From nobody Sun Apr 9 02:40:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvGYs4bVHz459tn; Sun, 9 Apr 2023 02:40:49 +0000 (UTC) (envelope-from kevans@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 4PvGYs44mBz4QX0; Sun, 9 Apr 2023 02:40:49 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681008049; 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=AqA0V16yq+OjcCMN0KeBOsKnhVu7f+IR7+tSxbNk2tA=; b=imoxzr0KxJnxZ77/qF+L6QGNzNWTQJT8i67NKcVhITZ3HsFxsQYYQODwdVAQqjhz4Y7h7r SxXjb+ibQZIbApopf0+O9VciIGns4swhggAc36z5iG+a6JZfHy1aSnCKXhsVamGZsb36AJ UfGlEpwQd5CyBdHJJ0qbBsInC9ZI2sVuPN7TmLFpJhF2dXad2P+WVB6qswsnHvEo1Hm/ij 9qcgYKJBzYZhbvlxY/WAwbLPaYkhOaM71ft6M+VsI0HdBimr12G9UcabcP2Ow7eztVRuXo HIi2aD3GTf8cx22CyKtTl4NAEKQRJ0aiXYEebDSlrfh35M9XTVKQsx3oFpITag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681008049; 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=AqA0V16yq+OjcCMN0KeBOsKnhVu7f+IR7+tSxbNk2tA=; b=q1/sn321PDuaAS1u3SUw6AVyQGMvK70ccvRjidgKoEUVy6uGx2aYDczjzn9wRjlI8xYlus e9u3SiFaDGUXw2x3VigOrr1mSHH7Y0BvC/imQ/OerBAdJL6nzSihmxpRP4OIWJzQy12POh iJwAA1PycxPoq7eulWevtErUmRCALLGYZARPIWxzp0IR7+tFU5ijo9tAvkJ4NzQ/XUYn9I Um5UatY6ApKEQitNgjxyUsQXFjHKXO0259zo6lc6JSjGhBuDfwacOGHu/xcU4BSfAeNSne VcZZxCuAcHbrIakWm3nAHm+lizdzm6GM7HNSVDzYG+UgWMcWVbnYtUhyRzaRbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681008049; a=rsa-sha256; cv=none; b=M+HN41JfLYKu75HArFp1ZJRPmX/9NxoV8U2Uj9F1LjFbnfY6XaXvYPmzh5AxQfCOQnq3Px un3YZ8wpgPBEt84LAhvGOe4l5aKqIBYHKXMyMK2Bb0WhlnFpsTk5AGCDArOshBgWAZdaS+ iVhXVsfw5at3p3ah8gezGKBceOkznk4kA92MAiTlzX0tgmmNCuf5zIPDpY2d8/7VYIoFpO fkFvxVwc/9imW3d+AOORUxiiUV2LLcjaT57xzydzxVu65XKBc6lOA7dTVttD2eM0kR4EAl +tNxN4OXwiYrMRvlI2SdcUJu6yKMl7KPcBBNTCI8NkbjIi/B8l6aooWS4XIXYQ== Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PvGYs31fJznyQ; Sun, 9 Apr 2023 02:40:49 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f179.google.com with SMTP id bn8so1880690qtb.2; Sat, 08 Apr 2023 19:40:49 -0700 (PDT) X-Gm-Message-State: AAQBX9eYp2gkBIQhjXiNpeLf2/dX+c1fBsBNn9wfhA6+VhYI83VnloTo mJXpt0AKcOb8QRuvNup1Ep735153EANgwpdBnvw= X-Google-Smtp-Source: AKy350aifjTI7XK/IbTGk9Rucrolsyq7xpXzsohboE6/AULmqSGdMZqIqd+2L2Q1vFbBUdnREG1HuyspheUOXiNcTX4= X-Received: by 2002:a05:622a:394:b0:3d7:9d03:75b0 with SMTP id j20-20020a05622a039400b003d79d0375b0mr2572684qtx.13.1681008048647; Sat, 08 Apr 2023 19:40:48 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <3A019D10-E520-4C11-AE9F-4EA5D99B9B07@yahoo.com> In-Reply-To: From: Kyle Evans Date: Sat, 8 Apr 2023 21:40:37 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 [separate aarch64 panic for zpool import] To: Mateusz Guzik Cc: Kyle Evans , Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD , freebsd-arm , John F Carr Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Sat, Apr 8, 2023 at 5:24=E2=80=AFAM Mateusz Guzik wr= ote: > > On 4/8/23, Kyle Evans wrote: > > On Fri, Apr 7, 2023 at 4:54=E2=80=AFPM Mateusz Guzik wrote: > >> > >> On 4/7/23, Mark Millard wrote: > >> > On Apr 7, 2023, at 14:26, Mateusz Guzik wrote: > >> > > >> >> On 4/7/23, Mateusz Guzik wrote: > >> >>> can you try with this: > >> >>> > >> >>> diff --git > >> >>> a/sys/contrib/openzfs/include/os/linux/kernel/linux/simd_aarch64.h > >> >>> b/sys/contrib/openzfs/include/os/linux/kernel/linux/simd_aarch64.h > >> >>> index 16276b08c759..e1bca9ef140a 100644 > >> >>> --- > >> >>> a/sys/contrib/openzfs/include/os/linux/kernel/linux/simd_aarch64.h > >> >>> +++ > >> >>> b/sys/contrib/openzfs/include/os/linux/kernel/linux/simd_aarch64.h > >> >>> @@ -71,7 +71,7 @@ > >> >>> #define ID_AA64PFR0_EL1 sys_reg(3, 0, 0, 1, 0) > >> >>> #define ID_AA64ISAR0_EL1 sys_reg(3, 0, 0, 6, 0) > >> >>> > >> >>> -#define kfpu_allowed() 1 > >> >>> +#define kfpu_allowed() 0 > >> >>> #define kfpu_begin() kernel_neon_begin() > >> >>> #define kfpu_end() kernel_neon_end() > >> >>> #define kfpu_init() (0) > >> >>> > >> >>> > >> >> > >> >> ops, wrong file > >> >> > >> >> diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_ar= m.h > >> >> b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_arm.h > >> >> index 178fbc3b3c6e..c462220289d6 100644 > >> >> --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_arm.h > >> >> +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_arm.h > >> >> @@ -46,7 +46,7 @@ > >> >> #include > >> >> #include > >> >> > >> >> -#define kfpu_allowed() 1 > >> >> +#define kfpu_allowed() 0 > >> >> #define kfpu_initialize(tsk) do {} while (0) > >> >> #define kfpu_begin() do {} while (0) > >> >> #define kfpu_end() do {} while (0) > >> > > >> > It will take me a bit to setup a separate build/install > >> > context for the source code vintage involved. Then more > >> > time to do the build, install, and test. (I'm keeping > >> > my normal environments completely before the mess.) > >> > > >> > FYI: > >> > > >> > I have used the artifact build just after your pair of zfs > >> > related updates to confirm the VFP problem is still in > >> > place as of that point: > >> > > >> > https://artifact.ci.freebsd.org/snapshot/main/5e2e3615d91f9c0c688987= 915ff5c8de23c22bde/arm64/aarch64/kernel.txz > >> > > >> > (No artifact build was exactly at either of your commits.) > >> > > >> > =3D=3D=3D > >> > Mark Millard > >> > marklmi at yahoo.com > >> > > >> > > >> > >> I have arm64 + zfs at $job and just verified the above lets it boot > >> again, so I committed already. > >> > > > > This was a known issue that we were working on fixing properly over in > > https://reviews.freebsd.org/D39448... this really could have waited > > just a little bit longer. This problem was already brought up in > > response to the commit in question days ago. > > > > Mate, that's one confusing email. > Sorry, this was misdirected anger around this series of crappery. > I had seen the upstream review, apparently there is opposition to the > patch, it is clearly not going to land within hours. > The opposition is notably from a person that does not actually work on this platform, and IMO has no bearing on our downstream review. We'll get past him eventually, because this is what needs to happen. > Whatever the Real Fix(tm) might be, I'm confident my change has no > impact on work on it, past the need to flip kfpu_allowed back to 1. > > At the same time things were broken to the point where aarch64 + zfs > literally did not boot. Once more, I fail to see how restoring basic > operation by fipping a macro to 0 throws any wrenches into the effort > to get simd working. > Thanks! > If anything the question is how come a clearly *not* implemented simd > support got kfpu_allowed set to 1. > Your guess is as good as mine -- it clearly could not have been tested at all, I have no clue why they didn't err on the side of caution and avoid fpu usage. Thanks, Kyle Evans From nobody Sun Apr 9 09:28:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvRc96t8Wz4499H; Sun, 9 Apr 2023 09:28: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 4PvRc95YmQz41sB; Sun, 9 Apr 2023 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681032505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jm5p8f4zKA/9pjV0f/arHBDQ3c5yfX05j6TfrqsHma8=; b=FXiUV4JRFblxUcT5ApKivyjQMg8sqnms2e56aMuZkDT+ELSKr7EWKiUPLKoB46Zkqm7S5P Un4GurrIOJYfAoWvCEJWX2bR7vdTsfNQ9oaOJ69HJv6etwNvke7l9pyTxy8zeC6pJH7KI7 SIfsaKf0t/Q685/jXKhi/F3DFR0I9IjTquPle8vcZMnb5LsXc3oDY9TePSzMLU2jSP6EDf JEJg5M+VFzAJ1AduOEXl9zAmFNSWrI1mQZjY9MjADakPUDTip+OzaLsbeIDZCSap46Zxbk ujljp2qT+dTaWNdnuls19I3z3wi0c9vS4IeKL3HoVfPnE1XaQuoA8mTwTXK3eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681032505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jm5p8f4zKA/9pjV0f/arHBDQ3c5yfX05j6TfrqsHma8=; b=f5Ms6G/hM9ixqDpexQUeShDbBc9POBlA6WYf1T59RDDmD9gBj4Yca/iYLDcGkqsCON8QOS iXJ/3freOmZEvxSjwfe9V5KJLhmy20RPngpgbR4vcn1Z4Xs/iANRcSM+ylMTwG3CjHTGlm 1juk29l4FBIop7sjEbFFY2e795RkPU7y1eL0Va8UhofjAMuQmlOvKiHvkzxgYQmJwpWrEK nkOUFxxFU/IDYdHDVZHX/xzCiufY/YF8wxJikpzhSrzdFZOdwGZw4bOy7/YQPz0emsWg3T TFolwvTVNVFKlZ4mOZgnnhBFda4dBvWzdfvfAOyBGDCyCGHLnpZCSUzp13u1mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681032505; a=rsa-sha256; cv=none; b=pvWd5mzfoP6xIhLZNRqj+2Mu5IKhmHDq0+q95d649gezLf1BAWsrn7+MXszZg+k6RSU0ou Axl2Yzmfeenyfu9btpuNV7RoKyaIin/kTAzh/j0f4j7N71mJBrbljqejLRs6+dL3a+Xv+j DELDGGMw8Ayo53NXliUhhZ44Bzpw5+w3ktNOt9iFTu61fCIwpM/zE93GE/NdYjkFRqFt88 NLm80jK5AOh4Xk+cUa7TcRAWtxn7yTYNhbdIxKvuwp4mpqJ8BPus67j4Vdt3zcLUJ662Yo DX7LP4SMqDRiyYNYj8/S4+GP7QpR13jJSENDrnhJCwAn62NJQE/G/bA7hyVSUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvRc94bbQz13NL; Sun, 9 Apr 2023 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3399SPO6065956; Sun, 9 Apr 2023 09:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3399SP07065955; Sun, 9 Apr 2023 09:28:25 GMT (envelope-from git) Date: Sun, 9 Apr 2023 09:28:25 GMT Message-Id: <202304090928.3399SP07065955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0d4038e3012b - main - netlink: set prefix-related flags to the created nexthop. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 commit 0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 Author: Alexander V. Chernikov AuthorDate: 2023-04-09 09:26:12 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-09 09:26:12 +0000 netlink: set prefix-related flags to the created nexthop. This fixes incorrect flag combinations when adding IPv4/IPv6 host routes. MFC after: 3 days --- sys/netlink/route/rt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 288ff111a038..7e81d59d696b 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -732,7 +732,7 @@ get_pxflag(const struct nl_parsed_route *attrs) pxflag = NHF_DEFAULT; break; case AF_INET6: - if (attrs->rtm_dst_len == 32) + if (attrs->rtm_dst_len == 128) pxflag = NHF_HOST; else if (attrs->rtm_dst_len == 0) pxflag = NHF_DEFAULT; @@ -776,6 +776,7 @@ create_nexthop_one(struct nl_parsed_route *attrs, struct rta_mpath_nh *mpnh, } if (mpnh->ifp != NULL) nhop_set_transmit_ifp(nh, mpnh->ifp); + nhop_set_pxtype_flag(nh, get_pxflag(attrs)); nhop_set_rtflags(nh, attrs->rta_rtflags); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); @@ -852,6 +853,7 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, nhop_set_broadcast(nh, true); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); + nhop_set_pxtype_flag(nh, get_pxflag(attrs)); nhop_set_rtflags(nh, attrs->rta_rtflags); switch (attrs->rtm_type) { From nobody Sun Apr 9 10:05:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvSQn3qv2z44Cgn; Sun, 9 Apr 2023 10:05: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 4PvSQn3JRwz3mVb; Sun, 9 Apr 2023 10:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681034721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxb1KUGPn8tBu8ha9sgupIfnAu2SRRDuRA3Nz18FnU8=; b=htabEQ63pKwgrP0nNBl3dtx25Xxj/56P7cel9Aix5e2hJZ+QIzoneouyYin3lYCI19JIwO yHa1Et4FydghM+bE8cgg0CdzTZdNQCyf5wpO7B9pkB7jyvvxyCKywZVYga7be1++uEyL/3 iDCnbfhk3vHOX0Jb3F7+Vr7tOY98f8DLCE2vUt6n/OsshuQvEVvNfIgvYQOop2uAqWiaMc /bBH7CpH8jyT91itqpQSG86lXBl49aE239hhAi3LtOKRpUuyr0wPGb34JdLE/8awf7RTnm RTwvpmdzJ057nnBID3IgTOifGm+o2X7W2djRiHGl5eEkJfn2euCvK+uRB/Wq5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681034721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxb1KUGPn8tBu8ha9sgupIfnAu2SRRDuRA3Nz18FnU8=; b=l2UTKocQv02DdUeXFBZ9+dqcjfZe3L8ZRaWp9Y8dnWe3juZEtBgrco4BTQKCSDuQwcMDSl iL26ahj8D3hR4oUjNSvsihDncKg84VSTW1orb4x5qiFXbbp/aBoU/VsKoxxAcLQYubj6cd /B9lvhlcBYnxZhz2+nDg9WlzjyIH2+CGxqMGDFnEyXfOnOk4/oiZi9FMORYbSQ8AVgZALe TMGweuscZKcuuNEZFG2Wjvc7c0ydezDc3pZAgLEQJbWMExRstOU/cOivl9/1MqaxWmycbv MOX7yvEM/SQbwDR2BhKSd3x8kcpAsBqnn/9ZgCwKm+jFMCCfS9/g+XHnrVxBdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681034721; a=rsa-sha256; cv=none; b=v16lScL+P0ABZUf4fq96fp9DBMB9f2xHXI7reWBbwhQO7LBCfNYe+giEdngonU5vP3Mmj5 OSF/lt+ayRISaWYdA40OHYaGoMuclVK5ZBXHIbb+7smoJ4HdWgqYFN9y2hbiHb22lvopOe j0EUsljO1DoGdbqkUuQaRkaLbKA4mLg672gLCeJr1JaMb+UaPENa/Pzlae3xwG1v3f4tX1 WnOndTX5ZCGd4gmU2MVqmGhPY2R8rYUrmYCZOVwkd4adEepT3Y4OgcBlfk0Vmb5hgbYGyr gRP2fH2qWu1M2NTA122+8auUD4T7Qav8K9McUwsgmR/U5PdX4XbUj9JpIomvfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvSQn2Hppz13kM; Sun, 9 Apr 2023 10:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339A5LoR031582; Sun, 9 Apr 2023 10:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339A5L70031581; Sun, 9 Apr 2023 10:05:21 GMT (envelope-from git) Date: Sun, 9 Apr 2023 10:05:21 GMT Message-Id: <202304091005.339A5L70031581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 351e4592f64b - main - route: remove always-true expression List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 351e4592f64b5c752e7967f5ed565c546a5ef9ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=351e4592f64b5c752e7967f5ed565c546a5ef9ac commit 351e4592f64b5c752e7967f5ed565c546a5ef9ac Author: Alexander V. Chernikov AuthorDate: 2023-04-09 10:04:56 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-09 10:04:56 +0000 route: remove always-true expression --- sbin/route/route_netlink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index a9f550ef6f43..e3305c0d7df1 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -781,8 +781,7 @@ print_flushed_route(struct snl_parsed_route *r, struct sockaddr *gw) routename(sa) : netname(sa)); sa = gw; printf("%-20.20s ", routename(sa)); - if (r->rta_table >= 0) - printf("-fib %-3d ", r->rta_table); + printf("-fib %-3d ", r->rta_table); printf("done\n"); } From nobody Sun Apr 9 13:34:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvY3r3jZJz44RGs; Sun, 9 Apr 2023 13:34: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 4PvY3r2pV2z43M6; Sun, 9 Apr 2023 13:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psf9QAeIQaPgMaTuJJnojDoCoElf3dK8S/xXTz/hVvw=; b=sab+DJXzpzpP1NBychX9exgTcwSsJyhCj28zgMA8zcC2l5nxCyhn5Rjs1qiiDZDX/aqIGh NLo4xlxxXuMizDW6+GOJFI74yqMfUann733aMAhlFZ1tmIAzEs4+XKNlsg5OygUeLatFDO 1egosFq+HomzF9ahqaBygASXCrtYkl7MMTKCSdW2QmbFjDgDMnlj3tFmKM4epUNe4g94aX 4ARY9OQRYq9ijYAcxhtDDHkFPCLPm0j4l4XmSye+PGpTpl6mn0M+W6FaPFknIAlWH0gDKm Vhm1ufFQUPe1EP0VoJzSkJw1Og++wWYitPvB9/p8ZuJO598vuwcLr5wLTEYsAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psf9QAeIQaPgMaTuJJnojDoCoElf3dK8S/xXTz/hVvw=; b=TFxQkDrHTkxj3g0Z1LCqIrWHGkh3qPIPlI7eEUppPJuW84zdBYhhngSlVv6Escmd0TsuDF fbRVeOH/js0rk11AQXvRmdJPac0kzj5a6Fxd+QWwqDIfirmyAOCsGjot14Sfk+LmOqekDi bMFOklaXzWR8BLe6LrQAkhWxviK7GQXPwI/A83vYiy6N3NY8OUKK8NXCUpf85MWcEQUkMV OKW5pSoFPDgsQocMyJpl/D8gr1nSx71xTofx5SF9kV9L9RcFnCR7/HtfwsZGjjHgkzF74l 9zO/oDc5dJiSybHuInGhePVcg5dtPjanUYssyZVnRwJiMqGgk13epyfqp+2N5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681047256; a=rsa-sha256; cv=none; b=mWgeEd8UqN7V/emW6w8161IOLEUGJiBhV5upMomT5ESm4loTmjQXDDwIJMA4aweEgvK9k0 zK0xKosLuIArnLcn594eqApiwkm1lUTiyHo20fWZ8TxXdYmnZsh4VhIVdi5dsxMInmI9Cd vGy3JjX+9dcYziINikLcI4iieoA8C85vE8mhvn49pLiq0QM5NjIbSTo1hMhHcAWvfeKi1J VbNzcnDzB6I9HtiKX+6OeNjBRWciURW1iCHq/Y4Cb5UfxXnD1opH6K1KWwvmPNslXNSxcm WeHxzYqX3ingFpA/EXnykqZf4U/i28gLRIkHS/c1G3uche1LvJEjSnsT/zpZYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PvY3r1r62z19HD; Sun, 9 Apr 2023 13:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339DYG4P077250; Sun, 9 Apr 2023 13:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339DYGRC077249; Sun, 9 Apr 2023 13:34:16 GMT (envelope-from git) Date: Sun, 9 Apr 2023 13:34:16 GMT Message-Id: <202304091334.339DYGRC077249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: cc3793b1c548 - main - netlink: improve source ifa selection algorithm when adding routes. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc3793b1c54847e26001f42026778703970fa570 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=cc3793b1c54847e26001f42026778703970fa570 commit cc3793b1c54847e26001f42026778703970fa570 Author: Alexander V. Chernikov AuthorDate: 2023-04-09 13:30:45 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-09 13:33:22 +0000 netlink: improve source ifa selection algorithm when adding routes. Use route destination sockaddr when the gateway is eiter AF_LINK or has the different family (IPv4 over IPv6). This change ensures the nexthop IFA has the same family as the destination. Reported by: Dmitriy Smirnov Tested by: Dmitriy Smirnov MFC after: 3 days --- sys/netlink/route/rt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7e81d59d696b..db535cb676e4 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -708,7 +708,19 @@ finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) } /* Both nh_ifp and gateway are set */ if (nh->nh_ifa == NULL) { - struct ifaddr *ifa = ifaof_ifpforaddr(&nh->gw_sa, nh->nh_ifp); + const struct sockaddr *gw_sa = &nh->gw_sa; + + if (gw_sa->sa_family != dst->sa_family) { + /* + * Use dst as the target for determining the default + * preferred ifa IF + * 1) the gateway is link-level (e.g. direct route) + * 2) the gateway family is different (e.g. IPv4 over IPv6). + */ + gw_sa = dst; + } + + struct ifaddr *ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); if (ifa == NULL) { NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); *perror = EINVAL; From nobody Sun Apr 9 16:49:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvdP22ysMz44gnV; Sun, 9 Apr 2023 16:49:26 +0000 (UTC) (envelope-from vishwin@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 4PvdP22Jp5z3JyF; Sun, 9 Apr 2023 16:49:26 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681058966; 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=NwjJxoSPXBS0rdEArxcTYQHwc6GaNx/e5yTLfcEl9UM=; b=Iagzn/gh76BmlLZl+P3cEDG96GbN0T/xGFN3fUjcAQdGNg2Ix4brB6FBbax4TRG6zpsg5N br840coPvwis9RSlk65lA7TkKGIWQaN1IA6r162XKQN+wN6VNbxV5qfns3xU0nod/03jDz wyN3mCPP0+QToUfmkzDYt1GR67ouJlmIELP0T8BFxn6iPApnEWFA+jr4cgMjYAAQflJsjT aAEOXmiJ2CLcrdcZF8NCqgTSvhCIw1VYhNV++kIsHmCdpg6tNSDwH4znwJ0i3d4o/K56Rn MomQc2vYtPbagxsA8G+zEWJ5EH73hVSEozDWHUt1NehbxMiNjgCeYZodqp8Q4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681058966; 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=NwjJxoSPXBS0rdEArxcTYQHwc6GaNx/e5yTLfcEl9UM=; b=euQb1UB4/6/PHBX9pkGO1AspdH7/ewygolIjvbMBorz3XNrUdYe/uXeraZdokfLgOlW9SZ pnPAoA4DfnUirWPV5pQljCPN2cR6V5HJfDO53oxlCBhqyRLs5AifNi1PjhHrNgG5C5ogI9 1fg1JNt0fVJmlS6oieXU44d6TmdisBESPWDIsjX76pcOsptiQ5RY9CupScDC1YucEJQT2b Brny0LZudJjABkVCGvjwDi58Uy1WlaX10BTGFbVtPFLtVv/FypeSbDSKkLpSBgxVHPwlA1 iA4yVmbptD94rTyGHc6vu1fSFnveWFruMH2YiCax2eYlB6NCuWfjzIAdoEVdoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681058966; a=rsa-sha256; cv=none; b=f5rlRoa65tmHN5RIcQT8oeSb9LzAF9Sd8r9zdpGfHK/pkXHgdW9FI8s9mitp++VX4mQCb9 M4IfjCu5zAvQIxBtdwizqJr/2m7ONW3YZDDzYazHrLapVkuij2e6c06CN4qnUoRHB+qmdu 2UjlZXHs4Y5hGt391GoNSRdTfsepUeli0qBfAzGTGW0YApFbDhn4jOzikXR3czBRuT3gWN 4O8nGmjyXKYI4w2Mw39q+Lu6sJO6Egn5Z8Z4Bqpo7mLxQhZMqJDoluNmV16EdIa3qHgGo8 C0t69HXlNHu0g5pNeb8WO/O5Tymc6LaTBpJQGO6pDgdpqp2yqiDDlF+I47Yi0Q== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PvdP16WT7z16NH; Sun, 9 Apr 2023 16:49:25 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> Date: Sun, 9 Apr 2023 12:49:23 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 To: Cy Schubert , Rick Macklem Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> Content-Language: en-GB From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <20230404052811.DA2172C1@slippy.cwsent.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------rhQBVeEGGGVY5Zq9VHsNa9eb" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------rhQBVeEGGGVY5Zq9VHsNa9eb Content-Type: multipart/mixed; boundary="------------pNAtpx0K9htveoYQQhLXap4I"; protected-headers="v1" From: Charlie Li To: Cy Schubert , Rick Macklem Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> In-Reply-To: <20230404052811.DA2172C1@slippy.cwsent.com> --------------pNAtpx0K9htveoYQQhLXap4I Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IEkndmUgbm90aWNlZCByYW5kb20gYXJ0aWZhY3RzIGlu IG15IGVtYWlscyBzaW5jZSB0aGUgbmV3IFpGUy4gSSdtIG5vdCBzdXJlDQo+IGlmIGl0J3Mg cmVsYXRlZCB0byBibG9ja19jbG9uaW5nIG9yIHNvbWV0aGluZyBlbHNlLiBUaGlzIGNvdWxk IG1lYW4gZGVlcGVyDQo+IHRyb3VibGUuDQo+IA0KSSd2ZSBhbHNvIHN0YXJ0ZWQgbm90aWNp bmcgcmFuZG9tIGFydGVmYWN0cyBhbmQgbWFsZm9ybWVkIGZpbGVzIHdoaWxzdCANCmJ1aWxk aW5nIHBhY2thZ2VzIHdpdGggcG91ZHJpZXJlLCBjYXVzaW5nIGFsbCBzb3J0cyBvZiAiZXhl YyBmb3JtYXQgDQplcnJvciJzLCBtaXNzaW5nIC5zbyBmaWxlcyBkdWUgdG8gY29ycnVwdGlv biwgZGF0YSBmaWxlIGNvcnJ1cHRpb24gDQpjYXVzaW5nIHVuaW50ZW5kZWQgZmFpbHVyZSBt b2RlcywgZXRjLiBBbGwgd2l0aG91dCBibG9ja19jbG9uaW5nOyANCmVuYWJsaW5nIHN1Y2gg Y2F1c2VzIGEgcGFuaWMgb2YgaXRzIG93biB3aGVuIHN0YXJ0aW5nIG11bHRpcGxlIGJ1aWxk ZXIgDQpqYWlscyBhdCBvbmNlLg0KDQotLSANCkNoYXJsaWUgTGkNCuKApm5vcGUsIHN0aWxs IGRvbid0IGhhdmUgYW4gZXhpdCBsaW5lLg0KDQo= --------------pNAtpx0K9htveoYQQhLXap4I-- --------------rhQBVeEGGGVY5Zq9VHsNa9eb Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQy7JMFAwAAAAAACgkQ/reFK+KbPocf RBAAqnn8L/YOhxsVF4ZUHCS8u2ijHH22T156pwkD/Nv2K0xehrNB7Ffu7OHtg7G6w7c3bZzbmfj3 5prMEstuc8Hd5dc1ocgv8nA6iCkclJysInHxAq/aM1648MqGC8hKMEByz3SzLuNwS9yJBiQZJ/xV +zvf7S4/y5BpNAUkJ7YpOQTEJJE85XxvCoJYkaM0bA2G0j9e95hgzB/EydbX4u9rikbp1RgOkiYD 8HMhWoAgOHy8/jaBdNvRFMpEa4m4pP946l+CEE2MksNXn4yh9OmqjbMdZeuYtXBcCnbt7KM9KCxd U6XwAxNUaW+HRoBWlJbdSqUUPHUXCm7KkjEEUQYEEANar5e5E54NcwjBj8Sbi+WQxnLJ0pFQU3xL kDyvQfymI9Vd63h+z4t7LiemB+R4NP8fHau7oCfS8wuuPkE31vHEcR4KK6IbWo7e6mThQCwqugLw JvDcZWkRSVPpgTU1apx8kLLQ9Qg6wvb7XzELEAf3JEL0JQ1Ya7b1TikvwWudsRq63PdJG9GPkiMQ Uiz8A0oOJ8SR3BEQ/e1q2C6K4f+xxbsYsDpc7o+hCF645MOUdzxp1zbX+AmUJ8y4QMJTTag444w5 H63w0vfCuVLJZjV7RuV7UAqAw+DbH1F7j3HjijhJIW6qs9hGB4InfdChXPUUxbZ0Yy2eFX1zhCUn S+w= =tguw -----END PGP SIGNATURE----- --------------rhQBVeEGGGVY5Zq9VHsNa9eb-- From nobody Sun Apr 9 17:02:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvdhZ6hTkz44j4Q; Sun, 9 Apr 2023 17:02:54 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) (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 4PvdhY40p4z3vMd; Sun, 9 Apr 2023 17:02:53 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-1842e278605so3733709fac.6; Sun, 09 Apr 2023 10:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681059768; x=1683651768; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=pxu/g4C6VrLDfx1T9dE9iir2rwyNS3T3vGOs4SHjM+M=; b=hUjDHvrNoPtKwgOwpF9J/BuMWha9LS9fndh77lHKa0J5hoOAebWUAC9jeqNTrXDIJj HJ3SCKnAAwO8seG1iKpqSCjqenyzahMNtgsr48x/4PmC2BC6uIum2bYk0aVgeSP+V1QO l+ca24tI1SVjPb/Z9hXHPD7t0pZnc5IGQ86lCOFKoWvym3F5Sfi2rlpTORdEHiVQWTQv HFDsJqDSamz/55FbPy7QeMDbjhQyNsKHyUj6R0c8T9LTgcpMr417XGkfMa6OC2dHurXx s8tGSnJpeFvCb5lIG2BR+kKVOoEFeHqjrPOJYB2mFJL+gjT/VaW3dsOin+YVYJjTgDXa TUmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681059768; x=1683651768; h=content-transfer-encoding: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=pxu/g4C6VrLDfx1T9dE9iir2rwyNS3T3vGOs4SHjM+M=; b=Sj3NAC0TSf9uX7UsU7EvHEBgsvpPL/tb9dtcARzU95I3bxJXBi6t+dloIOkhmiW8TP QZIvkhUPGFV2sLyg2Pywy9wjo9xHaSvW8soaFxxxqJ30kRuOAFxsQd/ojg8/zQK/HSoV 1ohZR0RBDzKZGyuqW4mV48wQrFpZMHnHjQOQunyY9qic9NXAcVH40pxxx22Z3BjF0W+r 09wlHAdRigPtciVX9h7oBlgmnIrP4GPB2MvEr0SQPt7Fai9+2T9QG5C80qW+YoinlVaF JRxOizNcBIQH6uesoiSBAtOfpP+QpQrZKM0w6r4XEWsSYGr5gLseEFceyxWCkb2PR+pX A3kA== X-Gm-Message-State: AAQBX9fC7IdBSlE4n2Ai/7+pYbExORB0zAIPBFkyHHI3vhA8pR06O/s6 heLP4xe+p7o26iVnVjUpDJ+ZSFBwz+a6vPoNOksf96gv X-Google-Smtp-Source: AKy350Y8fjyTuudNPHFR+E0IfUI1MEEavj91v0zVy9+hlyxG9SzCajOa/ppnL1QpSd1JNVvXYjCf+cqKGRcNBYIj/fM= X-Received: by 2002:a05:6870:24a2:b0:177:ca1c:2cd5 with SMTP id s34-20020a05687024a200b00177ca1c2cd5mr2434440oaq.4.1681059768443; Sun, 09 Apr 2023 10:02:48 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:798d:0:b0:49c:b071:b1e3 with HTTP; Sun, 9 Apr 2023 10:02:47 -0700 (PDT) In-Reply-To: <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> From: Mateusz Guzik Date: Sun, 9 Apr 2023 19:02:47 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Charlie Li Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PvdhY40p4z3vMd X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/9/23, Charlie Li wrote: > Cy Schubert wrote: >> I've noticed random artifacts in my emails since the new ZFS. I'm not >> sure >> if it's related to block_cloning or something else. This could mean >> deeper >> trouble. >> > I've also started noticing random artefacts and malformed files whilst > building packages with poudriere, causing all sorts of "exec format > error"s, missing .so files due to corruption, data file corruption > causing unintended failure modes, etc. All without block_cloning; > enabling such causes a panic of its own when starting multiple builder > jails at once. > what's the panic? > -- > Charlie Li > =E2=80=A6nope, still don't have an exit line. > > --=20 Mateusz Guzik From nobody Sun Apr 9 17:23:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvf7t5vXPz440Pk; Sun, 9 Apr 2023 17:23:06 +0000 (UTC) (envelope-from vishwin@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 4Pvf7t5D4Rz3HR0; Sun, 9 Apr 2023 17:23:06 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681060986; 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=Ukl5StKisZ0t5mqsZ/sHZfSK1gh9o5w6Q9guipmoI1E=; b=cVdLRv69l9Ip4Bh5EDOGiDoGG+udKFUHZX4vrNM6CHtBp7LZsu/+m1manEYiPMFsQX/udc yH0LNYUU+tbbzdnPTZtIrDGyoyGAaD6ZvaDzdLg0LM72usIVkXxyToNxbeln2H3IoqCB/0 VPUUapTbKJ/2/0ZSpSkCvfug1YBEWsnxgeVFJ9dnPuZnDHsFpcoxQWtudPX4TKTEMhqF91 8uVOMHycuZg80aOldiGoK9Bkv/AaAFSiLamLBS6GrA8Ct8eGOizLltNty7/48WYvinrekh 28OTPbtejnl3TSGU3iOT7XgMbqTuDuGx/RMeEsTr17depeoCgT6fo1VNrOBuXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681060986; 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=Ukl5StKisZ0t5mqsZ/sHZfSK1gh9o5w6Q9guipmoI1E=; b=ZBy/hCXwu2IpTKNTS44c2fmwV2Ow9SuOAppmTNGsZIvPzyBtfOLF7gL9lW/g8MqUYVaKMl d1IIIsOTNHpKLeAbq+sujwP7c37z41wtEyPli+QdXDRkTbtym6wJjZunXc+zhzUuZWP6Re mX4GmdrJKlSYEE0mJw5QXMfQPvt8AjDa6mmoZfUmnBI/BGoWg1U30znMVbI/PZpj2P2j/L DE6fwmEbIRN6poireYRIVoQ7wr0LG3ZdWCCgB6y2XU4e4R5HMM2341qhoYIh35mcHtJc5p dQ2+3GWZuszLBGWTTkhfwlwLIgd6UIZ3tutctCKSqq1E39xJfCjVYBHeX0SdUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681060986; a=rsa-sha256; cv=none; b=ScKfcA0Dal0AKqXew2G3z6t7UWgcy0cHQvOD7TYnsiKPhLGRr/HLE4xc9/Sp5DfDZ1g0zb U7xGKQ4oe19K495fBvzFaZ8EYljQPipz4j7wGU8udKrQIkQwXH2RaqVgW6IvVoCC6BO0qQ ZkmIQT5NXqn7jwGLd1tWuNtxPMgKgEMR0mLhJmMSj4tkHQg90OjCrY2GhxXsdwsCMZOmBQ d++c97ku4FxPXaIU/SaGhB3YsJdQIqXuYo681Qkj2KkCBcaq2YRmCZS1TH3eRpEVPXuvsH 4YR3qVCxXlyDvjE3vuXU8h98jV7ZZH/0kVUV4sX5z79Wl7LdP5/lVfzHV2T/aQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pvf7t26zNz17k9; Sun, 9 Apr 2023 17:23:06 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Sun, 9 Apr 2023 13:23:05 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------fgZr9sxCVpGzCTDhWsx50PDB" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------fgZr9sxCVpGzCTDhWsx50PDB Content-Type: multipart/mixed; boundary="------------M8iNBa1XqwSylgIrYGfE0HTM"; protected-headers="v1" From: Charlie Li To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> In-Reply-To: --------------M8iNBa1XqwSylgIrYGfE0HTM Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TWF0ZXVzeiBHdXppayB3cm90ZToNCj4gT24gNC85LzIzLCBDaGFybGllIExpIHdyb3RlOg0K Pj4gSSd2ZSBhbHNvIHN0YXJ0ZWQgbm90aWNpbmcgcmFuZG9tIGFydGVmYWN0cyBhbmQgbWFs Zm9ybWVkIGZpbGVzIHdoaWxzdA0KPj4gYnVpbGRpbmcgcGFja2FnZXMgd2l0aCBwb3Vkcmll cmUsIGNhdXNpbmcgYWxsIHNvcnRzIG9mICJleGVjIGZvcm1hdA0KPj4gZXJyb3IicywgbWlz c2luZyAuc28gZmlsZXMgZHVlIHRvIGNvcnJ1cHRpb24sIGRhdGEgZmlsZSBjb3JydXB0aW9u DQo+PiBjYXVzaW5nIHVuaW50ZW5kZWQgZmFpbHVyZSBtb2RlcywgZXRjLiBBbGwgd2l0aG91 dCBibG9ja19jbG9uaW5nOw0KPj4gZW5hYmxpbmcgc3VjaCBjYXVzZXMgYSBwYW5pYyBvZiBp dHMgb3duIHdoZW4gc3RhcnRpbmcgbXVsdGlwbGUgYnVpbGRlcg0KPj4gamFpbHMgYXQgb25j ZS4NCj4+DQo+IA0KPiB3aGF0J3MgdGhlIHBhbmljPw0KPiANCm1hbnVhbGx5IHR5cGVkIG91 dDoNCg0KcGFuaWM6IFZFUklGWSghemlsX3JlcGxheWluZyh6aWxvZywgdHgpKSBmYWlsZWQN Cg0KY3B1aWQgPSA3DQp0aW1lID0gMTY4MTA2MDQ3Mg0KS0RCOiBzdGFjayBiYWNrdHJhY2U6 DQpkYl90cmFjZV9zZWxmX3dyYXBwZXIoKSBhdCBkYl90cmFjZV9zZWxmX3dyYXBwZXIrMHgy Yi9mcmFtZSANCjB4ZmZmZmZlMDJhMDViMjhhMA0KdnBhbmljKCkgYXQgdnBhbmljKzB4MTUy L2ZyYW1lIDB4ZmZmZmZlMDJhMDViMjhmMA0Kc3BsX3BhbmljKCkgYXQgc3BsX3BhbmljKzB4 M2EvZnJhbWUgMHhmZmZmZmUwMmEwNWIyOTUwDQp6ZnNfbG9nX2Nsb25lX3JhbmdlKCkgYXQg emZzX2xvZ19jbG9uZV9yYW5nZSsweDFkYi9mcmFtZSAweGZmZmZmZTAyYTA1YjI5ZTANCnpm c19jbG9uZV9yYW5nZSgpIGF0IHpmc19jbG9uZV9yYW5nZSsweGFlMi9mcmFtZSAweGZmZmZm ZTAyYTA1YjJiYzANCnpmc19mcmVlYnNkX2NvcHlfZmlsZV9yYW5nZSgpIGF0IHpmc19mcmVl YnNkX2NvcHlfZmlsZV9yYW5nZSsweGZmL2ZyYW1lIA0KMHhmZmZmZmUwMmEwNWIyYzQwDQp2 bl9jb3B5X2ZpbGVfcmFuZ2UoKSBhdCB2bl9jb3B5X2ZpbGVfcmFuZ2UrMHgxMTUvZnJhbWUg MHhmZmZmZmUwMmEwNWIyY2UwDQprZXJuX2NvcHlfZmlsZV9yYW5nZSgpIGF0IGtlcm5fY29w eV9maWxlX3JhbmdlKzB4MzRlL2ZyYW1lIA0KMHhmZmZmZmUwMmEwNWIyZGIwDQpzeXNfY29w eV9maWxlX3JhbmdlKCkgYXQgc3lzX2NvcHlfZmlsZV9yYW5nZSsweDc4L2ZyYW1lIDB4ZmZm ZmZlMDJhMDViMmUwMA0KYW1kNjRfc3lzY2FsbCgpIGF0IGFtZDY0X3N5c2NhbGwrMHgxNDgv ZnJhbWUgMHhmZmZmZmUwMmEwNWIyZjMwDQpmYXN0X3N5c2NhbGxfY29tbW9uKCkgYXQgZmFz dF9zeXNjYWxsX2NvbW1vbisweGY4L2ZyYW1lIDB4ZmZmZmZlMDJhMDViMmYzMA0KLS0tIHN5 c2NhbGwgKDU2OSwgRnJlZUJTRCBFTEY2NCwgY29weV9maWxlX3JhbmdlKSwgcmlwID0gMHg5 MDhkMmEsIHJzcCA9IA0KMHg4MjBjMjhlNjgsIHJicCA9IDB4ODIwYzI5MmIwIC0tLQ0KS0RC OiBlbnRlcjogcGFuaWMNClsgdGhyZWFkIHBpZCAxODU2IHRpZCAxMDIxMjkgXQ0KU3RvcHBl ZCBhdCAgICAgIGtkYl9lbnRlcisweDMyOiBtb3ZxICAgICQwLDB4MTI3NjBmMyglcmlwKQ0K ZGI+DQoNCi0tIA0KQ2hhcmxpZSBMaQ0K4oCmbm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBl eGl0IGxpbmUuDQoNCg== --------------M8iNBa1XqwSylgIrYGfE0HTM-- --------------fgZr9sxCVpGzCTDhWsx50PDB Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQy9HkFAwAAAAAACgkQ/reFK+KbPoc2 BQ//QoIitNvlL1H4mney6jOVQ1kterrGgxLdpIS8mDvFSSosbLhTyKQbUf+DQ/yXJcqRJTB3L0a6 VdMHnq9k5utRfR+9vv19jEQtKuBPzZpWJCWrFfoKVmGodJy2Cimc5q4FX4xKmWeRHtkJ7i3B3uUz dVVAiUxTg/WnAU5bpqJK0nAJy1ZCQEFJD5YwNhm0b2ImmThJATvmVJFEBEqfYqgBBoTrC3oR7WtA wXyFSv2OWa0cwRRsPe2+ITo9/5De8u5MYwbMmsFuakzWHBbn6V/kraFTCW+HzutN/gfCWGYvUVrf g7ouTgTDjuvmzanI5SuMj7X3hDanR+IsGEhlxLbStNupH41eEf4XKAiU+S0Jc/BzQB5V0KqHeLxx b/VtZORMTTyCJ9HyuliHKjJft5w1/IYA8JJEqXfwNGXdR4CYT7HS+rQLA38NNwzGYQ1cV/BJOhuj NbhwqVfE7eeavC3ogPhrKvFczqruEMfB2TtgPuaAUEK6bNctllk0igT9Ng+ul9IdlnmFTp+l5ZCj A5rrgWU6wSOU4Pevg89I15lTa3CBONSY2IMaRytOaiZDvi26PS/kc1fD+UJrcMIwk4iKm6ZJ64GG dI5dpKq38Qh2sHYBJbxB1f0bI37hBrlFLUuzeiU4ciLOTDUq9YCESqs5VkO3+D6AlclzTSD3V9nF CdM= =VvTi -----END PGP SIGNATURE----- --------------fgZr9sxCVpGzCTDhWsx50PDB-- From nobody Sun Apr 9 18:26:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvgYz2qVRz444JH; Sun, 9 Apr 2023 18:27:19 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_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 4PvgYz0Jkvz4Qlb; Sun, 9 Apr 2023 18:27:18 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [IPv6:2001:1640:5::8:53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 547DD101A7B2; Sun, 9 Apr 2023 20:27:11 +0200 (CEST) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 47D6410A1EBE; Sun, 9 Apr 2023 20:27:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1681064827; 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=RqbYmqdRU5lNeD/AphaztRfHhoXnW3+dooD2BLGWY+Y=; b=WjWDpzFx2Un+YomKvC8oSR/VQCR9iLRKJ6ZqHnNg4IHhy40ML+ILA4yV5p/51DIyvfTMCO dPfrufrjyWcIBqVJLVGdMGbZcxfPQoaAHGO6U0zHQgz2Uo2Gyt0rL4169apyM4nmUwf17B ayTIuUmbhkRc7irbLvNew7N6DTsttp38hLvRX1VaXacWnrpBaAhxw9LwN1Y7SBV+S+hLXI kbgCefBJn8P3tQYKRNkPS8hevXgU4roqlXcBd0c9isynoQ04sVwUcMi5pWfCOKZA43qcrG H8WD1ub8xiQOBavhKqgWv8oXJOKEF8drYw+VkVdp/Vqy2Oph/AaO8Eq1fxHkMA== Received: from thor.intern.walstatt.dynvpn.de (dynamic-078-054-235-039.78.54.pool.telefonica.de [78.54.235.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id AD28210A1EBB; Sun, 9 Apr 2023 20:27:06 +0200 (CEST) Date: Sun, 9 Apr 2023 20:26:23 +0200 From: FreeBSD User To: Charlie Li Cc: Mateusz Guzik , Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NSO=6J2gRQWjQg+=NaQ_H9c"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 3c9105 X-Rspamd-UID: 5c778e X-Rspamd-Queue-Id: 4PvgYz0Jkvz4Qlb X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Sig_/NSO=6J2gRQWjQg+=NaQ_H9c Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Sun, 9 Apr 2023 13:23:05 -0400 Charlie Li schrieb: > Mateusz Guzik wrote: > > On 4/9/23, Charlie Li wrote: =20 > >> I've also started noticing random artefacts and malformed files whilst > >> building packages with poudriere, causing all sorts of "exec format > >> error"s, missing .so files due to corruption, data file corruption > >> causing unintended failure modes, etc. All without block_cloning; > >> enabling such causes a panic of its own when starting multiple builder > >> jails at once. > >> =20 > >=20 > > what's the panic? > > =20 > manually typed out: >=20 > panic: VERIFY(!zil_replaying(zilog, tx)) failed >=20 > cpuid =3D 7 > time =3D 1681060472 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame=20 > 0xfffffe02a05b28a0 > vpanic() at vpanic+0x152/frame 0xfffffe02a05b28f0 > spl_panic() at spl_panic+0x3a/frame 0xfffffe02a05b2950 > zfs_log_clone_range() at zfs_log_clone_range+0x1db/frame 0xfffffe02a05b29= e0 > zfs_clone_range() at zfs_clone_range+0xae2/frame 0xfffffe02a05b2bc0 > zfs_freebsd_copy_file_range() at zfs_freebsd_copy_file_range+0xff/frame=20 > 0xfffffe02a05b2c40 > vn_copy_file_range() at vn_copy_file_range+0x115/frame 0xfffffe02a05b2ce0 > kern_copy_file_range() at kern_copy_file_range+0x34e/frame=20 > 0xfffffe02a05b2db0 > sys_copy_file_range() at sys_copy_file_range+0x78/frame 0xfffffe02a05b2e00 > amd64_syscall() at amd64_syscall+0x148/frame 0xfffffe02a05b2f30 > fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe02a05b2f30 > --- syscall (569, FreeBSD ELF64, copy_file_range), rip =3D 0x908d2a, rsp = =3D=20 > 0x820c28e68, rbp =3D 0x820c292b0 --- > KDB: enter: panic > [ thread pid 1856 tid 102129 ] > Stopped at kdb_enter+0x32: movq $0,0x12760f3(%rip) > db> =20 >=20 I have the same issue (crash on access of several, but random datasets). It started with /usr/ports build failures when performing updates or rebuil= ding ports, poudriere host doesn't work anymore, as soon as started building ports, the= hosts (several of them, same OS revision, new ZFS option enabled) crash. Also when building binaries for an pkg OS distribution. That host also reports a ZFS RAIDZ pool as corrupted, out of the blue! Some= files from a poudriere build and /usr/ports build seem to have issues with some temporar= ily created files in work directory.=20 On another host /usr/ports is residing on ZFS and it crashes also when buil= ding/updating ports (/usr/ports residing on ZFS) - but on the same host /home is also residing = on ZFS, but even downloading large amounts of emails, the host seem to be stable. Have not f= ound out yet what kind of file access triggers the crash. Kind regards, oh --=20 O. Hartmann --Sig_/NSO=6J2gRQWjQg+=NaQ_H9c Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCZDMDagAKCRCxzvs8Oqok r3AyAP9FON4zWPqVHNHc2cuI68fgm+kB7uJrJ3Q2pXgcBO+SrAEAkNpVEIlf0utS focxU1C3yUUUGwSsoITprL9yVOf5iwY= =7grH -----END PGP SIGNATURE----- --Sig_/NSO=6J2gRQWjQg+=NaQ_H9c-- From nobody Sun Apr 9 21:34:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvlk25HkWz44JRC; Sun, 9 Apr 2023 21:34: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 4Pvlk23vwJz4Kd4; Sun, 9 Apr 2023 21:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWuT3pM91kpNJrcyLMUMyClic6mqMQKD6O6jof1P5RU=; b=TXbG8sb1RkxfGCm3Pd8lDqzJr0qW6K1zPZylEokb9p7B52u/YyWJlpfbhYEw300PbIw/mS S1eDUguInkbm4JIOvfv1O3En855YDWlH9rTJ5l2XvB8mj7XW+C8HeQ9KLj2t2WYbyLV6tV E3kmsgiiHddCfT0RAQ5DIN8aFk0I5qhkk4VvWMzMi71r66RPPEW+xEStV2vBja2/FRyc0E XUH3IIR4+7e62VSXRNR18q/FLAPMf8rt75s34/FwQKy8GYBSHNGvUVKWTL2precdaCBAtb MsM6UEPAtuwc8j7XOvZz19Dfq67YgEZTnjzwerThBT7RNwC9MVUJh171t8wu6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWuT3pM91kpNJrcyLMUMyClic6mqMQKD6O6jof1P5RU=; b=yrqPR6P1KOW4+2UNnFEjUlup5x7vX0qD9DEmHEHsaI2xUAGKSJGxlJA+dMRRJFh7iN/PNu sqJVpwtV1qPPsRKJpRvaoALC/+j8sI2WRZl5ds0diVi10iEfqn9B18KNXf+2Q14cWkTaX3 Y3RIxxWqohk0q5Gt8I3voo/v7tB5NOjQGqwwGZD6fXtziH4PmxSwQzvoul69OjtjpKhJt5 wBwnoDLv6g/DEbTNl6TcC8n2mQ/YfyZUdBhBuqc3LROqtwUIpxF+16S86bKy9+R6+kDjtM QV0etwF8u4EE/kBSnozYmVBPb93t9ueCdnHGbZK2uJAEqalRO039PiQN+FdRtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076074; a=rsa-sha256; cv=none; b=Hk2HBjZn3o49/bRZmUwCLFP7LF2Bj4UkMeeAR5XA3B4jFucQiQgFntK/ha/VuWkfZB2PEN 9Ai/fw4TpUiGhDeQj8UhchCQ4LqqSus0kGlaF/nFpCFmz+YmYTcSMnxR2qeSVi1eWz7Qpk L4zRiMRyU+YyswZpa1BhfKoplaVx7YViEDsl8Us6AdIIUtd+mb3XBcGQhjCc/qG/DzuzpY gbiChfZYtL/1Nn84dP3RIKIzcbb010ocuu9nDI2OMJVK+zP6HzdZxP7ptAGOapa164rV/n UcE+Y2nq7urw0R3av6G4pA5voJsHeLypYXVrHNBP2C+Q/in6RHH71dL22vrg9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pvlk22Df5zPhC; Sun, 9 Apr 2023 21:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339LYYko081081; Sun, 9 Apr 2023 21:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LYYY5081080; Sun, 9 Apr 2023 21:34:34 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:34:34 GMT Message-Id: <202304092134.339LYYY5081080@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: 7b6fe2428a97 - main - DEBUG_VFS_LOCKS: use witness if available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b6fe2428a97921e8df882d0a24b87094c37b468 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6fe2428a97921e8df882d0a24b87094c37b468 commit 7b6fe2428a97921e8df882d0a24b87094c37b468 Author: Konstantin Belousov AuthorDate: 2023-04-08 06:15:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-09 21:34:12 +0000 DEBUG_VFS_LOCKS: use witness if available The assert_vop_locked messages are ignored, and file/line information is not too useful. Fixing this without changing both witness and VFS asserts KPIs is not possible. Reviewed by: markj (previous version) Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39464 --- sys/kern/vfs_lookup.c | 1 + sys/kern/vfs_subr.c | 16 +++++++++++++--- sys/sys/vnode.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index e7f1deea0fae..172aa4b4f576 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -162,6 +162,7 @@ nameiinit(void *dummy __unused) vfs_vector_op_register(&crossmp_vnodeops); getnewvnode("crossmp", NULL, &crossmp_vnodeops, &vp_crossmp); vp_crossmp->v_state = VSTATE_CONSTRUCTED; + vp_crossmp->v_irflag |= VIRF_CROSSMP; } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c2b1f71502cd..7e7315f827a1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5452,14 +5452,18 @@ assert_vi_unlocked(struct vnode *vp, const char *str) void assert_vop_locked(struct vnode *vp, const char *str) { - int locked; - if (KERNEL_PANICKED() || vp == NULL) return; - locked = VOP_ISLOCKED(vp); +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, + __FILE__, __LINE__); +#else + int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) vfs_badlock("is not locked but should be", str, vp); +#endif } void @@ -5468,8 +5472,14 @@ assert_vop_unlocked(struct vnode *vp, const char *str) if (KERNEL_PANICKED() || vp == NULL) return; +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, + __FILE__, __LINE__); +#else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) vfs_badlock("is locked but should not be", str, vp); +#endif } void diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 5e3f81de0236..fa889826867e 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -228,6 +228,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); never cleared once set */ #define VIRF_MOUNTPOINT 0x0004 /* This vnode is mounted on */ #define VIRF_TEXT_REF 0x0008 /* Executable mappings ref the vnode */ +#define VIRF_CROSSMP 0x0010 /* Cross-mp vnode, no locking */ #define VI_UNUSED0 0x0001 /* unused */ #define VI_MOUNT 0x0002 /* Mount in progress */ From nobody Sun Apr 9 21:58:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvmFB6WK2z44Kyw; Sun, 9 Apr 2023 21:58:06 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) (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 4PvmFB4Tfrz3vT3; Sun, 9 Apr 2023 21:58:06 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22c.google.com with SMTP id bh10so2289837oib.1; Sun, 09 Apr 2023 14:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681077485; x=1683669485; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+U5TcYFAfdiJB7QwZpnQZkdWH63UlTtgCMJUZGH+fEQ=; b=UcyP3xIHh4AoZi9ZTtPum2djCcnJKfJl9sm5FcvVWMs2DFWCBDpK6Q0FSFXZznzQtS dDCBRMN5tPbD+3Ejl8BS9/YjqbY2LaflBxpatZbigIkI7NZIo8jk5Uw7swScVJ9Na7Om PtAmUF3nCtqKyR/b73bbngPsvGmC9/OdQiJsdDMhw/5o8MVuXYDTi4WwKG64tYOD8g7+ tni+AKV/GAM5USfiCOxD92827/biMMO7OM4xu7rihtvBT2QfwvpdG3G4eczjWHNVFJIZ FAmoumRNM3eGdHw3yN7FWxzUNOztozPoBdwd8JkuK88eR33Ipw4Jb1vkVzlcLT00DgPx 847w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681077485; x=1683669485; 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=+U5TcYFAfdiJB7QwZpnQZkdWH63UlTtgCMJUZGH+fEQ=; b=KV4RSq0ap4BmKNUy2H9qWGlPtyam8+MSnWFeTbXMeT6w5/8AZwaN+RWTqgafH+Bnd6 5BRqh4XfEQJIPeNwLozJhhEQLtulwwPR8udIV9JhBw8GKM4/CZhmZW0TJaqX16Hhtw+E HS3/L67amcZ4ZDZ436TlBPNbxLLb+qkKcm3RsN80qKFauy0VKiM4sM+vilXsKZ06EjTJ 0AvbNGJqOIJyNODpja6YvPcnWwlJHSxy5GW28VaMjdZo7zgJDk7fQ7MZoeGTZulFO1ny xJrQwU1PKG+UNKVyfXYOuClgncD6pIZejWpJnr5rebEbYg1bpUlgVsrl0RXDhjDuliB3 xVbg== X-Gm-Message-State: AAQBX9ehtvIibcKJ07Iz05lz/kOqVYi0wt+9V7r+b0aOyIl61VO3tXo0 5YreRt/Wh09iUlLkcvrcnGo980dHNTGJUaj0OLhHb/woA38= X-Google-Smtp-Source: AKy350aN81ly70ztFgGGzGdiQQ/zxBRokhMe4edQ569I/1PH+mikCX/qEFbyuTC0QB9vDlxFlgrhNpmdbLkFabhGCXQ= X-Received: by 2002:a05:6808:3a96:b0:389:53dc:cdf2 with SMTP id fb22-20020a0568083a9600b0038953dccdf2mr2278592oib.4.1681077485169; Sun, 09 Apr 2023 14:58:05 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:798d:0:b0:49c:b071:b1e3 with HTTP; Sun, 9 Apr 2023 14:58:04 -0700 (PDT) In-Reply-To: <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> From: Mateusz Guzik Date: Sun, 9 Apr 2023 23:58:04 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: FreeBSD User Cc: Charlie Li , Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PvmFB4Tfrz3vT3 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/9/23, FreeBSD User wrote: > Am Sun, 9 Apr 2023 13:23:05 -0400 > Charlie Li schrieb: > >> Mateusz Guzik wrote: >> > On 4/9/23, Charlie Li wrote: >> >> I've also started noticing random artefacts and malformed files whilst >> >> building packages with poudriere, causing all sorts of "exec format >> >> error"s, missing .so files due to corruption, data file corruption >> >> causing unintended failure modes, etc. All without block_cloning; >> >> enabling such causes a panic of its own when starting multiple builder >> >> jails at once. >> >> >> > >> > what's the panic? >> > >> manually typed out: >> >> panic: VERIFY(!zil_replaying(zilog, tx)) failed >> >> cpuid = 7 >> time = 1681060472 >> KDB: stack backtrace: >> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame >> 0xfffffe02a05b28a0 >> vpanic() at vpanic+0x152/frame 0xfffffe02a05b28f0 >> spl_panic() at spl_panic+0x3a/frame 0xfffffe02a05b2950 >> zfs_log_clone_range() at zfs_log_clone_range+0x1db/frame >> 0xfffffe02a05b29e0 >> zfs_clone_range() at zfs_clone_range+0xae2/frame 0xfffffe02a05b2bc0 >> zfs_freebsd_copy_file_range() at zfs_freebsd_copy_file_range+0xff/frame >> 0xfffffe02a05b2c40 >> vn_copy_file_range() at vn_copy_file_range+0x115/frame 0xfffffe02a05b2ce0 >> kern_copy_file_range() at kern_copy_file_range+0x34e/frame >> 0xfffffe02a05b2db0 >> sys_copy_file_range() at sys_copy_file_range+0x78/frame >> 0xfffffe02a05b2e00 >> amd64_syscall() at amd64_syscall+0x148/frame 0xfffffe02a05b2f30 >> fast_syscall_common() at fast_syscall_common+0xf8/frame >> 0xfffffe02a05b2f30 >> --- syscall (569, FreeBSD ELF64, copy_file_range), rip = 0x908d2a, rsp = >> 0x820c28e68, rbp = 0x820c292b0 --- >> KDB: enter: panic >> [ thread pid 1856 tid 102129 ] >> Stopped at kdb_enter+0x32: movq $0,0x12760f3(%rip) >> db> >> > > I have the same issue (crash on access of several, but random datasets). > > It started with /usr/ports build failures when performing updates or > rebuilding ports, > poudriere host doesn't work anymore, as soon as started building ports, the > hosts (several of > them, same OS revision, new ZFS option enabled) crash. > Also when building binaries for an pkg OS distribution. > > That host also reports a ZFS RAIDZ pool as corrupted, out of the blue! Some > files from a > poudriere build and /usr/ports build seem to have issues with some > temporarily created files > in work directory. > > On another host /usr/ports is residing on ZFS and it crashes also when > building/updating ports > (/usr/ports residing on ZFS) - but on the same host /home is also residing > on ZFS, but even > downloading large amounts of emails, the host seem to be stable. Have not > found out yet what > kind of file access triggers the crash. > I reproduced the VERIFY(!zil_replaying(zilog, tx)) panic. As the backtrace shows it triggers when using copy_file_range, I temporarily patched the kernel to never do block cloning. So far the only package which failed to build was sqlite and it was for a legitimate reason (compiler errored out due to a problem in the code). -- Mateusz Guzik From nobody Sun Apr 9 22:15:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvmds1hy4z44M0y; Sun, 9 Apr 2023 22:16:01 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) (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 4Pvmdr0m5Mz4NXm; Sun, 9 Apr 2023 22:16:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=ITe0UASO; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2607:f8b0:4864:20::236 as permitted sender) smtp.mailfrom=mjguzik@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oi1-x236.google.com with SMTP id e9so2175460oig.7; Sun, 09 Apr 2023 15:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681078558; x=1683670558; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=OoWj940RdtoeSQEx4KHZMdisRHXku0JQPs4Z2xGawL8=; b=ITe0UASOGDvlI/KidV2zTVugzd9M8Z1qg2MbqMBnW+UTQr55yYrOKRvqcxChn/QsJj lkSQdlOzfE6n9moIarEsQyr1JGF1sR1Gr+1TJ1RhoRg90pv/KuS1TrcZ/nKDWwzQqTPk 8EwbWsON6ocHHDhtuSB3S6htMIkYorc1rvAwXP8Fb48LgzUCHssKoulTLKNOmHxfI3aL Dowg2sHh+blJxekw+/lws0w2u5llnvmsCG01r16sedQikaNLYdwTkt11fNjw7HnOQ3wC ywNB+7lzHi8NB0ff9wUAPtslvDSPZRz5vIBf/CByi+J7fcUDiyVdG0wJsZvyFi5DACJV Pc7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681078558; x=1683670558; 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=OoWj940RdtoeSQEx4KHZMdisRHXku0JQPs4Z2xGawL8=; b=IefI3kS1ZCFc8gE16TTp0f8ip0mhITUV2PgPizhXtf/k4jKt2ya6Zt+sUnriFT36Ox Z5GlYDGP0dIzjD84RCMZbWxO3hOo/Z2/oMwXAH5rynv/ICDtEp9eQnJMbLOAaqD+Jedg NBbfsQ3GHty1WD7DCh5Mj0GWzT69L4pLoaqoyWRb2B7NYCmMZSEX9H5dd36x9QS70ukR PoIcV1fgdBP+BlNGmfrFc1wrgP3DM2my/0PEeEDIOfPo29J0e75EgU6e+/m8g0kePELN bebexlQ+MaeiQE1hjW3iweqOLCeCC5rev35dEOEMAdU8mw/yrsj+OKfUgS1OhhYfGC0U y1Qg== X-Gm-Message-State: AAQBX9cUXPaSTR+piWCNZbOCWjzPz4yGI+A4yy6w6X8RQOz8KAy1jOXU j5v4tDZBahUmmhQV0AePSb+EEmjyZaBe7ih8ymY= X-Google-Smtp-Source: AKy350bmsRQECNb0w2kU3JiMTQ7sUDtJq87orkDnMuBNsW4MKT8K8bgDlFvQYjbzfH9j1F/Lho8KrYM9t5mTXQoKDZo= X-Received: by 2002:a05:6808:8c4:b0:387:82c4:6425 with SMTP id k4-20020a05680808c400b0038782c46425mr1026139oij.4.1681078558073; Sun, 09 Apr 2023 15:15:58 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:798d:0:b0:49c:b071:b1e3 with HTTP; Sun, 9 Apr 2023 15:15:57 -0700 (PDT) In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> From: Mateusz Guzik Date: Mon, 10 Apr 2023 00:15:57 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: FreeBSD User Cc: Charlie Li , Cy Schubert , Rick Macklem , Martin Matuska , 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-Result: default: False [-2.49 / 15.00]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.988]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::236:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[gmail.com]; FREEMAIL_CC(0.00)[freebsd.org,cschubert.com,gmail.com]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Pvmdr0m5Mz4NXm X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On 4/9/23, Mateusz Guzik wrote: > On 4/9/23, FreeBSD User wrote: >> Am Sun, 9 Apr 2023 13:23:05 -0400 >> Charlie Li schrieb: >> >>> Mateusz Guzik wrote: >>> > On 4/9/23, Charlie Li wrote: >>> >> I've also started noticing random artefacts and malformed files >>> >> whilst >>> >> building packages with poudriere, causing all sorts of "exec format >>> >> error"s, missing .so files due to corruption, data file corruption >>> >> causing unintended failure modes, etc. All without block_cloning; >>> >> enabling such causes a panic of its own when starting multiple >>> >> builder >>> >> jails at once. >>> >> >>> > >>> > what's the panic? >>> > >>> manually typed out: >>> >>> panic: VERIFY(!zil_replaying(zilog, tx)) failed >>> >>> cpuid = 7 >>> time = 1681060472 >>> KDB: stack backtrace: >>> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame >>> 0xfffffe02a05b28a0 >>> vpanic() at vpanic+0x152/frame 0xfffffe02a05b28f0 >>> spl_panic() at spl_panic+0x3a/frame 0xfffffe02a05b2950 >>> zfs_log_clone_range() at zfs_log_clone_range+0x1db/frame >>> 0xfffffe02a05b29e0 >>> zfs_clone_range() at zfs_clone_range+0xae2/frame 0xfffffe02a05b2bc0 >>> zfs_freebsd_copy_file_range() at zfs_freebsd_copy_file_range+0xff/frame >>> 0xfffffe02a05b2c40 >>> vn_copy_file_range() at vn_copy_file_range+0x115/frame >>> 0xfffffe02a05b2ce0 >>> kern_copy_file_range() at kern_copy_file_range+0x34e/frame >>> 0xfffffe02a05b2db0 >>> sys_copy_file_range() at sys_copy_file_range+0x78/frame >>> 0xfffffe02a05b2e00 >>> amd64_syscall() at amd64_syscall+0x148/frame 0xfffffe02a05b2f30 >>> fast_syscall_common() at fast_syscall_common+0xf8/frame >>> 0xfffffe02a05b2f30 >>> --- syscall (569, FreeBSD ELF64, copy_file_range), rip = 0x908d2a, rsp = >>> 0x820c28e68, rbp = 0x820c292b0 --- >>> KDB: enter: panic >>> [ thread pid 1856 tid 102129 ] >>> Stopped at kdb_enter+0x32: movq $0,0x12760f3(%rip) >>> db> >>> >> >> I have the same issue (crash on access of several, but random datasets). >> >> It started with /usr/ports build failures when performing updates or >> rebuilding ports, >> poudriere host doesn't work anymore, as soon as started building ports, >> the >> hosts (several of >> them, same OS revision, new ZFS option enabled) crash. >> Also when building binaries for an pkg OS distribution. >> >> That host also reports a ZFS RAIDZ pool as corrupted, out of the blue! >> Some >> files from a >> poudriere build and /usr/ports build seem to have issues with some >> temporarily created files >> in work directory. >> >> On another host /usr/ports is residing on ZFS and it crashes also when >> building/updating ports >> (/usr/ports residing on ZFS) - but on the same host /home is also >> residing >> on ZFS, but even >> downloading large amounts of emails, the host seem to be stable. Have not >> found out yet what >> kind of file access triggers the crash. >> > > I reproduced the VERIFY(!zil_replaying(zilog, tx)) panic. As the > backtrace shows it triggers when using copy_file_range, I temporarily > patched the kernel to never do block cloning. So far the only package > which failed to build was sqlite and it was for a legitimate reason > (compiler errored out due to a problem in the code). > ... and got an illegitimate failure: strip: file format not recognized the port builds after retrying iow there is more breakage. i don't know if the merge can be easily reverted now, will have to see about that -- Mateusz Guzik From nobody Sun Apr 9 22:27:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvmtx6P8Xz44MQq; Sun, 9 Apr 2023 22:27:21 +0000 (UTC) (envelope-from vishwin@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 4Pvmtx5CRzz3kfm; Sun, 9 Apr 2023 22:27:21 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681079241; 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=GPfcXdn/9nyX1jEwLX6BluXqC2dwP7M9iVJtlk/MM1c=; b=IaGKTRhRqu5YSEwKaUWnLJNa0KNAI5Bgroj/ApP3moqtzN+eggmFkBYCVlWuRvFEv72umP ozN2TJ0WN+fCUoExkg9Jjr4/AcfDJ2dZklkqw74I6THeY4Zw8TIjS1b+X2bVpSMIsb+EtV DcHCP283k7cZIVnEKhyklYj97QTI4mYQgTu6GUmMCpnmnpFG+wpecqkv8XJzzwCHaufa2l /NutoDp/lGB5xCIxbGIaltn7ePgdEs6LvS3UAt3CaGROWBriBNf7vgh0v6VeBODVXh5P67 WNVfBXm38I01jpNwavd3k5zi5K8G3XbonCfEJAgMAJ09g0w4vzZE862ZtCbmAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681079241; 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=GPfcXdn/9nyX1jEwLX6BluXqC2dwP7M9iVJtlk/MM1c=; b=E+j7tYTMC3ibt+qu9zgBFhIlrqFXCHdp4p8k80vX4ZIuMDXuzPPGXoAc6YHRdHd9ea2i1s 5AZsSCg0i28RQNdGw8PH6zSnROd0HoqJIa4WK+jZGJ3sDjqeBEKbRVabxeQYBlSEFwT9rj ikVwCDcwM4IsGD9x0N4rJLF4jqd7NdHDQZ5wxIHrlwnqnPvVaRD9pPuuC+axLXpTxdsAuD KEjub2Tu08Mw10CEyjF9cyJmVCfb1F+hbfwT/ctVYBUPvDR077rl/tpqlMEmujjIqAXEll VPXwrHFLnoJSG4Zkzr14fTikbkKNd9W4t3pi6o8mPSVJrlLvuFGAYwrBrulyIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681079241; a=rsa-sha256; cv=none; b=UeSsLWMcG3aDbazEv46+BfT0eHSAEsbFnu9P+/HuEVHX5Y7rJ0azp13bh7C6kb3LMbVX36 ObRgDb+4+3/Gg5ktuXgWjPfahViUp2fWALeEehEJZe+GdMsSC8xUwQuuFXtnm6vktYQLR7 bCDs+jfNuIeMpP4rxmD7bKptwZUdzP7B4/zQxj4yjJsfL1ddYyEt7WDpAO1rYtK2r0ghfa 7QBJ+tq62K+VU88rhnQZWzyg81yw7daadkOwU3aVzu20/EUSZUb6hfKpvHlFRn8vqWyl/W JfgjiPyhVDcz4DYFVBLijEPBdEhG2qJs4NIjHZiZMMCkjGlIzu8lG//gP40r4g== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pvmtx1l89zFg5; Sun, 9 Apr 2023 22:27:21 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <68784fe5-ae12-133c-fe22-1660c0037652@freebsd.org> Date: Sun, 9 Apr 2023 18:27:19 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Mateusz Guzik , FreeBSD User Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> Content-Language: en-GB From: Charlie Li Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------TxDufWBMGHa7sjgXR4N0m3GV" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------TxDufWBMGHa7sjgXR4N0m3GV Content-Type: multipart/mixed; boundary="------------bmFFwwFN4Yh92EfkiXQaEJ05"; protected-headers="v1" From: Charlie Li To: Mateusz Guzik , FreeBSD User Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <68784fe5-ae12-133c-fe22-1660c0037652@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> In-Reply-To: --------------bmFFwwFN4Yh92EfkiXQaEJ05 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TWF0ZXVzeiBHdXppayB3cm90ZToNCj4gLi4uIGFuZCBnb3QgYW4gaWxsZWdpdGltYXRlIGZh aWx1cmU6DQo+IHN0cmlwOiBmaWxlIGZvcm1hdCBub3QgcmVjb2duaXplZA0KPiANCj4gdGhl IHBvcnQgYnVpbGRzIGFmdGVyIHJldHJ5aW5nDQo+IA0KPiBpb3cgdGhlcmUgaXMgbW9yZSBi cmVha2FnZS4NCj4gDQo+IGkgZG9uJ3Qga25vdyBpZiB0aGUgbWVyZ2UgY2FuIGJlIGVhc2ls eSByZXZlcnRlZCBub3csIHdpbGwgaGF2ZSB0byBzZWUNCj4gYWJvdXQgdGhhdA0KPiANCll1 cCwgdGhpcyBpcyB0aGUgcmFuZG9tIGZpbGUgY29ycnVwdGlvbiBtb2RlIHRoYXQgSSBtZW50 aW9uZWQgYmVmb3JlLiANClRoZSBhY3R1YWwgYnVpbGQvY29tcGlsZS9ldGMgYWN0aW9ucyBh cmUgZmluZSwganVzdCB0aGUgd3JpdGluZyANCm9jY2FzaW9uYWxseSBjb21lcyB1cCBjb3Jy dXB0ZWQsIHdpdGggdGhlIHJlc3VsdHMgKHRoYXQgYXJlIG5vdCBmdXJ0aGVyIA0KdXNlZC90 b3VjaGVkKSBnZXR0aW5nIHBhY2thZ2VkLCBjYXVzaW5nIGZhaWx1cmVzIGluIGNvbnN1bWVy cy4NCg0KLS0gDQpDaGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4 aXQgbGluZS4NCg0K --------------bmFFwwFN4Yh92EfkiXQaEJ05-- --------------TxDufWBMGHa7sjgXR4N0m3GV Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQzO8cFAwAAAAAACgkQ/reFK+KbPocC uRAAgqHDOQtSHZKEExAL53Fc0uCNvOBNyD6yazJRI5FhpDrKO7dSZJPklF4GXU+tb10lc/NN3XRd QWe11fIphGUbhcVI+mxQUnCGS5KQ7c8zR3R+r6/Ldef3+Yp/8HJkC+C6FfkUOSXBLQw3fojkrNnb UfDbHjay6hbImby/NiR0Fb/xP8IJWSsfAYTwk56RzJH2lDQoTni19IpDQq+tjgvZT/QzpjTdQjdT uur0hM2F1iAgnwIct+NHe2wh/DFTgwmnNIOBJ69AmUbKRTRRZDrEDC4obtDjjfoDMTbV6WePQTp6 qcNGAvWIjP+Uxbwi1vMq5wpHvj3BFNjFmGz3bo5TIVBoT27trWFVG6wxukRf/CzDSZG5wjm8NtPP V56XVo6K4Urb4CIIlXjqcqt/WEnK2LgSfI+26Z5Or5BD162YMCHi4hsSoivfu0At/+MnxdAsh9DI e0oUw8335H7sQIzchqrlrhvtTm1MSzdliz4Iljjd/vSduueInnJcnS/M7OnKvrLHYig4ha5TCAv8 rPB8ZL5SFG5mWYazikQdVnZ3Fzr0fjFnPCZcep6G/RGn5BJli6PegImkpOI502w6GQ+Em/TVRoXP mPcwuz2eQmHMkpehtGuVQ7KvYJGumJ/757okFaLsc4/UUwk5S4lHNTbgdj3903LpOcnksl4nRY/T v04= =VNKl -----END PGP SIGNATURE----- --------------TxDufWBMGHa7sjgXR4N0m3GV-- From nobody Sun Apr 9 22:35:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvn4D68fsz44MyK; Sun, 9 Apr 2023 22:35:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pvn4C703Pz40RC; Sun, 9 Apr 2023 22:35:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id lVAbpxuLjuZMSldd4pD8kw; Sun, 09 Apr 2023 22:35:22 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id ldd2pxzZrHFsOldd3pLdrJ; Sun, 09 Apr 2023 22:35:22 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64333daa a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=pGLkceISAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=DxWW-xz7vxWGE-6_3GgA:9 a=CjuIK1q_8ugA:10 a=Trad_Bmqfy8A:10 a=aHTgUBiGqFQ7EW2Mis07:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C4E663DBB; Sun, 9 Apr 2023 15:35:19 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 68D741F3; Sun, 9 Apr 2023 15:35:19 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mateusz Guzik cc: FreeBSD User , Charlie Li , Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409202650.49130b92@thor.intern.walstatt.dynvpn.de> Comments: In-reply-to Mateusz Guzik message dated "Mon, 10 Apr 2023 00:15:57 +0200." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 09 Apr 2023 15:35:19 -0700 Message-Id: <20230409223519.68D741F3@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKivlH12rK/gTCaCJPTboNHandJ2IkkV/+3grQRBAP/BYMA0GfoVXLw6E8HlCXugMKdWe0Op5bqFSQUmAUMa2hGJoo43IGFtpoGnzBkexP0bU8Q9Kv1b Ah1tzy7P6U4uvlEGNpgsLi7n/4SwwNUFoEFNu63jijXNSnjzzUSj7jsm1WxPu7pAgQD5H5dSnuLeJiQK6u6rO9Ux2ptk0wGCPSMpfSKianmgoCldY7XvhPTI 8LTx5WcRBMzy8xRNaFc0z5ISTox+GJlhVBxYqh1rpxPQbEH7wiDdt/77DmEhCB6M4UQk4II6uaDooU2mEFhy6Klg+6H8Ll/4IdTzLQ1Bmbv3t+s8d/qlboVE SZOdrHT/x5VmjrncN0HDMknpQZTq9edXM7u5b+3hUqkQuxztV72MfCOPkKnEKex7jqn6Tl1y4eQAJPkEiiCGplUfP5+3m81sM//u1vsVZRhi6aNGQPw= X-Rspamd-Queue-Id: 4Pvn4C703Pz40RC X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Mateusz Guzik writes: > On 4/9/23, Mateusz Guzik wrote: > > On 4/9/23, FreeBSD User wrote: > >> Am Sun, 9 Apr 2023 13:23:05 -0400 > >> Charlie Li schrieb: > >> > >>> Mateusz Guzik wrote: > >>> > On 4/9/23, Charlie Li wrote: > >>> >> I've also started noticing random artefacts and malformed files > >>> >> whilst > >>> >> building packages with poudriere, causing all sorts of "exec format > >>> >> error"s, missing .so files due to corruption, data file corruption > >>> >> causing unintended failure modes, etc. All without block_cloning; > >>> >> enabling such causes a panic of its own when starting multiple > >>> >> builder > >>> >> jails at once. > >>> >> > >>> > > >>> > what's the panic? > >>> > > >>> manually typed out: > >>> > >>> panic: VERIFY(!zil_replaying(zilog, tx)) failed > >>> > >>> cpuid = 7 > >>> time = 1681060472 > >>> KDB: stack backtrace: > >>> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame > >>> 0xfffffe02a05b28a0 > >>> vpanic() at vpanic+0x152/frame 0xfffffe02a05b28f0 > >>> spl_panic() at spl_panic+0x3a/frame 0xfffffe02a05b2950 > >>> zfs_log_clone_range() at zfs_log_clone_range+0x1db/frame > >>> 0xfffffe02a05b29e0 > >>> zfs_clone_range() at zfs_clone_range+0xae2/frame 0xfffffe02a05b2bc0 > >>> zfs_freebsd_copy_file_range() at zfs_freebsd_copy_file_range+0xff/frame > >>> 0xfffffe02a05b2c40 > >>> vn_copy_file_range() at vn_copy_file_range+0x115/frame > >>> 0xfffffe02a05b2ce0 > >>> kern_copy_file_range() at kern_copy_file_range+0x34e/frame > >>> 0xfffffe02a05b2db0 > >>> sys_copy_file_range() at sys_copy_file_range+0x78/frame > >>> 0xfffffe02a05b2e00 > >>> amd64_syscall() at amd64_syscall+0x148/frame 0xfffffe02a05b2f30 > >>> fast_syscall_common() at fast_syscall_common+0xf8/frame > >>> 0xfffffe02a05b2f30 > >>> --- syscall (569, FreeBSD ELF64, copy_file_range), rip = 0x908d2a, rsp = > >>> 0x820c28e68, rbp = 0x820c292b0 --- > >>> KDB: enter: panic > >>> [ thread pid 1856 tid 102129 ] > >>> Stopped at kdb_enter+0x32: movq $0,0x12760f3(%rip) > >>> db> > >>> > >> > >> I have the same issue (crash on access of several, but random datasets). > >> > >> It started with /usr/ports build failures when performing updates or > >> rebuilding ports, > >> poudriere host doesn't work anymore, as soon as started building ports, > >> the > >> hosts (several of > >> them, same OS revision, new ZFS option enabled) crash. > >> Also when building binaries for an pkg OS distribution. > >> > >> That host also reports a ZFS RAIDZ pool as corrupted, out of the blue! > >> Some > >> files from a > >> poudriere build and /usr/ports build seem to have issues with some > >> temporarily created files > >> in work directory. > >> > >> On another host /usr/ports is residing on ZFS and it crashes also when > >> building/updating ports > >> (/usr/ports residing on ZFS) - but on the same host /home is also > >> residing > >> on ZFS, but even > >> downloading large amounts of emails, the host seem to be stable. Have not > >> found out yet what > >> kind of file access triggers the crash. > >> > > > > I reproduced the VERIFY(!zil_replaying(zilog, tx)) panic. As the > > backtrace shows it triggers when using copy_file_range, I temporarily > > patched the kernel to never do block cloning. So far the only package > > which failed to build was sqlite and it was for a legitimate reason > > (compiler errored out due to a problem in the code). > > > > ... and got an illegitimate failure: > strip: file format not recognized > > the port builds after retrying > > iow there is more breakage. > > i don't know if the merge can be easily reverted now, will have to see > about that git revert is the easy part. What about people who've done zpool upgrade, and following the revert have read-only zpools? Personally, I typically avoid enabling new zpool features for the first few weeks, even months, just in case. But not everyone does this. People who've done zpool upgrade already will need to back up their zpools and restore them following any upgrade to a FreeBSD with reverted zfs commits. And, considering the above, we may be long past the point of no return. For me, personally, it won't matter either way. For others? I don't know. Maybe simply disabling block_cloning regardless of the zpool setting might be a less disruptive solution. What is the ZFS project issue number? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sun Apr 9 22:40:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvnBY5dnWz44MvF; Sun, 9 Apr 2023 22:40:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvnBX4kyvz487Z; Sun, 9 Apr 2023 22:40:52 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id ld3tp3wnpjvm1ldiOpyuIn; Sun, 09 Apr 2023 22:40:52 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id ldiMpy0yAHFsOldiNpLeFA; Sun, 09 Apr 2023 22:40:52 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64333ef4 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=NqxC62ManMFd0QyVcpYA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 762313DC5; Sun, 9 Apr 2023 15:40:50 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 393E71F4; Sun, 9 Apr 2023 15:40:50 -0700 (PDT) Date: Sun, 9 Apr 2023 15:40:50 -0700 From: Cy Schubert To: Charlie Li Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230409154042.0685a273@cschubert.com> In-Reply-To: <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfPe8L3TRZ5V1b8xxNzgKtg9/aG8wLTtZpa4HzCXagLFPp+5ioLm5iVHafm29MHkMJJuy+k+hhJTceclUm6Wk/BflZxpbLk/syyLVjz2/qlsLWloi5WMR aZhp6OO1JAp5VJ4LZ9xfp9XUnKy7uvZGjCq+WfMs6bTY8Cr9t+Oqe+sM5+CoRqem6P9ZCc/l1aRi+k9KmRbtn4Tn0NTJ1J+lBA7F1jo/P3sWddWrrxuTSABA PfdDypG5iTY41FW3P1bKZtu/pfFkwnQXZRSgavFzZVLmzhbKPUu09MQtDCI/sKGO+bKhezvzICen3XP/WBexxZOhC8Lfr8uYRxR6s1DpYSrOlPhpZESQ0eWB F7MegcOoktDzMZXXyAMip2THpvPjuLKumHmHB/ArFKDTZqizmOU= X-Rspamd-Queue-Id: 4PvnBX4kyvz487Z X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, 9 Apr 2023 12:49:23 -0400 Charlie Li wrote: > Cy Schubert wrote: > > I've noticed random artifacts in my emails since the new ZFS. I'm not sure > > if it's related to block_cloning or something else. This could mean deeper > > trouble. > > > I've also started noticing random artefacts and malformed files whilst > building packages with poudriere, causing all sorts of "exec format > error"s, missing .so files due to corruption, data file corruption > causing unintended failure modes, etc. All without block_cloning; > enabling such causes a panic of its own when starting multiple builder > jails at once. > I've noticed that the problem was resolved after the latest mjg patch (and prior to that the rmacklem patch) was applied. block_cloning is disabled in all my zpools. I assume you you are saying that enabling block_cloning also causes random corruption? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Apr 10 00:14:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvqGk0VBMz44TfJ; Mon, 10 Apr 2023 00:14:38 +0000 (UTC) (envelope-from jah@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 4PvqGj6JhVz3DVs; Mon, 10 Apr 2023 00:14:37 +0000 (UTC) (envelope-from jah@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681085677; 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=R3OeZjJ3eR3+nAa57Cv2vLnuXNBPHJJCSgXJGijkUYU=; b=iUuLEL8DsOrxH9Keq/uAXfGvURUK3wJvC/MsCYHtpgC9D4lR8gljKvu1MTtBnJj3nVTEX7 b7PxRpsKzecN4NY+5rPrPSOvLeUOzzBeztwtcNza9F3NZFWmUZYtCH28/m6+l6Lcu6MKo3 q9TA+UXu+suvnuxIAKQaCwTcDzY0iUE9LWgJOntaIEZm0nX9lnUhD+W6S4C50FXTOWq96v +fi++2mcdGOMX+34IVBWTmGgAuaPINXvGtBrn7PJUZwcWSNZ0TR+dO4UqgQgLI7ndIxVZv MVczV/y6PvVfK+i7kZYMylHtMieR7s1jwCwQ48ozuGis64dQddHj+o/yKWXxDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681085677; 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=R3OeZjJ3eR3+nAa57Cv2vLnuXNBPHJJCSgXJGijkUYU=; b=r+bYo3fW3tXQVykpxP6rM3iISqFCXKSVDbu2DLUDhsMDQ1tTVCDXAKLv49HD1iqNEfw03U 6gLK7hmobX+MISj5Wa01MvzjCbo8JqyhKZz3vmED5iUtw/NnC70Y6ehgfi2u+q632PNctd iEyL/JGiMGrvkCHylxBPjXU1vke0Jj3TfVpG+CWoZJ1ntGTjGh/ain98k9deJDgwKymMy/ uyD/UwFsMmHt6Q+mFT0dvGYBZR9x/eFtkjYwSLd3HlgrRhuXICR61Z39NezJE/9HxD3iyJ LCNjUHtlRussGt1vcQfR6lv0YQR0zEFlt4WmTSStlxkM1YkCJXIZN/AW4AJn7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681085677; a=rsa-sha256; cv=none; b=OgX41aR9//U8cpW3oDj452ovUFmDIDRKek6PR50QG9KMSx0gsJVKpOY/qSHewaKDthHL0r trG8xAbKJxfNoGVau6WXMlLs3WFyHC913LiVKaAkFoCpADdRtFkPp+0DlOKHIZJkbI35UX 4cjZ459LNBZspQSzy+DXqYXTbLa5csPxmX9gZk6qYgIfkGjD85v5QQGT8TA+Gd++ause6P YxHN0Hfd+eS4sqPK8JFoy3bwsdi2giWnT6GkMUCKq8NdH4FXVeqXZPPYRM/7IwiKYfqU/+ JLaSZg8WHVGT0D8kLcGNY4f5RMU3IzNMRayHawIgTbyY0sJQAn5ERsK6TPKyEw== Received: from corona (047-232-115-243.res.spectrum.com [47.232.115.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jah) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PvqGj36cRzHTb; Mon, 10 Apr 2023 00:14:37 +0000 (UTC) (envelope-from jah@freebsd.org) Date: Sun, 9 Apr 2023 19:14:35 -0500 From: "Jason A. Harmening" To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7b6fe2428a97 - main - DEBUG_VFS_LOCKS: use witness if available Message-ID: References: <202304092134.339LYYY5081080@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202304092134.339LYYY5081080@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On Sun, Apr 09, 2023 at 09:34:34PM +0000, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7b6fe2428a97921e8df882d0a24b87094c37b468 > > commit 7b6fe2428a97921e8df882d0a24b87094c37b468 > Author: Konstantin Belousov > AuthorDate: 2023-04-08 06:15:00 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-04-09 21:34:12 +0000 > > DEBUG_VFS_LOCKS: use witness if available > > The assert_vop_locked messages are ignored, and file/line information > is not too useful. Fixing this without changing both witness and VFS > asserts KPIs is not possible. What was the motivation for this change? At first glance it seems regressive. I've at least found the assert messages, as well as the vnode state dumping done by vfs_badlock(), to be really useful for quick debugging of locking issues. This is especially true when optimization makes the backtrace and frame info less than useful; see commit 5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 for a recent example. > > Reviewed by: markj (previous version) > Tested by: pho > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D39464 > --- > sys/kern/vfs_lookup.c | 1 + > sys/kern/vfs_subr.c | 16 +++++++++++++--- > sys/sys/vnode.h | 1 + > 3 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c > index e7f1deea0fae..172aa4b4f576 100644 > --- a/sys/kern/vfs_lookup.c > +++ b/sys/kern/vfs_lookup.c > @@ -162,6 +162,7 @@ nameiinit(void *dummy __unused) > vfs_vector_op_register(&crossmp_vnodeops); > getnewvnode("crossmp", NULL, &crossmp_vnodeops, &vp_crossmp); > vp_crossmp->v_state = VSTATE_CONSTRUCTED; > + vp_crossmp->v_irflag |= VIRF_CROSSMP; > } > SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL); > > diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c > index c2b1f71502cd..7e7315f827a1 100644 > --- a/sys/kern/vfs_subr.c > +++ b/sys/kern/vfs_subr.c > @@ -5452,14 +5452,18 @@ assert_vi_unlocked(struct vnode *vp, const char *str) > void > assert_vop_locked(struct vnode *vp, const char *str) > { > - int locked; > - > if (KERNEL_PANICKED() || vp == NULL) > return; > > - locked = VOP_ISLOCKED(vp); > +#ifdef WITNESS > + if ((vp->v_irflag & VIRF_CROSSMP) == 0) > + witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, > + __FILE__, __LINE__); > +#else > + int locked = VOP_ISLOCKED(vp); > if (locked == 0 || locked == LK_EXCLOTHER) > vfs_badlock("is not locked but should be", str, vp); > +#endif > } > > void > @@ -5468,8 +5472,14 @@ assert_vop_unlocked(struct vnode *vp, const char *str) > if (KERNEL_PANICKED() || vp == NULL) > return; > > +#ifdef WITNESS > + if ((vp->v_irflag & VIRF_CROSSMP) == 0) > + witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, > + __FILE__, __LINE__); > +#else > if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) > vfs_badlock("is locked but should not be", str, vp); > +#endif > } > > void > diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h > index 5e3f81de0236..fa889826867e 100644 > --- a/sys/sys/vnode.h > +++ b/sys/sys/vnode.h > @@ -228,6 +228,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); > never cleared once set */ > #define VIRF_MOUNTPOINT 0x0004 /* This vnode is mounted on */ > #define VIRF_TEXT_REF 0x0008 /* Executable mappings ref the vnode */ > +#define VIRF_CROSSMP 0x0010 /* Cross-mp vnode, no locking */ > > #define VI_UNUSED0 0x0001 /* unused */ > #define VI_MOUNT 0x0002 /* Mount in progress */ From nobody Mon Apr 10 01:35:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvs3w3jJMz44Z03; Mon, 10 Apr 2023 01:35:24 +0000 (UTC) (envelope-from vishwin@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 4Pvs3w2mbgz4YSd; Mon, 10 Apr 2023 01:35:24 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681090524; 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=wmXjrWzp1g2imJZ0DdKDLy2hIwJkm3b1KqAVyTpzgUw=; b=FZTualsoSsRJyyirOPoZ0Cdk3UPX2qPaLl/nivEOCzPLVuEdCB7EugLET0IRy2lexMSdka zI93DNoT/dRT0Dygut55qqeH6+mzY/GyfO6/PkLGUwIXul+xJDlZ7i9pboSVz9+fTPwd0l GX5RXVhBhh3pMFv7baftv6ug11pW8wLCHfP0aKdz6YcaktF1pxnLgle6X0K2JOKBJVvtiJ A+2rN5KMi4CW+SroP4UGb0B2yGvoZ+wyDuiPvrt04fZRby9/VUkRFyx+jhOR+H3MnJ0qzN 8HbCYpmsmH/h+g96gmm0XpQPqrFNIX8bv9igdxddWS92i/Cte3ZLb17peAc3xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681090524; 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=wmXjrWzp1g2imJZ0DdKDLy2hIwJkm3b1KqAVyTpzgUw=; b=EFXedsdJ5gZB+4/2gX7af9jIayTW8CmCF5JDQTJdPAi0E+7DoJ/t5cg1KXnZEp4HWz73O0 keD4KwawT8zZWy78lwNEFHNs/2IVrbBzuhwOIqUPfuji0do5wRaqPe8rHdH0btgU/u6Lt1 yJ31VfLIsYc5kHiorZ9YNfD7tUyZnxbSEYZfZsKwTks3sEGKtgAWiG8YPK8C0kBIi4ecJ3 R1ayDr1WoNxCUY8cchptXESNJ7jg+yEH3ZFNkBNBbxPO5fxLrBTY0R2YRpywD+6L9EGUZJ j0PCTzuqNiBlt8zcCEMo924VL5JOXWUyCtH02FfsCE9ZT6r2H9JdIoPVwr4IrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681090524; a=rsa-sha256; cv=none; b=sCecNe/cIAO3JmN9Tvlstyp5qbn8SWSaDwXabWHhMcswS6FRBGtlszgnDaeP1zL/ZtLW7B 8ocO6lqVu9FOfTmFBH9E4H9OTcETPrYDJ2w6YoR8tCalUrFlIQFVTs/16DIjqJlEFyN1Nt DHHzNkVMdwAjb1g7EBVgHASttC06ARWDkEpASydW7AHj9YdyapSY8ztVXF6Jdy8AR67JnX T4dDY6F6mWiOxqyTDQuY23feVhQ34oTdLjL+wzytOg370CLq3qQt5Dhejpu6x9immBsboz P3yk3IflrEm+QNbgcaxqFWOGtyFQEjevX5FN/P1z6ZEWLlPZXKvudXLjA1xslg== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pvs3v72rFzJpM; Mon, 10 Apr 2023 01:35:23 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Sun, 9 Apr 2023 21:35:21 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> Content-Language: en-GB From: Charlie Li Organization: FreeBSD Project In-Reply-To: <20230409154042.0685a273@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------GvO1BrhbWWT9GhiWvcGYymNQ" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------GvO1BrhbWWT9GhiWvcGYymNQ Content-Type: multipart/mixed; boundary="------------kLC6OEShzSzOizBlOM13t45z"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> In-Reply-To: <20230409154042.0685a273@cschubert.com> --------------kLC6OEShzSzOizBlOM13t45z Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IE9uIFN1biwgOSBBcHIgMjAyMyAxMjo0OToyMyAtMDQw MA0KPiBDaGFybGllIExpIHdyb3RlOg0KPiANCj4+IEN5IFNjaHViZXJ0IHdyb3RlOg0KPj4+ IEkndmUgbm90aWNlZCByYW5kb20gYXJ0aWZhY3RzIGluIG15IGVtYWlscyBzaW5jZSB0aGUg bmV3IFpGUy4gSSdtIG5vdCBzdXJlDQo+Pj4gaWYgaXQncyByZWxhdGVkIHRvIGJsb2NrX2Ns b25pbmcgb3Igc29tZXRoaW5nIGVsc2UuIFRoaXMgY291bGQgbWVhbiBkZWVwZXINCj4+PiB0 cm91YmxlLg0KPj4+ICAgIA0KPj4gSSd2ZSBhbHNvIHN0YXJ0ZWQgbm90aWNpbmcgcmFuZG9t IGFydGVmYWN0cyBhbmQgbWFsZm9ybWVkIGZpbGVzIHdoaWxzdA0KPj4gYnVpbGRpbmcgcGFj a2FnZXMgd2l0aCBwb3VkcmllcmUsIGNhdXNpbmcgYWxsIHNvcnRzIG9mICJleGVjIGZvcm1h dA0KPj4gZXJyb3IicywgbWlzc2luZyAuc28gZmlsZXMgZHVlIHRvIGNvcnJ1cHRpb24sIGRh dGEgZmlsZSBjb3JydXB0aW9uDQo+PiBjYXVzaW5nIHVuaW50ZW5kZWQgZmFpbHVyZSBtb2Rl cywgZXRjLiBBbGwgd2l0aG91dCBibG9ja19jbG9uaW5nOw0KPj4gZW5hYmxpbmcgc3VjaCBj YXVzZXMgYSBwYW5pYyBvZiBpdHMgb3duIHdoZW4gc3RhcnRpbmcgbXVsdGlwbGUgYnVpbGRl cg0KPj4gamFpbHMgYXQgb25jZS4NCj4+DQo+IA0KPiBJJ3ZlIG5vdGljZWQgdGhhdCB0aGUg cHJvYmxlbSB3YXMgcmVzb2x2ZWQgYWZ0ZXIgdGhlIGxhdGVzdCBtamcgcGF0Y2gNCj4gKGFu ZCBwcmlvciB0byB0aGF0IHRoZSBybWFja2xlbSBwYXRjaCkgd2FzIGFwcGxpZWQuIGJsb2Nr X2Nsb25pbmcgaXMNCj4gZGlzYWJsZWQgaW4gYWxsIG15IHpwb29scy4NCj4gDQo+IEkgYXNz dW1lIHlvdSB5b3UgYXJlIHNheWluZyB0aGF0IGVuYWJsaW5nIGJsb2NrX2Nsb25pbmcgYWxz byBjYXVzZXMNCj4gcmFuZG9tIGNvcnJ1cHRpb24/DQo+IA0KVGhlIGZpbGUgY29ycnVwdGlv biB3YXMgcHJpb3IgdG8gZW5hYmxpbmcgYmxvY2tfY2xvbmluZyBidXQgYWZ0ZXIgdGhpcyAN CmltcG9ydC4NCg0KLS0gDQpDaGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZl IGFuIGV4aXQgbGluZS4NCg0K --------------kLC6OEShzSzOizBlOM13t45z-- --------------GvO1BrhbWWT9GhiWvcGYymNQ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQzZ9kFAwAAAAAACgkQ/reFK+KbPodQ Yg/9H+9NMQ9OYSU0uA4YsjF0cFxrnYwLpqLBNatYRuYdzWL0qReENJ4iarQxow9QIiZYczx56Nq0 3Ak93RV8fdY87I58ihmIwH7rs8kbuFF0S+bjk/RbBgNkTqJqJTE8Btzlce1GWd1KSW+0ZMPonFef BMVMzbo6VfZjucuh7Hc4HSd+K3Vj2heGLrCFGVU/Je/HXebaIM4ewMR3nz2ihxgAzq8ot3R5B5Iw Rlq6pXi53Tn0Rs02VDfnlIbXJSsZ5EXTMTDexJ1aETASNgr3Nfug5vv93tmXXSQUT8EAwPwtOg96 rF5ozijzcLd3XMtL3WiW2G0MHRxP7HolP85k9Yy456oObVXIdZF8YljBDxZ51dfvaHueevIKvy8F t+Ae8xqZ/Dv4tH6WtpivIBamk2xUNUKZvNw/4bi3fwvppuO0tEAd3DjyWl/602zFNyi2U69QBrmr 15ZThBKem4STL34+6h0MavVz+59Z2ouwdghgQ+1gqoncFkJ8BTxk5lRqqtdFl4KlQFUhHD2xGje4 7iqZdQ4ldLWs3YlchDcMHmWeXfC0IiEsLpnzE8+dQZawC63cGakI699wrg9qFIpakCwZqTBDIhIB Z/9figfpwehPqmNeBy/W5Pu0L1CTXTk7tputCu1STnjJM6dvLNm8tPkJMIATUeHMskK9bb1GF7Lc 1sY= =yCkd -----END PGP SIGNATURE----- --------------GvO1BrhbWWT9GhiWvcGYymNQ-- From nobody Mon Apr 10 02:27:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvtVh2DjJz44dQy; Mon, 10 Apr 2023 02:40:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvtVh04QNz4F2F; Mon, 10 Apr 2023 02:40:11 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id lUbNp3UMXjvm1lhRzpzFGz; Mon, 10 Apr 2023 02:40:11 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id lhRxpBubi3fOSlhRypWeve; Mon, 10 Apr 2023 02:40:11 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=6433770b a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=nfzC2KkzRXIm6QvMOUYA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (unknown [209.52.88.50]) by spqr.komquats.com (Postfix) with ESMTPSA id 8BAF74688; Sun, 9 Apr 2023 19:40:08 -0700 (PDT) Date: Sun, 09 Apr 2023 19:27:36 -0700 From: Cy Schubert To: Charlie Li CC: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfJvBJutMn/ZBI184GXAgZmJalrBq33SEqIEQBSKl5WdFN98LrVllyz9nNxF6+LK4ppY+h4Wv6qulw7vqN5+8aT0aX3BeyyltGp8x9ZeHdzgK2OCG0C3Y caKLawwkw/eE1u9GbUMiWXzQzQ9I4HzoubA2WseWhYC9IpM4MZSHCI2fk4ffL4UxE/1HDvib9gn8mV9cDjynqZHmQRpY2eLJ1CGtTVhsjSwaF6jerlYjk+Wg RuWQVbf1Sp7qr797CPWhmUsdJeidE2B29KoFOJbzzZm8RwntYD5uxYB1TZKxnNS+T8s25i8Nb5EYJKpe6OLO8PH3JdgSjrMKHz4urjsc1Jf+NkwPQmmetOrE WCk+AfvFsRNEVnHL1NTBBRZsmnTGTjVBiGg5xsTUYbhlMD7pxyQ= X-Rspamd-Queue-Id: 4PvtVh04QNz4F2F X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TAGGED_RCPT(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 9, 2023 6:35:21 PM PDT, Charlie Li wrote: >Cy Schubert wrote: >> On Sun, 9 Apr 2023 12:49:23 -0400 >> Charlie Li wrote: >>=20 >>> Cy Schubert wrote: >>>> I've noticed random artifacts in my emails since the new ZFS=2E I'm n= ot sure >>>> if it's related to block_cloning or something else=2E This could mean= deeper >>>> trouble=2E >>>> =20 >>> I've also started noticing random artefacts and malformed files whilst >>> building packages with poudriere, causing all sorts of "exec format >>> error"s, missing =2Eso files due to corruption, data file corruption >>> causing unintended failure modes, etc=2E All without block_cloning; >>> enabling such causes a panic of its own when starting multiple builder >>> jails at once=2E >>>=20 >>=20 >> I've noticed that the problem was resolved after the latest mjg patch >> (and prior to that the rmacklem patch) was applied=2E block_cloning is >> disabled in all my zpools=2E >>=20 >> I assume you you are saying that enabling block_cloning also causes >> random corruption? >>=20 >The file corruption was prior to enabling block_cloning but after this im= port=2E > This regression was fixed by mjg's commit=2E I'm not sure which (I'm pres= ently AFK)=2E --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Mon Apr 10 03:13:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvvDx4vY4z44g8X; Mon, 10 Apr 2023 03:13:21 +0000 (UTC) (envelope-from vishwin@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 4PvvDx45vQz45bT; Mon, 10 Apr 2023 03:13:21 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681096401; 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=BPywK4lulOVnlUbol5XJ5oIlxhr/xoiplqcZavVBJ+k=; b=x23ugzJAKo5DegKTsCPr1JGHD8syY4Fdnh/Q0bHwQ7wzeSUGjaoVdyo6c1JpQsxzAVHHq/ BX7BeyGk8GOfZYPtydKrGdMsGA9jtJxuy182IunRE/x028hrqDc5n7DcuhlOo2yhU9mqdF X9EpOR5m8kgcZmBdq1HUrwO5YFiPBzLsvYdkEDKuRxVfBVlnJYuLspTH2qO5Z+Hl48jcuG 4AUwdrRVzMHrybNZB624qOxr92aI0OB09xXLUKcd4Y3PHecIwFp85KKqC8JphdSRAx/C95 PEpISp3Vkx9jfwQ+DyTccFsAhjSkvo830BEyuhf+4jGisEslwcDUJ8M6YILU3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681096401; 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=BPywK4lulOVnlUbol5XJ5oIlxhr/xoiplqcZavVBJ+k=; b=Xzfiwc5Titox6Wn86zfeFeDyD2CoWuTQ6PHwkYcm6EpyjUyM02yYzvMwAmjgYycTXga+rb C6QuFWXrI7QtvsB2tcby+BHi6jNR01X5iLu6bPplMjpZjYQO7BJRKIo/bb1K55+kIMECgF 6Dqtkpwq2a2Ulv/wt8KwpwfjN/Ei0ab99ogdq+YFO6NSlguw+v5bT2ybNU/Y/XgcOdcQEC L00vtbVKFL7qA7u5ETemMN4iq4gup00ZqPXejoY7gPHyTh2iGYYdSg2tyAzeqXLJPcuqjB 6SwqH7UH/84KBGhI7oLljGWfK90wl0dPFEnncUrXcBtaZwd4xFNWPoTzrdkgYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681096401; a=rsa-sha256; cv=none; b=c0ficp6d7WDGV54XC5/D2E1YVB+js/vjWEMVhHf4zVqw+RFunyC6DtW/gf1KLo7eMnBpKF /x/i4VvGA/4aKz7/hifBuYBtssITibWt0kDAtp2qstE3g14TitsQLVfDVRXES24B8qhoGY Dx90J/rc3/qojHOzXOKWJAW+pDk+PxL2+Sju1y4uEFNXNRCErb5pPnGy1fTeYxGTu9ttJS mGlMqKcJWGPmB7Vb0S11CX/AEwueTBIKo9WGYwiMjHrrrcLOkOSMKsrF6OGNkp6loAabkz L9SQp5+AkSBD2sSaRP9jbh13dVP/GIBCA9VFNOy7WKa1u0x1lDSWsrJC1nOLYw== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PvvDx1HnlzKSy; Mon, 10 Apr 2023 03:13:21 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Sun, 9 Apr 2023 23:13:20 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------TuaIPLrOhunk2h8kB4On5Pxl" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------TuaIPLrOhunk2h8kB4On5Pxl Content-Type: multipart/mixed; boundary="------------FC4NNm2jl0ttEeJkCT0DD5Gs"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> In-Reply-To: --------------FC4NNm2jl0ttEeJkCT0DD5Gs Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+PiBUaGUgZmlsZSBjb3JydXB0aW9uIHdhcyBwcmlvciB0 byBlbmFibGluZyBibG9ja19jbG9uaW5nIGJ1dCBhZnRlciB0aGlzIGltcG9ydC4NCj4+DQo+ IA0KPiBUaGlzIHJlZ3Jlc3Npb24gd2FzIGZpeGVkICBieSBtamcncyBjb21taXQuIEknbSBu b3Qgc3VyZSB3aGljaCAoSSdtIHByZXNlbnRseSBBRkspLg0KPiANCkJvdGggdGhlIGJsb2Nr X2Nsb25pbmcgcGFuaWMgYW5kIGZpbGUgY29ycnVwdGlvbiBhcmUgc3RpbGwgaGFwcGVuaW5n IGFzIA0Kb2YgMzUxZTQ1OTJmNjRiLCB3aGljaCBpcyBhZnRlciBhbnkgc3VjaCBjb21taXQg aGVyZSwgdW5sZXNzIHJlZmVycmluZyANCnRvIGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuemZz L3pmcy9wdWxsLzE0NzIzIC4NCg0KLS0gDQpDaGFybGllIExpDQrigKZub3BlLCBzdGlsbCBk b24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------FC4NNm2jl0ttEeJkCT0DD5Gs-- --------------TuaIPLrOhunk2h8kB4On5Pxl Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQzftAFAwAAAAAACgkQ/reFK+KbPoep QxAAj5IY48LrnbMylGrwvw32jZe+k8PsQpoIxpAWUL9auUTTWb6qaB+Cl9vmAP24erAsDkuq4z3E SPf+XUhAPU1Nz4ou1ISL27prm9uXb+5rxtLhGLSeixazsA7Hb+Xq9orM1ps5Yd67FZftQDrSbSar RBGq6n2C98iX2scvDVj7Yfa+rBL4CZgC/s1wHEjwWetUI0mpR+Rr8T4wHEeZd/4Gs/uxdy75WLUR xSHjoqXGLGJ3GW+OJ/eZ6hTmipak5k0TdpwzT2/g4HW7wDzCsjljrFWKJBdvBMHF9KWdGvQw+sXe Qc/QAqNGFxDYbPUO+LPpBgxaMEyyC68ugzFGypLGAAC1VJoRfpNCLso+vbzJsJAaH7rgKqxAE/Gu nV5yGqsjKKD3Q5KHnAH7QspgUaKceuZHsx+bO+Jg2cBV4mTx45/7AdA7CpcnBUlycXmhbphDsE+a fLIkK2o9Yc+W4QApKhxDxVJufbWOr6xY9QT2VqJQZGczda+unS/W91NdIs3gbQ/hXxti4k6LUnZ5 SkfPiq+WqRuiuhwNTK0DC86c4X9gGrUEsNHcc7eUy4auJAxZMSVLTdPn7Oc0a1v0XfeFDTMPMWBL CBjbpQntPbuiTLcG0oJmXyP+ul/Ll2nrDU9jdkN4MdW31TQH4+LawiSvL8tGns1Yy2EHqOFaIsko trE= =kU4k -----END PGP SIGNATURE----- --------------TuaIPLrOhunk2h8kB4On5Pxl-- From nobody Mon Apr 10 03:25:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvvWG0yblz44h2f; Mon, 10 Apr 2023 03:25:46 +0000 (UTC) (envelope-from vishwin@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 4PvvWF72FRz4QvG; Mon, 10 Apr 2023 03:25:45 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681097146; 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=jg7gTtZZgq1XNtNZb9tY2SUBxnVqPUCis+fXgleJYvM=; b=aZhTy7P2pxQyyzVetB3687Cl3gSE+46KE54Cb7UdmvArRIVI2HsfeLsGL2+1pOcy3bnkk2 0yRMntB7y+CAz2zkt93mL0/QmGZDJAq9PEqGWKdOnKs6w7B1VH+kwYnKwRRpIlQqPhK9vN c1A6fCf0jfgy9u4oFjeo8+hLjbpAuPUr5hgS0doEDmeYlIOof/XlUpoisnzPuiHsAcOVaa 3c0u5esjZ7FtnAfQ4cQ7wqPdub/Wi/V1rp1PiOLY+mYS1fnEVQj7lxLndgCw+l6L6qwuLK JRqlElu2sQzAGxqhJ+XFxRe8zY2R/g9kIaBKGLc+U50DvygdMoF4INH1TIufFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681097146; 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=jg7gTtZZgq1XNtNZb9tY2SUBxnVqPUCis+fXgleJYvM=; b=tL2wdsDOBsLYU8kMmAKrPJJCoTy9nMnMwff7/eFULPTKGgTGK272eQ6NsbBWwZj7D2cZaU RkzCqobAHy0PBSkBasl13JNxwSzd1MPRGhWZnOe2VXU0XE+acSYXCeSkWNvWUs8KnRl6+o nrWPwXKjtoJWBqfYA5Ccc1/JscCvgED0rtTzGVw99UQQyMuxRwXDAnml/bccl2qPKxq+Gh 73h5CgfXyyOOISOQHvrQMv4j6gIV/EQgtaTUshOoCQhJGMBZfogn2SQjojr/CS05RTIG9m wUZBetwokdH9/0OoJhsd5tnSKFKfFZQCe1iXI7M3OyxEqw2b16et3qBoC+eGhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681097146; a=rsa-sha256; cv=none; b=OXBd7YVuZ+H7Qs0mCLyPXySPfrjbMeX9RNRiMuMd0CY6ng9f7QxW+jYPei2lxd0RCvvmKG bUdkDRrzX7eL7t8elV5pNi5PurSkMD29mjto+FbEg5yrmx4ElzcZGianidxT0dx8WhXCx7 eI7PwOqFmBXR2YHIBz2tgryarlckI1vH7CCTZ3268WB1u9LiN0GT4NilzEGpXIclFVU0Ey Z8xTcEL/eSINTPPXO6JVVduTwz+mMPvOjzkZC2pgQq6O53GNkdaXdXq23aqKO5n7basI7M wmoHl0MxiUvEffK6vO4kKHmELYvs8AwinZzz3n36+EwsaTI7+9p8BBHG4YI+xQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PvvWF35Q2zKw8; Mon, 10 Apr 2023 03:25:45 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> Date: Sun, 9 Apr 2023 23:25:44 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------XHP0D9knEScCyjni0h3JdQPA" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------XHP0D9knEScCyjni0h3JdQPA Content-Type: multipart/mixed; boundary="------------6nTviK4Iy00ip22O1kHIPR6I"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> In-Reply-To: --------------6nTviK4Iy00ip22O1kHIPR6I Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q2hhcmxpZSBMaSB3cm90ZToNCj4gQ3kgU2NodWJlcnQgd3JvdGU6DQo+Pj4gVGhlIGZpbGUg Y29ycnVwdGlvbiB3YXMgcHJpb3IgdG8gZW5hYmxpbmcgYmxvY2tfY2xvbmluZyBidXQgYWZ0 ZXIgDQo+Pj4gdGhpcyBpbXBvcnQuDQo+Pj4NCj4+DQo+PiBUaGlzIHJlZ3Jlc3Npb24gd2Fz IGZpeGVkwqAgYnkgbWpnJ3MgY29tbWl0LiBJJ20gbm90IHN1cmUgd2hpY2ggKEknbSANCj4+ IHByZXNlbnRseSBBRkspLg0KPj4NCj4gQm90aCB0aGUgYmxvY2tfY2xvbmluZyBwYW5pYyBh bmQgZmlsZSBjb3JydXB0aW9uIGFyZSBzdGlsbCBoYXBwZW5pbmcgYXMgDQo+IG9mIDM1MWU0 NTkyZjY0Yiwgd2hpY2ggaXMgYWZ0ZXIgYW55IHN1Y2ggY29tbWl0IGhlcmUsIHVubGVzcyBy ZWZlcnJpbmcgDQo+IHRvIGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuemZzL3pmcy9wdWxsLzE0 NzIzIC4NCj4gDQouLi53aGljaCB3YXMgY29tbWl0dGVkIGhlcmUgcHJpb3IgdG8gMzUxZTQ1 OTJmNjRiLCBzbyB0aGUgaXNzdWVzIHN0aWxsIA0KcGVyc2lzdC4NCg0KLS0gDQpDaGFybGll IExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------6nTviK4Iy00ip22O1kHIPR6I-- --------------XHP0D9knEScCyjni0h3JdQPA Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQzgbgFAwAAAAAACgkQ/reFK+KbPof6 /hAAol1TH/hH5GrMz6pICVK+3F77qzAVa+9Sh18hcMuF5WQ6E3H9e9OEwFdVUYxCxTzAKl27Du5s EVssAlRlZi2XhtZCu7aw12bqMxUJSdT4igQNsEgWkmC4MuZMmZKkPfrYJdTonTte7oASXjYzAoDC 5mIKg1p5VNaMRK1VPhofKdXtBsGiOE8EXSK/DTrZd+wvUIq1V+wpSZLq3oTI/QKNQQ8U4OvIwSBV cvJrtLE9nKYYyuiJ9sIBpdDP+e6Ibwp3g5QAimFaU6Ped/Y9rxpYV/VVuLtX5E83vUwy05ykeAbg 0lkLV5D7hXC0bDSXqSKmkfM7wsTEhu7+4YytNTRxHYupHE9Eb7zgbzNvsoKogMqle8gbUkzN66YS nLP1IlM0Got59o1RDsK5yYTrD9q8MfjENEImtpJ7pODE28QhtagOuoUZTnN6tgIDaidjZa9yVvBQ EeB7U/M2Kgxu90nvMdnf9zuTpcZxc0r7J47q/IgV2MHDy3vkIHF7fZ1yDaKh0H0fV0aG6j4ppE3Q h0Cduw5qTLdbTqWRlDJOCH1Kd8R6/MgOMs43599Z/OIQqkW1fwPnftonqyDnkWmzySTk442bEjna uQC2GeITvMjtqxmX0+yNFvw2UX9ySYYuQGhVKXyVZzFl1pMBJipR1o8gBdio13a4wmKWGT5hwQoe dDk= =45w6 -----END PGP SIGNATURE----- --------------XHP0D9knEScCyjni0h3JdQPA-- From nobody Mon Apr 10 04:41:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvxBP362Fz44lZs; Mon, 10 Apr 2023 04:41:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PvxBN3v6Sz47Zq; Mon, 10 Apr 2023 04:41:16 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id lUbNpxsYuuZMSljL9pDcS5; Mon, 10 Apr 2023 04:41:15 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id ljL7pCPLR3fOSljL8pWllI; Mon, 10 Apr 2023 04:41:14 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=6433936a a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=kenwOhc8DBI5jldCQOAA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E065F4964; Sun, 9 Apr 2023 21:41:12 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id A6F661AF; Sun, 9 Apr 2023 21:41:12 -0700 (PDT) Date: Sun, 9 Apr 2023 21:41:12 -0700 From: Cy Schubert To: Charlie Li Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230409205826.7802259d@cschubert.com> In-Reply-To: <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfP8kN/cfLkLnclXeIJBY4MibOoJ90Rl77sNndKyFS/7VylEpSY/MJqe3+vlwj2AOhr3VHsQlpUj7Y+pLB7qCFl/aLFOUHw7uxnAH0oQ7GBCVsnd1uC7t 9XTMqyiuD3nsQHBwbjAcUyv+i3xDjzUjEL0W1HXiZ2iJhqmF/wu6nKDwGUjurWX+zulOkBpTj0qN1gTrCehDUJEsLn1qcEwW8yMT+UukLfVN9FFbkoZVLQja UFW+E35bQjsg96RI2l3S/xOeNqoWEBXY5NjzNGg9chfQO1vWDRAQMgiYUl0IsCLuVWXdQYmeKDOFGhYLB3N86PU8m4G4/phrO8YH80Jk4n2UbKf4zCdysRji xC9HUjXRcMQhhSynoSdlVvrjgwUSuUw6/13OveK7Yj58+8QMwZ8= X-Rspamd-Queue-Id: 4PvxBN3v6Sz47Zq X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, 9 Apr 2023 23:25:44 -0400 Charlie Li wrote: > Charlie Li wrote: > > Cy Schubert wrote: =20 > >>> The file corruption was prior to enabling block_cloning but after=20 > >>> this import. > >>> =20 > >> > >> This regression was fixed=C2=A0 by mjg's commit. I'm not sure which (I= 'm=20 > >> presently AFK). > >> =20 > > Both the block_cloning panic and file corruption are still happening as= =20 > > of 351e4592f64b, which is after any such commit here, unless referring= =20 > > to https://github.com/openzfs/zfs/pull/14723 . > > =20 > ...which was committed here prior to 351e4592f64b, so the issues still=20 > persist. >=20 Hmm, interesting. I'm experiencing no such panics nor corruption since the commit. Reading a previous email of yours from today block_cloning is not enabled. Is it possible that before the regression was fixed, while it was wreaking havoc in your zpool, that your zpool became irreversibly corrupted resulting in panics, even with the fixed code? One way, probably the best way, to test would be to revert back to the commit prior to the import. If you still experience panics and corruption, your zpool is damaged. At the moment we don't know if the code is still broken or if it has been fixed but residual damage is still causing creeping rot and panics. I don't know if zpool scrub can fix this -- reading one comment on FreeBSD-current, zpool scrub fails to complete. I'm not convinced, yet, that the problem code has not been fixed. We don't know if the panics are a result of corruption as a result of the regression. Would it be best if we reverted the seven commits to main? I don't know. I could argue it either way. My problems, on four machines, have been fixed by the subsequent commits. We don't know if there are other regressions or if the current problems are due to corruption caused writes prior to patches addressing the regression. Maybe reverting the seven commits and taking a watch for further fallout approach, whether the panics and problems persist post revert. If the problems persist post revert we know for sure the regression has caused some permanent corruption. This is a radical option. IMO, I'm torn whether a revert would be the best approach or not. It has its merits but significant limitations too. --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=3D0 From nobody Mon Apr 10 04:58:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PvxZ4439Bz44mPp; Mon, 10 Apr 2023 04:58:20 +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 4PvxZ40sqTz3DZj; Mon, 10 Apr 2023 04:58:19 +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 33A4wC6p008438 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 10 Apr 2023 07:58:15 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 33A4wC6p008438 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 33A4wBIU008437; Mon, 10 Apr 2023 07:58:11 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 10 Apr 2023 07:58:11 +0300 From: Konstantin Belousov To: "Jason A. Harmening" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7b6fe2428a97 - main - DEBUG_VFS_LOCKS: use witness if available Message-ID: References: <202304092134.339LYYY5081080@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4PvxZ40sqTz3DZj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, Apr 09, 2023 at 07:14:35PM -0500, Jason A. Harmening wrote: > On Sun, Apr 09, 2023 at 09:34:34PM +0000, Konstantin Belousov wrote: > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=7b6fe2428a97921e8df882d0a24b87094c37b468 > > > > commit 7b6fe2428a97921e8df882d0a24b87094c37b468 > > Author: Konstantin Belousov > > AuthorDate: 2023-04-08 06:15:00 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2023-04-09 21:34:12 +0000 > > > > DEBUG_VFS_LOCKS: use witness if available > > > > The assert_vop_locked messages are ignored, and file/line information > > is not too useful. Fixing this without changing both witness and VFS > > asserts KPIs is not possible. > > What was the motivation for this change? I thought it was obvious, please look at the old assertion conditions, now in the #else blocks. They are completely unable to handle shared locks. In other words, if the current thread owns the lock shared, or does not, ASSERT_VOP_UNLOCKED/ASSERT_VOP_LOCKED silently do nothing. > At first glance it seems regressive. I've at least found the assert > messages, as well as the vnode state dumping done by vfs_badlock(), > to be really useful for quick debugging of locking issues. This is > especially true when optimization makes the backtrace and frame info > less than useful; see commit 5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 > for a recent example. This is fair, and I noted it in the commit message. But better working asserts are IMO worth it. Eventually it might be fixed. From nobody Mon Apr 10 05:58:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvyty1plSz44q5M; Mon, 10 Apr 2023 05:58:02 +0000 (UTC) (envelope-from vishwin@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 4Pvyty1Kxjz4FvS; Mon, 10 Apr 2023 05:58:02 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681106282; 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=iKWZOhJ/6ZnhJ9jHhJw37URTeNi/Tty0V38ZjdsuSDE=; b=OPf0jIA3aunDKx4AgeM3E/bV4ed2YhCtnatkUDrUmWOHenB5z7DZknLQXY53SDNt4+jTNa EjzdTxdPjECn7QhnvwjNwJCThMgJRZ705eCFPQBPErBexfdgmq21eLYK0e4n2m2GVqpSQr 6JTYbY6Y4tcBd8wO5beL5X5npm9FVLol1Ab/zV0wMfTeQQYUFS0QML5bGARZhUzIJw38uX 8iOv9vINv9NYbRj20S8blj+/QKpa+3yln/wXp/q5ykTOOIrfdS9sdbDYW2Itv1eoKkl5dm /loIiLC/iKxvDIC8STGP7KP/ckYpKaA9SLoUWgOO3tMcyh3kxw0RuVrL8b+ucg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681106282; 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=iKWZOhJ/6ZnhJ9jHhJw37URTeNi/Tty0V38ZjdsuSDE=; b=SYBMfg/4UqDp8Fec470kZGqkvDczcbfk500+HdAJyQ0HA44ER+a73rrII1G3R51XBUJS8w rUHUu8UXzrhA3w0z5k0rO2sGQPkem7ebE1FB68hiTCGynz67olXBdkSNdp0OUMVBkMd+5b GBMWloLxW0BnkZA1/ET9/vw+jLbOggbKxFfDGNWbL4Y3oUh0C7hZsiZGQqyaZRF8OMT6vF TSGSCyAlQgIzSIKExeclGdhhH/ysLtQcMG8bmazQ9Z6AcBoA2/geuCZbzI816HIBOHrRyI QQ0zENasb/H2/KImRhMgVkf9DAQtNRbckoYLp4TVdnWro7lXX9sfwVyL8ALoyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681106282; a=rsa-sha256; cv=none; b=V8+mQuzXqccmzsQrOukdravg32yHHwPPc3S/UYtz8uCEVf+hVF0a/D2U9M/36yKqDvpWIj xMooOWUUEUxCQEi35H+4gXfsBd3s6CPEA27OuLMv/grP1qQPcI2UvHZC0Gn+e8kPwR/oNX i7II+2icenEb6Dwet16d+RBTPYLqLsGqP6H9opvBr9/lZMX3qZD6Ni5sUFkcndvc+1TYt3 Eni3/auL+t97UReaHmTw3UE0DRqx3KprfpfVQg4gPhRpcjlvad8U4SmVBxCN4+G/gZySRz S6R/8NMCxfnCm5oZZMRtogWvqLwPOT4BhJYJiX5qrgLGT3lDMYThJHf664ZERQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pvytx5VTtzMsw; Mon, 10 Apr 2023 05:58:01 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> Date: Mon, 10 Apr 2023 01:58:00 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <20230409205826.7802259d@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------maKAiMXK38pABLvbHnxvXSpQ" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------maKAiMXK38pABLvbHnxvXSpQ Content-Type: multipart/mixed; boundary="------------3ylVf2TWH2AJaTfS0hgnNQyk"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> In-Reply-To: <20230409205826.7802259d@cschubert.com> --------------3ylVf2TWH2AJaTfS0hgnNQyk Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IEhtbSwgaW50ZXJlc3RpbmcuIEknbSBleHBlcmllbmNp bmcgbm8gc3VjaCBwYW5pY3Mgbm9yIGNvcnJ1cHRpb24gc2luY2UNCj4gdGhlIGNvbW1pdC4N Cj4gDQo+IFJlYWRpbmcgYSBwcmV2aW91cyBlbWFpbCBvZiB5b3VycyBmcm9tIHRvZGF5IGJs b2NrX2Nsb25pbmcgaXMgbm90DQo+IGVuYWJsZWQuIElzIGl0IHBvc3NpYmxlIHRoYXQgYmVm b3JlIHRoZSByZWdyZXNzaW9uIHdhcyBmaXhlZCwgd2hpbGUgaXQNCj4gd2FzIHdyZWFraW5n IGhhdm9jIGluIHlvdXIgenBvb2wsIHRoYXQgeW91ciB6cG9vbCBiZWNhbWUgaXJyZXZlcnNp Ymx5DQo+IGNvcnJ1cHRlZCByZXN1bHRpbmcgaW4gcGFuaWNzLCBldmVuIHdpdGggdGhlIGZp eGVkIGNvZGU/DQo+IA0KVGhpcyBpcyBwcm9iYWJseSBub3cgdGhlIGNhc2UuDQo+IE9uZSB3 YXksIHByb2JhYmx5IHRoZSBiZXN0IHdheSwgdG8gdGVzdCB3b3VsZCBiZSB0byByZXZlcnQg YmFjayB0byB0aGUNCj4gY29tbWl0IHByaW9yIHRvIHRoZSBpbXBvcnQuIElmIHlvdSBzdGls bCBleHBlcmllbmNlIHBhbmljcyBhbmQNCj4gY29ycnVwdGlvbiwgeW91ciB6cG9vbCBpcyBk YW1hZ2VkLg0KPiANCkZhaWxzIHRvIG1vdW50IHdpdGggZXJyb3IgNDUgb24gYSBib290IGVu dmlyb25tZW50IG9ubHkgYSBmZXcgY29tbWl0cyANCmJlZm9yZSB0aGUgaW1wb3J0Lg0KPiBB dCB0aGUgbW9tZW50IHdlIGRvbid0IGtub3cgaWYgdGhlIGNvZGUgaXMgc3RpbGwgYnJva2Vu IG9yIGlmIGl0IGhhcw0KPiBiZWVuIGZpeGVkIGJ1dCByZXNpZHVhbCBkYW1hZ2UgaXMgc3Rp bGwgY2F1c2luZyBjcmVlcGluZyByb3QgYW5kIHBhbmljcy4NCj4gDQo+IEkgZG9uJ3Qga25v dyBpZiB6cG9vbCBzY3J1YiBjYW4gZml4IHRoaXMgLS0gcmVhZGluZyBvbmUgY29tbWVudCBv bg0KPiBGcmVlQlNELWN1cnJlbnQsIHpwb29sIHNjcnViIGZhaWxzIHRvIGNvbXBsZXRlLg0K PiANCkl0IGRvZXNuJ3QuIEFsbCBzY3J1YnMgb24gbXkgZW5kIGNvbXBsZXRlIGZ1bGx5IHdp dGggbm90aGluZyB0byByZXBhaXIuDQo+IEknbSBub3QgY29udmluY2VkLCB5ZXQsIHRoYXQg dGhlIHByb2JsZW0gY29kZSBoYXMgbm90IGJlZW4gZml4ZWQuIFdlDQo+IGRvbid0IGtub3cg aWYgdGhlIHBhbmljcyBhcmUgYSByZXN1bHQgb2YgY29ycnVwdGlvbiBhcyBhIHJlc3VsdCBv ZiB0aGUNCj4gcmVncmVzc2lvbi4NCj4gDQo+IFdvdWxkIGl0IGJlIGJlc3QgaWYgd2UgcmV2 ZXJ0ZWQgdGhlIHNldmVuIGNvbW1pdHMgdG8gbWFpbj8gSSBkb24ndA0KPiBrbm93LiBJIGNv dWxkIGFyZ3VlIGl0IGVpdGhlciB3YXkuIE15IHByb2JsZW1zLCBvbiBmb3VyIG1hY2hpbmVz LCBoYXZlDQo+IGJlZW4gZml4ZWQgYnkgdGhlIHN1YnNlcXVlbnQgY29tbWl0cy4gV2UgZG9u J3Qga25vdyBpZiB0aGVyZSBhcmUgb3RoZXINCj4gcmVncmVzc2lvbnMgb3IgaWYgdGhlIGN1 cnJlbnQgcHJvYmxlbXMgYXJlIGR1ZSB0byBjb3JydXB0aW9uIGNhdXNlZA0KPiB3cml0ZXMg cHJpb3IgdG8gcGF0Y2hlcyBhZGRyZXNzaW5nIHRoZSByZWdyZXNzaW9uLiBNYXliZSByZXZl cnRpbmcgdGhlDQo+IHNldmVuIGNvbW1pdHMgYW5kIHRha2luZyBhIHdhdGNoIGZvciBmdXJ0 aGVyIGZhbGxvdXQgYXBwcm9hY2gsIHdoZXRoZXINCj4gdGhlIHBhbmljcyBhbmQgcHJvYmxl bXMgcGVyc2lzdCBwb3N0IHJldmVydC4gSWYgdGhlIHByb2JsZW1zIHBlcnNpc3QNCj4gcG9z dCByZXZlcnQgd2Uga25vdyBmb3Igc3VyZSB0aGUgcmVncmVzc2lvbiBoYXMgY2F1c2VkIHNv bWUgcGVybWFuZW50DQo+IGNvcnJ1cHRpb24uIFRoaXMgaXMgYSByYWRpY2FsIG9wdGlvbi4g SU1PLCBJJ20gdG9ybiB3aGV0aGVyIGEgcmV2ZXJ0DQo+IHdvdWxkIGJlIHRoZSBiZXN0IGFw cHJvYWNoIG9yIG5vdC4gSXQgaGFzIGl0cyBtZXJpdHMgYnV0DQo+IHNpZ25pZmljYW50IGxp bWl0YXRpb25zIHRvby4NCj4gDQpHb2luZyB0byB0cnkgcmVjcmVhdGluZyB0aGUgcG9vbCBv biBjdXJyZW50IHRpcCwgbWFraW5nIHN1cmUgdGhhdCANCmJsb2NrX2Nsb25pbmcgaXMgZGlz YWJsZWQuDQoNCi0tIA0KQ2hhcmxpZSBMaQ0K4oCmbm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBh biBleGl0IGxpbmUuDQoNCg== --------------3ylVf2TWH2AJaTfS0hgnNQyk-- --------------maKAiMXK38pABLvbHnxvXSpQ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQzpWgFAwAAAAAACgkQ/reFK+KbPodp 3g//Z1bjZ6Kbi4N/rwCgb0xsqvA4OrxlAwKFZKdNNBa4OxepCoDolEMBUshJ45IzuqI9ZFj02rw6 FsEUI7CLp1EtMkQcaFFEs759V71yofCjoQ/I2z7P++yj8CjO+pTpQn/L9pL7mfcZaQsReqMStSKa qnh51bwkkVQGk8nroj5OwMi2Ovb3Lx4BgnG9JbtcYlvvR3r7n0Hu3XxP99kM0EaQGjJFR9D7P2V7 PA/oeTvmKlNbUAqY0ObZIkoct9jpqiMchlPqR5nCBlms81ja+2sv3YUKg1H8A5YQMgGbbbuMZ8on bHLNgtfpFQiQ8hBF2c8aIxVfYMOEad4BVfJ3ncMKBY1LY0a64blB2oEs0672vh8ebzXX3kJZrZ/r g1/XOQws7BeMRl35KmcsBXRyOWm0zdrydSBJspqNUATPy8oA5OdCVXxNzlI6YGRoWn6aA/DFbyWg h9EC7aIqoOrS4cBH1e63s0Jfebl5fAEbpQqYOINFgUkk3dBLh8O8fMCHpmkhwjKYwtbBBBmyoCgF Z7cS8uVzIxEOdsMsiLgYI3c+YfnYfF311Yk5/Egb1hPmfxA4z9i3vACyN+JmKR7wTh0gPh3rE+jR 6fHYz275nvYpbBPSMaeXZy7ZnMRaVi9Dvt8/fxjt7L6wDjy9SsjfXv7+Csndee7vVwR9HRbMxtk4 d0U= =hjyG -----END PGP SIGNATURE----- --------------maKAiMXK38pABLvbHnxvXSpQ-- From nobody Mon Apr 10 07:54:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pw1Tj6Vt7z44wFV; Mon, 10 Apr 2023 07:54:49 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pw1Tj5F4tz4P06; Mon, 10 Apr 2023 07:54:49 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681113289; 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=yQv6q5A3hDDb/jhrPj+MnQ+7f8LB7vPQZAr6DRloW/Q=; b=Z8Lu3qC1My1lb43JUH1qcEg3sysDjylL2N0Atlw+WjzkhdZA3v6TIaGpGJReqwGfZF09Et rZ9YFZmGypI6VUKg8je6e2WVZRcjDMDt1LCNw5CyRF90Nz9Y8VUleQsYwGbjOvjeWrD16L GSEXRItuEDpjaeyRExXL+Mw1Sqp6r5bjfSl+VRUfb0JUQlWXLtXrT//xys662Z2ZfMO7mv QgTtry6mSCOgFaOT9+qQkpgV9aig1jXDP/rsqHiAyIpmuPhh23xfUTYLsEomn08h6v+Aoj xb1Wb3Xv3ybpjaRSgXrtopvWhgqFBJ4Zg2sKwNEGJnqrlK4nhZpcNoq3mq+6EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681113289; 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=yQv6q5A3hDDb/jhrPj+MnQ+7f8LB7vPQZAr6DRloW/Q=; b=npR1Wow+EDjaDs2De8pISNa1Pq9tQ1EC2vQdulmRpeTu5TziUvwOEipiLlMgEAYMaLUJe7 mWzTJmINxESA0VCHQD8J2mkxLgi+5Pke6k+5JBmhdFPbgsgokK9VqAYUTtIqZFyr88CC1M VTdOqUXY59XSoq5CfiV5001bRzjE2rx7Yf4IQDWjsP2/0wek2bY8PePwkRiVzwEe+4tP8K rr14rO1FsuZ/ivBauKByV1A/JsioEVjxoTmRo+XU2gu1CqYhQD0NdnX2dG1v6CrUht80sy ypV905lsuQuI1UTDy7w8Wu8KQ/mkiFHCP83f273anwwfs44UPffVOs4VrfLP3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681113289; a=rsa-sha256; cv=none; b=GXC0Y152QRb7igXSH6moKSSDprh0ZRQ7YMXywFmGIJ/JGEjBl9UYk7iv6lFogEMpDQA4on h26Sea291hFHKWfnZuLb5kRlC6nYV7Qbr7IiyhDqwVBZv+z4LAr4431q9EbaRevRYx7fu1 IWhASFRvtn4cpyPAFfVcP77ZevToDa+GtfbREFMwYJzHpnSDh9b3SEKCoUkA5qHCUAHyoP BlqeJei9xkxZOp6K96SddUtcJkCkZkrjef1v4EWyrBb1AKDBwSlqzOjr+D/xocC+UZ6ukx 7ttlUABdm9nzbBCFnXPRsLvPofvdkb5aKwdIwlPGdbUrc8mRf2WmMuw4A97lcw== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 9EC80621; Mon, 10 Apr 2023 07:54:49 +0000 (UTC) Date: Mon, 10 Apr 2023 07:54:49 +0000 From: Alexey Dokuchaev To: Rick Macklem Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c98a764c681f - main - cp(1): fix performance issue for large non-sparse file copies Message-ID: References: <202101030102.10312IAC061762@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202101030102.10312IAC061762@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On Sun, Jan 03, 2021 at 01:02:18AM +0000, Rick Macklem wrote: > commit c98a764c681f8b70812a9f13a6e61c96aa1a69d2 > > cp(1): fix performance issue for large non-sparse file copies > > PR252358 reported a serious performance problem when > copying a large non-sparse file on a UFS file system. > This problem seems to have been caused by a large > number of SEEK_HOLE operations, with one done > for each copy_file_range(2) call. > > This patch modifies cp(1) to use a large (SSIZE_MAX) > len argument, reducing the number of system calls > and resolving the performance issue. > char *p; > > @@ -236,7 +235,7 @@ copy_file(const FTSENT *entp, int dne) > do { > if (use_copy_file_range) { > rcount = copy_file_range(from_fd, NULL, > - to_fd, NULL, bufsize, 0); > + to_fd, NULL, SSIZE_MAX, 0); Hi Rick, This change unfortunately breaks copying files in resource-limited environments (e.g. many port builders do that to prevent runaway processes): ulimit -f 16384000 cp -p packages/13.0-i386-wip/All/perl5-5.32.1_3.tbz /tmp ; echo $? Filesize limit exceeded 153 Previously bufsize was 2097152 which was a lot saner than current 9223372036854775807. Perhaps we should set it per getrlimit(2) value for RLIMIT_FSIZE? ./danfe From nobody Mon Apr 10 08:04:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pw1ht3vs3z44x8X; Mon, 10 Apr 2023 08:04: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 4Pw1ht2ydJz3MZN; Mon, 10 Apr 2023 08:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681113870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ykfhh/BE52NjoXs7ZRCuET44S2/fR81eAcihzD+1y0=; b=GXU8f70oojViISsAe+r0UmofMQkn/smI1/Xt5xMdWFQOmw9aOPcOrE+SsmdofdH7YhkNf3 grihMkd6VGU8EQrFIE2WMBklP1FMeiloeDz6pjywdANHreMdGh+xfbLn7ituQ9z6amZ/13 wgIod88TgVg/LIphBqqLNktr7uQx/DCveyBlnds3WtAB75fJV6WsNtH4Qq749u5KHiD90/ b3xiaZY/2Wkou2Nta4GL8CKdUsqqkhL6cm2cGoz+S/p7Wq/zdaOyNseh11YLWP3rP58ZAS /MOfr2ZUZ5jFPqssHPDfjJVVIe/o5OdCozvdtKNdj2EpfBd4X57Az9KPqPTq3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681113870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ykfhh/BE52NjoXs7ZRCuET44S2/fR81eAcihzD+1y0=; b=ysL/QFX3apuTdibqbqloyF0caG7OI5BnHjVdMbVSztEf+epAgXw1pbaCB0KMbLtZz9b+BD Jc+yoTUDpK6t+veCYevfo/c9iz1PUNSFUz3vlCWsdIRu491sJ86PrtRZH4Guk7i9OWZfv3 kvROVtPka6SChdk+HB5XDbLTSmGfH+QrCO5DyuOO1FpZO4Q/ftlPRu7oAhcYCyc+s1mDa2 c+D6XJ1U4s8Ybr/PXJDr2uRol2AkkGdsB2NSoQTNbjuLp1DGcn2ZeeRmkzYAH8sFeusDFk qsCTqkUo4u/Fcge8v05kx61vedgQsHzWvwovwwKTtMKwQTTSx1erNxB1H5Lxcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681113870; a=rsa-sha256; cv=none; b=c94F1CRD5h6Ck52J8b+TbMzEteRDsrCmsmdZL/5zjZgsgmeS8xStpV+a+J5bxZeB9p7o7C MaS3WnY2pcQv4VPkAB74LaFbK1V3M4B7pl8Rqc/lRF5AqGWFIvPwkbvS/lAXAlWt5ZUzFU qJxbXmkKygixalgzR7hzpsPZxScX2KyqQ0pwK1FfhCk9HO9zCGbibRCNU807CqZkZzSU9k cRjFlYEzQdWmj3GZmzm+bBgbDYDxeNgxjaA+pbC2xh8Nx5RZiKuAncXrP7q+MKxRxvlJmu 05BYgcYntZdVZ4DgDLxzc+x8maYzIubCd1ga49UvdRYFsXS/GtvL729p5kYpfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pw1ht21Snzj61; Mon, 10 Apr 2023 08:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33A84UkW017520; Mon, 10 Apr 2023 08:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A84UZA017519; Mon, 10 Apr 2023 08:04:30 GMT (envelope-from git) Date: Mon, 10 Apr 2023 08:04:30 GMT Message-Id: <202304100804.33A84UZA017519@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: af67f36a9288 - main - stress2: Update the exclude list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af67f36a9288480f2545fec9f6813ed38196f41a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=af67f36a9288480f2545fec9f6813ed38196f41a commit af67f36a9288480f2545fec9f6813ed38196f41a Author: Peter Holm AuthorDate: 2023-04-10 08:03:22 +0000 Commit: Peter Holm CommitDate: 2023-04-10 08:03:22 +0000 stress2: Update the exclude list --- tools/test/stress2/misc/all.exclude | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index bca9dac4c1bf..c8ec2fdb43bf 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -30,8 +30,6 @@ gnop8.sh Waiting for patch commit 20201214 gnop9.sh Waiting for patch commit 20201214 graid1_8.sh Known issue 20170909 graid1_9.sh panic: Bad effnlink 20180212 -ifconfig.sh Bug 253824 20210322 -ifconfig2.sh https://people.freebsd.org/~pho/stress/log/log0051.txt 20210210 lockf5.sh Spinning threads seen 20160718 maxvnodes2.sh https://people.freebsd.org/~pho/stress/log/log0083.txt 20210329 memguard.sh https://people.freebsd.org/~pho/stress/log/log0088.txt 20210402 @@ -51,6 +49,7 @@ oom2.sh Hang in pfault 20180324 overcommit2.sh CAM stuck in vmwait seen 20200112 pageout.sh panic: handle_written_filepage: not started 20190218 pmc8.sh panic: [pmc,2749] (ri21, rc1) waiting too long for pmc to ... 20210621 +rename14.sh https://people.freebsd.org/~pho/stress/log/log0433.txt 20230409 sctp2.sh panic: Queues are not empty when handling SHUTDOWN-COMPLETE 20210211 sctp3.sh panic: Queues are not empty when handling SHUTDOWN-COMPLETE 20210211 sendfile25.sh WiP 20200611 From nobody Mon Apr 10 10:08:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pw4Rl1GHGz453bQ; Mon, 10 Apr 2023 10:08: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 4Pw4Rk748yz3wF9; Mon, 10 Apr 2023 10:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681121299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pRJQjH6aqhiav56LaW9Y8+BA8vDrf+sfcYngCjCQ5s8=; b=R/d0emNWVIicoSRqxwfYRk2fwKwAfR/2F7dXX4CvlhAXsMmxuaaMYPxog7Txa3ibIMrtbN 5PBabVc5mO/dm75y1CbpAYOEKB4oLdEcLWs9JI4WYdIcPyHrGH4G82qv2jBzfXDftjhNiA a8Y3HYfp3uCZNY54fbpJotz6Vb2Tw2frMNOsL9Ki6BbWnlwVaOo5pILjE+HvZ4KnyWDVM3 Pl+kVTyeOWxHH8KE8QXM1TaPWYfMeoMH/+d3g2ZSBAJHjnyEj0Uo2d2e8tXaeU1tgRHf6A EtoqVJKC8f0aIErxOv/eMtQJBeQkH7Oki81OvLFAzTyIE1JfzW0UFjiKo0ZPGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681121299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pRJQjH6aqhiav56LaW9Y8+BA8vDrf+sfcYngCjCQ5s8=; b=mieo17OETKUmzotN2od9RetDchY+8ci3nhXLcPilBVlpi60sIvbQgS4uyB5zYeeO+JcezB NMG4BmTFnEN6bP4ZGXDnex8oU8aybKa331XA7I4OvnjVucpEc1tlFdbfOPclNQbayqq1Du bz7leVT25pBokMOpO4O37bXHZLbkwWHCbtwp5sCQe1ieehym8/Ki7rfwq/hxaeu7wyB6it dUKj/UA6RtYwKvHynNBGx+SPuWyEZo81ofDQS2w0q2JxKZKRTCbk3eevFuFFX/jyWFk107 m7cP7KQoUXjHjlIYPV4SCqCav1rRnZNl4oL2lay2gaW6k/OmmNBPyiJSpHfrNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681121299; a=rsa-sha256; cv=none; b=IpyydCPL4F+bor/JrXopXhFTYduz47Y2ddFXMqzCMzckgooUY/psPkP+Yq4YUwFyoVAUpT p3+o5m3bof2K3ZDFmLKIQwT9u2x4T8GZfmUCWBBEaEzg7IeDqLZrqXMLdEutvSeHgwpd4J z/pIGjDrr2xaYjvvA1Lmz62wiJMp0f+PWnUYjLd08gmNE4DffP/T0Ayq7qZQQbiK5Qs/SS G3hO4XjiOoVLybAcD9B3+o9X3eNj3cYKl4m5xz97ALxNGON/A64EXKMs51gQ4PBK6hNV0p Fi5+jilk612ZVOc4S8AfvZxQ9ylGgiVMkjURWA3XsqDdfpP2q9vXLUCSowBD4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pw4Rk68sJzm4b; Mon, 10 Apr 2023 10:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AA8Iam018158; Mon, 10 Apr 2023 10:08:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AA8I4M018157; Mon, 10 Apr 2023 10:08:18 GMT (envelope-from git) Date: Mon, 10 Apr 2023 10:08:18 GMT Message-Id: <202304101008.33AA8I4M018157@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: 3fdb40d1befe - main - bridge.4: Document the net.link.bridge.log_mac_flap sysctl variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdb40d1befe7b561e7e5fa0b5c80aac41adc50d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdb40d1befe7b561e7e5fa0b5c80aac41adc50d commit 3fdb40d1befe7b561e7e5fa0b5c80aac41adc50d Author: Zhenlei Huang AuthorDate: 2023-04-10 10:07:04 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-10 10:07:04 +0000 bridge.4: Document the net.link.bridge.log_mac_flap sysctl variable It was introduced in 2d3614fb132b (bridge: Log MAC address port flapping). Reviewed by: gbe (manpages) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39465 --- share/man/man4/bridge.4 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index e5313430b407..b4dabcbb79bc 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 7, 2022 +.Dd April 10, 2023 .Dt IF_BRIDGE 4 .Os .Sh NAME @@ -118,6 +118,15 @@ interfaces that are part of the bridge. For unicast traffic, the bridge learns which MAC addresses are associated with which interfaces and will forward the traffic selectively. .Pp +By default the bridge logs MAC address port flapping to +.Xr syslog 3 . +This behavior can be disabled by setting the +.Xr sysctl 8 +variable +.Va net.link.bridge.log_mac_flap +to +.Li 0 . +.Pp All the bridged member interfaces need to be up in order to pass network traffic. These can be enabled using .Xr ifconfig 8 From nobody Mon Apr 10 13:08:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pw8Rw5xkrz44F0M; Mon, 10 Apr 2023 13:08:44 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pw8Rw4qcNz3Dd0; Mon, 10 Apr 2023 13:08:44 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681132124; 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=8EX56W1As3D8aqwsfOo6NBqCfjk4rpZ6dnp3OMoC6fY=; b=b/wQy+bKhppHdn/5SZKmiFa11zGF1t2z+KKseLBsJE+pWArYItuEflHgMwDVQiaRQrV1yg Wfp3R40G3dCeBRqxQhf1E0krapEVmri2uoC0lyDzaw0IhkPWHzHfrfHufNFN34UYmPk3mx ZSm7o4ZOXCkegCz9OJPctyYXvSD2qGbz6hP0hOdUkH13OPije9ZKhdXN6g9GJvg41SovLd YQZIoSplcbzhbfZKDdDGlnKEKAOz4Bg0FMjC/K+EvnKC/mbJaVB7W1C/mR+9DQbT1RCfeS X3nPpyO+Syh/8/U11ItN+BrZq6YMOceA/BX5m1/5lrzxin5s7EJYyKL1geCp2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681132124; 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=8EX56W1As3D8aqwsfOo6NBqCfjk4rpZ6dnp3OMoC6fY=; b=ifqUkccSMQB/Np5v29AkdPh+O1YfJMnwyV8m6l65UkE59qhOrBVx9RLchO5qYZMI/TxQt8 P7cTeUphC+hCzopLzHbZfQ9OVuoeGyGfShy1OfVNt4hcxlyk7/RoO9PZ+bmiAVgJSPqbki XDtXeSfHwZ15V6vkQS0vPhVivOMNld429tJxtOkkIO/2IxU844aeDtsqY9kcinVWU6ShfR 5tnLoZx1UH16k5vDajE3VEAp6GVm+E429YwWXwTdHPgWJNkiTb2rsmN6YZo/7FoKqUl+ke uRf3+jvHUsnf46znYPLiJLDUgF2KVIYCQa63gLNnnpLQ1+Uiz0OUNLz/GuPxjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681132124; a=rsa-sha256; cv=none; b=h6KMNdi7bbXuy+RZlM4U/DQ+g0AMaH0bGags5eotjARM8rKtZ5sRRQXf5xZZYg9oll7yyF EpjTA3QsBW5M2FoIi0/+oFxkDAkd+gP+y18qx0foq0VSBaVyY20S+tBwjNHTD6++khNc90 a9VmHo7vSSr00a05PmRAUgPPzsjH6xt3LZUqWIMAbaYAhCD6JO3/OUafiUKqoTxTWAa9Q4 tK/hLIJTnxBZFZPpBDIPxe/m8TF2NY4dNyqzlgSQJ7CKoF6kieCf0GjpHYrNXZuf+5Pny4 28zDBTadv6WZ/W61tmUotL2o7q5FKVD2cK2FfqTsxHjQy4MBEtEUcT7/cbl2kQ== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 9E9E76929; Mon, 10 Apr 2023 13:08:44 +0000 (UTC) Date: Mon, 10 Apr 2023 13:08:44 +0000 From: Alexey Dokuchaev To: Yuri Cc: Mateusz Guzik , Poul-Henning Kamp , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 643336549081 - main - If copy_file_range(2) fails with EXDEV, use fall-back. Message-ID: References: <202304040740.3347eiU8033699@gitrepo.freebsd.org> <202304040959.3349xqqB005509@critter.freebsd.dk> <202304041015.334AF7oF006042@critter.freebsd.dk> <872bff80-a306-a5b8-dbc1-cf54be85fa81@aetern.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On Tue, Apr 04, 2023 at 11:31:49AM +0000, Alexey Dokuchaev wrote: > On Tue, Apr 04, 2023 at 12:31:53PM +0200, Yuri wrote: > > Mateusz Guzik wrote: > > > On 4/4/23, Poul-Henning Kamp wrote: > > >> -------- > > >> Alexey Dokuchaev writes: > > >> > > >>> Okay, but did it leave an empty file, I wonder? > > >> > > >> I didn't check, but it probably would, because cp(1) must have opened > > >> and created the destination in order to call copy_file_range(2). > > >> > > >> PS: I'll note that EXDEV is not a documented return value from > > >> copy_file_range(2), and my surprise that cp(1) did not revert > > >> to the fall-back, no matter why copy_file_range(2) failed. > > > > > > that's a new one and should not be happening, something is borked in > > > the kernel -- cross device copies *are* supported > > > > > > i'll look into it later > > > > Likely has to do with openzfs merge issues reported by Cy just above? > > If cp(1) producing empty files for me after commit c98a764c681f is also > EXDEV-related (which I'm not sure as of yet), it could be that recent > OpenZFS merely exposed an earlier bug (c98a764c681f is from Jan 2 2021). > And I didn't have any ZFS on that machine. Never mind, I've eventually figured it out, it's a totally different bug, having nothing to do with OpenZFS or EXDEV. ./danfe From nobody Mon Apr 10 14:33:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwBKM1Zzlz44KPc; Mon, 10 Apr 2023 14:33:11 +0000 (UTC) (envelope-from jah@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 4PwBKL6Vt7z3hW9; Mon, 10 Apr 2023 14:33:10 +0000 (UTC) (envelope-from jah@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681137191; 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=4QlhUE0lxls9FeOdVtUpkSpYgQiE+AeAA9Ms01ESRiE=; b=av5mitQN5BgmCuw5q0HBxwZI2KrP8a/hb2ETDsG2myThA6zspkUn+RUxr4+w/aJJdjikzL gxbKm4DaYb+lFwbmVtOVoxV/rj4aNxTBUOiFQMThKuAfp1+mAXZym422qXKunL+Llz/P9i KTqiUHlhdPMneURntbxPHn3oj1nqj3MNV4Li62hIwtvm+0OqNuzM7PcJbizJVV/Gfd5Jmz f8DTrxpc8U7wcAI6xyBB0kxr0bZWfdJGJ2DngZkseH+8OG9aBzTA35lUrp7oMay+/onvTH w+Vx9JTZpGBZTvJB1PfUNsyI3t1dUO91MXSwyEaBwKV5TqkUgg+sFqE9f9P6gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681137191; 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=4QlhUE0lxls9FeOdVtUpkSpYgQiE+AeAA9Ms01ESRiE=; b=bC+M1dMuZsOyYLtUr/KXkJ3JiGZjBG7nVMn5hWd/FBK+PX8SFpm5hbZ7GrbcvrVP/r9kLC BfXkJAwEOxajeWCaiPhf2gPL0/7YtPpjpi+JTBYR4xV5LHnaZB1Ag4E+7f2+eJjn90t0Uj cxoQ2iW0JHTfAp/jWH///bu8xw0/ogHgTC9HjXgSfkFBx6J1Ai/sFzVs2W5aN0UFeRGfX4 +6+x/JnpIfMJBSoTnrXhafAXIgQEr87wuaMVfJBmBCqG95qNGG4rYnoHlb5QJKE3yu2MmM 5SyUhZ1/Jm5dVYesReE2yv42l123f38S6Rfw+Cc7FKK4Yd6lTulM1I8oAdc2/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681137191; a=rsa-sha256; cv=none; b=Du3DrhhbDT60qnrtkD82QxOte02yg+8NWdvw7i60iNaQ8B5MXPyzEBZ8tZqkekdY/e4XZ2 Q6Xtm9PRgCYq4yiWdSIRafW4fRVFLRrC3Vy1aURyCW53pZ986wfOHTq0Ept7b92gtfNezv lUhVarx05xdKZyzP5oTfA1EXZRtuYTiHOcqXq9Vr3zsrX/fEr625RWPYp0yxHE5rPUU2MA MVXvDaWO93jPx4Equ05Ihmv11ttoNfGBRSa3JXJyUewasCTCSe/1gbzPbO5BY+LLfYj/1+ smBQ0+Ba/IG18kcVVquaLPHFQ3C9LQhmnFg4fi3MBEKqnC4LuH8588RAQ8B47Q== Received: from corona (047-232-115-243.res.spectrum.com [47.232.115.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jah) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PwBKL3PLFzXFS; Mon, 10 Apr 2023 14:33:10 +0000 (UTC) (envelope-from jah@freebsd.org) Date: Mon, 10 Apr 2023 09:33:08 -0500 From: "Jason A. Harmening" To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7b6fe2428a97 - main - DEBUG_VFS_LOCKS: use witness if available Message-ID: References: <202304092134.339LYYY5081080@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On Mon, Apr 10, 2023 at 07:58:11AM +0300, Konstantin Belousov wrote: > On Sun, Apr 09, 2023 at 07:14:35PM -0500, Jason A. Harmening wrote: > > On Sun, Apr 09, 2023 at 09:34:34PM +0000, Konstantin Belousov wrote: > > > The branch main has been updated by kib: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=7b6fe2428a97921e8df882d0a24b87094c37b468 > > > > > > commit 7b6fe2428a97921e8df882d0a24b87094c37b468 > > > Author: Konstantin Belousov > > > AuthorDate: 2023-04-08 06:15:00 +0000 > > > Commit: Konstantin Belousov > > > CommitDate: 2023-04-09 21:34:12 +0000 > > > > > > DEBUG_VFS_LOCKS: use witness if available > > > > > > The assert_vop_locked messages are ignored, and file/line information > > > is not too useful. Fixing this without changing both witness and VFS > > > asserts KPIs is not possible. > > > > What was the motivation for this change? > I thought it was obvious, please look at the old assertion conditions, > now in the #else blocks. They are completely unable to handle shared > locks. In other words, if the current thread owns the lock shared, > or does not, ASSERT_VOP_UNLOCKED/ASSERT_VOP_LOCKED silently do nothing. Ah right, sorry. I keep forgetting we have a separate assert_vop_elocked() function for checking exclusive locks, while assert_vop_locked() just sort of gives up when it comes to shared locks. In any case, I like your proposal for restoring the diagnostics, thank you for posting it so quickly. > > > At first glance it seems regressive. I've at least found the assert > > messages, as well as the vnode state dumping done by vfs_badlock(), > > to be really useful for quick debugging of locking issues. This is > > especially true when optimization makes the backtrace and frame info > > less than useful; see commit 5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 > > for a recent example. > This is fair, and I noted it in the commit message. But better working > asserts are IMO worth it. Eventually it might be fixed. From nobody Mon Apr 10 15:15:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwCGc19Hrz44Mnw; Mon, 10 Apr 2023 15:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwCGb6zvKz3pKL; Mon, 10 Apr 2023 15:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681139752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WMCFIUOhwePnCWjyrbn3qdfKwmK9XL2IVi/Kciqp0M=; b=jX4XAXqDz/HYHxuA3vAu5/CX9lvoLSFkt4EUlj8OmEgC3WWhI3KALYPHaUHXM9b7mexXpE /9x64eOER919LmtbGrwU6cd5xHYb4Q0FkjHtTEjuypuv8rmYGN6dmG8KJFct+x+nPxm9mp mRFmAQTuzW2qJXgNDeTjG4371CLms7PA5gTggFO86pZruCgvsnl29YmVkvmWsKg+L5DglW Ko3B3QvilMkmww9BO4hj58RMDMJHLf5hhvl71W9qfHHd/VE1FJqN317ZxgWjnS1gq1t1by XSs7oxJzxk8vPCcaiMCPyfMnQnSoVL1rcK224C7/Wyuv39FrkUmn7L5C8DJx5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681139752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WMCFIUOhwePnCWjyrbn3qdfKwmK9XL2IVi/Kciqp0M=; b=Hi/Zse+14iq2doGEyBZXqE18W099Tb+IWLeVi3ua6a3IQ7UgVLjv0DaD2FUaTkvGyKB2+v jj62JY9ICkjQIRAbo0OMsrgVHV/fRQYWiFoOXdXaZ0/iXheS+UU2316biGiKDWKWNNGDYH soTe13cPa3Z001FTEsjAgQghRacipXkHG2OCnKwvEpPAWmLWQKqhK4ZhJK2NPMWbvvY/dY 4F1+XWIOqTJDBVecNSJ9gKvMpdvgJhDBBuwfpJXBp1SnqxMWBpj+pe6i0jnrkqdxAZkYKv ftWecWIz7YqIYp+lsrELV7WADsrZCbEitnEH/mgTF6HRkOBfWRVlLCPkKm+g6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681139752; a=rsa-sha256; cv=none; b=pAS6uXolFCsaFLig0ZY4uZR4DXILnLfKZdciucZqDe0BFnZxlKe7OfnlcsY5F506YHz7eZ otWnoxX2SsxtI2N8qY0xp/3VEMOf6u0wgTVIENnfm7OXulPItwtlpHYLJRhnun9rKhN5BD FJkUIvHRWqN/dGQjLnGSCN9rDqwJ9HAHAZQuR3/ZPmcuqTWJ7A2KTgxcEPYzx/RVQ71e8q 9zefx7SkljfYzf29gJVI3Mxi7acBr3EEMaKB8nnKoC6rRdGfRV4jIjlAt60Osar8kdbj6s UtrHfX59TPXbfX4IlyL1y87R0QxdmMNPfmzsqTH53L40On0BU0YnQscDg7P+mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwCGb656czvb6; Mon, 10 Apr 2023 15:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AFFpBk027441; Mon, 10 Apr 2023 15:15:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AFFpgp027440; Mon, 10 Apr 2023 15:15:51 GMT (envelope-from git) Date: Mon, 10 Apr 2023 15:15:51 GMT Message-Id: <202304101515.33AFFpgp027440@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: d73acb32d334 - main - makefs: remove some unused cd9660 types and defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d73acb32d3343d14c29a995160c007aeadfa79f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d73acb32d3343d14c29a995160c007aeadfa79f3 commit d73acb32d3343d14c29a995160c007aeadfa79f3 Author: Ed Maste AuthorDate: 2023-03-30 23:31:41 +0000 Commit: Ed Maste CommitDate: 2023-04-10 15:15:34 +0000 makefs: remove some unused cd9660 types and defines Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index 80b49f86ecf8..c4baa590101a 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -65,31 +65,8 @@ #define INODE_WARNX(__x) #endif /* DEBUG */ -#define ISO_STRING_FILTER_NONE = 0x00 -#define ISO_STRING_FILTER_DCHARS = 0x01 -#define ISO_STRING_FILTER_ACHARS = 0x02 - -/* -Extended preferences type, in the spirit of what makefs gives us (only ints) -*/ -typedef struct { - const char *shortName; /* Short option */ - const char *name; /* option name */ - char *value; /* where to stuff the value */ - int minLength; /* minimum for value */ - int maxLength; /* maximum for value */ - const char *desc; /* option description */ - int filterFlags; -} string_option_t; - /******** STRUCTURES **********/ -/*Defaults*/ -#define ISO_DEFAULT_VOLUMEID "MAKEFS_CD9660_IMAGE" -#define ISO_DEFAULT_APPID "MAKEFS" -#define ISO_DEFAULT_PUBLISHER "MAKEFS" -#define ISO_DEFAULT_PREPARER "MAKEFS" - #define ISO_VOLUME_DESCRIPTOR_STANDARD_ID "CD001" #define ISO_VOLUME_DESCRIPTOR_BOOT 0 #define ISO_VOLUME_DESCRIPTOR_PVD 1 From nobody Mon Apr 10 15:31:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwCcs4hNmz44NkG; Mon, 10 Apr 2023 15:31:41 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (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 4PwCcs2nK6z4K7L; Mon, 10 Apr 2023 15:31:41 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1035.google.com with SMTP id jx2-20020a17090b46c200b002469a9ff94aso3042863pjb.3; Mon, 10 Apr 2023 08:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681140700; x=1683732700; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vWSOoJlaCa+UfMPHSJkuhgU8wVUshDQkP8e18epaL/I=; b=Shadk/T0HJ1XFjoZFvE/dU5ISfskKqJVJL/hwq5aN+AX1+HW89NKYKDlyKsik0X6X0 DREI1hRo8FWqscF4caq0GWM4oWA8FIGDcU8Jg+dWA6UUNTV/rdBkgtX37a8XP0zRIofo 10A162BalhkFw8hNk/uYCMPzZK63JimGpFoOETjklUdDzyNbW1zNLK2VquZba5IbBJnF 6tPLXNc+oqAr/Ew2GK7zJieyndq0B1jqFZIKyDWPZBLbxYQqxrIeaTZ0drBfDNjA+Dux IZqrMCojULs6Og+xJKiIE8VErHl02VRQnYsSy4qLvJUeaR/GpIkfbmzhx38OcGkAamoj g5Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681140700; x=1683732700; 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=vWSOoJlaCa+UfMPHSJkuhgU8wVUshDQkP8e18epaL/I=; b=StvM11HMBjBn8qtAjn6VlXqcWjWkVJtdN4AC/tOtsRGPZylz3wiko4DR1pc7CKmhHM riJqESr9/aPnyk+esuiHNH1xA6lvEoZ25VOz05Ka2Ufn+hSKvkQsHFmg2zqWpeRkQGpL AupLzQ0TSQ/HRDqxhACvMkNLMsZh81sq7Dh3//IZ9cz8S1SPp3+Bo3urt+OKKWc+H6vj 2g6ZGLvoMftICmAcdOw/7tWWICByoM0UtDdmKXUwt8eQEy83QiZ0CiQ9pljK6Dl3fI92 w7U2y3E36ZBqSCq2lwBso1BbLe17DTr4DFaXmk5dTsXw+sIKnmjh1A9XOCjtxY6jSxoX jQ1A== X-Gm-Message-State: AAQBX9duyvCiUVKZC95jAr4TQoTc7ZOau3ML8pekI9tZSiQMDigNozn2 92llAmFc5xjKk7l8NVqilGILAZPO0bD1+8Vqx+UnQN9nOg== X-Google-Smtp-Source: AKy350bcCMcCQrCGOGf2CLIGJVkci3tTgmQcExXRgiUcL/sWIyw1qbzSVjVlPwkcDx5Ggx89sJYMHrFGGRRqg39i91o= X-Received: by 2002:a17:90a:f10a:b0:236:a1f9:9a9d with SMTP id cc10-20020a17090af10a00b00236a1f99a9dmr5946591pjb.2.1681140699854; Mon, 10 Apr 2023 08:31:39 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202101030102.10312IAC061762@gitrepo.freebsd.org> In-Reply-To: From: Rick Macklem Date: Mon, 10 Apr 2023 08:31:28 -0700 Message-ID: Subject: Re: git: c98a764c681f - main - cp(1): fix performance issue for large non-sparse file copies To: Alexey Dokuchaev Cc: Rick Macklem , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/mixed; boundary="0000000000003ba28b05f8fd12ea" X-Rspamd-Queue-Id: 4PwCcs2nK6z4K7L X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000003ba28b05f8fd12ea Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Apr 10, 2023 at 12:54=E2=80=AFAM Alexey Dokuchaev wrote: > > CAUTION: This email originated from outside of the University of Guelph. = Do not click links or open attachments unless you recognize the sender and = know the content is safe. If in doubt, forward suspicious emails to IThelp@= uoguelph.ca > > > On Sun, Jan 03, 2021 at 01:02:18AM +0000, Rick Macklem wrote: > > commit c98a764c681f8b70812a9f13a6e61c96aa1a69d2 > > > > cp(1): fix performance issue for large non-sparse file copies > > > > PR252358 reported a serious performance problem when > > copying a large non-sparse file on a UFS file system. > > This problem seems to have been caused by a large > > number of SEEK_HOLE operations, with one done > > for each copy_file_range(2) call. > > > > This patch modifies cp(1) to use a large (SSIZE_MAX) > > len argument, reducing the number of system calls > > and resolving the performance issue. > > char *p; > > > > @@ -236,7 +235,7 @@ copy_file(const FTSENT *entp, int dne) > > do { > > if (use_copy_file_range) { > > rcount =3D copy_file_range(from_fd, NULL, > > - to_fd, NULL, bufsize, 0); > > + to_fd, NULL, SSIZE_MAX, 0); > > Hi Rick, > > This change unfortunately breaks copying files in resource-limited > environments (e.g. many port builders do that to prevent runaway > processes): > > ulimit -f 16384000 > cp -p packages/13.0-i386-wip/All/perl5-5.32.1_3.tbz /tmp ; echo $? > Filesize limit exceeded > 153 > > Previously bufsize was 2097152 which was a lot saner than current > 9223372036854775807. Perhaps we should set it per getrlimit(2) > value for RLIMIT_FSIZE? I think zfs_copy_file_range() needs to use vn_rlimit_fsizex() the same way that vn_generic_copy_file_range() does. I have posted the attached patch to D39419. danfe@. Assuming you were using zfs, could you test this patch? (You will need an up to date main kernel and, hopefully, the block cloning stuff has not trashed your zpool.) rick > > ./danfe > --0000000000003ba28b05f8fd12ea Content-Type: application/octet-stream; name="zfscopyrlimit.patch" Content-Disposition: attachment; filename="zfscopyrlimit.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lgazr7f60 LS0tIHpmc192bm9wc19vcy5jLnNhdgkyMDIzLTA0LTEwIDA4OjAxOjA1LjkwNTkwNjAwMCAtMDcw MAorKysgemZzX3Zub3BzX29zLmMJMjAyMy0wNC0xMCAwODoxNDo0MC41NjM3NDMwMDAgLTA3MDAK QEAgLTYyNDIsNyArNjI0Miw4IEBAIHpmc19mcmVlYnNkX2NvcHlfZmlsZV9yYW5nZShzdHJ1Y3Qg dm9wX2NvcHlfZmlsZV9yYW5nZQogCXN0cnVjdCBtb3VudCAqbXA7CiAJc3RydWN0IHVpbyBpbzsK IAlpbnQgZXJyb3I7Ci0JdWludDY0X3QgbGVuID0gKmFwLT5hX2xlbnA7CisJdWludDY0X3QgbGVu OworCXNzaXplX3QgciA9IDA7CiAKIAkvKgogCSAqIFRPRE86IElmIG9mZnNldC9sZW5ndGggaXMg bm90IGFsaWduZWQgdG8gcmVjb3Jkc2l6ZSwgdXNlCkBAIC02MjgwLDkgKzYyODEsMTQgQEAgemZz X2ZyZWVic2RfY29weV9maWxlX3JhbmdlKHN0cnVjdCB2b3BfY29weV9maWxlX3JhbmdlCiAKIAlp by51aW9fb2Zmc2V0ID0gKmFwLT5hX291dG9mZnA7CiAJaW8udWlvX3Jlc2lkID0gKmFwLT5hX2xl bnA7Ci0JZXJyb3IgPSB2bl9ybGltaXRfZnNpemUob3V0dnAsICZpbywgYXAtPmFfZnNpemV0ZCk7 CisJZXJyb3IgPSB2bl9ybGltaXRfZnNpemV4KG91dHZwLCAmaW8sIDAsICZyLCBhcC0+YV9mc2l6 ZV90ZCk7CiAJaWYgKGVycm9yICE9IDApCiAJCWdvdG8gb3V0X2xvY2tlZDsKKwlsZW4gPSBpby51 aW9fcmVzaWQ7CisJLyoKKwkgKiBObyBuZWVkIHRvIGNhbGwgdm5fcmxpbWl0X2ZzaXpleF9yZXMg YmVmb3JlIHJldHVybiwKKwkgKiBzaW5jZSB0aGUgdWlvIGlzIGxvY2FsLgorCSAqLwogCiAJZXJy b3IgPSB6ZnNfY2xvbmVfcmFuZ2UoVlRPWihpbnZwKSwgYXAtPmFfaW5vZmZwLCBWVE9aKG91dHZw KSwKIAkgICAgYXAtPmFfb3V0b2ZmcCwgJmxlbiwgYXAtPmFfb3V0Y3JlZCk7Cg== --0000000000003ba28b05f8fd12ea-- From nobody Mon Apr 10 15:56:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwD9h2N77z44Py6; Mon, 10 Apr 2023 15:56: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 4PwD9h1WJMz3nPP; Mon, 10 Apr 2023 15:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2FDsRxUs3xzxuJwxBgcYMjZBAevsHTef3nFzObCJFc=; b=W1p+9S7J8lEKChFE87VdcWkpJyZM62Uxid633dFl5tqTfcOkLgBY5Sy9WpQbAJrkcUD6Mt KDhKDPQEuU/VL4YKUdgkW0iHHY3S1P7Ui95ld1pnr/cBmooFK2yyAIYwmkNKGODn743ekh efuoZD2Hkn5eZ0pEWAOJ5c2PyXjHMnXP+Oz2E7WizYVKtiGKRyAhlSrBXSsa2GbCAUGOCQ whj9KoILw95WLxXmpNoxFeqTrV5ipOGBrIof0h10G8ZwZHilYHl39v4boICYtlu2U04hIn dk5eRQtCtrLgwQd7aDoeAeBPvGecuVLu05oIzktLbnmkxntSQoo3wuK8sSdqNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b2FDsRxUs3xzxuJwxBgcYMjZBAevsHTef3nFzObCJFc=; b=kRNuQ2FWOCU82MNUmyPDA/Sz1+9QlHbdbSJI4iG/b4ycdrma6pJ6ioIogTh5yLBiUBy5DU H9j4aeoFub6lw6T8fEVIZtpO4SyxEr9d1lV7GiEV/lr+YYjMDc6yf/ly92tssMRJpEen7d xAm18GnssRUOvMmBjEAjfAARtCig5CA9qH32xI1EEnNL/UxSi7eKBSTi4QnjDKODqKIxkI Jr7ph7t+K5igA7LxIqSeD03QhDTnQiGaDSvdjFL+aIQwJDGFtfS77iHQNMDy1vTgexpBJU sBOLQtJRIdZiYLBZrzaFdRh8Pe0crDpgqgTgIjGKxsZG2L0z22K2vmfmgoaF1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681142200; a=rsa-sha256; cv=none; b=xMpB9LOS/uWVeVTidfjQpVyjggvxNw/QqMC7WxzvQWZES52vuZ+DtRnqZNPc3vO9zyYHat al5dfzkN+IKmIiN7PAwX2RT5e6kdrgsZcF5Q44kII75NK85FaSAhMAWBHV55xC7WABjE3U U5DHEewbX7y5Z95W/u7xWhqixsj1+k2FRuncpnpvrYTUW6S0XUVsOSu7X/YH8INEIWuJ+5 OiwJlvDNnuDrBzlLcqez5QU1pApHgddUEXyOi4qmeC1teAdccFDSyRQ6pRrHXpV4C9YNUW yY6ysauUgbFlmHHhXznMwIQZ7HrPodCGnwwOgKokd6CBSEdRsS2A+SwKNkX7pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwD9h0bBFzwVN; Mon, 10 Apr 2023 15:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AFudIA092721; Mon, 10 Apr 2023 15:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AFudDM092720; Mon, 10 Apr 2023 15:56:39 GMT (envelope-from git) Date: Mon, 10 Apr 2023 15:56:39 GMT Message-Id: <202304101556.33AFudDM092720@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: c69ae8419734 - main - if_epair: also remove vlan metadata from mbufs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c69ae8419734829404bdb47d694d105c85f9835e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c69ae8419734829404bdb47d694d105c85f9835e commit c69ae8419734829404bdb47d694d105c85f9835e Author: Kristof Provost AuthorDate: 2023-04-10 11:02:55 +0000 Commit: Kristof Provost CommitDate: 2023-04-10 13:55:35 +0000 if_epair: also remove vlan metadata from mbufs We already remove mbuf tags from packets transitting an if_epair, but we didn't remove vlan metadata. In certain configurations this could lead to unexpected vlan tags turning up on the rx side. PR: 270736 Reviewed by: markj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39482 --- sys/net/if_epair.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index aeed993249f5..e9e1a48b3d58 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -133,6 +133,8 @@ static struct epair_tasks_t epair_tasks; static void epair_clear_mbuf(struct mbuf *m) { + M_ASSERTPKTHDR(m); + /* Remove any CSUM_SND_TAG as ether_input will barf. */ if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) { m_snd_tag_rele(m->m_pkthdr.snd_tag); @@ -140,6 +142,10 @@ epair_clear_mbuf(struct mbuf *m) m->m_pkthdr.csum_flags &= ~CSUM_SND_TAG; } + /* Clear vlan information. */ + m->m_flags &= ~M_VLANTAG; + m->m_pkthdr.ether_vtag = 0; + m_tag_delete_nonpersistent(m); } From nobody Mon Apr 10 15:56:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwD9k0yJpz44Q33; Mon, 10 Apr 2023 15:56: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 4PwD9j2QC4z3nK8; Mon, 10 Apr 2023 15:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRBlEIPp46s0J5cw+P9sDOQ5qmmoEtyxunGpc1EP3eo=; b=If+gkRKEECa4S3bh2Iey6q6dZ0OVQZVyLfPS2FWpgvds82CDkUdaqpuRFIrukb8ZhQVOGm bfKQVmdJo6aEWzMl0pCaBFM0YjGVLNG+JtRhPDPGQJK4xXpVQRhQx8LSJCb0CUaBfncmh+ uIHpeNQuzXMW3EncqyxSHsDvfDg88Ecz/m6HUQegX6ul8XRM9CCK9r5E4de7qU+cFm1cbn l8+WENPZL1Y27Vzf8xTKn7lEZ+Ah6xV9WrF9bU4CuYd4ig6kZYRSl3SweBXAvcXVkMPimJ u6eMRdPnGpbGprNeZuTUd/v/KIWlocy+ayq6mJHDFme0eZ1GjocEIdWP5lIJjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRBlEIPp46s0J5cw+P9sDOQ5qmmoEtyxunGpc1EP3eo=; b=pZ6sAUBDRGUepOJqksvqXqs56KEQ9t4qsY7mO1hBDfihGUgUhJwKRiMth88eNV341hlc+u m5oMLAm8ZQsZe+gi2HYgVBVM33SYCDTvABA370L9VS1ys0WnwEl9sbVqdGsuxNTDstiQ8k QuDww3uT8eAy0bXdGtyIJLlBwfSvsJ8B7DlIm1/AELHG6INnF1IBPoafUlJ4Mybaoqt5WM pj6qc2xirl/6DPlgCXL17MLomgffED8q4J3Zto/VnwAa4z1JYxvo9UAxuc6KmHzDY4geUe NzLUUFLeRGg8PNWiOAl2pOyu+2NTgKqNDhJnKAgcJ9ayRX4XaaZheAROPvyIHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681142201; a=rsa-sha256; cv=none; b=q3rooSxnXpwZFTTkiitKFCYpDKL2aZhlr25qOzFvJNLmL1py0hmZIbSKyRA4gYj3Am0i2a bBqEMzKljSKlfr4Dh+2ogYM+GXz39cV1SeAc0NaizWnCxTnDt3fEAoXKWniRLf/+ezUu4V STXM04HI/cqXsLUPrEaXRlh1vNaT3EQsDXFUC7PZii1rsVN2n0gfS/aOfxH/tFn7RIWgCF ZFmVsV5edYVnvHQfghvYLHMHlGPg/ghHDPUJU0lOboxLHAOy0tRFlZk9KvayZzewwhbE8v XcKu4YPoY6LIf/aQLIbcm5oj2ukPuT4eUd8b9ZHip63RejLpxfDHYtvMnnVUoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwD9j17XNzwxG; Mon, 10 Apr 2023 15:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AFuf1c092747; Mon, 10 Apr 2023 15:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AFufPq092746; Mon, 10 Apr 2023 15:56:41 GMT (envelope-from git) Date: Mon, 10 Apr 2023 15:56:41 GMT Message-Id: <202304101556.33AFufPq092746@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: d116b8430b90 - main - epair tests: test PCP tagged packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d116b8430b90212e308fe9945038c7bd98edf1bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d116b8430b90212e308fe9945038c7bd98edf1bc commit d116b8430b90212e308fe9945038c7bd98edf1bc Author: Kristof Provost AuthorDate: 2023-04-10 10:55:10 +0000 Commit: Kristof Provost CommitDate: 2023-04-10 13:55:53 +0000 epair tests: test PCP tagged packets PR: 270736 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39483 --- tests/sys/net/Makefile | 1 + tests/sys/net/if_epair_test.sh | 65 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index 730727b3d688..b4fea3041ebe 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -6,6 +6,7 @@ TESTSDIR= ${TESTSBASE}/sys/net BINDIR= ${TESTSDIR} ATF_TESTS_C+= if_epair +ATF_TESTS_SH+= if_epair_test ATF_TESTS_SH+= if_bridge_test TEST_METADATA.if_bridge_test+= required_programs="python" ATF_TESTS_SH+= if_clone_test diff --git a/tests/sys/net/if_epair_test.sh b/tests/sys/net/if_epair_test.sh new file mode 100644 index 000000000000..45b5552fb3c9 --- /dev/null +++ b/tests/sys/net/if_epair_test.sh @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/../common/vnet.subr + +atf_test_case "pcp" "cleanup" +pcp_head() +{ + atf_set descr 'Test PCP over if_epair. PR#270736' + atf_set require.user root +} + +pcp_body() +{ + vnet_init + + j="if_epair_test_pcp" + + epair=$(vnet_mkepair) + + vnet_mkjail ${j}one ${epair}a + vnet_mkjail ${j}two ${epair}b + + jexec ${j}one ifconfig ${epair}a 192.0.2.1/24 pcp 3 up + jexec ${j}two ifconfig ${epair}b 192.0.2.2/24 up + + atf_check -s exit:0 -o ignore \ + jexec ${j}one ping -c 1 192.0.2.2 + + # Now set a different PCP. This used to lead to double tagging and failed pin. + atf_check -s exit:0 -o ignore \ + jexec ${j}one ping -C5 -c 1 192.0.2.2 +} + +pcp_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "pcp" +} From nobody Mon Apr 10 16:03:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwDKG5fN7z44Q7J; Mon, 10 Apr 2023 16:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwDKG5DXrz3wwT; Mon, 10 Apr 2023 16:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGGPPXcYkJLceTMiLu9EjctOGrANEDz3zqYAdJ/CoOc=; b=Lo6ihYKRZoB57w1UnPBuGT/NdkSXB6GY0sbofOdhq8s78v2jxwAOVGtfzT/tQe6OexNshi aVjVlpjiJCoqj1lls/5XfUNq4WzcNpX4HSM+aFNNzhVEMH7u8n7fmeiGDa/HgkN39lmahx 0WfDyoT2grDF+xExmVwGLiPm5W2rxriSlsTw5nPvuX4VIx0ep/Zkh5aA+luMamXzWwYmYW 5SI1DxV0pJlPuwxIqU3uCSSCValvtSWLD1EN1ZSS38B1Cp6pXyXH7hSnrHymNCPJvXxJQN Fc0EYqcU2QPeK28mYXHdgKhQY6Q1vAQ3iX8lYWg/93G9/5bXVWEUAP0o1klCBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGGPPXcYkJLceTMiLu9EjctOGrANEDz3zqYAdJ/CoOc=; b=hZkRaPkSbmxZYiG2Oe5mL5mWWb7sXG8TN3rnb2iF8Zp9K1nFMbnU0EwYXJCb35aK4k4blN cwVoX6luQrrUPB+V11W4IbQrV+p3P+IBmW62iBlfiyAOjk8kzY3c9MrWbbCNZKJf6zSG0J RAdLgtAPj/H2QdMJQT4eJm7FTCWsRNyQtP1dDCtZQHMAaWfRZe1DL4sQUy3QxUxfw42z0F aMQJ5XBVsl0L6OOlINJe/Tt7cpZF+LUhgpB9YWj6ilCB486NRCjLNTzca6ByK0DkfSQdh7 qbOUs8MeAEcCRs94iaj5CRIisLBX5/66wYX0pvSxnAn54rusuaGmIdB2HKsi5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681142594; a=rsa-sha256; cv=none; b=xwpCAjKmSt/ixHJBY4ZkQWQLyTirDkIPRIWvKRTzsWgEd0mXwic1NZmLn4ZAeumY9T5vpO OJPXRoiQJDSF8aNbSvrRA35yr2ztT9z4cKSvpWMOrVG4PEk9DgrWPMa0f6bO7yMToG6Z2/ I/WZZeG92hzFC5X/YDUHikkMivpjIO6x1XgO/tOCr76QxjCvVOixAQGVAsdbXY2WKY07pW 6nSWmLowoEIB2FVkezn8FNVWNYC4Mcskx1E7YSn9akSseHPOVq+4Kmj0D1ZqzmegJSOu9e NjgUHmocyew/S1E1tSnhzuBfp4oE/QCmWYQm4Os57xaW4vdBBD4K/xlT91ogSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwDKG40tZzx8Z; Mon, 10 Apr 2023 16:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AG3EBl009883; Mon, 10 Apr 2023 16:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AG3Ecv009882; Mon, 10 Apr 2023 16:03:14 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:03:14 GMT Message-Id: <202304101603.33AG3Ecv009882@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: c02e6ca7c22a - main - makefs: simplify filename conversion handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c02e6ca7c22aa340fb261233f4f9c4438fee301a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c02e6ca7c22aa340fb261233f4f9c4438fee301a commit c02e6ca7c22aa340fb261233f4f9c4438fee301a Author: Ed Maste AuthorDate: 2023-03-31 13:05:52 +0000 Commit: Ed Maste CommitDate: 2023-04-10 16:03:06 +0000 makefs: simplify filename conversion handling Obtained from: OpenBSD 4095a2e01d18 Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index cf2696e578a4..54c1794d1500 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -147,10 +147,6 @@ static int cd9660_level1_convert_filename(iso9660_disk *, const char *, char *, int); static int cd9660_level2_convert_filename(iso9660_disk *, const char *, char *, int); -#if 0 -static int cd9660_joliet_convert_filename(iso9660_disk *, const char *, char *, - int); -#endif static int cd9660_convert_filename(iso9660_disk *, const char *, char *, int); static void cd9660_populate_dot_records(iso9660_disk *, cd9660node *); static int64_t cd9660_compute_offsets(iso9660_disk *, cd9660node *, int64_t); @@ -1585,11 +1581,6 @@ cd9660_compute_full_filename(cd9660node *node, char *buf) errx(EXIT_FAILURE, "Pathname too long."); } -/* NEW filename conversion method */ -typedef int(*cd9660_filename_conversion_functor)(iso9660_disk *, const char *, - char *, int); - - /* * TODO: These two functions are almost identical. * Some code cleanup is possible here @@ -1722,16 +1713,6 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, return namelen + extlen + found_ext; } -#if 0 -static int -cd9660_joliet_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) -{ - /* TODO: implement later, move to cd9660_joliet.c ?? */ -} -#endif - - /* * Convert a file name to ISO compliant file name * @param char * oldname The original filename @@ -1745,13 +1726,13 @@ cd9660_convert_filename(iso9660_disk *diskStructure, const char *oldname, char *newname, int is_file) { assert(1 <= diskStructure->isoLevel && diskStructure->isoLevel <= 2); - /* NEW */ - cd9660_filename_conversion_functor conversion_function = NULL; if (diskStructure->isoLevel == 1) - conversion_function = &cd9660_level1_convert_filename; + return(cd9660_level1_convert_filename(diskStructure, + oldname, newname, is_file)); else if (diskStructure->isoLevel == 2) - conversion_function = &cd9660_level2_convert_filename; - return (*conversion_function)(diskStructure, oldname, newname, is_file); + return (cd9660_level2_convert_filename(diskStructure, + oldname, newname, is_file)); + abort(); } int From nobody Mon Apr 10 16:14:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwDZJ2tg4z44RDy; Mon, 10 Apr 2023 16:14: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 4PwDZJ1s9Rz4FcS; Mon, 10 Apr 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plNGWUkExVMp6hq9t7Gl7WJxUtx8HvcTP7kMZ5m0wFQ=; b=Xx7saLxEu6C5unjwSjeyxf8KQ9juoenwnDkFcIB1EQeOMRCECTnFfOAkQGd24WSG39X+tn A5P+oFogi+quPWlreP9QoA6kJmLA8+0vkWuygJpVUIBI5UoLGXOVX0M1T1wbfhF9+juCj7 TzxSYpCy/+B9y4g/bphcYVsAMCkTnz6JHE93LrEU4jKqqzxjkEsuCZmioHAyRnqPIfvp83 hEq0UK3Af476hjvSoSuboaw6rVUah7KE1z53IVzklMtsmnUFIos9KITLT4XgNSEp8NSjjQ XAZ4ulRVEUgAQnegfWvKdg6MuqDs194dwogG7FDFiHdnCXYTlT9DOtZbB/8jXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plNGWUkExVMp6hq9t7Gl7WJxUtx8HvcTP7kMZ5m0wFQ=; b=gr58oPlQEWYE4FpN7JFF7TuPuI+CdjErQP+5IeagY3G1tiY+Vzv9nNwPUQs9U29J4vMkEK sYyVxVEyidOMiJin2cxuzsQ9WH3K7bBcdxa3y6xR9FiDrIgrnvJJ83AFu4DmPAImLenHdH aPCego6ot+vULyNMof3SvIzgVhh6w45bJr1zSEULg7cszTRoCJ2Ykjh4ZQfL9s3q7/CUq8 aUhfzBzAcWn0ce88JMOJlykIAYejhpMuz4nIhDWdomZdDaNp6GbjBROTCa1opcEzKx90q9 QfsuwJ/6SdXI2jPysP5TptFd0Jz/LjKc41xSL+fCRmfwnqhEmUBBv5c2KDnWJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681143272; a=rsa-sha256; cv=none; b=apT+HpqRSA5kfFs/mvI7bOwkp8pxup3zwCyNT33WkEPWqO2YhpnVFhSJvqOfDIOHKrbIKc Y/zCMqwD7+KbL/UrRtM/Rly0pRSsDm/2ZcEwUcZsaRzHbnwc13BZhRhKhN17LX2ztLXQa1 CxfkKUyHwhEk8q2j0UFuN7gBWyi4t0hetM9ocWbAIBnFyckEr6YfuPE/VIob9p+zGfG2PG 3swNS2Nwd+aQ+Gux0xM9LCWcQ2HMb8E7tojY7sS0mNaigH9lPwK9qSI11vXeb3wPX5hPgX flpT1KvyNJmXw4RWJvqxXEpF1XI6YokR3vldDFo2xg7OYEAL2Et16zqnJM/3kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwDZJ0yvPzxCR; Mon, 10 Apr 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AGEW3Q025985; Mon, 10 Apr 2023 16:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGEWDD025984; Mon, 10 Apr 2023 16:14:32 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:14:32 GMT Message-Id: <202304101614.33AGEWDD025984@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: d862b165a6d3 - main - bridge: Add support for emulated netmap mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d862b165a6d3436d01c8ae63ab7879d17a5d143a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d862b165a6d3436d01c8ae63ab7879d17a5d143a commit d862b165a6d3436d01c8ae63ab7879d17a5d143a Author: Mark Johnston AuthorDate: 2023-04-10 15:18:25 +0000 Commit: Mark Johnston CommitDate: 2023-04-10 16:14:11 +0000 bridge: Add support for emulated netmap mode if_bridge receives packets via a special interface, if_bridge_input, rather than by if_input. Thus, netmap's usual hooking of ifnet routines does not work as expected. Instead, modify bridge_input() to pass packets directly to netmap when it is enabled. This applies to both locally delivered packets and forwarded packets. When a netmap application transmits a packet by writing it to the host TX ring, the mbuf chain is passed to if_input, which ordinarily points to ether_input(). However, when transmitting via if_bridge, bridge_input() needs to see the packet again in order to decide whether to deliver or forward. Thus, introduce a new protocol flag, M_BRIDGE_INJECT, which 1) causes the packet to be passed to bridge_input() again after Ethernet processing, and 2) avoids passing the packet back to netmap. The source MAC address of the packet is used to determine the original "receiving" interface. Reviewed by: vmaffione MFC after: 2 months Sponsored by: Zenarmor Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38066 --- share/man/man4/bridge.4 | 24 +++++++++++ sys/net/ethernet.h | 1 + sys/net/if_bridge.c | 108 ++++++++++++++++++++++++++++++++++++++++++++---- sys/net/if_bridgevar.h | 4 +- sys/net/if_ethersubr.c | 7 +++- 5 files changed, 134 insertions(+), 10 deletions(-) diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index b4dabcbb79bc..2671bfaf73cc 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -421,6 +421,29 @@ interface and not to the bridge members. Enabling .Va net.link.bridge.pfil_local_phys will let you do the additional filtering on the physical interface. +.Sh NETMAP +.Xr netmap 4 +applications may open a bridge interface in emulated mode. +The netmap application will receive all packets which arrive from member +interfaces. +In particular, packets which would otherwise be forwarded to another +member interface will be received by the netmap application. +.Pp +When the +.Xr netmap 4 +application transmits a packet to the host stack via the bridge interface, +.Nm +receive it and attempts to determine its +.Ql source +interface by looking up the source MAC address in the interface's learning +tables. +Packets for which no matching source interface is found are dropped and the +input error counter is incremented. +If a matching source interface is found, +.Nm +treats the packet as though it was received from the corresponding interface +and handles it normally without passing the packet back to +.Xr netmap 4 . .Sh EXAMPLES The following when placed in the file .Pa /etc/rc.conf @@ -495,6 +518,7 @@ ifconfig bridge0 addm fxp0 addm gif0 up .Xr gif 4 , .Xr ipf 4 , .Xr ipfw 4 , +.Xr netmap 4 , .Xr pf 4 , .Xr ifconfig 8 .Sh HISTORY diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 98b02d71da50..e259ab53e77e 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -43,6 +43,7 @@ * Ethernet-specific mbuf flags. */ #define M_HASFCS M_PROTO5 /* FCS included at end of frame */ +#define M_BRIDGE_INJECT M_PROTO6 /* if_bridge-injected frame */ /* * Ethernet CRC32 polynomials (big- and little-endian versions). diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 78be987d681b..f71d7c0cdfd1 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -267,6 +267,7 @@ struct bridge_softc { uint32_t sc_brtexceeded; /* # of cache drops */ struct ifnet *sc_ifaddr; /* member mac copied from */ struct ether_addr sc_defaddr; /* Default MAC address */ + if_input_fn_t sc_if_input; /* Saved copy of if_input */ struct epoch_context sc_epoch_ctx; }; @@ -298,6 +299,7 @@ static int bridge_altq_transmit(if_t, struct mbuf *); #endif static void bridge_qflush(struct ifnet *); static struct mbuf *bridge_input(struct ifnet *, struct mbuf *); +static void bridge_inject(struct ifnet *, struct mbuf *); static int bridge_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); static int bridge_enqueue(struct bridge_softc *, struct ifnet *, @@ -768,6 +770,15 @@ bridge_clone_create(struct if_clone *ifc, char *name, size_t len, #ifdef VIMAGE ifp->if_reassign = bridge_reassign; #endif + sc->sc_if_input = ifp->if_input; /* ether_input */ + ifp->if_input = bridge_inject; + + /* + * Allow BRIDGE_INPUT() to pass in packets originating from the bridge + * itself via bridge_inject(). This is required for netmap but + * otherwise has no effect. + */ + ifp->if_bridge_input = bridge_input; BRIDGE_LIST_LOCK(); LIST_INSERT_HEAD(&V_bridge_list, sc, sc_list); @@ -2355,6 +2366,19 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif, sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING) goto drop; +#ifdef DEV_NETMAP + /* + * Hand the packet to netmap only if it wasn't injected by netmap + * itself. + */ + if ((m->m_flags & M_BRIDGE_INJECT) == 0 && + (if_getcapenable(ifp) & IFCAP_NETMAP) != 0) { + ifp->if_input(ifp, m); + return; + } + m->m_flags &= ~M_BRIDGE_INJECT; +#endif + /* * At this point, the port either doesn't participate * in spanning tree or it is in the forwarding state. @@ -2461,7 +2485,7 @@ drop: static struct mbuf * bridge_input(struct ifnet *ifp, struct mbuf *m) { - struct bridge_softc *sc = ifp->if_bridge; + struct bridge_softc *sc; struct bridge_iflist *bif, *bif2; struct ifnet *bifp; struct ether_header *eh; @@ -2471,11 +2495,31 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) NET_EPOCH_ASSERT(); - if ((sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) - return (m); + eh = mtod(m, struct ether_header *); + vlan = VLANTAGOF(m); + sc = ifp->if_bridge; + if (sc == NULL) { + /* + * This packet originated from the bridge itself, so it must + * have been transmitted by netmap. Derive the "source" + * interface from the source address and drop the packet if the + * source address isn't known. + */ + KASSERT((m->m_flags & M_BRIDGE_INJECT) != 0, + ("%s: ifnet %p missing a bridge softc", __func__, ifp)); + sc = if_getsoftc(ifp); + ifp = bridge_rtlookup(sc, eh->ether_shost, vlan); + if (ifp == NULL) { + if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1); + m_freem(m); + return (NULL); + } + m->m_pkthdr.rcvif = ifp; + } bifp = sc->sc_ifp; - vlan = VLANTAGOF(m); + if ((bifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + return (m); /* * Implement support for bridge monitoring. If this flag has been @@ -2496,8 +2540,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (m); } - eh = mtod(m, struct ether_header *); - bridge_span(sc, m); if (m->m_flags & (M_BCAST|M_MCAST)) { @@ -2526,6 +2568,18 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) /* Perform the bridge forwarding function with the copy. */ bridge_forward(sc, bif, mc); +#ifdef DEV_NETMAP + /* + * If netmap is enabled and has not already seen this packet, + * then it will be consumed by bridge_forward(). + */ + if ((if_getcapenable(bifp) & IFCAP_NETMAP) != 0 && + (m->m_flags & M_BRIDGE_INJECT) == 0) { + m_freem(m); + return (NULL); + } +#endif + /* * Reinject the mbuf as arriving on the bridge so we have a * chance at claiming multicast packets. We can not loop back @@ -2542,7 +2596,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } if (mc2 != NULL) { mc2->m_pkthdr.rcvif = bifp; - (*bifp->if_input)(bifp, mc2); + mc2->m_flags &= ~M_BRIDGE_INJECT; + sc->sc_if_input(bifp, mc2); } /* Return the original packet for local processing. */ @@ -2570,6 +2625,18 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) #define PFIL_HOOKED_INET6 false #endif +#ifdef DEV_NETMAP +#define GRAB_FOR_NETMAP(ifp, m) do { \ + if ((if_getcapenable(ifp) & IFCAP_NETMAP) != 0 && \ + ((m)->m_flags & M_BRIDGE_INJECT) == 0) { \ + (ifp)->if_input(ifp, m); \ + return (NULL); \ + } \ +} while (0) +#else +#define GRAB_FOR_NETMAP(ifp, m) +#endif + #define GRAB_OUR_PACKETS(iface) \ if ((iface)->if_type == IFT_GIF) \ continue; \ @@ -2592,7 +2659,9 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) /* It's passing over or to the bridge, locally. */ \ ETHER_BPF_MTAP(bifp, m); \ if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1); \ - if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); \ + if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);\ + /* Hand the packet over to netmap if necessary. */ \ + GRAB_FOR_NETMAP(bifp, m); \ /* Filter on the physical interface. */ \ if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \ PFIL_HOOKED_INET6)) { \ @@ -2635,6 +2704,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) #undef CARP_CHECK_WE_ARE_DST #undef CARP_CHECK_WE_ARE_SRC #undef PFIL_HOOKED_INET6 +#undef GRAB_FOR_NETMAP #undef GRAB_OUR_PACKETS /* Perform the bridge forwarding function. */ @@ -2643,6 +2713,28 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (NULL); } +/* + * Inject a packet back into the host ethernet stack. This will generally only + * be used by netmap when an application writes to the host TX ring. The + * M_BRIDGE_INJECT flag ensures that the packet is re-routed to the bridge + * interface after ethernet processing. + */ +static void +bridge_inject(struct ifnet *ifp, struct mbuf *m) +{ + struct bridge_softc *sc; + + KASSERT((if_getcapenable(ifp) & IFCAP_NETMAP) != 0, + ("%s: iface %s is not running in netmap mode", + __func__, if_name(ifp))); + KASSERT((m->m_flags & M_BRIDGE_INJECT) == 0, + ("%s: mbuf %p has M_BRIDGE_INJECT set", __func__, m)); + + m->m_flags |= M_BRIDGE_INJECT; + sc = if_getsoftc(ifp); + sc->sc_if_input(ifp, m); +} + /* * bridge_broadcast: * diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index 69b9aa33f133..5696e8a62ae0 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -309,8 +309,10 @@ struct ifbpstpconf { KASSERT((_ifp)->if_bridge_input != NULL, \ ("%s: if_bridge not loaded!", __func__)); \ _m = (*(_ifp)->if_bridge_input)(_ifp, _m); \ - if (_m != NULL) \ + if (_m != NULL) { \ _ifp = _m->m_pkthdr.rcvif; \ + m->m_flags &= ~M_BRIDGE_INJECT; \ + } \ } while (0) #define BRIDGE_OUTPUT(_ifp, _m, _err) do { \ diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 34ff4ac22e7f..839bae8e9d43 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -667,10 +667,15 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m) /* * Allow if_bridge(4) to claim this frame. + * * The BRIDGE_INPUT() macro will update ifp if the bridge changed it * and the frame should be delivered locally. + * + * If M_BRIDGE_INJECT is set, the packet was received directly by the + * bridge via netmap, so "ifp" is the bridge itself and the packet + * should be re-examined. */ - if (ifp->if_bridge != NULL) { + if (ifp->if_bridge != NULL || (m->m_flags & M_BRIDGE_INJECT) != 0) { m->m_flags &= ~M_PROMISC; BRIDGE_INPUT(ifp, m); if (m == NULL) { From nobody Mon Apr 10 16:14:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwDZK60swz44Qxs; Mon, 10 Apr 2023 16: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 4PwDZK3tF0z4Fjc; Mon, 10 Apr 2023 16: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=1681143273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2C7h1xWBFj1K3Lts4o/KhQgS3b+jwRhCUNFE8XUWhg=; b=iUQ82/fxv1ZFBDKMyA+QPWVpAiR56Ix+FaGW+cEbB9Vkw0ptsRcITo/k7hgQxzZzY+Edrb 1yzmUtzlMLlPUM1QzvC7q+1AvNCxgQfsin5tVZge4oes62UjfXVfai5sp1S2D1nWlpqbVh 5S+UkOQHqSmhC/nGYAnUrn8dr0U4xttdsI5/5gwD5TC7L6bwZq5WsnJ0whRYULWod/cnx0 Y8dZ9mZYsYSL8d/pD+iPLNFQ+KI/cNxc6mbjWc4nvdG8KNLzCjvOL+B1vtFQg+t/viTiPS 3lIFGeC7N/u4k6+YJBNbvkLWUdxaN8oA0v8rosSlUNMaLJzua32ksc+IrR7Rzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2C7h1xWBFj1K3Lts4o/KhQgS3b+jwRhCUNFE8XUWhg=; b=LzyusPLAknxaMJZ19mutdkFfGCwN1GfEE/u8qNjKT9KvdeN0WS6CqYuznDtRoo1/TotX+Q b5NsFE9FYfYtvc97+sg12lAb2bEmwVLv7LSM6fV16vJ6N3FYVGAcIsBwQLKn/jWyVLwYVU e6x9itQzYGfR0eTXeSzzo2XezqdXKtoKRmK1FlKy4W358cwQ/+gf+k3ntB19hA/ZaNaPWQ 5SOpa8Zh4wLH6w3B+wwq1BJ7LtrrR4kKH2ugRy4zE1XAxUJ2fowhWgh/VXedkWkmIHU8ci nbKQnqwWz82oKrHjma3UaSYQej5O45mhXcHIzdcR6AoaE8QcAEj3s0m6H6JIJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681143273; a=rsa-sha256; cv=none; b=KTJxKULe5QQkaHPVVTyTFMfxJhXlk7S2RdaXy9FuCx25cLwv0XaBYuWw0vpGhILLIaTMiq A+9FLwNKExIjauXtIzZQKYibETUShSvO+AowKug/Ipze5afXyFs8fpMVoz/mVsQn9I+Ayn ptVA99wblvGe4GZKlB9W3toWaBF+U/sV9/YlGYuhZRSfxvwVbyvQiMTkwu/tA2reErdklv lAq2gN/zRoUNkSQ1DeVY21GphRiGww4Sq8aikLw7NeQf68BVaWJH5i8kGLfcCpnBhyHM3o nzYtKXiBaAtUaJKfvvkOJUju3aws9dUZWvFbpsMnCxdnaXAnVh7Uv8YqQ+5Y2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwDZK1r9QzxM7; Mon, 10 Apr 2023 16:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AGEXqa026004; Mon, 10 Apr 2023 16:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGEXUZ026003; Mon, 10 Apr 2023 16:14:33 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:14:33 GMT Message-Id: <202304101614.33AGEXUZ026003@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: 0388a0887a8d - main - dtrace: handle NOP instructions in the riscv invop handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0388a0887a8d0e6f21b130bf7d9f6b455958c7eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0388a0887a8d0e6f21b130bf7d9f6b455958c7eb commit 0388a0887a8d0e6f21b130bf7d9f6b455958c7eb Author: Christos Margiolis AuthorDate: 2023-04-10 15:30:48 +0000 Commit: Mark Johnston CommitDate: 2023-04-10 16:14:11 +0000 dtrace: handle NOP instructions in the riscv invop handler This will be used by a forthcoming port of the kinst provider. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39481 --- sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c index f32bb3a2343e..1717b118be7e 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c @@ -308,6 +308,9 @@ dtrace_invop_start(struct trapframe *frame) return (0); } + if (match_opcode(invop, MATCH_C_NOP, MASK_C_NOP)) + return (0); + #ifdef INVARIANTS panic("Instruction %x doesn't match any opcode.", invop); #endif From nobody Mon Apr 10 16:14:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwDZM1hX1z44RKs; Mon, 10 Apr 2023 16:14: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 4PwDZL3Q9xz4FgB; Mon, 10 Apr 2023 16:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bz2zIfM3YgHy2I5x7fiq9rMRjUVqbtg2Vjb0UgF9b7w=; b=TvODJ82Gp6xQV2QO3wkKBH2O5kKMi5t5b1xeekeeAMU5VLVLoVl9XltXowgIl1lfXB+38i b7lsWw/N2mdg171DXwkv8QpSjFMclKjmcaFyZ6mPzeaPVB3ZsyqG81AqYV8H2l7gNwgvQ3 MvXpn7RQJ48TPk506l2OU+u3d6vOWGviqTVlYFYwLC87RnDt7sVEeqrbzL2EpYbvaKHsZ7 kng3SBr7vxETLTFCznPuAu4SJo6HvWsuRVLkTqgTE/CK+/uRml1ZWwwa/lYPLwXZ909IYz yJzyyeDtwiAAipVuxuQ7g3X+TCm1qa9X0VVfZY8lSl3iexNAjz4P6fGbWrbHZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681143274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bz2zIfM3YgHy2I5x7fiq9rMRjUVqbtg2Vjb0UgF9b7w=; b=qwu46djxELgBhIHmms3fhUjotTCUT8j7Ww4/cZCqZqJ1QF5U0yiCK8x1hyIY1Qt4SJuFWC GKX+Mbptgb1qltfKQfaEk//CvnfY3d+ywG/2LQiG+qnUMcYK1uT00he7e3VQhZYcCME3SK FuYJ/1CEPbr6eK0prBIjEYAYoNKK9R+A8Xhdklfeldraytms8+7YuZLsdNnd8bqJ+bPFm0 mJpEscPpJkz3o1s1950IRGTd5AadRhLXKHFOp/fQzfFA8IYauQA51aW2wo4cU12CuZVyBW wZ7utsp1RswFlI4v5Um6/+lBMaqUXtdnb6tueKRko/GABPTsS51KhDUbWWf5FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681143274; a=rsa-sha256; cv=none; b=OwOicpyyfPMj6gaAjokA5M7uQvm4bgSPl1IEV4US3dX8JWm5FMr2+fQ+mEkhoRMPYJLIgw ZD4DWPSNHfPZrOvDzTGBUe1YCWm/7rK5yIhOn8O9RFi+envUy76bvFp9xF2yWtPiDHqpVt h2pQCrZcSkscYk0XlYl8XPgfOQCoBW/OjWZGBo4R8/yBrI/qxHNckGQbWjHziqas5or3GP kzTJymPLaM0PO8zfjziJcqdJjMAHIp+srHMZaf2pp4yc2xMadFa7pbMYWanQ3ljNQJZZwY RiWnjA3+V3pASghWU/0m09EGEcFDGc4k7SV3fhJ3fBifGf4DhCbh3zHErEMp7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwDZL2Vsvzx9Z; Mon, 10 Apr 2023 16:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AGEYbu026030; Mon, 10 Apr 2023 16:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGEY9Z026029; Mon, 10 Apr 2023 16:14:34 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:14:34 GMT Message-Id: <202304101614.33AGEY9Z026029@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: 38594ff9c0c9 - main - ofw: fix memory leak in ofwbus_attach() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38594ff9c0c9568b5082ba3273103904a6afd38e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=38594ff9c0c9568b5082ba3273103904a6afd38e commit 38594ff9c0c9568b5082ba3273103904a6afd38e Author: Christos Margiolis AuthorDate: 2023-04-10 15:31:46 +0000 Commit: Mark Johnston CommitDate: 2023-04-10 16:14:12 +0000 ofw: fix memory leak in ofwbus_attach() PR: 269509 Reported by: Jaroslaw Pelczar Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38903 --- sys/dev/ofw/ofwbus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 80d013cd06ee..b35a3ce968e6 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -130,6 +130,7 @@ ofwbus_attach(device_t dev) if (ofw_bus_gen_setup_devinfo(&obd, node) != 0) continue; simplebus_add_device(dev, node, 0, NULL, -1, NULL); + ofw_bus_gen_destroy_devinfo(&obd); } return (bus_generic_attach(dev)); } From nobody Mon Apr 10 16:28:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwDt5540nz44Rl8; Mon, 10 Apr 2023 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwDt53ZsJz3Nmk; Mon, 10 Apr 2023 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681144093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwrXtqPZSJPerEWe1XozZzM2jUUJkQxKrfSI/mvjidk=; b=Sjjf0tq74mFH+CYeXhXyT+pn2nZj+DXBw5rNKsZMuoQaYZLt2shdnKMieKNCufeYWX7BHI 2Dp9jNO4CTCFlY2XK9fAELLMzmaIzlGHsJWq3eMWAD02X3n53zxbq8l0P7ccBTelL+B9Hd 8xQQa9vdLBLnb9p6LTu+bhWLkWJ/BFbd9BQQnF5RU+/AFA1AZlHfjBFwcweKTMrhlnEWcx 4jXSDpd+kkGpwjvVo6/lbwik3XjaCiL7C2l7e1FwaDcvl3kE+2LlGyw4o879p7hHBkj/Px G/Q/CioH0tYTT+L5AIKFAlBBDsqImqG8DRf0PLxpofqcIU6V3lB3ZqgJOO6y5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681144093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwrXtqPZSJPerEWe1XozZzM2jUUJkQxKrfSI/mvjidk=; b=b4/TQCJ44iRVQ9RHr2GXi2dROmLhoZFybowhoYw+Fbgb1UOrAntamkGTY+DMzl94ATtvlC bTeyJALsr/EqtqCNZdoZZrp+KBF09jQQ+1F9v1YJhw4qSKdivy30s+gZlsSvFGlARcV+WL SeEf/TOoU0qIcOAuR0OEUg1o30UpCErCAwZ1iflsxarEIz6+5fIVtSyQTVyoUW+xCBLv8m ZVxF7VhmxthuVXDHKMMkc1qt/QUdvfUGkQPc+XlpTuGaOXc3MaAyw7a3xWsxIdjDxJ81yT ROVRWeJ9ii83mrh3DfpbNfcTrhywoRuvVowNdFmvGIoTN5ES+XUacBrw7N9Gnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681144093; a=rsa-sha256; cv=none; b=wih0ITlR75Vdu013MH2z3q4196ppGrrSrcMs5/oaU0eupk6dYvnAwR10XbTw12Tyz2rtM3 d2129DvHmxNk5JdhWB6R5JBHi/C4hHL3we16SxdR3YOzwBGjNaceaG7rfWCGjvwctTojiH ead3gE7UQqpaxG/i/IP2iIeA5dEc1TNGZvXFHySWDaj65P6bQpS5r969UubQcYivRwmMY3 J5l5sEk1HLxLpnSjQuB1OGdprKAm0sSGKrBFTEFKhDg0ro2RMTf7fLs91+HhJVrBop/tid jNc8tyQmaWmceLYz/7BPngIC7GEGzzVTqzXSiVRO/vO+mcXu41vzXvIftHNhSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwDt52YJFzxDJ; Mon, 10 Apr 2023 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AGSDm1042400; Mon, 10 Apr 2023 16:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGSDtV042399; Mon, 10 Apr 2023 16:28:13 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:28:13 GMT Message-Id: <202304101628.33AGSDtV042399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 9309a460b23a - main - Implement GEOM::rotation_rate for gmirror List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9309a460b23a8cda8d47c5f775da7fc6472d9925 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9309a460b23a8cda8d47c5f775da7fc6472d9925 commit 9309a460b23a8cda8d47c5f775da7fc6472d9925 Author: Alan Somers AuthorDate: 2023-04-07 16:07:50 +0000 Commit: Alan Somers CommitDate: 2023-04-10 16:27:10 +0000 Implement GEOM::rotation_rate for gmirror If all of the mirror's children have the same rotation rate, report that. But if they have mixed rotation rates, or if any child has an unknown rotation rate, report "Unknown". MFC after: 2 weeks Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D39458 --- sys/geom/mirror/g_mirror.c | 29 +++++++++++++++++++++++++++++ sys/geom/mirror/g_mirror.h | 1 + 2 files changed, 30 insertions(+) diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 94e615c8038d..9153345cc7e2 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include FEATURE(geom_mirror, "GEOM mirroring support"); @@ -479,6 +480,10 @@ g_mirror_init_disk(struct g_mirror_softc *sc, struct g_provider *pp, error = g_getattr("GEOM::candelete", disk->d_consumer, &i); if (error == 0 && i != 0) disk->d_flags |= G_MIRROR_DISK_FLAG_CANDELETE; + error = g_getattr("GEOM::rotation_rate", disk->d_consumer, + &disk->d_rotation_rate); + if (error) + disk->d_rotation_rate = DISK_RR_UNKNOWN; if (md->md_provider[0] != '\0') disk->d_flags |= G_MIRROR_DISK_FLAG_HARDCODED; disk->d_sync.ds_consumer = NULL; @@ -1147,6 +1152,27 @@ g_mirror_kernel_dump(struct bio *bp) g_mirror_get_diskname(disk)); } +static void +g_mirror_rotation_rate(struct bio *bp) +{ + struct g_mirror_softc *sc; + struct g_mirror_disk *disk; + bool first = true; + uint16_t rr = DISK_RR_UNKNOWN; + + sc = bp->bio_to->private; + LIST_FOREACH(disk, &sc->sc_disks, d_next) { + if (first) + rr = disk->d_rotation_rate; + else if (rr != disk->d_rotation_rate) { + rr = DISK_RR_UNKNOWN; + break; + } + first = false; + } + g_handleattr(bp, "GEOM::rotation_rate", &rr, sizeof(rr)); +} + static void g_mirror_start(struct bio *bp) { @@ -1176,6 +1202,9 @@ g_mirror_start(struct bio *bp) } else if (strcmp("GEOM::kerneldump", bp->bio_attribute) == 0) { g_mirror_kernel_dump(bp); return; + } else if (!strcmp(bp->bio_attribute, "GEOM::rotation_rate")) { + g_mirror_rotation_rate(bp); + return; } /* FALLTHROUGH */ default: diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h index 7cec94adae18..09436ec164e6 100644 --- a/sys/geom/mirror/g_mirror.h +++ b/sys/geom/mirror/g_mirror.h @@ -139,6 +139,7 @@ struct g_mirror_disk { u_int d_init_ndisks; /* Initial number of mirror components */ uint32_t d_init_slice; /* Initial slice size */ uint8_t d_init_balance;/* Initial balance */ + uint16_t d_rotation_rate;/* Disk's rotation rate */ uint64_t d_init_mediasize;/* Initial mediasize */ }; #define d_name d_consumer->provider->name From nobody Mon Apr 10 16:37:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwF4k3ZNzz44S6M; Mon, 10 Apr 2023 16:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwF4k2ytnz3tTJ; Mon, 10 Apr 2023 16:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681144646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a6JtifrVAGqYpgM5SJt1JuR15Pe9zsQUeOw1GybdNU=; b=oVFIm6BiGgof6tFGYxms0cWhW+hvEmMtiWTGpGNSFLiaRPelCKfxeqoIqaPgWDcyYZY1nK Bv31I21KhrYoPOeuiThGVppoWKwKx4tScXQ+hhZg/Kt3jyF+fyTPn89/tV0E7e+g1nu0Ni drzon+4O9+3ULvjoTfWDtNomCbUZjzPcoAEsZ0Dzl0VF85U6WOJJhfCAV8cFmyHdZRY7zV BbSOU+681HYV+ivXQzq3ff7GnqiAdPf3MhFlvQ7ZK4AAJsfrtOZ7SBGGe68S+Qh729juv1 oAIHYkyes7NJ3Wi2EvGpG6gaiwJ+1qjA2XBtEPIymMtgBm5/3GtTi5QdEKOTGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681144646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a6JtifrVAGqYpgM5SJt1JuR15Pe9zsQUeOw1GybdNU=; b=fgUouXzjM86t2mAqBIGyEkkfSeUEE7n6QZLmOBrcj7z+2yfcHx6PRIoyGK6UXN4r7dvhBR JOD0vjaiTQzgeZi20Ol/PeyOg5izp+a9zToIFjpDIB4KyX8PBUUVX4q/N9qtKDeMGzk6OB TAAdTKjBd2sbFHKNCJrql9mHx1Dcob9o8bRajHYNxbygnTmtMnfUM2dpKGA8NTmZMMXZdB 72AIxk8KMfbl1BjnjAVW/bPToynNsMDIFUrsZBEYUPyfqxVkWoBjylo2bW0BDTcJLW2Ewr KovP+4AoqRr41VqvAlV1k4OJASiQLI7RXdkvPh96xC27AXPbo18TsxAFKq///g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681144646; a=rsa-sha256; cv=none; b=mf6fE5/rlvHQUcSF1pxnlCF79auTatsNn2chAaoUllng30H9gAba2MdxdD/nbTcwhm4SQb wjeu6wj+yohDRR01Cj4R6P7ARvQ+LqaI3Fu6y0//qSUjnopQ6WD3lM2vO+YQaJR59ISoe3 ts44+VpsTvV5+nYHh8oDx9pQoVpQc5HmfYX/4exa52zWcki+p6X9yxZxXrmA+XAjjtX8j/ Cz0jXGnYaV0p7XdIkroqokTU7au4/lFWLKbJLeYba9DRFMBjVA50pQ8rTBwfSb84mR92g7 fbrsZnZes7+I2rr/T/r1nAnqv+NQDX+W2vfxQDYTcst3kyOZmnsZp7GakC3tiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwF4k1v1MzxnN; Mon, 10 Apr 2023 16:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AGbQPH059381; Mon, 10 Apr 2023 16:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AGbQuh059380; Mon, 10 Apr 2023 16:37:26 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:37:26 GMT Message-Id: <202304101637.33AGbQuh059380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: de07f7f06e5e - main - procfs: Document the content of /proc/$PID/map. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de07f7f06e5e98a0035120bcdce63b355d999d25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=de07f7f06e5e98a0035120bcdce63b355d999d25 commit de07f7f06e5e98a0035120bcdce63b355d999d25 Author: Joseph Koshy AuthorDate: 2023-04-10 15:14:12 +0000 Commit: Joseph Koshy CommitDate: 2023-04-10 16:37:09 +0000 procfs: Document the content of /proc/$PID/map. Approved by: gnn (mentor) Differential Revision: https://reviews.freebsd.org/D39484 --- share/man/man5/procfs.5 | 90 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5 index 9e1d12cf3324..7fa00c53e62b 100644 --- a/share/man/man5/procfs.5 +++ b/share/man/man5/procfs.5 @@ -2,7 +2,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd March 25, 2023 +.Dd April 10, 2023 .Dt PROCFS 5 .Os .Sh NAME @@ -69,7 +69,93 @@ in is only implemented on machines which have distinct general purpose and floating point register sets. .It Pa map -A map of the process' virtual memory. +A collection of lines describing the memory regions of the process, +where each line contains the following fields: +.Bl -tag -compact -width private-resident +.It start-address +The starting address for the region (inclusive). +.It end-address +The ending address for the region (exclusive). +.It resident +The number of resident pages. +.It private-resident +The number of resident pages that were private to the process. +.It obj +The virtual address of the +.Vt struct vm_object +kernel data structure describing the memory region. +.It access +A three character string comprising the characters +.Sq r , +.Sq w +and +.Sq x , +denoting read, write, and execute permissions respectively. +The lack of a permission is represented by +.Sq - . +.It ref_count +The number of references to the region. +.It shadow_count +The number of VM objects that this region is a shadow for. +.It flags +The flags for the object, see the flags named +.Sy OBJ_* +in +.In vm/vm_object.h . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width NCOW +.It COW +A copy-on-write region. +.It NCOW +A non-copy-on-write region. +.El +.It needs-copy +Whether the region needs a copy. +One of: +.Bl -tag -compact -width NNC +.It NC +The region needs a copy. +.It NNC +The region does not need a copy. +.El +.It type +The type of the region. +One of: +.Bl -tag -compact -width unknown +.It dead +A region associated with a dead VM object. +.It device +A region backed by device memory. +.It none +A region not backed by anything. +.It phys +A region backed by physical memory. +.It swap +A region backed by swap. +.It unknown +A region of unknown type. +.It vnode +A region backed by a file. +.El +.It fullpath +The path to the file backing the memory region, or +.Sq - +if there is no such file. +.It cred +One of: +.Bl -tag -compact -width NCH +.It CH +The region is being charged to the user specified in the +.Sq charged-uid +field. +.It NCH +The region is not being charged to any user. +.El +.It charged-uid +The UID of the user being charged, or -1 if no user is being charged. +.El .It Pa mem The complete virtual memory image of the process. Only those address which exist in the process can be accessed. From nobody Mon Apr 10 17:43:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYR4hcNz44WtB; Mon, 10 Apr 2023 17:43: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 4PwGYR483jz3HkQ; Mon, 10 Apr 2023 17:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qivjQskvIntmGSVaKlyA3MrAZOkT5uU5I9Wx7LrtGok=; b=KwTvAvE7ibKW2h/U/03UdExhHBLDHnSqAW93ATgnqZvzK1frfH6JtcYuP+KjGxk8Pba5EY b1RkGvDhvJ2aPR1YhWoQTsLP/OvCX/KcyKc2p88ps+ScwvSjwbz6OnTAvTVJq4x4pJpi3h dE1LCK8zwYvsWhr48W3hGTbk5Ee+N6+y5CjVmHuCfmPKp2w/aJVYsAJxqWN++rzyFxqdWr q3VgJLKgUlMf4+0UZm6jcMJz1DV53ghljY8EYIQM3lVb2+JQNuQPZWAuabRJtmyD/KLvuu OwViRdnFRcmLvryzt/XnGzZjfdC5CE8AGBt6pSnDmrOrl7+F/UkovZizzyYjqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qivjQskvIntmGSVaKlyA3MrAZOkT5uU5I9Wx7LrtGok=; b=shOXxWqlYIGRw9sAujtHQKtmgtjtRB4S9Fx0DRjg8yVog5q4m/SBRGIW55hJ2VFsTmBAYw tB+gsEXo6oqMxxZ3+0lMi9g5tpwbkK2XS1VkWBKhFWvxkktELjhNEQJ22SYson5pTxCqJ7 B4gptR6XEDUdSa4YybPosmKErAJtBWf07NVH1fEqqftKafALYlFBSWCStdQOW5NWLWUpGf 5pGZdcVGsXoMNyPIoTDKkX7higi+7jRKKOVD5248fNiMLdEKNFKnsQc9MXVwfG703fXi8D PBlqxtjPp0p6LSs2urgPrPnwl0TMGHt58npjXe7GRNPJ7saHz2zq2hEQ+0tJAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148635; a=rsa-sha256; cv=none; b=oOiJt9bA5A7/QcehhYXhUNqdXYZDFPgOMF3n5BUX3ag5pF+t9gZXNI3Y1Rq5BCsVo4fKwq I14WcB0T1Lqr4Alig0AjMV70rhMM7/k7w/lSZ1sLYNVABApsbcP+8pB6kZVPKxe2ULifqZ 1mqOEWhAtFz3zGJ/FmpOsmgQ9iJpdS9Au3PtjR74XLnls7nfiwMRaSsrc9cRgtxrP4YAJp pMjwlXPCPApFzgxrbLC4ibuJbVBQprkEb3/SgNjr5Uuz7EA8QCNsb67ZXNOxqishi8KVZC iQw0AV7atY6IoFJSx9j+9en7fGcuGU9zKKBGAr1ZbheMecMtmn6l+QUgDzuRtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYR3Dnrz10TJ; Mon, 10 Apr 2023 17:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHhtpx073744; Mon, 10 Apr 2023 17:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHhtMS073743; Mon, 10 Apr 2023 17:43:55 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:43:55 GMT Message-Id: <202304101743.33AHhtMS073743@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: 677e70e0c472 - main - ipmi: Remove some dead code for unsupported BMCs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 677e70e0c4726dbcc909934069b851f8eecc7c77 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=677e70e0c4726dbcc909934069b851f8eecc7c77 commit 677e70e0c4726dbcc909934069b851f8eecc7c77 Author: John Baldwin AuthorDate: 2023-04-10 17:30:54 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:30:54 +0000 ipmi: Remove some dead code for unsupported BMCs. Reviewed by: emaste Reported by: GCC Differential Revision: https://reviews.freebsd.org/D39351 --- sys/dev/ipmi/ipmi_acpi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c index f3745375c15c..6e70d5ad0fc0 100644 --- a/sys/dev/ipmi/ipmi_acpi.c +++ b/sys/dev/ipmi/ipmi_acpi.c @@ -80,9 +80,8 @@ ipmi_acpi_attach(device_t dev) { ACPI_HANDLE devh; const char *mode; - struct ipmi_get_info info; struct ipmi_softc *sc = device_get_softc(dev); - int count, error, flags, i, type; + int count, error, i, type; int interface_type = 0, interface_version = 0; error = 0; @@ -106,9 +105,6 @@ ipmi_acpi_attach(device_t dev) device_printf(dev, "BT interface not supported\n"); return (ENXIO); case SSIF_MODE: - if (ACPI_FAILURE(acpi_GetInteger(devh, "_ADR", &flags))) - return (ENXIO); - info.address = flags; device_printf(dev, "SSIF interface not supported on ACPI\n"); return (0); default: From nobody Mon Apr 10 17:43:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYS6gxzz44WtF; Mon, 10 Apr 2023 17:43: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 4PwGYS5cMgz3HYb; Mon, 10 Apr 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AKLZdtAiaFt3lwGHRVUsCi+cSbuKF83IYi3rBQIc6wg=; b=jX0W5wRDtT0uvFbWlNkMvLeYWg8wN1yUX0Op5/KO0RMfWEDEWiKwEByFNqRjgGEN4NQ5Zq tquPF+e5L3Q70nDuiq0t9avsGD4BNzzgS+3eHnWOfnBP3gnreOMconjTcfUBqYDUGI3eRQ jXdV8pCs6hUDh/LVgY5GiITiMgLsWA4eUqram0iRrQxmlf37s6y0wg5c7+yfDih+4v1Cwz GhjQYfcbEmIgrFmYzYzaULG9wmgW9bMz+znwY6CPqw8OPaxzVbuIKQdaVLDajNLB4O9LYZ fkKx87DQFN0ziFsNm659iEl4b/a2nJEOXfIdWQcjbyF6ZGI4QU2rj0HRAG6XaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AKLZdtAiaFt3lwGHRVUsCi+cSbuKF83IYi3rBQIc6wg=; b=y20QyiarJu78z1SMWvx6vBHRRoxa8nGRg3lyGPENtPRVOamrH7qhi74NtoO3MofcBx9Qq2 Ox2lGbfXyHM4MTaYzftGvThXzbla3nhe5jRSTSTe8qbLYaUdlHuh3wUoV3YGDg/R9O0NZ5 q4cMSbcfyBhGU1noWhcdgqWYHqhQcusVChDShE7S18PNV5Dm9uc562wgXyChLHq5x9cAkj kCoTi4yCJUDic2Ft4Ck7MlF3SMq2OUfks7b7SOlPwCjxfZL+zXwYFmwAVxtDEtYj0r2VRT HqEnr9/6BQ12Z71uA7exq9kaOZAGiKC22+T+pemLxGOjCEbCAkrraL5exWSHbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148636; a=rsa-sha256; cv=none; b=hybxFqsdTFaIZyjf3sOnTAdr5GOcMot+g84JAzhG7FOPBiX7f2jQr7w89zFNS5VIV2VvKd EZK0Fu5LOxNw3Y+rmN3QNBwBx6erO7Kg0NRF1nTH49h+8dPuN1GxDgJU+r1Ix2B7Q+eDvY U/u76OmCsr9egAjeN+dZZKt3uTcoMqgx5ZmsqVBah/BNvmVhAlhcyinXfchTL89ksFjtjQ 6FKaCH+QWex8kL/4mKJnz1W/EkGO4V390+0MRw+0AuVLRO6PrFukRaP/b5cbbaj0Zj19H5 xV6vp6r2Oou4leXJmUYdX9gYNOuKAU6kNZurl6i0/h/bfcSMBJaBFcz+ZNi2TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYS40BKz10Z6; Mon, 10 Apr 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHhuel073763; Mon, 10 Apr 2023 17:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHhu3n073762; Mon, 10 Apr 2023 17:43:56 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:43:56 GMT Message-Id: <202304101743.33AHhu3n073762@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: 0b672df9142f - main - iwlwifi: Silence unused but set warnings from GCC for iwl-debug.c. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b672df9142f28f2f1b5a54f1fe7b5f41f135473 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0b672df9142f28f2f1b5a54f1fe7b5f41f135473 commit 0b672df9142f28f2f1b5a54f1fe7b5f41f135473 Author: John Baldwin AuthorDate: 2023-04-10 17:31:07 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:31:07 +0000 iwlwifi: Silence unused but set warnings from GCC for iwl-debug.c. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D39352 --- sys/modules/iwlwifi/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 5cf652267354..39e60cb452af 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -66,4 +66,7 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1 # GCC warns about NULL format strings passed to iwl_fw_dbg_collect_trig CWARNFLAGS.gcc+= -Wno-format +# GCC warns about set but unused vaf variables +CWARNFLAGS.iwl-debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE} + .include From nobody Mon Apr 10 17:43:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYV3ZWzz44X6r; Mon, 10 Apr 2023 17:43: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 4PwGYT5t1Hz3HYr; Mon, 10 Apr 2023 17:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wi1OGJ8kuA3KX6pFLfrRiY1m2K0Cprjhmps5o/6oQBk=; b=Jrp1brJGYPcRsG2caJ0NYZC+9E2Gc6hLqaFLnxErFDXx9Y2kiPA7uRWB2SBAN43+DiYqM/ LCNnN4Xzg5ma5NhqB0Lozyh0l90rziz14o4vzeRZ9kA64UmjxSWPwSsv4ol5iPv1K3SgAn Jwr1m3ry6cijl1Ckik0Ite3PaIgFTkfiVCCBjkAtzy0+e2LBVtI9ihx0vVoe2e/1EFiKiW +z/vYClt737altya/w3BuuNrlgSkbb49Zdw7qCWcmiw6doTX7JpBEACcctod5elwHklAZA 8yp3UnyNvCf5woWQWibCFMs8JoA/mGHmDO62epzml3Gvr5McN3omyeIK9vSq/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wi1OGJ8kuA3KX6pFLfrRiY1m2K0Cprjhmps5o/6oQBk=; b=i1WIaKvTnN0H0rzPi8BW3WYr3N9sHHINvtscmgGMlCOU/ESYhpTXF4zqG3jJZLD1g0Hi/y zZqYf6h/XlujghR84WsFt6Dnv9vTqiQY/8t7eS4iukraqmfSwzq43WE9Tg2z6+YbeiqlZv SL4HcQgvgr+1cd7AgiQ06hYALtvuwoL2vFBwjcHa6axPF97Dgm9qPGOYkYnTQgDlrXun4b PPZPwUCi/sN/ku92XIcLlNAFT7hofsAAj3xlwVO9cMsDroQq6ZAhrvE0UyRyMCk1VG711d cwqIynQorZrQtf64P8ptJ/t9QCvEOHE2gtq1geQoyqLcglM2KiBot3S3vH1/SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148637; a=rsa-sha256; cv=none; b=MXcqZu19WVaYxrXwQY2TiJRAt3lctRj93F933AeY6N/9YfcTX71VHQVXRJ9Tr05I6gjxyn +Glffe3hzvyrHR2z0B9RQ+EcujxQeBfc3eNLBIn47vtE6NaIZ+NCugJkKbgpy2PzIXWU15 ZMt1wKaPiwEzTesmGbzGGToV+fhuAA6jt0lou+V1vMYs0XTITYlq+ifK4vzzxGnsMva+4d qkQ79tTNYYbTebCnCf1jqrAdggTYMFxIJr5J94L5MlEtbQfpJ7P5foTqY5H1ywfAGtJlfN kpLStCgn9rbIhF8bXx7n6082VHWb+hjGNBr7FCMNeNaVwFZ1EOD+5tmj+jzQXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYT4zzWz10M2; Mon, 10 Apr 2023 17:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHhvba073783; Mon, 10 Apr 2023 17:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHhvlk073782; Mon, 10 Apr 2023 17:43:57 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:43:57 GMT Message-Id: <202304101743.33AHhvlk073782@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: 3a9e6624ebef - main - rtw88: Silence unused but set warnings from GCC for debug.c. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a9e6624ebeff00fb2330606acdcb194504ae05f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9e6624ebeff00fb2330606acdcb194504ae05f commit 3a9e6624ebeff00fb2330606acdcb194504ae05f Author: John Baldwin AuthorDate: 2023-04-10 17:31:26 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:31:26 +0000 rtw88: Silence unused but set warnings from GCC for debug.c. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D39353 --- sys/modules/rtw88/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index 2df00358821c..930438a04f2c 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -40,4 +40,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_RTW88_DEBUG #CFLAGS+= -DCONFIG_RTW88_DEBUGFS +# GCC warns about set but unused vaf variables +CWARNFLAGS.debug.c+= ${NO_WUNUSED_BUT_SET_VARIABLE} + .include From nobody Mon Apr 10 17:43:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYX0qgnz44X27; Mon, 10 Apr 2023 17:44: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 4PwGYV6psdz3Hss; Mon, 10 Apr 2023 17:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo1m4eDcW2bJxdXppjIunWzZIsI3QBGooeBPF924cUc=; b=h4Sud9nF0n6DX5+1IlnOut4T8uabUXK0oiXFy6ldpxKDBpCCsmKCSPfaBWakhKhvu9xaRn LHCJC5XKwIEUGvqWxNPukQM3EFST83xRkZ3MlZs0vHfbbk0dUe3AGpGz1TMDgVFZre9p3l 0wmFsgAtyYXvlhM6KjlUBPrtaSYGaNGpiXlasCe0WNmdfGTSm+SeTEyfmUv0GRto3tRDvl ABzTl833Olt8dRvVgOVf1gQBwrBlQsifcF/P1d9ZinBXl79N6PazK1Gq/E+oaP7Qknn8HF 0YyHhon03qMp3ugiV3x84A3REL86qLBI6BrG2oVZB9+KQgdL32X9iyvwJZjSiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo1m4eDcW2bJxdXppjIunWzZIsI3QBGooeBPF924cUc=; b=TELsFTK1m+gd7bm4/K/RGz1O6YuI9aYC/BT5igqpNVPlU8dYP98Oq8uxHR1619zxRABbKJ ZxdbyBmGAkS1z6m/YZ6LSnWBeWWs6lHhfYUmakavdfFTQ3g9qdQV7PRZ4DscRrbxZU8sCF zPy196cU+NaZDPBKmjtX89LqWe4r0dtj1OKN5cyDJXOaEA9feIWUtNYknXzogcfV5gEoxd 0pdgb7W5xzwWPvvAsCcwFRwV/Gre94O8BTMRfTpS8ebyCj7KAIaVHsAaFMzqVgCbnslTfY SlLnhUoUfZcBBGRDtdG7NjFF4J/WDlXppb6o0W8kp0UtGZXZATMiKNoD+HVlcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148639; a=rsa-sha256; cv=none; b=GZCOWPA4F/nU8upU48lsyQQlYIFZuoic7Gzo63FxN/85VvYWO7rQrgiA/4/ykMd6bAc78f twwattmBcC0tLgVnFKxngT7+JJ64bTQuLCMX/vpPcwsgrUyYEYJ5QlQdjutcCdfLvvQNl+ FpY5tSA77JPe47tX8yERsmmwjYSFR6JuP71Fjy5VGi1xU12HwmrmWtOf2CXfP4dt1hBV6r w96ch8SOe0OhFDmOPHBG/EH2v0kZSVhF08T2vqGCatp+WbrR2Tc1nJnO9rN1WPol8KpuSJ 2sdeadGYkqudPcalsmi826R2/c1RosNr6h7b5N+v3tJA3m1+Tux7WhTZiM5uQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYV5wsQz10TK; Mon, 10 Apr 2023 17:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHhwO3073802; Mon, 10 Apr 2023 17:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHhwB4073801; Mon, 10 Apr 2023 17:43:58 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:43:58 GMT Message-Id: <202304101743.33AHhwB4073801@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: 16df72a9a236 - main - udf: Remove set but unused variable from udf_getattr. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16df72a9a2362e38b4d2e6e739f0a20b33c80790 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16df72a9a2362e38b4d2e6e739f0a20b33c80790 commit 16df72a9a2362e38b4d2e6e739f0a20b33c80790 Author: John Baldwin AuthorDate: 2023-04-10 17:31:45 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:31:45 +0000 udf: Remove set but unused variable from udf_getattr. Reviewed by: emaste Reported by: GCC Differential Revision: https://reviews.freebsd.org/D39354 --- sys/fs/udf/udf_vnops.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index fd2d5c5c0439..41f9d4a054b3 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -289,9 +289,6 @@ udf_getattr(struct vop_getattr_args *a) struct udf_node *node; struct vattr *vap; struct file_entry *fentry; - struct timespec ts; - - ts.tv_sec = 0; vp = a->a_vp; vap = a->a_vap; From nobody Mon Apr 10 17:43:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYY0jMkz44X03; Mon, 10 Apr 2023 17:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwGYX3rdvz3HrN; Mon, 10 Apr 2023 17:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIdNAuIwLf2tntbVxCPdwzzqRofO2TFzvLmhS338ZWs=; b=X5bD7sIQqJXL91A295cycKlHJm+429xD40pA5nLyiOtuKv5pSpGG2MScv4jm5UdmiVMpCv 9grNt4o79Z2CDVap6vfuNcmzogJuoko6qUfaIAeSLF/MOrJMWcIT/yo/tCqbPTlUjj4ZfO PA/16j04ydj13jxTen8d0fVXnya4kaWt7bnaqENSwBeSE0On5pkR6b/tOIXdCU8cnBizK8 KGmfVdBibPVsXdkm+Qr/S0jNE9h+OIpTEQ6FDqL/38XkR+F73MsZNuD4AfLl8NvTa1INvZ MvR7GkugKsNcdxKIWdPf7lwdtutufVI1QzS4p4C1rXrZoXW/DluEegCIvpZ2ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIdNAuIwLf2tntbVxCPdwzzqRofO2TFzvLmhS338ZWs=; b=O+QP3uqi1292AeDct+GqUiP/XC6c5HBt1/FN9g5l5HWe8vdL8dBGbxve/9PKxZLasySTxy 4iMYGPwD0bVcOoAaRW5uTrWKxq1BnI2Jy5WO5ULDVNQNBTzCE0e85IJqJVA7JYUhi996mA CkeohX+RjrLlFR2aWyg7QHuhi02ws3xIuL9KvWkEVEWMSOq+QEtvfi8vVrpdX/h44YpHrZ /Q7rjvmsZKHXHptNIy0TXK4WJomK08XjkDyks7Npe6ugs8LdDj3w8AEMUVA0q+jmETPEyj xb7ziUU8o0QN6eAOJwqH9jTLZccPSWBHcYYsn/irQmxvF7AZn46cRdl8Bat21w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148640; a=rsa-sha256; cv=none; b=TS7kRXtCpRfLvduENzFXYWy82ziqsNwkV+9UMiqZuGkPF3KxdC1F1IOl+KileSxUT9g7aA wwOw/NKW0TyptjfGBsIb7fwUiz2dsJ/IaQ+azjurF9awQCnvIEjd6gz2ZHhmyeW4PUxLzH UIboNC9IPVm31/qZzbSEZcln6xh7Dy17irqwxcSStZYEGvU/QBP4zPBxtKxwMDc0JXkIZn g75YM/LoNKovePLUg5MW7vHmRchj1OclGDQO9Vqqk9TXVJOaZgcOFS9b/N8AjQfflZgJ4V Ei2VsHJRz45VZp4oVrp9vRkptSvaMIqnGtHBM3WsbuVMIVcEhGYUnr6kDippOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYW6fJDz10dj; Mon, 10 Apr 2023 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHhxin073824; Mon, 10 Apr 2023 17:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHhxEv073823; Mon, 10 Apr 2023 17:43:59 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:43:59 GMT Message-Id: <202304101743.33AHhxEv073823@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: 4b6228906ff7 - main - libalias: Mark set but unused variables as unused. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b6228906ff7ec932a12ebfc2fe7fdd9f4e93299 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4b6228906ff7ec932a12ebfc2fe7fdd9f4e93299 commit 4b6228906ff7ec932a12ebfc2fe7fdd9f4e93299 Author: John Baldwin AuthorDate: 2023-04-10 17:35:29 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:35:29 +0000 libalias: Mark set but unused variables as unused. This function is clearly a stub, but it seems better to leave the stub bits in place than to remove the function entirely. Differential Revision: https://reviews.freebsd.org/D39355 --- sys/netinet/libalias/alias_skinny.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c index 70b3a29ddb40..c167891dab09 100644 --- a/sys/netinet/libalias/alias_skinny.c +++ b/sys/netinet/libalias/alias_skinny.c @@ -230,7 +230,7 @@ alias_skinny_startmedia(struct StartMediaTransmission *start_media, struct alias_link *lnk, u_int32_t localIpAddr, ConvDirection direction) { - struct in_addr dst, src; + struct in_addr dst __unused, src __unused; (void)pip; (void)tc; From nobody Mon Apr 10 17:44:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYZ2MBdz44X70; Mon, 10 Apr 2023 17:44: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 4PwGYY1Lp7z3Hwh; Mon, 10 Apr 2023 17:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gRzcZBbxIQOScrI7CNtrRv65NhcyscsidQW+Klje0Q=; b=ACBOB7lP6NNhsH3is8652nmkcDmRlMVPdYeKbNLOOHMjJW/aPgIVAlVwn1qK4YKjr7rvcf Ea6XRTU+8CzGqZ5udMoBjkIlXVMwREIZ+qb2Ct/iob+1oB9i9f3n76IJyXFxp4rNYclMyK YuEFQFB9E5e+Txsn6HlyKqIKxOZ1kE34CAXpc54kVt6aV83kRbMgmuD58FIYqrWBZhVQGI RtbqI6Mhez4wd63InK+CYkJO5SIWaSpcz89kx0z+8XVauzDqnYcjwOFqbivqO79dG0G/YX B8azMgfFDGekW6PH2NxdoFebUMv49R6wAw9Y8OyHsAfos5aRy6SVtd7WM01dgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gRzcZBbxIQOScrI7CNtrRv65NhcyscsidQW+Klje0Q=; b=LsisE8tjyr0FQfK8lhXRxZwwDsNSPul5awWPymA56fmR3RhriT0ay+c8VNDmvD94EP9kr0 ULG4RT6Dus8LBjQKJP0Up3fuqoXmzsLOLjk4CRz9sTd3bSFcEzvzmg6sYjKb3F8a0ky9do aR7fIfdmwgMOfxKyhrCiUZuWqkk/I1ndleAqYJIkHaIUwdm8a+jipBR8ZSqNtEeRBjm5tN LIPcPHzvDhNUh5hJ4IBnThKEtqOnJwLebdb2mA77KM3ZTHnVHqfhp76yyfi1o9bkn0aMGI 6OPvnkc3AG0D3fNj5mTpDJ0yhVhy3UX5OdCbpyYqcWvadgRdc5BbVcsph+zOPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148641; a=rsa-sha256; cv=none; b=AOcnPVEEhW701xFjnZJJMGfNp1I9qD023Nz0Uyvur9tttvMvjk2w/cfIMYQjIDE72EZPsS +iAh6pcX3d4rv/BaStOcXlHhxVrVhDZU2Ehsl3EoAVw5HvlTMFooK2x+SWU02HSlHxzSf4 AiBw2HDw0ZWyGpliyv/khrfRt2MXXDWnMqG5LVJthcNDbA2dd+qSdqRZ0kqvyMAG+1aADQ fitIW+1NM7/amYX7j0B9KFJGzs7Lcbr9zFJSLLBI0lcf+b7siRtBdpGqBuafoWR47UZcVy Wty2yTSJXWirqpo1h4qw1zj6zqkhtaZ4pcM0hS4yX9lmAs9Znttez/w6bdU8BQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYY0Qwzz10M3; Mon, 10 Apr 2023 17:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHi0dE073867; Mon, 10 Apr 2023 17:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHi0H0073866; Mon, 10 Apr 2023 17:44:00 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:44:00 GMT Message-Id: <202304101744.33AHi0H0073866@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: 5328efb3d0a5 - main - if_mos: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5328efb3d0a54df20779d82319c3eebd49aa2993 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5328efb3d0a54df20779d82319c3eebd49aa2993 commit 5328efb3d0a54df20779d82319c3eebd49aa2993 Author: John Baldwin AuthorDate: 2023-04-10 17:35:48 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:35:48 +0000 if_mos: Remove set but unused variable. Reviewed by: hselasky Reported by: GCC Differential Revision: https://reviews.freebsd.org/D39356 --- sys/dev/usb/net/if_mos.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c index d6d5becb6b46..11eefbc2adf9 100644 --- a/sys/dev/usb/net/if_mos.c +++ b/sys/dev/usb/net/if_mos.c @@ -424,11 +424,8 @@ static int mos_miibus_readreg(device_t dev, int phy, int reg) { struct mos_softc *sc = device_get_softc(dev); - uWord val; int i, res, locked; - USETW(val, 0); - locked = mtx_owned(&sc->sc_mtx); if (!locked) MOS_LOCK(sc); From nobody Mon Apr 10 17:44:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYb0W3Lz44XJd; Mon, 10 Apr 2023 17:44: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 4PwGYZ2R9Wz3Hrx; Mon, 10 Apr 2023 17:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oWut6x0I26yLbEp8sp0qh6p3G8psJc+75HUPHKoPHc=; b=RmspQiEW1BQdnakpwbi3ptMf9P4Zpd8XxB0XlHPdBcNcdzV5/wkRWM2VA679VmIieoOPn2 WBCCTHyiVuNf22BfCaGyOsv66Tw8KEhUOcTvo11ozDi61eVQVji84iv9TIf5xh0QjWgYZH mM3qvzOIY+s+OWwIdcWrBXwj0WXliiIREosFAckPO2sJTeudM2NiRdmDzp8bK+PSuajzv2 0RGov6RfHCVoIyA7OIOUZoNgFSgRSm+tu5HKo3rf22weIi07PGY23V4CxIQ4q71178/vtj 6jEbN/bON9widraelaMbO/Zkz2xWjIyVQHeFRDzSxl9TBPlTIBdsaR3l7UWIQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oWut6x0I26yLbEp8sp0qh6p3G8psJc+75HUPHKoPHc=; b=rIyjs6Xmo/+H8rWR3GJmN64aZ125FC7mrPNV/Dow3xhGpQCM8fcpEN5RdEpRgbWSQa/e1t EnDW697MfY0G4zPk9l5gTSFv5JJZNKjBFzdpvH7gJh7ej667CxSeC6MG2/dNnzeQTh3PQh qcme81K9ytT61vMtl3cQ4we0F+2vwMSR3EMEU8dHWzlgGq7p99u5F0c+TcGFmgOCGI3hTL uCqrwFuAxxNKHegDRGh64gtpynSXzZ/9+cGFzttIqGZH+XyadUm4RMmMVyOs1HdERj85a1 MSODs2CFiRBpqTi/TfyOHqb4y7X/t6UW/2ekLejHpUTSFgl0rc6ydiqLxBY9yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148642; a=rsa-sha256; cv=none; b=hwoKtSCedBPeRpZwaUM27+z67yBuwVwXPEMVC9u3VP0szko/3pB5OtJN+a/pZViyBZkFPn 3t5nfXeIhYNfsM/0kUsLVEF5Q2prjE1B19+5zLrrz984fLtPBlGgsYRIZcjiYGdSFyj15Q b+jDgs2Iz7X8x1FtgyAUlSVq52uuDF95PfFCW5JPilFP4YloRWXIxcxay1Q6GdUMuFEjOO hYNoEE1IDgaxqdeX5YgOynqopgv5WCgT01gK6+XpanHrjAUiI69J0zfnbtwQzVyLX45hcW sjH7WP6gJcVjwPo6zmUknrYIOaS4QcecQXqRFHuf22yGdlOvJAbJ8Zq51xhfxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYZ1Vy6z10TL; Mon, 10 Apr 2023 17:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHi2D6073886; Mon, 10 Apr 2023 17:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHi2bS073885; Mon, 10 Apr 2023 17:44:02 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:44:02 GMT Message-Id: <202304101744.33AHi2bS073885@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: 8e9db62e7423 - main - zfs: Appease set by unused warnings for spl_fstrans_*mark stubs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e9db62e7423eed795291ac88622fbed018b6abd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9db62e7423eed795291ac88622fbed018b6abd commit 8e9db62e7423eed795291ac88622fbed018b6abd Author: John Baldwin AuthorDate: 2023-04-10 17:36:14 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:36:14 +0000 zfs: Appease set by unused warnings for spl_fstrans_*mark stubs. Use a void cast to mark the cookie value as used in spl_fstrans_unmark. Reported by: GCC Differential Revision: https://reviews.freebsd.org/D39357 --- sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h index 1ce72330412c..457fa3af8142 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h @@ -78,7 +78,7 @@ extern int hz; extern int tick; typedef int fstrans_cookie_t; #define spl_fstrans_mark() (0) -#define spl_fstrans_unmark(x) (x = 0) +#define spl_fstrans_unmark(x) ((void)x) #define signal_pending(x) SIGPENDING(x) #define current curthread #define thread_join(x) From nobody Mon Apr 10 17:44:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGYc34Xjz44XL6; Mon, 10 Apr 2023 17:44: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 4PwGYb3d7cz3Hpn; Mon, 10 Apr 2023 17:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V8oM1kBorFKeSVC+icRycSsTroa3BdkcmB6Yi7Bl7QM=; b=ylXWNkhU5BKLxQ/EkP5w6SNEceyE8aUhDlNHlP05iFw4CQSxeBfxy4K2uTOX1lmiIs1QUD MhQrBtJnLbqPZDEYQOx0znKfhsk97EU8up3GBLYU5hYm2BV63/G3KHcruOTSifZlWKp8zE Kb29OOoIDjYQk1NNq0aLaTAwUzkRF09OiOLPiJ5TQE5dLDyjlpNDPkkj86gVE2O/b+3+Ze 7SYk1DLQW3kucorBn1vc2WKTV2SdvlazNuqmGB83CbxHlS5W54j5sOb6jLksR1446X7NEa 32RJiC1draLc2yBJF6fbb0Q8tvcnHNLYhx3piUIJJF/GNAJ7y5mx6UyIauIeJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681148643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V8oM1kBorFKeSVC+icRycSsTroa3BdkcmB6Yi7Bl7QM=; b=tb1p5+4gm9hTEt7ErMlngwY7n8FvMOK1YZ3v4wYjNrrZNoBrVlPYOfQIwToCtPjIxIdOsC Gi9fiZpxLKE2evXJyJhef9JLrb6PdB8/N94qac8lebDn7HWryeKY5Fx9MIBe1R+k9/cHH8 kpd2fXAov/CgPkcZdaukuEfaXUbas8Bv9P99VbQvNXTJxW7q8eF8R2s9NzsWspf/L1ySZW ohO32L5QLQvmDZabsWne5F9FjKobY9zfvhrg9i7OH8SmXe6Tz1RFELh6R18odFN++1F2pV YXv4sBbBhj2xFSSn4dRGOIZx3xBEtTYQ7kvvvDXVx0Tpy8LxeUczqC0y2ysyiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681148643; a=rsa-sha256; cv=none; b=FyViJtllKufiYkP65A/R/+hwWQi7AtJ23MGcdqZrly1FIhj4km970M1/auKFgJDmR6nwSp VOwOjdgcuYsn60pzggZQ1MrH+4taWOAYBbPSl4qsLxNrOgIFueQ0d0aA8hpXnkLG5Nxg8N V8Bzhr1s799R1V9MLXG8nKzJBnXwqJAG4qNnGNzaiqEFT7Zus17OlvrunGLGVEwUOfeDKq XM47Fw25PPiKlft/Npj7Q/ZUO9s2kP+ax6Gp4kwpKwpfERxnJGwrdHW/bzAobwVG96jQ3g EjoMPT034ybE+tMKR7no32wEWrnsTtdkveWOAn3ldDSj3LNDy8zaA3zxvfjvaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGYb2gfPz10TM; Mon, 10 Apr 2023 17:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHi3qj073907; Mon, 10 Apr 2023 17:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHi3Bu073906; Mon, 10 Apr 2023 17:44:03 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:44:03 GMT Message-Id: <202304101744.33AHi3Bu073906@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: 3b3762c34e2f - main - sys: Enable -Wunused-but-set-variable for GCC. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b3762c34e2f64671637a527fc11819ab26370fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b3762c34e2f64671637a527fc11819ab26370fe commit 3b3762c34e2f64671637a527fc11819ab26370fe Author: John Baldwin AuthorDate: 2023-04-10 17:36:33 +0000 Commit: John Baldwin CommitDate: 2023-04-10 17:36:33 +0000 sys: Enable -Wunused-but-set-variable for GCC. It has been enabled for clang for a while now. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39358 --- sys/conf/kern.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 9975eea6417a..8676cb525db4 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -74,8 +74,7 @@ CWARNEXTRA?= -Wno-error=address \ -Wno-error=sequence-point \ -Wno-error=shift-overflow \ -Wno-error=tautological-compare \ - -Wno-error=unused-function \ - -Wno-unused-but-set-variable + -Wno-error=unused-function .if ${COMPILER_VERSION} >= 70100 CWARNEXTRA+= -Wno-error=stringop-overflow .endif From nobody Mon Apr 10 17:58:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwGtq4hSdz44Y01; Mon, 10 Apr 2023 17:58: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 4PwGtq0yQtz41Ln; Mon, 10 Apr 2023 17:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681149539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhEi2M3k91AbdxuL5FSJoaETZoNSVOn+5u4rgvODVwc=; b=fuK24io4fGeX/tZYKlJbL1kNDvEDuc8yZ6Wiyvr9QOapsuKVUrycAKpJ/kcKtdq0Nvf40U SG90WcyahneIG/a6q9DLW7Ri/j++W9xpt9vYNOXkZi1GWxux/ilHSeYkbsQwKBV+rcQt5g 0zxsjTJfx2bsTFLxv8Yk2SRaZIgxWkU8rcOmGHfFWK9CRKdkPa9x4K0ntHpGRadHax+6La 0N8EbEzdBsQ7e9UO20w7GHGoKU8/gm0SeT2cq+i47rdfWAQ3ZGzTuLufFv+an9IrO2lfwx Fer4e/rHx3CSMV0pdOdKZvG9ngDi5g6UyHLWdip4+HdgslUrBbxAv7fxbNXqQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681149539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhEi2M3k91AbdxuL5FSJoaETZoNSVOn+5u4rgvODVwc=; b=uLuh3LhbGOitXR8xLK8tFR1WR1CXZtqO21kqFNpgJ7atAWIYJVTIhPOMctsaZElmjTv/us q+uxuImf8tdcBUpaw4gZJ8aolHdppld7tFkYxsZ+WqbRG1WVVNT+vLnfAD9yrVnXJXWebL JlgPhPUqXMAM03U4coCTg8oET08agtUDFl+19KVUKcyF25nvIaAKAm7vJct/lHm8cJEWcy BVEXUPeLVJCnj3EXlpvlJ3BjBPStKxNJ4TxXVgqR8OR3ipFzOm2F5+TEQrdWYJzkjwH40N cyAWGTETPuyiIXExjwSSRyBkWEyBnBio2aOM7IHEm64Ak9/X6BlR+faJm3xIyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681149539; a=rsa-sha256; cv=none; b=i5uGbhI43Z8AyEh9YqI2xSmnAJ/wQ3WPa5ytA3rsqtFjJ/driImg5rqC2qycCF7JxptQMY hSdVKWpGu/nGAsWEoIQDVF5MXvXnBDAiI9Cf4WQvUI1L65kJY5p4HaDBPYB52H8+UZAnHM G7wjCoSoLj2N4C0O8bI1JLTwmo1euw/AC9XfpwfuJ3GZKQBpi5QfxuSJpG1brcmRlfe9TL /PTKqe8Q8XVmKc4Drti4eIdaszd5604YaCFzkbtEqxYq5ZS3Z5MZpd1lZxiUUBMcqkTHk4 tfWlhicJZFSlDfv1n1v+IhfEEvK3IMZ6YO0JqiHMq3V6lVqDR2dHNFwZLm7LsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwGtq044fz10VW; Mon, 10 Apr 2023 17:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AHwwYG090516; Mon, 10 Apr 2023 17:58:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AHwweu090515; Mon, 10 Apr 2023 17:58:58 GMT (envelope-from git) Date: Mon, 10 Apr 2023 17:58:58 GMT Message-Id: <202304101758.33AHwweu090515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: 0e9e9048ae08 - main - procfs: Sync a documentation comment with the code. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e9e9048ae08b38336ed3186b748bfd44a728f31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=0e9e9048ae08b38336ed3186b748bfd44a728f31 commit 0e9e9048ae08b38336ed3186b748bfd44a728f31 Author: Joseph Koshy AuthorDate: 2023-04-10 17:11:16 +0000 Commit: Joseph Koshy CommitDate: 2023-04-10 17:58:46 +0000 procfs: Sync a documentation comment with the code. Approved by: gnn (mentor) Differential Revision: https://reviews.freebsd.org/D39488 --- sys/fs/procfs/procfs_map.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index caca731afc34..611cf65e81d3 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -202,8 +202,9 @@ procfs_doprocmap(PFS_FILL_ARGS) /* * format: - * start, end, resident, private resident, cow, access, type, - * charged, charged uid. + * start, end, resident, private-resident, obj, access, + * ref_count, shadow_count, flags, cow, needs_copy, type, + * fullpath, charged, charged uid. */ error = sbuf_printf(sb, "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s %s %s %d\n", From nobody Mon Apr 10 18:31:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwHcB10Htz44cMY; Mon, 10 Apr 2023 18:31:22 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwHc973Xpz3sTd; Mon, 10 Apr 2023 18:31:21 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681151482; 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=fC1I7oT6LteSQYLER5bjeQ59ERotUQA7DafLOz3kW84=; b=rPlS3o3PcgR1GO8VnKEJ/2aw+O6o8ATVhyjPsR2VcVgxxi/J2gZ9RqGVDDYp4DYKsoJuh5 zPDsLqgQk/8P4hsYQx4vkWt1YHONKxzSKTz4Sx8GnAkbkLAvgoD+Atyc4UYOW0mJA1q8L8 QBIs+tJKqd1ModrIUuTWx5cMUigGKaDt71NKfOcg8vTdcigNtqzVxS3nNSAxjuG3BW5X0f 66hkchjGNd9HLOblWnOs1lL7Wqnu+WPARLt2ako+ejQ3kw52nraJbdbRw0Kg9Z9YOLFmRA uFVsMUlmIsXe+2SJqtGKC+CpN0uaaB1kFGZvNmb3HWLslWDYO21j4XGQTH5plw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681151482; 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=fC1I7oT6LteSQYLER5bjeQ59ERotUQA7DafLOz3kW84=; b=U6gojYX65T7w4IEFGkQnNm2y3SOj3GOwSh01r6SBfagWmy8V+7lYXZHuoPbmSJAa5p6SIp YM90ADoT6fLc3+/vwdBCUh2daheAygnVbwYE+JiTeOcsdW1cpnI54CPnDB39Iq+SOdiAy7 slR5PyoAcy73Uo93ennoP8Jd08LT8IHGXfDNmlSYPNaIo75X2QiCIhWSUCN6/b0OrrfOQR KvoecN0qVzkXvNb12PBYGJoHDdmNU/Hq6a3cfQHMSIQUahRY66AVimJFIRvZ6uKEcPPdZM vpjn1mGazCnXPla4q5uu4RTnCvBL4ABsz8C/pqhU+fT0gYV8xXv2fqQFDQEAXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681151482; a=rsa-sha256; cv=none; b=M3yvjn37gtO4ZVFjOS62aTOLv5zSN0XvYyqfx2WYJlN3nsUgnHa6NihdBVz17x4dT3hJCx 9rU7u04BwCqv8dRvfKSQg6xa7PVo9hrwzSESk2TzstEZLXWMDmsOnXoQsPYCXFgoV000w4 nN9D5F/3x7hFBs1Vwgphm4J9FT6Gv1IBuEhN/haPPqom+7nKxigDGWl3l9qVcykefXp+tP Y/0+c/D98ETXQ8b590zmlWq6I/wpRs17vI76g1x4L+/NYxfAxEt0SO9VACdaXCcn26Zw9r udK925fXH7bjq+opSHhICAE2orucmGuwa5pLbBvXlgXsQiS9WOEACa38Auuw1A== Received: by freefall.freebsd.org (Postfix, from userid 1033) id D560219702; Mon, 10 Apr 2023 18:31:21 +0000 (UTC) Date: Mon, 10 Apr 2023 18:31:21 +0000 From: Alexey Dokuchaev To: Rick Macklem Cc: Rick Macklem , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c98a764c681f - main - cp(1): fix performance issue for large non-sparse file copies Message-ID: References: <202101030102.10312IAC061762@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On Mon, Apr 10, 2023 at 08:31:28AM -0700, Rick Macklem wrote: > On Mon, Apr 10, 2023 at 12:54???AM Alexey Dokuchaev wrote: > > On Sun, Jan 03, 2021 at 01:02:18AM +0000, Rick Macklem wrote: > > > commit c98a764c681f8b70812a9f13a6e61c96aa1a69d2 > > > > > > cp(1): fix performance issue for large non-sparse file copies > > > > > > @@ -236,7 +235,7 @@ copy_file(const FTSENT *entp, int dne) > > > do { > > > if (use_copy_file_range) { > > > rcount = copy_file_range(from_fd, NULL, > > > - to_fd, NULL, bufsize, 0); > > > + to_fd, NULL, SSIZE_MAX, 0); > > > > Hi Rick, > > > > This change unfortunately breaks copying files in resource-limited > > environments (e.g. many port builders do that to prevent runaway > > processes): > > > > ulimit -f 16384000 > > cp -p packages/13.0-i386-wip/All/perl5-5.32.1_3.tbz /tmp ; echo $? > > Filesize limit exceeded > > 153 > > I think zfs_copy_file_range() needs to use vn_rlimit_fsizex() the > same way that vn_generic_copy_file_range() does. > > I have posted the attached patch to D39419. > > danfe@. Assuming you were using zfs, could you test this patch? > (You will need an up to date main kernel and, hopefully, the block > cloning stuff has not trashed your zpool.) We had already discussed with with Rick privately, but for the archives, looks like my problem had been solved somewhere between 13.1 and 13.2, and it's not related to ZFS. sh -c 'cd /tmp ; truncate -s 20m foo ; limits -f 8386560000 cp foo bar ; stat -f %z bar' ==> 13.1: Filesize limit exceeded 0 ==> 13.2: 20971520 Allegedly this is due to commit 52360ca, but I'd have to look closer into it to be sure. Sorry for distracting you guys from that recent ZoL merge fallout, I should've not be lazy and reported it earlier. :( ./danfe From nobody Mon Apr 10 19:21:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwJkQ5R9gz44hT6; Mon, 10 Apr 2023 19:21: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 4PwJkP62w6z4FhC; Mon, 10 Apr 2023 19:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681154509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzW9b8FWmBPOFss+Xi3uYXY66j99aNluAOUcyNVL8BQ=; b=FYYb1S1GFublbc/eRiXzlms0hd8/0CpYMxVW3Dz1zfiHwy/rmydarabBfGahHwE5rUMkDk ARvlxaZQNWF8UKW7ZEQrnpJWH2UPQ9/0dPnwoOQ/ek4TFhx7OXYMTyCChxS5V05TdKfQH1 Ifu0rV2AqtYO3bDILzz6YKeCT7ChRyAX6h2ZObtm/PRRjgx13pmepe4Qf0Xjjp5AGsQBOK aTkv6O3bTdcnDb2eQWSfwfj1OS+mdWF410+29s2HLbDpBJ7taCFkpma5I/yj5K/wucdJaj U5R793iiDKRh/h39ntg1TGoI6vVVCMBCnfXHB9ued3OtoAMESVymjSZYJEQCCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681154509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzW9b8FWmBPOFss+Xi3uYXY66j99aNluAOUcyNVL8BQ=; b=ZcOnNcvPnakAjTJDgxBez30z8U5jtLyVdxOAELzw/D9lpZs/4YT8xAE+9Wd9U7aSXxs/4P 3ud80vaMtAWsy5GsN5M0cXhWkGEeh7K2wfskRJxnWZLR2MoU6qAW3BIQ5uC/v7x0TcMBJX KHR/kwxSWOlgb6Ar5xwokiwqHUF7yjqOwR+PPBQ1Fz9THkBjRRm4D4HFKliUoisVJkLHwr PRgUAj0Nh8f37yAcJnXDjLfFcC2QkopreiwwJCZWKJJWgIQR8ritcxHrEGuJOKaA3r40Bz mRtcaylP2JWnnKEr7d4f8vGgIcadhlv5f2SuPwQd73feSPR+eiUFLrEQp2ONRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681154509; a=rsa-sha256; cv=none; b=rWnxfxp2KfJCFdNNG778lQapcqPGhn6f+dfbIaSm7xFGgq1SYWs81mE2o4Kf311QtQhV0F apZhaFd9AKiZVwMgZvzpCpcrwglQdAKt6EdzhaVCdiN/zJncNh1aAVIYT9eReSSwi1WQ/m 08NFkx12KzfivIWPUiypCgpkRCn1g4pCIE0nIC73sDm0CIrhS8xzv2TL5QH3O5+1xDbQO9 3Bu13KdU5hWkDut98yfuZZ85CfSAVJAmR0oREEyUQElyrZXUOyAyfuvh+MIIkgM6fjKnky ztcmrxyvNuC2U3V6EbQ0Pv0j+fEeKVimcKI14wsSgQkrzxE+QGKEC6GmGg5T+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 4PwJkP588dz132G; Mon, 10 Apr 2023 19:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AJLn1f032066; Mon, 10 Apr 2023 19:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AJLntv032065; Mon, 10 Apr 2023 19:21:49 GMT (envelope-from git) Date: Mon, 10 Apr 2023 19:21:49 GMT Message-Id: <202304101921.33AJLntv032065@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: e22246179011 - main - rack: mask and tclass are only used for INET6. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e222461790111ead1413b95810f724deb90b3e4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e222461790111ead1413b95810f724deb90b3e4a commit e222461790111ead1413b95810f724deb90b3e4a Author: John Baldwin AuthorDate: 2023-04-10 19:21:03 +0000 Commit: John Baldwin CommitDate: 2023-04-10 19:21:03 +0000 rack: mask and tclass are only used for INET6. This fixes the LINT-NOINET6 build. --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 4185b50737af..a1dda9889549 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -23369,6 +23369,7 @@ rack_set_sockopt(struct tcpcb *tp, struct sockopt *sopt) struct inpcb *inp = tptoinpcb(tp); #ifdef INET6 struct ip6_hdr *ip6; + int32_t mask, tclass; #endif #ifdef INET struct ip *ip; @@ -23376,7 +23377,7 @@ rack_set_sockopt(struct tcpcb *tp, struct sockopt *sopt) struct tcp_rack *rack; struct tcp_hybrid_req hybrid; uint64_t loptval; - int32_t error = 0, mask, optval, tclass; + int32_t error = 0, optval; rack = (struct tcp_rack *)tp->t_fb_ptr; if (rack == NULL) { From nobody Mon Apr 10 19:27:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwJsb3W8yz44htg; Mon, 10 Apr 2023 19:28:03 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) (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 4PwJsb1wP3z4RPZ; Mon, 10 Apr 2023 19:28:03 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-24677168b7bso193633a91.0; Mon, 10 Apr 2023 12:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681154882; x=1683746882; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=sGbN99AtrQr7bnu7t5bP4zY0q/2JcBgIBxIjy0ksMfE=; b=L51uNxoNZVltQQFxesobCJ4ybTxBuCi2SiGww4yldQfYk10iYZIoCXxXbvzrYWsS9I NcWgMCAufs8kve1wfBmEcQJM7dnhCHujkY9qCqOc3yiy1F/N/7zrYgtoAlAvNqKSPvQw TcJppCf5ZIW/hndGHbv7jUutwqKAV4W1JEwkAN9ZsUF2VIKG12eFKWboxV3+sxyGrhpQ ZdSSllJUVi/+moT9H+23eUeNtw/d5IZIPZnHm2o5oYVzN0gBKExCFD2j+EJKJ5Yltw3S ReXpSfn/mR7SIQUxe8XF/fa7uQ74Ik2wK+CdE1MzUjHHx2ob9EVUwLye7ysmgz9sKu7o 6bxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681154882; x=1683746882; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sGbN99AtrQr7bnu7t5bP4zY0q/2JcBgIBxIjy0ksMfE=; b=VMdDRItjZvIfW61OhpWZxLDFGSTFd/C7I95uovgIQFsbUQxSvFL1yzBoTiKbhQQnv6 DA3ZyBArwvj9ONVUouSi+sieDVhr5hYnEyAPbsB8vc5+1RN3Vog/uQ/EJWtCG8hfOXmf TLcq/lei+8ELyTukS2Ymppw17NOARdk9915OUXLcb8IlpRBD6BciFWixHiZNYEVPd2Ro 5fCaJooa3hwZ8KfvDYI1UA6oQ4//XloHBG/uEYZMB6XuugSxISxLiVjklkzWtrmvE0Ii z7bdCNn/wuBm4NCKZiOZicQM9VPFPLSULrylGR/aBhksUbGfk0ObH1pvxcvxzqA0Liwt n0oA== X-Gm-Message-State: AAQBX9fevHtR7PvDvemT7/PTnkbHPLRYNXI+M7b3tYcbnJeU8ztlBGCY sQRTsIgWyQWRgBMIkilX/Zzgsze/eMtQr0k/+iMq4TdnFQ== X-Google-Smtp-Source: AKy350bhW5pjUXvBltBKZ+GLfpZ0a62pKa9un1avzFouu+WqRqUAH7pnayzUDj8cIIrkCvQQRHZMn/PMZwf5md/LcsI= X-Received: by 2002:a05:6a00:2e1b:b0:62a:56ce:f90b with SMTP id fc27-20020a056a002e1b00b0062a56cef90bmr5734556pfb.2.1681154881914; Mon, 10 Apr 2023 12:28:01 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202101030102.10312IAC061762@gitrepo.freebsd.org> In-Reply-To: From: Rick Macklem Date: Mon, 10 Apr 2023 12:27:51 -0700 Message-ID: Subject: Re: git: c98a764c681f - main - cp(1): fix performance issue for large non-sparse file copies To: Alexey Dokuchaev Cc: Rick Macklem , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PwJsb1wP3z4RPZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mon, Apr 10, 2023 at 11:31=E2=80=AFAM Alexey Dokuchaev wrote: > > On Mon, Apr 10, 2023 at 08:31:28AM -0700, Rick Macklem wrote: > > On Mon, Apr 10, 2023 at 12:54???AM Alexey Dokuchaev wrote: > > > On Sun, Jan 03, 2021 at 01:02:18AM +0000, Rick Macklem wrote: > > > > commit c98a764c681f8b70812a9f13a6e61c96aa1a69d2 > > > > > > > > cp(1): fix performance issue for large non-sparse file copies > > > > > > > > @@ -236,7 +235,7 @@ copy_file(const FTSENT *entp, int dne) > > > > do { > > > > if (use_copy_file_range) { > > > > rcount =3D copy_file_range(from_fd, NULL, > > > > - to_fd, NULL, bufsize, 0); > > > > + to_fd, NULL, SSIZE_MAX, 0); > > > > > > Hi Rick, > > > > > > This change unfortunately breaks copying files in resource-limited > > > environments (e.g. many port builders do that to prevent runaway > > > processes): > > > > > > ulimit -f 16384000 > > > cp -p packages/13.0-i386-wip/All/perl5-5.32.1_3.tbz /tmp ; echo $? > > > Filesize limit exceeded > > > 153 > > > > I think zfs_copy_file_range() needs to use vn_rlimit_fsizex() the > > same way that vn_generic_copy_file_range() does. > > > > I have posted the attached patch to D39419. > > > > danfe@. Assuming you were using zfs, could you test this patch? > > (You will need an up to date main kernel and, hopefully, the block > > cloning stuff has not trashed your zpool.) > > We had already discussed with with Rick privately, but for the archives, > looks like my problem had been solved somewhere between 13.1 and 13.2, > and it's not related to ZFS. > > sh -c 'cd /tmp ; truncate -s 20m foo ; limits -f 8386560000 cp foo bar ; > stat -f %z bar' > > =3D=3D> 13.1: > Filesize limit exceeded > 0 Yes. If you think this should be done as an Errata for 13.1, please email asomers@, who committed the fix to main and stable/13 after the 13.1 release. > > =3D=3D> 13.2: > 20971520 > > Allegedly this is due to commit 52360ca, but I'd have to look closer into > it to be sure. Sorry for distracting you guys from that recent ZoL merge > fallout, I should've not be lazy and reported it earlier. :( > I do believe the recent ZoL merge introduced the same bug to ZFS. I have posted a proposed patch to D39419. (Basically call vn_rlimit_fsizex() and not vn_rlimit_fsize().) rick > ./danfe From nobody Mon Apr 10 20:22:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwL4t3lK5z44lpT; Mon, 10 Apr 2023 20:22: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 4PwL4s6TJNz3R5t; Mon, 10 Apr 2023 20:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681158173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcqpv/33tOFczf638zPCWq9AgzW3rno5pZj2c+LPpmM=; b=Gw9HHoZ59gOpZU4htR3s8tq9wZQhctksYgb/2c6A9bAfVqqLnnSa/vLKsCgGXy3pyaKTHk XBqj1uKetSfA5d47Zwj/iF/01aP1EdZYGjfTUA/r2aNBQhry6DFLE8lDRcYS2XytW7yEDI v6xy9aKF4GNWnSKP+RIVP+YpIc57TC9PIuPMrVQQn4uDS336jj6xaw2/pURXoYCC+PV/u7 fjFVLWw/HSdHqcqeg7C26zXhpxSbpDwBeQnccVY258CHYNDdv3JZM/+tSptTYg7BytZktE mzFrDVWBzffJcW1FksGnoJmcDRO9tfmg5tk9tznD3H6xyyiKdx5n8VY/IjncKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681158173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcqpv/33tOFczf638zPCWq9AgzW3rno5pZj2c+LPpmM=; b=g9QXrklm2HEpiWST6I+a/Tbui2uxUze+H7oLWQ4UJSGrKHh57bNo0Kc4eah9fMN0j3L/if K6XFKn65zrepg2AeUdJPCfcjxdpZhylR8wq73KvGTIokQY4r9rGO5l60c5sXgJ9ew6W5RH nsAbUugQpPH+y6PFB3sAFryiJwKzDwB3RlpVjQEPy71E6XkJEQLrnjpXWmit0sB9Bf0o/1 QSMt/O0K5brOgIC7JPnwcLYN0I981bcp//+LXVQBFuye2i93nDfNnqI+HvqrNuWO5jcv8v SA021Ch2IN45bhblVEmmD2Vjfoaj/JzECZr8MKCW4PauZwCMKhiXzid976nBkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681158173; a=rsa-sha256; cv=none; b=Bkochws7m7eYLnp942UEN+ZfrdniVFCJQMD846kRQV+4W4LuB5sAgpB0xdriNMFqJEq53Z H5a7LHGX/Tnkgi7lrHsBRodxWlajosGsRaBb3V+5a6iww+zffufqwyC8WObl5zYjIgM2J9 tGjIuaZbOZqZUPj0IcSNcTvxwp/0Q4xuSEyIUE5HvDAtokPSDMgBNqAdJoVb8nU7ZXxQPK hfcBFVeWkc+nMC0L4Q7KKyyOEK2J9NgeIU0inF8tHazYMicCbZdEA/fBIQ4fZa6ZqEKSc3 qCX4uctKFbFL+fjenP/KLwkOwh7RhpMG06ZmHOTz2uuGSK9GHq477jwPhj5HNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwL4s5WGZz14n7; Mon, 10 Apr 2023 20:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AKMrsN036264; Mon, 10 Apr 2023 20:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AKMrhm036263; Mon, 10 Apr 2023 20:22:53 GMT (envelope-from git) Date: Mon, 10 Apr 2023 20:22:53 GMT Message-Id: <202304102022.33AKMrhm036263@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: c3dbcadca268 - main - mail: fix build if TIOCSTI is not defined List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3dbcadca2680b8f04d8c910eae8f82868994c0d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dbcadca2680b8f04d8c910eae8f82868994c0d commit c3dbcadca2680b8f04d8c910eae8f82868994c0d Author: Ed Maste AuthorDate: 2023-03-21 01:01:55 +0000 Commit: Ed Maste CommitDate: 2023-04-10 20:08:20 +0000 mail: fix build if TIOCSTI is not defined Sponsored by: The FreeBSD Foundation --- usr.bin/mail/tty.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c index ca86bd480336..ed5c5f546347 100644 --- a/usr.bin/mail/tty.c +++ b/usr.bin/mail/tty.c @@ -139,7 +139,9 @@ grabh(struct header *hp, int gflags) hp->h_bcc = extract(readtty("Bcc: ", detract(hp->h_bcc, 0)), GBCC); } +#ifdef TIOCSTI out: +#endif (void)signal(SIGTSTP, savetstp); (void)signal(SIGTTOU, savettou); (void)signal(SIGTTIN, savettin); @@ -172,7 +174,10 @@ out: char * readtty(const char *pr, char src[]) { - char ch, canonb[BUFSIZ]; + char canonb[BUFSIZ]; +#ifdef TIOCSTI + char ch; +#endif int c; char *cp, *cp2; From nobody Mon Apr 10 20:34:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwLKn6vPnz44lwc; Mon, 10 Apr 2023 20:34: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 4PwLKn5fglz41Dl; Mon, 10 Apr 2023 20:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681158845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUr2+F3jCW4Vq4oiIIwZXbU8PtdROVIzyG1uzowJhRM=; b=JRCw/N/Ic43f30ydrBa2T0vCyc0DtzEUtrdVQLzmu1ADV+Ox1QTllcxADi9OKAUK5Z5vKG leDyBq3rhZdmm3WcQQGUbU6ahA1Ex7taCDWfRoDI81Zl5ORWbGEyt4J25ynzcC/xugs43C YvA28AG1OJZZwIQRUhBZZ7bR2nasdYCjmxhelKeI46KptNgxRV6kVK73L+DU1bJ0dHIOeA kYyrdYf21klFEsmrNYLh8ZzpIP75bWhMQTr8cb0trohl8KC7C3+RzVOC1einV0E/tvZlML IBhrJjF+CjHBXMq9Kg99zJhU+fkMmJAZcNfDvraCJKqg3JIqjl9jXbX/RkQ95Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681158845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUr2+F3jCW4Vq4oiIIwZXbU8PtdROVIzyG1uzowJhRM=; b=Fl0Tuy9idzA0b8mPLLir6tlJc0YS63RFP+2ATBrjWpHV6X12HPOu1W0JfuxQGmmPo8Yjd0 l76yL8N5zEROgWLE6WljNwLL+hn1IMtakupewIZzAq3aY+ZvX46GIPlxJIwUUdoXUNfDKz I9j5MKPk0pI3j1lNOvINSS3psryh2bu0MUOVzxWBKWwYcy77MxEC2VHGjV9jdf4o/TzPdk EilFm4ZIIvSrRRMqYriFRjXgTxcOz/snvby3/eONoGfdv+bIoTOqaNGcLU2JmMkB0ss0my J6qF53ubGi28eScOO6jFIhNxC3l2de5nRA2HE23ynhteE2YticfzU069InAKcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681158845; a=rsa-sha256; cv=none; b=lvthXFO/hye5JjdGossJMMNYEj8oZDnXU/P5VPeS0mBiMshJnWU3gw6jEc/KJNqWicIbwf pBnFqc4OKGFT9qLYOR1r3mDvIqaNQptQs3j6q9Qi4jNMwFdTU5Chl6+dJavGlHIoBIGi7I 7XAn8yipxaRH+tlvZMpHoFL27mBxeGbo1KbfknBNKmSoEYjNRUnvNVOons1eA0dc+TKo0F 31Q6HpjKlU5EBmnK7jQRj4OkMTjxbbtwoKYp3NWQDynDD76qBmsRLdcQjcpvdynTcgtffx tKgFD2sVUNV4S3ZD7sTGV5Y8Xn4SqfwB5aubqe5lbMT6XOED1o8Ej6o6Ft1E2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwLKn4byFz14tk; Mon, 10 Apr 2023 20:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AKY5Re054143; Mon, 10 Apr 2023 20:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AKY513054142; Mon, 10 Apr 2023 20:34:05 GMT (envelope-from git) Date: Mon, 10 Apr 2023 20:34:05 GMT Message-Id: <202304102034.33AKY513054142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: a2b33c9a7a95 - main - tcp: Rack - in the absence of LRO fixed rate pacing (loopback or interfaces with no LRO) does not work correctly. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2b33c9a7a952ff35d5061ae1dc76980d40320d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b33c9a7a952ff35d5061ae1dc76980d40320d3 commit a2b33c9a7a952ff35d5061ae1dc76980d40320d3 Author: Randall Stewart AuthorDate: 2023-04-10 20:33:56 +0000 Commit: Randall Stewart CommitDate: 2023-04-10 20:33:56 +0000 tcp: Rack - in the absence of LRO fixed rate pacing (loopback or interfaces with no LRO) does not work correctly. Rack is capable of fixed rate or dynamic rate pacing. Both of these can get mixed up when LRO is not available. This is because LRO will hold off waking up the tcp connection to processing the inbound packets until the pacing timer is up. Without LRO the pacing only sort-of works. Sometimes we pace correctly, other times not so much. This set of changes will make it so pacing works properly in the absence of LRO. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39494 --- sys/netinet/tcp_stacks/rack.c | 54 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a1dda9889549..1bab253818b5 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16433,6 +16433,9 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb return (0); } +#define TCP_LRO_TS_OPTION \ + ntohl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | \ + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP) static int rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, @@ -16458,6 +16461,8 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, struct tcp_rack *rack; struct rack_sendmap *rsm; int32_t prev_state = 0; + int no_output = 0; + int slot_remaining = 0; #ifdef TCP_ACCOUNTING int ack_val_set = 0xf; #endif @@ -16480,6 +16485,43 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ rack_deferred_init(tp, rack); } + /* + * Check to see if we need to skip any output plans. This + * can happen in the non-LRO path where we are pacing and + * must process the ack coming in but need to defer sending + * anything becase a pacing timer is running. + */ + us_cts = tcp_tv_to_usectick(tv); + if ((rack->rc_always_pace == 1) && + (rack->r_ctl.rc_hpts_flags & PACE_PKT_OUTPUT) && + (TSTMP_LT(us_cts, rack->r_ctl.rc_last_output_to))) { + /* + * Ok conditions are right for queuing the packets + * but we do have to check the flags in the inp, it + * could be, if a sack is present, we want to be awoken and + * so should process the packets. + */ + slot_remaining = rack->r_ctl.rc_last_output_to - us_cts; + if (rack->rc_inp->inp_flags2 & INP_DONT_SACK_QUEUE) { + no_output = 1; + } else { + /* + * If there is no options, or just a + * timestamp option, we will want to queue + * the packets. This is the same that LRO does + * and will need to change with accurate ECN. + */ + uint32_t *ts_ptr; + int optlen; + + optlen = (th->th_off << 2) - sizeof(struct tcphdr); + ts_ptr = (uint32_t *)(th + 1); + if ((optlen == 0) || + ((optlen == TCPOLEN_TSTAMP_APPA) && + (*ts_ptr == TCP_LRO_TS_OPTION))) + no_output = 1; + } + } if (m->m_flags & M_ACKCMP) { /* * All compressed ack's are ack's by definition so @@ -16914,7 +16956,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, } } #endif - if (nxt_pkt == 0) { + if ((nxt_pkt == 0) && (no_output == 0)) { if ((rack->r_wanted_output != 0) || (rack->r_fast_output != 0)) { do_output_now: if (tcp_output(tp) < 0) { @@ -16927,6 +16969,16 @@ do_output_now: } rack_start_hpts_timer(rack, tp, cts, 0, 0, 0); rack_free_trim(rack); + } else if ((no_output == 1) && + (nxt_pkt == 0) && + (tcp_in_hpts(rack->rc_inp) == 0)) { + /* + * We are not in hpts and we had a pacing timer up. Use + * the remaining time (slot_remaining) to restart the timer. + */ + KASSERT ((slot_remaining != 0), ("slot remaining is zero for rack:%p tp:%p", rack, tp)); + rack_start_hpts_timer(rack, tp, cts, slot_remaining, 0, 0); + rack_free_trim(rack); } /* Update any rounds needed */ if (rack_verbose_logging && tcp_bblogging_on(rack->rc_tp)) From nobody Mon Apr 10 22:13:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwNXM3Cvwz44sTp; Mon, 10 Apr 2023 22:13: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 4PwNXM2m1sz3HkP; Mon, 10 Apr 2023 22:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681164803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8VIz2j/pXVUc1tRm98jVpsywsfYLSU9ZyVECYycRlQ=; b=YasyhP7TrWujskFkNzrl8lLKRDfg4aDj9yNcMNJG3AFx6y9ONL6/juLm2XiI6oQDxKWeX1 R+t3HIkbdxFxpvlc2ZdQ/Xzo/kYHYOSrcyGisg2OUIwW+oKb7rMXqfQi/DNbXwqLxmCXji 82lVwh7/9SnihqsPCJm03hEyIela1BVgkDAGXe/UNPnmPt0YIvwmHGLVC2RXliqP2IHuAZ LQ/eYdNSryDV9iNq8GfmXreWuRQowuniM8enhIww7wxXZ8NBtRDS/wN+uLVY2LYMz9ked2 JyJ7vtVDR+luSk3cLjUL/992BqMnrrHxdJOM+bf2ka5wBgD+h5CKULfhL4w0ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681164803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8VIz2j/pXVUc1tRm98jVpsywsfYLSU9ZyVECYycRlQ=; b=IsUchmLdvUxbZxpEhd+4B93PQ05E94AWIypB7sJ1/IjHzDfePYQcQgDfC2boN/90N/smw/ AFlJAVK1ZbH9tTB9idiqatKj89FxHwoP2OYBzYjk7V5RbaEdmrw7v52DIXLl/9kMVCpej1 mLrn7QS4icOUglYa6jN5jJQB+UbbxMEY9qqw5wIuZk74xFj9lCWv/bA6UruWv8utp9R/CP n89U10WE3frJowWYxiP1QKFAG05BVG2+EySwWAzEXdHT895wdVDwjikPBns06Mb8fz/PFs iwU+tLfitsL6K0KF6twlTVDPA+E3BCVoZntzXoIIbhe4mQkhvOXnAhq9fcmuJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681164803; a=rsa-sha256; cv=none; b=GiN7yXB7MlZpg5XBJ9pcCWyn32iss6G2EyI7Qcv5V0zffu0FWfqmbH27YUT6/H45CFWiVI 2p1Yum05p8Qb3UrU3eomM8UMM74oS9EhRkMFIGzQbQRrDCdLbyksNfaDENXuTkqMMvOM4v PE3TyBAhvR4/q+moGqzgYmgkiog3gdgQMfcET3UrGQBKvLLdSguQNWmvw0tot1btTa5oad M4NFqA81Ie4bg+VyNcSDL8c4Ff8/NcKPwssUfNW2VwnpVZKiZihbJpkv5F6KM87h4805zN RCfBiiQ+pISmrHVDd4EfjGaF7KyIY2hgV+j0hcF+UqdMn1uIjynSrO0h/TmBoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwNXM1gcsz172p; Mon, 10 Apr 2023 22:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AMDNiS017966; Mon, 10 Apr 2023 22:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AMDNot017965; Mon, 10 Apr 2023 22:13:23 GMT (envelope-from git) Date: Mon, 10 Apr 2023 22:13:23 GMT Message-Id: <202304102213.33AMDNot017965@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: 7f8953991fac - main - bsd-family-tree: add OpenBSD 7.3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f8953991fac3dec6554298625d4692833bb2ab7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=7f8953991fac3dec6554298625d4692833bb2ab7 commit 7f8953991fac3dec6554298625d4692833bb2ab7 Author: Sergey A. Osokin AuthorDate: 2023-04-10 22:12:29 +0000 Commit: Sergey A. Osokin CommitDate: 2023-04-10 22:12:29 +0000 bsd-family-tree: add OpenBSD 7.3 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 c764ffc222f8..5a4487634fc8 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -443,6 +443,7 @@ FreeBSD 5.2 | | | | | FreeBSD | | | | | 12.4 | | | | | | | | DragonFly 6.4.0 + | | | OpenBSD 7.3 | | | | | | FreeBSD 14 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -867,6 +868,7 @@ OpenBSD 7.2 2022-10-20 [OBD] macOS 13 2022-10-24 [APL] FreeBSD 12.4 2022-12-05 [FBD] DragonFly 6.4 2022-12-30 [DFB] +OpenBSD 7.3 2023-04-10 [OBD] Bibliography ------------------------ From nobody Mon Apr 10 22:51:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwPN72Q7Fz44v9F; Mon, 10 Apr 2023 22:51: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 4PwPN71snGz4lMg; Mon, 10 Apr 2023 22:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681167079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4casdZOEZwouAqN1Vr1hLbI7UCxVE5aSIBjipzm0EpI=; b=l/BiEqDmt1sr4xbV+pIgGRVlbwaRnGUtVvxcNy+0uI1hvScYWiRFERylEWbI2HKhDhs+xh b8xbtkZjOtvKqRTa7sZrdWWVg3jP+tzya2in1dY1cmiFag03E9Yb/XKWDbXT8HESXHAlrY zuGfd00x1M+UYiUJfGxr0+gdJkBZ6y7Doh8YOry5A41KVXvbCd1gyzOaAMGHnKAmtAuOFz 9CF6B+qayhJj61BcPIIZBaT+IGRlASxk0Hv7muYAzM2OAZFOw46PEaYMF7+cVEz7XBNoJR 1DclWoLEQ9fK1t85ienA/j/xXvx9GB/247Mwyrfkxjim6kMgELBuT903e5X3FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681167079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4casdZOEZwouAqN1Vr1hLbI7UCxVE5aSIBjipzm0EpI=; b=Xx/6G1wCPuvsINhnXhtYxuHIWFRD5yqKKUGpYd0uO4EU5yomv1AatglosfS0rImaVWikAo o/06Q25DziZw4RGglFkQ4teTceVdT8iPlMWHPYzhsuiDJ74g4B9Zu/I7VagaQbs1o2yFDr GSQthjW9tq79krzSwuApfWaiaT7205VJlwmjtpc6j5azSxxj0HGqDtxLtX8cIuAaxyDX69 vhksS0icfT18Q8uo1N9pmXXyKDpsIwciX2yQQ1FXgzWsGT/Bl9bd3SJSmgTDSUvH2Kn3rt fgUJCdXy4JuriPAaILtYdiFoPIdBTFQVR9JXApfd+KRed70RmI3UXQm0x5Dt7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681167079; a=rsa-sha256; cv=none; b=x9jTym+AHYpENRjIx8nqE53dGN1VnpIEokkAioCQ0H3DkgLGP5gYplJuBxxksCQiJ2v+Tl vpavQkcGNIzFt1vcLdSJULhklrXSQ79FrYdpTEWTE1wQF4PXUE0w+2OleGmxZH594Q/Tjy 5RifJfUPmdmoreMJujB8JMMEhp4rNwwZMaH0FfdCjbjBz3OMX30jd9PAXjJwgk7rQylosY Y+sAkf+GIxHbwYkxos2RiOXgGFVQVmBB3TyUILOxu0SwdiqhifcSPJOTbkI51jTM3OS+oc IbAZ4bV0+uUx0YGYqIUfqdyICUxcoMkwy5IsSDJW9XVRrDaBA8Duo7bLL7VPew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwPN70zPcz188T; Mon, 10 Apr 2023 22:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AMpJ31076231; Mon, 10 Apr 2023 22:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AMpJXF076230; Mon, 10 Apr 2023 22:51:19 GMT (envelope-from git) Date: Mon, 10 Apr 2023 22:51:19 GMT Message-Id: <202304102251.33AMpJXF076230@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: 1d1ffa2efd2a - main - makefs: use size_t or ssize_t where appropriate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d1ffa2efd2a54c435b7977dc1cfd21dce248671 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1d1ffa2efd2a54c435b7977dc1cfd21dce248671 commit 1d1ffa2efd2a54c435b7977dc1cfd21dce248671 Author: Ed Maste AuthorDate: 2023-03-30 02:04:16 +0000 Commit: Ed Maste CommitDate: 2023-04-10 22:50:27 +0000 makefs: use size_t or ssize_t where appropriate Obtained from: NetBSD af7bc97830ac --- usr.sbin/makefs/cd9660.c | 11 ++++++----- usr.sbin/makefs/cd9660.h | 4 ++-- usr.sbin/makefs/cd9660/cd9660_strings.c | 4 ++-- usr.sbin/makefs/ffs/buf.c | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 54c1794d1500..661eefc832da 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.c,v 1.32 2011/08/23 17:09:11 christos Exp $ */ +/* $NetBSD: cd9660.c,v 1.56 2019/10/18 04:09:02 msaitoh Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause @@ -115,7 +115,7 @@ __FBSDID("$FreeBSD$"); static void cd9660_finalize_PVD(iso9660_disk *); static cd9660node *cd9660_allocate_cd9660node(void); static void cd9660_set_defaults(iso9660_disk *); -static int cd9660_arguments_set_string(const char *, const char *, int, +static int cd9660_arguments_set_string(const char *, const char *, size_t, char, char *); static void cd9660_populate_iso_dir_record( struct _iso_directory_record_cd9660 *, u_char, u_char, u_char, @@ -324,10 +324,11 @@ cd9660_cleanup_opts(fsinfo_t *fsopts) } static int -cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, - char testmode, char * dest) +cd9660_arguments_set_string(const char *val, const char *fieldtitle, + size_t length, char testmode, char *dest) { - int len, test; + size_t len; + int test; if (val == NULL) warnx("error: '%s' requires a string argument", fieldtitle); diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index c4baa590101a..fae2d2077c00 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.h,v 1.17 2011/06/23 02:35:56 enami Exp $ */ +/* $NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD @@ -284,7 +284,7 @@ typedef struct _iso9660_disk { /************ FUNCTIONS **************/ int cd9660_valid_a_chars(const char *); int cd9660_valid_d_chars(const char *); -void cd9660_uppercase_characters(char *, int); +void cd9660_uppercase_characters(char *, size_t); /* ISO Data Types */ void cd9660_721(uint16_t, unsigned char *); diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c index 12d7566e463d..da47084961bb 100644 --- a/usr.sbin/makefs/cd9660/cd9660_strings.c +++ b/usr.sbin/makefs/cd9660/cd9660_strings.c @@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$"); void -cd9660_uppercase_characters(char *str, int len) +cd9660_uppercase_characters(char *str, size_t len) { - int p; + size_t p; for (p = 0; p < len; p++) { if (islower((unsigned char)str[p]) ) diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index 13f3099c4491..f2e2b9a882eb 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -78,7 +78,7 @@ bread(struct m_vnode *vp, daddr_t blkno, int size, struct ucred *u1 __unused, if (lseek((*bpp)->b_fs->fd, offset, SEEK_SET) == -1) err(1, "%s: lseek %lld (%lld)", __func__, (long long)(*bpp)->b_blkno, (long long)offset); - rv = read((*bpp)->b_fs->fd, (*bpp)->b_data, (*bpp)->b_bcount); + rv = read((*bpp)->b_fs->fd, (*bpp)->b_data, (size_t)(*bpp)->b_bcount); if (debug & DEBUG_BUF_BREAD) printf("%s: read %ld (%lld) returned %d\n", __func__, (*bpp)->b_bcount, (long long)offset, (int)rv); @@ -206,8 +206,8 @@ getblk(struct m_vnode *vp, daddr_t blkno, int size, int u1 __unused, } bp->b_bcount = size; if (bp->b_data == NULL || bp->b_bcount > bp->b_bufsize) { - n = erealloc(bp->b_data, size); - memset(n, 0, size); + n = erealloc(bp->b_data, (size_t)size); + memset(n, 0, (size_t)size); bp->b_data = n; bp->b_bufsize = size; } From nobody Mon Apr 10 23:08:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwPlQ5CHhz44w2m; Mon, 10 Apr 2023 23:08: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 4PwPlQ4JXWz3nbX; Mon, 10 Apr 2023 23:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681168082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogTfgFjzvWl0ck1CQMNZ3EQ2UEIBirELb072rrcff1Y=; b=YaZIs6YRvxMw0jzYWWED2IXw9BEnoP0lR2LVAyldHFQBAmS7oyhnDwIxE68XNC4iT5iifV Q59UsJpZltzyp6k9VX9IMEStCVjBcIyCuHGDf1p63qcQqoPSpfv1AncwxpTdVnTMhm70hd NOsgd5cIXmiZlhiRf4SMWxVsxIlTgIeqR/JeEBBSecazOqNl29PG84Olq2JhK1kuH2NY2v CtbRAGS3LtfAtP4r2SyixtYjIenCSUc9YZoXUw7l2tMFhpfwg3J7RISG9yhSICtoMu0RH7 1CmHDUJg3OOfWvJ4MQzcBEAAzPUrFGoRtmicoeffkQa44GU8M0OlyOedMfII9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681168082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogTfgFjzvWl0ck1CQMNZ3EQ2UEIBirELb072rrcff1Y=; b=nQpN38QRzu7XDnGlRHp0SSqj3Z20dwammgnja6peoFETTN0RoMoEEVFcm5tF8HY8EXYjWz O+OduUJY34Y557yomFXdldNMuBVK/4XpPvPzO03SMBwK1UT2CD+uF5RKs6KMZfejFRbD4g kHbNjJcnzGfHA0HAHEZleql6F/3+JDPM9pix7URiQDEG37ghNU5/HW0rbMGZpS8v7W8zjO Xr459Li7GKDLstoY6QatkJYXl9eJ46yDmS/Ka2Zr+1raezMTFOrlFYc9Qs+TFvqWGy10bt nD8JuIAIfLqg43B8vcL2kGYLECqmKMTOR4WtANC6MGtmBGsj1MsY/mzQSKExCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681168082; a=rsa-sha256; cv=none; b=CA+rh3i8uXWvd8e0PubJmvaoEuczIraYSThPp5jPwTeqZGb6nfkwBy2VVzMRa2f6X4svuq OwFdLcQuCKXXJ8KOGbW09r+9AS9VkaUbbtAR+WAiFYbyTYBdcSKaPGTiRKQy0Mws1xoBr+ eNDtlk2/ROteWqLBmbYwQ07wER0bR22+1+29RtFQUG1x+dnizydXZIT73fHJjHUMs70Ak7 hwdiEqTnxAal4nChGinPGc7HGultyPS0ANCHq2tRAeIWlsXRDBcdwtwNu3TbWMllzpc5Pz OeNhbCMEopw5SFKefqvBtZ8LODCWl3AEnbQZwka9W+VxwoVZq9AW0DjijdlqAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwPlQ3G1Gz18M3; Mon, 10 Apr 2023 23:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33AN820T001398; Mon, 10 Apr 2023 23:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AN82Mo001397; Mon, 10 Apr 2023 23:08:02 GMT (envelope-from git) Date: Mon, 10 Apr 2023 23:08:02 GMT Message-Id: <202304102308.33AN82Mo001397@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: 22db5e5d0327 - main - makefs: set the validation entry system type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22db5e5d03278471c46799016c177abf95f273cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=22db5e5d03278471c46799016c177abf95f273cb commit 22db5e5d03278471c46799016c177abf95f273cb Author: Ed Maste AuthorDate: 2023-03-30 14:31:45 +0000 Commit: Ed Maste CommitDate: 2023-04-10 23:07:14 +0000 makefs: set the validation entry system type Obtained from: NetBSD c3cb4dcc9c43 Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 6d7a32378b64..f837c0b3c381 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -374,6 +374,7 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector) struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *efi_head, *valid_entry, *default_entry, *temp, *head, **headp, *next; struct cd9660_boot_image *tmp_disk; + uint8_t system; headp = NULL; x86_head = mac_head = ppc_head = efi_head = NULL; @@ -388,9 +389,16 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector) cd9660_731(first_sector, diskStructure->boot_descriptor->boot_catalog_pointer); + /* + * Use system type of default image for validation entry. Fallback to + * X86 system type if not found. + */ + system = default_boot_image != NULL ? default_boot_image->system : + ET_SYS_X86; + /* Step 1: Generate boot catalog */ /* Step 1a: Validation entry */ - valid_entry = cd9660_boot_setup_validation_entry(ET_SYS_X86); + valid_entry = cd9660_boot_setup_validation_entry(system); if (valid_entry == NULL) return -1; From nobody Mon Apr 10 23:13:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwPsr04gxz44wT1; Mon, 10 Apr 2023 23:13: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 4PwPsq6dnpz3yg3; Mon, 10 Apr 2023 23:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681168415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qct/Lqbse/cFcMbwTbg7crbqrDYaeoRbj2olDvUht1U=; b=Hckz1H4QWhH0UNH5BM97PgXNWRANksmj58xketmKevp/iKoK6aVSfzKt1mI5TsOC9FrLIO 20BTnGx+FrF9yVFaEfABwxy1ohvD6SBdMpcIsSCOT1Vb8kbTltN8LV3kq+fnPBWyfQ7S7X QLza4EQFcZ7tgsJcG21bFAdwJnPmqtFwVOTBdvIbhCrspyvxv8VEac7AnvAlBrHs7tr2GZ lHgDbx/23BxhZpFY8embTXMolb0mWDvyB+wlIduDPTDZ8FeeZp9rEo8gwWN3k/8H42QMLO O/0BdlfswUZh8sPnuJCwRqOhSEnjlMxWbpY0Jke0sGdTOf7Jh0Qx+k6OwahFhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681168415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qct/Lqbse/cFcMbwTbg7crbqrDYaeoRbj2olDvUht1U=; b=dXzvWjJxjLblcmyAJ8E/+qp72+57s0HYyymvhb1tykS90B3cP+0TRouovgwIsd91eTHSda LFgtBLrZwn0yCK+saB9BKGvHhni+xts1iwKR6m1P9u7bELiQ7MCpGbXpSZ0u/tf9Ae/iMi cNKtDH2wX8cS9TAKA7eItN4w8dZhReFshuQeBd42aalayOi0ojYaJuaFuCkmZbD/x9312g Dqxswh+ppoyejziucCZA+WwRjCUbmqbEuztvk1l2H7QmxpSW8MsDHOsYB3aJlOSDRblyJk X09MZZy+gZ7wQTvsX2xPmcjv12IIrP9nUqOLV+YTnZ5VJs7/o81p3WRovwpYCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681168415; a=rsa-sha256; cv=none; b=E3481QJ0lw4x4ZvHg9Cuk9Q2WodwI2rXLDJ82VuIXj+tIk7jMv7yAtCKQ3bjYblbfNcb4t zeuP1Iq8x2gfvJKIbo95uFaMf6bYss/z8CdM5XHFux09QERL3XgMbaReINBT2Kw+QBVusz hPSHlj+K8QiWqjSyWhdTHrfXf3GpRgtZiP5kAAWoxCqytk4v8Lk+ClErqveveBWol6EgH9 Yme8GbrwyJgDdC6AQd05kuX4k9LFDMBSM0a79mf9PZvGaKRtMAlSMo87uryAni7aSp+RFf wvNkpOryOqsLa6W97UfehlUyAG7UExz8NKRWpIdIZXaIPJb/W1R+PsKK5q4XWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwPsq5dDSz18t2; Mon, 10 Apr 2023 23:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ANDZGs016972; Mon, 10 Apr 2023 23:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ANDZuX016971; Mon, 10 Apr 2023 23:13:35 GMT (envelope-from git) Date: Mon, 10 Apr 2023 23:13:35 GMT Message-Id: <202304102313.33ANDZuX016971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: 461ccb55d50c - main - dhclient: add ability to ignore options in offers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 461ccb55d50ccf1b5bcfe1310fe32d72f8b0ecdd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=461ccb55d50ccf1b5bcfe1310fe32d72f8b0ecdd commit 461ccb55d50ccf1b5bcfe1310fe32d72f8b0ecdd Author: Rob Norris AuthorDate: 2023-03-14 22:07:18 +0000 Commit: Allan Jude CommitDate: 2023-04-10 23:13:18 +0000 dhclient: add ability to ignore options in offers A machine might exist on multiple networks, all of which offer, say, default routes or name servers. There's no easy way to indicate in the config that those options are only valid for a single interface. Now, we can write: interface "lan0" { request routers; require routers; } interface "lan1" { ignore routers; } And only take action on default routes offered on lan0. Tested by: Jose Luis Duran MFC after: 2 months Reviewed by: allanjude, imp Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. Pull Request: #693 --- sbin/dhclient/clparse.c | 4 ++++ sbin/dhclient/conflex.c | 2 ++ sbin/dhclient/dhclient.c | 13 +++++++++++-- sbin/dhclient/dhclient.conf.5 | 7 ++++++- sbin/dhclient/dhcpd.h | 1 + sbin/dhclient/dhctoken.h | 1 + 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index c7b02a073aa3..295a800a7328 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -186,6 +186,7 @@ read_client_leases(void) * hardware-declaration | * REQUEST option-list | * REQUIRE option-list | + * IGNORE option-list | * TIMEOUT number | * RETRY number | * REBOOT number | @@ -249,6 +250,9 @@ parse_client_statement(FILE *cfile, struct interface_info *ip, sizeof(config->required_options)); parse_option_list(cfile, config->required_options); return; + case IGNORE: + parse_option_list(cfile, config->ignored_options); + return; case TIMEOUT: parse_lease_time(cfile, &config->timeout); return; diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index c11c9189527e..3a6824a9a815 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -413,6 +413,8 @@ intern(char *atom, int dfv) return (HOSTNAME); break; case 'i': + if (!strcasecmp(atom + 1, "gnore")) + return (IGNORE); if (!strcasecmp(atom + 1, "nitial-interval")) return (INITIAL_INTERVAL); if (!strcasecmp(atom + 1, "nterface")) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index da9a567fad04..4261251b6b78 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1039,7 +1039,6 @@ dhcpoffer(struct packet *packet) note("%s from %s", name, piaddr(packet->client_addr)); - /* If this lease doesn't supply the minimum required parameters, blow it off. */ for (i = 0; ip->client->config->required_options[i]; i++) { @@ -1141,8 +1140,9 @@ dhcpoffer(struct packet *packet) struct client_lease * packet_to_lease(struct packet *packet) { + struct interface_info *ip = packet->interface; struct client_lease *lease; - int i; + int i, j; lease = malloc(sizeof(struct client_lease)); @@ -1156,6 +1156,15 @@ packet_to_lease(struct packet *packet) /* Copy the lease options. */ for (i = 0; i < 256; i++) { if (packet->options[i].len) { + int ignored = 0; + for (j = 0; ip->client->config->ignored_options[j]; j++) + if (i == + ip->client->config->ignored_options[j]) { + ignored = 1; + break; + } + if (ignored) + continue; lease->options[i].data = malloc(packet->options[i].len + 1); if (!lease->options[i].data) { diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5 index 14a0de4111dd..39a00fd0f207 100644 --- a/sbin/dhclient/dhclient.conf.5 +++ b/sbin/dhclient/dhclient.conf.5 @@ -38,7 +38,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 21, 2021 +.Dd March 17, 2023 .Dt DHCLIENT.CONF 5 .Os .Sh NAME @@ -200,6 +200,11 @@ option other than the default requested lease time, which is two hours. The other obvious use for this statement is to send information to the server that will allow it to differentiate between this client and other clients or kinds of clients. +.It Ic ignore Oo Ar option Oc Oo , Ar ... option Oc ; +The +.Ic ignore +statement causes the client to disregard the specified options in any offer +received, as though the server had never sent them at all. .El .Sh OPTION MODIFIERS In some cases, a client may receive option data from the server which diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index b151daa90a1c..580fdabaf367 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -159,6 +159,7 @@ struct client_config { u_int8_t required_options[256]; u_int8_t requested_options[256]; int requested_option_count; + u_int8_t ignored_options[256]; u_int vlan_pcp; time_t timeout; time_t initial_interval; diff --git a/sbin/dhclient/dhctoken.h b/sbin/dhclient/dhctoken.h index c929307c7e06..dc8008e23be9 100644 --- a/sbin/dhclient/dhctoken.h +++ b/sbin/dhclient/dhctoken.h @@ -134,6 +134,7 @@ #define TOKEN_NOT 334 #define ALWAYS_REPLY_RFC1048 335 #define VLAN_PCP 336 +#define IGNORE 337 #define is_identifier(x) ((x) >= FIRST_TOKEN && \ (x) != STRING && \ From nobody Mon Apr 10 23:39:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwQRq26C9z44xR4; Mon, 10 Apr 2023 23:39: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 4PwQRq12Mmz3mWk; Mon, 10 Apr 2023 23:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681169975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgxHIK6tl5wnZ+ekoJb9SuKPSgkg33wkScOjBbPmQAQ=; b=jER3wex8Su4Z+GFpVzn9CBOCArWcXn88VBMsefjtKqwDI7rCxbtpi+J9H33mzXNtwKrja7 wLykmRN+P5MCVz7092vnT8oKRj7Un/fbC1JZJ/81dGLPkKQF1o5EaPsK4gT0+PqxrthW6w C27sYx7O098s6/xw6n39jssXrGtpN7iVUDLttG7Lk8b+NZgIL61ok1QAQBHViCjuoG7GNK qmzicHdATLs2XK8zF96Eb58cZ/MS4zkwYAOl37xO0XlhMehfitmG11q27bD9bIBpV/g+L9 X0Q4LJGgnuQiu1QTdX1rfYZlIQKsO6VVsCleVF7e9seLhYhqc0FTSbuKo/emZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681169975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgxHIK6tl5wnZ+ekoJb9SuKPSgkg33wkScOjBbPmQAQ=; b=rPiGpKrzD3XOhrpxyMY3KSKANzI317GrFCkOROG73bX5/9P5UnbtT6RWImiD0cG155afDu Ozc+FPE44FdfLcGlnKjcX/cC90QZpRrSkft2gHBARpK/8jR8Fx75QIV4I2/JBkceNIWGUI zTZn4XswdRIBAnvNPFUdxCSg/16gaguByRgfW7cJiUEA4XxNFASh7UcQZNxalvFXb3PvhQ wbGfQ5WWQtm148CijrqGZQkH3JAXmyrv8Y24eXnxfuz26/Pwz5QRlo5HLdPbSTGVSdJjq5 0niFD5t+xb8brj4aOUoAx/NPCwujIi8zxdimugXO8FYQ8IX7FYoch/goiNBMUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681169975; a=rsa-sha256; cv=none; b=GRZCkUzk6pW0GAHOUFSZ5aSQL0g6MUrVshgQgYZbhWc5TQRUSfijV+keDYINr1mE/QEr2V ZbhqafGVnozX5jH+mlkizRdXcfgQ2UPVc8GsPIb40HM38hExTDRdg7h5nd+MIsDSdvzcSl ZlND+HULq2J9DY3eh0M5JIxxBNY7meTEhp9mD99oISgxVrFgh8bo7dxnD4WIcRkjFnmSjg 87B2NwUotd0A3vil04b447aFqPkL2Pt38dbfytVVHGUnBVGRV+wUunvAyQOjJmOVJu/jHj QtveCuLzR3lR+sZV1wrYfFDaZ6xKNY9wDV0D7UIw//h0FDagXS4uEzbRoFhA3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwQRp6rPdz19Q5; Mon, 10 Apr 2023 23:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ANdY11049362; Mon, 10 Apr 2023 23:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ANdYpF049361; Mon, 10 Apr 2023 23:39:34 GMT (envelope-from git) Date: Mon, 10 Apr 2023 23:39:34 GMT Message-Id: <202304102339.33ANdYpF049361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 61605e0ae5d8 - main - net80211: fail for unicast traffic without unicast key List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61605e0ae5d8f34b89b8e71e393f3006f511e86a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=61605e0ae5d8f34b89b8e71e393f3006f511e86a commit 61605e0ae5d8f34b89b8e71e393f3006f511e86a Author: domienschepers AuthorDate: 2022-11-10 00:00:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-04-10 23:38:57 +0000 net80211: fail for unicast traffic without unicast key Falling back to the multicast key may cause unicast traffic to leak. Instead fail when no key is found. For more information see the 'Framing Frames: Bypassing Wi-Fi Encryption by Manipulating Transmit Queues' paper. [ I updated the commit message to reference the paper and the code comment to record historic behaviour as discussed in private email. ] Security: CVE-2022-47522 --- sys/net80211/ieee80211_crypto.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 59760d1e7d9c..f5941392465b 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -560,13 +560,17 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) /* * Multicast traffic always uses the multicast key. - * Otherwise if a unicast key is set we use that and - * it is always key index 0. When no unicast key is - * set we fall back to the default transmit key. + * + * Historically we would fall back to the default + * transmit key if there was no unicast key. This + * behaviour was documented up to IEEE Std 802.11-2016, + * 12.9.2.2 Per-MSDU/Per-A-MSDU Tx pseudocode, in the + * 'else' case but is no longer in later versions of + * the standard. Additionally falling back to the + * group key for unicast was a security risk. */ wh = mtod(m, struct ieee80211_frame *); - if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { if (vap->iv_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr1, @@ -578,6 +582,8 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) return &vap->iv_nw_keys[vap->iv_def_txkey]; } + if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) + return NULL; return &ni->ni_ucastkey; } From nobody Mon Apr 10 23:54:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwQmn6n3bz44y7W; Mon, 10 Apr 2023 23:54:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwQmm2wT9z4Htd; Mon, 10 Apr 2023 23:54:16 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id lwEUp548Kjvm1m1Kxp21BE; Mon, 10 Apr 2023 23:54:15 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id m1KvpVNAqyAOem1KwpWzWO; Mon, 10 Apr 2023 23:54:15 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=6434a1a7 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=MBLj5XERK8VBRhsjEw8A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 9278EB08; Mon, 10 Apr 2023 16:54:13 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 78E341CE; Mon, 10 Apr 2023 16:54:13 -0700 (PDT) Date: Mon, 10 Apr 2023 16:54:13 -0700 From: Cy Schubert To: Charlie Li Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230410165406.51bcd958@cschubert.com> In-Reply-To: <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfMJz2v9QSXlw7UgfsivpxbGLFEyVhjxDY3I9ck3msop+TYOPRlfXZRVPF8Yy/yV1IylE77SmQMtZp1D7B964iAy/iUEygz1e/n42dSXqoXxjTm2uIWuK SL1rsi9V0V+y7mn7hs5Bxt0YnURsqGpWfy/6m6dadD+wvBJ5gzIpAMNAfSoP7wKSu0vYsMxfxKVLD764fjPGVFR1jnsdR8qrz/N96pcdor3ErzUViEmuDV0r A0B/sixg5z46ZJ8zwQPzk6V2A8ImuuA+i02CUEArHI9jR1Rjh0d80vWH92unVzGExfY/xPHY+x16ZLsgvuu9jLkFI7OPb83ZQ5FJGA/BJyFDnkF1Rz8AlC7z dvjx7V5XTjNO5VdkfcaSzcZyaPNEWuuL5mDOZIZK+xpFyJ9jtVY= X-Rspamd-Queue-Id: 4PwQmm2wT9z4Htd X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mon, 10 Apr 2023 01:58:00 -0400 Charlie Li wrote: > Cy Schubert wrote: > > Hmm, interesting. I'm experiencing no such panics nor corruption since > > the commit. > > > > Reading a previous email of yours from today block_cloning is not > > enabled. Is it possible that before the regression was fixed, while it > > was wreaking havoc in your zpool, that your zpool became irreversibly > > corrupted resulting in panics, even with the fixed code? > > > This is probably now the case. > > One way, probably the best way, to test would be to revert back to the > > commit prior to the import. If you still experience panics and > > corruption, your zpool is damaged. > > > Fails to mount with error 45 on a boot environment only a few commits > before the import. > > At the moment we don't know if the code is still broken or if it has > > been fixed but residual damage is still causing creeping rot and panics. > > > > I don't know if zpool scrub can fix this -- reading one comment on > > FreeBSD-current, zpool scrub fails to complete. > > > It doesn't. All scrubs on my end complete fully with nothing to repair. > > I'm not convinced, yet, that the problem code has not been fixed. We > > don't know if the panics are a result of corruption as a result of the > > regression. > > > > Would it be best if we reverted the seven commits to main? I don't > > know. I could argue it either way. My problems, on four machines, have > > been fixed by the subsequent commits. We don't know if there are other > > regressions or if the current problems are due to corruption caused > > writes prior to patches addressing the regression. Maybe reverting the > > seven commits and taking a watch for further fallout approach, whether > > the panics and problems persist post revert. If the problems persist > > post revert we know for sure the regression has caused some permanent > > corruption. This is a radical option. IMO, I'm torn whether a revert > > would be the best approach or not. It has its merits but > > significant limitations too. > > > Going to try recreating the pool on current tip, making sure that > block_cloning is disabled. > You'll need to do this at pool creation time. I have a "sandhbox" pool, called t, used for /usr/obj and ports wrkdirs, and other writes I can easily recreate on my laptop. Here are the results of my tests. Method: Initially I copied my /usr/obj from my two build machines (one amd64.amd64 and an i386.i386) to my "sandbox" zpool. Next, with block_cloning disabled I did cp -R of the /usr/obj test files. Then a diff -qr. They source and target directories were the same. Next, I cleaned up (rm -rf) the target directory to prepare for the block_clone enabled test. Next, I did zpool checkpoint t. After this, zpool upgrade t. Pool t now has block_cloning enabled. I repeated the cp -R test from above followed by a diff -qr. Almost every file was different. The pool was corrupted. I restored the pool by the following removing the corruption: slippy# zpool export t slippy# zpool import --rewind-to-checkpoint t slippy# It is recommended that people avoid upgrading their zpools until the problem is fixed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Tue Apr 11 02:51:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwVj13LKNz459HD; Tue, 11 Apr 2023 02:51:17 +0000 (UTC) (envelope-from vishwin@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 4PwVj12Blgz4LZH; Tue, 11 Apr 2023 02:51:17 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681181477; 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=k42pTauTRA6Zjy/X8HORhUxOkwIsk/kOrLp4PTJyeh4=; b=V3J/9cl/KSY4fOqv43I9uIYAXGfhYCKYBIr4xOu/yUb6odXd9U7MUKH7IY3lrGIbUafVoD SSIpz/e5bF84EwJhVJ9X5m18B+4n+qs/Vb9M4cKSnWfpQiX26SHHNyYkPrAs9DoATyUWIg miVJXdRrGPwBLOmLmXto7LjX/k9gtYHKypIu6iSNIAviQ1Gk1QLUs8LsgNJZCOen6kZoB6 F0e+GGO+OgUT9JpiMZL0l7LgmIrReaKE7PQe3shMaLld5hfWL0s83ay2agU+3E9g1IESGL PfKmLqSWXLneARZfRn4Jiddh2dNjLOvZcrVTTAqjNlFiWUfMKiFWnPxIpqJI4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681181477; 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=k42pTauTRA6Zjy/X8HORhUxOkwIsk/kOrLp4PTJyeh4=; b=U39ikOnCzixgObweYZQp6Hz7E158Ut53unhojAHXheDdkojOcAUIPBCCZJfrp21snovQ4f NLoNEE1KKhmA/f7atFj2weMJXOk0T03IRxpL7DVQBsidSdflcNAfB8HuqUOcTkHx4LQK6I FtzW4D8B9BWMfJpuAtgK19hTPgslqGso2BK3yLx1gpoNwBdk0ZgfrVlRK1U0SjMZjyj/Mn JBnzEnkh6dgMmsXXQYpnus/li2OvMwTqQ/xltXvWu2oULUfNJAoy/UYRhDJhP9eXsxjhPn wOCZQS8fmRw8eyN/wSiZc5XXIssGoBAyb5XClCPDfH2eKi3nQmHL633gOs7fpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681181477; a=rsa-sha256; cv=none; b=OzBG9OcbBs6LbU7EbBzoBor9BWaaKqeFl/oPGn5nyOvulaqgGO+DVEVw6cQaKVJXmgNK4v LieP8BljDQpDJTlo3/G+IcJcqKfzi3mqht8EI8fgvayC5TY6iDuszRme/vxoqPY/L7Z1Ft mreneenT9BBJxPcHfJL29mbif56KSbHY8BMokuy9QcOHWXR/Yx1/T0ahdtQR4jSgrZJXFc qqNm67cADgvKF9LmxEB/ogjbkq12Z7Nj6oy9vEppVLe5/cwKS8Y4VXDDKdVSjPLoVRPJF1 VMV8QlGUP+K9E7yekcDSvGcw0SBBBd7unr1FeuVRYCG66BH8EbvoHRsShAgksA== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PwVj06ZCzzm14; Tue, 11 Apr 2023 02:51:16 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Mon, 10 Apr 2023 22:51:13 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <20230410165406.51bcd958@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------z1Y0fe2aL0jmw00Eo8DAV22H" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------z1Y0fe2aL0jmw00Eo8DAV22H Content-Type: multipart/mixed; boundary="------------jAfaM68RfRA99xzKV8ZCovoL"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> In-Reply-To: <20230410165406.51bcd958@cschubert.com> --------------jAfaM68RfRA99xzKV8ZCovoL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SSBlbmRlZCB1cCBjcmVhdGluZyBhIG5ldyBwb29sIHdpdGggLW8gDQpjb21wYXRpYmlsaXR5 PW9wZW56ZnMtMi4xLWZyZWVic2QsIHNvIG5vIGJsb2NrX2Nsb25pbmcgb3Igb3RoZXIgZmVh dHVyZXMgDQpzaW5jZSB0aGVuLiBUaGUgcGFuaWMgaXMgZ29uZSwgYnV0IHN0aWxsIGdldHRp bmcgdGhlIG9jY2FzaW9uYWwgZmlsZSANCmNvcnJ1cHRpb24gb24gd3JpdGUgYXMgZXZpZGVu Y2VkIGJ5IGZhaWxlZCBwb3VkcmllcmUgYnVpbGRzLg0KDQotLSANCkNoYXJsaWUgTGkNCuKA pm5vcGUsIHN0aWxsIGRvbid0IGhhdmUgYW4gZXhpdCBsaW5lLg0KDQo= --------------jAfaM68RfRA99xzKV8ZCovoL-- --------------z1Y0fe2aL0jmw00Eo8DAV22H Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ0yyEFAwAAAAAACgkQ/reFK+KbPof7 3hAAhaRIEAIbkFXb9WcISqDZfOOxt4sV4kwQcAu7uC9GlrubQhJ8jcnVnl+RkAgam5W0EvWC1lKC 7m9eIBazZDmPlvFmOo7P4uB3Ba4jwZWmsGUMDzarCBxgOse4jKTiiv8+v+7E5jF90kCPITynprll zzc/3pMl8XhJKPtlWHSSD1RrQAwx4pliYmQ9w7zxHoWdb8mUAgpIbtEOpLI8ou07A6Ld96X3lUup 7Z1ZICdudc0dOBxAiulZwiE2OMaV0FNBSU6FESJJHHeIDHNaRGcgRlIE9Y+/9zi1t0rxxb2/lHSt KPOAjUo7SmgcwaiVgrF4sDQEuehkPNqWLC/2V2yVxZnBGzGLJ78XDCctELLrpf7VD6sgpzsThU11 vvQJbHDJU3yGunSH6XonGPK4QOZQrJfqIEZL4CpaXbkEphIYbCVh4yulug1gRON98arw7eiJEjUs mVaIb/tsUEeql4Bqe7cPv60QlLw6+tkGqfZl3+xRJ7V2d8nXgK02FfAo5aNVhGVvdwtk42ekHpbt L3yLkfvlhFUvp2+fHSBwjl7MUxHYGYZc4B7xQAFBhUNhqZqRs/AY/R98s+0vj4jnWaZGgHS5e9wg Ulm/l0+dNieP3SuoqG9vngUWx+tdxLDIlfTQwJRIVse95tGYD17KR3pfp4IjSUhLEk451/PlhoQN fbk= =UnVS -----END PGP SIGNATURE----- --------------z1Y0fe2aL0jmw00Eo8DAV22H-- From nobody Tue Apr 11 06:16:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwbG72KP0z45Qjm; Tue, 11 Apr 2023 06:16:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PwbG704QXz45Fh; Tue, 11 Apr 2023 06:16:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id ltAgpzCdZuZMSm7J8pGrts; Tue, 11 Apr 2023 06:16:46 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id m7J6pJDAX3fOSm7J7pZ2ld; Tue, 11 Apr 2023 06:16:46 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=6434fb4e a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=LjbI3QAdtRfmy7vlO2EA:9 a=QEXdDO2ut3YA:10 a=zZCYzV9kfG8A:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (S0106002401cb186f.gv.shawcable.net [70.67.229.168]) by spqr.komquats.com (Postfix) with ESMTPSA id DEA8E19D2; Mon, 10 Apr 2023 23:16:43 -0700 (PDT) Date: Mon, 10 Apr 2023 23:16:42 -0700 From: Cy Schubert To: Charlie Li CC: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> Message-ID: <9215BEBD-889B-4F45-90E3-B1D82EFDF7E5@cschubert.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfAc5xnU6/8K44gZ6/zVZEvu+6VmB1Az5wuRwnlQHbNOANZIoRBcwxT8hWaBteUTAyeaIxiz+X0MnDmcn5btA/SzbCzxSrHNnGpsfuAbQ2f5YEcSMo65A 4egaJ/31IaiOb6Qf2BtjKDWiKcFxeCEfktYlN3FUiF62WjBiF3zxQHA9i2FMTCRDvxcxVityIyn3/HX3NXvS7nYncdqUG2oUyJmGt7PjOv++Q1nWAR77TKMs lxjzmnkSyBTVwASr5lIf/av4MhEFr6jf3qXSTBMWv9b5ug5Q5BDJ7nrOdHmBxy7F46blmrZMJM7ckMxo0Y+qSwRuMnv9A9kW0TjtGE7f8GGHKBB+WVO7TM7p K43orDjLPCvxoDGSVmGxgZd8sL/C3LDjfF0JfGNtUMdgPHNXPTE= X-Rspamd-Queue-Id: 4PwbG704QXz45Fh X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TAGGED_RCPT(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 10, 2023 7:51:13 PM PDT, Charlie Li wrote: >I ended up creating a new pool with -o compatibility=3Dopenzfs-2=2E1-free= bsd, so no block_cloning or other features since then=2E The panic is gone,= but still getting the occasional file corruption on write as evidenced by = failed poudriere builds=2E > Can you please try the cp -R test I posted, to verify the corruption is re= al? --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Tue Apr 11 06:41:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwbq502lDz44DNW; Tue, 11 Apr 2023 06:41: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 4Pwbq44J9Fz3nQ3; Tue, 11 Apr 2023 06:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681195312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0X4/MPsLQmYDzt8YaOWhTA84vBChpZy/GuiUl9fKJc=; b=WId7sjbPcNiMN1SDhxiYer1R3VZQ/zVy8pzBIansDWZ7eGLkfzEjOGLrHM2I8EiGXAos7W aAE/np4GiAqzSkbE7sBixb1jZRyMyJ9E2+aX1vsCinIvVvxppM2Jxx+AYCv2adh0GoKsY0 324JQD3U7xX9r3n7TYFc+1pe2rixY9255GhkpxTnR8wNoGX0kplCjKit4NGnu9ak4/vxtf aQ102RGZvkLmRhT7jHp5dAP9xk1YtQ/8TObgP/u5rWa3E+9fPRIasC0mZ4R7LrJsaoP2yD Z1YWP5UgQCOdihj0NaEhoXeU2rE4UIxjJnDGtuBuFjIX4g/NVopjwPQp1BckDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681195312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0X4/MPsLQmYDzt8YaOWhTA84vBChpZy/GuiUl9fKJc=; b=GVNX4ukS2Gt9hnKbeYFOE4tYXR0uAxZdyotZxN6p6+w1L7W/P/QD7OSuUoOu6hx0sO0Fy+ ipd7Tjeln/ehvVR877FWdESpb+E1xMzfIMJWBQfSWqVdH9FdFNcvQ4cN9+J3daVKMyjh83 gDPpQsJMSG1uLqLuhj0brLjiI5BrDISc9VeRHFtDy0HTSEdGa7iH1gtgvVLOUrejjT+lD9 wqrQ06qSK6Wxtixb3tXO2yCqywlVbFaBbNkSjvt7WUDSYu3WZ/FymPsJkKsR5EVAq0rUTI G0CvDNCliDrC/dEGs9ACd5RI7W9JMEzqrN+oau0FzO0DF+F9Q4gupEFVkYzlIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681195312; a=rsa-sha256; cv=none; b=QDqpGr3IMTEufWIJizUdT9G/KNnHsf5NBkZi89+FGX8d43o+eOfBgj56nOme9WmFnEuVeZ DEPk0j417ElJ/37blPg0+etdZUUSJVJQu+Gq0IrGMFN9rQ08hFQ5gzarYNStj/l5SDEjCn XsLT+AHR24oiXxn+mboXW8Kprbt8Rh2zlUn5XZdivxGd2Dw2STQ8hPOB9uX7OC91HQp9Rw Y3hBt9KrtSAK0yrvA+47oKu6nEOJxLGoTdTktVFBNPhxT6f14QEC0um75ta/HkKh6SUsZP CpEb5DUWvLIqetyHZMnvzkay6/fH8HhfFVy2RT5da1Vb9tZkg/1M8wKdlixfEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pwbq43LZrz1Mj4; Tue, 11 Apr 2023 06:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33B6fqZR055004; Tue, 11 Apr 2023 06:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33B6fqVg055003; Tue, 11 Apr 2023 06:41:52 GMT (envelope-from git) Date: Tue, 11 Apr 2023 06:41:52 GMT Message-Id: <202304110641.33B6fqVg055003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 0d29d750b9a7 - main - bhyve: do not exit if LPC finds no host selector List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0d29d750b9a7188c435d3701b2183f4df15ac98b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=0d29d750b9a7188c435d3701b2183f4df15ac98b commit 0d29d750b9a7188c435d3701b2183f4df15ac98b Author: Corvin Köhne AuthorDate: 2023-03-29 08:07:10 +0000 Commit: Corvin Köhne CommitDate: 2023-04-11 06:39:21 +0000 bhyve: do not exit if LPC finds no host selector The host selector is only required when the user likes to use the same LPC device IDs as the physical LPC device. This is an uncommon use case. For that reason, it makes no sense to exit when we don't find the host selector. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39311 --- usr.sbin/bhyve/pci_lpc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index 02105ef01bdf..8213f32985ef 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -480,6 +480,8 @@ pci_lpc_get_sel(struct pcisel *const sel) } } + warnx("%s: Unable to find host selector of LPC bridge.", __func__); + return (-1); } @@ -487,6 +489,7 @@ static int pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) { struct pcisel sel = { 0 }; + struct pcisel *selp = NULL; uint16_t device, subdevice, subvendor, vendor; uint8_t revid; @@ -511,15 +514,15 @@ pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) if (lpc_init(pi->pi_vmctx) != 0) return (-1); - if (pci_lpc_get_sel(&sel) != 0) - return (-1); + if (pci_lpc_get_sel(&sel) == 0) + selp = &sel; - vendor = pci_config_read_reg(&sel, nvl, PCIR_VENDOR, 2, LPC_VENDOR); - device = pci_config_read_reg(&sel, nvl, PCIR_DEVICE, 2, LPC_DEV); - revid = pci_config_read_reg(&sel, nvl, PCIR_REVID, 1, LPC_REVID); - subvendor = pci_config_read_reg(&sel, nvl, PCIR_SUBVEND_0, 2, + vendor = pci_config_read_reg(selp, nvl, PCIR_VENDOR, 2, LPC_VENDOR); + device = pci_config_read_reg(selp, nvl, PCIR_DEVICE, 2, LPC_DEV); + revid = pci_config_read_reg(selp, nvl, PCIR_REVID, 1, LPC_REVID); + subvendor = pci_config_read_reg(selp, nvl, PCIR_SUBVEND_0, 2, LPC_SUBVEND_0); - subdevice = pci_config_read_reg(&sel, nvl, PCIR_SUBDEV_0, 2, + subdevice = pci_config_read_reg(selp, nvl, PCIR_SUBDEV_0, 2, LPC_SUBDEV_0); /* initialize config space */ From nobody Tue Apr 11 08:42:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwfVj4FvKz44R8F; Tue, 11 Apr 2023 08:42: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 4PwfVh6wZ9z3NJt; Tue, 11 Apr 2023 08:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681202573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldTIfMwXjFcrCDq8ag0coRu6le8+TrZ0btAR81ZNkFo=; b=HfLHxYSVzfZ4rsG1D6Zr7Q9vyJyzupPeYYepRAosXzBMaC62ClROVeNbQil/JEWHaynY23 +YGG7N8tPe6/qm+kAybNc9ao6O8FUbl4X+8CiLHz9K+ySQx9tUs3rP9g5OPEgv3PUasW4N S6esI9wPoMYDhJ2XSyoo/iIIvhuTWLgLe4KU7ksiHimO4CfbyOCof3zq4381JfLbfXqcXJ aQ+z5R51YZvSBUObTlWvUyuKM7jyCDkiW5ysHbKL3zTeAnhegZ37wR+x+4t0OMHb4jXrpm f2buNSvygsNglO3/52ipLxBJ0NUimDA9+2BaM9JFqMWurBMokkDPcY8qgMStwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681202573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldTIfMwXjFcrCDq8ag0coRu6le8+TrZ0btAR81ZNkFo=; b=ti7ImCJAyJFbdi6j5y6xEs3mSYA1SFu5FeuzcunTqj30j8HchNNoiqoXQhyRDJuDat9S1M p2BdfeTdYnC2MSaMbHFBiuZgjn7hPQDcMESl9D0bz78uAkC7BsXFPhP3swbmKf7XT5PENi WecJX0EQGUQNMwLc3+mIWyO4RcGYubdInyvMMq6IWDi7KsFaJfJScxGJ9vHUcK5mnbH//F 2bnEpPDbq/LhM1WqNvBzQsHn7u568y/EizKHJdhgZUw1wA2guY2B8XKwuId7vHv4lw7u/f 2WdBfk3ROGI8ZWmfCP32llAxf4zhyKoM2QxEHnuI+SixRna/50SUWdj+zkaslQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681202573; a=rsa-sha256; cv=none; b=fPMi7mVgOpj4RsCw/I6tKFEy2YiSDjsGvfZMmohsG/5KYjfGtNBBAsOcjHRdamEOjZH1a2 rrJBkzjOTdvhaMqpIc73nbT0xthVd9UM+McceJtGnW1cHEb0bKCc8PEF8vMYWanbsBwZSq 7aYa+DVbp2RlPKxUbZadaHGByr8W2wYFKT9uFkVlJkDlA1sDa/zbManyuxpYIYBn/h5fj4 6NaukFZGhMrura5KYFFhU+SCSW+R4p40FRMNsyliGOem80bE2rKpl/l64rDyGUB9aw7t8O 6II2ewUoiL6Rk35fkVfOqgx8ey31FkJ5COWU5jtLkPQeUdCvZhR6w6mk3QLrlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwfVh61mGz1Qk3; Tue, 11 Apr 2023 08:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33B8gqMZ054100; Tue, 11 Apr 2023 08:42:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33B8gqbc054099; Tue, 11 Apr 2023 08:42:52 GMT (envelope-from git) Date: Tue, 11 Apr 2023 08:42:52 GMT Message-Id: <202304110842.33B8gqbc054099@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: d2e0204ec0ac - main - telnet.1: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2e0204ec0ace5a65e688a35a960e949624f3cb2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d2e0204ec0ace5a65e688a35a960e949624f3cb2 commit d2e0204ec0ace5a65e688a35a960e949624f3cb2 Author: Gordon Bergling AuthorDate: 2023-04-11 08:42:37 +0000 Commit: Gordon Bergling CommitDate: 2023-04-11 08:42:37 +0000 telnet.1: Fix a typo in the manual page - s/addreess/address/ MFC after: 3 days --- contrib/telnet/telnet/telnet.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/telnet/telnet/telnet.1 b/contrib/telnet/telnet/telnet.1 index 66d9c95b76ff..e3fc6c4390b3 100644 --- a/contrib/telnet/telnet/telnet.1 +++ b/contrib/telnet/telnet/telnet.1 @@ -619,7 +619,7 @@ The host specification may be either a host name (see .Xr hosts 5 ) , an Internet address specified in the \*(Lqdot notation\*(Rq (see .Xr inet 3 ) , -or IPv6 host name or IPv6 coloned-hexadecimal addreess. +or IPv6 host name or IPv6 coloned-hexadecimal address. The .Fl l option may be used to specify the user name From nobody Tue Apr 11 10:32:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwhxY1HgJz44c2k; Tue, 11 Apr 2023 10: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 4PwhxY0dgpz3H7m; Tue, 11 Apr 2023 10: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=1681209169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Np4sUK2eNrUjcemcd90COAOtm3S9m+a0ZZAVjyci7Nw=; b=l3aHVZh4GJsyfg/0M3RCyw6yBE/G+52dCeiiUXCF4rZnkAfeSLHxo1ZNszNntBjtcl5GlA Uc8GlqjUjUlsr6ygEryyWq9CL/ggtpZB6HHXZvvF5WTKnXSc4Dri4MV1BawuCT96uT1qiv 5MCPQtXtjp+MBgL7yOWU1Ue+LVK4zBatw27d9f0KG158698gKDw4YBncs4ZVm4lwa2BRYM m423tgETe3rx+DdQE4phYlu2QDu1Zb5gpsU0aJpfTGIgY1fIpQvvDy3k+5dqETvzL1wKqV ZaJMD+8SB5XbU+JVEUSgbUtp4f22l1BNUhlCw+tsqR4kiWhMxbjCaCxpduqixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681209169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Np4sUK2eNrUjcemcd90COAOtm3S9m+a0ZZAVjyci7Nw=; b=OHLw2XBP9RNzsUKcP6nMPyFMskXHHcVnrvDBsBZIHXHxwyN5aO2/EHWoaXHClVup4XRu7Z RQ/Ee2WeZWxvWAxvOgow7p+yY6/vpekNCtUNd6vwJy6B8ogUvdTIUSAhfjXf7aFihMAQDT gBcERLqLoLnz6Q1AOQEdPrWsopnL5MmoNyeYr9TmdbKPvHIWWWjxbsesrB4pgl57tydZHB PK63b+8GfHhC3fGvw/csZPHstPefj9y4zxoJiZBRXpaSzCNeXERIhw+38V+eLyB1cPrKM0 gMV1UsgqhE38uoNUKR9Xy43bRT8FXPjes4uC+qFV9Tk9kqQG/jJsV9xLl2aBnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681209169; a=rsa-sha256; cv=none; b=Xl+r62YwFLg3mMYLzRNIOOfCr5/DAu0xVVlNxEFCWlccBMU9tRifU/SBV2D9rCZeDNf1V2 jwaaCy1ekfqLAscZDM15NPPTJqB4BOAwNDoYTOijVPJm4l8NG9BVzTZnwSO3OKItloipKb YMJnMAoiUdp8H8SYyBCvHeFipwvnqYZGk0cLMYtbmyYpBY/ISlVW6Djry7dewmyT5rO50p f38NLPLOkxYDoUake9StcakDRskcTK/aXblUUDqj+jh2tdUvCOrmOMPLIEAwj8j36MtOCF h8fgak9rpCxExJGkXfXORCqBCprIWOg5k2hUoXjZeBcZWINspKKntDdAKWvIDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwhxX6ncJzFBH; Tue, 11 Apr 2023 10:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BAWmdS035115; Tue, 11 Apr 2023 10:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BAWmKG035114; Tue, 11 Apr 2023 10:32:48 GMT (envelope-from git) Date: Tue, 11 Apr 2023 10:32:48 GMT Message-Id: <202304111032.33BAWmKG035114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 37f4cb29bdaf - main - imgact_binmisc: unbreak module build outside of kernel build environment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37f4cb29bdafa33ec46f505fb5b769bafddcac74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=37f4cb29bdafa33ec46f505fb5b769bafddcac74 commit 37f4cb29bdafa33ec46f505fb5b769bafddcac74 Author: Eugene Grosbein AuthorDate: 2023-04-11 10:31:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-11 10:32:29 +0000 imgact_binmisc: unbreak module build outside of kernel build environment MFC after: 3 days --- sys/modules/imgact_binmisc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/imgact_binmisc/Makefile b/sys/modules/imgact_binmisc/Makefile index 6d8f64530db3..e7b7155258cb 100644 --- a/sys/modules/imgact_binmisc/Makefile +++ b/sys/modules/imgact_binmisc/Makefile @@ -3,6 +3,6 @@ .PATH: ${SRCTOP}/sys/kern KMOD= imgact_binmisc -SRCS= imgact_binmisc.c +SRCS= vnode_if.h imgact_binmisc.c .include From nobody Tue Apr 11 13:20:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwmgV0v3gz44rY8; Tue, 11 Apr 2023 13:20: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 4PwmgT5b9hz3rQx; Tue, 11 Apr 2023 13:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yEfcjqgBvNx8Fu69x7SvjivZZciwtA6PanFJxQTxeE=; b=nnMONrVlS8r8AL7ayes7z8/M2FCglM/r/pmZN/5gGqBa1N3Sownnt/qWf3E355+Z/s6wcC hVhjHlP8JtpcRcsrdTaZgQ164H5pF9Sn4u8/RqAmp5GpCIBhxLxTXhYuDw/wKpaunoiHSv IJdwcniZ7iyWG5Y7KI5XX7q/7py9n0wtKKAckzuXYexuh/AX+y3MxKMo/Is5KXOFMm2umM oOyN112yLJGS6iUEfv3ei9uTWCz70Lcf4iiqDdqaBZaCVOIQub6cCYnz7aiDFc7GTLCs7t y4N1cZZL105gprZotpKZfjDWU/bELOHQKfhKrwgYpFb8KOTkyX9Wgh7kd8+6Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yEfcjqgBvNx8Fu69x7SvjivZZciwtA6PanFJxQTxeE=; b=srbZWc9bDgQtB6tKXjFMJ4lmF2dSCvR5d+0JWi9IZV7dzEVKmHEmQWyOke3RBvpGBAKmIQ GwN5GzeGQccHaslCPBYwqW1+CXExtHT4Q14oguD3OiKroRfiq/xp6okkh7N8ArajdP50AV aRhI8mF0ddjlJcCOdB6Ft3GN/0Mo7miTFp1Ej7RP1g2dbF1kspwI2AkAULD8nU0iiD01Fh vq6YNSDk57R9dLnBLFGvdCKYVKUFM4IQqIq16IPw+szvMSg3KZa6Dn35TyN/spA4TbDbKW B6f38Dp53GpK1VXKD25AomP26578SDTjmrFYq1fvRRZYVALaAZMYl/e+QeIPXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681219253; a=rsa-sha256; cv=none; b=Igek2lo1SfNuGgz0ITIaGRCqhHCd1XX2U2v6fZbBaMyO1HRFGyR74mP3AQyRKFw6v8V6iT XzxQqyCDwnaUsKxpeEkBsloHlMlgtGdjmzGQ07yOmwHykodctmkNAIYgn6kyxw1txumc54 LyM1pTgX2zOvJZC1HGO87g2x7IxKFVfE4Jqh/XIdr56zkXeUAA9uzBPuU5A//LeupSZLW+ yErDazPVqhn+JmYH8oYZlk0wfv/khE9El98HhKOMPSW7m5w4rRZxoMEPfhfuv6khQymGrp nQLSWQwYRQR7IdeWMDq1R2f2FSLHfHJivgBOQYkRhTrjw51hs48I9no/62wDSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwmgT4b8YzJhG; Tue, 11 Apr 2023 13:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BDKrIr010207; Tue, 11 Apr 2023 13:20:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BDKrFq010206; Tue, 11 Apr 2023 13:20:53 GMT (envelope-from git) Date: Tue, 11 Apr 2023 13:20:53 GMT Message-Id: <202304111320.33BDKrFq010206@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: b2f32887475f - main - vn_start_write(): minor style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2f32887475f3b25024d19aac9f4540dc959f90a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2f32887475f3b25024d19aac9f4540dc959f90a commit b2f32887475f3b25024d19aac9f4540dc959f90a Author: Konstantin Belousov AuthorDate: 2023-04-09 22:41:12 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-11 12:59:39 +0000 vn_start_write(): minor style Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39441 --- sys/kern/vfs_vnops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 05cc0cfda16e..122e53c0d9fb 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1880,17 +1880,17 @@ vn_start_write_refed(struct mount *mp, int flags, bool mplocked) } mflags |= (PUSER - 1); while ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0) { - if (flags & V_NOWAIT) { + if ((flags & V_NOWAIT) != 0) { error = EWOULDBLOCK; goto unlock; } error = msleep(&mp->mnt_flag, MNT_MTX(mp), mflags, "suspfs", 0); - if (error) + if (error != 0) goto unlock; } } - if (flags & V_XSLEEP) + if ((flags & V_XSLEEP) != 0) goto unlock; mp->mnt_writeopcount++; unlock: @@ -1986,7 +1986,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) MNT_IUNLOCK(mp); return (0); } - if (flags & V_NOWAIT) { + if ((flags & V_NOWAIT) != 0) { MNT_REL(mp); MNT_IUNLOCK(mp); return (EWOULDBLOCK); @@ -1996,7 +1996,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) */ mflags = 0; if ((mp->mnt_vfc->vfc_flags & VFCF_SBDRY) != 0) { - if (flags & V_PCATCH) + if ((flags & V_PCATCH) != 0) mflags |= PCATCH; } mflags |= (PUSER - 1) | PDROP; From nobody Tue Apr 11 13:20:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwmgW0Q1tz44rYD; Tue, 11 Apr 2023 13:20: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 4PwmgV6g6Kz3rNq; Tue, 11 Apr 2023 13:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u08Tc81UJJX+IqrBWVC/gvVBatUVYz+FQRehiekpi2Y=; b=DS86qhLJtmKHEnSlYbQwehUbmugNjndh2CCiSTiL5yyN8zn/CBd6EW+QZYc6WklQHP7kOD 2LJJ1Co0L2DAjmI6ZlKeH1UyKClAWPpJUJFncAlqfqG42Cq83UqouSVsAGyfR+c3in7uYL wuVOa+wOEkBGrWaW16EGyPL44/0ajlEzOHOweTKZENyAFEGGhmWOfz617lKfQhtxEQArvi f1iSoPrAhjf7bv8xnBUmYTFFTM8Ldsdpz+UwLTVzHi+tZFVhO+nm3K14p9cidXQRDHCcxU pmoCYSySGbR66gH6jZ90idBad6nZSFjZ28geELLHHqHAu78KAFd66D6rqnUuIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u08Tc81UJJX+IqrBWVC/gvVBatUVYz+FQRehiekpi2Y=; b=HAcuhNwoGsISKBsPWW/gbgvKiBMLrFYbGbA0WvOkC+/TtxaDE0CnZNcSANFiYSwAOq8bxo UcE8HAe04a0uBTN9lcjyO/c3ustwTzTBYBXSYEqLClpETzOem1ObpDa/v2wK8h6ii7b5YD 5uKzUeFauAx6bo/fLBMTB6Wl5jgV/IM3/IrvkLcJ+PfnJ6TXNHEvwxw1ykePqvEyvSZsS9 WVFyV/qsI//ADbiQpiSztigL8ZPEfa6UHyliDTpRyCh7mZDZcfKVcel0+Gstj5D48Y+qLM H7PKNztMLLNufS+NKHOvZtd6P3kF2a6DGiULyVyORBkvigh8lRRR+dnTNEP/YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681219255; a=rsa-sha256; cv=none; b=skoGmmTAR2QFq7mJiOEMb6+rjlg3KL4JRNEnjMxvlsecnWNvECsWofVW8G5OA4SH7u/ooS zPvO2PVyuUMGfIlecIVcRAjziFWjnMhxhLMHF4RJsElumeWVJP2pRP2y8svvQfx47VIv44 KzRzDcMfN9lJ26yCqHh0pz9gP5SJEilraNUnhMw8Et9fsLjBwHIbXl9FaJhjzKdXrkezx+ S+/rZ690TkNYKGkPCJwVdwiWsIoa0DhTGJP9lh4Sk1Hk2rFspFV1N7/ctidX+M2XjJE0OI IfQDLHo0PqDqg/b8L6pumpUutbINAnzfp3EJEspYMqHRmda1Y5uVeD3s/ISirA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwmgV539pzJyp; Tue, 11 Apr 2023 13:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BDKs3g010230; Tue, 11 Apr 2023 13:20:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BDKsuv010229; Tue, 11 Apr 2023 13:20:54 GMT (envelope-from git) Date: Tue, 11 Apr 2023 13:20:54 GMT Message-Id: <202304111320.33BDKsuv010229@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: afa8f8971b86 - main - vn_start_write(): consistently set *mpp to NULL on error or after failed sleep List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afa8f8971b869b8b5d1468e431d18c615a35a63e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afa8f8971b869b8b5d1468e431d18c615a35a63e commit afa8f8971b869b8b5d1468e431d18c615a35a63e Author: Konstantin Belousov AuthorDate: 2023-04-05 21:00:04 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-11 12:59:46 +0000 vn_start_write(): consistently set *mpp to NULL on error or after failed sleep This ensures that *mpp != NULL iff vn_finished_write() should be called, regardless of the returned error, except for V_NOWAIT. The only exception that must be maintained is the case where vn_start_write(V_NOWAIT) is called with the intent of later dropping other locks and then doing vn_start_write(V_XSLEEP), which needs the mp value calculated from the non-waitable call above it. Also note that V_XSLEEP is not supported by vn_start_secondary_write(). Reviewed by: markj, mjg (previous version), rmacklem (previous version) Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39441 --- sys/kern/vfs_vnops.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 122e53c0d9fb..52242cce0692 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1935,7 +1935,10 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags) if (vp == NULL) vfs_ref(mp); - return (vn_start_write_refed(mp, flags, false)); + error = vn_start_write_refed(mp, flags, false); + if (error != 0 && (flags & V_NOWAIT) == 0) + *mpp = NULL; + return (error); } /* @@ -1951,7 +1954,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) struct mount *mp; int error, mflags; - KASSERT((flags & ~V_VALID_FLAGS) == 0, + KASSERT((flags & (~V_VALID_FLAGS | V_XSLEEP)) == 0, ("%s: invalid flags passed %d\n", __func__, flags)); retry: @@ -1989,6 +1992,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) if ((flags & V_NOWAIT) != 0) { MNT_REL(mp); MNT_IUNLOCK(mp); + *mpp = NULL; return (EWOULDBLOCK); } /* @@ -2004,6 +2008,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) vfs_rel(mp); if (error == 0) goto retry; + *mpp = NULL; return (error); } From nobody Tue Apr 11 13:20:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwmgX21MBz44rdY; Tue, 11 Apr 2023 13:20: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 4PwmgX056Lz3rWQ; Tue, 11 Apr 2023 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27ZDhA4mZFweQYxWGxek22xzdrWlznBuiQyWYbkdots=; b=nkaBkx2P4DbAnwMYng9HC+UM1f/v3r5OUHFa77uVu7O0vJTrPrw3c+pummowx6lQPq/wYv qh5GwFHnXK8YtkBlNCVdeeO/7VTRjitB6MMGUqiJOJ1cXgrGEP7X/xOb0asl05M6Nswfvi yqSpCbTJ7Gu5GwQiGVf9DSqSqDYVULdV1xTAfvOJLYzdKkYQR0PPEZQxyfCyjepzg2u/X/ zKmDdNajSFquG4bWGM47EU91XNRPIqZe61FkkW1VvYqwpp/X+SneigSOa6kSPkKSddGKCK /Zxr9H5JsxGnBU71xYVvE4nkWtl7mWAVUPLYoIxJV58/a7WlGNFS58pxu42c1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27ZDhA4mZFweQYxWGxek22xzdrWlznBuiQyWYbkdots=; b=xsJM0CSQp1G95Z3HBDBPQrV1M0b0+fRaIt6KMvY3mYE50PU7oJss6owmkds/C1+8jU9Sc3 Si6XOa5FpFBdEJEp/Ct8eAhYwjnsPDQafmB00i1rYvj0l1Z+Wd6Od3gADoNJuj5n05/Mdr v8rqQb30d093wxKaSj72hvU6pwZA4Uwpvd08AfK2y2D1F8W/vu4GMxbaZyUCxGZHp3AEDN NSFTNEZFtVSw+qlEs6hurt1yd9W24G2eLAS8iIrDROUVefrm7OdZ5gGGZN0kg5mcKalQBQ MHS6EmflRkcK9Rb+g8eM+PcwKOdiXLtkn1HHs5DZeS4qKLgQW2HbEiQTvBn07A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681219256; a=rsa-sha256; cv=none; b=DkJqIsinV1uPgJn4W0rVeBiYpYk+FeWUh7FObKtdCaUVIBNERPYSWPEmPVca4FmRpOxpVJ UHHzvUI80NcL6uW0lvXzIanoY6AQkvOf59BeeIlycEvV7YgmDVNQ3NbgBsLsjWq26meDkU PwBbTQmflSvcjTEDloNVUWoIJDYJdoohMk5ziqFM/igdbvAmPEh5rPXlU5AagMjVmDVvXh adLxDRbSfT4jefxTaunzVaZpZvSWNWk3TqgCKJVkjRnPwIQzHvR2PZSKW7aJHkgcz60R+o lr0tMzczI5nsxq6eE+nwP72z5UFd2olYJihfSEgYZopS8XTBfAMGhWmFneT68Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwmgW63nrzJyq; Tue, 11 Apr 2023 13:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BDKtXA010249; Tue, 11 Apr 2023 13:20:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BDKt3K010248; Tue, 11 Apr 2023 13:20:55 GMT (envelope-from git) Date: Tue, 11 Apr 2023 13:20:55 GMT Message-Id: <202304111320.33BDKt3K010248@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: 75fc6f86c388 - main - Add witness_is_owned(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75fc6f86c38807f1fb305c065c6affcf7617b029 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=75fc6f86c38807f1fb305c065c6affcf7617b029 commit 75fc6f86c38807f1fb305c065c6affcf7617b029 Author: Konstantin Belousov AuthorDate: 2023-04-10 15:54:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-11 12:59:49 +0000 Add witness_is_owned(9) which returns an indicator if the current thread owns the specified lock. Reviewed by: jah, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39477 --- sys/kern/subr_witness.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- sys/sys/lock.h | 1 + 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 97f68c812a76..839e4a4ce54b 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2429,6 +2429,32 @@ witness_restore(struct lock_object *lock, const char *file, int line) instance->li_line = line; } +static bool +witness_find_instance(const struct lock_object *lock, + struct lock_instance **instance) +{ +#ifdef INVARIANT_SUPPORT + struct lock_class *class; + + if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + return (false); + class = LOCK_CLASS(lock); + if ((class->lc_flags & LC_SLEEPLOCK) != 0) { + *instance = find_instance(curthread->td_sleeplocks, lock); + return (true); + } else if ((class->lc_flags & LC_SPINLOCK) != 0) { + *instance = find_instance(PCPU_GET(spinlocks), lock); + return (true); + } else { + kassert_panic("Lock (%s) %s is not sleep or spin!", + class->lc_name, lock->lo_name); + return (false); + } +#else + return (false); +#endif +} + void witness_assert(const struct lock_object *lock, int flags, const char *file, int line) @@ -2437,18 +2463,9 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, struct lock_instance *instance; struct lock_class *class; - if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + if (!witness_find_instance(lock, &instance)) return; class = LOCK_CLASS(lock); - if ((class->lc_flags & LC_SLEEPLOCK) != 0) - instance = find_instance(curthread->td_sleeplocks, lock); - else if ((class->lc_flags & LC_SPINLOCK) != 0) - instance = find_instance(PCPU_GET(spinlocks), lock); - else { - kassert_panic("Lock (%s) %s is not sleep or spin!", - class->lc_name, lock->lo_name); - return; - } switch (flags) { case LA_UNLOCKED: if (instance != NULL) @@ -2501,6 +2518,27 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, #endif /* INVARIANT_SUPPORT */ } +/* + * Checks the ownership of the lock by curthread, consulting the witness list. + * Returns: + * 0 if witness is disabled or did not work + * -1 if not owned + * 1 if owned + */ +int +witness_is_owned(const struct lock_object *lock) +{ +#ifdef INVARIANT_SUPPORT + struct lock_instance *instance; + + if (!witness_find_instance(lock, &instance)) + return (0); + return (instance == NULL ? -1 : 1); +#else + return (0); +#endif +} + static void witness_setflag(struct lock_object *lock, int flag, int set) { diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 2db38f9df89a..4031f20946c0 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -237,6 +237,7 @@ int witness_list_locks(struct lock_list_entry **, int (*)(const char *, ...)); int witness_warn(int, struct lock_object *, const char *, ...); void witness_assert(const struct lock_object *, int, const char *, int); +int witness_is_owned(const struct lock_object *lock); void witness_display_spinlock(struct lock_object *, struct thread *, int (*)(const char *, ...)); int witness_line(struct lock_object *); From nobody Tue Apr 11 13:20:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwmgY27xVz44rh3; Tue, 11 Apr 2023 13:20: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 4PwmgY0spLz3rSD; Tue, 11 Apr 2023 13:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGxEnsFCQ0K53qZdVxjMOA7YAZXeNp6lpC18s8uKJtY=; b=Tx3p3oWpGuh3MfB155jCH1Ya80P5ZAvYMtmOT/3tOT0DDdRz8id8EosdqdfQ7bI3BikZ7n j5tLAVMjFp8DzzRjTt4Fgp1jBHc6fQTEviDsQE9jL7e6dYhcyqanCMoOgiNpJ/nMGMVMMv 7XXrrWVCV3BhaCpMIpKwoOHeBPtH/3Kb7U89VWWsrABCAGlwG/Z8PzTRddMqOq/C6eGauz YD/AROHK5IUDLNCUZl2Jgj/BVRqZqssfLJVtwXwJLKLnolD+KKltE7YQHzy7I4wqiZPGLF 1h0ANk3mlJ4VkViV9ryQBeYXDyV+clYqO1Y1XmwWXNGu/KoT3BXAjXQAfw4uvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681219257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGxEnsFCQ0K53qZdVxjMOA7YAZXeNp6lpC18s8uKJtY=; b=HBGGzt4a8Jp8ELOTwan9Q5MWdxsxgRAfnKDg2ma2yCvvszTBu8m9IoBgAQxBruavNlo32G NTA8D1lEEIKL7KEthT13jb3KKvJZt2ZUI1Hv66LLYs95CfhOMiHsGDEtV6zYJCr6hQDJ3X abFZczFvVdzevxXlAYTv5c9A/7GQ35Z3ISdK7b+Yat1Qiw4jyn8oBSKgDyWgLU6Xc7JUAZ ijGBBFl6SHHdeIz80PTonJgsXpB2xbN9qaIkNMmHxZXeUR+y5zb1RkpUQySGIkwv4vlOzd LPYevsMkg/y4kuUVUdEGTSpeIPPkCYJlbX5bbtPUzjDvH0uhrLPTZfRoQHE7iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681219257; a=rsa-sha256; cv=none; b=OOiu90471K8mJtGYn/gUqyvEvSoznbPYFLyVEWJ86UXdC0ggp5pFSpI6TYjSN9dSE9HGKy sTr8cC3oX4Y2XRm0iIl9zbsXENxdY3RZvgHLBIwpna5yk1Ioo9aujDE0zpVYyUC56QtKbY gsXYMHQOLcfdIcjLJjddLsdeeYtJPGRfDTa2vv+H6+l2FNXo8mSVfFmwxYt+GDsT3I7HjB 0iUJBp3CsgOJ0bTBvVMx8pGZN4kcjdRvFgsq2FjmyQChTZefu1tWXUtMBdl+efruQkJX/i waN9EYOdDoaVEr4Q6SqgQ43ENvtOFa0+iRUMCAeAoa2Wd8kZ0CGBIkgKd1xgWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwmgX6wfRzK5X; Tue, 11 Apr 2023 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BDKug8010270; Tue, 11 Apr 2023 13:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BDKuZO010269; Tue, 11 Apr 2023 13:20:56 GMT (envelope-from git) Date: Tue, 11 Apr 2023 13:20:56 GMT Message-Id: <202304111320.33BDKuZO010269@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: c53e990b8d04 - main - DEBUG_VFS_LOCKS: restore diagnostic for the witness use case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c53e990b8d0444b5ad59ddb18742a71434e30ee2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c53e990b8d0444b5ad59ddb18742a71434e30ee2 commit c53e990b8d0444b5ad59ddb18742a71434e30ee2 Author: Konstantin Belousov AuthorDate: 2023-04-10 08:52:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-11 12:59:55 +0000 DEBUG_VFS_LOCKS: restore diagnostic for the witness use case Reviewed by: jah, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39477 --- sys/kern/vfs_subr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7e7315f827a1..60d3a71667a1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5456,14 +5456,13 @@ assert_vop_locked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == -1) #else int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) - vfs_badlock("is not locked but should be", str, vp); #endif + vfs_badlock("is not locked but should be", str, vp); } void @@ -5473,13 +5472,12 @@ assert_vop_unlocked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == 1) #else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) - vfs_badlock("is locked but should not be", str, vp); #endif + vfs_badlock("is locked but should not be", str, vp); } void From nobody Tue Apr 11 14:14:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwnrz4r0Nz44wcV; Tue, 11 Apr 2023 14:14:11 +0000 (UTC) (envelope-from asiciliano@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 4Pwnry6klYz4QsT; Tue, 11 Apr 2023 14:14:10 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222450; h=from:from:reply-to:subject: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=C6qrujhukX1YY5ZaqaF4CvCqZ5E+z9z+F86o5ICBhgo=; b=xxFC79VsIE/UMkPsSZGM+m6+sBuxK3mzCjyprdPsePvwrW/A9sSVEd4GnndpVLnsfAjX63 Y/pqnJhxhzb8qDe8owfmNLWzuakwVZXRkGvbwgJ5FCHdTa8F4u8OKRgsXR9TZ8uCb+tqhJ /xKZs27/0BFj6dg92pXAP3IbMV1re6hr9opHNdL4BaHbJ+pO8HWitnyYS06sZtWeAz2Hue F99gWheWrfW3r1aGbRwBUh6v+niM1euL8AjBn1AYfUyu3QCZgdOJ7uovs9aUMkL7hQkq2L sDjQ5TYRXT180YfR4nXdlVP/FeciEseHnVCxXCU4icFuAD5x5doQ+MNWhsVZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222450; h=from:from:reply-to:subject: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=C6qrujhukX1YY5ZaqaF4CvCqZ5E+z9z+F86o5ICBhgo=; b=jxW10W111LJVL/F81Dz4nFaG19PKW4xj8YKzpvBHtUeRKyjOI4LvopFLX91pn6x4iiJAzq x4fsSC1HODLt7iLI0LSiIJn5PPdmWU3ve0EnSds2ucbGgQ8dxW4cmAObIq3xIb8Tdir9kR c1lVPAA+9ubtt+BbScvY1fvHNA3meHoiFX9Uj94qc/B6gYdjaidNmOfDGEP4A2mlPUMTyQ hGJJhKVQXjEqfzZPvL5cqoD+/EoNYkiuXLYDhSyHkej28ci8syI8dRoeja2iPuUb2TSaa4 I1siDIFpyF0eiZiJIu2/YsLONYRJpCkr3GcxbHkqd8JdSJO3KAPeDz257Y97WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681222450; a=rsa-sha256; cv=none; b=q2OB4qVhHcEFiRdc9xoRBLo8vi3g0tsiyvRbQ3DV/Axr6eJV7VoPG3pea+YFx5E0LMbR8h cWNjVzcJ9QHR24Vi0droaABN4Is0qu8A8fFXl1vAbDgr25nXEfaDaDvWappt0GhQt2ypK0 WucsM254BBdKUy0mShFrpXEKfySpaXvIqHs899wPN8PN83N6/uXDaHotoDo2lk+hwE/m53 2nBt3o2yUuONBvDY/eqiuJCrEKNp3rq7fn/HYYVnjntRyzJxEY23CN6b946hLf1Z0XTb60 spefM3jp6hb6VYEIDnxciZCT03uQ4JNEzCIPXo/NHHu4iK6oS4EzEs2ALl5sfg== Received: from [192.168.1.25] (net-93-148-110-254.cust.vodafonedsl.it [93.148.110.254]) (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 4Pwnry0jyDz12Jm; Tue, 11 Apr 2023 14:14:09 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <6cd86574-0aed-a9ac-150b-598b01924cfd@FreeBSD.org> Date: Tue, 11 Apr 2023 16:14:06 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: d577d6178bde - main - bsdinstall release: Move code to a new startbsdinstall wrapper Content-Language: en-US To: Jessica Clarke , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202210031609.293G9hiu022582@gitrepo.freebsd.org> From: "Alfonso S. Siciliano" In-Reply-To: <202210031609.293G9hiu022582@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 03/10/2022 18:09, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d577d6178bdeff86dbff0b954659ac5e23c17b2a > > commit d577d6178bdeff86dbff0b954659ac5e23c17b2a > Author: Jessica Clarke > AuthorDate: 2022-10-03 16:09:16 +0000 > Commit: Jessica Clarke > CommitDate: 2022-10-03 16:09:16 +0000 > > bsdinstall release: Move code to a new startbsdinstall wrapper > > This separates out the install media-specific environment (creating > bsdinstall_etc) from actually running the installer on a given console. > This will be used by a future change to start the installer on multiple > consoles. > > Reviewed by: brooks, gjb > Differential Revision: https://reviews.freebsd.org/D36803 > --- > release/rc.local | 96 +------------------------------ > tools/build/mk/OptionalObsoleteFiles.inc | 1 + > usr.sbin/bsdinstall/Makefile | 3 + > usr.sbin/bsdinstall/startbsdinstall | 97 ++++++++++++++++++++++++++++++++ > 4 files changed, 102 insertions(+), 95 deletions(-) > > diff --git a/release/rc.local b/release/rc.local > index 9adaea468ae7..943c175ddd52 100755 > --- a/release/rc.local > +++ b/release/rc.local > @@ -1,101 +1,7 @@ > #!/bin/sh > # $FreeBSD$ > > -: ${BSDDIALOG_OK=0} > -: ${BSDDIALOG_CANCEL=1} > -: ${BSDDIALOG_HELP=2} > -: ${BSDDIALOG_EXTRA=3} > -: ${BSDDIALOG_ESC=5} > -: ${BSDDIALOG_ERROR=255} > - > # resolv.conf from DHCP ends up in here, so make sure the directory exists > mkdir /tmp/bsdinstall_etc > > -kbdcontrol -d >/dev/null 2>&1 > -if [ $? -eq 0 ]; then > - # Syscons: use xterm, start interesting things on other VTYs > - TERM=xterm > - > - # Don't send ESC on function-key 62/63 (left/right command key) > - kbdcontrol -f 62 '' > /dev/null 2>&1 > - kbdcontrol -f 63 '' > /dev/null 2>&1 > - > - if [ -z "$EXTERNAL_VTY_STARTED" ]; then > - # Init will clean these processes up if/when the system > - # goes multiuser > - touch /tmp/bsdinstall_log > - tail -f /tmp/bsdinstall_log > /dev/ttyv2 & > - /usr/libexec/getty autologin ttyv3 & > - EXTERNAL_VTY_STARTED=1 > - fi > -else > - # Serial or other console > - echo > - echo "Welcome to FreeBSD!" > - echo > - echo "Please choose the appropriate terminal type for your system." > - echo "Common console types are:" > - echo " ansi Standard ANSI terminal" > - echo " vt100 VT100 or compatible terminal" > - echo " xterm xterm terminal emulator (or compatible)" > - echo > - echo -n "Console type [vt100]: " > - read TERM > - TERM=${TERM:-vt100} > -fi > -export TERM > - > -# Query terminal size; useful for serial lines. > -resizewin -z > - > -if [ -f /etc/installerconfig ]; then > - if bsdinstall script /etc/installerconfig; then > - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 > - reboot > - else > - bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 > - fi > - exit > -fi > - > -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 > - > -case $? in > -$BSDDIALOG_OK) # Install > - # If not netbooting, have the installer configure the network > - dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` > - if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then > - BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT > - fi > - > - trap true SIGINT # Ignore cntrl-C here > - bsdinstall > - if [ $? -eq 0 ]; then > - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 > - > - case $? in > - $BSDDIALOG_OK) # Reboot > - reboot > - ;; > - $BSDDIALOG_EXTRA) # Shutdown > - shutdown -p now > - ;; > - $BSDDIALOG_CANCEL) # Live CD > - exit 0 > - ;; > - esac > - else > - . /etc/rc.local > - fi > - ;; > -$BSDDIALOG_CANCEL) # Live CD > - exit 0 > - ;; > -$BSDDIALOG_EXTRA) # Shell > - clear > - echo "When finished, type 'exit' to return to the installer." > - /bin/sh > - . /etc/rc.local > - ;; > -esac > - > +/usr/libexec/bsdinstall/startbsdinstall > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc > index 484089d47203..f0ddd90b784c 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -474,6 +474,7 @@ OLD_FILES+=usr/libexec/bsdinstall/runconsoles > OLD_FILES+=usr/libexec/bsdinstall/script > OLD_FILES+=usr/libexec/bsdinstall/scriptedpart > OLD_FILES+=usr/libexec/bsdinstall/services > +OLD_FILES+=usr/libexec/bsdinstall/startbsdinstall > OLD_FILES+=usr/libexec/bsdinstall/time > OLD_FILES+=usr/libexec/bsdinstall/umount > OLD_FILES+=usr/libexec/bsdinstall/wlanconfig > diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile > index d09bef110518..e71cae726536 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -10,6 +10,9 @@ GENHDRS= opt_osname.h > SRCS+= ${GENHDRS} > CLEANFILES+= ${GENHDRS} > > +SCRIPTS+= startbsdinstall > +SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall > + > opt_osname.h: .PHONY > if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall > new file mode 100644 > index 000000000000..3a5a07e85b4d > --- /dev/null > +++ b/usr.sbin/bsdinstall/startbsdinstall > @@ -0,0 +1,97 @@ This commit copy&paste code from scripts/auto to a new file. Why weren't the SPDX, Copyright and License copied and added? I was inactive for a few months. Do we have a new policy to add new files in BASE without legal info, bsd license, etc? https://cgit.freebsd.org/src/tree/usr.sbin/bsdinstall/startbsdinstall > +#!/bin/sh > + > +: ${BSDDIALOG_OK=0} > +: ${BSDDIALOG_CANCEL=1} > +: ${BSDDIALOG_HELP=2} > +: ${BSDDIALOG_EXTRA=3} > +: ${BSDDIALOG_ESC=5} > +: ${BSDDIALOG_ERROR=255} > + > +kbdcontrol -d >/dev/null 2>&1 > +if [ $? -eq 0 ]; then > + # Syscons: use xterm, start interesting things on other VTYs > + TERM=xterm > + > + # Don't send ESC on function-key 62/63 (left/right command key) > + kbdcontrol -f 62 '' > /dev/null 2>&1 > + kbdcontrol -f 63 '' > /dev/null 2>&1 > + > + if [ -z "$EXTERNAL_VTY_STARTED" ]; then > + # Init will clean these processes up if/when the system > + # goes multiuser > + touch /tmp/bsdinstall_log > + tail -f /tmp/bsdinstall_log > /dev/ttyv2 & > + /usr/libexec/getty autologin ttyv3 & > + EXTERNAL_VTY_STARTED=1 > + fi > +else > + # Serial or other console > + echo > + echo "Welcome to FreeBSD!" > + echo > + echo "Please choose the appropriate terminal type for your system." > + echo "Common console types are:" > + echo " ansi Standard ANSI terminal" > + echo " vt100 VT100 or compatible terminal" > + echo " xterm xterm terminal emulator (or compatible)" > + echo > + echo -n "Console type [vt100]: " > + read TERM > + TERM=${TERM:-vt100} > +fi > +export TERM > + > +# Query terminal size; useful for serial lines. > +resizewin -z > + > +if [ -f /etc/installerconfig ]; then > + if bsdinstall script /etc/installerconfig; then > + bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 > + reboot > + else > + bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 > + fi > + exit > +fi > + > +bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 > + > +case $? in > +$BSDDIALOG_OK) # Install > + # If not netbooting, have the installer configure the network > + dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` > + if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then > + BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT > + fi > + > + trap true SIGINT # Ignore cntrl-C here > + bsdinstall > + if [ $? -eq 0 ]; then > + bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 > + > + case $? in > + $BSDDIALOG_OK) # Reboot > + reboot > + ;; > + $BSDDIALOG_EXTRA) # Shutdown > + shutdown -p now > + ;; > + $BSDDIALOG_CANCEL) # Live CD > + exit 0 > + ;; > + esac > + else > + . "$0" > + fi > + ;; > +$BSDDIALOG_CANCEL) # Live CD > + exit 0 > + ;; > +$BSDDIALOG_EXTRA) # Shell > + clear > + echo "When finished, type 'exit' to return to the installer." > + /bin/sh > + . "$0" > + ;; > +esac > + From nobody Tue Apr 11 14:19:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwnyb3sVWz44wqc for ; Tue, 11 Apr 2023 14:19:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pwnyb0ssXz4Zhd for ; Tue, 11 Apr 2023 14:19:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-f45.google.com with SMTP id qb20so20366035ejc.6 for ; Tue, 11 Apr 2023 07:19:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681222742; 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=0+yUyf8JLGd2MPj+N20Uq/JJd86ir2sQ+wE8bjBwEtQ=; b=d6n/YQ7lw0x78q5VOVbDDf8bm9HRt73b2up8GFIfNJCQqyAdn1NlVP+076Uk8YjBto oPj/evtglLg0gytlYHAouI4wWRYpevUjnOoG7nqbxJXZgMD103EpqjC9v5tu2lCSnQJg i4xTbtqUuGS+aj1RkfDZOOdYIS1Zn0NVZWEO77nh+JLxp1x5KQfJmr1VlFpU/UFqZToz E75x6rh9caQ0ndkmXAfygHc0KSyI9f58T5VJlngG0xQyfz97WhLE6NdmKEpxr6EgosUo 5auiZY4A8lXx3WOrcumKKV6N5lmmMux94W06QTmih7La4WWtgzXxd8b3lP1ZrSnKraAj UhsQ== X-Gm-Message-State: AAQBX9eKsneahL2PsrRj3+Nkz14KSAelVcDVHs7fvd2qcdMwOU0rh9hD MAbBaYcyaLEoMwBhjv2Q2TpN4A== X-Google-Smtp-Source: AKy350aT5OFdhNcDACOpbqBdX4qqZfaZlPJezUxq4M2rxdaVZXIzTMDrTHzPG+xKzyCMtm9ovtS1vA== X-Received: by 2002:a17:907:98fb:b0:92f:33ca:c9a3 with SMTP id ke27-20020a17090798fb00b0092f33cac9a3mr2710641ejc.71.1681222741689; Tue, 11 Apr 2023 07:19:01 -0700 (PDT) Received: from smtpclient.apple (global-5-142.n-2.net.cam.ac.uk. [131.111.5.142]) by smtp.gmail.com with ESMTPSA id j14-20020a508a8e000000b005029c47f814sm5896578edj.49.2023.04.11.07.19.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2023 07:19:01 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: d577d6178bde - main - bsdinstall release: Move code to a new startbsdinstall wrapper From: Jessica Clarke In-Reply-To: <6cd86574-0aed-a9ac-150b-598b01924cfd@FreeBSD.org> Date: Tue, 11 Apr 2023 15:19:00 +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: References: <202210031609.293G9hiu022582@gitrepo.freebsd.org> <6cd86574-0aed-a9ac-150b-598b01924cfd@FreeBSD.org> To: "Alfonso S. Siciliano" X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Pwnyb0ssXz4Zhd X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 11 Apr 2023, at 15:14, Alfonso S. Siciliano = wrote: >=20 > On 03/10/2022 18:09, Jessica Clarke wrote: >> The branch main has been updated by jrtc27: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd577d6178bdeff86dbff0b954659ac5e= 23c17b2a >> commit d577d6178bdeff86dbff0b954659ac5e23c17b2a >> Author: Jessica Clarke >> AuthorDate: 2022-10-03 16:09:16 +0000 >> Commit: Jessica Clarke >> CommitDate: 2022-10-03 16:09:16 +0000 >> bsdinstall release: Move code to a new startbsdinstall wrapper >> This separates out the install media-specific environment = (creating >> bsdinstall_etc) from actually running the installer on a given = console. >> This will be used by a future change to start the installer on = multiple >> consoles. >> Reviewed by: brooks, gjb >> Differential Revision: https://reviews.freebsd.org/D36803 >> --- >> release/rc.local | 96 = +------------------------------ >> tools/build/mk/OptionalObsoleteFiles.inc | 1 + >> usr.sbin/bsdinstall/Makefile | 3 + >> usr.sbin/bsdinstall/startbsdinstall | 97 = ++++++++++++++++++++++++++++++++ >> 4 files changed, 102 insertions(+), 95 deletions(-) >> diff --git a/release/rc.local b/release/rc.local >> index 9adaea468ae7..943c175ddd52 100755 >> --- a/release/rc.local >> +++ b/release/rc.local >> @@ -1,101 +1,7 @@ >> #!/bin/sh >> # $FreeBSD$ >> -: ${BSDDIALOG_OK=3D0} >> -: ${BSDDIALOG_CANCEL=3D1} >> -: ${BSDDIALOG_HELP=3D2} >> -: ${BSDDIALOG_EXTRA=3D3} >> -: ${BSDDIALOG_ESC=3D5} >> -: ${BSDDIALOG_ERROR=3D255} >> - >> # resolv.conf from DHCP ends up in here, so make sure the directory = exists >> mkdir /tmp/bsdinstall_etc >> -kbdcontrol -d >/dev/null 2>&1 >> -if [ $? -eq 0 ]; then >> - # Syscons: use xterm, start interesting things on other VTYs >> - TERM=3Dxterm >> - >> - # Don't send ESC on function-key 62/63 (left/right command key) >> - kbdcontrol -f 62 '' > /dev/null 2>&1 >> - kbdcontrol -f 63 '' > /dev/null 2>&1 >> - >> - if [ -z "$EXTERNAL_VTY_STARTED" ]; then >> - # Init will clean these processes up if/when the system >> - # goes multiuser >> - touch /tmp/bsdinstall_log >> - tail -f /tmp/bsdinstall_log > /dev/ttyv2 & >> - /usr/libexec/getty autologin ttyv3 & >> - EXTERNAL_VTY_STARTED=3D1 >> - fi >> -else >> - # Serial or other console >> - echo >> - echo "Welcome to FreeBSD!" >> - echo >> - echo "Please choose the appropriate terminal type for your = system." >> - echo "Common console types are:" >> - echo " ansi Standard ANSI terminal" >> - echo " vt100 VT100 or compatible terminal" >> - echo " xterm xterm terminal emulator (or compatible)" >> - echo >> - echo -n "Console type [vt100]: " >> - read TERM >> - TERM=3D${TERM:-vt100} >> -fi >> -export TERM >> - >> -# Query terminal size; useful for serial lines. >> -resizewin -z >> - >> -if [ -f /etc/installerconfig ]; then >> - if bsdinstall script /etc/installerconfig; then >> - bsddialog --backtitle "FreeBSD Installer" --title = "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of = FreeBSD complete! Rebooting in 10 seconds" 10 30 10 >> - reboot >> - else >> - bsddialog --backtitle "FreeBSD Installer" --title = "Error" --textbox /tmp/bsdinstall_log 0 0 >> - fi >> - exit >> -fi >> - >> -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" = --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label = "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an = installation or use the live CD?" 0 0 >> - >> -case $? in >> -$BSDDIALOG_OK) # Install >> - # If not netbooting, have the installer configure the network >> - dlv=3D`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` >> - if [ ${dlv:=3D0} -eq 0 -a ! -f /etc/diskless ]; then >> - BSDINSTALL_CONFIGCURRENT=3Dyes; export = BSDINSTALL_CONFIGCURRENT >> - fi >> - >> - trap true SIGINT # Ignore cntrl-C here >> - bsdinstall >> - if [ $? -eq 0 ]; then >> - bsddialog --backtitle "FreeBSD Installer" --title = "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" = --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! = Would you like to reboot into the installed system now?" 0 0 >> - >> - case $? in >> - $BSDDIALOG_OK) # Reboot >> - reboot >> - ;; >> - $BSDDIALOG_EXTRA) # Shutdown >> - shutdown -p now >> - ;; >> - $BSDDIALOG_CANCEL) # Live CD >> - exit 0 >> - ;; >> - esac >> - else >> - . /etc/rc.local >> - fi >> - ;; >> -$BSDDIALOG_CANCEL) # Live CD >> - exit 0 >> - ;; >> -$BSDDIALOG_EXTRA) # Shell >> - clear >> - echo "When finished, type 'exit' to return to the installer." >> - /bin/sh >> - . /etc/rc.local >> - ;; >> -esac >> - >> +/usr/libexec/bsdinstall/startbsdinstall >> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc = b/tools/build/mk/OptionalObsoleteFiles.inc >> index 484089d47203..f0ddd90b784c 100644 >> --- a/tools/build/mk/OptionalObsoleteFiles.inc >> +++ b/tools/build/mk/OptionalObsoleteFiles.inc >> @@ -474,6 +474,7 @@ OLD_FILES+=3Dusr/libexec/bsdinstall/runconsoles >> OLD_FILES+=3Dusr/libexec/bsdinstall/script >> OLD_FILES+=3Dusr/libexec/bsdinstall/scriptedpart >> OLD_FILES+=3Dusr/libexec/bsdinstall/services >> +OLD_FILES+=3Dusr/libexec/bsdinstall/startbsdinstall >> OLD_FILES+=3Dusr/libexec/bsdinstall/time >> OLD_FILES+=3Dusr/libexec/bsdinstall/umount >> OLD_FILES+=3Dusr/libexec/bsdinstall/wlanconfig >> diff --git a/usr.sbin/bsdinstall/Makefile = b/usr.sbin/bsdinstall/Makefile >> index d09bef110518..e71cae726536 100644 >> --- a/usr.sbin/bsdinstall/Makefile >> +++ b/usr.sbin/bsdinstall/Makefile >> @@ -10,6 +10,9 @@ GENHDRS=3D opt_osname.h >> SRCS+=3D ${GENHDRS} >> CLEANFILES+=3D ${GENHDRS} >> +SCRIPTS+=3D startbsdinstall >> +SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall >> + >> opt_osname.h: .PHONY >> if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then = \ >> echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ >> diff --git a/usr.sbin/bsdinstall/startbsdinstall = b/usr.sbin/bsdinstall/startbsdinstall >> new file mode 100644 >> index 000000000000..3a5a07e85b4d >> --- /dev/null >> +++ b/usr.sbin/bsdinstall/startbsdinstall >> @@ -0,0 +1,97 @@ >=20 >=20 > This commit copy&paste code from scripts/auto to a new file. Why = weren't the SPDX, Copyright and License copied and added? >=20 > I was inactive for a few months. Do we have a new policy to add new = files in BASE without legal info, bsd license, etc? > https://cgit.freebsd.org/src/tree/usr.sbin/bsdinstall/startbsdinstall The code had no such info before; I merely moved it (moved / cut+paste, not copy+paste) and lightly adapted it as needed. Adding copyright and license information would presumably be worthwhile but is a separate activity and would require trawling through the history of the code. It probably started life small enough that copyright wasn=E2=80=99t = relevant and then slowly grew to a point where it sort of is (though there=E2=80=99s = nothing hugely interesting here). Jess >> +#!/bin/sh >> + >> +: ${BSDDIALOG_OK=3D0} >> +: ${BSDDIALOG_CANCEL=3D1} >> +: ${BSDDIALOG_HELP=3D2} >> +: ${BSDDIALOG_EXTRA=3D3} >> +: ${BSDDIALOG_ESC=3D5} >> +: ${BSDDIALOG_ERROR=3D255} >> + >> +kbdcontrol -d >/dev/null 2>&1 >> +if [ $? -eq 0 ]; then >> + # Syscons: use xterm, start interesting things on other VTYs >> + TERM=3Dxterm >> + >> + # Don't send ESC on function-key 62/63 (left/right command key) >> + kbdcontrol -f 62 '' > /dev/null 2>&1 >> + kbdcontrol -f 63 '' > /dev/null 2>&1 >> + >> + if [ -z "$EXTERNAL_VTY_STARTED" ]; then >> + # Init will clean these processes up if/when the system >> + # goes multiuser >> + touch /tmp/bsdinstall_log >> + tail -f /tmp/bsdinstall_log > /dev/ttyv2 & >> + /usr/libexec/getty autologin ttyv3 & >> + EXTERNAL_VTY_STARTED=3D1 >> + fi >> +else >> + # Serial or other console >> + echo >> + echo "Welcome to FreeBSD!" >> + echo >> + echo "Please choose the appropriate terminal type for your = system." >> + echo "Common console types are:" >> + echo " ansi Standard ANSI terminal" >> + echo " vt100 VT100 or compatible terminal" >> + echo " xterm xterm terminal emulator (or compatible)" >> + echo >> + echo -n "Console type [vt100]: " >> + read TERM >> + TERM=3D${TERM:-vt100} >> +fi >> +export TERM >> + >> +# Query terminal size; useful for serial lines. >> +resizewin -z >> + >> +if [ -f /etc/installerconfig ]; then >> + if bsdinstall script /etc/installerconfig; then >> + bsddialog --backtitle "FreeBSD Installer" --title = "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of = FreeBSD complete! Rebooting in 10 seconds" 10 30 10 >> + reboot >> + else >> + bsddialog --backtitle "FreeBSD Installer" --title = "Error" --textbox /tmp/bsdinstall_log 0 0 >> + fi >> + exit >> +fi >> + >> +bsddialog --backtitle "FreeBSD Installer" --title "Welcome" = --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label = "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an = installation or use the live CD?" 0 0 >> + >> +case $? in >> +$BSDDIALOG_OK) # Install >> + # If not netbooting, have the installer configure the network >> + dlv=3D`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` >> + if [ ${dlv:=3D0} -eq 0 -a ! -f /etc/diskless ]; then >> + BSDINSTALL_CONFIGCURRENT=3Dyes; export = BSDINSTALL_CONFIGCURRENT >> + fi >> + >> + trap true SIGINT # Ignore cntrl-C here >> + bsdinstall >> + if [ $? -eq 0 ]; then >> + bsddialog --backtitle "FreeBSD Installer" --title = "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" = --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! = Would you like to reboot into the installed system now?" 0 0 >> + >> + case $? in >> + $BSDDIALOG_OK) # Reboot >> + reboot >> + ;; >> + $BSDDIALOG_EXTRA) # Shutdown >> + shutdown -p now >> + ;; >> + $BSDDIALOG_CANCEL) # Live CD >> + exit 0 >> + ;; >> + esac >> + else >> + . "$0" >> + fi >> + ;; >> +$BSDDIALOG_CANCEL) # Live CD >> + exit 0 >> + ;; >> +$BSDDIALOG_EXTRA) # Shell >> + clear >> + echo "When finished, type 'exit' to return to the installer." >> + /bin/sh >> + . "$0" >> + ;; >> +esac >> + From nobody Tue Apr 11 14:33:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwpH75gp2z44y0H; Tue, 11 Apr 2023 14:33: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 4PwpH754W7z3mQ0; Tue, 11 Apr 2023 14:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681223603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59Tli52btJRmYQR4W0MItZB5Tq0l8EHJt+iKQpx600A=; b=lOPQcHsTPHb7eOeAfLzFvQDd+2derw+sgPDziH89k/fdXL3tDEI2KjOEURr9xTAsFz67jw cTMARosDeHzW+6b7VU72T2iAMI6BGaSGMuWu0QlvLDpGKT/LA28HtWGNoQfi8CgF5DJatT gMTvO3ogJbS5pDZIormej4sJvx5l5VPGRTifzGIJekgDu4FdVBs97FqJVnt9ux7BxHy2c6 3apiV/NjPc+0q72WVGdp9pFvGtiLRS/WctocOzzKzzEuYt3hxDlbFIs+/lkbhssSUEbn34 NniVw9QJvATosYOjegcCeOWthqy+jndfY7M0aH0L1KFiX0knM90VntuDUV0nng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681223603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59Tli52btJRmYQR4W0MItZB5Tq0l8EHJt+iKQpx600A=; b=bN1flNUefNTNkCzzGmK20TI2vqkWVI51qMDDjSm61SboHZDXYylM9AzZaXB7ROKtfbFDBo A6RAnbHjng2dnrJDXxECOBzqbBgLBEWSPixCHlrVWWjsDtXe35C3cDgBlc4QYLu495XN/H 9H8R/kLzfdv2kdSrPMsHB3w+8TvmZyp1Nx0MjsQ5NfPIDDKDuMnOszfDuObLdub3pZALFL 8nOziUUBrEme9kgEKciYJyOjf3OdHRLHA/UGd7sy+E6y0FKCwHz1FID2r4VGAhZ2IYCyvn KwdTRJ6/u83xtrk0LF6ogRnrZD7NvyQTpiO8pFlLDbWyDs0j6izbIgw6KsQekw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681223603; a=rsa-sha256; cv=none; b=hmENKsErMzCxCNZEGwui9HQ95vN2nr9cRDG2jJS+p8gvhtfXTEvPot15G3B+yN+okzoGa8 Dq8oQfOQwDQpVixabMR3mUPoQJGpKLPnVsVw/ga/uOLVx9vQaBlgIvLIbKqTQv90GLEOEv BU1BIbDKvJo/Rfd86/0ttayszgKNZen+6XXHH/w9gw7svXtCfnAwSLiLMeikDjrMsvZk8x +/uEspXe23RNv0z14Ri/X5fxHfLcRfRwyFxKO6YgdErTCIzj0KMi/4EhubB3rZw6qv5Km4 Noiu7BURl3l8DCgz3rd/kgLcqG6evkEQrLo0UJbGt4lQ1XiUhT8CyFR2aLxB7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwpH74BFVzM5P; Tue, 11 Apr 2023 14:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BEXNrT029728; Tue, 11 Apr 2023 14:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BEXNNe029727; Tue, 11 Apr 2023 14:33:23 GMT (envelope-from git) Date: Tue, 11 Apr 2023 14:33:23 GMT Message-Id: <202304111433.33BEXNNe029727@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: eed92455e600 - main - bsd-family-tree: add FreeBSD 13.2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eed92455e60016258277f395fddf6433f290c0ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=eed92455e60016258277f395fddf6433f290c0ba commit eed92455e60016258277f395fddf6433f290c0ba Author: Sergey A. Osokin AuthorDate: 2023-04-11 14:32:53 +0000 Commit: Sergey A. Osokin CommitDate: 2023-04-11 14:32:53 +0000 bsd-family-tree: add FreeBSD 13.2 MFC after: 3 days --- share/misc/bsd-family-tree | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 5a4487634fc8..c3b0baa26d8d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -436,14 +436,16 @@ FreeBSD 5.2 | | | | | | | | | | OpenBSD 7.1 | | FreeBSD | | | | | | | 13.1 | | | | | | - | | | | | | DragonFly 6.2.2 - | | | | NetBSD 9.3 | | - | | macOS | OpenBSD 7.2 | - | | 13 | | | - | FreeBSD | | | | - | 12.4 | | | | - | | | | DragonFly 6.4.0 - | | | OpenBSD 7.3 | + | | | | | | | DragonFly 6.2.2 + | | | | | NetBSD 9.3 | | + | | | macOS | OpenBSD 7.2 | + | | | 13 | | | + | | FreeBSD | | | | + | | 12.4 | | | | + | | | | | DragonFly 6.4.0 + | | | | OpenBSD 7.3 | + | FreeBSD | | | | + | 13.2 | | | | | | | | | FreeBSD 14 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -869,6 +871,7 @@ macOS 13 2022-10-24 [APL] FreeBSD 12.4 2022-12-05 [FBD] DragonFly 6.4 2022-12-30 [DFB] OpenBSD 7.3 2023-04-10 [OBD] +FreeBSD 13.2 2023-04-11 [FBD] Bibliography ------------------------ From nobody Tue Apr 11 15:22:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwqMH3VHgz452d5; Tue, 11 Apr 2023 15:22: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 4PwqMH2KR8z4DSh; Tue, 11 Apr 2023 15:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681226523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXUIuMyhW1Rjio0NeRBFUmIRZthAKslfn9MZ19SQPps=; b=S4MIK65aR3aPdU14PVbbe4AlnZtkHuIznSt9FHOBoTsWXX2OkVSeNlDO4OYrxUNyrJmAc3 Z/mliOgx5gDaA6oP+C+J0ylEFlmnjDljXQ7Y5i49jl+MZV8qTtx0y/3YcmZbf0c89dNinv ZjK2hsP+Y5NKYnQRlWkCZp+wPcexQgplfSKbSxfL5y0PZV2Z7Rnw05gSo8dxhR87iNdyYg lnL6dIv4X+66wdIi+WVnsimHz8tNCBvx5gWV9kJGCQmRwbzjm8Yin41fo0RP99/E8ryUZj 0eN9VwcJslRjubwEk2W3kJkDazYD4DKqN2q+EvuPJV2a3Ndl7KudJYVhVaUHNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681226523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXUIuMyhW1Rjio0NeRBFUmIRZthAKslfn9MZ19SQPps=; b=YJNp6eQT1qhRX+sR/3sALLhGRaJCnbyl2qMplZ9uQyS13QERZw37KLzSghACnVIzBGVLSe XGvYyWs27wjXZQjbZsFRHw9nUsT52I6/HnGcdYJw5RKO2+fccb6FGJZ34pu9DMxCbQzAkp mETPjTfwgyHTDeUq2fd4eHFUuMTb7eKPM7zpbHSK3HS+IYJyMxvxwQ9nxT/Le1GjQMo/oU aexxKXCPHE+j+Fu3KlTm8fwKJ790W9UzcwdzI0cX4duLfdoFEtSiFyD3pUzHjfda1zelmg cKPNYY+Lbo3AuYUCac5ztxl+c6b1IgWTLxSKGo9xZHbSJRmhfpcD/J8tQEE7qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681226523; a=rsa-sha256; cv=none; b=kh0/pydyrCCa5LTRBAderVZrev2SgBTr6VIpNQB1BLH6I4V1dafX8PGSLuD05LckuFdMCp n89FH7Sk+X2kh5T3pf20ZLHQS/Fq9SFkgrzST0AFQzjF8nm7zmecTqEXnv94pS9jmUd4fX WMCbbp2R0COVi951xlkYpGri/6edLMw/wsvSHZXr0Zl55LIYfVbWHBLgYNteMDO6IzkcCB hKvhymDvZPTgY+ipj6ZjSclTBhrSFXA5gmGBAtZBrfZtJREKM/j9LGVikSXiGUPzsv+ij7 DxEJ2VGDvG8dD73G6BgQg/1b0Gsfxy3B9AiCsCfQLoYnukWDi1BP242z9WZmXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwqMH15fSzNQ0; Tue, 11 Apr 2023 15:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BFM3FS011497; Tue, 11 Apr 2023 15:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BFM36s011496; Tue, 11 Apr 2023 15:22:03 GMT (envelope-from git) Date: Tue, 11 Apr 2023 15:22:03 GMT Message-Id: <202304111522.33BFM36s011496@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: af7624ed3145 - main - makefs: use %s and __func__ in printf messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af7624ed314574d6da1eb45b9fddbd2ad503fea4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=af7624ed314574d6da1eb45b9fddbd2ad503fea4 commit af7624ed314574d6da1eb45b9fddbd2ad503fea4 Author: Ed Maste AuthorDate: 2023-04-11 15:19:06 +0000 Commit: Ed Maste CommitDate: 2023-04-11 15:21:36 +0000 makefs: use %s and __func__ in printf messages For diff reduction against NetBSD. Obtained from: NetBSD 0c4125e1a19f Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/ffs/buf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index f2e2b9a882eb..fe6eaed93d04 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -132,14 +132,14 @@ bwrite(struct m_buf *bp) assert (bp != NULL); offset = (off_t)bp->b_blkno * fs->sectorsize + fs->offset; if (debug & DEBUG_BUF_BWRITE) - printf("bwrite: blkno %lld offset %lld bcount %ld\n", + printf("%s: blkno %lld offset %lld bcount %ld\n", __func__, (long long)bp->b_blkno, (long long) offset, bp->b_bcount); if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) return (errno); rv = write(bp->b_fs->fd, bp->b_data, bp->b_bcount); if (debug & DEBUG_BUF_BWRITE) - printf("bwrite: write %ld (offset %lld) returned %lld\n", + printf("%s: write %ld (offset %lld) returned %lld\n", __func__, bp->b_bcount, (long long)offset, (long long)rv); if (rv == bp->b_bcount) return (0); @@ -163,13 +163,13 @@ bcleanup(void) if (TAILQ_EMPTY(&buftail)) return; - printf("bcleanup: unflushed buffers:\n"); + printf("%s: unflushed buffers:\n", __func__); TAILQ_FOREACH(bp, &buftail, b_tailq) { printf("\tlblkno %10lld blkno %10lld count %6ld bufsize %6ld\n", (long long)bp->b_lblkno, (long long)bp->b_blkno, bp->b_bcount, bp->b_bufsize); } - printf("bcleanup: done\n"); + printf("%s: done\n", __func__); } struct m_buf * @@ -181,12 +181,13 @@ getblk(struct m_vnode *vp, daddr_t blkno, int size, int u1 __unused, void *n; if (debug & DEBUG_BUF_GETBLK) - printf("getblk: blkno %lld size %d\n", (long long)blkno, size); + printf("%s: blkno %lld size %d\n", __func__, (long long)blkno, + size); bp = NULL; if (!buftailinitted) { if (debug & DEBUG_BUF_GETBLK) - printf("getblk: initialising tailq\n"); + printf("%s: initialising tailq\n", __func__); TAILQ_INIT(&buftail); buftailinitted = 1; } else { From nobody Tue Apr 11 17:23:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwt3N0rDgz44DJm; Tue, 11 Apr 2023 17:23: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 4Pwt3N0Czcz4TgH; Tue, 11 Apr 2023 17:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681233808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yq37lRfZUMGCUDNGSve8AvME/Wk61nIc6Arw3CkPtPg=; b=ViSNSRaiLMGq3fYe43TA5HSNpff1j6YkuiUwAFAq/B+h7IOaLvgld0lgJiomRQyorbOP2o dWrNnzZI1xVD3OvmgmmRW35mOi1fla+WtxeOZUYq3XkQi/LWXmAYOcSXl91slqWa7zP9aV b7pR0/8k1kLSn0cWNpJUZkaUApx8GEGd7fyY3CHVEI2QhgZmgNZwYODWTktP+15WjF6fU7 Wq8d3cA5mySkzMwSB772SKxguAmqdRgqkWlhkGYXQ/zbdCrD0b3WFqRMI3S9fymoMTPbjM F9uznym/bNQxOVLSfeeeFYB6uCSANWoqywRL4G+REKcGhohrDQCGM20+gNiCBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681233808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yq37lRfZUMGCUDNGSve8AvME/Wk61nIc6Arw3CkPtPg=; b=XJ+PQudRIy2tT7RUbTLVRqgmvMbQmNuOqaE+25OPyZ7DFyM784PqVzZYA74pgAvmcMjil+ +a+SL4rDgsvWgg4L9NFbSfanCBTT+p1cyBAj7Q0aaz8IGmGeO0EtxU1oS5XDGa57HTPcS5 I58tsiUEEhxtbahV4gLaojE6QHwvtt5LC8H/HCa0kdIjBtBr4dl/GIN8mYVBEiEGg0BZh1 xBGi/h8GOHQL7c43SjcaONYNOpI36pyf3pRa4lZwfam4vZYNti17zGbaFiPWlPxzgYg3V/ Vsc6on5xjYiOE2xmgXzC+vfmKymwzsWc5RLDlSY5i/SqcFq96ilRRkFl6yV/qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681233808; a=rsa-sha256; cv=none; b=pLzdFtIArPosKF9wbzPYchTd3F1y2Rk7jHZ9lnkv4W+ZOtsk4F12cMTK0YjaAXj5HAn2Cp +SYl+T2Fc3fxso4uq7DHAdBW+NzTa4jzUJcBI72nscH6zXuv6I5GdmD8QjQw6smqaD0TZq nTNEuLANkOIGj55RjAXNUAJmMWCQeX2hZRsZhSdltO4n2sOdLosZZouIu8pFd9vyroOPZT x2Mx4tEW0p4YYLLekKpOz9y4pdLFEQgCV2g0Pmpn1J+viI8DaMvpVEiB5VS5zCw/dE55xc Zc1RgidtF0B7fHKel3OADDWbrdAiilmMFj3hScYp+ibX3ru+N5vAPGmCRZCSSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pwt3M665dzRWw; Tue, 11 Apr 2023 17:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BHNRZM010989; Tue, 11 Apr 2023 17:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BHNRwF010988; Tue, 11 Apr 2023 17:23:27 GMT (envelope-from git) Date: Tue, 11 Apr 2023 17:23:27 GMT Message-Id: <202304111723.33BHNRwF010988@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: 2169f71277b4 - main - tcp: use IPV6_FLOWLABEL_LEN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2169f71277b4703606f97d2dfc703d1d0e2c9c9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2169f71277b4703606f97d2dfc703d1d0e2c9c9e commit 2169f71277b4703606f97d2dfc703d1d0e2c9c9e Author: Richard Scheffenegger AuthorDate: 2023-04-11 16:53:20 +0000 Commit: Richard Scheffenegger CommitDate: 2023-04-11 16:53:51 +0000 tcp: use IPV6_FLOWLABEL_LEN Avoid magic numbers when handling the IPv6 flow ID for DSCP and ECN fields and use the named variable instead. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D39503 --- sys/netinet/ip6.h | 6 +++--- sys/netinet/tcp_output.c | 4 ++-- sys/netinet/tcp_subr.c | 2 +- sys/netinet/tcp_syncache.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index 1bc79a98e689..6617e1ca7d00 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -106,9 +106,9 @@ struct ip6_hdr { #endif #define IPV6_FLOWLABEL_LEN 20 -#define IPV6_TRAFFIC_CLASS(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0xff) -#define IPV6_DSCP(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0xfc) -#define IPV6_ECN(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0x03) +#define IPV6_TRAFFIC_CLASS(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0xff) +#define IPV6_DSCP(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0xfc) +#define IPV6_ECN(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0x03) /* * Extension Headers diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 09036d940815..abfab1a62176 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1204,8 +1204,8 @@ send: tp->t_flags2 &= ~TF2_ECN_SND_ECE; #ifdef INET6 if (isipv6) { - ip6->ip6_flow &= ~htonl(IPTOS_ECN_MASK << 20); - ip6->ip6_flow |= htonl(ect << 20); + ip6->ip6_flow &= ~htonl(IPTOS_ECN_MASK << IPV6_FLOWLABEL_LEN); + ip6->ip6_flow |= htonl(ect << IPV6_FLOWLABEL_LEN); } else #endif diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 80202bc3a416..36112a101fa8 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2005,7 +2005,7 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, ulen = tlen - sizeof(struct ip6_hdr); uh->uh_ulen = htons(ulen); } - ip6->ip6_flow = htonl(ect << 20); + ip6->ip6_flow = htonl(ect << IPV6_FLOWLABEL_LEN); ip6->ip6_vfc = IPV6_VERSION; if (port) ip6->ip6_nxt = IPPROTO_UDP; diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 6a3561b179c2..96f57b9e0d95 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1866,7 +1866,7 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) ip6->ip6_nxt = IPPROTO_TCP; th = (struct tcphdr *)(ip6 + 1); } - ip6->ip6_flow |= htonl(sc->sc_ip_tos << 20); + ip6->ip6_flow |= htonl(sc->sc_ip_tos << IPV6_FLOWLABEL_LEN); } #endif #if defined(INET6) && defined(INET) From nobody Tue Apr 11 19:18:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwwc16kZgz44P4g; Tue, 11 Apr 2023 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pwwc15VF8z4G8S; Tue, 11 Apr 2023 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681240705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3LF6r7BGjNBntkSgEV+JjTnsLvDJysP5rOJKccOU9sQ=; b=IAnLhceWO2asPx236mq8udvAmd/6dE9De25janbLupgvhQprpqLGFAKx7dGyNo9aO4ymF2 iI/QqHB0K7io0HyAFJUFhdKjjmNJS4E1SS6waLLrZ4RAjg5DnM4RFL/WTwVT4uuz67oxTv DQZm7JDtea61k1XMf8BGoEo3IViU10FGG6IJvn2uC+QVwCTbTHbBRlN4BapEebPCmx7iCz Cf/L1BOrfAUoqo0V4q6jpxdettZuPLwZKSDzf++axHb9TaehPFqyl4N4/W1irIWCAu0Lrc ZLQG+l1w9WcV6O1HQsOVf43cxXui2NaP9CEE2ymO7p7rS+A50xKjEn7bq+0EQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681240705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3LF6r7BGjNBntkSgEV+JjTnsLvDJysP5rOJKccOU9sQ=; b=NyQK75gWSc6V0iroOZdNC7+d/Qlg2dzxjbH9ihXi8U94a7FDEmOGJ/sWpn+htc7YvB/E3W 0lKlCYeTCuUe/uFTxNuOIeVQf7OE3BjucqOz1wiyTIDG8HtvXyQM4B5RmR8//gG+UnNixC WgHc3RKU7U493vUQ03fSKKOYc47Zi3M2bwQAL5a8df4ahpodK+3/kbotbL8yLbEh19kld1 DKxEV19Pnj3+HOe7rFAwi1kASxsJc3QU2uekPBqy5/EBr2blB0KxmFCObU09/mZFDhT20+ zcuLFmvyXdDrZLU0DRLIOpw6+uENrRRJPZwf7Fe285MGBr7IJUQ5RAgfQ51H5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681240705; a=rsa-sha256; cv=none; b=DXzmPn5h5R0p0ZtlYNZcTWIlSqeXyRgwHo5JsK8GNldzxK2vWk0vfnbvbvFWR4/b2uslhV rpzOWF7CO+MdVotAPVPD90LHkGRYM6FQGofrtAbeqg3I14sXhJqXCm5gbIZdgbt4L5ARG7 jKCEi+ByDMijzXqTDi5L3YWnKJskVqomlnvpxlwbc99GbOj1RjfcPLw1aoHvCXqeaLPucC W6d4JbQf/Ty8FzFj74TpG7szn7StjaZ3Iu9+3/74+nabtCeqQXQ61zG5f0bHL6VzIObq3X I7K50JRKJQpD31D+Y/GP5yzgxyID/Zxyq97zZsAJ/obWAF4PWKUZEIHEb9HlJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pwwc14QjdzV64; Tue, 11 Apr 2023 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BJIP9a092650; Tue, 11 Apr 2023 19:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BJIP47092649; Tue, 11 Apr 2023 19:18:25 GMT (envelope-from git) Date: Tue, 11 Apr 2023 19:18:25 GMT Message-Id: <202304111918.33BJIP47092649@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: 61330e494f63 - main - mount_nfs.8: Update man page for the "syskrb5" option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61330e494f63ab60a515e3273668a03a7e8b4fee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=61330e494f63ab60a515e3273668a03a7e8b4fee commit 61330e494f63ab60a515e3273668a03a7e8b4fee Author: Rick Macklem AuthorDate: 2023-04-11 19:17:09 +0000 Commit: Rick Macklem CommitDate: 2023-04-11 19:17:09 +0000 mount_nfs.8: Update man page for the "syskrb5" option Commit 896516e54a8c added a new NFS mount option used for Kerberized NFSv4.1/4.2 mounts. It specifies that AUTH_SYS be used for state maintenance (also called system) operations. This allows the mount to be done without the "gssname" option or a valid Kerberos TGT being held by the user doing the mount (so it can be specified in fstab(5) for example). Reviewed by: gbe (manpages), karels MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D39469 --- sbin/mount_nfs/mount_nfs.8 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 0e6ea0538063..5052b1a2d6dd 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd September 24, 2022 +.Dd April 3, 2023 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -166,7 +166,7 @@ It allows the mount to be performed by and avoids problems with cached credentials for the system operations expiring. The -.Dq "service-prinicpal-name" +.Dq "service-principal-name" should be specified without instance or domain and is typically .Dq "host" , .Dq "nfs" @@ -441,6 +441,21 @@ A soft mount, which implies that file system calls will fail after .Ar retrycnt round trip timeout intervals. +.It Cm syskrb5 +This option specifies that a KerberosV NFSv4 minor version 1 or 2 mount +uses AUTH_SYS for system operations. +Using this option avoids the need for a KerberosV mount to have a +host-based principal entry in the default keytab file +(no +.Cm gssname +option) or a requirement for the user doing the mount to have a +valid KerberosV ticket granting ticket (TGT) when the mount is done. +This option is intended to be used with the +.Cm sec Ns = Ns krb5 +and +.Cm tls +options and can only be used for +NFSv4 mounts with minor version 1 or 2. .It Cm tcp Use TCP transport. This is the default option, as it provides for increased reliability on both From nobody Tue Apr 11 20:48:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwybl06QHz44Y65; Tue, 11 Apr 2023 20:48: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 4Pwybk6hc2z3PnW; Tue, 11 Apr 2023 20:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681246098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK9QgOhFz+KJzL+5FE/1WxnirSonwcTm8qB8NYLmDII=; b=Q2Z+jnkfYfFRm/XzVRIZaaGHSOKcSje4Y5TLs5k91gPFVduWmWURs8TNv50rsrmFGyeFGS Ku5Cqgo5HHTPRfxUI6U8R7axtFu2QfTtvkuCOPt61U7jLEYg1U+Vcykekt+kbKtFSe7bhw XughSI/dKh1+1oeahJe5egRUz1SrAlbIDNnlVwHSD0+LIA6wyW/H+/Tcy/Uqsd9HSXEsnP a+ke7apNviGkFf2vOcnJQu/r+CpWuifa5uUxNn/IacNvj1QZ3l6zztLeZ0rwDgJKfMmVhr 28oz8OLzjedVYmMWS5EnBvTlpWTPJpdb8yLexf0Q+uFN/u3xV009EwDLt9UUng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681246098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK9QgOhFz+KJzL+5FE/1WxnirSonwcTm8qB8NYLmDII=; b=kw/odwG6aa3MFP8Qtrz7KuA7uZAHx4GTparBjDPnZOx7dzrBAOM9kqlLOiAv9fir58rJcP g5zN5QVEw2EH5CakskBCoBspVjVVqhY/KMHJJnVj+XJYcqLrmJvI8BwJCH43olRWN9UTZ9 oqWOD6AQu3mM/7soQXtU2DijyUdBT2umB1BLsRlLwcWGC+HrPymdstPDpjjJPO2GUV03Tf AoB/h/OR25RceFGeGdFwjBC7n1CLIEpnRI4QgQgulapZp4uALzoPXw5vdy3s+iIZmyEwYv GPHil8m9hKqGTjUfvFnr42l2dyYtFSF3PmF0qM8ro9xzg9/4DhpYpiN+uUtCFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681246098; a=rsa-sha256; cv=none; b=RfbkFIuvUamGKMKUG2RKgYZ2OW+6ntngjebG+H32S9p6oPHVFMcJT/gjN4LFvjnhvF5w8Z 6ivBw41Zr3qSSnQRSBJveNpl6dg21/JB+PQvZqPD+PTrUtr9av+9pfDI5n4W8kBuJT45y4 uwx+dwrcv4UgjAVBIIDuRmT+uHJM3qQQ3OGifG3JAAGe3CRdt5o8alrlXMXB03pLG8qFoJ MOF3YJA7udw3xKVgqiAMGDampJRbMneIvahGMsoCjUqMUtU6jCvuqrrPXOBF/MUHwwAfcr kQVE6WmbTAX8CFAHtRQtPmzheGQ+lUUb165vCbFpV5FNfA2BlTKtX712FqJiNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pwybk5pcmzXmQ; Tue, 11 Apr 2023 20:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BKmIdC041563; Tue, 11 Apr 2023 20:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BKmIb2041562; Tue, 11 Apr 2023 20:48:18 GMT (envelope-from git) Date: Tue, 11 Apr 2023 20:48:18 GMT Message-Id: <202304112048.33BKmIb2041562@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: cd800d3c9635 - main - Enable -Warray-parameter for clang. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd800d3c963578310e18e40846a38c77bc24fa0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cd800d3c963578310e18e40846a38c77bc24fa0a commit cd800d3c963578310e18e40846a38c77bc24fa0a Author: John Baldwin AuthorDate: 2023-04-11 20:47:59 +0000 Commit: John Baldwin CommitDate: 2023-04-11 20:47:59 +0000 Enable -Warray-parameter for clang. I fixed many of these previously for GCC 12 and make tinderbox passes with this enabled. Differential Revision: https://reviews.freebsd.org/D39378 --- share/mk/bsd.sys.mk | 2 +- sys/conf/kern.mk | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index b4c053d053dc..8446b8eeae62 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -95,7 +95,6 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable CWARNFLAGS.clang+= -Wno-error=unused-but-set-variable .endif .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 -CWARNFLAGS.clang+= -Wno-error=array-parameter CWARNFLAGS.clang+= -Wno-error=deprecated-non-prototype CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter .endif @@ -127,6 +126,7 @@ CWARNFLAGS+= -Wno-misleading-indentation NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical .endif .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 +NO_WARRAY_PARAMETER= -Wno-array-parameter NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype .endif diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 8676cb525db4..b7f89c78d19d 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -47,10 +47,9 @@ CWARNEXTRA?= -Wno-error=tautological-compare -Wno-error=empty-body \ CWARNEXTRA+= -Wno-error=shift-negative-value CWARNEXTRA+= -Wno-address-of-packed-member .if ${COMPILER_VERSION} >= 150000 -# Clang 15 has much more aggressive diagnostics about inconsistently declared -# array parameters, K&R prototypes, mismatched prototypes, and unused-but-set -# variables. Make these non-fatal for the time being. -CWARNEXTRA+= -Wno-error=array-parameter +# Clang 15 has much more aggressive diagnostics about K&R prototypes, +# mismatched prototypes, and unused-but-set variables. Make these +# non-fatal for the time being. CWARNEXTRA+= -Wno-error=deprecated-non-prototype CWARNEXTRA+= -Wno-error=strict-prototypes CWARNEXTRA+= -Wno-error=unused-but-set-variable From nobody Tue Apr 11 21:20:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PwzK20vMSz44bnc; Tue, 11 Apr 2023 21:20: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 4PwzK20J3cz4Vlb; Tue, 11 Apr 2023 21:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681248038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iao0T4/phS1J0IbP7el7MkiIoS3FbpzqCwm5ommRiMU=; b=hUsCnu9Xxm6vu72bhEF3q+qgK3BHx5EVw1/4Snx6FGH3mlIrtVTKWMvfMBlwT/hloCYsNX llTOoUNjmrWDgdO8V7Sct0xTdc7RIPeIAbf4Pw2HN219DXy4GNnxLbQsbAtdLL1Oem+zT3 22UaloluN7ji2RDP2dJiGOfP+faJJpVeGDBhtxpYVSh9BT8dJ8XDBBVXOPfxShMHsPpvdX WpXa0xn2LUjuBFvShBH+81vUol4aWnrYDjXs4Jg8muFK4dwsda83xT2I7RyUsKG3QtHKct HeN3qCdHHHskQDN2V+BQlj8GYnPH8zQbdo513FFdmOOZI6EWzb1vNC7LfTnH6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681248038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iao0T4/phS1J0IbP7el7MkiIoS3FbpzqCwm5ommRiMU=; b=eH/sFhGswxLnLRgRYGN8qS8/LoTMH90EM60TNOdq1JUs/ZCocQEGB+BsEAi3JgA/tQ0x+7 AIZle4/dPAHfEcr2/u0KNtKVGTfNwu54fbg5QklaYpuLi/jf0k7AMMkHo0oZJtGTdsa0yG i4dSB9pXRNaWoiBEY+8xjAWW8pzS9m4DsjgNyS/wZAsxBATyJJhCh0v2Evyt7rNUi5BdQR t9nOR6MoRjRrgiW2bZC6335PbejmkJ0rWZkReMB8ldk0OEPMrRE2bMRPmupLFid8mept0e vuQjPBL9FTzq5IxwTJyjYGbqfPGpH5pTxiyFgssXHhOom7Sjlsz2cHD4tr8mPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681248038; a=rsa-sha256; cv=none; b=CriMtHTb6HV/DhUxZiNTggm54FCHaIAAnEAU0Z8PS3857B8yA9W+D88ENycFZKQ74me8Hw +aLLAFbZ0j4vcQYIok9wBYknwkg62sc6MK7rnme+PykPaZEXQsa+GBHrF4veMG7FznDRxm N5hyNSAxhz9F78QzHPXqZS8x3NzM5d3bEu0ixfjr3NpeI/bRUa1ff3ALLYPzwSxIBiIVRR g9qvCvYzeLY+INCz9wKVQxVE+3C/6fnCFvTzL7RmqGndwaVEtI5ZSgA0XDF9cRmBwOqJsD URWwnlI1f//pDb9rg3ZrDik/aPrzYI7RA9SNNfWGL34POemd57BqIkEIpLrXTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PwzK16VK0zYHw; Tue, 11 Apr 2023 21:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BLKboA002941; Tue, 11 Apr 2023 21:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BLKbqm002940; Tue, 11 Apr 2023 21:20:37 GMT (envelope-from git) Date: Tue, 11 Apr 2023 21:20:37 GMT Message-Id: <202304112120.33BLKbqm002940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rene Ladan Subject: git: 6a68db4a8fe7 - main - misc: remove swills from the portmgr graph List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a68db4a8fe78b836bcceaa38f1d2fcaf6f9eccb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/src/commit/?id=6a68db4a8fe78b836bcceaa38f1d2fcaf6f9eccb commit 6a68db4a8fe78b836bcceaa38f1d2fcaf6f9eccb Author: Rene Ladan AuthorDate: 2023-04-11 21:12:44 +0000 Commit: Rene Ladan CommitDate: 2023-04-11 21:20:18 +0000 misc: remove swills from the portmgr graph Hat: portmgr-secretary --- share/misc/organization.dot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index aab39c96ea73..d888ff420b1c 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -31,11 +31,11 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat, pizzamig\nrene, swills, tcberner"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat\npizzamig, rene, tcberner"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib\n, blackend, delphij, cperciva"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"] -portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, swills, zi"] +portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\nbenno, delphij,\ndes, emaste,\ngjb, gordon,\nremko"] srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"] From nobody Wed Apr 12 04:15:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8X63XDLz45C1x; Wed, 12 Apr 2023 04:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Px8X636fpz3nrj; Wed, 12 Apr 2023 04:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681272950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thx6GDoXHxW+6JZ97ncqZL8VDiO0m+NyLgmCIwD9f14=; b=hh6hD82DxL1HoxDPUUH80Vx3o+Fu4czEDkSR9S+R4MOsjfxhhRV4+PSWv2snBxcvrGwA+m Ljmlhsdb60RQ2L75z/qbnkdgYBm5urlXSikiehxPmOrwugVzsDK3fzjUMbaZjtVkkMWEfa AipyFYtxNiwtoHDtLlJSUzis1b0YKyh2scPu4gcyZ9WKAfF6ttJNiXueM8HRGt1B60XuuF +Z5SDoxk9FY/1BJA4tsYICH0uBZ5OluTKzquf08EP1IVsBfCV/oRr0DUQgDtZzAboYisun d9UU41Tu4CVA5X3JIl7wh2c9DfuSdg06YE7dxw3jL24SqD+wrm0pTe2FJKgMMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681272950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thx6GDoXHxW+6JZ97ncqZL8VDiO0m+NyLgmCIwD9f14=; b=B/7PF7z+Z7vWCQQXZo/MavkheQGPVtJ2pY6QP+2uPOlhePraPIwJEGvG+E12OxwFawFQRs Ygdf7QEX5kTMdO4/phiTaenXmANVjZNjkfWIcG324sG9teE1PnaCkIp3MB7HJOzft9U5vz BUPFHQyjssekzx7nN/g1ax1/7CZF4JhDuhQCuw+WG8lppg2H5HPlZlBUU/GeZeQKhdoEsn 9ZBAKWPkkCBoWNoVuPT8mECRPV12rSiXeegK3A/IaruLZBf5P1OWXzgRcVGG62IeSmeT9b 7vD+7eaoE4pWFFrc5TbYr+oBaOI7jR1sx/fJXzHvAPGIQ8axFGAjjjB5jWbIFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681272950; a=rsa-sha256; cv=none; b=ZDUi0CAs589AF19xYrD2i+0VG9pfyifuygcik7AXCp395yVn78usoPL2dQkRorCV8oyllX Kh7pyQ5rdMkiqF7VA3b1egHM1E20hq0hleMVqs1v8fN0uuwHOA78FwxePztVBfX0feqCyC Qorkbit3OXZQ5OcYyj/4bLGliYVCtU8HYi+go93kpcKPW1b2Mt0Y5kB8uyXTK5XuSrqRyd oSPqsGPN1sy/OMf/B7mTXQ4OtRdSlYmlEzCgmMxDoOoEH/bNtutr58BAps+QNquDnV8JHK AHUEimiu9wMyi5UnOudarAMQi6kdsUtzZAKq6sdfu2Cv0EsCz+JSJ5a/99ZB6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8X626f0zlZg; Wed, 12 Apr 2023 04:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4FoYl082623; Wed, 12 Apr 2023 04:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4FoHc082622; Wed, 12 Apr 2023 04:15:50 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:15:50 GMT Message-Id: <202304120415.33C4FoHc082622@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: 7968a06a6934 - main - sysdecode: Add aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7968a06a69344cbaaa88c475b0fe7aa8c2833039 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7968a06a69344cbaaa88c475b0fe7aa8c2833039 commit 7968a06a69344cbaaa88c475b0fe7aa8c2833039 Author: Warner Losh AuthorDate: 2023-04-12 04:11:24 +0000 Commit: Warner Losh CommitDate: 2023-04-12 04:14:17 +0000 sysdecode: Add aarch64 FREEBSD32 API is also supported on aarch64. Refer to aarch64 instead of arm64 because it's about the architecture (powerpc64), not the kernel interface... Sponsored by: Netflix --- lib/libsysdecode/sysdecode.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsysdecode/sysdecode.3 b/lib/libsysdecode/sysdecode.3 index 51272bd1a914..c40f5daf00b2 100644 --- a/lib/libsysdecode/sysdecode.3 +++ b/lib/libsysdecode/sysdecode.3 @@ -51,10 +51,10 @@ Native FreeBSD binaries. Supported on all platforms. .It Li SYSDECODE_ABI_FREEBSD32 32-bit FreeBSD binaries. -Supported on amd64 and powerpc64. +Supported on aarch64, amd64 and powerpc64. .It Li SYSDECODE_ABI_LINUX Linux binaries of the same platform. -Supported on amd64, i386, and arm64. +Supported on amd64, i386, and aarch64. .It Li SYSDECODE_ABI_LINUX32 32-bit Linux binaries. Supported on amd64. From nobody Wed Apr 12 04:21:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fV1w1zz45CG7; Wed, 12 Apr 2023 04:21: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 4Px8fV1G6dz3yml; Wed, 12 Apr 2023 04:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81D1DO9PIVrGAEjLwgyqQUUjypk+zSnk5+4W7jPLQ2w=; b=hRunUea8b6VjfLOQGsmynFOnavQbnC4mVT93eW2nJHiJRMyy2qmwg72KxEJ0kgaC8Priu1 +sQTj5SCwJnQHQp7yyOsU8y85gdQ6Cgec2pZB1huY+Y8+tkIO/H3W6k89DBsi5++AuCLUq z7hiIqpq4KEbImiUDNK6ypsE7bmTKeqah7s6xDnxYK48NzsXx8zb4VVjErIQLABZcUkmIB 4v9aE2GvaszssbO3Fw4sDWl6cqeSHaSIDoINK9n2wWmlEOgyPuSiJHe222HspU34ekFb1e t/kAa5jbKzG3hk/Q24ZrUn5H9gm5x/a8bgfZ0cG7DAkW3jafYt+6lytrCZVmbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81D1DO9PIVrGAEjLwgyqQUUjypk+zSnk5+4W7jPLQ2w=; b=U8sDLN29ENKnbMRUO0pb/MA1bnqpOahdkGDVKsOiMAXZYypaKD0Eazg0Q5d9NLh0nd0A3l 6ZU/9/Ph5KItEeco9aMSAo04uBlsn39QNm3ZA5K2Eky0jUQZUdhF0h26iu/FJk2J9nFBXE 3JpDfpiRgHg7AP+FCr60lxIY8kF8q5BBX3bjp6trr3wuYZQEPbAHzjL0LjLf+voGEBdIcH Q00L+G7SJBTn5Lk+tSJaoDZwjB6Y8EiitOLvjIv1RPe4EjLl/nnd0YSlmw30vYCkFIt7wT 86KPaB8g0Z2p4ocvRL+MTHUu+ayljbq6SFVqHyrjdrjMQIdvKNRnd/vfbV5y8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273282; a=rsa-sha256; cv=none; b=aPk+sh2GNDtbE0S8oF9tpnG4e/bNIDpM0w3fx1ED8mLKkDmuJ4kNJeTTrlEB1hFjX2OOC3 I5h6jPC043xg688HHLD0BMd9qj4cLpbcGEaQfj9qTLch3bN2NogP1b9juMYEeeyBkozqEW efAADZOQ679UDQvbFFc4Ok5GBAbjhD7V4ERAy2PWfqKoUPrI5F/JxDOcY6O1Mew4TfhxrP e01DTzllH9pJOfNahIctGjHTA63eHN4PEZjWxi/PmS1N1JwzeTFlcOs9nzg1KeSVz7PDzz cAO4vM/1HhNEUzZVrP3d6WQ4ej7WuqiXBVifMBQ1Gtbrqxxey9N72TmEChEqdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fV0HgCzlnV; Wed, 12 Apr 2023 04:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LLIr091892; Wed, 12 Apr 2023 04:21:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LLZH091891; Wed, 12 Apr 2023 04:21:21 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:21 GMT Message-Id: <202304120421.33C4LLZH091891@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: dc1c5138c325 - main - powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: dc1c5138c3255cc9004a3842001ed6c5db8f4ea3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1c5138c3255cc9004a3842001ed6c5db8f4ea3 commit dc1c5138c3255cc9004a3842001ed6c5db8f4ea3 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/powerpc/powermac/powermac_thermal.c | 2 +- sys/powerpc/powerpc/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c index 2b1c383ded10..03dbb998559f 100644 --- a/sys/powerpc/powermac/powermac_thermal.c +++ b/sys/powerpc/powermac/powermac_thermal.c @@ -61,7 +61,7 @@ static struct kproc_desc pmac_therm_kp = { SYSINIT(pmac_therm_setup, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &pmac_therm_kp); -SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RWTUN, &enable_pmac_thermal, 1, "Enable automatic fan management"); static MALLOC_DEFINE(M_PMACTHERM, "pmactherm", "Powermac Thermal Management"); diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 7993911a7c80..2393c266a65e 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -68,7 +68,7 @@ static struct kobj_ops plat_kernel_kops; static struct platform_kobj plat_kernel_obj; static char plat_name[64] = ""; -SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0, "Platform currently in use"); static struct mem_affinity mem_info[VM_PHYSSEG_MAX + 1]; From nobody Wed Apr 12 04:21:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fW6PbZz45Cc2; Wed, 12 Apr 2023 04:21: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 4Px8fW1s1lz3yp0; Wed, 12 Apr 2023 04:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHed9magVPokBQcE0+RG8SQfrEH0swcEt8JZFgX0lO4=; b=biTGzPx1Bvk1G3DCD/uE40kYOf50wTOQm4GUu89rkMmcBgguhbDIu9FUSloop+ffQMZ6l2 x8P7ye/VgE5K0TrWXoIUPfkvL7rNIPHKvzIMveNr/nhfAIvpP/7pN8wkx3wnYbnBb715zr KJALbjQj11wkAZ2lZ7dbqQ3wop20FOK5onIAXyOA81q9tQBIQ7BxOy8Ed9KhF9cEIepa/I ROo8AzDJE+IPLrfb4z6aYo6t65JkOdtp/++fJay065G1yyCL3oFlR86OuugoEnDfUlg4Y+ rFphgN03diZ6OCMz4+3YlsytMYRqRRMcgAdHqlP144Xq6jM7R5YQNE1F9LXCaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHed9magVPokBQcE0+RG8SQfrEH0swcEt8JZFgX0lO4=; b=cUZwSu6FWc8+xaUBPrdi3rpGNlTDcCz4W513FtzjrPr85857XBe/xXw3vzhuGlg5LZIxUU lX2AoFKYHrY1KU48a6/jXWTtWrvtlsBGOX39b/ed9NhktveIjlFGE0zDBqOsAfhUWS9UN1 kAYcLMku4LaaBs6CyT6sf9SczNX+2Wb2cNaZJpzGRj1GyPqlYDgPNi8SOZymYKdA28U7Ra doFeg8gWYIjzLsybKKCYV3esylQfJPrdu8g+d6Fz857dYvn1rC4uEt2lRuUStcZLihLIhI a3iOPwJJUdXJ0FJrKK/TWPKAQTBFG4Llq7VQEXxcx3uz4zeB6u+s+Xs4J9+DFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273283; a=rsa-sha256; cv=none; b=BGlbBkqHXW0okjmw9h2hS3EeEyltnIPzKOIIxsJzSyaJUzVmLpA9EsDDG0IM89qF8/GMdP 4yQB0rvSEVgJoJmuxSGtHoTMEyciFjQqQy22+9yhc3Bur9GWA0lb9SHKXEV96eJj8cYhHJ jzdLq/islEaXesImlwjEWmfF0LC5J0KSd8azfnYvJk3gVmVeY+euK1MDyCbgo57lG1LnhH vaPzWI08lNWWwMobQUVM0kr6PpMFM5OnE36y1Wq1r5G2ESRm1rCHGD8GahG6mbZe9Zz2ZF D1vqaA8+3o5v+fIjL+y1mW1dEXc+G3nUN7cut5NNSiw741MFxkPvEstMm23uwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fW0vdvzlZt; Wed, 12 Apr 2023 04:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LNeA091917; Wed, 12 Apr 2023 04:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LNv1091916; Wed, 12 Apr 2023 04:21:23 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:23 GMT Message-Id: <202304120421.33C4LNv1091916@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: 69cb72b8728b - main - cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 69cb72b8728ba605d6cc8758480eca3fc6fd2ed6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=69cb72b8728ba605d6cc8758480eca3fc6fd2ed6 commit 69cb72b8728ba605d6cc8758480eca3fc6fd2ed6 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/cam/cam_iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 34c2ee2cbd17..b351453b2460 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -74,7 +74,7 @@ static SYSCTL_NODE(_kern_cam, OID_AUTO, iosched, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, #ifdef CAM_IOSCHED_DYNAMIC static bool do_dynamic_iosched = true; -SYSCTL_BOOL(_kern_cam_iosched, OID_AUTO, dynamic, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_BOOL(_kern_cam_iosched, OID_AUTO, dynamic, CTLFLAG_RDTUN, &do_dynamic_iosched, 1, "Enable Dynamic I/O scheduler optimizations."); @@ -99,7 +99,7 @@ SYSCTL_BOOL(_kern_cam_iosched, OID_AUTO, dynamic, CTLFLAG_RD | CTLFLAG_TUN, * Note: See computation of EMA and EMVAR for acceptable ranges of alpha. */ static int alpha_bits = 9; -SYSCTL_INT(_kern_cam_iosched, OID_AUTO, alpha_bits, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_kern_cam_iosched, OID_AUTO, alpha_bits, CTLFLAG_RWTUN, &alpha_bits, 1, "Bits in EMA's alpha."); From nobody Wed Apr 12 04:21:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fX5nLGz45CW6; Wed, 12 Apr 2023 04:21: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 4Px8fX3Yvfz400p; Wed, 12 Apr 2023 04:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMAOq8ojnca1RmtS4iBps5tY3NyNt3atZv/SxNGM3qg=; b=x8cLe/RUJWhO+7NtOAZN9MUBb4GPZC8DFktfCWMze8YMo07AcWnnlI0DEiChIJub09Y1Gy t1RC8njqobSMTLnOC+VZdlAIfp+Owp56NUA7HinlP9E6lestZdahT0x18StiqygMwK1GZ6 2EsaynZj3thBfIA1uS6fb9E8nxEP0lJYmP74XDZvwwtnSb84Aou1CxOsw8bYxh0S1BH34G C6iDHDGue7gAiI0LhKM20ALvwqFUA67Rnuw0PgWaPC9gymsqlqRW0F/KOTxrqt49hBG4E7 qOLNi3p4g8xth7HMQl7N5Q7GRDppkhbHg3NuywK4fTRTziA3NGk55Mj/w/vF9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMAOq8ojnca1RmtS4iBps5tY3NyNt3atZv/SxNGM3qg=; b=vEJK+w1BW+quovO1ZBRkz3X6DX6n7VvRCkufsLogfiwYZd8iTFJf81nMl4ohdV0DLVM0QG 0SnTa8aPmDmctTrcnEO2oNs7RpPReS7aE3QIZd8zaPJkb/pymID0ENQuA8La+bFbyAYwRh NMgwEeBd24UqdPcIn7jtDlHf2sHx/SW/1gAO0Yx1UTSoieDwoS3df/WFC2fyhCC0p8cyuP e2EVfglLi7m/OahBNewAIoVc3jjEf0/tvtH00DfCCxwCKdfYWwZxC8QJ+XZt1lrxhZ4BG2 uRcmVp5MnTcc8tHXChfA1OL9hvgS04vSQmodJkT79z3Ao3tRdOUqgPNL+RdvWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273284; a=rsa-sha256; cv=none; b=a1/EL6JBQSgAXpPqII5VVKAON4ky52M5AZK6id1dAj4cCfSfcKhXpSB0zAbiLj7XgWOuQh +wIDqUgeLDfixz4fsqhWgA6vnm8MPIH7JLEkwNGvfnJQAREK/vuaSvCDlAs2sG9BdVbro8 BlnQOYLEeng2K0ci3TLcDTdHsXfp6SUkJApMMCXXqS/+ek534lnROhFLN+pnd3ZASArNSX zKJFYavkNB9XPRRZNziBg+t07Tem8vmgaEaA9+xYjLxQEyyobVuTgnimdEVeKD8imPpICJ GSZX9NUHTqHds8qsbckq+AlCT57Ixwxb534lM9yykelCVabMTWhL5m1QPUyRHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fX1lp9zlL4; Wed, 12 Apr 2023 04:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LO7S091938; Wed, 12 Apr 2023 04:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LOwN091937; Wed, 12 Apr 2023 04:21:24 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:24 GMT Message-Id: <202304120421.33C4LOwN091937@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: 5ff801810827 - main - ice(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5ff8018108278d06e024676c539e9f60f8189e83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5ff8018108278d06e024676c539e9f60f8189e83 commit 5ff8018108278d06e024676c539e9f60f8189e83 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 ice(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/dev/ice/ice_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index da69145e85de..91c00e02310a 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -5852,7 +5852,7 @@ ice_add_debug_tunables(struct ice_softc *sc) debug_list = SYSCTL_CHILDREN(sc->debug_sysctls); SYSCTL_ADD_U64(ctx, debug_list, OID_AUTO, "debug_mask", - ICE_CTLFLAG_DEBUG | CTLFLAG_RW | CTLFLAG_TUN, + ICE_CTLFLAG_DEBUG | CTLFLAG_RWTUN, &sc->hw.debug_mask, 0, ICE_SYSCTL_DEBUG_MASK_HELP); From nobody Wed Apr 12 04:21:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fY5GjDz45Cg3; Wed, 12 Apr 2023 04:21: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 4Px8fY3wSqz40Pn; Wed, 12 Apr 2023 04:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OsVY+z7nXZ3vo/Y4VwQZ48DUQIDNUGdXe55h4A2aDU=; b=iGC5R8uI64tMR2/G61OHs//lbj518nfaGBirf2RTS6Li49fUjF2CBSRXqIThizda1NjRL5 jtfMLy3k2HtTZzxRXSdPd5G5DNQ0gM0AWv3+5P3bsSA7JMyxYULmx2Bfp1TM9fUslIq840 veC1zW2UAf1Y0wtaXJ+aXcsJWiDkvPKScONunkYk8iTs5PE32CRN9b71lhFLnkJcRfbU8y m9vLIW1Ok91u8qOjG3m/WSYF2t0XAolf/elRJjQ/AsprbECqrNjSpjRIS3ZTG6q0er3+qP cMP4WOPhP7DnvCqHsGU+BCc49mzskpHDHO2sRcyZ1VjP5osujaGozhrU7LG2CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OsVY+z7nXZ3vo/Y4VwQZ48DUQIDNUGdXe55h4A2aDU=; b=V3PZQaiV5xd60LN+QTC9KM6lCT0IPL3C3oeaOoaKf/ZyfZIF6p4eQED3jFb8vSf53+IWoQ 5TkXQ+CrLOgFkOTDncOjtcxlbM0FSdiRYsdg3Az3FbtTXeCJsZNdHpL+ftBgsIRvEv/p4H cNLpxuCnsomoWtVwwRJ9PvN9OFPZGNR0MPDs/8k0z/pEipy8b3MR8UwtsDZhaIjLphyTus FfrDy0qU49VEO7M8IYKcflhzJfXdZufpJJMd/iHY+PQQ6KIOzC2iYWyZy4qDmzOMXHaJzw djukUel3XfnKDft+cZsPenU0auOVyOXWv+8a63raGkdBUpG8s654KfLq3zqXgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273285; a=rsa-sha256; cv=none; b=ZYmIRB6JQR/oL5geaqzFv5OPiO7LsoUaI4hyJ6eOzcHDiw2Cm8s/OdMQp3cCZIbOco4qDn dNzTjvNhAtMwj32ryVwBnLFTz2vwsx1DNi9LAC9SsC+exZC0VwXwEQq+DkMkZ619FZR6PR wh9mm5aVFHe/17GwY26n7lS4hPzhnLfw0aDFgV1STf/tYNlK0aGu/Ku/rvfOA4WtxuLoWS q3jUDroID7Jea3NbmrzzjUU0Hr43Dp5f3xWywMALvykNLsS9pHlLxSSofYkBvC66KEvrEp 3du6UV1GO0bNcXl07J1XytkkhIksTZDI19hJJj5Tozgazl47P3kEvq4d3PsD4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fY2nNhzlm9; Wed, 12 Apr 2023 04:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LP7C091957; Wed, 12 Apr 2023 04:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LPZF091956; Wed, 12 Apr 2023 04:21:25 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:25 GMT Message-Id: <202304120421.33C4LPZF091956@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: 8bd9afe9e182 - main - bxe(4): Use CTLFLAG_RDTUN flag definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8bd9afe9e1821368f4bb0d39c8c6703bf5007fd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd9afe9e1821368f4bb0d39c8c6703bf5007fd1 commit 8bd9afe9e1821368f4bb0d39c8c6703bf5007fd1 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 bxe(4): Use CTLFLAG_RDTUN flag definition sysctl variables rx_budget and max_aggregation_size are read-only loader tunable. Mark them with CTLFLAG_RD flag. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/dev/bxe/bxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index aa417ae6b95b..3a25321138ec 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -279,12 +279,12 @@ SYSCTL_INT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN, /* Maximum number of Rx packets to process at a time */ static int bxe_rx_budget = 0xffffffff; -SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_RDTUN, &bxe_rx_budget, 0, "Rx processing budget"); /* Maximum LRO aggregation size */ static int bxe_max_aggregation_size = 0; -SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_RDTUN, &bxe_max_aggregation_size, 0, "max aggregation size"); /* PCI MRRS: -1 (Auto), 0 (128B), 1 (256B), 2 (512B), 3 (1KB) */ From nobody Wed Apr 12 04:21:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fc5fkmz45Cg8; Wed, 12 Apr 2023 04:21: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 4Px8fZ58mwz40D2; Wed, 12 Apr 2023 04:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=geWNKr2o3WIxjQEzZS/XPk1gCJiOWMl2PPCtSHOCez0=; b=Ce9wEsnYUNgzaFUAMBI8969Up3ZP+doqvE43nWNZH1ju0v7KLZiXTiooXgGzMMEuTFn4/1 gid8C9oMcN3LjJ+Fz5uM1Pli9GX6q+IZTDKRuWZNRuxJeXbXYV1Pm2rrXa8Um5tSRdwPck DccE+tm7xgrBBqvJCZO6KUzICF+Iws42/zwpcka08B5+J0lVVtqdbxSiyTkPUHAlolgGiJ vH1jbOGZopmRsvgROij3ySO85cqnUVWiYMiUQkCkLmdBwNfPC9cEpisvhr0WxuVh5t87Kk P1hkD1qj63qHm170ZWpzwLqHkdebGdQSM9DV3SOKD0FSIsyAdKygp+Y/BcHFVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=geWNKr2o3WIxjQEzZS/XPk1gCJiOWMl2PPCtSHOCez0=; b=s4MuKamPQtnVJgpgB1PAAJ+2ngX8S+OvlIT1srGS4D53/EJw4rE0g16F1KJ/X6Oab7xq5m nONXbFv6C6J3X4kj1+vYJU7ShhBtAd1gjUJjHyfgvlxRvrHvu1b7ajl4shx1+/DRkep2Hr rhtHAEl24urimpbrq6Rqpjc6/eEuFg00EZgkrP8g9M8mHmC6uhVnH6fUGi1rQSIBizNAsv 5xieafbQxSdo4lWbE9TwpI+FunbEjeW+QRrYtUX0cjgH2kiCc9uyCV/CgYAHX0qugJ1mL6 5SgP8u4skTrPyZ3gOiBW7cpKBV1kxl0kvNal+sQn4OA6GBDz5QRIyQvUty9gwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273286; a=rsa-sha256; cv=none; b=MNa6KYdH6u9Ks7V51MRhRy3jEfGNED0/lzCmkJRHjM+as2JsQXb1tbm5nr4RQIHvlZbtiv CMuVj4YW0zZIMZVVmnC7wjpgQzqzv0AgwpMSN/0gN2uXyzHG5JVB43lXJZ+COXEATiUY7w bEnRDX+ABPL2wPbTD6Fqajic0PUAgivbSAVxIYCu5THAzx4VoopWbHEB5CnU83hum4nqv7 41Tfeynzk2Eoj/LTIk/yGZJ3oYgBtvo4Bx6Sk52+jD5vMiLh3UA6oaEHSratzc89tt4SWu ncQLjJ6/M4F3QIYC0ScwSwChU02lczJuJJwP1R9Mjcx19db4W+POvHeT+csICQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fZ41rkzlL6; Wed, 12 Apr 2023 04:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LQdh091979; Wed, 12 Apr 2023 04:21:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LQVd091978; Wed, 12 Apr 2023 04:21:26 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:26 GMT Message-Id: <202304120421.33C4LQVd091978@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: deac4c7f0753 - main - iicbus(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: deac4c7f0753841de8da4d7f37d7e49620b3bbb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=deac4c7f0753841de8da4d7f37d7e49620b3bbb4 commit deac4c7f0753841de8da4d7f37d7e49620b3bbb4 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 iicbus(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/dev/iicbus/iicbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index 4ecdda75767b..8bba023a5384 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -323,7 +323,7 @@ iicbus_init_frequency(device_t dev, u_int bus_freq) */ SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "frequency", CTLFLAG_RW | CTLFLAG_TUN, &sc->bus_freq, + OID_AUTO, "frequency", CTLFLAG_RWTUN, &sc->bus_freq, sc->bus_freq, "Bus frequency in Hz"); } From nobody Wed Apr 12 04:21:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Px8fd0J7Mz45CLY; Wed, 12 Apr 2023 04:21: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 4Px8fb6xzTz40N8; Wed, 12 Apr 2023 04:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnqhUFKltR/HMSkvUJZLdeTBxGKr1qDV0GvjPqq4Fk8=; b=fJ0iuYtWyBcShUIpt2YiagppvUhoCXFL7ITaeXfjNz4O7VeJkPkif8mw5fY59Slrvdoqd+ FDVqc3ado2zqW1t7lzJfovi9lWdMMQFFlP1HV1CNie/k+w8Oby7vnrse/JtCoQGTEKlmSb VpLxDmgH00cGTZEjo9ifH4qzS0OKNgQ2dDa2Y0dfI0hhSD/2OOqjYukAe4JgkIBwEEcyyb QAYGDeN3Se9dzO83EN+EG8MHPXHW2nfCtEbewQpH5WgoCZ59WvN3dr3PEt4f8TlLY4za/V JZj/ygg1RO/vTkdJ1spQMqjuXt6bVGUmO34mU44h7YW7gMA6/Wsgx6GH1a/lLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681273288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnqhUFKltR/HMSkvUJZLdeTBxGKr1qDV0GvjPqq4Fk8=; b=an7+dxFJ+Jhi9d3wt6G6bOys12Rqa9Nr/pPtLDrC85+lVLZFYhngliNcA5LBMw2J27gDmo INvcvIRIGMKaC89z5GjW3fCJYaFdqWA8Ewc+Bx0pBiet+jk9U33GzaGiZPz4ajlhN5NbQz 0TLGMI0TTMxZpQ8wIUb9BOHRYrW+cst7OX7nFEmmjkfuHCStZeD1k3PrfrbotvJLslQUga 0OtHJdZGQqCTNjq29Y9Mc40H2JWkC3/TllDB25b7F5f4eo46VtuLuFnzr8lCiglbFKM/OW EaVnJdfCSDAaPTHTplOJ4I4OvGdlBJDIiF+CgrVHgL1vA1bpdJMd7ghUxisHUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681273288; a=rsa-sha256; cv=none; b=TiwWP7rbe2TFxFDay2lWeZG4gn1HS8Wskp53fY0d0ioPDEVzZvrjBZzLw1gHmc/AU8fb82 NbDC0H2nWnGosakXQ6TcoHtswtKiJJu6fOjKr+tIlUaZprI5j/rJnsRS66Skd9IiNeE1tf j29HYbVrmSa/zQnfK+rhtz9GSUwOweigyDFjOPAWt6CcvvMC/KQq9DPvSILG4jSfET5d3E vGRnLlntUpoUF8qRDdyl02fcUsOXZu09h9qTZnr7rKA8aSVyjvV/8LYKKHBfeNPcOWzftU DF3LImlOPcAobrSDQvsySBW8FfQ/7DTkg48WD2aYxwraFtY5Ew85UUwGkLNsAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Px8fb4h2GzlRN; Wed, 12 Apr 2023 04:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C4LRT8092005; Wed, 12 Apr 2023 04:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C4LRe5092004; Wed, 12 Apr 2023 04:21:27 GMT (envelope-from git) Date: Wed, 12 Apr 2023 04:21:27 GMT Message-Id: <202304120421.33C4LRe5092004@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: c3c5e6c3e6c4 - main - tarfs: Use the existing CTLFLAG_RWTUN flag definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c3c5e6c3e6c459839efa5184e67928c25384d246 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c5e6c3e6c459839efa5184e67928c25384d246 commit c3c5e6c3e6c459839efa5184e67928c25384d246 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-12 04:20:38 +0000 tarfs: Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 --- sys/fs/tarfs/tarfs_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_subr.c b/sys/fs/tarfs/tarfs_subr.c index 6aa7eaedb773..a0077c611f25 100644 --- a/sys/fs/tarfs/tarfs_subr.c +++ b/sys/fs/tarfs/tarfs_subr.c @@ -79,13 +79,13 @@ tarfs_sysctl_handle_ioshift(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_vfs_tarfs, OID_AUTO, ioshift, - CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW | CTLFLAG_TUN, + CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RWTUN, &tarfs_ioshift, 0, tarfs_sysctl_handle_ioshift, "IU", "Tar filesystem preferred I/O size (log 2)"); #ifdef TARFS_DEBUG int tarfs_debug; -SYSCTL_INT(_vfs_tarfs, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_vfs_tarfs, OID_AUTO, debug, CTLFLAG_RWTUN, &tarfs_debug, 0, "Tar filesystem debug mask"); #endif /* TARFS_DEBUG */ From nobody Wed Apr 12 07:04:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDGS49ssz45QHP; Wed, 12 Apr 2023 07:04: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 4PxDGS3JQSz3nJB; Wed, 12 Apr 2023 07:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrImAVhzR3Ezk5H1IihiiKLhTgY33od5G15jsKH8ZXw=; b=R+nDqljHmF/LExEkbgKjt8Nuh36ruh/d564hOX+vu4/y7CcAWVR9tTm4DnxTFGBdQq/obS vAlz7gvQoQAOGUpLX1pH6CzhZEOU7vSP7Fbn4eq5fuEXVzXd5XjzL7nvBcnv+i5LWZTFF2 yKsUqSjLNVIrJLVev8LSfizgfkrY86mM8x8apMhxGA/qB6V6b+iMvJiQef2XJeaogpiHRX BjuT1XoNLv2TAvkIq2pbxkth0eQBG6JMK53l99A3B7aTmovK6ces1ktCU8cg+JkU+EObGg HcQfqTsxgMxnmzpJ0E8pmNPgxrjF8AvLZueTPBTa6VdfveDhH674ewE4ZQPGSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrImAVhzR3Ezk5H1IihiiKLhTgY33od5G15jsKH8ZXw=; b=dV5pUMASJa/kDk3Vj2FFPXrkIIrn2iw5p2enLAEmkV7LFAxEqXGqISCLsT9xN8PTBopWBE 6xqoli+IdKxY1lC7bDZHhC9dfm9GdYP8vutE8rTCrykIzA9TchV91/ONTdGA1wPLmvvSvd 06nZdKdLDgxmDsoba/V6VB26u0xWd1KFPVg5Ghqx+01cdk4ij4+y2CX3IUFhYINS4gPVmr wU0cNVfT5eglX0Anh8mu6aob4NR4b77s3E5PDOJl8x+D/OJffv3T8hVkEKlH4rvO1r6tPM ql6a8TZUkcLRAbp6e/Asu6r4j2M2WRad51mWqcnxERVoAgxNfffjId5XqEl5hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681283056; a=rsa-sha256; cv=none; b=c1wscM5M79LizIvKZ9zhyvSBaXZh5j18QdXydXkH0ioCpqbMe7BQWaIXAkQfuED39oEePj 03zHX9KkSA5GpsCcAo/dU1feCHQtmr41e3v5L9O2lgj3SH3TfZ+t2yQW0Yt28XVySk6erj siVitbI6MV+lV3itU5UP29tNyNrmvXKqU/NmW04VxfjhXBfD5Q7xZaWBNqPzjO7PYobyq1 rFfGcXmnC/5xUQ+b34YXU+Au4XEXdv05oImnlhXCZSSTvFyQZx18zrleiP+XVxL/ZCND+V j4+Xj8kVwia2XpCfGAPzl6+ltOtgerzFSN/9BO4H+JGfltRktx4fkbOhsG1rbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDGS24cdzqWc; Wed, 12 Apr 2023 07:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C74GPF062554; Wed, 12 Apr 2023 07:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C74GqA062553; Wed, 12 Apr 2023 07:04:16 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:04:16 GMT Message-Id: <202304120704.33C74GqA062553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 0926566f6f9c - main - bhyve: allow building device specific ACPI tables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0926566f6f9cc1dba0d7b5d7e0b45484dd901b20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=0926566f6f9cc1dba0d7b5d7e0b45484dd901b20 commit 0926566f6f9cc1dba0d7b5d7e0b45484dd901b20 Author: Corvin Köhne AuthorDate: 2022-07-22 08:09:01 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 06:27:04 +0000 bhyve: allow building device specific ACPI tables Some ACPI devices require a device specific acpi table. E.g. a TPM2 device requires a TPM2 table. Use the acpi_device_emul struct to define such a device specific table. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39320 --- usr.sbin/bhyve/acpi.c | 7 +++++++ usr.sbin/bhyve/acpi_device.c | 13 +++++++++++++ usr.sbin/bhyve/acpi_device.h | 11 +++++++++++ 3 files changed, 31 insertions(+) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index d53785c4bfba..614aa8b476b1 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -810,6 +810,13 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(build_mcfg(ctx)); BASL_EXEC(build_facs(ctx)); BASL_EXEC(build_spcr(ctx)); + + /* Build ACPI device-specific tables such as a TPM2 table. */ + const struct acpi_device_list_entry *entry; + SLIST_FOREACH(entry, &acpi_devices, chain) { + BASL_EXEC(acpi_device_build_table(entry->dev)); + } + BASL_EXEC(build_dsdt(ctx)); BASL_EXEC(basl_finish()); diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index a1155ecb44b6..b183da3055b1 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -135,6 +135,19 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } +int +acpi_device_build_table(const struct acpi_device *const dev) +{ + assert(dev != NULL); + assert(dev->emul != NULL); + + if (dev->emul->build_table != NULL) { + return (dev->emul->build_table(dev)); + } + + return (0); +} + static void acpi_device_write_dsdt_crs(const struct acpi_device *const dev) { diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 45e36a8ae771..0306f19f47f0 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -16,9 +16,19 @@ struct vmctx; struct acpi_device; +/** + * Device specific information and emulation. + * + * @param name Used as device name in the DSDT. + * @param hid Used as _HID in the DSDT. + * @param build_table Called to build a device specific ACPI table like the TPM2 + * table. + */ struct acpi_device_emul { const char *name; const char *hid; + + int (*build_table)(const struct acpi_device *dev); }; /** @@ -39,4 +49,5 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); +int acpi_device_build_table(const struct acpi_device *dev); void acpi_device_write_dsdt(const struct acpi_device *dev); From nobody Wed Apr 12 07:04:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDGV1cYZz45QNS; Wed, 12 Apr 2023 07:04: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 4PxDGT4Hpxz3nQf; Wed, 12 Apr 2023 07:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iSOj0WK16YEyxx1bV6YkuI5Ndg4jZZOztZbI5t20HUA=; b=D2MdBxRUc+19aTb8gAUBuuLiB2/hB44fJpLHVMD+QNrBcmLgZBMtNhWWo2hqoYyb2bFasW k3IovwYVDqSr2CV3zdxcr23V+7TIElks5XOmZlkKvuS6DUmW7Z7t7Btakq6M+HLlqJVz8d My/xIgFKGiZh/BYoP63uydNsH3cCKLDVGrhso44NMUUHyIa31jk4/AJZPusDmQmauLLFzg LFCWqMg0pXJb2aIWXQNgkvJaAI7T+oT1JocHfxxrXnRFxN4cNdEC4X9Vqvzx8fcWwmd5Gw 01pt1NZB9u1BEKl8nrcB+lEmJ6PlyI/FqAHddpZQG82CPt1V4f81/l+UqZk4bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iSOj0WK16YEyxx1bV6YkuI5Ndg4jZZOztZbI5t20HUA=; b=mIVpO0UAQDXST5M96AXcbvCjmJCTq4NsaDrCJZDysUC2F09nzaqeXLvkiNEchF7htept8o 7Rl2UF/sq0pmOWpUTV1f4R4khxOpG5Q1LeCCsUr6OhfVaSIMAAhZA284kbuzEsctb+eiBD 1pPJ7i9r+6NEh4obba8+GDVFkrKd87CY2LGlpU19aLJZkSaW4n8rHGILaEcfWnvvP1MAyt MosAPPMNIIUvJ4hdieYAc3g1XTB7334lK7554pzX8WJ+UI4FDHAXinYoFGsDbCdD74tR1S 5YJ7UyfApXpzoN9/Yqd2cZDKvKgxMXq07OyAAUZGVpPV+ME2uxJrC3IX2pLv3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681283057; a=rsa-sha256; cv=none; b=pMhjY4VPumwW+Fg0LENMDqZXpYeCoklRQY4psI/60MKoQyG+iV3Yq9OTC5KKAwu4bSuKpp 8Hd4KCSBOCN/wZFu8QT8TEveYFg5GIa2VcNR1rIZwKXokMBTFK5OispICr1QF4Tef/gQDN GnXFgriXF50vs9nauqXt4SmXbuySBTZewrt4/vmrqVBozd3RcDKKEwvbkcjdoj2GbgNlpS Y3xUeXqoJ5L0hHDgIeprri2Su3OXXTItthCaNvl8H5QUlVGTGnORr6XXW2Qvsf5cuML2r0 U3K9i+PsFw2fzveXNtq9iBGjrJDSjY1TyxE8tcvoiocBjeE6xBcJJJ5z7hmNAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDGT30xVzqql; Wed, 12 Apr 2023 07:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C74HHh062578; Wed, 12 Apr 2023 07:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C74HLM062577; Wed, 12 Apr 2023 07:04:17 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:04:17 GMT Message-Id: <202304120704.33C74HLM062577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: ab34ea4711b1 - main - bhyve: check for errors when writing device specific DSDT entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ab34ea4711b1001c416dc286380e54c118ff0c49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=ab34ea4711b1001c416dc286380e54c118ff0c49 commit ab34ea4711b1001c416dc286380e54c118ff0c49 Author: Corvin Köhne AuthorDate: 2023-04-05 06:45:22 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 06:33:29 +0000 bhyve: check for errors when writing device specific DSDT entries At the moment, this function can't fail. This behaviour will change in the future. In preparation to that, convert the return type to int in order to be able to check for errors. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39422 --- usr.sbin/bhyve/acpi.c | 2 +- usr.sbin/bhyve/acpi_device.c | 15 +++++++++------ usr.sbin/bhyve/acpi_device.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 614aa8b476b1..232dc0b2d501 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -245,7 +245,7 @@ basl_fwrite_dsdt(FILE *fp) const struct acpi_device_list_entry *entry; SLIST_FOREACH(entry, &acpi_devices, chain) { - acpi_device_write_dsdt(entry->dev); + BASL_EXEC(acpi_device_write_dsdt(entry->dev)); } dsdt_line("}"); diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index b183da3055b1..dffb73ba9023 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -17,6 +17,7 @@ #include "acpi.h" #include "acpi_device.h" +#include "basl.h" /** * List entry to enumerate all resources used by an ACPI device. @@ -148,7 +149,7 @@ acpi_device_build_table(const struct acpi_device *const dev) return (0); } -static void +static int acpi_device_write_dsdt_crs(const struct acpi_device *const dev) { const struct acpi_resource_list_entry *res; @@ -167,14 +168,14 @@ acpi_device_write_dsdt_crs(const struct acpi_device *const dev) break; } } + + return (0); } -void +int acpi_device_write_dsdt(const struct acpi_device *const dev) { - if (dev == NULL) { - return; - } + assert(dev != NULL); dsdt_line(""); dsdt_line(" Scope (\\_SB)"); @@ -186,9 +187,11 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) dsdt_line(" Name (_CRS, ResourceTemplate ()"); dsdt_line(" {"); dsdt_indent(4); - acpi_device_write_dsdt_crs(dev); + BASL_EXEC(acpi_device_write_dsdt_crs(dev)); dsdt_unindent(4); dsdt_line(" })"); dsdt_line(" }"); dsdt_line(" }"); + + return (0); } diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 0306f19f47f0..de72ce1e5370 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -50,4 +50,4 @@ int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); int acpi_device_build_table(const struct acpi_device *dev); -void acpi_device_write_dsdt(const struct acpi_device *dev); +int acpi_device_write_dsdt(const struct acpi_device *dev); From nobody Wed Apr 12 07:04:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDGW6XMYz45QHT; Wed, 12 Apr 2023 07:04: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 4PxDGV4dlRz3n6d; Wed, 12 Apr 2023 07:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUmFiWomOs1tv3Hv2IbZnx2pIzlAEL+JEROJ6pn1JPk=; b=gFsJ0IvWsGNEc4uA/eHgZvA9FEaYPJBfePff/RylG4G4iVbcUM6wV2wJ3s8GqMfS6NtpvQ tyIEnreW96cWbuPVESDpm0xG+XMyfzjj1bRb9UDFYeuGQQ5NpDDNsl0i41LX/vx2sb9PN4 kuUsbYnCm48H1VuUr1KHjmR54Xo1OZEFFhk+N7O5Gif/UVK5wXNyxsXnOQQADkEMBtPbqc zvksDqee9rSYdAJ4KY6L5cFN7gEKMJUWtyCkCKFN2GnDN0n1TcdDhz8wxgpu3QnfCQqVkQ XQKoRJaIZSlD4rRyu7UmWSRc+4U7yr2XRiudJX8RSIIAosjdLT6Xcb4gBlgW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681283058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUmFiWomOs1tv3Hv2IbZnx2pIzlAEL+JEROJ6pn1JPk=; b=FEfHRNIiLhYV6CgDS1d2q+zaO+qvHfFvRVTPWJLJqQsXMODWNQ0odFCittF+mS5/DKlF6m fTEvQGM3sx6Y4kIpZWLcJxc4Jxt/hRPJfXf/qi00MUOq9ApmXBdI7GmoWAIYNEyVM3+pLk DpHlvA890aCrUks0KIlPhmON1FkCjTr6NoBCfDAEvB7XMtVNB9uftjXLsBMj19zDqhNkyO bAOPO9r7Qb6cBiaUNJH7KUmfg6u2Fe8haK8dj/0aApRW6PDqTNhT+qnZ/GnEQWPxfwn7io yEIXYinrrR8BKw0gfXr84Z0JrscmD6mU7Nwkc7Fsj4NJs86eY74JAy9RvUZpLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681283058; a=rsa-sha256; cv=none; b=uNPCYNxnqXItyWsrfW9nNEY+plFABeFIAfwKk8cBfN6MCZMZbJ5ed/7JDz3jRU+jxBAmql 0FGSB3Lj5uUuEgsqR0GPP7zGn7fAPnQqs2iSoyRgK3Rdn+Yl2BJ1gZqtH3Fz29Fz7prp9H GO1gPV9/ie2z9L59EX+InULJmTRAHW9jj1iCZ4FlcO4kiUpyJhr8RJ3A4TTzFUuxW2FKgf khxjWdkakY5CUOq0xvbhPWfdazWImNuq+9r0d6VmXfu3EJ4FVy+evf2HRaRfEN7CxUnCU4 FlhkUHANSOn416xDSBRfA2XJh8YmiPxwjuDTfhlRZKe2E3Q+PNeqGx5WeFNbrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDGV3hnhzqYD; Wed, 12 Apr 2023 07:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C74IOo062604; Wed, 12 Apr 2023 07:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C74IEr062603; Wed, 12 Apr 2023 07:04:18 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:04:18 GMT Message-Id: <202304120704.33C74IEr062603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e976464a50ac - main - bhyve: allow device specific DSDT entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e976464a50aceebf97fb3cc6b94058111fc40de1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e976464a50aceebf97fb3cc6b94058111fc40de1 commit e976464a50aceebf97fb3cc6b94058111fc40de1 Author: Corvin Köhne AuthorDate: 2022-07-22 08:11:14 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 06:33:47 +0000 bhyve: allow device specific DSDT entries This feature will be used by future commits to implement a device specific method (_DSM) for TPM devices. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39321 --- usr.sbin/bhyve/acpi_device.c | 5 +++++ usr.sbin/bhyve/acpi_device.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index dffb73ba9023..51603e138fba 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -190,6 +190,11 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) BASL_EXEC(acpi_device_write_dsdt_crs(dev)); dsdt_unindent(4); dsdt_line(" })"); + if (dev->emul->write_dsdt != NULL) { + dsdt_indent(3); + BASL_EXEC(dev->emul->write_dsdt(dev)); + dsdt_unindent(3); + } dsdt_line(" }"); dsdt_line(" }"); diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index de72ce1e5370..4d734b422ec5 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -23,12 +23,15 @@ struct acpi_device; * @param hid Used as _HID in the DSDT. * @param build_table Called to build a device specific ACPI table like the TPM2 * table. + * @param write_dsdt Called to append the DSDT with device specific + * information. */ struct acpi_device_emul { const char *name; const char *hid; int (*build_table)(const struct acpi_device *dev); + int (*write_dsdt)(const struct acpi_device *dev); }; /** From nobody Wed Apr 12 07:22:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDgc49qZz45RKx; Wed, 12 Apr 2023 07:22: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 4PxDgc3h7Yz4Hy5; Wed, 12 Apr 2023 07:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pRby1TsacI7c87+G7AjCnfJesuwW2SVQK6BwrLtwSA=; b=TWzf6EwM5LWbdSWYWKCCBOPJiIHWpNC3xRMkVyPEmSiX0xuNwlkDbZ3aDHRgo+AVdSK7v1 BE3X9JIV+5E9FGwMgfI8riLAmP65hopbtjHQY+I2bITj+DkqzJY6zN5075tCNtmW0GMWNG bGBa6/r3oLB1iDTvFaWS4oEjIhAHyRcRlMfYdInNsIOEXjxea0G2F5XPXn51dkN2kEWYDZ TL/X3vVe56yx5Q9qoNwpezetfZ0cY/1/GTB5AR1CB6kJvCFFypd87nhKEXL8wsJ6ZqvInz JHs1/Q4YXRBnKD62dIAnHFfjofHno7j8gG5olHxGN/oQ9E+2jJBuaKp83yiPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pRby1TsacI7c87+G7AjCnfJesuwW2SVQK6BwrLtwSA=; b=i5W2lk73TFtHDO2fP5llo6nb2ZXxI+uT2XkIytYgb1WsILiHMhbHv2Vu3+DSdkKv8op8aI rod5IMTHyRqrGzVQDLp292PRnIDHJpC3OqnCQQOOer3JRj99YyGcAnDDFtYy7ABi5DjZez CEcvFq+/Oy7llH2yPjBx8Wk3n67tvgW+4aTPg97zbMq9wt8O28Xvi/ve+7fPpcJgEHpEdX 34xM1cgoLAt42BAbD9J9tnwT9+2YI5m6aTEIoo758Jyech3B9sNPh7xPlSjSnRTk8dvmqP Z2kGTDtZrIcvftDSaAp7RV8JfMCFC/Ci6+qKS4mfJDpJfnFufp1mVMv/5TH8lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681284156; a=rsa-sha256; cv=none; b=QDPpqab6fcZGzzM3XE8SKw4rHVa+0x69NkAXJiSpCU2IhMnDjLhSOm70+mDnLZZGMB5aHN 8/YkLIozEBR0Ik6wq/YxEsBZaszQueCi153/MyYBU3L4V0fAzC+wfwEdn498jw+Y5yy/YD +LCtiJCdXRdH7UGc1xjXsJfea9R5ap8tO1YCcyyGVlSbX2ouszCEoWDh5gJvRsWW0vMMQN oe8yGyBsN3611AmSZDwjb06W2wg+PGp/ccPsaEf07PLvmK62Ow/pw75OG+wvTLEk8d9Zb0 VSDFx09D0SXz7ZR7APAv5zvDpk+wXzoWHZzDCpFxjqLmM0h7kOqR6HAXnWmCTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDgc2kkMzrDW; Wed, 12 Apr 2023 07:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C7MaiT094652; Wed, 12 Apr 2023 07:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C7MadI094651; Wed, 12 Apr 2023 07:22:36 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:22:36 GMT Message-Id: <202304120722.33C7MadI094651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 931bb7bf1c8f - main - bhyve: define array to protect passthru regs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 931bb7bf1c8f90f3303b5291e4868c587f9364e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=931bb7bf1c8f90f3303b5291e4868c587f9364e7 commit 931bb7bf1c8f90f3303b5291e4868c587f9364e7 Author: Corvin Köhne AuthorDate: 2021-03-19 12:48:34 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 07:22:19 +0000 bhyve: define array to protect passthru regs GPU passthrough requires a special handling of some PCI config register. Therefore, we need a flexible approach for implementing it. Adding an array of handler meets this condition. Start by using the default handler for all accesses to the PCI config space. In upcoming commits, we can start to split the default handler into several handler for each register that requires emulation. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39291 --- usr.sbin/bhyve/pci_passthru.c | 57 +++++++++++++++++++++++++++++++++++++------ usr.sbin/bhyve/pci_passthru.h | 9 +++++++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index d4382f6cc20e..0055de461270 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -93,6 +93,9 @@ struct passthru_softc { int capoff; } psc_msix; struct pcisel psc_sel; + + cfgread_handler psc_pcir_rhandler[PCI_REGMAX + 1]; + cfgwrite_handler psc_pcir_whandler[PCI_REGMAX + 1]; }; static int @@ -643,6 +646,23 @@ done: return (error); } +int +set_pcir_handler(struct passthru_softc *sc, int reg, int len, + cfgread_handler rhandler, cfgwrite_handler whandler) +{ + if (reg > PCI_REGMAX || reg + len > PCI_REGMAX + 1) + return (-1); + + for (int i = reg; i < reg + len; ++i) { + assert(sc->psc_pcir_rhandler[i] == NULL || rhandler == NULL); + assert(sc->psc_pcir_whandler[i] == NULL || whandler == NULL); + sc->psc_pcir_rhandler[i] = rhandler; + sc->psc_pcir_whandler[i] = whandler; + } + + return (0); +} + static int passthru_legacy_config(nvlist_t *nvl, const char *opts) { @@ -902,12 +922,9 @@ msixcap_access(struct passthru_softc *sc, int coff) } static int -passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) +passthru_cfgread_default(struct passthru_softc *sc, + struct pci_devinst *pi __unused, int coff, int bytes, uint32_t *rv) { - struct passthru_softc *sc; - - sc = pi->pi_arg; - /* * PCI BARs and MSI capability is emulated. */ @@ -946,14 +963,25 @@ passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) } static int -passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) +passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) { - int error, msix_table_entries, i; struct passthru_softc *sc; - uint16_t cmd_old; sc = pi->pi_arg; + if (sc->psc_pcir_rhandler[coff] != NULL) + return (sc->psc_pcir_rhandler[coff](sc, pi, coff, bytes, rv)); + + return (passthru_cfgread_default(sc, pi, coff, bytes, rv)); +} + +static int +passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t val) +{ + int error, msix_table_entries, i; + uint16_t cmd_old; + /* * PCI BARs are emulated */ @@ -1026,6 +1054,19 @@ passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) return (0); } +static int +passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) +{ + struct passthru_softc *sc; + + sc = pi->pi_arg; + + if (sc->psc_pcir_whandler[coff] != NULL) + return (sc->psc_pcir_whandler[coff](sc, pi, coff, bytes, val)); + + return (passthru_cfgwrite_default(sc, pi, coff, bytes, val)); +} + static void passthru_write(struct pci_devinst *pi, int baridx, uint64_t offset, int size, uint64_t value) diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index bdc8dc3cd0e2..f6ce2d4b85ab 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -11,5 +11,14 @@ #include "pci_emul.h" +struct passthru_softc; + +typedef int (*cfgread_handler)(struct passthru_softc *sc, + struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); +typedef int (*cfgwrite_handler)(struct passthru_softc *sc, + struct pci_devinst *pi, int coff, int bytes, uint32_t val); + uint32_t read_config(const struct pcisel *sel, long reg, int width); void write_config(const struct pcisel *sel, long reg, int width, uint32_t data); +int set_pcir_handler(struct passthru_softc *sc, int reg, int len, + cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Wed Apr 12 07:22:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDgf3HJDz45R8W; Wed, 12 Apr 2023 07:22: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 4PxDgd6C8nz4Hnp; Wed, 12 Apr 2023 07:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQHGJVyyeE/V5zYcPAR9X8zgNgNaNvxbtME+df3w/ig=; b=nB6tH0HLq4UvEaUa8rIFWUA67cdN4xXb3APTZOlZQqVq5AyGiDtvnf5bA5tVLTL9vudROr y9vjepUUb/jFarKr9yvwBiD4Br7rfMRDTI1uHCu0fk6R7LU2UBl97sNj2Juidv7J9mHRkz XBz7MDVcD17kBOo5c4BVxR1sgE8RUs/yJX+hX1FEy3JqGHm5AN6/O6WUH56BwlsT8SlvIY A58j8400OnMZMShsCu8j3QD2LQwzTngwN97rLrA4ocM2nzrowsW5LXnEqV3Yq71K9ik2HR IlgalQOQrq/HjtkOrQPDDflKqGdpfGLEWn1Y/c4lH6uXKOLZTlaRVwVBUJgXng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQHGJVyyeE/V5zYcPAR9X8zgNgNaNvxbtME+df3w/ig=; b=LL73Xii61O9+Lrv71BBvsJEfCxhnELbaSmZVe8cM25kbanVcxX2nMMWFnk+TatRbS/vCNs 68+bU10bgRy7DzWSMeWgMXm6nyMalKPolyxQblK8NbujcRc+yd4ttvQhW4uF1zurr9xfJ7 fqdsIqlW2KwLOP4ED5YIpTXhzor4Uzfb2yJkNb78BNhJSmIxK5E8ULdVHbCd3a0lB36ZYx pvdEb3d4qVpuYfWz54RkT5h7WR51iq0JLt8HjTIjOuVkBsiw1Ki2shRJWQq9ME9bnOyCgU y17wyNkqUkWasEpN0gitMILcc2IlBA18sY6SNZn/kJ3Gy3mWHN81bLQ5ieVUVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681284157; a=rsa-sha256; cv=none; b=jW/UWGsXB7uqpUgxz+6PTNfS5s7Z0BKaXE07SZATcDDWtqU76Y4gfJbSd6m7PuKP1Ccl3u tyhYrppOvvST8+a+MZkX7oIdac6IERpsS0SZSg9wLpeTneJXpNtdBzwm+k3xhLfwym04FQ 6QUKeGRw5a3RtW014tzLDV1QlvlV+72QpvzAipLbtOJHbL38idwkhKWLll8zfWJFon2Hqp e8foaHlU0rywEzv0VK3XQxLlCXfB8Qdp5xshhbIlsn8Ym8dlQrqP7umpz9ZVlU3yIU61PE eo2K3LfBBd48X30eFSekkmAKPyizQsIeRuvo8WPrwmbh2BX3SzreVr4uGH0Xwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDgd3krhzrDX; Wed, 12 Apr 2023 07:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C7MbW9094677; Wed, 12 Apr 2023 07:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C7MbGd094676; Wed, 12 Apr 2023 07:22:37 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:22:37 GMT Message-Id: <202304120722.33C7MbGd094676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b6e67875a3e5 - main - bhyve: add hook for PCI header of passthru devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6e67875a3e5bc706fe37565e464c61fe7833846 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b6e67875a3e5bc706fe37565e464c61fe7833846 commit b6e67875a3e5bc706fe37565e464c61fe7833846 Author: Corvin Köhne AuthorDate: 2021-09-07 11:42:25 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 07:22:24 +0000 bhyve: add hook for PCI header of passthru devices Most register of the PCI header are either constant values or require emulation anyway. The command and status register are the only exception which require hardware access. So, we're adding an emulation handler for all other register. As this emulation handler will be reused by some future features like GPU passthrough, we directly export it. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33010 --- usr.sbin/bhyve/pci_passthru.c | 71 +++++++++++++++++++++++++------------------ usr.sbin/bhyve/pci_passthru.h | 4 +++ 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 0055de461270..b5c83f302f0e 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -603,6 +603,7 @@ cfginit(struct pci_devinst *pi, int bus, int slot, int func) { int error; struct passthru_softc *sc; + uint8_t intline, intpin; error = 1; sc = pi->pi_arg; @@ -612,6 +613,19 @@ cfginit(struct pci_devinst *pi, int bus, int slot, int func) sc->psc_sel.pc_dev = slot; sc->psc_sel.pc_func = func; + /* + * Copy physical PCI header to virtual config space. INTLINE and INTPIN + * shouldn't be aligned with their physical value and they are already set by + * pci_emul_init(). + */ + intline = pci_get_cfgdata8(pi, PCIR_INTLINE); + intpin = pci_get_cfgdata8(pi, PCIR_INTPIN); + for (int i = 0; i <= PCIR_MAXLAT; i += 4) { + pci_set_cfgdata32(pi, i, read_config(&sc->psc_sel, i, 4)); + } + pci_set_cfgdata8(pi, PCIR_INTLINE, intline); + pci_set_cfgdata8(pi, PCIR_INTPIN, intpin); + if (cfginitmsi(sc) != 0) { warnx("failed to initialize MSI for PCI %d/%d/%d", bus, slot, func); @@ -876,6 +890,15 @@ passthru_init(struct pci_devinst *pi, nvlist_t *nvl) get_config_value_node(nvl, "rom"))) != 0) goto done; + /* Emulate most PCI header register. */ + if ((error = set_pcir_handler(sc, 0, PCIR_MAXLAT + 1, + passthru_cfgread_emulate, passthru_cfgwrite_emulate)) != 0) + goto done; + + /* Allow access to the physical command and status register. */ + if ((error = set_pcir_handler(sc, PCIR_COMMAND, 0x04, NULL, NULL)) != 0) + goto done; + error = 0; /* success */ done: if (error) { @@ -885,16 +908,6 @@ done: return (error); } -static int -bar_access(int coff) -{ - if ((coff >= PCIR_BAR(0) && coff < PCIR_BAR(PCI_BARMAX + 1)) || - coff == PCIR_BIOS) - return (1); - else - return (0); -} - static int msicap_access(struct passthru_softc *sc, int coff) { @@ -926,23 +939,11 @@ passthru_cfgread_default(struct passthru_softc *sc, struct pci_devinst *pi __unused, int coff, int bytes, uint32_t *rv) { /* - * PCI BARs and MSI capability is emulated. + * MSI capability is emulated. */ - if (bar_access(coff) || msicap_access(sc, coff) || - msixcap_access(sc, coff)) + if (msicap_access(sc, coff) || msixcap_access(sc, coff)) return (-1); -#ifdef LEGACY_SUPPORT - /* - * Emulate PCIR_CAP_PTR if this device does not support MSI capability - * natively. - */ - if (sc->psc_msi.emulated) { - if (coff >= PCIR_CAP_PTR && coff < PCIR_CAP_PTR + 4) - return (-1); - } -#endif - /* * Emulate the command register. If a single read reads both the * command and status registers, read the status register from the @@ -962,6 +963,14 @@ passthru_cfgread_default(struct passthru_softc *sc, return (0); } +int +passthru_cfgread_emulate(struct passthru_softc *sc __unused, + struct pci_devinst *pi __unused, int coff __unused, int bytes __unused, + uint32_t *rv __unused) +{ + return (-1); +} + static int passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) { @@ -982,12 +991,6 @@ passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, int error, msix_table_entries, i; uint16_t cmd_old; - /* - * PCI BARs are emulated - */ - if (bar_access(coff)) - return (-1); - /* * MSI capability is emulated */ @@ -1054,6 +1057,14 @@ passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, return (0); } +int +passthru_cfgwrite_emulate(struct passthru_softc *sc __unused, + struct pci_devinst *pi __unused, int coff __unused, int bytes __unused, + uint32_t val __unused) +{ + return (-1); +} + static int passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) { diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index f6ce2d4b85ab..e999e84f85f2 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -20,5 +20,9 @@ typedef int (*cfgwrite_handler)(struct passthru_softc *sc, uint32_t read_config(const struct pcisel *sel, long reg, int width); void write_config(const struct pcisel *sel, long reg, int width, uint32_t data); +int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t *rv); +int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t val); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Wed Apr 12 07:35:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxDyh0cZ5z44DS4; Wed, 12 Apr 2023 07:35: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 4PxDyg6xGgz3RFQ; Wed, 12 Apr 2023 07:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsvXD3yc9TNVbh7DcB+qavSTmaFz/IiMXDYF86LxrHw=; b=iGR4LdlyMcT88QFBbezaE+JMnJw6QgQ7S40fEJG7zuqadqIURqB5c2KOjJr6A7yqPQ1Ooh h0/tm3pkrcQKKbA+IKj6AN53eSgEQVTuFlbrzOF9foUAW+a7Xt1M1A7VqhEe8C3Rjbr8tr QSgzGsd3qxX5WqR68HRfv9T//T4ACARey8SZ50j4PnTBJGTH5I5FNlWecjHFN/Q0oDhPQW S/TlvX7lvxnzcLEfAw+VSfvv4CKhdWrnSiPD8OeOnmSJ2LJV1UJ844GDJ8vastru6TcLSS Sh0KnEH0U15dOkJGuRF5nu2pkzaYMalM8z6sZW3PPiT0SQ+489c9uAHcMYY43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681284940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsvXD3yc9TNVbh7DcB+qavSTmaFz/IiMXDYF86LxrHw=; b=ISgTolba1p42Ex77rnkpXiTtmSJKFCg52xXsl6K7Bc0JLOrp+wJ3NCx2+/VCVHmK8mBIfL ZoR+ZCpgqn4zYPP+cbZDe0iU7dtjqnPHloTYVJi6pJXXNB+CdAQ3EQjzAwB9sG+gpi4fz6 BN334KDrrXNpogzklSh++NUeU/2AzMEYoEkyojnP4KZ6Zxh3YeOg2RwbGwt8IG2EtnM5lj R7NsbJBsNQUVpqKcuoxXVOjxoNhGhd1s/sgy/GxJg55Uy/YayiclAA3VzcMpskxTZcXO9y DdUwdC2Qdti5uqkSam7qOca3cZIvyOa8ONjXGff3ILoSNgVueknCTPjuIRSd4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681284940; a=rsa-sha256; cv=none; b=rzw9cGIaXv4iJJ/T53IZLbdSliPF0g+4CpX2EoDwpWjoW0a3luXcji5J7PPVu5YTvUgqud WuNcmuzaTyU+gP3n3rT9CNL5sfd4ynw7MyopHMrkCo5USdpLzNNOytjRFF+Zo1GewwquKA CxQ5W9prv9igBl8o4pwpVpnhYsibqizRKjnnWVQGTwrdIrF35eoTV9P9sq4ikqP1xw6phi ZX8aPwczSfoeSpoufbj4DGxoMcJinMo631T8P7g7s8Lyuw/EPs3PCoWPbRLSDrWbznIsBI uM+7SvsC6VTvR3En13YrX2yh5tPmOmzMsgDZRSY5n92fqG4KSbI1//rCvOODsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxDyg62VvzrLl; Wed, 12 Apr 2023 07:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C7Zdlh011582; Wed, 12 Apr 2023 07:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C7Zd9c011581; Wed, 12 Apr 2023 07:35:39 GMT (envelope-from git) Date: Wed, 12 Apr 2023 07:35:39 GMT Message-Id: <202304120735.33C7Zd9c011581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 305edaa47918 - main - bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 305edaa47918a559de46a5d72060644009f1875c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=305edaa47918a559de46a5d72060644009f1875c commit 305edaa47918a559de46a5d72060644009f1875c Author: Corvin Köhne AuthorDate: 2022-06-21 08:35:40 +0000 Commit: Corvin Köhne CommitDate: 2023-04-12 07:35:33 +0000 bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item Requested-by: coreboot Reviewed by: MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39315 --- usr.sbin/bhyve/qemu_fwcfg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 3c7cd0f33224..ddd73d06d34d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -44,6 +44,7 @@ #define QEMU_FWCFG_INDEX_SIGNATURE 0x00 #define QEMU_FWCFG_INDEX_ID 0x01 #define QEMU_FWCFG_INDEX_NB_CPUS 0x05 +#define QEMU_FWCFG_INDEX_MAX_CPUS 0x0F #define QEMU_FWCFG_INDEX_FILE_DIR 0x19 #define QEMU_FWCFG_FIRST_FILE_INDEX 0x20 @@ -227,6 +228,24 @@ qemu_fwcfg_add_item_id(void) (uint8_t *)fwcfg_id)); } +static int +qemu_fwcfg_add_item_max_cpus(void) +{ + uint16_t *fwcfg_max_cpus = calloc(1, sizeof(uint16_t)); + if (fwcfg_max_cpus == NULL) { + return (ENOMEM); + } + + /* + * We don't support cpu hotplug yet. For that reason, use guest_ncpus instead + * of maxcpus. + */ + *fwcfg_max_cpus = htole16(guest_ncpus); + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_MAX_CPUS, sizeof(uint16_t), fwcfg_max_cpus)); +} + static int qemu_fwcfg_add_item_nb_cpus(void) { @@ -433,6 +452,10 @@ qemu_fwcfg_init(struct vmctx *const ctx) warnx("%s: Unable to add nb_cpus item", __func__); goto done; } + if ((error = qemu_fwcfg_add_item_max_cpus()) != 0) { + warnx("%s: Unable to add max_cpus item", __func__); + goto done; + } if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { warnx("%s: Unable to add file_dir item", __func__); goto done; From nobody Wed Apr 12 07:37:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxF0s2n8Pz44DPm; Wed, 12 Apr 2023 07:37:33 +0000 (UTC) (envelope-from corvink@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 4PxF0r680rz3l1Q; Wed, 12 Apr 2023 07:37:32 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681285052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yZVw/XjGdHn0M/bXziSY1X3e6xXcLxuZ/aAxXtHwXho=; b=d+mT118S8ZdthobOJqw51S7uwY7GOCc2+tlD0uE76itU9OxGSXKQOxfuFa+yPSwe8rRQKd 3im5XAnVa5qhkEr31VFWw/RZe4qCJ0xIOZ+K2UP5d0RPVFrxM+GSx/phWLDlOCtZbgtpZi j5bZxmOZYqKAtVc5DA2sA3Mp2Lm/6ab8NLSBm6WmdS/Nz2ymEHn9Ubi3dn9du0gF4VvTTU RvxxqTn60L4gNk6GWcUzywIA71jMHgEjVUWN009JXZqZM+NVe4Y4T3Nj5F8sYRNr10jY0t gpcSPQrtSvnCCa34uOE2NZSPIt81TMJMnGYQPAwnTEHH/p7aJLTPzqRBv0W4LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681285052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yZVw/XjGdHn0M/bXziSY1X3e6xXcLxuZ/aAxXtHwXho=; b=kU5EB1YLTDnFVVb0B64s87WHmi0jxA8V1Hg/P6mQG9/lkH+h84Eo+eQGMJEEXJ2pxoaFwG 9eVyTdMb5kHMYUsuX94H0O9XpPwMtDhOnsP8ODdV1Coj4rP1Vuen2bBGSREOtD0wM8v0ZG G2KJDdwSvOZIZd5WhBhYjUAXplfXIVGt/tYqyw2/uf28sn0fidmd7ohqhm2YtuFlFMUNsY C/ndyp4K7Dpnon+B9UsysVgdYYEjG70K9BfgilZTGMjB59CXNnqmNpWQwImi86GU35CmRS SQWn7zzwoI4gANZxfHXG3+kBcMGjEeY+hEPY1pB8CdZPLeJkWQZ0o3o5ZFng/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681285052; a=rsa-sha256; cv=none; b=CGbfL3oc8t2mB8js7Tc/b6k11TDHFWOgGb3U8WqpCXlOCTpS+Y8ZL9uTL2CUvxx/CWsmB6 LUQvZXXtme0lzKlN88U6dy61wcBmuIsiclyvNZRz3RkVL8IGExub9EZCwSd08Sr8UeLawc IIfo2qn9a5Avmr5LtyjLKyZSaveYN6tV4y5xvn72Rs3AEnCsnlLHZ3sHesAjVap6STELNn mfPZ1F7tdbQeVcvxo8ytXEJHWhqWjDepqPd+grY88b2zviJC3Su/NPd7fK5vMKz79MoXmn xudb1EccxwnKJCsxwRM6VPo2cpH4ywjTOmksL4+JEMIxUWAdLUWo8dWxOqiJog== Received: from [172.21.178.239] (unknown [195.226.174.194]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxF0r0ywyz1Lm2; Wed, 12 Apr 2023 07:37:32 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: Subject: Re: git: 305edaa47918 - main - bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Wed, 12 Apr 2023 09:37:30 +0200 In-Reply-To: <202304120735.33C7Zd9c011581@gitrepo.freebsd.org> References: <202304120735.33C7Zd9c011581@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-6LhOdcrda0PXsCg5wFKC" User-Agent: Evolution 3.46.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N --=-6LhOdcrda0PXsCg5wFKC Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 T24gV2VkLCAyMDIzLTA0LTEyIGF0IDA3OjM1ICswMDAwLCBDb3J2aW4gS8O2aG5lIHdyb3RlOgo+ IFRoZSBicmFuY2ggbWFpbiBoYXMgYmVlbiB1cGRhdGVkIGJ5IGNvcnZpbms6Cj4gCj4gVVJMOgo+ IGh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD0zMDVlZGFhNDc5MThhNTU5 ZGU0NmE1ZDcyMDYwNjQ0MDA5ZjE4NzVjCj4gCj4gY29tbWl0IDMwNWVkYWE0NzkxOGE1NTlkZTQ2 YTVkNzIwNjA2NDQwMDlmMTg3NWMKPiBBdXRob3I6wqDCoMKgwqAgQ29ydmluIEvDtmhuZSA8Y29y dmlua0BGcmVlQlNELm9yZz4KPiBBdXRob3JEYXRlOiAyMDIyLTA2LTIxIDA4OjM1OjQwICswMDAw Cj4gQ29tbWl0OsKgwqDCoMKgIENvcnZpbiBLw7ZobmUgPGNvcnZpbmtARnJlZUJTRC5vcmc+Cj4g Q29tbWl0RGF0ZTogMjAyMy0wNC0xMiAwNzozNTozMyArMDAwMAo+IAo+IMKgwqDCoCBiaHl2ZTog YWRkIFFFTVVfRldDRkdfSU5ERVhfTUFYX0NQVVMgaXRlbQo+IMKgwqDCoCAKPiDCoMKgwqAgUmVx dWVzdGVkLWJ5OsKgwqDCoMKgwqDCoMKgwqDCoMKgIGNvcmVib290Cj4gwqDCoMKgIFJldmlld2Vk IGJ5OsKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgPElmIHNvbWVvbmUgZWxzZSByZXZpZXdlZCB5b3Vy Cj4gbW9kaWZpY2F0aW9uLj4KPiDCoMKgwqAgTUZDIGFmdGVyOsKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIDEgd2Vlawo+IMKgwqDCoCBTcG9uc29yZWQgYnk6wqDCoMKgwqDCoMKgwqDCoMKgwqAg QmVja2hvZmYgQXV0b21hdGlvbiBHbWJIICYgQ28uIEtHCj4gwqDCoMKgIERpZmZlcmVudGlhbCBS ZXZpc2lvbjrCoCBodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDM5MzE1Cj4gLS0tCj4gwqB1 c3Iuc2Jpbi9iaHl2ZS9xZW11X2Z3Y2ZnLmMgfCAyMyArKysrKysrKysrKysrKysrKysrKysrKwo+ IMKgMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvdXNy LnNiaW4vYmh5dmUvcWVtdV9md2NmZy5jCj4gYi91c3Iuc2Jpbi9iaHl2ZS9xZW11X2Z3Y2ZnLmMK PiBpbmRleCAzYzdjZDBmMzMyMjQuLmRkZDczZDA2ZDM0ZCAxMDA2NDQKPiAtLS0gYS91c3Iuc2Jp bi9iaHl2ZS9xZW11X2Z3Y2ZnLmMKPiArKysgYi91c3Iuc2Jpbi9iaHl2ZS9xZW11X2Z3Y2ZnLmMK PiBAQCAtNDQsNiArNDQsNyBAQAo+IMKgI2RlZmluZSBRRU1VX0ZXQ0ZHX0lOREVYX1NJR05BVFVS RSAweDAwCj4gwqAjZGVmaW5lIFFFTVVfRldDRkdfSU5ERVhfSUQgMHgwMQo+IMKgI2RlZmluZSBR RU1VX0ZXQ0ZHX0lOREVYX05CX0NQVVMgMHgwNQo+ICsjZGVmaW5lIFFFTVVfRldDRkdfSU5ERVhf TUFYX0NQVVMgMHgwRgo+IMKgI2RlZmluZSBRRU1VX0ZXQ0ZHX0lOREVYX0ZJTEVfRElSIDB4MTkK PiDCoAo+IMKgI2RlZmluZSBRRU1VX0ZXQ0ZHX0ZJUlNUX0ZJTEVfSU5ERVggMHgyMAo+IEBAIC0y MjcsNiArMjI4LDI0IEBAIHFlbXVfZndjZmdfYWRkX2l0ZW1faWQodm9pZCkKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICh1aW50OF90ICopZndjZmdfaWQpKTsKPiDCoH0KPiDCoAo+ICtzdGF0aWMg aW50Cj4gK3FlbXVfZndjZmdfYWRkX2l0ZW1fbWF4X2NwdXModm9pZCkKPiArewo+ICvCoMKgwqDC oMKgwqDCoHVpbnQxNl90ICpmd2NmZ19tYXhfY3B1cyA9IGNhbGxvYygxLCBzaXplb2YodWludDE2 X3QpKTsKPiArwqDCoMKgwqDCoMKgwqBpZiAoZndjZmdfbWF4X2NwdXMgPT0gTlVMTCkgewo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqByZXR1cm4gKEVOT01FTSk7Cj4gK8KgwqDCoMKg wqDCoMKgfQo+ICsKPiArwqDCoMKgwqDCoMKgwqAvKgo+ICvCoMKgwqDCoMKgwqDCoCAqIFdlIGRv bid0IHN1cHBvcnQgY3B1IGhvdHBsdWcgeWV0LiBGb3IgdGhhdCByZWFzb24sIHVzZQo+IGd1ZXN0 X25jcHVzIGluc3RlYWQKPiArwqDCoMKgwqDCoMKgwqAgKiBvZiBtYXhjcHVzLgo+ICvCoMKgwqDC oMKgwqDCoCAqLwo+ICvCoMKgwqDCoMKgwqDCoCpmd2NmZ19tYXhfY3B1cyA9IGh0b2xlMTYoZ3Vl c3RfbmNwdXMpOwo+ICsKPiArwqDCoMKgwqDCoMKgwqByZXR1cm4gKHFlbXVfZndjZmdfYWRkX2l0 ZW0oUUVNVV9GV0NGR19BUkNISVRFQ1RVUkVfR0VORVJJQywKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqAgUUVNVV9GV0NGR19JTkRFWF9NQVhfQ1BVUywgc2l6ZW9mKHVpbnQxNl90KSwKPiBmd2NmZ19t YXhfY3B1cykpOwo+ICt9Cj4gKwo+IMKgc3RhdGljIGludAo+IMKgcWVtdV9md2NmZ19hZGRfaXRl bV9uYl9jcHVzKHZvaWQpCj4gwqB7Cj4gQEAgLTQzMyw2ICs0NTIsMTAgQEAgcWVtdV9md2NmZ19p bml0KHN0cnVjdCB2bWN0eCAqY29uc3QgY3R4KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgd2FybngoIiVzOiBVbmFibGUgdG8gYWRkIG5iX2NwdXMgaXRlbSIsIF9fZnVuY19fKTsK PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoGdvdG8gZG9uZTsKPiDCoMKgwqDCoMKg wqDCoMKgfQo+ICvCoMKgwqDCoMKgwqDCoGlmICgoZXJyb3IgPSBxZW11X2Z3Y2ZnX2FkZF9pdGVt X21heF9jcHVzKCkpICE9IDApIHsKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgd2Fy bngoIiVzOiBVbmFibGUgdG8gYWRkIG1heF9jcHVzIGl0ZW0iLCBfX2Z1bmNfXyk7Cj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoGdvdG8gZG9uZTsKPiArwqDCoMKgwqDCoMKgwqB9Cj4g wqDCoMKgwqDCoMKgwqDCoGlmICgoZXJyb3IgPSBxZW11X2Z3Y2ZnX2FkZF9pdGVtX2ZpbGVfZGly KCkpICE9IDApIHsKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoHdhcm54KCIlczog VW5hYmxlIHRvIGFkZCBmaWxlX2RpciBpdGVtIiwgX19mdW5jX18pOwo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgZ290byBkb25lOwoKUmV2aWV3ZWQgYnk6ICAgICAgICAgICAgbWFy a2oKCgotLSAKS2luZCByZWdhcmRzLApDb3J2aW4K --=-6LhOdcrda0PXsCg5wFKC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmQ2X7oACgkQ2FTaVjFe AmqYKhAAo1ft19L/6GnTQorU2r7p3auNLnVT64FWGCtSNYO/ZtEr6snW6UuZSyqg YByLuL0bD837bCtQo9uMduXdcB4Ou5YMnkkznxEpYCUGW2T6WJ3D8ow3Vhea2jxF 5pwFNgSeoGbHTYrbXZKbYya+gmumRsxNtT63DaIhCNki5BLSmVRB2y64xG3aYmHE 5mQ9hqNDjboLsdIhJy+eCu8G50X0H5FkoxM04a2U+kBgx1ErPt46p/qjaib/F9qh oWQh4T0od2GNVT/8qaTRBIVEGGMaFPhwnqUZpdWNaKbe0isxlgRctEJOSY7n4wzN OHf3FKLYnGLEfsqCOSpGSWSggeKhXFKL7OHY7T/MeyVD8dnGs+iaaabvuTUYGXsL ZhmmGoJngCAQfrlFym1tyUKdVcgnwRLI+Po/yPv1QKCwHuMQ8ysJe2i0GbIqEImp +Rh+oMdyTmR4cmK8Z9BKDqcTeSSTb51SJqjNhVBVA2n/xmMbXjmbrsi6M1VYqa9d 3IME49Xjdv5m/ooL/Jdl7cSAIVNXOM028ufjrYozxYjD/VDqku5UfwsNIO7erIl6 6urjXlOARytF31ATxJjSuuZ9ZXdkW7h+g+PSmAqC1Y2XkwawmiH1JxBxBP0kw+ae zbDKLLtXf8yVrQ9Qd6qRqec1Ad9PsQf47wwBN1vgY3FcFpijTdc= =R1dg -----END PGP SIGNATURE----- --=-6LhOdcrda0PXsCg5wFKC-- From nobody Wed Apr 12 08:56:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxGlN2rZxz44LgM; Wed, 12 Apr 2023 08:56: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 4PxGlN2QTJz3CbM; Wed, 12 Apr 2023 08:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681289760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VXLezjxplrLF0xJHHdhePXHtm7INW6vOm0itasV1Xk=; b=hM/CANYjL9TZXOckQmNCmrgeA714O3RX0J1f84iHOypakLfTeImPgbWo9TXBcmMkY4cFsq ofYRlClXIzKhHtrRFUFEbp8nDQOQgktFOXb7hW1rRm7VStZAc6d2GbT/r4nd80QsOzE1vZ s9dcl6Hjg6n0EVk0O5gM3heXhSBqL7G4ajGVDutBEbvdcuWaEotxtNEm8ENcfAH6t+rT8z PU3LcS+D7inlKyDjniynKVNFUZ1NETr1eWP6N0Urw/EBHqEPRhsLWL56JBD917wDfGBKA0 9cEw5T60eAqDTgmnXxa4Cs4AkpkexB2QDTjxGfq+CQ19pbBr5XnH3c2ZcWu7Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681289760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VXLezjxplrLF0xJHHdhePXHtm7INW6vOm0itasV1Xk=; b=LuaMEplm+fZodC+4m1PFUox53vO5+4KKTtvpCNuhC8zSUtBfomej95jNmLpeureh9Q5SsD ADoPZWg6kmnMD3V9N0VswvYDbkH5ej7O3RkCfVPROJTQW4FYwSNFkSFxrbSJt/4ly+ZXz3 wLgnppRfebDe2306a0cJQRevMFa7zsBueV9PR2JKGx3iJOl7mIKiRgp44JBUsBhAk/uLbP uqzKRBgrP+OgmXk4cNR3V4yWcVDYruqg0oBrXIe61B0tJnG+W9H07L4w/xFm36eNG7eFp+ De8o4kPNfevPWmUPqpH5PF09Q+JMNQ78HEJtg8v4VPVUP4GtGy5uYWwDpVvs8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681289760; a=rsa-sha256; cv=none; b=XEs6xMpMn3A3rAnLzMbUbd9rbIrWzE0JYmrAbLxCoXFrsQo4JpESg7uKFzdg4vb8op2/w2 UeI/E/xFJJqQ4nRtSuiJpRSguzqCkyuc8dEIdA6m9hhrwQ7tIvvR/213dxvOOGYFpdsFAN vSv5NN8ssG7YI1bakU6OZQ075wgJbu3+pWnCuDbOsDezkNOuH7TimxPm6iFDzn5DftPE1h qXi1oZbFoODDtDFWsD3s9vWGfKoJ8TWVHfGd7ejUCatw+LcKIvfNHxsR84X3oXmilZRhag KJzJv/naJvA6a1L6ntepxWAo0pPinBRXCedi2KZ/2dMh4nrTS1mBqrpkGixR3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxGlN1WklzswY; Wed, 12 Apr 2023 08:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33C8u0jE042434; Wed, 12 Apr 2023 08:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33C8u0b9042433; Wed, 12 Apr 2023 08:56:00 GMT (envelope-from git) Date: Wed, 12 Apr 2023 08:56:00 GMT Message-Id: <202304120856.33C8u0b9042433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 73c48d9d8f89 - main - tcp: fix deregistering stacks when vnets are used List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73c48d9d8f89f066db5c5eef967a936d6b7f2d1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=73c48d9d8f89f066db5c5eef967a936d6b7f2d1f commit 73c48d9d8f89f066db5c5eef967a936d6b7f2d1f Author: Michael Tuexen AuthorDate: 2023-04-12 08:52:53 +0000 Commit: Michael Tuexen CommitDate: 2023-04-12 08:52:53 +0000 tcp: fix deregistering stacks when vnets are used This fixes a bug where stacks could not be deregistered when end points in the non-default vnet are using it. Reviewed by: glebius, zlei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39514 --- sys/netinet/tcp_subr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 36112a101fa8..be78396260c7 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1355,8 +1355,6 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, * to the default stack. */ if (force && blk->tfb_refcnt) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_tcbinfo, - INPLOOKUP_WLOCKPCB); struct inpcb *inp; struct tcpcb *tp; VNET_ITERATOR_DECL(vnet_iter); @@ -1366,6 +1364,9 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_tcbinfo, + INPLOOKUP_WLOCKPCB); + while ((inp = inp_next(&inpi)) != NULL) { tp = intotcpcb(inp); if (tp == NULL || tp->t_fb != blk) From nobody Wed Apr 12 12:26:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxMPv5BtVz44gsM; Wed, 12 Apr 2023 12:26: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 4PxMPv4n9gz43Z6; Wed, 12 Apr 2023 12:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681302371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxvPAP6B+7xC2TBBA424az7yXvkdnm+b1hObHN+bhaU=; b=QpiqvCxCW9nCP2u9I/nzb2KgcpCNF71JoLgZrQWiaYI5EE2HI0dOZzDwJiyIVmTEgDyv3q OBHVZQrkWfp9yH/I+D0kkJJ3GtPiWH0nMJqR+z+WXlImH9B8UlwNn67nIBqh6Rj7aFp61j 1+i/ysjjoFIWSuKSheGQqw6zmWb8uUCLNXbq4APoDr+uX2l1BYvYAM4196kccelsT7wCTq g2CGqKtOBpcolJOThguntzr4Lsv7NPu1EE2hk/1JWq/LDKbusWFdNUU9hGP4PbpaAv7iiI W5BhFSomT7aDV89POnSBM4rHPFdjGpRDmlmgM2SnUFiFW0lvqnJbj86KG1KP8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681302371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxvPAP6B+7xC2TBBA424az7yXvkdnm+b1hObHN+bhaU=; b=izIYhif0TvMu70r7UZ2r3uayaRcunqvtfu116fY2IT+t2lde4fc6mGa263cJZ3VDn615w8 h/zJW5iDY37Dg9FsDQalEAHiKPdAnV9jEv8VU5V2uIVsmyZmk2Qb5VuRnCvi+VlEuP7W1K JCTciiCwARB1u3I17gqMVTA4VG+dqNYHs/LrwDVtSd3y6N0B+Jbs0ilLvdZSmvI0eR3eoj GL7NOVcxq+WwWyma73ycTE5ESS7SVdPpCMjAHqvF8xbRSaiKI38vAwAwyz9JoxG/OD36Y1 bwimUGJQa8NPC7qtz1dAnbvC+QFnE/jiSCYzjb1pm5rx1T9rNMkBqsN9KVZNFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681302371; a=rsa-sha256; cv=none; b=BC/Rsn3tz6hXGnE9b2wj2KOg4sf+asBjFbZHJ5LHYgn0a1lHrm3YdF6vbZJHtg8jimzeS4 gGJO+g/aCRdC92RXUQuApg4s+ldgLs/EhQDUGrL1DkkiGShS8orp0sAQMrpfPauE97PJlT sgWE2y5sr/zTmWW+yxUbwG2B2AnRXTBwqsAdRPRe2R7dqhrkcfaxqAKXMQU/UK2Ggud7GN N8L4FmSMEHb00xluCaSZJSJIWMyqzbh6o3SF+j+EVeuyh6raIQq0v5zA5g0RFz/SwhL62s 1NxAYraUJ5qwrm1QAdKquah8X8zYOXZZvUyjo1Z4MyxckGri57JhsmhSLuoQpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxMPv3tFcz10BJ; Wed, 12 Apr 2023 12:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CCQB88088678; Wed, 12 Apr 2023 12:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CCQBCK088677; Wed, 12 Apr 2023 12:26:11 GMT (envelope-from git) Date: Wed, 12 Apr 2023 12:26:11 GMT Message-Id: <202304121226.33CCQBCK088677@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: 421516f25e9c - main - Create pmap_mask_set_locked on arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 421516f25e9cfa91b33841f633a463889bc10af7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=421516f25e9cfa91b33841f633a463889bc10af7 commit 421516f25e9cfa91b33841f633a463889bc10af7 Author: Andrew Turner AuthorDate: 2023-04-12 12:09:06 +0000 Commit: Andrew Turner CommitDate: 2023-04-12 12:10:13 +0000 Create pmap_mask_set_locked on arm64 Create a locked version of pmap_mask_set. We will need this for BTI support. Sponsored by: Arm Ltd --- sys/arm64/arm64/pmap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2e5b2c23efd7..fc4650c8d449 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -3837,14 +3837,14 @@ pmap_protect_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t sva, pt_entry_t mask, * pmap and range */ static void -pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, +pmap_mask_set_locked(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, pt_entry_t nbits, bool invalidate) { vm_offset_t va, va_next; pd_entry_t *l0, *l1, *l2; pt_entry_t *l3p, l3; - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); for (; sva < eva; sva = va_next) { l0 = pmap_l0(pmap, sva); if (pmap_load(l0) == 0) { @@ -3938,6 +3938,14 @@ pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, if (va != va_next && invalidate) pmap_s1_invalidate_range(pmap, va, sva, true); } +} + +static void +pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, + pt_entry_t nbits, bool invalidate) +{ + PMAP_LOCK(pmap); + pmap_mask_set_locked(pmap, sva, eva, mask, nbits, invalidate); PMAP_UNLOCK(pmap); } From nobody Wed Apr 12 14:28:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxQ6v0wK1z44s1q; Wed, 12 Apr 2023 14:28: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 4PxQ6s403Zz3rN1; Wed, 12 Apr 2023 14:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90YFIZ3PZmU+q2CwxpNO+9zkc0Kr3SisvF5JyusSPCc=; b=Vu8zlBgLPp8If+RMqn7P8tYU95Cj1QNdF42eauz650jQNqU7+RXFAEl13klsROaLbjQKlv ZQ3L3V+i1iD1Af9oX/TMd1f5RoLuduU6cDIRAXM9BqMcEw4WcpjboBhWtBb6KrwyflJ58O YPZlvw40SnOUhsARWVd+SLTYcnfwAYxoAiE5QfEuB677Iui9gXE0tQcj7i/FdZBQMYWwPo q915i7b8W+Gk2+oFsjO9scwRpTTgOFYQHauPnLqkg6qali5ICGqloi8f7RsrwgV02mzc34 0zeEdlWeZMKfENA/ygPH8U2EyIsk3yE941reiqCjbM9/iTPshS4ZwUFckSaYKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90YFIZ3PZmU+q2CwxpNO+9zkc0Kr3SisvF5JyusSPCc=; b=nhhI+gIMEeVMDLpHLR94BcXVO6NGfq1ueTK4O360QdmgFFaHYLBNBkSExv8J2KAEonsC6C IaYElBRp90ehBI/F1FqrNmDqj863ZD4YE4xUF9SldcF9o+j0Rz1sHHRHZUq4FWDaBztcLn 6co4VboDia32WFuyN8bBECvfGng70h+0me8dzQu/kcVrS36IbV00BkQ/qS3v8AUVf8I1Bk qz/p6y6oqVWiPQmWTMI/zj+fMxJNx1KqB+6sxpLTnhjM0MvMsbDoB9IKyodbxlc+jL86US la4VCDt34CIbd9cfviqjHRYAgguYR1oT8GJ4pDJVTuUywO1kFzcZxsULeNxifg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681309701; a=rsa-sha256; cv=none; b=EDKqgyYzlfohg8e5P2baFX7uggz+P/OclzjELSo0v92AZb41eDrb9MsP3s3A7cug1rcbl+ mxlwL5vl9NYsYZBSIbHoIs3KI9FKRGIdrv9S/c5brIiUJ9z21ZYNmd1dNM4HedmV9sjN6S 5DQMB8DzQcFvKmVef25jOVIe5SSXAE7E3ag06um46N9NcBRLItT6ILWfTnkxjPXFrl+HXW ESC3HycaMZRMaSAnc75sryIvP16RjzOq2NNQCaT2AUPYkU/sdZjRpgNCexz96YstEHOVsA l+vfzpQoDjHY1knq3hVaXU9ieQO3g3Cc54uroMUf5WJ/NUoFYFBjr5+4gURj3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxQ6s0F9Vz13DX; Wed, 12 Apr 2023 14:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CESKJK086503; Wed, 12 Apr 2023 14:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CESKBL086502; Wed, 12 Apr 2023 14:28:20 GMT (envelope-from git) Date: Wed, 12 Apr 2023 14:28:20 GMT Message-Id: <202304121428.33CESKBL086502@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: b4f1582f3b62 - main - netisr: Purge another reference to NETISR_EPAIR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4f1582f3b62ca943a6009d7f08c938833bf70d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4f1582f3b62ca943a6009d7f08c938833bf70d5 commit b4f1582f3b62ca943a6009d7f08c938833bf70d5 Author: Mark Johnston AuthorDate: 2023-04-12 14:27:00 +0000 Commit: Mark Johnston CommitDate: 2023-04-12 14:27:00 +0000 netisr: Purge another reference to NETISR_EPAIR Fixes: 03276e338a1b ("netisr: Remove the now-unused NETISR_EPAIR queue index") MFC after: 1 week --- share/man/man9/netisr.9 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/share/man/man9/netisr.9 b/share/man/man9/netisr.9 index efcb8ed8e7b1..06e394915729 100644 --- a/share/man/man9/netisr.9 +++ b/share/man/man9/netisr.9 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 25, 2017 +.Dd April 12, 2023 .Dt NETISR 9 .Os .Sh NAME @@ -220,9 +220,6 @@ Routing socket loopback ARP .It Dv NETISR_IPV6 IPv6 -.It Dv NETISR_EPAIR -.Xr netstat 1 , -.Xr epair 4 .El .Sh AUTHORS This manual page and the From nobody Wed Apr 12 15:35:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxRcC5wv9z44yD3; Wed, 12 Apr 2023 15:35: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 4PxRcC5Ppzz3Pwl; Wed, 12 Apr 2023 15:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z36eESDGLPA6U4x3dvI/eCZyd6nt84Y4UcrdmU+3It0=; b=eZXrg7sEzBUZLMHkORQxoH0MNvUaHMZj0WfMIF7t+fOZdNz0UdPyucSaW8YrKa7ShQeK16 65d7q2KEg+Mk/J+BbwwAvfcgWZwdhtfOAZRtEoXuFEEFElUae22ME+keeI/NVS5xs2pYdX Q/nG+lt3kbqBkSyk84WDTVAfPI83wyx914+CUYViy+g770QWZkZUAVKKzqSOpulBPh5dSs rRopg2R6IdwV972QMfRJ2S5vbOPH8dFFqgSrqjdg5Hhn3z3krcdHF0lXhbjYywc0u1a7+Z 5uv1EoZeXPDtTxMFBMOAI8UxH805jNxa+k96mq/zVBp1PnaLoEASzDY73uSDaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z36eESDGLPA6U4x3dvI/eCZyd6nt84Y4UcrdmU+3It0=; b=B3ICAOfp42kFFM9bCQxFGWfi/doMIDKNIrgzwEMA7kV2ZoSkt0lcJhVcXS7S/0dAWJIrIU v8aQMm1jj7+jNPQNzCUVvuu2kEERxHPUaZH620CmpXvQlBmY/89vyI9Wt1vQR2IowD+9hL 6n2W5qUnj0y/J2Oh/zwfOSNeVxQuJi9xxHJz16XBp3YGnDuXiWwXA1J4R9TNVznRCDEHye es5F9u+YcCFVoC53ljmIcw10P/kCuVdAR6NrQOprsTXNxURY8cKsrKlmgdmJae0pjkGP57 ntXgSPcYdK5nhfv3xhdrf5jINSUB8q/9zn6MyK00PZeloYcOVSp+RuMHs25Dbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681313723; a=rsa-sha256; cv=none; b=aHAKIuQkbuFjj+66pjt2sbrYxe+gGW4YPuIWeF6CRxMJK71TRfLJyC89lmJrzIlsg9PMFu Zw+jiImAHOtQ1dHqW/wE96DtyyIXi8tXhlwTh0XPVN75VIeJBpa0hvtm59Wyk9tpUS0rBs smEsI8yKVwLgJXUa8lmkVToHYl+AKl6H117kFziN/36kVlqMUKqRYVKGok9L+5rFDmJmHy yCrgIncUjLR1l7ahmQO90ht6VZjyF304iC0gsNYkP5LWU7e8C2T+dLP104Io73n/NtSNoT 7BfB9aH8+zQYLkkb9T5N+i/dS8/lMJCBabfRVPt67wE+IN+G2TtEdyD+auFRXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxRcC4TxYz14mw; Wed, 12 Apr 2023 15:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CFZN3f001870; Wed, 12 Apr 2023 15:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CFZNfK001864; Wed, 12 Apr 2023 15:35:23 GMT (envelope-from git) Date: Wed, 12 Apr 2023 15:35:23 GMT Message-Id: <202304121535.33CFZNfK001864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 1073f416576b - main - tcp_lro: When processing compressed acks lets support the new early wake feature for rack. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1073f416576b50c575414c79294c2d80a3634a05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=1073f416576b50c575414c79294c2d80a3634a05 commit 1073f416576b50c575414c79294c2d80a3634a05 Author: Randall Stewart AuthorDate: 2023-04-12 15:35:14 +0000 Commit: Randall Stewart CommitDate: 2023-04-12 15:35:14 +0000 tcp_lro: When processing compressed acks lets support the new early wake feature for rack. During compressed ack and mbuf queuing we determine if we need to wake up. A new function was added that is optional to the tfb so that the stack itself can also be asked if a wakeup should happen. This helps compensate for late hpts calls. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39502 --- sys/netinet/tcp_lro.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index c35fb0ef1035..3ce49171a65c 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -1195,6 +1195,19 @@ tcp_queue_pkts(struct inpcb *inp, struct tcpcb *tp, struct lro_entry *le) le->m_last_mbuf = NULL; } +static bool +tcp_lro_check_wake_status(struct inpcb *inp) +{ + struct tcpcb *tp; + + tp = intotcpcb(inp); + if (__predict_false(tp == NULL)) + return (true); + if (tp->t_fb->tfb_early_wake_check != NULL) + return ((tp->t_fb->tfb_early_wake_check)(tp)); + return (false); +} + static struct mbuf * tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, struct inpcb *inp, int32_t *new_m, bool can_append_old_cmp) @@ -1751,6 +1764,9 @@ do_bpf_strip_and_compress(struct inpcb *inp, struct lro_ctrl *lc, * not care about SACKS, then we should wake up. */ *should_wake = true; + } else if (*should_wake == false) { + /* Wakeup override check if we are false here */ + *should_wake = tcp_lro_check_wake_status(inp); } /* Is the ack compressable? */ if (can_compress == false) From nobody Wed Apr 12 15:51:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxRyR668fz4503W; Wed, 12 Apr 2023 15:51:11 +0000 (UTC) (envelope-from vishwin@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 4PxRyR5CrTz47f6; Wed, 12 Apr 2023 15:51:11 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681314671; 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=FyqugnsYpT8CDc534NQrs+mNtqFejZPJy1hCuczw4sQ=; b=NaPieeu3k/Jh3U+Ex/5Y6E0mCXWO/3EzCy0RUeGpmfNnNKMrVZSnN3yUUrZ14eIak/1Yi+ RaQnvp0Z4D8HUi0kGZL7P3v43WN5ZrakY14oByyi+UFa20XmLEztNJxle5xyJOJ4XBZX4Q kUPgYFKV9jnTF5U2/u1DxQnxYjBEXYAdn7Ut3WO5YLlAVF/Wg/c3c9GJ1xR1dQDtQgCvG2 F7K19WGpleeEgwkqGc57V9ddGomab7n+aC4yWbUQlUI9sJ1WN/QimWhLs5Q5DBMdMes28+ 9cjXJR6NskrflNrWyU7+XtTrZ+ACFTqCu6v/vC2IsGu4hUWjd9nyLSNK6P76Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681314671; 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=FyqugnsYpT8CDc534NQrs+mNtqFejZPJy1hCuczw4sQ=; b=OWxWKIoVuI0hYwE0xANOp9SPzgKFv0qAEF+/butsfiF2Xd/myvAq+7m+Omkeq96ZmFAcyS XXNQhxtEqQl+6Oyw5YfUkU/QcTEKI15dkBIQGusZLRsNbIo3YS+ctehKTMM8BK1yJu+jrX YfRawAcbsWhPSr2xSKcEUWCUlZlsWa8+75EpI/1esLMlh3ZLuyteMPVVoOMd20y7DUO6G+ XIThAntjM1F1iJrZB/ZzXsVZ4pgO+hFA9IWc23mWUnsnbOPs5ORLLMox5B7mvG5ARXA4XB njPdyFSpJr3fbMbjJjwgWPr6OJriB6TRgKuXRjHpiUOWxwzQv3faxIED9ycmeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681314671; a=rsa-sha256; cv=none; b=czbcqM91PpBZ6I5aJPSQQDMWaxNRnx5opsEPkq0xee2K0/9mumRj0ZeSUHm6zyj/SXa4lo K+8g45pJuAFbUZxPNLRvG+AiNpbCuhFC1ZPNLNuNYfhg0N871hIjljUUbmM3CMS0z7Plge kIlMbSKcGBP09ToKE2UoNHljjSjw/iC6/BWHK58vllxD5FCgR+Mri1Ao9AeRZUCkI2c6Ef RxyjD5/uN0mPVqXb/62yCQ0A8iEJu6AaCU6HprId2tyRsPN4S5rZN4FFEQGLCHMTmOHyQi mASdJ2z2UxuOdrJh5lF/GPH1bASbKg3H+r3cJIeUahami1o/6uAUryy1c7g7WA== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxRyR2fMTzGCG; Wed, 12 Apr 2023 15:51:11 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> Date: Wed, 12 Apr 2023 11:51:09 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <20230410165406.51bcd958@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------F6b58eChnPzc4i58XNxHkcMh" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------F6b58eChnPzc4i58XNxHkcMh Content-Type: multipart/mixed; boundary="------------L02mS322XAIWslMIGZMSsF9Z"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> In-Reply-To: <20230410165406.51bcd958@cschubert.com> --------------L02mS322XAIWslMIGZMSsF9Z Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IEkgaGF2ZSBhICJzYW5kaGJveCIgcG9vbCwgY2FsbGVk IHQsIHVzZWQgZm9yIC91c3Ivb2JqIGFuZCBwb3J0cyB3cmtkaXJzLCBhbmQgb3RoZXIgd3Jp dGVzIEkgY2FuIGVhc2lseSByZWNyZWF0ZSBvbiBteSBsYXB0b3AuIEhlcmUgYXJlIHRoZSBy ZXN1bHRzIG9mIG15IHRlc3RzLg0KPiANCj4gTWV0aG9kOg0KPiANCj4gSW5pdGlhbGx5IEkg Y29waWVkIG15IC91c3Ivb2JqIGZyb20gbXkgdHdvIGJ1aWxkIG1hY2hpbmVzIChvbmUgYW1k NjQuYW1kNjQgYW5kIGFuIGkzODYuaTM4NikgdG8gbXkgInNhbmRib3giIHpwb29sLg0KPiAN Cj4gTmV4dCwgd2l0aCBibG9ja19jbG9uaW5nIGRpc2FibGVkIEkgZGlkIGNwIC1SIG9mIHRo ZSAvdXNyL29iaiB0ZXN0IGZpbGVzLiBUaGVuIGEgZGlmZiAtcXIuIFRoZXkgc291cmNlIGFu ZCB0YXJnZXQgZGlyZWN0b3JpZXMgd2VyZSB0aGUgc2FtZS4NCj4gDQo+IE5leHQsIEkgY2xl YW5lZCB1cCAocm0gLXJmKSB0aGUgdGFyZ2V0IGRpcmVjdG9yeSB0byBwcmVwYXJlIGZvciB0 aGUNCj4gYmxvY2tfY2xvbmUgZW5hYmxlZCB0ZXN0Lg0KPiANCj4gTmV4dCwgSSBkaWQgenBv b2wgY2hlY2twb2ludCB0LiBBZnRlciB0aGlzLCB6cG9vbCB1cGdyYWRlIHQuIFBvb2wgdCBu b3cgaGFzIGJsb2NrX2Nsb25pbmcgZW5hYmxlZC4NCj4gDQo+IEkgcmVwZWF0ZWQgdGhlIGNw IC1SIHRlc3QgZnJvbSBhYm92ZSBmb2xsb3dlZCBieSBhIGRpZmYgLXFyLiBBbG1vc3QNCj4g ZXZlcnkgZmlsZSB3YXMgZGlmZmVyZW50LiBUaGUgcG9vbCB3YXMgY29ycnVwdGVkLg0KPiAN Cj4gSSByZXN0b3JlZCB0aGUgcG9vbCBieSB0aGUgZm9sbG93aW5nIHJlbW92aW5nIHRoZSBj b3JydXB0aW9uOg0KPiANCj4gDQo+IHNsaXBweSMgenBvb2wgZXhwb3J0IHQNCj4gc2xpcHB5 IyB6cG9vbCBpbXBvcnQgLS1yZXdpbmQtdG8tY2hlY2twb2ludCB0DQo+IHNsaXBweSMNCj4g DQo+IEl0IGlzIHJlY29tbWVuZGVkIHRoYXQgcGVvcGxlIGF2b2lkIHVwZ3JhZGluZyB0aGVp ciB6cG9vbHMgdW50aWwgdGhlDQo+IHByb2JsZW0gaXMgZml4ZWQuDQo+IA0KQXMgb2YgYWY3 NjI0ZWQzMTQ1LCBJIGp1c3QgZGlkIHRoaXMgd2l0aCBhbiBtZCg0KS1iYWNrZWQgdGVzdCBw b29sLCANCnRob3VnaCB3aXRoIHRoZSBzZWNvbmQgYGNwIC1SYCBsYW5kaW5nIGluIGEgc2Vw YXJhdGUgZGF0YXNldCwgY3JlYXRlZCANCmFuZCBkZXN0cm95ZWQgZm9yIGVhY2ggdGVzdC4g Tm8gY29ycnVwdGlvbiBlaXRoZXIgd2F5LiBIb3dldmVyLCBteSANCnBvdWRyaWVyZSBidWls ZHMgc3RpbGwgb3V0cHV0L3BhY2thZ2UgY29ycnVwdGVkIGZpbGVzIChwYXJ0aWN1bGFybHkg DQp0aG9zZSB3aXRoIG51bGwgY2hhcmFjdGVycyksIHByb2JhYmx5IGFmdGVyIGluc3RhbGwo MSkgaW52b2NhdGlvbnMgKG5vdCANCmNwKDEpKS4NCg0KLS0gDQpDaGFybGllIExpDQrigKZu b3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------L02mS322XAIWslMIGZMSsF9Z-- --------------F6b58eChnPzc4i58XNxHkcMh Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ2020FAwAAAAAACgkQ/reFK+KbPoec uBAAi2Kazau2gJ7ylMtwrRQ1rHvLuDWewXwAgLjhagb6beoIVRTsLe8VxJ2QjU8JeM38KJ3BDiH6 DF7tVkO7ndNmx+2j32A6BEa79+oOCHnaeg1SXbrsL3NfLynTSKlHOYsNXXujgUukjC6oLpoAozzA RrhUImfBDD+lanh+/rFOdXmtpk4148Xt0qChS2j7VmcSivDJspd0KcnFsa4HB9ZFwxn+kVdEWr8Q gxkpfKLko37rWrLktwdwcuBAGtc9jqViElybXVJW0hgcd4WrBD6B0n367hDw6rfp7OnxYmw3TigC /puLqyTPt0Zyl9sm36Tg5o2x0XGplpscJAin4f4L4iNWUNBz3aN5srBbdPCdwWmxLyXm7arpX6Gi oDTMmB2l7yGABz23d0kQ6jxg055lXbt2d8vGxEowBZ5+YWHNCQ1qa5QFjubZ7yuWgulj1h6glh1s 5Vm9zrd3RSjJnl4DiXS8ih5/Th/WoWXoNTpOZnrFXJJmOkrAeOZLRMKLrytaBUR8f3mrmziVtVZ7 Co0sX72uJTvA/8c7QOhniMh3E7nMPj66jKX7F7aQby9pndVLb191cjWUEyuRp1hRr+HRbbLIO4S9 2f6Z6JuS8r9x41J1gwKsLXJNRpk3KgCTIJsz9XMm+g0R/tjvZbLwikYewq8k7rRll4BI3cWWr3YT Cug= =fNBw -----END PGP SIGNATURE----- --------------F6b58eChnPzc4i58XNxHkcMh-- From nobody Wed Apr 12 16:07:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxSK94QQ5z451Q3; Wed, 12 Apr 2023 16:07: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 4PxSK940xYz3J0d; Wed, 12 Apr 2023 16:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681315645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxC6GtDNbtxswqoGpDJn/Wo6G/0Dx2sSrOoaVwNmATo=; b=HrYKp4h3ZKYqdejGIrWA3DgBjZv5Bx22SXNXQJ8HyrL4UZNHzNyubEVP+MRUxug9iHFCHp bRLZl1fvZ14GKNYuvptVRskUPBGCSkUy5pXZt6tkBj+Y/wkOBcJv6dfvATEbc8PF+JV5xw l2U5Iqe+hdeEO4dG6GfmyeWjN9zTh+baA3C4xAJCWHZQ8pseV9daXyOQcA3udSvicE8YVE Wu6Ke3vTWgEcPGZ3P8nQx5fVHJ4llUKGdAAYxZ1fRQ/Hbqhp6KsZHXRheg/y0mk5dwM42k uzPKERacUJ9PSQa5o5eRFw8Oeakq/I5KYpBrWzi7f6bgClFgwnRZezRXz6t8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681315645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxC6GtDNbtxswqoGpDJn/Wo6G/0Dx2sSrOoaVwNmATo=; b=xskNvYDEMRYCLaGX8Tz/A1Z5QMqkS7zW4gTfBlsz6BIqL+MrB3FvYAfxpgjzDaOLBatyZH N9C0oI5jONL3Hm/6lhJyb4XY0FQZn9WkT6VpcxwePNm6dJeybWDAxzx8HXsTkvnSj6CXJf ah3GeD/PpSEotFVIEXSaXisfDp0//0fc/g5Ac1mEA2VWw9l39ndnMMQ394yxPqBuqpVmiI GZg8wSoMsQRy4pmxHOPp5S1U4O4uOugrPhno/Qpop3p6m1rHBeGADFtToCrL6FBH3//c/G cp1v7yt0Mtf8Hczh9nlvkCX637zyRZEBJLr+BwlqfpUZhKmYg41BJNE25/yF7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681315645; a=rsa-sha256; cv=none; b=QtxP945+N4XnOMYBXcpYu0z/PY70NFugbRJH1NernI7tTbmcgt6zAhSgIWTR4VLYrdHHpa uB7WiowKBsuCiwUlSNtPocAXhv8b5Yxkmt18dPmzk0hs62tDrUoYh8z+F1yvOeu3BQwD2O c0w8bft0HCn58KxgQiX11K4B5kpL/inBO0UQN40CKd8P2m0JZTNh4yV1o15nvAMnSkERC0 GHl7+x0icw2w9pll63VjKouplAU4iERQMiedJCYm6NMB1P7M7rCtZ4cwro4TJY2t29xUF7 xuor2eJ6u83KOcANE4sHp6JS6YuTBTpvzhx5uRrLxYOzYXM4yYe4dLXzOFKYLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxSK936dlz15ld; Wed, 12 Apr 2023 16:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CG7Pn6051334; Wed, 12 Apr 2023 16:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CG7PwK051333; Wed, 12 Apr 2023 16:07:25 GMT (envelope-from git) Date: Wed, 12 Apr 2023 16:07:25 GMT Message-Id: <202304121607.33CG7PwK051333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c687f21add77 - main - tcp: make net.inet.tcp.functions_default vnet specific Reviewed by: cc, rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39516 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c687f21add77f48cca6a961670ee6ef6697aea47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c687f21add77f48cca6a961670ee6ef6697aea47 commit c687f21add77f48cca6a961670ee6ef6697aea47 Author: Michael Tuexen AuthorDate: 2023-04-12 16:04:27 +0000 Commit: Michael Tuexen CommitDate: 2023-04-12 16:04:27 +0000 tcp: make net.inet.tcp.functions_default vnet specific Reviewed by: cc, rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39516 --- sys/netinet/tcp_subr.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index be78396260c7..6cf1f69cee69 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -393,7 +393,8 @@ static struct tcp_function_block tcp_def_funcblk = { static int tcp_fb_cnt = 0; struct tcp_funchead t_functions; -static struct tcp_function_block *tcp_func_set_ptr = &tcp_def_funcblk; +VNET_DEFINE_STATIC(struct tcp_function_block *, tcp_func_set_ptr) = &tcp_def_funcblk; +#define V_tcp_func_set_ptr VNET(tcp_func_set_ptr) void tcp_record_dsack(struct tcpcb *tp, tcp_seq start, tcp_seq end, int tlp) @@ -515,7 +516,7 @@ find_and_ref_tcp_default_fb(void) struct tcp_function_block *rblk; rw_rlock(&tcp_function_lock); - rblk = tcp_func_set_ptr; + rblk = V_tcp_func_set_ptr; refcount_acquire(&rblk->tfb_refcnt); rw_runlock(&tcp_function_lock); return (rblk); @@ -682,7 +683,7 @@ sysctl_net_inet_default_tcp_functions(SYSCTL_HANDLER_ARGS) memset(&fs, 0, sizeof(fs)); rw_rlock(&tcp_function_lock); - blk = find_tcp_fb_locked(tcp_func_set_ptr, NULL); + blk = find_tcp_fb_locked(V_tcp_func_set_ptr, NULL); if (blk) { /* Found him */ strcpy(fs.function_set_name, blk->tfb_tcp_block_name); @@ -703,14 +704,14 @@ sysctl_net_inet_default_tcp_functions(SYSCTL_HANDLER_ARGS) error = ENOENT; goto done; } - tcp_func_set_ptr = blk; + V_tcp_func_set_ptr = blk; done: rw_wunlock(&tcp_function_lock); return (error); } SYSCTL_PROC(_net_inet_tcp, OID_AUTO, functions_default, - CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + CTLFLAG_VNET | CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_NEEDGIANT, NULL, 0, sysctl_net_inet_default_tcp_functions, "A", "Set/get the default TCP functions"); @@ -747,7 +748,7 @@ sysctl_net_inet_list_available(SYSCTL_HANDLER_ARGS) alias = (f->tf_name != f->tf_fb->tfb_tcp_block_name); linesz = snprintf(cp, bufsz, "%-32s%c %-32s %u\n", f->tf_fb->tfb_tcp_block_name, - (f->tf_fb == tcp_func_set_ptr) ? '*' : ' ', + (f->tf_fb == V_tcp_func_set_ptr) ? '*' : ' ', alias ? f->tf_name : "-", f->tf_fb->tfb_refcnt); if (linesz >= bufsz) { @@ -766,7 +767,7 @@ sysctl_net_inet_list_available(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_tcp, OID_AUTO, functions_available, - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLFLAG_VNET | CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, NULL, 0, sysctl_net_inet_list_available, "A", "list available TCP Function sets"); @@ -1337,17 +1338,26 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, bool force) { struct tcp_function *f; + VNET_ITERATOR_DECL(vnet_iter); if (blk == &tcp_def_funcblk) { /* You can't un-register the default */ return (EPERM); } rw_wlock(&tcp_function_lock); - if (blk == tcp_func_set_ptr) { - /* You can't free the current default */ - rw_wunlock(&tcp_function_lock); - return (EBUSY); + VNET_LIST_RLOCK_NOSLEEP(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + if (blk == V_tcp_func_set_ptr) { + /* You can't free the current default in some vnet. */ + CURVNET_RESTORE(); + VNET_LIST_RUNLOCK_NOSLEEP(); + rw_wunlock(&tcp_function_lock); + return (EBUSY); + } + CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK_NOSLEEP(); /* Mark the block so no more stacks can use it. */ blk->tfb_flags |= TCP_FUNC_BEING_REMOVED; /* @@ -2206,7 +2216,7 @@ tcp_newtcpcb(struct inpcb *inp) tp->t_ccv.type = IPPROTO_TCP; tp->t_ccv.ccvc.tcp = tp; rw_rlock(&tcp_function_lock); - tp->t_fb = tcp_func_set_ptr; + tp->t_fb = V_tcp_func_set_ptr; refcount_acquire(&tp->t_fb->tfb_refcnt); rw_runlock(&tcp_function_lock); /* From nobody Wed Apr 12 16:10:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxSP363Ldz451nk; Wed, 12 Apr 2023 16:10: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 4PxSP32ytvz3Mp6; Wed, 12 Apr 2023 16:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681315847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voG5oDqKu14X43Rh6Js/QcmzAHuv7Va4/6ryyuLbUkc=; b=MWx6R79yzLJn96Gh1wYs0T6M3wRhXC/f7ezgCJQiay9rZvUmKYtw/4Qxel4KSAzxehGpiq N9VL7b+2K/5b5fjT0Mh9BPGkCRQzeq64HEKKFaS8Gbh/L1hTxa1LvG9Lt+oZJR/UEVSy34 4UJEbojGREe1+aHZRf8f9NhK8WldOfNo/jCFH4wZPB6PDaUjUWPjBlHtQwxl52CRHy/ozj tcU110wClRKpMuv3YOZz6SowePQUCF9Y7dtSmD1//fO0EhFbWCt0suDsCCMlLxAtvQp05N 58oWjEIN8T8w+Y49M+KDNhX9UAfjmx6IBVUl+XTNXDK36w7yjcuUoXB7a/U/yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681315847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voG5oDqKu14X43Rh6Js/QcmzAHuv7Va4/6ryyuLbUkc=; b=oF0JVWjEHcCnrz/pUqyCBvhBZxagbc4Su/eBVOuqIYGlRb+XYnfKeOHcKiARh4/iOPox5G XTyFhejGZJxS6Fv+h5dTrFD/PpCvjzxzuRdAJvPJPOqTfme4rSDwfITM5soJsqg37Md4AC 6q5bjRtDls0CxuAW9uulz+tNzFxMENzHumGhVtyzAJvlV4XmvJdMLLZJJS+gIQq+XhEhdO K/7VigjSGYzlb8f66x5Ybo0ASbZKnrhDu6pRrydtPtAEUqXCnRXZk7sZoJ/Zt9xZzCZKC6 6eg4VJI/S93KgITGmfYPtAWMgbilHnx58M0JpB9UytwqE12upqbFTTmLGGd9aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681315847; a=rsa-sha256; cv=none; b=RwiueGLwg7rdJ7rZrE/vISNUGRDj5+BgYZ8Wptayo0RkLyVSr5nZ2RQZdhixh28Sf0nTzH IQddXeWcykCyhcHzeGuTGEmQShzDQVeOAz9xgFO6ysiwUpcIEUQ+5lrtVqBc2cx0g9axKo HHxnrjCWBke7h0iSuADSGDXINr8oDdwbgK1jn80g5OsNxlUSAgXjkQcvf3OXiNA0YRXGQ2 mEmFxlrfYSB/tK8/uPLHmANHslKZviEitpkAnjLRD2v6SDi5M4JRsEfzRz+OHs6QTpijWP 0ODCP8b4PejXuthnWrOUdxTAkfSBpmr5DG1j5bPjvW8mkpmd/W47UvkpQuM9Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxSP324KDz15qS; Wed, 12 Apr 2023 16:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CGAlVF060265; Wed, 12 Apr 2023 16:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CGAlkW060264; Wed, 12 Apr 2023 16:10:47 GMT (envelope-from git) Date: Wed, 12 Apr 2023 16:10:47 GMT Message-Id: <202304121610.33CGAlkW060264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2ba2849c8275 - main - tcp: fix typo in comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ba2849c8275d4aeb2e4ca04aafaf89f1962910b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba2849c8275d4aeb2e4ca04aafaf89f1962910b commit 2ba2849c8275d4aeb2e4ca04aafaf89f1962910b Author: Michael Tuexen AuthorDate: 2023-04-12 16:08:21 +0000 Commit: Michael Tuexen CommitDate: 2023-04-12 16:08:21 +0000 tcp: fix typo in comment Reported by: cc MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 6cf1f69cee69..f7b3fcea125e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1330,7 +1330,7 @@ register_tcp_functions(struct tcp_function_block *blk, int wait) * When called with a force argument, attempt to switch all TCBs to * use the default stack instead of returning EBUSY. * - * Returns 0 on success (or if the removal would succeed, or an error + * Returns 0 on success (or if the removal would succeed), or an error * code on failure. */ int From nobody Wed Apr 12 16:27:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxSnW1072z453Vr; Wed, 12 Apr 2023 16:28:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.31]) (using TLSv1.3 with cipher TLS_AES_256_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 4PxSnV0zFkz43f9; Wed, 12 Apr 2023 16:28:29 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id DE17B10A32CE; Wed, 12 Apr 2023 18:28:25 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id A4B9510A1E83; Wed, 12 Apr 2023 18:28:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1681316901; 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=s6dbn25biUkXhWZ6eDSE9vLUQRnJTvK2K3njZ1XueBM=; b=qoN4IBBSLchgEQ63gqXQ5TLfb2TaqYHwZVsHzisaDrzJq1BdX8XgBmen21tPFaRFPiRfYp GLQ2ekI/lOvjoYycKjL/NQnw2zSbtn1d6hhUy6Whgh/RSpTsBB08GItyf6VPJHjqzJ0/0r RePgtPO0aI+NsFlXOSXXnAmPXSaxUQzkcBJM9clrw2j1yjn/wYAQS1P11zO05xgNCnVTl4 hsiNnd4Iy7rDFoq1Bc/ssET0vIaPvCTzTccv7uv142WQIJV2JQi8S/wRjzyNK5vml/I9AL sGxINhZEgRTrRxQaESAnL/vCVm0YwR4ufYUbYTOBaia8R2y+tVF2fNOS0MGYzw== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-183-141-152.77.183.pool.telefonica.de [77.183.141.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 1C8C010A32F4; Wed, 12 Apr 2023 18:28:21 +0200 (CEST) Date: Wed, 12 Apr 2023 18:27:46 +0200 From: FreeBSD User To: Charlie Li Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230412182813.63180c6a@thor.intern.walstatt.dynvpn.de> In-Reply-To: <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/w.usAa90GXCQmikF=8jfs4L"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: caa3b5 X-Rspamd-UID: c46c0c X-Rspamd-Queue-Id: 4PxSnV0zFkz43f9 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Sig_/w.usAa90GXCQmikF=8jfs4L Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Wed, 12 Apr 2023 11:51:09 -0400 Charlie Li schrieb: > Cy Schubert wrote: > > I have a "sandhbox" pool, called t, used for /usr/obj and ports wrkdirs= , and other writes > > I can easily recreate on my laptop. Here are the results of my tests. > >=20 > > Method: > >=20 > > Initially I copied my /usr/obj from my two build machines (one amd64.am= d64 and an > > i386.i386) to my "sandbox" zpool. > >=20 > > Next, with block_cloning disabled I did cp -R of the /usr/obj test file= s. Then a diff -qr. > > They source and target directories were the same. > >=20 > > Next, I cleaned up (rm -rf) the target directory to prepare for the > > block_clone enabled test. > >=20 > > Next, I did zpool checkpoint t. After this, zpool upgrade t. Pool t now= has block_cloning > > enabled. > >=20 > > I repeated the cp -R test from above followed by a diff -qr. Almost > > every file was different. The pool was corrupted. > >=20 > > I restored the pool by the following removing the corruption: > >=20 > >=20 > > slippy# zpool export t > > slippy# zpool import --rewind-to-checkpoint t > > slippy# > >=20 > > It is recommended that people avoid upgrading their zpools until the > > problem is fixed. > > =20 > As of af7624ed3145, I just did this with an md(4)-backed test pool,=20 > though with the second `cp -R` landing in a separate dataset, created=20 > and destroyed for each test. No corruption either way. However, my=20 > poudriere builds still output/package corrupted files (particularly=20 > those with null characters), probably after install(1) invocations (not=20 > cp(1)). >=20 I still have corrupt files on the /usr/ports tree (located on ZFS, with fea= ture@block_cloning active): [...] Installing man pages and online manual mkdir /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24 cd /usr/ports/www/apache24/work/httpd-2.4.57/docs/manual && cp -rp * /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24 install -m= 0644 /usr/ports/www/apache24/files/no-accf.conf /usr/ports/www/apache24/work/stage/usr/local/etc/apache24/Includes/ install= -m 0644 /usr/ports/www/apache24/files/README_modules.d /usr/ports/www/apache24/work/stage/usr/local/etc/apache24/modules.d/ /usr/b= in/strip /usr/ports/www/apache24/work/stage/usr/local/libexec/apache24/mod_*.so /bin= /rm -f /usr/ports/www/apache24/work/stage/usr/local/share/apache24/build/ecp.?????= ??? 2>/dev/null install -m 555 /usr/ports/www/apache24/work/httpd-2.4.57/support/check_for= ensic /usr/ports/www/apache24/work/stage/usr/local/sbin =3D=3D=3D=3D> Compressing= man pages (compress-man) =3D=3D=3D> Staging rc.d startup script(s) =3D=3D=3D> Installing for apache= 24-2.4.57 =3D=3D=3D> Registering installation for apache24-2.4.57 pkg-static: pkg_checksum_hash_sha256_file(= read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): = Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error = pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error www/apache24 is now ALWAYS droping this corruption, even after scrubbing th= e pool. This one is the same in my case: [...] cd /usr/ports/devel/ruby-gems/work/stage/usr/local/ && /usr/bin/find -ds lib/ruby/gems/3.1/doc/ ! -type d >> /usr/ports/devel/ruby-gems/work/.PLIST.= mktmp =3D=3D=3D=3D> Compressing man pages (compress-man) =3D=3D=3D>>> Starting check for runtim= e dependencies =3D=3D=3D>>> Gathering dependency list for devel/ruby-gems from ports =3D=3D=3D>>> Dependency check complete for devel/ruby-gems =3D=3D=3D>>> All >> rubygem-addressable-2.8.1 >> devel/ruby-gems (3/27) =3D=3D=3D> Installing for ruby31-gems-3.4.10 =3D=3D=3D> Registering installation for ruby31-gems-3.4.10 as automatic pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error *** Error code 1 Stop. make[1]: stopped in /usr/ports/devel/ruby-gems Pool is then marked corrupt (was scrubbed after the last corruption): [...] pool: POOL00 state: ONLINE status: One or more devices has experienced an error resulting in data corruption. Applications may be affected. action: Restore the file in question if possible. Otherwise restore the entire pool from backup. see: https://openzfs.github.io/openzfs-docs/msg/ZFS-8000-8A scan: scrub in progress since Wed Apr 12 18:07:02 2023 1.45T scanned at 2.01G/s, 139G issued at 193M/s, 13.2T total 0B repaired, 1.02% done, 19:49:53 to go config: NAME STATE READ WRITE CKSUM POOL00 ONLINE 0 0 0 raidz1-0 ONLINE 0 0 0 gpt/pool00 ONLINE 0 0 0 gpt/pool01 ONLINE 0 0 0 gpt/pool02 ONLINE 0 0 0 gpt/pool03 ONLINE 0 0 0 errors: 22 data errors, use '-v' for a list [...] errors: Permanent errors have been detected in the following files: /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/= 3.1/rubygems/optparse/lib/optionparser.rb /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/= 3.1/rubygems/optparse.rb /usr/ports/www/apache24/work/stage/usr/local/www/apache24/icons/sma= ll/blank.gif /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/= 3.1/rubygems/resolver/molinillo.rb /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/ima= ges/left.gif /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/ima= ges/right.gif /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/ima= ges/down.gif /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/ima= ges/pixel.gif /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/= 3.1/rubygems/tsort.rb /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/ima= ges/up.gif --=20 O. Hartmann --Sig_/w.usAa90GXCQmikF=8jfs4L Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCZDbcHQAKCRCxzvs8Oqok rzgJAQCeJ5RPOot/JL7dkZbcErVOnFXtHHnPQJju+ASYCiZHbAEAiXGs7hYK942f +5OlJ+YnxizbV2VhPZYJFg4wWPGl8gc= =6R+z -----END PGP SIGNATURE----- --Sig_/w.usAa90GXCQmikF=8jfs4L-- From nobody Wed Apr 12 16:46:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTBk2Plxz454x7; Wed, 12 Apr 2023 16:46:54 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) (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 4PxTBj0dccz4bGq; Wed, 12 Apr 2023 16:46:53 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-1878504c22aso900546fac.8; Wed, 12 Apr 2023 09:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681318011; x=1683910011; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=FKf9Hu86nSUGRR2PN/wKn2affB4Cg3DkgBIWutvPxgA=; b=cn7zyWLieEPty29SJdfekA6DGMDACGDH8phT9X7Z7t3hHFFfgkdMuu+5owsUZKQsGC p2CYOO6lpdr9EV5894U8i+lZLXCxi3+ge5it+SHbnVPBU2vWO9HsTBFpuu6N1edrZYSz sMWjk2CX+LC4iMGYJ4f5KmQ9tijbgmYyTpLvnKQWlSSjWSI3ISK6Eu6J+CYfjCGVRXdy HAwgDgqsGtR+auQ6L31xA6QM/sbR3W3/FTi9deQu/LScYcDKPv/h8njwm+IgR1leDsO+ DBoRAgQf53pKBA/w3sQmhz/sgIGpBkjaR1BlcJAmt1NtyEX0seqZJB9N523OsHomvBv6 S1kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681318011; x=1683910011; 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=FKf9Hu86nSUGRR2PN/wKn2affB4Cg3DkgBIWutvPxgA=; b=JFQjqs0mhPT36ecz0l5UEqJrOrY8K+Z/hwjLcDCDrmaegydweEMVJMtjucNeRgImQg eZHOdNOJ9o3cLq78sv9dHQM9pXRIlzrLMYWYscMqDWw+Y6LalR3yjsIyR9iEBzxlajjf ODLo0wXfhd5pTuRWN79Y6dljidqs4G3aEgaVoHmaRPFVxWeV/uTmgB4Sisqgyv65Anro S+Df5BPx+R2phXP6Umr5YxFtbpZhJUCb8azVFVT2AO1Qq/ASpfht7L+fn2LmNgsi1H0w K3YC0uk9fbjJIq8AAm65SZyJoFJeNYA44KKJAdN91rPUKKd/R4eOOCKFauUfykUTCZzX EZlA== X-Gm-Message-State: AAQBX9fSeebUkiinsDcRaYPVJ6fYg4QXtdyYVMQQCpPFoCqJmtEsScL9 H3Vffl9PdtSNl7KjgKRccm1biD6zQY/8W+Y6d84= X-Google-Smtp-Source: AKy350Ye+Tv+cDLyrfWiHsQH78wpZFTzm0YBwfPhFS7R077bc7PU1LVLhOieJZEvsDIe5CybjXu9fiQ1Uu0O4J/7mEU= X-Received: by 2002:a05:6870:11:b0:183:fc80:7361 with SMTP id a17-20020a056870001100b00183fc807361mr1347581oaa.4.1681318011668; Wed, 12 Apr 2023 09:46:51 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:28c:0:b0:49c:b071:b1e3 with HTTP; Wed, 12 Apr 2023 09:46:50 -0700 (PDT) In-Reply-To: <20230412182813.63180c6a@thor.intern.walstatt.dynvpn.de> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <20230412182813.63180c6a@thor.intern.walstatt.dynvpn.de> From: Mateusz Guzik Date: Wed, 12 Apr 2023 18:46:50 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: FreeBSD User Cc: Charlie Li , Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PxTBj0dccz4bGq X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/12/23, FreeBSD User wrote: > Am Wed, 12 Apr 2023 11:51:09 -0400 > Charlie Li schrieb: > >> Cy Schubert wrote: >> > I have a "sandhbox" pool, called t, used for /usr/obj and ports wrkdirs, >> > and other writes >> > I can easily recreate on my laptop. Here are the results of my tests. >> > >> > Method: >> > >> > Initially I copied my /usr/obj from my two build machines (one >> > amd64.amd64 and an >> > i386.i386) to my "sandbox" zpool. >> > >> > Next, with block_cloning disabled I did cp -R of the /usr/obj test >> > files. Then a diff -qr. >> > They source and target directories were the same. >> > >> > Next, I cleaned up (rm -rf) the target directory to prepare for the >> > block_clone enabled test. >> > >> > Next, I did zpool checkpoint t. After this, zpool upgrade t. Pool t now >> > has block_cloning >> > enabled. >> > >> > I repeated the cp -R test from above followed by a diff -qr. Almost >> > every file was different. The pool was corrupted. >> > >> > I restored the pool by the following removing the corruption: >> > >> > >> > slippy# zpool export t >> > slippy# zpool import --rewind-to-checkpoint t >> > slippy# >> > >> > It is recommended that people avoid upgrading their zpools until the >> > problem is fixed. >> > >> As of af7624ed3145, I just did this with an md(4)-backed test pool, >> though with the second `cp -R` landing in a separate dataset, created >> and destroyed for each test. No corruption either way. However, my >> poudriere builds still output/package corrupted files (particularly >> those with null characters), probably after install(1) invocations (not >> cp(1)). >> > > I still have corrupt files on the /usr/ports tree (located on ZFS, with > feature@block_cloning active): > > [...] > Installing man pages and online manual > mkdir /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24 > cd /usr/ports/www/apache24/work/httpd-2.4.57/docs/manual && cp -rp * > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24 install -m > 0644 > /usr/ports/www/apache24/files/no-accf.conf > /usr/ports/www/apache24/work/stage/usr/local/etc/apache24/Includes/ install > -m 0644 > /usr/ports/www/apache24/files/README_modules.d > /usr/ports/www/apache24/work/stage/usr/local/etc/apache24/modules.d/ > /usr/bin/strip > /usr/ports/www/apache24/work/stage/usr/local/libexec/apache24/mod_*.so > /bin/rm -f > /usr/ports/www/apache24/work/stage/usr/local/share/apache24/build/ecp.???????? > 2>/dev/null > install -m 555 > /usr/ports/www/apache24/work/httpd-2.4.57/support/check_forensic > /usr/ports/www/apache24/work/stage/usr/local/sbin ====> Compressing man > pages (compress-man) > ===> Staging rc.d startup script(s) ===> Installing for apache24-2.4.57 > ===> Registering > installation for apache24-2.4.57 pkg-static: > pkg_checksum_hash_sha256_file(read failed): > Input/output error pkg-static: pkg_checksum_hash_sha256_file(read failed): > Input/output error > pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error > pkg-static: > pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: > pkg_checksum_hash_sha256_file(read failed): Input/output error pkg-static: > pkg_checksum_hash_sha256_file(read failed): Input/output error > > www/apache24 is now ALWAYS droping this corruption, even after scrubbing the > pool. > > This one is the same in my case: > > [...] > > cd /usr/ports/devel/ruby-gems/work/stage/usr/local/ && /usr/bin/find -ds > lib/ruby/gems/3.1/doc/ ! -type d >> > /usr/ports/devel/ruby-gems/work/.PLIST.mktmp ====> > Compressing man pages (compress-man) ===>>> Starting check for runtime > dependencies > ===>>> Gathering dependency list for devel/ruby-gems from ports > ===>>> Dependency check complete for devel/ruby-gems > > ===>>> All >> rubygem-addressable-2.8.1 >> devel/ruby-gems (3/27) > > ===> Installing for ruby31-gems-3.4.10 > ===> Registering installation for ruby31-gems-3.4.10 as automatic > pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error > pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error > pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error > pkg-static: pkg_checksum_hash_sha256_file(read failed): Input/output error > *** Error code 1 > > Stop. > make[1]: stopped in /usr/ports/devel/ruby-gems > > > Pool is then marked corrupt (was scrubbed after the last corruption): > > [...] > > pool: POOL00 > state: ONLINE > status: One or more devices has experienced an error resulting in data > corruption. Applications may be affected. > action: Restore the file in question if possible. Otherwise restore the > entire pool from backup. > see: https://openzfs.github.io/openzfs-docs/msg/ZFS-8000-8A > scan: scrub in progress since Wed Apr 12 18:07:02 2023 > 1.45T scanned at 2.01G/s, 139G issued at 193M/s, 13.2T total > 0B repaired, 1.02% done, 19:49:53 to go > config: > > NAME STATE READ WRITE CKSUM > POOL00 ONLINE 0 0 0 > raidz1-0 ONLINE 0 0 0 > gpt/pool00 ONLINE 0 0 0 > gpt/pool01 ONLINE 0 0 0 > gpt/pool02 ONLINE 0 0 0 > gpt/pool03 ONLINE 0 0 0 > > errors: 22 data errors, use '-v' for a list > > [...] > > errors: Permanent errors have been detected in the following files: > > > /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/3.1/rubygems/optparse/lib/optionparser.rb > > /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/3.1/rubygems/optparse.rb > > /usr/ports/www/apache24/work/stage/usr/local/www/apache24/icons/small/blank.gif > > /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/3.1/rubygems/resolver/molinillo.rb > > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/images/left.gif > > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/images/right.gif > > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/images/down.gif > > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/images/pixel.gif > > /usr/ports/devel/ruby-gems/work/stage/usr/local/lib/ruby/site_ruby/3.1/rubygems/tsort.rb > > /usr/ports/www/apache24/work/stage/usr/local/share/doc/apache24/images/up.gif > > > -- > O. Hartmann > https://github.com/openzfs/zfs/pull/14739/files here is a fix you can apply on top of sys/contrib/openzfs, i have no idea how much it can do though -- Mateusz Guzik From nobody Wed Apr 12 16:49:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTFh6Trqz454yv; Wed, 12 Apr 2023 16: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 4PxTFh5rmJz3C4L; Wed, 12 Apr 2023 16: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=1681318168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Y6e/gyMuYGJzaNpVChy49n6XQpKtjNgKY8X9Vi4da4=; b=twSEdCfL/AMPHvOBtLbgrWg7KJmVM5BVOSMipgNPEIGb+Q0r9iu2dzYIEFSeLWC5oke4hT j+vgHFuekYe1nbir87yEj/bBxudbQxdt3DHj6pY3RfjSufKqYsPoWJ/Ok2U2SE2yE6BcHv GzQaOmQNm8RhGFtJpRyzDoZhOGOpi8bX0iJrBei8kT/gBIe/mzQxk3HwfzuEfpq6EEwW7e 31+KYcrQEoJXhBdclLHUTWH6fZAfvFYXiqGA6BewHKwcQjcPbzFyfDJ1YSC55e4M+kjpw9 g4yuMNv4eqy75SeB/6Xer6vtiEqCai8UZGK+Qdg18fr+WsfoNlRgPhgqyP+PLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681318168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Y6e/gyMuYGJzaNpVChy49n6XQpKtjNgKY8X9Vi4da4=; b=gf0h+cYkDCXkuQX6a4U3geALKDZaA7VM5mb/djN3/Y1IuP6YC+uHX62/IOrLZ9mIJDsjkj 3gMtX1wLSZc7FxE5lSrXqmryn/HxTuMoAapO5dF/rq3Zgx4j9rHG0z8LAdxwxJ6n5ehLHr iAn/5wg+JuzPciOsVRdFZdEa3zF9pDVQo0zbbpYT8dz/6praryBzAMfx/bmFU4GGzkrfUA 1DS1xQcEPsiCo4Xil4esh81kcLx2rDEPOszWYcGm2LIpi2qw2iADC7kUgtDovmnIgNTqNA L+oh+pJW2AMmUomRlbaEqc+oGpPvY1QXVyeyRvWPJbm5fjC2bYoWZ536UZo+Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681318168; a=rsa-sha256; cv=none; b=KJ3+AW6WQsXi+fJ7xzTtJ3MN3r0dl3d34wXhGbq4QYZ2vW9kZZu9rpcdLa1DAe4IBvitpf 2dtj8vKFwAfzEy4soLptv6/GUGuzN5QXkwkRXuYMx1VxrSzU1Zm7OvPFUiEd/Jde6Fcyvv cDvbdWvHILG0NEe8toOKS5pjiPvnmJTPp624TF5WZICuRmMO+P79kjwAxZQGSy/Nvdr7xx 7BbR52bNE3a0N15Bqset8m3/o3A1jFpRNWE4jrnXpfnAr6zz0If/4Uop++kH9y3BtcgCWQ RaV0YdXxKZCD+qAnKT9OfjdeGz0dbAqwkpnmMJhjySTxBzr0BpMi2fv1ldnhHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxTFh4mVPz16nY; Wed, 12 Apr 2023 16:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CGnSVH016773; Wed, 12 Apr 2023 16:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CGnS5g016772; Wed, 12 Apr 2023 16:49:28 GMT (envelope-from git) Date: Wed, 12 Apr 2023 16:49:28 GMT Message-Id: <202304121649.33CGnS5g016772@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: 87443cb6c669 - main - rtld: reindent and style(9) elf_hash() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87443cb6c669b51ceaa7f85db63191374477efc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87443cb6c669b51ceaa7f85db63191374477efc1 commit 87443cb6c669b51ceaa7f85db63191374477efc1 Author: Ed Maste AuthorDate: 2023-04-12 15:06:14 +0000 Commit: Ed Maste CommitDate: 2023-04-12 16:43:36 +0000 rtld: reindent and style(9) elf_hash() In preparation for an upcoming change (D39517). Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 7e4df3392ec7..382b05191a81 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1802,17 +1802,17 @@ donelist_check(DoneList *dlp, const Obj_Entry *obj) unsigned long elf_hash(const char *name) { - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; - - while (*p != '\0') { - h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; - } - return (h); + const unsigned char *p = (const unsigned char *)name; + unsigned long h = 0; + unsigned long g; + + while (*p != '\0') { + h = (h << 4) + *p++; + if ((g = h & 0xf0000000) != 0) + h ^= g >> 24; + h &= ~g; + } + return (h); } /* From nobody Wed Apr 12 16:49:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTFk1Sxxz4553m; Wed, 12 Apr 2023 16:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxTFj5zL5z4lQc; Wed, 12 Apr 2023 16:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681318169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqTbcz85ZjnsfJlsu6M/qdPJHiN72hXvke53AC2cA1o=; b=E/lurkbKuuF1x6EdpWOoI0YjVb97I+jTJHWq2ntkRU8HddfavDoLPjnriO9MoHmh2RP0Kv lAkYgqMSLTLYV3AF0QK6G7ehV+rffhkStc9EDBf1w1JUNV5DtGjl6Kde2LKVk5MZUoby7v 2LwA/QbfCGN4owDiqwKtAds6cx7k8mylZtUAmMwXneyuyx1DmM3jSoSVQs4X0m4TgCi/oQ qGMMKajiW02N4fqKvUztHhxdFZyk75uCdhxyVeabRAPMiNrWXOapDVZwyO/qfhoOzSqpSw mDvzXOU7P8krT7yA5ntAcZ6kSYktq0TV/6ALIyvCn2TJYdN9tnkhtmqh3aATjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681318169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqTbcz85ZjnsfJlsu6M/qdPJHiN72hXvke53AC2cA1o=; b=umsJTTW4ymlSKWsIlxVqwwQcctg42r4chLV6vjTjVdaUE9IIrS4uB0i5W2LPgHwt7EK/0J x7W2NFJLVHj+pxvJMSpPaSqM0A14buhnD8cK5/tbmGq/FVn/2DhKf0eJvr0qUzSlOZ4Pg7 Jn7P/gRDc4YCbdCCnqhMr+emY1ow4J4ltIY6cBoTDlr2BoRGkkpsN5TXTWYgrq8wIVrd5A Gh6W6EltUkuamfdkPdO7G2oOmnfoC5YBzPVQ0tEyJHchwwhProJAUDuNLQLFXTuJVwQJdb i8dVgOCjO59hfAmZE67jOlL/YPI01LRCn0oNupFqmwRR/9A4mh5W13ipr+qGPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681318169; a=rsa-sha256; cv=none; b=pxyUdZYWETI+S5Zncf6iV1Z54HpOAkni4JWfBDt4ybQSprmJBSwL908SWZf9DqD6SKoF87 KQnoNRoEiSeElGoFwPKX8cS2+hv7n4eenBVl4TAFKs3w3jB9tOeLH3PSraSmyg2rTlS5t6 z9shGZJSNzA0aIYV9W+wTt0wHLf1xIZcXr0aVHQxtellT+zyC2UhF/phL62QjgiJw3/Zit YQHF5P00wlH+SIGzcC2ZRQS4GoKV0VH69v3dfVDXHn3sI7G/wjHV6ql/M75plrJEY+NXu5 /8E7shfbpSx4vh/puGuhBiuYZLztw2EcjqxAzleVG6XwrCXIe0wPkoIQT49FKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxTFj526pz1716; Wed, 12 Apr 2023 16:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CGnTD3016792; Wed, 12 Apr 2023 16:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CGnTlH016791; Wed, 12 Apr 2023 16:49:29 GMT (envelope-from git) Date: Wed, 12 Apr 2023 16:49:29 GMT Message-Id: <202304121649.33CGnTlH016791@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: 29e3a0651082 - main - rtld: fix SysV hash function overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29e3a06510823edbb91667d21f530d3ec778116d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=29e3a06510823edbb91667d21f530d3ec778116d commit 29e3a06510823edbb91667d21f530d3ec778116d Author: Ed Maste AuthorDate: 2023-04-12 15:07:26 +0000 Commit: Ed Maste CommitDate: 2023-04-12 16:44:34 +0000 rtld: fix SysV hash function overflow Quoting from https://maskray.me/blog/2023-04-12-elf-hash-function: The System V Application Binary Interface (generic ABI) specifies the ELF object file format. When producing an output executable or shared object needing a dynamic symbol table (.dynsym), a linker generates a .hash section with type SHT_HASH to hold a symbol hash table. A DT_HASH tag is produced to hold the address of .hash. The function is supposed to return a value no larger than 0x0fffffff. Unfortunately, there is a bug. When unsigned long consists of more than 32 bits, the return value may be larger than UINT32_MAX. For instance, elf_hash((const unsigned char *)"\xff\x0f\x0f\x0f\x0f\x0f\x12") returns 0x100000002, which is clearly unintended, as the function should behave the same way regardless of whether long represents a 32-bit integer or a 64-bit integer. Reviewed by: kib, Fangrui Song Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39517 --- libexec/rtld-elf/rtld.c | 15 ++++++--------- libexec/rtld-elf/rtld.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 382b05191a81..0d2a2b6b4c24 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1796,23 +1796,20 @@ donelist_check(DoneList *dlp, const Obj_Entry *obj) } /* - * Hash function for symbol table lookup. Don't even think about changing - * this. It is specified by the System V ABI. + * SysV hash function for symbol table lookup. It is a slightly optimized + * version of the hash specified by the System V ABI. */ -unsigned long +Elf32_Word elf_hash(const char *name) { const unsigned char *p = (const unsigned char *)name; - unsigned long h = 0; - unsigned long g; + Elf32_Word h = 0; while (*p != '\0') { h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; + h ^= (h >> 24) & 0xf0; } - return (h); + return (h & 0x0fffffff); } /* diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 807437af5ff3..2db73c767502 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -379,7 +379,7 @@ void dump_Elf_Rela(Obj_Entry *, const Elf_Rela *, u_long); */ uintptr_t rtld_round_page(uintptr_t); uintptr_t rtld_trunc_page(uintptr_t); -unsigned long elf_hash(const char *); +Elf32_Word elf_hash(const char *); const Elf_Sym *find_symdef(unsigned long, const Obj_Entry *, const Obj_Entry **, int, SymCache *, struct Struct_RtldLockState *); void lockdflt_init(void); From nobody Wed Apr 12 16:54:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTNT0m7Gz455KW; Wed, 12 Apr 2023 16:55:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxTNS4kxgz3N0w; Wed, 12 Apr 2023 16:55:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id mYJ6p7mO6jvm1mdkdp7jS6; Wed, 12 Apr 2023 16:55:19 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mdkcpfif2yAOemdkcpassm; Wed, 12 Apr 2023 16:55:19 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=6436e277 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=f_yBiDhzxxtlnRg0lPwA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (unknown [209.52.88.98]) by spqr.komquats.com (Postfix) with ESMTPSA id 75B5B2D9; Wed, 12 Apr 2023 09:55:17 -0700 (PDT) Date: Wed, 12 Apr 2023 09:54:59 -0700 From: Cy Schubert To: Charlie Li CC: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfLkdg39lZcvJHWIfF+7EX3DY3vyJHhCfI/x4hGhqKeP9Ghk1VfARpjVmwHrpr9E2XpZ26wOHMMCqLYTe4oA96ZSdHof4U1WZtgM46AXcYvZvHE+m7MpY GJCUcyeELtf1TLjSwAlSG5ac+QAwByu8jmhl1c/sR5sOBa6m+pbVxjZ09hFypnzACOw3s/t6KAvtwROMmZy2GjFVCSVjCsy1FRuhtgmyW9C5/WyCRA4N4Z9u jgVEBL/RJ7q8iNV0aRkAT1ZzkaywVgODYbKeQzbmUz8/EAQnHeq2tRIA6wzfHw+xqovJCQSkexou9THPZqvb5+NyCDxs6YiWVzpFojfGQ+vaili8gXyaF0il uyShrZ4Imj0d1SEl/ssuasyeRfyh8XP5GYZTQFXmyQ41LzKlFcg= X-Rspamd-Queue-Id: 4PxTNS4kxgz3N0w X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 12, 2023 8:51:09 AM PDT, Charlie Li wrote: >Cy Schubert wrote: >> I have a "sandhbox" pool, called t, used for /usr/obj and ports wrkdirs= , and other writes I can easily recreate on my laptop=2E Here are the resul= ts of my tests=2E >>=20 >> Method: >>=20 >> Initially I copied my /usr/obj from my two build machines (one amd64=2E= amd64 and an i386=2Ei386) to my "sandbox" zpool=2E >>=20 >> Next, with block_cloning disabled I did cp -R of the /usr/obj test file= s=2E Then a diff -qr=2E They source and target directories were the same=2E >>=20 >> Next, I cleaned up (rm -rf) the target directory to prepare for the >> block_clone enabled test=2E >>=20 >> Next, I did zpool checkpoint t=2E After this, zpool upgrade t=2E Pool t= now has block_cloning enabled=2E >>=20 >> I repeated the cp -R test from above followed by a diff -qr=2E Almost >> every file was different=2E The pool was corrupted=2E >>=20 >> I restored the pool by the following removing the corruption: >>=20 >>=20 >> slippy# zpool export t >> slippy# zpool import --rewind-to-checkpoint t >> slippy# >>=20 >> It is recommended that people avoid upgrading their zpools until the >> problem is fixed=2E >>=20 >As of af7624ed3145, I just did this with an md(4)-backed test pool, thoug= h with the second `cp -R` landing in a separate dataset, created and destro= yed for each test=2E No corruption either way=2E However, my poudriere buil= ds still output/package corrupted files (particularly those with null chara= cters), probably after install(1) invocations (not cp(1))=2E > You need to copy from/to the same dataset to reproduce the problem=2E Copy= ing from a source dataset to a different dataset will avoid block_cloning= =2E --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Wed Apr 12 17:10:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTjj1XWVz456Wd; Wed, 12 Apr 2023 17:10:17 +0000 (UTC) (envelope-from vishwin@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 4PxTjh6HJKz3ww7; Wed, 12 Apr 2023 17:10:16 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681319416; 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=lxzbi+zX844xtU6s4BgBiu4/eIR3DqoYP7cJtMoczv0=; b=E9LSHwx4AC2RN6kBcwfkTlaPWaOCAG3xgQSfRqiRBuYNl8PI2ei03VuZow2NSYUYs25zck EzLG45J90JgqA0wApU1EptpDjJwHHnvMIR03mxSjcGJ+QB1qdPulVV07P18OrTsQC5AAjk ZYyMX7Mq0Hbistm5ZWyacTVtPpUNfl+FhsqLTGB0OGM2XycdTyHivKcaxTeB718blF7m9v O7elu0Li0a24kFojZmc1WugH1crksirOVNHDAs9r4xBS0XY6aAfY+JUBL+ND0/YrhpbX+T 6iw7LuW9V2Hwtha8jfZyxYmJ0xD/dMuETzUvY8oY9VvDC8fOTwES6uaeX275Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681319416; 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=lxzbi+zX844xtU6s4BgBiu4/eIR3DqoYP7cJtMoczv0=; b=tbTiGOOwnUxumywaInD0JHQhmKsofPL/ICnuyotrFzAwval5ie4Jt/x0RdlokFbcABKjVC dkzNF7GHICTyi92IUdHkSpguY+nqt1imtXFlsuoYmZ/eXSdRBpsKH4MuBDbx7IFgUZllG1 9y2TuIHP1dMUgfvDc3ICvNK24bptsWVPQidRwZRzWwPVhFNCfoehhmCUrmpBIQ3PkJnwzw FmubcIEKrIDfJxPDvT5jXtanBkFN2OeA32GASdcNObeLKpStOYSWKe8nL3e+UUZxbeRA4l mgxA+DrzjdmZkhQP2LZolHBT/0HyJdorsMO3a8pKHrs6oYHkuTcCJA//z0AAJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681319416; a=rsa-sha256; cv=none; b=rw9VIg+4jyAavtwiG78jWTp6j4MJFWXSRoAzYjBJUrNZexikiKKuqpQ+GRJkZthXerdSEk 6Ju/f20hKo6W1mP6yAo8eqf17NoXDTktBZV+V+vyPoHaV/3zU3O3xiF6JxCEm8ncVTA6dm XM5i7ZEodfoWVjTLobYeCZa5C2qHwBfjq3JCLk5cSmp39mIG6MmiFPIB2O6T1Ec8OxQLNS RUB+t4y7ciMBgV0rS0KzStL2xBJdWg+SHwZSrzyj3qjpNdDvSrM76xD9496Ikt50/N2odD cdOQPsnneGWZtMV0+qd/dX6bu3QHQQYWekEQV0+YQA9zSVCtt+9GKSSvbR9qnw== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxTjh3LmlzHZW; Wed, 12 Apr 2023 17:10:16 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> Date: Wed, 12 Apr 2023 13:10:14 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> From: Charlie Li Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------qFYstRqMT9rCX0xD8fL0Iusc" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------qFYstRqMT9rCX0xD8fL0Iusc Content-Type: multipart/mixed; boundary="------------4Uy06BKiLqOyz99sABPlDGYJ"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> In-Reply-To: --------------4Uy06BKiLqOyz99sABPlDGYJ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IE9uIEFwcmlsIDEyLCAyMDIzIDg6NTE6MDkgQU0gUERU LCBDaGFybGllIExpIDx2aXNod2luQGZyZWVic2Qub3JnPiB3cm90ZToNCj4+IEN5IFNjaHVi ZXJ0IHdyb3RlOg0KPj4+IEkgaGF2ZSBhICJzYW5kaGJveCIgcG9vbCwgY2FsbGVkIHQsIHVz ZWQgZm9yIC91c3Ivb2JqIGFuZCBwb3J0cyB3cmtkaXJzLCBhbmQgb3RoZXIgd3JpdGVzIEkg Y2FuIGVhc2lseSByZWNyZWF0ZSBvbiBteSBsYXB0b3AuIEhlcmUgYXJlIHRoZSByZXN1bHRz IG9mIG15IHRlc3RzLg0KPj4+DQo+Pj4gTWV0aG9kOg0KPj4+DQo+Pj4gSW5pdGlhbGx5IEkg Y29waWVkIG15IC91c3Ivb2JqIGZyb20gbXkgdHdvIGJ1aWxkIG1hY2hpbmVzIChvbmUgYW1k NjQuYW1kNjQgYW5kIGFuIGkzODYuaTM4NikgdG8gbXkgInNhbmRib3giIHpwb29sLg0KPj4+ DQo+Pj4gTmV4dCwgd2l0aCBibG9ja19jbG9uaW5nIGRpc2FibGVkIEkgZGlkIGNwIC1SIG9m IHRoZSAvdXNyL29iaiB0ZXN0IGZpbGVzLiBUaGVuIGEgZGlmZiAtcXIuIFRoZXkgc291cmNl IGFuZCB0YXJnZXQgZGlyZWN0b3JpZXMgd2VyZSB0aGUgc2FtZS4NCj4+Pg0KPj4+IE5leHQs IEkgY2xlYW5lZCB1cCAocm0gLXJmKSB0aGUgdGFyZ2V0IGRpcmVjdG9yeSB0byBwcmVwYXJl IGZvciB0aGUNCj4+PiBibG9ja19jbG9uZSBlbmFibGVkIHRlc3QuDQo+Pj4NCj4+PiBOZXh0 LCBJIGRpZCB6cG9vbCBjaGVja3BvaW50IHQuIEFmdGVyIHRoaXMsIHpwb29sIHVwZ3JhZGUg dC4gUG9vbCB0IG5vdyBoYXMgYmxvY2tfY2xvbmluZyBlbmFibGVkLg0KPj4+DQo+Pj4gSSBy ZXBlYXRlZCB0aGUgY3AgLVIgdGVzdCBmcm9tIGFib3ZlIGZvbGxvd2VkIGJ5IGEgZGlmZiAt cXIuIEFsbW9zdA0KPj4+IGV2ZXJ5IGZpbGUgd2FzIGRpZmZlcmVudC4gVGhlIHBvb2wgd2Fz IGNvcnJ1cHRlZC4NCj4+Pg0KPj4+IEkgcmVzdG9yZWQgdGhlIHBvb2wgYnkgdGhlIGZvbGxv d2luZyByZW1vdmluZyB0aGUgY29ycnVwdGlvbjoNCj4+Pg0KPj4+DQo+Pj4gc2xpcHB5IyB6 cG9vbCBleHBvcnQgdA0KPj4+IHNsaXBweSMgenBvb2wgaW1wb3J0IC0tcmV3aW5kLXRvLWNo ZWNrcG9pbnQgdA0KPj4+IHNsaXBweSMNCj4+Pg0KPj4+IEl0IGlzIHJlY29tbWVuZGVkIHRo YXQgcGVvcGxlIGF2b2lkIHVwZ3JhZGluZyB0aGVpciB6cG9vbHMgdW50aWwgdGhlDQo+Pj4g cHJvYmxlbSBpcyBmaXhlZC4NCj4+Pg0KPj4gQXMgb2YgYWY3NjI0ZWQzMTQ1LCBJIGp1c3Qg ZGlkIHRoaXMgd2l0aCBhbiBtZCg0KS1iYWNrZWQgdGVzdCBwb29sLCB0aG91Z2ggd2l0aCB0 aGUgc2Vjb25kIGBjcCAtUmAgbGFuZGluZyBpbiBhIHNlcGFyYXRlIGRhdGFzZXQsIGNyZWF0 ZWQgYW5kIGRlc3Ryb3llZCBmb3IgZWFjaCB0ZXN0LiBObyBjb3JydXB0aW9uIGVpdGhlciB3 YXkuIEhvd2V2ZXIsIG15IHBvdWRyaWVyZSBidWlsZHMgc3RpbGwgb3V0cHV0L3BhY2thZ2Ug Y29ycnVwdGVkIGZpbGVzIChwYXJ0aWN1bGFybHkgdGhvc2Ugd2l0aCBudWxsIGNoYXJhY3Rl cnMpLCBwcm9iYWJseSBhZnRlciBpbnN0YWxsKDEpIGludm9jYXRpb25zIChub3QgY3AoMSkp Lg0KPj4NCj4gDQo+IFlvdSBuZWVkIHRvIGNvcHkgZnJvbS90byB0aGUgc2FtZSBkYXRhc2V0 IHRvIHJlcHJvZHVjZSB0aGUgcHJvYmxlbS4gQ29weWluZyBmcm9tIGEgc291cmNlIGRhdGFz ZXQgdG8gYSBkaWZmZXJlbnQgZGF0YXNldCB3aWxsIGF2b2lkIGJsb2NrX2Nsb25pbmcuDQo+ IA0KR290IHRoZSBjb3JydXB0aW9uIG5vdy4NCg0KLS0gDQpDaGFybGllIExpDQrigKZub3Bl LCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------4Uy06BKiLqOyz99sABPlDGYJ-- --------------qFYstRqMT9rCX0xD8fL0Iusc Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ25fYFAwAAAAAACgkQ/reFK+KbPocK PQ/9HunldHZrVtgUvbmXILT/5aX7aW5RhOURuMM40mZqr+VrZsp8lnsTwfP3UaXXav8ISUUc/Ei3 U/3+kxhYfHDad/s/VfOMoyzoModHVc7Jf5Xe3mA6I3uJI17iiyJRfVohCiJFOo5DE4nVKDB8gSWt 32SLT86KA2SIaUxxi98YR5YbpIf12x2jE2VuelpqDF4KfW/SIZXAFfnwcb4hTdxzm5qmrs7hFS/4 k1KlqPgj35taz+IxxCO3IlzfhigXSBeIuHYkQuv/4eOeWru4cyqxN5rb4q5ZEz6TbbvX56NKhOmR QbrBKs0j5tBJve+/F3lBDt8ieYVjOVYYjOguy4RkH2AvtDPo3fSJnpY/wzIHcKZ0XLlKMbO38JVs 43EjzFvdKJB31CJfLK6FufHtIl7dH0k0CXeykD4AkDbRdOxPTGUkbIVlA6DPFZi36uKWYZGdqvfc s+3e+gC+Fu2dx1iJU0H8dVUkSECPtkJi46qNk/bOVC/uxEeqBw4+meq12oQ1dj/nxlkAlWOXZjcG ZlonPzbcBtidty/OYP09k5I/uDnCdIcvlBG9r6u26DCp/EgFUEZmAvL5JjJsZW+fmVJ6Bjn4MDta dhT1mlWgR6UOp2RWv1GHFR8FM7jwPerhYcUKscpqf33FosKTIRjbpX7frv6XkA1ocT0TrMh0rhZI 2+s= =3TlP -----END PGP SIGNATURE----- --------------qFYstRqMT9rCX0xD8fL0Iusc-- From nobody Wed Apr 12 17:22:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTzk4TwTz4576B; Wed, 12 Apr 2023 17:22:26 +0000 (UTC) (envelope-from vishwin@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 4PxTzk3yzHz4N5v; Wed, 12 Apr 2023 17:22:26 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681320146; 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=7gY8dnp++DmI5KbrpHUBfgSUeDU57IAaI96q5dVKRdk=; b=mHXDEdIexI8kEYZFvUpOINWKE+y0nTuPd4RkVa2RtdMBwTd8vPSQrI0BqO0wzA/ERlE0Re VfTicjdSIFtV/A9hMTb16H1BydUi8s5TUSjfB8zGTrG+dbiEOIfcoDLLBG2zVkfqj6uouj 5lB/jVUMvL/KFU7YgqgrFUaCeHpLLsqwUyu0NDxccE0UqqEu6yHuwU2QXGVKnCVR8fM0HG hjrch+EMR0Xco/7ckiOC5ePb7TQHEFcXxGh62dvesPPwM+9lixEMSHIFqh2p7QECJDuwuN eXJxh+BFx3hWGZQtZZ9heIBGO7xRM3uHXc8T4Mz5TMTAmuLop42tozk+w5yiLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681320146; 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=7gY8dnp++DmI5KbrpHUBfgSUeDU57IAaI96q5dVKRdk=; b=RJvPMhRO7RaaCShz7RtVsM5vBgXhiwYKEkkjpDWn2FOTsr0X3jMIhQPEeYjDv45G18N78M Eqa/01k9jfCXWXbtc5nr/OXFnmdvcQ86zhnrzjcEFC1SEDcwlfXEPlIGR2wPlbZxdqEGwU RcziBaBQDDcDMz7JpM3+o7jzWWCaleWyzUrIHKkDAVYyYsAfikui/G/frKAEKnYbocKtjy D1xkX88VAipDPM4Le0CXEvvEYVn0CGPFzch0c/Nn5ESDTB0uMMzS6nKTXtcFCD1vYkEzNx 48vo5vf14lGx0nYTiLIEPfUSLKB8HcOpfhZORP0yEEEzZAE3SKpv4qDw/FU4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681320146; a=rsa-sha256; cv=none; b=x8G4sbjaTxKeYN4bLz1yscAn0zO7svhMQu8uh3p67b45IvZmO0F4gd4MJRwh9kCCWOUuj2 st1ZP+sp1MkiACZOIUXOHaN7g+VsSrd23uyAGj3sKLZQyJx34BQkwS/sxfTmi+PJDvs8XV t344zRD2ZQ9wj8OMuybNjZZFV59Z7nalGPq0RlaJvP7XnXt8ETk/PK8wE/Vgi+jpi1T7GN ZuGR1gtosYHISDVgW0DAfQNrv+nUmEAee+eY712mM7gXowLPkzXW8D0SNPdcM0DSu9hSQt yWRhW9pLa3UBlKQyGFnwZPRUe1bIlCSaqrLeftj08t2SUi1pIRmKNDFxyhDY4w== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxTzk14m1zHPZ; Wed, 12 Apr 2023 17:22:26 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Date: Wed, 12 Apr 2023 13:22:25 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> Organization: FreeBSD Project In-Reply-To: <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------6ICQqbrV1AlSKzMJ1XzpInwx" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------6ICQqbrV1AlSKzMJ1XzpInwx Content-Type: multipart/mixed; boundary="------------NWFns1FlMM0NrX5UxcK3PWbw"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403231444.CF48911F@slippy.cwsent.com> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> In-Reply-To: <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> --------------NWFns1FlMM0NrX5UxcK3PWbw Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q2hhcmxpZSBMaSB3cm90ZToNCj4gQ3kgU2NodWJlcnQgd3JvdGU6DQo+PiBPbiBBcHJpbCAx MiwgMjAyMyA4OjUxOjA5IEFNIFBEVCwgQ2hhcmxpZSBMaSA8dmlzaHdpbkBmcmVlYnNkLm9y Zz4gd3JvdGU6DQo+Pj4gQ3kgU2NodWJlcnQgd3JvdGU6DQo+Pj4+IEkgaGF2ZSBhICJzYW5k aGJveCIgcG9vbCwgY2FsbGVkIHQsIHVzZWQgZm9yIC91c3Ivb2JqIGFuZCBwb3J0cyANCj4+ Pj4gd3JrZGlycywgYW5kIG90aGVyIHdyaXRlcyBJIGNhbiBlYXNpbHkgcmVjcmVhdGUgb24g bXkgbGFwdG9wLiBIZXJlIA0KPj4+PiBhcmUgdGhlIHJlc3VsdHMgb2YgbXkgdGVzdHMuDQo+ Pj4+DQo+Pj4+IE1ldGhvZDoNCj4+Pj4NCj4+Pj4gSW5pdGlhbGx5IEkgY29waWVkIG15IC91 c3Ivb2JqIGZyb20gbXkgdHdvIGJ1aWxkIG1hY2hpbmVzIChvbmUgDQo+Pj4+IGFtZDY0LmFt ZDY0IGFuZCBhbiBpMzg2LmkzODYpIHRvIG15ICJzYW5kYm94IiB6cG9vbC4NCj4+Pj4NCj4+ Pj4gTmV4dCwgd2l0aCBibG9ja19jbG9uaW5nIGRpc2FibGVkIEkgZGlkIGNwIC1SIG9mIHRo ZSAvdXNyL29iaiB0ZXN0IA0KPj4+PiBmaWxlcy4gVGhlbiBhIGRpZmYgLXFyLiBUaGV5IHNv dXJjZSBhbmQgdGFyZ2V0IGRpcmVjdG9yaWVzIHdlcmUgdGhlIA0KPj4+PiBzYW1lLg0KPj4+ Pg0KPj4+PiBOZXh0LCBJIGNsZWFuZWQgdXAgKHJtIC1yZikgdGhlIHRhcmdldCBkaXJlY3Rv cnkgdG8gcHJlcGFyZSBmb3IgdGhlDQo+Pj4+IGJsb2NrX2Nsb25lIGVuYWJsZWQgdGVzdC4N Cj4+Pj4NCj4+Pj4gTmV4dCwgSSBkaWQgenBvb2wgY2hlY2twb2ludCB0LiBBZnRlciB0aGlz LCB6cG9vbCB1cGdyYWRlIHQuIFBvb2wgdCANCj4+Pj4gbm93IGhhcyBibG9ja19jbG9uaW5n IGVuYWJsZWQuDQo+Pj4+DQo+Pj4+IEkgcmVwZWF0ZWQgdGhlIGNwIC1SIHRlc3QgZnJvbSBh Ym92ZSBmb2xsb3dlZCBieSBhIGRpZmYgLXFyLiBBbG1vc3QNCj4+Pj4gZXZlcnkgZmlsZSB3 YXMgZGlmZmVyZW50LiBUaGUgcG9vbCB3YXMgY29ycnVwdGVkLg0KPj4+Pg0KPj4+PiBJIHJl c3RvcmVkIHRoZSBwb29sIGJ5IHRoZSBmb2xsb3dpbmcgcmVtb3ZpbmcgdGhlIGNvcnJ1cHRp b246DQo+Pj4+DQo+Pj4+DQo+Pj4+IHNsaXBweSMgenBvb2wgZXhwb3J0IHQNCj4+Pj4gc2xp cHB5IyB6cG9vbCBpbXBvcnQgLS1yZXdpbmQtdG8tY2hlY2twb2ludCB0DQo+Pj4+IHNsaXBw eSMNCj4+Pj4NCj4+Pj4gSXQgaXMgcmVjb21tZW5kZWQgdGhhdCBwZW9wbGUgYXZvaWQgdXBn cmFkaW5nIHRoZWlyIHpwb29scyB1bnRpbCB0aGUNCj4+Pj4gcHJvYmxlbSBpcyBmaXhlZC4N Cj4+Pj4NCj4+PiBBcyBvZiBhZjc2MjRlZDMxNDUsIEkganVzdCBkaWQgdGhpcyB3aXRoIGFu IG1kKDQpLWJhY2tlZCB0ZXN0IHBvb2wsIA0KPj4+IHRob3VnaCB3aXRoIHRoZSBzZWNvbmQg YGNwIC1SYCBsYW5kaW5nIGluIGEgc2VwYXJhdGUgZGF0YXNldCwgY3JlYXRlZCANCj4+PiBh bmQgZGVzdHJveWVkIGZvciBlYWNoIHRlc3QuIE5vIGNvcnJ1cHRpb24gZWl0aGVyIHdheS4g SG93ZXZlciwgbXkgDQo+Pj4gcG91ZHJpZXJlIGJ1aWxkcyBzdGlsbCBvdXRwdXQvcGFja2Fn ZSBjb3JydXB0ZWQgZmlsZXMgKHBhcnRpY3VsYXJseSANCj4+PiB0aG9zZSB3aXRoIG51bGwg Y2hhcmFjdGVycyksIHByb2JhYmx5IGFmdGVyIGluc3RhbGwoMSkgaW52b2NhdGlvbnMgDQo+ Pj4gKG5vdCBjcCgxKSkuDQo+Pj4NCj4+DQo+PiBZb3UgbmVlZCB0byBjb3B5IGZyb20vdG8g dGhlIHNhbWUgZGF0YXNldCB0byByZXByb2R1Y2UgdGhlIHByb2JsZW0uIA0KPj4gQ29weWlu ZyBmcm9tIGEgc291cmNlIGRhdGFzZXQgdG8gYSBkaWZmZXJlbnQgZGF0YXNldCB3aWxsIGF2 b2lkIA0KPj4gYmxvY2tfY2xvbmluZy4NCj4+DQo+IEdvdCB0aGUgY29ycnVwdGlvbiBub3cu DQo+IA0KQ2xhcmlmeTogbm8gY29ycnVwdGlvbiB3aXRob3V0IGJsb2NrX2Nsb25pbmcsIGNv cnJ1cHRpb24gd2l0aC4NCg0KV2hhdCBpcyBzdGlsbCBhIG15c3RlcnkgdG8gbWUgaXMgaG93 IGNvcnJ1cHRpb24gaGFwcGVucyBldmVuIHdpdGhvdXQgDQpibG9ja19jbG9uaW5nIGluIHRo ZSBwb3VkcmllcmUgc2NlbmFyaW8uIGNwKDEpL2luc3RhbGwoMSkgYWx3YXlzIGhhcHBlbiAN CndpdGhpbiB0aGUgc2FtZSBkYXRhc2V0LCBhcyB0aGlzIHRlc3QuDQoNCi0tIA0KQ2hhcmxp ZSBMaQ0K4oCmbm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0IGxpbmUuDQoNCg== --------------NWFns1FlMM0NrX5UxcK3PWbw-- --------------6ICQqbrV1AlSKzMJ1XzpInwx Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ26NEFAwAAAAAACgkQ/reFK+KbPofk uA//YGCZkN4xZLxWpkXDEGmOmRRjq0TfARrSi7P9PhIQNPMEhyg0wzv9f5sXY6i+NiZJD4l8Dhl0 RhYmcjvQOi/yD+Vn3hanUXlyQaBXc1Zkx8Y8p4OAhs8V2Rwhd+2z3hiNsy5nOIckfQ9IUw1YYsUs ySEQGsvwgBR3568h4NH2MU2m3H3SQ2dAfPU+oLKjfNKtEk1YlGEejR44xcQ7hLNAabUNVCkMrT2X ojKaWQIhq6uI9xlUBwg6dOKDdMTyH0QGpDn7gyWGK80XxxkDzaLCB4mM7izhZ/6RuhEA4yl4zLUl ZzvDMGRnP2VGjlmjW03AWYQfccQY/S4dimVM3iXafPvt5zVEoEjlCuidAuqVXrQcVtWEOYCOFAEC 1Y1Qkedi7e/F/yPGtYud1jXVIpNXIqkBb28pa1Qkdh/MX66mIRQZu20v6JDVA08UEOmPhqgYYXAw msFso+cKWfCecgKebCqQihyJfqriNNO7s36TBFmM9uiPByN/92HSRWihKy8leU43j90A9OOUvNHN Hdjdyhni15QBd68yTcE3W4vkho0UDT8aXuNS5ZLodNVzFXxAJaY4pTokD8ms+KdLvM+9ynBeik3B 8k3a6b63DQlCXhOVuMvuBzBS7MeonYpCoVPf1rX550HQJs6tFMOUUfZQeuD4vEMcEKt6xzX5PoXu kp0= =+uQ9 -----END PGP SIGNATURE----- --------------6ICQqbrV1AlSKzMJ1XzpInwx-- From nobody Wed Apr 12 17:28:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxV6h5x1yz457j1; Wed, 12 Apr 2023 17:28:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (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 4PxV6h3kvgz3JXj; Wed, 12 Apr 2023 17:28:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-18782426c4bso1405102fac.9; Wed, 12 Apr 2023 10:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681320507; x=1683912507; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=k+0Qk0xsrFIA70Kobn0JBCexOxn1iYu2GFoU+FZ/Ytw=; b=EJ9SLW0HbgGv+f4i3ML5xJ9cAc6fow1tmNNfji9qbUKDJUCkAV69tazQ2kNjVLwX+r D7lPjeiHREiNlwXJTTBAlt3aCyww2O/MOLKgokAm9ZECLI3UU0rHqS4Iukr3erBvpfSg r2GG6Mpl7Jd6kI14IVij6NN+jsOFHV37gJxRurcEf6yjIXU8zkUTER1XMs6LeFMxx56P NGtWrAtrTb561Qi74x701Cez1cq5X8vFdPsZP6Wk8XQ6MkNq8d3KiPB1vdi757i8sah8 0Q5HE/Hly7arWfOpMFMzgaUvBixJT7VyRyBJMZkfKJUmWRq5xBaEqcCVe3Zn+9OKF21y j6gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681320507; x=1683912507; h=content-transfer-encoding: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=k+0Qk0xsrFIA70Kobn0JBCexOxn1iYu2GFoU+FZ/Ytw=; b=VTNUqOF/L/nXd6rgEWRAZNyOLjRAABHbJQBEeuPcb/6Au08WlxuD8KOqA/V071fPp7 0DSNiOeWRmI/URsO4BMY9SrNx6X6RLaehoK6nI+hBK33mpTUpUNaIDArTVe/u5iazGUh iErZwAjvr1oLx5VFfHOCXcWdV1PdAPpIWO3dQDzMiq4/5N5mFYXlUYKwAh+dVBMshzGt FUuHWLxNvOKduIZKkS/hx47JlOQnyMPSwKfQq6XuT2LPmEEPcCxntW7WGIDmOMPxhjGc lQFT0AOAGsOo9dTdJn/KDmlBa4K9NZmVlMj3zUXylJ6hcs9OkD5Y/wVM992hFsKbftDV mAUQ== X-Gm-Message-State: AAQBX9enQkGG28wnf+pQsFNygZQJanJBeuJ3vKAmmtYjdNdtpTgIHmwJ +bq/kBNdIYuOM4mY+/FvZDciRIeHxutsvp/x05uZQofc X-Google-Smtp-Source: AKy350Zr4YaHIS2Wn1B1M9qzUFeEcO/cugOPE6OFDouuFj4zPNnIt2YhYrJ0ZhYJxltbc9z6B9CTj1jadGQ5PMXNZ+c= X-Received: by 2002:a05:6870:eca3:b0:184:48cc:62ef with SMTP id eo35-20020a056870eca300b0018448cc62efmr3406890oab.4.1681320507170; Wed, 12 Apr 2023 10:28:27 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:28c:0:b0:49c:b071:b1e3 with HTTP; Wed, 12 Apr 2023 10:28:26 -0700 (PDT) In-Reply-To: <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> From: Mateusz Guzik Date: Wed, 12 Apr 2023 19:28:26 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Charlie Li Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PxV6h3kvgz3JXj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N can you please test poudriere with https://github.com/openzfs/zfs/pull/14739/files On 4/12/23, Charlie Li wrote: > Charlie Li wrote: >> Cy Schubert wrote: >>> On April 12, 2023 8:51:09 AM PDT, Charlie Li >>> wrote: >>>> Cy Schubert wrote: >>>>> I have a "sandhbox" pool, called t, used for /usr/obj and ports >>>>> wrkdirs, and other writes I can easily recreate on my laptop. Here >>>>> are the results of my tests. >>>>> >>>>> Method: >>>>> >>>>> Initially I copied my /usr/obj from my two build machines (one >>>>> amd64.amd64 and an i386.i386) to my "sandbox" zpool. >>>>> >>>>> Next, with block_cloning disabled I did cp -R of the /usr/obj test >>>>> files. Then a diff -qr. They source and target directories were the >>>>> same. >>>>> >>>>> Next, I cleaned up (rm -rf) the target directory to prepare for the >>>>> block_clone enabled test. >>>>> >>>>> Next, I did zpool checkpoint t. After this, zpool upgrade t. Pool t >>>>> now has block_cloning enabled. >>>>> >>>>> I repeated the cp -R test from above followed by a diff -qr. Almost >>>>> every file was different. The pool was corrupted. >>>>> >>>>> I restored the pool by the following removing the corruption: >>>>> >>>>> >>>>> slippy# zpool export t >>>>> slippy# zpool import --rewind-to-checkpoint t >>>>> slippy# >>>>> >>>>> It is recommended that people avoid upgrading their zpools until the >>>>> problem is fixed. >>>>> >>>> As of af7624ed3145, I just did this with an md(4)-backed test pool, >>>> though with the second `cp -R` landing in a separate dataset, created >>>> and destroyed for each test. No corruption either way. However, my >>>> poudriere builds still output/package corrupted files (particularly >>>> those with null characters), probably after install(1) invocations >>>> (not cp(1)). >>>> >>> >>> You need to copy from/to the same dataset to reproduce the problem. >>> Copying from a source dataset to a different dataset will avoid >>> block_cloning. >>> >> Got the corruption now. >> > Clarify: no corruption without block_cloning, corruption with. > > What is still a mystery to me is how corruption happens even without > block_cloning in the poudriere scenario. cp(1)/install(1) always happen > within the same dataset, as this test. > > -- > Charlie Li > =E2=80=A6nope, still don't have an exit line. > > --=20 Mateusz Guzik From nobody Wed Apr 12 17:37:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxVKm583cz458PG; Wed, 12 Apr 2023 17:38:04 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxVKm2X9Yz3lRH; Wed, 12 Apr 2023 17:38:04 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id mZ8bp7qvVjvm1mePzp7wCB; Wed, 12 Apr 2023 17:38:03 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mePxpFViHHFsOmePypRsBg; Wed, 12 Apr 2023 17:38:03 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=6436ec7b a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=Rrb4mQHHm2gU3NfK1bwA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (S01060c8ddb6bf355.gv.shawcable.net [24.69.190.13]) by spqr.komquats.com (Postfix) with ESMTPSA id 4903942E; Wed, 12 Apr 2023 10:38:01 -0700 (PDT) Date: Wed, 12 Apr 2023 10:37:59 -0700 From: Cy Schubert To: Charlie Li CC: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Message-ID: <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfK+FtYA4Tjj91OVElqh36swKJ1Bk0Pe4FDKUo2trqFTbBn46LuR7jsH83oqn0R/0VCb+Iq2zAn59GYhCHJrF3HrExNDRQ4Ns7Jn+5pjbBF7JSSEB4Wje qkoGtQgfZ8/GzfHyaDo3xSjT/aig49EO2D37gG+BOsPaLUs1wMrN4mAwW5evbs/PM/Z3gOG9Pgi1IO1gQp3VBpHcbYUJdPPng3C3sqt6TvkIyq1oPPdZaP3e NywS5UgYAKWk8trIu99aweQRI4yeNcJqoG86JNOzZoXikr+h3OjRH9zvd62YiLczQgqri/jjn7R+usTHVoZLbF6I0UHLjJatR5vcLJb9/scqxqeb8qngY+tR QiqK2w1gOGRgf71ko0re3mA1BiZR8hJRf1k/w/5rsdF9Fw2SIV0= X-Rspamd-Queue-Id: 4PxVKm2X9Yz3lRH X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 12, 2023 10:22:25 AM PDT, Charlie Li wrote= : >Charlie Li wrote: >> Cy Schubert wrote: >>> On April 12, 2023 8:51:09 AM PDT, Charlie Li w= rote: >>>> Cy Schubert wrote: >>>>> I have a "sandhbox" pool, called t, used for /usr/obj and ports wrkd= irs, and other writes I can easily recreate on my laptop=2E Here are the re= sults of my tests=2E >>>>>=20 >>>>> Method: >>>>>=20 >>>>> Initially I copied my /usr/obj from my two build machines (one amd64= =2Eamd64 and an i386=2Ei386) to my "sandbox" zpool=2E >>>>>=20 >>>>> Next, with block_cloning disabled I did cp -R of the /usr/obj test f= iles=2E Then a diff -qr=2E They source and target directories were the same= =2E >>>>>=20 >>>>> Next, I cleaned up (rm -rf) the target directory to prepare for the >>>>> block_clone enabled test=2E >>>>>=20 >>>>> Next, I did zpool checkpoint t=2E After this, zpool upgrade t=2E Poo= l t now has block_cloning enabled=2E >>>>>=20 >>>>> I repeated the cp -R test from above followed by a diff -qr=2E Almos= t >>>>> every file was different=2E The pool was corrupted=2E >>>>>=20 >>>>> I restored the pool by the following removing the corruption: >>>>>=20 >>>>>=20 >>>>> slippy# zpool export t >>>>> slippy# zpool import --rewind-to-checkpoint t >>>>> slippy# >>>>>=20 >>>>> It is recommended that people avoid upgrading their zpools until the >>>>> problem is fixed=2E >>>>>=20 >>>> As of af7624ed3145, I just did this with an md(4)-backed test pool, t= hough with the second `cp -R` landing in a separate dataset, created and de= stroyed for each test=2E No corruption either way=2E However, my poudriere = builds still output/package corrupted files (particularly those with null c= haracters), probably after install(1) invocations (not cp(1))=2E >>>>=20 >>>=20 >>> You need to copy from/to the same dataset to reproduce the problem=2E = Copying from a source dataset to a different dataset will avoid block_cloni= ng=2E >>>=20 >> Got the corruption now=2E >>=20 >Clarify: no corruption without block_cloning, corruption with=2E > >What is still a mystery to me is how corruption happens even without bloc= k_cloning in the poudriere scenario=2E cp(1)/install(1) always happen withi= n the same dataset, as this test=2E > This is because your pool has previously corrupted blocks=2E Even when you= backed up the old pool, created a new pool without block_cloning and resto= red your data, because the backup contained corrupted blocks from your old = pool, they were restored as is=2E ZFS can only fix corruption if the checks= um says it's corrupt=2E As far as ZFS was concerned at the time those block= s were not corrupted=2E You will need to delete the files with corruption a= nd recreate them=2E Even after this regression is fixed and people build/install kernel, whate= ver was corrupted will remain until corrupted files are either removed and = recreated or fixed manually=2E This regression will have long lasting effects=2E Like Kirk McKusick has reiterated many times, back in the old days people = didn't trust EXT*FS because of the data corruption experienced=2E Sadly ZFS= will need to earn people's trust back again=2E This is unfortunate=2E --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Wed Apr 12 17:41:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxVPs5G1dz458kd for ; Wed, 12 Apr 2023 17:41:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-54.consmr.mail.gq1.yahoo.com (sonic316-54.consmr.mail.gq1.yahoo.com [98.137.69.30]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxVPr4ftyz3qG0 for ; Wed, 12 Apr 2023 17:41:36 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=U6qluDOj; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.30 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681321294; bh=lDh72VCFIm2AIppI6RLE5iUnjvHNArExT9SdHKN/zRs=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=U6qluDOj+BJ6mgTnFox4N0VL4CffO18/Kf8iyCppNKzxUZ5iMdFT/MHb7LhjHx3A67M5OTXsmMef6pRY4fGesaZj4aoRxdMdVd4bRNg3o2xMJ+Ic61YsPYdh3R96UEG8aURLE6pR+VX5Hfao8dQpPWLkyt+aQlu7lUsvNEuUDJjLFZ6t4GXhnjKcNYToFUBS7Nse14s7vpq1m5z26zjYcn0ODlnDdAA+xY60/pm1jxSYp9uC3TybctE2yFiFTC5W/GggmKJ3N1SNqWSBQEz1V85RGMPsnbPKgf2yoiuiQAsfizZXCsgkTEZomcEb+2C18QfKA+xyADiUYWBsjWQReg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681321294; bh=msncf5hAx4+DpxOLN1pgvnLxPxH0qHW4amkUO5RJPB3=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=iH3KwhUImK4fUB2aQRblBpRM6VFgh9ja9k+cTg9Qr0PzEOEX6mnSkuF9/BKnXWqV6r05wvZckL3krRD7FtiSH+ut3DLRL3kGT62oAcXCEZdZ4rTWrietcE8q3fP5WhuVseDAoJ2tdPWPc+fJRIul7Dhbqc7WS7GpCqC3g7c0WCpPpE8MNx1G0LP+tN1o2ZaPUJaEkKNf2DH8SV1HGqELcyq0fkquEXCuX54cOrQ51cpSLt1wn+KTqtS+ZLVw6WhhoeMBZVg5hXwEj+6GCkGs7RRlOeN01Y0PFOAZGwUhuOCFWm+3LtyqZ8T3dgsA5oNtw485htziPOGILJyucDJZtg== X-YMail-OSG: Y00r_ykVM1l._ZMgddTPfJ4g3TfoVjVBExhJR2n0YTY5SI_S_2rJHeIEYclQr8k 85o6m2B1vwuM7zff1DbwiNIhhhWfaUtLaq4s71tyGWBKHMYSpTau1dpaPWsFlrVavXI8KiNCpAQx P6kCGyUNI2sPOzrFnUkU15U4fSblLkx.Rnm1Qumxmso3rxkSnuvyNaHBVbreHdB1lAoWJ5eCLmT0 UuPhW8LWwez4r1i346tiafC6.GACxm4WZyAMpg_zvW9PkLFotnNlnTILuralzEjXccDvg3Gv5gGL jTl9cwXJ_qnIfrT7eSzu2k9Uyij9EnhZ5vW1Ne539Gtqzbu8oinZT1xizJTWbOK_ETu9glzIEhRa YsKSzxw.4mfKswwTcJDC3VT8ClIdyL_xTvR.L8dapGh7ny79FUuTUNa7fDBOJDmoWATI9pF5Ezsx Lg4fDJouqZ3.72Jj3gOJzdlBIg1_c327klIS8Psw.i_d.snUiDGWom.Vox8xB3dIx2lGVIbRgzEy 9VAcKouzVkThNv_vwdqJ.nc6WXBryMr2DybKPLlRzP25ti.cxI3tw5Hy5sGWjenjZAef5zwTmxC1 V8i.DrXP1M.Po41YHIWNuuNdhDobW9SyDdK8TwBhcf4v4RZJshXXb3SZo0EDcpdQKDXTueKrWXe6 EEECBQ5ZysJYkI1AsvwcCNJIotXJ6r2BXGEtaCOcemA4TNpPNB2AKVK8NVWp0An28kERfogM5UMH Eoc6YvYDNSLf7bHHhh3SalE6km.z02RpPY5Fjv.2OoQoDic0vaK0MCQZ3YUH8dPDW8AWYwLG9ees gw7hIFJPNbbtFgdy0KW7l5rlmvCXGS6OzdfXujV.dsPuAVzeMeHn75r.5uIndctpN_AgSJENSZ_a fXi3fZH89cqTwWP_tbkf6zLgX4_fHWt7MGMdC01ZfNdMZ54Ivr4WlXshEAalWi5tsu_wCoo9plA4 y45FmPeq1ZmHRua72XS5U7WqHsKKPMd9DNxaFOtOmZdWVbTuOvmDXF.njoi4GIV8squ7EyFvZSZE eK5VHOuywBtOZ0PpndUP9GwcOp_SwCnIpPA8wG6K29Wv_xjt5AsPzc90v4HFmFB6RfEOxAXJ6iU6 aAVm9DFzBD0zgVDD3n9RwcpYFpdJ7svbvMJsyZ0Cg7vzd2ztD7yMAhm9qpMIP2V_dAiT5jUSbON4 FV_CaqeEwE1KST3ri_r4QtvT4Q3W_n5bgTUPXOndPOnG7TyaG.gMpn3aB5xVLLPrVDQKraqhdZac WT4m1iHXKqioKD85RJQcXSHcXPl_0K6stEOguRZywrJwwFdKBLezFOxt_.eeQDUIA9IFBwb3ghEL Y.XxgR66Gh768_M492hpqJGObguQXaI8RnN_1nKv4J6Ofkn2AMY8uW7HGQ18XFX2i9DV7jPCwVOZ 4PAU5roG.IREMq4jervIQzFMCL526NQECKt9WcWWN1pq2f7G9bjo_sprloeDDmi7PlgZ9bxWW3vn Q34V9VndFP9YoNfod8pCp0uRqarajKRT2xCtcOjo_KHOZzfrOW5K.sd1333Nd2juFzsKhDC.cI6R dkpI0pNoI_PAfKSQAjqidXpKVCUHnl0s7M8D4w88_dOUPsHDamASrgwoSGunE_J.5rpKKqXMYVIZ W67gdkxX11LZfd2_0vTLG9p_3wWH0F3rw_jrDeUf1sXuzKDO.SGpvjggh98VGbh7TfvtAuqRxK5u cqXzaboNLC5xvM95Xvf9CWcmHRx75FO0ZA44eCU68un_h3fDELArjWSCEjA9_1TqHhg9x8X0ukeA jt0u69UFHtGObPGVOTTtsXnv71psVR9U7ELH9upEfXNPTWiHuzyq2gFWpKlaRoSf5XTjCsEUyc4r GQGTZrRE2A3GU4GNk5OJzniM3wY7mY1n9WKO8rm1UWncOoh8tjv0HKGb.v4nsp.JNvobZG8VYd9S T8x4E4jP8PI9wR_0BVd4UWjG2ZwPlxvwvGiMtTaIRt7Qmo.PKARepj9IPuxoECqGZm9L6mSEs6ED Cgm4UaoS3p3lS7nrdq0hgvj4wSc1uuwXOfzSpBaTfN.7tl4NNqD8wbX_T5ztKYomv7SrSjRAYGlb Nc7yIR4S0cfMgewKl7z0JY1uu6KR2h1Dr9PBmBXgThKitKlqGM34OeXf.sIL1zaWb_vGs1lnHn8B RdD8eEBFVgpBEZqvYGH.uFiIzaMS52Pl9rljop4SOJ1zP9gCTDnfNKW0JmJUOASB7yFLftFQQ8lW lJP6912XG_hbP4UvvYjd7CovknCRQ3fV89ftk2q63gx1upMfc61Zy2rOfPuJ.7DlkON2upXcSz.b dbe6k X-Sonic-MF: X-Sonic-ID: c5cf9a77-2711-4618-ba4f-1957b5779e02 Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Wed, 12 Apr 2023 17:41:34 +0000 Received: by hermes--production-gq1-546798879c-qx24x (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a4845bee0812cc8b7d34d76e9f7989c6; Wed, 12 Apr 2023 17:41:28 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-Id: <72115147-BA5F-44CA-9DD5-D84CC4BE626F@yahoo.com> Date: Wed, 12 Apr 2023 10:41:17 -0700 Cc: vishwin@freebsd.or To: Cy Schubert , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.400.51.1.1) References: <72115147-BA5F-44CA-9DD5-D84CC4BE626F.ref@yahoo.com> X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.30:from]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4PxVPr4ftyz3qG0 X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N From: Cy Schubert wrote on Date: Wed, 12 Apr 2023 16:54:59 UTC : > . . . >=20 > You need to copy from/to the same dataset to reproduce the problem. = Copying from a source dataset to a different dataset will avoid = block_cloning. https://openzfs.github.io/openzfs-docs/man/7/zpool-features.7.html = reports: QUOTE block_cloning . . . . . . Blocks can be cloned across datasets under some conditions (like = disabled encryption and equal recordsize). This feature becomes active when first block is cloned. When the last = cloned block is freed, it goes back to the enabled state. END QUOTE I've no clue if that is/will--be different for FreeBSD for some reason. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Apr 12 17:43:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxVSJ5L9Tz458X1 for ; Wed, 12 Apr 2023 17:43:44 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-21.consmr.mail.gq1.yahoo.com (sonic310-21.consmr.mail.gq1.yahoo.com [98.137.69.147]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxVSH2pQtz3sKq for ; Wed, 12 Apr 2023 17:43:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=gpXCkgM7; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681321421; bh=Lf4Pf1jE5qdmGR+Jwgm+6mcp0U9go8V4C/bZXPfhEgY=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=gpXCkgM7wmea0UrF9ArVhTdnms+bo347x0M2olOV+00/1TuTaq+N4cQA5gMjDTqqoTPgys2653D7SwOSx8I5vlSIvH7xrMREL1BNwXiwoPsYt+f1XBJUTr3n4GaDEoR2SK7gMSuqknVWZnTVjFhYIDrUxmtV1fc59e1w3ADnAXhQ4lxkquH4jvwWf2Y00RminOBo2ZRBCabRqyWm16sNNnaOezVjjV37JeP9bax3Asqw2ooWI2t1UN62cWPLTVwIKlTVoHimS/nJFmOD8EW1zUnSqMiYCepy56WsabNsqeTOhNnRnz5qsHHKq4VaJHIv6BceFKW8HoJoROSFzQiVqQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681321421; bh=ULw7v2bIi96SXDBPgdDMashs6Dd2TSnYhJJDG+b8rPR=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=Sy/uAAdtbTeXJaGAeVXBpg0/FouDbzJ75GIOXowW3v+RZBIOIrNRHtBlBp2VvrupELUxFFIfEBf+B7QH56XsyOfdcBi+gRVUaNViE4nDD6lQYZiHoBCnFAm3BDqPbThXNQ59j0ILVVyyxtna2p8ZZTqo3F6te4C323nQZPG1PSK/svFI2ukFRIBPQNhF1pwpLUSPxd2wrcg1V75l+4LE1t7LNn76xVrNvTmzcV16OINSHVHHEKPImitFYXA57g1bQ7P4tghH4QJ4LfXq/DQ0f8EsmCCGihkAHQxBnsyByvkMX6qRjNIRR67tFSyiL4jSNibGJlCuZ6fZs/KXSKRm5A== X-YMail-OSG: UMftbDsVM1n.mqa8ZXefOeb.wh4P.jpPrIsOxXju12bJ._L2v5xZwM17.IUMjwc kUBjt47vPGEpY9Kl4YRB_wGOjxOs9RWHH0mXrMzNK30Y5NWUIsbMT4u2KaGm8eaAk.QRgXHqk_Eg du80lsEpBkMtow2BaUdYPupuZTX2n53aYfnNQyy7L2pGIK6Ph1XoNqImKCsYauZZg4JclrFkzD1S l_MZFRe1i1a5TGgbzlL.CrERAouMh9tikw8uBkH6IkXtp.ylobdWZU5U5d_vScXN89EIVE.bUBEE 1.eNx1w5A7yIkpYIvHbaMhtlrZHjYpkZEFYNTCRgAaKK3nhrH_zeu6PMsqYRji73w3m1c9LTyI.P jz87P7J9cDkeQkseJDf6evdj8VtlO05yfEn5jBUEQGXxcVdx9fXFKIbZn2ArawGziRm2PdPUt7sR nsr5Qk4Q37qpd4EICJ2gyWZTZvaY5nYlbpbZeLZamKg3qcqiAXRv6mPNnnNdvEryyOzgSO9waYG0 OilOZacEPKQEmE8EJ.256CsVW66AfhmjYkThtsijixjMdLPZ6TaVsf_qeW8jqtUVlonZxF6hpImQ FNJFoQ6_84.Ps4.5iuTWFRacmrk88JvARawCGvjCTaL.4RU9waYlOFodOrNr9GMVLrb1Lg6uATML J9JFsqXP30XejIk2t0RwG1ZX7vcq4BgVEVOZudJg9Uc7N7k15ZGtswQMn_CKwisdtGYlfrze21t5 UOXoCf0Qaj4qXhXWSBkWGtzwkhzTqFbNqpwhZj2n05xXW6jv2G5xgtj3MwTYDiewGa5piMj2KRkC sSbXrGstFAaakRV7TDklpM.HVpYSbHb3oKk4pW7anWDQyyo5u.65jEJ7sV70x1kDEmQDipesUJGD sQ5iIV70xNA9miGyOCaLp5B1jfBYCt_BGQdPU40ykzf0vsFo_MHH_9oIlsIKgVLu_2N99eOKwcpd 8xN.xmeAOE66.X5bFqPtmdmLq1CL6Fhxn3UXKNkMvRYooRrc1oPgt4tUULrPFQD09ZiIFXmjuYvA DhZiGQtgvno3hASp.8MhSrYSpzr30v4rwbtOR8rvQWx6KIBDHkgpyXmgyaYJTSclmRe4qhhwDq4B HjMObgsx0oF7_WGJsXGlAvDY34uAoVCZcwwQwmf0w0ouaxGD7IxqJ5Nbg4BFparNw9bA.0HxDa6i Lfk9XfFrXdU6KSDzgX3cdMorcr_lJfG.hfzoRBsSUH6JAsnqco8pBmY7D6jp0vph381aH5WoN1AC caGwX2YFDCI9PTNScYFEhi8yPddeXn2zAvLznZcukF.ndXZxqlMGQ8Kc6TrWDRfKK_lHlagvAfGO VaZKn2LoY_5GQqjzUyWpNNndL8.6OZF.ZGFW.j1oiJYemy1uCO.dHb.9__5.JzhsI042Vlpk1qau 2iSHwSXTqEth2jI2Qhpdi3uw8YU0Q4q8qw__N3q0.6zbtnfKH4PXmgkrbcz4KbKoVa1vS6KWM3oy ZaP2ADIHtZQJuTakAhpluzmS0JZaXt4rTRbIXKSsOpwEnwQA1adroqdLZ._vJmSz50ziS0fJAO3Q gazK5f8s47CIDGr42n4F0J.eW00BIEXOix1AX1yMm1aRWivkx24nma6rpI.WFIcfUPXqG8GoITtT XobxAHSJ9fT_FQ0RjdouPubCgq0Cx1K8R3EjtB.YyBV73RJBpfCH2mChMxc2qjn1.fIxrnnvdhBJ yzp426_X0E2rIiwDtYmCOhcuWCSsH1lE_aKBII0texicGxgfa5opnObsezB7vVAtozVxIeQRwraZ G5h8TsXqEQYeGz4K3yFsByjbp64VA1cTPtDAUqVeR9nlykWxC18AzES2.mtNnmMU2vEigGQQwVoG kunuMlUfp4A3BgFRCuf9mxSvFMMal_nGwbzSsslPudp_9Y712GwvfFhCTltyfSu8ZFm744.vyxHy ZGznSi1mq.CUNf6mFEefNOe_inO.1wmQjOsGVqei2PTQYSmwn7ne2SPzfP.kFqse6nXR7yvsaTj8 EuHXoKORnGr1MmTqMvnebq4RzQhL8jcyFGA4Q8PSP46zFDdhDjXAxy.TITkv1sIsoLHeXVMA5_mL fwwd_.cfV8trzCK1n4i4uCM3lD1Em76hul1NSizt8STTHLugSFS_r_02CMvN_vHlYePPo_ADmZXD OPrlIBLwwtU.4C37dO0xzzREhm54ZjmgTpG62t263ox73JW40I24M0SdJxzERNm87MUyrRq6_IJV ksCZAFgFROexz3Tg0G5VjWWLes7.CNoh7HYrBVGKAxeNie34c_5p3mw3U_FNVZb85qE8hgsHw0gR Ojy4qkxTkMFE- X-Sonic-MF: X-Sonic-ID: 35cbdd9c-1375-4604-961c-432312bf6e1b Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Wed, 12 Apr 2023 17:43:41 +0000 Received: by hermes--production-bf1-5f9df5c5c4-8dccp (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID aa2562cfd15ecceaa3671c293498906f; Wed, 12 Apr 2023 17:43:39 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <72115147-BA5F-44CA-9DD5-D84CC4BE626F@yahoo.com> Date: Wed, 12 Apr 2023 10:43:27 -0700 Cc: vishwin@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <72115147-BA5F-44CA-9DD5-D84CC4BE626F@yahoo.com> To: Cy Schubert , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.147:from]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4PxVSH2pQtz3sKq X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N [Just a resend to fix a typo in the CC.] From: Cy Schubert wrote on Date: Wed, 12 Apr 2023 16:54:59 UTC : > . . . >=20 > You need to copy from/to the same dataset to reproduce the problem. = Copying from a source dataset to a different dataset will avoid = block_cloning. https://openzfs.github.io/openzfs-docs/man/7/zpool-features.7.html = reports: QUOTE block_cloning . . . . . . Blocks can be cloned across datasets under some conditions (like = disabled encryption and equal recordsize). This feature becomes active when first block is cloned. When the last = cloned block is freed, it goes back to the enabled state. END QUOTE I've no clue if that is/will--be different for FreeBSD for some reason. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Apr 12 17:59:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxVp64ynvz45Brv; Wed, 12 Apr 2023 17:59:10 +0000 (UTC) (envelope-from vishwin@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 4PxVp62cWYz4G6r; Wed, 12 Apr 2023 17:59:10 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681322350; 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=3VKUCo+BGNchXOgDloo/l5erhC55aY1fMKMb/9DRwR0=; b=tfaxir22bj6B+mM1AYimCp/uhmTW+vIOk8QV/EZblQ02IFO/p+o/iwxwAjNynFrVD10ZnS J+WyhkwHD1gcWmMXTMqtlG2tcjMH792XjCs5SvdZC40PxqrJudvANzMo7KQ7YPrgyJH1Xk vfQySqRBLvzE4mjf0DkDnCyqtdNnuObXQ4KjknB6TXt3In77LrvN4FvzIbPcOUu/9p3aEP 6ozgwgdYXAXkHj1ixW3w0SE9QYHkrC/FA0HZ4WTs4tCkwNsLp9EOZo+wl9FQiCulaUMjpJ W2Goi7sDYnNsD5U3O4ETPycCdkuWo/X8YV+306Ax8HfQrQA6+i8f5iS16+fk2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681322350; 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=3VKUCo+BGNchXOgDloo/l5erhC55aY1fMKMb/9DRwR0=; b=HutZQI7fGORaN5N8lAxi8SzaEmOwdJo/27uyKWHjvu7rdaN/dn706tGK7Uv5gypH2mFmc4 Xv2S9W01RyVEZn2HOUDuM/rDLcpM8JUzM3q3Se2eDd8sQ0ns5HB0C9D7wbfZbINdWeY+t1 1blctI2C4aCtD8sTmPivuoM/Zu4eQTcRnc5aKnd2gGfmvLmHerNdiLdkxj5/X7y97WbEUE XsGpepx6G5wcoAoX4lM8GfFzERaFB+3npiPcOS4gshWM7Kbcis5BK6aWsF5N8t2DS9E8H3 e+2lUiZoWUf8e0DskZetwB1K226xAgbPtBiY8Dk/02/JFkHQ6OwzDFl7PMfk5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681322350; a=rsa-sha256; cv=none; b=ZCGyuVI4Pw/oP5POAibfOnkEe7JFoseKCz0MR/7sDirZx629KIQFGorelnewKqAtfyhIOK w46pbjs9DbgUmRdG2yJgvIONCHFa/s57YqTmpxp3l2Hd556gaZv+8GrSpFV/hlSrC71Uo7 Ht0wkCNAOWLhBtYE1bJks7pWWStuVq3T/makKKl8dk+lGN0aGBdd1BX39gKQ2AWWmLftjS Mhen6O3SrnG97KIeAc3HNT7r4GWSKwo1pMp8ViDyB3f6h6o0M1/QDtyGSHlPfXg00ahUxo ySuNlhehY5JvSDSfX0Kfzswe3X2bXTuK2/Ub4yk15IK6ooyEnxGd3U+50g4Bzw== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxVp56gkMzK1m; Wed, 12 Apr 2023 17:59:09 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <17b3c870-74b7-17f1-58b2-5cf3cec83ed9@freebsd.org> Date: Wed, 12 Apr 2023 13:59:08 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------MnUgFWqLuY9NIDlS0XF0A82M" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------MnUgFWqLuY9NIDlS0XF0A82M Content-Type: multipart/mixed; boundary="------------9JNG8ljH8pr8IwBq0VmNi9s9"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <17b3c870-74b7-17f1-58b2-5cf3cec83ed9@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> In-Reply-To: <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> --------------9JNG8ljH8pr8IwBq0VmNi9s9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IFRoaXMgaXMgYmVjYXVzZSB5b3VyIHBvb2wgaGFzIHBy ZXZpb3VzbHkgY29ycnVwdGVkIGJsb2Nrcy4gRXZlbiB3aGVuIHlvdSBiYWNrZWQgdXAgdGhl IG9sZCBwb29sLCBjcmVhdGVkIGEgbmV3IHBvb2wgd2l0aG91dCBibG9ja19jbG9uaW5nIGFu ZCByZXN0b3JlZCB5b3VyIGRhdGEsIGJlY2F1c2UgdGhlIGJhY2t1cCBjb250YWluZWQgY29y cnVwdGVkIGJsb2NrcyBmcm9tIHlvdXIgb2xkIHBvb2wsIHRoZXkgd2VyZSByZXN0b3JlZCBh cyBpcy4gWkZTIGNhbiBvbmx5IGZpeCBjb3JydXB0aW9uIGlmIHRoZSBjaGVja3N1bSBzYXlz IGl0J3MgY29ycnVwdC4gQXMgZmFyIGFzIFpGUyB3YXMgY29uY2VybmVkIGF0IHRoZSB0aW1l IHRob3NlIGJsb2NrcyB3ZXJlIG5vdCBjb3JydXB0ZWQuIFlvdSB3aWxsIG5lZWQgdG8gZGVs ZXRlIHRoZSBmaWxlcyB3aXRoIGNvcnJ1cHRpb24gYW5kIHJlY3JlYXRlIHRoZW0uDQo+IA0K QWxsIGZpbGVzIGFuZCBkYXRhc2V0cyBpbnZvbHZlZCBpbiB0aGUgcG91ZHJpZXJlIHNjZW5h cmlvIGFyZSBlbnRpcmVseSANCmZyZXNoIGZvciBldmVyeSBydW4sIGRpc3RmaWxlcyBhcmUg ZnJlc2ggYXQgbGVhc3QgZXZlcnkgYm9vdCANCihESVNURElSPS90bXApLiBObyBjaGFuY2Ug dGhhdCBhbnkgcHJldmlvdXMgc2lsZW50bHkgY29ycnVwdGVkIGZpbGVzIGdvdCANCnJlYWQu DQoNCi0tIA0KQ2hhcmxpZSBMaQ0K4oCmbm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0 IGxpbmUuDQoNCg== --------------9JNG8ljH8pr8IwBq0VmNi9s9-- --------------MnUgFWqLuY9NIDlS0XF0A82M Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ28WwFAwAAAAAACgkQ/reFK+KbPody thAAgm2TkY7UQzQRByhagcHOcxs9EFntrFcx4u0vtnnSzAtUxt4pZHumNZbLdQD5GDpS+gyzjex6 IIKqAKrdX1bECL/sixqNIeaGNMABh8b8+BXouTL/qH+Js5pXwze+ME5BlaXSgVl2MOg6WlNK60d/ 1i6S7PxmzxhMH+hQmsqNEsQp0jQT/8pi72wtEEE66rJ+fyouWMlhxgdYd8MxE5wikWS/H2WPJXvm bHx3RCxZQ/co3RnuQY6C/TLonZIJG9iz+yNoHlLx3mMKd72iJktOaYSERj6W36Y4W4Ib3mhG3rio ysJ6I+juQwJanUpmCfSUz4NKGmxij15YLK9SGTinVnswVn4at+3vYbWvjepwW5FDz+MP+OWgjArK MW+UADgz/9LzE+Udi9GHkO9KAK8v7F2UFC8KS/jDM7F7mPE07jAp3aRz1mwcSTr0YNP/jwl9qIY7 sC98YCqhsdwlLrf1SE0NIgDxoOSMZ7kAwgJGmaFYbOXd/4hMbaRdMuoexNLBmHMv7Ng3bGVw9IOv DzrcsUxG11tF86xk8JXyvvL+ggfam63dS53HiG/MpTUZSKONhPkeqkWxtQGsNzw/D3WjdQYeFZX8 Csdx1Abs633yW0wGGVy6i/o3khZrywWc0veaA71G9L5yzINg1t3uj3lsdkZ+e7imdG9+ZdNh7fif xO8= =kHR9 -----END PGP SIGNATURE----- --------------MnUgFWqLuY9NIDlS0XF0A82M-- From nobody Wed Apr 12 18:14:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxW8K6cBGz44SyY for ; Wed, 12 Apr 2023 18:14:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxW8K68hPz3Ltj for ; Wed, 12 Apr 2023 18:14:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id meBjp8LPQjvm1mezhp86Ps; Wed, 12 Apr 2023 18:14:57 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mezfpFjpVHFsOmezgpRyla; Wed, 12 Apr 2023 18:14:57 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=6436f521 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=-yz_V462AAAA:8 a=qF6jAoLqAAAA:8 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Yv0Jm5usbdrTkC8sZ9gA:9 a=QEXdDO2ut3YA:10 a=1eAojV_PCUoA:10 a=mbJVFO_RAaaqJwqGRO5a:22 a=n8SRK0I9JfLwxYerQcLn:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (unknown [209.52.88.98]) by spqr.komquats.com (Postfix) with ESMTPSA id 6C947473; Wed, 12 Apr 2023 11:14:55 -0700 (PDT) Date: Wed, 12 Apr 2023 11:14:53 -0700 From: Cy Schubert To: Mark Millard , dev-commits-src-main@freebsd.org CC: vishwin@freebsd.or Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: <72115147-BA5F-44CA-9DD5-D84CC4BE626F@yahoo.com> References: <72115147-BA5F-44CA-9DD5-D84CC4BE626F.ref@yahoo.com> <72115147-BA5F-44CA-9DD5-D84CC4BE626F@yahoo.com> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfE9WtK/6e2m5lf7AOh6HvQzKR2B4DxtB/07pZB8FSSocsvcQTwmN8/rOVpY9KWcG2Azck1yeO2kXe1ZTs3fdF3Nm0UDRNRcyBaPpGxLafOqjAZNElb1o QUUKjw37K7NR4LP9midrFVrug5hk+jSXi5Q4xBrccsqVHjM7VNAJ9y4im7nZDOKsY4Jbw1KJlWW8+zQzfrDgg/YFQ+XsKTgsv3scrz4nOEjHZeadfcEf12rs IZ5YSlOnTQS1A6mOHcwneA== X-Rspamd-Queue-Id: 4PxW8K68hPz3Ltj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 12, 2023 10:41:17 AM PDT, Mark Millard wrote= : >From: Cy Schubert wrote on >Date: Wed, 12 Apr 2023 16:54:59 UTC : > >> =2E =2E =2E >>=20 >> You need to copy from/to the same dataset to reproduce the problem=2E C= opying from a source dataset to a different dataset will avoid block_clonin= g=2E > > >https://openzfs=2Egithub=2Eio/openzfs-docs/man/7/zpool-features=2E7=2Ehtm= l reports: > >QUOTE >block_cloning >=2E =2E =2E >=2E =2E =2E Blocks can be cloned across datasets under some conditions (l= ike disabled encryption and equal recordsize)=2E > >This feature becomes active when first block is cloned=2E When the last c= loned block is freed, it goes back to the enabled state=2E >END QUOTE > >I've no clue if that is/will--be different for FreeBSD for some reason=2E > >=3D=3D=3D >Mark Millard >marklmi at yahoo=2Ecom > Looking at the patch on GH, this would also affect linux=2E --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Wed Apr 12 18:28:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWRf5mXBz44V6Y; Wed, 12 Apr 2023 18:28:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxWRf3dvpz41Fr; Wed, 12 Apr 2023 18:28:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id mX64p7g51jvm1mfCXp89lX; Wed, 12 Apr 2023 18:28:13 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mfCVpSVBV3fOSmfCWpclJQ; Wed, 12 Apr 2023 18:28:13 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=6436f83d a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=pGLkceISAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=fWrN1aOx0V_uFX-ik18A:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (unknown [24.244.23.74]) by spqr.komquats.com (Postfix) with ESMTPSA id 6FE944A0; Wed, 12 Apr 2023 11:28:11 -0700 (PDT) Date: Wed, 12 Apr 2023 11:28:09 -0700 From: Cy Schubert To: Mateusz Guzik , Charlie Li CC: Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfKxliIYCUSnWpKg0ljHuwee4+Kk/M+HXhhJAtgbPkz0IRisxW1CTtMIuFRPaVi8xTzkVidJkjVgksP/c8NZ/FjFTOj4RIygPPkHwxkTRnbn5htZpVju1 9ZrAVwy+6v3v1Z8Mtto+1OxSdX1yhO0x0rpHMcie5GwoqMsKGion6Xb2elICLxSE83IhGSKgaOUe1BEr8oyBCPqBE0DHKfB0CD5hQZczSCTZoRGVlqf42sLw JszW1HAKvdhnpElzD1QLD+ovpz6J/WxrCs6MQuRo8Sw67jA8gNBZ2LncJ6NWVSwekjMb5eATlL13jDwvJ8gDgZoK0cotiLYa6udABjh2NvFu8bKGS7x/a1V/ uJoxg5kk7lkBe9K8f8kqoC0H/4QP74X7BDT/bzgYSax+FCIbsxU+zfYQvnX5/cpZ19K0o9g+ X-Rspamd-Queue-Id: 4PxWRf3dvpz41Fr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On April 12, 2023 10:28:26 AM PDT, Mateusz Guzik wrot= e: >can you please test poudriere with >https://github=2Ecom/openzfs/zfs/pull/14739/files > >On 4/12/23, Charlie Li wrote: >> Charlie Li wrote: >>> Cy Schubert wrote: >>>> On April 12, 2023 8:51:09 AM PDT, Charlie Li >>>> wrote: >>>>> Cy Schubert wrote: >>>>>> I have a "sandhbox" pool, called t, used for /usr/obj and ports >>>>>> wrkdirs, and other writes I can easily recreate on my laptop=2E Her= e >>>>>> are the results of my tests=2E >>>>>> >>>>>> Method: >>>>>> >>>>>> Initially I copied my /usr/obj from my two build machines (one >>>>>> amd64=2Eamd64 and an i386=2Ei386) to my "sandbox" zpool=2E >>>>>> >>>>>> Next, with block_cloning disabled I did cp -R of the /usr/obj test >>>>>> files=2E Then a diff -qr=2E They source and target directories were= the >>>>>> same=2E >>>>>> >>>>>> Next, I cleaned up (rm -rf) the target directory to prepare for the >>>>>> block_clone enabled test=2E >>>>>> >>>>>> Next, I did zpool checkpoint t=2E After this, zpool upgrade t=2E Po= ol t >>>>>> now has block_cloning enabled=2E >>>>>> >>>>>> I repeated the cp -R test from above followed by a diff -qr=2E Almo= st >>>>>> every file was different=2E The pool was corrupted=2E >>>>>> >>>>>> I restored the pool by the following removing the corruption: >>>>>> >>>>>> >>>>>> slippy# zpool export t >>>>>> slippy# zpool import --rewind-to-checkpoint t >>>>>> slippy# >>>>>> >>>>>> It is recommended that people avoid upgrading their zpools until th= e >>>>>> problem is fixed=2E >>>>>> >>>>> As of af7624ed3145, I just did this with an md(4)-backed test pool, >>>>> though with the second `cp -R` landing in a separate dataset, create= d >>>>> and destroyed for each test=2E No corruption either way=2E However, = my >>>>> poudriere builds still output/package corrupted files (particularly >>>>> those with null characters), probably after install(1) invocations >>>>> (not cp(1))=2E >>>>> >>>> >>>> You need to copy from/to the same dataset to reproduce the problem=2E >>>> Copying from a source dataset to a different dataset will avoid >>>> block_cloning=2E >>>> >>> Got the corruption now=2E >>> >> Clarify: no corruption without block_cloning, corruption with=2E >> >> What is still a mystery to me is how corruption happens even without >> block_cloning in the poudriere scenario=2E cp(1)/install(1) always happ= en >> within the same dataset, as this test=2E >> >> -- >> Charlie Li >> =E2=80=A6nope, still don't have an exit line=2E >> >> > > I'll test this on my scratch pool later today or tomorrow as I'm afk atm= =2E (Bottom posted because the app is configured so=2E) --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Wed Apr 12 18:28:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWSY6xWCz44VRw; Wed, 12 Apr 2023 18:29:01 +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 4PxWSX5x7Hz42WX; Wed, 12 Apr 2023 18:29:00 +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 e9so42157412ljq.4; Wed, 12 Apr 2023 11:29:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681324138; x=1683916138; h=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=DUDnuejdW7w2U1wJ+pDyM2CpWAreccXWayvr804iIy4=; b=Gm/kH1/F+/G7XUbbNR221hsjmqXnDG1kNZ9ePG7Z9JrBWSf4NTqGrrLP5FuLD4LxVL Pf/WA4A98Sr0Vxhrt21HdIZ468JXAbjBSRUBOAQh+18VgKW000jrP2fWIAhO4rp61vnH u0Vuq8bH7ptavM9WWad2zbt1TTYRtjB6UWlSCyzpbNqSO+VAVUD2toflO6PlACCfdF99 BMlZkaLXIbuWwhpq1K/5gxKR/fGL5rVCFNvKieZLZNc98QZXWENSHK0v5LSF5fYv3dF5 mmpf88Ezd3ip9kASc8nGSGifqcfAx0W8qRnbjXuu4qH96nN2nNenhtmqQeQ6pXTi9WLW BJzg== X-Gm-Message-State: AAQBX9fjYcz0S2ezq1Bj72yzcw3rTpXzFHwrquHN3TzWy7OrV5wuuoxE +tMS0vpB0yCA2PMQAF75uqgU1qmRcXRUqCk/GtxmY09f X-Google-Smtp-Source: AKy350azswhV09MvXNv/MdmkcM/oq8uK14y623y6O1SlN+1Mn/7pXN4U3FAM3gqYoE+PMQHGAbICml1RLCYSVY7DSCQ= X-Received: by 2002:a2e:3503:0:b0:2a7:a248:6840 with SMTP id z3-20020a2e3503000000b002a7a2486840mr773260ljz.8.1681324138033; Wed, 12 Apr 2023 11:28:58 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202302241821.31OIL4ux075893@gitrepo.freebsd.org> <20230224205001.Fbn1A%steffen@sdaoden.eu> <20230225012736.PT3cH%steffen@sdaoden.eu> <20230225222952.t3oH3%steffen@sdaoden.eu> <20230227205125.wT7DI%steffen@sdaoden.eu> In-Reply-To: <20230227205125.wT7DI%steffen@sdaoden.eu> From: Ed Maste Date: Wed, 12 Apr 2023 14:28:45 -0400 Message-ID: Subject: Re: git: 2c709ee70ade - main - libc: handle zero alignment in memalign() To: Ed Maste , 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-Result: default: False [0.26 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.98)[0.984]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; NEURAL_SPAM_MEDIUM(0.28)[0.280]; 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)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.179:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4PxWSX5x7Hz42WX X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N On Mon, 27 Feb 2023 at 15:51, Steffen Nurpmeso wrote: > > This is what happens when one mutilates the email quote context. I'm not sure what you mean here. This thread is in response to my commit that modified memalign() which exists for glibc compatibility. Whatever posix_memalign is specified to do is irrelevant. From nobody Wed Apr 12 18:33:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWYY1KsKz44VqT; Wed, 12 Apr 2023 18:33: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 4PxWYY0N3xz4BLL; Wed, 12 Apr 2023 18:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YCr3CUJWSrIv4t8Ncv7fgELT4Pr4By6ibt4Wn2fp3s=; b=Q1TB4ePr/JIBCRsWOEuctqGhXOIL0wTItBYsGnaDP8/xyLCPPNUmXatlF0Ch1Xsqa8vbg3 8I3LqoiuFSR2E+9KFYyWYvkWJ6pNcB4+D4XrlFofOy5uPrvYRmJZjgKDZOuwMjLlyLfx5n /O8UXj3pASmScINRkl6xf8SAYKMgZnaOtPZyivchDH0veRVJQe69sjq6mJc7fUfdYAVoDo WNSlvKr+Y6oYXdZP49dc4VR2VDE3la2nLthqa3mrSr0RwvQB+8KLc+T4/B/y6nn7cw42Zt wyVqG0JL3y/crhC5C5DHBYEWMyi+M0hkF8HGQqmE0fKtxJMrHp8pcj3B3urXYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YCr3CUJWSrIv4t8Ncv7fgELT4Pr4By6ibt4Wn2fp3s=; b=BlNNMk8Cf+FTrpgjEUOSX3oiuRVLLDrWz+6GCjV62gmLteXa7SArYKR3qbFEX0bgkTN+WR LgCJFuZsjDXq7QYjWmluZapGL1UalSOEhDo3ee1xmOFAYjch0G2VPyyWSMxamjLOWPBRBa jGydM9GYrtmmIl/l4QgRf8xcJ0zSLCU0+nljSSexJ1tR2Q/8K1irmhJmVaRXC8/HeqIkhv uJjjAYVJvkMDPQZDeNjY7PtHY356oiXrfJcfKSnaN7D+g//dH84sOIqiGcukXWs/WZ4c6D +DSyn0VzPgTCyiANp2q9U8NHFT1pyBgP9FyRGuab/2ooBOGBdpVMiU1OD8ZVZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681324401; a=rsa-sha256; cv=none; b=iALjiNv7duslKb+gXM8SIOfoLJ4irQAUV6t+OovWGrvU4CHJKEl/HjJc8775lMCdTdEice wGLwWDJe0VKZEysyd3hJT5Ztmzn3Be587xAKNVMsmm8gGXzw71pvZ4DAhVOVee8BLgMot2 SlxAGztW1tOk3SCZrU0ya/SrXubxCTZGDjrEBr8ODHD1BthG1+neFjGaNCqw3dXt42KHXU yFAEaikljkz9wtOhBWwcoWM+uAvyW3bwWElmrry7o2Wr4XPkRZwcwk/NtWm/rjuxYRbi8f Y2oXmO1Am6PgD+NPxXsMyLkmpgyi4jf23AUSlxUgO1fasrFP3xBE4BbMhRUI+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 4PxWYX6XQ4z19y1; Wed, 12 Apr 2023 18:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CIXKv1098765; Wed, 12 Apr 2023 18:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CIXK2l098763; Wed, 12 Apr 2023 18:33:20 GMT (envelope-from git) Date: Wed, 12 Apr 2023 18:33:20 GMT Message-Id: <202304121833.33CIXK2l098763@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: 1ca12bd927d7 - main - Remove the riscv64sf architecture. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ca12bd927d76f5a1b9aad2c72f673a3b01919c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1ca12bd927d76f5a1b9aad2c72f673a3b01919c0 commit 1ca12bd927d76f5a1b9aad2c72f673a3b01919c0 Author: John Baldwin AuthorDate: 2023-04-12 18:09:27 +0000 Commit: John Baldwin CommitDate: 2023-04-12 18:09:27 +0000 Remove the riscv64sf architecture. Reviewed by: jrtc27, arichardson, br, kp, imp, emaste Differential Revision: https://reviews.freebsd.org/D39496 --- Makefile | 2 +- Makefile.inc1 | 3 +-- share/man/man7/arch.7 | 9 ++------- share/mk/local.meta.sys.mk | 2 +- share/mk/sys.mk | 2 +- sys/conf/kern.mk | 1 - sys/riscv/include/param.h | 8 +------- tools/boot/universe.sh | 2 +- 8 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 4e474ad04e61..8232041e0a35 100644 --- a/Makefile +++ b/Makefile @@ -525,7 +525,7 @@ _UNIVERSE_TARGETS= ${TARGETS} TARGET_ARCHES_arm?= armv6 armv7 TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} -TARGET_ARCHES_riscv?= riscv64 riscv64sf +TARGET_ARCHES_riscv?= riscv64 .for target in ${TARGETS} TARGET_ARCHES_${target}?= ${target} .endfor diff --git a/Makefile.inc1 b/Makefile.inc1 index 471267b3435f..e131cc463bc8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -148,8 +148,7 @@ KNOWN_ARCHES?= aarch64/arm64 \ powerpc64/powerpc \ powerpc64le/powerpc \ powerpcspe/powerpc \ - riscv64/riscv \ - riscv64sf/riscv + riscv64/riscv .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index e8d43d185a08..cd341fcd217b 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -97,7 +97,6 @@ release to support each architecture. .It powerpc64 Ta 9.0 .It powerpc64le Ta 13.0 .It riscv64 Ta 12.0 -.It riscv64sf Ta 12.0 .El .Pp Discontinued architectures are shown in the following table. @@ -117,6 +116,7 @@ Discontinued architectures are shown in the following table. .It mips64elhf Ta 12.0 Ta 13.x .It mips64hf Ta 12.0 Ta 13.x .It pc98 Ta 2.2 Ta 11.4 +.It riscv64sf Ta 12.0 Ta 13.x .It sparc64 Ta 5.0 Ta 12.x .El .Ss Type sizes @@ -205,7 +205,6 @@ Machine-dependent type sizes: .It powerpc64 Ta 8 Ta 8 Ta 8 .It powerpc64le Ta 8 Ta 8 Ta 8 .It riscv64 Ta 8 Ta 16 Ta 8 -.It riscv64sf Ta 8 Ta 16 Ta 8 .El .Pp .Sy time_t @@ -223,7 +222,6 @@ is 8 bytes on all supported architectures except i386. .It powerpc64 Ta big Ta unsigned .It powerpc64le Ta little Ta unsigned .It riscv64 Ta little Ta signed -.It riscv64sf Ta little Ta signed .El .Ss Page Size .Bl -column -offset indent "Architecture" "Page Sizes" @@ -238,7 +236,6 @@ is 8 bytes on all supported architectures except i386. .It powerpc64 Ta 4K .It powerpc64le Ta 4K .It riscv64 Ta 4K, 2M, 1G -.It riscv64sf Ta 4K, 2M, 1G .El .Ss Floating Point .Bl -column -offset indent "Architecture" "float, double" "long double" @@ -253,7 +250,6 @@ is 8 bytes on all supported architectures except i386. .It powerpc64 Ta hard Ta hard, double precision .It powerpc64le Ta hard Ta hard, double precision .It riscv64 Ta hard Ta hard, quad precision -.It riscv64sf Ta soft Ta soft, quad precision .El .Ss Default Tool Chain .Fx @@ -285,7 +281,7 @@ or similar things like boot sequences. .It arm Ta arm Ta armv6, armv7 .It i386 Ta i386 Ta i386 .It powerpc Ta powerpc Ta powerpc, powerpcspe, powerpc64, powerpc64le -.It riscv Ta riscv Ta riscv64, riscv64sf +.It riscv Ta riscv Ta riscv64 .El .Ss Predefined Macros The compiler provides a number of predefined macros. @@ -322,7 +318,6 @@ Architecture-specific macros: .It powerpc64 Ta Dv __powerpc__ , Dv __powerpc64__ .It powerpc64le Ta Dv __powerpc__ , Dv __powerpc64__ .It riscv64 Ta Dv __riscv , Dv __riscv_xlen == 64 -.It riscv64sf Ta Dv __riscv , Dv __riscv_xlen == 64 , Dv __riscv_float_abi_soft .El .Pp Compilers may define additional variants of architecture-specific macros. diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index fc28b83d82cc..5e477885e1e2 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -17,7 +17,7 @@ MK_INSTALL_AS_USER= yes TARGET_ARCHES_arm?= arm armv6 armv7 TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?= riscv64 riscv64sf +TARGET_ARCHES_riscv?= riscv64 # some corner cases BOOT_MACHINE_DIR.amd64 = boot/i386 diff --git a/share/mk/sys.mk b/share/mk/sys.mk index cddbb0da584c..1ab0022ddc21 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -13,7 +13,7 @@ unix ?= We run FreeBSD, not UNIX. # and/or endian. This is called MACHINE_CPU in NetBSD, but that's used # for something different in FreeBSD. # -__TO_CPUARCH=C/arm(v[67])?/arm/:C/powerpc(64|64le|spe)/powerpc/:C/riscv64(sf)?/riscv/ +__TO_CPUARCH=C/arm(v[67])?/arm/:C/powerpc(64|64le|spe)/powerpc/:C/riscv64/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} .endif diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index b7f89c78d19d..9040fced6cba 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -331,5 +331,4 @@ LD_EMULATION_powerpcspe= elf32ppc_fbsd LD_EMULATION_powerpc64= elf64ppc_fbsd LD_EMULATION_powerpc64le= elf64lppc_fbsd LD_EMULATION_riscv64= elf64lriscv -LD_EMULATION_riscv64sf= elf64lriscv LD_EMULATION=${LD_EMULATION_${MACHINE_ARCH}} diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h index 70f8ecde971b..56fe9530b76d 100644 --- a/sys/riscv/include/param.h +++ b/sys/riscv/include/param.h @@ -48,16 +48,10 @@ #define MACHINE "riscv" #endif #ifndef MACHINE_ARCH - -/* Always use the hard-float arch for the kernel. */ -#if !defined(_KERNEL) && defined(__riscv_float_abi_soft) -#define MACHINE_ARCH "riscv64sf" -#else #define MACHINE_ARCH "riscv64" #endif -#endif #ifdef _KERNEL -#define MACHINE_ARCHES "riscv64 riscv64sf" +#define MACHINE_ARCHES "riscv64" #endif #ifdef SMP diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index 20b89fb5dfe4..359c9d88d5df 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -5,7 +5,7 @@ # # Full list of all arches we don't build. # -# powerpc/powerpcspe riscv/riscv64sf arm/armv6 +# powerpc/powerpcspe arm/armv6 # # This script is expected to be run in stand (though you could run it anywhere # in the tree). It does a full clean build. For stand you can do all the archs in From nobody Wed Apr 12 18:33:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWYb3jnlz44VxR; Wed, 12 Apr 2023 18:33: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 4PxWYZ2JzFz4CTY; Wed, 12 Apr 2023 18:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXmwBa0zOXiWfUZM+QO19jj730nLB2aBez8OCGGtPDg=; b=u1PHA0LhbZTHbcLr3ql7T7cP/Pbvx6em1XjgZR7t0dnRkzFAGQEei8TdalQ1k2cTrVbJgN bOXoSKIOQ3cEGN2snYZx/TU7unLQV+EROO68B7ttDNvcygkx/H8OB4F75rGaRlzHV7q1+B S+9z6tiJsaD9AgzqI+OxSeE9l2o+KYO0zMt7d5U3N044Ofhq63VSE9zR6gvcs6xff7ycG8 AkCCecqObn5cBzRCgwipVs3IuC6rIVgS7tYoHIVGe1P2aj57eWc3LXyWAibxXDnB83cGOJ iTASf4JidZJIMlGisIVUGpFZ5ex1/r5JGua+sMyShDxKwDzLhp8XPwQ68Zs8xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXmwBa0zOXiWfUZM+QO19jj730nLB2aBez8OCGGtPDg=; b=Mn8ofoKD4VD0aTktHOKIx7wvJl3Fah76U4vUtwga9WFSdo7auTJ20FGiLmPpad6usyLMQB EHbb1Ghf1oknalDg7QfYebUajcrJKlsSbRdBfUL4RBiLIVGA9VQGLTQ95hJF4byFucSCCp SlR8vD1iiu5+BdHwYYS6IpRZoKYjpqIMNVpbiANHMXbvpR+F9/B8/a5ikneUpQOEZg1v6Z yL2xQDJ2eqvzqkpUwd/e2CXbfoLrIfhh4augXXpu7iqIjwioSYkMfa0ioHQJ/Qg+JrYlLM YcndbtRI4UdMz00ldc7spE++RUucwvp1eoi8achnu+uWaIB1Ig0JqgHQLs6LnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681324402; a=rsa-sha256; cv=none; b=G1kUbK2RpXFBxhYnWsvz6bDY3Ecw1TQlSa6V6JFQ3f1muYG0dTVHkEe6tOVRcGHOnzZcs9 IdZjONqm8v9LBmFU8Zh/TsW1S824IA9sOKkyGT8MN0qd6ohR2WhB7DMa/tWxTBK+waYbvc JB44pukzGbTdngsXw9Bne0JjiLyhGTLv/rt7XN27tLYOQ8cOfKMoyyND5YSM4P4Yk1xmLX kFLM/M7ypc/XMmabp+9ZEseSGbRz2XM4obEqrerMrwxYszxmJUQEnEyMsXgEOjdLE974IU 0zldlqAfrVsYtqv1mgkBBN+AkPLrzU3/nZ1MiPUN62VaXZxah83qX8aYXonY6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxWYZ0KnLz19S5; Wed, 12 Apr 2023 18:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CIXLMd098789; Wed, 12 Apr 2023 18:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CIXLrX098788; Wed, 12 Apr 2023 18:33:21 GMT (envelope-from git) Date: Wed, 12 Apr 2023 18:33:21 GMT Message-Id: <202304121833.33CIXLrX098788@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: d27cc0683872 - main - src.conf.5: Regen after removal of riscv64sf. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d27cc068387286b21c51ceac496c227986698790 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d27cc068387286b21c51ceac496c227986698790 commit d27cc068387286b21c51ceac496c227986698790 Author: John Baldwin AuthorDate: 2023-04-12 18:10:37 +0000 Commit: John Baldwin CommitDate: 2023-04-12 18:10:37 +0000 src.conf.5: Regen after removal of riscv64sf. --- share/man/man5/src.conf.5 | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ff287a5b017e..a4f93d35af8d 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd April 5, 2023 +.Dd April 12, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -460,7 +460,7 @@ Do not build .Xr cxgbetool 8 .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_CXGBETOOL Build .Xr cxgbetool 8 @@ -612,7 +612,7 @@ and .Xr efivar 8 . .Pp This is a default setting on -powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_EFI Build .Xr efivar 3 @@ -646,7 +646,7 @@ Build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_FILE Do not build .Xr file 1 @@ -712,7 +712,7 @@ Do not build HTML docs. Do not build or install HyperV utilities. .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_HYPERV Build or install HyperV utilities. .Pp @@ -872,7 +872,7 @@ On 64-bit platforms, do not build 32-bit library set and a runtime linker. .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_LIB32 On 64-bit platforms, build the 32-bit library set and a .Nm ld-elf32.so.1 @@ -886,7 +886,7 @@ Do not build LLVM's lld linker. Do not build the LLDB debugger. .Pp This is a default setting on -arm/armv6, arm/armv7, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7 and riscv/riscv64. .It Va WITH_LLDB Build the LLDB debugger. .Pp @@ -1001,12 +1001,12 @@ powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpc64le. Build GELI bootloader support. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITHOUT_LOADER_KBOOT Do not build kboot, a linuxboot environment loader .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_LOADER_KBOOT Build kboot, a linuxboot environment loader .Pp @@ -1021,12 +1021,12 @@ powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpc64le. Build LUA bindings for the boot loader. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITHOUT_LOADER_OFW Disable building of openfirmware bootloader components. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITH_LOADER_OFW Build openfirmware bootloader components. .Pp @@ -1036,7 +1036,7 @@ powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpc64le. Disable building of ubldr. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_LOADER_UBOOT Build ubldr. .Pp @@ -1218,7 +1218,7 @@ Do not build .Xr mlx5tool 8 .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_MLX5TOOL Build .Xr mlx5tool 8 @@ -1256,7 +1256,7 @@ interfaces instead of .Xr snl 3 . .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_NIS Do not build .Xr NIS 8 @@ -1292,7 +1292,7 @@ and related programs. Do not build nvme related tools and kernel modules. .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_NVME Build nvme related tools and kernel modules. .Pp @@ -1317,7 +1317,7 @@ Build the InfiniBand software stack, including kernel modules and userspace libraries. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_OFED_EXTRA Build the non-essential components of the .Dq "OpenFabrics Enterprise Distribution" @@ -1333,7 +1333,7 @@ arm/armv6, arm/armv7 and powerpc/powerpc. Build LLVM's OpenMP runtime. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_OPENSSH Do not build OpenSSH. .It Va WITHOUT_OPENSSL @@ -1377,7 +1377,7 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, i386/i386, powerpc/powerpc and riscv/riscv64. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp @@ -1420,7 +1420,7 @@ Build dynamically linked binaries as Position-Independent Executable (PIE). .Pp This is a default setting on -amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_PKGBOOTSTRAP Do not build .Xr pkg 7 From nobody Wed Apr 12 18:33:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWYc0jPMz44Vdp; Wed, 12 Apr 2023 18:33: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 4PxWYb26cWz4CZs; Wed, 12 Apr 2023 18:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i12D4xkfXIYBgzYcHLPkcdhXD8qbdZl9pNA8uEHcgrE=; b=QHfiyxG19lhJKPuX6P4bQZ/HJQj/ish32sJG417NtICv80cu3SXlOQjnGiPg+BpMbTV85Z ZFFC8tffKezQZaEahuYPyHt+i4UrgnRpFI1o55KPqz72BAeo3R6WwI71+gBxz+HM0S8Hht pQnbqvVJZ4VrtnvP1j43vwkl9OHIAVPQjjLoo2WNmXXqw/h04EvktKJpkrCoZuFhRAwN+r 4852bvDm+Bjg9FzpBbXUSFq0VbLN/tagKN9FaxNsTHXOXadr0T64kBdpNqtgMenav1hWnc ZTho0J3m2iIQWHc4GlGmWad9UruJHzgBHDxpWZyX5S56JmIjdWZVIqnDuofC7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i12D4xkfXIYBgzYcHLPkcdhXD8qbdZl9pNA8uEHcgrE=; b=RAW4U7nFYqr8QL7dsYY0YRi73KdFWoFyqXJRXdoctwU3/7XD8mVGOVKo/U91RyQtgdZRYK sdqGWqAokL7moLzEH58nf41kJsmlMQv4zuVEcWuoy91jn55dYbckZsS5qzHG4S7ElW4zTI Pll2SK8A1zJ7Jv/EtdvT/T6H/Pg0r2726npWP5nPEoSx8ryixkWrPpLx1Vt5DgxsagLkEn 20WNF5QtawE+iN4N1nFObeqEGibW4ARBGgXdTleFP8WsC0LkLcm3T0ugY8whRLWeaIz59m PCgqwdwPj5TeL4+VUCIkPiSGkqC8mHEK7NqciAwB5tCv+5ESpQNnnZqrmmEpQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681324403; a=rsa-sha256; cv=none; b=krn33SihPJA2lwky8heFNtN4ZtdYx/S0HtVdEdK/wtdiGjmSJDHGoFdhnsnDc8OMc79nPQ 9sJfhTdoeVM4pF6lVvPlRo2soAnEpaIN0itdaNvmaz8YCZuZCWyRcRe4dNTjZGfSggZa/z VFFb9vAx2DY64BdVvpVa3d2YkAhOGs5YS5nHmRf0i7DFODn9wMQPwzdqIwIhM37b099Zub WM+txRHIcia2EGiCi/nLPeO5dZpqjxYBXjBnAeMO0UAf+/xSaecUYypUYVrKfL0S2h208/ 1HNLcmLV9tmnfXJuT03258Qas8zPwWiKLf9FKywtwuGPZY6ael9BuWxzUAph6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxWYb12Qhz19YK; Wed, 12 Apr 2023 18:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CIXNFV098808; Wed, 12 Apr 2023 18:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CIXNWU098807; Wed, 12 Apr 2023 18:33:23 GMT (envelope-from git) Date: Wed, 12 Apr 2023 18:33:23 GMT Message-Id: <202304121833.33CIXNWU098807@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: 10172ce32c8f - main - Stop stripping 'sf' suffixes from architecture names. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10172ce32c8f2f419ede51b675ed4d30036ef339 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10172ce32c8f2f419ede51b675ed4d30036ef339 commit 10172ce32c8f2f419ede51b675ed4d30036ef339 Author: John Baldwin AuthorDate: 2023-04-12 18:11:02 +0000 Commit: John Baldwin CommitDate: 2023-04-12 18:11:02 +0000 Stop stripping 'sf' suffixes from architecture names. riscv64sf was the only architecture with an 'sf' suffix. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D39497 --- Makefile.inc1 | 4 ++-- lib/clang/llvm.build.mk | 4 ++-- lib/libclang_rt/compiler-rt-vars.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e131cc463bc8..60956d58fd9b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -136,9 +136,9 @@ TARGET_TRIPLE_ABI= gnueabi .endif .endif MACHINE_TRIPLE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} TARGET_TRIPLE_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_TRIPLE_ABI}-freebsd${OS_REVISION} +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/}-${TARGET_TRIPLE_ABI}-freebsd${OS_REVISION} KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index d958a4becc63..609f729430fa 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} -LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk index 5658b94b312d..4515d8c98a28 100644 --- a/lib/libclang_rt/compiler-rt-vars.mk +++ b/lib/libclang_rt/compiler-rt-vars.mk @@ -9,7 +9,7 @@ SANITIZER_SHAREDIR= ${CLANGDIR}/share (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") CRTARCH?= armhf .else -CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//} +CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/} .endif .if ${COMPILER_TYPE} == "clang" From nobody Wed Apr 12 18:36:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxWcs1WR8z44WBp; Wed, 12 Apr 2023 18:36: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 4PxWcs0yt2z4JCQ; Wed, 12 Apr 2023 18:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUffPrC+zYmZXKoqBDXcAWWiHjjxPmcco5ciPrYpMc4=; b=pC5o978IhRJlJ0LjJtnPv/sbg2r/bXqyr8iV30rzObTsczwjR8gECSZSrISH3oAfkFVX3t L6x8bUxsg5f5UcGjeoh18Xg3k3x4pm++83T/9QKK/phZfqgliRc/cmdKJNsR9JZipGPd0j FMOQ3aDqZlaW2iehHiAeWPD47ROVZtsRnCkeu1aIZmQIxOT2bz5NXbpaoCEaIOdem/S+ks r5UHpiZ6uw7uqweF4Q4DefbgugoPc91ZohE2P4WQFcZQvTjoR7LKK8ZRo1cWBGP2I/LzZJ P8/2GfzOILaz5Tq/FpBw9NwOku4qD23fpNbcxQCLOwyE3/92gtAVe5Pwo65NVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUffPrC+zYmZXKoqBDXcAWWiHjjxPmcco5ciPrYpMc4=; b=q+UApURu4ADZMHTYssNcvFnr2XuM1wyYuXNdNp1I9/d/THQKzNvQ13EGxh9bUFDOePFapL CLGaEQ7wOL3qzemhxkEMXSLiF3iC7YDY46QsxMV3v9a3XQt9aAb1To7WrsL6BZVRgEzp6w LfCGpALpzA2tWvjPuEPe0OYE4JpLyTs76sHJCKfJ8+2fzfoXIxwiJp5IyUTwkPLNoSQH0q ALixIE0tEhvoRriVYQqa1PfeFTk3iEuAZ3UmzYFydoJET6rPYsat71AolsT83mQVrqRSJS bDpBcE1jFyuIxGp4MnylePuikFpP65ogwXsT3CAWs/ZZ62z7ZdNYZMucSIhEnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681324573; a=rsa-sha256; cv=none; b=ZxIq7ZV72+EdV+8urZ/w57lOKUdXhvroKPQC5FyxdH0yhc1Vg98fxef5OwS8qjjfjMqpLG eeyhWSXh46FCfpU+ULTZZW9M7qMDB2nFomg+QpBefMAdHNmNa2ZXF8tI6kE+B/J5NtUak3 d1UmakhNx1sm1uE8Vz7IEggQ6NZlVCYmyC7qPov36e6wclWOzU8h2nJFSAk3CIluQ2FNQI ERlAGnxQwv8qfhdIZ7bVvSoGGw4c9c/UkKqeEIdsOdq/9wsjpeW3k3lIuTxROfgXHhHtlN x8XAA91lN5ZTD9D9bpg3B2WNzZkfAlAq38fnd8nErrnHEfK09aT14VMrYasXug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxWcs02Rdz1B1D; Wed, 12 Apr 2023 18:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CIaC8G099414; Wed, 12 Apr 2023 18:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CIaCP0099413; Wed, 12 Apr 2023 18:36:12 GMT (envelope-from git) Date: Wed, 12 Apr 2023 18:36:12 GMT Message-Id: <202304121836.33CIaCP0099413@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: e1ff83fb1915 - main - arch.7: Bump Dd after removal of riscv64sf. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1ff83fb191511f771e7d34999d3b8df5441bd4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e1ff83fb191511f771e7d34999d3b8df5441bd4a commit e1ff83fb191511f771e7d34999d3b8df5441bd4a Author: John Baldwin AuthorDate: 2023-04-12 18:35:33 +0000 Commit: John Baldwin CommitDate: 2023-04-12 18:35:33 +0000 arch.7: Bump Dd after removal of riscv64sf. Pointy hat to: jhb --- share/man/man7/arch.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index cd341fcd217b..e0450e693a88 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2023 +.Dd April 12, 2023 .Dt ARCH 7 .Os .Sh NAME From nobody Wed Apr 12 19:01:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxX9n1dCpz44YJ6; Wed, 12 Apr 2023 19:01:17 +0000 (UTC) (envelope-from vishwin@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 4PxX9n1BM8z3jdD; Wed, 12 Apr 2023 19:01:17 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681326077; 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=EBlwIpOzkvDP7tnBXEsebooa4gxjULCABgpWucSwrRA=; b=DD4MdDOKEBTaKFl0ZmUQs28ojqW9A/etkz2rtZ+8r0IUgmvg3Exqwy3hLZ98Mlf1kClwBT cmOZodt64aoqJXpi4fh+WRT1g67xFomhIgUHSVQbuxuDG0DsoKSkgkM3SGcon1/dqofg6D zgZc1BuAqpMGpfN7sDSWzu5iktZ3Xzzg1G0UtQJmzmhPmbyEB38It9xl46H6+7CL5rPxA7 frRce0b+0e4VrCj9I9jlAU2I4AcGJ8D3SQHIgNY5b3QGpjb+LLER5c+TgEsKns1vfmG0oi H/Zx/peJRMePMT7SSWZDuXUEHS403maHzQxJDCSQMfp/pBrBo87DVj4d0aovJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681326077; 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=EBlwIpOzkvDP7tnBXEsebooa4gxjULCABgpWucSwrRA=; b=VARzVpMxh/wz9XPS9PYrHXkTStEqzGPWdAzfGSkIhZ9oSVQ7N9G5ozkf1Mbq2HwXoE7yZ3 Fvs9J6VZfcXBFvMrLLwKr+w1mT2UADi4xAYBT7nklpQEqlYXLlXtyvqlL2LKfJarDQc7wr PTvIXIbaSZGALgdKr88hcNoenAs+Eg/6dRnhFaCsVnrs3hPjhI3j2eCbGvZScOMbjuub0Q Z+nM3iwtRXSn1XUKLp/PtJt7c7+2Q9kH5qeEh7ywLWX/PNX42115WZF+U4k0jP+vDOIkiw 11fyu41mGVhZ0wRFsCmWFr5PMxyAyKyU2FldWBPh4wG9h3bL9sKFTF3i64sBRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681326077; a=rsa-sha256; cv=none; b=Zvhtv6PVgHnBEt/CRvvt0ydi3FWhtjgNv8A0GJi3Hx9OknXQ1Pzu96H14cjuRrG8bIi1yY WBwqBl3C4XIjasM0omWhiIepgUKjS3iBqc48vLsJu9d9YiNXVjaNwAUPaHucPL6qYH7s04 tFG6VEey7su35l5G3wIkolcDYjO4saFtQjgfpV2e4gpoLHuRgohqVzEdMQxSACSXLoJSnZ /F1JkwjsyLIUgVIeTpP8qWn2y+BMaZO1OAqB/J0aBJiI7e2bvv72cWVWI7Md2uwgtJmmnR nkdXByGEZqxaVA2P6vIc9Rzbcver94rjh0Mpx7k+Dr90Vy1sJNUUx75TLu31xQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxX9m5LvQzKxD; Wed, 12 Apr 2023 19:01:16 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Wed, 12 Apr 2023 15:01:15 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> From: Charlie Li Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------9v0mTvKmf01GCaymmASYaeQp" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------9v0mTvKmf01GCaymmASYaeQp Content-Type: multipart/mixed; boundary="------------bXwRJAWaCns46x0Ae1KDkyaO"; protected-headers="v1" From: Charlie Li To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403232549.73E331A2@slippy.cwsent.com> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> In-Reply-To: --------------bXwRJAWaCns46x0Ae1KDkyaO Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TWF0ZXVzeiBHdXppayB3cm90ZToNCj4gY2FuIHlvdSBwbGVhc2UgdGVzdCBwb3VkcmllcmUg d2l0aA0KPiBodHRwczovL2dpdGh1Yi5jb20vb3Blbnpmcy96ZnMvcHVsbC8xNDczOS9maWxl cw0KPiANCkFmdGVyIGFwcGx5aW5nLCBvbiB0aGUgbWQoNCktYmFja2VkIHBvb2wgcmVnYXJk bGVzcyBvZiBibG9ja19jbG9uaW5nLCANCnRoZSBjeUAgYGNwIC1SYCB0ZXN0IHJlcG9ydHMg bm8gZGlmZmVyaW5nIChpZSBjb3JydXB0ZWQpIGZpbGVzLiBXaWxsIA0KcmVwb3J0IGJhY2sg b24gcG91ZHJpZXJlIHJlc3VsdHMgKG5vIGJsb2NrX2Nsb25pbmcpLg0KDQotLSANCkNoYXJs aWUgTGkNCuKApm5vcGUsIHN0aWxsIGRvbid0IGhhdmUgYW4gZXhpdCBsaW5lLg0KDQo= --------------bXwRJAWaCns46x0Ae1KDkyaO-- --------------9v0mTvKmf01GCaymmASYaeQp Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ2//sFAwAAAAAACgkQ/reFK+KbPocc iQ/+MTr9bX9e9EzwIJc4x63I/KknGLfb4Vo/GmlQcCnC4ZsfdUXF+aNJhrCj78zISGbXQDuxt7Fg ffE0kuA2zBxJEHJSeIFlxH9ANeAcm1S++h5EB0w6metGLM1qXmXzgUI+1Cb+H/D8bm2WImudeVH/ 46Z+Kl4dE3xF6FEKc2blKd2pbzrxCyP6nrSsZrWAhXMJmhmiDuOIcdLACmSaaxU79CpG2MNc8W9F obpOQocFoVyaOEocBWic8kseAU6GnhyunhwKRXGwL15J5R0X49vvqDZ3W6Hd4Opycks7sP8qE/ur 8L6s4RFi4l5gB1TT35hPiXBACrqP552SSigjRZh8zim1oQdZBwL7/BhUWK2XBzw5eiC5SXZKPiAg 8eqhFS3mV/7w0PVTpx7NV5GFPfP9rX6lJwT4GT9RDEhjvTxN3JQcfRQZ9dDTA8W/gw2vK0BQhnIm bzfCVv0BcNtaViRniRJ2KFzyD5LRgpkXLVLMmRNCIbK1DhA6aDrWtrqx6uyfrz2sEKUabRRaMH1v 5OsVYs4GV4CcdDKyV0cRKEsi55U9+Qc5yqj4d5A8Gj549neoEDz9AQypjIwAwA3dRY/o9altN50b rlVm0OrUjPYgFvpRi4McgpD5Wnx0eagsFNUOQ9yxFT0NgqjPkIQmy8/vtpSYWoOl2gDY+nm5AXxj YG0= =FFyo -----END PGP SIGNATURE----- --------------9v0mTvKmf01GCaymmASYaeQp-- From nobody Wed Apr 12 19:34:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxXwB5McYz44c0y; Wed, 12 Apr 2023 19:34: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 4PxXwB0cb1z3NNr; Wed, 12 Apr 2023 19:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681328074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnfBGRcgoM8wVmPXbbvACuHS6KQAL5cQIWXdOogLh9o=; b=ksKzyCTQsJMozf2oLam3ci7Oqun8hj5xfE373Ju5TAlrz1YWVhqEDxPxDJ5ra1oFZRrdo5 LNNZn9a6G+xOIrmXsGOPC5Lazg8LoLUC/bp5t39YMYhqBnrpq4VMMg5A37CN1INGyrRwWh /TCvSOXncMGyP4ZBAmgWrPnWOmwDogzAuU8AvKDXfbO6AssORqOGsLYz3iOyhRn0miZeCY oTY0/67GLNsUvG5DT1CV5ZAQB9UMvIaDSHbgee++MbSWryydGlfU8dcql5e6LuoxW1MBZg /V4fQujMvgvRLxa3Y7KldvyrY4CmYYQ0pegLWKSFG80ZLjwgFWUkNd36bEi1JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681328074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnfBGRcgoM8wVmPXbbvACuHS6KQAL5cQIWXdOogLh9o=; b=cgcyZxvQkXx0eU54Jy7mZfq4P4dhyJQWocjYGJfUP8nr6XmKshL+VS4Foj1r+x00CjQ/jx CgWZjXlLROoRNDvkdNaybnX0befy+TS8R7vjIBjrli8kt6G4mbXaDugTVW8Lz7jm7dIw38 plo482fE/Ps00OvIey0NkhbQcwLtQg2cwXMO9Ct3sKkNxEpyky7yRZWY+6pCzCfJmrsTe8 rnmXopl6cQbze/z+RufbMDhCq4yppjsqSYebJI132wC5XzvxTCmnW6g2vNRfmtqP54lscX ocID2DAh9vH9b0ayiJOV9NZmKR7mmKbyxJld+sCegtz5Ks7dAX9ifFxm4DQyxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681328074; a=rsa-sha256; cv=none; b=fNJ46z2y1fEAElSNjwIK6i6+KhJmjCnTvAbkRIsQn+rp1n5nyiXsvIZvAvZQmfyBrZcngH qNO20VX2hxG3AFWCwjZU7VFZsbxo1UY6o2+J30AFkwCesUVFEWjbZ1EbD6lVyIsW74Y/d9 TIrGoiEwEJgi6McsBnp/6PAifyt6b2o0sEUMC1sa0B4kCm5DSQKf0/lWq+ZEZzMNaFXY0m LTVShBc3DBJ974aMy5zqAzh2/cWwntdOe7FXuCLHLsYy2FUbR/g2Hr2livRNQqcXus7bXu xjhffPgqj6DX7cmC1gQMWIlsdo0gxVekvIFFw8q3/hZwV386RxVfD7HRx/uy/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 4PxXw96QnPz1C1H; Wed, 12 Apr 2023 19:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CJYXgG097101; Wed, 12 Apr 2023 19:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CJYXQl097100; Wed, 12 Apr 2023 19:34:33 GMT (envelope-from git) Date: Wed, 12 Apr 2023 19:34:33 GMT Message-Id: <202304121934.33CJYXQl097100@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: 2ef2c26f3f13 - main - link_elf: fix SysV hash function overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ef2c26f3f132af33f6f12cd7b27d4dbbd7fa435 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2ef2c26f3f132af33f6f12cd7b27d4dbbd7fa435 commit 2ef2c26f3f132af33f6f12cd7b27d4dbbd7fa435 Author: Ed Maste AuthorDate: 2023-04-12 14:04:27 +0000 Commit: Ed Maste CommitDate: 2023-04-12 19:33:55 +0000 link_elf: fix SysV hash function overflow Quoting from https://maskray.me/blog/2023-04-12-elf-hash-function: The System V Application Binary Interface (generic ABI) specifies the ELF object file format. When producing an output executable or shared object needing a dynamic symbol table (.dynsym), a linker generates a .hash section with type SHT_HASH to hold a symbol hash table. A DT_HASH tag is produced to hold the address of .hash. The function is supposed to return a value no larger than 0x0fffffff. Unfortunately, there is a bug. When unsigned long consists of more than 32 bits, the return value may be larger than UINT32_MAX. For instance, elf_hash((const unsigned char *)"\xff\x0f\x0f\x0f\x0f\x0f\x12") returns 0x100000002, which is clearly unintended, as the function should behave the same way regardless of whether long represents a 32-bit integer or a 64-bit integer. Reviewed by: kib, Fangrui Song Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39517 --- sys/kern/link_elf.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5f0649d7540c..8e1495acee2b 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1470,23 +1470,20 @@ relocate_file(elf_file_t ef) } /* - * Hash function for symbol table lookup. Don't even think about changing - * this. It is specified by the System V ABI. + * SysV hash function for symbol table lookup. It is specified by the + * System V ABI. */ -static unsigned long +static Elf32_Word elf_hash(const char *name) { - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; + const unsigned char *p = (const unsigned char *)name; + Elf32_Word h = 0; while (*p != '\0') { h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; + h ^= (h >> 24) & 0xf0; } - return (h); + return (h & 0x0fffffff); } static int @@ -1497,7 +1494,7 @@ link_elf_lookup_symbol1(linker_file_t lf, const char *name, c_linker_sym_t *sym, unsigned long symnum; const Elf_Sym* symp; const char *strp; - unsigned long hash; + Elf32_Word hash; /* If we don't have a hash, bail. */ if (ef->buckets == NULL || ef->nbuckets == 0) { From nobody Wed Apr 12 20:11:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxYkb0nfTz44gKm; Wed, 12 Apr 2023 20:11:19 +0000 (UTC) (envelope-from vishwin@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 4PxYkb0Bwnz3Mnb; Wed, 12 Apr 2023 20:11:19 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681330279; 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=JsdzftAtH5GHDdDT8E8/110TIHG+j1WagTHBF4vNrU8=; b=ktmrOfjdC/VdmPe01qIdE82umdDK+I+eUnzuVoB0pH8Gqy3a2CICOKj6ZP+XkSwbyuaXh+ DWvZ24G25K2jKrfDCMA9CMF9H9vqJ3ri8f4MiMVerotSvy3duggbJO4aCD1i7tEYJhwMUC 99+l6CXhMRK0hjECYQ8lRzPKvYBxzD+g0hCLvQ32l/M8ygAb6qAPbotXHeigBi/R9cm5GF TkpYbii16fuI5Io+TdTqvrCikRcLDZnGu+FzU4CulRJ+x+R+zYyXUDJzg5Yx4cdk8v854K 2zzrkq9mDkJxSZdETQZO0EEZ+O6IXXCloMf1qroSzW+BIKjRgosW7syH7Fposw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681330279; 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=JsdzftAtH5GHDdDT8E8/110TIHG+j1WagTHBF4vNrU8=; b=Mhw1myoogcBIoN7y5hNll3+kgzUY2gWFu79Vs6Q2Vn7Ba2S6tDEEGq0nHqlWWU1+WMHCVn O2T1ihxsp/ClQuETdg1ZjC7ZOXKqbP8CltRtr3lSWMCuyAAPHHyuN90V7VzPiD/k20eQNP ArOZkoqYdk4RAR66y6dR6yKgL+yDkGE0fsTmlI1XsWQ+/rp9yh7k5pPRLKrfaXO6x6rVa9 yGHtRd94xyv7B3fpHtBdi529hI9WzM2Ni6BKbCV7WIyIioiuIo27k3rnw6xenADTS7F8of mNpQIBqKurvthNQOjbwUArr7SIBEZP4yb4Coj6tBJ3hQHVzB3CxOMPvPLfioLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681330279; a=rsa-sha256; cv=none; b=aJmdlH4Yhv7NBHrfeawRZHrckjU6XDasIEL65FgBk6lfbyoc7D90b7GZbzNbJv8ILcWwoG VzU+AvNzAHru9P8gFUu69X+vmX1YEhr8ND4qQL9hM7fDKL/7Qfp7hFtMBt4lA0Bh57lrnw fv6iuralf6cQfiypjSjbPnGpAmdGRIke6nS74Xssv1KG+v3N88MTg/MiD16eCNMu9ar+oq +l4ei+tBV4It0kFKd7pXFVAGaQ5ryzHE1Ay7qfcSg74BRckUewHVljsmv888l6M33WrRJF fQorznodhkiinQ6HaIkeZ7nKBG8+M7xAaxVYN8wtq8kBny7AFRtN1ZRHXdgI5w== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxYkZ4QFFzLDB; Wed, 12 Apr 2023 20:11:18 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Wed, 12 Apr 2023 16:11:16 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-GB From: Charlie Li To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Organization: FreeBSD Project Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------xibUr7UJQL3odv8j00CxBpBM" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------xibUr7UJQL3odv8j00CxBpBM Content-Type: multipart/mixed; boundary="------------S0o2OsR4Tc3DFa2jWl3o8XEu"; protected-headers="v1" From: Charlie Li To: Mateusz Guzik Cc: Cy Schubert , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230403235851.84C0467@slippy.cwsent.com> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> In-Reply-To: --------------S0o2OsR4Tc3DFa2jWl3o8XEu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q2hhcmxpZSBMaSB3cm90ZToNCj4gTWF0ZXVzeiBHdXppayB3cm90ZToNCj4+IGNhbiB5b3Ug cGxlYXNlIHRlc3QgcG91ZHJpZXJlIHdpdGgNCj4+IGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVu emZzL3pmcy9wdWxsLzE0NzM5L2ZpbGVzDQo+Pg0KPiBBZnRlciBhcHBseWluZywgb24gdGhl IG1kKDQpLWJhY2tlZCBwb29sIHJlZ2FyZGxlc3Mgb2YgYmxvY2tfY2xvbmluZywgDQo+IHRo ZSBjeUAgYGNwIC1SYCB0ZXN0IHJlcG9ydHMgbm8gZGlmZmVyaW5nIChpZSBjb3JydXB0ZWQp IGZpbGVzLiBXaWxsIA0KPiByZXBvcnQgYmFjayBvbiBwb3VkcmllcmUgcmVzdWx0cyAobm8g YmxvY2tfY2xvbmluZykuDQo+IA0KQXMgZm9yIHBvdWRyaWVyZSwgYnVpbGQgZmFpbHVyZXMg YXJlIHN0aWxsIHJvbGxpbmcgaW4uIFRoZXNlIGFyZSAoYW5kIA0KaGF2ZSBiZWVuKSBlbnRp cmVseSByYW5kb20gb24gZXZlcnkgcnVuLiBTb21lIGV4YW1wbGVzIGZyb20gdGhpcyBydW46 DQoNCmxhbmcvcGhwODE6DQotIHBvc3QtaW5zdGFsbDogQCR7SU5TVEFMTF9EQVRBfSAke1dS S1NSQ30vcGhwLmluaS1kZXZlbG9wbWVudCANCiR7V1JLU1JDfS9waHAuaW5pLXByb2R1Y3Rp b24gJHtXUktESVJ9L3BocC5jb25mICR7U1RBR0VESVJ9LyR7UFJFRklYfS9ldGMNCi0gY29u c3VtZXJzIGZhaWwgdG8gYnVpbGQgZHVlIHRvIGNvcnJ1cHRlZCBwaHAuY29uZiBwYWNrYWdl ZA0KDQpkZXZlbC9uaW5qYToNCi0gcGhhc2U6IHN0YWdlDQotIGluc3RhbGwgIC1zIC1tIDU1 NSANCi93cmtkaXJzL3Vzci9wb3J0cy9kZXZlbC9uaW5qYS93b3JrL25pbmphLTEuMTEuMS9u aW5qYSANCi93cmtkaXJzL3Vzci9wb3J0cy9kZXZlbC9uaW5qYS93b3JrL3N0YWdlL3Vzci9s b2NhbC9iaW4NCi0gY29uc3VtZXJzIGZhaWwgdG8gYnVpbGQgZHVlIHRvIGNvcnJ1cHRlZCBi aW4vbmluamEgcGFja2FnZWQNCg0KZGV2ZWwvbmV0c3VyZi1idWlsZHN5c3RlbToNCi0gcGhh c2U6IHN0YWdlDQotIG1rZGlyIC1wIA0KL3dya2RpcnMvdXNyL3BvcnRzL2RldmVsL25ldHN1 cmYtYnVpbGRzeXN0ZW0vd29yay9zdGFnZS91c3IvbG9jYWwvc2hhcmUvbmV0c3VyZi1idWls ZHN5c3RlbS9tYWtlZmlsZXMgDQovd3JrZGlycy91c3IvcG9ydHMvZGV2ZWwvbmV0c3VyZi1i dWlsZHN5c3RlbS93b3JrL3N0YWdlL3Vzci9sb2NhbC9zaGFyZS9uZXRzdXJmLWJ1aWxkc3lz dGVtL3Rlc3R0b29scw0KZm9yIE0gaW4gTWFrZWZpbGUudG9wIE1ha2VmaWxlLnRvb2xzIE1h a2VmaWxlLnN1YmRpciBNYWtlZmlsZS5wa2djb25maWcgDQpNYWtlZmlsZS5jbGFuZyBNYWtl ZmlsZS5nY2MgTWFrZWZpbGUubm9yY3JvZnQgTWFrZWZpbGUub3BlbjY0OyBkbyBcDQogICAg ICAgICBjcCBtYWtlZmlsZXMvJE0gDQovd3JrZGlycy91c3IvcG9ydHMvZGV2ZWwvbmV0c3Vy Zi1idWlsZHN5c3RlbS93b3JrL3N0YWdlL3Vzci9sb2NhbC9zaGFyZS9uZXRzdXJmLWJ1aWxk c3lzdGVtL21ha2VmaWxlcy87IA0KXA0KZG9uZQ0KLSBncmFwaGljcy9saWJuc2dpZiBmYWls cyB0byBidWlsZCBkdWUgdG8gTlVMIGNoYXJhY3RlcnMgaW4gDQpNYWtlZmlsZS57Y2xhbmcs c3ViZGlyfSwgY2F1c2luZyBub3RoaW5nIHRvIGxpbmsNCg0KLS0gDQpDaGFybGllIExpDQri gKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------S0o2OsR4Tc3DFa2jWl3o8XEu-- --------------xibUr7UJQL3odv8j00CxBpBM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ3EGQFAwAAAAAACgkQ/reFK+KbPoeV +Q//dQUYoobAXA9DKRVg0rKOnRFQjpVyZuOUvQhhzAKxTci6kjgdyKyQSjL8rTZvYpHewPmgMwvM 0udJZlyXGyY33ah58S/z+A6t+P96gRtZnaG9GeTgb4linpUGe77KX160HA93ATgc0IqlCAIeQvNE FHVeJjMSii8th6E5KN0e9PZeFgByyp349YhRWcQFrE8burChApBlEbiKtKyQquWwHmVWam+yNUDT 3wE7V2a0VBEj1GZvr1kSbXqIVwnFKbppZkxpQzoHKxBDZvjUEfjFhd7yABtGXLPF0aBNDHv+EF4q fxwQXdyBvtSVBxwCUOpHkTvB512LfnxJHo6Wgm5fWiM3DU19zr1JB++FDUUq1/c+axQX8aPNRUTw m2EztCMc5qSKma7or9nuq0AUg9CfFG5FDQSGAQNtuB/2TSQf5ikJNjcRj243fHGQKdOrhZ5jisR1 epbWsnWJ8tcKct9qfFdMcNHDXTYmxGcHQOZDCAlo8e6TH5I3EODJJDYB8o0ANzzJs/F6ZNmAktuI e2NIlhm4nd5Jo76G1/OK2lpi7wrPILlC23W81HjQE7nDqgmXzHDpgltiY5x8oUHUGGh677/36re2 aQYvtomR6SevBZWQBZdNLWhmhIuvuuPDO6nzIz9d2yNiXQQ+XfftoWy4t3RzbXrWiLmmsJ5SilOX AbY= =IxTx -----END PGP SIGNATURE----- --------------xibUr7UJQL3odv8j00CxBpBM-- From nobody Wed Apr 12 20:40:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxZN30TwRz44jNC; Wed, 12 Apr 2023 20:40:19 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxZN26cB8z4Wgw; Wed, 12 Apr 2023 20:40:18 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Wed, 12 Apr 2023 22:40:16 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2c709ee70ade - main - libc: handle zero alignment in memalign() Message-ID: <20230412204016.AUebZ%steffen@sdaoden.eu> In-Reply-To: References: <202302241821.31OIL4ux075893@gitrepo.freebsd.org> <20230224205001.Fbn1A%steffen@sdaoden.eu> <20230225012736.PT3cH%steffen@sdaoden.eu> <20230225222952.t3oH3%steffen@sdaoden.eu> <20230227205125.wT7DI%steffen@sdaoden.eu> Mail-Followup-To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org User-Agent: s-nail v14.9.24-443-g95b3cc3d07 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Rspamd-Queue-Id: 4PxZN26cB8z4Wgw X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Ed Maste wrote in : |On Mon, 27 Feb 2023 at 15:51, Steffen Nurpmeso wrote: |> |> This is what happens when one mutilates the email quote context. | |I'm not sure what you mean here. This thread is in response to my |commit that modified memalign() which exists for glibc compatibility. |Whatever posix_memalign is specified to do is irrelevant. I was so deep in the thread i did not even look at the subject. 'Happened again just today on postfix list, SPF for HELO was the thread, i talked SPF for FROM. But there .. you know! Oh, i dream of that calm reflectivity fostering environment where one can sit down concentrated for four to six hours in a row. And email only once at the end. I do not seem to be good multitasking. (All the context switches, makes a Kasper of you.) --End of --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Thu Apr 13 01:33:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pxht64ZXzz458WB; Thu, 13 Apr 2023 01:33:18 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pxht62V1bz3jGR; Thu, 13 Apr 2023 01:33:18 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id mX3Bp7fw2jvm1mlpsp9btK; Thu, 13 Apr 2023 01:33:16 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mlpqpiXNFyAOemlprpc6kU; Thu, 13 Apr 2023 01:33:16 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=64375bdc a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=sfwCBl6-ctJEIEmHxlEA:9 a=CjuIK1q_8ugA:10 a=VlZU0XKO32wA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 87A63389; Wed, 12 Apr 2023 18:33:14 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 502DE77; Wed, 12 Apr 2023 18:33:14 -0700 (PDT) Date: Wed, 12 Apr 2023 18:33:14 -0700 From: Cy Schubert To: Charlie Li Cc: Mateusz Guzik , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230412183306.763dad5a@cschubert.com> In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfKl4snMSJw/2dXDUXKeR8JMVla4Ng8GW5o8gVcYMivO4SPd+/+Z5UQPAoToklN20I735fsTSoN7ZkrDHEYhtp7UR55TpAV8S94SmvsPN09C+SxOjk3ol nF/nDpAXgt/Xa33wKzJD+8fO2+iGHVJm+rYKGJwWAlMlHRiV+IGiAWs7Ct2yyjj7N50mms6bfrtzO8S9/+mFG87BTDYJhdFcqpa4qkR8HazOKQpxnUR+J0N0 1iuIzXKWCBGQCFHWD2sDgkyM8aHpfdqiUXzcwg3FR8A6VAzy6Z+x5Fu4GJVflbcNfvjG+3aBb/KgslnPezZAV+cVjJ9kL5tvlNKaLfLzF7qbCF//7Jjd0Dks vWcwpwJvPpu+PAAiY5STSYMw+mJYLBQU8PNcXMTsVs5YDABPbWHtuDYbP2J5SFyR1kK/Vo+b X-Rspamd-Queue-Id: 4Pxht62V1bz3jGR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TAGGED_RCPT(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, 12 Apr 2023 15:01:15 -0400 Charlie Li wrote: > Mateusz Guzik wrote: > > can you please test poudriere with > > https://github.com/openzfs/zfs/pull/14739/files > > > After applying, on the md(4)-backed pool regardless of block_cloning, > the cy@ `cp -R` test reports no differing (ie corrupted) files. Will > report back on poudriere results (no block_cloning). > Confirmed. The regression is fixed. I'll keep block_cloning enabled with that pool. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 05:28:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pxp5Y3T52z45T5D for ; Thu, 13 Apr 2023 05:28:33 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-22.consmr.mail.gq1.yahoo.com (sonic317-22.consmr.mail.gq1.yahoo.com [98.137.66.148]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pxp5W2V66z4CXB for ; Thu, 13 Apr 2023 05:28:31 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=PS3kauxm; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681363708; bh=L5q5sALpsYKoVMC4oyt29NhN4/yoqXPpBQbs936dfSU=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=PS3kauxm6DIGSpv+1nAPbJvgDLEDgxxRyr/VOq231OFg5nyvM99UX54yEu+4sgcnDMV6PNDejV+nxpHqoqpbXFUoszLoNGh7OkCUIypmX5pu9wcUTNXoXYFrrQKuiT6MzAmkN+AOjgTk/7mWmcn+fZcM7Dw1rVv3ZVmT9V9QwZei5yIQ+5X+q9rGJBeRM+fN1XbW+Q9ntRBVUB1v+hES5sjXwiHZLPVV6CiWUc+LT5hf/0+GEb7zE/ZlshyqwRQmyNrHhKFdqLrnlZQNhtHK0F3ZAVm0wI26XDC0MpEyZwcBw5VDZbwL0vyafd/9/jCvoCqWF5G3ZCBLmV87Qqks4g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681363708; bh=9O8rW1estJc8tDGxkleHYAB6B85vzwHUhYwQCGbopZc=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=XwlfmPfn+k69bT0bqPGrXaT/CF8O6IYde2LI86+Y+6vyJUFnkLT5SzPdx6x4pMwcmlBOdDtveVGZBWjtDsTRz0T+VW22DKxkjD2rbJExCsEk0b8vDKxuu7i1BwRo5eqsjtgZChlF9T5KSxgk8GD8Yg6UnmZtwzFAPVfq0gyp8uzMXwZTxhvU5K8maFNZuiVpROHpMC2M8i1HsnZ4uJwS02aBG8K7jxK3xS66ccwTnGCoEVOkr6tzfg5ufUtUCtsJJ8oOqy9uy/gPNwZzH73p5sjfTd05SP/4sOIIf7U96SqCJqs8Ge7+LGAgZvm/8YF3pPaczC4DjGJ5l/KBpMnjyQ== X-YMail-OSG: 5xF05S8VM1mXlDt0Hhdjw3cXXeBxGBurn3vLXMQAvqBqn1tA6D6YiC3adyZdze4 us5XQpDTOHbBQPagLAZSQdMVN9jU0U3w1_y7DmP9jQLmG7w8s0gp_x8IO3dYLlhE7umUuxXxBY5W .qZBHxQ8z1WYx59_u3L0UqTiuNujZ9GLaKPS3TtsQEUdcqG7p5AKWVTtVmqtdwhCHBIcmqjKI3fh ZSAppnZ9oSzT2ggAAvX26_ONCVXzoWlf.g8h0ED66Dt.pHI.WTWWnVOolmu7C2i7Q.4Cn_qNJEDx 7OG.xNgnhOHqogDwFXWYBxaEKK9dDbrqKn2LaWADMUW_k_J_InlfkHczMVj99j428XjacWE2.IVf RTXzrEh_6f1Tj_nxoLUqNzcaBZJQoek4MkL9oJtIexBUu5mCo4yY4ZlY2pbEwgQwqW8t0NKRfqYf 7FPBkVTXAcGdxZhpYfo8IhT1gqUn4NvTqepr2ExGY1MpeqRH98O9.2WwidPBgw..hVD0MOMEjMi3 Ziqp3SdZLz9z5U9232vivoBZbfNH._GAxjX242TrhQ7OkFVUrUkYcTx_.7mAyEIzt3bm.M8e5lew TejtaTQl1itIqdBHhnTBw5K2Kq3X9pMvBEliT.blWmfXdJDmm50UQaw4Powbuo88chPQYxx4.4GZ JLV2OTG7JKjqbMcJO34Dbr4ynPm0NiW1moU9SS64XlKy3PUybLuCEeGWYPn6aE1wzUhaCcDp5rMa jPPoLBu2v5785TA1_ivqNo9c6JTZaCm3SUI8_Ml1evAoisHYWUNyPCY7RNBCMDJilMaw68RjTwHh Owetkp0syY7TgUOCxY4iNCiCKALyaB4Wyxxh8tRc7Ds0GdFajxPItQVXQbWtkgwDhbnouyL_vkpz VntGAj2KfoCcZGcyMo_Qhj6mbYYqjDKaYVHDhOrgbI2RbOqviTpwy0yCVoDuBjnUQcRfqh4ecukf qfuoyGIKJk70bRWZst7hWgOc3uXhEIGxuK2cunlVIPFqsKNFe8lqsFnAT7k9mQQx2wYAkAuNzEUv KZdoM6SPOIQt_3.b8BMC8YCRjXZSSKijtiACS1HomsK_X3f6mcUPBOY7n7J9x.FZjHyvIDPrA.8p Zyu9_RRJQNrwtKlOTP_h.p6iac3tuWSRgndW.JCohOD0m2O3ydgIMqaquQqesrbpaxg.2tQ8mEHR dHbFLwYldhtj6IVTdsESpzzY1KEqvfTnXqCMiR6xH4996p6hAB0jzmNXSS5qM1fv6ElLlH9pMoFH 9PMTu54j6CZNqoi.NgOkgHLMAXct01YxjAxiOYjvogwLuDjPy1KFTCda91AQFQqC.tM5ZVDqt529 DdhH_Kz5FlBSliO6vcQybcFydpnCMNGWK993yjFHglUDysaHcgijZIQ7wgKI_HyCl48Sbc53E9hm VebnVbtGr1LfxL9ms2FK9ooOUTXbpYKyaTyRNvQCJRzztqxuOnU2bSPI4TF86bXs01N18X5JgkdK NqBRyrkxFPY_1Mk.10rsOHsvyzokvh2xc9sICGgkksomV85OmrYyiZRkfm99d5lCZd5hwKqiH8sp 1awiKLIG7RpkwvXEqsWflmvkXAvaVa8DPeankxP6qgVnbhJ4SIxJ._dFJYa9LuN_WAG622IvCgWP 6JCsFxDbJC9K4vFqGVm2zVblHAkCC9HLwrrRyPvIhSXZ.dOvf_in2f0bRuh1DN9B.seVLj7f0c8u MA1gVZiIEICxG6Kb.friXcZ42BWw9ctStAbjk9wgQAtD..lOxVIVLmKei8waoebj__YjMOzl.ixL dQLEgpGuhXs3fc8f7plKXBKI4s0LsI63TvXr3rtc6NRe0a9LliwV7mr3zVWZc7iMwv2ci2l1pTV0 QQfsiZB1uPm3mrPLHHYUuFMjRgJl2t2So1OBvjKkxiiNMeGIOJnkz4PUctuyje30n7maq5VtGdyz e6EdWR_5f9GL4MN5rTfInWGjME1.0AVPgLTptQrPRZW2pbZDOOtrl8ND2lq0VvomLa.vejy15UPC FzVg_.KfzkGvay9XqYZVUcszNUCfn.t.9qmfOFWu_PYZ2kenY1s.zdfQQcOk93PIQO9CKU._He5B E7LLJr7vQ.JuEP9MxCxmedWLSRnwwi21YJ2SbbbWfWpPRtiB9gt251GJabAkvQqn.QWf66NCHJS3 Rj3s5OgyvP1vT_XF31xUj3ouMw.TeuEMi5AigtG8SlT3O5as3IAB3sErnjs.KoCbAa1ZSaHJR8xL a3ywt3qh6TwiI5s7JrRxoK425PJWSkuqARcArS3iFDiccjQH7NLOvO_d3RwG4ihxddw7vqAZ1XZM Ky.x_tg5v6QY- X-Sonic-MF: X-Sonic-ID: cad348fe-098d-41dd-8eef-80fc4c0e9dd6 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Thu, 13 Apr 2023 05:28:28 +0000 Received: by hermes--production-gq1-546798879c-dcj2l (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 19058c53ce8266ee25011cb0f97af078; Thu, 13 Apr 2023 05:28:24 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-Id: Date: Wed, 12 Apr 2023 22:28:13 -0700 Cc: Cy Schubert To: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD X-Mailer: Apple Mail (2.3731.400.51.1.1) References: X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.148:from]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_TO(0.00)[gmail.com,freebsd.org]; DKIM_TRACE(0.00)[yahoo.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.148:from] X-Rspamd-Queue-Id: 4Pxp5W2V66z4CXB X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N From: Charlie Li wrote on Date: Wed, 12 Apr 2023 20:11:16 UTC : > Charlie Li wrote: > > Mateusz Guzik wrote: > >> can you please test poudriere with > >> https://github.com/openzfs/zfs/pull/14739/files > >> > > After applying, on the md(4)-backed pool regardless of = block_cloning,=20 > > the cy@ `cp -R` test reports no differing (ie corrupted) files. Will=20= > > report back on poudriere results (no block_cloning). > >=20 > As for poudriere, build failures are still rolling in. These are (and=20= > have been) entirely random on every run. Some examples from this run: >=20 > lang/php81: > - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=20 > ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf = ${STAGEDIR}/${PREFIX}/etc > - consumers fail to build due to corrupted php.conf packaged >=20 > devel/ninja: > - phase: stage > - install -s -m 555=20 > /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=20 > /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > - consumers fail to build due to corrupted bin/ninja packaged >=20 > devel/netsurf-buildsystem: > - phase: stage > - mkdir -p=20 > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/makefiles=20 > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/testtools > for M in Makefile.top Makefile.tools Makefile.subdir = Makefile.pkgconfig=20 > Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > cp makefiles/$M=20 > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/makefiles/;=20 > \ > done > - graphics/libnsgif fails to build due to NUL characters in=20 > Makefile.{clang,subdir}, causing nothing to link Summary: I have problems building ports into packages via poudriere-devel use despite being fully updated/patched (as of when I started the experiment), never having enabled block_cloning ( still using openzfs-2.1-freebsd ). In other words, I can confirm other reports that have been made. The details follow. [Written as I was working on setting up for the experiments and then executing those experiments, adjusting as I went along.] I've run my own tests in a context that has never had the zpool upgrade and that jump from before the openzfs import to after the existing commits for trying to fix openzfs on FreeBSD. I report on the sequence of activities getting to the point of testing as well. By personal policy I keep my (non-temporary) pool's compatible with what the most recent ??.?-RELEASE supports, using openzfs-2.1-freebsd for now. The pools involved below have never had a zpool upgrade from where they started. (I've no pools that have ever had a zpool upgrade.) (Temporary pools are rare for me, such as this investigation. But I'm not testing block_cloning or anything new this time.) I'll note that I use zfs for bectl, not for redundancy. So my evidence is more limited in that respect. The activities were done on a HoneyComb (16 Cortex-A72 cores). The system has and supports ECC RAM, 64 GiBytes of RAM are present. I started by duplicating my normal zfs environment to an external USB3 NVMe drive and adjusting the host name and such to produce the below. (Non-debug, although I do not strip symbols.) : # uname -apKU FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 I then did: git fetch, stash push ., merge --ff-only, stash apply . : my normal procedure. I then also applied the patch from: https://github.com/openzfs/zfs/pull/14739/files Then I did: buildworld buildkernel, install them, and rebooted. The result was: # uname -apKU FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 = main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 = root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 The later poudriere-devel based build of packages from ports is based on: # ~/fbsd-based-on-what-commit.sh -C /usr/ports 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) = devel/freebsd-gcc12: Bump to 12.2.0. Author: John Baldwin Commit: John Baldwin CommitDate: 2023-03-25 00:06:40 +0000 branch: main merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 merge-base: CommitDate: 2023-03-25 00:06:40 +0000 n613214 (--first-parent --count for merge-base) poudriere attempted to build 476 packages, starting with pkg (in order to build the 56 that I explicitly indicate that I want). It is my normal set of ports. The form of building is biased to allowing a high load average compared to the number of hardware threads (same as cores here): each builder is allowed to use the full count of hardware threads. The build used USE_TMPFS=3D"data" instead of the USE_TMPFS=3Dall I normally use on the build machine involved. And it produced some random errors during the attempted builds. A type of example that is easy to interpret without further exploration is: pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse = error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) A fair number of errors are of the form: the build installing a previously built package for use in the builder but later the builder can not find some file from the package's installation. Another error reported was: ld: error: /usr/local/lib/libblkid.a: unknown file type For reference: [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] Queued: = 476 Built: 252 Failed: 11 Skipped: 213 Ignored: 0 Fetched: 0 = Tobuild: 0 Time: 00:37:52 I started another build that tried to build 224 packeges: the 11 failed and 213 skipped. Just 1 package built that failed before: [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | = sqlite3-3.41.0_1,1: Success It seems to be the only one where the original failure was not an example of complaining about the missing/corrupted content of a package install used for building. So it is an example of randomly varying behavior. That, in turn, allowed: [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 to build but everything else failed or was skipped. The sqlite3 vs. other failure difference suggests that writes have random problems but later reads reliably see the problem that resulted (before the content is deleted). After the above: # zpool status pool: zroot state: ONLINE config: NAME STATE READ WRITE CKSUM zroot ONLINE 0 0 0 da0p8 ONLINE 0 0 0 errors: No known data errors # zpool scrub zroot # zpool status pool: zroot state: ONLINE scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 = 22:15:39 2023 config: NAME STATE READ WRITE CKSUM zroot ONLINE 0 0 0 da0p8 ONLINE 0 0 0 errors: No known data errors =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Thu Apr 13 05:31:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pxp9P2lBPz45TX2; Thu, 13 Apr 2023 05:31:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pxp9P065rz4H1g; Thu, 13 Apr 2023 05:31:52 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id mcTGp2X1OuZMSmpYmpOF0Z; Thu, 13 Apr 2023 05:31:52 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mpYkpVieh3fOSmpYlpe0uJ; Thu, 13 Apr 2023 05:31:52 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=643793c8 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=Y--Ymys-rxVKTIXM4kkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A8056804; Wed, 12 Apr 2023 22:31:49 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 7455D291; Wed, 12 Apr 2023 22:31:49 -0700 (PDT) Date: Wed, 12 Apr 2023 22:31:49 -0700 From: Cy Schubert To: Charlie Li Cc: Mateusz Guzik , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230412223143.24615882@cschubert.com> In-Reply-To: References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfIzxyT77pl6WiEnpSEa5KsUBS9A2NUiXjK+KvqYsNvHMIQl2WZk/E++zBoqSko5Ek/ECfRjubOcnkpS9hAo6zelIaluoWbMWQoyc6141eOr4rkl9ejIf WPz/t67SxxoVlGxgDAUgVfuWWFC9HZWFUdg8dDlU1QOFyWDsJ339DI0pULvzFtOXqxj5dUsbLxU+CN64/4PxHr8Ckky23zDwPXbHJxUx3PjeVoZkInqy8FBw GnG3JFTSZ9jDEzDFmMCaCYWDuiy4R2qM0lj2By6CprTLIzxCIY5WXIq2iUgd6uNm8Xg0hFCOba+RSmU58AdKbOjGQE3M6chFWW+wQj+ltDCtAspL+K1Q4LMt oayXw7kz9TE96ISsPk6zq6mUh6EUpijcKaAkO5KBYHk+S7+iIJV89czc+KWFYLcOzT9A/61D X-Rspamd-Queue-Id: 4Pxp9P065rz4H1g X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, 12 Apr 2023 16:11:16 -0400 Charlie Li wrote: > Charlie Li wrote: > > Mateusz Guzik wrote: > >> can you please test poudriere with > >> https://github.com/openzfs/zfs/pull/14739/files > >> > > After applying, on the md(4)-backed pool regardless of block_cloning, > > the cy@ `cp -R` test reports no differing (ie corrupted) files. Will > > report back on poudriere results (no block_cloning). > > > As for poudriere, build failures are still rolling in. These are (and > have been) entirely random on every run. Some examples from this run: > > lang/php81: > - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development > ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc > - consumers fail to build due to corrupted php.conf packaged The package might have been corrupted from before. > > devel/ninja: > - phase: stage > - install -s -m 555 > /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja > /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > - consumers fail to build due to corrupted bin/ninja packaged Same as above. > > devel/netsurf-buildsystem: > - phase: stage > - mkdir -p > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/makefiles > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/testtools > for M in Makefile.top Makefile.tools Makefile.subdir Makefile.pkgconfig > Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > cp makefiles/$M > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/makefiles/; > \ > done > - graphics/libnsgif fails to build due to NUL characters in > Makefile.{clang,subdir}, causing nothing to link > This might point to some problem that might need further investigation. Have you tried poudriere bulk -C or -c ? Some packages may be corrupt. The problem my poudriere encountered was it couldn't find any packages, because of EXDEV (because I had not enabled block_cloning) which left dozens of zero length files in my repo. It therefore deleted them from the meta.pkg. My repo was hosed. Since I use sysutils/zfs-periodic, rolling back a previous ZFS snapshot restored my poudriere tree, allowing me to recover my poudriere. I haven't had any problems since the EXDEV fix + a rollback of the periodic snapshot of my poudriere ZFS datasets to their last known good state (the day prior to the ZFS upgrade). This is why I suspect some kind of lingering corruption within some files in your poudriere dataset tree. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 05:47:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxpWX2M1Hz45VZ1; Thu, 13 Apr 2023 05:47:36 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxpWX19Vxz3NSX; Thu, 13 Apr 2023 05:47:36 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id mborp2SgVuZMSmpnzpOFn5; Thu, 13 Apr 2023 05:47:35 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mpnxpVm5Y3fOSmpnype1ds; Thu, 13 Apr 2023 05:47:35 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=64379777 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=sZLT3qLpMDko9ba0sx4A:9 a=CjuIK1q_8ugA:10 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 73A957E4; Wed, 12 Apr 2023 22:47:33 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 524611EB; Wed, 12 Apr 2023 22:47:33 -0700 (PDT) Date: Wed, 12 Apr 2023 22:47:33 -0700 From: Cy Schubert To: Mark Millard Cc: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230412224733.4f016fb9@cschubert.com> In-Reply-To: References: Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfBNFcEdB4+WgKM1syqBG94flIi3G+k8rTGLXUkk6CS1WeOa8wHP6qaACPQ9N93PxQ3Bbxcoo3AsY1FPFVGqYTwdUb3oufdTRlaQfJ71Z0ISL+6kYNp0Q kFvoEjA+umW/9w9x6jlkunLv8vAidKUimRE7JfiY6WjlpCAIm1wMPDTKAqCxdZcG3gSJvWbUnbP/iS6QrqciHFDRm08Sl7NSp7ORNnyj3/4JjvczI7oMxohA +hd+JC/c7jgrZDzqgt+V7Xed5oHPTa+CXTrARHPHm/f6l3oH3D6pjzv7/rSBe60UMPsxhpzTz55bdUYQIEP5/JVAOZSBmita+j9pGQA7GdyZd+RX9Vh0EeXr JkJZ3x+5 X-Rspamd-Queue-Id: 4PxpWX19Vxz3NSX X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, 12 Apr 2023 22:28:13 -0700 Mark Millard wrote: > From: Charlie Li wrote on > Date: Wed, 12 Apr 2023 20:11:16 UTC : > > > Charlie Li wrote: > > > Mateusz Guzik wrote: > > >> can you please test poudriere with > > >> https://github.com/openzfs/zfs/pull/14739/files > > >> > > > After applying, on the md(4)-backed pool regardless of block_cloning, > > > the cy@ `cp -R` test reports no differing (ie corrupted) files. Will > > > report back on poudriere results (no block_cloning). > > > > > As for poudriere, build failures are still rolling in. These are (and > > have been) entirely random on every run. Some examples from this run: > > > > lang/php81: > > - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development > > ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc > > - consumers fail to build due to corrupted php.conf packaged > > > > devel/ninja: > > - phase: stage > > - install -s -m 555 > > /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja > > /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > - consumers fail to build due to corrupted bin/ninja packaged > > > > devel/netsurf-buildsystem: > > - phase: stage > > - mkdir -p > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/makefiles > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/testtools > > for M in Makefile.top Makefile.tools Makefile.subdir Makefile.pkgconfig > > Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > > cp makefiles/$M > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/netsurf-buildsystem/makefiles/; > > \ > > done > > - graphics/libnsgif fails to build due to NUL characters in > > Makefile.{clang,subdir}, causing nothing to link > > Summary: I have problems building ports into packages > via poudriere-devel use despite being fully updated/patched > (as of when I started the experiment), never having enabled > block_cloning ( still using openzfs-2.1-freebsd ). > > In other words, I can confirm other reports that have > been made. > > The details follow. > > > [Written as I was working on setting up for the experiments > and then executing those experiments, adjusting as I went > along.] > > I've run my own tests in a context that has never had the > zpool upgrade and that jump from before the openzfs import to > after the existing commits for trying to fix openzfs on > FreeBSD. I report on the sequence of activities getting to > the point of testing as well. > > By personal policy I keep my (non-temporary) pool's compatible > with what the most recent ??.?-RELEASE supports, using > openzfs-2.1-freebsd for now. The pools involved below have > never had a zpool upgrade from where they started. (I've no > pools that have ever had a zpool upgrade.) > > (Temporary pools are rare for me, such as this investigation. > But I'm not testing block_cloning or anything new this time.) > > I'll note that I use zfs for bectl, not for redundancy. So > my evidence is more limited in that respect. > > The activities were done on a HoneyComb (16 Cortex-A72 cores). > The system has and supports ECC RAM, 64 GiBytes of RAM are > present. > > I started by duplicating my normal zfs environment to an > external USB3 NVMe drive and adjusting the host name and such > to produce the below. (Non-debug, although I do not strip > symbols.) : > > # uname -apKU > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm64.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > > I then did: git fetch, stash push ., merge --ff-only, stash apply . : > my normal procedure. I then also applied the patch from: > > https://github.com/openzfs/zfs/pull/14739/files > > Then I did: buildworld buildkernel, install them, and rebooted. > > The result was: > > # uname -apKU > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm64.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > > The later poudriere-devel based build of packages from ports is > based on: > > # ~/fbsd-based-on-what-commit.sh -C /usr/ports > 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) devel/freebsd-gcc12: Bump to 12.2.0. > Author: John Baldwin > Commit: John Baldwin > CommitDate: 2023-03-25 00:06:40 +0000 > branch: main > merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > n613214 (--first-parent --count for merge-base) > > poudriere attempted to build 476 packages, starting > with pkg (in order to build the 56 that I explicitly > indicate that I want). It is my normal set of ports. > The form of building is biased to allowing a high > load average compared to the number of hardware > threads (same as cores here): each builder is allowed > to use the full count of hardware threads. The build > used USE_TMPFS="data" instead of the USE_TMPFS=all I > normally use on the build machine involved. > > And it produced some random errors during the attempted > builds. A type of example that is easy to interpret > without further exploration is: > > pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > > A fair number of errors are of the form: the build > installing a previously built package for use in the > builder but later the builder can not find some file > from the package's installation. > > Another error reported was: > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > For reference: > > [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] Queued: 476 Built: 252 Failed: 11 Skipped: 213 Ignored: 0 Fetched: 0 Tobuild: 0 Time: 00:37:52 > > I started another build that tried to build 224 packeges: > the 11 failed and 213 skipped. > > Just 1 package built that failed before: > > [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | sqlite3-3.41.0_1,1: Success > > It seems to be the only one where the original failure was not > an example of complaining about the missing/corrupted content > of a package install used for building. So it is an example > of randomly varying behavior. > > That, in turn, allowed: > > [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 > > to build but everything else failed or was skipped. > > The sqlite3 vs. other failure difference suggests that writes > have random problems but later reads reliably see the problem > that resulted (before the content is deleted). > > > After the above: > > # zpool status > pool: zroot > state: ONLINE > config: > > NAME STATE READ WRITE CKSUM > zroot ONLINE 0 0 0 > da0p8 ONLINE 0 0 0 > > errors: No known data errors > > # zpool scrub zroot > # zpool status > pool: zroot > state: ONLINE > scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 22:15:39 2023 > config: > > NAME STATE READ WRITE CKSUM > zroot ONLINE 0 0 0 > da0p8 ONLINE 0 0 0 > > errors: No known data errors > > > === > Mark Millard > marklmi at yahoo.com Did your pools suffer the EXDEV problem? The EXDEV also corrupted files. I think, without sufficient investigation we risk jumping to conclusions. I've taken an extremely cautious approach, rolling back snapshots (as much as possible, i.e. poudriere datasets) when EXDEV corruption was encountered. I did not rollback any snapshots in my MH mail directory. Rolling back snapshots of my MH maildir would result in loss of email. I have to live with that corruption. Corrupted files in my outgoing sent email directory remain: slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1 53 slippy$ There are 53 corrupted files in my note log of 9913 emails. Those files will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS or ZFS patches cannot retroactively remove the corruption from those files. But my poudriere files, because the snapshots were rolled back, were "repaired" by the rolled back snapshots. I'm not convinced that there is presently active corruption since the problem has been fixed. I am convinced that whatever corruption that was written at the time will remain forever or until those files are deleted or replaced -- just like my email files written to disk at the time. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 05:52:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pxpd53dQ3z45Vxq; Thu, 13 Apr 2023 05:52:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pxpd50Q9mz3l95; Thu, 13 Apr 2023 05:52:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id moE3p9FBSjvm1mpsepA1Qg; Thu, 13 Apr 2023 05:52:24 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mpscpJAgNHFsOmpsdpTHOs; Thu, 13 Apr 2023 05:52:24 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64379898 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=PDfvT9ULBxMJ-dlh9yIA:9 a=CjuIK1q_8ugA:10 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0775C908; Wed, 12 Apr 2023 22:52:22 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id E8B211F0; Wed, 12 Apr 2023 22:52:21 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mark Millard cc: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , Cy Schubert Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: References: Comments: In-reply-to Mark Millard message dated "Wed, 12 Apr 2023 22:28:13 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 12 Apr 2023 22:52:21 -0700 Message-Id: <20230413055221.E8B211F0@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNXk6Z6tF/DEUb/02Rm7PoY8z7gLfZfj/pIqE9g3figmUuA8pGI4ooq8louuaVk1g+np4dUYOcPpOiruEDq33jGuaXoUQdHA4N29/AEyYHTaroIfKBCH uTuxhWJWA3S5G+mgT2tjifQDUZiz9/AvvkzN9YzIxOcdMroiF024QcOUcZJj/s6XLrvVAnGzMW7trIjfNNbTDdJATrs16T74sJDfzFxWv6G+NegriyH7Mrht 7O8tU0u9fk6PvniuKMku3AeBJjT50xbtd1wGRJaUXHtqgN6e7S23I06ZB+GfPGqr7F/pzpLxw8YDWEZzL/W29PvWdMt3t6N1+zIruqsyMzBz6WnoEqZToYGw +q4z9F9f X-Rspamd-Queue-Id: 4Pxpd50Q9mz3l95 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Mark Millard write s: > From: Charlie Li wrote on > Date: Wed, 12 Apr 2023 20:11:16 UTC : > > > Charlie Li wrote: > > > Mateusz Guzik wrote: > > >> can you please test poudriere with > > >> https://github.com/openzfs/zfs/pull/14739/files > > >> > > > After applying, on the md(4)-backed pool regardless of = > block_cloning,=20 > > > the cy@ `cp -R` test reports no differing (ie corrupted) files. Will=20= > > > > report back on poudriere results (no block_cloning). > > >=20 > > As for poudriere, build failures are still rolling in. These are (and=20= > > > have been) entirely random on every run. Some examples from this run: > >=20 > > lang/php81: > > - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=20 > > ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf = > ${STAGEDIR}/${PREFIX}/etc > > - consumers fail to build due to corrupted php.conf packaged > >=20 > > devel/ninja: > > - phase: stage > > - install -s -m 555=20 > > /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=20 > > /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > - consumers fail to build due to corrupted bin/ninja packaged > >=20 > > devel/netsurf-buildsystem: > > - phase: stage > > - mkdir -p=20 > > = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > tsurf-buildsystem/makefiles=20 > > = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > tsurf-buildsystem/testtools > > for M in Makefile.top Makefile.tools Makefile.subdir = > Makefile.pkgconfig=20 > > Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > > cp makefiles/$M=20 > > = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > tsurf-buildsystem/makefiles/;=20 > > \ > > done > > - graphics/libnsgif fails to build due to NUL characters in=20 > > Makefile.{clang,subdir}, causing nothing to link > > Summary: I have problems building ports into packages > via poudriere-devel use despite being fully updated/patched > (as of when I started the experiment), never having enabled > block_cloning ( still using openzfs-2.1-freebsd ). > > In other words, I can confirm other reports that have > been made. > > The details follow. > > > [Written as I was working on setting up for the experiments > and then executing those experiments, adjusting as I went > along.] > > I've run my own tests in a context that has never had the > zpool upgrade and that jump from before the openzfs import to > after the existing commits for trying to fix openzfs on > FreeBSD. I report on the sequence of activities getting to > the point of testing as well. > > By personal policy I keep my (non-temporary) pool's compatible > with what the most recent ??.?-RELEASE supports, using > openzfs-2.1-freebsd for now. The pools involved below have > never had a zpool upgrade from where they started. (I've no > pools that have ever had a zpool upgrade.) > > (Temporary pools are rare for me, such as this investigation. > But I'm not testing block_cloning or anything new this time.) > > I'll note that I use zfs for bectl, not for redundancy. So > my evidence is more limited in that respect. > > The activities were done on a HoneyComb (16 Cortex-A72 cores). > The system has and supports ECC RAM, 64 GiBytes of RAM are > present. > > I started by duplicating my normal zfs environment to an > external USB3 NVMe drive and adjusting the host name and such > to produce the below. (Non-debug, although I do not strip > symbols.) : > > # uname -apKU > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = > main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = > root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > > I then did: git fetch, stash push ., merge --ff-only, stash apply . : > my normal procedure. I then also applied the patch from: > > https://github.com/openzfs/zfs/pull/14739/files > > Then I did: buildworld buildkernel, install them, and rebooted. > > The result was: > > # uname -apKU > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 = > main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 = > root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > > The later poudriere-devel based build of packages from ports is > based on: > > # ~/fbsd-based-on-what-commit.sh -C /usr/ports > 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) = > devel/freebsd-gcc12: Bump to 12.2.0. > Author: John Baldwin > Commit: John Baldwin > CommitDate: 2023-03-25 00:06:40 +0000 > branch: main > merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > n613214 (--first-parent --count for merge-base) > > poudriere attempted to build 476 packages, starting > with pkg (in order to build the 56 that I explicitly > indicate that I want). It is my normal set of ports. > The form of building is biased to allowing a high > load average compared to the number of hardware > threads (same as cores here): each builder is allowed > to use the full count of hardware threads. The build > used USE_TMPFS=3D"data" instead of the USE_TMPFS=3Dall I > normally use on the build machine involved. > > And it produced some random errors during the attempted > builds. A type of example that is easy to interpret > without further exploration is: > > pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse = > error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > > A fair number of errors are of the form: the build > installing a previously built package for use in the > builder but later the builder can not find some file > from the package's installation. > > Another error reported was: > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > For reference: > > [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] Queued: = > 476 Built: 252 Failed: 11 Skipped: 213 Ignored: 0 Fetched: 0 = > Tobuild: 0 Time: 00:37:52 > > I started another build that tried to build 224 packeges: > the 11 failed and 213 skipped. > > Just 1 package built that failed before: > > [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | = > sqlite3-3.41.0_1,1: Success > > It seems to be the only one where the original failure was not > an example of complaining about the missing/corrupted content > of a package install used for building. So it is an example > of randomly varying behavior. > > That, in turn, allowed: > > [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 > > to build but everything else failed or was skipped. > > The sqlite3 vs. other failure difference suggests that writes > have random problems but later reads reliably see the problem > that resulted (before the content is deleted). > > > After the above: > > # zpool status > pool: zroot > state: ONLINE > config: > > NAME STATE READ WRITE CKSUM > zroot ONLINE 0 0 0 > da0p8 ONLINE 0 0 0 > > errors: No known data errors > >> # zpool status > pool: zroot > state: ONLINE > scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 = > 22:15:39 2023 > config: > > NAME STATE READ WRITE CKSUM > zroot ONLINE 0 0 0 > da0p8 ONLINE 0 0 0 > > errors: No known data errors > > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com Let's try this again. Claws-mail didn't include the list address in the header. Trying to reply, again, using exmh instead. Did your pools suffer the EXDEV problem? The EXDEV also corrupted files. I think, without sufficient investigation we risk jumping to conclusions. I've taken an extremely cautious approach, rolling back snapshots (as much as possible, i.e. poudriere datasets) when EXDEV corruption was encountered. I did not rollback any snapshots in my MH mail directory. Rolling back snapshots of my MH maildir would result in loss of email. I have to live with that corruption. Corrupted files in my outgoing sent email directory remain: slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1 53 slippy$ There are 53 corrupted files in my note log of 9913 emails. Those files will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS or ZFS patches cannot retroactively remove the corruption from those files. But my poudriere files, because the snapshots were rolled back, were "repaired" by the rolled back snapshots. I'm not convinced that there is presently active corruption since the problem has been fixed. I am convinced that whatever corruption that was written at the time will remain forever or until those files are deleted or replaced -- just like my email files written to disk at the time. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 06:00:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxppC4BNYz45WT4; Thu, 13 Apr 2023 06: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 4PxppC3ghWz40C6; Thu, 13 Apr 2023 06: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=1681365619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txI7EyQ4bb1Ubi6vCf8t+qRsc2ftEk4sf+sCTBpTsm0=; b=GGwz2/rH2+OP1fXlrZqq7AyD+tFNEyXEJejlph+gaTZWbo5eaFk4rx5QdzofWHIXMe9iM/ REbrTaR6qpt6csk3/xZLRtHaD4GRnORxyCck++9AJ+zYwpOfO796k16qfo6bMUl0rF/MUq ImvnpaFgUxKUsuf3N1QW59kthTCbiarK0G8BB8Bc9qpOSaLdFj8wNgL1WLh87rGKaNC7vK Ccgn+LQbo7hc/CoXyR0bH4Jf2PsF3useLTsQKxM0JSM4IyEyXkha6yFjaUyPWX/OWzkso6 e9YSeS+gJ1wSXqrp0qyzB7Y7iWuEN6U/mLhSLWwSnfBwpS/iIodgpx/V+L4EmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681365619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txI7EyQ4bb1Ubi6vCf8t+qRsc2ftEk4sf+sCTBpTsm0=; b=WkL/y8wId8RFs62jIzDNQtiUJsIdGX9wx2Qiy+25fHnX/KlUYCNExqP5W5//BZMj80DKvt JFWISIbAXwh/2x8EZ4iRUvBKaKQ5RubsWShb1QfTROG8eRa564CNtHhdH5bWsw/BIoNRSE ZeVVUcBGDOnXvMM+vPJmVj/oeMLsD9jlBOQFAq/uc2M5cbV/jR0B9ZlVYHu0NtPnjeoSqp 2Hv/FdM8PQ1xg95KZtV36TmiRsrpgch0VfHSvI9DPPrLCd1wksPKhL8yK9ztEy0gRRJqyH vLLZ3xLE5PrRMvynFQuXFFpPBOfXiLs4tzsJHKLtkSblNFRQa2GMC+FACYvmRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681365619; a=rsa-sha256; cv=none; b=yClA3J7dQmt7B64IOTujBP7qL87R9p8yowb8h7QLMdXDNcoo61IQYUhK9e3eH2YGmwB9ZA YIuZmnqqZ+yfQUMIh/zpvkMbSeHuha7WU3VeSnvRSLYUuxtdk2tIjHg4KVIyTGmCYzBISM ravshIXZZVls/sOCnZcgHYVxTPC+caK+LLprunSSjUzuH1kdCTqtDYrObsvCSTeM/MBw2O jRzb+UlsFGcVtXZoPP5/xzxW/ePaQC9hc3vJq8atFOu72HZh1hRHebkBjO2/Dr6c62TQYn AXPoQQow6ETWLCZDDCjwBHnrk3TLulBfLAY2mmplpAckoHXmSclLn0mHfPeNsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxppC2nYmzWPY; Thu, 13 Apr 2023 06:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33D60JDn027004; Thu, 13 Apr 2023 06:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D60JiW027003; Thu, 13 Apr 2023 06:00:19 GMT (envelope-from git) Date: Thu, 13 Apr 2023 06:00:19 GMT Message-Id: <202304130600.33D60JiW027003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 158adced65f8 - main - bhyve: save softc of ACPI devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 158adced65f844682d26e1e64f247de94212f135 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=158adced65f844682d26e1e64f247de94212f135 commit 158adced65f844682d26e1e64f247de94212f135 Author: Corvin Köhne AuthorDate: 2022-07-22 08:15:28 +0000 Commit: Corvin Köhne CommitDate: 2023-04-13 06:00:09 +0000 bhyve: save softc of ACPI devices This will be useful for writing device specific ACPI tables or DSDT methods. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39322 --- usr.sbin/bhyve/acpi_device.c | 13 ++++++++++++- usr.sbin/bhyve/acpi_device.h | 7 +++++-- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 51603e138fba..e37fc50b8c91 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -36,18 +36,20 @@ struct acpi_resource_list_entry { * Holds information about an ACPI device. * * @param vm_ctx VM context the ACPI device was created in. + * @param softc A pointer to the software context of the ACPI device. * @param emul Device emulation struct. It contains some information like the name of the ACPI device and some device specific functions. * @param crs Current resources used by the ACPI device. */ struct acpi_device { struct vmctx *vm_ctx; + void *softc; const struct acpi_device_emul *emul; SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs; }; int -acpi_device_create(struct acpi_device **const new_dev, +acpi_device_create(struct acpi_device **const new_dev, void *const softc, struct vmctx *const vm_ctx, const struct acpi_device_emul *const emul) { assert(new_dev != NULL); @@ -60,6 +62,7 @@ acpi_device_create(struct acpi_device **const new_dev, } dev->vm_ctx = vm_ctx; + dev->softc = softc; dev->emul = emul; SLIST_INIT(&dev->crs); @@ -136,6 +139,14 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } +void * +acpi_device_get_softc(const struct acpi_device *const dev) +{ + assert(dev != NULL); + + return (dev->softc); +} + int acpi_device_build_table(const struct acpi_device *const dev) { diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 4d734b422ec5..32e299f2da86 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -38,13 +38,14 @@ struct acpi_device_emul { * Creates an ACPI device. * * @param[out] new_dev Returns the newly create ACPI device. + * @param[in] softc Pointer to the software context of the ACPI device. * @param[in] vm_ctx VM context the ACPI device is created in. * @param[in] emul Device emulation struct. It contains some information * like the name of the ACPI device and some device specific * functions. */ -int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx, - const struct acpi_device_emul *emul); +int acpi_device_create(struct acpi_device **new_dev, void *softc, + struct vmctx *vm_ctx, const struct acpi_device_emul *emul); void acpi_device_destroy(struct acpi_device *dev); int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, @@ -52,5 +53,7 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); +void *acpi_device_get_softc(const struct acpi_device *dev); + int acpi_device_build_table(const struct acpi_device *dev); int acpi_device_write_dsdt(const struct acpi_device *dev); diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index ddd73d06d34d..af819dc4a952 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -401,7 +401,7 @@ qemu_fwcfg_init(struct vmctx *const ctx) * tables and register io ports for fwcfg, if it's used. */ if (strcmp(lpc_fwcfg(), "qemu") == 0) { - error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, + error = acpi_device_create(&fwcfg_sc.acpi_dev, &fwcfg_sc, ctx, &qemu_fwcfg_acpi_device_emul); if (error) { warnx("%s: failed to create ACPI device for QEMU FwCfg", From nobody Thu Apr 13 06:11:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pxq3021p2z45XGN for ; Thu, 13 Apr 2023 06:11:24 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic309-22.consmr.mail.gq1.yahoo.com (sonic309-22.consmr.mail.gq1.yahoo.com [98.137.65.148]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pxq2z1MXDz4FBC for ; Thu, 13 Apr 2023 06:11:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Rb4veZNA; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681366281; bh=uhYHB/QKC6y9MqB2is1zGkHhHywh5oRKko+KkQ7uWEk=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=Rb4veZNA4DGBh7WVDfIEgq/oDF60pBz6S5+n8hGibfZ1Vb/du3EXTjB1xkFOua90ENCvl1y4iff0ewYHikaa5MDZO5bcfTgP9w645JyZ4Cax7MCChxPs90CuL/rFTFwD0qTe1NMMqr5wrZ3xoxZGgHIyE1I+J/HhEMGCTbI8vXsEMfF24Ai57leYZ6KCak7TNqGN9y2leTMma9qPiHZG+zPLlett7Y4o7MSE6dVgghJ6cK/6CoqILaNdDld57p4pU/BQpfAhe7WxlmvNx34LXyNgpIsoJv9MmYzqZXydSrJPkz5viyinSnfRLuaOs2eK0QoWQu94KuP3j1Mga2iq2A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681366281; bh=FOZPolu4K3kJUCjyoxoBg8SeqYmxKReXJ0Yh6Ww39yi=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=mbs89pBosxKXrmpqXCo7GHNfq7ZIApAFg0lIU8PLMuB3kTPCPetYjwulQO3yJF58MJFUFqCxfBDgZoahT0TMzVjtzOH8oSi4mdtbqjz5xQHQEWtRUe/n2TEvwObIMYq3LsL93mNeHOn7/fB96mZ7f2dd2AZ784QyxypzSFc7/VB/eh8IlLYRsSmm04JxzTkcdppGc/YK/FDgQkIISRdTbffXLo7Eq+zm7EGlRrmDM+E/DHZm9ILZYsaAZiZFPYEfDUnWPC9GyL+bYz22wG2Hqhowoqr9txrcpy7t1hXkbyFXAeybzc43Gltw6lflv9Dd+TNvPwxKGnzqPbCssbV19A== X-YMail-OSG: GKMQ9c4VM1mGvvt77TU_DZrhesYIyXM5SI90qc80bLgUjub8ivvUMtRuDynQY7k nkLXjyMz3XTRm25mrWgneV_.8gMmZY8hrgbz5YPXn1FVMHhc9eUOgI53DUWWo4XGc7aYp4x5ow5N uzevXtBhItAXCrwEH6_z.fSSLmKkHKsOjlFpsJ2JJHFn19dCYJ0ewPLuob2ABFv6DF1Nhg_IH1o. vYwRnTGiKk0oQXdABh4Q57ZWya5cgYQrib1oQ_5N1rZ2vUbFkgOSc_PRA2_a3SxtFfVLKmGCYwlc 9Oi6unYjaZTJSLGqxoUWYN2Tz6AUN1xvQW9DLowbmLt8zJarloOVigO5bLzStQiWHlQU.Xg4X_tD 5v6M5As0w4quTFbKTcCKZRbB69PxC3n1LdwZWDO4WHS8t.ahFHlnQ1gPcar75tCGpyWLEH9wDkym MAOYYE2.xOBTC2VoYS2bCvQ5Wy2moxv3lsUh0RBA2HVhjH3U2ZeVLJgGPmojwViUSt73jjyfF8OA ZFhF2605PvKpECT4Ll4u6u.SdxXNEf8dFfE1kCjfqyjypFgC1F_6.nAJxa1Q7x2R7Mvx.uRbygoN uzzlvQ1JPY8RSqcWM7x4gB1AjDMZPxP8NkWYBxg1nisVt5PEary3sqJc0u7022TfCJKkm4lGVqxH mxzrHlUTsT30ibBs8OTxbAd92uNyfK39n2T7pDoVKUVMdAyqy.JENDeQe8DGKw95.Ca_Je22HkNb BQvDIlxZnwAmfQTzPLqoMaPSRwziYy1PZodVxtFTmezynFT3v1tW0KyPTQZ_y128seuHUeaCmEFG OdK3FnnoAh_LvheyLKN0FmBBMS3Jmyjx7KoNKBUbUBAJr5AOdcDtDHzgXez2mJvp74nKkvJ5ubw4 y76o5RdpVZ5ep_FqAIOYxkWS8.5soP8kCTzpzOlL4GxYNk9UKghl8huzyBQ2fIU5cWECMcXygdFT cysBtArARhFQdSG_tjevL2J0yH2ftdf4eWpo9WDgbDGCgrdmDwazoMt_GskOp_cY5kDQDsukLKnC tENtgGBQ4hY8Hn1TpjK4jbAw_lJkJOGMvm5N3ahaHmcxDWbm8F6_SfmSDv7czc6QrzI0X7sbTPB6 hLi23YdLgEptz.1H.EmOylyQ5RQz_1V6ISufN5F5F9us4ZNsb9WEfj8u5S_gW0omB.5xxHuHXrvK 4ng3YVtpO8DgYiWU1n2FZ78aXKlTHy_H25SIxiHOAOqeVmViSmDAsgS3r4hHJ1eEdgjSUYQ3yNa_ 7Mw7b5Z455rYlGJQRSfTL4_VduulY.pJz6n8ItVumD.EcZZg5kRQ25vws3YMpdz63AdyNvqPWxMt PjHy5_HWfBdaRcPOykC60DvgGV5sO6T1ktsoCwdK5ZhMuIDGQNPUhAs8.RkQRwHTkQRNZuMokz2t pWkP_1NPt7KzimeSF.154O_.NI9AsRKNScVdiF6hOY2S9fKruMCTyY78zqnqtvvvt29cdN1XcN1p G2AJdAWSKjfXfCZDPwT.gH.LpOweH_fvuuX1bpOqzDukzdb9tkcTUVRz8a_wv_PJftjABNAUq90h ZRg9OFbd_J6UwgqlptE1Eue2WqxdQkKZPotCyaFYlD2VRqH3Mdd9Wi7Yg.cJD6jscEQ2bO21rfRh 3UZKI9n_c.whJMr6mPSOByHZOIhwgQCBcnroe5CgHPhU_pNfyzixUByeBg8wfcXcm142n0AgoGYB KH7ReA7FahtYce4vzWff8PRfCYHLc3bLEoPUZ8i9YUDqOZpiI.YvINK6j.5N8tWnCFzpKcf3UoPR bNI_FtJeE29zmlIADnHzwPd6WU1mKGo8cOyChctKh1ttRFJDHzK44sEVTOFWEFbXlvVeCaBxjAPF Ja.JuL4QLyPfkpe7QusyQOXMB2O5H3.aAL.wTQ77Eu7GrICJZJ4AWAPikU1rrH7fBVOHrfffeCDX mFgKwCZpaHT4_kP9s1z1qjlcj0Ut5WFL8nd1aGB2Nlkw5p7cK44k8xbZFZcauwCWswdU.SpnRxyD r6OycCIQ2PkJtiESJsvcH_tg.d7mKBRJa7Oj.Xxqghe7z4uPGvUVOuYOJsT82eGajhqTj9dqPijz DZodhJiZwf7LxkfHxlJugpVa7Z6uks78arpE7DLz69jAaKhE3Mu8TKx8ORHbyiYBCo4XeDKG0FxT JRFeRhVFpcU3Dj9QY_LGNYTrkdFnCjzG593HqJS28517CczYyurL2sAW.bDKTil.oQtnSM6eJ56f 54_iHVhZP91t4lvVaPsEe1uIFLbEc20_yQwM0DJdmmq2PAfPdeSTenBaP_tGQ8zn_cvhJChJoCFE j1nLd X-Sonic-MF: X-Sonic-ID: b830c80c-4626-4c8f-9a71-a30c5e12f25a Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.gq1.yahoo.com with HTTP; Thu, 13 Apr 2023 06:11:21 +0000 Received: by hermes--production-ne1-7dbd98dd99-znv4z (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 618c13e3389b1298e3a8008ed2e8b408; Thu, 13 Apr 2023 06:11:20 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-Id: <5C8E3DDB-3D8D-4C7F-94DE-09CF45611E70@yahoo.com> Date: Wed, 12 Apr 2023 23:11:08 -0700 To: Cy Schubert , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.400.51.1.1) References: <5C8E3DDB-3D8D-4C7F-94DE-09CF45611E70.ref@yahoo.com> X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.148:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.148:from] X-Rspamd-Queue-Id: 4Pxq2z1MXDz4FBC X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N From: Cy Schubert wrote on Date: Thu, 13 Apr 2023 05:47:33 UTC : > On Wed, 12 Apr 2023 22:28:13 -0700 > Mark Millard wrote: >=20 > > From: Charlie Li wrote on > > Date: Wed, 12 Apr 2023 20:11:16 UTC : > >=20 > > > Charlie Li wrote:=20 > > > > Mateusz Guzik wrote:=20 > > > >> can you please test poudriere with > > > >> https://github.com/openzfs/zfs/pull/14739/files > > > >>=20 > > > > After applying, on the md(4)-backed pool regardless of = block_cloning,=20 > > > > the cy@ `cp -R` test reports no differing (ie corrupted) files. = Will=20 > > > > report back on poudriere results (no block_cloning). > > > >=20 > > > As for poudriere, build failures are still rolling in. These are = (and=20 > > > have been) entirely random on every run. Some examples from this = run: > > >=20 > > > lang/php81: > > > - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=20 > > > ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf = ${STAGEDIR}/${PREFIX}/etc > > > - consumers fail to build due to corrupted php.conf packaged > > >=20 > > > devel/ninja: > > > - phase: stage > > > - install -s -m 555=20 > > > /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=20 > > > /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > > - consumers fail to build due to corrupted bin/ninja packaged > > >=20 > > > devel/netsurf-buildsystem: > > > - phase: stage > > > - mkdir -p=20 > > > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/makefiles=20 > > > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/testtools > > > for M in Makefile.top Makefile.tools Makefile.subdir = Makefile.pkgconfig=20 > > > Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do = \ > > > cp makefiles/$M=20 > > > = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= tsurf-buildsystem/makefiles/;=20 > > > \ > > > done > > > - graphics/libnsgif fails to build due to NUL characters in=20 > > > Makefile.{clang,subdir}, causing nothing to link=20 > >=20 > > Summary: I have problems building ports into packages > > via poudriere-devel use despite being fully updated/patched > > (as of when I started the experiment), never having enabled > > block_cloning ( still using openzfs-2.1-freebsd ). > >=20 > > In other words, I can confirm other reports that have > > been made. > >=20 > > The details follow. > >=20 > >=20 > > [Written as I was working on setting up for the experiments > > and then executing those experiments, adjusting as I went > > along.] > >=20 > > I've run my own tests in a context that has never had the > > zpool upgrade and that jump from before the openzfs import to > > after the existing commits for trying to fix openzfs on > > FreeBSD. I report on the sequence of activities getting to > > the point of testing as well. > >=20 > > By personal policy I keep my (non-temporary) pool's compatible > > with what the most recent ??.?-RELEASE supports, using > > openzfs-2.1-freebsd for now. The pools involved below have > > never had a zpool upgrade from where they started. (I've no > > pools that have ever had a zpool upgrade.) > >=20 > > (Temporary pools are rare for me, such as this investigation. > > But I'm not testing block_cloning or anything new this time.) > >=20 > > I'll note that I use zfs for bectl, not for redundancy. So > > my evidence is more limited in that respect. > >=20 > > The activities were done on a HoneyComb (16 Cortex-A72 cores). > > The system has and supports ECC RAM, 64 GiBytes of RAM are > > present. > >=20 > > I started by duplicating my normal zfs environment to an > > external USB3 NVMe drive and adjusting the host name and such > > to produce the below. (Non-debug, although I do not strip > > symbols.) : > >=20 > > # uname -apKU > > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > >=20 > > I then did: git fetch, stash push ., merge --ff-only, stash apply . = : > > my normal procedure. I then also applied the patch from: > >=20 > > https://github.com/openzfs/zfs/pull/14739/files > >=20 > > Then I did: buildworld buildkernel, install them, and rebooted. > >=20 > > The result was: > >=20 > > # uname -apKU > > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 = main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 = root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > >=20 > > The later poudriere-devel based build of packages from ports is > > based on: > >=20 > > # ~/fbsd-based-on-what-commit.sh -C /usr/ports > > 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) = devel/freebsd-gcc12: Bump to 12.2.0. > > Author: John Baldwin > > Commit: John Baldwin > > CommitDate: 2023-03-25 00:06:40 +0000 > > branch: main > > merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > > merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > > n613214 (--first-parent --count for merge-base) > >=20 > > poudriere attempted to build 476 packages, starting > > with pkg (in order to build the 56 that I explicitly > > indicate that I want). It is my normal set of ports. > > The form of building is biased to allowing a high > > load average compared to the number of hardware > > threads (same as cores here): each builder is allowed > > to use the full count of hardware threads. The build > > used USE_TMPFS=3D"data" instead of the USE_TMPFS=3Dall I > > normally use on the build machine involved. > >=20 > > And it produced some random errors during the attempted > > builds. A type of example that is easy to interpret > > without further exploration is: > >=20 > > pkg_resources.extern.packaging.requirements.InvalidRequirement: = Parse error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected = W:(0-9A-Za-z) > >=20 > > A fair number of errors are of the form: the build > > installing a previously built package for use in the > > builder but later the builder can not find some file > > from the package's installation. > >=20 > > Another error reported was: > >=20 > > ld: error: /usr/local/lib/libblkid.a: unknown file type > >=20 > > For reference: > >=20 > > [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] = Queued: 476 Built: 252 Failed: 11 Skipped: 213 Ignored: 0 Fetched: 0 = Tobuild: 0 Time: 00:37:52 > >=20 > > I started another build that tried to build 224 packeges: > > the 11 failed and 213 skipped. > >=20 > > Just 1 package built that failed before: > >=20 > > [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | = sqlite3-3.41.0_1,1: Success > >=20 > > It seems to be the only one where the original failure was not > > an example of complaining about the missing/corrupted content > > of a package install used for building. So it is an example > > of randomly varying behavior. > >=20 > > That, in turn, allowed: > >=20 > > [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 > >=20 > > to build but everything else failed or was skipped. > >=20 > > The sqlite3 vs. other failure difference suggests that writes > > have random problems but later reads reliably see the problem > > that resulted (before the content is deleted). > >=20 > >=20 > > After the above: > >=20 > > # zpool status > > pool: zroot > > state: ONLINE > > config: > >=20 > > NAME STATE READ WRITE CKSUM > > zroot ONLINE 0 0 0 > > da0p8 ONLINE 0 0 0 > >=20 > > errors: No known data errors > >=20 > > # zpool scrub zroot > > # zpool status > > pool: zroot > > state: ONLINE > > scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 = 22:15:39 2023 > > config: > >=20 > > NAME STATE READ WRITE CKSUM > > zroot ONLINE 0 0 0 > > da0p8 ONLINE 0 0 0 > >=20 > > errors: No known data errors > >=20 > >=20 > > =3D=3D=3D > > Mark Millard > > marklmi at yahoo.com >=20 > Did your pools suffer the EXDEV problem? The EXDEV also corrupted = files. As I reported, this was a jump from before the import to as things are tonight (here). So: NO, unless the existing code as of tonight still has the EXDEV problem! Prior to this experiment I'd not progressed any media beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > I think, without sufficient investigation we risk jumping to > conclusions. I've taken an extremely cautious approach, rolling back > snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > corruption was encountered. Again: nothing between main-n261544-cee09bda03c8-dirty and main-n262122-2ef2c26f3f13-dirty was involved at any stage. > I did not rollback any snapshots in my MH mail directory. Rolling back > snapshots of my MH maildir would result in loss of email. I have to > live with that corruption. Corrupted files in my outgoing sent email > directory remain: >=20 > slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=20 > 53 > slippy$=20 >=20 > There are 53 corrupted files in my note log of 9913 emails. Those = files > will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS > or ZFS patches cannot retroactively remove the corruption from those > files. >=20 > But my poudriere files, because the snapshots were rolled back, were > "repaired" by the rolled back snapshots. >=20 > I'm not convinced that there is presently active corruption since > the problem has been fixed. I am convinced that whatever corruption > that was written at the time will remain forever or until those files > are deleted or replaced -- just like my email files written to disk at > the time. My test results and procedure just do not fit your conclusion that things are okay now if block_clonging is completely avoided. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Thu Apr 13 06:21:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxqGt0HcCz45Y9t for ; Thu, 13 Apr 2023 06:21:41 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic313-21.consmr.mail.gq1.yahoo.com (sonic313-21.consmr.mail.gq1.yahoo.com [98.137.65.84]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxqGs2GfRz4Wym for ; Thu, 13 Apr 2023 06:21:41 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681366898; bh=CO8PRRu3TSsLc/F8pOb+6WdYJ9PxhDtllc2LhGE4UeA=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=JRtzimld5TFU5SrXYWwpaqC+MrtBsY3JoIdRkjx+uNfyx2oC0bqKMfwh6OcnKFce/MKZK0iWaB60on7/EvcU/KkQROb4OKU3EyOAuY7KAwmDZRr2G0I5AraKds4VLGL6LC+z/Y3e2bsicpG//HRNs3Mkiu6nuAX/QewCD8YNgFiEilLcjiI1dgS7g9ecKI+LC5UvHoAc1O6tLtW6k2t0l0BR8+VCfrrYum7KGc0PoVRinjXBJ3vyAEQSWccIrGOllyXsKQjI4cgrl/0gIKgCeXeXMm7c3XE0fYP1tCmayi3Jo9xunO0uOSSwr8lbKYFOwx9Giea5hFKRynWPieYKIg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681366898; bh=C7Tg+f5q7NYiKWciU0/pEo1Db4MuQH72/miLV4eiM/M=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=C2tgmlLgE2UJ7RQSHpZ7/aMNjKyN46m2bPxwK8FIZ7fTQiiIjT3XmGWe//1dQisxm4vcLfKjV8QYDIAv4bqTVC+skfpFkpUtbqrRADaJ1ZDfz2HjfkdQioNNDpklFG+HFa96OdANyQiS8jk0KxSDpDlJRjr7L7jy+8sXZ2Hyx+f2+I9cezK3+5jAOyXS4rdvx6uThkzPjjbMfwVJ2OtkUlBYDaHDgdyVfzxjRBbGhKYPu7Y4TLvp6SzWgf7aUYvOkVpClcZoduydmB+SjsP/Lh+h7UEi6IEBSiuECc6L49O6s72DwAB0Y0B4SqEyPNzXniPqx8ekjcwFXWXJ9C1APg== X-YMail-OSG: RyNtswIVM1npF6zm.gZ4eIQsHfA_tU385IEK__S.6YUuBJs9bysP5mTh.MCIaCH MWoLKCgIDaUp64d6Xfo1YDvytOIo_Tof3X5vMDBLZdvvYYS_vBU52qAf3s3t7b7M0cs1bbeNvb1k 8Fu.Ep7gDwLcoRzE9TcQqGa3HuoksLlpp.Ch9zGGQa_m9PGl.LmXrxjHDmMXNtgb9mdwLBUSyMAC kmUgjKyTEZzcYpG75EVZbWO7PnFwXhIgZcNZFdykhRuq2kzen3yY8cjnYIKzoMlfYrwDZHAynk0x s2EkkRH8d3Im4dsK8UyXaRsBo.2NYU9RCI1P3fFhL2Y1uI3r_1ju_fl5uIAd7AcYvpWTjQUWi9PC IaSChPnygLQZpnejKzHIH.ehSGc9XQxJ1x0To.f.3WkYIEuibE3Ag5qjzL5BXn_w8qX30vgBvh1N voPSMvtXPFMFbrMKKw3KFnBDMyiVVnXxSHmHfBvm0pZDynv9FNDrLvy9LKYJUjtfa5Eb7Gc43jm8 8veQxnYWloXgcfTpvV8WTI3e4DEreNU.KjuPS5cUEs9CbZi0sgvRTYxlvcDcwSeyzq.wVpE7_8mu 5yXBhF_8oxuo4Up85RwUKVOiKEohI4oud.5cQc28iMXBPUVA0C47RZPoOsm4CY5Wb3Tklf0D2j5L NfPxIVZD43wkV3yanZ3gWez2gi1cRwOtPuyxPLm7OSNiNvn36PXx01VZzwF1A0GjIOcbEJM8XY19 .sGsACoGnJxUyurpE1CWviySzsP2mANLi_bTrK..psXkGrPVKKpejZU3rIwUf3zsUb4VsvtmeqKr 5rJsqPhquiVBSnSRRVB98qaNranM_NrVLz1pH2.Bs7f8mfx20hkD7ad5Zlk.b0J4MJlTBKRQxT3n GPlzq5lPjxKjc97j33C4_4ITg4j9DR2_gGtOnDzOT96h1Mc2XiYPjKmppodFSXmrm_k0_3VKHxQF gzja31KqZErY1lNw1s8IO.wWALWObM_cjSJCq85cSALFiZnOYjngdPvncoxtGGSG0JK9ewIcJuN0 8_j0WcqFm6oGHeiLHwN8K4D4jL.kBxCQbLln27.bYS1CfmsMS8c.eRGPqEQxqV2Ra2JI.pDf4KIk 8iiD3_2LcO_p7_bHgJjbzI1Dt1xoCdDSFQHBMHmC0pqRiYoomXPlzcM_GOPclnsy2DdXid8Noam2 uPw3v9bYAADlC4ZNMqTEGjYWzRSfS1IoBm6HZkFauNKVpGUPt.HKNHBvqv_B9vI1AAfahf8jqn2F dboxoSy7URSlBQ9PVf._lyeLDFnQmAZw1n1OgJGdqujpFQHccSgePx6WqJ8Af12rasanO8qBpSOX cFDKkjuF8TizCkKLvi6u9SlICZZbgRkKqVYoToBUzw6RrSytL5AHAulqCOmD8WsocEtXVBv.Ktwh Y.0ZVegPR_ZRsrq5vF8GlH0pjQCJJTsDKMWYJs1ywsuFgc7GX8OpMjna6Slx4Zjv4P.rNLHWD6aQ gMKmL4zIypcg597YgX_EvPZWE5z_NFmyRIGAMVgarP2S6BiNhmRgkc84QNky4B5CfsY0zNL5E0y7 2h7M7a.0.prL9XJa45C5RruS8ZEcOpzHYIIV4C.AFEDWSh6qqx_MfuZVm0cRQI553sR3qAgjKV1v P1LzckclwWWjfnWv76AZVpxuTe_ge0nkLcxm._LgOo3R0EZ068Mw6jXcdaikAVCleMv9gfE0k72j YQrWY5D_B07I.22rkTwZ7plD91CyT_Tj17_MmYmSzDcSeGDm5Tb_GC3V13jw1TyewGtZPPR745JD WrES5ccK_lArK6lasj68eKFIV7c.uWHdSAxjvUP2dFl7zc7dYT6N1rIMh51oV_SI8h36IWDYSwWG WA9IVf1rAyH7wmi_vgTDZ.aehpMLSanJRfLBmrZYIsXRRtY7M91awTpiHrpBhYR3d.oMse_UA8Y1 8enro0o3gxhKK9NQDSqn5.17NZfy4DAwXkIPJ11u3C5JrJoa1dzFEAXCURs5uMsEH985jnXM8ure iwksHqbM04zw9GM6RjGzZAk7TtVCjlO030TXYOdIFCk.OI.b8VP9WHcgZHsORlxbzVwfyk8Am.YT nq5ZNBRM7JEdNUsRWV_oTiWUdzXst5sAWE7l2LA0q9vWfHTcfPMkMQjlg5lZztIYwu1QNU4gQCnn 3ip4jCsILMgYW6fih8hSMcXofSVQBebdzcfbQvrbMiHQRvQCHDfEr9uRD5YCYikGh1qrNmRnq7ZR ernJhSnfpYDGzor8rQCNkofjLFObGFshfCeh87c2FT4ZI.JHUNQyv_Hri2KijnQQo9IwKyyWSp1U gwEytkA-- X-Sonic-MF: X-Sonic-ID: 845b5ec2-8357-4222-b9db-1618602ddecd Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Thu, 13 Apr 2023 06:21:38 +0000 Received: by hermes--production-bf1-5f9df5c5c4-wvm2h (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a481fa1bb45a3a50e0daa9b92e5d42cf; Thu, 13 Apr 2023 06:21:32 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <20230413055221.E8B211F0@slippy.cwsent.com> Date: Wed, 12 Apr 2023 23:21:19 -0700 Cc: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: References: <20230413055221.E8B211F0@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PxqGs2GfRz4Wym X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N [This just puts my prior reply's material into Cy's adjusted resend of the original. The To/Cc should be coomplete this time.] On Apr 12, 2023, at 22:52, Cy Schubert = wrote: > In message , Mark = Millard=20 > write > s: >> From: Charlie Li wrote on >> Date: Wed, 12 Apr 2023 20:11:16 UTC : >>=20 >>> Charlie Li wrote: >>>> Mateusz Guzik wrote: >>>>> can you please test poudriere with >>>>> https://github.com/openzfs/zfs/pull/14739/files >>>>>=20 >>>> After applying, on the md(4)-backed pool regardless of =3D >> block_cloning,=3D20 >>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = Will=3D20=3D >>=20 >>>> report back on poudriere results (no block_cloning). >>>> =3D20 >>> As for poudriere, build failures are still rolling in. These are = (and=3D20=3D >>=20 >>> have been) entirely random on every run. Some examples from this = run: >>> =3D20 >>> lang/php81: >>> - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D20 >>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D >> ${STAGEDIR}/${PREFIX}/etc >>> - consumers fail to build due to corrupted php.conf packaged >>> =3D20 >>> devel/ninja: >>> - phase: stage >>> - install -s -m 555=3D20 >>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D20 >>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin >>> - consumers fail to build due to corrupted bin/ninja packaged >>> =3D20 >>> devel/netsurf-buildsystem: >>> - phase: stage >>> - mkdir -p=3D20 >>> =3D >> = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= =3D >> tsurf-buildsystem/makefiles=3D20 >>> =3D >> = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= =3D >> tsurf-buildsystem/testtools >>> for M in Makefile.top Makefile.tools Makefile.subdir =3D >> Makefile.pkgconfig=3D20 >>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ >>> cp makefiles/$M=3D20 >>> =3D >> = /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= =3D >> tsurf-buildsystem/makefiles/;=3D20 >>> \ >>> done >>> - graphics/libnsgif fails to build due to NUL characters in=3D20 >>> Makefile.{clang,subdir}, causing nothing to link >>=20 >> Summary: I have problems building ports into packages >> via poudriere-devel use despite being fully updated/patched >> (as of when I started the experiment), never having enabled >> block_cloning ( still using openzfs-2.1-freebsd ). >>=20 >> In other words, I can confirm other reports that have >> been made. >>=20 >> The details follow. >>=20 >>=20 >> [Written as I was working on setting up for the experiments >> and then executing those experiments, adjusting as I went >> along.] >>=20 >> I've run my own tests in a context that has never had the >> zpool upgrade and that jump from before the openzfs import to >> after the existing commits for trying to fix openzfs on >> FreeBSD. I report on the sequence of activities getting to >> the point of testing as well. >>=20 >> By personal policy I keep my (non-temporary) pool's compatible >> with what the most recent ??.?-RELEASE supports, using >> openzfs-2.1-freebsd for now. The pools involved below have >> never had a zpool upgrade from where they started. (I've no >> pools that have ever had a zpool upgrade.) >>=20 >> (Temporary pools are rare for me, such as this investigation. >> But I'm not testing block_cloning or anything new this time.) >>=20 >> I'll note that I use zfs for bectl, not for redundancy. So >> my evidence is more limited in that respect. >>=20 >> The activities were done on a HoneyComb (16 Cortex-A72 cores). >> The system has and supports ECC RAM, 64 GiBytes of RAM are >> present. >>=20 >> I started by duplicating my normal zfs environment to an >> external USB3 NVMe drive and adjusting the host name and such >> to produce the below. (Non-debug, although I do not strip >> symbols.) : >>=20 >> # uname -apKU >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D >> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 =3D >> = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= =3D >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 >>=20 >> I then did: git fetch, stash push ., merge --ff-only, stash apply . : >> my normal procedure. I then also applied the patch from: >>=20 >> https://github.com/openzfs/zfs/pull/14739/files >>=20 >> Then I did: buildworld buildkernel, install them, and rebooted. >>=20 >> The result was: >>=20 >> # uname -apKU >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D >> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 =3D >> = root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= =3D >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 >>=20 >> The later poudriere-devel based build of packages from ports is >> based on: >>=20 >> # ~/fbsd-based-on-what-commit.sh -C /usr/ports >> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D >> devel/freebsd-gcc12: Bump to 12.2.0. >> Author: John Baldwin >> Commit: John Baldwin >> CommitDate: 2023-03-25 00:06:40 +0000 >> branch: main >> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 >> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 >> n613214 (--first-parent --count for merge-base) >>=20 >> poudriere attempted to build 476 packages, starting >> with pkg (in order to build the 56 that I explicitly >> indicate that I want). It is my normal set of ports. >> The form of building is biased to allowing a high >> load average compared to the number of hardware >> threads (same as cores here): each builder is allowed >> to use the full count of hardware threads. The build >> used USE_TMPFS=3D3D"data" instead of the USE_TMPFS=3D3Dall I >> normally use on the build machine involved. >>=20 >> And it produced some random errors during the attempted >> builds. A type of example that is easy to interpret >> without further exploration is: >>=20 >> pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse = =3D >> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) >>=20 >> A fair number of errors are of the form: the build >> installing a previously built package for use in the >> builder but later the builder can not find some file >> from the package's installation. >>=20 >> Another error reported was: >>=20 >> ld: error: /usr/local/lib/libblkid.a: unknown file type >>=20 >> For reference: >>=20 >> [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] = Queued: =3D >> 476 Built: 252 Failed: 11 Skipped: 213 Ignored: 0 Fetched: 0 =3D >> Tobuild: 0 Time: 00:37:52 >>=20 >> I started another build that tried to build 224 packeges: >> the 11 failed and 213 skipped. >>=20 >> Just 1 package built that failed before: >>=20 >> [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | =3D >> sqlite3-3.41.0_1,1: Success >>=20 >> It seems to be the only one where the original failure was not >> an example of complaining about the missing/corrupted content >> of a package install used for building. So it is an example >> of randomly varying behavior. >>=20 >> That, in turn, allowed: >>=20 >> [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 >>=20 >> to build but everything else failed or was skipped. >>=20 >> The sqlite3 vs. other failure difference suggests that writes >> have random problems but later reads reliably see the problem >> that resulted (before the content is deleted). >>=20 >>=20 >> After the above: >>=20 >> # zpool status >> pool: zroot >> state: ONLINE >> config: >>=20 >> NAME STATE READ WRITE CKSUM >> zroot ONLINE 0 0 0 >> da0p8 ONLINE 0 0 0 >>=20 >> errors: No known data errors >>=20 >> =08=E0=B9=84=C2=8DM # zpool scrub zroot >> # zpool status >> pool: zroot >> state: ONLINE >> scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 =3D >> 22:15:39 2023 >> config: >>=20 >> NAME STATE READ WRITE CKSUM >> zroot ONLINE 0 0 0 >> da0p8 ONLINE 0 0 0 >>=20 >> errors: No known data errors >>=20 >>=20 >> =3D3D=3D3D=3D3D >> Mark Millard >> marklmi at yahoo.com >=20 >=20 > Let's try this again. Claws-mail didn't include the list address in = the=20 > header. Trying to reply, again, using exmh instead. >=20 >=20 > Did your pools suffer the EXDEV problem? The EXDEV also corrupted = files. As I reported, this was a jump from before the import to as things are tonight (here). So: NO, unless the existing code as of tonight still has the EXDEV problem! Prior to this experiment I'd not progressed any media beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > I think, without sufficient investigation we risk jumping to > conclusions. I've taken an extremely cautious approach, rolling back > snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > corruption was encountered. Again: nothing between main-n261544-cee09bda03c8-dirty and main-n262122-2ef2c26f3f13-dirty was involved at any stage. >=20 > I did not rollback any snapshots in my MH mail directory. Rolling back > snapshots of my MH maildir would result in loss of email. I have to > live with that corruption. Corrupted files in my outgoing sent email > directory remain: >=20 > slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=20 > 53 > slippy$=20 >=20 > There are 53 corrupted files in my note log of 9913 emails. Those = files > will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS > or ZFS patches cannot retroactively remove the corruption from those > files. >=20 > But my poudriere files, because the snapshots were rolled back, were > "repaired" by the rolled back snapshots. >=20 > I'm not convinced that there is presently active corruption since > the problem has been fixed. I am convinced that whatever corruption > that was written at the time will remain forever or until those files > are deleted or replaced -- just like my email files written to disk at > the time. My test results and procedure just do not fit your conclusion that things are okay now if block_clonging is completely avoided. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Thu Apr 13 06:42:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxqlM71ZNz45Zs1; Thu, 13 Apr 2023 06:42:55 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxqlM5xJ0z3lN3; Thu, 13 Apr 2023 06:42:55 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id mmqmp3VKHuZMSmqfWpOI4B; Thu, 13 Apr 2023 06:42:54 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mqfUp4CUicyvumqfVp4k6P; Thu, 13 Apr 2023 06:42:54 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=6437a46e a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Q5sIUPrKt2Z6qAjYQ9sA:9 a=wPNLvfGTeEIA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 35E5CA1B; Wed, 12 Apr 2023 23:42:52 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 1E5C1318; Wed, 12 Apr 2023 23:42:52 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mark Millard cc: Cy Schubert , Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pawel@dawidek.net, pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: References: <20230413055221.E8B211F0@slippy.cwsent.com> Comments: In-reply-to Mark Millard message dated "Wed, 12 Apr 2023 23:21:19 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Wed, 12 Apr 2023 23:42:52 -0700 Message-Id: <20230413064252.1E5C1318@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKVXIbi7ssLvnTb3JOj7dXnaImKSoPPshHeMdFgx8RPZheYaXcwaJnNEjbaQNKl28t+Wg7P/3YOesXP8fv4o4YF//5SNSrJaVZ64iKYmmVbJdQfQqTxo dWzqwlN3V1wCt2PwrQrjjJqk1YU8DGhsggYJWDXtYmx5hKHdlAAgwzHgN9AeU4e8bngQjUQZ3w3A0ZcUkqv53N8mBHVJzsvDf/8H7uejRAFJDGoLvrii/45i TO5SU/9E1jNL39RhCV7smd5ogkxQ2OrUzZIRaGnIc+oKhQscjmHpKghH/7GPvIWw5LsEQF27TVoXhO+4z3QAhZwYXLVgXBQLMZRdxYXvTPf5ssYAJ0Iwiq9I bK+Yn1NmmWB4iQNL0IPvsSWh+8pIERb41szoaTD4pv13rIlSwDU= X-Rspamd-Queue-Id: 4PxqlM5xJ0z3lN3 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Mark Millard write s: > [This just puts my prior reply's material into Cy's > adjusted resend of the original. The To/Cc should > be coomplete this time.] > > On Apr 12, 2023, at 22:52, Cy Schubert = > wrote: > > > In message , Mark = > Millard=20 > > write > > s: > >> From: Charlie Li wrote on > >> Date: Wed, 12 Apr 2023 20:11:16 UTC : > >>=20 > >>> Charlie Li wrote: > >>>> Mateusz Guzik wrote: > >>>>> can you please test poudriere with > >>>>> https://github.com/openzfs/zfs/pull/14739/files > >>>>>=20 > >>>> After applying, on the md(4)-backed pool regardless of =3D > >> block_cloning,=3D20 > >>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = > Will=3D20=3D > >>=20 > >>>> report back on poudriere results (no block_cloning). > >>>> =3D20 > >>> As for poudriere, build failures are still rolling in. These are = > (and=3D20=3D > >>=20 > >>> have been) entirely random on every run. Some examples from this = > run: > >>> =3D20 > >>> lang/php81: > >>> - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D20 > >>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D > >> ${STAGEDIR}/${PREFIX}/etc > >>> - consumers fail to build due to corrupted php.conf packaged > >>> =3D20 > >>> devel/ninja: > >>> - phase: stage > >>> - install -s -m 555=3D20 > >>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D20 > >>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > >>> - consumers fail to build due to corrupted bin/ninja packaged > >>> =3D20 > >>> devel/netsurf-buildsystem: > >>> - phase: stage > >>> - mkdir -p=3D20 > >>> =3D > >> = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > =3D > >> tsurf-buildsystem/makefiles=3D20 > >>> =3D > >> = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > =3D > >> tsurf-buildsystem/testtools > >>> for M in Makefile.top Makefile.tools Makefile.subdir =3D > >> Makefile.pkgconfig=3D20 > >>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > >>> cp makefiles/$M=3D20 > >>> =3D > >> = > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > =3D > >> tsurf-buildsystem/makefiles/;=3D20 > >>> \ > >>> done > >>> - graphics/libnsgif fails to build due to NUL characters in=3D20 > >>> Makefile.{clang,subdir}, causing nothing to link > >>=20 > >> Summary: I have problems building ports into packages > >> via poudriere-devel use despite being fully updated/patched > >> (as of when I started the experiment), never having enabled > >> block_cloning ( still using openzfs-2.1-freebsd ). > >>=20 > >> In other words, I can confirm other reports that have > >> been made. > >>=20 > >> The details follow. > >>=20 > >>=20 > >> [Written as I was working on setting up for the experiments > >> and then executing those experiments, adjusting as I went > >> along.] > >>=20 > >> I've run my own tests in a context that has never had the > >> zpool upgrade and that jump from before the openzfs import to > >> after the existing commits for trying to fix openzfs on > >> FreeBSD. I report on the sequence of activities getting to > >> the point of testing as well. > >>=20 > >> By personal policy I keep my (non-temporary) pool's compatible > >> with what the most recent ??.?-RELEASE supports, using > >> openzfs-2.1-freebsd for now. The pools involved below have > >> never had a zpool upgrade from where they started. (I've no > >> pools that have ever had a zpool upgrade.) > >>=20 > >> (Temporary pools are rare for me, such as this investigation. > >> But I'm not testing block_cloning or anything new this time.) > >>=20 > >> I'll note that I use zfs for bectl, not for redundancy. So > >> my evidence is more limited in that respect. > >>=20 > >> The activities were done on a HoneyComb (16 Cortex-A72 cores). > >> The system has and supports ECC RAM, 64 GiBytes of RAM are > >> present. > >>=20 > >> I started by duplicating my normal zfs environment to an > >> external USB3 NVMe drive and adjusting the host name and such > >> to produce the below. (Non-debug, although I do not strip > >> symbols.) : > >>=20 > >> # uname -apKU > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D > >> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 =3D > >> = > root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > =3D > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > >>=20 > >> I then did: git fetch, stash push ., merge --ff-only, stash apply . : > >> my normal procedure. I then also applied the patch from: > >>=20 > >> https://github.com/openzfs/zfs/pull/14739/files > >>=20 > >> Then I did: buildworld buildkernel, install them, and rebooted. > >>=20 > >> The result was: > >>=20 > >> # uname -apKU > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D > >> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 =3D > >> = > root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > =3D > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > >>=20 > >> The later poudriere-devel based build of packages from ports is > >> based on: > >>=20 > >> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > >> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D > >> devel/freebsd-gcc12: Bump to 12.2.0. > >> Author: John Baldwin > >> Commit: John Baldwin > >> CommitDate: 2023-03-25 00:06:40 +0000 > >> branch: main > >> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > >> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > >> n613214 (--first-parent --count for merge-base) > >>=20 > >> poudriere attempted to build 476 packages, starting > >> with pkg (in order to build the 56 that I explicitly > >> indicate that I want). It is my normal set of ports. > >> The form of building is biased to allowing a high > >> load average compared to the number of hardware > >> threads (same as cores here): each builder is allowed > >> to use the full count of hardware threads. The build > >> used USE_TMPFS=3D3D"data" instead of the USE_TMPFS=3D3Dall I > >> normally use on the build machine involved. > >>=20 > >> And it produced some random errors during the attempted > >> builds. A type of example that is easy to interpret > >> without further exploration is: > >>=20 > >> pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse = > =3D > >> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > >>=20 > >> A fair number of errors are of the form: the build > >> installing a previously built package for use in the > >> builder but later the builder can not find some file > >> from the package's installation. > >>=20 > >> Another error reported was: > >>=20 > >> ld: error: /usr/local/lib/libblkid.a: unknown file type > >>=20 > >> For reference: > >>=20 > >> [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] = > Queued: =3D > >> 476 Built: 2> >> Tobuild: 0 Time: 00:37:52 > >>=20 > >> I started another build that tried to build 224 packeges: > >> the 11 failed and 213 skipped. > >>=20 > >> Just 1 package built that failed before: > >>=20 > >> [00:04:58] [09] [00:04:15] Finished databases/sqlite3@default | =3D > >> sqlite3-3.41.0_1,1: Success > >>=20 > >> It seems to be the only one where the original failure was not > >> an example of complaining about the missing/corrupted content > >> of a package install used for building. So it is an example > >> of randomly varying behavior. > >>=20 > >> That, in turn, allowed: > >>=20 > >> [00:04:58] [01] [00:00:00] Building security/nss | nss-3.89 > >>=20 > >> to build but everything else failed or was skipped. > >>=20 > >> The sqlite3 vs. other failure difference suggests that writes > >> have random problems but later reads reliably see the problem > >> that resulted (before the content is deleted). > >>=20 > >>=20 > >> After the above: > >>=20 > >> # zpool status > >> pool: zroot > >> state: ONLINE > >> config: > >>=20 > >> NAME STATE READ WRITE CKSUM > >> zroot ONLINE 0 0 0 > >> da0p8 ONLINE 0 0 0 > >>=20 > >> errors: No known data errors > >>=20 > >> =08=E0=B9=84=C2=8DM # zpool scrub zroot > >> # zpool status > >> pool: zroot > >> state: ONLINE > >> scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 =3D > >> 22:15:39 2023 > >> config: > >>=20 > >> NAME STATE READ WRITE CKSUM > >> zroot ONLINE 0 0 0 > >> da0p8 ONLINE 0 0 0 > >>=20 > >> errors: No known data errors > >>=20 > >>=20 > >> =3D3D=3D3D=3D3D > >> Mark Millard > >> marklmi at yahoo.com > >=20 > >=20 > > Let's try this again. Claws-mail didn't include the list address in = > the=20 > > header. Trying to reply, again, using exmh instead. > >=20 > >=20 > > Did your pools suffer the EXDEV problem? The EXDEV also corrupted = > files. > > As I reported, this was a jump from before the import > to as things are tonight (here). So: NO, unless the > existing code as of tonight still has the EXDEV problem! > > Prior to this experiment I'd not progressed any media > beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > > > I think, without sufficient investigation we risk jumping to > > conclusions. I've taken an extremely cautious approach, rolling back > > snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > > corruption was encountered. > > Again: nothing between main-n261544-cee09bda03c8-dirty and > main-n262122-2ef2c26f3f13-dirty was involved at any stage. > > >=20 > > I did not rollback any snapshots in my MH mail directory. Rolling back > > snapshots of my MH maildir would result in loss of email. I have to > > live with that corruption. Corrupted files in my outgoing sent email > > directory remain: > >=20 > > slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=20 > > 53 > > slippy$=20 > >=20 > > There are 53 corrupted files in my note log of 9913 emails. Those = > files > > will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS > > or ZFS patches cannot retroactively remove the corruption from those > > files. > >=20 > > But my poudriere files, because the snapshots were rolled back, were > > "repaired" by the rolled back snapshots. > >=20 > > I'm not convinced that there is presently active corruption since > > the problem has been fixed. I am convinced that whatever corruption > > that was written at the time will remain forever or until those files > > are deleted or replaced -- just like my email files written to disk at > > the time. > > My test results and procedure just do not fit your conclusion > that things are okay now if block_clonging is completely avoided. Admitting I'm wrong: sending copies of my last reply to you back to myself, again and again, three times, I've managed to reproduce the corruption you are talking about. >From my previous email to you. header. Trying to reply ^^^^^^^^^ Here it is, nine additional bytes of garbage. In another instance about 500 bytes were removed. I can reproduce the corruption at will now. The EXDEV patch is applied. Block_cloning is disabled. > > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 06:52:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxqzG1N9bz45bXq for ; Thu, 13 Apr 2023 06:53:14 +0000 (UTC) (envelope-from Alexander@leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxqzD6fVRz40M7 for ; Thu, 13 Apr 2023 06:53:12 +0000 (UTC) (envelope-from Alexander@leidinger.net) Authentication-Results: mx1.freebsd.org; none Received: from outgoing.leidinger.net (p5b165130.dip0.t-ipconnect.de [91.22.81.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-256) client-signature ECDSA (P-256)) (Client CN "outgoing.leidinger.net", Issuer "R3" (verified OK)) by mailgate.Leidinger.net (Postfix) with ESMTPSA id 07C5628062 for ; Thu, 13 Apr 2023 08:53:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1681368781; 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=bWldago0k2E4j27RlB1aVe/L6cIPFMAL7GEI+j2t90E=; b=awBQWdCKPxpMJRT1WhQA9wWohLMGPDv773d7rFm9ANDOjvpNo6uDIOvrqCoExlHvW1uZbX C01hlXEiCxmaA85QNFy8w9m99sO7G70nn51RI6t/5V7WpkVPFYXeep3BzpxjwqxVCLDRn0 5z0SVl9DcrGqbHZCSrBuxgCZoXuIdYjd28Cs5XS42oi3MLdjwuB++DyPQphFo7qanlRp6/ s7LLUcCMqh7dEr9dDWnIUbmNJ2P6MgG6/R10LeNGtVCV/vBsBevtYO72W43xxwDhoKG24Q KLxZ4kKCALWkmQhKFLlQc8D800K5BdYREQoYns0I2ov2xWTVjvNXeJMMvTfSzQ== Received: from webmail.leidinger.net (localhost [127.0.0.1]) by outgoing.leidinger.net (Postfix) with ESMTP id 653CC546C for ; Thu, 13 Apr 2023 08:52:53 +0200 (CEST) Received: from www (uid 80) (envelope-from Alexander@leidinger.net) id 68656 by webmail.leidinger.net (DragonFly Mail Agent v0.13+ on webmail.leidinger.net); Thu, 13 Apr 2023 08:52:53 +0200 Date: Thu, 13 Apr 2023 08:52:53 +0200 Message-ID: <20230413085253.Horde.bYgKkPjxGfDPP_pwWqnyTN2@webmail.leidinger.net> From: Alexander Leidinger To: Mark Millard Cc: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , Cy Schubert Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: In-Reply-To: Accept-Language: de,en Content-Type: multipart/signed; boundary="=_XJcTNEGi5tSrLXujDCZB1br"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PxqzD6fVRz40M7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N This message is in MIME format and has been PGP signed. --=_XJcTNEGi5tSrLXujDCZB1br Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Quoting Mark Millard (from Wed, 12 Apr 2023=20=20 22:28:13=20-0700): > A fair number of errors are of the form: the build > installing a previously built package for use in the > builder but later the builder can not find some file > from the package's installation. As a data point, last year I had such issues with one particular=20=20 package.=20It was consistent no matter how often I was updating the=20=20 ports=20tree. Poudriere always failed on port X which was depending on=20= =20 port=20Y (don't remember the names). The problem was, that port Y was=20=20 build=20successfully but an extract of it was not having a file it was=20= =20 supposed=20to have. IIRC I fixed the issue by building the port Y=20=20 manually,=20as re-building port Y with poudriere didn't change the=20=20 outcome. So=20it seems this may not be specific to the most recent ZFS version,=20= =20 but=20could be an older issue. It may be the case that the more recent=20= =20 ZFS=20version amplifies the problem. It can also be that it is related=20= =20 to=20a specific use case in poudriere. I remember a recent mail which talks about poudriere failing to copy=20=20 files=20in resource-limited environments, see=20=20 https://lists.freebsd.org/archives/dev-commits-src-all/2023-April/025153.ht= ml While=20the issue you are trying to pin-point may not be related to this=20= =20 discussion,=20I mention it because it smells to me like we could be in a=20= =20 situation=20where a similar combination of unrelated to each other=20=20 FreeBSD=20features could form a combination which triggers the issue at=20= =20 hand. Bye, Alexander. --=20 http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_XJcTNEGi5tSrLXujDCZB1br Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIzBAABCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmQ3psQACgkQEg2wmwP4 2IYtNA//TmbSVqDv8LUhp46+N91wzieAFOeiJqQSMIvbmmn8fALAQyCe5qfczV3z SDsNI6JwNAUxWC6e4v933DoTH56D6ychOigtANR4IMhJt3XkWnsKnz8gby8/JEMG g1ua2lRRApd0b8cNsoadgWPIWw+y9TiVNrdCWivYkw0IfvpOZmLvsVgghmMIof4Y 8U4T+p9kyw2aezqBftGbncxGHcwIErZWAaYUG7gnt00jX5Nfr2Xg6Fu3LCSwge0U g5pECfZdmlCMHRsjVm+K2j01a7QWOwzLCFuPZKhMVThazYeaP8YMqSpVLYihwGnG ntIMz0s1iLe8T+PD/+Y/nNzMi2VM5YQ5TSq8Hhbc/DQGUBhn2nesCdhKWGV5UEUK qx62XOlSdClZxweShi3ewNfmqqsRaewF5kjZRPj88UBqWvxCQg8LsqzKQDbuSbIN tj6dvyA9jT8r4DbhLw+VQnczihQR5sZiEC6fre2yD0pTX/3vCYy9BVQqfkFYRcMh 6Uv5O+gfwCrO/QW7seq1wt9ReGCWG3liskakwszlHnAnYiQcY6QA3035M8KpdQ5x kko69pCpAqaRYP3RKXda//naTzWLNApRa0aOk1RcDQbBSKVEedSqbCPcAWu8nyYl jFff14YvJ8vVxUK1JMd4XJxJx1iaPSsuvWaSWxFeItO6TbNQxww= =kBIp -----END PGP SIGNATURE----- --=_XJcTNEGi5tSrLXujDCZB1br-- From nobody Thu Apr 13 07:04:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxrDM3TYQz45cSF; Thu, 13 Apr 2023 07:04:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxrDM1xxPz4Gvd; Thu, 13 Apr 2023 07:04:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id mdvup8Jikjvm1mr0PpA4Ij; Thu, 13 Apr 2023 07:04:29 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mr0NpjqeLyAOemr0OpcT3T; Thu, 13 Apr 2023 07:04:29 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=6437a97d a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=dKHAf1wccvYA:10 a=VxmjJ2MpAAAA:8 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=kahnpYOlYw8TZN4Y7l8A:9 a=wPNLvfGTeEIA:10 a=LyydU4Oes_UA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C7047A47; Thu, 13 Apr 2023 00:04:26 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8A54F25A; Thu, 13 Apr 2023 00:04:26 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Mark Millard , Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pawel@dawidek.net, pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: <20230413064252.1E5C1318@slippy.cwsent.com> References: <20230413055221.E8B211F0@slippy.cwsent.com> <20230413064252.1E5C1318@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Wed, 12 Apr 2023 23:42:52 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Thu, 13 Apr 2023 00:04:26 -0700 Message-Id: <20230413070426.8A54F25A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDW1U4wOl8PpVSdbzcrob7O+642sN8+uc4pGtrEjSS7AP2D9093BZW21qNUGquzta+VOp5v+vWMEkO6gJwXMe5F02zvxvxxN8iv+5SPKcXgKGZ0ZU/7H hOyUYRStgZKdY7mRV/tmEye84z02L3iFRYFo2YXTd2+JPRKxvQ6y5ljiI9z0oWbClUCfLFtYjC2f6cJFr93vn6tcZjruSVb8Z5uZLbun/GVPwbfnblviIwQq ew+PDWhKR70Ovl4HiH2ibUKLpRS+96pgj+K/p0fXvJ0wNSVGGAgPW+0Ut6RtzacWBPlyuacAcDU+CLJO81u6txlnuLESJnvn8nnU+4rF9ydgTR+mU08Gf67e KzGqicr3YZQ47qC0gNZySaPT1Z5yzky5Y+4SH0LUe1clhhbYU0k= X-Rspamd-Queue-Id: 4PxrDM1xxPz4Gvd X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert writes: > In message , Mark Millard > write > s: > > [This just puts my prior reply's material into Cy's > > adjusted resend of the original. The To/Cc should > > be coomplete this time.] > > > > On Apr 12, 2023, at 22:52, Cy Schubert = > > wrote: > > > > > In message , Mark = > > Millard=20 > > > write > > > s: > > >> From: Charlie Li wrote on > > >> Date: Wed, 12 Apr 2023 20:11:16 UTC : > > >>=20 > > >>> Charlie Li wrote: > > >>>> Mateusz Guzik wrote: > > >>>>> can you please test poudriere with > > >>>>> https://github.com/openzfs/zfs/pull/14739/files > > >>>>>=20 > > >>>> After applying, on the md(4)-backed pool regardless of =3D > > >> block_cloning,=3D20 > > >>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = > > Will=3D20=3D > > >>=20 > > >>>> report back on poudriere results (no block_cloning). > > >>>> =3D20 > > >>> As for poudriere, build failures are still rolling in. These are = > > (and=3D20=3D > > >>=20 > > >>> have been) entirely random on every run. Some examples from this = > > run: > > >>> =3D20 > > >>> lang/php81: > > >>> - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D20 > > >>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D > > >> ${STAGEDIR}/${PREFIX}/etc > > >>> - consumers fail to build due to corrupted php.conf packaged > > >>> =3D20 > > >>> devel/ninja: > > >>> - phase: stage > > >>> - install -s -m 555=3D20 > > >>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D20 > > >>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > >>> - consumers fail to build due to corrupted bin/ninja packaged > > >>> =3D20 > > >>> devel/netsurf-buildsystem: > > >>> - phase: stage > > >>> - mkdir -p=3D20 > > >>> =3D > > >> = > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > > =3D > > >> tsurf-buildsystem/makefiles=3D20 > > >>> =3D > > >> = > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > > =3D > > >> tsurf-buildsystem/testtools > > >>> for M in Makefile.top Makefile.tools Makefile.subdir =3D > > >> Makefile.pkgconfig=3D20 > > >>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > > >>> cp makefiles/$M=3D20 > > >>> =3D > > >> = > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/ne= > > =3D > > >> tsurf-buildsystem/makefiles/;=3D20 > > >>> \ > > >>> done > > >>> - graphics/libnsgif fails to build due to NUL characters in=3D20 > > >>> Makefile.{clang,subdir}, causing nothing to link > > >>=20 > > >> Summary: I have problems building ports into packages > > >> via poudriere-devel use despite being fully updated/patched > > >> (as of when I started the experiment), never having enabled > > >> block_cloning ( still using openzfs-2.1-freebsd ). > > >>=20 > > >> In other words, I can confirm other reports that have > > >> been made. > > >>=20 > > >> The details follow. > > >>=20 > > >>=20 > > >> [Written as I was working on setting up for the experiments > > >> and then executing those experiments, adjusting as I went > > >> along.] > > >>=20 > > >> I've run my own tests in a context that has never had the > > >> zpool upgrade and that jump from before the openzfs import to > > >> after the existing commits for trying to fix openzfs on > > >> FreeBSD. I report on the sequence of activities getting to > > >> the point of testing as well. > > >>=20 > > >> By personal policy I keep my (non-temporary) pool's compatible > > >> with what the most recent ??.?-RELEASE supports, using > > >> openzfs-2.1-freebsd for now. The pools involved below have > > >> never had a zpool upgrade from where they started. (I've no > > >> pools that have ever had a zpool upgrade.) > > >>=20 > > >> (Temporary pools are rare for me, such as this investigation. > > >> But I'm not testing block_cloning or anything new this time.) > > >>=20 > > >> I'll note that I use zfs for bectl, not for redundancy. So > > >> my evidence is more limited in that respect. > > >>=20 > > >> The activities were done on a HoneyComb (16 Cortex-A72 cores). > > >> The system has and supports ECC RAM, 64 GiBytes of RAM are > > >> present. > > >>=20 > > >> I started by duplicating my normal zfs environment to an > > >> external USB3 NVMe drive and adjusting the host name and such > > >> to produce the below. (Non-debug, although I do not strip > > >> symbols.) : > > >>=20 > > >> # uname -apKU > > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D > > >> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 =3D > > >> = > > root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > > =3D > > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > > >>=20 > > >> I then did: git fetch, stash push ., merge --ff-only, stash apply . : > > >> my normal procedure. I then also applied the patch from: > > >>=20 > > >> https://github.com/openzfs/zfs/pull/14739/files > > >>=20 > > >> Then I did: buildworld buildkernel, install them, and rebooted. > > >>=20 > > >> The result was: > > >>=20 > > >> # uname -apKU > > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D > > >> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 =3D > > >> = > > root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= > > =3D > > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > > >>=20 > > >> The later poudriere-devel based build of packages from ports is > > >> based on: > > >>=20 > > >> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > > >> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D > > >> devel/freebsd-gcc12: Bump to 12.2.0. > > >> Author: John Baldwin > > >> Commit: John Baldwin > > >> CommitDate: 2023-03-25 00:06:40 +0000 > > >> branch: main > > >> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > > >> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > > >> n613214 (--first-parent --count for merge-base) > > >>=20 > > >> poudriere attempted to build 476 packages, starting > > >> with pkg (in order to build the 56 that I explicitly > > >> indicate that I want). It is my normal set of ports. > > >> The form of building is biased to allowing a high > > >> load average compared to the number of hardware > > >> threads (same as cores here): each builder is allowed > > >> to use the full count of hardware threads. The build > > >> used USE_TMPFS=3D3D"data" instead of the USE_TMPFS=3D3Dall I > > >> normally use on the build machine involved. > > >>=20 > > >> And it produced some random errors during the attempted > > >> builds. A type of example that is easy to interpret > > >> without further exploration is: > > >>=20 > > >> pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse = > > =3D > > >> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > > >> A fair number of errors are of the form: the build > > >> installing a previously built package for use in the > > >> builder but later the builder can not find some file > > >> from the package's installation. > > >>=20 > > >> Another error reported was: > > >>=20 > > >> ld: error: /usr/local/lib/libblkid.a: unknown file type > > >>=20 > > >> For reference: > > >>=20 > > >> [main-CA72-bulk_a-default] [2023-04-12_20h45m32s] [committing:] = > > Queued: =3D > > >> 476 Built: 2ol: zroot > > >> state: ONLINE > > >> config: > > >>=20 > > >> NAME STATE READ WRITE CKSUM > > >> zroot ONLINE 0 0 0 > > >> da0p8 ONLINE 0 0 0 > > >>=20 > > >> errors: No known data errors > > >>=20 > > >> =08=E0=B9=84=C2=8DM # zpool scrub zroot > > >> # zpool status > > >> pool: zroot > > >> state: ONLINE > > >> scan: scrub repaired 0B in 00:16:25 with 0 errors on Wed Apr 12 =3D > > >> 22:15:39 2023 > > >> config: > > >>=20 > > >> NAME STATE READ WRITE CKSUM > > >> zroot ONLINE 0 0 0 > > >> da0p8 ONLINE 0 0 0 > > >>=20 > > >> errors: No known data errors > > >>=20 > > >>=20 > > >> =3D3D=3D3D=3D3D > > >> Mark Millard > > >> marklmi at yahoo.com > > >=20 > > >=20 > > > Let's try this again. Claws-mail didn't include the list address in = > > the=20 > > > header. Trying to reply, again, using exmh instead. > > >=20 > > >=20 > > > Did your pools suffer the EXDEV problem? The EXDEV also corrupted = > > files. > > > > As I reported, this was a jump from before the import > > to as things are tonight (here). So: NO, unless the > > existing code as of tonight still has the EXDEV problem! > > > > Prior to this experiment I'd not progressed any media > > beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > > > > > I think, without sufficient investigation we risk jumping to > > > conclusions. I've taken an extremely cautious approach, rolling back > > > snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > > > corruption was encountered. > > > > Again: nothing between main-n261544-cee09bda03c8-dirty and > > main-n262122-2ef2c26f3f13-dirty was involved at any stage. > > > > >=20 > > > I did not rollback any snapshots in my MH mail directory. Rolling back > > > snapshots of my MH maildir would result in loss of email. I have to > > > live with that corruption. Corrupted files in my outgoing sent email > > > directory remain: > > >=20 > > > slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=20 > > > 53 > > > slippy$=20 > > >=20 > > > There are 53 corrupted files in my note log of 9913 emails. Those = > > files > > > will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS > > > or ZFS patches cannot retroactively remove the corruption from those > > > files. > > >=20 > > > But my poudriere files, because the snapshots were rolled back, were > > > "repaired" by the rolled back snapshots. > > >=20 > > > I'm not convinced that there is presently active corruption since > > > the problem has been fixed. I am convinced that whatever corruption > > > that was written at the time will remain forever or until those files > > > are deleted or replaced -- just like my email files written to disk at > > > the time. > > > > My test results and procedure just do not fit your conclusion > > that things are okay now if block_clonging is completely avoided. > > Admitting I'm wrong: sending copies of my last reply to you back to myself, > again and again, three times, I've managed to reproduce the corruption you > are talking about. This email itself was also corrupted. Below is what was sent. Good thing multiple copies are saved by exmh. Admitting I'm wrong: sending copies of my last reply to you back to myself, again and again, three times, I've managed to reproduce the corruption you are talking about. >From my previous email to you. header. Trying to reply ^^^^^^^^^ Here it is, nine additional bytes of garbage. In another instance about 500 bytes were removed. I can reproduce the corruption at will now. The EXDEV patch is applied. Block_cloning is disabled. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 07:10:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxrMH3sRmz45chF; Thu, 13 Apr 2023 07:10:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxrMH2DSYz4QG0; Thu, 13 Apr 2023 07:10:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id mnQSp9Bhrjvm1mr6IpA4W1; Thu, 13 Apr 2023 07:10:34 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mr6GpJQi4HFsOmr6HpTKil; Thu, 13 Apr 2023 07:10:34 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=6437aaea a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=dKHAf1wccvYA:10 a=VxmjJ2MpAAAA:8 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=1EHfynvRDzDv6SEXHlQA:9 a=wPNLvfGTeEIA:10 a=tCI1PRuhg74A:10 a=LyydU4Oes_UA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 2F06BAA8; Thu, 13 Apr 2023 00:10:32 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 18BFF31F; Thu, 13 Apr 2023 00:10:32 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Mark Millard , Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pawel@dawidek.net, pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: <20230413070426.8A54F25A@slippy.cwsent.com> References: <20230413055221.E8B211F0@slippy.cwsent.com> <20230413064252.1E5C1318@slippy.cwsent.com> <20230413070426.8A54F25A@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Thu, 13 Apr 2023 00:04:26 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Thu, 13 Apr 2023 00:10:32 -0700 Message-Id: <20230413071032.18BFF31F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfAN0PUpmcKlBumtDvar9Xq23zko3pOE7tmlMv3+AX23f8VBbUUKzTc2xxxyh9MoNLNjdzmTmWb0zkktqKsfV79vJHwtIka0Rbme3xVTNHUGky8Xt7zzA 5OHFc2dEIKmKdSXGcGyQhBtBy+IxMPe75cFBtgGmLZ0B71xZjUSYAont7dIh1D2lSAyqywYcFFcgABX3RBgleX3LxjqwrPqak6ck+cMIMFm2wfxADJ7uUBK5 De9ijGEgtoUQJN6QlFadz6x85NN2dMXONR+T/pZFfTkVN6jqu7kUPwRXP/sV3s7608HzpUPRFj/XFdUZS2uDp3MUSugDq/8KVPDbTJ8J5ppv4ouqfZSPPUdw A4pBGXWCAEiaIWIf/u5xIgiMP8uNoOT8UH82BeHKp9efhxJkRdY= X-Rspamd-Queue-Id: 4PxrMH2DSYz4QG0 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <20230413070426.8A54F25A@slippy.cwsent.com>, Cy Schubert writes: > In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert writes: > > In message , Mark Millard > > write > > s: > > > [This just puts my prior reply's material into Cy's > > > adjusted resend of the original. The To/Cc should > > > be coomplete this time.] > > > > > > On Apr 12, 2023, at 22:52, Cy Schubert = > > > wrote: > > > > > > > In message , Mark = > > > Millard=20 > > > > write > > > > s: > > > >> From: Charlie Li wrote on > > > >> Date: Wed, 12 Apr 2023 20:11:16 UTC : > > > >>=20 > > > >>> Charlie Li wrote: > > > >>>> Mateusz Guzik wrote: > > > >>>>> can you please test poudriere with > > > >>>>> https://github.com/openzfs/zfs/pull/14739/files > > > >>>>>=20 > > > >>>> After applying, on the md(4)-backed pool regardless of =3D > > > >> block_cloning,=3D20 > > > >>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = > > > Will=3D20=3D > > > >>=20 > > > >>>> report back on poudriere results (no block_cloning). > > > >>>> =3D20 > > > >>> As for poudriere, build failures are still rolling in. These are = > > > (and=3D20=3D > > > >>=20 > > > >>> have been) entirely random on every run. Some examples from this = > > > run: > > > >>> =3D20 > > > >>> lang/php81: > > > >>> - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D20 > > > >>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D > > > >> ${STAGEDIR}/${PREFIX}/etc > > > >>> - consumers fail to build due to corrupted php.conf packaged > > > >>> =3D20 > > > >>> devel/ninja: > > > >>> - phase: stage > > > >>> - install -s -m 555=3D20 > > > >>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D20 > > > >>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > > >>> - consumers fail to build due to corrupted bin/ninja packaged > > > >>> =3D20 > > > >>> devel/netsurf-buildsystem: > > > >>> - phase: stage > > > >>> - mkdir -p=3D20 > > > >>> =3D > > > >> = > > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/n > e= > > > =3D > > > >> tsurf-buildsystem/makefiles=3D20 > > > >>> =3D > > > >> = > > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/n > e= > > > =3D > > > >> tsurf-buildsystem/testtools > > > >>> for M in Makefile.top Makefile.tools Makefile.subdir =3D > > > >> Makefile.pkgconfig=3D20 > > > >>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > > > >>> cp makefiles/$M=3D20 > > > >>> =3D > > > >> = > > > /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/n > e= > > > =3D > > > >> tsurf-buildsystem/makefiles/;=3D20 > > > >>> \ > > > >>> done > > > >>> - graphics/libnsgif fails to build due to NUL characters in=3D20 > > > >>> Makefile.{clang,subdir}, causing nothing to link > > > >>=20 > > > >> Summary: I have problems building ports into packages > > > >> via poudriere-devel use despite being fully updated/patched > > > >> (as of when I started the experiment), never having enabled > > > >> block_cloning ( still using openzfs-2.1-freebsd ). > > > >>=20 > > > >> In other words, I can confirm other reports that have > > > >> been made. > > > >>=20 > > > >> The details follow. > > > >>=20 > > > >>=20 > > > >> [Written as I was working on setting up for the experiments > > > >> and then executing those experiments, adjusting as I went > > > >> along.] > > > >>=20 > > > >> I've run my own tests in a context that has never had the > > > >> zpool upgrade and that jump from before the openzfs import to > > > >> after the existing commits for trying to fix openzfs on > > > >> FreeBSD. I report on the sequence of activities getting to > > > >> the point of testing as well. > > > >>=20 > > > >> By personal policy I keep my (non-temporary) pool's compatible > > > >> with what the most recent ??.?-RELEASE supports, using > > > >> openzfs-2.1-freebsd for now. The pools involved below have > > > >> never had a zpool upgrade from where they started. (I've no > > > >> pools that have ever had a zpool upgrade.) > > > >>=20 > > > >> (Temporary pools are rare for me, such as this investigation. > > > >> But I'm not testing block_cloning or anything new this time.) > > > >>=20 > > > >> I'll note that I use zfs for bectl, not for redundancy. So > > > >> my evidence is more limited in that respect. > > > >>=20 > > > >> The activities were done on a HoneyComb (16 Cortex-A72 cores). > > > >> The system has and supports ECC RAM, 64 GiBytes of RAM are > > > >> present. > > > >>=20 > > > >> I started by duplicating my normal zfs environment to an > > > >> external USB3 NVMe drive and adjusting the host name and such > > > >> to produce the below. (Non-debug, although I do not strip > > > >> symbols.) : > > > >>=20 > > > >> # uname -apKU > > > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D > > > >> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 =3D > > > >> = > > > root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm > 6= > > > =3D > > > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > > > >>=20 > > > >> I then did: git fetch, stash push ., merge --ff-only, stash apply . : > > > >> my normal procedure. I then also applied the patch from: > > > >>=20 > > > >> https://github.com/openzfs/zfs/pull/14739/files > > > >>=20 > > > >> Then I did: buildworld buildkernel, install them, and rebooted. > > > >>=20 > > > >> The result was: > > > >>=20 > > > >> # uname -apKU > > > >> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D > > > >> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 =3D > > > >> = > > > root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm > 6= > > > =3D > > > >> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > > > >>=20 > > > >> The later poudriere-devel based build of packages from ports is > > > >> based on: > > > >>=20 > > > >> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > > > >> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D > > > >> devel/freebsd-gcc12: Bump to 12.2.0. > > > >> Author: John Baldwin > > > >> Commit: John Baldwin > > > >> CommitDate: 2023-03-25 00:06:40 +0000 > > > >> branch: main > > > >> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > > > >> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > > > >> n613214 (--first-parent --count for merge-base) > > > >>=20 > > > >> poudriere attempted to build 476 packages, starting > > > >> with pkg (in order to build the 56 that I explicitly > > > >> indicate that I want). It is my normal set of ports. > > > >> The form of building is biased to allowing a high > > > >> load average compared to the number of hardware > > > >> threads (same as cores here): each builder is allowed > > > >> to use the full count of hardware threads. The build >> > > >> normally use on the build machine involved. > > > >>=20 > > > >> And it produced some random errors during the attempted > > > >> builds. A type of example that is easy to interpret > > > >> without further exploration is: > > > >>=20 > > > >> pkg_resources.extern.packaging.requirements.InvalidRequirement: Parse > = > > > =3D > > > >> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > 0 > > > >> da0p8 ONLINE 0 0 0 > > > >>=20 > > > >> errors: No known data errors > > > >>=20 > > > >>=20 > > > >> =3D3D=3D3D=3D3D > > > >> Mark Millard > > > >> marklmi at yahoo.com > > > >=20 > > > >=20 > > > > Let's try this again. Claws-mail didn't include the list address in = > > > the=20 > > > > header. Trying to reply, again, using exmh instead. > > > >=20 > > > >=20 > > > > Did your pools suffer the EXDEV problem? The EXDEV also corrupted = > > > files. > > > > > > As I reported, this was a jump from before the import > > > to as things are tonight (here). So: NO, unless the > > > existing code as of tonight still has the EXDEV problem! > > > > > > Prior to this experiment I'd not progressed any media > > > beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > > > > > > > I think, without sufficient investigation we risk jumping to > > > > conclusions. I've taken an extremely cautious approach, rolling back > > > > snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > > > > corruption was encountered. > > > > > > Again: nothing between main-n261544-cee09bda03c8-dirty and > > > main-n262122-2ef2c26f3f13-dirty was involved at any stage. > > > > > > >=20 > > > > I did not rollback any snapshots in my MH mail directory. Rolling back > > > > snapshots of my MH maildir would result in loss of email. I have to > > > > live with that corruption. Corrupted files in my outgoing sent email > > > > directory remain: > > > >=20 > > > > slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=20 > > > > 53 > > > > slippy$=20 > > > >=20 > > > > There are 53 corrupted files in my note log of 9913 emails. Those = > > > files > > > > will never be fixed. They were corrupted by the EXDEV bug. Any new ZFS > > > > or ZFS patches cannot retroactively remove the corruption from those > > > > files. > > > >=20 > > > > But my poudriere files, because the snapshots were rolled back, were > > > > "repaired" by the rolled back snapshots. > > > >=20 > > > > I'm not convinced that there is presently active corruption since > > > > the problem has been fixed. I am convinced that whatever corruption > > > > that was written at the time will remain forever or until those files > > > > are deleted or replaced -- just like my email files written to disk at > > > > the time. > > > > > > My test results and procedure just do not fit your conclusion > > > that things are okay now if block_clonging is completely avoided. > > > > Admitting I'm wrong: sending copies of my last reply to you back to myself, > > > again and again, three times, I've managed to reproduce the corruption you > > are talking about. > > This email itself was also corrupted. Below is what was sent. Good thing > multiple copies are saved by exmh. > > Admitting I'm wrong: sending copies of my last reply to you back to myself, > again and again, three times, I've managed to reproduce the corruption you > are talking about. This email itself was also corrupted. Below is what was sent. Good thing multiple copies are saved by exmh. Admitting I'm wrong: sending copies of my last reply to you back to myself, again and again, three times, I've managed to reproduce the corruption you are talking about. >From my previous email to you. header. Trying to reply:::::::::, again, using exmh instead. ^^^^^^^^^ Here it is, nine additional bytes of garbage. I've replaced the garbage with colons because nulls mess up a lot of things, including cut&paste. In another instance about 500 bytes were removed. I can reproduce the corruption at will now. The EXDEV patch is applied. Block_cloning is disabled. Somehow nulls and other garbage are inserted in the middle of emails after the ZFS upgrade. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 08:17:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxssC02Kpz44Vfb for ; Thu, 13 Apr 2023 08:18:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic313-21.consmr.mail.gq1.yahoo.com (sonic313-21.consmr.mail.gq1.yahoo.com [98.137.65.84]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxssB3qgvz4N2n for ; Thu, 13 Apr 2023 08:18:06 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681373884; bh=C1dOU6e8fSFpVSeCukzP+SV4Erg0Fz19yu+ukYqsJ/g=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=JvJ7Kumsp/b7t1GXFRW5abhyhyTQ6EF10whtx4XZpwnbE/0hjj8yWureVI9L5a8lIMQGuEPkr7XhJvv7Zu6+kLNaFkhfXQpLywAYcpnIMcqclLPff1LSB5+rH8TrWX4b0Udo1tb7u4xWB9/Mt8NOXD0B2rXDDUrmYdAOaAKbf+DAcG7g1LDuVGmEGCBWJAXOuHCIK3ucUQe7OzWIckZQ2suswbhdWcUJbUtja/a1cQ5KHk1/m3eeiPaFMhG6WxooF06DX6rjVi8fB90S27GtyBnsT82gG4bnY4MpLO9ujYx87ce5p53gzvyaLne9XxjHfLWbNA7O57pKcEU7aL2SKQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681373884; bh=m2VQhuuQB1aQDBH3j3gVNC4CS031BpIAfY7HLl4UgGe=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=gkRXvR1AHdGq5Q6kCHOh0C3atu1s5Q0QcO7gIzuxEGy2OuJ8XC22EpR88aNtJDrYLU65uNukEfR2P791CbtoJ9LzG89PwCAf7JBcw41y3gM1VkkIADKokijC3c2AT9YXtj7nxAfZ/GwTJ+ME7+flnEoeWf0URhrxPtdNUxyi4QspiKuBW3H6GkNEcjUbIU0UmbouC3vUS31uL4TFZCdHHH5N62c+fi9gds3ZNWlda5hnT1F55+Xhmimzi6pRd3t0lDjTrTKqCo47xuMT+7194fSpJ2RR6w89oDpqXNahkOM85mAqJrdI69ExJAkjq0vKUUzZaucTl07OOH2Mlcqk2Q== X-YMail-OSG: us00UUIVM1lhPGKEbMsO3Vo9EMZOMgxwjVUA12qk1w.1QoFFc3H65dyJpegPhOx e5joNi8JF0BlY7koTYLAcQzrXu2eEjgoayScNLWF6NxeYQPTqDKAfwDa.l_W_xXdbkMXdHTsjdGe L6XHOdcVxNaDjRDvdc49NOFwzv.M6Gj87q8.rvL12EJJUPMB8wv4ZE3KDFW409tbJF4PfyjjGRp3 f1ovyoXqYpT0WprV.V3DGuEZzPDH.K8edTqdp8nRVaI48pbdnULYhxKCODs04SIod7iddDbUBXrC 9088CerLN43GcoZmHGKQLUEt7YGL2hUdeg2nxi1jUFF5MK9tPFVqujYA_.unTcUet.u0LeU3TmOj N1cinta9pZaplObxT7KWf.Isgc2shNFc_K_7o2KTvb6K_ZoC6GLmVk7YRjPTpx738E.08DpgWmXR G3_ir19NLhtpDOw4._8_r.By8Ip9AhxMMWFZWuGFuUe3pgddAgrQCmhMBOAIivlmltBbdFbxUODX FBiDySqfHSZZkWN6MS8KrUTtzz6GQ8QSGp8JZgq.zKVGLydCxW7lWA3Exl24HekoNir3X9dbCTfN _RtnTDBGl1yIMjxHopNTGTxhXVtgW2h6PMiRY_nQKNSgzulnr__hLhJ.3QtVbwfY.f3gLmDTITsl gbCGyM0gWOzkMYWdikteXlxQmkQtDM58ch9Vvd2WNycyML2e4qp8I1.CYhL4ApvO41lVwwVfnih. xvZedDVeKQ.UvTiAakjaF8IDAAyWFO4aSPdzftXccsfcZDIgW5UUARR73na9PRDGCK5CkAohwh0Q ktp40pPQROkzkLSsUbA7joyZvVHVfAOxseqelF1SJEUL9g5YcLz0bJotBOaF81bDKQwQFdyLQYkA 35q.uSTfJT4H_r_F1Aw30KIegQuEVvtfT5xpjOq4GX5.oAlxzYnuSc_dwA3uQdAkxfNw4epAB86. 0OmTgyoqYy0h2Zj2mJtYwzbOYcnkruY8nYUJ37yBK7xT8vIO_ZI213gnGd2gkLdfdHFnE9Ay8tNA YrmKqHO2exJWIbrP2Ep2ZYZlJawIVqnHXxKR3CLApNS1s4VE_5Y7ScAxEuUt3Ffu2W8gXRSSs.P_ aGW3tozvuP3JXsiSBDl8IiURgO6W2iB44QErMvA_FpmQfoSoYjGvzJ34UEPW6F.esLGGJ2U4Ijp1 IwxGaaxr9jhplGnDn7itRI4vqjpM196QsDB6bLO4ms6x_MqGKFOMNS4qdTKAY8Z36JSU7Zg__hY8 OqbviH.SOHnzGE32JWQ4SRGyuhuOrC7xEmagyqg5vrvyGzhEQonHi5ov6EnkeKYogVsGy0Dq0mGB RrlZOEBN5FfO8cy9wQn_gdPTkVrkRzhE.nUB0wdpCtJCFPgvAe5IgtcTSUlv5knHAzzJBX7gQn2m PcjIy0965uKHXPhha8XTLnV4Zw1FXNgBQLRjDal10RXyr6eK2qINf4Ln6hzYmZcYGykp68roCqp0 1iTpCkNah8fHdlJsaRqaIvLemYfB_XBnhLX69PwXK.jOtalzeWb2yHybGSm6uGYfxdJ5If_hOC5T 16KJTS7ZNgiy3jmBNGYBb9zaHxXegAqvdAxxvEup0m2iCRKAThD4ITUjNlirjua2kGU1orQ5Qr69 A42sAMI779rr.rfqUhk3u_UvpF4KyjZeHU3CUCjVJ0cTmY_ry1O1BA1r8Pf2i2i4YkGBtXx15qyG u_daV.5wypgSEhIQiTeCWzRcz7wDLVtHQIw3HJAWh8vrkpLR07QBA0YEYkUB0K15Imv0b2fC0N4O uxIBpA4pjNRes.SlGm2_E6nPLkEgE3PcINKJs6mVNwvtcX_tDPuOC6kaxeHmi1.zOr3u19U_8toZ xRll8MhfX8LNIKDD_GV6mVcOMnENiRi3t64BYRjSgBnYPnnn34v_NqW5JsKNXai6aLrgO1dAs3Qc lIxj3Hs49NJb7jxaLBsdHgJ6k1oTT4slZOCYjDAjVwGQFnUm3a15YBnMyH4Md84fFOQSh.r.b2Vb h3PKYZhLU431L.abvDrvC5.pPUE1S8YIF4qKxhKdCWQmhqxezm1UTKg2bC0_NbCx8UgGDSADQRVa rtudwisvt.riBbyUB5FJj__L7.Pf_O08bdn85r3ZWmLCGDD6E29LWPoRaMqqIQ6DqGJtIUGITYac iZE8u0I8QjmZTB.tgPf4BQ6sMuwotO2CZhfiB2kI0WtAfxJpbFivmUkeMiecn.QGeIO9VjoefLww uEE8V5vlA2ejJZExzVeJkbO5iKGf9quUqcugUfaCHmZz2UZIZX84pRS6WXnFOxibNOcbNmae7jJJ .YaosNy8- X-Sonic-MF: X-Sonic-ID: e25b280d-d20b-498c-a59f-027cfa4446b1 Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Thu, 13 Apr 2023 08:18:04 +0000 Received: by hermes--production-bf1-5f9df5c5c4-fgkgh (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 236d662cbf8a2ac996c8884c5ed1f944; Thu, 13 Apr 2023 08:18:00 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <20230413085253.Horde.bYgKkPjxGfDPP_pwWqnyTN2@webmail.leidinger.net> Date: Thu, 13 Apr 2023 01:17:47 -0700 Cc: Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , Cy Schubert Content-Transfer-Encoding: quoted-printable Message-Id: <10AB86BC-FECC-40B2-AF09-AF1732D819E3@yahoo.com> References: <20230413085253.Horde.bYgKkPjxGfDPP_pwWqnyTN2@webmail.leidinger.net> To: Alexander Leidinger X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PxssB3qgvz4N2n X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 12, 2023, at 23:52, Alexander Leidinger = wrote: > Quoting Mark Millard (from Wed, 12 Apr 2023 = 22:28:13 -0700): >=20 >> A fair number of errors are of the form: the build >> installing a previously built package for use in the >> builder but later the builder can not find some file >> from the package's installation. >=20 > As a data point, last year I had such issues with one particular = package. It was consistent no matter how often I was updating the ports = tree. Poudriere always failed on port X which was depending on port Y = (don't remember the names). The problem was, that port Y was build = successfully but an extract of it was not having a file it was supposed = to have. IIRC I fixed the issue by building the port Y manually, as = re-building port Y with poudriere didn't change the outcome. >=20 > So it seems this may not be specific to the most recent ZFS version, = but could be an older issue. It may be the case that the more recent ZFS = version amplifies the problem. It can also be that it is related to a = specific use case in poudriere. In my procedure I'm building the same versions of the same ports that I'd built in the pre-ZFS-import context, just in my jail for experiments instead of in the jail for normal use. (So I still have the original package files available.) I am working a distinct media that started as a copy of my good context. In other words, I was reporting differences with the known-status as shown by prior builds of the same /usr/ports/ tree. The difference is just my progressing FreeBSD's version. I'm even using the exact same machine to do the builds, but with distinct media. (My good environment's FreeBSD still predates the zfs import.) > I remember a recent mail which talks about poudriere failing to copy = files in resource-limited environments, see = https://lists.freebsd.org/archives/dev-commits-src-all/2023-April/025153.h= tml > While the issue you are trying to pin-point may not be related to this = discussion, I mention it because it smells to me like we could be in a = situation where a similar combination of unrelated to each other FreeBSD = features could form a combination which triggers the issue at hand. My procedure eliminates this alternative. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Thu Apr 13 08:41:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxtN86Zn1z44XGk; Thu, 13 Apr 2023 08:41:28 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxtN860D3z3q9T; Thu, 13 Apr 2023 08:41:28 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681375288; 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=HNG8tuf+7VOyRhqg9WUaBumxYxARO45Uc/qYMkTcNng=; b=m0qE8y+7GwG+xiD7OH/VVi7G77sH0+KSVl9Ffjrj0Ui0vOtvl9WwRaPd5IpsYS0KlI6r3g CNbNpXCqSLSW1qwjsT0A9KZ8FtSQes6qie9nkejLAxkJu5UyF9JLvgj8ExuzSInPFST5zy tbRLzC3hj9h8nz+9MuyP60d9ItPdVOXBPFZA6f1jZsab9vbjs+XD4psUqyabshPEVc7K60 /nW0YOQGSvCERy758lLb2s7qFxze1/QaZz91HDenmtUaiu0SUKmy11wl0T4wW/JZ3sIXKa +9SlhHGSUrEof3ptR0Fdj0Hn74tuqpBEdC7ZeP7VCn8vajY+/7g1+6T4xdPK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681375288; 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=HNG8tuf+7VOyRhqg9WUaBumxYxARO45Uc/qYMkTcNng=; b=CsX2txoe/yH1PVBxyrTCsWrYwXTGfX/Ne3RLk3+ExWuFlV5MqikJrN48NBK4zIhBOwWU+Z 97vIO8o8r5ZqNJhV2zLiOwU0dqLw1LFd/BDqI5Rbec/Ojt02AqzdKt9/hvgWiBFSh53JP+ 34dUqfA4GJmjhiUoPhNEj+nr6IUGXIcciQ/mn4F/5hRqCao1ab+jQ2Pn6f9WQ4PoqtCpub rjjHGJ+lJKQENNtQfEmfQTUnUINs3IcE8NSvxdRl4TM7vEPeMO2spneBQ9BNe/QF2LW4i1 VmcP4+sqkj1kVAfCZW2fAoZfcpB3TlSyQLFkp8hw/OzeEv4tLK6U7NvOfVgZ1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681375288; a=rsa-sha256; cv=none; b=IQS6kO3zraKG8hdlV3yRooaBLv2lVue64TxrYZxprYlDd5YT3/5lln+3RplPJ/2kRnIiat 72F7UI4MM6acUpeOvnWnqD4cLppUAWf89j2gbLshlpXOUXJF5BnbcSxwnmP+GDDD8Rq5zs uhZDzodwXA0jLqY2o69iZYs2dJtRd+euB7/sitpF1HgG4oZ5SyaoNoYCLJU7rW7LNNIeTw HV9fpqSPLc9G1aO8wWb6wGwnRyP2+zc6h75sqfeerSFms8CzLaKcaDpXic1uOL5Fj5L1Xx o7Q4W0otKk9RwRDUGlWPK9uWJtQeeovEmGnlejdFsUBQBski9s+nI4yHe1+lag== Received: by freefall.freebsd.org (Postfix, from userid 1033) id A8A80BE12; Thu, 13 Apr 2023 08:41:28 +0000 (UTC) Date: Thu, 13 Apr 2023 08:41:28 +0000 From: Alexey Dokuchaev To: Cy Schubert Cc: Charlie Li , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: References: <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <00780E30-8E72-4746-B651-8A9A048C9EE4@cschubert.com> X-ThisMailContainsUnwantedMimeParts: N On Wed, Apr 12, 2023 at 10:37:59AM -0700, Cy Schubert wrote: > .... > Like Kirk McKusick has reiterated many times, back in the old days > people didn't trust EXT*FS because of the data corruption experienced. > Sadly ZFS will need to earn people's trust back again. This is > unfortunate. Correction: not ZFS, but ZoL (disguising itself as OpenZFS). FreeBSD stopped using real (illumos) ZFS in 13.x and up after r364745. ./danfe From nobody Thu Apr 13 09:34:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxvXp6l3bz44d4d; Thu, 13 Apr 2023 09:34: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 4PxvXp6G0Pz4LmS; Thu, 13 Apr 2023 09:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681378442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IydbwGQIZTXRpRVM5TsPCLgHDmpWx11h3NkwpshOVJI=; b=G7Ek0ai6+99kgJeWT1Yg9w7d2A+TpF6kI5xOa6vJsB2JyfZaqREnI+S2bSoZbKSjXPQzXz moYd4jLvlyi92CVeRx67HCESLzS1MQBAEEQVe2KXmrEjmPozY5D6I10T7GPhqO0oOPM3lY JFL3rZTC+EMYwkQC6yuFue2gFG1ZQBnrmmulZbyWrPaR0P0Gwgwi3Oc57hyyDh2d7R1Ol8 htt6hJi0M18FX8N8JHYMLrCibEn0+xCz2TkSfwPpstQhnR6ugN3bHJFsIELWXUmXfskNFJ IYz1nADug7tkfte44zrAsGuF91gs5oBENHfht43yMohpPwfpL77osIHVI74/vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681378442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IydbwGQIZTXRpRVM5TsPCLgHDmpWx11h3NkwpshOVJI=; b=Opf53Gq+yFKOSDIZ6KoYIAKtBftfJ+9GHxnvlS7oGVqwu7E0IPs2Nt5YyJ8vPAnoMT17aL cTsTtMWvEe2spmXKg2VSrXGnTehR9+Qm/GdgmCzpVRGQBYonWKdfW6QoMx0EWqckeK3aoC u1RxiXlf2ZeUmNQOx7xV/bnc6lj8KSsQLXJqLnc8EzeeQca/A8JAARj/w12e/U8j9g+0Q+ ZGydfynFe4lShUkRaUyEX+dPXQzcl74H+RHEzdgfBt/lxa1OFNqtkits4SP9R38+p5lJlY F+DZPHmozhf4JoEvEegOK/ltz83vvpFFxVn0YWMQutYn9ADEINouubVcK2h4Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681378442; a=rsa-sha256; cv=none; b=Dyn49g4T/bOkEfqqyLmOJzgaDcDnvemoWnIyvN5jxgUitVh2Z2I9dBTb4jVyTSWrmRFH93 YzB19g3G8h+qMI7QG6SIaqCMIJuPBqgbjk1IypkAv8bAIY8dYfji+Jx4opRVI2iE3OSYL5 ilRQ6Jsb+EbnSd1ssz90JEXuf2OUS0mdEZLZfg+OrfL20oMmeUEKWsbGoDxyiWamgvnGp2 cQAQSqxizn9taHTIE/V3Al8f4K+Ylu9Ip/qXyAmzipkEW+7Ke2tMgJkE5uV+LqPfCU40J0 b76lglpQ3cdUYVZGrPUpjL9Ejmkr5N3cfbMfEAQlpfJJWJOMLG9VQOv53V9yeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxvXp59q1zcq2; Thu, 13 Apr 2023 09:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33D9Y2Nb077904; Thu, 13 Apr 2023 09:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D9Y2UB077903; Thu, 13 Apr 2023 09:34:02 GMT (envelope-from git) Date: Thu, 13 Apr 2023 09:34:02 GMT Message-Id: <202304130934.33D9Y2UB077903@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: f0311046a0e2 - main - ifconfig: change carp commands mcast and mcast6 to DEF_CMD as they take no args List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0311046a0e21cea8f343fa6fe868444ba552b3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0311046a0e21cea8f343fa6fe868444ba552b3f commit f0311046a0e21cea8f343fa6fe868444ba552b3f Author: Reid Linnemann AuthorDate: 2023-04-13 07:18:18 +0000 Commit: Kristof Provost CommitDate: 2023-04-13 07:18:18 +0000 ifconfig: change carp commands mcast and mcast6 to DEF_CMD as they take no args Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39548 --- sbin/ifconfig/carp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index 126a15a230df..940b3fa34c74 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -261,9 +261,9 @@ static struct cmd carp_cmds[] = { DEF_CMD_ARG("vhid", setcarp_vhid), DEF_CMD_ARG("state", setcarp_state), DEF_CMD_ARG("peer", setcarp_peer), - DEF_CMD_ARG("mcast", setcarp_mcast), + DEF_CMD("mcast", 0, setcarp_mcast), DEF_CMD_ARG("peer6", setcarp_peer6), - DEF_CMD_ARG("mcast6", setcarp_mcast6), + DEF_CMD("mcast6", 0, setcarp_mcast6), }; static struct afswtch af_carp = { .af_name = "af_carp", From nobody Thu Apr 13 10:54:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxLW3BX1z44lhK; Thu, 13 Apr 2023 10:55:15 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PxxLV627pz3By4; Thu, 13 Apr 2023 10:55:14 +0000 (UTC) (envelope-from pawel@dawidek.net) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [111.65.32.33]) by mail.dawidek.net (Postfix) with ESMTPSA id 42B8C4F2F6; Thu, 13 Apr 2023 12:54:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dawidek.net; s=202110; t=1681383308; bh=kBy3BPb8wp7B66sAzl3SOsqwpwg1ehP7blWgR4opfZw=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=OUXi75TW/mT0f7qYie0IXzqKEw2LAuz45poEypn66PE2fDx3QGQ3MYC6nXBV+CU+i bYnz2jNIEUEcnulZcEjDUFZMjQSSfUZUn7rxdoNh9z6VjAl7jGlHrM7QN2OLpiOzVK +Qp5WvqXAh0tvlUBoNdYparJvOezi+czbRFfSnws= Content-Type: multipart/alternative; boundary=Apple-Mail-2BA72446-819E-425D-8704-55E95D118510 Content-Transfer-Encoding: 7bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: =?utf-8?Q?Pawe=C5=82_Jakub_Dawidek?= In-Reply-To: <20230413071032.18BFF31F@slippy.cwsent.com> Date: Thu, 13 Apr 2023 19:54:42 +0900 Cc: Mark Millard , Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Message-Id: References: <20230413071032.18BFF31F@slippy.cwsent.com> To: Cy Schubert X-Mailer: iPhone Mail (20E252) X-Rspamd-Queue-Id: 4PxxLV627pz3By4 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail-2BA72446-819E-425D-8704-55E95D118510 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
On Apr 13, 2023, at 16:10, Cy Schubert <Cy.Schubert@cschubert.com>= wrote:

=EF=BB=BFIn message <20230413070426.8A54F25A@slippy.cwsent.com>= , Cy Schubert writes:
In message &= lt;20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert writes:=
I= n message <A291C24C-9D7C-4E79-AD03-68ED910FC2DE@yahoo.com>, Mark Milla= rd
write
s:
[This just puts my prior reply's material into Cy's
adjusted resend of the orig= inal. The To/Cc should
be coomplete this time.]

On Apr 1= 2, 2023, at 22:52, Cy Schubert <Cy.Schubert@cschubert.com> =3D<= br>
wrote:

<= /blockquote>
In message <C8E4A43B-9FC8-45= 6E-ADB3-13E7F40B2B04@yahoo.com>, Mark =3D
Millard=3D20
<= /blockquote>
write
<= /blockquote>
s:
=
From: Charlie Li &= lt;vishwin_at_freebsd.org> wrote on
<= /blockquote>
Date: Wed, 12 Apr 2023 20:11:16 UTC :
=3D20
Charlie Li wrote:
Mateusz Guzik wrote:
<= /blockquote>
= can you please test poudriere with
<= blockquote type=3D"cite">
https://github.co= m/openzfs/zfs/pull/14739/files
=3D20
<= blockquote type=3D"cite">
After applying, o= n the md(4)-backed pool regardless of =3D3D
block_cloning,=3D3D20
=
the cy@ `cp -R` test reports no differing (= ie corrupted) files. =3D
=
Will=3D3D20=3D3D
=
=3D20
rep= ort back on poudriere results (no block_cloning).
<= blockquote type=3D"cite">
=3D3D20
As for poudriere, build failures are still rolling in. These are =3D
(and=3D3D20=3D3D
=3D20<= br>
have been) entirely random on every run. Some examples from this =3D
run:
=3D3D20
<= blockquote type=3D"cite">lang/php81:
- post-inst= all: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D3D20
<= span>${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D3D
${STAGEDIR}/${PREFIX}= /etc
- consumers fail to build due to corrupted php.conf packaged
=3D3D20
=
devel/ninja:
=
- phase: stage
- install -s -m 555=3D3D20
/wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D3= D20
/wrkdirs/usr/ports/devel/ninja/work/stage/usr/loca= l/bin
- consumers fail to build due to corrupted bin/n= inja packaged
=
=3D3D20
devel/netsu= rf-buildsystem:
- phase: stage
=
-= mkdir -p=3D3D20
=3D3D
=3D
/wrkdirs/usr/ports/devel/n= etsurf-buildsystem/work/stage/usr/local/share/n
e=3D
=3D3D
tsurf-buildsystem/makefi= les=3D3D20
=3D3D
=3D
=
/wrkdirs/usr/ports/devel/netsurf-buildsystem= /work/stage/usr/local/share/n
e=3D
=3D3D=
=
tsurf-buildsystem/testtools
for M= in Makefile.top Makefile.tools Makefile.subdir =3D3D
Makefile.pkgconfig=3D3D20<= /span>
<= blockquote type=3D"cite">
Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \=
=
cp makefiles/$M=3D3D20
=3D3D
=3D<= br>
= /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/share/n
e=3D
=3D3D
tsurf-buildsystem/makefiles/;=3D3D20
<= /blockquote>
\
done<= /span>
<= /blockquote>
- graphics/libnsgif fails to build due to NUL character= s in=3D3D20
=
Makefile.{clang,subdir}, causing nothing t= o link
=3D20
Summary:= I have problems building ports into packages
via poudriere-devel use despite being fully upd= ated/patched
<= /blockquote>
(as o= f when I started the experiment), never having enabled
block_cloning ( still using openzfs-2.= 1-freebsd ).
<= /blockquote>
=3D20=
=
In other words, I= can confirm other reports that have
been made.
=3D20
The details follow.
<= span>=3D20
=3D20<= /span>
<= blockquote type=3D"cite">
[Written as I was= working on setting up for the experiments
and then executing those experiments, adjusting as= I went
along.]
=3D20
I've run my own tests in a cont= ext that has never had the
=
zpool upgrade and that jump from before the openzfs import to
after the existing co= mmits for trying to fix openzfs on
FreeBSD. I report on the sequence of activities getting to=
=
the point of tes= ting as well.
=
=3D= 20
By personal po= licy I keep my (non-temporary) pool's compatible
=
with what the most recent ??.?-RELEASE suppo= rts, using
openzf= s-2.1-freebsd for now. The pools involved below have
=
never had a zpool upgrade from where the= y started. (I've no
pools that have ever had a zpool upgrade.)
=3D20
(Temporary pools are rare for me, such as this investigati= on.
But I'm not t= esting block_cloning or anything new this time.)
=
=3D20
I'll note that I use zfs for bectl, not for redundancy.= So
my evidence i= s more limited in that respect.
=3D20
The activities were done on a HoneyComb (16 Cortex-A72 cores).
<= /blockquote>
The system has and supports E= CC RAM, 64 GiBytes of RAM are
present.
<= span>=3D20
I star= ted by duplicating my normal zfs environment to an
=
external USB3 NVMe drive and adjusting the= host name and such
to produce the below. (Non-debug, although I do not strip
symbols.) :
=3D20
# uname -apKU
FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CUR= RENT #90 =3D3D
ma= in-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023   &nbs= p; =3D3D
=
=3D=
=
root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-sr= c/arm
6=3D
=3D3D
=
4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082
=3D20
I then did: git fetch, stash pu= sh ., merge --ff-only, stash apply . :
<= /blockquote>
my normal procedure. I then also applied the patch from= :
=3D20
https://github.com/openzfs= /zfs/pull/14739/files
<= span>=3D20
Then I= did: buildworld buildkernel, install them, and rebooted.
=3D20
The result was:
=3D20
# uname -apKU
=
FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D3D<= /span>
<= blockquote type=3D"cite">
main-n262122-2ef2= c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023     =3D3D
=
=3D
root@CA= 72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm
6=3D=
=
=3D3D
4.aar= ch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086
=3D20
The later poudriere-devel based build of package= s from ports is
b= ased on:
=3D20
<= blockquote type=3D"cite">
# ~/fbsd-based-on-w= hat-commit.sh -C /usr/ports
4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D3D<= /span>
<= blockquote type=3D"cite">
devel/freebsd-gcc= 12: Bump to 12.2.0.
Author:     John Baldwin <jhb@FreeBSD.org>
Commit:   &= nbsp; John Baldwin <jhb@FreeBSD.org>
<= blockquote type=3D"cite">CommitDate: 2023-03-25 00:06:40 +0000<= br>
branch: main
<= /blockquote>
merge-base: 4e94ac9eb97fab165= 10b74ebcaa9316613182a72
<= blockquote type=3D"cite">
merge-base: CommitDate: 2023-03-25 00:06:40 +0000
n613214 (--first-parent --count for m= erge-base)
=3D20<= /span>
<= blockquote type=3D"cite">
poudriere attempt= ed to build 476 packages, starting
with pkg (in order to build the 56 that I explicitly
indicate that I want).= It is my normal set of ports.
The form of building is biased to allowing a high
load average compared to the nu= mber of hardware
= threads (same as cores here): each builder is allowed
to use the full count of hardware threa= ds. The build
=
=E2=82=AC=C3=8FL=E2=82=AC=E2=82= =AC=E2=82=AC=E2=82=AC=E2=80=B9=15 > > >> used USE_TMPFS=3D3D3D"d= ata" instead of the USE_TMPFS=3D3D3Dall I
normally use on the build m= achine involved.
= =3D20
And it prod= uced some random errors during the attempted
builds. A type of example that is easy to interp= ret
without furth= er exploration is:
=3D20
pkg_resourc= es.extern.packaging.requirements.InvalidRequirement: Parse
=3D
=3D3D
error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Z= a-z)
    0
 = ;       da0p8     ONL= INE       0     0  &n= bsp;  0
=3D20
errors: No k= nown data errors
= =3D20
=3D20
=3D3D3D=3D3D3D=3D3D3D<= /span>
<= blockquote type=3D"cite">
Mark Millard
marklmi at yahoo.com<= /span>
<= blockquote type=3D"cite">
=3D20
<= /blockquote>
=3D20
<= /blockquote>
Let's try this again. Claws-mail didn't include the list address in= =3D
t= he=3D20
header. Trying to reply, again, using exmh instead.
<= /blockquote>
=3D20
=3D20
Did your pools s= uffer the EXDEV problem? The EXDEV also corrupted =3D
files.

As I reported, this was a jump from before the import
to as things are tonigh= t (here). So: NO, unless the
existing code as of tonight still has the EXDEV problem!

Prior to this experiment I'd not progressed an= y media
beyond: mai= n-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49.
<= blockquote type=3D"cite">
I think, without sufficient investiga= tion we risk jumping to
conclusions. I've taken an extre= mely cautious approach, rolling back
<= blockquote type=3D"cite">
snapshots (as much a= s possible, i.e. poudriere datasets) when EXDEV
corrupti= on was encountered.

Again= : nothing between main-n261544-cee09bda03c8-dirty and
main-n262122-2ef2c26f3f13-dirty was invol= ved at any stage.
<= /span>
<= blockquote type=3D"cite">
=3D20
<= blockquote type=3D"cite">
I did not rollback any snapshots in my MH m= ail directory. Rolling back
snapshots of my MH maildir w= ould result in loss of email. I have to
=
live with that c= orruption. Corrupted files in my outgoing sent email
=
dir= ectory remain:
=3D20
slippy$ ugrep -= cPa '\x00' ~/.Mail/note | grep -c :1=3D20
53
<= /blockquote>
slippy$=3D20
=3D20
There ar= e 53 corrupted files in my note log of 9913 emails. Those =3D
files
will ne= ver be fixed. They were corrupted by the EXDEV bug. Any new ZFS
=
or ZFS patches cannot retroactively remove the corruption from those=
files.
=3D20
Bu= t my poudriere files, because the snapshots were rolled back, were
"repaired" by the rolled back snapshots.
<= /blockquote>
=3D20=
I'm not convinced that there is presently active corrup= tion since
<= blockquote type=3D"cite">the problem has been fixed. I am convinced th= at whatever corruption
that was written at the time will= remain forever or until those files
<= blockquote type=3D"cite">
are deleted or repl= aced -- just like my email files written to disk at
<= /blockquote>
the t= ime.
<= /span>
<= blockquote type=3D"cite">
My test results and= procedure just do not fit your conclusion
that things are okay now if block_clonging is comple= tely avoided.

Admitting I'= m wrong: sending copies of my last reply to you back to myself,

again and agai= n, three times, I've managed to reproduce the corruption you
are talking about.

This em= ail itself was also corrupted. Below is what was sent. Good thing
multiple copies are saved by e= xmh.

Admitting I'm wrong: sending copies o= f my last reply to you back to myself,
again and again, three times, I've managed to reproduce t= he corruption you
ar= e talking about.

This email it= self was also corrupted. Below is what was sent. Good thing
multiple copies are saved by exmh.

Admitti= ng I'm wrong: sending copies of my last reply to you back to myself, =
again and again, three times, I've managed to reproduce the corrup= tion you
are talking about.

=46rom my previous email to you.

header. T= rying to reply:::::::::, again, using exmh instead.
 &= nbsp;            = ;        ^^^^^^^^^
H= ere it is, nine additional bytes of garbage. I've replaced the garbage
with colons because nulls mess up a lot of things, including cut= &paste.

In another instance about 500 b= ytes were removed. I can reproduce the
corruption at will n= ow.

The EXDEV patch is applied. Block_cloni= ng is disabled.

Somehow nulls and other gar= bage are inserted in the middle of emails after
the ZFS upg= rade.

Can you please try th= is patch:

Unfortunately I don=E2=80=99t see how th= is can happen with block cloning disabled.

--=  
Pawe=C5=82 Jakub Dawidek
= --Apple-Mail-2BA72446-819E-425D-8704-55E95D118510-- From nobody Thu Apr 13 11:02:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxWT2gDpz44mRc; Thu, 13 Apr 2023 11:03:01 +0000 (UTC) (envelope-from vishwin@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 4PxxWT28Nmz3Mdt; Thu, 13 Apr 2023 11:03:01 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383781; 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=Ffh6npBlzCFKrTNsO9Joqodek1zplThxEa03uU6Tdac=; b=dypQFo4a/u9x+SZ9+zVAnKZn5VeT1q0T1Q7dG2pRzEhzojNsPO88LTdZyuNENlOQzcT/6C 5eM5ZmOiGy25sQsIdFp2b/9pdMVAFz9lHRFjtCq6/XFl9tx3j7Nk7uzeEbD2iZCgRZWBwc F0R5qsyuoS/L9TusESls5sIrpqB4MPIFPl7luB1Mnb4lnfy7jN0l3xYqEvFRNJeWdMl+5G wgmJ/dZLurTqyM7ErS12ECyF5IWDFK4L1x6VEE3q7LiSb39LIYfdHVOkAQsiUf8LEHXXwD uG/x+Kj2OByCz5Vfe3zThrTe/7rndFbF5W5Nn0VLF/VZT6yF97g6lJKvO20rcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383781; 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=Ffh6npBlzCFKrTNsO9Joqodek1zplThxEa03uU6Tdac=; b=Av2u58PMvOEYjRw/a8GHp1qUbdCDpl7AJibYTivfFlTS89yEZP9rOXCf3HAyqx6rB34nCN fQtd6zS1LTLEfFEpUfK76Obpy63BsECzptchgA5xB1MBG5zN4f/KwZ2n3xWd81nFLto96V s/bj0squlB4nKL8v53zIpb8bgUikBseHqnDOPZ9tXEMBS69SAVN65Y72Z06SZR/1KPa4xR ilpfvj1lz/BuJfgT6oQAa0L357QoTdyMO/Utr37yvh5PQPdxRjIRto9f+OrkQ668K2gjLv p1GMDanjJeLH5Fjc0si8c4OLfBmgh7NPJ8Syl1snpQsZZU3KM1GLc8gNZlkt4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681383781; a=rsa-sha256; cv=none; b=Yx99xhEFFFCuBZFe052eOU1MBc1Df1NZQIBKG6ceWBaJEHeQefMztH5g+OFjJOOrh35PPY XiMTedk9WXP3aI64aP4bm88gkxH9kf2Z3TTuoCPJTGnE5d/SVC6KSxn+9b2tQ1l0MQbn1F O3tgMxI4OPQxjZBVpC4e3MhXhNhxfRyxF9/i3O1IA4LmOqMMhEUrikLIFptsGdsccid32D j7Cpw2AvKLvk9B7SOZ4A19/HGQoD2sCedi1zlFqxTLBVHgEl3Xqfcr1x/DcwYkkWfKrz8m AH1bQxYG47IuQf7zz0VRCCpeXJ57/fLoOmHyFx0OeGq2QFfaJSt96X2igtbubQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxxWS6QvHzcGN; Thu, 13 Apr 2023 11:03:00 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <1c033b39-644c-e4fa-5986-05ac09704072@freebsd.org> Date: Thu, 13 Apr 2023 07:02:59 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Cy Schubert Cc: Mateusz Guzik , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> <20230412223143.24615882@cschubert.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <20230412223143.24615882@cschubert.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------CY1IsMEDbbmpND6yeobPZzLr" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------CY1IsMEDbbmpND6yeobPZzLr Content-Type: multipart/mixed; boundary="------------s3bM00B0hj10yRLQpiwwOskL"; protected-headers="v1" From: Charlie Li To: Cy Schubert Cc: Mateusz Guzik , Rick Macklem , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <1c033b39-644c-e4fa-5986-05ac09704072@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <202304031513.333FD6qw014903@gitrepo.freebsd.org> <20230404052811.DA2172C1@slippy.cwsent.com> <7c75b934-cb0a-b32e-bc19-b1e15e8cf3aa@freebsd.org> <20230409154042.0685a273@cschubert.com> <707e4671-d746-aa23-e340-6eb8f50f78c6@freebsd.org> <20230409205826.7802259d@cschubert.com> <4e85eb84-f0cc-2f8c-d3d9-1e016ede042a@freebsd.org> <20230410165406.51bcd958@cschubert.com> <70739834-4eea-db30-63be-556bcfd881a1@freebsd.org> <464cc8cd-2bf6-b7e5-3823-89227d842458@freebsd.org> <64e4af2a-5273-6219-c146-f867160f09ac@freebsd.org> <20230412223143.24615882@cschubert.com> In-Reply-To: <20230412223143.24615882@cschubert.com> --------------s3bM00B0hj10yRLQpiwwOskL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Q3kgU2NodWJlcnQgd3JvdGU6DQo+IEhhdmUgeW91IHRyaWVkIHBvdWRyaWVyZSBidWxrIC1D IG9yIC1jID8gU29tZSBwYWNrYWdlcyBtYXkgYmUgY29ycnVwdC4NCj4gDQpUaGlzIHdhcyBl bnRpcmVseSB3aXRoIGJ1bGsgLWMuDQoNCkJlY2F1c2UgdGhpcyBwb29sIGhhcyAtbyBjb21w YXRpYmlsaXR5PW9wZW56ZnMtMi4xLWZyZWVic2QsIEkgd2FzIGFibGUgDQp0byByZXZlcnQg dGhpcyBlbnRpcmUgc2VyaWVzIGFuZCB0aGUgcHJvYmxlbXMgd2VudCBhd2F5Lg0KDQotLSAN CkNoYXJsaWUgTGkNCuKApm5vcGUsIHN0aWxsIGRvbid0IGhhdmUgYW4gZXhpdCBsaW5lLg0K DQo= --------------s3bM00B0hj10yRLQpiwwOskL-- --------------CY1IsMEDbbmpND6yeobPZzLr Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ34WMFAwAAAAAACgkQ/reFK+KbPofU Nw/7B/gKgy1fZyXmtPir/91JjxVBk1vrB0xP5bnVS8xIemgna693aCIWSGzlYiMOXfrzzJ6pkfcN zuVVSNHaGyfOsPwdfoRgpzgS+FRNzE8/K5HWBUz684Hhyxf5R81ard2OtndCz20PT3UMLkohbCs0 aVWmX8wiBKPzgMXeRZ6vK4Gy9GlATgfHFWT9HFTwyo3RO7BsWcfAKnzV7DT3iDN8fC+J8uPlPhR2 DoTBQYoXp3VnW14pn0q8zhgdg7y/kxHi1atJ4No/IlWfMom2ltX8jqZxjIuIEfbPtXZTkYvbtM4P YMXoRSRIcb5I05XFyUrGga8HroopGP25k58poqs+O3ao2cGvHknPcVXDdTwxDKSHmI+HCS/fZ3Vs VXbVlBMhGO/ww0PDgrI2I9Fy90o6vWRXqE1cl4ykdTaWxnz2zKnJubSb/YvUducmEHCbCK4PZmiL CkNswmtw5WqMvhE2au9innwRMDStpydCCbd3UJ7Ad+yX0JuyvZIgodzeKSNmLWjRZxEqiPc8XO3P Ff5AeBKD59R6vLL+rbIU1Cjq6DT6KQj5yK0lAQbVniSFPvhxPmvKPxs1VlgqUV7wS5/OW5KNOHcU GX906+H5Pryil/YpBVrdaVO8WhgO91DcHfL4+5zF/6RytGRpT/ZMpdnkMfVuSENQGfzw05j2T5uP v/g= =626H -----END PGP SIGNATURE----- --------------CY1IsMEDbbmpND6yeobPZzLr-- From nobody Thu Apr 13 11:03:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxXH6ncKz44mP8; Thu, 13 Apr 2023 11: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 4PxxXH5hynz3NQ7; Thu, 13 Apr 2023 11: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=1681383823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYnJV7gOTm8tk7QQMmswsfXPVkOvG5ozApPdwokAsA0=; b=lkpZ5RLlVZrILEs0PXYJ8Unif+ipBapTF5VnmfobAa2Jfh54oUPaZWTBUr3LQZDMnzfzH1 +x3ZjJS4hXrIjJg9dsj/LcIVUiXHJC0DKqkmsXqb7LiVds92RJZChPZ2JD6HIP/C66pG4I Cm2fj8/BDurcho610HT4ObJzGMWVptIjTfyFioGjQ0mNQdCHtFYBT9NlNzV9T8bTaGHZRM ku9ns1GeJgQChUuB2Q3Ti+iRwvMpf2hV7cJ5Oi/whv+DZHMNwP2rrKrCsYTOo+3tXbvHY8 M/XInEeyoAUUv02+M4k6l08zXINKqQODXwsw8amSAVUPeH1qBg0BuoMLu1iNCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYnJV7gOTm8tk7QQMmswsfXPVkOvG5ozApPdwokAsA0=; b=uS5afI/2m3s/HgmXgqBWCpR4g8EWbu0Hmx/ArUL5w2XJipGblrK+O05tqgMftdzWtGVOGb MK3ud+HurgcWrNFtCZAXXMVvrFwnENW1F3RN5i0D0PDZcmW537BI+lNwdrYUjbZU2O6mYW Y+iP90bl1w4ji6dhCu3aikkxpwUwhhQN8OmPeUKIp9WMko7YskBYVoAp0DTR6ojTc2ypdG x/dEDjeYMmS8sPGW/l1hfwDLWMOwoRRMEkAgpguxeNLje6UJlTWQVJBJPGF7j/KT3cqq3I Hvfk+Fk/uYoooreuOo4oDWNMEWE50bZ7gm7Y88uwPn/joP0C1MBVC/McW4a26w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681383823; a=rsa-sha256; cv=none; b=wL8t4H/UFvdUFyglVzW60Sl7Uzf4fmOgP/KKofgHqj55LiVkgJyjsfHEV/Hxv82qnTbcoA Ut3piQsP7AWUFFVQcWEvfYpsgKpzmEOI06qAvpmeGdZNCuGYh3Q/XMgSea61JZB6YyTQLS OqTarM3lzNciZtkBFlarZYTsXLGFDAco8eCUGfc2f/+KLbPijI6eWWtC2IsuRH56joeiUF PssYxC9j8JLcYO/PDI4KilSLVdI52h4CnJrZSuNxsyJyPOEdmosm3L6BaF9bU4JrEXmsK7 kdEH9QMq7WVAoukYv5dLHmr3PiuwYvomnWQAXMwyYzpT6sYVJDD597i175ByYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxxXH4SDjzg4h; Thu, 13 Apr 2023 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DB3hEW025625; Thu, 13 Apr 2023 11:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DB3hmS025624; Thu, 13 Apr 2023 11:03:43 GMT (envelope-from git) Date: Thu, 13 Apr 2023 11:03:43 GMT Message-Id: <202304131103.33DB3hmS025624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8688532f07c1 - main - date.1: Make sure that the example works in any locale List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8688532f07c14aee9e2d0f21397c193cf53fe2b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8688532f07c14aee9e2d0f21397c193cf53fe2b9 commit 8688532f07c14aee9e2d0f21397c193cf53fe2b9 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-13 11:02:20 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-04-13 11:02:20 +0000 date.1: Make sure that the example works in any locale --- bin/date/date.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 582b8bc6cd09..0c92a8c71f90 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd February 27, 2023 +.Dd April 13, 2023 .Dt DATE 1 .Os .Sh NAME @@ -516,7 +516,7 @@ will display .Pp Finally the command: .Pp -.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`env LC_ALL=C date`"" ""+%s""" +.Dl "env LC_ALL=C date -j -f ""%a %b %d %T %Z %Y"" ""`env LC_ALL=C date`"" ""+%s""" .Pp can be used to parse the output from .Nm From nobody Thu Apr 13 11:03:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxXK0Xnqz44mTt; Thu, 13 Apr 2023 11:03: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 4PxxXJ6m3zz3NFC; Thu, 13 Apr 2023 11: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=1681383825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1M7M6hOtfIHX8f+ZSoz5bkvLrhhxg726ifgeX2Z7TBw=; b=mto+BkrJSuob4M3l1ixA/+1JAvFKrfZHmlROCOb5Xi46NeCuo1Jn9+T4+/jRKLaU2WQVwj a6b59dxNH1jNV8uCYrkkf6AuvEP1wV5w6k5BT7PHWqJwJXsMHoTbU14Hf6OYypIyJ8ZbvV B6bZywI/3xGLKAxDaQqcYs4R+BSIQyH37f48f4ZZZxrMaTv+P5Ebjpr60OhN3aU73/cFSq fumug56hOxK0pG/PSyqxcnAFKBvLO0OVO1t2z9cAWXCvtiQtwhwAjRmmX4XbzP75RX4u13 Kry0IKTS6D/YB35Dq2hkrwxFB5uEKKmIImf6r29zpOi59IrBKJ5mduH5jobnvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1M7M6hOtfIHX8f+ZSoz5bkvLrhhxg726ifgeX2Z7TBw=; b=rOkTsR36gcsrcJ0wlQkEmW+oWB49ekUkBXCUqK7FU4NgmQzuunxL088i3nBFQIjJ2B4cvF YUiC8URsPJ0UlZOfqaPQObcheK5ggDmb49VS4T+QFgVYg/AULytTnDvPmUFl9mGErhoXne pSTHT32p6Gkc/JXYxI+O22aIdP0NwGM6hQad48Y6UbqPiGJPyKVWKGV7F98StjFqOZ+QS/ vLieiZoo5oTry4n+4CNGBgcY5munYt4f6BOr077ZG9z7VvUbN3O/MfaxE3ddult9SnyIjd nLPAEhA/gHnfmaNJ+fOuZ+1rHhEetRcRgNKOgAKFcVe3+xW490Gwnu42jKBgtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681383824; a=rsa-sha256; cv=none; b=J5cVQT9J+qMjjFioB0tJUhvrNMwLT/Q1nygv/T6X4seNlgPo660h2S6r6dKXO/7DTqeddd Dmk4Ljogt7Z9MOkz9i3KgZTJ7aR/tj6n+LVUIxPQlafhsm8XKCtdCvpaTtvNfkoaaouQ3m Ps27h6RTL8SmXJv5f/Ra8B/+zK3duBBVRFssTpzh9bihXfCbovvZeEBAs2ff1yY9i1MlT1 JTTnFLjvvA1JijxjC29GAjdASXaNHbIuJd73uXLTleZxruhEk7Sjy0LNCA+9DDks6Iqwea shN6raN8lVSSnK2of5zWbtUUdTYIV+B0yMWxLnuWyYs9fRV/UeTk7k9cMyqw8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxxXJ5MkGzg0y; Thu, 13 Apr 2023 11:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DB3igh025644; Thu, 13 Apr 2023 11:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DB3iea025643; Thu, 13 Apr 2023 11:03:44 GMT (envelope-from git) Date: Thu, 13 Apr 2023 11:03:44 GMT Message-Id: <202304131103.33DB3iea025643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d8e36cd2b10f - main - gptboot.efi.8: Fix a typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8e36cd2b10f78470c1de56337f685c10ce26ed2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d8e36cd2b10f78470c1de56337f685c10ce26ed2 commit d8e36cd2b10f78470c1de56337f685c10ce26ed2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-13 11:02:59 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-04-13 11:02:59 +0000 gptboot.efi.8: Fix a typo --- stand/efi/gptboot/gptboot.efi.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/gptboot/gptboot.efi.8 b/stand/efi/gptboot/gptboot.efi.8 index 134c5353e9f1..b4231fbf6d0c 100644 --- a/stand/efi/gptboot/gptboot.efi.8 +++ b/stand/efi/gptboot/gptboot.efi.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 6, 2021 +.Dd April 13, 2023 .Dt GPTBOOT.EFI 8 .Os .Sh NAME @@ -274,7 +274,7 @@ gpart set -a bootonce -i 2 ada0 appeared in .Fx 13.0 .Sh AUTHORS -This manual page written by +This manual page was written by .An Warner Losh Aq imp@FreeBSD.org . It is based heavily on the .Xr gptboot 8 From nobody Thu Apr 13 11:04:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxYk3Hw4z44mn5; Thu, 13 Apr 2023 11:04:58 +0000 (UTC) (envelope-from vishwin@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 4PxxYk2WrZz3PLC; Thu, 13 Apr 2023 11:04:58 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383898; 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=jc3oYf4fXTD/yFk4LugxhsBgEpe+W6ofOjINkwJB2hI=; b=UsIWl3STBmfSgNtppMYEyAuLiYskYkO6GfWCKOom15qFePi/9ngo8xMp7Jh7oCVR8P5U7T W/Ci2cHv6A97rCt694mATX9Pxkf415PlCmTF+CmF9Nqqcx3MFIXrv8sxcmUPp4qul18env 4HXsEhuxNOF1hyRweEx/CTAeaYFc20i8qmDD83Yf84Nj6M7C/MNzxNelGg0rtBzFH6XK0/ 34ufIdHACP3d/AxVpZSgne37EGopXuqYvmtcvf3xoBrspPRPaaxArsQMppCzTQwQ78Pmh5 E2a4D31z4cLvqBf0uAc1xxSSzTgni9AuBdizfjlzg7s8hchCl5Tt5SDwyzwTdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383898; 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=jc3oYf4fXTD/yFk4LugxhsBgEpe+W6ofOjINkwJB2hI=; b=BGNsL3Lx7b4V7JBeqw0VGy7GrZp+nmnErXQoQ8Knq7PG0oxXcecJB1XHqqXfMKQj69hZ4I QY+GdhOdc1fV6ctZ2PbkBGPQsm1gIQR4tt2D3obgZkpqw9L/8LtJyzPIVNoUHz7JYYoJqw J7fQyMxGtnAqscStRGL6dMfi9irjm60i6/8c2ed+rR5YZWbTyVHxnl2CLOrDGk0SdSsAHT TCd6UU1FoDK7mdWYtY9zdleVwzw3WrW5RtzoDk28pTah9Fj2XAz2McWjm4PgON6LPR4G+V pFQXmm4EcNLjmmZgAvYHbLAn9hxHvJ2q4tQphlYWgrgiQmy4TfCpYtXDd7HReA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681383898; a=rsa-sha256; cv=none; b=hf7SUzsxjcLhYKrZFCpbf+myb0HDkG84m3x0TAwPjZl06LhTyuHXg4aFL/xL4WzentTO1g 6NLCCFVx8pqYBndNOYItXImzJ5wN/0WniCIy4oLWoSIjD3EBnDoAmD4YOtdYadp+JYcDKZ dX4YFmICZ44YQ+9HGNkqLa+eoMXpjE9M9FR4x7GlzGNFXxZurBdAWHVp7pLURvCLNJCDmL mhVKuHxEgn7RdWTnCFHj5G4ozcu202UJEDhRvtVI1Tqe1BytBCMu7MySlAdvjs7B8ME412 NrO8CWnxsLvsE1rxo1KwEl8G3Nz9UtN3/T7TyIPJK7DzgIaHal3OF5iX+wu7Vw== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PxxYj6b9szd9Y; Thu, 13 Apr 2023 11:04:57 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Thu, 13 Apr 2023 07:04:57 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: =?UTF-8?Q?Pawe=c5=82_Jakub_Dawidek?= , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org References: <20230413071032.18BFF31F@slippy.cwsent.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------UKCQp4ej4cOAKv08aye80fKU" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------UKCQp4ej4cOAKv08aye80fKU Content-Type: multipart/mixed; boundary="------------fpdu0TTcHiqeNaThx660EQD6"; protected-headers="v1" From: Charlie Li To: =?UTF-8?Q?Pawe=c5=82_Jakub_Dawidek?= , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> In-Reply-To: --------------fpdu0TTcHiqeNaThx660EQD6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 UGF3ZcWCIEpha3ViIERhd2lkZWsgd3JvdGU6DQo+IENhbiB5b3UgcGxlYXNlIHRyeSB0aGlz IHBhdGNoOg0KPiA8aHR0cHM6Ly9naXRodWIuY29tL29wZW56ZnMvemZzL3B1bGwvMTQ3Mzk+ DQo+IA0KPiBVbmZvcnR1bmF0ZWx5IEkgZG9u4oCZdCBzZWUgaG93IHRoaXMgY2FuIGhhcHBl biB3aXRoIGJsb2NrIGNsb25pbmcgZGlzYWJsZWQuDQo+IA0KVGhpcyBwYXRjaCBtYWRlIG5v IGRpZmZlcmVuY2UgaW4gcG91ZHJpZXJlOyBjb3JydXB0aW9uIHN0aWxsIHJvbGxlZCBpbi4N Cg0KLS0gDQpDaGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQg bGluZS4NCg0K --------------fpdu0TTcHiqeNaThx660EQD6-- --------------UKCQp4ej4cOAKv08aye80fKU Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ34dkFAwAAAAAACgkQ/reFK+KbPofd 6w//RmNDw6vl+XQnOZ2CjOxRYHRzERFg3WK+9pSpVREwAizB/lFXU3WxIHWveoWpRxTeufK2sN7K +nsZaMH7jbKYjE82zD4DczZLR2d+HquHVFiJzYKX3UnZk3ILJYGTCuEchQHj47rIlWj5Pi7s0OZT ZDoh306YMYKEztkdA46OuGOWZhgp9ltYtMvZRcCSm2nLMPz7NQ8V52//yltGjsT4rFcjX9leRi4k CyM0bu71up7qUDcZZT2r0N1R5BkQxYinBt6n4/t0zdfwcZL3qI26G0mFI2oEStj094We3+P3tnaZ l0O1j8NFn5V7Sf64oacYYUZuz1ibD/09e3SzZwg6GX7Dhh9O+uO7BF7uJ3oHVLk4z00B89hoEdqo Kdg+IzRPLrp0bf38D/gX1zmQ3RRHRMD24vg4Oz0oGeZgEuOdv5EWK1SU4h769Pi+y0anvobHahR+ SeUGLWjcrDL5EDwFi10acueOSpxAuq8g85VuSuxmsOiX7raETKRjFN/qR7JvR0IPdlBKPIVElPNI 6wnNuteHQFC2SDG3fvxp8urN7KxEPNdW6sUn04CXWiNQ9vQuvfCUJ+2a9CUE45cf2eITEzZU6mHJ vUlOW31FCgg3nKa+e7yCYbZ8ulEvka6ROoWXdcHdB0mijHNiRPteTFhib2SKJPtQgrLJz+W4fy1y pjA= =zWTB -----END PGP SIGNATURE----- --------------UKCQp4ej4cOAKv08aye80fKU-- From nobody Thu Apr 13 13:25:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py0hk0VZdz45156 for ; Thu, 13 Apr 2023 13:26:14 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic307-54.consmr.mail.gq1.yahoo.com (sonic307-54.consmr.mail.gq1.yahoo.com [98.137.64.30]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4Py0hh5mvyz4Sbr for ; Thu, 13 Apr 2023 13:26:12 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681392371; bh=hX96yStHZUlFMdbWl043umvAmyXPama4W72l75gNeTo=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=KmnObWmS7e2WNihU/73tYtWGufJcPg7yEEaEDauYhZVnW2FbLohIj13qZ2oypww2n+I8MtQvbonnhKPuUc2PeQIGN1A0q7Ng/XLca2ITjkMo/S9a7vznjeNhwVNXeEUOzbVBEbnRl+6axiSafmZxAc+0YL8i7Fe1EOs2yknR6L2G1vSk8tu0sTW6+N1EDBR01PLv8nzbBxZ5WbjIecHX/5cXnOv/7nqVaflgWVKuMj0e6/aule5DSFzSpFZCy3iYXtyqNaaKDUbQVL5dbzAbi2tXmcLlCZapeaNm9e5GDGVqn7fAU1B40U4/adV/PWiML8Tq677xu4wR4ArLYLYgDQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681392371; bh=g8FU5jPnJN5nQLS12favE5Ng97OOV76KYIrGsN6+yPy=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=iGvsva2hsf9sYGD7cnU+Y66k6gLDf1ii0tz3txLKlI/JJzLsHh8PUrViLn8nWjqlz92TDLT63FqUMmcXq7zxFllwhE9cqhvyJA7U4/Gmp4YpRUMLqgnVvaS96xpAXii+8jOnfSKxkVxYx+JkXxhG9eD37WPmVTaeqM3CFzcW327xfAF0ovIFPEztbn/w1mnQ+oJKog9RvYwmc2JT+VWk4j8uRq4JAxeh9aZ5+RQ4mXTVx9tRDJVq4ukhcOH27bR3sTJnbbovh7F86C3M7D7CsU7xU1yJZStKZUmx/9eumqfb5lNYRFV85fWAnQb/p+0a6BXtFzM/1ZgC5nmoxXB7wg== X-YMail-OSG: G_Ip5O4VM1lVr4RV7U6kyN.iIh6LiTzAKs3nY.Ioqup7wWhUBvsA7Kro2QSRTCY vO6kX2mjbQEKaVonYWs5IaEUoSIGpMONOxQmVS2BHpAdrSgM.Vdx4vRAjeoH7B2WS2j6hq_i5A4H yhyykVE1L0_YHv4.3OFtdKoFX.iA1Q5WQk_6q2zX3g.1w0gZ503yUv4LIlwJztuvPjmUPKQRDQuu 74Y22uHeL3Y90AVfJYfvldmjZmqj8X42mVlwvcK0ZCHQlJberaXpiV_KnQOf_wzAPhcAd2WjDMve PWS7H96Z9pgf7CwaDdF2oq30DenxiWDAR9TNgwlo8XNOBdddU.IcD.lN3oOERojmJKT_qKQuZ_BI bADGcUMrGOpF.rWUxsDQRc0rB2tu_WWFn3u_HMqpBRLGYazDEGGYNOYPeg0qgyy4AB3Mxw3.YZ3X wZCvDZKWNwyskL9cbnEanuU.3WBp84wrJ3hnVp8fkJ4SV5r6y6c5mqhFB0.qpQycyqGjhCGzTEuy 6tRjHCZ9OkO74Tv7Ou6y7MNY49LuVLKdtfONIbn52F346qSoEgIfLTt_x6JTvYVEYW_vgNzqqehL 31YEFJdzANzbK7dwsUIz1PDhTOYtXwk6ltPe8HG0.R7tWr6aKRf1Na5N6Fw_QU1_1k70MulkO.fM 8g2rONnc0uD9vi.wtkGJV.9Su5LpfD25NM3RHY9WAM5VWZdK5wkf9ZjjDdSRKZwy_yVhSyGjlLlp fHhl5ybS5.OMwTgvlnvYpbHozzjPZwmKpTCylW9N8D8iKNsNUEZS53aLF45L_oAclo4IqVPY8.Ag WQ2D6gGF0UaQViy2yf2yWTAtUXddoA8hzQh6bRWjgvALIHLMREKwGcR_v8BpJxUmuAJkEHLgZ5Wl M_hssnlyAKFNDEXP55eRQQ91AdyN_UPQMk9QMao6kIyQxqPInxqsAAcauEBQZgut3RyMp2Fo6mmX xZvJURIm.sI58CYnEarYU5zn7Mvl9mgdqYtrMLp3xfSYqs7y2hjHnmg.jtyjy3tNVaZMZOeR6ZLs WE4t.25O5gGNcJ.8rJog0s1FLVwKEcdixx2VEfLBgQB4OzcG8Y7mNTSBxd2bOx0kV6I0DMR3AEqK mPanpTKp4rq.gxv.08n690SV3p1XUGrbzxDNHkRtLCMlC8Q8lHxHuzN4r3AzmASAibsBEfGsbzCK jie.Km.JAaUe4BfyjfgNh_6KhmkDYH8WXdDifbjSkCR8xCjtYNTOMtx8yYVBJ73KGSNxFEQqV2Pi yINx8wusVKqAzbvnUTP9TcYQ_TFtj5QVRrL2.LWMYDmkkdaIzwiNDfGqWEwSosvVwsdo9bF3fERL VqHHDVlXrZucTu_v13zt.dT5SE6R1ADLFNSkY2xa5fAYCfW7gj.TORR77n4jiFNnteATEQ_m1gmd yUWnsi26In4us8PjqxAHJSDbb2Sb5iaBD_.C85cisrkVJSr3QEYcnqQMvsI1.N5OQ.3PfJRcJzFE rInNf5uBYpsgfG46_RyVpCh7oTIufeFnH2zUvfoMwlY2W9L9Ps.D10NFW1FvSBL52zxTA.qA_0ow X6tvjEYZqWvVP5NSmNQbF1AlGLZW5M2.dsZOakfPHaacmYBlEGhXbvuZ.dyJZ7AfMcOwVogGYZub tr5kkuklSKoxnHmYRAkhLU5w9EOcVvUaqQ4jjxSq2qXo1KJF50.LYt0G8zeRBaKoYpwbdt7ZtRTI 6fbzdGstG.oRPxm1.0AqhDltYoKxUh.1gj7vvddoHk0OyZzzVchUX92XycqM5n9XiSOS.Of5DK3X IJ2Va0hMrw83QvRhus2sG86oa2w1pMPegkKW6sVWgCICUnrHEDQ41wALc16pee7_Ztg6lCO4pkqq hBwYV7IkmDtPxSPtCWmKzwA.fa48xPg441RZ.lBlMgnKe5qlfLdyYQeJc8rYvC3kWCN86f4CymFX P_3Vlr0CboXc0eavvH6_P3jDkh3dN2lWYsj5EqNnywGq46AIwiNi6YGfHpokghNELkcTEOvnDPm. TCan_vYCa2mGqzHUcAEnHiKq7zrj_adufhq1TXi1ZvuLkTcv8eRCjjWKnXN6F2t.0TvTBK96cRNT eInPoR0XTWdXVLqM5PG0J.QtAJMI3JE0NpE22Axjbpb7Nn_cwwCiJ5HEKc80eeyrYpKY2mQC_ZQu p3IcpbamNEgxK9Kf2on59Nlh4V9OP4AgCTT1slIR0bGM37D2yfT5ZQaDWZl63_AZR0FTLRdeHBtO VksrNmmwSLx1U1x9xE0vQRWM0KJ4soP3Lz63r9rNMd_rHTZgx_OYezW.q1WwFt2Mx4lH0RsG.Gzc YpIAVEg-- X-Sonic-MF: X-Sonic-ID: a7b92d98-66e5-4635-9de2-49e08ca638af Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.gq1.yahoo.com with HTTP; Thu, 13 Apr 2023 13:26:11 +0000 Received: by hermes--production-bf1-5f9df5c5c4-fgkgh (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID e8b018cb9f140281bc97a5129d934e73; Thu, 13 Apr 2023 13:26:09 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: Date: Thu, 13 Apr 2023 06:25:56 -0700 Cc: Charlie Li , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1DEBDF0D-DEF7-4986-922C-2C2A645875A5@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> To: =?utf-8?Q?Pawe=C5=82_Jakub_Dawidek?= X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4Py0hh5mvyz4Sbr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 13, 2023, at 04:04, Charlie Li wrote: > Pawe=C5=82 Jakub Dawidek wrote: >> Can you please try this patch: >> >> Unfortunately I don=E2=80=99t see how this can happen with block = cloning disabled. > This patch made no difference in poudriere; corruption still rolled = in. >=20 Same "made no difference" here. = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014512.= html indicated that I'd applied the patch already: "I then also applied the = patch from: https://github.com/openzfs/zfs/pull/14739/files" Cy reported the same in: = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014519.= html "The EXDEV patch is applied. Block_cloning is disabled." =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Thu Apr 13 13:29:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py0mS0mKTz451fK; Thu, 13 Apr 2023 13:29: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 4Py0mR69sgz4ZDC; Thu, 13 Apr 2023 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681392567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mTSazrv//ffbL1lTtS8tRfqCOLexX7p0tEmXDVLCsI=; b=Kt0YSLAOVGAlhPQObdt8U/63+HYslkVyTJ/a0lwFW4ApL3An6zjgt2H8yWWHsjWaoanW0M 5c2cPduMDqpt2ZyHFZvSkgYwR4de2c6rRQsqeuRBiD+BfQCpD8O2RSBziUoWXsHhk765rd bW7FgMsj3I4XKc/5pXEXyFw5RKMCZBbWvwMR6FgJWwZgckJbFyABnV++zOaiti4HjP807I wRvvaKpGRjKS07u5XuYqy5wNWyyMo1bzSU6TjzN+MoD4Ho6ntO4v6ExOsqZdPd7LCkS5Gz d2Sx7tvVOUoL8OK/HWQsL1qUYzaa6nzNmKJoIgXLGWeY2YxK7KZKT+rWAvLlpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681392567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mTSazrv//ffbL1lTtS8tRfqCOLexX7p0tEmXDVLCsI=; b=VKon768glHZ+Kli/3NmR+yYi86FTMDrLFEQ2tFj1bS17N2w/EcghWpa+xGtb+KA8SAQg/l GjAOnK/9l3atC64FnIDk529gaWYFlqoxfOKBBEQMFIfxe+whvSzxJTm00pffwm7nHwoaNO S9br0Pq3YuWiB2riUL/rrXCSkqV8cQ5P0T3MspTqMyAUVc33zMrpXnZLIgeftTL1sphPC+ 6lEQThTypH/p8ZwLTo2pR4nAP9iSQZ6O0FViK8YfQQ+1mAS/AhKsFY88ZzHxUYiY3o9gS8 Iex04uI8cyaNAcBw9XTaU4avyLWB21bTFtcIfajCf7bqNNRkn8wxZag/+2mElw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681392567; a=rsa-sha256; cv=none; b=qrvIEbEmWRFKGAOimEjKmMrfnZWHpCZKTX7nCaSMHLlg6/1y0RpP3oF2ky0Fx7e4NrGrDQ LPEmrPw5vrAviYkKW5XwliFcxXRd98DreC56dHga7tsX+/t1FkKmNUAwZAv6a+EY7KP2ue C4LQqrficw+Z4d5Mk+sC63r04PvhZG7CPEAbb2H78qxFG1YWGDwpybU/7h5+Wz0wZuxcme AlSSR8+rS95Lho/wVudViXDxuQwn2aWjaDJYi+0AvavZ6bVbYOuL6eCXGeSlGn0OEwWr39 Bzpf3WTqmHVbEMKITeIlO9tK75Y4K3qpGaE7bB8AFGfdMj8SUhEuGsBbNGd/1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py0mR3CZhzk6T; Thu, 13 Apr 2023 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DDTRL1055785; Thu, 13 Apr 2023 13:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DDTRGQ055784; Thu, 13 Apr 2023 13:29:27 GMT (envelope-from git) Date: Thu, 13 Apr 2023 13:29:27 GMT Message-Id: <202304131329.33DDTRGQ055784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 25685b753752 - main - TCP: Misc cleanups of tcp_subr.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25685b7537524a0f067968cd29819ac94b66071e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=25685b7537524a0f067968cd29819ac94b66071e commit 25685b7537524a0f067968cd29819ac94b66071e Author: Randall Stewart AuthorDate: 2023-04-13 13:29:05 +0000 Commit: Randall Stewart CommitDate: 2023-04-13 13:29:05 +0000 TCP: Misc cleanups of tcp_subr.c In going through all the TCP stacks I have found we have a few little bugs and niggles that need to be cleaned up in tcp_subr.c including the following: a) Set tcp_restoral_thresh to 450 (45%) not 550. This is a better proven value in my testing. b) Lets track when we try to do pacing but fail via a counter for connections that do pace. c) If a switch away from the default stack occurs and it fails we need to make sure the time scale is in the right mode (just in case the other stack changed it but then failed). d) Use the TP_RXTCUR() macro when starting the TT_REXMT timer. e) When we end a default flow lets log that in BBlogs as well as cleanup any t_acktime (disable). f) When we respond with a RST lets make sure to update the log_end_status properly. g) When starting a new pcb lets assure that all LRO features are off. h) When discarding a connection lets make sure that any t_in_pkt's that might be there are freed properly. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39501 --- sys/netinet/tcp_subr.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index f7b3fcea125e..3a6a902c35be 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -168,10 +168,10 @@ SYSCTL_INT(_net_inet_tcp_sack_attack, OID_AUTO, move_thresh, CTLFLAG_RW, &tcp_sack_to_move_thresh, 600, "Percentage of sack moves we must see above (10.1 percent is 101)"); -int32_t tcp_restoral_thresh = 650; /* 65 % (sack:2:ack -5%) */ +int32_t tcp_restoral_thresh = 450; /* 45 % (sack:2:ack -25%) (mv:ratio -15%) **/ SYSCTL_INT(_net_inet_tcp_sack_attack, OID_AUTO, restore_thresh, CTLFLAG_RW, - &tcp_restoral_thresh, 550, + &tcp_restoral_thresh, 450, "Percentage of sack to ack percentage we must see below to restore(10.1 percent is 101)"); int32_t tcp_sad_decay_val = 800; SYSCTL_INT(_net_inet_tcp_sack_attack, OID_AUTO, decay_per, @@ -290,6 +290,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, ts_offset_per_conn, CTLFLAG_VNET | CTLFLAG_R /* How many connections are pacing */ static volatile uint32_t number_of_tcp_connections_pacing = 0; static uint32_t shadow_num_connections = 0; +static counter_u64_t tcp_pacing_failures; static int tcp_pacing_limit = 10000; SYSCTL_INT(_net_inet_tcp, OID_AUTO, pacing_limit, CTLFLAG_RW, @@ -299,6 +300,9 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, pacing_limit, CTLFLAG_RW, SYSCTL_UINT(_net_inet_tcp, OID_AUTO, pacing_count, CTLFLAG_RD, &shadow_num_connections, 0, "Number of TCP connections being paced"); +SYSCTL_COUNTER_U64(_net_inet_tcp, OID_AUTO, pacing_failures, CTLFLAG_RD, + &tcp_pacing_failures, "Number of times we failed to enable pacing to avoid exceeding the limit"); + 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"); @@ -378,6 +382,7 @@ static struct inpcb *tcp_mtudisc(struct inpcb *, int); static struct inpcb *tcp_drop_syn_sent(struct inpcb *, int); static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, const void *ip4hdr, const void *ip6hdr); +static void tcp_default_switch_failed(struct tcpcb *tp); static ipproto_ctlinput_t tcp_ctlinput; static udp_tun_icmp_t tcp_ctlinput_viaudp; @@ -389,6 +394,7 @@ static struct tcp_function_block tcp_def_funcblk = { .tfb_tcp_handoff_ok = tcp_default_handoff_ok, .tfb_tcp_fb_init = tcp_default_fb_init, .tfb_tcp_fb_fini = tcp_default_fb_fini, + .tfb_switch_failed = tcp_default_switch_failed, }; static int tcp_fb_cnt = 0; @@ -1107,7 +1113,7 @@ tcp_default_fb_init(struct tcpcb *tp, void **ptr) (int32_t)sbavail(&so->so_snd)) tcp_setpersist(tp); else - tcp_timer_activate(tp, TT_REXMT, tp->t_rxtcur); + tcp_timer_activate(tp, TT_REXMT, TP_RXTCUR(tp)); } /* All non-embryonic sessions get a keepalive timer. */ @@ -1140,6 +1146,12 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) { INP_WLOCK_ASSERT(tptoinpcb(tp)); + +#ifdef TCP_BLACKBOX + tcp_log_flowend(tp); +#endif + tp->t_acktime = 0; + return; } /* @@ -1561,6 +1573,7 @@ tcp_init(void *arg __unused) tcp_comp_total = counter_u64_alloc(M_WAITOK); tcp_uncomp_total = counter_u64_alloc(M_WAITOK); tcp_bad_csums = counter_u64_alloc(M_WAITOK); + tcp_pacing_failures = counter_u64_alloc(M_WAITOK); #ifdef TCPPCAP tcp_pcap_init(); #endif @@ -1932,6 +1945,8 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, m_freem(m->m_next); m->m_next = NULL; m->m_data = (caddr_t)ipgen; + /* clear any receive flags for proper bpf timestamping */ + m->m_flags &= ~(M_TSTMP | M_TSTMP_LRO); /* m_len is set later */ #ifdef INET6 if (isipv6) { @@ -2068,6 +2083,10 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, nth->th_ack = htonl(ack); nth->th_off = (sizeof (struct tcphdr) + optlen) >> 2; tcp_set_flags(nth, flags); + if (tp && (flags & TH_RST)) { + /* Log the reset */ + tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); + } if (tp != NULL) nth->th_win = htons((u_short) (win >> tp->rcv_scale)); else @@ -2249,6 +2268,9 @@ tcp_newtcpcb(struct inpcb *inp) #endif /* INET6 */ V_tcp_mssdflt; + /* All mbuf queue/ack compress flags should be off */ + tcp_lro_features_off(tptoinpcb(tp)); + callout_init_rw(&tp->t_callout, &inp->inp_lock, CALLOUT_RETURNUNLOCKED); for (int i = 0; i < TT_N; i++) tp->t_timers[i] = SBT_MAX; @@ -2403,6 +2425,17 @@ tcp_discardcb(struct tcpcb *tp) #ifdef TCP_BLACKBOX tcp_log_tcpcbfini(tp); #endif + if (tp->t_in_pkt) { + struct mbuf *m, *n; + + m = tp->t_in_pkt; + tp->t_in_pkt = tp->t_tail_pkt = NULL; + while (m) { + n = m->m_nextpkt; + m_freem(m); + m = n; + } + } TCPSTATES_DEC(tp->t_state); if (tp->t_fb->tfb_tcp_fb_fini) (*tp->t_fb->tfb_tcp_fb_fini)(tp, 1); @@ -3984,6 +4017,7 @@ tcp_can_enable_pacing(void) shadow_num_connections = number_of_tcp_connections_pacing; return (1); } else { + counter_u64_add(tcp_pacing_failures, 1); return (0); } } @@ -4009,6 +4043,23 @@ tcp_decrement_paced_conn(void) } } +static void +tcp_default_switch_failed(struct tcpcb *tp) +{ + /* + * If a switch fails we only need to + * care about two things: + * a) The inp_flags2 + * and + * b) The timer granularity. + * Timeouts, at least for now, don't use the + * old callout system in the other stacks so + * those are hopefully safe. + */ + tcp_lro_features_off(tptoinpcb(tp)); + tcp_change_time_units(tp, TCP_TMR_GRANULARITY_TICKS); +} + #ifdef TCP_ACCOUNTING int tcp_do_ack_accounting(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, uint32_t tiwin, int mss) From nobody Thu Apr 13 13:33:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py0s22rt3z451y8; Thu, 13 Apr 2023 13:33:26 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Py0s13hRtz3F7R; Thu, 13 Apr 2023 13:33:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id mc7ip87BQjvm1mx4mpAVdf; Thu, 13 Apr 2023 13:33:24 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mx4kplAu6yAOemx4kpcpIf; Thu, 13 Apr 2023 13:33:24 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=643804a4 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dKHAf1wccvYA:10 a=13WrDtVnAAAA:8 a=YxBL1-UpAAAA:8 a=VxmjJ2MpAAAA:8 a=CjxXgO3LAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=ihgffkLAiP3tzcNCCncA:9 a=QEXdDO2ut3YA:10 a=tCI1PRuhg74A:10 a=LyydU4Oes_UA:10 a=qcMfyop8IQhGkljw9-nY:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B5F5CEBF; Thu, 13 Apr 2023 06:33:21 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 873DE42A; Thu, 13 Apr 2023 06:33:21 -0700 (PDT) Date: Thu, 13 Apr 2023 06:33:21 -0700 From: Cy Schubert To: =?ISO-8859-1?Q?Pawe=3F?= Jakub Dawidek Cc: Mark Millard , Mateusz Guzik , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230413063321.60344b1f@cschubert.com> In-Reply-To: References: <20230413071032.18BFF31F@slippy.cwsent.com> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfG/NhU8usWTT6E/Oy5taytMLmD+KXjVD0TFXLPq3b+df0Y/7ACTlNJousOPmmk/XbR+u/jy0TF+uuK6FGlBTbNvrmFGzZYkkuxQGj3RpNvDXfFUyiyds 8RArMpP81K8AlkIsKUtNuXBTNOeCbHqNISKxvawcIqYXyNu05H8r3BtB0NPuTxKCNthzRMPnNu3lL+PeGqROckXnoL4MeKAq2c8W0RVEfaZWAH/BT70WLChg 9ojhyZa6KqCd1cmqrLT3FQr1H5trDaJxbN9KKjJCUcOfvk/pcChU+cqkvcRq/1PGhnPF//Sp0uNvvesM8HLjjHIlxxhv52CXE74WmWGIgoG046x8orIk9g8S lkmqDqdTRavV0cdk+CUzfMVAkhP/IITd7i4aHz6bh/tqsZ6+xts= X-Rspamd-Queue-Id: 4Py0s13hRtz3F7R X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, 13 Apr 2023 19:54:42 +0900 Pawe=C5=82 Jakub Dawidek wrote: > On Apr 13, 2023, at 16:10, Cy Schubert wrote: > >=20 > > =EF=BB=BFIn message <20230413070426.8A54F25A@slippy.cwsent.com>, Cy Sch= ubert writes: > > In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert wri= tes: > >> In message , Mark Mill= ard > >>> write > >>> s: > >>> [This just puts my prior reply's material into Cy's > >>>> adjusted resend of the original. The To/Cc should > >>>> be coomplete this time.] > >>>>=20 > >>>> On Apr 12, 2023, at 22:52, Cy Schubert = =3D > >>>> wrote: > >>>>=20 > >>>> In message , Mark =3D > >>>>> Millard=3D20 > >>>> write > >>>>> s: > >>>>> From: Charlie Li wrote on > >>>>>> Date: Wed, 12 Apr 2023 20:11:16 UTC : > >>>>>> =3D20 > >>>>>> Charlie Li wrote: > >>>>>>> Mateusz Guzik wrote: > >>>>>>>> can you please test poudriere with > >>>>>>>>> https://github.com/openzfs/zfs/pull/14739/files > >>>>>>>>> =3D20 > >>>>>>>>> After applying, on the md(4)-backed pool regardless of =3D3D > >>>>>>>> block_cloning,=3D3D20 > >>>>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. =3D > >>>>>>>> Will=3D3D20=3D3D > >>>> =3D20 > >>>>>> report back on poudriere results (no block_cloning). > >>>>>>>> =3D3D20 > >>>>>>>> As for poudriere, build failures are still rolling in. These are= =3D > >>>>>>> (and=3D3D20=3D3D > >>>> =3D20 > >>>>>> have been) entirely random on every run. Some examples from this = =3D > >>>>>>> run: > >>>> =3D3D20 > >>>>>>> lang/php81: > >>>>>>> - post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development=3D= 3D20 > >>>>>>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D3D > >>>>>>> ${STAGEDIR}/${PREFIX}/etc > >>>>>> - consumers fail to build due to corrupted php.conf packaged > >>>>>>> =3D3D20 > >>>>>>> devel/ninja: > >>>>>>> - phase: stage > >>>>>>> - install -s -m 555=3D3D20 > >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D3D20 > >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > >>>>>>> - consumers fail to build due to corrupted bin/ninja packaged > >>>>>>> =3D3D20 > >>>>>>> devel/netsurf-buildsystem: > >>>>>>> - phase: stage > >>>>>>> - mkdir -p=3D3D20 > >>>>>>> =3D3D > >>>>>>> =3D > >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/= share/n > >>>> e=3D > >> =3D3D > >>>> tsurf-buildsystem/makefiles=3D3D20 > >>>>>> =3D3D > >>>>>>> =3D > >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/= share/n > >>>> e=3D > >> =3D3D > >>>> tsurf-buildsystem/testtools > >>>>>> for M in Makefile.top Makefile.tools Makefile.subdir =3D3D > >>>>>>> Makefile.pkgconfig=3D3D20 > >>>>>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do \ > >>>>>>> cp makefiles/$M=3D3D20 > >>>>>>> =3D3D > >>>>>>> =3D > >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local/= share/n > >>>> e=3D > >> =3D3D > >>>> tsurf-buildsystem/makefiles/;=3D3D20 > >>>>>> \ > >>>>>>> done > >>>>>>> - graphics/libnsgif fails to build due to NUL characters in=3D3D20 > >>>>>>> Makefile.{clang,subdir}, causing nothing to link > >>>>>>> =3D20 > >>>>>> Summary: I have problems building ports into packages > >>>>>> via poudriere-devel use despite being fully updated/patched > >>>>>> (as of when I started the experiment), never having enabled > >>>>>> block_cloning ( still using openzfs-2.1-freebsd ). > >>>>>> =3D20 > >>>>>> In other words, I can confirm other reports that have > >>>>>> been made. > >>>>>> =3D20 > >>>>>> The details follow. > >>>>>> =3D20 > >>>>>> =3D20 > >>>>>> [Written as I was working on setting up for the experiments > >>>>>> and then executing those experiments, adjusting as I went > >>>>>> along.] > >>>>>> =3D20 > >>>>>> I've run my own tests in a context that has never had the > >>>>>> zpool upgrade and that jump from before the openzfs import to > >>>>>> after the existing commits for trying to fix openzfs on > >>>>>> FreeBSD. I report on the sequence of activities getting to > >>>>>> the point of testing as well. > >>>>>> =3D20 > >>>>>> By personal policy I keep my (non-temporary) pool's compatible > >>>>>> with what the most recent ??.?-RELEASE supports, using > >>>>>> openzfs-2.1-freebsd for now. The pools involved below have > >>>>>> never had a zpool upgrade from where they started. (I've no > >>>>>> pools that have ever had a zpool upgrade.) > >>>>>> =3D20 > >>>>>> (Temporary pools are rare for me, such as this investigation. > >>>>>> But I'm not testing block_cloning or anything new this time.) > >>>>>> =3D20 > >>>>>> I'll note that I use zfs for bectl, not for redundancy. So > >>>>>> my evidence is more limited in that respect. > >>>>>> =3D20 > >>>>>> The activities were done on a HoneyComb (16 Cortex-A72 cores). > >>>>>> The system has and supports ECC RAM, 64 GiBytes of RAM are > >>>>>> present. > >>>>>> =3D20 > >>>>>> I started by duplicating my normal zfs environment to an > >>>>>> external USB3 NVMe drive and adjusting the host name and such > >>>>>> to produce the below. (Non-debug, although I do not strip > >>>>>> symbols.) : > >>>>>> =3D20 > >>>>>> # uname -apKU > >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D3D > >>>>>> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 =C2= =A0=C2=A0=C2=A0=C2=A0=3D3D > >>>>>> =3D > >>>>>> root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-= src/arm > >>>> 6=3D > >> =3D3D > >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > >>>>>> =3D20 > >>>>>> I then did: git fetch, stash push ., merge --ff-only, stash apply = . : > >>>>>> my normal procedure. I then also applied the patch from: > >>>>>> =3D20 > >>>>>> https://github.com/openzfs/zfs/pull/14739/files > >>>>>> =3D20 > >>>>>> Then I did: buildworld buildkernel, install them, and rebooted. > >>>>>> =3D20 > >>>>>> The result was: > >>>>>> =3D20 > >>>>>> # uname -apKU > >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D3D > >>>>>> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 =C2= =A0=C2=A0=C2=A0=C2=A0=3D3D > >>>>>> =3D > >>>>>> root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-= src/arm > >>>> 6=3D > >> =3D3D > >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 > >>>>>> =3D20 > >>>>>> The later poudriere-devel based build of packages from ports is > >>>>>> based on: > >>>>>> =3D20 > >>>>>> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > >>>>>> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D3D > >>>>>> devel/freebsd-gcc12: Bump to 12.2.0. > >>>>>> Author: =C2=A0=C2=A0=C2=A0=C2=A0John Baldwin > >>>>>> Commit: =C2=A0=C2=A0=C2=A0=C2=A0John Baldwin > >>>>>> CommitDate: 2023-03-25 00:06:40 +0000 > >>>>>> branch: main > >>>>>> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > >>>>>> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > >>>>>> n613214 (--first-parent --count for merge-base) > >>>>>> =3D20 > >>>>>> poudriere attempted to build 476 packages, starting > >>>>>> with pkg (in order to build the 56 that I explicitly > >>>>>> indicate that I want). It is my normal set of ports. > >>>>>> The form of building is biased to allowing a high > >>>>>> load average compared to the number of hardware > >>>>>> threads (same as cores here): each builder is allowed > >>>>>> to use the full count of hardware threads. The build > >>>>>> =E2=82=AC=C3=8FL=E2=82=AC=E2=82=AC=E2=82=AC=E2=82=AC=E2=80=B9=15 >= > >> used USE_TMPFS=3D3D3D"data" instead of the USE_TMPFS=3D3D3Dall I > >> normally use on the build machine involved. > >>>>>> =3D20 > >>>>>> And it produced some random errors during the attempted > >>>>>> builds. A type of example that is easy to interpret > >>>>>> without further exploration is: > >>>>>> =3D20 > >>>>>> pkg_resources.extern.packaging.requirements.InvalidRequirement: Pa= rse > >>>>>> =3D > >> =3D3D > >>>> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected W:(0-9A-Za-z) > >>>>>> =C2=A0=C2=A0=C2=A0=C2=A00 > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0da0p8 =C2=A0=C2=A0=C2= =A0=C2=A0ONLINE =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A00 =C2=A0=C2=A0=C2=A0=C2= =A00 =C2=A0=C2=A0=C2=A0=C2=A00 > >>>>>> =3D20 > >>>>>> errors: No known data errors > >>>>>> =3D20 > >>>>>> =3D20 > >>>>>> =3D3D3D=3D3D3D=3D3D3D > >>>>>> Mark Millard > >>>>>> marklmi at yahoo.com > >>>>>> =3D20 > >>>>> =3D20 > >>>>> Let's try this again. Claws-mail didn't include the list address in= =3D > >>>>> the=3D20 > >>>> header. Trying to reply, again, using exmh instead. > >>>>> =3D20 > >>>>> =3D20 > >>>>> Did your pools suffer the EXDEV problem? The EXDEV also corrupted = =3D > >>>>> files. > >>>>=20 > >>>> As I reported, this was a jump from before the import > >>>> to as things are tonight (here). So: NO, unless the > >>>> existing code as of tonight still has the EXDEV problem! > >>>>=20 > >>>> Prior to this experiment I'd not progressed any media > >>>> beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > >>>>=20 > >>>> I think, without sufficient investigation we risk jumping to > >>>>> conclusions. I've taken an extremely cautious approach, rolling back > >>>>> snapshots (as much as possible, i.e. poudriere datasets) when EXDEV > >>>>> corruption was encountered. > >>>>>=20 > >>>> Again: nothing between main-n261544-cee09bda03c8-dirty and > >>>> main-n262122-2ef2c26f3f13-dirty was involved at any stage. > >>>>=20 > >>>> =3D20 > >>>>> I did not rollback any snapshots in my MH mail directory. Rolling b= ack > >>>>> snapshots of my MH maildir would result in loss of email. I have to > >>>>> live with that corruption. Corrupted files in my outgoing sent email > >>>>> directory remain: > >>>>> =3D20 > >>>>> slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=3D20 > >>>>> 53 > >>>>> slippy$=3D20 > >>>>> =3D20 > >>>>> There are 53 corrupted files in my note log of 9913 emails. Those = =3D > >>>>> files > >>>> will never be fixed. They were corrupted by the EXDEV bug. Any new Z= FS > >>>>> or ZFS patches cannot retroactively remove the corruption from those > >>>>> files. > >>>>> =3D20 > >>>>> But my poudriere files, because the snapshots were rolled back, were > >>>>> "repaired" by the rolled back snapshots. > >>>>> =3D20 > >>>>> I'm not convinced that there is presently active corruption since > >>>>> the problem has been fixed. I am convinced that whatever corruption > >>>>> that was written at the time will remain forever or until those fil= es > >>>>> are deleted or replaced -- just like my email files written to disk= at > >>>>> the time. > >>>>>=20 > >>>> My test results and procedure just do not fit your conclusion > >>>> that things are okay now if block_clonging is completely avoided. > >>>>=20 > >>> Admitting I'm wrong: sending copies of my last reply to you back to m= yself, > >>>=20 > >> again and again, three times, I've managed to reproduce the corruption= you > >>> are talking about. > >>>=20 > >> This email itself was also corrupted. Below is what was sent. Good thi= ng > >> multiple copies are saved by exmh. > >>=20 > >> Admitting I'm wrong: sending copies of my last reply to you back to my= self, > >> again and again, three times, I've managed to reproduce the corruption= you > >> are talking about. > >>=20 > > This email itself was also corrupted. Below is what was sent. Good thing > > multiple copies are saved by exmh. > >=20 > > Admitting I'm wrong: sending copies of my last reply to you back to mys= elf, > > again and again, three times, I've managed to reproduce the corruption = you > > are talking about. > >=20 > > From my previous email to you. > >=20 > > header. Trying to reply:::::::::, again, using exmh instead. > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0^^^^^^^^^ > > Here it is, nine additional bytes of garbage. I've replaced the garbage > > with colons because nulls mess up a lot of things, including cut&paste. > >=20 > > In another instance about 500 bytes were removed. I can reproduce the > > corruption at will now. > >=20 > > The EXDEV patch is applied. Block_cloning is disabled. > >=20 > > Somehow nulls and other garbage are inserted in the middle of emails af= ter > > the ZFS upgrade. > >=20 > Can you please try this patch: >=20 > github.com The patch was applied yesterday at noon (PDT). >=20 >=20 >=20 > Unfortunately I don=E2=80=99t see how this can happen with block cloning = disabled. It does and it's reproducible. >=20 > --=C2=A0 > Pawe=C5=82 Jakub Dawidek >=20 --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=3D0 From nobody Thu Apr 13 13:48:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py1BN3wZnz453CJ; Thu, 13 Apr 2023 13:48:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Py1BN1xkRz3v3C; Thu, 13 Apr 2023 13:48:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x32c.google.com with SMTP id x22-20020a9d6296000000b006a42c37ddcdso1844306otk.1; Thu, 13 Apr 2023 06:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681393707; x=1683985707; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=E66lyzydUgVBgSAemf9jaZxb1uimf/I7PLpXzx95GKE=; b=Lwjac2ujwXnpF/DHxtPnuatf8+CaWAtpth7cLx4XMNgYBY1ZyL2nG8INKMQNXpT+TU DKFFCTCDafliFVPpVDxynMarSY7SebRD+THnEdSWuLxmtV0RaEvJQ4zi3sq+wQ5qSSza CBBJC7C/o+HKGSOqGO8UNY1MZKo0VADcWfIlIDVXnXZluKI2H18XD8Tr85xeY58UwoWQ AvXpPakjWFezn6YzII0agLAiJ+euVeZmxRskLmk9GIBxtG41JSuCarBjw0pX9ilTPESO yoEI4t04AGJgcgVC9MHwy+7wjLMNCwaa+MnxDvzL/PoEDZpNxQHGnT8g6gcKIT1qhPuU 8Q+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681393707; x=1683985707; h=content-transfer-encoding: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=E66lyzydUgVBgSAemf9jaZxb1uimf/I7PLpXzx95GKE=; b=HWLT1DxUc8YzZBEtbf8DCMRTEAvcFVvj+kBxirC5VzL79jiNwfg55jff97SlsNKfwY m35uajyJY4hn2p6MrdE/GtNrstJngCbABRk6kHWpNdXRp7RUDXqd29NVsvTUFwF+TBxj PamGUmLVZrUsXute4FoFi7Lt+Anj0DTwC4WXgrDHId+3WkzF4mOz2emU1Jswa/UqMw6Y GqQxv4aV1sEc8W9y+oRy5nlOfxSd0+frgbeghSRD25mNne4puOgBpiKXet6ASSjNWOye w3Ah/xY+lP6/0C3e75rHSofZXnhxWieQRNREo6ZN3Y76DiPBldy8MTs7Y8XQpCcuFgJS sk5A== X-Gm-Message-State: AAQBX9dike+Xqwt1JKk/KjWPbkdrmC9XpS80A830LsCsZ5JlgUcY9CaG bilKerNObdocdIsiU/skv9rCo8bhCCIf0CieFpw= X-Google-Smtp-Source: AKy350ZQeJf0wGOecyyrl9c4U7h1uTIBLhiqZYX3nqqCrAS0G5TrKGiELi8fTkYKmtBt7RsZrws8TIB/claih0r73Z0= X-Received: by 2002:a05:6830:2093:b0:6a1:cbc6:f1b3 with SMTP id y19-20020a056830209300b006a1cbc6f1b3mr616405otq.2.1681393707011; Thu, 13 Apr 2023 06:48:27 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:74cf:0:b0:49c:b071:b1e3 with HTTP; Thu, 13 Apr 2023 06:48:26 -0700 (PDT) In-Reply-To: <20230413063321.60344b1f@cschubert.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> From: Mateusz Guzik Date: Thu, 13 Apr 2023 15:48:26 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Cy Schubert Cc: "Pawe? Jakub Dawidek" , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Py1BN1xkRz3v3C X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/13/23, Cy Schubert wrote: > On Thu, 13 Apr 2023 19:54:42 +0900 > Pawe=C5=82 Jakub Dawidek wrote: > >> On Apr 13, 2023, at 16:10, Cy Schubert wrote= : >> > >> > =EF=BB=BFIn message <20230413070426.8A54F25A@slippy.cwsent.com>, Cy Sc= hubert >> > writes: >> > In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert >> > writes: >> >> In message , Mark >> >> Millard >> >>> write >> >>> s: >> >>> [This just puts my prior reply's material into Cy's >> >>>> adjusted resend of the original. The To/Cc should >> >>>> be coomplete this time.] >> >>>> >> >>>> On Apr 12, 2023, at 22:52, Cy Schubert = =3D >> >>>> wrote: >> >>>> >> >>>> In message , Mark = =3D >> >>>>> Millard=3D20 >> >>>> write >> >>>>> s: >> >>>>> From: Charlie Li wrote on >> >>>>>> Date: Wed, 12 Apr 2023 20:11:16 UTC : >> >>>>>> =3D20 >> >>>>>> Charlie Li wrote: >> >>>>>>> Mateusz Guzik wrote: >> >>>>>>>> can you please test poudriere with >> >>>>>>>>> https://github.com/openzfs/zfs/pull/14739/files >> >>>>>>>>> =3D20 >> >>>>>>>>> After applying, on the md(4)-backed pool regardless of =3D3D >> >>>>>>>> block_cloning,=3D3D20 >> >>>>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = =3D >> >>>>>>>> Will=3D3D20=3D3D >> >>>> =3D20 >> >>>>>> report back on poudriere results (no block_cloning). >> >>>>>>>> =3D3D20 >> >>>>>>>> As for poudriere, build failures are still rolling in. These ar= e >> >>>>>>>> =3D >> >>>>>>> (and=3D3D20=3D3D >> >>>> =3D20 >> >>>>>> have been) entirely random on every run. Some examples from this = =3D >> >>>>>>> run: >> >>>> =3D3D20 >> >>>>>>> lang/php81: >> >>>>>>> - post-install: @${INSTALL_DATA} >> >>>>>>> ${WRKSRC}/php.ini-development=3D3D20 >> >>>>>>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D3D >> >>>>>>> ${STAGEDIR}/${PREFIX}/etc >> >>>>>> - consumers fail to build due to corrupted php.conf packaged >> >>>>>>> =3D3D20 >> >>>>>>> devel/ninja: >> >>>>>>> - phase: stage >> >>>>>>> - install -s -m 555=3D3D20 >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D3D20 >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin >> >>>>>>> - consumers fail to build due to corrupted bin/ninja packaged >> >>>>>>> =3D3D20 >> >>>>>>> devel/netsurf-buildsystem: >> >>>>>>> - phase: stage >> >>>>>>> - mkdir -p=3D3D20 >> >>>>>>> =3D3D >> >>>>>>> =3D >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= /share/n >> >>>> e=3D >> >> =3D3D >> >>>> tsurf-buildsystem/makefiles=3D3D20 >> >>>>>> =3D3D >> >>>>>>> =3D >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= /share/n >> >>>> e=3D >> >> =3D3D >> >>>> tsurf-buildsystem/testtools >> >>>>>> for M in Makefile.top Makefile.tools Makefile.subdir =3D3D >> >>>>>>> Makefile.pkgconfig=3D3D20 >> >>>>>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do >> >>>>>> \ >> >>>>>>> cp makefiles/$M=3D3D20 >> >>>>>>> =3D3D >> >>>>>>> =3D >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= /share/n >> >>>> e=3D >> >> =3D3D >> >>>> tsurf-buildsystem/makefiles/;=3D3D20 >> >>>>>> \ >> >>>>>>> done >> >>>>>>> - graphics/libnsgif fails to build due to NUL characters in=3D3D= 20 >> >>>>>>> Makefile.{clang,subdir}, causing nothing to link >> >>>>>>> =3D20 >> >>>>>> Summary: I have problems building ports into packages >> >>>>>> via poudriere-devel use despite being fully updated/patched >> >>>>>> (as of when I started the experiment), never having enabled >> >>>>>> block_cloning ( still using openzfs-2.1-freebsd ). >> >>>>>> =3D20 >> >>>>>> In other words, I can confirm other reports that have >> >>>>>> been made. >> >>>>>> =3D20 >> >>>>>> The details follow. >> >>>>>> =3D20 >> >>>>>> =3D20 >> >>>>>> [Written as I was working on setting up for the experiments >> >>>>>> and then executing those experiments, adjusting as I went >> >>>>>> along.] >> >>>>>> =3D20 >> >>>>>> I've run my own tests in a context that has never had the >> >>>>>> zpool upgrade and that jump from before the openzfs import to >> >>>>>> after the existing commits for trying to fix openzfs on >> >>>>>> FreeBSD. I report on the sequence of activities getting to >> >>>>>> the point of testing as well. >> >>>>>> =3D20 >> >>>>>> By personal policy I keep my (non-temporary) pool's compatible >> >>>>>> with what the most recent ??.?-RELEASE supports, using >> >>>>>> openzfs-2.1-freebsd for now. The pools involved below have >> >>>>>> never had a zpool upgrade from where they started. (I've no >> >>>>>> pools that have ever had a zpool upgrade.) >> >>>>>> =3D20 >> >>>>>> (Temporary pools are rare for me, such as this investigation. >> >>>>>> But I'm not testing block_cloning or anything new this time.) >> >>>>>> =3D20 >> >>>>>> I'll note that I use zfs for bectl, not for redundancy. So >> >>>>>> my evidence is more limited in that respect. >> >>>>>> =3D20 >> >>>>>> The activities were done on a HoneyComb (16 Cortex-A72 cores). >> >>>>>> The system has and supports ECC RAM, 64 GiBytes of RAM are >> >>>>>> present. >> >>>>>> =3D20 >> >>>>>> I started by duplicating my normal zfs environment to an >> >>>>>> external USB3 NVMe drive and adjusting the host name and such >> >>>>>> to produce the below. (Non-debug, although I do not strip >> >>>>>> symbols.) : >> >>>>>> =3D20 >> >>>>>> # uname -apKU >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D3D >> >>>>>> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 >> >>>>>> =3D3D >> >>>>>> =3D >> >>>>>> root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main= -src/arm >> >>>> 6=3D >> >> =3D3D >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 >> >>>>>> =3D20 >> >>>>>> I then did: git fetch, stash push ., merge --ff-only, stash apply= . >> >>>>>> : >> >>>>>> my normal procedure. I then also applied the patch from: >> >>>>>> =3D20 >> >>>>>> https://github.com/openzfs/zfs/pull/14739/files >> >>>>>> =3D20 >> >>>>>> Then I did: buildworld buildkernel, install them, and rebooted. >> >>>>>> =3D20 >> >>>>>> The result was: >> >>>>>> =3D20 >> >>>>>> # uname -apKU >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D3D >> >>>>>> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 >> >>>>>> =3D3D >> >>>>>> =3D >> >>>>>> root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main= -src/arm >> >>>> 6=3D >> >> =3D3D >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 >> >>>>>> =3D20 >> >>>>>> The later poudriere-devel based build of packages from ports is >> >>>>>> based on: >> >>>>>> =3D20 >> >>>>>> # ~/fbsd-based-on-what-commit.sh -C /usr/ports >> >>>>>> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D3D >> >>>>>> devel/freebsd-gcc12: Bump to 12.2.0. >> >>>>>> Author: John Baldwin >> >>>>>> Commit: John Baldwin >> >>>>>> CommitDate: 2023-03-25 00:06:40 +0000 >> >>>>>> branch: main >> >>>>>> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 >> >>>>>> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 >> >>>>>> n613214 (--first-parent --count for merge-base) >> >>>>>> =3D20 >> >>>>>> poudriere attempted to build 476 packages, starting >> >>>>>> with pkg (in order to build the 56 that I explicitly >> >>>>>> indicate that I want). It is my normal set of ports. >> >>>>>> The form of building is biased to allowing a high >> >>>>>> load average compared to the number of hardware >> >>>>>> threads (same as cores here): each builder is allowed >> >>>>>> to use the full count of hardware threads. The build >> >>>>>> =E2=82=AC=C3=8FL=E2=82=AC=E2=82=AC=E2=82=AC=E2=82=AC=E2=80=B9 > = > >> used USE_TMPFS=3D3D3D"data" instead of the >> >>>>>> USE_TMPFS=3D3D3Dall I >> >> normally use on the build machine involved. >> >>>>>> =3D20 >> >>>>>> And it produced some random errors during the attempted >> >>>>>> builds. A type of example that is easy to interpret >> >>>>>> without further exploration is: >> >>>>>> =3D20 >> >>>>>> pkg_resources.extern.packaging.requirements.InvalidRequirement: >> >>>>>> Parse >> >>>>>> =3D >> >> =3D3D >> >>>> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected >> >>>> W:(0-9A-Za-z) >> >>>>>> 0 >> >> da0p8 ONLINE 0 0 0 >> >>>>>> =3D20 >> >>>>>> errors: No known data errors >> >>>>>> =3D20 >> >>>>>> =3D20 >> >>>>>> =3D3D3D=3D3D3D=3D3D3D >> >>>>>> Mark Millard >> >>>>>> marklmi at yahoo.com >> >>>>>> =3D20 >> >>>>> =3D20 >> >>>>> Let's try this again. Claws-mail didn't include the list address i= n >> >>>>> =3D >> >>>>> the=3D20 >> >>>> header. Trying to reply, again, using exmh instead. >> >>>>> =3D20 >> >>>>> =3D20 >> >>>>> Did your pools suffer the EXDEV problem? The EXDEV also corrupted = =3D >> >>>>> files. >> >>>> >> >>>> As I reported, this was a jump from before the import >> >>>> to as things are tonight (here). So: NO, unless the >> >>>> existing code as of tonight still has the EXDEV problem! >> >>>> >> >>>> Prior to this experiment I'd not progressed any media >> >>>> beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. >> >>>> >> >>>> I think, without sufficient investigation we risk jumping to >> >>>>> conclusions. I've taken an extremely cautious approach, rolling >> >>>>> back >> >>>>> snapshots (as much as possible, i.e. poudriere datasets) when EXDE= V >> >>>>> corruption was encountered. >> >>>>> >> >>>> Again: nothing between main-n261544-cee09bda03c8-dirty and >> >>>> main-n262122-2ef2c26f3f13-dirty was involved at any stage. >> >>>> >> >>>> =3D20 >> >>>>> I did not rollback any snapshots in my MH mail directory. Rolling >> >>>>> back >> >>>>> snapshots of my MH maildir would result in loss of email. I have t= o >> >>>>> live with that corruption. Corrupted files in my outgoing sent >> >>>>> email >> >>>>> directory remain: >> >>>>> =3D20 >> >>>>> slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=3D20 >> >>>>> 53 >> >>>>> slippy$=3D20 >> >>>>> =3D20 >> >>>>> There are 53 corrupted files in my note log of 9913 emails. Those = =3D >> >>>>> files >> >>>> will never be fixed. They were corrupted by the EXDEV bug. Any new >> >>>> ZFS >> >>>>> or ZFS patches cannot retroactively remove the corruption from >> >>>>> those >> >>>>> files. >> >>>>> =3D20 >> >>>>> But my poudriere files, because the snapshots were rolled back, >> >>>>> were >> >>>>> "repaired" by the rolled back snapshots. >> >>>>> =3D20 >> >>>>> I'm not convinced that there is presently active corruption since >> >>>>> the problem has been fixed. I am convinced that whatever corruptio= n >> >>>>> that was written at the time will remain forever or until those >> >>>>> files >> >>>>> are deleted or replaced -- just like my email files written to dis= k >> >>>>> at >> >>>>> the time. >> >>>>> >> >>>> My test results and procedure just do not fit your conclusion >> >>>> that things are okay now if block_clonging is completely avoided. >> >>>> >> >>> Admitting I'm wrong: sending copies of my last reply to you back to >> >>> myself, >> >>> >> >> again and again, three times, I've managed to reproduce the corruptio= n >> >> you >> >>> are talking about. >> >>> >> >> This email itself was also corrupted. Below is what was sent. Good >> >> thing >> >> multiple copies are saved by exmh. >> >> >> >> Admitting I'm wrong: sending copies of my last reply to you back to >> >> myself, >> >> again and again, three times, I've managed to reproduce the corruptio= n >> >> you >> >> are talking about. >> >> >> > This email itself was also corrupted. Below is what was sent. Good >> > thing >> > multiple copies are saved by exmh. >> > >> > Admitting I'm wrong: sending copies of my last reply to you back to >> > myself, >> > again and again, three times, I've managed to reproduce the corruption >> > you >> > are talking about. >> > >> > From my previous email to you. >> > >> > header. Trying to reply:::::::::, again, using exmh instead. >> > ^^^^^^^^^ >> > Here it is, nine additional bytes of garbage. I've replaced the garbag= e >> > with colons because nulls mess up a lot of things, including cut&paste= . >> > >> > In another instance about 500 bytes were removed. I can reproduce the >> > corruption at will now. >> > >> > The EXDEV patch is applied. Block_cloning is disabled. >> > >> > Somehow nulls and other garbage are inserted in the middle of emails >> > after >> > the ZFS upgrade. >> > >> Can you please try this patch: >> >> github.com > > The patch was applied yesterday at noon (PDT). > >> >> >> >> Unfortunately I don=E2=80=99t see how this can happen with block cloning >> disabled. > > It does and it's reproducible. > There is corruption with the recent import, with the https://github.com/openzfs/zfs/pull/14739/files patch applied and block cloning disabled on the pool. There is no corruption with top of main with zfs merge reverted altogether. Which commit results in said corruption remains to be seen, a variant of the tree with just block cloning support reverted just for testing purposes is about to be evaluated. --=20 Mateusz Guzik From nobody Thu Apr 13 13:56:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py1Mq3Lmcz453l3; Thu, 13 Apr 2023 13:56:39 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Py1Mq1D7Mz4CSq; Thu, 13 Apr 2023 13:56:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id mwNcp9lNbjvm1mxRGpAZDG; Thu, 13 Apr 2023 13:56:38 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id mxREpKrD7HFsOmxRFpTjry; Thu, 13 Apr 2023 13:56:38 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64380a16 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=YxBL1-UpAAAA:8 a=13WrDtVnAAAA:8 a=VxmjJ2MpAAAA:8 a=CjxXgO3LAAAA:8 a=kDZLfgLDAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=pGLkceISAAAA:8 a=EkcXrb_YAAAA:8 a=RS6mBWU6Sx5l2QwkfgEA:9 a=CjuIK1q_8ugA:10 a=UJ0tAi3fqDAA:10 a=tCI1PRuhg74A:10 a=LyydU4Oes_UA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=qcMfyop8IQhGkljw9-nY:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Aez1uqWRNYMWVBb44gMB:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id AE6CCEE1; Thu, 13 Apr 2023 06:56:35 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 6B62F354; Thu, 13 Apr 2023 06:56:35 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mateusz Guzik cc: Cy Schubert , "Pawe? Jakub Dawidek" , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> Comments: In-reply-to Mateusz Guzik message dated "Thu, 13 Apr 2023 15:48:26 +0200." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 13 Apr 2023 06:56:35 -0700 Message-Id: <20230413135635.6B62F354@slippy.cwsent.com> X-CMAE-Envelope: MS4xfN3etariwi3B9xU2Y4dzcEvxS8pHXGrI7IJMdsJjVogiK2nKIdP2Nld2h9Y+W4l9li5UM7+JJ+jpxeBMxy2GE9w7cUXM5oyX2AF4uH+vpR8TUHoPQhuS 6OlAcyWHdpaCpnRaKyJCrk3WCkBqzPzTnqDB3Bjovdhc7V9gDa2331Ih5bGrWHnMJnFQuSeaaoGu9HlRyaOmoiy1oLzvUNYnljVB/feztTraTwYg2rb2G5qP lXkIPiZV9ZEIhPpC41ZB41gnaVKGtX+ys5OssL5bNO6xnZXzQzSH7Uwb9r5kiguv86YukUegrAc7oUcqjPyBr0qDXgG3bPgjk3bKETr0DH1ukhsxrC13kzO5 zeShxyvL3lSNQOSccdyhKZPp2H2ZLbuNOT4C5kl1f0h3foHAk0s= X-Rspamd-Queue-Id: 4Py1Mq1D7Mz4CSq X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Mateusz Guzik writes: > On 4/13/23, Cy Schubert wrote: > > On Thu, 13 Apr 2023 19:54:42 +0900 > > Pawe=C5=82 Jakub Dawidek wrote: > > > >> On Apr 13, 2023, at 16:10, Cy Schubert wrote= > : > >> > > >> > =EF=BB=BFIn message <20230413070426.8A54F25A@slippy.cwsent.com>, Cy Sc= > hubert > >> > writes: > >> > In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert > >> > writes: > >> >> In message , Mark > >> >> Millard > >> >>> write > >> >>> s: > >> >>> [This just puts my prior reply's material into Cy's > >> >>>> adjusted resend of the original. The To/Cc should > >> >>>> be coomplete this time.] > >> >>>> > >> >>>> On Apr 12, 2023, at 22:52, Cy Schubert = > =3D > >> >>>> wrote: > >> >>>> > >> >>>> In message , Mark = > =3D > >> >>>>> Millard=3D20 > >> >>>> write > >> >>>>> s: > >> >>>>> From: Charlie Li wrote on > >> >>>>>> Date: Wed, 12 Apr 2023 20:11:16 UTC : > >> >>>>>> =3D20 > >> >>>>>> Charlie Li wrote: > >> >>>>>>> Mateusz Guzik wrote: > >> >>>>>>>> can you please test poudriere with > >> >>>>>>>>> https://github.com/openzfs/zfs/pull/14739/files > >> >>>>>>>>> =3D20 > >> >>>>>>>>> After applying, on the md(4)-backed pool regardless of =3D3D > >> >>>>>>>> block_cloning,=3D3D20 > >> >>>>>> the cy@ `cp -R` test reports no differing (ie corrupted) files. = > =3D > >> >>>>>>>> Will=3D3D20=3D3D > >> >>>> =3D20 > >> >>>>>> report back on poudriere results (no block_cloning). > >> >>>>>>>> =3D3D20 > >> >>>>>>>> As for poudriere, build failures are still rolling in. These ar= > e > >> >>>>>>>> =3D > >> >>>>>>> (and=3D3D20=3D3D > >> >>>> =3D20 > >> >>>>>> have been) entirely random on every run. Some examples from this = > =3D > >> >>>>>>> run: > >> >>>> =3D3D20 > >> >>>>>>> lang/php81: > >> >>>>>>> - post-install: @${INSTALL_DATA} > >> >>>>>>> ${WRKSRC}/php.ini-development=3D3D20 > >> >>>>>>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D3D > >> >>>>>>> ${STAGEDIR}/${PREFIX}/etc > >> >>>>>> - consumers fail to build due to corrupted php.conf packaged > >> >>>>>>> =3D3D20 > >> >>>>>>> devel/ninja: > >> >>>>>>> - phase: stage > >> >>>>>>> - install -s -m 555=3D3D20 > >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D3D20 > >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > >> >>>>>>> - consumers fail to build due to corrupted bin/ninja packaged > >> >>>>>>> =3D3D20 > >> >>>>>>> devel/netsurf-buildsystem: > >> >>>>>>> - phase: stage > >> >>>>>>> - mkdir -p=3D3D20 > >> >>>>>>> =3D3D > >> >>>>>>> =3D > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= > /share/n > >> >>>> e=3D > >> >> =3D3D > >> >>>> tsurf-buildsystem/makefiles=3D3D20 > >> >>>>>> =3D3D > >> >>>>>>> =3D > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= > /share/n > >> >>>> e=3D > >> >> =3D3D > >> >>>> tsurf-buildsystem/testtools > >> >>>>>> for M in Makefile.top Makefile.tools Makefile.subdir =3D3D > >> >>>>>>> Makefile.pkgconfig=3D3D20 > >> >>>>>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64; do > >> >>>>>> \ > >> >>>>>>> cp makefiles/$M=3D3D20 > >> >>>>>>> =3D3D > >> >>>>>>> =3D > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/local= > /share/n > >> >>>> e=3D > >> >> =3D3D > >> >>>> tsurf-buildsystem/makefiles/;=3D3D20 > >> >>>>>> \ > >> >>>>>>> done > >> >>>>>>> - graphics/libnsgif fails to build due to NUL characters in=3D3D= > 20 > >> >>>>>>> Makefile.{clang,subdir}, causing nothing to link > >> >>>>>>> =3D20 > >> >>>>>> Summary: I have problems building ports into packages > >> >>>>>> via poudriere-devel use despite being fully updated/patched > >> >>>>>> (as of when I started the experiment), never having enabled > >> >>>>>> block_cloning ( still using openzfs-2.1-freebsd ). > >> >>>>>> =3D20 > >> >>>>>> In other words, I can confirm other reports that have > >> >>>>>> been made. > >> >>>>>> =3D20 > >> >>>>>> The details follow. > >> >>>>>> =3D20 > >> >>>>>> =3D20 > >> >>>>>> [Written as I was working on setting up for the experiments > >> >>>>>> and then executing those experiments, adjusting as I went > >> >>>>>> along.] > >> >>>>>> =3D20 > >> >>>>>> I've run my own tests in a context that has never had the > >> >>>>>> zpool upgrade and that jump from before the openzfs import to > >> >>>>>> after the existing commits for trying to fix openzfs on > >> >>>>>> FreeBSD. I report on the sequence of activities getting to > >> >>>>>> the point of testing as well. > >> >>>>>> =3D20 > >> >>>>>> By personal policy I keep my (non-temporary) pool's compatible > >> >>>>>> with what the most recent ??.?-RELEASE supports, using > >> >>>>>> openzfs-2.1-freebsd for now. The pools involved below have > >> >>>>>> never had a zpool upgrade from where they started. (I've no > >> >>>>>> pools that have ever had a zpool upgrade.) > >> >>>>>> =3D20 > >> >>>>>> (Temporary pools are rare for me, such as this investigation. > >> >>>>>> But I'm not testing block_cloning or anything new this time.) > >> >>>>>> =3D20 > >> >>>>>> I'll note that I use zfs for bectl, not for redundancy. So > >> >>>>>> my evidence is more limited in that respect. > >> >>>>>> =3D20 > >> >>>>>> The activities were done on a HoneyComb (16 Cortex-A72 cores). > >> >>>>>> The system has and supports ECC RAM, 64 GiBytes of RAM are > >> >>>>>> present. > >> >>>>>> =3D20 > >> >>>>>> I started by duplicating my normal zfs environment to an > >> >>>>>> external USB3 NVMe drive and adjusting the host name and such > >> >>>>>> to produce the below. (Non-debug, although I do not strip > >> >>>>>> symbols.) : > >> >>>>>> =3D20 > >> >>>>>> # uname -apKU > >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 =3D3D > >> >>>>>> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 > >> >>>>>> =3D3D > >> >>>>>> =3D > >> >>>>>> root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main= > -src/arm > >> >>>> 6=3D > >> >> =3D3D > >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > >> >>>>>> =3D20 > >> >>>>>> I then did: git fetch, stash push ., merge --ff-only, stash apply= > . > >> >>>>>> : > >> >>>>>> my normal procedure. I then also applied the patch from: > >> >>>>>> =3D20 > >> >>>>>> https://github.com/openzfs/zfs/pull/14739/files > >> >>>>>> =3D20 > >> >>>>>> Then I did: buildworld buildkernel, install them, and rebooted. > >> >>>>>> =3D20 > >> >>>>>> The result was: > >> >>>>>> =3D20 > >> >>>>>> # uname -apKU > >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 =3D3D > >> >>>>>> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 > >> >>>>>> =3D3D > >> >>>>>> =3D > >> >>>>>> root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main= > -src/arm > >> >>>> 6=3D > >> >> =3D3D > >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarc> >> >>>>>> =3D20 > >> >>>>>> The later poudriere-devel based build of packages from ports is > >> >>>>>> based on: > >> >>>>>> =3D20 > >> >>>>>> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > >> >>>>>> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D3D > >> >>>>>> devel/freebsd-gcc12: Bump to 12.2.0. > >> >>>>>> Author: John Baldwin > >> >>>>>> Commit: John Baldwin > >> >>>>>> CommitDate: 2023-03-25 00:06:40 +0000 > >> >>>>>> branch: main > >> >>>>>> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > >> >>>>>> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > >> >>>>>> n613214 (--first-parent --count for merge-base) > >> >>>>>> =3D20 > >> >>>>>> poudriere attempted to build 476 packages, starting > >> >>>>>> with pkg (in order to build the 56 that I explicitly > >> >>>>>> indicate that I want). It is my normal set of ports. > >> >>>>>> The form of building is biased to allowing a high > >> >>>>>> load average compared to the number of hardware > >> >>>>>> threads (same as cores here): each builder is allowed > >> >>>>>> to use the full count of hardware threads. The build > >> >>>>>> =E2=82=AC=C3=8FL=E2=82=AC=E2=82=AC=E2=82=AC=E2=82=AC=E2=80=B9 > = > > >> used USE_TMPFS=3D3D3D"data" instead of the > >> >>>>>> USE_TMPFS=3D3D3Dall I > >> >> normally use on the build machine involved. > >> >>>>>> =3D20 > >> >>>>>> And it produced some random errors during the attempted > >> >>>>>> builds. A type of example that is easy to interpret > >> >>>>>> without further exploration is: > >> >>>>>> =3D20 > >> >>>>>> pkg_resources.extern.packaging.requirements.InvalidRequirement: > >> >>>>>> Parse > >> >>>>>> =3D > >> >> =3D3D > >> >>>> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected > >> >>>> W:(0-9A-Za-z) > >> >>>>>> 0 > >> >> da0p8 ONLINE 0 0 0 > >> >>>>>> =3D20 > >> >>>>>> errors: No known data errors > >> >>>>>> =3D20 > >> >>>>>> =3D20 > >> >>>>>> =3D3D3D=3D3D3D=3D3D3D > >> >>>>>> Mark Millard > >> >>>>>> marklmi at yahoo.com > >> >>>>>> =3D20 > >> >>>>> =3D20 > >> >>>>> Let's try this again. Claws-mail didn't include the list address i= > n > >> >>>>> =3D > >> >>>>> the=3D20 > >> >>>> header. Trying to reply, again, using exmh instead. > >> >>>>> =3D20 > >> >>>>> =3D20 > >> >>>>> Did your pools suffer the EXDEV problem? The EXDEV also corrupted = > =3D > >> >>>>> files. > >> >>>> > >> >>>> As I reported, this was a jump from before the import > >> >>>> to as things are tonight (here). So: NO, unless the > >> >>>> existing code as of tonight still has the EXDEV problem! > >> >>>> > >> >>>> Prior to this experiment I'd not progressed any media > >> >>>> beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > >> >>>> > >> >>>> I think, without sufficient investigation we risk jumping to > >> >>>>> conclusions. I've taken an extremely cautious approach, rolling > >> >>>>> back > >> >>>>> snapshots (as much as possible, i.e. poudriere datasets) when EXDE= > V > >> >>>>> corruption was encountered. > >> >>>>> > >> >>>> Again: nothing between main-n261544-cee09bda03c8-dirty and > >> >>>> main-n262122-2ef2c26f3f13-dirty was involved at any stage. > >> >>>> > >> >>>> =3D20 > >> >>>>> I did not rollback any snapshots in my MH mail directory. Rolling > >> >>>>> back > >> >>>>> snapshots of my MH maildir would result in loss of email. I have t= > o > >> >>>>> live with that corruption. Corrupted files in my outgoing sent > >> >>>>> email > >> >>>>> directory remain: > >> >>>>> =3D20 > >> >>>>> slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=3D20 > >> >>>>> 53 > >> >>>>> slippy$=3D20 > >> >>>>> =3D20 > >> >>>>> There are 53 corrupted files in my note log of 9913 emails. Those = > =3D > >> >>>>> files > >> >>>> will never be fixed. They were corrupted by the EXDEV bug. Any new > >> >>>> ZFS > >> >>>>> or ZFS patches cannot retroactively remove the corruption from > >> >>>>> those > >> >>>>> files. > >> >>>>> =3D20 > >> >>>>> But my poudriere files, because the snapshots were rolled back, > >> >>>>> were > >> >>>>> "repaired" by the rolled back snapshots. > >> >>>>> =3D20 > >> >>>>> I'm not convinced that there is presently active corruption since > >> >>>>> the problem has been fixed. I am convinced that whatever corruptio= > n > >> >>>>> that was written at the time will remain forever or until those > >> >>>>> files > >> >>>>> are deleted or replaced -- just like my email files written to dis= > k > >> >>>>> at > >> >>>>> the time. > >> >>>>> > >> >>>> My test results and procedure just do not fit your conclusion > >> >>>> that things are okay now if block_clonging is completely avoided. > >> >>>> > >> >>> Admitting I'm wrong: sending copies of my last reply to you back to > >> >>> myself, > >> >>> > >> >> again and again, three times, I've managed to reproduce the corruptio= > n > >> >> you > >> >>> are talking about. > >> >>> > >> >> This email itself was also corrupted. Below is what was sent. Good > >> >> thing > >> >> multiple copies are saved by exmh. > >> >> > >> >> Admitting I'm wrong: sending copies of my last reply to you back to > >> >> myself, > >> >> again and again, three times, I've managed to reproduce the corruptio= > n > >> >> you > >> >> are talking about. > >> >> > >> > This email itself was also corrupted. Below is what was sent. Good > >> > thing > >> > multiple copies are saved by exmh. > >> > > >> > Admitting I'm wrong: sending copies of my last reply to you back to > >> > myself, > >> > again and again, three times, I've managed to reproduce the corruption > >> > you > >> > are talking about. > >> > > >> > From my previous email to you. > >> > > >> > header. Trying to reply:::::::::, again, using exmh instead. > >> > ^^^^^^^^^ > >> > Here it is, nine additional bytes of garbage. I've replaced the garbag= > e > >> > with colons because nulls mess up a lot of things, including cut&paste= > . > >> > > >> > In another instance about 500 bytes were removed. I can reproduce the > >> > corruption at will now. > >> > > >> > The EXDEV patch is applied. Block_cloning is disabled. > >> > > >> > Somehow nulls and other garbage are inserted in the middle of emails > >> > after > >> > the ZFS upgrade. > >> > > >> Can you please try this patch: > >> > >> github.com > > > > The patch was applied yesterday at noon (PDT). > > > >> > >> > >> > >> Unfortunately I don=E2=80=99t see how this can happen with block cloning > >> disabled. > > > > It does and it's reproducible. > > > > There is corruption with the recent import, with the > https://github.com/openzfs/zfs/pull/14739/files patch applied and > block cloning disabled on the pool. Same here. > > There is no corruption with top of main with zfs merge reverted altogether. I'm in the process of building a branch reverting the merge altogether and will test it on my sandbox machine later today. > > Which commit results in said corruption remains to be seen, a variant > of the tree with just block cloning support reverted just for testing > purposes is about to be evaluated. > > --=20 > Mateusz Guzik -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 13 14:05:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py1Yc5rylz458mN for ; Thu, 13 Apr 2023 14:05:08 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) (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 4Py1Yc4S5Qz4QGZ for ; Thu, 13 Apr 2023 14:05:08 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82a.google.com with SMTP id gb12so13364102qtb.6 for ; Thu, 13 Apr 2023 07:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1681394707; x=1683986707; 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=SwC4h0o6JTZ2nbjTjoaKtAalDE+xU9li87T6BCp0I7o=; b=HyUKMBNZsr0LFsouXEig+tpUec9Dr1KpKLfsJid76mXIKq+1I03HooJ0qVkDEnjiCw O7L2hfSyFDMYmCvLcvTKYjOIzlvQ+78y/TU8PamRnt7sHH7UyAHwIDcP/2ZggjMcKv+u LkHZoSI98vKY2V0EjMf4LBhhz+F++304ft8f2SKxiYTN7B7EE4EP2W3rEhqSX8a4/O5q +RFuxAbRY6O2Gd9kFlNXtIYhsqe57ssnNIIh69IeMnSwtlfhQkjesr3Uj8HWRa7eyHNV xiL0RvAfHgllQ4YbFnKQGDWMaRI0ZTZ7yO7qioG+/sIVtKaw39+6Lxo1wG3o3IvfL5SV Nn7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681394707; x=1683986707; 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=SwC4h0o6JTZ2nbjTjoaKtAalDE+xU9li87T6BCp0I7o=; b=QE0MUrbfxQVoRweRzPJ8ej+FgOnBxFJYHc7Qj6EI0nMN8Ep1X3MkWWYWDujl0g36RV wZCBpwbPsbrHVf4ki6warjKEQ37RG6Ahzzk4+QpgyWtEjcMhjqZHvmSsNsCZa2obhew9 TOzXfrB/JkGtrzT63aXQ/d+Doq+uLAKVO684sku/S0xmWUjOnwcHUXP43S/8ETMnM6xU lS3aE8m5SxR+opFmdJdVjxd7u+bRa5RZ6RwJUcbXGpI62fDZLBO4hiqTESOo90TWMHqS zBgNfB8L1o7kZ5MVON8NHghh99Wh99KDkmAzbDztpVdYeJrAPswBZSsznCB7Qj3HBZ38 4bGw== X-Gm-Message-State: AAQBX9fPQLVJPZYLJM+Gcn/vjzXiDRCytPXeUay20ZjWw2RI5nB18wJx p5oJ9IB+ifz96FTscJP8VcyUEg== X-Google-Smtp-Source: AKy350ZoY2H2SnOdOaZYTVwaZkahpkh+gkfEbXyyG5J2J+U7DsiIeqMM9eJGMX83MPbIOjPSurGblA== X-Received: by 2002:ac8:5896:0:b0:3b9:b6e3:c78e with SMTP id t22-20020ac85896000000b003b9b6e3c78emr3050711qta.8.1681394706608; Thu, 13 Apr 2023 07:05:06 -0700 (PDT) Received: from mutt-hbsd (pool-100-16-219-215.bltmmd.fios.verizon.net. [100.16.219.215]) by smtp.gmail.com with ESMTPSA id h21-20020ac85695000000b003e3c23dd2cfsm500327qta.84.2023.04.13.07.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 07:05:05 -0700 (PDT) Date: Thu, 13 Apr 2023 10:05:04 -0400 From: Shawn Webb To: Cy Schubert Cc: Mateusz Guzik , Pawe? Jakub Dawidek , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="of4regawd5rmtjji" Content-Disposition: inline In-Reply-To: <20230413135635.6B62F354@slippy.cwsent.com> X-Rspamd-Queue-Id: 4Py1Yc4S5Qz4QGZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --of4regawd5rmtjji Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 13, 2023 at 06:56:35AM -0700, Cy Schubert wrote: > In message om> > , Mateusz Guzik writes: > > On 4/13/23, Cy Schubert wrote: > > > On Thu, 13 Apr 2023 19:54:42 +0900 > > > Pawe=3DC5=3D82 Jakub Dawidek wrote: > > > > > >> On Apr 13, 2023, at 16:10, Cy Schubert w= rote=3D > > : > > >> > > > >> > =3DEF=3DBB=3DBFIn message <20230413070426.8A54F25A@slippy.cwsent.c= om>, Cy Sc=3D > > hubert > > >> > writes: > > >> > In message <20230413064252.1E5C1318@slippy.cwsent.com>, Cy Schubert > > >> > writes: > > >> >> In message , Mark > > >> >> Millard > > >> >>> write > > >> >>> s: > > >> >>> [This just puts my prior reply's material into Cy's > > >> >>>> adjusted resend of the original. The To/Cc should > > >> >>>> be coomplete this time.] > > >> >>>> > > >> >>>> On Apr 12, 2023, at 22:52, Cy Schubert =3D > > =3D3D > > >> >>>> wrote: > > >> >>>> > > >> >>>> In message , Ma= rk =3D > > =3D3D > > >> >>>>> Millard=3D3D20 > > >> >>>> write > > >> >>>>> s: > > >> >>>>> From: Charlie Li wrote on > > >> >>>>>> Date: Wed, 12 Apr 2023 20:11:16 UTC : > > >> >>>>>> =3D3D20 > > >> >>>>>> Charlie Li wrote: > > >> >>>>>>> Mateusz Guzik wrote: > > >> >>>>>>>> can you please test poudriere with > > >> >>>>>>>>> https://github.com/openzfs/zfs/pull/14739/files > > >> >>>>>>>>> =3D3D20 > > >> >>>>>>>>> After applying, on the md(4)-backed pool regardless of =3D= 3D3D > > >> >>>>>>>> block_cloning,=3D3D3D20 > > >> >>>>>> the cy@ `cp -R` test reports no differing (ie corrupted) file= s. =3D > > =3D3D > > >> >>>>>>>> Will=3D3D3D20=3D3D3D > > >> >>>> =3D3D20 > > >> >>>>>> report back on poudriere results (no block_cloning). > > >> >>>>>>>> =3D3D3D20 > > >> >>>>>>>> As for poudriere, build failures are still rolling in. Thes= e ar=3D > > e > > >> >>>>>>>> =3D3D > > >> >>>>>>> (and=3D3D3D20=3D3D3D > > >> >>>> =3D3D20 > > >> >>>>>> have been) entirely random on every run. Some examples from t= his =3D > > =3D3D > > >> >>>>>>> run: > > >> >>>> =3D3D3D20 > > >> >>>>>>> lang/php81: > > >> >>>>>>> - post-install: @${INSTALL_DATA} > > >> >>>>>>> ${WRKSRC}/php.ini-development=3D3D3D20 > > >> >>>>>>> ${WRKSRC}/php.ini-production ${WRKDIR}/php.conf =3D3D3D > > >> >>>>>>> ${STAGEDIR}/${PREFIX}/etc > > >> >>>>>> - consumers fail to build due to corrupted php.conf packaged > > >> >>>>>>> =3D3D3D20 > > >> >>>>>>> devel/ninja: > > >> >>>>>>> - phase: stage > > >> >>>>>>> - install -s -m 555=3D3D3D20 > > >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/ninja-1.11.1/ninja=3D3D3= D20 > > >> >>>>>>> /wrkdirs/usr/ports/devel/ninja/work/stage/usr/local/bin > > >> >>>>>>> - consumers fail to build due to corrupted bin/ninja packaged > > >> >>>>>>> =3D3D3D20 > > >> >>>>>>> devel/netsurf-buildsystem: > > >> >>>>>>> - phase: stage > > >> >>>>>>> - mkdir -p=3D3D3D20 > > >> >>>>>>> =3D3D3D > > >> >>>>>>> =3D3D > > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/l= ocal=3D > > /share/n > > >> >>>> e=3D3D > > >> >> =3D3D3D > > >> >>>> tsurf-buildsystem/makefiles=3D3D3D20 > > >> >>>>>> =3D3D3D > > >> >>>>>>> =3D3D > > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/l= ocal=3D > > /share/n > > >> >>>> e=3D3D > > >> >> =3D3D3D > > >> >>>> tsurf-buildsystem/testtools > > >> >>>>>> for M in Makefile.top Makefile.tools Makefile.subdir =3D3D3D > > >> >>>>>>> Makefile.pkgconfig=3D3D3D20 > > >> >>>>>> Makefile.clang Makefile.gcc Makefile.norcroft Makefile.open64= ; do > > >> >>>>>> \ > > >> >>>>>>> cp makefiles/$M=3D3D3D20 > > >> >>>>>>> =3D3D3D > > >> >>>>>>> =3D3D > > >> >>>>>> /wrkdirs/usr/ports/devel/netsurf-buildsystem/work/stage/usr/l= ocal=3D > > /share/n > > >> >>>> e=3D3D > > >> >> =3D3D3D > > >> >>>> tsurf-buildsystem/makefiles/;=3D3D3D20 > > >> >>>>>> \ > > >> >>>>>>> done > > >> >>>>>>> - graphics/libnsgif fails to build due to NUL characters in= =3D3D3D=3D > > 20 > > >> >>>>>>> Makefile.{clang,subdir}, causing nothing to link > > >> >>>>>>> =3D3D20 > > >> >>>>>> Summary: I have problems building ports into packages > > >> >>>>>> via poudriere-devel use despite being fully updated/patched > > >> >>>>>> (as of when I started the experiment), never having enabled > > >> >>>>>> block_cloning ( still using openzfs-2.1-freebsd ). > > >> >>>>>> =3D3D20 > > >> >>>>>> In other words, I can confirm other reports that have > > >> >>>>>> been made. > > >> >>>>>> =3D3D20 > > >> >>>>>> The details follow. > > >> >>>>>> =3D3D20 > > >> >>>>>> =3D3D20 > > >> >>>>>> [Written as I was working on setting up for the experiments > > >> >>>>>> and then executing those experiments, adjusting as I went > > >> >>>>>> along.] > > >> >>>>>> =3D3D20 > > >> >>>>>> I've run my own tests in a context that has never had the > > >> >>>>>> zpool upgrade and that jump from before the openzfs import to > > >> >>>>>> after the existing commits for trying to fix openzfs on > > >> >>>>>> FreeBSD. I report on the sequence of activities getting to > > >> >>>>>> the point of testing as well. > > >> >>>>>> =3D3D20 > > >> >>>>>> By personal policy I keep my (non-temporary) pool's compatible > > >> >>>>>> with what the most recent ??.?-RELEASE supports, using > > >> >>>>>> openzfs-2.1-freebsd for now. The pools involved below have > > >> >>>>>> never had a zpool upgrade from where they started. (I've no > > >> >>>>>> pools that have ever had a zpool upgrade.) > > >> >>>>>> =3D3D20 > > >> >>>>>> (Temporary pools are rare for me, such as this investigation. > > >> >>>>>> But I'm not testing block_cloning or anything new this time.) > > >> >>>>>> =3D3D20 > > >> >>>>>> I'll note that I use zfs for bectl, not for redundancy. So > > >> >>>>>> my evidence is more limited in that respect. > > >> >>>>>> =3D3D20 > > >> >>>>>> The activities were done on a HoneyComb (16 Cortex-A72 cores). > > >> >>>>>> The system has and supports ECC RAM, 64 GiBytes of RAM are > > >> >>>>>> present. > > >> >>>>>> =3D3D20 > > >> >>>>>> I started by duplicating my normal zfs environment to an > > >> >>>>>> external USB3 NVMe drive and adjusting the host name and such > > >> >>>>>> to produce the below. (Non-debug, although I do not strip > > >> >>>>>> symbols.) : > > >> >>>>>> =3D3D20 > > >> >>>>>> # uname -apKU > > >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = =3D3D3D > > >> >>>>>> main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 > > >> >>>>>> =3D3D3D > > >> >>>>>> =3D3D > > >> >>>>>> root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/= main=3D > > -src/arm > > >> >>>> 6=3D3D > > >> >> =3D3D3D > > >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 > > >> >>>>>> =3D3D20 > > >> >>>>>> I then did: git fetch, stash push ., merge --ff-only, stash a= pply=3D > > . > > >> >>>>>> : > > >> >>>>>> my normal procedure. I then also applied the patch from: > > >> >>>>>> =3D3D20 > > >> >>>>>> https://github.com/openzfs/zfs/pull/14739/files > > >> >>>>>> =3D3D20 > > >> >>>>>> Then I did: buildworld buildkernel, install them, and reboote= d. > > >> >>>>>> =3D3D20 > > >> >>>>>> The result was: > > >> >>>>>> =3D3D20 > > >> >>>>>> # uname -apKU > > >> >>>>>> FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 = =3D3D3D > > >> >>>>>> main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 > > >> >>>>>> =3D3D3D > > >> >>>>>> =3D3D > > >> >>>>>> root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/= main=3D > > -src/arm > > >> >>>> 6=3D3D > > >> >> =3D3D3D > > >> >>>> 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarc> >> >>>>>> =3D3D20 > > >> >>>>>> The later poudriere-devel based build of packages from ports = is > > >> >>>>>> based on: > > >> >>>>>> =3D3D20 > > >> >>>>>> # ~/fbsd-based-on-what-commit.sh -C /usr/ports > > >> >>>>>> 4e94ac9eb97f (HEAD -> main, freebsd/main, freebsd/HEAD) =3D3D= 3D > > >> >>>>>> devel/freebsd-gcc12: Bump to 12.2.0. > > >> >>>>>> Author: John Baldwin > > >> >>>>>> Commit: John Baldwin > > >> >>>>>> CommitDate: 2023-03-25 00:06:40 +0000 > > >> >>>>>> branch: main > > >> >>>>>> merge-base: 4e94ac9eb97fab16510b74ebcaa9316613182a72 > > >> >>>>>> merge-base: CommitDate: 2023-03-25 00:06:40 +0000 > > >> >>>>>> n613214 (--first-parent --count for merge-base) > > >> >>>>>> =3D3D20 > > >> >>>>>> poudriere attempted to build 476 packages, starting > > >> >>>>>> with pkg (in order to build the 56 that I explicitly > > >> >>>>>> indicate that I want). It is my normal set of ports. > > >> >>>>>> The form of building is biased to allowing a high > > >> >>>>>> load average compared to the number of hardware > > >> >>>>>> threads (same as cores here): each builder is allowed > > >> >>>>>> to use the full count of hardware threads. The build > > >> >>>>>> =3DE2=3D82=3DAC=3DC3=3D8FL=3DE2=3D82=3DAC=3DE2=3D82=3DAC=3DE2= =3D82=3DAC=3DE2=3D82=3DAC=3DE2=3D80=3DB9 > =3D > > > >> used USE_TMPFS=3D3D3D3D"data" instead of the > > >> >>>>>> USE_TMPFS=3D3D3D3Dall I > > >> >> normally use on the build machine involved. > > >> >>>>>> =3D3D20 > > >> >>>>>> And it produced some random errors during the attempted > > >> >>>>>> builds. A type of example that is easy to interpret > > >> >>>>>> without further exploration is: > > >> >>>>>> =3D3D20 > > >> >>>>>> pkg_resources.extern.packaging.requirements.InvalidRequiremen= t: > > >> >>>>>> Parse > > >> >>>>>> =3D3D > > >> >> =3D3D3D > > >> >>>> error at "'\x00\x00\x00\x00\x00\x00\x00\x00'": Expected > > >> >>>> W:(0-9A-Za-z) > > >> >>>>>> 0 > > >> >> da0p8 ONLINE 0 0 0 > > >> >>>>>> =3D3D20 > > >> >>>>>> errors: No known data errors > > >> >>>>>> =3D3D20 > > >> >>>>>> =3D3D20 > > >> >>>>>> =3D3D3D3D=3D3D3D3D=3D3D3D3D > > >> >>>>>> Mark Millard > > >> >>>>>> marklmi at yahoo.com > > >> >>>>>> =3D3D20 > > >> >>>>> =3D3D20 > > >> >>>>> Let's try this again. Claws-mail didn't include the list addre= ss i=3D > > n > > >> >>>>> =3D3D > > >> >>>>> the=3D3D20 > > >> >>>> header. Trying to reply, again, using exmh instead. > > >> >>>>> =3D3D20 > > >> >>>>> =3D3D20 > > >> >>>>> Did your pools suffer the EXDEV problem? The EXDEV also corrup= ted =3D > > =3D3D > > >> >>>>> files. > > >> >>>> > > >> >>>> As I reported, this was a jump from before the import > > >> >>>> to as things are tonight (here). So: NO, unless the > > >> >>>> existing code as of tonight still has the EXDEV problem! > > >> >>>> > > >> >>>> Prior to this experiment I'd not progressed any media > > >> >>>> beyond: main-n261544-cee09bda03c8-dirty Wed Mar 15 20:25:49. > > >> >>>> > > >> >>>> I think, without sufficient investigation we risk jumping to > > >> >>>>> conclusions. I've taken an extremely cautious approach, rolling > > >> >>>>> back > > >> >>>>> snapshots (as much as possible, i.e. poudriere datasets) when = EXDE=3D > > V > > >> >>>>> corruption was encountered. > > >> >>>>> > > >> >>>> Again: nothing between main-n261544-cee09bda03c8-dirty and > > >> >>>> main-n262122-2ef2c26f3f13-dirty was involved at any stage. > > >> >>>> > > >> >>>> =3D3D20 > > >> >>>>> I did not rollback any snapshots in my MH mail directory. Roll= ing > > >> >>>>> back > > >> >>>>> snapshots of my MH maildir would result in loss of email. I ha= ve t=3D > > o > > >> >>>>> live with that corruption. Corrupted files in my outgoing sent > > >> >>>>> email > > >> >>>>> directory remain: > > >> >>>>> =3D3D20 > > >> >>>>> slippy$ ugrep -cPa '\x00' ~/.Mail/note | grep -c :1=3D3D20 > > >> >>>>> 53 > > >> >>>>> slippy$=3D3D20 > > >> >>>>> =3D3D20 > > >> >>>>> There are 53 corrupted files in my note log of 9913 emails. Th= ose =3D > > =3D3D > > >> >>>>> files > > >> >>>> will never be fixed. They were corrupted by the EXDEV bug. Any = new > > >> >>>> ZFS > > >> >>>>> or ZFS patches cannot retroactively remove the corruption from > > >> >>>>> those > > >> >>>>> files. > > >> >>>>> =3D3D20 > > >> >>>>> But my poudriere files, because the snapshots were rolled back, > > >> >>>>> were > > >> >>>>> "repaired" by the rolled back snapshots. > > >> >>>>> =3D3D20 > > >> >>>>> I'm not convinced that there is presently active corruption si= nce > > >> >>>>> the problem has been fixed. I am convinced that whatever corru= ptio=3D > > n > > >> >>>>> that was written at the time will remain forever or until those > > >> >>>>> files > > >> >>>>> are deleted or replaced -- just like my email files written to= dis=3D > > k > > >> >>>>> at > > >> >>>>> the time. > > >> >>>>> > > >> >>>> My test results and procedure just do not fit your conclusion > > >> >>>> that things are okay now if block_clonging is completely avoide= d. > > >> >>>> > > >> >>> Admitting I'm wrong: sending copies of my last reply to you back= to > > >> >>> myself, > > >> >>> > > >> >> again and again, three times, I've managed to reproduce the corru= ptio=3D > > n > > >> >> you > > >> >>> are talking about. > > >> >>> > > >> >> This email itself was also corrupted. Below is what was sent. Good > > >> >> thing > > >> >> multiple copies are saved by exmh. > > >> >> > > >> >> Admitting I'm wrong: sending copies of my last reply to you back = to > > >> >> myself, > > >> >> again and again, three times, I've managed to reproduce the corru= ptio=3D > > n > > >> >> you > > >> >> are talking about. > > >> >> > > >> > This email itself was also corrupted. Below is what was sent. Good > > >> > thing > > >> > multiple copies are saved by exmh. > > >> > > > >> > Admitting I'm wrong: sending copies of my last reply to you back to > > >> > myself, > > >> > again and again, three times, I've managed to reproduce the corrup= tion > > >> > you > > >> > are talking about. > > >> > > > >> > From my previous email to you. > > >> > > > >> > header. Trying to reply:::::::::, again, using exmh instead. > > >> > ^^^^^^^^^ > > >> > Here it is, nine additional bytes of garbage. I've replaced the ga= rbag=3D > > e > > >> > with colons because nulls mess up a lot of things, including cut&p= aste=3D > > . > > >> > > > >> > In another instance about 500 bytes were removed. I can reproduce = the > > >> > corruption at will now. > > >> > > > >> > The EXDEV patch is applied. Block_cloning is disabled. > > >> > > > >> > Somehow nulls and other garbage are inserted in the middle of emai= ls > > >> > after > > >> > the ZFS upgrade. > > >> > > > >> Can you please try this patch: > > >> > > >> github.com > > > > > > The patch was applied yesterday at noon (PDT). > > > > > >> > > >> > > >> > > >> Unfortunately I don=3DE2=3D80=3D99t see how this can happen with blo= ck cloning > > >> disabled. > > > > > > It does and it's reproducible. > > > > > > > There is corruption with the recent import, with the > > https://github.com/openzfs/zfs/pull/14739/files patch applied and > > block cloning disabled on the pool. >=20 > Same here. >=20 > > > > There is no corruption with top of main with zfs merge reverted altoget= her. >=20 > I'm in the process of building a branch reverting the merge altogether an= d=20 > will test it on my sandbox machine later today. >=20 > > > > Which commit results in said corruption remains to be seen, a variant > > of the tree with just block cloning support reverted just for testing > > purposes is about to be evaluated. I've learned over the years downstream that it's not really my place to tell upstream what to do or how to do it. However, I think given the seriousness of this, upstream might do well to revert the commit until a solid fix is in place. Upstream might want to consider the impacts this is having not just with downstream projects, but also regular users. Really bad timing to have a lot of new tax documentation that I really don't want to lose. I'd really like to have an up-to-date, security patched OS, but I guess I'll stay behind so that I don't risk losing critical financial documentation. Does the ZFS project have some sort of automated testing to catch data-gobbling, pool killing bugs? It seems like this would have been caught with some CI/CD stress testing automation scripts. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --of4regawd5rmtjji Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmQ4DAkACgkQ/y5nonf4 4fomgxAAn0eDUQVU6hZ4z9rC/NttvibQseTBVvr/0Re48+GLu+AFYz34BT10t/p/ vxINgpeoHMMEfC8k67dojIcElsDOUa9M2Y5XNnJI6rr1TjwIiIE3Hpn7etH59g8O +k9B715AkRwP+3o8N4xUPXIHnZ6c/auFdFZO3MUsYOhr1O0UrkYtH5IC1OjcapXl x2uENZj9FaEFsjgWpVyougkUsh04/9T+xbj7+s6J0npvDCVuXkqDKiyQEWfE/ntu b7LcU2c/fpLvwWdYNYBV6+vIGy99aRYdld9OW9IdkA0XZnkyurKXU9OPgmZgIBze f1dqkEZzGdM3K/6CqS9RuzHYIzMyFtt3ic+vZZB+VKOqP8O66chERGP+lZnG41Rz QESnEFn1H2QUBH6xTw+RKXHwL3Gsx/HUmQK0uQksqKY54AeTBMEKjlmsL05G1MGF 78vcaCcMlbHja7aHeAlaPpYfVchl6O+VRogz5FFoPF4xMldoKNYTOAv+qlCNE9qw y1qwDsg2f7vQCtrS0XbBZCQ28zF18v9DEzLxXF3xYfmE/lu0AqQgGICxwkOW4QZv Hw7kr2D5PdSLSzN4hlbsuGyvb4VVq7fGlw6JnVxLUIr41V5Y/XjY6uSysoQvZsdo 7zCHdyIMsbELZncZAzMXwhSUDpeArKQS0vS9WLZQHScsZEP3huQ= =mNE2 -----END PGP SIGNATURE----- --of4regawd5rmtjji-- From nobody Thu Apr 13 14:13:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py1kx13dvz4599l; Thu, 13 Apr 2023 14:13: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 4Py1kx0fL2z3QnW; Thu, 13 Apr 2023 14:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681395193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moj84iYiYDX8n3o01NId2FSzuD4F67hKB+XkqbAYtY8=; b=GBNLTh7t/V/PEhtWZ3wnI/EI+jDpG9y48QZPpcuZwhMUTNZHDGuRwNhB3/0YnB4lYKtBi5 4DaJy2NLZqsu4q/UFpJZ0DmGdwJIpcVYCYnJIpow6PAGN6SDalnS+G9KtC1L4bAI4EZUR7 /QYtF1CSuTrRLZizm6+msRGP2PmfJAqgJKmAHUqtDUOik/3GxxdnyMCQrF9wxVuHeUhyI+ FJi4w6zdDfbtJOPot2LMoGBs+Ie9BXoop+zXyu1vzL9GKgDiUOUAJ+mHFW28smgkkPKHeL vosROv4Teh0iQUuYK/W3nHlY29nKz94bmQMmcBdrtM+psLg+IFbtPYsp2xrgeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681395193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moj84iYiYDX8n3o01NId2FSzuD4F67hKB+XkqbAYtY8=; b=lKKLO8oosP3nr1X0tRynZh2CFt76GMX4BPX2nvSWKoJWBj5mY61j87n0fb9/8vrNdlnpLg EIqcGmHYboARYS36UKZ3NNPF3Mvp1EWw/cR6AauGC1ipD7EoYKUs3Q//b9v7RJb62ARsZL I/Y8SEWH2hFVlW4OEFaAltwEDrOZW5BX2bp3XKlHiY7YFZwCIRRsS8OaVwU+SHrEU4BW6L PCvmaYyyutJnpX5mFGXsYicYAAWdatpjoPy8B9HmthyJAD1M6cgcS22KGeinZXZxT1t85U VdnOGykyC4RcqFi4zCPwom+MAFTtZkUqQ5bQ+92UE2ihF/OF0zfYrqq9hmnrIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681395193; a=rsa-sha256; cv=none; b=GE/32F6lOPwUT4foh2mnxyyyjxwQ35yMnm5ooviIHhkdWwXDZLJAD+xdJj3M2NazA8WVji qWBD7BUdhwsPWUMdNQExrbSda8MOFINXolpBDlVa8BBDrnr20wez3zpsKJi+SaA7wqPuvE lBJS1q29eInc997EY5svONLqyT7aQyLLr2J12C3fYRWiN6nlfCdHezJH/eubrsF81oaFQC ISE6ROtbot1yQJUny/WdtPFDcWZHXFrwSnO/9BwATBGepdlPP4+WvKG36A7oQ3BLTkBWHs Ct0zBoxvcc14iK9nPkDhbwi4sOfsHWkX1+fi0XlUgc7Q5LlB+mOoDKltnVFRDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py1kw6rGpzlX5; Thu, 13 Apr 2023 14:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DEDC6T038355; Thu, 13 Apr 2023 14:13:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DEDC8W038354; Thu, 13 Apr 2023 14:13:12 GMT (envelope-from git) Date: Thu, 13 Apr 2023 14:13:12 GMT Message-Id: <202304131413.33DEDC8W038354@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: 71883128e5c8 - main - rtsx: Add plug-and-play info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71883128e5c883bd986219b1aa1b2a7e9772a448 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=71883128e5c883bd986219b1aa1b2a7e9772a448 commit 71883128e5c883bd986219b1aa1b2a7e9772a448 Author: Henri Hennebert AuthorDate: 2023-04-13 14:07:12 +0000 Commit: Mitchell Horne CommitDate: 2023-04-13 14:12:50 +0000 rtsx: Add plug-and-play info Add MODULE_PNP_INFO() to the driver to make it autoload if not linked statically into the kernel. Remove the device from amd64/i386 GENERIC. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35074 --- sys/amd64/conf/GENERIC | 1 - sys/dev/rtsx/rtsx.c | 49 +++++++++++++++++++++++++------------------------ sys/i386/conf/GENERIC | 1 - 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 67463e1013f8..6073f9716d3e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -364,7 +364,6 @@ device snd_via8233 # VIA VT8233x Audio device mmc # MMC/SD bus device mmcsd # MMC/SD memory card device sdhci # Generic PCI SD Host Controller -device rtsx # Realtek SD card reader # VirtIO support device virtio # Generic VirtIO bus (required) diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c index 65c4aa809de9..cd3ca787ed9a 100644 --- a/sys/dev/rtsx/rtsx.c +++ b/sys/dev/rtsx/rtsx.c @@ -174,22 +174,20 @@ struct rtsx_softc { #define RTSX_VERSION "2.1g" -static const struct rtsx_device { - uint16_t vendor_id; +static const struct rtsx_pciids { uint16_t device_id; const char *desc; -} rtsx_devices[] = { - { RTSX_REALTEK, RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader"}, - { RTSX_REALTEK, RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader"}, - { 0, 0, NULL} +} rtsx_ids[] = { + { RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader" }, + { RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader" }, + { RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader" }, + { RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader" }, + { RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader" }, + { RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader" }, + { RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader" }, + { RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader" }, + { RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader" }, + { RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader" }, }; /* See `kenv | grep smbios.system` */ @@ -199,6 +197,7 @@ static const struct rtsx_inversion_model { char *product; } rtsx_inversion_models[] = { { "LENOVO", "ThinkPad T470p", "20J7S0PM00"}, + { "LENOVO", "ThinkPad X13 Gen 1", "20UF000QRT"}, { NULL, NULL, NULL} }; @@ -3571,22 +3570,19 @@ rtsx_probe(device_t dev) uint16_t vendor_id; uint16_t device_id; int i; - int result; vendor_id = pci_get_vendor(dev); device_id = pci_get_device(dev); - result = ENXIO; - for (i = 0; rtsx_devices[i].vendor_id != 0; i++) { - if (rtsx_devices[i].vendor_id == vendor_id && - rtsx_devices[i].device_id == device_id) { - device_set_desc(dev, rtsx_devices[i].desc); - result = BUS_PROBE_DEFAULT; - break; + if (vendor_id != RTSX_REALTEK) + return (ENXIO); + for (i = 0; i < nitems(rtsx_ids); i++) { + if (rtsx_ids[i].device_id == device_id) { + device_set_desc(dev, rtsx_ids[i].desc); + return (BUS_PROBE_DEFAULT); } } - - return (result); + return (ENXIO); } /* @@ -3907,6 +3903,11 @@ static device_method_t rtsx_methods[] = { DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc)); DRIVER_MODULE(rtsx, pci, rtsx_driver, NULL, NULL); + +/* For Plug and Play */ +MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x10ec", pci, rtsx, + rtsx_ids, nitems(rtsx_ids)); + #ifndef MMCCAM MMC_DECLARE_BRIDGE(rtsx); #endif /* !MMCCAM */ diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 475b584f366b..0ca5fe12d13f 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -319,7 +319,6 @@ device snd_via8233 # VIA VT8233x Audio device mmc # MMC/SD bus device mmcsd # MMC/SD memory card device sdhci # Generic PCI SD Host Controller -device rtsx # Realtek SD card reader # VirtIO support device virtio # Generic VirtIO bus (required) From nobody Thu Apr 13 14:37:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py2HH3gnSz45CXS; Thu, 13 Apr 2023 14:37: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 4Py2HH0v32z3CPy; Thu, 13 Apr 2023 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681396667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPs5OTCXj2sbTLtfrDcT1lHBU0oJNcT2dSnMyNjdWe4=; b=X6DgNC/4ULod42WUytOXoUNnl2FBzuCdDBaDkjVpbtyhwlMjQLuR1N8uXa7YTOj4xrCe/6 H5/dU75RbsxGalpson7Iuarj2s0q4ZEI4Ku2EjjETR83zkaaM4HcOEh9+cklspl6pmunTv 8SdkgkZ/fw8uA3rx6r0QP8FJuZ42GaoDiSH8Sl/K9NUQzIMophyx5m2Pta8QGgShc1ywXz MLyPJQcCgxPgJ7bLDBiPY+hvvOAGzyj2nBw4uUuKErykulmWHEwU9e5n0TjJgIFtzzv8Bu mfjkCiJNboBPTVGYRGtUDubkouZT/ZW5iB6J8rr2aSnmINx1/cjLfv8yy24EZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681396667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPs5OTCXj2sbTLtfrDcT1lHBU0oJNcT2dSnMyNjdWe4=; b=aMw+bYyeNxOemDonRp7eRvrcFcHW7wMGvve3M+H0UxzldIMXkYhsZOuI/x3yuflVyp1J+u BFgYANbfRCoznpYE7PCx/b7aOgNaaA+1B4xQhSTCKRDHwtbimC6dbZYeQPytatza3wkvGN 0zwu9+MUnIN0C6BNQuWHTB3NUHZbcxGST1XZpkjByHqHq2Lqi79zx6Ok3SoAv2/+NDAGBp xfWinC58XBHLv0DxR0Shegt96ka8Q0TMtmQkoj0mbCvbESOBYYkHM1fcNfhzx/X2VykB4j jebgoeZ7lolaxmwv1DMxDPY654j9omAEfvnVgd4wrO9Fp6GpbRiPpBXUiqmCVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681396667; a=rsa-sha256; cv=none; b=rDCdLanW+8H9hEcp1vxyV/AHe//VA49V5Q94zXbhmMm+j3V7dC0yLw2dM8ewkyjoDfhhYo 8xPGC6Z8FEMelvrOH2kbDn63BKSbY3FuGdKXx0x0kU+I86ImoNngyxQ/7WdclZPdgMzQK3 52P9QlM+QJDnOIPQtqE96XWyPbNWhgc+vobRuR95FoNgPlQzOoWR/oXjaWFX0DCK8P91eF qHIkBjzukByBIaHojs9pG1IuaEemWJ1CnnyekxEbiCvBdxdS1LSvuglVakh7u4vrME6jeU JQv96u7afXBIyDbF2ftCWmDsNzhv4qi0bjQVAJEj5qZxQnWe8qxP5kVvFuOy9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py2HH00l5zm3y; Thu, 13 Apr 2023 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DEbkqf070946; Thu, 13 Apr 2023 14:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DEbk14070945; Thu, 13 Apr 2023 14:37:46 GMT (envelope-from git) Date: Thu, 13 Apr 2023 14:37:46 GMT Message-Id: <202304131437.33DEbk14070945@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: 7cdfe51f3096 - main - rtld: fixes for handling of the grouped options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cdfe51f30965a365e3e7c829396a56e2a7e5141 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7cdfe51f30965a365e3e7c829396a56e2a7e5141 commit 7cdfe51f30965a365e3e7c829396a56e2a7e5141 Author: Konstantin Belousov AuthorDate: 2023-04-13 04:47:23 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-13 14:37:33 +0000 rtld: fixes for handling of the grouped options Do not terminate scanning group when 'd' is encountered. The 'b' option must be last in the group, same as 'f'. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39544 --- libexec/rtld-elf/rtld.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 0d2a2b6b4c24..ea56ade960d9 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6029,13 +6029,16 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, _rtld_error("Both -b and -f specified"); rtld_die(); } + if (j != arglen - 1) { + _rtld_error("Invalid options: %s", arg); + rtld_die(); + } i++; *argv0 = argv[i]; seen_b = true; break; } else if (opt == 'd') { *dir_ignore = true; - break; } else if (opt == 'f') { if (seen_b) { _rtld_error("Both -b and -f specified"); @@ -6050,7 +6053,8 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, * name but the descriptor is what * will actually be executed). * - * -f must be the last option in, e.g., -abcf. + * -f must be the last option in the + * group, e.g., -abcf . */ if (j != arglen - 1) { _rtld_error("Invalid options: %s", arg); From nobody Thu Apr 13 18:04:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py6sK2B9dz45YLt; Thu, 13 Apr 2023 18:04: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 4Py6sJ5NZ5z40MT; Thu, 13 Apr 2023 18:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681409044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=844x3E2Uqz4vJeRtJvtaCrUjH3lA2rpp398L5aTQpro=; b=PQVWmAc2ANGUY3vyQTj0gfnWcgXIE/D8y38E/H2vW/kZ8u4YhDOCxOhGsgb6b5rZHAMlNy /olZEPblMXl5B4LWjfHixLb/xc6pmZpH0ppQ4Yg0iHztgZlbmKICA5AFS7GXAqly4pAgoS DnGhZUdBFOkMydK7n0fb0k7KEWiC5Itp+MVodiu8kVyTnJuPb6wv31gkmpS//PR+ya083g HUmhdMGqRFE4XnrzoaQYSDqp8WFdSCZ2qv6tHJ8qkNRyUkLsx3sO294Wa8/WpkrJrdORro 7ef2UvKHOvpTu1heS5Ijvqp84SkMsk/lhHMY7WG8YqzXdCFjxH9yQQn82dAZyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681409044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=844x3E2Uqz4vJeRtJvtaCrUjH3lA2rpp398L5aTQpro=; b=Pp7O3nYwBtuoQSh95+HO0b7cEaC7A9GSVYiow4H5681lbfsTzD+I6T2f9OAPC+XEidI5OL peEAOO0yTk1AzQKEj450xfX2WQFTObJtaCYib8LzvFJ5lXAD3ZAiq92CkYGyM5moB9RGao 5se7UfrfC59JGC/d5nXumgy4/flXK/DLl9EiPb33WcbFIqfmiqjCw9jnstQ2P0blsKtxxK BNfvE49lenReZqb8/CDtnKfEt7Tchv1qCpcaZFVEW/Q+yVEnScrEhE5xn/uvksrGBVJunR cnxFtf0oFhbtRilrj1mC6aOWHkIgtnfFwqv/6SlKSACOaURGzctTzazwIvPVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681409044; a=rsa-sha256; cv=none; b=d7hjNmtLXOy75hU6cGOVFgJG8WNqvHxJntEiz7YXEgLUaymBKYO97/jcb0dgO9fogn7Yf6 7sFSdeWdTMwV7c8THFxLmHX13W2wJNQVVB65xkcCRQ1BGskF5QXgSeGHUJGtTD4sjZExdE wo60FD3LqrMzVbspiYRP1BM7wxQhSHSUPJ2fyeMIm8us9ywdH+JBdXHcu3qrFta7JEn8uA jQ3sWDbBMV0dfjplmG7ItEOk8zH0tE4vHS2j9HVh/ICgzf1VvkValm88kyd+pCzcupmxoR YXSoIGxJq1aEsoEfCCTEoDbfv+eDgDq6VPDrE5BkKexmlYWFjyPbrJURRlzKHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py6sJ4SvYzsPl; Thu, 13 Apr 2023 18:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DI4460015737; Thu, 13 Apr 2023 18:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DI44uZ015736; Thu, 13 Apr 2023 18:04:04 GMT (envelope-from git) Date: Thu, 13 Apr 2023 18:04:04 GMT Message-Id: <202304131804.33DI44uZ015736@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: c159f76713d7 - main - kern: remove a double word in a KASSERT in subr_trap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c159f76713d7c1cbfdfc0c81dd91a5483096cf6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c159f76713d7c1cbfdfc0c81dd91a5483096cf6f commit c159f76713d7c1cbfdfc0c81dd91a5483096cf6f Author: Gordon Bergling AuthorDate: 2023-04-13 18:03:37 +0000 Commit: Gordon Bergling CommitDate: 2023-04-13 18:03:37 +0000 kern: remove a double word in a KASSERT in subr_trap - s/with with/with/ MFC after: 5 days --- sys/kern/subr_trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index f9976b090771..1f35b8b6ba73 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -175,7 +175,7 @@ userret(struct thread *td, struct trapframe *frame) KASSERT(0, ("userret: Returning with sleep disabled")); } KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, - ("userret: Returning with with pinned thread")); + ("userret: Returning with pinned thread")); KASSERT(td->td_vp_reserved == NULL, ("userret: Returning with preallocated vnode")); KASSERT((td->td_flags & (TDF_SBDRY | TDF_SEINTR | TDF_SERESTART)) == 0, From nobody Thu Apr 13 18:22:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py7Gl0yr8z45ZpP; Thu, 13 Apr 2023 18:22: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 4Py7Gl0WLNz3FYK; Thu, 13 Apr 2023 18:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681410159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wjvdShXq1iTraHg2ztu2X96y1bqVg425j7t9If+DH8o=; b=GBycUQUEkVPGIoZWmeguZT6srnTcDfYjG96sBFRz8knNjr8gEDCP8z03jzyR69T2cdCbfB HAs823xKlSBsXqFjJgsMrujUeYXLZFk1YvSAlrShlqZGB141h8imqBkBubp+bs2eUr3oQV aqjf5qpN+71JiaxyVZ+GFQ44wpXOWu/vvtrljwcV0wcDvTra7PkH3nMkA+MeJDzgem79u7 RCDzHR4bfCDnvHzZIkn7mUg37QfzGopSq3/lJnNheXj0V1FtU9vNE4PLRuBbLBIQQEt9Xl rpHZRnDDW87W7fwQAt3NMTMf8PlSG07M036jy1mHU/7KNZfCcx14sJoODd/Tpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681410159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wjvdShXq1iTraHg2ztu2X96y1bqVg425j7t9If+DH8o=; b=Mga+X0rKwJh9E0Z0RMPh+fVDXsnnRpWePu+mEmmdJ194VqSS/duxdwB6Bo3oDPm+piY7WD YoOAzFByLBoc2+F46sng9gp1nspZSAQy6djW+7hIWPGmMk0IJjmGNRwWZp1o1+9SKgCswF drBymq0xCrwd2bJyoi6mgCuETsfeexMGOyFnTd/YjYU1y+WYXl9hdMlAFjAqcJKkscmAQ4 kRph9sOmccNjzGs259bmMPvBHk5LHm3ojY//P+CkVPV13vsw1UmAOgJUNTypa7AK1V0m4r oXC704Vp2siNCW41DG0fH3mE1Jyhy2gD6LRJRqi+CICkMpDIaBCsYFl7R9O7cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681410159; a=rsa-sha256; cv=none; b=fpslRaCr8z6TjN1YFjY/erU+CttM7LkgYq9uvZxD0ixWrtVGfvcTr3bE+So5dePA/IPqye 2Y35BVWH+dveK03b2DqtdetwZPtTGmAu13oG7sdZyfycvjIdYiB9L25w2c5H8FFbK+mEv7 eIkXv3rfMJ8fMK4azijYdmtwaOwN/bHlWLxlx9Mh8kiukBwxOLQFS+ibZcC4ve6wB1hhEp A0aCc24V9l6H9t1Wrs2H0waNlfP0SF9PifHk0Koh+6m+Rco0PKn0lB9ITDk6BFOcy00IxI Ekm0DLcf3UyhRCrHvXRQUuKAm9+3ztgHZ4Gc15ets9WaAGLqgZnU92dh1idjwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py7Gk6jQXzsm2; Thu, 13 Apr 2023 18:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DIMc8S047879; Thu, 13 Apr 2023 18:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DIMcbZ047878; Thu, 13 Apr 2023 18:22:38 GMT (envelope-from git) Date: Thu, 13 Apr 2023 18:22:38 GMT Message-Id: <202304131822.33DIMcbZ047878@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: e0c2f9302985 - main - vimage.8: Remove a double word List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e0c2f93029850968712a4fb4ab3630579d8812d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c2f93029850968712a4fb4ab3630579d8812d3 commit e0c2f93029850968712a4fb4ab3630579d8812d3 Author: Gordon Bergling AuthorDate: 2023-04-13 18:22:25 +0000 Commit: Gordon Bergling CommitDate: 2023-04-13 18:22:25 +0000 vimage.8: Remove a double word - s/are are/are/ MFC after: 3 days --- tools/tools/vimage/vimage.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/vimage/vimage.8 b/tools/tools/vimage/vimage.8 index accb9d6400bb..8b0d74f69a74 100644 --- a/tools/tools/vimage/vimage.8 +++ b/tools/tools/vimage/vimage.8 @@ -70,7 +70,7 @@ Every process, socket and network interface present in the system is always attached to one, and only one, virtual network stack instance (vnet). During system bootup sequence a default vnet is created to which all the configured interfaces and user processes are initially attached. -Assuming that enough system resources are are available, a user with sufficient +Assuming that enough system resources are available, a user with sufficient privileges can create and manage a hierarchy of subordinated virtual images. The .Nm From nobody Thu Apr 13 18:37:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Py7c53L3zz45bt0; Thu, 13 Apr 2023 18:37: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 4Py7c52hf0z3wvc; Thu, 13 Apr 2023 18:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681411061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHvvosbkrddHeforG4l0/CYz/0H8DOSNKhN1eHpTkWU=; b=iddl7y0tlfxFX7ddoB+UAjOZ8hdfa6Y8FuCSfqhDfDzUf4qYb6U6XS1uyHckoIC26aiLpg 5K1RhFgQeCbRaARpT9+r7qORE5MoUNBjBzwna7PWNJHlMUr1dtdz0gizr0ZEYTFEwWvpZw 9P7KnAuIPvAtDd9SGcqCX8EtGS9GcrdGneBMMacE0q0tTvzKIYUjV3q6B9SrZYRah2mTch o40AOf5O1TWQTfbcntLYNsAfzXU4tXi0uyCTMxO+l5IYAm7vYDS0jLAtIyoPMQbAhbXBVJ yAi1AOiGCuy6oZSvGcaMALF1kD+pAromXEK3061QyV3VkUIXulpj3lbUzx0qkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681411061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHvvosbkrddHeforG4l0/CYz/0H8DOSNKhN1eHpTkWU=; b=a35sRsvxkL78vB/E3+0jgHkXLyMo/AYLCXU/n7T5JiOmmNlpPUwk17jChjZeB+WW0EV1ID H3Ik2YtHhYdgZRX0cQDJkNSpiQ6RagDu2r3EqkXX/yIcN5jef0/2u+578TK8lv6zNHjJd2 EfUXNnvQgOJVk4uw7IJqYTlHgI+nqQEiJ+GdHIyUf7AfxXLtTzplEg5GQ0uX/7INdfZrwD 7wiKjyzlXJAFWj39QQAAyoNWw+i8lfPW1l/cyW9TnoaptdBsz/yA8/dCZtg/0G6lWnYfBy FBJD8j9N9iCPRbv6ydCowCL95W776gZTIWS8HvmbaDCqXjjdihlsgrAEP1vZNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681411061; a=rsa-sha256; cv=none; b=gPkR2NJUGngRaZZyX5/nB2gxvJq699tbP+iBaMlV+x2UfRfpYMkOIORrNyxjKIrChBRDIG jNYx5x560KPZ+n9aNUN/ZzQDcJRytTCcte3/ItqWiMCma8yi+W1OFDBgcr8e/tlwC27/s8 L7mQia/cwRhh5tKVQu7uddxu8UVxnP8Jrqjxn6MLTTa/txcCRUErk8EIZ6v1gY90dEbXrA xbV6CBhJYSxQ+aVISKq8bpn2+H4TfKPuDWHKD5d20O6atFSgVVqRvG68iF7ElU4HVgf2qn j76LiCuEXjqLfLwtn+n5aFapqFIiZv9LJHtfl00S58EG36GJHa03+Me7L6uJxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Py7c51nlZzswn; Thu, 13 Apr 2023 18:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DIbfft064915; Thu, 13 Apr 2023 18:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DIbf6G064914; Thu, 13 Apr 2023 18:37:41 GMT (envelope-from git) Date: Thu, 13 Apr 2023 18:37:41 GMT Message-Id: <202304131837.33DIbf6G064914@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: 26713ad9cf18 - main - arm: Remove a double word in a comment in setjmp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 26713ad9cf18b6ecd37f862182c84c1e57aee091 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=26713ad9cf18b6ecd37f862182c84c1e57aee091 commit 26713ad9cf18b6ecd37f862182c84c1e57aee091 Author: Gordon Bergling AuthorDate: 2023-04-13 18:37:25 +0000 Commit: Gordon Bergling CommitDate: 2023-04-13 18:37:25 +0000 arm: Remove a double word in a comment in setjmp - s/number number/number/ MFC after: 5 days --- sys/arm/include/setjmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h index 2090c5d15f40..490df1036e2b 100644 --- a/sys/arm/include/setjmp.h +++ b/sys/arm/include/setjmp.h @@ -44,7 +44,7 @@ * 44-45 d14 (vfp register d14) * 46-47 d15 (vfp register d15) * - * The magic number number identifies the jmp_buf and + * The magic number identifies the jmp_buf and * how the buffer was created as well as providing * a sanity check * From nobody Thu Apr 13 22:36:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyDvc4YVbz44n6F; Thu, 13 Apr 2023 22:36:28 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyDvc1qhwz4MyD; Thu, 13 Apr 2023 22:36:28 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id 1B4EF4F63E; Fri, 14 Apr 2023 00:36:23 +0200 (CEST) Message-ID: <060e8793-cca7-9301-57ac-9c73a187db3f@dawidek.net> Date: Fri, 14 Apr 2023 07:36:20 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Shawn Webb , Cy Schubert Cc: Mateusz Guzik , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> Content-Language: en-US From: Pawel Jakub Dawidek In-Reply-To: <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PyDvc1qhwz4MyD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/13/23 23:05, Shawn Webb wrote: > I've learned over the years downstream that it's not really my place > to tell upstream what to do or how to do it. However, I think given > the seriousness of this, upstream might do well to revert the commit > until a solid fix is in place. Upstream might want to consider the > impacts this is having not just with downstream projects, but also > regular users. > > Really bad timing to have a lot of new tax documentation that I really > don't want to lose. I'd really like to have an up-to-date, security > patched OS, but I guess I'll stay behind so that I don't risk losing > critical financial documentation. Shawn, I'm working on a patch to safely revert this that would also work for people who already upgraded their pools. I'm sorry for this mess. -- Pawel Jakub Dawidek From nobody Thu Apr 13 22:40:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyF0G5Rv4z44nCj; Thu, 13 Apr 2023 22:40:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyF0G47r4z4V7j; Thu, 13 Apr 2023 22:40:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id C64E34F3E1; Fri, 14 Apr 2023 00:40:27 +0200 (CEST) Message-ID: Date: Fri, 14 Apr 2023 07:40:23 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Cy Schubert , Mateusz Guzik Cc: Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> From: Pawel Jakub Dawidek In-Reply-To: <20230413135635.6B62F354@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PyF0G47r4z4V7j X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/13/23 22:56, Cy Schubert wrote: > I'm in the process of building a branch reverting the merge altogether and > will test it on my sandbox machine later today. Cy, thank you for your testing and patience so far. I'm working on a patch to revert block cloning without affecting people who already upgraded their pools. I'd also greatly appreciate if you could provide a procedure for me to reproduce the corruption, ideally without the internet access, as I'll be on the plane(s) for the next ~24h. -- Pawel Jakub Dawidek From nobody Thu Apr 13 22:48:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyF9D0fCTz44p5C; Thu, 13 Apr 2023 22:48:16 +0000 (UTC) (envelope-from vishwin@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 4PyF9D03W3z3G5N; Thu, 13 Apr 2023 22:48:16 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681426096; 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=AyRecSlrynly5UY8AB3MXZ70phnuDMsDaGVYr901OXU=; b=eGfwXOfqjdMiDQ01wx2EOfBRPYE8E7d+VJR4wuphHlCa7Xlbcv4/US+cZUPdJLD9C6nfCd T4+ztc/MuMbKRaIThDiNJEKbG9abm+qHz/3IgrLRJO5K8ykTEUdY7xNm3dYwRnAvZzv9vB v1W4qpwLry/cqMIk4GVbg67AJfZlL936ZbWudhHN7VQ6VDuhe2CzBXEM2Gex6RiH8u7Kdy QAW7qhAG9CWUGwVrCkoSJT/ThE0I4Jt/UXpLmwYeJ3/n6vOhbWZz2UUkfT6HBC4pNRHM+0 l4uKbGcKe7CatvfvP1SA9c1/v5R2lzEb6lPDxUFlPHDhP7xlfHdMEZ8Iy98Ulw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681426096; 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=AyRecSlrynly5UY8AB3MXZ70phnuDMsDaGVYr901OXU=; b=x6eIiOYwBLxJuWYrUWulE35ozAM/2xeVsV/VZHoi/IZYLErPsJbt1f5mmylnyjsMYIC9ge vZM3bqy2ydGF1+Ns1w7YzS2uVvvTdos7MnlpAsAbX1RPcb9KUtPYCelF49C8G3Gq2eazRh ESJQncWeaB97YEHQONVEZf/HOyM/yHxTYITaXGME1my3ZS4j7BvnvX7U2QSNv6X7OWFrz1 lhaOZ0b7nP+HE6Ub1GyjdS5IruEmUrE6M2kTe9EjRVdVtoCT8GuuPV/yApkGD2wMnNk+Xg YMWeRyxs/U8zC4KM3SRT2F9re1kqxce+6fmNppd8wDmIj10dHkmOuFeGfOf/XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681426096; a=rsa-sha256; cv=none; b=V7+8qwOufR20iQK86DdHCwcRP+kNSjK4z4XZgbA+xkanyNWJB8GYoLG/zRVb34yp3cf1xq OtL/8DV40Fg9I1zdVReMi0iEtrskBiR60atkh/LncdHvzeTpz/p8REk9fOAYoa/u8qVpnv aKq1C0GRGXHTiCIHIp9UaJ542DziU0NMr7jIjPKITPAN2Hq8jM3WAR1uFSbL8Wa3gOT+tq hm3LyJ5e25E0iD+eSm+nrZ6U6SAVoL99vkSGWLdv1hEwiwwzG17oYyzCRqeVfmJ1VVx+rw jfDcKiQXHeElZyRmBl2D98A0GmpoMqFv7gcXyIa8eesijp6IdZWJ2pcLIfJqBw== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyF9C3bhCztV2; Thu, 13 Apr 2023 22:48:15 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Thu, 13 Apr 2023 18:48:14 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Shawn Webb , Cy Schubert Cc: Mateusz Guzik , Pawe? Jakub Dawidek , Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------vIbZwbLYufuViZicV4PBmRib" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------vIbZwbLYufuViZicV4PBmRib Content-Type: multipart/mixed; boundary="------------0mG74PqwpjtYR4QsOFOb0YeH"; protected-headers="v1" From: Charlie Li To: Shawn Webb , Cy Schubert Cc: Mateusz Guzik , Pawe? Jakub Dawidek , Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> In-Reply-To: <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> --------------0mG74PqwpjtYR4QsOFOb0YeH Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 U2hhd24gV2ViYiB3cm90ZToNCj4gRG9lcyB0aGUgWkZTIHByb2plY3QgaGF2ZSBzb21lIHNv cnQgb2YgYXV0b21hdGVkIHRlc3RpbmcgdG8gY2F0Y2gNCj4gZGF0YS1nb2JibGluZywgcG9v bCBraWxsaW5nIGJ1Z3M/IEl0IHNlZW1zIGxpa2UgdGhpcyB3b3VsZCBoYXZlIGJlZW4NCj4g Y2F1Z2h0IHdpdGggc29tZSBDSS9DRCBzdHJlc3MgdGVzdGluZyBhdXRvbWF0aW9uIHNjcmlw dHMuDQo+IA0KSSBjYW4ndCBzcGVhayBhYm91dCBob3cgdGhlIE9wZW5aRlMgcHJvamVjdCBk b2VzIHRoaW5ncywgYnV0IHRoaXMgDQpwYXJ0aWN1bGFyIGNvcnJ1cHRpb24gZG9lcyBub3Qg aGF2ZSBhbnkgZGV0ZXJtaW5pc3RpYyBjaGFyYWN0ZXJpc3RpY3MgDQpib3RoIHByZS0gYW5k IHBvc3QtY29uZGl0aW9uLCBzbyB3b3VsZCBiZSBoYXJkIHRvIGF1dG9tYXRlIHRlc3Rpbmcu DQoNCi0tIA0KQ2hhcmxpZSBMaQ0K4oCmbm9wZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0 IGxpbmUuDQoNCg== --------------0mG74PqwpjtYR4QsOFOb0YeH-- --------------vIbZwbLYufuViZicV4PBmRib Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ4hq4FAwAAAAAACgkQ/reFK+KbPod3 1BAApB80UWXBt2vO31qji6ybXhWSnHeUithzLV38j4lHDUZ0TWNgjEGRhNPHKbyr1lfszwrqpJlz wu3kth5ETvqudAD98rE2Wwx+xKYjeFGSHXhtsnJws1CNtoQf3AATkUcO5vhMARd7jD1jDelfk7wl wW9k2pTZQi2sODWOnIOPRLEb8+Wq8fhdWz4CLyUxnMRwwfobwsnPGMkbqlD0Brp2mNdRYKP6nrYe r8qeFktu89rYvC97c3PWRkU3tpWRc+r5RV8VZMZmFUcPzgOoMaPl8/Qb/RhhT78weapal1sKP5So ZpjaKHcMukXQlmF2XrJPfRiJljnGfkdd71xTEFb1EYMGccYnyTCahCdnCbGOjuC1ya1aDNh1RR+j RZvkdiKu9bOXA92VNv39o2pV+bWBv2EA9JAbSBWQhhwVKmVjJdHpj4t2KzqdRqT7Tjp7kDxoNzhj Q89IVfMMxTDLqhD5zzLHwhxiX2GtnrtwLcTvWGPu9cpfoU7sSLmLRqDtt3hrutgL2dm9xDWgWLuq avaKO01VgKsEI5kGimRjxeEV+N4c5Muhy+KOTqDujSgmemn4KkaIt5BEix45/U8PQSkPm5WKOPtp nAiaZPhXIi8RW22TGhU/W113QhiJP6p3dlo/a4Rzg820wYt4nZoYkjUgyIf27wW+jgo/bMQ5tvOg tA4= =FdTX -----END PGP SIGNATURE----- --------------vIbZwbLYufuViZicV4PBmRib-- From nobody Thu Apr 13 22:52:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyFGZ4D3Gz44pvC; Thu, 13 Apr 2023 22:52:54 +0000 (UTC) (envelope-from vishwin@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 4PyFGZ3N8Gz3PFB; Thu, 13 Apr 2023 22:52:54 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681426374; 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=97HL1qWd2574ZQYyYY+YFPK+5rusmR2U/fd3ycTakMU=; b=l2C32nS4XLg4Yrmy+uxwXBGz/IChciMQsJaYGK3lBUUbWAzm0fjf5x0tGG2O3gBmshGPyv lPY2t9Gmywnmwz4s1EPEHuZVavL/SbVcYzQwbD+kMUJtzR1Qp97Ao3Rj79OMlqmnKKnBXM GR/NtCj+9dd11zmQHyzUNSByfl2KoWIBVP96yHCtfh9TfAPpeXz2PIafbbGLMnX/Eo+nmi 35XukET+NXUJp71fX1Xq4SMVp6fRn2OI0s72vbv5Bo7VeYhOAwjg4Z9uI7HFndIG/566/i JLlFAR00NRsf+HgqdU0AOQHouyN4DkDsfRn2bxcYVDYqLmk66LprE1JG4gKg6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681426374; 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=97HL1qWd2574ZQYyYY+YFPK+5rusmR2U/fd3ycTakMU=; b=k6nQPfhRR0nx2jPze1FxyeKO7vOKlSFZp1yMIzmc1lRa8oknutbLMCam24CeChn8ZtsPuy nLRM4faDB1KJ3jjy26gWgld4UoV9gV7Tp4FgJBWPXARdJSYPP6lZU0GuFJdLJr4/cmmZeI iz3VXS/d/SwI5TIW8XZHvvW3DLlyRsOVX7DBW3e5ORQYVwVdptFV8xotylNxkfbRgkF8qG Pj7k4eawIkLxhZzZWDf5uJnegi37UpHLO6+a1AODRtWB3fzkjO6gsBGIOISoVHT3OczO8k 6LAURmsZSAYMKWSibwZkas6BBKzenTRD3WXXNo5JZhgywtveAizQHHlsXQmS5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681426374; a=rsa-sha256; cv=none; b=EkEf/EfKYNk9nT/o57dAaRWqtvkfALwbHg+9abP9k9rc5eUEUZJNZ2KtUOhM/YUH2f6k50 fCjnNYsdgLZXqHB5SCsCNPdApa0CnRKtTat4nS7nkH89dpKGquksGvJBlTf377JY4TC8kq zhv/Isku9wGpqYvTY2hG7i4i45XHIUw0kG2/Oc41F4T4PvGtlzKPf+Rkc5vLqpS/NtXBQv J26XDdU+ZxqjVtWZNOdCIcPBzhKjLBipKYt629Mr5juhCNRgg87sEu7nONDFbtwlsvR5DN m/vjiqLbUhkuTfcuVDTix2sptKtCkFGaV9cbDuGZuVaci9RhsBG1b1rZrvutCQ== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyFGZ0fv7zthd; Thu, 13 Apr 2023 22:52:54 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> Date: Thu, 13 Apr 2023 18:52:53 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik Cc: Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------FB7dp5piutxmv9bFc4NF1cTT" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------FB7dp5piutxmv9bFc4NF1cTT Content-Type: multipart/mixed; boundary="------------9TaJHcWocJFugNSKOIX0ZY9d"; protected-headers="v1" From: Charlie Li To: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik Cc: Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> In-Reply-To: --------------9TaJHcWocJFugNSKOIX0ZY9d Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 UGF3ZWwgSmFrdWIgRGF3aWRlayB3cm90ZToNCj4gdGhhbmsgeW91IGZvciB5b3VyIHRlc3Rp bmcgYW5kIHBhdGllbmNlIHNvIGZhci4gSSdtIHdvcmtpbmcgb24gYSBwYXRjaCANCj4gdG8g cmV2ZXJ0IGJsb2NrIGNsb25pbmcgd2l0aG91dCBhZmZlY3RpbmcgcGVvcGxlIHdobyBhbHJl YWR5IHVwZ3JhZGVkIA0KPiB0aGVpciBwb29scy4NCj4gDQpUZXN0aW5nIHdpdGggbWpnQCBl YXJsaWVyIHRvZGF5IHJldmVhbGVkIHRoYXQgYmxvY2tfY2xvbmluZyB3YXMgbm90IHRoZSAN CmNhdXNlIG9mIHBvdWRyaWVyZSBidWxrIGJ1aWxkIChhbmQgc2ltaWxhciBjcCgxKS9pbnN0 YWxsKDEpLWJhc2VkKSANCmNvcnJ1cHRpb24sIGFsdGhvdWdoIG1heSBoYXZlIGV4YWNlcmJh dGVkIGl0Lg0KPiBJJ2QgYWxzbyBncmVhdGx5IGFwcHJlY2lhdGUgaWYgeW91IGNvdWxkIHBy b3ZpZGUgYSBwcm9jZWR1cmUgZm9yIG1lIHRvIA0KPiByZXByb2R1Y2UgdGhlIGNvcnJ1cHRp b24sIGlkZWFsbHkgd2l0aG91dCB0aGUgaW50ZXJuZXQgYWNjZXNzLCBhcyBJJ2xsIA0KPiBi ZSBvbiB0aGUgcGxhbmUocykgZm9yIHRoZSBuZXh0IH4yNGguDQo+IA0KRHVlIHRvIG5vbi1k ZXRlcm1pbmlzdGljIGNvbmRpdGlvbnMsIHRoZXJlLi4ua2luZCBvZiBpc24ndCBvbmUuIEJl c3QgaXMgDQpwcm9iYWJseSBqdXN0IHBvdWRyaWVyZSBidWxrIGJ1aWxkcy4NCg0KLS0gDQpD aGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------9TaJHcWocJFugNSKOIX0ZY9d-- --------------FB7dp5piutxmv9bFc4NF1cTT Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ4h8UFAwAAAAAACgkQ/reFK+KbPoe7 UQ//f7+9QEFICxxLCXJpCqRzDoEWeGvfo1omIkJLHMpyfG0nFFQl8NvNxvbw9ME/vZv+0cw/OuVu dFLn7F/SfQqQ633h91uaynrs8WASpvE/CkQRvxu/Td1V6Q0s9ePEJ/gSR/Ks/RxmJVHq7ks6kk1w 2xIBu80Ob0mkrYbe1aMSsh+jra8f7p0xzjXcFAQui2DrojVb0O5+tUwZxeEnpYi1GxKX2qvllLmK RYSbFPBa/GFl0Ayfh82G9ODWjp6MLHki7BPvXsOka+QUcBOLOFkC+N8932v9K8UbZ7/Q/NknAOxo hpr2zZG70cjZaGWk/eEVmGQ6p97WQ3cjQV3uQnxbo28zDx432V1XgclvY0bY6OQ5X0emLhFwGoO3 iTgvctIlwpFmLtEKDldO6dkZSnBpF6OymhanrVtCQEHcORk8WaOMFpNeNO5jm5zCQEo0NWqPAAkz ybCVw3JWgNnLc0oHmnjlJ5MYvpHQxslTfn/P0OyqaMfdqluNFPIfg/uZZqvvyL2a3qAP9XhVhO2F +K1jSrIR908zP4BzxdTVx3U7mfvQyEA7XUReFYycHLifIfOimE7x7j22ZspVt9lZwidaVgoZGndp zwIRpiLf3L6dn27IS8N35nZV8W3R1m3k7gjKMx5aGIxIY3XciD5amO7vRgd6hzX5u4/HxBsR9PtS TZY= =9o1L -----END PGP SIGNATURE----- --------------FB7dp5piutxmv9bFc4NF1cTT-- From nobody Thu Apr 13 23:40:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyGKH08wnz44t95; Thu, 13 Apr 2023 23:40:19 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyGKF6pFxz3w5S; Thu, 13 Apr 2023 23:40:17 +0000 (UTC) (envelope-from pawel@dawidek.net) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=dawidek.net header.s=202110 header.b=xgg5z6pt; spf=pass (mx1.freebsd.org: domain of pawel@dawidek.net designates 94.130.64.56 as permitted sender) smtp.mailfrom=pawel@dawidek.net; dmarc=none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id CBD634F4D8; Fri, 14 Apr 2023 01:40:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dawidek.net; s=202110; t=1681429216; bh=SqwUsizydQcta5Wjpkj6VoDOZw/5n3s6/HX2E/f8BXY=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=xgg5z6ptnqLQ8OW39rF/ksVsUvrrmgeXCZwHAp1QCHGKjC84iRzG3YTlK1d109n+/ HLAlpGH5fYeTEhoiIjI1L42+kgAKeJvNNw7IymW4IfLXbkiKbXZMqsp/GoFaNoNLuO lcRqK2pgJx8vY1nPq9nhaXqE8U7VPwHIyZBp68hY= Message-ID: <5e67bfbc-1e9c-432b-ac03-61839bd47e20@dawidek.net> Date: Fri, 14 Apr 2023 08:40:09 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Cy Schubert Cc: Mateusz Guzik , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , Shawn Webb References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> <060e8793-cca7-9301-57ac-9c73a187db3f@dawidek.net> From: Pawel Jakub Dawidek In-Reply-To: <060e8793-cca7-9301-57ac-9c73a187db3f@dawidek.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.20 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; R_DKIM_PERMFAIL(0.00)[dawidek.net:s=202110]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,freebsd-current@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_CC(0.00)[gmail.com,yahoo.com,freebsd.org,hardenedbsd.org]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; RCPT_COUNT_SEVEN(0.00)[7]; DKIM_TRACE(0.00)[dawidek.net:~]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[pawel]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[dawidek.net]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4PyGKF6pFxz3w5S X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 07:36, Pawel Jakub Dawidek wrote: > On 4/13/23 23:05, Shawn Webb wrote: >> I've learned over the years downstream that it's not really my place >> to tell upstream what to do or how to do it. However, I think given >> the seriousness of this, upstream might do well to revert the commit >> until a solid fix is in place. Upstream might want to consider the >> impacts this is having not just with downstream projects, but also >> regular users. >> >> Really bad timing to have a lot of new tax documentation that I really >> don't want to lose. I'd really like to have an up-to-date, security >> patched OS, but I guess I'll stay behind so that I don't risk losing >> critical financial documentation. > > Shawn, > > I'm working on a patch to safely revert this that would also work for > people who already upgraded their pools. > > I'm sorry for this mess. > Here is the change that reverts most of the modifications and disables cloning new blocks. It does retain ability to free existing cloned blocks and keeps block_cloning feature around, so upgraded pools can be imported and existing cloned blocks freed. It does not handle replaying ZIL with block-cloning logs, so make sure you import pools that were cleanly exported. I'd appreciate if someone who can reproduce those corruptions could try it. https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103 Thank you guys for your help! -- Pawel Jakub Dawidek From nobody Thu Apr 13 23:42:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyGNJ3NcSz44tNv; Thu, 13 Apr 2023 23:42:56 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyGNH4hZQz421V; Thu, 13 Apr 2023 23:42:55 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 94.130.64.56 is neither permitted nor denied by domain of pjd@FreeBSD.org) smtp.mailfrom=pjd@FreeBSD.org; dmarc=none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id BD6784F642; Fri, 14 Apr 2023 01:42:51 +0200 (CEST) Message-ID: <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> Date: Fri, 14 Apr 2023 08:42:47 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Cy Schubert Cc: Mark Millard , vishwin@freebsd.org, Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> From: Pawel Jakub Dawidek In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [0.54 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.96)[-0.959]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,freebsd-current@freebsd.org]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; FREEFALL_USER(0.00)[pjd]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org,gmail.com] X-Rspamd-Queue-Id: 4PyGNH4hZQz421V X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 07:40, Pawel Jakub Dawidek wrote: > On 4/13/23 22:56, Cy Schubert wrote: >> I'm in the process of building a branch reverting the merge altogether >> and >> will test it on my sandbox machine later today. > > Cy, > > thank you for your testing and patience so far. I'm working on a patch > to revert block cloning without affecting people who already upgraded > their pools. > > I'd also greatly appreciate if you could provide a procedure for me to > reproduce the corruption, ideally without the internet access, as I'll > be on the plane(s) for the next ~24h. Here is the change that reverts most of the modifications and disables cloning new blocks. It does retain ability to free existing cloned blocks and keeps block_cloning feature around, so upgraded pools can be imported and existing cloned blocks freed. It does not handle replaying ZIL with block-cloning logs, so make sure you import pools that were cleanly exported. I'd appreciate if someone who can reproduce those corruptions could try it. https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103 Thank you guys for your help! -- Pawel Jakub Dawidek From nobody Thu Apr 13 23:51:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyGYl28Rjz44vKH; Thu, 13 Apr 2023 23:51:07 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyGYl0xqPz4JHl; Thu, 13 Apr 2023 23:51:07 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id 1D5E74F3E8; Fri, 14 Apr 2023 01:51:03 +0200 (CEST) Message-ID: <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> Date: Fri, 14 Apr 2023 08:51:00 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Charlie Li , Cy Schubert , Mateusz Guzik Cc: Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> From: Pawel Jakub Dawidek In-Reply-To: <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PyGYl0xqPz4JHl X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 07:52, Charlie Li wrote: > Pawel Jakub Dawidek wrote: >> thank you for your testing and patience so far. I'm working on a patch >> to revert block cloning without affecting people who already upgraded >> their pools. >> > Testing with mjg@ earlier today revealed that block_cloning was not the > cause of poudriere bulk build (and similar cp(1)/install(1)-based) > corruption, although may have exacerbated it. Can you please elaborate how were you testing and what exactly did you exclude? Thanks. -- Pawel Jakub Dawidek From nobody Fri Apr 14 00:09:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyGzC6LtPz44wXv; Fri, 14 Apr 2023 00:09:43 +0000 (UTC) (envelope-from vishwin@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 4PyGzC5fQxz4lDN; Fri, 14 Apr 2023 00:09:43 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681430983; 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=rqouSAdksmjIDXq0A8r4ZzUsj+65vCJIjMyMxsu60+Q=; b=QJXBreq9TRXo2sMgpBjEUZMwcb6m/SWlzO6Koup+OdzNFmQsHRTKUuBqBLvyNWb92BYiWQ weuUU8yx/cbBoCypLb2kbkx8VGga8qypcrNW39uiBFbOqQJasuJcFOwaL86QOJSuTJE+lI EkqUyVgH72vO55zTj3YP0CMaFXnXa5kAakmB/p1gy9cmH4Bmu6iA2QgEhF/Ad9Nvln1o0n LFnMZa66QQN9P7k0bnAt+igXa1tkjZWJ5o8vkNkoRGz6RHQhyVBTVZCtUr1QmgngmPN5s4 Am7QboHUMFbepv1I/PjKVUzRTMm+7mZJ9Hv1ZIot8tF+cf/v9Q03fITI1nX02g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681430983; 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=rqouSAdksmjIDXq0A8r4ZzUsj+65vCJIjMyMxsu60+Q=; b=J4MIqcIO9bV0L9dE3/oAqw9sw2clkbIOrIywtJuu6i4medDB9TjA8lckOuZOrr6/2fGTU0 XcRtqnft8IK5NRUnbT4YafgkrsGdxivvu+zZ5ge1h2OD6CDYEQ33J6ZG9AiBYxTsYcWyku 6a1NCb/xL8TA/AWgBRE34xOH+KKgZ94qgDB4WdaLkQyay+e08pTph6ObnRfcwFOgYsK8MV jmSifWQBv9MLb4T1Ko6ryV5s+PVWiOHdKpdg+X6pjRwM9TE4cNMQ4H7O0zXcViLsil7Q6a nwK/ACDYtdH2wqTEyq9acFwgReKBURgsfC+gmViLWuZUX+xJbvHCb4pf5gQhEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681430983; a=rsa-sha256; cv=none; b=VAN76z1XK+LyztyP7sqy37TTi7uatoJVywSkGUKrkroqBjvmiq89ln7017jXyFY6uLBeyl vHSuGDvEz+BYwv+MhsMx01A6AYqG+jvB6Ni/I2vNNwvLASeBAuCzHul99BlA+S1ZW/1Lpb 9Dw8Jsv++V8Y9B/eY2UuxxzOi+V8Bzaq8SAHt2e2YgwoTuKJCxVY8GR7uvOeJrKl2uVd0Z 5aFqJ61YXdhP3aNIrddaQKmdkQNLf0H5uWqut+7yuTen3IUQ4IwQJKKRUckX/3wxy6/Ew+ JaijDlfAKHrF4l0Hp/f0igfVFKom7RbknuBVArMhirzs4+x54pdiO+sj06TB7w== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyGzC2lgbzvmp; Fri, 14 Apr 2023 00:09:43 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Thu, 13 Apr 2023 20:09:41 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik Cc: Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------V2e7Walm9PMfeXnAkMmSi0Uh" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------V2e7Walm9PMfeXnAkMmSi0Uh Content-Type: multipart/mixed; boundary="------------9WuYTIou60N8rXF0KUhmos97"; protected-headers="v1" From: Charlie Li To: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik Cc: Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> In-Reply-To: <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> --------------9WuYTIou60N8rXF0KUhmos97 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 UGF3ZWwgSmFrdWIgRGF3aWRlayB3cm90ZToNCj4gT24gNC8xNC8yMyAwNzo1MiwgQ2hhcmxp ZSBMaSB3cm90ZToNCj4+IFBhd2VsIEpha3ViIERhd2lkZWsgd3JvdGU6DQo+Pj4gdGhhbmsg eW91IGZvciB5b3VyIHRlc3RpbmcgYW5kIHBhdGllbmNlIHNvIGZhci4gSSdtIHdvcmtpbmcg b24gYSANCj4+PiBwYXRjaCB0byByZXZlcnQgYmxvY2sgY2xvbmluZyB3aXRob3V0IGFmZmVj dGluZyBwZW9wbGUgd2hvIGFscmVhZHkgDQo+Pj4gdXBncmFkZWQgdGhlaXIgcG9vbHMuDQo+ Pj4NCj4+IFRlc3Rpbmcgd2l0aCBtamdAIGVhcmxpZXIgdG9kYXkgcmV2ZWFsZWQgdGhhdCBi bG9ja19jbG9uaW5nIHdhcyBub3QgDQo+PiB0aGUgY2F1c2Ugb2YgcG91ZHJpZXJlIGJ1bGsg YnVpbGQgKGFuZCBzaW1pbGFyIGNwKDEpL2luc3RhbGwoMSktYmFzZWQpIA0KPj4gY29ycnVw dGlvbiwgYWx0aG91Z2ggbWF5IGhhdmUgZXhhY2VyYmF0ZWQgaXQuDQo+IA0KPiBDYW4geW91 IHBsZWFzZSBlbGFib3JhdGUgaG93IHdlcmUgeW91IHRlc3RpbmcgYW5kIHdoYXQgZXhhY3Rs eSBkaWQgeW91IA0KPiBleGNsdWRlPw0KPiANCm1qZ0AgcHJlcGFyZWQgDQpodHRwczovL2dp dGxhYi5jb20vdmlzaHdpbi9mcmVlYnNkLXNyYy8tL2NvbW1pdC9iNDFmMTg3YmEzMjk2MjFj ZGExZThlNjdhMDc4NmYwN2IxMjIxYTNjIA0Kd2hpY2ggb25seSByZW1vdmVzIGJsb2NrX2Ns b25pbmcsIHJlYnVpbGRpbmcga2VybmVsIG9ubHkgKGJ1aWxkd29ybGQgDQpmYWlscykgZm9y IG1lIHRvIHRlc3QgcG91ZHJpZXJlIGJ1bGsgLWMgYnVpbGRzIHdpdGguIEkgdXNlZCBhIHdv cmxkIGZyb20gDQpodHRwczovL2dpdGxhYi5jb20vdmlzaHdpbi9mcmVlYnNkLXNyYy8tL3Ry ZWUvemZzLXJldmVydCB3aGljaCBjb25zaXN0cyANCm9mIHJldmVydGluZyB0aGUgbWVyZ2Ug Y29tbWl0IHBsdXMgYSBmZXcgb3RoZXIgY29uZmxpY3RzLCBidXQga2VlcGluZyANCnZvcF9m cGxvb2t1cF92ZXhlYy4NCg0KLS0gDQpDaGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24n dCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------9WuYTIou60N8rXF0KUhmos97-- --------------V2e7Walm9PMfeXnAkMmSi0Uh Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ4mcUFAwAAAAAACgkQ/reFK+KbPocY Ng//d9Y6aqKfp+UnEyU3IP2IucZ1rF2GjLYDONBxD0B/ECt3wqbTIWi1OQX1vsfCnY7DF6Et2MdA EJKnVe4RYChczL/CC6VqWszP7OvuleUxMn4x1W59r9Lzo1VoudFjxtJomFd2ZAL7hQBEANf5zosN fM+2M8iE1wuQmzYwAXYPkRBoWr/w53v9NcL9faAwSotcG0y73PwjOThNgZhLp/uJ2qXt9/j/hWuw oMKgBbtElJl891FG0httbTWOB1wwGTCqAAbl9O/UC8HHL6Hy6xDor3k/slxfaJLGmOFnyxBVYpo6 Osa/6tb093Ivn4j0pE0N8vH+JCxIp15nFsHQf45P3LvseqSjKuEf4rUq+IX1ANKJROpcqx2O+8sH OodivbqQqmirooQksiUGaWyCvIgU9U1PwveICa80z2yduiTkvhWiXMSa7HoPzyD9g3cRXBHL6V+Q mNbJ7+k15b95jpFB4HuThqG9VOP6IsbMvmBOXlTJo0fn7IYjw/dGmR82G3KnPGLMIMYw33l6Bu3C K+gbUIVSpz/gr12q5YmrX7vJGb4VLzWzx19yyfpERCXJV42PvrwZ9PziF8n2zM/NkbAgg+IgXXEb GCcXwHYwgMiZqjKUxnz/tQP8hzYKde3F2XbMErWVLjwyewjBc00kzsJ4WOvajtC07NB25Ar4mgiq JGU= =5fvg -----END PGP SIGNATURE----- --------------V2e7Walm9PMfeXnAkMmSi0Uh-- From nobody Fri Apr 14 00:23:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyHHG5xB5z44y8j; Fri, 14 Apr 2023 00:23:38 +0000 (UTC) (envelope-from vishwin@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 4PyHHF2v1xz3h5S; Fri, 14 Apr 2023 00:23:37 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681431817; 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=ez6b2K0dEg9WRqp2XqL9F+khrWYckWZeccnvMMdfl74=; b=gxLneTNcPCIU/U7lLFCHpTjIK+8N7sr/jROwr7NRYZdnJVtURe0LG7XWxalmaxOy3VfuxE yRk3Akg4KXibF4hBqHegZ3ai5nHDmW8Cyahyxnw4idLZmcGPGxBT09+lBW2bi3m4Jl9EdF n7nZ0Zep5Qi+chC3vHiptnNi+eEL+Y6mlqzEllXLjoUN96QgpBk3scXoDX3L0x+LB4AcOl hUohw+vu7Tr4sXRb1UkEGgADEdhefACJtLYCtU+ezMuSCY/Ax+rHrdEbXi2gwbNUzY+SzX md+X1atXbR3z9prZCwz4gbc+5wG7d63Kgs/MaDQmOFzE7tS9Jeu/TmT/x/ixzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681431817; 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=ez6b2K0dEg9WRqp2XqL9F+khrWYckWZeccnvMMdfl74=; b=qvV6AZu0JpCz1y5Nr3LKfyiCWIarm44FEILuBUcLKjuV5+TUvb1hQmPJdMWFS3zZHjPoUr U8WYr9DockOSJHfFgjj0lTkzH4oXpW8m9REAEV04X2AuDLDolmq1W3nTLQ8L6H5KjKukae YpIqMGA3zYQNETntLzlr/lyMISEOBknUIwRCCyUK1QxuambYLMdy6qwHhbMTh0aoSDR9Lw epFXNEbt8S32TQ95LSwnPpKYieeBF3lnPIdQtmlNraUDb+UE+5WlEXpEsEY7yf0ONDu6Ds FU2sAnDYVpzMt7L2zaLM8OhJRDfGY79D1QuNBdwfRn+BexPAMPlcQWg2YYEEfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681431817; a=rsa-sha256; cv=none; b=VwjTe1BInYv8gCnN6jzu4SW2pM7At4eu5cWHnC2Qb5eZuPoo6raFiOXtjbUTNAdHNSZdAd gXTPotBk8uAHeFoJihr0HcfrNBB7I5o/9MBbbQjLCcOs0/fJOrJGECyLsApNtFnzdBKurl kISDBeu4GHHhOg/JhNvVwTadnSbAbtf9QNRSFJAeHinI9KSSp9Gc+vm1fB+S+IArTejUmO eBV0zBQiBTSQE3ecZqkMjqqtdmemQKkBxy6Nk1J69qSZwFNe/SvyGID+LuRr4VRY0Qnlqo Hp1x8TwBwFIZasvC3n8yfdfIS6cu0VULwxln8NJ9dy+c/wU2R4J2y9Zi67kO5Q== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyHHD6p6Rzvy6; Fri, 14 Apr 2023 00:23:36 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Thu, 13 Apr 2023 20:23:36 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Pawel Jakub Dawidek , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------CKkWOqTk6p0PIDBz0YM2LpDh" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------CKkWOqTk6p0PIDBz0YM2LpDh Content-Type: multipart/mixed; boundary="------------rI9RcAkHOI6aeiBCyNncbfSt"; protected-headers="v1" From: Charlie Li To: Pawel Jakub Dawidek , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> In-Reply-To: <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> --------------rI9RcAkHOI6aeiBCyNncbfSt Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 UGF3ZWwgSmFrdWIgRGF3aWRlayB3cm90ZToNCj4gSGVyZSBpcyB0aGUgY2hhbmdlIHRoYXQg cmV2ZXJ0cyBtb3N0IG9mIHRoZSBtb2RpZmljYXRpb25zIGFuZCBkaXNhYmxlcyANCj4gY2xv bmluZyBuZXcgYmxvY2tzLiBJdCBkb2VzIHJldGFpbiBhYmlsaXR5IHRvIGZyZWUgZXhpc3Rp bmcgY2xvbmVkIA0KPiBibG9ja3MgYW5kIGtlZXBzIGJsb2NrX2Nsb25pbmcgZmVhdHVyZSBh cm91bmQsIHNvIHVwZ3JhZGVkIHBvb2xzIGNhbiBiZSANCj4gaW1wb3J0ZWQgYW5kIGV4aXN0 aW5nIGNsb25lZCBibG9ja3MgZnJlZWQuDQo+IA0KPiBJdCBkb2VzIG5vdCBoYW5kbGUgcmVw bGF5aW5nIFpJTCB3aXRoIGJsb2NrLWNsb25pbmcgbG9ncywgc28gbWFrZSBzdXJlIA0KPiB5 b3UgaW1wb3J0IHBvb2xzIHRoYXQgd2VyZSBjbGVhbmx5IGV4cG9ydGVkLg0KPiANCj4gSSdk IGFwcHJlY2lhdGUgaWYgc29tZW9uZSB3aG8gY2FuIHJlcHJvZHVjZSB0aG9zZSBjb3JydXB0 aW9ucyBjb3VsZCB0cnkgaXQuDQo+IA0KPiBodHRwczovL2dpdGh1Yi5jb20vcGpkL29wZW56 ZnMvY29tbWl0L2YyY2ZiY2Y3NmE3MzNjNDRlMjVjYmE4YzY0OTE2MmVmNjgwNDcxMDMNCj4g DQpEb2VzIG5vdCBhcHBseSB0byBzeXMvY29udHJpYi9vcGVuemZzIHRpcCwgY29uZmxpY3Rz IGluIA0KbW9kdWxlL29zL2ZyZWVic2QvemZzL3pmc192bm9wc19vcy5jIGFuZCBtb2R1bGUv emZzL2RtdS5jLg0KDQotLSANCkNoYXJsaWUgTGkNCuKApm5vcGUsIHN0aWxsIGRvbid0IGhh dmUgYW4gZXhpdCBsaW5lLg0KDQo= --------------rI9RcAkHOI6aeiBCyNncbfSt-- --------------CKkWOqTk6p0PIDBz0YM2LpDh Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ4nQgFAwAAAAAACgkQ/reFK+KbPocA 2w/+ILDTKRE4x9ma2xshXSmhSX64Nq1C1i6QCUjMFgTAjrrc4eJzzBFi3mdqzfiXfqux51Q+Rbkv szqoM3+GQ1l1b6ksLC8X2gxyOiOGo3LVTkhF1jJL/1/v7UnxzVqfQD9qq1ALQhxWuUN3w4LO9Y7T hNNLUD30Km4eKOrb7CxLx4c/oWQlCHVx6UyJs5H9hhWcWILqiH8Lw6LYpahoCN8dO6tUITfFZo4+ LAAccrSKrO/URCTCCvh6wXjkPxrIl4xv7z6/zilI9qq6oIrFueeXKln/4SC7jhJPcRPGxjTIpPkX wI/cGwdf7G5qI31tQRiRBJI0tQ5wZDHSPCk+lyk39nE/wUWsfkfxfbPzLRraO2H/V/jHIPeH/cDB 0uzSDZC90E5DNOEdlSsEL5GQuLNNUMgo4FvbcN8DwNjYZaIrIe1V3blk31idocIw0/8U4J9kGlQf LfAmZXjhLVGfV9pnQDBAQhDAUGxwjn+lhK/TtT3QIoWXTIyX5gXBicmSmk4bpl1pnncoLBLNAbw/ Jm/akdBWaGCV/zKrr9Y18s/WFFF0aFSB2yNLQ4/pOv3SuGjNGvmIoT5055eduNdXBZmHEPUyVnCG kP/tIc0O5UhimOnxAYGTGRt1Y55k8obStLubWPAO1hsvBkQDZ3aIM28Ic+du6hVmwxL3BnXIpwj5 nsE= =gvkK -----END PGP SIGNATURE----- --------------CKkWOqTk6p0PIDBz0YM2LpDh-- From nobody Fri Apr 14 00:24:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyHHm1DkRz44y42; Fri, 14 Apr 2023 00:24:04 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) (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 4PyHHl6R45z3jcR; Fri, 14 Apr 2023 00:24:03 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-18782426c4bso6948140fac.9; Thu, 13 Apr 2023 17:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681431842; x=1684023842; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=RyuexlV/yrBS+Yes7wNn0L+oR/KK+F72RG/pzN+BZaw=; b=icprlOPFyZuOL3mENbsVw5vYBJNZqw5NGkq4lYipXozRr+7kqwJrHE8xepOAJuTu6F f2VropqCtAdoX90Zku7wvpLt/zm9sC52wj/9HdGf9KvrgBwcCvPiz4E/4uOvDl49yrw3 ReCOK9Ujcv+a5kqfhZV1zSsQkgH7vkXt+uQetfRTaf65pcT+Br13uRO1DHrs6lsYQmMK 2jlesWwIpBDORS7c+xiOd0KONzfiM5iITvx4luXXxcqLzQAqhT4AsUhHKO6NSFwYZe1z x8a6LW2zoyY/2PH+qk8VFsQn2CTytEuBhSJnDgDWpwcQIhY4ZGY0Mm1kS25KIKTGwYXu dUaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681431842; x=1684023842; 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=RyuexlV/yrBS+Yes7wNn0L+oR/KK+F72RG/pzN+BZaw=; b=b/SzbxL6GgGbP37zAoGZPRN050AH0nBfTuqfv38yLwG60HLDWsXJ6fh3LF2pmLdzcd l0Lqqlri6EvR183NyHwWhp5N2rYWUFebRz9AlJiRTd2hW//0qFu/5MGx8abw3rXJwjkN XNvpac+elrz6q/c1Caw1SQHtYfa7HPKxgBF6gROnDTZAAuMdvcHX5uhCBLzfkt2rH4Gw u6ECx4VDjacD7kUAWRNAZfb5QcIwSmTVZ6fWAi27gcyQ1fCGaAgG00wPhdvlotZ0oCh7 hUiSvi8dZ7AYqhGycZzMoN56mfVsWML9L2IIH6kA54kPfp12uPNOiy3rpckz5YQg1NoS N5FA== X-Gm-Message-State: AAQBX9c/8yP7o2Q7f3uxoC9uRiz8ijoaV0DMl8mVT85NiN7S9DSQGyUk /u0QKjBTEauftO9YbetfZndsXH6UGpTjs3o3J/1ZjtL6 X-Google-Smtp-Source: AKy350aVezNXQiPTTKo316DZht3Y4OwAimUnG5FnerfIwip3sw+sDi3WabSmYkVmAH2bo1hpDnl1hrtR3xoejvQvj2E= X-Received: by 2002:a05:6870:b510:b0:177:ca1c:2cd5 with SMTP id v16-20020a056870b51000b00177ca1c2cd5mr2094490oap.4.1681431842389; Thu, 13 Apr 2023 17:24:02 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:74cf:0:b0:49c:b071:b1e3 with HTTP; Thu, 13 Apr 2023 17:24:01 -0700 (PDT) In-Reply-To: References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <6696e95c-0879-dc68-2839-06f77eb7c0e4@freebsd.org> <3ac74c8b-db46-c4f5-cef2-9f09c32903c4@dawidek.net> From: Mateusz Guzik Date: Fri, 14 Apr 2023 02:24:01 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Charlie Li Cc: Pawel Jakub Dawidek , Cy Schubert , Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PyHHl6R45z3jcR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/14/23, Charlie Li wrote: > Pawel Jakub Dawidek wrote: >> On 4/14/23 07:52, Charlie Li wrote: >>> Pawel Jakub Dawidek wrote: >>>> thank you for your testing and patience so far. I'm working on a >>>> patch to revert block cloning without affecting people who already >>>> upgraded their pools. >>>> >>> Testing with mjg@ earlier today revealed that block_cloning was not >>> the cause of poudriere bulk build (and similar cp(1)/install(1)-based) >>> corruption, although may have exacerbated it. >> >> Can you please elaborate how were you testing and what exactly did you >> exclude? >> > mjg@ prepared > https://gitlab.com/vishwin/freebsd-src/-/commit/b41f187ba329621cda1e8e67a0786f07b1221a3c > > which only removes block_cloning, rebuilding kernel only (buildworld > fails) for me to test poudriere bulk -c builds with. I used a world from > https://gitlab.com/vishwin/freebsd-src/-/tree/zfs-revert which consists > of reverting the merge commit plus a few other conflicts, but keeping > vop_fplookup_vexec. > I'm going to narrow down the non-blockcopy corruption after my testjig gets off the ground. Basically I expect to have it sorted out on Friday. -- Mateusz Guzik From nobody Fri Apr 14 02:05:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyKYV17Zwz458Lj; Fri, 14 Apr 2023 02:06:06 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyKYT67Qqz4JX0; Fri, 14 Apr 2023 02:06:05 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from [172.20.5.159] (p7123-ipngnfx01osakakita.osaka.ocn.ne.jp [114.160.237.123]) by mail.dawidek.net (Postfix) with ESMTPSA id E627B4F567; Fri, 14 Apr 2023 04:06:01 +0200 (CEST) Message-ID: <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> Date: Fri, 14 Apr 2023 11:05:57 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: Charlie Li , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> Content-Language: en-US From: Pawel Jakub Dawidek In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PyKYT67Qqz4JX0 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 09:23, Charlie Li wrote: > Pawel Jakub Dawidek wrote: >> Here is the change that reverts most of the modifications and disables >> cloning new blocks. It does retain ability to free existing cloned >> blocks and keeps block_cloning feature around, so upgraded pools can >> be imported and existing cloned blocks freed. >> >> It does not handle replaying ZIL with block-cloning logs, so make sure >> you import pools that were cleanly exported. >> >> I'd appreciate if someone who can reproduce those corruptions could >> try it. >> >> https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103 >> > Does not apply to sys/contrib/openzfs tip, conflicts in > module/os/freebsd/zfs/zfs_vnops_os.c and module/zfs/dmu.c. This should work: https://people.freebsd.org/~pjd/patches/brt_revert.patch -- Pawel Jakub Dawidek From nobody Fri Apr 14 04:27:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyNhJ1TBFz45LxF; Fri, 14 Apr 2023 04:27:12 +0000 (UTC) (envelope-from vishwin@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 4PyNhH3Zl8z4WnZ; Fri, 14 Apr 2023 04:27:11 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681446431; 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=mLH8yCIwm8TRja0NfbwmxzGG16rzVjdBoP8wvRkaJ4I=; b=jMv0gP8KW7LGebWWH3FUqutNSPBxMS5q9FWZCi8OYW4twP2hnqUicg0N8b9mIif1UyJ6Th EW+B6B+P1vUQ+dixo0+92UPYWivAa42GwZ2mTO+YNiuC48+XRhDUJQ7+dTHG7jyRvOsZfV VOQbbMiUQQ5hsYj3fhTysOY5R+xZGwwwozAH0xDHQl1cwrum6PZ2Ux+MvPSS2DitpFx6mY BNxoRHEeJhYqUq6c/i5IC3UK2kmzpo6OJPLHgkYdpAXC1N+OJkP8RP71FVJab/eGYguUJW +l0lmAsXf2ZIqJ7wYVRY+ABTV0WXcUliDX13hMXjTAa4UwylxP3E8WjcXcCewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681446431; 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=mLH8yCIwm8TRja0NfbwmxzGG16rzVjdBoP8wvRkaJ4I=; b=UlStWPh+G7rh2osxd9knKxh4Mbdc2q6DeB7uq+ZGtNIbSZP4zb7tNkQGV71KZXkFaiIY0v weJwlpr2ZGB9k/Xpdb95ueVsQI5yMCEhfqRQl3wHbPzrx6ReW66VpGDvnbCnVB6IwzGuIp F6mo6CHL/NYgcwgALHI8P6+rcGrwK/PYlQ8MK48RirdtJFnEbBZ3XDCn7tNzgBrSrqtJHm cplSzNeOuT51cafzrDuqWXaTrSs/9bP+G9Hds+JiT8aH+kwFFewBmxZGk5tIO9B8N7zgcE jD/1AtAOtf5DkUTyOdoCTFv18PRRsZ6TrWc5gIn1Jcd33F0SCDwAO+7mhsJyag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681446431; a=rsa-sha256; cv=none; b=kjKxcrOD6hIB1mxtMQrLz/g3YE6fruJm+ecp4Qj7FGMETilzeoY7MtYVYUs+237W2fPQEz wuqr29U/6A46tUxf+YBTXErh0eHGphmtXDqUpVKUHQt9srS0VDS44J/HkvW7ilYJhUF/ZF yKxWhXsarv2/43vBq8G2wn3xtixRwbT/OH5HpnT3TnMCJO9bvJ+48q3rxxmcIKvG37dDZI +Szwh92orXk3EIlHCqKwNtliWOj79RZJ7IieTRfdAijoYZBozuV1TEwYudk2Il72EmIw6y tMNPBtbJxWiaAg3b9akePuc0S2ePFZegWR19luF63F5Ibf5oCgAtOuqSAfFoxA== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyNhG5LWNz10qD; Fri, 14 Apr 2023 04:27:10 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> Date: Fri, 14 Apr 2023 00:27:07 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Pawel Jakub Dawidek , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------F9eTSOcYS7Wjt0wuTvJoGuDO" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------F9eTSOcYS7Wjt0wuTvJoGuDO Content-Type: multipart/mixed; boundary="------------6VyQYLkGjCMzbRUMAkjPjxZH"; protected-headers="v1" From: Charlie Li To: Pawel Jakub Dawidek , Cy Schubert Cc: Mark Millard , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> In-Reply-To: <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> --------------6VyQYLkGjCMzbRUMAkjPjxZH Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 UGF3ZWwgSmFrdWIgRGF3aWRlayB3cm90ZToNCj4gT24gNC8xNC8yMyAwOToyMywgQ2hhcmxp ZSBMaSB3cm90ZToNCj4+IFBhd2VsIEpha3ViIERhd2lkZWsgd3JvdGU6DQo+Pj4gSGVyZSBp cyB0aGUgY2hhbmdlIHRoYXQgcmV2ZXJ0cyBtb3N0IG9mIHRoZSBtb2RpZmljYXRpb25zIGFu ZCANCj4+PiBkaXNhYmxlcyBjbG9uaW5nIG5ldyBibG9ja3MuIEl0IGRvZXMgcmV0YWluIGFi aWxpdHkgdG8gZnJlZSBleGlzdGluZyANCj4+PiBjbG9uZWQgYmxvY2tzIGFuZCBrZWVwcyBi bG9ja19jbG9uaW5nIGZlYXR1cmUgYXJvdW5kLCBzbyB1cGdyYWRlZCANCj4+PiBwb29scyBj YW4gYmUgaW1wb3J0ZWQgYW5kIGV4aXN0aW5nIGNsb25lZCBibG9ja3MgZnJlZWQuDQo+Pj4N Cj4+PiBJdCBkb2VzIG5vdCBoYW5kbGUgcmVwbGF5aW5nIFpJTCB3aXRoIGJsb2NrLWNsb25p bmcgbG9ncywgc28gbWFrZSANCj4+PiBzdXJlIHlvdSBpbXBvcnQgcG9vbHMgdGhhdCB3ZXJl IGNsZWFubHkgZXhwb3J0ZWQuDQo+Pj4NCj4+PiBJJ2QgYXBwcmVjaWF0ZSBpZiBzb21lb25l IHdobyBjYW4gcmVwcm9kdWNlIHRob3NlIGNvcnJ1cHRpb25zIGNvdWxkIA0KPj4+IHRyeSBp dC4NCj4+Pg0KPj4+IGh0dHBzOi8vZ2l0aHViLmNvbS9wamQvb3Blbnpmcy9jb21taXQvZjJj ZmJjZjc2YTczM2M0NGUyNWNiYThjNjQ5MTYyZWY2ODA0NzEwMw0KPj4+DQo+PiBEb2VzIG5v dCBhcHBseSB0byBzeXMvY29udHJpYi9vcGVuemZzIHRpcCwgY29uZmxpY3RzIGluIA0KPj4g bW9kdWxlL29zL2ZyZWVic2QvemZzL3pmc192bm9wc19vcy5jIGFuZCBtb2R1bGUvemZzL2Rt dS5jLg0KPiANCj4gVGhpcyBzaG91bGQgd29yazoNCj4gDQo+IGh0dHBzOi8vcGVvcGxlLmZy ZWVic2Qub3JnL35wamQvcGF0Y2hlcy9icnRfcmV2ZXJ0LnBhdGNoDQo+IA0KVGhpcyByZXN1 bHRzIGluIG1pc3NpbmcgZmlsZXMgcmF0aGVyIHRoYW4gY29ycnVwdGlvbi4NCg0KLS0gDQpD aGFybGllIExpDQrigKZub3BlLCBzdGlsbCBkb24ndCBoYXZlIGFuIGV4aXQgbGluZS4NCg0K --------------6VyQYLkGjCMzbRUMAkjPjxZH-- --------------F9eTSOcYS7Wjt0wuTvJoGuDO Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ41hsFAwAAAAAACgkQ/reFK+KbPocN Rg//daBAayFMuQzL49ZCSn9brNqmZmZhyoqJsEc+5rBwwyS9soLy7GbEVD+6MhGJ4eaniYaNOJAG DFxBgzl8YHblpFTJwoHY6tZt7GP/teBQx5DedF4DAe5e4/c5igtBfIvC+aGd5JQeUzeGWWMELn0Z dZwZLoxucpebjS/YWB3s2xRfdcFE/Up4kqBW1Sq11v8uoH5EkEh0KiJ02FFqQGSeJ1WLD5GYVk5D PCW770DfGcazDU/p3mysVNKmgv1OTr90sI/DdvhN0OarIPLmA5Zwf8jA8tHLsjVpIqV6ShZPgQRY pbY1Fu1lOayFvOWMJReRDNN66lYgNzBImffPhtYEt3r0xtrij8awlg8R4BudsrrDyk6tii6XjbXL jXolWzkikfy291+ssVlCK9tqkU1tvT/jXl89bWzRDCoq3DAT4mZMBxT5mAHQwNrnt80aJO9Mc2ZC 9KbeBfvRlxKOV0SvbFHOuudp3YZMMtlVPV5zfwaueIrVF82R6M/aMpgc+lXXy4nX0/YWy+oDPuDM ARr1go+gcoFs+0Gf8r9/1QIkQMJIaFEhK498l3udd34cLklf+k7qLIu6d3jksywrWLlVNyfMWANd 3o1FEffv/9YKWp2eTuWFpXZUhxetxcge6sSuIt0joY+Q61im5zyVUCSAE10yakt6+19Dpv02OQi2 Tj4= =iAPk -----END PGP SIGNATURE----- --------------F9eTSOcYS7Wjt0wuTvJoGuDO-- From nobody Fri Apr 14 04:39:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyNyq16sDz45N4Z for ; Fri, 14 Apr 2023 04:39:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic303-23.consmr.mail.gq1.yahoo.com (sonic303-23.consmr.mail.gq1.yahoo.com [98.137.64.204]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyNyp2JR7z3Kfy for ; Fri, 14 Apr 2023 04:39:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681447184; bh=qLb6C5wf1sfaU+vK5XRO0Wkqy7nDPZ8gJDhNpgp0XXQ=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=cD1vl7Q61XBxhDb/uJbe/pKYuy3wuzw5Bt5T3G8FjNpt4qGL6X1SE6zM0rmDgb2JBg9Typ7/sjFh7djtD2UBe7VufoMzhoLtWf3ATtw1Zl3y0Ua8f3qRoW7A17dikedLUqP5Eswnk5wPW/1p4uint+PQM+gGt0jHyK8OIf6H3YuBY6oNkU+kKOFoms0bc7eIj5T0ofoU1waLyw7+jP7fnm/UME6IBo3yReswsGnPSDGppKsnJH4Ext9laPvNE8CwpTZS738gDz6VxfuaaqthduT5I9wUC+Juh4y4XdG4jwlZLRzTInxdJHciJyTjFP4FAr5F2Cj7xIGFj1bqMjxmxg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681447184; bh=CGM3pJy48LezBw+Z6gAze3pZQfOq/xXkA1s02GA3oNz=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=KvGWN2zoTvtjsIGrkSCckOoDAUQYf7Ud7fFoDEEt/q0rA3VKaiM55gS7W/W+ugF2A64U4mww9Wo9kgOUe5SMBxR1EctUfx4A6Gmp1l9P3euP+LXcwrf0pyaCpn6dO89JObUAH8EKkUAeoiyUWn5G3Ncpjrh5jUxBcb2rtRVYFrLKaomQtOImuUtrUORJzUUEboo0mdsVJ6Z1xITckX5xua6cTzgQtHBOMpbgQyO3nIDlhH2ruCihwYOQrpTER1c8q2eGX3tqdgn/lxPv6i71YpnrbTCz2UMkov+PZ1zuitTWMsGmfIZOK1I7xzlgzt+EYsEbqSA4a9zutY0xhgD2jQ== X-YMail-OSG: jzZh44cVM1lgr.ym2YExJc6STphNciotXXGnNPxVXu1o0U_MjjX0IwRDA841j21 GWYR1LhpxXGSP2Na.OCXuOaKbOf49tUlj1MNtZ_Od9ZFOZ.i1hVXjdHK4aFT7PlvLIYvyWlkD37_ _btIoiZY3Kv.SduRW5MWXW9dhhgBroSk4XjtJ32vMWK49m62XLa94mL8BkAU64o_VMsw7_fD45Ju Rs9dVs.KAFzzKusa9YqyFv9EGRd34cH2iCZRflpCICbc7.aeDsIKoJzhnwaRbAN.KCD4cKIBOwkv 5HgVeUnx86Ogm07GIVj9VMa8LhcRCfRvKBE_WdUny.d_v90Cd.IshHUXUd6KGsrxiSjl76BxpXU. Cg0Dd_fjOqZUu1OTWZ89rjw1pWdbsaVRnGxrMNbE4K4KGs1__nVnR5UdcE0cWCkBW3NsEz5pDRBs mfhFcakw17hELJB0kg9aBC83p1I87jDq2NWsG.DW2LC5N0ddOH6VZOs2AsFuYgyzI4e7h0169B4U xRvHCAksdNtG3IRNbsSmQNoofZP16sBJq1FOdv9AsRYCZ5sGEtdUnbysub4enQruOoc3q4VK6WHp 24nmofYE3B_pT4hPgnxEIYYHjB27y.4tLftaU3XbYnL3AyukNQkQ_mMgM2U1uRzAiuG6GqPYZTSK 0QCLzoc06gnd18Idi9UjEyIibNpXgNcGnqltEGCu.1WSUhBnF.JPVq4.Gp.apcvjRRm_xJgVKmZb 5yF6MvPGnrjBwlBYZfUJCAJIrVzHqyz0ZNkqyNQ.L0UO2ry6YcRhQqzT6uYY5r3mWbuSdjS_jMF. CeBzcNpO4gAL07ejuLtBEASy1T4gFbl9AsQJL4dYV0MJn57g8q6LsZvQ2fyBkNp7mKeItsjoDKqD .QdmVQlb1qN7e9rxuH.utgdpkk.vTcq6cqHKZL3haWKl61H5BTE9IJyZfFU488LNVQaVLJQ1PHrD fneyolFcmhWe.JmcMLJ.OFlYpTt_cFmJgsqA54dhIAycHN3pBwEC7s_4JuxFJoVf_1YTZOzJiBF8 U_SyN7bRyU8YwZWzH_H9XUTwHXm6jlbXwCXLeK4KiiV9SFmMh4qPYLBDlsLt2Mas7FiWRxcYxkGj hGyjlpOc4ahnjgZjcpTD4l6oBVIRSbfCxjVcAUZhm06D_aSKKDRrcrLVOZkT_Y6XTcx20Prc61j4 al5pKIVoBWw.UIQ1XFCkP2WOzjWNmAbipNNGrb5cxu9M6_R0qKFIIEaaKckKnl8nOwZpoF9qPB3N 86p7d2j6aqB_HRJnkJcysKIGukkqsy5i0qF0lEM_st4_qfGA3IsY0ikTfnSpTYgDMJqr5NulVL0_ z9yTN_A00FY2ExI6K0Y_MVDRgZ54Rd7A5cAxEV3jXl4gozDQBjGHBeTYLxmV3yRy4WTynT1Va6_3 WxdAlD553vAa5i6RRdr_BVztoheVIjGgHhEgB2ACqwd1K4gHo71H.HCkTTgnngCOpNeCO_kKEHis bLghdvf9wg9G1oGUe_KB72CZDuRcHVKo6pB0cRrDikbvRHFP8jWLagRoBvLNMdk6Ad_QxME3c6dv XqtOwDXW1YBgj8IbZUYFJa0DmDTa2rxLvdth1uq0NMKnVOMKljj7lwqH8bE9uGPuro5qGjN5jbv7 11kFD82f.GroMdrEadlJF51xQC_Mo9wNWnD4ihcOp3cvap47Cc2W0_caKY.OUSmuRNVPjEPeCgc8 92AKWSE3lS_ybbkwk85ktPzHf7CMo0FLZ2bv4EVrG7QYJTpiPAh2nB47jaIud8zm1nH3JMhvP2.b MJi.RU5oPM52_.0tltIq9KCHESUEh8Yqw29ldKoInLMMdhnpm00anlMfXOKsUR5u0RE6R1PSnITQ 7ES.TIhWpu2RDMh1bjB_cgNQQtOKELSlYmjlopS_aRt23bLQ297.n5WyFoEdyrje16cOup5Tbtiw w2xnycDsTosJtlaS1gX0ZNSPxPIPglhXABdjnk6pBR0Q8wxrjVGDv8sYII2polAlsgq5oDHNmTq0 aosnpYxtXMBtxeMdhtRW4r0KNRKUNJLIb7.CmtxyIe.HX9s3Zti9zTh00vkFsHeI5d0UsWVwiglP k9Hlz9ZgkJmG7ANFgkLH6G6K7SKMy8YOFnQ4WUMrlq2fUiNIVxzulOr1Oi0PZjZKVBJDgTcCQ6gQ gXu.D00poGzVj63LclCQ9.hvxGOHAnyf8gKBK5ho87pkfMXK55XlTfVZIZ_kVxjcgjHJhcTXLh_O MpnUDTH3JGshFz9oXrrGUfLmxZCGszvE0JPasQMnpd.keyLulbKqxSa_LQfqC0QGySu0wQDzhXvi Q X-Sonic-MF: X-Sonic-ID: 893398a3-e78f-45ca-9925-7e16de6c4638 Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Fri, 14 Apr 2023 04:39:44 +0000 Received: by hermes--production-ne1-7dbd98dd99-zgnmj (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a8740944bb247395853dd8ed0631549c; Fri, 14 Apr 2023 04:39:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> Date: Thu, 13 Apr 2023 21:39:29 -0700 Cc: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> To: Charlie Li X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PyNyp2JR7z3Kfy X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 13, 2023, at 21:27, Charlie Li wrote: >=20 > Pawel Jakub Dawidek wrote: >> On 4/14/23 09:23, Charlie Li wrote: >>> Pawel Jakub Dawidek wrote: >>>> Here is the change that reverts most of the modifications and = disables cloning new blocks. It does retain ability to free existing = cloned blocks and keeps block_cloning feature around, so upgraded pools = can be imported and existing cloned blocks freed. >>>>=20 >>>> It does not handle replaying ZIL with block-cloning logs, so make = sure you import pools that were cleanly exported. >>>>=20 >>>> I'd appreciate if someone who can reproduce those corruptions could = try it. >>>>=20 >>>> = https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef6804= 7103 >>>>=20 >>> Does not apply to sys/contrib/openzfs tip, conflicts in = module/os/freebsd/zfs/zfs_vnops_os.c and module/zfs/dmu.c. >> This should work: >> https://people.freebsd.org/~pjd/patches/brt_revert.patch > This results in missing files rather than corruption. FYI: in my original report for a context that has never had block_cloning enabled, I reported BOTH missing files and file content corruption in the poudriere-devel bulk build testing. This predates: https://people.freebsd.org/~pjd/patches/brt_revert.patch but had the changes from: https://github.com/openzfs/zfs/pull/14739/files The files were missing from packages installed to be used during a port's build. No other types of examples of missing files happened. (But only 11 ports failed.) =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Apr 14 04:42:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyP2K5xVKz45NNN; Fri, 14 Apr 2023 04:42: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 4PyP2K1Nm9z3PXr; Fri, 14 Apr 2023 04:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2t/9Ou7ujBOdqzWoSXt5VU3Uimj1v51e0ANYOP7ki0=; b=JN+VnQnP5k26oM4fS4mQgcowezGFg1kcAMuUMDeGcgSmyQN1wt06Y8xmNraYpH2UPjdZ93 d5tC+86Gsk41KQkT5owvC+Gl5jvjQ+RgPdhlW0zygvosPLtl0nkYmFKU1nT+wiLbLjmS+4 2SAolz2mjucuwwDj/W1rYk5YaALWTWUitHFWapNt/2g1GO4cZJ2wEMELuHDLHmX49e08J2 O3L6q97xjxFNOS2aohkCIbfWVgbRGPGDiO8FJ9x9Gh3yUUlWCxFzp6toOgLJoelFGmuzwu JQ8OfmOFS3vkn4srqUEaymJTLQybE97DKqFSXApke2OYlDd8ZuMJyvhS9B4tKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2t/9Ou7ujBOdqzWoSXt5VU3Uimj1v51e0ANYOP7ki0=; b=h+fTGkufl2RW9wklL310moIpyG4q8Wnq1Ge3K5QDS7U/ukLgETAhguPOon/bQ81h8ftxJd FjjM6aHS4n8jg5sy8cUDNbHdMrBJyn4FaKcRVUF80pea26zSkUlH7VWdHlbdiP+KQIn1oJ 7XcU2usgFN7xTyAcfNNk9fKlgGALvxONAvOQNdfvvmmXu4ZrQQi9jC0fOmaJxU1ZqAWkFV ITNDOhVYn8qF4GpbYo//OpewrBIRy+pqj63+qqkdxOWDKZqulPpJG0aknNFNwcjeKke5oq +7cqWQXSrU8kYLNTDfATO2B2GMZFk3mu9DWWKjwxfITrMPwHnj7p3jIoJtE5Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681447369; a=rsa-sha256; cv=none; b=BWxf94JkhHDoaPSGRYW17VlYFacqndfRAIVED9+sNzjsd2TNvlNj4M5di0m+98ibyJ9EQk nutsaLVq03riWK9Fmvuhz+PuGVGWUAFHflDp1LyV+OLX62U2HW1dYe0Qg1JMsTwApupfza HdmKuZkGvZ3QAMITg1YFJO2Rat3SaSE0DyFiFdwkTu22RFaKicoW+U23fvw/sRspFRUl3I 9N2GYlwaSWZjk9ISV55KvMjzOOXVHxDzPtdpzOYavNsUUjYVLSbDVo54C5nGIhia+MpDja 3A9Tl8GK0rbvRaTI+up90gMC1jYfscJ8L5MHvRv/usqLxUVocH6/au3ueVv4rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyP2K0T3dz19cZ; Fri, 14 Apr 2023 04:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E4gml6069273; Fri, 14 Apr 2023 04:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E4gmrp069272; Fri, 14 Apr 2023 04:42:48 GMT (envelope-from git) Date: Fri, 14 Apr 2023 04:42:48 GMT Message-Id: <202304140442.33E4gmrp069272@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: ec671f498043 - main - loader: comconsole: don't unconditionally wipe out hw.uart.console List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec671f4980437008b0119c6367816083e15fa503 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ec671f4980437008b0119c6367816083e15fa503 commit ec671f4980437008b0119c6367816083e15fa503 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Kyle Evans CommitDate: 2023-04-14 04:42:03 +0000 loader: comconsole: don't unconditionally wipe out hw.uart.console It may be the case that we need to set hw.uart.console manually in some scenarios that comconsole can't necessarily support. Avoid clobbering hw.uart.console unless we've actually selected comconsole so that one could at least get kernel console output.. Discussed with: imp Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. --- stand/i386/libi386/comconsole.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index 3fbb6a292c19..507cd0ec922f 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -338,12 +338,13 @@ comc_setup(int speed, int port) char intbuf[64]; int tries; - unsetenv("hw.uart.console"); comc_curspeed = speed; comc_port = port; if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0) return; + unsetenv("hw.uart.console"); + #define COMC_TEST 0xbb /* * Write byte to scratch register and read it out. From nobody Fri Apr 14 04:44:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyP4l03Jdz45NRM; Fri, 14 Apr 2023 04:44:55 +0000 (UTC) (envelope-from vishwin@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 4PyP4k3mftz3hGl; Fri, 14 Apr 2023 04:44:54 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447494; 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=FHjMxtu801teBV7tBfFkBI3elMTnj+L+NWw+rA//u1w=; b=Z3iA5jasYchVYAjQcuIjHC0ff5oz0ZJVy1qiqm78Sll3pPNkLpRLhAciFzlhcVJk+QmwuD l+9bBxYarvg5JG4IxCdEWczLJWz0Ojw7/8zaX2U0nEDRu96nZB1L6KNCPitXHwFjperspD NW6Gl85FqXWpnMB/ysUPTukeZ2zE9Q9u5Hfllu89S7UF3suJ6GoemBzzue6ltmcxspTwDz DgDkMOUZtMsRGOwr/EoIfDYqDJtFtg4hSXyskmbbEevJwejCI03iDyjXyhmQ+ctVGuY586 watN4PYsPCdRJW39Z3tA28nzwdY9hACzZL6gZtDzqL9GDdOokDUKDNPYqfbbPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681447494; 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=FHjMxtu801teBV7tBfFkBI3elMTnj+L+NWw+rA//u1w=; b=lypZEHYeZurk8kQ5pBsdOM8PoUqtm9BOiGOZWWV5+4AtsYyNSkKLaWbJi8Mz6pLroejHDi L5x3q7NPII6/CYw5iQv6dgG3CwXrUx1LStzFLgjpN/93AtUlDDILDHNflTI5g8qh2Nojwl If3mwSdkkN7f0PxTJI/rKWFl6eVfdUKE9v5Ww3siMSQY/MHvkku3OvLLOkN4THXZAiR4vz u6Zt4B/jxct1BX1TZWl4mfl/dR7Fnb03cnWRr0Rm1yP7NT5zUCJj1GsR+CN0MRMTxjZvXv fb2m2zn200UXqgPhOLNgx+0INY2L+0v+rY4k8216i1XqTHD7xLWM2vwbj6dPcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681447494; a=rsa-sha256; cv=none; b=c9EbO0ve78BZzDOkZ7Ij8WxLiQ3kdbA4Yi5xXmgAf+9uGF/CsneyuCjul9QdUVrwRsPOPJ HvBP6uKlB6Y8tSHansZygbVMD8EVU40Ru1fIQ+WUSP6HClBl5kC8oVviHOgW4yCEvJ1WDD s811tjANWE1it5ZCGv44ILZ85vSMJ0NAFHj9totMNI7rvl3SB/ruRshhhidH+QN+/1U78i 4HbcXp334qjUacLZFvGAM8FwjZamWYtDrGnVDA65FM3KpYlhuLZKDunPGHp536mYO+GyOC zZqfK04PLTaauxKX83Ng90i/HeS7P3RYfMRyZ/K4EaWJP/aApj1kPSWgO79XNA== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PyP4k0Khwz1160; Fri, 14 Apr 2023 04:44:53 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> Date: Fri, 14 Apr 2023 00:44:52 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-GB To: Mark Millard Cc: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> From: Charlie Li Organization: FreeBSD Project In-Reply-To: <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------QI2eF8dJ2urjgRjWgoORwkvO" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------QI2eF8dJ2urjgRjWgoORwkvO Content-Type: multipart/mixed; boundary="------------0MPUJqCt5SiXutVNb8M0v6Oa"; protected-headers="v1" From: Charlie Li To: Mark Millard Cc: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> In-Reply-To: <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> --------------0MPUJqCt5SiXutVNb8M0v6Oa Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TWFyayBNaWxsYXJkIHdyb3RlOg0KPiBGWUk6IGluIG15IG9yaWdpbmFsIHJlcG9ydCBmb3Ig YSBjb250ZXh0IHRoYXQgaGFzIG5ldmVyIGhhZA0KPiBibG9ja19jbG9uaW5nIGVuYWJsZWQs IEkgcmVwb3J0ZWQgQk9USCBtaXNzaW5nIGZpbGVzIGFuZA0KPiBmaWxlIGNvbnRlbnQgY29y cnVwdGlvbiBpbiB0aGUgcG91ZHJpZXJlLWRldmVsIGJ1bGsgYnVpbGQNCj4gdGVzdGluZy4g VGhpcyBwcmVkYXRlczoNCj4gDQo+IGh0dHBzOi8vcGVvcGxlLmZyZWVic2Qub3JnL35wamQv cGF0Y2hlcy9icnRfcmV2ZXJ0LnBhdGNoDQo+IA0KPiBidXQgaGFkIHRoZSBjaGFuZ2VzIGZy b206DQo+IA0KPiBodHRwczovL2dpdGh1Yi5jb20vb3Blbnpmcy96ZnMvcHVsbC8xNDczOS9m aWxlcw0KPiANCj4gVGhlIGZpbGVzIHdlcmUgbWlzc2luZyBmcm9tIHBhY2thZ2VzIGluc3Rh bGxlZCB0byBiZSB1c2VkDQo+IGR1cmluZyBhIHBvcnQncyBidWlsZC4gTm8gb3RoZXIgdHlw ZXMgb2YgZXhhbXBsZXMgb2YgbWlzc2luZw0KPiBmaWxlcyBoYXBwZW5lZC4gKEJ1dCBvbmx5 IDExIHBvcnRzIGZhaWxlZC4pDQo+IA0KSSBhbHNvIGRvbid0IGhhdmUgYmxvY2tfY2xvbmlu ZyBlbmFibGVkLiAiTWlzc2luZyBmaWxlcyIgcHJpb3IgdG8gDQpicnRfcmV2ZXJ0IG1heSBh Y3R1YWxseSBiZSBwcmVzZW50LCBidXQgYXMgdGhlIGNvcnJ1cHRpb24gYWxzbyBtZXNzZXMg DQp3aXRoIHRoZSBmaWxlKDEpIHNpZ25hdHVyZSwgc29tZSB0b29scyBsaWtlIGxkY29uZmln IHJlcG9ydCB0aGVtIGFzIG1pc3NpbmcuDQoNCi0tIA0KQ2hhcmxpZSBMaQ0K4oCmbm9wZSwg c3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0IGxpbmUuDQoNCg== --------------0MPUJqCt5SiXutVNb8M0v6Oa-- --------------QI2eF8dJ2urjgRjWgoORwkvO Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQ42kQFAwAAAAAACgkQ/reFK+KbPofj XBAAqNDMrHSX84pWYWNzsyzXk8flGy6hkIm/HxKIu0+n8QyGBJsclQVL24uaUrHz6Jic/LndGU+H kX8aZDzDlBZczBzfBGnKS0zVmfsuSrnfGQGMhqclRcO/1VccUTZCbuvEV9RCmvW1TC8Pf3SsAzSG SEmNgY3m4DMV9BtSPu91YxXcQnLXWLOw01KqjEN2qALm3mi7dtAlNrpiK3SIImecOCV96+rWBTC3 tiOaOK/1luHpqR8WRg87z2HGY6p7unVdB/2UZht26LDgbNejIlEjNUwwOX9fN2k+f8atoVfeF4sh tpOhmEDeC1ZXJCY7lP1NmffvNTvS68oG6zIfW/HOJm3k2+wvMI2jl5bUOngqQTJw86Qrjo7BRTeK zPGy9DQmPgplqn4eecBbcca952DbRWrf+DcF0xkfl4QBtJ4DLQV8LQ0MKmLvSg+XY5BrvHgTooaJ Y8WIHRjDcuLLDdHyLusmpHy/rH85IJCvT97bXMH7lry5kVVFhhhE991k4gQTyXdq8XpDVpBuBISg bUEys2eW6vaQLEMu8DUS3HqiGY5P+BSU5e/wDCCOk7/MaBZPgnDr15qXGwG+Q5QqVt47iRYbt9Wb ThyCmV2SovIFvKpW6QrgWgSJ8KWYv5QgHhEx1cQP+oDPGUE67pO0RXuQckAagicpIDJHvQmy/VZa KzY= =Y5xh -----END PGP SIGNATURE----- --------------QI2eF8dJ2urjgRjWgoORwkvO-- From nobody Fri Apr 14 05:13:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyPkC3HSHz45R6H; Fri, 14 Apr 2023 05:13: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 4PyPkC1QD2z4PY9; Fri, 14 Apr 2023 05:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vChVWs78KEk9SwwQTaUC4krPaTudXpOy6da9jhdWZ0=; b=VgKIVv/zb90cKc43vKXTAkbuxc9xDrkzaMxyFcEnpjr10n3NA1VpOslf294TT9XmNY8hr4 N6DWJkhpX5/Oa7pGq7Rkusn6uYffkza0O7HH2Kl58SbRiEdqo2OIR8SqhtUg3BmvkbQ4tF FCF58sn5zCfQXwsjwCQ+ZJWGikQ0QB6icWFneOSZTA+m3NrnG5pYflR4moaepo8nRTGXKo rhdn0c2fIbjNMLak6gE2PyPsU9eyLseXeG0+kunqAWY/qesG3BEmnP7AzikM+2xxlhvr7i VZdRN0IcIxD/xdpbj/RsPMbznTpRyF3B/kyB8BbbxKaCQTJRPms6O4Zufo8EPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vChVWs78KEk9SwwQTaUC4krPaTudXpOy6da9jhdWZ0=; b=SYhPNE2oCjpjJ4hG3N8fJDIaT+sm8gZg0hYxRY55AavpwuatsJTPRGZjTZW4tWWRAmmvhP wF0RDY1arZlQ2fuisdLy+8TDLNJ5klBHsNujs8XhnwaQ+y2HThO2XCIwAmK6S763f5CFcn 255SyMJsAvewQCRTzfNlDcZVBqoKao5KuMLpBo0mE1uRQ/xFS51ANuzgVPcKkyTeORosS9 VsdxGxfeKxeR8xL+ss2x8vdG4XezejZ3hR+V2O53AHHGcnrBlzdLkQsDiY40EDwlvcEc9v 1bGJfz+WQnSUMRftpBjk3puOJ12N+ULiPEUi1fjkkkYQuu0pimc9JO8/TGnCqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681449235; a=rsa-sha256; cv=none; b=YiGwVGJScBgtLtP0mMzN7eaMjnyPYg/gotNL4PDbhNnXDA05vjkSlBSuIFBYLa/G6tEvqW Ev1b4kFBZlOX34tzonpQ8Gm4jcN1b6YFqGN2wzplHbaUvW+HpIR8T5XAZH2ZuO2jcb3OsM 1mwkpCMEUZPikbdTgU+pGSSY+FdgnHhcM2m7lcAmmmm5Pc5xHYnfrzVlvS835jLfmHETCz t+J+gcMGKWHAhtbqR2csJ4OSMz4I9rOqefnUTTC0qAWQe45LAjUPCe7iGgj/FjXtLWvJIt FWoKIZDmiDch94gRoHlanl/ETHubciWFvfCu6gpLWMQ8Qk7Ho+E0zjUXCYp+1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyPkC0PvCz1BVT; Fri, 14 Apr 2023 05:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E5DtgF019548; Fri, 14 Apr 2023 05:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E5DsXL019547; Fri, 14 Apr 2023 05:13:54 GMT (envelope-from git) Date: Fri, 14 Apr 2023 05:13:54 GMT Message-Id: <202304140513.33E5DsXL019547@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: 8935a3993219 - main - daemon: use kqueue for all events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8935a3993219be76c7ea03e9ad4509657d08af6c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8935a3993219be76c7ea03e9ad4509657d08af6c commit 8935a3993219be76c7ea03e9ad4509657d08af6c Author: Ihor Antonov AuthorDate: 2023-04-14 05:10:29 +0000 Commit: Kyle Evans CommitDate: 2023-04-14 05:12:21 +0000 daemon: use kqueue for all events Refactor daemon to use kqueue/kevent instead of signals. This changes allows to simplify the code in several ways: - the execution flow is now linear, no async events. - several variables became redundant and got removed. - all event handling is now concentrated inside of the event loop, which makes code reading and comprehension easier. - new kqueuex(2) call is used for CLOEXEC, but maintained closing the kq fd prior to execve() to ease later MFC No UX/API changes are intended. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/701 --- usr.sbin/daemon/daemon.c | 508 ++++++++++++++++++++++------------------------- 1 file changed, 239 insertions(+), 269 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 790b0f6fcd0f..89adde8d5e83 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -59,11 +60,14 @@ __FBSDID("$FreeBSD$"); #define LBUF_SIZE 4096 +enum daemon_mode { + MODE_DAEMON = 0, /* simply daemonize, no supervision */ + MODE_SUPERVISE, /* initial supervision state */ + MODE_TERMINATING, /* user requested termination */ + MODE_NOCHILD, /* child is terminated, final state of the event loop */ +}; + struct daemon_state { - sigset_t mask_orig; - sigset_t mask_read; - sigset_t mask_term; - sigset_t mask_susp; int pipe_fd[2]; char **argv; const char *child_pidfile; @@ -74,6 +78,8 @@ struct daemon_state { const char *user; struct pidfh *parent_pidfh; struct pidfh *child_pidfh; + enum daemon_mode mode; + int pid; int keep_cur_workdir; int restart_delay; int stdmask; @@ -81,33 +87,25 @@ struct daemon_state { int syslog_facility; int keep_fds_open; int output_fd; - bool supervision_enabled; - bool child_eof; bool restart_enabled; bool syslog_enabled; bool log_reopen; }; -static void setup_signals(struct daemon_state *); static void restrict_process(const char *); -static void handle_term(int); -static void handle_chld(int); -static void handle_hup(int); static int open_log(const char *); static void reopen_log(struct daemon_state *); static bool listen_child(int, struct daemon_state *); static int get_log_mapping(const char *, const CODE *); static void open_pid_files(struct daemon_state *); static void do_output(const unsigned char *, size_t, struct daemon_state *); -static void daemon_sleep(time_t, long); +static void daemon_sleep(struct daemon_state *); static void daemon_state_init(struct daemon_state *); static void daemon_eventloop(struct daemon_state *); static void daemon_terminate(struct daemon_state *); - -static volatile sig_atomic_t terminate = 0; -static volatile sig_atomic_t child_gone = 0; -static volatile sig_atomic_t pid = 0; -static volatile sig_atomic_t do_log_reopen = 0; +static void daemon_exec(struct daemon_state *); +static bool daemon_is_child_dead(struct daemon_state *); +static void daemon_set_child_pipe(struct daemon_state *); static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; @@ -172,6 +170,10 @@ main(int argc, char *argv[]) daemon_state_init(&state); + /* Signals are processed via kqueue */ + signal(SIGHUP, SIG_IGN); + signal(SIGTERM, SIG_IGN); + /* * Supervision mode is enabled if one of the following options are used: * --child-pidfile -p @@ -207,7 +209,7 @@ main(int argc, char *argv[]) errx(5, "unrecognized syslog facility"); } state.syslog_enabled = true; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'm': state.stdmask = strtol(optarg, &p, 10); @@ -223,19 +225,19 @@ main(int argc, char *argv[]) * daemon could open the specified file and set it's * descriptor as both stderr and stout before execve() */ - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'p': state.child_pidfile = optarg; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'P': state.parent_pidfile = optarg; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'r': state.restart_enabled = true; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'R': state.restart_enabled = true; @@ -251,11 +253,11 @@ main(int argc, char *argv[]) errx(4, "unrecognized syslog priority"); } state.syslog_enabled = true; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'S': state.syslog_enabled = true; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 't': state.title = optarg; @@ -263,7 +265,7 @@ main(int argc, char *argv[]) case 'T': state.syslog_tag = optarg; state.syslog_enabled = true; - state.supervision_enabled = true; + state.mode = MODE_SUPERVISE; break; case 'u': state.user = optarg; @@ -304,246 +306,212 @@ main(int argc, char *argv[]) * to be able to report the error intelligently */ open_pid_files(&state); + + /* + * TODO: add feature to avoid backgrounding + * i.e. --foreground, -f + */ if (daemon(state.keep_cur_workdir, state.keep_fds_open) == -1) { warn("daemon"); daemon_terminate(&state); } - /* Write out parent pidfile if needed. */ - pidfile_write(state.parent_pidfh); - if (state.supervision_enabled) { - /* Block SIGTERM to avoid racing until the child is spawned. */ - if (sigprocmask(SIG_BLOCK, &state.mask_term, &state.mask_orig)) { - warn("sigprocmask"); - daemon_terminate(&state); - } + if (state.mode == MODE_DAEMON) { + daemon_exec(&state); + } - setup_signals(&state); + /* Write out parent pidfile if needed. */ + pidfile_write(state.parent_pidfh); - /* - * Try to protect against pageout kill. Ignore the - * error, madvise(2) will fail only if a process does - * not have superuser privileges. - */ - (void)madvise(NULL, 0, MADV_PROTECT); - } do { + state.mode = MODE_SUPERVISE; daemon_eventloop(&state); - close(state.pipe_fd[0]); - state.pipe_fd[0] = -1; - } while (state.restart_enabled && !terminate); + daemon_sleep(&state); + } while (state.restart_enabled); daemon_terminate(&state); } +static void +daemon_exec(struct daemon_state *state) +{ + pidfile_write(state->child_pidfh); -/* - * Main event loop: fork the child and watch for events. - * In legacy mode simply execve into the target process. - * - * Signal handling logic: - * - * - SIGTERM is masked while there is no child. - * - * - SIGCHLD is masked while reading from the pipe. SIGTERM has to be - * caught, to avoid indefinite blocking on read(). - * - * - Both SIGCHLD and SIGTERM are masked before calling sigsuspend() - * to avoid racing. - * - * - After SIGTERM is recieved and propagated to the child there are - * several options on what to do next: - * - read until EOF - * - read until EOF but only for a while - * - bail immediately - * Currently the third option is used, because otherwise there is no - * guarantee that read() won't block indefinitely if the child refuses - * to depart. To handle the second option, a different approach - * would be needed (procctl()?). - * - * - Child's exit might be detected by receiveing EOF from the pipe. - * But the child might have closed its stdout and stderr, so deamon - * must wait for the SIGCHLD to ensure that the child is actually gone. + if (state->user != NULL) { + restrict_process(state->user); + } + + /* Ignored signals remain ignored after execve, unignore them */ + signal(SIGHUP, SIG_DFL); + signal(SIGTERM, SIG_DFL); + execvp(state->argv[0], state->argv); + /* execvp() failed - report error and exit this process */ + err(1, "%s", state->argv[0]); +} + +/* Main event loop: fork the child and watch for events. + * After SIGTERM is recieved and propagated to the child there are + * several options on what to do next: + * - read until EOF + * - read until EOF but only for a while + * - bail immediately + * Currently the third option is used, because otherwise there is no + * guarantee that read() won't block indefinitely if the child refuses + * to depart. To handle the second option, a different approach + * would be needed (procctl()?). */ static void daemon_eventloop(struct daemon_state *state) { - if (state->supervision_enabled) { - if (pipe(state->pipe_fd)) { - err(1, "pipe"); - } - /* - * Spawn a child to exec the command. - */ - child_gone = 0; - pid = fork(); + struct kevent event; + int kq; + int ret; + + /* + * Try to protect against pageout kill. Ignore the + * error, madvise(2) will fail only if a process does + * not have superuser privileges. + */ + (void)madvise(NULL, 0, MADV_PROTECT); + + if (pipe(state->pipe_fd)) { + err(1, "pipe"); } - /* fork failed, this can only happen when supervision is enabled */ - if (pid == -1) { - warn("fork"); - daemon_terminate(state); + kq = kqueuex(KQUEUE_CLOEXEC); + EV_SET(&event, state->pipe_fd[0], EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, + NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); } - /* fork succeeded, this is child's branch or supervision is disabled */ - if (pid == 0) { - pidfile_write(state->child_pidfh); + EV_SET(&event, SIGHUP, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } - if (state->user != NULL) { - restrict_process(state->user); - } - /* - * In supervision mode, the child gets the original sigmask, - * and dup'd pipes. - */ - if (state->supervision_enabled) { - close(state->pipe_fd[0]); - if (sigprocmask(SIG_SETMASK, &state->mask_orig, NULL)) { - err(1, "sigprogmask"); - } - if (state->stdmask & STDERR_FILENO) { - if (dup2(state->pipe_fd[1], STDERR_FILENO) == -1) { - err(1, "dup2"); - } - } - if (state->stdmask & STDOUT_FILENO) { - if (dup2(state->pipe_fd[1], STDOUT_FILENO) == -1) { - err(1, "dup2"); - } - } - if (state->pipe_fd[1] != STDERR_FILENO && - state->pipe_fd[1] != STDOUT_FILENO) { - close(state->pipe_fd[1]); - } - } - execvp(state->argv[0], state->argv); - /* execvp() failed - report error and exit this process */ - err(1, "%s", state->argv[0]); + EV_SET(&event, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); } - /* - * else: pid > 0 - * fork succeeded, this is the parent branch, this can only happen when - * supervision is enabled. - * - * Unblock SIGTERM - now there is a valid child PID to signal to. - */ - if (sigprocmask(SIG_UNBLOCK, &state->mask_term, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); + EV_SET(&event, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); } - close(state->pipe_fd[1]); - state->pipe_fd[1] = -1; + memset(&event, 0, sizeof(struct kevent)); - setproctitle("%s[%d]", state->title, (int)pid); - for (;;) { - if (child_gone && state->child_eof) { - break; - } + /* Spawn a child to exec the command. */ + state->pid = fork(); - if (terminate) { - daemon_terminate(state); - } + /* fork failed, this can only happen when supervision is enabled */ + switch (state->pid) { + case -1: + warn("fork"); + state->mode = MODE_NOCHILD; + return; + /* fork succeeded, this is child's branch */ + case 0: + close(kq); + daemon_set_child_pipe(state); + daemon_exec(state); + break; + } - if (state->child_eof) { - if (sigprocmask(SIG_BLOCK, &state->mask_susp, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); - } - while (!terminate && !child_gone) { - sigsuspend(&state->mask_orig); - } - if (sigprocmask(SIG_UNBLOCK, &state->mask_susp, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); - } + /* case: pid > 0; fork succeeded */ + close(state->pipe_fd[1]); + state->pipe_fd[1] = -1; + setproctitle("%s[%d]", state->title, (int)state->pid); + + while (state->mode != MODE_NOCHILD) { + ret = kevent(kq, NULL, 0, &event, 1, NULL); + switch (ret) { + case -1: + err(EXIT_FAILURE, "kevent wait"); + case 0: continue; } - if (sigprocmask(SIG_BLOCK, &state->mask_read, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); + if (event.flags & EV_ERROR) { + errx(EXIT_FAILURE, "Event error: %s", + strerror(event.data)); } - state->child_eof = !listen_child(state->pipe_fd[0], state); + switch (event.filter) { + case EVFILT_SIGNAL: + + switch (event.ident) { + case SIGCHLD: + if (daemon_is_child_dead(state)) { + /* child is dead, read all until EOF */ + state->pid = -1; + state->mode = MODE_NOCHILD; + while (listen_child(state->pipe_fd[0], + state)) + ; + } + continue; + case SIGTERM: + if (state->mode != MODE_SUPERVISE) { + /* user is impatient */ + /* TODO: warn about repeated SIGTERM? */ + continue; + } - if (sigprocmask(SIG_UNBLOCK, &state->mask_read, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); - } + state->mode = MODE_TERMINATING; + state->restart_enabled = false; + if (state->pid > 0) { + kill(state->pid, SIGTERM); + } + /* + * TODO set kevent timer to exit + * unconditionally after some time + */ + continue; + case SIGHUP: + if (state->log_reopen && state->output_fd >= 0) { + reopen_log(state); + } + continue; + } + break; - } + case EVFILT_READ: + /* + * detecting EOF is no longer necessary + * if child closes the pipe daemon will stop getting + * EVFILT_READ events + */ - /* - * At the end of the loop the the child is already gone. - * Block SIGTERM to avoid racing until the child is spawned. - */ - if (sigprocmask(SIG_BLOCK, &state->mask_term, NULL)) { - warn("sigprocmask"); - daemon_terminate(state); + if (event.data > 0) { + (void)listen_child(state->pipe_fd[0], state); + } + continue; + default: + continue; + } } - /* sleep before exiting mainloop if restart is enabled */ - if (state->restart_enabled && !terminate) { - daemon_sleep(state->restart_delay, 0); - } + close(kq); + close(state->pipe_fd[0]); + state->pipe_fd[0] = -1; } static void -daemon_sleep(time_t secs, long nsecs) +daemon_sleep(struct daemon_state *state) { - struct timespec ts = { secs, nsecs }; + struct timespec ts = { state->restart_delay, 0 }; - while (!terminate && nanosleep(&ts, &ts) == -1) { + if (!state->restart_enabled) { + return; + } + while (nanosleep(&ts, &ts) == -1) { if (errno != EINTR) { err(1, "nanosleep"); } } } -/* - * Setup SIGTERM, SIGCHLD and SIGHUP handlers. - * To avoid racing SIGCHLD with SIGTERM corresponding - * signal handlers mask the other signal. - */ -static void -setup_signals(struct daemon_state *state) -{ - struct sigaction act_term = { 0 }; - struct sigaction act_chld = { 0 }; - struct sigaction act_hup = { 0 }; - - /* Setup SIGTERM */ - act_term.sa_handler = handle_term; - sigemptyset(&act_term.sa_mask); - sigaddset(&act_term.sa_mask, SIGCHLD); - if (sigaction(SIGTERM, &act_term, NULL) == -1) { - warn("sigaction"); - daemon_terminate(state); - } - - /* Setup SIGCHLD */ - act_chld.sa_handler = handle_chld; - sigemptyset(&act_chld.sa_mask); - sigaddset(&act_chld.sa_mask, SIGTERM); - if (sigaction(SIGCHLD, &act_chld, NULL) == -1) { - warn("sigaction"); - daemon_terminate(state); - } - - /* Setup SIGHUP if configured */ - if (!state->log_reopen || state->output_fd < 0) { - return; - } - - act_hup.sa_handler = handle_hup; - sigemptyset(&act_hup.sa_mask); - if (sigaction(SIGHUP, &act_hup, NULL) == -1) { - warn("sigaction"); - daemon_terminate(state); - } -} - static void open_pid_files(struct daemon_state *state) { @@ -612,6 +580,8 @@ restrict_process(const char *user) * * Return value of false is assumed to mean EOF or error, and true indicates to * continue reading. + * + * TODO: simplify signature - state contains pipefd */ static bool listen_child(int fd, struct daemon_state *state) @@ -623,9 +593,6 @@ listen_child(int fd, struct daemon_state *state) assert(state != NULL); assert(bytes_read < LBUF_SIZE - 1); - if (do_log_reopen) { - reopen_log(state); - } rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); if (rv > 0) { unsigned char *cp; @@ -697,42 +664,6 @@ do_output(const unsigned char *buf, size_t len, struct daemon_state *state) } } -/* - * We use the global PID acquired directly from fork. If there is no valid - * child pid, the handler should be blocked and/or child_gone == 1. - */ -static void -handle_term(int signo) -{ - if (pid > 0 && !child_gone) { - kill(pid, signo); - } - terminate = 1; -} - -static void -handle_chld(int signo __unused) -{ - - for (;;) { - int rv = waitpid(-1, NULL, WNOHANG); - if (pid == rv) { - child_gone = 1; - break; - } else if (rv == -1 && errno != EINTR) { - warn("waitpid"); - return; - } - } -} - -static void -handle_hup(int signo __unused) -{ - - do_log_reopen = 1; -} - static int open_log(const char *outfn) { @@ -745,7 +676,6 @@ reopen_log(struct daemon_state *state) { int outfd; - do_log_reopen = 0; outfd = open_log(state->output_filename); if (state->output_fd >= 0) { close(state->output_fd); @@ -765,9 +695,9 @@ daemon_state_init(struct daemon_state *state) .parent_pidfile = NULL, .title = NULL, .user = NULL, - .supervision_enabled = false, - .child_eof = false, + .mode = MODE_DAEMON, .restart_enabled = false, + .pid = 0, .keep_cur_workdir = 1, .restart_delay = 1, .stdmask = STDOUT_FILENO | STDERR_FILENO, @@ -780,25 +710,23 @@ daemon_state_init(struct daemon_state *state) .output_fd = -1, .output_filename = NULL, }; - - sigemptyset(&state->mask_susp); - sigemptyset(&state->mask_read); - sigemptyset(&state->mask_term); - sigemptyset(&state->mask_orig); - sigaddset(&state->mask_susp, SIGTERM); - sigaddset(&state->mask_susp, SIGCHLD); - sigaddset(&state->mask_term, SIGTERM); - sigaddset(&state->mask_read, SIGCHLD); - } static _Noreturn void daemon_terminate(struct daemon_state *state) { assert(state != NULL); - close(state->output_fd); - close(state->pipe_fd[0]); - close(state->pipe_fd[1]); + + if (state->output_fd >= 0) { + close(state->output_fd); + } + if (state->pipe_fd[0] >= 0) { + close(state->pipe_fd[0]); + } + + if (state->pipe_fd[1] >= 0) { + close(state->pipe_fd[1]); + } if (state->syslog_enabled) { closelog(); } @@ -812,3 +740,45 @@ daemon_terminate(struct daemon_state *state) */ exit(1); } + +/* + * Returns true if SIGCHILD came from state->pid + * This function could hang if SIGCHILD was emittied for a reason other than + * child dying (e.g., ptrace attach). + */ +static bool +daemon_is_child_dead(struct daemon_state *state) +{ + for (;;) { + int who = waitpid(-1, NULL, WNOHANG); + if (state->pid == who) { + return true; + } + if (who == -1 && errno != EINTR) { + warn("waitpid"); + return false; + } + } +} + +static void +daemon_set_child_pipe(struct daemon_state *state) +{ + if (state->stdmask & STDERR_FILENO) { + if (dup2(state->pipe_fd[1], STDERR_FILENO) == -1) { + err(1, "dup2"); + } + } + if (state->stdmask & STDOUT_FILENO) { + if (dup2(state->pipe_fd[1], STDOUT_FILENO) == -1) { + err(1, "dup2"); + } + } + if (state->pipe_fd[1] != STDERR_FILENO && + state->pipe_fd[1] != STDOUT_FILENO) { + close(state->pipe_fd[1]); + } + + /* The child gets dup'd pipes. */ + close(state->pipe_fd[0]); +} From nobody Fri Apr 14 05:18:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyPqM42qjz45RD0 for ; Fri, 14 Apr 2023 05:18:23 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-8.consmr.mail.gq1.yahoo.com (sonic316-8.consmr.mail.gq1.yahoo.com [98.137.69.32]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyPqM1bBlz3JxC for ; Fri, 14 Apr 2023 05:18:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681449500; bh=0z6TPNvBeY6oLN/7UdG8fizR800pXgeuzm5Ch8U5FLk=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=bIcc1YcTVnXjj1fbLoK56bB6Huxndl9tNLkJl/c2cm4DAFQQv3OMzjcuPNJ7fnCaZcSmCmpWA5exfFPkmxMLVwr5y7HncjwJ5Qa/0JxNLqOE3Usfr+M5A/RZREqCrjaO8WsvazwSuK4ecBWiCTn+jYLDrq/ZGHMsMYXMfCBpITRjRBZw6xA0LA8aw+42haxq/RQVmNH4lni8P7xkdACg9Vn/pXr1/8/Ptrb+xXrfaTAN+THE80PbBXgmKmRAUf4VjYU8v3oFgCOjLQ39ghy1DuCrFnbYOVdY2TQkMNtTbGk2JKsmLwgp4umLujI6C930qcV6ui6QTzSeonZT3y5GqA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681449500; bh=ioFIV656JzI+wK8ZWQO0VYtAgpwUNULk+oAVUk6JfDI=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=eP9JG5YAHgTcCut1oVW/g5YjXBIpQ3OwJ/lylvzmobiyxcewJkPVFwvgXjm5eEFYQQA1xILseyBQJXA6JFfxumzLVfIsjxP9B2VzwEfGGQLlNpu8ZKJ1CcCU05jw/OQCVm1JY/NEBQGEHkjN4qK8twhogyfIHEFOWrcpypIMzdxFTgz0SM1vE7CK9vIEhhGMBXybl/4jpHGxJsgSjQL/84bXsTXT5I+875JiE92ce4BIBRYdfC1mBQFIOqtk1sJUDeXagHHBHA2E0zYWtS3eNT3miBNFHLtOvy4VBQ5zkI/XrHK8zT6io85CV/+jvV8VaO1Tt1WekS62Iy9r5NdTYA== X-YMail-OSG: YLSilpIVM1l7LEZXS9h5qA.qBnEtZgRsKHJEkLVUtDaRXJuq3z.CXjZ7ySxm0BM FVooBTp0sEG1EgijcSiIx7wOxHCktKb6ZMasgHJVJqBjiyQ3lIbFPG9Nt.4mDILW5PDLoE7clYen _stal7R2jfBIQSsOyyIDfldzrELtrjLNkrSyuGgbqBfEbEQ3MJWYmzgLT6YPOqJfyWo7JuInn.tu h1lLTFNH2smGpnyBCboutjZinhVC9RtZM5rUBWGuYcpUv76zOt5EUM9itv4.5grsOmiOSmDeKXX_ oT5CoudtfBjRud_ZewK_sjj01M7fNncQJhWmZHZOjBoJDvfiNKhMFx9erRWvn0muYk_uI8TkShX9 TdXCFa1Oany5I4e2zfYLr3ptB_0W5MYw94xasBllF8y8UWY8aNtPDkWlo073eecSHxKjca.sdw4U qmbRxHRuz4oayg2iXpjZkSWIjarKva.WTYmUUHOBO07bsR0D4EwYEJIzBbBoHDv2g4Jrir_Fgf8z ZX45iGn.3Q9yw9HQITdxiFBx6R5O2JRiXDaqw8.7X6SuxteU9RBT2CNMUXu2cHF1eLWFq1OhKZwn tfZ.xaeUGn3ymRlGkXO.fXoU_O8lj_GsRG9KJ4RM9_Vmusvn8suLAx4G1lZorBbksNYa7HB5eawz oZCX2pAfk2HvJQ5CWGw6XH5IRXkJmaVSNKrnCSClk49f_jX8fB5LTK7LVOqFOa..DbAV8EeaAUI_ vNNLR04q1HnDpk7RBdtEZmNEYZ4b52km8jHjgFHIst4LCMp1sEN5NA4y.uqmcDS8yA4LbOtk5RPA dPHfDWHFiI9QJug6.X6XYH1aFAtR4h2Xfdx3d6LeD5fnKQlNXf2B2yRdlzZxZ9WtwyOUQ6XzZ1C2 rlSC_dffL4PSe_Zy3bMSqeWbmJPqaEFI2rT.Fk2VQlM57Oe9nMBFAmnfmJSjdutI13dxJUofe3sc xX7.5AQLss8eRpmtNVBy8qcEqtDPyQ6Pu8thBQqxG5MAsx_3t4Kq9pI8NzdIEDko8I92pB0Z2J2X U9wEZhfCyNUT4M0oMrzdvEgK78pOKcHMdhS6Db2sNyD2O65zxV.nfqASnJawt4tiUdAN8SJcBJGl 92BYU8i557WsBKKpYjwvs9jXH4rLJY5GW9nD2DNITwaWoRfFG9Dk39uPQPwEyat92yZ5MrN0QheD 9TGs4.AA3x4ycIQG_ZO0DmiI4Y3OVArP8b6I.uZ2Eeo4uDKNF8MWmzal8j7toZG_qUz3aCSk7BW8 jJ3hMgvIc81KnDUz0Dgz1Ci1ZWLSqudhhFDQNtaHlqyiMC6AD15Z4HP8FmUc4F1Oa6HI3C1qsDEw 0nzE32450pBHeYjmp_x9U0r5uyPHF5.hh8RoVvsp7pLBnOkOyMZViwvRWhNyAxTxCiP_emnk_rIQ xPZozQfZI6xA3xyJtZ56Lt7CionkSaQamL.TibqzrsTjrxpjvqMVpk_DkO2vcQ7B3R1KRxo2JKhD A_1Uxw_Ax8DZTTHTqkNXLxhcAcq10JTjjZDJaX3aUMNWuo2Ke_BDjc10G3KpQ2qdCNHrv9Bmd5jP jRaH.LmrOYaQnZMfJJI97DVNAIthPWeDEmbnhGrZk3DWaPAucpPd0nuLSxtuvGfjhqenArCymigJ 3zIvcMCjLy0vRbxGcwci9qvLdjY1B.37fXvO3ucxUPg5H4SLdW3vy4yygYMF75FezOQU2WzygLtB AHb011hrldP4fcVUxNmlPp.9VTZsPTCye7VybiJBrPFyh3Q45V8ltZwKNG3.SnlbLKWpavqcpzwZ vpigcQ6xcB8T6amhT2VtpL7sHRBmvl2O3pZrJ3QtSHF.XNiEQN4oyXY57eYm7kUX1bFibmYr00lk zVKk9lWiB91kjjlV188.hiO0yTwz7kL6Az9wPimGVp0xn_saIxmJXq7VwXalvC8wlNDRS8Q4iW4g 75o8zfrw_njh.hFRcHD6YOUr70boBv53gCByZQsujV0vKhkf7NPwbVA6GpUmzTTNCN1iRqRrXMbQ TjysEkSwJ24_dN8miVoPQ4g2wxBwr2nGrXKFSkvCJbmP27iPzdFo0FnucNi5uS1AKnPPlSNH32sf 9Pjn0PTz1xEPWYhCJ4MhknmgC2jSscyah7xF8A5D0j5BjGd3P94v7rGCwxeS1VkAO5hRHOSICQYp .djfc3EbGwjRxhIISfhlxV06gJWRQzEz6uaZrVLRVylvY7z_idtZPFGIyn8Y.RHTaPkpPjjV60H6 RPaRInv4wKra7NaYm2lfpoFlHUORw3Tk5BnevWcwmjQxphYCurcIvR16W8uxljAdwnZqjDWE0d8c hdZdQYa8- X-Sonic-MF: X-Sonic-ID: 1b698032-5a24-4500-ba52-f26474126bed Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Fri, 14 Apr 2023 05:18:20 +0000 Received: by hermes--production-bf1-5f9df5c5c4-fgkgh (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID adb7ed4b25f564d34aaeb70265d06145; Fri, 14 Apr 2023 05:18:17 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> Date: Thu, 13 Apr 2023 22:18:04 -0700 Cc: Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> To: Charlie Li X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PyPqM1bBlz3JxC X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 13, 2023, at 21:44, Charlie Li wrote: > Mark Millard wrote: >> FYI: in my original report for a context that has never had >> block_cloning enabled, I reported BOTH missing files and >> file content corruption in the poudriere-devel bulk build >> testing. This predates: >> https://people.freebsd.org/~pjd/patches/brt_revert.patch >> but had the changes from: >> https://github.com/openzfs/zfs/pull/14739/files >> The files were missing from packages installed to be used >> during a port's build. No other types of examples of missing >> files happened. (But only 11 ports failed.) > I also don't have block_cloning enabled. "Missing files" prior to = brt_revert may actually be present, but as the corruption also messes = with the file(1) signature, some tools like ldconfig report them as = missing. For reference, the specific messages that were not explicit null-byte complaints were (some shown with a little context): =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - not = found =3D=3D=3D> Installing existing package = /packages/All/libxml2-2.10.3_1.pkg [CA72_ZFS] Installing libxml2-2.10.3_1... [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - = found (/usr/local/lib/libxml2.so) . . . [CA72_ZFS] Extracting libxslt-1.1.37: .......... done =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxslt.so - = found (/usr/local/lib/libxslt.so) =3D=3D=3D> Returning to build of py39-lxml-4.9.2 . . . =3D=3D=3D> Configuring for py39-lxml-4.9.2 Building lxml version 4.9.2. Building with Cython 0.29.33. Error: Please make sure the libxml2 and libxslt development packages are = installed. [CA72_ZFS] Extracting libunistring-1.1: .......... done =3D=3D=3D> libidn2-2.3.4 depends on shared library: libunistring.so - = not found [CA72_ZFS] Extracting gmp-6.2.1: .......... done =3D=3D=3D> mpfr-4.2.0,1 depends on shared library: libgmp.so - not = found =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = found =3D=3D=3D> Installing existing package /packages/All/gmp-6.2.1.pkg [CA72_ZFS] Installing gmp-6.2.1... the most recent version of gmp-6.2.1 is already installed =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = found *** Error code 1 autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 checking for GNU=20 M4 that supports accurate traces... configure: error: no acceptable m4 = could be found in $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended. GNU M4 1.4.15 uses a buggy replacement strstr on some systems. Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. ld: error: /usr/local/lib/libblkid.a: unknown file type =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Apr 14 07:43:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyT2s0BZ7z44hmF; Fri, 14 Apr 2023 07:43:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyT2r2dylz4QQZ; Fri, 14 Apr 2023 07:43:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 33E7hJ2t075445 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 14 Apr 2023 10:43:22 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 33E7hJ2t075445 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 33E7hJj5075444; Fri, 14 Apr 2023 10:43:19 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 14 Apr 2023 10:43:19 +0300 From: Konstantin Belousov To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8935a3993219 - main - daemon: use kqueue for all events Message-ID: References: <202304140513.33E5DsXL019547@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202304140513.33E5DsXL019547@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4PyT2r2dylz4QQZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Apr 14, 2023 at 05:13:54AM +0000, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8935a3993219be76c7ea03e9ad4509657d08af6c > > commit 8935a3993219be76c7ea03e9ad4509657d08af6c > Author: Ihor Antonov > AuthorDate: 2023-04-14 05:10:29 +0000 > Commit: Kyle Evans > CommitDate: 2023-04-14 05:12:21 +0000 > > daemon: use kqueue for all events > > Refactor daemon to use kqueue/kevent instead of signals. > > This changes allows to simplify the code in several ways: > - the execution flow is now linear, no async events. > - several variables became redundant and got removed. > - all event handling is now concentrated inside of the event loop, which > makes code reading and comprehension easier. > - new kqueuex(2) call is used for CLOEXEC, but maintained closing the > kq fd prior to execve() to ease later MFC > + /* Signals are processed via kqueue */ > + signal(SIGHUP, SIG_IGN); > + signal(SIGTERM, SIG_IGN); Are you sure that this works? When a signal disposition is set to 'ignore', the signal delivery drops the signal immediately without queuing/notifying the victim. I very much doubt that you would get any kqueue event for HUP or TERM after the calls. From nobody Fri Apr 14 07:52:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyTFZ2YjKz44j38; Fri, 14 Apr 2023 07:52: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 4PyTFZ0KN9z3PCy; Fri, 14 Apr 2023 07:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681458770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhXE+po/OrXE7xALxB2rKBrOvmmBCEHWbSYl1z6Rg4=; b=OcE09VTJdI30iybMIAFKNk3EgG1iKcYt36f68F+pnOYd0cFhHfxWeV2MLp78yje3DMa1Mj /Ouus59//s2NWk4VvzRPQcXDjijTqnYqBOz0VHNE4Dx3iepl18ginYlN3Rfk4vuZwpFo3f mqUtjtllA9yJXpZmDdh+omOeCKnSQSizw5F3ThlSjq54+wzgrWRCcLinpjmMNdfhkQ8423 viNeMfz6Ll+6gFPp50CnzzmFh7KHuCAl+g5VNG8MY8h2Iv7Pcc6HRtXfowPQ4G0lvUY2yB CFyfsUFjjRKvyCg3UAdsxk4HlyfuMj2oeAow3uOGUNCflawB7LxtCcHnmTdj3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681458770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhXE+po/OrXE7xALxB2rKBrOvmmBCEHWbSYl1z6Rg4=; b=LEgzoSoPNFQbu8HPqp+Y3AdpLFtY4JSlSqudkCaYEvs6D+tK8TpLJK/9eDserhQhVdZa0i d8AnnmEzSD0hc5gObeUljHElqbm6oNDiYVeewmGC70g+Zv9PZEsElwiAWmmm3v78263d+n w+CDzDsCinDF6FhRRCf4PsxRkspdpQb61SOy9iYMEr02a1G5uXWjzj3ZZB798yvX1W3I1+ lZmtYEwGt8StAgWZfJmtemgZ/HJ8e6rjGXMDs2KGnlqE2VA6S0eaz36vEl+KavYk5HLmD0 5MowHayc+ACy/pcfQVd56UJARk3XnyiwVPivHjpkfC1/WfC5UKT/Stai7MskIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681458770; a=rsa-sha256; cv=none; b=l8174OJ83ewvBTu9Bsg6+KhMNQBb8/kzf4/53h803bGp6ni4T9QU5owt3uGR/rscuCwX9X HIBj9k1qyAfmHUVyoUWLBwu4bAJrP4Op8Bc1YDsEajE3Y6UJZzp0zZ7s8YMI3yuuYVqaU2 CVHglH7a6GvYmVaMDrlouHZ0SfOq39Mw1HF89/YmV8O2gzgn0ryZifbhi2w4f94YtXByLZ OSOtbU6/1Dey4R8IF4+Xii9mqfXSkz40j8x7NzOzjcTrjmOpI/lGZgeYGu3Leb4IL/warM Z1fz6c782/J0Dl99vKuOQxYHzJitc4Q6+FoU6a3DAeBWbRTyc70lBdWxNKxCHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyTFY690XzGns; Fri, 14 Apr 2023 07:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E7qnDu080953; Fri, 14 Apr 2023 07:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E7qnUu080952; Fri, 14 Apr 2023 07:52:49 GMT (envelope-from git) Date: Fri, 14 Apr 2023 07:52:49 GMT Message-Id: <202304140752.33E7qnUu080952@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: 39282ef356db - main - pf: backport OpenBSD syntax of "scrub" option for "match" and "pass" rules List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39282ef356db25879660427de8607716a8439077 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=39282ef356db25879660427de8607716a8439077 commit 39282ef356db25879660427de8607716a8439077 Author: Kajetan Staszkiewicz AuthorDate: 2023-04-13 16:12:59 +0000 Commit: Kristof Provost CommitDate: 2023-04-14 07:04:06 +0000 pf: backport OpenBSD syntax of "scrub" option for "match" and "pass" rules Introduce the OpenBSD syntax of "scrub" option for "match" and "pass" rules and the "set reassemble" flag. The patch is backward-compatible, pf.conf can be still written in FreeBSD-style. Obtained from: OpenBSD MFC after: never Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D38025 --- lib/libpfctl/libpfctl.c | 1 + lib/libpfctl/libpfctl.h | 3 +- sbin/pfctl/parse.y | 119 ++++++++++++---- sbin/pfctl/pf_print_state.c | 16 +++ sbin/pfctl/pfctl.c | 39 ++++++ sbin/pfctl/pfctl_parser.c | 58 ++++++-- sbin/pfctl/pfctl_parser.h | 3 + share/man/man5/pf.conf.5 | 11 +- sys/net/pfvar.h | 64 ++++++--- sys/netpfil/pf/if_pfsync.c | 25 +++- sys/netpfil/pf/pf.c | 305 ++++++++++++++++++++++++++++++----------- sys/netpfil/pf/pf.h | 61 ++++++--- sys/netpfil/pf/pf_ioctl.c | 28 +++- sys/netpfil/pf/pf_norm.c | 154 ++++++++++++++------- sys/netpfil/pf/pf_syncookies.c | 4 +- 15 files changed, 675 insertions(+), 216 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index f34f83cfb57c..c75f9ab12889 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -225,6 +225,7 @@ pfctl_get_status(int dev) status->states = nvlist_get_number(nvl, "states"); status->src_nodes = nvlist_get_number(nvl, "src_nodes"); status->syncookies_active = nvlist_get_bool(nvl, "syncookies_active"); + status->reass = nvlist_get_number(nvl, "reass"); strlcpy(status->ifname, nvlist_get_string(nvl, "ifname"), IFNAMSIZ); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 684e73c1815d..1a07b74dc10f 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -58,6 +58,7 @@ struct pfctl_status { char ifname[IFNAMSIZ]; uint8_t pf_chksum[PF_MD5_DIGEST_LENGTH]; bool syncookies_active; + uint32_t reass; struct pfctl_status_counters counters; struct pfctl_status_counters lcounters; @@ -347,7 +348,7 @@ struct pfctl_state { uint32_t creation; uint32_t expire; uint32_t pfsync_time; - uint8_t state_flags; + uint16_t state_flags; uint32_t sync_flags; }; diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 6f9494828d53..e5629f9fcd5f 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -225,13 +225,21 @@ struct node_qassign { static struct filter_opts { int marker; -#define FOM_FLAGS 0x01 -#define FOM_ICMP 0x02 -#define FOM_TOS 0x04 -#define FOM_KEEP 0x08 -#define FOM_SRCTRACK 0x10 +#define FOM_FLAGS 0x0001 +#define FOM_ICMP 0x0002 +#define FOM_TOS 0x0004 +#define FOM_KEEP 0x0008 +#define FOM_SRCTRACK 0x0010 +#define FOM_MINTTL 0x0020 +#define FOM_MAXMSS 0x0040 +#define FOM_AFTO 0x0080 /* not yet implemmented */ +#define FOM_SETTOS 0x0100 +#define FOM_SCRUB_TCP 0x0200 #define FOM_SETPRIO 0x0400 +#define FOM_ONCE 0x1000 /* not yet implemmented */ #define FOM_PRIO 0x2000 +#define FOM_SETDELAY 0x4000 +#define FOM_FRAGCACHE 0x8000 /* does not exist in OpenBSD */ struct node_uid *uid; struct node_gid *gid; struct { @@ -266,6 +274,12 @@ static struct filter_opts { struct node_host *addr; u_int16_t port; } divert; + /* new-style scrub opts */ + int nodf; + int minttl; + int settos; + int randomid; + int max_mss; } filter_opts; static struct antispoof_opts { @@ -277,10 +291,6 @@ static struct antispoof_opts { static struct scrub_opts { int marker; -#define SOM_MINTTL 0x01 -#define SOM_MAXMSS 0x02 -#define SOM_FRAGCACHE 0x04 -#define SOM_SETTOS 0x08 int nodf; int minttl; int maxmss; @@ -511,7 +521,7 @@ int parseport(char *, struct range *r, int); %token PORTBINARY %type interface if_list if_item_not if_item %type number icmptype icmp6type uid gid -%type tos not yesno +%type tos not yesno optnodf %type probability %type no dir af fragcache optimizer syncookie_val %type sourcetrack flush unaryop statelock @@ -631,7 +641,16 @@ optimizer : string { } ; -option : SET OPTIMIZATION STRING { +optnodf : /* empty */ { $$ = 0; } + | NODF { $$ = 1; } + ; + +option : SET REASSEMBLE yesno optnodf { + if (check_rulestate(PFCTL_STATE_OPTION)) + YYERROR; + pfctl_set_reassembly(pf, $3, $4); + } + | SET OPTIMIZATION STRING { if (check_rulestate(PFCTL_STATE_OPTION)) { free($3); YYERROR; @@ -1408,7 +1427,7 @@ scrubrule : scrubaction dir logquick interface af proto fromto scrub_opts r.min_ttl = $8.minttl; if ($8.maxmss) r.max_mss = $8.maxmss; - if ($8.marker & SOM_SETTOS) { + if ($8.marker & FOM_SETTOS) { r.rule_flag |= PFRULE_SET_TOS; r.set_tos = $8.settos; } @@ -1443,7 +1462,7 @@ scrub_opts : { } ; -scrub_opts_l : scrub_opts_l scrub_opt +scrub_opts_l : scrub_opts_l comma scrub_opt | scrub_opt ; @@ -1455,7 +1474,7 @@ scrub_opt : NODF { scrub_opts.nodf = 1; } | MINTTL NUMBER { - if (scrub_opts.marker & SOM_MINTTL) { + if (scrub_opts.marker & FOM_MINTTL) { yyerror("min-ttl cannot be respecified"); YYERROR; } @@ -1463,11 +1482,11 @@ scrub_opt : NODF { yyerror("illegal min-ttl value %d", $2); YYERROR; } - scrub_opts.marker |= SOM_MINTTL; + scrub_opts.marker |= FOM_MINTTL; scrub_opts.minttl = $2; } | MAXMSS NUMBER { - if (scrub_opts.marker & SOM_MAXMSS) { + if (scrub_opts.marker & FOM_MAXMSS) { yyerror("max-mss cannot be respecified"); YYERROR; } @@ -1475,23 +1494,23 @@ scrub_opt : NODF { yyerror("illegal max-mss value %d", $2); YYERROR; } - scrub_opts.marker |= SOM_MAXMSS; + scrub_opts.marker |= FOM_MAXMSS; scrub_opts.maxmss = $2; } | SETTOS tos { - if (scrub_opts.marker & SOM_SETTOS) { + if (scrub_opts.marker & FOM_SETTOS) { yyerror("set-tos cannot be respecified"); YYERROR; } - scrub_opts.marker |= SOM_SETTOS; + scrub_opts.marker |= FOM_SETTOS; scrub_opts.settos = $2; } | fragcache { - if (scrub_opts.marker & SOM_FRAGCACHE) { + if (scrub_opts.marker & FOM_FRAGCACHE) { yyerror("fragcache cannot be respecified"); YYERROR; } - scrub_opts.marker |= SOM_FRAGCACHE; + scrub_opts.marker |= FOM_FRAGCACHE; scrub_opts.fragcache = $1; } | REASSEMBLE STRING { @@ -2351,6 +2370,21 @@ pfrule : action dir logquick interface route af proto fromto r.prob = $9.prob; r.rtableid = $9.rtableid; + if ($9.nodf) + r.scrub_flags |= PFSTATE_NODF; + if ($9.randomid) + r.scrub_flags |= PFSTATE_RANDOMID; + if ($9.minttl) + r.min_ttl = $9.minttl; + if ($9.max_mss) + r.max_mss = $9.max_mss; + if ($9.marker & FOM_SETTOS) { + r.scrub_flags |= PFSTATE_SETTOS; + r.set_tos = $9.settos; + } + if ($9.marker & FOM_SCRUB_TCP) + r.scrub_flags |= PFSTATE_SCRUB_TCP; + if ($9.marker & FOM_PRIO) { if ($9.prio == 0) r.prio = PF_PRIO_ZERO; @@ -2933,6 +2967,24 @@ filter_opt : USER uids { filter_opts.divert.port = 1; /* some random value */ #endif } + | SCRUB '(' scrub_opts ')' { + filter_opts.nodf = $3.nodf; + filter_opts.minttl = $3.minttl; + if ($3.marker & FOM_SETTOS) { + /* Old style rules are "scrub set-tos 0x42" + * New style are "set tos 0x42 scrub (...)" + * What is in "scrub(...)"" is unfortunately the + * original scrub syntax so it would overwrite + * "set tos" of a pass/match rule. + */ + filter_opts.settos = $3.settos; + } + filter_opts.randomid = $3.randomid; + filter_opts.max_mss = $3.maxmss; + if ($3.reassemble_tcp) + filter_opts.marker |= FOM_SCRUB_TCP; + filter_opts.marker |= $3.marker; + } | filter_sets ; @@ -2953,6 +3005,14 @@ filter_set : prio { filter_opts.set_prio[0] = $1.b1; filter_opts.set_prio[1] = $1.b2; } + | TOS tos { + if (filter_opts.marker & FOM_SETTOS) { + yyerror("tos cannot be respecified"); + YYERROR; + } + filter_opts.marker |= FOM_SETTOS; + filter_opts.settos = $2; + } prio : PRIO NUMBER { if ($2 < 0 || $2 > PF_PRIO_MAX) { yyerror("prio must be 0 - %u", PF_PRIO_MAX); @@ -5170,6 +5230,7 @@ rule_consistent(struct pfctl_rule *r, int anchor_call) switch (r->action) { case PF_PASS: + case PF_MATCH: case PF_DROP: case PF_SCRUB: case PF_NOSCRUB: @@ -5240,8 +5301,8 @@ filter_consistent(struct pfctl_rule *r, int anchor_call) yyerror("max-src-nodes requires 'source-track rule'"); problems++; } - if (r->action == PF_DROP && r->keep_state) { - yyerror("keep state on block rules doesn't make sense"); + if (r->action != PF_PASS && r->keep_state) { + yyerror("keep state is great, but only for pass rules"); problems++; } if (r->rule_flag & PFRULE_STATESLOPPY && @@ -5251,6 +5312,18 @@ filter_consistent(struct pfctl_rule *r, int anchor_call) "synproxy state or modulate state"); problems++; } + /* match rules rules */ + if (r->action == PF_MATCH) { + if (r->divert.port) { + yyerror("divert is not supported on match rules"); + problems++; + } + if (r->rt) { + yyerror("route-to, reply-to, dup-to and fastroute " + "must not be used on match rules"); + problems++; + } + } return (-problems); } diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index b66a296d6080..d23a0154b70d 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -339,8 +339,24 @@ print_state(struct pfctl_state *s, int opts) printf(", anchor %u", s->anchor); if (s->rule != -1) printf(", rule %u", s->rule); + if (s->state_flags & PFSTATE_ALLOWOPTS) + printf(", allow-opts"); if (s->state_flags & PFSTATE_SLOPPY) printf(", sloppy"); + if (s->state_flags & PFSTATE_NOSYNC) + printf(", no-sync"); + if (s->state_flags & PFSTATE_ACK) + printf(", psync-ack"); + if (s->state_flags & PFSTATE_NODF) + printf(", no-df"); + if (s->state_flags & PFSTATE_SETTOS) + printf(", set-tos"); + if (s->state_flags & PFSTATE_RANDOMID) + printf(", random-id"); + if (s->state_flags & PFSTATE_SCRUB_TCP) + printf(", scrub-tcp"); + if (s->state_flags & PFSTATE_SETPRIO) + printf(", set-prio"); if (s->sync_flags & PFSYNC_FLAG_SRCNODE) printf(", source-track"); if (s->sync_flags & PFSYNC_FLAG_NATSRCNODE) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f60e3f67e082..b5ef07064fb9 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -94,6 +94,7 @@ int pfctl_load_timeout(struct pfctl *, unsigned int, unsigned int); int pfctl_load_debug(struct pfctl *, unsigned int); int pfctl_load_logif(struct pfctl *, char *); int pfctl_load_hostid(struct pfctl *, u_int32_t); +int pfctl_load_reassembly(struct pfctl *, u_int32_t); int pfctl_load_syncookies(struct pfctl *, u_int8_t); int pfctl_get_pool(int, struct pfctl_pool *, u_int32_t, u_int32_t, int, char *); @@ -2258,6 +2259,7 @@ pfctl_init_options(struct pfctl *pf) pf->limit[PF_LIMIT_TABLE_ENTRIES] = PFR_KENTRY_HIWAT; pf->debug = PF_DEBUG_URGENT; + pf->reassemble = 0; pf->syncookies = false; pf->syncookieswat[0] = PF_SYNCOOKIES_LOWATPCT; @@ -2318,6 +2320,11 @@ pfctl_load_options(struct pfctl *pf) if (pfctl_load_hostid(pf, pf->hostid)) error = 1; + /* load reassembly settings */ + if (!(pf->opts & PF_OPT_MERGE) || pf->reass_set) + if (pfctl_load_reassembly(pf, pf->reassemble)) + error = 1; + /* load keepcounters */ if (pfctl_set_keepcounters(pf->dev, pf->keep_counters)) error = 1; @@ -2414,6 +2421,28 @@ pfctl_load_timeout(struct pfctl *pf, unsigned int timeout, unsigned int seconds) return (0); } +int +pfctl_set_reassembly(struct pfctl *pf, int on, int nodf) +{ + if ((loadopt & PFCTL_FLAG_OPTION) == 0) + return (0); + + pf->reass_set = 1; + if (on) { + pf->reassemble = PF_REASS_ENABLED; + if (nodf) + pf->reassemble |= PF_REASS_NODF; + } else { + pf->reassemble = 0; + } + + if (pf->opts & PF_OPT_VERBOSE) + printf("set reassemble %s %s\n", on ? "yes" : "no", + nodf ? "no-df" : ""); + + return (0); +} + int pfctl_set_optimization(struct pfctl *pf, const char *opt) { @@ -2512,6 +2541,16 @@ pfctl_load_hostid(struct pfctl *pf, u_int32_t hostid) return (0); } +int +pfctl_load_reassembly(struct pfctl *pf, u_int32_t reassembly) +{ + if (ioctl(dev, DIOCSETREASS, &reassembly)) { + warnx("DIOCSETREASS"); + return (1); + } + return (0); +} + int pfctl_load_syncookies(struct pfctl *pf, u_int8_t val) { diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index fca1a7aa7b8f..15ed8c29abd0 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -429,6 +429,7 @@ print_pool(struct pfctl_pool *pool, u_int16_t p1, u_int16_t p2, print_addr(&pooladdr->addr, af, 0); break; case PF_PASS: + case PF_MATCH: if (PF_AZERO(&pooladdr->addr.v.a.addr, af)) printf("%s", pooladdr->ifname); else { @@ -624,6 +625,10 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts) PFCTL_SYNCOOKIES_MODE_NAMES[cookies->mode]); printf(" %-25s %s\n", "active", s->syncookies_active ? "active" : "inactive"); + printf("Reassemble %24s %s\n", + s->reass & PF_REASS_ENABLED ? "yes" : "no", + s->reass & PF_REASS_NODF ? "no-df" : "" + ); } } @@ -685,6 +690,7 @@ print_src_node(struct pf_src_node *sn, int opts) printf(", rdr rule %u", sn->rule.nr); break; case PF_PASS: + case PF_MATCH: if (sn->rule.nr != -1) printf(", filter rule %u", sn->rule.nr); break; @@ -810,7 +816,8 @@ void print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numeric) { static const char *actiontypes[] = { "pass", "block", "scrub", - "no scrub", "nat", "no nat", "binat", "no binat", "rdr", "no rdr" }; + "no scrub", "nat", "no nat", "binat", "no binat", "rdr", "no rdr", + "", "", "match"}; static const char *anchortypes[] = { "anchor", "anchor", "anchor", "anchor", "nat-anchor", "nat-anchor", "binat-anchor", "binat-anchor", "rdr-anchor", "rdr-anchor" }; @@ -946,7 +953,7 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer print_flags(r->flags); printf("/"); print_flags(r->flagset); - } else if (r->action == PF_PASS && + } else if ((r->action == PF_PASS || r->action == PF_MATCH) && (!r->proto || r->proto == IPPROTO_TCP) && !(r->rule_flag & PFRULE_FRAGMENT) && !anchor_call[0] && r->keep_state) @@ -988,6 +995,10 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer r->set_prio[1]); comma = ","; } + if (r->scrub_flags & PFSTATE_SETTOS) { + printf("%s tos 0x%2.2x", comma, r->set_tos); + comma = ","; + } printf(" )"); } if (!r->keep_state && r->action == PF_PASS && !anchor_call[0]) @@ -1113,26 +1124,43 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer } printf(")"); } - if (r->rule_flag & PFRULE_FRAGMENT) - printf(" fragment"); - if (r->rule_flag & PFRULE_NODF) - printf(" no-df"); - if (r->rule_flag & PFRULE_RANDOMID) - printf(" random-id"); - if (r->min_ttl) - printf(" min-ttl %d", r->min_ttl); - if (r->max_mss) - printf(" max-mss %d", r->max_mss); - if (r->rule_flag & PFRULE_SET_TOS) - printf(" set-tos 0x%2.2x", r->set_tos); if (r->allow_opts) printf(" allow-opts"); + if (r->rule_flag & PFRULE_FRAGMENT) + printf(" fragment"); if (r->action == PF_SCRUB) { + /* Scrub flags for old-style scrub. */ + if (r->rule_flag & PFRULE_NODF) + printf(" no-df"); + if (r->rule_flag & PFRULE_RANDOMID) + printf(" random-id"); + if (r->min_ttl) + printf(" min-ttl %d", r->min_ttl); + if (r->max_mss) + printf(" max-mss %d", r->max_mss); + if (r->rule_flag & PFRULE_SET_TOS) + printf(" set-tos 0x%2.2x", r->set_tos); if (r->rule_flag & PFRULE_REASSEMBLE_TCP) printf(" reassemble tcp"); - + /* The PFRULE_FRAGMENT_NOREASS is set on all rules by default! */ printf(" fragment %sreassemble", r->rule_flag & PFRULE_FRAGMENT_NOREASS ? "no " : ""); + } else if (r->scrub_flags & PFSTATE_SCRUBMASK || r->min_ttl || r->max_mss) { + /* Scrub actions on normal rules. */ + printf(" scrub("); + if (r->scrub_flags & PFSTATE_NODF) + printf(" no-df"); + if (r->scrub_flags & PFSTATE_RANDOMID) + printf(" random-id"); + if (r->min_ttl) + printf(" min-ttl %d", r->min_ttl); + if (r->scrub_flags & PFSTATE_SETTOS) + printf(" set-tos 0x%2.2x", r->set_tos); + if (r->scrub_flags & PFSTATE_SCRUB_TCP) + printf(" reassemble tcp"); + if (r->max_mss) + printf(" max-mss %d", r->max_mss); + printf(")"); } i = 0; while (r->label[i][0]) diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h index 13151cc33829..c5da3408fb93 100644 --- a/sbin/pfctl/pfctl_parser.h +++ b/sbin/pfctl/pfctl_parser.h @@ -101,6 +101,7 @@ struct pfctl { u_int32_t limit[PF_LIMIT_MAX]; u_int32_t debug; u_int32_t hostid; + u_int32_t reassemble; char *ifname; bool keep_counters; u_int8_t syncookies; @@ -112,6 +113,7 @@ struct pfctl { u_int8_t debug_set; u_int8_t hostid_set; u_int8_t ifname_set; + u_int8_t reass_set; }; struct node_if { @@ -285,6 +287,7 @@ void pfctl_move_pool(struct pfctl_pool *, struct pfctl_pool *); void pfctl_clear_pool(struct pfctl_pool *); int pfctl_set_timeout(struct pfctl *, const char *, int, int); +int pfctl_set_reassembly(struct pfctl *, int, int); int pfctl_set_optimization(struct pfctl *, const char *); int pfctl_set_limit(struct pfctl *, const char *, unsigned int); int pfctl_set_logif(struct pfctl *, char *); diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index ca7c64d1cf83..8e0bb42f257a 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -1489,6 +1489,15 @@ 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 @@ -3172,7 +3181,7 @@ schedulers = ( cbq-def | priq-def | hfsc-def ) bandwidth-spec = "number" ( "b" | "Kb" | "Mb" | "Gb" | "%" ) etheraction = "pass" | "block" -action = "pass" | "block" [ return ] | [ "no" ] "scrub" +action = "pass" | "match" | "block" [ return ] | [ "no" ] "scrub" return = "drop" | "return" | "return-rst" [ "( ttl" number ")" ] | "return-icmp" [ "(" icmpcode [ [ "," ] icmp6code ] ")" ] | "return-icmp6" [ "(" icmp6code ")" ] diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b97524f34bc3..e2cddb49728c 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -310,6 +310,7 @@ _Static_assert(sizeof(time_t) == 4 || sizeof(time_t) == 8, "unexpected time_t si SYSCTL_DECL(_net_pf); MALLOC_DECLARE(M_PFHASH); +MALLOC_DECLARE(M_PF_RULE_ITEM); SDT_PROVIDER_DECLARE(pf); @@ -593,8 +594,13 @@ struct pf_kpool { }; struct pf_rule_actions { + int rtableid; uint16_t qid; uint16_t pqid; + uint16_t max_mss; + uint8_t log; + uint8_t set_tos; + uint8_t min_ttl; uint16_t dnpipe; uint16_t dnrpipe; /* Reverse direction pipe */ uint32_t flags; @@ -811,10 +817,18 @@ struct pf_krule { #endif }; +struct pf_krule_item { + SLIST_ENTRY(pf_krule_item) entry; + struct pf_krule *r; +}; + +SLIST_HEAD(pf_krule_slist, pf_krule_item); + struct pf_ksrc_node { LIST_ENTRY(pf_ksrc_node) entry; struct pf_addr addr; struct pf_addr raddr; + struct pf_krule_slist match_rules; union pf_krule_ptr rule; struct pfi_kkif *kif; counter_u64_t bytes[2]; @@ -892,16 +906,6 @@ struct pf_state_cmp { u_int8_t pad[3]; }; -#define PFSTATE_ALLOWOPTS 0x01 -#define PFSTATE_SLOPPY 0x02 -/* was PFSTATE_PFLOW 0x04 */ -#define PFSTATE_NOSYNC 0x08 -#define PFSTATE_ACK 0x10 -#define PFRULE_DN_IS_PIPE 0x40 -#define PFRULE_DN_IS_QUEUE 0x80 -#define PFSTATE_SETPRIO 0x0200 -#define PFSTATE_SETMASK (PFSTATE_SETPRIO) - struct pf_state_scrub_export { uint16_t pfss_flags; uint8_t pfss_ttl; /* stashed TTL */ @@ -952,12 +956,13 @@ struct pf_state_export { uint8_t proto; uint8_t direction; uint8_t log; - uint8_t state_flags; + uint8_t state_flags_compat; uint8_t timeout; uint8_t sync_flags; uint8_t updates; + uint16_t state_flags; - uint8_t spare[112]; + uint8_t spare[110]; }; _Static_assert(sizeof(struct pf_state_export) == 384, "size incorrect"); @@ -974,7 +979,7 @@ struct pf_kstate { * end of the area */ - u_int8_t state_flags; + u_int16_t state_flags; u_int8_t timeout; u_int8_t sync_state; /* PFSYNC_S_x */ u_int8_t sync_updates; /* XXX */ @@ -985,6 +990,7 @@ struct pf_kstate { LIST_ENTRY(pf_kstate) entry; struct pf_state_peer src; struct pf_state_peer dst; + struct pf_krule_slist match_rules; union pf_krule_ptr rule; union pf_krule_ptr anchor; union pf_krule_ptr nat_rule; @@ -1000,18 +1006,22 @@ struct pf_kstate { u_int32_t creation; u_int32_t expire; u_int32_t pfsync_time; - u_int16_t qid; - u_int16_t pqid; + u_int16_t qid; + u_int16_t pqid; u_int16_t dnpipe; u_int16_t dnrpipe; u_int16_t tag; u_int8_t log; + int rtableid; + u_int8_t min_ttl; + u_int8_t set_tos; + u_int16_t max_mss; }; /* - * Size <= fits 13 objects per page on LP64. Try to not grow the struct beyond that. + * Size <= fits 12 objects per page on LP64. Try to not grow the struct beyond that. */ -_Static_assert(sizeof(struct pf_kstate) <= 312, "pf_kstate size crosses 312 bytes"); +_Static_assert(sizeof(struct pf_kstate) <= 336, "pf_kstate size crosses 336 bytes"); #endif /* @@ -1061,9 +1071,9 @@ struct pfsync_state { sa_family_t af; u_int8_t proto; u_int8_t direction; - u_int8_t __spare[2]; + u_int16_t state_flags; u_int8_t log; - u_int8_t state_flags; + u_int8_t state_flags_compat; u_int8_t timeout; u_int8_t sync_flags; u_int8_t updates; @@ -1545,6 +1555,7 @@ struct pf_kstatus { bool syncookies_active; uint64_t syncookies_inflight[2]; uint32_t states_halfopen; + uint32_t reass; }; #endif @@ -1897,6 +1908,7 @@ struct pfioc_iface { #define DIOCGETETHRULES _IOWR('D', 99, struct pfioc_nv) #define DIOCGETETHRULESETS _IOWR('D', 100, struct pfioc_nv) #define DIOCGETETHRULESET _IOWR('D', 101, struct pfioc_nv) +#define DIOCSETREASS _IOWR('D', 102, u_int32_t) struct pf_ifspeed_v0 { char ifname[IFNAMSIZ]; @@ -2249,12 +2261,12 @@ struct mbuf *pf_build_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, - u_int16_t); + u_int16_t, int); void pf_send_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, - u_int16_t); + u_int16_t, int); void pf_syncookies_init(void); void pf_syncookies_cleanup(void); @@ -2368,6 +2380,16 @@ struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t); struct pf_state_key *pf_state_key_clone(struct pf_state_key *); +int pf_normalize_mss(struct mbuf *m, int off, + struct pf_pdesc *pd, u_int16_t maxmss); +u_int16_t pf_rule_to_scrub_flags(u_int32_t); +#ifdef INET +void pf_scrub_ip(struct mbuf **, uint32_t, uint8_t, uint8_t); +#endif /* INET */ +#ifdef INET6 +void pf_scrub_ip6(struct mbuf **, uint32_t, uint8_t, uint8_t); +#endif /* INET6 */ + struct pfi_kkif *pf_kkif_create(int); void pf_kkif_free(struct pfi_kkif *); void pf_kkif_zero(struct pfi_kkif *); diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index c9d214d73470..2bf1146ceda8 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -581,7 +581,30 @@ pfsync_state_import(struct pfsync_state *sp, int flags) st->direction = sp->direction; st->log = sp->log; st->timeout = sp->timeout; - st->state_flags = sp->state_flags; + /* 8 from old peers, 16 bits from new peers */ + st->state_flags = sp->state_flags_compat | ntohs(sp->state_flags); + + if (r == &V_pf_default_rule) { + /* ToS and Prio are not sent over struct pfsync_state */ + st->state_flags &= ~PFSTATE_SETMASK; + } else { + /* Most actions are applied form state, not from rule. Until + * pfsync can forward all those actions and their parameters we + * must relay on restoring them from the found rule. + * It's a copy of pf_rule_to_actions() */ + st->qid = r->qid; + st->pqid = r->pqid; + st->rtableid = r->rtableid; + if (r->scrub_flags & PFSTATE_SETTOS) + st->set_tos = r->set_tos; + st->min_ttl = r->min_ttl; + st->max_mss = r->max_mss; + st->state_flags |= (r->scrub_flags & (PFSTATE_NODF|PFSTATE_RANDOMID| + PFSTATE_SETTOS|PFSTATE_SCRUB_TCP|PFSTATE_SETPRIO)); + st->dnpipe = r->dnpipe; + st->dnrpipe = r->dnrpipe; + /* FIXME: dnflags are not part of state, can't update them */ + } st->id = sp->id; st->creatorid = sp->creatorid; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f20851cb60e8..5eebd44c297d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -268,7 +268,7 @@ static void pf_change_icmp(struct pf_addr *, u_int16_t *, u_int16_t *, u_int16_t *, u_int16_t *, u_int16_t *, u_int8_t, sa_family_t); static void pf_send_icmp(struct mbuf *, u_int8_t, u_int8_t, - sa_family_t, struct pf_krule *); + sa_family_t, struct pf_krule *, int); static void pf_detach_state(struct pf_kstate *); static int pf_state_key_attach(struct pf_state_key *, struct pf_state_key *, struct pf_kstate *); @@ -294,7 +294,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_state_key *, struct mbuf *, int, u_int16_t, u_int16_t, int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, - int); + int, struct pf_krule_slist *); static int pf_test_fragment(struct pf_krule **, int, struct pfi_kkif *, struct mbuf *, void *, struct pf_pdesc *, struct pf_krule **, @@ -386,6 +386,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); #define STATE_INC_COUNTERS(s) \ do { \ + struct pf_krule_item *mrm; \ counter_u64_add(s->rule.ptr->states_cur, 1); \ counter_u64_add(s->rule.ptr->states_tot, 1); \ if (s->anchor.ptr != NULL) { \ @@ -396,18 +397,26 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); counter_u64_add(s->nat_rule.ptr->states_cur, 1);\ counter_u64_add(s->nat_rule.ptr->states_tot, 1);\ } \ + SLIST_FOREACH(mrm, &s->match_rules, entry) { \ + counter_u64_add(mrm->r->states_cur, 1); \ + counter_u64_add(mrm->r->states_tot, 1); \ + } \ } while (0) #define STATE_DEC_COUNTERS(s) \ do { \ + struct pf_krule_item *mrm; \ if (s->nat_rule.ptr != NULL) \ counter_u64_add(s->nat_rule.ptr->states_cur, -1);\ if (s->anchor.ptr != NULL) \ counter_u64_add(s->anchor.ptr->states_cur, -1); \ counter_u64_add(s->rule.ptr->states_cur, -1); \ + SLIST_FOREACH(mrm, &s->match_rules, entry) \ + counter_u64_add(mrm->r->states_cur, -1); \ } while (0) MALLOC_DEFINE(M_PFHASH, "pf_hash", "pf(4) hash header structures"); +MALLOC_DEFINE(M_PF_RULE_ITEM, "pf_krule_item", "pf(4) rule items"); VNET_DEFINE(struct pf_keyhash *, pf_keyhash); VNET_DEFINE(struct pf_idhash *, pf_idhash); VNET_DEFINE(struct pf_srchash *, pf_srchash); @@ -2031,7 +2040,7 @@ pf_unlink_state(struct pf_kstate *s) s->key[PF_SK_WIRE]->port[1], s->key[PF_SK_WIRE]->port[0], s->src.seqhi, s->src.seqlo + 1, - TH_RST|TH_ACK, 0, 0, 0, 1, s->tag); + TH_RST|TH_ACK, 0, 0, 0, 1, s->tag, s->rtableid); } LIST_REMOVE(s, entry); @@ -2066,11 +2075,17 @@ pf_alloc_state(int flags) void pf_free_state(struct pf_kstate *cur) { + struct pf_krule_item *ri; KASSERT(cur->refs == 0, ("%s: %p has refs", __func__, cur)); KASSERT(cur->timeout == PFTM_UNLINKED, ("%s: timeout %u", __func__, cur->timeout)); + while ((ri = SLIST_FIRST(&cur->match_rules))) { + SLIST_REMOVE_HEAD(&cur->match_rules, entry); + free(ri, M_PF_RULE_ITEM); + } + pf_normalize_tcp_cleanup(cur); uma_zfree(V_pf_state_z, cur); pf_counter_u64_add(&V_pf_status.fcounters[FCNT_STATE_REMOVALS], 1); @@ -2084,6 +2099,7 @@ pf_purge_expired_states(u_int i, int maxcheck) { struct pf_idhash *ih; struct pf_kstate *s; + struct pf_krule_item *mrm; V_pf_status.states = uma_zone_get_cur(V_pf_state_z); @@ -2109,6 +2125,8 @@ relock: if (s->anchor.ptr != NULL) s->anchor.ptr->rule_ref |= PFRULE_REFS; s->kif->pfik_flags |= PFI_IFLAG_REFS; + SLIST_FOREACH(mrm, &s->match_rules, entry) + mrm->r->rule_ref |= PFRULE_REFS; if (s->rt_kif) s->rt_kif->pfik_flags |= PFI_IFLAG_REFS; } @@ -2772,7 +2790,7 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, - u_int16_t rtag) + u_int16_t rtag, int rtableid) { struct mbuf *m; int len, tlen; @@ -2824,8 +2842,8 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, m->m_flags |= M_SKIP_FIREWALL; pf_mtag->tag = rtag; - if (r != NULL && r->rtableid >= 0) - M_SETFIB(m, r->rtableid); + if (rtableid >= 0) + M_SETFIB(m, rtableid); #ifdef ALTQ if (r != NULL && r->qid) { @@ -2923,13 +2941,13 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, - u_int16_t rtag) + u_int16_t rtag, int rtableid) { struct pf_send_entry *pfse; struct mbuf *m; m = pf_build_tcp(r, af, saddr, daddr, sport, dport, seq, ack, flags, - win, mss, ttl, tag, rtag); + win, mss, ttl, tag, rtag, rtableid); if (m == NULL) return; @@ -2961,7 +2979,7 @@ static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, struct pf_state_key *sk, int off, struct mbuf *m, struct tcphdr *th, struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, - u_short *reason) + u_short *reason, int rtableid) { struct pf_addr * const saddr = pd->src; struct pf_addr * const daddr = pd->dst; @@ -3019,16 +3037,16 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, pf_send_tcp(r, af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, - r->return_ttl, 1, 0); + r->return_ttl, 1, 0, rtableid); } } else if (pd->proto != IPPROTO_ICMP && af == AF_INET && r->return_icmp) pf_send_icmp(m, r->return_icmp >> 8, - r->return_icmp & 255, af, r); + r->return_icmp & 255, af, r, rtableid); else if (pd->proto != IPPROTO_ICMPV6 && af == AF_INET6 && r->return_icmp6) pf_send_icmp(m, r->return_icmp6 >> 8, - r->return_icmp6 & 255, af, r); + r->return_icmp6 & 255, af, r, rtableid); } *** 1207 LINES SKIPPED *** From nobody Fri Apr 14 07:52:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyTFb42V0z44jYL; Fri, 14 Apr 2023 07:52: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 4PyTFb0qJPz3PMh; Fri, 14 Apr 2023 07:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681458771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNgkRLuxC8hLMQ0yvWxQShtMvp8S/2H1xzlfwgQot2M=; b=cJ4R0bMbB6E+o0dxjXNcODwhgI5etq60oRAT135lWQjC4PtDd5YCOXJCx1KvLrhusYyn1R nT+J72Al2ldqfrnymeiJLtcutqcek9XFT131RzJmmi36jqVR+YlNdrnk2THIkZyE5h0v8I 1x0x1roBSiHwbtrt4e7JvbG0RFGCo0BJpvnemn0ADhU+dxkitb1Dffa3GRwX0b6gky9vAC vcTh/pkfiF2BdfVTtB6ZhWB8brs/e57n5Jls193ZNc2cCn0KyzdmEovpiGl8F6FeNvbGVv dVQFgV1gviq3xBr94yo9UaEM/hwdHUva3/RNX43md87XvwCI0YpI5b2TLtQ+hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681458771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNgkRLuxC8hLMQ0yvWxQShtMvp8S/2H1xzlfwgQot2M=; b=CeXv4n+yTZsrMU4Mul/fjcbyXQ037JG+/mcnILsvTEH8WsJ56IPd0wov7PbQ9veTCFPJTS 5K76aaP9Ni9egqJ6V3fZuFdn95gHb5IE0O8yNJyAeQcmhEc9nmJk03TdKNbUlN1dCm/lba Sd9PuwnTp3e/D7uCGYG0tSqqpryx1AYgK0gn+Wq9YOJ3N6GEGzed+9re95+nRj7uGgBg0P U+IN+PpRZQnRvJyNzq1fqjGpdQTIzpRppM4ucuC0pM1Sf3EnKIyR7AXjJi5jDbmKfKYGbC kBsqo77iDS+N1JGzlJxs0HAgdd9JDEIEf0r7ecey1oHN6RlY0CMFGLpYF48BZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681458771; a=rsa-sha256; cv=none; b=iJ8QFbFFXwgf66qFq0ZHNfKWAeF0XGtJEBTsdEi8hnj5Fjxe6fmx4JSMKJkbn8BXOvrL5n fCOd8aHpSAPUPgFK+KOetWX/qRya5cLj3UESI/b2OmBZMit/1VI/2xb4hSXPN7G/2MAefk gMmhpFhCxHloHCin28ud7hZ7IM13HFxSsfcyM6x4oKkq8FebCoEi9xGmdaiwbyqUrkpaDb R/HvzjEUyeRC7pIW63cKkyVONl0ukWPVfLGeO0t4NSoXjDcDddP79llM/vQzB0pojdckOE 7lG1YudQjNqsZoPDcbxVzs7q1mqtw80ws8kxJDLohI+Nl8pb9E+HT+p7GUy36A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyTFZ72DZzGb8; Fri, 14 Apr 2023 07:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E7qoRP080972; Fri, 14 Apr 2023 07:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E7qoNV080971; Fri, 14 Apr 2023 07:52:50 GMT (envelope-from git) Date: Fri, 14 Apr 2023 07:52:50 GMT Message-Id: <202304140752.33E7qoNV080971@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: b800be978086 - main - pf tests: add tests for the new scrub syntax List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b800be978086396e4449525165096d188f4f3527 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b800be978086396e4449525165096d188f4f3527 commit b800be978086396e4449525165096d188f4f3527 Author: Kajetan Staszkiewicz AuthorDate: 2023-04-13 16:14:52 +0000 Commit: Kristof Provost CommitDate: 2023-04-14 07:04:06 +0000 pf tests: add tests for the new scrub syntax Add functions for testing new scrub option syntax and for packet fragmentation and route tables, because this was modified too. When testing of both the new and the compatible syntax is necessary, move original tests into _compat.sh file. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D38129 --- tests/sys/netpfil/pf/Makefile | 6 +- .../{fragmentation.sh => fragmentation_compat.sh} | 31 +- tests/sys/netpfil/pf/fragmentation_pass.sh | 438 +++++++++++++++++++++ tests/sys/netpfil/pf/scrub_compat.sh | 221 +++++++++++ tests/sys/netpfil/pf/scrub_pass.sh | 173 ++++++++ 5 files changed, 856 insertions(+), 13 deletions(-) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 250299727697..1117f0dcc239 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -10,7 +10,8 @@ ATF_TESTS_SH+= altq \ dup \ ether \ forward \ - fragmentation \ + fragmentation_compat \ + fragmentation_pass \ get_state \ icmp \ killstate \ @@ -29,7 +30,8 @@ ATF_TESTS_SH+= altq \ route_to \ rtable \ rules_counter \ - scrub \ + scrub_compat \ + scrub_pass \ set_skip \ set_tos \ src_track \ diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh similarity index 93% rename from tests/sys/netpfil/pf/fragmentation.sh rename to tests/sys/netpfil/pf/fragmentation_compat.sh index 554a9fdecc09..ae1ba37310bf 100644 --- a/tests/sys/netpfil/pf/fragmentation.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -348,9 +348,6 @@ no_df_body() { setup_router_server_ipv4 - # Tester can send long packets which will get fragmented by the router. - # Replies from server will come in fragments which might get - # reassembled resulting in a long reply packet sent back to tester. ifconfig ${epair_tester}a mtu 9000 jexec router ifconfig ${epair_tester}b mtu 9000 jexec router ifconfig ${epair_server}a mtu 1500 @@ -359,16 +356,29 @@ no_df_body() # Sanity check. ping_server_check_reply exit:0 --ping-type=icmp - # Enable packet reassembly with clearing of the no-df flag. pft_set_rules router \ - "scrub all fragment reassemble no-df" \ - "block" \ - "pass inet proto icmp all icmp-type echoreq" - # Ping with non-fragmentable packets. - # pf will strip the DF flag resulting in fragmentation and packets - # getting properly forwarded. + "scrub fragment reassemble" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Ping with normal, fragmentable packets. + ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 + + # Ping with non-fragmentable packets, this will fail. + ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF + + pft_set_rules router \ + "scrub any reassemble" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Ping with non-fragmentable packets again. + # This time pf will strip the DF flag. ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF } + no_df_cleanup() { pft_cleanup @@ -383,5 +393,4 @@ atf_init_test_cases() atf_add_test_case "overindex" atf_add_test_case "overlimit" atf_add_test_case "reassemble" - atf_add_test_case "no_df" } diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh new file mode 100644 index 000000000000..cd6b0f9059ce --- /dev/null +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -0,0 +1,438 @@ +# $FreeBSD$ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2017 Kristof Provost +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "too_many_fragments" "cleanup" + +too_many_fragments_head() +{ + atf_set descr 'IPv4 fragment limitation test' + atf_set require.user root +} + +too_many_fragments_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}a + + ifconfig ${epair}b inet 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}a 192.0.2.2/24 up + + ifconfig ${epair}b mtu 200 + jexec alcatraz ifconfig ${epair}a mtu 200 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set reassemble yes" \ + "pass keep state" + + # So we know pf is limiting things + jexec alcatraz sysctl net.inet.ip.maxfragsperpacket=1024 + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + # We can ping with < 64 fragments + atf_check -s exit:0 -o ignore ping -c 1 -s 800 192.0.2.2 + + # Too many fragments should fail + atf_check -s exit:2 -o ignore ping -c 1 -s 20000 192.0.2.2 +} + +too_many_fragments_cleanup() +{ + pft_cleanup +} + +atf_test_case "v6" "cleanup" +v6_head() +{ + atf_set descr 'IPv6 fragmentation test' + atf_set require.user root + atf_set require.progs scapy +} + +v6_body() +{ + pft_init + + epair_send=$(vnet_mkepair) + epair_link=$(vnet_mkepair) + + vnet_mkjail alcatraz ${epair_send}b ${epair_link}a + vnet_mkjail singsing ${epair_link}b + + ifconfig ${epair_send}a inet6 2001:db8:42::1/64 no_dad up + + jexec alcatraz ifconfig ${epair_send}b inet6 2001:db8:42::2/64 no_dad up + jexec alcatraz ifconfig ${epair_link}a inet6 2001:db8:43::2/64 no_dad up + jexec alcatraz sysctl net.inet6.ip6.forwarding=1 + + jexec singsing ifconfig ${epair_link}b inet6 2001:db8:43::3/64 no_dad up + jexec singsing route add -6 2001:db8:42::/64 2001:db8:43::2 + route add -6 2001:db8:43::/64 2001:db8:42::2 + + jexec alcatraz ifconfig ${epair_send}b inet6 -ifdisabled + jexec alcatraz ifconfig ${epair_link}a inet6 -ifdisabled + jexec singsing ifconfig ${epair_link}b inet6 -ifdisabled + ifconfig ${epair_send}a inet6 -ifdisabled + + ifconfig ${epair_send}a + jexec alcatraz ifconfig ${epair_send}b + lladdr=$(jexec alcatraz ifconfig ${epair_send}b | awk '/ scopeid / { print($2); }' | cut -f 1 -d %) + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set reassemble yes" \ + "pass keep state" \ + "block in" \ + "pass in inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" + + # Host test + atf_check -s exit:0 -o ignore \ + ping -6 -c 1 2001:db8:42::2 + + atf_check -s exit:0 -o ignore \ + ping -6 -c 1 -s 4500 2001:db8:42::2 + + atf_check -s exit:0 -o ignore\ + ping -6 -c 1 -b 70000 -s 65000 2001:db8:42::2 + + # Force an NDP lookup + ping -6 -c 1 ${lladdr}%${epair_send}a + + atf_check -s exit:0 -o ignore\ + ping -6 -c 1 -b 70000 -s 65000 ${lladdr}%${epair_send}a + + # Forwarding test + atf_check -s exit:0 -o ignore \ + ping -6 -c 1 2001:db8:43::3 + + atf_check -s exit:0 -o ignore \ + ping -6 -c 1 -s 4500 2001:db8:43::3 + + atf_check -s exit:0 -o ignore\ + ping -6 -c 1 -b 70000 -s 65000 2001:db8:43::3 + + $(atf_get_srcdir)/CVE-2019-5597.py \ + ${epair_send}a \ + 2001:db8:42::1 \ + 2001:db8:43::3 +} + +v6_cleanup() +{ + pft_cleanup +} + +atf_test_case "mtu_diff" "cleanup" +mtu_diff_head() +{ + atf_set descr 'Test reassembly across different MTUs, PR #255432' + atf_set require.user root +} + +mtu_diff_body() +{ + pft_init + + epair_small=$(vnet_mkepair) + epair_large=$(vnet_mkepair) + + vnet_mkjail first ${epair_small}b ${epair_large}a + vnet_mkjail second ${epair_large}b + + ifconfig ${epair_small}a 192.0.2.1/25 up + jexec first ifconfig ${epair_small}b 192.0.2.2/25 up + + jexec first sysctl net.inet.ip.forwarding=1 + jexec first ifconfig ${epair_large}a 192.0.2.130/25 up + jexec first ifconfig ${epair_large}a mtu 9000 + jexec second ifconfig ${epair_large}b 192.0.2.131/25 up + jexec second ifconfig ${epair_large}b mtu 9000 + jexec second route add default 192.0.2.130 + + route add 192.0.2.128/25 192.0.2.2 + + jexec first pfctl -e + pft_set_rules first \ + "set reassemble yes" \ + "pass keep state" + + # Sanity checks + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.130 + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.131 + + # Large packet that'll get reassembled and sent out in one on the large + # epair + atf_check -s exit:0 -o ignore ping -c 1 -s 8000 192.0.2.131 +} + +mtu_diff_cleanup() +{ + pft_cleanup +} + +frag_common() +{ + name=$1 + + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}a + + ifconfig ${epair}b inet 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}a 192.0.2.2/24 up + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set reassemble yes" \ + "pass keep state" + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + atf_check -s exit:0 -o ignore $(atf_get_srcdir)/frag-${1}.py \ + --to 192.0.2.2 \ + --fromaddr 192.0.2.1 \ + --sendif ${epair}b \ + --recvif ${epair}b +} + +atf_test_case "overreplace" "cleanup" +overreplace_head() +{ + atf_set descr 'ping fragment that overlaps fragment at index boundary and replace it' + atf_set require.user root + atf_set require.progs scapy +} + +overreplace_body() +{ + frag_common overreplace +} + +overreplace_cleanup() +{ + pft_cleanup +} + +atf_test_case "overindex" "cleanup" +overindex_head() +{ + atf_set descr 'ping fragment that overlaps the first fragment at index boundary' + atf_set require.user root + atf_set require.progs scapy +} + +overindex_body() +{ + frag_common overindex +} + +overindex_cleanup() +{ + pft_cleanup +} + +atf_test_case "overlimit" "cleanup" +overlimit_head() +{ + atf_set descr 'ping fragment at index boundary that cannot be requeued' + atf_set require.user root + atf_set require.progs scapy +} + +overlimit_body() +{ + frag_common overlimit +} + +overlimit_cleanup() +{ + pft_cleanup +} + +atf_test_case "reassemble" "cleanup" +reassemble_head() +{ + atf_set descr 'Test reassembly' + atf_set require.user root +} + +reassemble_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}a + + ifconfig ${epair}b inet 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}a 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Single fragment passes + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + # But a fragmented ping does not + atf_check -s exit:2 -o ignore ping -c 1 -s 2000 192.0.2.2 + + pft_set_rules alcatraz \ + "set reassemble yes" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Both single packet & fragmented pass when we scrub + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + atf_check -s exit:0 -o ignore ping -c 1 -s 2000 192.0.2.2 +} + +reassemble_cleanup() +{ + pft_cleanup +} + +atf_test_case "no_df" "cleanup" +no_df_head() +{ + atf_set descr 'Test removing of DF flag' + atf_set require.user root +} + +no_df_body() +{ + setup_router_server_ipv4 + + ifconfig ${epair_tester}a mtu 9000 + jexec router ifconfig ${epair_tester}b mtu 9000 + jexec router ifconfig ${epair_server}a mtu 1500 + jexec server ifconfig ${epair_server}b mtu 1500 + + # Sanity check. + ping_server_check_reply exit:0 --ping-type=icmp + + pft_set_rules router \ + "set reassemble no" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Ping with normal, fragmentable packets. + ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 + + pft_set_rules router \ + "set reassemble yes" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Ping with normal, fragmentable packets. + ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 + + # Ping with non-fragmentable packets. + ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF + + pft_set_rules router \ + "set reassemble yes no-df" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + + # Ping with non-fragmentable packets again. + # This time pf will strip the DF flag. + ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF +} +no_df_cleanup() +{ + pft_cleanup +} + +atf_test_case "no_df" "cleanup" +no_df_head() +{ + atf_set descr 'Test removing of DF flag' + atf_set require.user root +} + +no_df_body() +{ + setup_router_server_ipv4 + + # Tester can send long packets which will get fragmented by the router. + # Replies from server will come in fragments which might get + # reassembled resulting in a long reply packet sent back to tester. + ifconfig ${epair_tester}a mtu 9000 + jexec router ifconfig ${epair_tester}b mtu 9000 + jexec router ifconfig ${epair_server}a mtu 1500 + jexec server ifconfig ${epair_server}b mtu 1500 + + # Sanity check. + ping_server_check_reply exit:0 --ping-type=icmp + + # Enable packet reassembly with clearing of the no-df flag. + pft_set_rules router \ + "scrub all fragment reassemble no-df" \ + "block" \ + "pass inet proto icmp all icmp-type echoreq" + # Ping with non-fragmentable packets. + # pf will strip the DF flag resulting in fragmentation and packets + # getting properly forwarded. + ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF +} +no_df_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "too_many_fragments" + atf_add_test_case "v6" + atf_add_test_case "mtu_diff" + atf_add_test_case "overreplace" + atf_add_test_case "overindex" + atf_add_test_case "overlimit" + atf_add_test_case "reassemble" + atf_add_test_case "no_df" +} diff --git a/tests/sys/netpfil/pf/scrub_compat.sh b/tests/sys/netpfil/pf/scrub_compat.sh new file mode 100644 index 000000000000..14065ba9bbeb --- /dev/null +++ b/tests/sys/netpfil/pf/scrub_compat.sh @@ -0,0 +1,221 @@ +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "max_mss_v4" "cleanup" +max_mss_v4_head() +{ + atf_set descr 'Test IPv4 scrub "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b max-mss 1300" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "max_mss_v6" "cleanup" +max_mss_v6_head() +{ + atf_set descr 'Test IPv6 scrub "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b max-mss 1300" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v4" "cleanup" +set_tos_v4_head() +{ + atf_set descr 'Test IPv4 scub "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=66 +} + +set_tos_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v6" "cleanup" +set_tos_v6_head() +{ + atf_set descr 'Test IPv6 scub "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-tc=0 --expect-tc=66 +} + +set_tos_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v4" "cleanup" +min_ttl_v4_head() +{ + atf_set descr 'Test IPv4 scub "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b min-ttl 50" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v6" "cleanup" +min_ttl_v6_head() +{ + atf_set descr 'Test IPv6 scub "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b min-ttl 50" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "no_scrub_v4" "cleanup" +no_scrub_v4_head() +{ + atf_set descr 'Test IPv4 "no scrub" rule' + atf_set require.user root + atf_set require.progs scapy +} + +no_scrub_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router\ + "no scrub on ${epair_tester}b to ${net_server_host_server}" + "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=0 +} + +no_scrub_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "no_scrub_v6" "cleanup" +no_scrub_v6_head() +{ + atf_set descr 'Test IPv6 "no scrub" rule' + atf_set require.user root + atf_set require.progs scapy +} + +no_scrub_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router \ + "no scrub on ${epair_tester}b to ${net_server_host_server}" + "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=0 +} + +no_scrub_v6_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "max_mss_v4" + atf_add_test_case "max_mss_v6" + atf_add_test_case "set_tos_v4" + atf_add_test_case "set_tos_v6" + atf_add_test_case "min_ttl_v4" + atf_add_test_case "min_ttl_v6" + atf_add_test_case "no_scrub_v4" + atf_add_test_case "no_scrub_v6" +} diff --git a/tests/sys/netpfil/pf/scrub_pass.sh b/tests/sys/netpfil/pf/scrub_pass.sh new file mode 100644 index 000000000000..e6dd0ed018ad --- /dev/null +++ b/tests/sys/netpfil/pf/scrub_pass.sh @@ -0,0 +1,173 @@ +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "max_mss_v4" "cleanup" +max_mss_v4_head() +{ + atf_set descr 'Test IPv4 pass "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "pass on ${epair_tester}b scrub ( max-mss 1300 )" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "max_mss_v6" "cleanup" +max_mss_v6_head() +{ + atf_set descr 'Test IPv6 pass "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "pass on ${epair_tester}b scrub ( max-mss 1300 )" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v4" "cleanup" +set_tos_v4_head() +{ + atf_set descr 'Test IPv4 pass "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "pass on ${epair_tester}b set ( tos 0x42 )" + ping_dummy_check_request exit:0 --send-tc=66 --expect-tc=66 +} + +set_tos_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v6" "cleanup" +set_tos_v6_head() +{ + atf_set descr 'Test IPv6 pass "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v6_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "pass on ${epair_tester}b set ( tos 0x42 )" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-tc=66 --expect-tc=66 +} + +set_tos_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v4" "cleanup" +min_ttl_v4_head() +{ + atf_set descr 'Test IPv4 pass "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "pass on ${epair_tester}b scrub ( min-ttl 50 )" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v6" "cleanup" +min_ttl_v6_head() +{ + atf_set descr 'Test IPv6 pass "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "pass on ${epair_tester}b scrub ( min-ttl 50 )" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v6_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "max_mss_v4" + atf_add_test_case "max_mss_v6" + atf_add_test_case "set_tos_v4" + atf_add_test_case "set_tos_v6" + atf_add_test_case "min_ttl_v4" + atf_add_test_case "min_ttl_v6" +} From nobody Fri Apr 14 07:56:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyTKS2gvkz44jjS; Fri, 14 Apr 2023 07: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 4PyTKR6YRhz3jyR; Fri, 14 Apr 2023 07: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=1681458971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReQDswJYWwi2GHJt6t12VtF/RCeIUPpFJ6um0d4BTuY=; b=OC8rcqIJIYWfNq9CKUmdqkkyAnB6GiJG7ClLPcR30qkn/7PQ4bgOQsGhgsdqOr0CJmVy/W sNi9Hf7X2moHbyaD+CcAAVhjy3Kq+EW9B4xHP/Yo+Ep+08dv1bJgoJ8KemTkScZ0vmXMVB Mzmvoi690PPxhasON4Ml3TojPtmhWFTSPCI1U0/u6nhr17nRjPY+Jao34MhUqQ5zhSENUv 2hm4lw4pNTbo/kAfpD2fH7LG+wY2bS5yzrGpWDfc9oQglXqHJWX8vuSeZHxc+mZ+VSaD17 +Dkh4jZ28utW2ocSvWgHRxpjyxU03mW+KUhREMmXcWi53yvwCqnYmLqEQvEztA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681458971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReQDswJYWwi2GHJt6t12VtF/RCeIUPpFJ6um0d4BTuY=; b=ZzalRq4cFkHl0CxoHVpPWBL2duGnV54CV8JUltC964xzDIwn8ok4tHKxdTc5yotDC0OPW9 aPHqRCjdBG+22kp3bGLUvVa0M5nlbOKcs87tQKBhvL9Mb4qfHPbczsc2UdKQldEMGK5zje 1qoPo7mm9bJ6r+bDXGERj+mrFXmCo0ERCcLVM8VYyN8Vplsfv/tPpwf1sMQQ2778AXXyIH xveOZG4DAt++bv2uI/8SWCoviocVQI7iqzsRt9QI/nOnE6Yl7SYOhtLo5wH2KwKccCcvmf nMDX2kengvTIoMPG6GKazKPfPv4D6vKG1mo6nKF5V+UCyXAmtHEPCg3PoTUIrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681458971; a=rsa-sha256; cv=none; b=v6eE/5I3PoF2yNDoyr2tUbKOdpGBTBUHNzdXCpdVY44ibmvOUCTsg3hhsqC7+F1svQ2fGK D72nj1CSrINLykMMlvdt99eUY7ADUUxKRwghpF+hHHjOdwYOKwtpQmODKfwBi4yaxiYvop bihsez/P6ag9VnceLH5I+uISkv9qsiWpwDarxh5TFldQuANaqTqTAieEPyK7GAsB0DrXrA 9xuJ8cTyFAixgh1H7+H/FPTrbX8/eEpiHGYgX2PCcrtJb7zhYrVKb5IxACn0NwrxfGNxOu oCKIvEfMkhYUc477fwu/scdcl2TG9QcO2KsxvJ+TaTEiALHpDSMLv2Ial4r2MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyTKR5ZLSzFxL; Fri, 14 Apr 2023 07:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E7uBF8081516; Fri, 14 Apr 2023 07:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E7uBc5081515; Fri, 14 Apr 2023 07:56:11 GMT (envelope-from git) Date: Fri, 14 Apr 2023 07:56:11 GMT Message-Id: <202304140756.33E7uBc5081515@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: 0ece3355f63f - main - stress2: Added comment about a new panic found. Test both SU and SU+J. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ece3355f63fc79a4afb4bb5e16995230cbf8748 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=0ece3355f63fc79a4afb4bb5e16995230cbf8748 commit 0ece3355f63fc79a4afb4bb5e16995230cbf8748 Author: Peter Holm AuthorDate: 2023-04-14 07:55:10 +0000 Commit: Peter Holm CommitDate: 2023-04-14 07:55:10 +0000 stress2: Added comment about a new panic found. Test both SU and SU+J. --- tools/test/stress2/misc/pageout.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/pageout.sh b/tools/test/stress2/misc/pageout.sh index eafeb22d3417..2df199f9e6dc 100755 --- a/tools/test/stress2/misc/pageout.sh +++ b/tools/test/stress2/misc/pageout.sh @@ -33,6 +33,9 @@ # "panic: handle_written_filepage: not started" seen: # https://people.freebsd.org/~pho/stress/log/pageout-2.txt +# "panic: ffs_geom_strategy: bad I/O" seen: +# https://people.freebsd.org/~pho/stress/log/log0434.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg @@ -49,6 +52,8 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +[ "$newfs_flags" = "-U" ] && [ `jot -r 1 0 1` -eq 1 ] && newfs_flags="-j" +[ $# -eq 1 ] && newfs_flags="$1" # or use script argument newfs $newfs_flags md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint @@ -61,8 +66,8 @@ daemon sh -c "(cd ../testcases/swap; ./swap -t 5m -i 20 -l 100 -h)" > /dev/null (cd /tmp; /tmp/pageout $f1) & sleep .2 while kill -0 $! 2> /dev/null; do - mksnap_ffs $mntpoint $mntpoint/.snap/stress2 && - rm -f $mntpoint/.snap/stress2 + rm -f $mntpoint/.snap/stress2 + mksnap_ffs $mntpoint $mntpoint/.snap/stress2 done while pgrep -q swap; do pkill swap From nobody Fri Apr 14 08:29:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyV492vlZz44mQx; Fri, 14 Apr 2023 08:29: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 4PyV486TLmz4c7L; Fri, 14 Apr 2023 08: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=1681460984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltyfssnjot8cAdwnM2wjjz2/szdNcrlealj6c0iG8qo=; b=OaBMFmM526WfOvQqS7uQPIh2DDCUYYNa10z4MJi8PltddA8fRScv6yXM06FGwlPSIySRGe zDM4WaYrEe+W+3yRziyzmeVuYBssd8AjfMIZnBF8IjXjPqSu5NGZLWQgIQE1xI2g9024WB 8t/nrg7bithh3sytJiGs4A/S7ng7+TsvqB7ikMcQL3v6Z2P6sPaJQu81Qm9bz0Ak1rnRXU p3EHRe5XYK4ysIUuliLHAPITChy28L36NTMILco0dskpW3b9CvhUNfyRemNyan6r2ymJUd QAH8WvxjHlfvGeCl0CSChmzI1pXW7YI7tD+voUnbdeSR1wxVQYPc79D89p+Xgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681460984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltyfssnjot8cAdwnM2wjjz2/szdNcrlealj6c0iG8qo=; b=qmyBBzAHtazXCBK8aY7JI2XtzzrB8P3DYsl5AEKsdXG7+87zHyd1kD3nGd2TfIrj2emUFJ rA7ouY2su2PCC4SPt6HFKq/FFW8t+sljuT6jMZp8uxQgJeE34JWnn7kJvM+ugxhSxOFEsM an6FgYIOsAnxRXnCBaVCDvODX7I9ksVDDUmDnDvAXgVBJT5mIKgQVYJ1Cz5rYsswOF2cEx 1lj1tOgMEMjkBRb+mskCQ+nNU6LjWEsTfnfJKJ6rNT8aWG5YLz5MANTyCajkHoYNdv5+e4 qT+259g19ofzjNxpHGMpAaRKxJggtHHj80ljNGZyOpiAS0kxErR2+FlkF9ERjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681460984; a=rsa-sha256; cv=none; b=AHf5OvuWpyrTAObQM/OttQhi4wx8cu1NqO7AoYtdW0vE9Gi15e9oxmIfFCCEu9+Y48icBs qBc0mybTm4FODaPK8yLte1BBONBGUn7Cn4LhPB3z4NMOBR1H9u+8zVlq/mNrtzaeCBgTZH paB+LLqBge9PVz8d/Qz2FHcAFCZfDb+xgf/6w6RkNpmNqjkf8a84U1UDCRKbT5qYXC8Bys itiaD/rj5y+760hGkLmpn4QEQU7WCeZvcDx0kL0gM85dslt2+4Xn6jzcT7gWcYQf3TmGDM zop+Jp3X3xflV9qNqTlnIF5SGmNBoi25YBcWMStl1iVxdFRevMgCtoGySXba2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyV485ZdYzGdV; Fri, 14 Apr 2023 08:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E8Tilo032336; Fri, 14 Apr 2023 08:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E8Ti9x032335; Fri, 14 Apr 2023 08:29:44 GMT (envelope-from git) Date: Fri, 14 Apr 2023 08:29:44 GMT Message-Id: <202304140829.33E8Ti9x032335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hartmut Brandt Subject: git: 9088779e3c8b - main - SNMP: Update the fokus MIB with a new contact info. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9088779e3c8b810afb701adb80be154a7b2e0523 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=9088779e3c8b810afb701adb80be154a7b2e0523 commit 9088779e3c8b810afb701adb80be154a7b2e0523 Author: Hartmut Brandt AuthorDate: 2023-04-14 08:18:28 +0000 Commit: Hartmut Brandt CommitDate: 2023-04-14 08:28:56 +0000 SNMP: Update the fokus MIB with a new contact info. Bring the contact info in sync with the contact info at IANA. --- contrib/bsnmp/snmpd/FOKUS-MIB.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/contrib/bsnmp/snmpd/FOKUS-MIB.txt b/contrib/bsnmp/snmpd/FOKUS-MIB.txt index f356d14573c1..3f1fa2f092e5 100644 --- a/contrib/bsnmp/snmpd/FOKUS-MIB.txt +++ b/contrib/bsnmp/snmpd/FOKUS-MIB.txt @@ -26,9 +26,7 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $Begemot: bsnmp/snmpd/FOKUS-MIB.txt,v 1.5 2004/08/06 08:47:08 brandt Exp $ --- --- Begemot private definitions and fokus root. +-- Fokus PEN root module. -- FOKUS-MIB DEFINITIONS ::= BEGIN @@ -37,24 +35,29 @@ IMPORTS FROM SNMPv2-SMI; fokus MODULE-IDENTITY - LAST-UPDATED "200202050000Z" - ORGANIZATION "Fraunhofer FOKUS, CATS" + LAST-UPDATED "202304140000Z" + ORGANIZATION "Fraunhofer FOKUS" CONTACT-INFO - " Hartmut Brandt + " Bjoern Riemer Postal: Fraunhofer Institute for Open Communication Systems Kaiserin-Augusta-Allee 31 10589 Berlin Germany - Fax: +49 30 3463 7352 - - E-mail: harti@freebsd.org" + E-mail: iana-pen@fokus.fraunhofer.de" DESCRIPTION "The root of the Fokus enterprises tree." + REVISION "202304140000Z" + DESCRIPTION + "Contact info updated." REVISION "200202050000Z" DESCRIPTION "Initial revision." ::= { enterprises 12325 } +-- +-- begemot ::= fokus.1 +-- contact: hartmut.brandt@dlr.de +-- END From nobody Fri Apr 14 10:09:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyXHn455Pz44wFF; Fri, 14 Apr 2023 10: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 4PyXHn1prDz3vZ6; Fri, 14 Apr 2023 10:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+S5VM+lVx7qL788isvujm5l1wsUYQ4Ct6GhhqmVXGEQ=; b=YaZeflfm6czIUbHQiAqtoe8mQolf+7ysO1pdIggsUUSrLfNxEWryOP973jmeoDrPFOuKB3 D0jfGTmHgQqgLNZD3ymL+OVMxUr8u96JPbNEhZsWg6ebcltIWvSoBtwosAsuanxV5cnJhG r6lOKuuZarx1gMGoEz7MLo3QHWR/skHw3ppjyQUWldow+NXwyBe+mhLXEX6VDM7QWIbv9F 8mGxuz/pPPGeoqDKfD4cc71yqoQehk+JP2cPmExjJ1qXUWJnKS2X4xyPohkoV9wJ1ke7mi umuu02dMA6wmsZ118NKZakgpDiU4oNT6CyKne0QeQjTt6cQeSs/AYe1F63RokQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+S5VM+lVx7qL788isvujm5l1wsUYQ4Ct6GhhqmVXGEQ=; b=fhn99DNIovoMCp6zP55e+H5nAhGkTaDCujbwNtiPgPsiN4/Q3G/ZLZ3oxJubkk9jVukQ3l VtmUhk6BgOXUrmhPKe38VXyTjFCGyhH1vm0WNm7JgUp6OJx476hOi/0v3Ae4AL9CVbI003 B8qvPckrIphYc/WaY3qT0IL+hPuI1fv34LzMhYfGo8zYXlp5fgF/G5rSyvgJd4IbbZPd+R ETf+e7p+MWqJ0T61SA1sJiA0C0TnJq+ieWbVeMbCh3SO7j6IMl/qATpR7Z2PjpQxYj6FKN NP0+Vc9Jy0sAGy7MyLIR9F21lhf8vmE1jnbQx0YmzubqoDSsEn7D6PMtsYaGkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681466997; a=rsa-sha256; cv=none; b=mysRN30rxwyEchzl3uyGH5YqLSgHewNtLMe5q8lDX/jawziExp5zuatBQ2aMZ21OCIGIJF 3Q+iZV4Ch1fwwxx5F4BV7JGtkJSYoOKz8pQL3GrjrRIu+sxO1m4uZe4a58YQROIss2BNFf LxtasYJb/FWio2sawJm8f1DJwuADG+V0RySwbIzD0zhuZYUX/GQn+fSndcjNRrx2+4cFSL SKQkxnZYMccAEXbUGQRuHOVCfPSLzOdLZe6y2339KuO0r8kr0wNSD3w4zccUkVJXH9zyuo 9o89k0SKZVHeprsDVm7K+cDRkwxzyuQhJX0K0usLVf+G8RlV8QMhs32WxbfkqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyXHn0pL8zKgd; Fri, 14 Apr 2023 10:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EA9uL6096910; Fri, 14 Apr 2023 10:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EA9uGu096909; Fri, 14 Apr 2023 10:09:56 GMT (envelope-from git) Date: Fri, 14 Apr 2023 10:09:56 GMT Message-Id: <202304141009.33EA9uGu096909@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: 722b7589cca7 - main - printf.9: Update the use example of the %D conversion specifier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 722b7589cca704670c3c532bdd0f5d46675df085 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=722b7589cca704670c3c532bdd0f5d46675df085 commit 722b7589cca704670c3c532bdd0f5d46675df085 Author: Zhenlei Huang AuthorDate: 2023-04-14 10:08:56 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-14 10:08:56 +0000 printf.9: Update the use example of the %D conversion specifier The output of hexadecimal bytes are in lowercase. Update the example to reflect the reality. Reviewed by: gbe (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39543 --- share/man/man9/printf.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 4d3a6fb8b2a5..33347fb135ca 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2020 +.Dd April 14, 2023 .Dt PRINTF 9 .Os .Sh NAME @@ -164,14 +164,14 @@ printf_test(void) { printf("reg=%b\en", 3, "\e10\e2BITTWO\e1BITONE"); - printf("out: %4D\en", "AAAA", ":"); + printf("out: %4D\en", "AAZZ", ":"); } .Ed .Pp will produce the following output: .Bd -literal -offset indent reg=3 -out: 41:41:41:41 +out: 41:41:5a:5a .Ed .Pp The call From nobody Fri Apr 14 10:09:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyXHp3Fkdz44wHg; Fri, 14 Apr 2023 10:09: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 4PyXHp2Gvzz3vLj; Fri, 14 Apr 2023 10:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5hxuWMCLGsYEEE/SJS/y3iFD9mQH2tfgaYib8xVlCg=; b=iHjg1HjpMT6lEANN4F4zIr8owCJkDqSysjjUa0NF5yvWNJgftPL1ChF+uCQwR8x/T+K5Vw qH0WcadFbB6S7eM3kOlcqefXffNJ6jPcESusQcyqp/vDqRqP/4BfNXZ4rcg25lsuLLNFNk VVTmRC796nc/QQoBgsNB68EQ/kRwB43Em7+nxQq0440CjVHWsM9jWO/dlPJmX4U3zIZyuy Sr7ZIXMDbLs2/Ghx0A2VtGmqOKx+OL+iZo3ipEjkVZWbmFXf1gatIeqfyCA8lb8bdQiAzt dzqOp3wUR+Ltgwqu3j9nN+MKU0ZJ/f7E9AJiK6dufTE6SIuOjsqDWEehNTgNJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5hxuWMCLGsYEEE/SJS/y3iFD9mQH2tfgaYib8xVlCg=; b=pnrPiiA408J4WcSVL131HowirwI9sQzdJd8+0IdW3KUj25oyEklHvUEoBtYvC6fk8UO3Zf 59CvGcZi4QyPmsMoAiLRGoMsCgDsOn3H9a+G6BsL/GMbk/z1iu1h7ED1s442bkDXvUduRq CSU/sWzVasTJUdXMB0nPEDpWB3KOcuVhARhRxdu7wep60JT4jho6Xka0pskCQO/WdzXF5P 3+Vrw6iTVHQQyKsZlJAXAJbpKOdSjaqfuh3oYM0D7V5tvduBiRTxMHFiI8N3rhmJWxd5md 8K9siGi9HLSSLQBaMly6mCar2peVwpK2x55ira/mpJOSEjYbabHG+svNEGplEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681466998; a=rsa-sha256; cv=none; b=G+xOCRBsNdepW/ewW4oai76hcHxtEeprYLzYkC/1PdZQqxidjrvSigXsn0bqbv3YsNBG8c FEgMB83rYGpVo6aPmMC/q2+QMkgipN5lmOq5HSdtIDcFzQRkNetSaMZJoDB7IKheKwCUOs NenLKeo8Nx8aSdvTtQjnqsiw2jSY+IOmbOHtlA5zEQMW37a0wgpFjivPD2TN8ad7ui1V9U Njr+4faZeFwWo3dXPfWisOaDsPP46+4z7HwqTVGsyVtVcwKYZGlvifa5yaK4y4DpySdC0o Nd4jz34lrIAohMDMGWVoC+wgExkBnTwKvLRksPHVYCPCcFXoBLqG24k+pupRjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyXHp1MBvzKLV; Fri, 14 Apr 2023 10:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EA9wF6096929; Fri, 14 Apr 2023 10:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EA9wXl096928; Fri, 14 Apr 2023 10:09:58 GMT (envelope-from git) Date: Fri, 14 Apr 2023 10:09:58 GMT Message-Id: <202304141009.33EA9wXl096928@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: 9af6f4268ac3 - main - bridge: Use the %D identifier to format MAC address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 9af6f4268ac3cc8203f34c746d955b4405279099 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9af6f4268ac3cc8203f34c746d955b4405279099 commit 9af6f4268ac3cc8203f34c746d955b4405279099 Author: Zhenlei Huang AuthorDate: 2023-04-14 10:08:56 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-14 10:08:56 +0000 bridge: Use the %D identifier to format MAC address It is shorter and more readable. No functional change intended. Reviewed by: kp Fixes: 2d3614fb132b bridge: Log MAC address port flapping MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39542 --- sys/net/if_bridge.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index f71d7c0cdfd1..44ee52e62b77 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2957,11 +2957,10 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, if (V_log_mac_flap && ppsratecheck(&V_log_last, &V_log_count, V_log_interval)) { - uint8_t *addr = &brt->brt_addr[0]; log(LOG_NOTICE, - "%s: mac address %02x:%02x:%02x:%02x:%02x:%02x vlan %d moved from %s to %s\n", + "%s: mac address %6D vlan %d moved from %s to %s\n", sc->sc_ifp->if_xname, - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], + &brt->brt_addr[0], ":", brt->brt_vlan, obif->bif_ifp->if_xname, bif->bif_ifp->if_xname); From nobody Fri Apr 14 11:20:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyYsW24FZz4535q; Fri, 14 Apr 2023 11:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyYsW0Kvpz3vYq; Fri, 14 Apr 2023 11:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681471247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpLAbtZBwMoNz/0W10yfWx+klfozlopvZ1rRI4IM4S8=; b=GtowPeLjJE8MRNrqx/3XzcczcOm7efjxlaewQ4zyLFUPVyNZhrLJYW7hGJhNSVs/dx8R95 ckN/OTREImMfr4P4WBC8mjKkiJVQS74EJv1TuJbkpgJV33MA1NPw4B3WUkJs0EW2/MO38c Lq4rAtoOorDsCjVqLznIXVXio8oSLsjdhSbwBn0T3w0lJr7FTt6Qvrust84at2ewxe1lBW 5Bz3nXi0u6oDri6H53kVRpgJVwMTLwf/uT52tpzrWtv4WNogZiP3eghxEilootFbac4u/Q /9DE3pffuQ8FZK9ccaGBSrxEQ9oTcACDfupIDVt64lDF/5n1ICiJGofiK9Dteg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681471247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpLAbtZBwMoNz/0W10yfWx+klfozlopvZ1rRI4IM4S8=; b=w8A20DqF/rhJUzsEspUsfqxMyY4Lr0VuI0Yz9rRlYEQP633kSGh/Cl5VuzIMOrKk+gXh4x yDk3iVdDm2d3doyPhQBjNZuDn7y0Ly91OAHxm6F2fNj7BouNZivnhrbtCLCELREU35eoDc ntNWE8NhWtfE0Q6aliqXW/dxMT2NT/Uc29YBNSBhLmM3hVFE55fXDiPewIJtsT/jBIvtNs dD//ErnpjVSZAFr8vZ4xqq+iQFKtUQxvbnZYaFB3yUY/TAB0pIjUQzAytXvDE5i/93m4eh tvBkpk0/tpiUvCNl5DRRsbWFKtqhgR5sFiCOUfM28T8u0sdnkblZKc8AUyenSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681471247; a=rsa-sha256; cv=none; b=YHjQifLQmPPHrCHl/VyhOjZdi2YSsP+HOfjuAWXyBSkA71QFyC/5fFHsWB2hovDY1UGtJc sSLBWpenXcPJCGHtjCauToa+WBF2R5SVoVPjjwc6GsrNyyNVLbEq769dpfz3BqcId0lml0 HNvRuZy843VsFHTq0HarZjhbKPiSdA9DP4RNi2yatSXEpcExHkhwodhYM8fJ6wxH9bCt/x zKBRjmU1q1vW++PkrzjAKFZiMJMVfhpuSXf53EWQkJN3RZ4WiELbsmo06kzdjCnAXhMhAr wHDYh2Ia5OffinbRY+iQbU+UK68M8xJ1SIIAhLaYJ76NzIGuSvojKz4YxXeaKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyYsV6JvTzMmY; Fri, 14 Apr 2023 11:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EBKkJI022815; Fri, 14 Apr 2023 11:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EBKkHI022814; Fri, 14 Apr 2023 11:20:46 GMT (envelope-from git) Date: Fri, 14 Apr 2023 11:20:46 GMT Message-Id: <202304141120.33EBKkHI022814@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: b0e38a1373c0 - main - bridge: distinguish no vlan and vlan 1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0e38a1373c087e5a55eefcdee69ccfbf12f86ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b0e38a1373c087e5a55eefcdee69ccfbf12f86ce commit b0e38a1373c087e5a55eefcdee69ccfbf12f86ce Author: Kristof Provost AuthorDate: 2023-04-07 16:00:08 +0000 Commit: Kristof Provost CommitDate: 2023-04-14 11:17:02 +0000 bridge: distinguish no vlan and vlan 1 The bridge treated no vlan tag as being equivalent to vlan ID 1, which causes confusion if the bridge sees both untagged and vlan 1 tagged traffic. Use DOT1Q_VID_NULL when there's no tag, and fix up the lookup code by using 'DOT1Q_VID_RSVD_IMPL' to mean 'any vlan', rather than vlan 0. Note that we have to account for userspace expecting to use 0 as meaning 'any vlan'. PR: 270559 Suggested by: Zhenlei Huang Reviewed by: philip, zlei Differential Revision: https://reviews.freebsd.org/D39478 --- sys/net/if_bridge.c | 24 ++++++++++++++---------- sys/net/if_vlan_var.h | 5 +++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 44ee52e62b77..d78c647df0b4 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -389,9 +389,12 @@ static int bridge_fragment(struct ifnet *, struct mbuf **mp, static void bridge_linkstate(struct ifnet *ifp); static void bridge_linkcheck(struct bridge_softc *sc); -/* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ +/* + * Use the "null" value from IEEE 802.1Q-2014 Table 9-2 + * to indicate untagged frames. + */ #define VLANTAGOF(_m) \ - (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1 + (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : DOT1Q_VID_NULL static struct bstp_cb_ops bridge_ops = { .bcb_state = bridge_state_change, @@ -1639,8 +1642,13 @@ static int bridge_ioctl_daddr(struct bridge_softc *sc, void *arg) { struct ifbareq *req = arg; + int vlan = req->ifba_vlan; + + /* Userspace uses '0' to mean 'any vlan' */ + if (vlan == 0) + vlan = DOT1Q_VID_RSVD_IMPL; - return (bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan)); + return (bridge_rtdaddr(sc, req->ifba_dst, vlan)); } static int @@ -2886,10 +2894,6 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0) return (EINVAL); - /* 802.1p frames map to vlan 1 */ - if (vlan == 0) - vlan = 1; - /* * A route for this destination might already exist. If so, * update it, otherwise create a new one. @@ -3100,8 +3104,8 @@ bridge_rtdaddr(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan) BRIDGE_RT_LOCK(sc); /* - * If vlan is zero then we want to delete for all vlans so the lookup - * may return more than one. + * If vlan is DOT1Q_VID_RSVD_IMPL then we want to delete for all vlans + * so the lookup may return more than one. */ while ((brt = bridge_rtnode_lookup(sc, addr, vlan)) != NULL) { bridge_rtnode_destroy(sc, brt); @@ -3232,7 +3236,7 @@ bridge_rtnode_lookup(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan hash = bridge_rthash(sc, addr); CK_LIST_FOREACH(brt, &sc->sc_rthash[hash], brt_hash) { dir = bridge_rtnode_addr_cmp(addr, brt->brt_addr); - if (dir == 0 && (brt->brt_vlan == vlan || vlan == 0)) + if (dir == 0 && (brt->brt_vlan == vlan || vlan == DOT1Q_VID_RSVD_IMPL)) return (brt); if (dir > 0) return (NULL); diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index fb05cddc03bd..faed461c97aa 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -128,6 +128,11 @@ struct vlanreq { #define VLAN_PCP_MAX 7 +#define DOT1Q_VID_NULL 0x0 +#define DOT1Q_VID_DEF_PVID 0x1 +#define DOT1Q_VID_DEF_SR_PVID 0x2 +#define DOT1Q_VID_RSVD_IMPL 0xfff + /* * 802.1q full tag. Proto and vid are stored in host byte order. */ From nobody Fri Apr 14 11:20:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyYsX4fyXz4538f; Fri, 14 Apr 2023 11:20: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 4PyYsX1h4nz3vb3; Fri, 14 Apr 2023 11:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681471248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOPQa0/uvuanCqL9/wKqtGJHHqUTzXrbdiJQN8TcCbg=; b=QGOLGOQpeiU6rhV7AYeewN6VBE0cJ2wah4Cj9Wwn3/QK+Iosu3ENeCBiitdohOHpDUVs7E aI4VTHGAsJkLAijYsJjN5PyUti/1w81kqD9KYohNZCTSFI9oP6f+o1VbM+ga4GRvY9EeL/ 4xrRESCYzwOJVEk9GfupB7yau64yI/qd32xX47Rjj42TBq/iP7ywOq63n2h4DlbrCYaOf/ e6Nfi604UoJtbgzmyBaLnZ57aP5pFByHAPTJzYyJrE/zlxLaNkKxumewBYuEMAcK2NGviq yylLWlttBTwf/7h7yWR4QZR9XtYgRW0Yr+b4/1mhP3qT2gYD1x38vkJY8+u+Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681471248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOPQa0/uvuanCqL9/wKqtGJHHqUTzXrbdiJQN8TcCbg=; b=HvFDzOIXhpqkzbfVVZAsNWW/oK8OfQmohBB4/3taahS0Ck6PKXReVe4pG/lJooh9RYw5nZ YAJmifs4AztIKq1DV8XUiWZuHOqZW4J6lk+LQAXBqebXvx4EeqP0OwoLENtZtrxBEpBnIg 5UtLtFgbERxyxPzoRgk0xWfFM6xrXtdFiT26CqGuTYWz29DpqqzN/b2CxWBZ2NqPjeU8h6 7Rywr34c1OPI6LZK+4OuxzUyMdBHdfGywnyLgblBVSnsoQJelLaG7g5DSuYgU31r5iFLj8 kets07HPCU4ZPQnDK8N9VZdS+QbWAtdsgmpOtQXRdkBHssyO7SX7pE2gtuDadg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681471248; a=rsa-sha256; cv=none; b=tzezdMI0DKn1MAAPyb1V1Q9d/K5YlWullkIttleo3lwfcEagl0PXT1ydW2L1icqFdx4F6P Wq1jdFTROONxxqnhNJDS9b7FO0YF1l7gOy3JpZ8T8ZHD3Ih8GM03j6ZZff3l7ipvrc0Q2L 8WEMiciGYk5cyNFEiXRTU9o+kj6YKC6mjnB6ogrtTL0ckVcwpM1bd5otc+YC/FbQgjWdon Ov7H5RXAq3GJ63Oe/OwGxJpaMKpcna+VVQz+3Bixl1CmG4jBDtxpaOT87ODKjiuZeSozGX 7xGKbl29rvc9YKrrxUZ+FDWLi9L/iJsUZXPc/m00oQ8FFB6ia8zlJZ0YFjNjDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyYsW6pJbzMLV; Fri, 14 Apr 2023 11:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EBKlFT023430; Fri, 14 Apr 2023 11:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EBKlm2023419; Fri, 14 Apr 2023 11:20:47 GMT (envelope-from git) Date: Fri, 14 Apr 2023 11:20:47 GMT Message-Id: <202304141120.33EBKlm2023419@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: f97802a35e48 - main - bridge tests: test cross-vlan bridging List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f97802a35e484ee0f8e11d3956189392ea995b29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f97802a35e484ee0f8e11d3956189392ea995b29 commit f97802a35e484ee0f8e11d3956189392ea995b29 Author: Kristof Provost AuthorDate: 2023-04-07 16:02:35 +0000 Commit: Kristof Provost CommitDate: 2023-04-14 11:17:02 +0000 bridge tests: test cross-vlan bridging Ensure that the bridge takes VLAN IDs into account when learning addresses. PR: 270559 Differential Revision: https://reviews.freebsd.org/D39379 --- tests/sys/net/if_bridge_test.sh | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index 42f65936d038..1d8c4d317090 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -597,6 +597,73 @@ mtu_cleanup() vnet_cleanup } +atf_test_case "vlan" "cleanup" +vlan_head() +{ + atf_set descr 'Ensure the bridge takes vlan ID into account, PR#270559' + atf_set require.user root +} + +vlan_body() +{ + vnet_init + + vid=1 + + epaira=$(vnet_mkepair) + epairb=$(vnet_mkepair) + + br=$(vnet_mkbridge) + + vnet_mkjail one ${epaira}b + vnet_mkjail two ${epairb}b + + ifconfig ${br} up + ifconfig ${epaira}a up + ifconfig ${epairb}a up + ifconfig ${br} addm ${epaira}a addm ${epairb}a + + jexec one ifconfig ${epaira}b up + jexec one ifconfig ${epaira}b.${vid} create + + jexec two ifconfig ${epairb}b up + jexec two ifconfig ${epairb}b.${vid} create + + # Create a MAC address conflict between an untagged and tagged interface + jexec two ifconfig ${epairb}b.${vid} ether 02:05:6e:06:28:1a + jexec one ifconfig ${epaira}b ether 02:05:6e:06:28:1a + jexec one ifconfig ${epaira}b.${vid} ether 02:05:6e:06:28:1b + + # Add ip address, will also populate $br's fowarding table, by ARP announcement + jexec one ifconfig ${epaira}b.${vid} 192.0.2.1/24 up + jexec two ifconfig ${epairb}b.${vid} 192.0.2.2/24 up + + sleep 0.5 + + ifconfig ${br} + jexec one ifconfig + jexec two ifconfig + ifconfig ${br} addr + + atf_check -s exit:0 -o ignore \ + jexec one ping -c 1 -t 1 192.0.2.2 + + # This will trigger a mac flap (by ARP announcement) + jexec one ifconfig ${epaira}b 192.0.2.1/24 up + + sleep 0.5 + + ifconfig ${br} addr + + atf_check -s exit:0 -o ignore \ + jexec one ping -c 1 -t 1 192.0.2.2 +} + +vlan_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "bridge_transmit_ipv4_unicast" @@ -610,4 +677,5 @@ atf_init_test_cases() atf_add_test_case "stp_validation" atf_add_test_case "gif" atf_add_test_case "mtu" + atf_add_test_case "vlan" } From nobody Fri Apr 14 13:33:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pycpx0gCnz45FgR; Fri, 14 Apr 2023 13:33: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 4Pycpx0FDPz40FY; Fri, 14 Apr 2023 13:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIS1VpguLU1V6BMUnnU2A4pXwDLApgrnvukzMq/3pjY=; b=M/PwS8zN59fG7prKDDOfJ6jJ/RHQeJnFNEgWAaeOv6gPqWBfQ/mRnPu6SfxQUM9R7NPP0S qarz4qZjO7Gwy95Nuyk9oSrAwKUMRKIAl9Us7EODknkdNXlJZ6O0hgwriibGaeQDjEblMu SgCtlptDHjo23+ZxoabDEUjiHtxdMMCzJBHnHChUy39y3xUjYLRuRF7KF3Az2iokos30dq ON3kcNSHGnA/5blcxhuhVViWmKxDkTbGoKpejZVR3HGNwh2VOOqtZE0BTD38XQn687Sw8a P2LoRbtoxDr9EOZc/u8cnet2n/LSoXWPiwLSJe1aFQXI3EK90uqg986AfPHXMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIS1VpguLU1V6BMUnnU2A4pXwDLApgrnvukzMq/3pjY=; b=c9tJPxxPymva8NKhYihbRRsuQXlaEldW9fcohxWuMXnco/rII522CgTHwlZ7wXgRpkhEx/ wq4kPhXLsvPYA9WzdXexGiwL6ON3tCEy61vEPSQb2yA7149sw8NoEPqwwEeQQgsvOScaIE q1XaHovjbAgmaTS/6Z3m+tiJy/xVft/g156Ds1hnZEgpNCkHb8CBdLTLeFbzfw3mwERjUM QGFxWII/61Vr66WRVu8kZwNxA5JAjuMC9dX2cPw0HTcWz35iXsn5M+QfK34KmB+Q7rXENl VB6hrTQPOHoJlzkUZogzUTNerd+mBUY+AsGBGZK185TyFPNUU2zftRzZQA/hMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681479225; a=rsa-sha256; cv=none; b=mNYFNa3q4trd3CF6TO++pKYU+fbPpIbY6lLH2oWnaTdFPxxFGcXKLBQCwHMV8J4j2uRSmX I5ihAAD8nTwRctQ/dQH7ZaTbXbHChWWT0j/dlT1jrvT1J9moTpwCa1Fvq/MyG8OzUsGXGb cWfr5WbCIdTtZsJf0gk3vGHdr86uumx9deTfBVUsQ7eanrp+Xck8pcw8+NAwTUw/VMB9fU 1K4cjT86LxWahTdMVuJVArqUXQqDg6DwULazlVdUDiOIytjXLB+SwuXLIYJ4mdARZh+47q Ac6EonP9mogd9GlInxpcfYDPtNELmhLDKMcUePtRzPIT665sElmPiqDky0pKsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pycpw675pzRCm; Fri, 14 Apr 2023 13:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EDXicj040922; Fri, 14 Apr 2023 13:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EDXigo040921; Fri, 14 Apr 2023 13:33:44 GMT (envelope-from git) Date: Fri, 14 Apr 2023 13:33:44 GMT Message-Id: <202304141333.33EDXigo040921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 9903bf34f01f - main - tcp: rack pacing has some caveats that need to be obeyed when LRO is missing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9903bf34f01f3972b1c19ac6e6263faddbc2cd3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=9903bf34f01f3972b1c19ac6e6263faddbc2cd3c commit 9903bf34f01f3972b1c19ac6e6263faddbc2cd3c Author: Randall Stewart AuthorDate: 2023-04-14 13:33:36 +0000 Commit: Randall Stewart CommitDate: 2023-04-14 13:33:36 +0000 tcp: rack pacing has some caveats that need to be obeyed when LRO is missing n further non-LRO testing I found a case where rack is supposed to be waking up but it is not now. In this special case it sets the flag rc_ack_can_sendout_data. When that is set we should not prohibit output. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39565 --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 1bab253818b5..a6a15514ff53 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -11578,7 +11578,7 @@ rack_log_hybrid(struct tcp_rack *rack, uint32_t seq, log.u_bbr.lt_epoch = (uint32_t)((cur->deadline >> 32) & 0x00000000ffffffff) ; log.u_bbr.bbr_state = 1; off = (uint64_t)(cur) - (uint64_t)(&rack->rc_tp->t_http_info[0]); - log.u_bbr.bbr_substate = (uint8_t)(off / sizeof(struct http_sendfile_track)); + log.u_bbr.use_lt_bw = (uint8_t)(off / sizeof(struct http_sendfile_track)); } else { log.u_bbr.flex2 = err; } @@ -16493,6 +16493,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ us_cts = tcp_tv_to_usectick(tv); if ((rack->rc_always_pace == 1) && + (rack->rc_ack_can_sendout_data == 0) && (rack->r_ctl.rc_hpts_flags & PACE_PKT_OUTPUT) && (TSTMP_LT(us_cts, rack->r_ctl.rc_last_output_to))) { /* From nobody Fri Apr 14 13:33:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pycq60lQrz45FPV; Fri, 14 Apr 2023 13:33:54 +0000 (UTC) (envelope-from kevans@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 4Pycq56X5qz40w7; Fri, 14 Apr 2023 13:33:53 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479233; 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=8UqxX0sbAZIEGwY1/dMgMU4D5LIet0nRYGIVn4sc+wc=; b=o2LskKXCyF9L5g3oTTw0Ut+0gqr2rXAkrsaLhncMk3OJdSVTXcjZ3zHfpfFDxchAgyh6hj ZMDJKt9SnGnz0OPAqYh15mVc6jZMhzSSUEqrYg1TcG+qHQ7BZo1FfN9GeUHOlH3xFWxVuX +W72UiIo+SQaJKZGmB1J5AVpR6tUv4qUP+ZFiDOaBtDaS/6FvKfcEotAINLm12bBtP7Ehc qDxvoi7PJqjhfteS2dri3oUYMngaCVLz7/8TIDfRWoGgZc6GXXoues4Ivd2dpb6FVD37Ow lETH/ogylyRuvDTE7RAaNOCojdUNV22I2t4kfzPbuA59uhwBlWhnpPgSBfvU2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479233; 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=8UqxX0sbAZIEGwY1/dMgMU4D5LIet0nRYGIVn4sc+wc=; b=NZYkvlUP1ygWh/Fg98D3P0P3cVKkfQK0ZbCGG7NZop6533UdINYX/XcJjOIg+QZrNuQECi TuS82+RwMRDNoxsptIuR5gIWVd0uE+1TbyTYEgNAJun3wp/9yMJkDntF7yjvb4O5ZMpToi TJR+bn13UyeAYT21MNu7G1v8btIVVOBhDmhhH5c9UZc6Vt3fxM0E0+itaIY5fRx6pjSjEp C1JzQsBZDXToketUgztlY+m4/+gXJFsDFvANmFiFYwuLLJXi565XM/ZnRZXHqK3ZCGI0fm zTY9I51+FygWWN5Wd/cK64MqKnkp8WVPkkiSdbb97c7rLnV07AWvYJryy7eH7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681479233; a=rsa-sha256; cv=none; b=vAs6JgLQYuc6yPzlUesRKVtnGnZKDYvUvDTf1nlqZGucKeZPwoL4YH9+M8XamRRzzHnE8u Tj2Ehb/bnE3r7odSs48PyS3W1/wZSNpnE13dsb3QGew4MzPxo6D0/aJcFIsWj7dN1JFqDC DlsT92Df2d534az+6hKIdawY2BrgrpJ20aKmL0y3USBwc4nkY5cMgSNDL1sr3r3c5WvK2y D35hE4ZtOweSNYKlt0cxOuFT0uFUUR9U1kCFUOcOfxOkjs/YJ+rkEV6TkMXDr4Etqp0Elw 7x5Z+HRhZumHPp6Z8OaCxuOekmDSIzDaR9AIRS5XnL8Rv9gFXjQQWzhSh+geFw== Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pycq55N18z19TG; Fri, 14 Apr 2023 13:33:53 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f46.google.com with SMTP id oo30so3630812qvb.12; Fri, 14 Apr 2023 06:33:53 -0700 (PDT) X-Gm-Message-State: AAQBX9e2trZ8ATB59Yu9INEzpdlolEaEy2Q//ru0MDejKAYcQCkpukap WgLS+ZEPWLHI0XUU2NlLTtw3xOqUHHxCRCKK3Z4= X-Google-Smtp-Source: AKy350avKXs5SbxwCAC1Tf8xP5eqPb88UPGAvcHzZuQALNw8srrURvQNn+rcK2w8a/Tp6Bumss+IOu2GJEE/AZK5D/c= X-Received: by 2002:ad4:55ee:0:b0:5bd:ed35:9546 with SMTP id bu14-20020ad455ee000000b005bded359546mr424652qvb.1.1681479233078; Fri, 14 Apr 2023 06:33:53 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202304140513.33E5DsXL019547@gitrepo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Fri, 14 Apr 2023 08:33:42 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 8935a3993219 - main - daemon: use kqueue for all events To: Konstantin Belousov Cc: Kyle Evans , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Fri, Apr 14, 2023 at 2:43=E2=80=AFAM Konstantin Belousov wrote: > > On Fri, Apr 14, 2023 at 05:13:54AM +0000, Kyle Evans wrote: > > The branch main has been updated by kevans: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8935a3993219be76c7ea03e9= ad4509657d08af6c > > > > commit 8935a3993219be76c7ea03e9ad4509657d08af6c > > Author: Ihor Antonov > > AuthorDate: 2023-04-14 05:10:29 +0000 > > Commit: Kyle Evans > > CommitDate: 2023-04-14 05:12:21 +0000 > > > > daemon: use kqueue for all events > > > > Refactor daemon to use kqueue/kevent instead of signals. > > > > This changes allows to simplify the code in several ways: > > - the execution flow is now linear, no async events. > > - several variables became redundant and got removed. > > - all event handling is now concentrated inside of the event loop, = which > > makes code reading and comprehension easier. > > - new kqueuex(2) call is used for CLOEXEC, but maintained closing t= he > > kq fd prior to execve() to ease later MFC > > > + /* Signals are processed via kqueue */ > > + signal(SIGHUP, SIG_IGN); > > + signal(SIGTERM, SIG_IGN); > Are you sure that this works? When a signal disposition is set to 'ignor= e', > the signal delivery drops the signal immediately without queuing/notifyin= g > the victim. I very much doubt that you would get any kqueue event for HU= P > or TERM after the calls. The manpage, at least, specifically calls this out: The filter will record all attempts to deliver a signal to a process, even if the signal has been marked as SIG_IGN, except for the SIGCHLD signal, which, if ignored, will not be recorded by the filter. The tests should at least test SIGHUP, maybe not the others. Thanks, Kyle Evans From nobody Fri Apr 14 13:54:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydGn35zKz45J2X; Fri, 14 Apr 2023 13:54:25 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PydGn03tsz4b3b; Fri, 14 Apr 2023 13:54:24 +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 33EDsHQo067736 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 14 Apr 2023 16:54:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 33EDsHQo067736 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 33EDsHPR067735; Fri, 14 Apr 2023 16:54:17 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 14 Apr 2023 16:54:17 +0300 From: Konstantin Belousov To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8935a3993219 - main - daemon: use kqueue for all events Message-ID: References: <202304140513.33E5DsXL019547@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4PydGn03tsz4b3b X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Apr 14, 2023 at 08:33:42AM -0500, Kyle Evans wrote: > On Fri, Apr 14, 2023 at 2:43 AM Konstantin Belousov wrote: > > > > On Fri, Apr 14, 2023 at 05:13:54AM +0000, Kyle Evans wrote: > > > The branch main has been updated by kevans: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8935a3993219be76c7ea03e9ad4509657d08af6c > > > > > > commit 8935a3993219be76c7ea03e9ad4509657d08af6c > > > Author: Ihor Antonov > > > AuthorDate: 2023-04-14 05:10:29 +0000 > > > Commit: Kyle Evans > > > CommitDate: 2023-04-14 05:12:21 +0000 > > > > > > daemon: use kqueue for all events > > > > > > Refactor daemon to use kqueue/kevent instead of signals. > > > > > > This changes allows to simplify the code in several ways: > > > - the execution flow is now linear, no async events. > > > - several variables became redundant and got removed. > > > - all event handling is now concentrated inside of the event loop, which > > > makes code reading and comprehension easier. > > > - new kqueuex(2) call is used for CLOEXEC, but maintained closing the > > > kq fd prior to execve() to ease later MFC > > > > > + /* Signals are processed via kqueue */ > > > + signal(SIGHUP, SIG_IGN); > > > + signal(SIGTERM, SIG_IGN); > > Are you sure that this works? When a signal disposition is set to 'ignore', > > the signal delivery drops the signal immediately without queuing/notifying > > the victim. I very much doubt that you would get any kqueue event for HUP > > or TERM after the calls. > > The manpage, at least, specifically calls this out: > > The filter will record all attempts to deliver a > signal to a process, even if the signal has been > marked as SIG_IGN, except for the SIGCHLD signal, > which, if ignored, will not be recorded by the > filter. > > The tests should at least test SIGHUP, maybe not the others. I see, the knote is activated before the signal is dropped. Thanks. From nobody Fri Apr 14 14:00:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQ764V0z45JL2; Fri, 14 Apr 2023 14:00: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 4PydQ74nRdz3JkB; Fri, 14 Apr 2023 14:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQzQTCkx4DAdFQ2MmTeew/tBhvdmFGRFdp4hM/Sw/0w=; b=ieuT27mdR7ewPRrA/9MUFeXW1ba3yeovjdsDJJDoZBdgtdWIUdDWW1PMryrF5BdJRs+n2V b8SN+GskdWA2pSRm2E2+eYK/XF5Wu60TSwIQ8B0frsS7jbQyDyjmErVO/ghDuoiSRmgTXO 5kPENeDNAqnsgki/TaUsWmm6w/hVwYO89DbgAtP5o9c70I5oJ08zDOKuv6b0a+7IJnxfxT e1aN5kzr+epPy6oFtiYtOGJyRvDJop3etzzDD8qH71wwU0ehSX4bdqwAiArCfn3gbBGEjR /3PD25e0Lp2hk6S6lJei81Jp+Aa5Ye5kCto+TRTOBDwF9857ExuAuWZ/o7R/ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQzQTCkx4DAdFQ2MmTeew/tBhvdmFGRFdp4hM/Sw/0w=; b=Y6bWiRiXnAz5XLvywh8NQlbmZSvJpjPNf5j/ZLSJ8pUry+C53Jg/HHqZ9sMWY0qYvQDbMa 6myLBCcMn7tc40SJsSSRudsSOltvHVYXMkfw7vjwD6CpucxA3e5aQ9lOfuAEsc7RU11OlY kb/5HTtk2RYxn2oLyo/CipRfWFa08rGoyzGX/Z2OI3/smKFzQIvzVILgLkeY2pIL6Het9d 9dtjUiTCDVSDKKH+EXfI84WEWM6VGxapseYPqZLg4RVIfhLKFv+rVdhGBkiE1R5QuTqbE9 l9vuDw3jgGGtk86HSqqdW8BqpVgV3+HkbyWoEsWCEymBzK2i8RtBHBtvLsS6BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480847; a=rsa-sha256; cv=none; b=MqVtuQ8zYU8YSM306PO9z/nWDmITDlKUNn8dD5lsGZZmubC5PAFqlvWhYkg9AHxMKvIV7f lgMBJcPWhrUi25tYEt4SvbwUkbDV48gTVNfMM9U9qYTp0WKZ9nzR6ZXiSwyxhhDNSu0D54 5M7z+26NbfoieiF5WeemUq4tZDmLt+NvIYtjo8Fexu2hAFBYUpPnXVUkfUYjrlyVHEDjxh B6c4HHNJYm0gG+8LhMkU4Kyu56ddZx6DZT6aiXRbGgiDYpxF8Qw7xZw73qPKTa+nc5ITCX guuaZ3zNcnGR1R1BGqDoUVF1+NzfknP4GZjEmNTNLTn21UluCaMjCdlR4gWP+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 4PydQ73tMHzRX8; Fri, 14 Apr 2023 14:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0li9083565; Fri, 14 Apr 2023 14:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0lTl083564; Fri, 14 Apr 2023 14:00:47 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:47 GMT Message-Id: <202304141400.33EE0lTl083564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 054073c2831c - main - xen/intr: xen_intr_bind_isrc() always set handle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 054073c2831cf70c3f2937b915663e1e2c75a25d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=054073c2831cf70c3f2937b915663e1e2c75a25d commit 054073c2831cf70c3f2937b915663e1e2c75a25d Author: Elliott Mitchell AuthorDate: 2022-05-14 21:41:51 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:45 +0000 xen/intr: xen_intr_bind_isrc() always set handle Previously the upper layer handle was being set before the last potential error condition. The reasoning appears to have been it was assumed invalid in case of an error being returned. Now ensure it is invalid until just before a successful return. Fixes: 76acc41fb7c7 ("Implement vector callback for PVHVM and unify event channel implementations") Fixes: 6d54cab1fe7d ("xen: allow to register event channels without handlers") Reviewed by: royger --- sys/x86/xen/xen_intr.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 4b9b4675b5a0..167870b892f1 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -410,7 +410,7 @@ static int xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, enum evtchn_type type, const char *intr_owner, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, - xen_intr_handle_t *port_handlep) + xen_intr_handle_t *const port_handlep) { struct xenisrc *isrc; int error; @@ -420,6 +420,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, printf("%s: %s: Bad event handle\n", intr_owner, __func__); return (EINVAL); } + *port_handlep = NULL; mtx_lock(&xen_intr_isrc_lock); isrc = xen_intr_find_unused_isrc(type); @@ -436,9 +437,6 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, refcount_init(&isrc->xi_refcount, 1); mtx_unlock(&xen_intr_isrc_lock); - /* Assign the opaque handler */ - *port_handlep = xen_intr_handle_from_isrc(isrc); - #ifdef SMP if (type == EVTCHN_TYPE_PORT) { /* @@ -450,23 +448,23 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } #endif - if (filter == NULL && handler == NULL) { - /* - * No filter/handler provided, leave the event channel - * masked and without a valid handler, the caller is - * in charge of setting that up. - */ - *isrcp = isrc; - return (0); + /* + * If a filter or handler function is provided, add it to the event. + * Otherwise the event channel is left masked and without a handler, + * the caller is in charge of setting that up. + */ + if (filter != NULL || handler != NULL) { + error = xen_intr_add_handler(intr_owner, filter, handler, arg, + flags, xen_intr_handle_from_isrc(isrc)); + if (error != 0) { + xen_intr_release_isrc(isrc); + return (error); + } } - error = xen_intr_add_handler(intr_owner, filter, handler, arg, flags, - *port_handlep); - if (error != 0) { - xen_intr_release_isrc(isrc); - return (error); - } *isrcp = isrc; + /* Assign the opaque handler */ + *port_handlep = xen_intr_handle_from_isrc(isrc); return (0); } From nobody Fri Apr 14 14:00:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQ903Lmz45J8m; Fri, 14 Apr 2023 14:00: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 4PydQ861Dfz3Jmc; Fri, 14 Apr 2023 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY/8MvGO5VUXw/KX+CY73jHXe/hnfj3bKZl0iDX1LWo=; b=tWwvRku1bTTKRNT7HBNnsiwjf1dng1bAiXNLtWQVSqCJcL9fStntONiroJSPq8Oru/FFfN nORQxy7stDlvI2q3uhJepBbeOtJR1jocXLwhTWmhyq/796TXNv/DKtr9qmez6FJnSVTLwu 2wVk1JqU2VAparBWbNaSADUTrtbfOUlyx79qgAXq2RekFX3QIOWR8SJUmQ6V18eODTTLu0 2sX4/44/U3az1WIFZlZiJj9pNtSDonaHSh+JEZ0PAQAz2/7vXSyftQJw7+D7XS3bJsf/1k 7sIQe8aXMOuGu85oBzgKOUpvUkylFbY+9dFAXClPqMZsTcYztqwmJBE+Vz1VJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY/8MvGO5VUXw/KX+CY73jHXe/hnfj3bKZl0iDX1LWo=; b=QtZIkO287c/CNUU3U9+eJJyXALJOylgOURKQlMLg3nEaR1w/KnWG+HdfB1ACMAPDGw1Ndj JYk5+zOeKqtIwZ3xVbRqmiS8O9jb6pNhHdIT9ZXIWIaXU9ONJotoisX9iCDZvcNRMktAnB UWLu8NYv/ByBnGzFEBe8+LDl1qLWTGI2yDdLHPzjLm09XcaNkKC+TKNWgKF3/mIaC9PGSO yRLnKozAMs6xiwADK+TwdoU+Zx8Wes3bYnQn78fuCAjLCt52ddR/G4WQNy9ijy8C0qV+PX zCZkXSpk91o/5t18HpK+6VeXLlwXNkeKOC7kXzgwoubktLqZAmyS5GwMWlor8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480848; a=rsa-sha256; cv=none; b=keUFzgV7t4y321xkWdvd4h0YLQxB/AR/A7ZLnByeu0kLWp+LlXfihtGeBCs98N4OPdcA5B ZE7RX8D+CeqQXl1HnNQSGl3H++P7yCGl49cf/gUPXk3M07GVRGtQ48hT1KuSw3Bjl+pTBU gJ2zH0DCJFWBg0a6xP/8Fcv0yl+z6EWyWKuTSIQkokjPBtlx96l/4vtLgSDZo+RgMf7UEl YzFwZUp+IWNO2f1U4/KXYjwq5cbK1izP8rq7KF9TCWdMO3vtgugSTvuTXXRerp840SZYls nUHhmkGtmjvW4u+eOl90TUUCLk5RaV8838jK6JsOhjfSgqkABHsbLGiUZsAwEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQ84pdnzRCV; Fri, 14 Apr 2023 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0mBk083590; Fri, 14 Apr 2023 14:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0mc1083589; Fri, 14 Apr 2023 14:00:48 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:48 GMT Message-Id: <202304141400.33EE0mc1083589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 28a78d860e46 - main - xen: introduce XEN_CPUID_TO_VCPUID()/XEN_VCPUID() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28a78d860e460b31970125d635d1abef99302645 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=28a78d860e460b31970125d635d1abef99302645 commit 28a78d860e460b31970125d635d1abef99302645 Author: Julien Grall AuthorDate: 2014-04-19 15:57:40 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:46 +0000 xen: introduce XEN_CPUID_TO_VCPUID()/XEN_VCPUID() Part of the series for allowing FreeBSD/ARM to run on Xen. On ARM the function is a trivial pass-through, other architectures need distinct implementations. While implementing XEN_VCPUID() as a call to XEN_CPUID_TO_VCPUID() works, that involves multiple accesses to the PCPU region. As such make this a distinct macro. Only callers in machine independent code have been switched. Add a wrapper for the x86 PIC interface to use matching the old prototype. Partially inspired by the work of Julien Grall , 2015-08-01 09:45:06, but XEN_VCPUID() was redone by Elliott Mitchell on 2022-06-13 12:51:57. Reviewed by: royger Submitted by: Elliott Mitchell Original implementation: Julien Grall , 2014-04-19 08:57:40 Original implementation: Julien Grall , 2014-04-19 14:32:01 Differential Revision: https://reviews.freebsd.org/D29404 --- sys/dev/xen/debug/debug.c | 2 +- sys/x86/include/xen/xen-os.h | 11 +++++++++++ sys/x86/xen/xen_intr.c | 40 +++++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/sys/dev/xen/debug/debug.c b/sys/dev/xen/debug/debug.c index d05e69f107c3..aa48fec2a9b4 100644 --- a/sys/dev/xen/debug/debug.c +++ b/sys/dev/xen/debug/debug.c @@ -78,7 +78,7 @@ xendebug_filter(void *arg __unused) mtx_lock_spin(&lock); sbuf_clear(buf); - xc_printf("Printing stack trace vCPU%d\n", PCPU_GET(vcpu_id)); + xc_printf("Printing stack trace vCPU%u\n", XEN_VCPUID()); stack_sbuf_print_ddb(buf, &st); sbuf_finish(buf); mtx_unlock_spin(&lock); diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 861ad10e3d78..90d165682fa9 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -40,6 +40,8 @@ /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__ +#include + /* If non-zero, the hypervisor has been configured to use a direct vector */ extern int xen_vector_callback_enabled; @@ -51,6 +53,15 @@ extern int xen_disable_pv_nics; extern uint32_t xen_cpuid_base; +static inline u_int +XEN_CPUID_TO_VCPUID(u_int cpuid) +{ + + return (pcpu_find(cpuid)->pc_vcpu_id); +} + +#define XEN_VCPUID() PCPU_GET(vcpu_id) + static inline bool xen_has_percpu_evtchn(void) { diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 167870b892f1..15001bb537cc 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -140,7 +140,8 @@ static int xen_intr_vector(struct intsrc *isrc); static int xen_intr_source_pending(struct intsrc *isrc); static int xen_intr_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static int xen_intr_assign_cpu(struct intsrc *isrc, u_int apic_id); +static int xen_intr_assign_cpu(struct intsrc *isrc, u_int to_cpu); +static int xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id); /** * PIC interface for all event channel port types except physical IRQs. @@ -156,7 +157,7 @@ struct pic xen_intr_pic = { .pic_suspend = xen_intr_suspend, .pic_resume = xen_intr_resume, .pic_config_intr = xen_intr_config_intr, - .pic_assign_cpu = xen_intr_assign_cpu + .pic_assign_cpu = xen_intr_pic_assign_cpu, }; static struct mtx xen_intr_isrc_lock; @@ -444,7 +445,8 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * unless specified otherwise, so shuffle them to balance * the interrupt load. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, intr_next_cpu(0)); + xen_intr_assign_cpu(&isrc->xi_intsrc, + apic_cpuid(intr_next_cpu(0))); } #endif @@ -695,7 +697,7 @@ xen_rebind_ipi(struct xenisrc *isrc) { #ifdef SMP int cpu = isrc->xi_cpu; - int vcpu_id = pcpu_find(cpu)->pc_vcpu_id; + u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id }; @@ -714,7 +716,7 @@ static void xen_rebind_virq(struct xenisrc *isrc) { int cpu = isrc->xi_cpu; - int vcpu_id = pcpu_find(cpu)->pc_vcpu_id; + u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_virq bind_virq = { .virq = isrc->xi_virq, .vcpu = vcpu_id }; @@ -752,8 +754,7 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) #ifdef SMP isrc->xi_cpu = 0; - error = xen_intr_assign_cpu(&isrc->xi_intsrc, - cpu_apic_ids[cpu]); + error = xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); if (error) panic("%s(): unable to rebind Xen channel %u to vCPU%u: %d", __func__, isrc->xi_port, cpu, error); @@ -884,25 +885,22 @@ xen_intr_config_intr(struct intsrc *isrc, enum intr_trigger trig, * Configure CPU affinity for interrupt source event delivery. * * \param isrc The interrupt source to configure. - * \param apic_id The apic id of the CPU for handling future events. + * \param to_cpu The id of the CPU for handling future events. * * \returns 0 if successful, otherwise an errno. */ static int -xen_intr_assign_cpu(struct intsrc *base_isrc, u_int apic_id) +xen_intr_assign_cpu(struct intsrc *base_isrc, u_int to_cpu) { #ifdef SMP struct evtchn_bind_vcpu bind_vcpu; struct xenisrc *isrc; - u_int to_cpu, vcpu_id; + u_int vcpu_id = XEN_CPUID_TO_VCPUID(to_cpu); int error, masked; if (!xen_has_percpu_evtchn()) return (EOPNOTSUPP); - to_cpu = apic_cpuid(apic_id); - vcpu_id = pcpu_find(to_cpu)->pc_vcpu_id; - mtx_lock(&xen_intr_isrc_lock); isrc = (struct xenisrc *)base_isrc; if (!is_valid_evtchn(isrc->xi_port)) { @@ -951,6 +949,14 @@ out: #endif } +/* Wrapper of xen_intr_assign_cpu to use as pic callbacks */ +static int +xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + return (xen_intr_assign_cpu(isrc, apic_cpuid(apic_id))); +} + /*------------------- Virtual Interrupt Source PIC Functions -----------------*/ /* * Mask a level triggered interrupt source. @@ -1119,7 +1125,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, xen_intr_handle_t *port_handlep) { - int vcpu_id = pcpu_find(cpu)->pc_vcpu_id; + u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); struct xenisrc *isrc; struct evtchn_bind_virq bind_virq = { .virq = virq, .vcpu = vcpu_id }; int error; @@ -1160,7 +1166,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, cpu_apic_ids[cpu]); + xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); } #endif @@ -1179,7 +1185,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, enum intr_type flags, xen_intr_handle_t *port_handlep) { #ifdef SMP - int vcpu_id = pcpu_find(cpu)->pc_vcpu_id; + u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); struct xenisrc *isrc; struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id }; /* Same size as the one used by intr_handler->ih_name. */ @@ -1216,7 +1222,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, cpu_apic_ids[cpu]); + xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); } /* From nobody Fri Apr 14 14:00:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQB1RPDz45JJs; Fri, 14 Apr 2023 14:00: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 4PydQ96X1fz3Jl2; Fri, 14 Apr 2023 14:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=358kJdcwHasSealdLepGuvc7YNbrfcR7nIJxuLL6LzU=; b=D4rIdkzKU2g8M+cxhIjHLKhRNAgJtkWfWTHn8PSz8ZaZ6hudVtPBRmUdYR2ly0fPUcUMYy 0D4WRw70XReFMibumMlgBZuVGRw/mzsHKPCZcPqVUEtX93pHaW75NEeZz/dPjRI33Na2B5 3CtGe8+wuVn9VVhRXP5GilCJqWk9U5mbGrU/oddh67TeV9t08viS7AMMcCGJJQwcn8pCIR Ub2eRozxTC0iinC9XSm8IMGRZBIQ7xzpWevcplAHlxNs4xfB01o9wWlD3HGcKB59FhGReV ycNaF2A6JgHeuciRk0yUBjCGtZa1sIVR/KBVleBAM/J9SkODLvtlA/hMzJPF3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=358kJdcwHasSealdLepGuvc7YNbrfcR7nIJxuLL6LzU=; b=WGt008tNqGu7cOFGaEosTaQXOli6BjN3ImMDiK//OFzvTY2a5SCxjrGOcCNQX2Blo1jzvW LCkuhJnavyruQlLG6sf5eX8OoxkFsK/iCr21REJMznojVw/xqK2z+s3AJ1jpsXDKgwN9ur tmEiSeHgfPDo50GBBjr5xkdoV1vIZZCrAy5YZ6hpSKJn03/DP8cUCEh16AhwfhxkniGynY 40Q3N1MhSICUAlQEYlOQ3LyAnjFUnRcn0I2tcUX1ASQNvhTHaxLtBNm50mVQNWDIOZznts sNBkFJ0DzBAkaXN1/EouzB3wdGNm12e/sTqeUZ7ApB3bOveq672AAP6f35e4rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480850; a=rsa-sha256; cv=none; b=U4xhssmNalbhmofjVsSRZ/tKmS3uv0/GTeuCIE2iRiXOLw5s5VBEpTn2FDf/nWjRQiT68s Oxikh7H5N5fGLqLg4tSH6F6FmuKJFBXQsKBhWEYhuyVKicP7EUCuqPT4or06/PgxNIcX1W s5duFz28t+iMd647Q4gJPuHAEWkjAAzIZp+WeV9wH3kx/H7qYBQlk5n5kVz6TEm8XwtotH Bk8KS/HpqVp5Dl5ZYOgl+41Qn3Svvopi5wIwl7nUvokTUDPHf5ZexQDCwgJg4XAIukUvi8 +KFUbYJWewoqAOd6yIygQSSWXSt7qVuagdL3QlOpfPlfZA0kNUF+0WJwCtBbHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQ95VPwzRgv; Fri, 14 Apr 2023 14:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0nP9083626; Fri, 14 Apr 2023 14:00:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0npD083625; Fri, 14 Apr 2023 14:00:49 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:49 GMT Message-Id: <202304141400.33EE0npD083625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: b2c50bb934fb - main - xen/efi: make Xen PV EFI clock optional List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e commit b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e Author: Elliott Mitchell AuthorDate: 2021-02-19 04:19:20 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:47 +0000 xen/efi: make Xen PV EFI clock optional The present implementation is only for x86. Other architectures need adjustments for querying presence of EFI. Xen's EFI support is also quite troublesome on non-x86. This is being slowly remedied, but until in better shape the EFI clock functionality should be disabled. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D31065 --- sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/MINIMAL | 1 + sys/amd64/conf/NOTES | 1 + sys/conf/files | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6073f9716d3e..7133c128de50 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -383,6 +383,7 @@ device hyperv # HyperV drivers # NOTE: XENHVM depends on xenpci and xentimer. # They must be added or removed together. options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index fdafeed46eef..e4d2d0febe94 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -147,6 +147,7 @@ device kvm_clock # KVM paravirtual clock driver # NOTE: XENHVM depends on xenpci and xentimer. # They must be added or removed together. options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index e568842f2830..ef0f7076633f 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -505,6 +505,7 @@ device hvhid # HyperV HID device # Xen HVM Guest Optimizations options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/conf/files b/sys/conf/files index ff840dce1355..9800c016532c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3486,7 +3486,7 @@ dev/xen/bus/xenpv.c optional xenhvm dev/xen/console/xen_console.c optional xenhvm dev/xen/control/control.c optional xenhvm dev/xen/cpu/xen_acpi_cpu.c optional xenhvm -dev/xen/efi/pvefi.c optional xenhvm efirt +dev/xen/efi/pvefi.c optional xenhvm xenefi efirt dev/xen/grant_table/grant_table.c optional xenhvm dev/xen/netback/netback.c optional xenhvm dev/xen/netfront/netfront.c optional xenhvm From nobody Fri Apr 14 14:00:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQD0sZ0z45JJw; Fri, 14 Apr 2023 14:00: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 4PydQC0k2fz3JlT; Fri, 14 Apr 2023 14:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YTbB4M/s6mwuh92lr97BYPNE9b5zpAWy6sjIIZHySHQ=; b=WCfAG8zFiMZzVRR5CO7YzAUp5yOTq+4IBPyeWEhZeBg0DoTAG/ZVb3pj+OUoaUSTeJD6QE SnukSVC5nFXoQCCvg7tVi4TfcTX5LESn0LncsoGDsuntBHeKv87HyvamRKCbF3YMW3KZKG zkO9oHk8zppC483MHtCOCdQm5kib6272WsA6Misa4LRTGCGPD2FInBpnHPlgNq/C/pK5YF MFxc1VCgTqin2/E/+Gb251OkTpr9jQhAW12eh3Bt8/GgmCtSpRfbox/YcZ7emcDyyuEvyC TXcCeV2So735eW/YD8t31GrNTk25f09nCawvmp7LbdjN/Kg0V0WCSDGX01i5qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YTbB4M/s6mwuh92lr97BYPNE9b5zpAWy6sjIIZHySHQ=; b=Qd5e8iJuOkdTEjSBPMDRcyFIsxHAXf7D+HjnJVFTEXQe1Pqr0eqVlCN/aS9E0h+mRc6r++ ppUer0h05NifDKHz+zccbubVtzOx1gJuOPszuBSwYoXCvaIvm3k75XC0A0+JUMy2Ddgymx 57sJcjFE8SzJlfFWV4q0GYMbqY1c/LqRkwDwVuOJOYrhgESKD7ktgJKlV9HxrAYSIrd6eK hpNDTkuBR7EcPADndbXzA9USTOb0QhrJ56PFWdY/CnA51/L3ClAKQdFF3J4VPIh+ZDcsJw YWRoLn0Jjtzvf2cRe0txAN0rS9cymfYCPW8sPBVoaZhHU/1s+eG6+12wPsySHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480851; a=rsa-sha256; cv=none; b=rQkHXt2o3YYMa3jXKSWiVbN4kdBYGt5cn68V6RDcMqbWcLrlE+1O1HsvhojYtqO53KJUqQ VAYVS0klOCa9f4nYA4Lot+jrLDdT3lgGpE4We+Khk4uDro6TocunD3NQCLOUP1G9GhKKSV 7B4HDlkTM3ZHi/ZO0KBnM6cGOGJGX1kxV3DFzsPBcx0wqL6QglE9zFvJDhGzigKXWhzXgb Cx0U6xyqrJ1BMCNwCT070kbml50sro8qW/ni8URHNHFaUSA/7wmgs4HqtugQO7pGJJqfBr 1/2u1yH0Frt2ZrHQfRgek9fKkgVfVJrXDKYSqhFZeO0G5dPYAei6HfdvNjPQRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQB6gFXzQcM; Fri, 14 Apr 2023 14:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0oCc083650; Fri, 14 Apr 2023 14:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0omu083649; Fri, 14 Apr 2023 14:00:50 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:50 GMT Message-Id: <202304141400.33EE0omu083649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 61ccede8cf6c - main - xen: purge no longer used hypervisor functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ccede8cf6cc1442ce531fe28c25fd000263fb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=61ccede8cf6cc1442ce531fe28c25fd000263fb5 commit 61ccede8cf6cc1442ce531fe28c25fd000263fb5 Author: Elliott Mitchell AuthorDate: 2022-03-07 23:23:23 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:47 +0000 xen: purge no longer used hypervisor functions HYPERVISOR_poll(), HYPERVISOR_block(), and HYPERVISOR_crash() appear no longer used. Further get_system_time() appears to have disappeared at some point in the past, so HYPERVISOR_poll() was broken anyway. No functional change intended. Reviewed by: royger --- sys/xen/hypervisor.h | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h index c42956d253c2..4e79423c3a8e 100644 --- a/sys/xen/hypervisor.h +++ b/sys/xen/hypervisor.h @@ -23,8 +23,6 @@ #include #include -extern uint64_t get_system_time(int ticks); - static inline int HYPERVISOR_console_write(const char *str, int count) { @@ -43,19 +41,6 @@ HYPERVISOR_yield(void) return (rc); } -static inline int -HYPERVISOR_block( - void) -{ - int rc = HYPERVISOR_sched_op(SCHEDOP_block, NULL); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = HYPERVISOR_sched_op_compat(SCHEDOP_block, 0); -#endif - return (rc); -} - static inline void HYPERVISOR_shutdown(unsigned int reason) { @@ -69,33 +54,4 @@ HYPERVISOR_shutdown(unsigned int reason) #endif } -static inline void -HYPERVISOR_crash(void) -{ - HYPERVISOR_shutdown(SHUTDOWN_crash); - /* NEVER REACHED */ - for (;;) ; /* eliminate noreturn error */ -} - -/* Transfer control to hypervisor until an event is detected on one */ -/* of the specified ports or the specified number of ticks elapse */ -static inline int -HYPERVISOR_poll( - evtchn_port_t *ports, unsigned int nr_ports, int ticks) -{ - int rc; - struct sched_poll sched_poll = { - .nr_ports = nr_ports, - .timeout = get_system_time(ticks) - }; - set_xen_guest_handle(sched_poll.ports, ports); - - rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll); -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0); -#endif - return (rc); -} - #endif /* __XEN_HYPERVISOR_H__ */ From nobody Fri Apr 14 14:00:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQD2vP7z45JSJ; Fri, 14 Apr 2023 14:00: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 4PydQD1MGPz3JwX; Fri, 14 Apr 2023 14:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVVsojSJg8tBd4teUxHf2Wz9tYggH63alEBWGmGSOP4=; b=onmKkJ7k/Y700/2o0lEbx/PTS4yOlndcAj9qdDfD8ICEWzH7q7jJfwYqhhTatQkiQx0LVY ymiPFryoObR+Lcn0EC6TL1aR74hdQwYeD3spmzJg1VmHkwVf2K2OybEHc4uuKfsijBxE9Z RxLIt7cOHsMwBtYeSeh0PcI3+F62LgEsT8kgnG733GhwclE+LqS9jnEprme9OQgDzbbkN4 XH1N01EvF+a8rAzApQ4gKM6UnBHczi3+ttG8EWwALQzuMRd3gl8MfnMo1UaxI0KBLywrzC RijiJdF6SXWj72QRkcxWFM5e+OPZytNmd/caKXqQsm/vXzyFjkaL6mv/Eecv8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVVsojSJg8tBd4teUxHf2Wz9tYggH63alEBWGmGSOP4=; b=Vd0DxZuArmFVq3hGxFrRLw3fihKWgqwn9VJfFcFscGJeyhwHZnNQZRxFnCapE9XXICS6UZ oxbOAdyhAN0P7unq0lDjnEXL3EpS82rQFab97VGWqDS0fPP6RLjEG+EjjfX0wGvfB9aYDt gi0HMpcu4EHGBJYYQJu2KukF3ugKK5amaOtXq7synULPbDtkdwt43pObGysMLY8a4gJGEJ 4T7Kaj5W0rX/Ux0WjMRsUc7iOoTIIsBwQLA/hK5JKab+t8v1PUmmYIL4tmEDlH+rygylyz mW8GGDebYb5lqEWDdQ9dI0f/lFbjh8oQhl3m9qa3UbiyBSKg5WCA538fkw/yCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480852; a=rsa-sha256; cv=none; b=DtPjS6e3aSMgFJ8mKNf3BJP5qcmCFAdMQNKFG919yC0dOka6dSKdzxhFLmydJ9dOIoTKrx tmNr+RBpIU5aMxVEsaOHTgBnnjxlIgvm1MlupcMrf1EhHYKS7GTigvtsmGas05Y0Us25hu VnfrY/DA26FJwZaprWPgHentU+zK8gQ3sE4bNoRbjo2cNMOiZw+6kOqEba5d60fL8lLZKh ZXYijGmFYyckUVS3RfXHTlpagzGwv8vDLBLABIoy/915sHF/4gC/n6RIepgxF6qGoOCFym 383O8ChJsAXKPCtSZAwBUuvh3oFbRpFO3hN36ULLfDm5IrthN5nMWbEIIwI1KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQD0S7KzQcN; Fri, 14 Apr 2023 14:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0p0h083674; Fri, 14 Apr 2023 14:00:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0pVt083673; Fri, 14 Apr 2023 14:00:51 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:51 GMT Message-Id: <202304141400.33EE0pVt083673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: ecdcad6516c9 - main - xen: remove CONFIG_XEN_COMPAT, purge Xen 3.0 compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecdcad6516c9a911a701e362f23a9d2643a6d7d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=ecdcad6516c9a911a701e362f23a9d2643a6d7d0 commit ecdcad6516c9a911a701e362f23a9d2643a6d7d0 Author: Elliott Mitchell AuthorDate: 2022-03-27 22:10:24 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:48 +0000 xen: remove CONFIG_XEN_COMPAT, purge Xen 3.0 compatibility This overlaps the purpose of __XEN_INTERFACE_VERSION__. Remove Xen 3.0.2 compatibility. __XEN_INTERFACE_VERSION__ has compatibility to Xen 3.2.8 enabled. As Xen 3.3 was released almost 15 years ago, it seems unlikely anyone hasn't updated. Reviewed by: royger --- sys/amd64/include/xen/hypercall.h | 58 ++------------------------------------- sys/i386/include/xen/hypercall.h | 54 +++--------------------------------- sys/xen/hypervisor.h | 10 +------ 3 files changed, 8 insertions(+), 114 deletions(-) diff --git a/sys/amd64/include/xen/hypercall.h b/sys/amd64/include/xen/hypercall.h index 60da390ef4c6..c561d1b84bd6 100644 --- a/sys/amd64/include/xen/hypercall.h +++ b/sys/amd64/include/xen/hypercall.h @@ -49,8 +49,6 @@ extern char *hypercall_page; #define __STR(x) #x #define STR(x) __STR(x) -#define ENOXENSYS 38 -#define CONFIG_XEN_COMPAT 0x030002 #define __must_check #define HYPERCALL_STR(name) \ @@ -212,13 +210,6 @@ HYPERVISOR_fpu_taskswitch( return _hypercall1(int, fpu_taskswitch, set); } -static inline int __must_check -HYPERVISOR_sched_op_compat( - int cmd, unsigned long arg) -{ - return _hypercall2(int, sched_op_compat, cmd, arg); -} - static inline int __must_check HYPERVISOR_sched_op( int cmd, void *arg) @@ -287,19 +278,7 @@ static inline int __must_check HYPERVISOR_event_channel_op( int cmd, void *arg) { - int rc = _hypercall2(int, event_channel_op, cmd, arg); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (__predict_false(rc == -ENOXENSYS)) { - struct evtchn_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, event_channel_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } -#endif - - return rc; + return _hypercall2(int, event_channel_op, cmd, arg); } static inline int __must_check @@ -320,19 +299,7 @@ static inline int __must_check HYPERVISOR_physdev_op( int cmd, void *arg) { - int rc = _hypercall2(int, physdev_op, cmd, arg); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (__predict_false(rc == -ENOXENSYS)) { - struct physdev_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, physdev_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } -#endif - - return rc; + return _hypercall2(int, physdev_op, cmd, arg); } static inline int __must_check @@ -379,35 +346,16 @@ HYPERVISOR_suspend( .reason = SHUTDOWN_suspend }; - int rc = _hypercall3(int, sched_op, SCHEDOP_shutdown, + return _hypercall3(int, sched_op, SCHEDOP_shutdown, &sched_shutdown, srec); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = _hypercall3(int, sched_op_compat, SCHEDOP_shutdown, - SHUTDOWN_suspend, srec); -#endif - - return rc; } -#if CONFIG_XEN_COMPAT <= 0x030002 -static inline int -HYPERVISOR_nmi_op( - unsigned long op, void *arg) -{ - return _hypercall2(int, nmi_op, op, arg); -} -#endif - -#ifndef CONFIG_XEN static inline unsigned long __must_check HYPERVISOR_hvm_op( int op, void *arg) { return _hypercall2(unsigned long, hvm_op, op, arg); } -#endif static inline int __must_check HYPERVISOR_callback_op( diff --git a/sys/i386/include/xen/hypercall.h b/sys/i386/include/xen/hypercall.h index f1757e8becaf..ff96cb93157c 100644 --- a/sys/i386/include/xen/hypercall.h +++ b/sys/i386/include/xen/hypercall.h @@ -38,8 +38,6 @@ extern char *hypercall_page; #define __STR(x) #x #define STR(x) __STR(x) -#define ENOXENSYS 38 -#define CONFIG_XEN_COMPAT 0x030002 #define HYPERCALL_STR(name) \ "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" @@ -190,13 +188,6 @@ HYPERVISOR_fpu_taskswitch( return _hypercall1(int, fpu_taskswitch, set); } -static inline int -HYPERVISOR_sched_op_compat( - int cmd, unsigned long arg) -{ - return _hypercall2(int, sched_op_compat, cmd, arg); -} - static inline int HYPERVISOR_sched_op( int cmd, void *arg) @@ -273,18 +264,7 @@ static inline int HYPERVISOR_event_channel_op( int cmd, void *arg) { - int rc = _hypercall2(int, event_channel_op, cmd, arg); - -#if CONFIG_XEN_COMPAT <= 0x030002 - if (__predict_false(rc == -ENOXENSYS)) { - struct evtchn_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, event_channel_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } -#endif - return (rc); + return _hypercall2(int, event_channel_op, cmd, arg); } static inline int @@ -305,17 +285,7 @@ static inline int HYPERVISOR_physdev_op( int cmd, void *arg) { - int rc = _hypercall2(int, physdev_op, cmd, arg); -#if CONFIG_XEN_COMPAT <= 0x030002 - if (__predict_false(rc == -ENOXENSYS)) { - struct physdev_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, physdev_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } -#endif - return (rc); + return _hypercall2(int, physdev_op, cmd, arg); } static inline int @@ -359,24 +329,10 @@ HYPERVISOR_suspend( struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_suspend }; - int rc = _hypercall3(int, sched_op, SCHEDOP_shutdown, - &sched_shutdown, srec); -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = _hypercall3(int, sched_op_compat, SCHEDOP_shutdown, - SHUTDOWN_suspend, srec); -#endif - return (rc); -} -#if CONFIG_XEN_COMPAT <= 0x030002 -static inline int -HYPERVISOR_nmi_op( - unsigned long op, void *arg) -{ - return _hypercall2(int, nmi_op, op, arg); + return _hypercall3(int, sched_op, SCHEDOP_shutdown, + &sched_shutdown, srec); } -#endif static inline int HYPERVISOR_callback_op( @@ -385,14 +341,12 @@ HYPERVISOR_callback_op( return _hypercall2(int, callback_op, cmd, arg); } -#ifndef CONFIG_XEN static inline unsigned long HYPERVISOR_hvm_op( int op, void *arg) { return _hypercall2(unsigned long, hvm_op, op, arg); } -#endif static inline int HYPERVISOR_xenoprof_op( diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h index 4e79423c3a8e..96e42ce9a14b 100644 --- a/sys/xen/hypervisor.h +++ b/sys/xen/hypervisor.h @@ -32,13 +32,8 @@ HYPERVISOR_console_write(const char *str, int count) static inline int HYPERVISOR_yield(void) { - int rc = HYPERVISOR_sched_op(SCHEDOP_yield, NULL); -#if CONFIG_XEN_COMPAT <= 0x030002 - if (rc == -ENOXENSYS) - rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0); -#endif - return (rc); + return (HYPERVISOR_sched_op(SCHEDOP_yield, NULL)); } static inline void @@ -49,9 +44,6 @@ HYPERVISOR_shutdown(unsigned int reason) }; HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown); -#if CONFIG_XEN_COMPAT <= 0x030002 - HYPERVISOR_sched_op_compat(SCHEDOP_shutdown, reason); -#endif } #endif /* __XEN_HYPERVISOR_H__ */ From nobody Fri Apr 14 14:00:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQF5hw6z45JBh; Fri, 14 Apr 2023 14:00: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 4PydQF31lyz3K47; Fri, 14 Apr 2023 14:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r20T/MVO6zDKgPBK6SR1fvAug7ywjkEEnUJbDg16mzI=; b=tSQq4SPci59Z68NU5AlQPTueWFAh/wQ4UAL4POql3t7/63ewzSBN+CysZSSOBPjHg9E/n+ Quw2z4EqiibO+NviAcP8B+JKSOJRzSWCHkU25M+uuXnY2QxSvRxS26MEoHErQgLdQnO1kz 73CV7VA00uaMfj56NqhLG9bY0VV0K78HFfodIHEX5IH44/gHnp40wSkoyITztiNwMTDbpm O9jcpaLGQmD+hjABnxGW9K9vRd/MouS3zAmHPrsEZWGvQ47H9VOl+6kEMb5gyvEy2izxQn D8SXAS6HWXjyeRNhYLHFtLnMfi+UpO8VhfogFcbvcESTX9RaGPXU+EXQ4yihKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r20T/MVO6zDKgPBK6SR1fvAug7ywjkEEnUJbDg16mzI=; b=FCA4ZiTZe9UlNGlGcAQoYhAk/8ceKX7eg12IolfOkETXHxFS04PJoh5+5zHtTbYnHPl3+W oBr26VmlAj+kW2JBZQy/qkPG+CTSJzKmbY6/r2Nn7GmMVZp5EyyrUSfvNYxsogpUVqUeIx hcjw+8fFxj0C4BviknhHnnPX5TSZNfrVP2WEx1m/dt1nQkSkvP5ZoOciAbVvKN3fWjd3nw pl84Q7rnrKyGg2LedF0P3m39BiaULs6yb8zMuQi0EbCoIZtRMjDNtl5x1i1uS2A89abMF1 7zM8ElNQz8ZPCJtIEGOkWnXsmGBZLO7rffi6ZfdH0FroJ3T4Z7KO+vTBbHpHFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480853; a=rsa-sha256; cv=none; b=sIE2k7YzG3dXFeB1qYWS79VsLjJ9xP5M/TrIhW+mk9VCQl8iIeH+JuozUuUrpKD25UDC/s TVhZcWDoSlNPN4608e5i5asqG18kXFYUW5i0JJ6txzb+9t1uwVL7P1bevpID5iG2+mMRfP 2u0rzvJlI4mN2N44se0ZarhlandVAF6DTLKlBalgwUkUbPGIePSNRyqac/vXYsN01WoGsE x92Jy6USyYCYtttsFDOow3wvTKz+vfMvhb9xIzFMhmACPifr+uOZvGLfNjrjef1/r6tWBq O+ah4YR+NRQVuzCWXmFmF1ElusccXZm1VdIcXptBNaiajIpPqSTjB3xN8DOq7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQF1NP6zRj6; Fri, 14 Apr 2023 14:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0rSQ083698; Fri, 14 Apr 2023 14:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0rMf083697; Fri, 14 Apr 2023 14:00:53 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:53 GMT Message-Id: <202304141400.33EE0rMf083697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 149c58101811 - main - xen/intr: adjust xenisrc types, adjust format strings to match List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 149c58101811ac703e98e0ea257cba65821134cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=149c58101811ac703e98e0ea257cba65821134cb commit 149c58101811ac703e98e0ea257cba65821134cb Author: Elliott Mitchell AuthorDate: 2021-11-01 01:12:51 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:49 +0000 xen/intr: adjust xenisrc types, adjust format strings to match As "CPUs", IRQs (vector) and virtual IRQs are always positive integers, adjust the Xen code to use unsigned integers. Several format strings need adjustment to match. Additionally single-bit bitfields are boolean. No functional change expected. Reviewed by: royger --- sys/x86/xen/xen_intr.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 15001bb537cc..c1ca984bf6ef 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -119,13 +119,13 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info); struct xenisrc { struct intsrc xi_intsrc; enum evtchn_type xi_type; - int xi_cpu; /* VCPU for delivery. */ - int xi_vector; /* Global isrc vector number. */ + u_int xi_cpu; /* VCPU for delivery. */ + u_int xi_vector; /* Global isrc vector number. */ evtchn_port_t xi_port; - int xi_virq; + u_int xi_virq; void *xi_cookie; - u_int xi_close:1; /* close on unbind? */ - u_int xi_masked:1; + bool xi_close:1; /* close on unbind? */ + bool xi_masked:1; volatile u_int xi_refcount; }; @@ -433,7 +433,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } } isrc->xi_port = local_port; - isrc->xi_close = 0; + isrc->xi_close = false; xen_intr_port_to_isrc[local_port] = isrc; refcount_init(&isrc->xi_refcount, 1); mtx_unlock(&xen_intr_isrc_lock); @@ -579,7 +579,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) /* Make sure we are firing on the right vCPU */ KASSERT((isrc->xi_cpu == PCPU_GET(cpuid)), - ("Received unexpected event on vCPU#%d, event bound to vCPU#%d", + ("Received unexpected event on vCPU#%u, event bound to vCPU#%u", PCPU_GET(cpuid), isrc->xi_cpu)); intr_execute_handlers(&isrc->xi_intsrc, trap_frame); @@ -696,7 +696,7 @@ static void xen_rebind_ipi(struct xenisrc *isrc) { #ifdef SMP - int cpu = isrc->xi_cpu; + u_int cpu = isrc->xi_cpu; u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id }; @@ -715,7 +715,7 @@ xen_rebind_ipi(struct xenisrc *isrc) static void xen_rebind_virq(struct xenisrc *isrc) { - int cpu = isrc->xi_cpu; + u_int cpu = isrc->xi_cpu; u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_virq bind_virq = { .virq = isrc->xi_virq, @@ -724,7 +724,7 @@ xen_rebind_virq(struct xenisrc *isrc) error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq); if (error != 0) - panic("unable to rebind xen VIRQ#%d: %d", isrc->xi_virq, error); + panic("unable to rebind xen VIRQ#%u: %d", isrc->xi_virq, error); isrc->xi_port = bind_virq.port; } @@ -1373,12 +1373,12 @@ xen_intr_dump_port(struct xenisrc *isrc) { struct xen_intr_pcpu_data *pcpu; shared_info_t *s = HYPERVISOR_shared_info; - int i; + u_int i; db_printf("Port %d Type: %s\n", isrc->xi_port, xen_intr_print_type(isrc->xi_type)); if (isrc->xi_type == EVTCHN_TYPE_VIRQ) - db_printf("\tVirq: %d\n", isrc->xi_virq); + db_printf("\tVirq: %u\n", isrc->xi_virq); db_printf("\tMasked: %d Pending: %d\n", !!xen_test_bit(isrc->xi_port, &s->evtchn_mask[0]), @@ -1387,7 +1387,7 @@ xen_intr_dump_port(struct xenisrc *isrc) db_printf("\tPer-CPU Masks: "); CPU_FOREACH(i) { pcpu = DPCPU_ID_PTR(i, xen_intr_pcpu); - db_printf("cpu#%d: %d ", i, + db_printf("cpu#%u: %d ", i, !!xen_test_bit(isrc->xi_port, pcpu->evtchn_enabled)); } db_printf("\n"); @@ -1395,7 +1395,7 @@ xen_intr_dump_port(struct xenisrc *isrc) DB_SHOW_COMMAND(xen_evtchn, db_show_xen_evtchn) { - int i; + u_int i; if (!xen_domain()) { db_printf("Only available on Xen guests\n"); From nobody Fri Apr 14 14:00:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQG4fqKz45JMg; Fri, 14 Apr 2023 14:00: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 4PydQG2zHlz3K0L; Fri, 14 Apr 2023 14:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEBOpzShBo8yTP35n7SefImR94de8qnDYnxnni6twCg=; b=fm8gBiFaAy3WwYAlSNKQZlIiRkMjI+pUmEO+I8avxjQwvb7PYjOrkAPVFSNm3NBDCoI2Wl edmMRr6+DnCl+CzyLhN2oGh1xlFqQWdHaEUsJDi5EXWJ+3Br5SUuSvqR4WNvmRoCsoARAi dj2/LehPDQ3JPWHOk8rbZi7+LWNae7i3JQxz8GsNr2P9sDbq5y1goPemf5aJQjJa3EQKwF DJCRnJOecaENMJa27xHoVWYzqzO07ksuBBI0VUU0hkYdQ/GlURvqFnjoepO0VkAQ4XXhw+ lYJe0qxaJ48Dk+Fuo2HBGqfdxhwXf3jVjsWMNaMeTur9zUbmf7th/dtgNNZK1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEBOpzShBo8yTP35n7SefImR94de8qnDYnxnni6twCg=; b=AEkagkWPdavJCqoMdGTf18AVHUSPIOJohRhW5nGqdCJgHGA0L36obG6y6CKockIm8MQ7ZV TiTAXo555Pic4EZn6mh9fZ88maOcExzrPrfBcRzj96gwmrS6RCZ+aK5SWpyOCYyz/1f5js /BzV3fzT3j8aMxZ8bhFdGnYPqYys6JiRgdMqwfDMkPLAiWFCRSrJ1l+Wg5JcuIDA1Mo3b8 K09nqW3Z2NGe3blITKAhz2LU1VN8HtJRTyWmb23EpmkwC15Q7R6g0qZmDa2eFl7UWKQkcc 2N8fxPDRdQC61s1GmRhD1nmhxNCd/pgol06YGENlR76bcl0yU+sNTJLR+QU9nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480854; a=rsa-sha256; cv=none; b=oRiLLBE47/u5i4cDLuH7ygJIF3BgDKZscH7iAkABCNEJJa3KyiRvhBHsrfy4oOobJDcmbD ZO/4BgbbGDtu+oMa0/xqFygzt6jyk+Bkp7hhFof2bTmERFw4+nr2yD+ne0K2JlzIflrtzB uaiD06VH1fdIgKS7vT6Fnrv0/Pja5MHHPu/PLjrkp3SR1Kz0T8Ct0v3edrJRd/QjdwdOzQ WCudyoEWDErcp5S9vKQuKGkczZc/jx1Z+64ogEfvEy1M2208VDg0wPlPLmGknq7QZIY4u8 fdGod0lAWtEke1x+oFMyu6Z6IHbPWm0NIFpu8ezruMYFy8sxsNu/nJ8zug+gKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQG1yWjzRgx; Fri, 14 Apr 2023 14:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0sQC083722; Fri, 14 Apr 2023 14:00:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0sMb083721; Fri, 14 Apr 2023 14:00:54 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:54 GMT Message-Id: <202304141400.33EE0sMb083721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 09bd542d17c9 - main - xen/intr: rework xen_intr_alloc_isrc() call structure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09bd542d17c938b236822d1dd09ef0bab8c1de04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=09bd542d17c938b236822d1dd09ef0bab8c1de04 commit 09bd542d17c938b236822d1dd09ef0bab8c1de04 Author: Elliott Mitchell AuthorDate: 2021-05-11 19:05:03 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:49 +0000 xen/intr: rework xen_intr_alloc_isrc() call structure The call structure around xen_intr_alloc_isrc() was rather awful. Notably finding a structure for reuse is part of allocation, but this was done outside xen_intr_alloc_isrc(). Move this into xen_intr_alloc_isrc() so the function handles all allocation steps. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30726 --- sys/x86/xen/xen_intr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index c1ca984bf6ef..6e4b1d9df1f8 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -318,6 +318,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) int error; KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held")); + isrc = xen_intr_find_unused_isrc(type); + if (isrc != NULL) { + return (isrc); + } if (xen_intr_auto_vector_count >= NR_EVENT_CHANNELS) { if (!warned) { @@ -424,13 +428,10 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, *port_handlep = NULL; mtx_lock(&xen_intr_isrc_lock); - isrc = xen_intr_find_unused_isrc(type); + isrc = xen_intr_alloc_isrc(type); if (isrc == NULL) { - isrc = xen_intr_alloc_isrc(type); - if (isrc == NULL) { - mtx_unlock(&xen_intr_isrc_lock); - return (ENOSPC); - } + mtx_unlock(&xen_intr_isrc_lock); + return (ENOSPC); } isrc->xi_port = local_port; isrc->xi_close = false; From nobody Fri Apr 14 14:00:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQJ4LdKz45JK7; Fri, 14 Apr 2023 14:00: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 4PydQH47TPz3KG6; Fri, 14 Apr 2023 14:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sueghzpuZJTulqzkQAQe9AOFXykPaR/Pi9AIFGQulEo=; b=Zgp1ZDGOZFha/cNcWHMCog9x7BVWUQHXQQLFgzZ+CcOCIdSk3GWTlF8F0rI68FrRTj01ze hNVdYxzsNyvkKbAiu4g5sQSB+4T0NQeizB37e0v4QcUOLRvjU+Qhm6jq1XVdu4QtQ8jK4w LWYDMiDjnN+jpW84SMXMeVQcQdv1Aj/2QZFE8PjEaAgO33upScb2NkXiAMbeC5rtJ3d4JZ pOw4BVVSTowDeQO2aPMMCkivSTZtJCaqNo5LG17mNddtGM66ay6MH9PnYFha076ec04hif 6OXAnDKq3egyUKf6Xe4ne2T9hqv5oCrr5FzMNA0YsniIGubVB3asjVqrGgrVgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sueghzpuZJTulqzkQAQe9AOFXykPaR/Pi9AIFGQulEo=; b=EvNRzU3PE11XrAdh5RfCwGol9QTAr23QljFWHwFufqrQSDUgcHl8v4ZHi945PVJejdldlm yaGdIvwgdRi5FbOaZ6EBnIuyeSg/maRAJEDWrUjJlRhp5Ay2X51iNsdsImV9uJ9gCyz+f4 p0xY0/S1bsHb5klO0S/0FkO1eHeJXa/fduEZOBpsQhYsMru6n2rev1Cugf+0OwscRH+Y/6 VknKPp1+tqm/F/BBtb3dUYeSiEQ/xX2+eqEqHcSPsC3m3eGQ+1ZBiBZj4BtsYblGgviaUP YLSOg3H7PAYxOGybRqLlUrYmwGD7Sj4bUKULxdT0REA4Nae/pnBU6tNKHHeNGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480855; a=rsa-sha256; cv=none; b=VKlfoqBlWtUmFbx53s2YR/VEioXeS06VpfMj9hd8xPxFOY8yzc5Cu8dBFZne3OMLBKaZSW 9j6buN6Zk60J4XW7LDHjXehHlD5U5ImkU8K3YVRFSPPQPZusnizShWndOM+ATMabWtO1Ca Ubj7t9W+kne+LsBH5EhFyxKto4LnZu/AVYBrH4Ad/2Q7Lpjrvm3yV9eZ3fm/gznWHS76hL JnPK0MiHaysMYaArutgpghlyqJL1IhcJw13vom19zn5U0tMDw+zFWTPCQbyXx1QBDFyIhm N+FzXWNXOJbh0cdShBt1pUJfDaXnqdGhsFahRQXRdfHPTtcMQFKKQCDF5j1tlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQH2yMQzRX9; Fri, 14 Apr 2023 14:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0t5A083752; Fri, 14 Apr 2023 14:00:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0tEQ083751; Fri, 14 Apr 2023 14:00:55 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:55 GMT Message-Id: <202304141400.33EE0tEQ083751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 834013dea2d2 - main - xen/intr: rework xen_intr_alloc_isrc() locking List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 834013dea2d29ef943620bfaf7f269f9e581e170 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=834013dea2d29ef943620bfaf7f269f9e581e170 commit 834013dea2d29ef943620bfaf7f269f9e581e170 Author: Elliott Mitchell AuthorDate: 2021-05-11 19:05:03 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:50 +0000 xen/intr: rework xen_intr_alloc_isrc() locking Locking for allocation was being done in xen_intr_bind_isrc(), but the unlock was inside xen_intr_alloc_isrc(). While the lock acquisition at the end of xen_intr_alloc_isrc() was to modify xen_intr_port_to_isrc[], NOT allocation. Fix this garbled (though working) locking scheme. Now locking for allocation is strictly in xen_intr_alloc_isrc(), while locking to modify xen_intr_port_to_isrc[] is in xen_intr_bind_isrc(). Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30726 --- sys/x86/xen/xen_intr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 6e4b1d9df1f8..cf20f2cdcbf8 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -317,9 +317,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) unsigned int vector; int error; - KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held")); + mtx_lock(&xen_intr_isrc_lock); isrc = xen_intr_find_unused_isrc(type); if (isrc != NULL) { + mtx_unlock(&xen_intr_isrc_lock); return (isrc); } @@ -328,6 +329,7 @@ xen_intr_alloc_isrc(enum evtchn_type type) warned = 1; printf("%s: Xen interrupts exhausted.\n", __func__); } + mtx_unlock(&xen_intr_isrc_lock); return (NULL); } @@ -346,7 +348,6 @@ xen_intr_alloc_isrc(enum evtchn_type type) if (error != 0) panic("%s(): failed registering interrupt %u, error=%d\n", __func__, vector, error); - mtx_lock(&xen_intr_isrc_lock); return (isrc); } @@ -427,16 +428,14 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } *port_handlep = NULL; - mtx_lock(&xen_intr_isrc_lock); isrc = xen_intr_alloc_isrc(type); - if (isrc == NULL) { - mtx_unlock(&xen_intr_isrc_lock); + if (isrc == NULL) return (ENOSPC); - } isrc->xi_port = local_port; isrc->xi_close = false; - xen_intr_port_to_isrc[local_port] = isrc; refcount_init(&isrc->xi_refcount, 1); + mtx_lock(&xen_intr_isrc_lock); + xen_intr_port_to_isrc[isrc->xi_port] = isrc; mtx_unlock(&xen_intr_isrc_lock); #ifdef SMP From nobody Fri Apr 14 14:00:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQK3BLZz45JLm; Fri, 14 Apr 2023 14:00: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 4PydQJ68xPz3K10; Fri, 14 Apr 2023 14:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jquY8VlbcbPSzho70Wsk1POJ1Ym9bm1D5GkZZLsE/M0=; b=e8dqUZSysj59OSiIkcPXbJbZ+HBEvIgnKITXANwhjE/59Jrp5LX3mEs2P2n7KH2z0kUMhS CzpMlBSzVjwaRx1+NgUrEO2ZPAjwip8BkgHzZFdesr+lTU2zHuXnzctBvs0KhJvMEeGkGz yFBIwDp1UffpyX/zlpmuusRwyN9yBurczq4RraSv49aAsifXhBhTbkxzZiAUTjyH6aRd0V VrInPANj8Ki1ChZEw8hA2D5K9R2qMT4XWbXlixfUtMHgcC/YDqjjjf3tUPH+u/4uIjYUCi 2WegYNYR+L9SnjEvvthWA8xzC9zHGM2DwzS6s6GenRbxXNY9mc8n5FtIuVBUeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jquY8VlbcbPSzho70Wsk1POJ1Ym9bm1D5GkZZLsE/M0=; b=OQVztGcNl+av8cWI5TKJtsEWBCcp/+pn4N5+gyM3JKNrGHX1tRpqSXtfRXpqS3afp1EQGF WGrEG+Hrx3oqsguauTNHWP/1qGKVTg/VxOgbSz/OiTSw/Bz4OTqwapajR+U4XGOpTomSEd 8ruoM1l0IQ3DfQn2ZQWz1YI8xAtOWHhz0fwOlxNmPKUM926HQFIqNCsCDJieosyL76JVhB xjeQ7uIukNxZtdQPMNOO0DZWYnPtfK1qEjjtoWGwd2uXv1CQ8WS41fJ0G0UFkGPNn3ADxC L2qhX2P7NNLysphKM8voCWQFnUBKmmvofdbc4PhVr0+keZ24hmR40sSnxufJgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480856; a=rsa-sha256; cv=none; b=Ww/Lz/gd4LHbx4wckmPag/Z4p0YxLuAuKxFFOUkTCdPBy75I7x7YunxnA94OJA68gdGyiV V56pOqIfEkVaoIfAW+wZu8ZKzZkEw4wXkz+OwyG6dSwCUnMmTpV0+DYIz1jqbKozcbohuP Xfwp62sdf6gfgYCSQdZtOTCYvKNQSkTS0f0ujhQBZqctRbiGD3LIRddT/ctwzM0yKb9ggp 2Gq1B4fUcrvMPC5Wi8ORVln5qqUHLMR4wOKzJx7h5g3EZQtaEQs1UqJYAPkA3Btsp89Nqx KFNGuLjX2OZ6Nv8aMs7yTaUV9EMfUGnuziA5MYw3SHvbdbvZo5CIy91q5P5jrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQJ3RMBzRXB; Fri, 14 Apr 2023 14:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0uWr083778; Fri, 14 Apr 2023 14:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0uWK083777; Fri, 14 Apr 2023 14:00:56 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:56 GMT Message-Id: <202304141400.33EE0uWK083777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: ff73b1d69b90 - main - xen/intr: split xen_intr_isrc_lock uses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff73b1d69b90e33e18e60a10383b75058c7639c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=ff73b1d69b90e33e18e60a10383b75058c7639c1 commit ff73b1d69b90e33e18e60a10383b75058c7639c1 Author: Elliott Mitchell AuthorDate: 2021-05-11 19:05:03 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:51 +0000 xen/intr: split xen_intr_isrc_lock uses There are actually several distinct locking domains in xen_intr.c, but all were sharing the same lock. Both xen_intr_port_to_isrc[] and the x86 interrupt structures needed protection. Split these two apart as a precursor to splitting the architecture portions off the file. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30726 --- sys/x86/xen/xen_intr.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index cf20f2cdcbf8..b3996e6cf1aa 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -73,6 +73,16 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); +/* + * Lock for x86-related structures. Notably modifying + * xen_intr_auto_vector_count, and allocating interrupts require this lock be + * held. + * + * ->xi_type == EVTCHN_TYPE_UNBOUND indicates a xenisrc is under control of + * this lock and operations require it be held. + */ +static struct mtx xen_intr_x86_lock; + static u_int first_evtchn_irq; /** @@ -160,6 +170,16 @@ struct pic xen_intr_pic = { .pic_assign_cpu = xen_intr_pic_assign_cpu, }; +/* + * Lock for interrupt core data. + * + * Modifying xen_intr_port_to_isrc[], or isrc->xi_port (implies the former) + * requires this lock be held. Any time this lock is not held, the condition + * `!xen_intr_port_to_isrc[i] || (xen_intr_port_to_isrc[i]->ix_port == i)` + * MUST be true for all values of i which are valid indicies of the array. + * + * Acquire/release operations for isrc->xi_refcount require this lock be held. + */ static struct mtx xen_intr_isrc_lock; static u_int xen_intr_auto_vector_count; static struct xenisrc *xen_intr_port_to_isrc[NR_EVENT_CHANNELS]; @@ -274,7 +294,7 @@ xen_intr_find_unused_isrc(enum evtchn_type type) { int isrc_idx; - KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn isrc lock not held")); + mtx_assert(&xen_intr_x86_lock, MA_OWNED); for (isrc_idx = 0; isrc_idx < xen_intr_auto_vector_count; isrc_idx ++) { struct xenisrc *isrc; @@ -317,10 +337,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) unsigned int vector; int error; - mtx_lock(&xen_intr_isrc_lock); + mtx_lock(&xen_intr_x86_lock); isrc = xen_intr_find_unused_isrc(type); if (isrc != NULL) { - mtx_unlock(&xen_intr_isrc_lock); + mtx_unlock(&xen_intr_x86_lock); return (isrc); } @@ -329,7 +349,7 @@ xen_intr_alloc_isrc(enum evtchn_type type) warned = 1; printf("%s: Xen interrupts exhausted.\n", __func__); } - mtx_unlock(&xen_intr_isrc_lock); + mtx_unlock(&xen_intr_x86_lock); return (NULL); } @@ -339,7 +359,7 @@ xen_intr_alloc_isrc(enum evtchn_type type) KASSERT((intr_lookup_source(vector) == NULL), ("Trying to use an already allocated vector")); - mtx_unlock(&xen_intr_isrc_lock); + mtx_unlock(&xen_intr_x86_lock); isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO); isrc->xi_intsrc.is_pic = &xen_intr_pic; isrc->xi_vector = vector; @@ -383,11 +403,16 @@ xen_intr_release_isrc(struct xenisrc *isrc) xen_intr_port_to_isrc[isrc->xi_port] = NULL; } + /* not reachable from xen_intr_port_to_isrc[], unlock */ + mtx_unlock(&xen_intr_isrc_lock); + isrc->xi_cpu = 0; - isrc->xi_type = EVTCHN_TYPE_UNBOUND; isrc->xi_port = INVALID_EVTCHN; isrc->xi_cookie = NULL; - mtx_unlock(&xen_intr_isrc_lock); + + mtx_lock(&xen_intr_x86_lock); + isrc->xi_type = EVTCHN_TYPE_UNBOUND; + mtx_unlock(&xen_intr_x86_lock); return (0); } @@ -634,6 +659,8 @@ xen_intr_init(void *dummy __unused) mtx_init(&xen_intr_isrc_lock, "xen-irq-lock", NULL, MTX_DEF); + mtx_init(&xen_intr_x86_lock, "xen-x86-table-lock", NULL, MTX_DEF); + /* * Set the per-cpu mask of CPU#0 to enable all, since by default all * event channels are bound to CPU#0. From nobody Fri Apr 14 14:00:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQL3BXZz45JYH; Fri, 14 Apr 2023 14:00: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 4PydQK5FTfz3K83; Fri, 14 Apr 2023 14:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPeS6QLjdiiWAYRw56h0cpNweQ0dlCts4GuaySWWvVc=; b=P2szy5fk66qRTUjYLbMATQsFW+Ia7byUNJo5zmwOVpNwxiUfnlb5B0iOZe68GAKebo5GG7 ySGvacW4EsFCDH1/neilv1eO7pVL9XAaHSLINeMLyGtSczFesLGWT+5m75cjSMthmVAGsZ wUSR/Wnal04NiwQJFrB7dFPwNjlpD3/8YUDDz/aM7tw5N4KBN+IwiA/G3IRrMN1EkiAZXK +N5j1ksZKKIqTA/Nh/TVXsC4foJ/hWMO1vk8WBuG7TJJCzAfUTDSgEsVJzTFcUnzxY/JS3 7fS7aodJ46dKblOCCz8ejTc/0D8W9FyLs1jF6g+mSQAZgET08cZo4n5NwRfKKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPeS6QLjdiiWAYRw56h0cpNweQ0dlCts4GuaySWWvVc=; b=F3uGZpapWaeRWMqng+xlYnoDxEVGgZncMqMkn852swL/y/ovXHr5LhpkUmhPJrU/gr3D7o hUT+zgMtJSKS8/K2zO8wCmnhtYmgYxAho2zLk+JRQp3ws0Bt34X2G9bHtKMOQatv9J8aG2 Otb6zmauuTIAq4L03+ZyXhZ/2DSqFF3du3JOw/T8cv1nnYWairfeAer1nLqYwxGxhYXAHJ Izkurf+f1HHNB335S+ZbNzkN0f7MVlFVLhiTH8wlWSqNXv89uaRWWJPxiOVaEJ3zQ5Vubs 4m39EwRcEXjyt6/c70YnCUNaU4tBzaVmxC1YGbzRVHVHmxgOXXgwJjlCa2W/pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480857; a=rsa-sha256; cv=none; b=et6wvOnHXN+LkTYXHx+UxHeLvlPKF7CTIhGbUOfOl+1I9TyQCRJeDOxT3zBljoOt2rc4O7 q3uab5OgN/mGEHZxcaemQ8jhLReb7UjOORxEUE6+sn/DwNrceFeDlzKzxS3CMp9/2wZ665 JCdPTptfDtVybdVcmZtVgYMj92xW7R9mYCr6tnlbbZl9Ig60p7/lWtHI2hUQUSv4upTWSl PoexzkymS3fFRKNZK7z+hBug6xS1iwoBwGGR5xk/ycdkldPm4HZy3gODCzOhp+5QdlGcLX SjpQSaCjj48qoSd+9eLsKS8l8OLRuv9Bf5+T/+fTbb1tQWB86P1knHGZGekMUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQK4MYyzRlk; Fri, 14 Apr 2023 14:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0vGj083802; Fri, 14 Apr 2023 14:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0vDU083801; Fri, 14 Apr 2023 14:00:57 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:57 GMT Message-Id: <202304141400.33EE0vDU083801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 2794893ebff0 - main - xen/intr: do full xenisrc initialization during binding List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2794893ebff0c0cab62692fdf07b8632bcfe4d35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=2794893ebff0c0cab62692fdf07b8632bcfe4d35 commit 2794893ebff0c0cab62692fdf07b8632bcfe4d35 Author: Elliott Mitchell AuthorDate: 2021-05-14 04:36:02 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:51 +0000 xen/intr: do full xenisrc initialization during binding Keeping released xenisrcs in a known state simplifies allocation, but forces the allocation function to maintain that state. This turns into a problem when trying to allow for interchangeable allocation functions. Fix this issue by ensuring xenisrcs are always *fully* initialized during binding. Reviewed by: royger --- sys/x86/xen/xen_intr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index b3996e6cf1aa..1bfe941bc67b 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -406,10 +406,6 @@ xen_intr_release_isrc(struct xenisrc *isrc) /* not reachable from xen_intr_port_to_isrc[], unlock */ mtx_unlock(&xen_intr_isrc_lock); - isrc->xi_cpu = 0; - isrc->xi_port = INVALID_EVTCHN; - isrc->xi_cookie = NULL; - mtx_lock(&xen_intr_x86_lock); isrc->xi_type = EVTCHN_TYPE_UNBOUND; mtx_unlock(&xen_intr_x86_lock); @@ -456,8 +452,11 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, isrc = xen_intr_alloc_isrc(type); if (isrc == NULL) return (ENOSPC); + + isrc->xi_cookie = NULL; isrc->xi_port = local_port; isrc->xi_close = false; + isrc->xi_cpu = 0; refcount_init(&isrc->xi_refcount, 1); mtx_lock(&xen_intr_isrc_lock); xen_intr_port_to_isrc[isrc->xi_port] = isrc; From nobody Fri Apr 14 14:00:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQM5n93z45JSV; Fri, 14 Apr 2023 14:00: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 4PydQL6Jc6z3K1H; Fri, 14 Apr 2023 14:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fQspjEfzQkB1e7/bkeQvs2H+v1ObOnNlVKXVOh8hek=; b=nJXSHTbsr/idOxjkxkupx7Ehr/iXuWqOBIjvIXouaJvBRrmymizZVIgKRskkjYjFJ1HrUF /zVhtfYcXUrj8att59Z+xzZyDkIWKhWw/X5ArFp5YzzqeCI4h0EaHctsTAbB/CBiXRurEa ah6o/e690AiudSBx2UB4fK8EWY3f8ZmMo3hb/GsnhsqRNqnGy3vbG3uvZHJENItVzUUwJd FzcQ+XcFmP0cn6XlHcHH6mUAv8rO3f/pQT2oVkK6eZhJTq/34Ke/nLiPhzGjHohl+/3SD6 jxNe4+QI8OgbpuHKeV1fa18oEVeP1VOEonfSYDM9yk4OKrkT0aP07vXn//sJQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fQspjEfzQkB1e7/bkeQvs2H+v1ObOnNlVKXVOh8hek=; b=YpLOKRPzOsULDgzXN6bObd7Smgijhe/O9kMR4jxosGn5t3gaHL0Ve9OjDl8TRp4e0iBJCa XXwb+viSvUZnA2cx56ovR3yVYml3K1mxPLGtsKqOdOJqs42uMoZ3/8mEgxdN+9QU6ufQ7L UpHrH3ql/bvgBYmUcSpdzALoRYC8TRHog/iEB6sybG1TBX/hsDCHuQnYb2PdIXXH2Vw/Ku 4JVIdh98adhnr9LS/0QLLWBrtfSIr9TaeX1fkEoYr7zlEckPUPSm+l3hyH+nGyVviLniYs V0knq6EO5UoeN0WVn3SbM7tUCOTB8jdl++gcTjqO3m7WRN3mmCeFvHUINT25ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480858; a=rsa-sha256; cv=none; b=deoOwCHzhernxwP2fNIuca1PNosFeUZqdZtrvljh9fe1DGpdKdg2YU7GCBwySBVj8buZzP bFTWh/i8ieIyBK7XiP/2AFiCMxqVkEqW6e75m9MqQ6PBu9aB2dNDDe6mPrvNaXJFCn70l3 zPvMBr1vQjiqo8jQty+dcpRo/nun/oumUXe+DRxFwfiLPnaVob0Y61MPM+nIDC2IStxe39 D8cU07729GwOzwesknHfrlvgFyR1cCpB8/j/XgqkB5sViGnbG8TrQ1rR9OeFj2nGvLk7OH gZn1BmnA3oJSKHFlx4oCc0W8lw1wZ593V2vZc0SP832yhnsup6GlhuflIkL4NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQL5Qf8zRj7; Fri, 14 Apr 2023 14:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0wre083826; Fri, 14 Apr 2023 14:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0wxP083825; Fri, 14 Apr 2023 14:00:58 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:58 GMT Message-Id: <202304141400.33EE0wxP083825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: af610cabf1f4 - main - xen/intr: adjust xen_intr_handle_upcall() to match driver filter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af610cabf1f4ae3129596d8f37a2ed70e142d057 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=af610cabf1f4ae3129596d8f37a2ed70e142d057 commit af610cabf1f4ae3129596d8f37a2ed70e142d057 Author: Elliott Mitchell AuthorDate: 2021-04-21 14:05:11 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:52 +0000 xen/intr: adjust xen_intr_handle_upcall() to match driver filter xen_intr_handle_upcall() has two interfaces. It needs to be called by the x86 assembly code invoked by the APIC. Second, it needs to be called as a driver_filter_t for the XenPCI code and for architectures besides x86. Unfortunately the driver_filter_t interface was implemented as a wrapper around the x86-APIC interface. Now create a simple wrapper for the x86-APIC code, which calls an architecture-independent xen_intr_handle_upcall(). When called via intr_event_handle(), driver_filter_t functions expect preemption to be disabled. This removes the need for critical_enter()/critical_exit() when called this way. The lapic_eoi() call is only needed on x86 in some cases when invoked directly as an APIC vector handler. Additionally driver_filter_t functions have no need to handle interrupt counters. The intrcnt_add() calling function was reworked to match the current situation. intrcnt_add() is now only called via one path. The increment/decrement of curthread->td_intr_nesting_level had previously been left out. Appears this was mostly harmless, but this was noticed during implementation and has been added. CONFIG_X86 is a leftover from use with Linux. While the barrier isn't needed for FreeBSD on x86, it will be needed for FreeBSD on other architectures. Copyright note. xen_intr_intrcnt_add() was introduced at 76acc41fb7c7 by Justin T. Gibbs. xen_intrcnt_init() was introduced at fd036deac1695 by John Baldwin. sys/x86/xen/xen_arch_intr.c was originally created by Julien Grall in 2015 for the purpose of holding the x86 interrupt interface. Later it was found xen_intr_handle_upcall() was better earlier, and the x86 interrupt interface better later. As such the filename and header list belong to Julien Grall, but what those were created for is later. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30006 --- sys/amd64/amd64/apic_vector.S | 2 +- sys/conf/files.x86 | 1 + sys/dev/xen/xenpci/xenpci.c | 9 +--- sys/i386/i386/apic_vector.S | 2 +- sys/x86/xen/xen_arch_intr.c | 103 ++++++++++++++++++++++++++++++++++++++++++ sys/x86/xen/xen_intr.c | 66 ++++----------------------- sys/xen/xen_intr.h | 5 +- 7 files changed, 120 insertions(+), 68 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index cea9b79a0ec8..5515213cd154 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -159,7 +159,7 @@ IDTVEC(spuriousint) INTR_HANDLER xen_intr_upcall KMSAN_ENTER movq %rsp, %rdi - call xen_intr_handle_upcall + call xen_arch_intr_handle_upcall KMSAN_LEAVE jmp doreti #endif diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 8774139eee3a..54f6e8c8260a 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -347,3 +347,4 @@ x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xenhvm x86/xen/xen_apic.c optional xenhvm smp +x86/xen/xen_arch_intr.c optional xenhvm diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index ca54b691b8ad..7dd69688a00e 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -52,13 +52,6 @@ __FBSDID("$FreeBSD$"); #include -static int -xenpci_intr_filter(void *trap_frame) -{ - xen_intr_handle_upcall(trap_frame); - return (FILTER_HANDLED); -} - static int xenpci_irq_init(device_t device, struct xenpci_softc *scp) { @@ -66,7 +59,7 @@ xenpci_irq_init(device_t device, struct xenpci_softc *scp) error = BUS_SETUP_INTR(device_get_parent(device), device, scp->res_irq, INTR_MPSAFE|INTR_TYPE_MISC, - xenpci_intr_filter, NULL, /*trap_frame*/NULL, + xen_intr_handle_upcall, NULL, NULL, &scp->intr_cookie); if (error) return error; diff --git a/sys/i386/i386/apic_vector.S b/sys/i386/i386/apic_vector.S index 6c4f8b78fe55..270e0d0393ab 100644 --- a/sys/i386/i386/apic_vector.S +++ b/sys/i386/i386/apic_vector.S @@ -183,7 +183,7 @@ IDTVEC(xen_intr_upcall) cld KENTER pushl %esp - movl $xen_intr_handle_upcall, %eax + movl $xen_arch_intr_handle_upcall, %eax call *%eax add $4, %esp jmp doreti diff --git a/sys/x86/xen/xen_arch_intr.c b/sys/x86/xen/xen_arch_intr.c new file mode 100644 index 000000000000..d946ca781355 --- /dev/null +++ b/sys/x86/xen/xen_arch_intr.c @@ -0,0 +1,103 @@ +/*- + * SPDX-License-Identifier: MIT OR GPL-2.0-only + * + * Copyright © 2013 Spectra Logic Corporation + * Copyright © 2018 John Baldwin/The FreeBSD Foundation + * Copyright © 2019 Roger Pau Monné/Citrix Systems R&D + * Copyright © 2021 Elliott Mitchell + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +/************************ Xen x86 interrupt interface ************************/ + +/* + * Pointers to the interrupt counters + */ +DPCPU_DEFINE_STATIC(u_long *, pintrcnt); + +static void +xen_intrcnt_init(void *dummy __unused) +{ + unsigned int i; + + if (!xen_domain()) + return; + + CPU_FOREACH(i) { + char buf[MAXCOMLEN + 1]; + + snprintf(buf, sizeof(buf), "cpu%d:xen", i); + intrcnt_add(buf, DPCPU_ID_PTR(i, pintrcnt)); + } +} +SYSINIT(xen_intrcnt_init, SI_SUB_INTR, SI_ORDER_MIDDLE, xen_intrcnt_init, NULL); + +/* + * Transition from assembly language, called from + * sys/{amd64/amd64|i386/i386}/apic_vector.S + */ +extern void xen_arch_intr_handle_upcall(struct trapframe *); +void +xen_arch_intr_handle_upcall(struct trapframe *trap_frame) +{ + struct trapframe *old; + + /* + * Disable preemption in order to always check and fire events + * on the right vCPU + */ + critical_enter(); + + ++*DPCPU_GET(pintrcnt); + + ++curthread->td_intr_nesting_level; + old = curthread->td_intr_frame; + curthread->td_intr_frame = trap_frame; + + xen_intr_handle_upcall(NULL); + + curthread->td_intr_frame = old; + --curthread->td_intr_nesting_level; + + if (xen_evtchn_needs_ack) + lapic_eoi(); + + critical_exit(); +} diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 1bfe941bc67b..0c4d2cd9222b 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -56,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -102,9 +102,6 @@ struct xen_intr_pcpu_data { */ u_int last_processed_l2i; - /** Pointer to this CPU's interrupt statistic counter. */ - u_long *evtchn_intrcnt; - /** * A bitmap of ports that can be serviced from this CPU. * A set bit means interrupt handling is enabled. @@ -261,25 +258,6 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port) xen_set_bit(port, pcpu->evtchn_enabled); } -/** - * Allocate and register a per-cpu Xen upcall interrupt counter. - * - * \param cpu The cpu for which to register this interrupt count. - */ -static void -xen_intr_intrcnt_add(u_int cpu) -{ - char buf[MAXCOMLEN + 1]; - struct xen_intr_pcpu_data *pcpu; - - pcpu = DPCPU_ID_PTR(cpu, xen_intr_pcpu); - if (pcpu->evtchn_intrcnt != NULL) - return; - - snprintf(buf, sizeof(buf), "cpu%d:xen", cpu); - intrcnt_add(buf, &pcpu->evtchn_intrcnt); -} - /** * Search for an already allocated but currently unused Xen interrupt * source object. @@ -526,9 +504,10 @@ xen_intr_active_ports(const struct xen_intr_pcpu_data *const pcpu, * * \param trap_frame The trap frame context for the current interrupt. */ -void -xen_intr_handle_upcall(struct trapframe *trap_frame) +int +xen_intr_handle_upcall(void *unused __unused) { + struct trapframe *trap_frame = curthread->td_intr_frame; u_int l1i, l2i, port, cpu __diagused; u_long masked_l1, masked_l2; struct xenisrc *isrc; @@ -536,11 +515,8 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) struct xen_intr_pcpu_data *pc; u_long l1, l2; - /* - * Disable preemption in order to always check and fire events - * on the right vCPU - */ - critical_enter(); + /* We must remain on the same vCPU during this function */ + CRITICAL_ASSERT(curthread); cpu = PCPU_GET(cpuid); pc = DPCPU_PTR(xen_intr_pcpu); @@ -551,19 +527,15 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) } v->evtchn_upcall_pending = 0; - -#if 0 -#ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */ +/* No need for a barrier on x86 -- XCHG is a barrier on x86. */ +#if !defined(__amd64__) && !defined(__i386__) /* Clear master flag /before/ clearing selector flag. */ wmb(); #endif -#endif - l1 = atomic_readandclear_long(&v->evtchn_pending_sel); l1i = pc->last_processed_l1i; l2i = pc->last_processed_l2i; - (*pc->evtchn_intrcnt)++; while (l1 != 0) { l1i = (l1i + 1) % LONG_BIT; @@ -627,10 +599,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) } } - if (xen_evtchn_needs_ack) - lapic_eoi(); - - critical_exit(); + return (FILTER_HANDLED); } static int @@ -682,23 +651,6 @@ xen_intr_init(void *dummy __unused) } SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_SECOND, xen_intr_init, NULL); -static void -xen_intrcnt_init(void *dummy __unused) -{ - unsigned int i; - - if (!xen_domain()) - return; - - /* - * Register interrupt count manually as we aren't guaranteed to see a - * call to xen_intr_assign_cpu() before our first interrupt. - */ - CPU_FOREACH(i) - xen_intr_intrcnt_add(i); -} -SYSINIT(xen_intrcnt_init, SI_SUB_INTR, SI_ORDER_MIDDLE, xen_intrcnt_init, NULL); - void xen_intr_alloc_irqs(void) { diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 5ebce0678222..d8e85b73d95e 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -38,7 +38,10 @@ /** Registered Xen interrupt callback handle. */ typedef void * xen_intr_handle_t; -void xen_intr_handle_upcall(struct trapframe *trap_frame); +/* + * Main handler for Xen event channel interrupts + */ +extern driver_filter_t xen_intr_handle_upcall; /** * Associate an already allocated local event channel port an interrupt From nobody Fri Apr 14 14:00:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQQ31DBz45JSb; Fri, 14 Apr 2023 14:01: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 4PydQN5hsLz3K5Y; Fri, 14 Apr 2023 14:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pj9y4vV5rawI2sok6912o/MG9VP5Dme0dXhhE4oRIJA=; b=agQjbZFkEFRLepc7x9v7VfG67521P7IlkPvzJ+6qlSuKGfUY5V+2vBWkBJJKbWizXSqJwk qy/qVSmTmX/VWqButPBwoyoGgcOi00xOVGIKUo9rZx6sxBiGc7UNruzHsMI9O20AZZVUHs C6Qf+gZvgMA/ZqIS3F7fnzkaoRZSCl4ZXiuhvoMiHzFB03/rJIoOuOokxe3kg0vOkMkFyZ AWXP950X2pGsDlUQ1kvlQmz661TIqzRFHqoiGI69ygsck07j71v4DncSitWEzmo8MdFj2Y Q6bfAPCSo9FhdZ2fEqUPv2sfoBtNpLbBj9Z8j5x9gfi8696H4B2fl72AiYA4fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pj9y4vV5rawI2sok6912o/MG9VP5Dme0dXhhE4oRIJA=; b=cz9pSRuAvYtFGHyHDLkwHYHHNY4W9ScqgFIN0xIrtfJnzMa8W0NQzOZTR6+MPAKcI1WFZW Ryzq1UZ/syEIjwIqyHpJLLCxa4PwUe/g3mxqMzQgnJ+nVJWABhoYYNCF8QVBU7xVekrelh YHtiZ9uBOPHJVRZ12DxVKm4VyiLMfrjvp+RxAci43sCRl50vq4h+6amaVVQhiX4iC2vwWp OuWqcYfFltBfk+VT0IXCezJ7bGLMtACUZsorPAN7+jM1z8x1rO3YIuhGwjAD6DAHQyGdQH DKGxDHCD0ffXtSQhGL7pQKMouWTzkU3EDnnvbdEg+WuqiYo+uUKReyF5Rt0Yiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480860; a=rsa-sha256; cv=none; b=NoqFRN/yAlcofiOlMheXwZQLJRlhY4HU6QGPz1LcZ14MyiRDZqs5FCYYVz194r2ZFaAzuc MfN+OfjjXWoos9l6qFqDFMUV1MRz8QNSTgK8xeTJ61eu9eB0xtTI6ODDehE+/AGvYNGcJh niqwuhG4V7p18lVhV0OWRAF/DneNXa3EXCcqnvzHRWk71fIfOfT5w+wdiDwwR5K6xvQITc pBsUy/13xcghNdu5+sgT1lyugn1iFTr0cZcOGIIPmY77DK9a9WSTReeOXH/1baVWtn7iJL ck82v8qiAP0m99ZIKau2kJdVl3KIG63UXsoRnBfh99Gd9u9GfEio2f4UUb4mqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQM69RZzRlm; Fri, 14 Apr 2023 14:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0xU3083856; Fri, 14 Apr 2023 14:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0xrN083855; Fri, 14 Apr 2023 14:00:59 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:59 GMT Message-Id: <202304141400.33EE0xrN083855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: ab7ce14b1d9d - main - xen/intr: introduce dev/xen/bus/intr-internal.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab7ce14b1d9da0cc2f77102be7ac287f8df5c52c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7ce14b1d9da0cc2f77102be7ac287f8df5c52c commit ab7ce14b1d9da0cc2f77102be7ac287f8df5c52c Author: Julien Grall AuthorDate: 2015-10-20 16:14:56 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:53 +0000 xen/intr: introduce dev/xen/bus/intr-internal.h Move the xenisrc structure which needs to be shared between the core Xen interrupt code and architecture-dependent code into a separate header. A similar situation exists for the NR_EVENT_CHANNELS constant. Turn xi_intsrc into a type definition named xi_arch to reflect the new purpose of being an architectural variable for the interrupt source. This was originally implemented by Julien Grall, but has been heavily modified. The core side was renamed "intr-internal.h" and is #include'd by "arch-intr.h" instead of the other way around. This allows the architecture to add function definitions which use struct xenisrc. The original version only moved xi_intsrc into xen_arch_isrc_t. Moving xi_vector was done by the submitter. The submitter had also moved xi_activehi and xi_edgetrigger into xen_arch_isrc_t. Those disappeared with the removal of PVHv1 support. Copyright note. The current xenisrc structure was introduced at 76acc41fb7c7 by Justin T. Gibbs. Traces remain, but the strength of Copyright claims from before 2013 seem pretty weak. Reviewed by: royger Submitted by: Elliott Mitchell , 2021-03-17 19:09:01 Original implementation: Julien Grall , 2015-10-20 09:14:56 Differential Revision: https://reviews.freebsd.org/D30648 [royger] - Adjust some line lengths - Fix comment about NR_EVENT_CHANNELS after movement. - Use #include instead of symlinks. --- sys/amd64/include/xen/arch-intr.h | 3 +++ sys/dev/xen/bus/intr-internal.h | 54 +++++++++++++++++++++++++++++++++++++++ sys/i386/include/xen/arch-intr.h | 3 +++ sys/x86/include/xen/arch-intr.h | 41 +++++++++++++++++++++++++++++ sys/x86/xen/xen_intr.c | 52 ++++++++++++++----------------------- 5 files changed, 120 insertions(+), 33 deletions(-) diff --git a/sys/amd64/include/xen/arch-intr.h b/sys/amd64/include/xen/arch-intr.h new file mode 100644 index 000000000000..6ea4b79be03f --- /dev/null +++ b/sys/amd64/include/xen/arch-intr.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +#include diff --git a/sys/dev/xen/bus/intr-internal.h b/sys/dev/xen/bus/intr-internal.h new file mode 100644 index 000000000000..222e0665b14d --- /dev/null +++ b/sys/dev/xen/bus/intr-internal.h @@ -0,0 +1,54 @@ +/*- + * SPDX-License-Identifier: MIT OR GPL-2.0-only + * + * Copyright © 2002-2005 K A Fraser + * Copyright © 2005 Intel Corporation + * Copyright © 2013 Spectra Logic Corporation + * Copyright © 2015 Julien Grall + * Copyright © 2021,2022 Elliott Mitchell + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef _XEN_INTR_INTERNAL_H_ +#define _XEN_INTR_INTERNAL_H_ + +#ifndef _MACHINE__XEN_ARCH_INTR_H_ +#error "do not #include intr-internal.h, #include machine/arch-intr.h instead" +#endif + +/* Current implementation only supports 2L event channels. */ +#define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS + +struct xenisrc { + xen_arch_isrc_t xi_arch; /* @TOP -> *xi_arch=*xenisrc */ + enum evtchn_type xi_type; + u_int xi_cpu; /* VCPU for delivery */ + evtchn_port_t xi_port; + u_int xi_virq; + void *xi_cookie; + bool xi_close:1; /* close on unbind? */ + bool xi_masked:1; + volatile u_int xi_refcount; +}; + +#endif /* _XEN_INTR_INTERNAL_H_ */ diff --git a/sys/i386/include/xen/arch-intr.h b/sys/i386/include/xen/arch-intr.h new file mode 100644 index 000000000000..6ea4b79be03f --- /dev/null +++ b/sys/i386/include/xen/arch-intr.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +#include diff --git a/sys/x86/include/xen/arch-intr.h b/sys/x86/include/xen/arch-intr.h new file mode 100644 index 000000000000..b721e744852a --- /dev/null +++ b/sys/x86/include/xen/arch-intr.h @@ -0,0 +1,41 @@ +/*- + * SPDX-License-Identifier: MIT OR GPL-2.0-only + * + * Copyright © 2015 Julien Grall + * Copyright © 2021 Elliott Mitchell + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef _MACHINE__XEN_ARCH_INTR_H_ +#define _MACHINE__XEN_ARCH_INTR_H_ + +#include + +typedef struct { + struct intsrc intsrc; /* @TOP -> *xen_arch_isrc */ + u_int vector; /* Global isrc vector number */ +} xen_arch_isrc_t; + +#include + +#endif /* _MACHINE__XEN_ARCH_INTR_H_ */ diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 0c4d2cd9222b..e23a021c069b 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -63,14 +62,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include #ifdef DDB #include #endif -/* The code below is the implementation of 2L event channels. */ -#define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS - static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); /* @@ -123,19 +120,6 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info); #define INVALID_EVTCHN (~(evtchn_port_t)0) /* Invalid event channel */ #define is_valid_evtchn(x) ((uintmax_t)(x) < NR_EVENT_CHANNELS) -struct xenisrc { - struct intsrc xi_intsrc; - enum evtchn_type xi_type; - u_int xi_cpu; /* VCPU for delivery. */ - u_int xi_vector; /* Global isrc vector number. */ - evtchn_port_t xi_port; - u_int xi_virq; - void *xi_cookie; - bool xi_close:1; /* close on unbind? */ - bool xi_masked:1; - volatile u_int xi_refcount; -}; - static void xen_intr_suspend(struct pic *); static void xen_intr_resume(struct pic *, bool suspend_cancelled); static void xen_intr_enable_source(struct intsrc *isrc); @@ -288,9 +272,10 @@ xen_intr_find_unused_isrc(enum evtchn_type type) * into Xen's interrupt range could be examined by this test. */ if (__predict_true(isrc != NULL) && - __predict_true(isrc->xi_intsrc.is_pic == &xen_intr_pic) && + __predict_true(isrc->xi_arch.intsrc.is_pic == + &xen_intr_pic) && isrc->xi_type == EVTCHN_TYPE_UNBOUND) { - KASSERT(isrc->xi_intsrc.is_handlers == 0, + KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, ("Free evtchn still has handlers")); isrc->xi_type = type; return (isrc); @@ -339,10 +324,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) mtx_unlock(&xen_intr_x86_lock); isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO); - isrc->xi_intsrc.is_pic = &xen_intr_pic; - isrc->xi_vector = vector; + isrc->xi_arch.intsrc.is_pic = &xen_intr_pic; + isrc->xi_arch.vector = vector; isrc->xi_type = type; - error = intr_register_source(&isrc->xi_intsrc); + error = intr_register_source(&isrc->xi_arch.intsrc); if (error != 0) panic("%s(): failed registering interrupt %u, error=%d\n", __func__, vector, error); @@ -361,7 +346,7 @@ static int xen_intr_release_isrc(struct xenisrc *isrc) { - KASSERT(isrc->xi_intsrc.is_handlers == 0, + KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, ("Release called, but xenisrc still in use")); mtx_lock(&xen_intr_isrc_lock); if (is_valid_evtchn(isrc->xi_port)) { @@ -447,7 +432,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * unless specified otherwise, so shuffle them to balance * the interrupt load. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, + xen_intr_assign_cpu(&isrc->xi_arch.intsrc, apic_cpuid(intr_next_cpu(0))); } #endif @@ -578,7 +563,8 @@ xen_intr_handle_upcall(void *unused __unused) ("Received unexpected event on vCPU#%u, event bound to vCPU#%u", PCPU_GET(cpuid), isrc->xi_cpu)); - intr_execute_handlers(&isrc->xi_intsrc, trap_frame); + intr_execute_handlers(&isrc->xi_arch.intsrc, + trap_frame); /* * If this is the final port processed, @@ -732,7 +718,7 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) #ifdef SMP isrc->xi_cpu = 0; - error = xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); + error = xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); if (error) panic("%s(): unable to rebind Xen channel %u to vCPU%u: %d", __func__, isrc->xi_port, cpu, error); @@ -821,7 +807,7 @@ xen_intr_vector(struct intsrc *base_isrc) { struct xenisrc *isrc = (struct xenisrc *)base_isrc; - return (isrc->xi_vector); + return (isrc->xi_arch.vector); } /** @@ -1124,7 +1110,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, #ifdef SMP if (error == 0) - error = intr_event_bind(isrc->xi_intsrc.is_event, cpu); + error = intr_event_bind(isrc->xi_arch.intsrc.is_event, cpu); #endif if (error != 0) { @@ -1144,7 +1130,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); + xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); } #endif @@ -1200,7 +1186,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_intsrc, cpu); + xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); } /* @@ -1228,7 +1214,7 @@ xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) va_start(ap, fmt); vsnprintf(descr, sizeof(descr), fmt, ap); va_end(ap); - return (intr_describe(isrc->xi_vector, isrc->xi_cookie, descr)); + return (intr_describe(isrc->xi_arch.vector, isrc->xi_cookie, descr)); } void @@ -1295,8 +1281,8 @@ xen_intr_add_handler(const char *name, driver_filter_t filter, if (isrc == NULL || isrc->xi_cookie != NULL) return (EINVAL); - error = intr_add_handler(name, isrc->xi_vector,filter, handler, arg, - flags|INTR_EXCL, &isrc->xi_cookie, 0); + error = intr_add_handler(name, isrc->xi_arch.vector, filter, handler, + arg, flags|INTR_EXCL, &isrc->xi_cookie, 0); if (error != 0) printf("%s: %s: add handler failed: %d\n", name, __func__, error); From nobody Fri Apr 14 14:01:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQQ35f0z45JMt; Fri, 14 Apr 2023 14:01: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 4PydQP11y6z3KGv; Fri, 14 Apr 2023 14:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4vEclLTEz6VyyQ0D1+sk4RYf+q5mqYEdf7EpC2SqvA=; b=m7q48zoJSW4qszfwFmMBpidRsapmBmB4k0+xiZe2RTac6rbuN5k322fR0utGtFZu4pj4dN 3grXaSf/2PWPe6hbGQZUe5pp2xxbCFzMSL5ZvIFOiB6y2UBdMwQEmsVIv8821DSCcyUzDX M86PJmYnnP+95U400BoYT9dvmyFyx9ccFQ9/IZUNvNxto9R4i1m6IjWTstnti+pY5uWwxi UHSVdb5IOPtBn/cKmE24of8/Ba1sRh06DqSFgJpQ/HYbQbE2/J3W/k0pLs73z9uxPdFXs0 YY+4FdC/vjSsdMRYShprscweXHW66Lsb0gymy9JKE8UxX4DWviPOsWgrQTQidA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4vEclLTEz6VyyQ0D1+sk4RYf+q5mqYEdf7EpC2SqvA=; b=Sxgf+T468+rh8eipGr7wv1KnaBO8pK/acC7vTFQ9o8HBvMv8YiNpG4du6nTGgB6yQc0AGF qdBIRXgvmTzCUpO0qGybXfnA4z9FqSGtf1GN2Rxe5fmsp1BT+RzXnAMMCCr91WiBSlhs7X +VefTD79M57WlA1O/TYK+eyVEJIYxn0K27nuZB5qnRsdOa5Z4rV4PO6HJ9AKxOBa0Qk4Ok 138+Y5vY/+VL+xnLBOgqdTS9mfQheWKOddPJjLBODHwZtISXGS27afweKsNjiwtmwTQ4u8 xnSFbDEQUWIIesD5zxruCULsJsw1uT4W8nSxKuELtkbB9+k2SLw57yPM5BhXzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480861; a=rsa-sha256; cv=none; b=peOT1+2yYtCtdP47TQKCJ1M4O5I9vXio3M7Ks8RZlOAaHjVzAdIvXVmMwrCugVmoi6WWcT HNWrqWAOpmI5qmy3o5DUeljefm1VyNe1BRCuKLBEf/8W4QUejx+jTSWg8AdyvULiefuFBx PbXRmdKqXqe4VIn5QDoRnx3kwfpf/2GW4vr2I2k20e7oTEIUIsZ6CdAWHUYTf69lsDXqk6 K4t3yrqFrwTRT+XDUuRa9ZcJtLMf1V/tI53iUwjSUw6NH+LmETJLDz2uGB4/uByxHktgVD 6+2o1L7pH3pas1VxzxDCDRYwYDPlzyN4pzjHlAl/bJ0Bda2dlGlr5/QUNluylg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQN722szRXD; Fri, 14 Apr 2023 14:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE10SN083886; Fri, 14 Apr 2023 14:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE10J1083885; Fri, 14 Apr 2023 14:01:00 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:00 GMT Message-Id: <202304141401.33EE10J1083885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: d32d65276b20 - main - xen/intr: move evtchn_type to intr-internal.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d32d65276b201d2abe963aa69cc2cfc951ddb278 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d32d65276b201d2abe963aa69cc2cfc951ddb278 commit d32d65276b201d2abe963aa69cc2cfc951ddb278 Author: Elliott Mitchell AuthorDate: 2021-11-08 23:01:59 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:53 +0000 xen/intr: move evtchn_type to intr-internal.h The evtchn_type enum is only touched by the Xen interrupt code. Other event channel uses no longer need the value, so that has been moved to restrict its use. Copyright note. The current evtchn_type was introduced at 76acc41fb7c7 by Justin T. Gibbs. This in turn appears to have been heavily inspired by 30d1eefe3937 done by Kip Macy. Reviewed by: royger --- sys/dev/xen/bus/intr-internal.h | 9 +++++++++ sys/xen/evtchn/evtchnvar.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/xen/bus/intr-internal.h b/sys/dev/xen/bus/intr-internal.h index 222e0665b14d..18f148bcb45f 100644 --- a/sys/dev/xen/bus/intr-internal.h +++ b/sys/dev/xen/bus/intr-internal.h @@ -3,6 +3,7 @@ * * Copyright © 2002-2005 K A Fraser * Copyright © 2005 Intel Corporation + * Copyright © 2005-2006 Kip Macy * Copyright © 2013 Spectra Logic Corporation * Copyright © 2015 Julien Grall * Copyright © 2021,2022 Elliott Mitchell @@ -39,6 +40,14 @@ /* Current implementation only supports 2L event channels. */ #define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS +enum evtchn_type { + EVTCHN_TYPE_UNBOUND, + EVTCHN_TYPE_VIRQ, + EVTCHN_TYPE_IPI, + EVTCHN_TYPE_PORT, + EVTCHN_TYPE_COUNT +}; + struct xenisrc { xen_arch_isrc_t xi_arch; /* @TOP -> *xi_arch=*xenisrc */ enum evtchn_type xi_type; diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index d1438846594f..448800be18a8 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -38,14 +38,6 @@ #include #include -enum evtchn_type { - EVTCHN_TYPE_UNBOUND, - EVTCHN_TYPE_VIRQ, - EVTCHN_TYPE_IPI, - EVTCHN_TYPE_PORT, - EVTCHN_TYPE_COUNT -}; - /** Submit a port notification for delivery to a userland evtchn consumer */ void evtchn_device_upcall(evtchn_port_t port); From nobody Fri Apr 14 14:01:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQR2sNCz45JYT; Fri, 14 Apr 2023 14:01: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 4PydQQ1nxVz3K5r; Fri, 14 Apr 2023 14:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++huD+x6dgMVadl1lf0sBRMCEo9YXAf4Rr/xA4zCy3k=; b=nFroxVeTeCaaH5KIYVZ8Mlub2grnnvheWcz4FL3lQe/BX9SCP/D6I8SgHly5QKpJsO/Zmx oCc6qIdgV5YpooYBgh+1OaU6zNjC0MMTWOOeNipCvthAWOO5QHJWB2nb6Ds62GdGlTDan/ 9oVwrvGG8cmcHOuRIE9TL3C9c7u00nJb6W3vmEZ4vjMHYlNMV2X1Cuw9602sErSu77yc9u 08C0g/V8HB0ohWmdERcuUTvnL9L2w7mmuAJfnUUNWY3cQCqcitLbhTZzVt2DqE+80R/R/N 6/j2Gu49JyEvoy+U8Lp1KaoEjpeP6DAt466sdFecgob8LYQRh+S0z6BWwqZ4fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++huD+x6dgMVadl1lf0sBRMCEo9YXAf4Rr/xA4zCy3k=; b=vTroxnHh2K7q/38Vnrr+EEvEGhB8z3fWl8snVrd5UV4DWbZcGqrLRO+7RMh3c0PdpMfXrl MeNnpb/bnksD/rDmZRWc28vBJPbTqPw1z7lI2w886c2rHEoQZMnR4+mim/XGORMGHFCkaL FphtUkPzxujgySlEsISK2cs9f4bBancgq6JodFgAJbyLiuDx0Pl0lPwAk373WDalD/aK9B LjLvX/cEpNFOrWyWArG7WiHuj9sbabeOytpFzj8hLodJA+rt0aAau3fI2AjRMKX+UWy+Lj +RkeWsl7IX2Mnpmvc0+rNp86Kq6SkK0F1dEl3CnXE5RGKIY8gIuOXoqKboFexQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480862; a=rsa-sha256; cv=none; b=L0Hs99zDk780LASC9a4oDpQLDCsmGtspX6PvMh8okhOGvthHklEx9r3cG+Ik8KR9+Z+lK0 8DyBS0MQryU1+PVfbo8ZoCX1qyxLOR4OQCINyFOo2kRlyOIL1EhOGXSjHJaEVUwR/dUKP4 l4HO5FDvEWrz/7D4wgX5yDIlXNTNk4M5fNq2+7llz+1iWQ1NvQUqrYmCwDgckBR7Q9j8Jk offgIaQhMbCVwIrFq5ZCfU3rSb8M2KYE9gulrIlwc+/TvmxQFkNXZ8D+yyvURHs2wK9kji JlPXYiIjnxAfUeLOyyca2UdWuqfbHh+/nXm9FEzUXZNbQAuCzR9nMIXJPwH9UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQQ0ty4zRSx; Fri, 14 Apr 2023 14:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE12h9083910; Fri, 14 Apr 2023 14:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE12E0083909; Fri, 14 Apr 2023 14:01:02 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:02 GMT Message-Id: <202304141401.33EE12E0083909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: d0a69069bb22 - main - xen/x86: rework isrc allocation to use list instead of table scanning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0a69069bb22316319835fbabf1a713c381878b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d0a69069bb22316319835fbabf1a713c381878b8 commit d0a69069bb22316319835fbabf1a713c381878b8 Author: Elliott Mitchell AuthorDate: 2021-10-13 23:13:53 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:54 +0000 xen/x86: rework isrc allocation to use list instead of table scanning Scanning the list of interrupts to find an unused entry is rather inefficient. Instead overlay a free list structure and use a list instead. This also has the useful effect of removing the last use of evtchn_type values outside of xen_intr.c. Reviewed by: royger [royger] - Make avail_list static. --- sys/x86/xen/xen_intr.c | 76 +++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index e23a021c069b..fe4a4b0f4dce 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -74,9 +74,6 @@ static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); * Lock for x86-related structures. Notably modifying * xen_intr_auto_vector_count, and allocating interrupts require this lock be * held. - * - * ->xi_type == EVTCHN_TYPE_UNBOUND indicates a xenisrc is under control of - * this lock and operations require it be held. */ static struct mtx xen_intr_x86_lock; @@ -165,6 +162,18 @@ static struct mtx xen_intr_isrc_lock; static u_int xen_intr_auto_vector_count; static struct xenisrc *xen_intr_port_to_isrc[NR_EVENT_CHANNELS]; +/* + * list of released isrcs + * This is meant to overlay struct xenisrc, with only the xen_arch_isrc_t + * portion being preserved, everything else can be wiped. + */ +struct avail_list { + xen_arch_isrc_t preserve; + SLIST_ENTRY(avail_list) free; +}; +static SLIST_HEAD(free, avail_list) avail_list = + SLIST_HEAD_INITIALIZER(avail_list); + /*------------------------- Private Functions --------------------------------*/ /** @@ -242,48 +251,6 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port) xen_set_bit(port, pcpu->evtchn_enabled); } -/** - * Search for an already allocated but currently unused Xen interrupt - * source object. - * - * \param type Restrict the search to interrupt sources of the given - * type. - * - * \return A pointer to a free Xen interrupt source object or NULL. - */ -static struct xenisrc * -xen_intr_find_unused_isrc(enum evtchn_type type) -{ - int isrc_idx; - - mtx_assert(&xen_intr_x86_lock, MA_OWNED); - - for (isrc_idx = 0; isrc_idx < xen_intr_auto_vector_count; isrc_idx ++) { - struct xenisrc *isrc; - u_int vector; - - vector = first_evtchn_irq + isrc_idx; - isrc = (struct xenisrc *)intr_lookup_source(vector); - /* - * Since intr_register_source() must be called while unlocked, - * isrc == NULL *will* occur, though very infrequently. - * - * This also allows a very small gap where a foreign intrusion - * into Xen's interrupt range could be examined by this test. - */ - if (__predict_true(isrc != NULL) && - __predict_true(isrc->xi_arch.intsrc.is_pic == - &xen_intr_pic) && - isrc->xi_type == EVTCHN_TYPE_UNBOUND) { - KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, - ("Free evtchn still has handlers")); - isrc->xi_type = type; - return (isrc); - } - } - return (NULL); -} - /** * Allocate a Xen interrupt source object. * @@ -301,9 +268,18 @@ xen_intr_alloc_isrc(enum evtchn_type type) int error; mtx_lock(&xen_intr_x86_lock); - isrc = xen_intr_find_unused_isrc(type); + isrc = (struct xenisrc *)SLIST_FIRST(&avail_list); if (isrc != NULL) { + SLIST_REMOVE_HEAD(&avail_list, free); mtx_unlock(&xen_intr_x86_lock); + + KASSERT(isrc->xi_arch.intsrc.is_pic == &xen_intr_pic, + ("interrupt not owned by Xen code?")); + + KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, + ("Free evtchn still has handlers")); + + isrc->xi_type = type; return (isrc); } @@ -369,8 +345,14 @@ xen_intr_release_isrc(struct xenisrc *isrc) /* not reachable from xen_intr_port_to_isrc[], unlock */ mtx_unlock(&xen_intr_isrc_lock); + _Static_assert(sizeof(struct xenisrc) >= sizeof(struct avail_list), + "unused structure MUST be no larger than in-use structure"); + _Static_assert(offsetof(struct xenisrc, xi_arch) == + offsetof(struct avail_list, preserve), + "unused structure does not properly overlay in-use structure"); + mtx_lock(&xen_intr_x86_lock); - isrc->xi_type = EVTCHN_TYPE_UNBOUND; + SLIST_INSERT_HEAD(&avail_list, (struct avail_list *)isrc, free); mtx_unlock(&xen_intr_x86_lock); return (0); } From nobody Fri Apr 14 14:01:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQR5FP9z45JSn; Fri, 14 Apr 2023 14:01: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 4PydQR2Bv3z3KHS; Fri, 14 Apr 2023 14:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90+N+TfD5R1yf7QQ7wqrkkF9yitWb5XkhwhrfhmgdMk=; b=SGBTi2g5VWjt0P2lZI64iUYaPzMF3+wCcmKQJmKOio20IWqt3Ry+L2aFQzzNZ9AP/plWt5 djb5/OCUF/waX5N6Kv10vQJuORbxC3/Aym/P03ZfTVYpbQ2d2leBkDRNMwgY/FaSr2csIH L7L3eldbm3vA/8nqEXqvmImPUL4V/9cjcEkHSjLBU5qvZxBBnfKsEuinJerptdd3iM0Co/ zI0gfnKKex6jN1qIHUNrgnd9KSlbSWE+Svg+IoMa6CBNx3MtVHxrcWURuYSHJcdQw3d1wB 0u1LweI2Ca6/+3E5CvuSMcdRafW5uD4scMsNjOMeCh2OYintpdsNxAAs9m0VkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90+N+TfD5R1yf7QQ7wqrkkF9yitWb5XkhwhrfhmgdMk=; b=I1I9vi/D4tKkquWBYLyQLq3YlXoVorRmjl65hTuu3NksTNyI4hwfZ96GG44Gqug38ZZB7B 1eNvqtB6iGMf2dG5czc/pSeKIjw5aT9t8uvR5ffZdx6zvNkvb23eSxEu0eB01rKeoIrWkf jl/cGah/Xy3/lVNq4JRarfI6aNs2neN6zexTRMju4OsKuCjsdp5B8RDJXiRxMs/oXryONT I5l2L/6Cyv1VqYCsFgAuo7bj6ASpv88uWRfuVFBfczDLKpljtIPwJNHDhOZNX19er9tDjC 2hmRRrVN2+yOQ6+W8y/CUwO9zn1093WVktQcQEiwKNvJczDQxnk6apD94LToJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480863; a=rsa-sha256; cv=none; b=x37aLL2fczntZlS2j7vXOVIJcz7mp5/Np7c6Q98N1CWrxHUR5dvzqJ8eilxFJmeD9bC67f RLqDpQPlqsfbWfuuWgvIhpaR1Q84boBGl0Obc15/XNQL3y/1E69QX+QzmKOXc6Pfv82CyA CyhzK5dPbDhBtPjnUr8h2fmU+cJXZA9It2LTE5XpR6shtjKYs0NKTgcOM0CHcFyvCweRWy 7R3pB4SbC20troW1fPGg/KiajlsOH9SO9KKwUvSBeupknhfEaium98dfMy2A3/FoDfm8jE udHZLZo/IUa41uveSIhHHFQZpYbIxuuvfqtrZR4AReY+KOGwuB9IKVOh2OjLTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQR1HQyzQcP; Fri, 14 Apr 2023 14:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE1327083976; Fri, 14 Apr 2023 14:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE13GK083958; Fri, 14 Apr 2023 14:01:03 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:03 GMT Message-Id: <202304141401.33EE13GK083958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 373301019f16 - main - xen/intr: remove type argument from xen_intr_alloc_isrc() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 373301019f16cbd7be7c92df3f62184e96815b63 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=373301019f16cbd7be7c92df3f62184e96815b63 commit 373301019f16cbd7be7c92df3f62184e96815b63 Author: Elliott Mitchell AuthorDate: 2021-07-02 15:07:58 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:55 +0000 xen/intr: remove type argument from xen_intr_alloc_isrc() This value doesn't need to be set in xen_intr_alloc_isrc(). What is needed is simply to ensure the allocated xenisrc won't appear as free, even if xi_type is written non-atomically. Since the type is no longer used to indicate free or not, the calling function should take care of all non-architecture initialization. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D31188 --- sys/x86/xen/xen_intr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index fe4a4b0f4dce..ec5b8b4c6c9b 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -260,7 +260,7 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port) * object or NULL. */ static struct xenisrc * -xen_intr_alloc_isrc(enum evtchn_type type) +xen_intr_alloc_isrc(void) { static int warned; struct xenisrc *isrc; @@ -279,7 +279,6 @@ xen_intr_alloc_isrc(enum evtchn_type type) KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, ("Free evtchn still has handlers")); - isrc->xi_type = type; return (isrc); } @@ -302,7 +301,6 @@ xen_intr_alloc_isrc(enum evtchn_type type) isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO); isrc->xi_arch.intsrc.is_pic = &xen_intr_pic; isrc->xi_arch.vector = vector; - isrc->xi_type = type; error = intr_register_source(&isrc->xi_arch.intsrc); if (error != 0) panic("%s(): failed registering interrupt %u, error=%d\n", @@ -394,11 +392,12 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } *port_handlep = NULL; - isrc = xen_intr_alloc_isrc(type); + isrc = xen_intr_alloc_isrc(); if (isrc == NULL) return (ENOSPC); isrc->xi_cookie = NULL; + isrc->xi_type = type; isrc->xi_port = local_port; isrc->xi_close = false; isrc->xi_cpu = 0; From nobody Fri Apr 14 14:01:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQT2VqTz45JC3; Fri, 14 Apr 2023 14:01: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 4PydQS33Vpz3K6C; Fri, 14 Apr 2023 14:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0nO16mPyIrGgK8ayaqqCT2vSfMMFtX9nvZIKP9uHo0=; b=GTUx+s57CPJOx2t6MC0AfQZxdqzw8JctrlQjX55PSCa7q72J132vTJHWtoCj3AFTlQxDK+ 5476HVZO3IkSYAlDDVoxX0toOUHTf9HoTrUW6dKJ6ojhpB2PwWx0FY9ynRPqASjCe7jSBi KuGyJPi/1H2JtbhQFky6/FB1apwFYvyb1j2ELveFjIpTbw9Dl7y9IHhE0OBfhxmHr5Pl1+ vs/SW8TNWmYQjR8uAYxhmrgKqrmJieFjZ0knr3CANuBaYH9ZHlJOXqoW1WxsQQ0fMFLUnE l2bd2TuI58AvhidMfkpJEDgNLVd+t1NBUtOL7QJmje39iKbMEi8oum+f5jylyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0nO16mPyIrGgK8ayaqqCT2vSfMMFtX9nvZIKP9uHo0=; b=b3N7nRm2zsi9/9me7yEj9ig5IbJOnKvStcgP/cdqckPpFwvKBSoVy0EUwoWIW5U9HdZ2O5 RfHEfM/GJUY9kBlElrhDv20s67ocEY+djlffUSufvcYbuqk5J6sFhoxvX7lNSwFm32eExe nHWf6oHNjri2k2Oahp0YRm/fmb/lJ++qJjiDemlzTmV4XwEIZEK2eO06AhP9sFLbdzCjjp NsodiTl9Nz/dKNe9Q5j4nDRq3V0iVBrD1HQrKG11rSfm05Qlq0qWAHm2RW0kIMjkxrZF/a h9VDyKMFPBtGX6U9ea4ocImweWZU3FI6fQ2RZL81i4s5fBHiKsHHhYo93kp71w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480864; a=rsa-sha256; cv=none; b=fEcdVEl2rmbO/77MvPZ2CZA1YcrU5CC+7L49JDxwgZUo+y7dvUabkb4BWgVeWFTXhNQELA /TkQ7AEBy4HUXSQPzr2OWk0OmDzm3TqvT7ZLZnvb6Bt3cARJ3S6ph++kUedWXecINN5MET gDGfTEZLPLkxwPT3r6puJiGzAE4sj31ToohFlt6kj7apePR57j9GUlamy+U7G3SWCJ3oFF +yorpnMjvo9u+3HZEtGqRm1ZJQxNgvB8zlxzaPQgf76YYHcxUv2xDYKrPAYgkv5y6XbwGg FbXq27ZPKAuQ7CCsGbzFg6A/FKdFRBTT8yoiv9YcrnfYjd/rzDCcK0Ndhc1wOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQS27Q0zQcQ; Fri, 14 Apr 2023 14:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE140u084907; Fri, 14 Apr 2023 14:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE14GD084906; Fri, 14 Apr 2023 14:01:04 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:04 GMT Message-Id: <202304141401.33EE14GD084906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 2d795ab1eaa7 - main - xen/intr: move x86 PIC interface to xen_arch_intr.c, introduce wrappers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d795ab1eaa78c6dd5d214285db7f94ff870bd45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=2d795ab1eaa78c6dd5d214285db7f94ff870bd45 commit 2d795ab1eaa78c6dd5d214285db7f94ff870bd45 Author: Julien Grall AuthorDate: 2015-10-20 16:14:56 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:56 +0000 xen/intr: move x86 PIC interface to xen_arch_intr.c, introduce wrappers The x86 PIC interface is very much x86-specific and not used by other architectures. Since most of xen_intr.c can be shared with other architectures, the PIC interface needs to be broken off. Introduce wrappers for calls into the architecture-dependent interrupt layer. All architectures need roughly the same functionality, but the interface is slightly different between architectures. Due to the wrappers being so thin, all of them are implemented as inline in arch-intr.h. The original implementation was done by Julien Grall in 2015, but this has required major updating. Removal of PVHv1 meant substantial portions disappeared. The original implementation took care of moving interrupt allocation to xen_arch_intr.c, but this has required massive rework and was broken off. In the original implementation the wrappers were normal functions. Some had empty stubs in xen_intr.c and were removed. Reviewed by: royger Submitted by: Elliott Mitchell Original implementation: Julien Grall , 2015-10-20 09:14:56 Differential Revision: https://reviews.freebsd.org/D30909 --- sys/dev/xen/bus/intr-internal.h | 30 +++++++ sys/x86/include/xen/arch-intr.h | 45 +++++++++++ sys/x86/xen/xen_arch_intr.c | 171 +++++++++++++++++++++++++++++++++++++++- sys/x86/xen/xen_intr.c | 170 ++++++--------------------------------- 4 files changed, 268 insertions(+), 148 deletions(-) diff --git a/sys/dev/xen/bus/intr-internal.h b/sys/dev/xen/bus/intr-internal.h index 18f148bcb45f..2c707edf095e 100644 --- a/sys/dev/xen/bus/intr-internal.h +++ b/sys/dev/xen/bus/intr-internal.h @@ -60,4 +60,34 @@ struct xenisrc { volatile u_int xi_refcount; }; +/***************** Functions called by the architecture code *****************/ + +extern void xen_intr_resume(void); +extern void xen_intr_enable_source(struct xenisrc *isrc); +extern void xen_intr_disable_source(struct xenisrc *isrc); +extern void xen_intr_enable_intr(struct xenisrc *isrc); +extern void xen_intr_disable_intr(struct xenisrc *isrc); +extern int xen_intr_assign_cpu(struct xenisrc *isrc, u_int to_cpu); + +/******************* Functions implemented by each architecture **************/ + +#if 0 +/* + * These are sample prototypes, the architecture should include its own in + * . The architecture may implement these as inline. + */ +void xen_arch_intr_init(void); +u_long xen_arch_intr_execute_handlers(struct xenisrc *isrc, + struct trapframe *frame); +int xen_arch_intr_add_handler(const char *name, + driver_filter_t filter, driver_intr_t handler, void *arg, + enum intr_type flags, struct xenisrc *isrc, + void **cookiep); +int xen_arch_intr_describe(struct xenisrc *isrc, void *cookie, + const char *descr); +int xen_arch_intr_remove_handler(struct xenisrc *isrc, + void *cookie); +int xen_arch_intr_event_bind(struct xenisrc *isrc, u_int cpu); +#endif + #endif /* _XEN_INTR_INTERNAL_H_ */ diff --git a/sys/x86/include/xen/arch-intr.h b/sys/x86/include/xen/arch-intr.h index b721e744852a..06e70ba462a2 100644 --- a/sys/x86/include/xen/arch-intr.h +++ b/sys/x86/include/xen/arch-intr.h @@ -36,6 +36,51 @@ typedef struct { u_int vector; /* Global isrc vector number */ } xen_arch_isrc_t; +extern struct pic xen_intr_pic; + #include +/******************************* ARCH wrappers *******************************/ + +extern void xen_arch_intr_init(void); + +static inline u_long +xen_arch_intr_execute_handlers(struct xenisrc *isrc, struct trapframe *frame) +{ + + intr_execute_handlers(&isrc->xi_arch.intsrc, frame); + return (0); +} + +static inline int +xen_arch_intr_add_handler(const char *name, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + struct xenisrc *isrc, void **cookiep) +{ + + return (intr_add_handler(name, isrc->xi_arch.vector, filter, handler, + arg, flags, cookiep, 0)); +} + +static inline int +xen_arch_intr_describe(struct xenisrc *isrc, void *cookie, const char *descr) +{ + + return (intr_describe(isrc->xi_arch.vector, cookie, descr)); +} + +static inline int +xen_arch_intr_remove_handler(struct xenisrc *isrc, void *cookie) +{ + + return (intr_remove_handler(cookie)); +} + +static inline int +xen_arch_intr_event_bind(struct xenisrc *isrc, u_int cpu) +{ + + return (intr_event_bind(isrc->xi_arch.intsrc.is_event, cpu)); +} + #endif /* _MACHINE__XEN_ARCH_INTR_H_ */ diff --git a/sys/x86/xen/xen_arch_intr.c b/sys/x86/xen/xen_arch_intr.c index d946ca781355..94ada3dee4e9 100644 --- a/sys/x86/xen/xen_arch_intr.c +++ b/sys/x86/xen/xen_arch_intr.c @@ -1,6 +1,7 @@ /*- * SPDX-License-Identifier: MIT OR GPL-2.0-only * + * Copyright © 2015 Julien Grall * Copyright © 2013 Spectra Logic Corporation * Copyright © 2018 John Baldwin/The FreeBSD Foundation * Copyright © 2019 Roger Pau Monné/Citrix Systems R&D @@ -32,8 +33,14 @@ __FBSDID("$FreeBSD$"); #include +#include #include +#include #include +#include +#include +#include +#include #include #include #include @@ -41,8 +48,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include -#include #include /************************ Xen x86 interrupt interface ************************/ @@ -101,3 +108,165 @@ xen_arch_intr_handle_upcall(struct trapframe *trap_frame) critical_exit(); } + +/******************************** EVTCHN PIC *********************************/ + +static void +xen_intr_pic_enable_source(struct intsrc *isrc) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + xen_intr_enable_source((struct xenisrc *)isrc); +} + +/* + * Perform any necessary end-of-interrupt acknowledgements. + * + * \param isrc The interrupt source to EOI. + */ +static void +xen_intr_pic_disable_source(struct intsrc *isrc, int eoi) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + xen_intr_disable_source((struct xenisrc *)isrc); +} + +static void +xen_intr_pic_eoi_source(struct intsrc *isrc) +{ + + /* Nothing to do on end-of-interrupt */ +} + +static void +xen_intr_pic_enable_intr(struct intsrc *isrc) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + xen_intr_enable_intr((struct xenisrc *)isrc); +} + +static void +xen_intr_pic_disable_intr(struct intsrc *isrc) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + xen_intr_disable_intr((struct xenisrc *)isrc); +} + +/** + * Determine the global interrupt vector number for + * a Xen interrupt source. + * + * \param isrc The interrupt source to query. + * + * \return The vector number corresponding to the given interrupt source. + */ +static int +xen_intr_pic_vector(struct intsrc *isrc) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + + return (((struct xenisrc *)isrc)->xi_arch.vector); +} + +/** + * Determine whether or not interrupt events are pending on the + * the given interrupt source. + * + * \param isrc The interrupt source to query. + * + * \returns 0 if no events are pending, otherwise non-zero. + */ +static int +xen_intr_pic_source_pending(struct intsrc *isrc) +{ + /* + * EventChannels are edge triggered and never masked. + * There can be no pending events. + */ + return (0); +} + +/** + * Prepare this PIC for system suspension. + */ +static void +xen_intr_pic_suspend(struct pic *pic) +{ + + /* Nothing to do on suspend */ +} + +static void +xen_intr_pic_resume(struct pic *pic, bool suspend_cancelled) +{ + + if (!suspend_cancelled) + xen_intr_resume(); +} + +/** + * Perform configuration of an interrupt source. + * + * \param isrc The interrupt source to configure. + * \param trig Edge or level. + * \param pol Active high or low. + * + * \returns 0 if no events are pending, otherwise non-zero. + */ +static int +xen_intr_pic_config_intr(struct intsrc *isrc, enum intr_trigger trig, + enum intr_polarity pol) +{ + /* Configuration is only possible via the evtchn apis. */ + return (ENODEV); +} + + +static int +xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + _Static_assert(offsetof(struct xenisrc, xi_arch.intsrc) == 0, + "xi_arch MUST be at top of xenisrc for x86"); + return (xen_intr_assign_cpu((struct xenisrc *)isrc, + apic_cpuid(apic_id))); +} + +/** + * PIC interface for all event channel port types except physical IRQs. + */ +struct pic xen_intr_pic = { + .pic_enable_source = xen_intr_pic_enable_source, + .pic_disable_source = xen_intr_pic_disable_source, + .pic_eoi_source = xen_intr_pic_eoi_source, + .pic_enable_intr = xen_intr_pic_enable_intr, + .pic_disable_intr = xen_intr_pic_disable_intr, + .pic_vector = xen_intr_pic_vector, + .pic_source_pending = xen_intr_pic_source_pending, + .pic_suspend = xen_intr_pic_suspend, + .pic_resume = xen_intr_pic_resume, + .pic_config_intr = xen_intr_pic_config_intr, + .pic_assign_cpu = xen_intr_pic_assign_cpu, +}; + +/******************************* ARCH wrappers *******************************/ + +void +xen_arch_intr_init(void) +{ + int error; + + error = intr_register_pic(&xen_intr_pic); + if (error != 0) + panic("%s(): failed registering Xen/x86 PIC, error=%d\n", + __func__, error); +} diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index ec5b8b4c6c9b..ebce27816539 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -117,37 +117,6 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info); #define INVALID_EVTCHN (~(evtchn_port_t)0) /* Invalid event channel */ #define is_valid_evtchn(x) ((uintmax_t)(x) < NR_EVENT_CHANNELS) -static void xen_intr_suspend(struct pic *); -static void xen_intr_resume(struct pic *, bool suspend_cancelled); -static void xen_intr_enable_source(struct intsrc *isrc); -static void xen_intr_disable_source(struct intsrc *isrc, int eoi); -static void xen_intr_eoi_source(struct intsrc *isrc); -static void xen_intr_enable_intr(struct intsrc *isrc); -static void xen_intr_disable_intr(struct intsrc *isrc); -static int xen_intr_vector(struct intsrc *isrc); -static int xen_intr_source_pending(struct intsrc *isrc); -static int xen_intr_config_intr(struct intsrc *isrc, - enum intr_trigger trig, enum intr_polarity pol); -static int xen_intr_assign_cpu(struct intsrc *isrc, u_int to_cpu); -static int xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id); - -/** - * PIC interface for all event channel port types except physical IRQs. - */ -struct pic xen_intr_pic = { - .pic_enable_source = xen_intr_enable_source, - .pic_disable_source = xen_intr_disable_source, - .pic_eoi_source = xen_intr_eoi_source, - .pic_enable_intr = xen_intr_enable_intr, - .pic_disable_intr = xen_intr_disable_intr, - .pic_vector = xen_intr_vector, - .pic_source_pending = xen_intr_source_pending, - .pic_suspend = xen_intr_suspend, - .pic_resume = xen_intr_resume, - .pic_config_intr = xen_intr_config_intr, - .pic_assign_cpu = xen_intr_pic_assign_cpu, -}; - /* * Lock for interrupt core data. * @@ -413,8 +382,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * unless specified otherwise, so shuffle them to balance * the interrupt load. */ - xen_intr_assign_cpu(&isrc->xi_arch.intsrc, - apic_cpuid(intr_next_cpu(0))); + xen_intr_assign_cpu(isrc, apic_cpuid(intr_next_cpu(0))); } #endif @@ -544,8 +512,7 @@ xen_intr_handle_upcall(void *unused __unused) ("Received unexpected event on vCPU#%u, event bound to vCPU#%u", PCPU_GET(cpuid), isrc->xi_cpu)); - intr_execute_handlers(&isrc->xi_arch.intsrc, - trap_frame); + xen_arch_intr_execute_handlers(isrc, trap_frame); /* * If this is the final port processed, @@ -609,7 +576,7 @@ xen_intr_init(void *dummy __unused) for (i = 0; i < nitems(s->evtchn_mask); i++) atomic_store_rel_long(&s->evtchn_mask[i], ~0); - intr_register_pic(&xen_intr_pic); + xen_arch_intr_init(); if (bootverbose) printf("Xen interrupt system initialized\n"); @@ -629,13 +596,6 @@ xen_intr_alloc_irqs(void) } /*--------------------------- Common PIC Functions ---------------------------*/ -/** - * Prepare this PIC for system suspension. - */ -static void -xen_intr_suspend(struct pic *unused) -{ -} static void xen_rebind_ipi(struct xenisrc *isrc) @@ -699,7 +659,7 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) #ifdef SMP isrc->xi_cpu = 0; - error = xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); + error = xen_intr_assign_cpu(isrc, cpu); if (error) panic("%s(): unable to rebind Xen channel %u to vCPU%u: %d", __func__, isrc->xi_port, cpu, error); @@ -713,16 +673,13 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) /** * Return this PIC to service after being suspended. */ -static void -xen_intr_resume(struct pic *unused, bool suspend_cancelled) +void +xen_intr_resume(void) { shared_info_t *s = HYPERVISOR_shared_info; u_int isrc_idx; int i; - if (suspend_cancelled) - return; - /* Reset the per-CPU masks */ CPU_FOREACH(i) { struct xen_intr_pcpu_data *pcpu; @@ -767,65 +724,13 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) * * \param isrc The interrupt source to disable. */ -static void -xen_intr_disable_intr(struct intsrc *base_isrc) +void +xen_intr_disable_intr(struct xenisrc *isrc) { - struct xenisrc *isrc = (struct xenisrc *)base_isrc; evtchn_mask_port(isrc->xi_port); } -/** - * Determine the global interrupt vector number for - * a Xen interrupt source. - * - * \param isrc The interrupt source to query. - * - * \return The vector number corresponding to the given interrupt source. - */ -static int -xen_intr_vector(struct intsrc *base_isrc) -{ - struct xenisrc *isrc = (struct xenisrc *)base_isrc; - - return (isrc->xi_arch.vector); -} - -/** - * Determine whether or not interrupt events are pending on the - * the given interrupt source. - * - * \param isrc The interrupt source to query. - * - * \returns 0 if no events are pending, otherwise non-zero. - */ -static int -xen_intr_source_pending(struct intsrc *isrc) -{ - /* - * EventChannels are edge triggered and never masked. - * There can be no pending events. - */ - return (0); -} - -/** - * Perform configuration of an interrupt source. - * - * \param isrc The interrupt source to configure. - * \param trig Edge or level. - * \param pol Active high or low. - * - * \returns 0 if no events are pending, otherwise non-zero. - */ -static int -xen_intr_config_intr(struct intsrc *isrc, enum intr_trigger trig, - enum intr_polarity pol) -{ - /* Configuration is only possible via the evtchn apis. */ - return (ENODEV); -} - /** * Configure CPU affinity for interrupt source event delivery. * @@ -834,12 +739,11 @@ xen_intr_config_intr(struct intsrc *isrc, enum intr_trigger trig, * * \returns 0 if successful, otherwise an errno. */ -static int -xen_intr_assign_cpu(struct intsrc *base_isrc, u_int to_cpu) +int +xen_intr_assign_cpu(struct xenisrc *isrc, u_int to_cpu) { #ifdef SMP struct evtchn_bind_vcpu bind_vcpu; - struct xenisrc *isrc; u_int vcpu_id = XEN_CPUID_TO_VCPUID(to_cpu); int error, masked; @@ -847,7 +751,6 @@ xen_intr_assign_cpu(struct intsrc *base_isrc, u_int to_cpu) return (EOPNOTSUPP); mtx_lock(&xen_intr_isrc_lock); - isrc = (struct xenisrc *)base_isrc; if (!is_valid_evtchn(isrc->xi_port)) { mtx_unlock(&xen_intr_isrc_lock); return (EINVAL); @@ -894,28 +797,15 @@ out: #endif } -/* Wrapper of xen_intr_assign_cpu to use as pic callbacks */ -static int -xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id) -{ - - return (xen_intr_assign_cpu(isrc, apic_cpuid(apic_id))); -} - /*------------------- Virtual Interrupt Source PIC Functions -----------------*/ /* * Mask a level triggered interrupt source. * * \param isrc The interrupt source to mask (if necessary). - * \param eoi If non-zero, perform any necessary end-of-interrupt - * acknowledgements. */ -static void -xen_intr_disable_source(struct intsrc *base_isrc, int eoi) +void +xen_intr_disable_source(struct xenisrc *isrc) { - struct xenisrc *isrc; - - isrc = (struct xenisrc *)base_isrc; /* * NB: checking if the event channel is already masked is @@ -933,36 +823,22 @@ xen_intr_disable_source(struct intsrc *base_isrc, int eoi) * * \param isrc The interrupt source to unmask (if necessary). */ -static void -xen_intr_enable_source(struct intsrc *base_isrc) +void +xen_intr_enable_source(struct xenisrc *isrc) { - struct xenisrc *isrc; - - isrc = (struct xenisrc *)base_isrc; if (isrc->xi_masked == 0) evtchn_unmask_port(isrc->xi_port); } -/* - * Perform any necessary end-of-interrupt acknowledgements. - * - * \param isrc The interrupt source to EOI. - */ -static void -xen_intr_eoi_source(struct intsrc *base_isrc) -{ -} - /* * Enable and unmask the interrupt source. * * \param isrc The interrupt source to enable. */ -static void -xen_intr_enable_intr(struct intsrc *base_isrc) +void +xen_intr_enable_intr(struct xenisrc *isrc) { - struct xenisrc *isrc = (struct xenisrc *)base_isrc; evtchn_unmask_port(isrc->xi_port); } @@ -1091,7 +967,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, #ifdef SMP if (error == 0) - error = intr_event_bind(isrc->xi_arch.intsrc.is_event, cpu); + error = xen_arch_intr_event_bind(isrc, cpu); #endif if (error != 0) { @@ -1111,7 +987,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); + xen_intr_assign_cpu(isrc, cpu); } #endif @@ -1167,7 +1043,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, * masks manually so events can't fire on the wrong cpu * during AP startup. */ - xen_intr_assign_cpu(&isrc->xi_arch.intsrc, cpu); + xen_intr_assign_cpu(isrc, cpu); } /* @@ -1195,7 +1071,7 @@ xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...) va_start(ap, fmt); vsnprintf(descr, sizeof(descr), fmt, ap); va_end(ap); - return (intr_describe(isrc->xi_arch.vector, isrc->xi_cookie, descr)); + return (xen_arch_intr_describe(isrc, isrc->xi_cookie, descr)); } void @@ -1219,7 +1095,7 @@ xen_intr_unbind(xen_intr_handle_t *port_handlep) mtx_unlock(&xen_intr_isrc_lock); if (isrc->xi_cookie != NULL) - intr_remove_handler(isrc->xi_cookie); + xen_arch_intr_remove_handler(isrc, isrc->xi_cookie); xen_intr_release_isrc(isrc); } @@ -1262,8 +1138,8 @@ xen_intr_add_handler(const char *name, driver_filter_t filter, if (isrc == NULL || isrc->xi_cookie != NULL) return (EINVAL); - error = intr_add_handler(name, isrc->xi_arch.vector, filter, handler, - arg, flags|INTR_EXCL, &isrc->xi_cookie, 0); + error = xen_arch_intr_add_handler(name, filter, handler, arg, + flags | INTR_EXCL, isrc, &isrc->xi_cookie); if (error != 0) printf("%s: %s: add handler failed: %d\n", name, __func__, error); From nobody Fri Apr 14 14:01:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQV0pKjz45JW6; Fri, 14 Apr 2023 14: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 4PydQT3lSbz3KPc; Fri, 14 Apr 2023 14:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUNrEwbJn+OMWT235/F30bxmFPLBcA4pjyEB1Z5AcxA=; b=NcaCB3pitTIckab9K51Mi/54/fTgftgP/uOm3IrowZiDAU2j1ZD+T0J3V68MS40XPa+6+n VVM9zThtQCTb4JvcEBIH+J3PK3+QRudZOXXmwMGZDtoN3fumyhoYAhLD95jrWBbiqGo1IE sNysd0stah2joPi3l/nVbpWwFlC9D41KsLxd1YRD6Exlh0mpLn99EpPpFbFDhB6gvwdfF4 KE1gO4uuNgTlaBTBXleXIuYols0OG25ocn5DfQHWIkdUPixMZXP0TAAUh9xveAv21eG/UA puGWRa0yHRbB8C9VzrKiertDvdo3km5C1Nvol3fuTIr3RHmVciSgSiN/VWGRmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUNrEwbJn+OMWT235/F30bxmFPLBcA4pjyEB1Z5AcxA=; b=tvgKk+MbqpuVogavP/JGPJLtkF6GCLgXmYFBBaEY+DhUrJLsX0xHPTP/IA9dFWU8mnmrS3 pWJDqwd7KEfZQnYiyCDBtBWsDDlehOz++y8KCGtt/k+eDPAieM3zyqzVE0dZlr2Cx1lh2U PF8FmZwtZSqO+yUzhT0rvFZMGiLce0zZANn516W6MIPIyMPypSDkZp7w0Xb7vgSTfGAw4k MT7WZvELR2ztDe6QtiqGatp9GGwYgGd//ewzPs3xIPP7NPV6FNlF/Ii5vMZ5pvlMrmhhZK WWdpnLB2e4iYo7dtnuf8sGZsOZEL3dwtnOJDfivMO5/B6mcRNZihR8gBhIHF6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480865; a=rsa-sha256; cv=none; b=CZtLovtGUb/C1KqpjmyGHLlO/xVk9zzC9/wtyyefuluFNb4WOusw+5IBRvj8NDRfx0uYk8 0L79zu6vE8oD6L5jU9Mdqk0L28SZ5rvH9gN5MVztBSdQJTjIaBCqTRsP4/2FNfuWrkVXwy OpBlmNH+mu8lPtVdZFmpTDZR9qghqYBYpDebd77ZPI9cRtxxPZQQUZrls3E5BZ073+qwRw 5DX05Km6+eCEC+JNdZe2I0zi6RHKV3LOSOt9OOCPiA9W95hMFQwwU2k4YZuq0VHddNgyT7 3q5QS9WX/4q9kwBibinDo6d89+UOFC2WYWgaN213QW/SxswyCCFCl+97bpnVSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQT2s46zRXJ; Fri, 14 Apr 2023 14:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE15F8084931; Fri, 14 Apr 2023 14:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE15Jp084930; Fri, 14 Apr 2023 14:01:05 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:05 GMT Message-Id: <202304141401.33EE15Jp084930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 6699c22c1cb0 - main - xen/intr: move interrupt allocation/release to architecture List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6699c22c1cb0f8a355ecb9d030c6990e48f8d7db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=6699c22c1cb0f8a355ecb9d030c6990e48f8d7db commit 6699c22c1cb0f8a355ecb9d030c6990e48f8d7db Author: Elliott Mitchell AuthorDate: 2021-05-14 04:36:02 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:56 +0000 xen/intr: move interrupt allocation/release to architecture Simply moving the interrupt allocation and release functions into files which belong to the architecture. Since x86 interrupt handling is quite distinct from other architectures, this is a crucial necessary step. Identifying the border between x86 and architecture-independent is actually quite tricky. Similarly, getting the prototypes for the border right is also quite tricky. Inspired by the work of Julien Grall , 2015-10-20 09:14:56, but heavily adjusted. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30936 --- sys/dev/xen/bus/intr-internal.h | 3 ++ sys/x86/include/xen/arch-intr.h | 13 ++++- sys/x86/xen/xen_arch_intr.c | 115 +++++++++++++++++++++++++++++++++++++++- sys/x86/xen/xen_intr.c | 111 ++------------------------------------ 4 files changed, 131 insertions(+), 111 deletions(-) diff --git a/sys/dev/xen/bus/intr-internal.h b/sys/dev/xen/bus/intr-internal.h index 2c707edf095e..28024d53e106 100644 --- a/sys/dev/xen/bus/intr-internal.h +++ b/sys/dev/xen/bus/intr-internal.h @@ -77,6 +77,9 @@ extern int xen_intr_assign_cpu(struct xenisrc *isrc, u_int to_cpu); * . The architecture may implement these as inline. */ void xen_arch_intr_init(void); +struct xenisrc *xen_arch_intr_alloc(void); +void xen_arch_intr_release(struct xenisrc *isrc); +u_int xen_arch_intr_next_cpu(struct xenisrc *isrc); u_long xen_arch_intr_execute_handlers(struct xenisrc *isrc, struct trapframe *frame); int xen_arch_intr_add_handler(const char *name, diff --git a/sys/x86/include/xen/arch-intr.h b/sys/x86/include/xen/arch-intr.h index 06e70ba462a2..eae3994108cc 100644 --- a/sys/x86/include/xen/arch-intr.h +++ b/sys/x86/include/xen/arch-intr.h @@ -30,20 +30,29 @@ #define _MACHINE__XEN_ARCH_INTR_H_ #include +#include typedef struct { struct intsrc intsrc; /* @TOP -> *xen_arch_isrc */ u_int vector; /* Global isrc vector number */ } xen_arch_isrc_t; -extern struct pic xen_intr_pic; - #include /******************************* ARCH wrappers *******************************/ extern void xen_arch_intr_init(void); +extern struct xenisrc *xen_arch_intr_alloc(void); +extern void xen_arch_intr_release(struct xenisrc *isrc); + +static inline u_int +xen_arch_intr_next_cpu(struct xenisrc *isrc) +{ + + return (apic_cpuid(intr_next_cpu(0))); +} + static inline u_long xen_arch_intr_execute_handlers(struct xenisrc *isrc, struct trapframe *frame) { diff --git a/sys/x86/xen/xen_arch_intr.c b/sys/x86/xen/xen_arch_intr.c index 94ada3dee4e9..8b136885f190 100644 --- a/sys/x86/xen/xen_arch_intr.c +++ b/sys/x86/xen/xen_arch_intr.c @@ -111,6 +111,41 @@ xen_arch_intr_handle_upcall(struct trapframe *trap_frame) /******************************** EVTCHN PIC *********************************/ +static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); + +/* + * Lock for x86-related structures. Notably modifying + * xen_intr_auto_vector_count, and allocating interrupts require this lock be + * held. + */ +static struct mtx xen_intr_x86_lock; + +static u_int first_evtchn_irq; + +static u_int xen_intr_auto_vector_count; + +/* + * list of released isrcs + * This is meant to overlay struct xenisrc, with only the xen_arch_isrc_t + * portion being preserved, everything else can be wiped. + */ +struct avail_list { + xen_arch_isrc_t preserve; + SLIST_ENTRY(avail_list) free; +}; +static SLIST_HEAD(free, avail_list) avail_list = + SLIST_HEAD_INITIALIZER(avail_list); + +void +xen_intr_alloc_irqs(void) +{ + + if (num_io_irqs > UINT_MAX - NR_EVENT_CHANNELS) + panic("IRQ allocation overflow (num_msi_irqs too high?)"); + first_evtchn_irq = num_io_irqs; + num_io_irqs += NR_EVENT_CHANNELS; +} + static void xen_intr_pic_enable_source(struct intsrc *isrc) { @@ -244,7 +279,7 @@ xen_intr_pic_assign_cpu(struct intsrc *isrc, u_int apic_id) /** * PIC interface for all event channel port types except physical IRQs. */ -struct pic xen_intr_pic = { +static struct pic xen_intr_pic = { .pic_enable_source = xen_intr_pic_enable_source, .pic_disable_source = xen_intr_pic_disable_source, .pic_eoi_source = xen_intr_pic_eoi_source, @@ -265,8 +300,86 @@ xen_arch_intr_init(void) { int error; + mtx_init(&xen_intr_x86_lock, "xen-x86-table-lock", NULL, MTX_DEF); + error = intr_register_pic(&xen_intr_pic); if (error != 0) panic("%s(): failed registering Xen/x86 PIC, error=%d\n", __func__, error); } + +/** + * Allocate a Xen interrupt source object. + * + * \param type The type of interrupt source to create. + * + * \return A pointer to a newly allocated Xen interrupt source + * object or NULL. + */ +struct xenisrc * +xen_arch_intr_alloc(void) +{ + static int warned; + struct xenisrc *isrc; + unsigned int vector; + int error; + + mtx_lock(&xen_intr_x86_lock); + isrc = (struct xenisrc *)SLIST_FIRST(&avail_list); + if (isrc != NULL) { + SLIST_REMOVE_HEAD(&avail_list, free); + mtx_unlock(&xen_intr_x86_lock); + + KASSERT(isrc->xi_arch.intsrc.is_pic == &xen_intr_pic, + ("interrupt not owned by Xen code?")); + + KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, + ("Free evtchn still has handlers")); + + return (isrc); + } + + if (xen_intr_auto_vector_count >= NR_EVENT_CHANNELS) { + if (!warned) { + warned = 1; + printf("%s: Xen interrupts exhausted.\n", __func__); + } + mtx_unlock(&xen_intr_x86_lock); + return (NULL); + } + + vector = first_evtchn_irq + xen_intr_auto_vector_count; + xen_intr_auto_vector_count++; + + KASSERT((intr_lookup_source(vector) == NULL), + ("Trying to use an already allocated vector")); + + mtx_unlock(&xen_intr_x86_lock); + isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO); + isrc->xi_arch.intsrc.is_pic = &xen_intr_pic; + isrc->xi_arch.vector = vector; + error = intr_register_source(&isrc->xi_arch.intsrc); + if (error != 0) + panic("%s(): failed registering interrupt %u, error=%d\n", + __func__, vector, error); + + return (isrc); +} + +void +xen_arch_intr_release(struct xenisrc *isrc) +{ + + KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, + ("Release called, but xenisrc still in use")); + + _Static_assert(sizeof(struct xenisrc) >= sizeof(struct avail_list), + "unused structure MUST be no larger than in-use structure"); + _Static_assert(offsetof(struct xenisrc, xi_arch) == + offsetof(struct avail_list, preserve), + "unused structure does not properly overlay in-use structure"); + + mtx_lock(&xen_intr_x86_lock); + SLIST_INSERT_HEAD(&avail_list, (struct avail_list *)isrc, free); + mtx_unlock(&xen_intr_x86_lock); +} diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index ebce27816539..c9de4675d091 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -68,17 +67,6 @@ __FBSDID("$FreeBSD$"); #include #endif -static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); - -/* - * Lock for x86-related structures. Notably modifying - * xen_intr_auto_vector_count, and allocating interrupts require this lock be - * held. - */ -static struct mtx xen_intr_x86_lock; - -static u_int first_evtchn_irq; - /** * Per-cpu event channel processing state. */ @@ -128,21 +116,8 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info); * Acquire/release operations for isrc->xi_refcount require this lock be held. */ static struct mtx xen_intr_isrc_lock; -static u_int xen_intr_auto_vector_count; static struct xenisrc *xen_intr_port_to_isrc[NR_EVENT_CHANNELS]; -/* - * list of released isrcs - * This is meant to overlay struct xenisrc, with only the xen_arch_isrc_t - * portion being preserved, everything else can be wiped. - */ -struct avail_list { - xen_arch_isrc_t preserve; - SLIST_ENTRY(avail_list) free; -}; -static SLIST_HEAD(free, avail_list) avail_list = - SLIST_HEAD_INITIALIZER(avail_list); - /*------------------------- Private Functions --------------------------------*/ /** @@ -220,64 +195,6 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port) xen_set_bit(port, pcpu->evtchn_enabled); } -/** - * Allocate a Xen interrupt source object. - * - * \param type The type of interrupt source to create. - * - * \return A pointer to a newly allocated Xen interrupt source - * object or NULL. - */ -static struct xenisrc * -xen_intr_alloc_isrc(void) -{ - static int warned; - struct xenisrc *isrc; - unsigned int vector; - int error; - - mtx_lock(&xen_intr_x86_lock); - isrc = (struct xenisrc *)SLIST_FIRST(&avail_list); - if (isrc != NULL) { - SLIST_REMOVE_HEAD(&avail_list, free); - mtx_unlock(&xen_intr_x86_lock); - - KASSERT(isrc->xi_arch.intsrc.is_pic == &xen_intr_pic, - ("interrupt not owned by Xen code?")); - - KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, - ("Free evtchn still has handlers")); - - return (isrc); - } - - if (xen_intr_auto_vector_count >= NR_EVENT_CHANNELS) { - if (!warned) { - warned = 1; - printf("%s: Xen interrupts exhausted.\n", __func__); - } - mtx_unlock(&xen_intr_x86_lock); - return (NULL); - } - - vector = first_evtchn_irq + xen_intr_auto_vector_count; - xen_intr_auto_vector_count++; - - KASSERT((intr_lookup_source(vector) == NULL), - ("Trying to use an already allocated vector")); - - mtx_unlock(&xen_intr_x86_lock); - isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO); - isrc->xi_arch.intsrc.is_pic = &xen_intr_pic; - isrc->xi_arch.vector = vector; - error = intr_register_source(&isrc->xi_arch.intsrc); - if (error != 0) - panic("%s(): failed registering interrupt %u, error=%d\n", - __func__, vector, error); - - return (isrc); -} - /** * Attempt to free an active Xen interrupt source object. * @@ -289,8 +206,6 @@ static int xen_intr_release_isrc(struct xenisrc *isrc) { - KASSERT(isrc->xi_arch.intsrc.is_handlers == 0, - ("Release called, but xenisrc still in use")); mtx_lock(&xen_intr_isrc_lock); if (is_valid_evtchn(isrc->xi_port)) { evtchn_mask_port(isrc->xi_port); @@ -312,15 +227,7 @@ xen_intr_release_isrc(struct xenisrc *isrc) /* not reachable from xen_intr_port_to_isrc[], unlock */ mtx_unlock(&xen_intr_isrc_lock); - _Static_assert(sizeof(struct xenisrc) >= sizeof(struct avail_list), - "unused structure MUST be no larger than in-use structure"); - _Static_assert(offsetof(struct xenisrc, xi_arch) == - offsetof(struct avail_list, preserve), - "unused structure does not properly overlay in-use structure"); - - mtx_lock(&xen_intr_x86_lock); - SLIST_INSERT_HEAD(&avail_list, (struct avail_list *)isrc, free); - mtx_unlock(&xen_intr_x86_lock); + xen_arch_intr_release(isrc); return (0); } @@ -361,7 +268,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } *port_handlep = NULL; - isrc = xen_intr_alloc_isrc(); + isrc = xen_arch_intr_alloc(); if (isrc == NULL) return (ENOSPC); @@ -382,7 +289,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * unless specified otherwise, so shuffle them to balance * the interrupt load. */ - xen_intr_assign_cpu(isrc, apic_cpuid(intr_next_cpu(0))); + xen_intr_assign_cpu(isrc, xen_arch_intr_next_cpu(isrc)); } #endif @@ -561,8 +468,6 @@ xen_intr_init(void *dummy __unused) mtx_init(&xen_intr_isrc_lock, "xen-irq-lock", NULL, MTX_DEF); - mtx_init(&xen_intr_x86_lock, "xen-x86-table-lock", NULL, MTX_DEF); - /* * Set the per-cpu mask of CPU#0 to enable all, since by default all * event channels are bound to CPU#0. @@ -585,16 +490,6 @@ xen_intr_init(void *dummy __unused) } SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_SECOND, xen_intr_init, NULL); -void -xen_intr_alloc_irqs(void) -{ - - if (num_io_irqs > UINT_MAX - NR_EVENT_CHANNELS) - panic("IRQ allocation overflow (num_msi_irqs too high?)"); - first_evtchn_irq = num_io_irqs; - num_io_irqs += NR_EVENT_CHANNELS; -} - /*--------------------------- Common PIC Functions ---------------------------*/ static void From nobody Fri Apr 14 14:01:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQV6MfPz45JKS; Fri, 14 Apr 2023 14: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 4PydQV4YLzz3KSK; Fri, 14 Apr 2023 14: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=1681480866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvWpfT/+UqgzquELxJttLOzQ6rkxJH6ySHvxW0UsjGs=; b=D9kCOMSF+gdUmCn+1PbKATs6pkWS3dhNiQbtw0Gg3parPKC4heMpd3FJ0W1EQvJNUqHz8b iH0yeHvZlkJiLUnyZ/d+/TalLnGcImEJE/6Wx/M4BZordiBKsHa2ht8K+EShZUt7dPiDd1 KORd6DU9j3JZWtArlKLhUv1tqbObxUqJvE9DjzTCtBGBLrmlV8Dw6BLk5Y5P9Be8NIT+XR bXOHBFUQ2mAzBWZ/rY9vmv8SrUDFKaAj+M7uubcXJnPOGp21lFHfUR3cpGUNGRz7G2y0qP XaA+Fdy+xOEapokZ/fd280zn2eDFuKXVCa8AWNqXiRtKdKOvxM3MaGF3VFT0zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvWpfT/+UqgzquELxJttLOzQ6rkxJH6ySHvxW0UsjGs=; b=YF7fXoJ2yhOfYZV2al4OctD25xNRFGvrKo+IIxgQ5qsvTCTbxhzszjMlfikD2uRw2YTK3O bDqrkvCrKuAA2VaWjs4eJKzGAHsMI04fVC7N7lJlihEaJODVQy2eascXWGY6OzL80lMI6U iLYyDnAOC6I6Iq7mTK8CJUMoinEB6wb229jkx/iRvclSfuKxVr4E4HdlsrsRK/VhMW5x3O I5yD+RH6x06jbjOgblkOpid2gRg2csiJm9hr8Bco6WobNxmeVseFVfqdboi8zlmYFAmLl1 K8L9687wj2VOhar6ao/bLPLvAn2Edv9twVx22NnnttKGp7ytGrGJiRfMa6qNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480866; a=rsa-sha256; cv=none; b=WamB4oQniNvhqfbT8BjA7wQx8nTzMx+Fr8lRxbi9VVpjWvlhTa4hRLM4hVqcVBB4ul4x4j Bl+uPbJg+bvCADynUQ5uJurb0dxj3BSDytkeKb23384vAX9+7Ido/y16ukOw9iqFruD2XK EeH8YRCYCuGOQOFxN8D0GPNjYt4ulLZCtbNK5rwvkJbF+OdKQHFBG77RzRoFNSU/xkBQ5K nevQd/glvn6cG7qoMj3CSbB2LrR+BGGagfi6hsihLcgCmw4nJu9Q4z74u0v/VrJqff4wgi jIDUbg7OMoYNNSd7daXgMub0NAXPwTEiPbPBp0DGuK9lQpGrTOgM4hrPwbF1yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQV3WTWzRnl; Fri, 14 Apr 2023 14:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE16cN084961; Fri, 14 Apr 2023 14:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE16t1084960; Fri, 14 Apr 2023 14:01:06 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:06 GMT Message-Id: <202304141401.33EE16t1084960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 5e2183dab871 - main - xen/intr: move sys/x86/xen/xen_intr.c to sys/dev/xen/bus/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e2183dab87140a0107f0d8c761d6c01ba9e25cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=5e2183dab87140a0107f0d8c761d6c01ba9e25cd commit 5e2183dab87140a0107f0d8c761d6c01ba9e25cd Author: Julien Grall AuthorDate: 2014-01-14 01:41:04 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:57 +0000 xen/intr: move sys/x86/xen/xen_intr.c to sys/dev/xen/bus/ The event channel source code or equivalent is needed on all architectures. Since much of this is viable to share, get this moved out of x86-land. Each interrupt interface then needs a distinct back-end implementation. Reviewed by: royger Submitted by: Elliott Mitchell Original implementation: Julien Grall , 2014-01-13 17:41:04 Differential Revision: https://reviews.freebsd.org/D30236 --- sys/conf/files | 1 + sys/conf/files.x86 | 1 - sys/{x86/xen => dev/xen/bus}/xen_intr.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 9800c016532c..6c7c6520d72a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3482,6 +3482,7 @@ dev/xdma/xdma_sglist.c optional xdma dev/xen/balloon/balloon.c optional xenhvm dev/xen/blkfront/blkfront.c optional xenhvm dev/xen/blkback/blkback.c optional xenhvm +dev/xen/bus/xen_intr.c optional xenhvm dev/xen/bus/xenpv.c optional xenhvm dev/xen/console/xen_console.c optional xenhvm dev/xen/control/control.c optional xenhvm diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 54f6e8c8260a..2e7ce6c00b3b 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -345,6 +345,5 @@ x86/x86/tsc.c standard x86/x86/ucode.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm -x86/xen/xen_intr.c optional xenhvm x86/xen/xen_apic.c optional xenhvm smp x86/xen/xen_arch_intr.c optional xenhvm diff --git a/sys/x86/xen/xen_intr.c b/sys/dev/xen/bus/xen_intr.c similarity index 100% rename from sys/x86/xen/xen_intr.c rename to sys/dev/xen/bus/xen_intr.c From nobody Fri Apr 14 14:01:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PydQX25Nnz45JN4; Fri, 14 Apr 2023 14:01: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 4PydQW5chCz3KbV; Fri, 14 Apr 2023 14:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDMbokyMfxMr6107JD0K7YLabg9Oq5ht843G9X4tli0=; b=sNLU8shtZi3p/Kxno4HSdc93sDnkuvOsITsLmPe4iL9fzBCYg2myW6lFJkBkdEZ0J5fLsg PaU0ideRHJkj0krW+QkSC4KPd/x58zRCqrmD1JB0ZNHbFP1xwfCm4ItfEeh3gDnCSkZeQf wPGTVon2W7WiJ2N/CItxsHHTHRB5hnp3RJUA4yxaV29LenCQ+cnEWgvk1+CKM9ZZk/O/Ur E7K3DzDN5Q+li4RxQxbjDtB2Icgtxa3xoe86g+qvb5UXXfwUM9OgFCbfV/3JS4uPxQt7zx FvhV0oI5/ulCtF9JhG8pa1BURLTPoct0fDg6lEPJl46PxiHMoSjWA0hA+KmEOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDMbokyMfxMr6107JD0K7YLabg9Oq5ht843G9X4tli0=; b=lAMsGaxJT9Pql+VClq7Pg+EmrJdpdPax7P/l3kMsYc4ji4OR/NZx5bp83HSTPnZ91yFnXT wGtBCEhArmFwzpZGwreyG3rbWJUJGsrwhOMtmX+bkMjvtukbUTl9r7ks4LKOyF1sYPwK9z peiAOmdjUVfCWlUflBf8dmmHZy1IWpFSYx6d1jT8s3D6X7TGSH4PRPM4SDR8YzsZdj8UL8 f8fNZv1a1/jCllF66iX8YnUmBSz+ZG3LfTDrtT/ExFQmzi7FaTbxd/WMv+bHf6iYDIQldL kYL/iG98hE1AshHcnK1ediOGU9EOZdAd6Zaf6UMVyKECTYY7+exGIi1fjfF24w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480867; a=rsa-sha256; cv=none; b=WQsoPkBECZ5J2DuMKpOepYavEfzijWaYq9h4t4iI5R/ziSeKLzR3Uds9M+U2iCONpPePEw n/AUyLu+LWC9KDRo8hGojYewWbnx+bX6Ic/6ealoGix+AGe5+gYukOQqhNbz3zGBt4Q/FN a7wumDi8Yw9Pd/Z1tJ8QkgmGbGV+CAy77Hfkw7JMQQbNfups/rxCkmgU0ft8iLGqLkdf5P rEx0N6hYyn5yo60/TfBwYEcyC85qUF0ch1qBgl8LJQ9HYD+KZkPxMLJ9iP8+5WP9WMjTKN Fzp8eR3ZdqOmrMntbZhWKHq6WuQjZsFh203Dsti+W+GgRLkpffKfqGC6gnIu3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PydQW4j2nzQcS; Fri, 14 Apr 2023 14:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE17vL084985; Fri, 14 Apr 2023 14:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE1761084984; Fri, 14 Apr 2023 14:01:07 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:01:07 GMT Message-Id: <202304141401.33EE1761084984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 6d765bff6f73 - main - xen: move common variables off of sys/x86/xen/hvm.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d765bff6f739f4b9cb2c1463325395d9746d23c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=6d765bff6f739f4b9cb2c1463325395d9746d23c commit 6d765bff6f739f4b9cb2c1463325395d9746d23c Author: Elliott Mitchell AuthorDate: 2021-02-16 03:06:59 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:59:11 +0000 xen: move common variables off of sys/x86/xen/hvm.c The xen_domain_type and HYPERVISOR_shared_info variables are shared by all Xen architectures, so they should be in common rather than reimplemented by each architecture. hvm_start_flags is used by xen_initial_domain() and so needs to be in common. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D28982 --- sys/conf/files | 1 + sys/x86/xen/hvm.c | 11 ----------- sys/xen/xen_common.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 6c7c6520d72a..4e981a135b0c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5205,6 +5205,7 @@ vm/vm_swapout_dummy.c optional NO_SWAPPING vm/vm_unix.c standard vm/vnode_pager.c standard xen/features.c optional xenhvm +xen/xen_common.c optional xenhvm xen/xenbus/xenbus_if.m optional xenhvm xen/xenbus/xenbus.c optional xenhvm xen/xenbus/xenbusb_if.m optional xenhvm diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 8edbda445dd5..a41c9ebdf745 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$"); static void xen_hvm_cpu_init(void); /*-------------------------------- Global Data -------------------------------*/ -enum xen_domain_type xen_domain_type = XEN_NATIVE; - #ifdef SMP struct cpu_ops xen_hvm_cpu_ops = { .cpu_init = xen_hvm_cpu_init, @@ -83,12 +81,6 @@ static MALLOC_DEFINE(M_XENHVM, "xen_hvm", "Xen HVM PV Support"); */ int xen_vector_callback_enabled; -/** - * Start info flags. ATM this only used to store the initial domain flag for - * PVHv2, and it's always empty for HVM guests. - */ -uint32_t hvm_start_flags; - /** * Signal whether the vector injected for the event channel upcall requires to * be EOI'ed on the local APIC. @@ -99,9 +91,6 @@ bool xen_evtchn_needs_ack; DPCPU_DEFINE(struct vcpu_info, vcpu_local_info); DPCPU_DEFINE(struct vcpu_info *, vcpu_info); -/*------------------ Hypervisor Access Shared Memory Regions -----------------*/ -shared_info_t *HYPERVISOR_shared_info; - /*------------------------------ Sysctl tunables -----------------------------*/ int xen_disable_pv_disks = 0; int xen_disable_pv_nics = 0; diff --git a/sys/xen/xen_common.c b/sys/xen/xen_common.c new file mode 100644 index 000000000000..586cc8bcf821 --- /dev/null +++ b/sys/xen/xen_common.c @@ -0,0 +1,51 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright © 2008, 2013 Citrix Systems, Inc. + * Copyright © 2012 Spectra Logic Corporation + * Copyright © 2021 Elliott Mitchell + * 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. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include /* required by xen/xen-os.h */ + +#include /* required by xen/xen-os.h */ + +#include +#include + +/*-------------------------------- Global Data -------------------------------*/ +enum xen_domain_type xen_domain_type = XEN_NATIVE; + +/** + * Start info flags. ATM this only used to store the initial domain flag for + * PVHv2, and it's always empty for HVM guests. + */ +uint32_t hvm_start_flags; + +/*------------------ Hypervisor Access Shared Memory Regions -----------------*/ +shared_info_t *HYPERVISOR_shared_info; From nobody Fri Apr 14 14:28:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pyf2P472yz45LsM for ; Fri, 14 Apr 2023 14:28:45 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4Pyf2P2CPxz4MV5 for ; Fri, 14 Apr 2023 14:28:45 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82d.google.com with SMTP id m21so8214127qtg.0 for ; Fri, 14 Apr 2023 07:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1681482524; x=1684074524; 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=XkyIxHetDhhiwCQGwKFA7ybmK+IKvlrPEvTT3V81Nc0=; b=R4peEwTNrbd8WWA54RNjQzjMSSzwTuB1DyUQd1+X7DPqxK/GMM097u8XIIl6yDQJez QpR19YTjOWZJZbWP5Mf0qPNIAM/OuDtuM9Zkms1SnWp24NZsD+bMs/ZmA1uNRRenG7jA PRE7hfIHU9cqwXjiGL710FjBKod1amIgW8IB8daMqSJpa0wp/yV5MDdpqWXaKhAEZDMu Mm/vG1bu9+uRQlTypiY5MVzwSGW7yE4Hv+SFrdanwIyyex8aHKJws2Zv2FPC2vDJ8iW/ hSkBTTqc9OZpRf1nQMvhFHQm5OnXroIXyQXgvSMbMSzvaDmMT6g4YXoVA8MlWN/tr1zV 86yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681482524; x=1684074524; 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=XkyIxHetDhhiwCQGwKFA7ybmK+IKvlrPEvTT3V81Nc0=; b=ScmjPFKj8oQ28PdUYNUFIcYyZeZwSNhMIojkA9mtSvzg2OWUi3PgwsZmO1MD0MHEYJ 8L0fxMI96/9GTBGf2FKnm3HaF69IW3LHohxV1rZJkXFK40iNg8JIxpHR7aMfNY5vYa1W PHucMHmy3EJUCyatmrnAWOwIxFDpZRYd7uQt3m5whg9GeV214oX2RgrDG+4kRvXTTjKs MN2yEbaXs5xwTNU82N1QvFy6CqwlCkctQnOSLuAUrD8ea2SjMPB7d2NaNAhzNjzgeeka 83aP/gWBspNUJePcu1hMOcoVvH9BBe8cXzla0t11LX6Len2Uqzlwvao6zM8Y6wSm30vi eAPQ== X-Gm-Message-State: AAQBX9fx4RtBeaygkwnCtGrBuapb7hnatBhykwjHf2RiqosBUZF/pwqO PCCxVj8L5gq9Q2hEhjWbAGkEJw== X-Google-Smtp-Source: AKy350akg3c07tz5BVyDAYiXXu9wiQsao9p9I7LIsWEKx3nwTDW2IvhVVH6kn4Hpa3I0rfxNVzf+BQ== X-Received: by 2002:a05:622a:1811:b0:3d0:7bdf:42c4 with SMTP id t17-20020a05622a181100b003d07bdf42c4mr8922345qtc.59.1681482524343; Fri, 14 Apr 2023 07:28:44 -0700 (PDT) Received: from mutt-hbsd (pool-100-16-219-215.bltmmd.fios.verizon.net. [100.16.219.215]) by smtp.gmail.com with ESMTPSA id a24-20020ac84358000000b003e64303bd2dsm1246579qtn.63.2023.04.14.07.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 07:28:43 -0700 (PDT) Date: Fri, 14 Apr 2023 10:28:42 -0400 From: Shawn Webb To: Charlie Li Cc: Cy Schubert , Mateusz Guzik , Pawe? Jakub Dawidek , Mark Millard , dev-commits-src-main@freebsd.org, Current FreeBSD , pjd@freebsd.org Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230414142842.sgeikpg4r5xunqye@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rmiz7lrozzjjacb7" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Pyf2P2CPxz4MV5 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --rmiz7lrozzjjacb7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 13, 2023 at 06:48:14PM -0400, Charlie Li wrote: > Shawn Webb wrote: > > Does the ZFS project have some sort of automated testing to catch > > data-gobbling, pool killing bugs? It seems like this would have been > > caught with some CI/CD stress testing automation scripts. > >=20 > I can't speak about how the OpenZFS project does things, but this particu= lar > corruption does not have any deterministic characteristics both pre- and > post-condition, so would be hard to automate testing. My approach would be to have a policy by which any new feature scheduled to land in the main branch must also not show any regressions when running `poudriere bulk -ac`. Such a policy could be enforced via server-side git commit hook. One problem, though, is that implementing that policy isn't just a matter of code, but also infrastructure, so there's a tangible monetary cost. I should mention that I appreciate the selfless hard work of those involved in the FreeBSD and OpenZFS projects. I hope for continued incremental improvements. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --rmiz7lrozzjjacb7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmQ5YxMACgkQ/y5nonf4 4fqB3Q//bNZCvDRWBsHONFrv+YamUmRi09dIEtZX9Cx+OprGvN+S4Rbq2lDhrpyW Wg5BWdj4mvJKEHU5RNjjWfJqWRulBwE0RDSPTo8ub2w3kr0+hKPF1lzZ7AC29uPU K0WYCz1p8mfwu+LhfgCEMOJsCErWeCRUejQijVLScGbkxnKufHu18Ske4KgJBgOd iab3gMZ+gE9jX4XMB623QaZkmmDnsBvaCCAmchx4vX7xVU8mNRvYfARTCQUx/pvS 2wFm67bDS+JULf7kfLwnv01DCJqNgdB3j4fSUSib0thYoJHSNC4Q91dl+dQSNsv8 c0aetNqGkeDGiRjRuSLige/tSGx+HRVA8womssUVBduLGIF8dMKqjQIrNXRmhnBH DcldNuHBVfzq9GWlfjZcBLRzWxXVqDxllvNIUznF2K9DmNLBKn0LB/mN1jD9TIcp R4GG6g6zbV7Uv/alb9+KOZwYOL7ZLYMfHcxI0SKfzQ+HWTfIdqCsVaydkR2NAdPs hxQkQjMup6t1xU8Q1sfmNujnXvy1QpaadVJYP27r7r5umJ1Szyjai3VeI6AD4l/G uZ/k3MOdSnzQFygWe1UVjzBEMTXxBZoUYbsHS8sQhUCJhEhubBh1c18USEgmKeVV MI4RdOkMmebhiN/uPQOW0fHSKq0M2p/WalTSFDZDxL+D/L3mDMk= =MCrJ -----END PGP SIGNATURE----- --rmiz7lrozzjjacb7-- From nobody Fri Apr 14 14:58:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyfhL2CX9z45PSY; Fri, 14 Apr 2023 14:58: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 4PyfhL1Sj0z4GQr; Fri, 14 Apr 2023 14:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681484290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xMjkSryKbfcVqg5ZUEmjbuMKeiYosBAvOEdJQZFY54o=; b=MA5A6V2c/TSWOC+BzcYSzCdYPJ3TyS9+6yRPntLxbpZJRfQyxCpd/n8CEfDWDemdKWHo6l aQi5YD3ekut9ZRjWdl3QOb8U3uMQfLXvyJD0ZyBTYwsdxSMo3xE+7p9yncEQ/3cLndOGud RPO5PYGZMSPPHFukcjbL6n1WgdfdJi630cpv9F2jKzSRycI7fN6/ZTaD5hrdAasr6R49KG C+BreuAYoto960qC8nc9TZ78rocA+bH+BbyVYnb3wHbX3LJ3InMV3K5incBz8wXJCY32fO EObvZ1fwwwcReZ+vZxrTALMVOF8RYzmtKJEgoIGDoSsKToF8OBNx2SwPMCI4Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681484290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xMjkSryKbfcVqg5ZUEmjbuMKeiYosBAvOEdJQZFY54o=; b=Tf76UqWvNuLeif5ghHop/5NpHlLjn2ALZVOgOA1lsKMQlSGuygJ65bz7i6JWXu09v1vmCi YeLwHFmGHBO8pGRbNN/DZ7kfI4nYktwU9GJpCbN+gFeu2Z17qeeVaFsf+RSXJ33hopLVi4 A1jo6Pru6xb4fVi9eZswufCDw+XupAvUpDf0vuQNn1GyBs8o/OE21p9dIIb6E2Y8mF1L25 U0pXl1jcPqWJfiOB0lw3g4mdLebGa+n5jW68Cfmiw8uFHksHHK2Kv/hq181qlTCnu74LMZ yHNhn2Rz4JSs4oQePsJiXIR4gVW2yPd8PPgjHUUtWA1J2/EM6cfb/QtBXC57Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681484290; a=rsa-sha256; cv=none; b=uk1G+BG8retbmQM10ZS8/J8xeB7dSCXMj0cLW9PCLxDlb8o/c4XYQUaT55E02zsA4icaeW GZ1bppGizHnETa98IEBAp8xI9DK1ct5p4arJaGLn9ZoErdRVXQkrTQqjHvmUqX3irm6Ezc LM1DHueyE2gXhMgTrM8zlMwDsHJ4rfAmrx1za86A0wVBAsYsR3BaGZcMc9KK/fBp5r4aDs 53SzCY581KgwD12P5Fc/6XhO9vtM/YBnfCLO6Jdk3AhgxXaWdWr7e59DlQFz6CFoj2eBKg UU+KBAPgxIvOjLf24Cg85nL1xJftXMaylOhfhpiSCxnZ9A1oKnyxUtyAEDQVYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyfhL0R5xzTDB; Fri, 14 Apr 2023 14:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EEwALc073577; Fri, 14 Apr 2023 14:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEw9kX073576; Fri, 14 Apr 2023 14:58:09 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:58:09 GMT Message-Id: <202304141458.33EEw9kX073576@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: d1b627111818 - main - uart(4): add Sunrise Point UART controllers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1b6271118188dd25a18f2372ab1d3004335ea3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d1b6271118188dd25a18f2372ab1d3004335ea3c commit d1b6271118188dd25a18f2372ab1d3004335ea3c Author: Kyle Evans AuthorDate: 2023-04-14 14:52:48 +0000 Commit: Kyle Evans CommitDate: 2023-04-14 14:58:00 +0000 uart(4): add Sunrise Point UART controllers Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. --- sys/dev/uart/uart_bus_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index 2ac91e09221d..6344f89c2248 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -182,6 +182,8 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x8086, 0x8d3d, 0xffff, 0, "Intel Corporation C610/X99 series chipset KT Controller", 0x10 }, { 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, +{ 0x8086, 0x9d27, 0xffff, 0, "Intel Sunrise Point Controller 0", 0x10, 0, 2 }, +{ 0x8086, 0x9d66, 0xffff, 0, "Intel Sunrise Point Controller 2", 0x10, 0, 2 }, { 0x8086, 0xa13d, 0xffff, 0, "100 Series/C230 Series Chipset Family KT Redirection", 0x10 | PCI_NO_MSI }, From nobody Fri Apr 14 15:22:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PygDJ14h0z45Rrf; Fri, 14 Apr 2023 15:22: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 4PygDJ08Hkz3sZn; Fri, 14 Apr 2023 15:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EW8Urr/uwXpp+jQPaPBkIY94HGDvVQoj4L+9U1vp+Ok=; b=E+O2beCac6kN8G1Z/XU2jaeMV0fyXZVMHDiRUJec1ViS0OQwGJbNqMzeCjT1kUtDd9V9Pv Qx7MAsj8GsiFMX1n7eLZUrZdvWzS4kMZwbWIpHQn+GmtmZ14Og3OfPo+Kubq/Z3EID4CsJ OS0XJoV9nFCT3fR9nmTUJTwznf6WgkyCTW3VHfxZRR5p3ZFaiFzMHB1FIJH3IzP5yc0Yzx eeDndfPxCbApTOyvJWP9/Di7RulDvyL0ApvwblIdGSpeVvWGz1eJs7mMY+LewM+o/HNbZV 4IO8zotEqEjHdka1R8Bl4DGSPb68134LlcgFPscTZdD3E3ISoN+akjH6hX6o4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EW8Urr/uwXpp+jQPaPBkIY94HGDvVQoj4L+9U1vp+Ok=; b=khsNTH4zEsCGDZ8vw1TIpU4zZLFeKluFyx235OMDriagx/DyxGVy+T2qgbK48o15LNPfAd AWKE2lxrTOGjDELG+l7p3W6rQm3WI87ANugS4pzlKDJyDv8UJ3FcTy9MV96CqP/ra+OduP Yr7SNoyKdltbbk+jfefe/52XHGf4NgZbLsYW4sv5HdJT/bf3BDRS6Ge0/6h3gA99n4VIAu waG6QMNG2OqOV4CtJqRhEZA30gweYJD2YK+ilJNca72LooDWFN9p3si0G5ovdyJjj+cw9X 9Yon8kMLEXHxIoLhMNZboJL3z78No3J/koe9I/cejMbnJpdfNtkDB9WxFLXacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681485744; a=rsa-sha256; cv=none; b=TqAi6cAzFLm4aHipHwstgrxb4QpvJ+P3LaspurNAUb5Fa+4mLnAN6uxgFp1GT+prZDT6Er x5rHGSK+jZgqkazb1htYle2d0a7BPm+A1g7p5m9n7+7VAWkwlZ3Fxid8AJydfOSKVUWPs9 57vkCQGe0fecmKMSiXWpRBxOQxhGQqDGB3AP6B8JCNlQmOnOgJa6knDdSfJsHGUSYgOh4D UzSnyRYKNwVmQepU5bS9k8sQvzskNRtbjxan+3V3GkkFs96fuufkfr15voP1QTq52iHAUZ LIxTBVCAk9uf+l+5+QqTjBH2M7CdZz2mK30U70n43Ukm+wPGYmmmYJXX8ku36Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PygDH67dHzVFK; Fri, 14 Apr 2023 15:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EFMN5m021334; Fri, 14 Apr 2023 15:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFMNAD021333; Fri, 14 Apr 2023 15:22:23 GMT (envelope-from git) Date: Fri, 14 Apr 2023 15:22:23 GMT Message-Id: <202304141522.33EFMNAD021333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mikhail Pchelin Subject: git: ea26545cc573 - main - net80211: wrong transmit MCS set in HT cap IE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: misha X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea26545cc573ff7e1f69c7cecaf6773e628b6aac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by misha: URL: https://cgit.FreeBSD.org/src/commit/?id=ea26545cc573ff7e1f69c7cecaf6773e628b6aac commit ea26545cc573ff7e1f69c7cecaf6773e628b6aac Author: Mikhail Pchelin AuthorDate: 2023-04-14 15:16:29 +0000 Commit: Mikhail Pchelin CommitDate: 2023-04-14 15:16:29 +0000 net80211: wrong transmit MCS set in HT cap IE Current code checks whether or not txstreams are equal to rxstreams and if it isn't - sets needed bits in "Transmit MCS Set". But if they are equal it sets whole set to zero, which contradicts the standard, if tx and rx streams are equal 'Tx MCS Set Defined' (table 9-186, IEEE Std 802.11-2020) must be set to one. Reviewed by: bz Approved by: bz Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D39476 --- sys/net80211/ieee80211_ht.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 2fbb5a10febf..f98316bc5088 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -3209,14 +3209,14 @@ ieee80211_set_mcsset(struct ieee80211com *ic, uint8_t *frm) } } + txparams = 0x1; /* TX MCS set defined */ if (ic->ic_rxstream != ic->ic_txstream) { - txparams = 0x1; /* TX MCS set defined */ txparams |= 0x2; /* TX RX MCS not equal */ txparams |= (ic->ic_txstream - 1) << 2; /* num TX streams */ if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) txparams |= 0x16; /* TX unequal modulation sup */ - } else - txparams = 0; + } + frm[12] = txparams; } From nobody Fri Apr 14 15:22:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PygDK28RXz45RZc; Fri, 14 Apr 2023 15:22: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 4PygDK1CL8z3sVN; Fri, 14 Apr 2023 15:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/+kEnJvMybAMBWsno2tKhHTCNjhOQfnsUgIi/JFNgk=; b=rRicUlOOjSdMZt2tQOrbVIIh0kknsmFQf2UrRebBL6TvL9oYuMXESHFSO6+E5AJOCFjDTC tdcFu7dr4vm2SyjKBfd2GmWG9KllF/UW19A2Rsl4AUkRYxbF2Eu/1XfyKKrqf0/DkBK0an 88vGWwn5x7wVj7RqoP6JtoELV9Qx1ObFI8REDWBKj4JBJSS0BZLWNrBhY5hSpQvhtMKvCA rAm7wozbjn231OEC3GAFf1KxyCchyCVu4BZAuzRflvlxckdHWNIcfr2as0YfA9LlHmz4Zf i/hCThntOj1EdJKAaXwoBRmIJa/8udq8vzB0t6Zo+/tM/rG01VgWAdtCVOQnRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/+kEnJvMybAMBWsno2tKhHTCNjhOQfnsUgIi/JFNgk=; b=T2OM5AXw8pYvm4Z718rwS0U+63tFqKWsabQWmE3a3Rarg4v+heDHAFejwhsMUTiChru/9G 7DTG0B0g5os1DQkGRMJcE27n6Z7qisYdQiV6sm2i12Ub5h/0Av5e0nig/l9igq7rJZD2hI PXPOM22TDq3VKLgmtp5H0QSrvqa9T02z2dmMxj3Sd3Xo0m+3usIzT7CAS3cproLyXdsnBM aRmp4FMpKG2Cf2yxtbj119NU0CUEEax40T9pl0MGS+uNhD0Ewbo7sTJRX3YqHdAj8LcnHp FnE8IcKWTYMl9VPrBGAPoOX+vlIRftfvnQNFHNoKhYW8qzEO8BYjEoLhDaQEXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681485745; a=rsa-sha256; cv=none; b=Mjb0cEZBWxBAd/YBIuwz08tEqHM0fimkoOlaOH/y0E1elyolJca2t2UWpJvWpiDSJjIfQK N1zP+7+bt5IFAJjvhf/LLI55tGTd49+8tAlBa+erNZzOjygBbEw6ivgLsDFOGrTsPYg1ie S8CMo8jHlpcZbgFGxabOPsBf/jiOR2czMG33f+zPOVsD7D+OFtO6f7H+GzS5xoMJAjLNEP 3206lmKYkwwCnOSyc7JUWVkcfGzu7O06Cm1ZM7nKBHIwoCxwBOXvJHyg9ab+IiC/S8zL1Z E0HgJeZHLI9e8M2/TqITeAXGx+issBlbKQkA1X2vpuN63MtiOdqFGhPw6NEkAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PygDJ72x6zVPw; Fri, 14 Apr 2023 15:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EFMOYT021591; Fri, 14 Apr 2023 15:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFMObi021590; Fri, 14 Apr 2023 15:22:24 GMT (envelope-from git) Date: Fri, 14 Apr 2023 15:22:24 GMT Message-Id: <202304141522.33EFMObi021590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mikhail Pchelin Subject: git: 2f53b5991ce0 - main - net80211: fix a typo in Rx MCS set for unequal modulation case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: misha X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by misha: URL: https://cgit.FreeBSD.org/src/commit/?id=2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb commit 2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb Author: Mikhail Pchelin AuthorDate: 2023-04-14 15:20:09 +0000 Commit: Mikhail Pchelin CommitDate: 2023-04-14 15:20:09 +0000 net80211: fix a typo in Rx MCS set for unequal modulation case RX MCS set defines which MCSs are supported for RX, bits 0-31 are for equal modulation of the streams, bits 33-76 are for unequal case. Current code checks txstreams variable instead of rxstreams to set bits from 53 to 76 for 4 spatial streams case. The modulations are defined in tables 19-38 and 19-41 of the IEEE Std 802.11-2020. Spotted by bz in https://reviews.freebsd.org/D39476 Reviewed by: bz Approved by: bz Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D39568 --- sys/net80211/ieee80211_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index f98316bc5088..2bdbc101d861 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -3203,7 +3203,7 @@ ieee80211_set_mcsset(struct ieee80211com *ic, uint8_t *frm) for (i = 39; i <= 52; i++) setbit(frm, i); } - if (ic->ic_txstream >= 4) { + if (ic->ic_rxstream >= 4) { for (i = 53; i <= 76; i++) setbit(frm, i); } From nobody Fri Apr 14 15:48:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PygpC4TB7z45Tb8; Fri, 14 Apr 2023 15:48: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 4PygpC3kctz3GDg; Fri, 14 Apr 2023 15:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681487299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPHp6ed1eccXSnSt1JYyXrENKw/HhAal0flYVU0Gjug=; b=fu3uD4hqDVGjKbyJBU3qtEOcYPd2Go9n3FTNyuvKDtY8JGbgnPnPGTrSrYUoewb7jLD0u9 prEcLhePW3m4qmud/kyAOcnHr/5NnyI05NsSG4GEjOwE7lH4W6gXGP+tuv5nUpoD2jUSf9 1B+VmtsdX3zdBNpnF9rw5rQZGrwUddNSJnWZjO7YCUN9Ei7Ox4vNJ1+08Q2x17cDhTZALD UKMZ0Zgdw4s/SWFhTLEg0FQ75AmbfLkb5TkzBcfxVdKjaZwJqgGHptx3fIwZfDMlRnO7ar 6YnODuwMKu5R0DEfd4iYMYFxgEFbUGYFU2t3PdwMCQend7H0tALsGBH+CLFD5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681487299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPHp6ed1eccXSnSt1JYyXrENKw/HhAal0flYVU0Gjug=; b=D3dY26AnBQhlU5uCCwVp3WRgdDB5kifuUF96Os1gZcPPMmlhXwGcQh600i63TLfbjEwzh/ M1MpVLKNWaxVkXmWyOohCGgHdp4CnzNOoQKSusQT5mCwiPpCFJq0kfkwx2+6+KoGCBonYu Lm6vY5UTDi7f6EcSrEFLfaenvOugYMQM/lJn5t5+BJMU/QkxW9dYgi+NF6lRMwB3Hw3Rja EOEhJJa+CI3aBhMo+mtQtTKT63HJbwueJyOa43JZn1wj83/cCoR2gW5vNHcEET01W5tXPh lM88aWOYbibNSlzfMQntTK+wuzEgYl8vc8yVXOXeVAYyXDfrw784BZnyheQOTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681487299; a=rsa-sha256; cv=none; b=oBKRVsxVV4EPMZck5wZAh/aFkfUgFW4UiXV4TKhyFzTaYi3K8C4IRrL/qJyKqEDGtlMfTE yPj74LE5Ogj4RSbGpkSEJY1mqR6tn9N6LVnXbzcyX3JrC7Yu8ukksvI9CVj7ZMe/3O53Ac 2ZgVIZkRnofLzWtF7W5zwDA1tBsmLrjXCBT3lBO/sZa2at7xvH4YPWOOhZrAx0mPTWXUgV eyJ5y3Hiaw7kIPs8672w0x1rREr3D7i+IXX8KFhAZeYvTbumCGD/rT1WArd0wdRZmd4iaH bHyoW1wsNs8nLihxWjCgpDUEOYtxgm3MvDs0dRRBdK/cm3SeWSXaPgky1OsNLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PygpC2pWKzVdV; Fri, 14 Apr 2023 15:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EFmJuL057301; Fri, 14 Apr 2023 15:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFmJoe057300; Fri, 14 Apr 2023 15:48:19 GMT (envelope-from git) Date: Fri, 14 Apr 2023 15:48:19 GMT Message-Id: <202304141548.33EFmJoe057300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3e5d0784b9b5 - main - Testing: add framework for the kernel unit tests. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e5d0784b9b5296bda801add034b057ad68237f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5d0784b9b5296bda801add034b057ad68237f7 commit 3e5d0784b9b5296bda801add034b057ad68237f7 Author: Alexander V. Chernikov AuthorDate: 2023-04-14 15:25:50 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-14 15:47:55 +0000 Testing: add framework for the kernel unit tests. This changes intends to reduce the bar to the kernel unit-testing by introducing a new kernel-testing framework ("ktest") based on Netlink, loadable test modules and python test suite integration. This framework provides the following features: * Integration to the FreeBSD test suite * Automatic test discovery * Automatic test module loading * Minimal boiler-plate code in both kernel and userland * Passing any metadata to the test * Convenient environment pre-setup using python testing framework * Streaming messages from the kernel to the userland * Running tests in the dedicated taskqueues * Skipping or parametrizing tests Differential Revision: https://reviews.freebsd.org/D39385 MFC after: 2 weeks --- sys/modules/ktest/Makefile | 7 + sys/modules/ktest/ktest/Makefile | 14 + sys/modules/ktest/ktest_example/Makefile | 13 + sys/tests/ktest.c | 414 ++++++++++++++++++++++++ sys/tests/ktest.h | 141 ++++++++ sys/tests/ktest_example.c | 134 ++++++++ tests/atf_python/Makefile | 2 +- tests/atf_python/atf_pytest.py | 6 + tests/atf_python/ktest.py | 173 ++++++++++ tests/atf_python/sys/netlink/attrs.py | 2 + tests/atf_python/sys/netlink/base_headers.py | 7 + tests/atf_python/sys/netlink/netlink.py | 2 +- tests/atf_python/sys/netlink/netlink_generic.py | 118 +++++++ tests/atf_python/utils.py | 5 + tests/conftest.py | 6 + tests/examples/Makefile | 1 + tests/examples/test_ktest_example.py | 35 ++ 17 files changed, 1078 insertions(+), 2 deletions(-) diff --git a/sys/modules/ktest/Makefile b/sys/modules/ktest/Makefile new file mode 100644 index 000000000000..21c94caabc30 --- /dev/null +++ b/sys/modules/ktest/Makefile @@ -0,0 +1,7 @@ +SYSDIR?=${SRCTOP}/sys +.include "${SYSDIR}/conf/kern.opts.mk" + +SUBDIR= ktest \ + ktest_example + +.include diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile new file mode 100644 index 000000000000..86ed957ac2b7 --- /dev/null +++ b/sys/modules/ktest/ktest/Makefile @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PACKAGE= tests + +SYSDIR?=${SRCTOP}/sys +.include "${SYSDIR}/conf/kern.opts.mk" + +.PATH: ${SYSDIR}/tests + +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 new file mode 100644 index 000000000000..b4a3e778e2ed --- /dev/null +++ b/sys/modules/ktest/ktest_example/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PACKAGE= tests + +SYSDIR?=${SRCTOP}/sys +.include "${SYSDIR}/conf/kern.opts.mk" + +.PATH: ${SYSDIR}/tests + +KMOD= ktest_example +SRCS= ktest_example.c + +.include diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c new file mode 100644 index 000000000000..fcb40130bcef --- /dev/null +++ b/sys/tests/ktest.c @@ -0,0 +1,414 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Alexander V. Chernikov + * + * 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 "opt_netlink.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +struct mtx ktest_mtx; +#define KTEST_LOCK() mtx_lock(&ktest_mtx) +#define KTEST_UNLOCK() mtx_unlock(&ktest_mtx) +#define KTEST_LOCK_ASSERT() mtx_assert(&ktest_mtx, MA_OWNED) + +MTX_SYSINIT(ktest_mtx, &ktest_mtx, "ktest mutex", MTX_DEF); + +struct ktest_module { + struct ktest_module_info *info; + volatile u_int refcount; + TAILQ_ENTRY(ktest_module) entries; +}; +static TAILQ_HEAD(, ktest_module) module_list = TAILQ_HEAD_INITIALIZER(module_list); + +struct nl_ktest_parsed { + char *mod_name; + char *test_name; + struct nlattr *test_meta; +}; + +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct nl_ktest_parsed, _field) + +static const struct nlattr_parser nla_p_get[] = { + { .type = KTEST_ATTR_MOD_NAME, .off = _OUT(mod_name), .cb = nlattr_get_string }, + { .type = KTEST_ATTR_TEST_NAME, .off = _OUT(test_name), .cb = nlattr_get_string }, + { .type = KTEST_ATTR_TEST_META, .off = _OUT(test_meta), .cb = nlattr_get_nla }, +}; +static const struct nlfield_parser nlf_p_get[] = { +}; +NL_DECLARE_PARSER(ktest_parser, struct genlmsghdr, nlf_p_get, nla_p_get); +#undef _IN +#undef _OUT + +static bool +create_reply(struct nl_writer *nw, struct nlmsghdr *hdr, int cmd) +{ + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (false); + + struct genlmsghdr *ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = cmd; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + return (true); +} + +static int +dump_mod_test(struct nlmsghdr *hdr, struct nl_pstate *npt, + struct ktest_module *mod, const struct ktest_test_info *test_info) +{ + struct nl_writer *nw = npt->nw; + + if (!create_reply(nw, hdr, KTEST_CMD_NEWTEST)) + goto enomem; + + nlattr_add_string(nw, KTEST_ATTR_MOD_NAME, mod->info->name); + nlattr_add_string(nw, KTEST_ATTR_TEST_NAME, test_info->name); + nlattr_add_string(nw, KTEST_ATTR_TEST_DESCR, test_info->desc); + + if (nlmsg_end(nw)) + return (0); +enomem: + nlmsg_abort(nw); + return (ENOMEM); +} + +static int +dump_mod_tests(struct nlmsghdr *hdr, struct nl_pstate *npt, + struct ktest_module *mod, struct nl_ktest_parsed *attrs) +{ + for (int i = 0; i < mod->info->num_tests; i++) { + const struct ktest_test_info *test_info = &mod->info->tests[i]; + if (attrs->test_name != NULL && strcmp(attrs->test_name, test_info->name)) + continue; + int error = dump_mod_test(hdr, npt, mod, test_info); + if (error != 0) + return (error); + } + + return (0); +} + +static int +dump_tests(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_ktest_parsed attrs = { }; + struct ktest_module *mod; + int error; + + error = nl_parse_nlmsg(hdr, &ktest_parser, npt, &attrs); + if (error != 0) + return (error); + + hdr->nlmsg_flags |= NLM_F_MULTI; + + KTEST_LOCK(); + TAILQ_FOREACH(mod, &module_list, entries) { + if (attrs.mod_name && strcmp(attrs.mod_name, mod->info->name)) + continue; + error = dump_mod_tests(hdr, npt, mod, &attrs); + if (error != 0) + break; + } + KTEST_UNLOCK(); + + if (!nlmsg_end_dump(npt->nw, error, hdr)) { + //NL_LOG(LOG_DEBUG, "Unable to finalize the dump"); + return (ENOMEM); + } + + return (error); +} + +static int +run_test(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_ktest_parsed attrs = { }; + struct ktest_module *mod; + int error; + + error = nl_parse_nlmsg(hdr, &ktest_parser, npt, &attrs); + if (error != 0) + return (error); + + if (attrs.mod_name == NULL) { + nlmsg_report_err_msg(npt, "KTEST_ATTR_MOD_NAME not set"); + return (EINVAL); + } + + if (attrs.test_name == NULL) { + nlmsg_report_err_msg(npt, "KTEST_ATTR_TEST_NAME not set"); + return (EINVAL); + } + + const struct ktest_test_info *test = NULL; + + KTEST_LOCK(); + TAILQ_FOREACH(mod, &module_list, entries) { + if (strcmp(attrs.mod_name, mod->info->name)) + continue; + + const struct ktest_module_info *info = mod->info; + + for (int i = 0; i < info->num_tests; i++) { + const struct ktest_test_info *test_info = &info->tests[i]; + + if (!strcmp(attrs.test_name, test_info->name)) { + test = test_info; + break; + } + } + break; + } + if (test != NULL) + refcount_acquire(&mod->refcount); + KTEST_UNLOCK(); + + if (test == NULL) + return (ESRCH); + + /* Run the test */ + struct ktest_test_context ctx = { + .npt = npt, + .hdr = hdr, + .buf = npt_alloc(npt, KTEST_MAX_BUF), + .bufsize = KTEST_MAX_BUF, + }; + + if (ctx.buf == NULL) { + //NL_LOG(LOG_DEBUG, "unable to allocate temporary buffer"); + return (ENOMEM); + } + + if (test->parse != NULL && attrs.test_meta != NULL) { + error = test->parse(&ctx, attrs.test_meta); + if (error != 0) + return (error); + } + + hdr->nlmsg_flags |= NLM_F_MULTI; + + KTEST_LOG_LEVEL(&ctx, LOG_INFO, "start running %s", test->name); + error = test->func(&ctx); + KTEST_LOG_LEVEL(&ctx, LOG_INFO, "end running %s", test->name); + + refcount_release(&mod->refcount); + + if (!nlmsg_end_dump(npt->nw, error, hdr)) { + //NL_LOG(LOG_DEBUG, "Unable to finalize the dump"); + return (ENOMEM); + } + + return (error); +} + + +/* USER API */ +static void +register_test_module(struct ktest_module_info *info) +{ + struct ktest_module *mod = malloc(sizeof(*mod), M_TEMP, M_WAITOK | M_ZERO); + + mod->info = info; + info->module_ptr = mod; + KTEST_LOCK(); + TAILQ_INSERT_TAIL(&module_list, mod, entries); + KTEST_UNLOCK(); +} + +static void +unregister_test_module(struct ktest_module_info *info) +{ + struct ktest_module *mod = info->module_ptr; + + info->module_ptr = NULL; + + KTEST_LOCK(); + TAILQ_REMOVE(&module_list, mod, entries); + KTEST_UNLOCK(); + + free(mod, M_TEMP); +} + +static bool +can_unregister(struct ktest_module_info *info) +{ + struct ktest_module *mod = info->module_ptr; + + return (refcount_load(&mod->refcount) == 0); +} + +int +ktest_default_modevent(module_t mod, int type, void *arg) +{ + struct ktest_module_info *info = (struct ktest_module_info *)arg; + int error = 0; + + switch (type) { + case MOD_LOAD: + register_test_module(info); + break; + case MOD_UNLOAD: + if (!can_unregister(info)) + return (EBUSY); + unregister_test_module(info); + break; + default: + error = EOPNOTSUPP; + break; + } + return (error); +} + +bool +ktest_start_msg(struct ktest_test_context *ctx) +{ + return (create_reply(ctx->npt->nw, ctx->hdr, KTEST_CMD_NEWMESSAGE)); +} + +void +ktest_add_msg_meta(struct ktest_test_context *ctx, const char *func, + const char *fname, int line) +{ + struct nl_writer *nw = ctx->npt->nw; + struct timespec ts; + + nanouptime(&ts); + nlattr_add(nw, KTEST_MSG_ATTR_TS, sizeof(ts), &ts); + + nlattr_add_string(nw, KTEST_MSG_ATTR_FUNC, func); + nlattr_add_string(nw, KTEST_MSG_ATTR_FILE, fname); + nlattr_add_u32(nw, KTEST_MSG_ATTR_LINE, line); +} + +void +ktest_add_msg_text(struct ktest_test_context *ctx, int msg_level, + const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vsnprintf(ctx->buf, ctx->bufsize, fmt, ap); + va_end(ap); + + nlattr_add_u8(ctx->npt->nw, KTEST_MSG_ATTR_LEVEL, msg_level); + nlattr_add_string(ctx->npt->nw, KTEST_MSG_ATTR_TEXT, ctx->buf); +} + +void +ktest_end_msg(struct ktest_test_context *ctx) +{ + nlmsg_end(ctx->npt->nw); +} + +/* Module glue */ + +static const struct nlhdr_parser *all_parsers[] = { &ktest_parser }; + +static const struct genl_cmd ktest_cmds[] = { + { + .cmd_num = KTEST_CMD_LIST, + .cmd_name = "KTEST_CMD_LIST", + .cmd_cb = dump_tests, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + }, + { + .cmd_num = KTEST_CMD_RUN, + .cmd_name = "KTEST_CMD_RUN", + .cmd_cb = run_test, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_KLD_LOAD, + }, +}; + +static void +ktest_nl_register(void) +{ + bool ret __diagused; + int family_id __diagused; + + NL_VERIFY_PARSERS(all_parsers); + family_id = genl_register_family(KTEST_FAMILY_NAME, 0, 1, KTEST_CMD_MAX); + MPASS(family_id != 0); + + ret = genl_register_cmds(KTEST_FAMILY_NAME, ktest_cmds, NL_ARRAY_LEN(ktest_cmds)); + MPASS(ret); +} + +static void +ktest_nl_unregister(void) +{ + MPASS(TAILQ_EMPTY(&module_list)); + + genl_unregister_family(KTEST_FAMILY_NAME); +} + +static int +ktest_modevent(module_t mod, int type, void *unused) +{ + int error = 0; + + switch (type) { + case MOD_LOAD: + ktest_nl_register(); + break; + case MOD_UNLOAD: + ktest_nl_unregister(); + break; + default: + error = EOPNOTSUPP; + break; + } + return (error); +} + +static moduledata_t ktestmod = { + "ktest", + ktest_modevent, + 0 +}; + +DECLARE_MODULE(ktestmod, ktestmod, SI_SUB_PSEUDO, SI_ORDER_ANY); +MODULE_VERSION(ktestmod, 1); +MODULE_DEPEND(ktestmod, netlink, 1, 1, 1); + diff --git a/sys/tests/ktest.h b/sys/tests/ktest.h new file mode 100644 index 000000000000..feadb800551b --- /dev/null +++ b/sys/tests/ktest.h @@ -0,0 +1,141 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Alexander V. Chernikov + * + * 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 SYS_TESTS_KTEST_H_ +#define SYS_TESTS_KTEST_H_ + +#ifdef _KERNEL + +#include +#include +#include +#include + +struct nlattr; +struct nl_pstate; +struct nlmsghdr; + +struct ktest_test_context { + void *arg; + struct nl_pstate *npt; + struct nlmsghdr *hdr; + char *buf; + size_t bufsize; +}; + +typedef int (*ktest_run_t)(struct ktest_test_context *ctx); +typedef int (*ktest_parse_t)(struct ktest_test_context *ctx, struct nlattr *container); + +struct ktest_test_info { + const char *name; + const char *desc; + ktest_run_t func; + ktest_parse_t parse; +}; + +struct ktest_module_info { + const char *name; + const struct ktest_test_info *tests; + int num_tests; + void *module_ptr; +}; + +int ktest_default_modevent(module_t mod, int type, void *arg); + +bool ktest_start_msg(struct ktest_test_context *ctx); +void ktest_add_msg_meta(struct ktest_test_context *ctx, const char *func, + const char *fname, int line); +void ktest_add_msg_text(struct ktest_test_context *ctx, int msg_level, + const char *fmt, ...); +void ktest_end_msg(struct ktest_test_context *ctx); + +#define KTEST_LOG_LEVEL(_ctx, _l, _fmt, ...) { \ + if (ktest_start_msg(_ctx)) { \ + ktest_add_msg_meta(_ctx, __func__, __FILE__, __LINE__); \ + ktest_add_msg_text(_ctx, _l, _fmt, ## __VA_ARGS__); \ + ktest_end_msg(_ctx); \ + } \ +} + +#define KTEST_LOG(_ctx, _fmt, ...) \ + KTEST_LOG_LEVEL(_ctx, LOG_DEBUG, _fmt, ## __VA_ARGS__) + +#define KTEST_MAX_BUF 512 + +#define KTEST_MODULE_DECLARE(_n, _t) \ +static struct ktest_module_info _module_info = { \ + .name = #_n, \ + .tests = _t, \ + .num_tests = nitems(_t), \ +}; \ + \ +static moduledata_t _module_data = { \ + "__" #_n "_module", \ + ktest_default_modevent, \ + &_module_info, \ +}; \ + \ +DECLARE_MODULE(ktest_##_n, _module_data, SI_SUB_PSEUDO, SI_ORDER_ANY); \ +MODULE_VERSION(ktest_##_n, 1); \ +MODULE_DEPEND(ktest_##_n, ktestmod, 1, 1, 1); \ + +#endif /* _KERNEL */ + +/* genetlink definitions */ +#define KTEST_FAMILY_NAME "ktest" + +/* commands */ +enum { + KTEST_CMD_UNSPEC = 0, + KTEST_CMD_LIST = 1, + KTEST_CMD_RUN = 2, + KTEST_CMD_NEWTEST = 3, + KTEST_CMD_NEWMESSAGE = 4, + __KTEST_CMD_MAX, +}; +#define KTEST_CMD_MAX (__KTEST_CMD_MAX - 1) + +enum ktest_attr_type_t { + KTEST_ATTR_UNSPEC, + KTEST_ATTR_MOD_NAME = 1, /* string: test module name */ + KTEST_ATTR_TEST_NAME = 2, /* string: test name */ + KTEST_ATTR_TEST_DESCR = 3, /* string: test description */ + KTEST_ATTR_TEST_META = 4, /* nested: container with test-specific metadata */ +}; + +enum ktest_msg_attr_type_t { + KTEST_MSG_ATTR_UNSPEC, + KTEST_MSG_ATTR_TS = 1, /* struct timespec */ + KTEST_MSG_ATTR_FUNC = 2, /* string: function name */ + KTEST_MSG_ATTR_FILE = 3, /* string: file name */ + KTEST_MSG_ATTR_LINE = 4, /* u32: line in the file */ + KTEST_MSG_ATTR_TEXT = 5, /* string: actual message data */ + KTEST_MSG_ATTR_LEVEL = 6, /* u8: syslog loglevel */ + KTEST_MSG_ATTR_META = 7, /* nested: message metadata */ +}; + +#endif diff --git a/sys/tests/ktest_example.c b/sys/tests/ktest_example.c new file mode 100644 index 000000000000..7cccaad7a855 --- /dev/null +++ b/sys/tests/ktest_example.c @@ -0,0 +1,134 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Alexander V. Chernikov + * + * 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 + + +static int +test_something(struct ktest_test_context *ctx) +{ + KTEST_LOG(ctx, "I'm here, [%s]", __func__); + + pause("sleeping...", hz / 10); + + KTEST_LOG(ctx, "done"); + + return (0); +} + +static int +test_something_else(struct ktest_test_context *ctx) +{ + return (0); +} + +static int +test_failed(struct ktest_test_context *ctx) +{ + return (EBUSY); +} + +static int +test_failed2(struct ktest_test_context *ctx) +{ + KTEST_LOG(ctx, "failed because it always fails"); + return (EBUSY); +} + +#include +#include +#include + +struct test1_attrs { + uint32_t arg1; + uint32_t arg2; + char *text; +}; + +#define _OUT(_field) offsetof(struct test1_attrs, _field) +static const struct nlattr_parser nla_p_test1[] = { + { .type = 1, .off = _OUT(arg1), .cb = nlattr_get_uint32 }, + { .type = 2, .off = _OUT(arg2), .cb = nlattr_get_uint32 }, + { .type = 3, .off = _OUT(text), .cb = nlattr_get_string }, +}; +#undef _OUT +NL_DECLARE_ATTR_PARSER(test1_parser, nla_p_test1); + +static int +test_with_params_parser(struct ktest_test_context *ctx, struct nlattr *nla) +{ + struct test1_attrs *attrs = npt_alloc(ctx->npt, sizeof(*attrs)); + + ctx->arg = attrs; + if (attrs != NULL) + return (nl_parse_nested(nla, &test1_parser, ctx->npt, attrs)); + return (ENOMEM); +} + +static int +test_with_params(struct ktest_test_context *ctx) +{ + struct test1_attrs *attrs = ctx->arg; + + if (attrs->text != NULL) + KTEST_LOG(ctx, "Get '%s'", attrs->text); + KTEST_LOG(ctx, "%u + %u = %u", attrs->arg1, attrs->arg2, + attrs->arg1 + attrs->arg2); + return (0); +} + +static const struct ktest_test_info tests[] = { + { + .name = "test_something", + .desc = "example description", + .func = &test_something, + }, + { + .name = "test_something_else", + .desc = "example description 2", + .func = &test_something_else, + }, + { + .name = "test_failed", + .desc = "always failing test", + .func = &test_failed, + }, + { + .name = "test_failed2", + .desc = "always failing test", + .func = &test_failed2, + }, + { + .name = "test_with_params", + .desc = "test summing integers", + .func = &test_with_params, + .parse = &test_with_params_parser, + }, +}; +KTEST_MODULE_DECLARE(ktest_example, tests); diff --git a/tests/atf_python/Makefile b/tests/atf_python/Makefile index 1a2fec387eda..889cdcdf9592 100644 --- a/tests/atf_python/Makefile +++ b/tests/atf_python/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR} -FILES= __init__.py atf_pytest.py utils.py +FILES= __init__.py atf_pytest.py ktest.py utils.py SUBDIR= sys .include diff --git a/tests/atf_python/atf_pytest.py b/tests/atf_python/atf_pytest.py index 0dd3a225b73d..19b5f88fa200 100644 --- a/tests/atf_python/atf_pytest.py +++ b/tests/atf_python/atf_pytest.py @@ -6,6 +6,7 @@ from typing import NamedTuple from typing import Optional from typing import Tuple +from atf_python.ktest import generate_ktests from atf_python.utils import nodeid_to_method_name import pytest @@ -42,6 +43,8 @@ class ATFTestObj(object): def _get_test_description(self, obj): """Returns first non-empty line from func docstring or func name""" + if getattr(obj, "descr", None) is not None: + return getattr(obj, "descr") docstr = obj.function.__doc__ if docstr: for line in docstr.split("\n"): @@ -163,6 +166,9 @@ class ATFHandler(object): items.clear() items.extend(new_items) + def expand_tests(self, collector, name, obj): + return generate_ktests(collector, name, obj) + def modify_tests(self, items, config): if config.option.atf_cleanup: self._generate_test_cleanups(items) diff --git a/tests/atf_python/ktest.py b/tests/atf_python/ktest.py new file mode 100644 index 000000000000..4cd9970aaec1 --- /dev/null +++ b/tests/atf_python/ktest.py @@ -0,0 +1,173 @@ +import logging +import time +from typing import NamedTuple + +import pytest +from atf_python.sys.netlink.attrs import NlAttrNested +from atf_python.sys.netlink.attrs import NlAttrStr +from atf_python.sys.netlink.netlink import NetlinkMultipartIterator +from atf_python.sys.netlink.netlink import NlHelper +from atf_python.sys.netlink.netlink import Nlsock +from atf_python.sys.netlink.netlink_generic import KtestAttrType +from atf_python.sys.netlink.netlink_generic import KtestInfoMessage +from atf_python.sys.netlink.netlink_generic import KtestLogMsgType +from atf_python.sys.netlink.netlink_generic import KtestMsgAttrType +from atf_python.sys.netlink.netlink_generic import KtestMsgType +from atf_python.sys.netlink.netlink_generic import timespec +from atf_python.sys.netlink.utils import NlConst +from atf_python.utils import BaseTest +from atf_python.utils import libc +from atf_python.utils import nodeid_to_method_name + + +datefmt = "%H:%M:%S" +fmt = "%(asctime)s.%(msecs)03d %(filename)s:%(funcName)s:%(lineno)d %(message)s" +logging.basicConfig(level=logging.DEBUG, format=fmt, datefmt=datefmt) +logger = logging.getLogger("ktest") + + +NETLINK_FAMILY = "ktest" + + +class KtestItem(pytest.Item): + def __init__(self, *, descr, kcls, **kwargs): + super().__init__(**kwargs) + self.descr = descr + self._kcls = kcls + + def runtest(self): + self._kcls().runtest() + + +class KtestCollector(pytest.Class): + def collect(self): + obj = self.obj + exclude_names = set([n for n in dir(obj) if not n.startswith("_")]) + + autoload = obj.KTEST_MODULE_AUTOLOAD + module_name = obj.KTEST_MODULE_NAME + loader = KtestLoader(module_name, autoload) + ktests = loader.load_ktests() + if not ktests: + return + + orig = pytest.Class.from_parent(self.parent, name=self.name, obj=obj) + for py_test in orig.collect(): + yield py_test + + for ktest in ktests: + name = ktest["name"] + descr = ktest["desc"] + if name in exclude_names: + continue + yield KtestItem.from_parent(self, name=name, descr=descr, kcls=obj) + + +class KtestLoader(object): + def __init__(self, module_name: str, autoload: bool): + self.module_name = module_name + self.autoload = autoload + self.helper = NlHelper() + self.nlsock = Nlsock(NlConst.NETLINK_GENERIC, self.helper) + self.family_id = self._get_family_id() + + def _get_family_id(self): + try: + family_id = self.nlsock.get_genl_family_id(NETLINK_FAMILY) + except ValueError: + if self.autoload: + libc.kldload(self.module_name) + family_id = self.nlsock.get_genl_family_id(NETLINK_FAMILY) + else: + raise + return family_id + + def _load_ktests(self): + msg = KtestInfoMessage(self.helper, self.family_id, KtestMsgType.KTEST_CMD_LIST) + msg.set_request() + msg.add_nla(NlAttrStr(KtestAttrType.KTEST_ATTR_MOD_NAME, self.module_name)) + self.nlsock.write_message(msg, verbose=False) + nlmsg_seq = msg.nl_hdr.nlmsg_seq + + ret = [] + for rx_msg in NetlinkMultipartIterator(self.nlsock, nlmsg_seq, self.family_id): + # test_msg.print_message() + tst = { + "mod_name": rx_msg.get_nla(KtestAttrType.KTEST_ATTR_MOD_NAME).text, + "name": rx_msg.get_nla(KtestAttrType.KTEST_ATTR_TEST_NAME).text, + "desc": rx_msg.get_nla(KtestAttrType.KTEST_ATTR_TEST_DESCR).text, + } + ret.append(tst) + return ret + + def load_ktests(self): + ret = self._load_ktests() + if not ret and self.autoload: + libc.kldload(self.module_name) + ret = self._load_ktests() + return ret + + +def generate_ktests(collector, name, obj): + if getattr(obj, "KTEST_MODULE_NAME", None) is not None: + return KtestCollector.from_parent(collector, name=name, obj=obj) + return None + + +class BaseKernelTest(BaseTest): + KTEST_MODULE_AUTOLOAD = True + KTEST_MODULE_NAME = None + + def _get_record_time(self, msg) -> float: + timespec = msg.get_nla(KtestMsgAttrType.KTEST_MSG_ATTR_TS).ts + epoch_ktime = timespec.tv_sec * 1.0 + timespec.tv_nsec * 1.0 / 1000000000 + if not hasattr(self, "_start_epoch"): + self._start_ktime = epoch_ktime + self._start_time = time.time() + epoch_time = self._start_time + else: + epoch_time = time.time() - self._start_time + epoch_ktime *** 315 LINES SKIPPED *** From nobody Fri Apr 14 16:33:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pyhpt6HQwz45Y67; Fri, 14 Apr 2023 16:33: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 4Pyhpt5kMYz3kj1; Fri, 14 Apr 2023 16:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681490038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDx96qzQ2GpO6rvTIDmL5mn1j8kBgNoGVQIPiMgx0eU=; b=GSkVEoy7D+97xo5J0yKBDTM8ZrP6vkrliF9Prz1sMSty6Pxy0P/rLmtcQhfGcmCX6rwti5 fQoOFWpo4l34cDZmzE3F2gWFlg/L/gMsy2hHZ5gyS71Z4fPlHhT2VDKlb14hTRsiAhrpYu YtF8wJvIQzAGBB6c5i8vly14F+GVcgqfDGi2lpvjlaRdhUEI9APClQvRQ25M92KYmTEnFG RNg0t8rVdq3z323KMirbit96hja1MzZcvZ4EKhc9/BNKg6jIlfWsKHkWsSvwWA1RbpU8SR 8T9MPHr+xGxC3/xxJ6j/0vgieCWPFNqM7CG69lgxMUx5l7LqpijXIZ5NmqJzOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681490038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDx96qzQ2GpO6rvTIDmL5mn1j8kBgNoGVQIPiMgx0eU=; b=lQymZiMfaonx9bGa9ik8dEQcD0mSITe+1ZJYBNRsWqgQBMm1kh/sSx5EfzNA1ImHx6Yu/U cl2eoVKWZOwM+9j6vTRLAhpe178OzE2Por0q7iQo8Xr67HRgSfNp4Xh+1rBs6t5MKKLvZ4 FR/CA9hFZ0xCPZEQxEu6Q23eyRO81uaSOWltZFpIGbrBhZ8StTJVdHsuF2TxbrxrW20vAG OlF1fOGIfmJFxUkbqaAzn+RWqrm17NB0RqEPMr9dNQC/Hv8f17erj7ReEgz2tWyS8HHry1 ehyTuMAtjpZwtb0OLeLE0Ivb5XTdrx4U5IZFcwhyArdikfI/OEXkQFG33T7TqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681490038; a=rsa-sha256; cv=none; b=VIAI8IEtnE4KwafLI2CskYR687uHeh58lna4Lpi95BDCVfpsYnpvjEHoWklGdCfyQaKoq3 KTG3LvCBnc8JSvyJg3qELzi1h7Rln0ctGPDOgCPfFZAfFNvZpcJv9qGtKQcLh7R+D7S8JP P7vjFgVgCvlKWu8zGTPzKwbw/fd/4QNtCmNTzLItxxm1o2WH82ronMpTh8eJA3xvBmC1fu AwkGJTe3tT/Hh16Icw7+gU4lwdiNMrcoTP6+yWcuPw7rHSwf5duLpdnr48I7zbwUWv/z2r PtD43MA6WFVu+rPjaJYLgznYPJcVyLxeS8Yp7AP0JhMaiopv7sHkvjYjML0sRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pyhpt4qNbzX81; Fri, 14 Apr 2023 16:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EGXwpZ038428; Fri, 14 Apr 2023 16:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EGXwRT038427; Fri, 14 Apr 2023 16:33:58 GMT (envelope-from git) Date: Fri, 14 Apr 2023 16:33:58 GMT Message-Id: <202304141633.33EGXwRT038427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9f324d8ac27d - main - netlink: make netlink work correctly on CHERI. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f324d8ac27d18a81dd1bb703b5f682857bfc37d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9f324d8ac27d18a81dd1bb703b5f682857bfc37d commit 9f324d8ac27d18a81dd1bb703b5f682857bfc37d Author: Alexander V. Chernikov AuthorDate: 2023-04-13 11:53:49 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-14 16:33:43 +0000 netlink: make netlink work correctly on CHERI. Current Netlink message writer code relies on executing callbacks with arbitrary data (pointer or integer) to flush the completed messages. This arbitrary data is stored as a union of { void *, uint64_t }. At some stage, the message flushing code copied this data, using direct uint64_t assignment instead of copying the union. It lead to failure on CHERI, as sizeof(pointer) == 16 there. Fix the code by making union non-anonymous and copying it entirely. Reviewed by: br, jhb, jrtc27 Differential Revision: https://reviews.freebsd.org/D39557 MFC after: 2 weeks --- sys/netlink/netlink_message_writer.c | 39 +++++++++++++++++++----------------- sys/netlink/netlink_message_writer.h | 9 ++++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 884295939ce5..ef568ecbca07 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -116,7 +116,7 @@ nlmsg_get_ns_buf(struct nl_writer *nw, int size, bool waitok) static bool nlmsg_write_socket_buf(struct nl_writer *nw, void *buf, int datalen, int cnt) { - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg.ptr); if (__predict_false(datalen == 0)) { free(buf, M_NETLINK); return (true); @@ -132,13 +132,14 @@ nlmsg_write_socket_buf(struct nl_writer *nw, void *buf, int datalen, int cnt) free(buf, M_NETLINK); int io_flags = (nw->ignore_limit) ? NL_IOF_IGNORE_LIMIT : 0; - return (nl_send_one(m, (struct nlpcb *)(nw->arg_ptr), cnt, io_flags)); + return (nl_send_one(m, (struct nlpcb *)(nw->arg.ptr), cnt, io_flags)); } static bool nlmsg_write_group_buf(struct nl_writer *nw, void *buf, int datalen, int cnt) { - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg_ptr); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d proto: %d id: %d", buf, datalen, + nw->arg.group.proto, nw->arg.group.id); if (__predict_false(datalen == 0)) { free(buf, M_NETLINK); return (true); @@ -155,15 +156,15 @@ nlmsg_write_group_buf(struct nl_writer *nw, void *buf, int datalen, int cnt) if (!success) return (false); - nl_send_group(m, cnt, nw->arg_uint >> 16, nw->arg_uint & 0xFFFF); + nl_send_group(m, cnt, nw->arg.group.proto, nw->arg.group.id); return (true); } static bool nlmsg_write_chain_buf(struct nl_writer *nw, void *buf, int datalen, int cnt) { - struct mbuf **m0 = (struct mbuf **)(nw->arg_ptr); - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg_ptr); + struct mbuf **m0 = (struct mbuf **)(nw->arg.ptr); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg.ptr); if (__predict_false(datalen == 0)) { free(buf, M_NETLINK); @@ -227,7 +228,7 @@ static bool nlmsg_write_socket_mbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) { struct mbuf *m = (struct mbuf *)buf; - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg_ptr); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg.ptr); if (__predict_false(datalen == 0)) { m_freem(m); @@ -237,14 +238,15 @@ nlmsg_write_socket_mbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) m->m_pkthdr.len = datalen; m->m_len = datalen; int io_flags = (nw->ignore_limit) ? NL_IOF_IGNORE_LIMIT : 0; - return (nl_send_one(m, (struct nlpcb *)(nw->arg_ptr), cnt, io_flags)); + return (nl_send_one(m, (struct nlpcb *)(nw->arg.ptr), cnt, io_flags)); } static bool nlmsg_write_group_mbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) { struct mbuf *m = (struct mbuf *)buf; - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg_ptr); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d proto: %d id: %d", buf, datalen, + nw->arg.group.proto, nw->arg.group.id); if (__predict_false(datalen == 0)) { m_freem(m); @@ -253,7 +255,7 @@ nlmsg_write_group_mbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) m->m_pkthdr.len = datalen; m->m_len = datalen; - nl_send_group(m, cnt, nw->arg_uint >> 16, nw->arg_uint & 0xFFFF); + nl_send_group(m, cnt, nw->arg.group.proto, nw->arg.group.id); return (true); } @@ -261,9 +263,9 @@ static bool nlmsg_write_chain_mbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) { struct mbuf *m_new = (struct mbuf *)buf; - struct mbuf **m0 = (struct mbuf **)(nw->arg_ptr); + struct mbuf **m0 = (struct mbuf **)(nw->arg.ptr); - NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg_ptr); + NL_LOG(LOG_DEBUG2, "IN: ptr: %p len: %d arg: %p", buf, datalen, nw->arg.ptr); if (__predict_false(datalen == 0)) { m_freem(m_new); @@ -324,7 +326,7 @@ nlmsg_write_socket_lbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) { struct linear_buffer *lb = (struct linear_buffer *)buf; char *data = (char *)(lb + 1); - struct nlpcb *nlp = (struct nlpcb *)(nw->arg_ptr); + struct nlpcb *nlp = (struct nlpcb *)(nw->arg.ptr); if (__predict_false(datalen == 0)) { free(buf, M_NETLINK); @@ -365,7 +367,7 @@ nlmsg_write_group_lbuf(struct nl_writer *nw, void *buf, int datalen, int cnt) m_append(m, datalen, data); free(buf, M_NETLINK); - nl_send_group(m, cnt, nw->arg_uint >> 16, nw->arg_uint & 0xFFFF); + nl_send_group(m, cnt, nw->arg.group.proto, nw->arg.group.id); return (true); } @@ -440,7 +442,7 @@ _nlmsg_get_unicast_writer(struct nl_writer *nw, int size, struct nlpcb *nlp) { if (!nlmsg_get_buf(nw, size, false, nlp->nl_linux)) return (false); - nw->arg_ptr = (void *)nlp; + nw->arg.ptr = (void *)nlp; nw->writer_target = NS_WRITER_TARGET_SOCKET; nlmsg_set_callback(nw); return (true); @@ -451,7 +453,8 @@ _nlmsg_get_group_writer(struct nl_writer *nw, int size, int protocol, int group_ { if (!nlmsg_get_buf(nw, size, false, false)) return (false); - nw->arg_uint = (uint64_t)protocol << 16 | (uint64_t)group_id; + nw->arg.group.proto = protocol; + nw->arg.group.id = group_id; nw->writer_target = NS_WRITER_TARGET_GROUP; nlmsg_set_callback(nw); return (true); @@ -463,7 +466,7 @@ _nlmsg_get_chain_writer(struct nl_writer *nw, int size, struct mbuf **pm) if (!nlmsg_get_buf(nw, size, false, false)) return (false); *pm = NULL; - nw->arg_ptr = (void *)pm; + nw->arg.ptr = (void *)pm; nw->writer_target = NS_WRITER_TARGET_CHAIN; nlmsg_set_callback(nw); NL_LOG(LOG_DEBUG3, "setup cb %p (need %p)", nw->cb, &nlmsg_write_chain_mbuf); @@ -542,7 +545,7 @@ _nlmsg_refill_buffer(struct nl_writer *nw, int required_len) /* Update callback data */ ns_new.writer_target = nw->writer_target; nlmsg_set_callback(&ns_new); - ns_new.arg_uint = nw->arg_uint; + ns_new.arg = nw->arg; /* Copy last (unfinished) header to the new storage */ int last_len = nw->offset - completed_len; diff --git a/sys/netlink/netlink_message_writer.h b/sys/netlink/netlink_message_writer.h index 91dbc9bb1312..57fc1bf342ea 100644 --- a/sys/netlink/netlink_message_writer.h +++ b/sys/netlink/netlink_message_writer.h @@ -49,9 +49,12 @@ struct nl_writer { void *_storage; /* Underlying storage pointer */ nl_writer_cb *cb; /* Callback to flush data */ union { - void *arg_ptr; /* Callback argument as pointer */ - uint64_t arg_uint; /* Callback argument as int */ - }; + void *ptr; + struct { + uint16_t proto; + uint16_t id; + } group; + } arg; int num_messages; /* Number of messages in the buffer */ int malloc_flag; /* M_WAITOK or M_NOWAIT */ uint8_t writer_type; /* NS_WRITER_TYPE_* */ From nobody Fri Apr 14 17:31:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pyk5h1yG3z45fL0; Fri, 14 Apr 2023 17:31: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 4Pyk5h0d9qz4P48; Fri, 14 Apr 2023 17:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681493512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3kn/IkTDvMCPuwGiLvnJX1+h5SSNQnAKMOpdePdpXg=; b=jLCXtZCb+wiDxqucXPj7aKBKg+2nrIFkTIC8sya7Phzpx4K6YxgleCCs1Xig4PguDhQ6GE qXHoGzJSA7UJRm6W1h08YixTdvRz4hJeV2mOno3zudiBRGaqkpnxHmioVX5Fze80EvHM/i ublxItEG1UuHNPvQjkdHleWHt6JWcxtnXa0jS8cl1PtyRFdmQPLUtIZguOJWmU8VHqhvvf qu8UO4BXQ+suqzHGXeTHJIsxQN1/blVWhtA4SdyzgPeulXaKGQmGLeszNjXoCPkWgA39zh f/LBzyMk97zCar29A6A1Qwswx8Kcyh91nfsA7zZs1w+U0WR5hVDdT06Yv1RNyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681493512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3kn/IkTDvMCPuwGiLvnJX1+h5SSNQnAKMOpdePdpXg=; b=X1K/eAZX8QQiGq+tnLV5Etw1OAGp2xKn9+P7Uoa6vfbqRXThsILOPFfZc/e3VGKy/XZgHi 8BYAQWfu/E8I0Brhwqq6cDM3AjwkhTFpEGnM+rXAHdtuj+MeAuLoio9Xcl//pr+ZHxngSC g5PL9Dq0C/LQmMI58CBz1R0ef9yjJFJNKBU+oNHL+gtHkj30PPeaCpR61eapRR9NXE7VKf nzu5A2jczfTSbarBioC6fAL+9pjxsIV/QxiwKZSuM+3fl5O50p5As/oYGw9/bBmMjQtvfk 4jv2P303pRa1nInUA5KjxqAYcHsDCR+8m/K7E8l1wKRfqRicDe+aiSySo7c6qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681493512; a=rsa-sha256; cv=none; b=xqkUpII0hqKPSAx1w0EVLMmk98wkpnOca75qU5u/0ANFdM/9wE73ynDV+QsS7+MK/4nBLo Qw2mDx64KO9wPjMrb0VZI3/Q8M4VnQJN4t9GzkogN7PrvUOBJPFjvAJJSlqN0kd1exn2cy CDLMX4h3Uoyd6pL8vAEn8K9+t2+nZru8mpP2roTzOXw4163UC0Aux0K2rIS5HbcRjfJ4n/ tJAlZpCRWI/aw8ZykrWnWrCPAz3+/0WWWX3vWrdIELd9o3KBh/vZya9LOWk/Oj2hDnz0Z2 mIzBiHQqVRfWY4geaR6AhrXbuOLXQB8Mr7x5rGVI12kLsrbI45b3ravSqSB4lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pyk5g6rh1zYFn; Fri, 14 Apr 2023 17:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EHVphZ034599; Fri, 14 Apr 2023 17:31:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EHVpO6034598; Fri, 14 Apr 2023 17:31:51 GMT (envelope-from git) Date: Fri, 14 Apr 2023 17:31:51 GMT Message-Id: <202304141731.33EHVpO6034598@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: 5dbd073b045c - main - awk: errror on printf format strings lacking conversion specifier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5dbd073b045c8e98730c025a4acf2279be26c33e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5dbd073b045c8e98730c025a4acf2279be26c33e commit 5dbd073b045c8e98730c025a4acf2279be26c33e Author: Ed Maste AuthorDate: 2023-04-14 14:49:05 +0000 Commit: Ed Maste CommitDate: 2023-04-14 17:31:02 +0000 awk: errror on printf format strings lacking conversion specifier Reported by: phk Reviewed by: imp, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39573 --- contrib/one-true-awk/run.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 117fb0748bd8..b81dafba35e6 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -912,6 +912,9 @@ int format(char **pbuf, int *pbufsize, const char *s, Node *a) /* printf-like co case 'c': flag = 'c'; break; + case '\0': + FATAL("missing printf conversion specifier"); + break; default: WARNING("weird printf conversion %s", fmt); flag = '?'; From nobody Fri Apr 14 19:43:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pyn1p4NhFz44f3F; Fri, 14 Apr 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 4Pyn1p3gJNz3M0r; Fri, 14 Apr 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=1681501422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=le26jD+qmXrAzZiJofhY7sHoHtuO2j8mu58V+Bb9DkY=; b=O334CZdZocTkRMemNr8onpdQuaIyvtkmx8gi0QiVIrh1e9zELy0Ktg2O/deqF9XAD+GFEY yb2jJVFaW5cP6gwQ23clg1Iy/2M0iQ9sLQoyDtrt4tczoxFTSoy0kzDrs3XQq7HfCOX5uv +/RaqIT6SoM7bjMgV/fQ1osfCFKx0i2VVKA72ZIcBJielnj7yipC51faAUpVbIaYaVDB9G wNHNUNep3z3xKJPNOpGUNp+vPVw/uBSpAQ6FG7D7MRGEEFI4yy28tIlIADaErHTD2QDsyh 1lV/GduKdTjGnbFDQYEmK0pc/DHdnF/0jhnpsuTl3KZ4vcLif8G4BaQJoVKP8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681501422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=le26jD+qmXrAzZiJofhY7sHoHtuO2j8mu58V+Bb9DkY=; b=glHNt5SP+AeRT/YIqyf4CsyG52Y8Vux2wbINXwBzmjw54AxPllMEa8JSXJkz2khQVzOJv3 erDqTsqPC/OXBOb16qh7jfVODeqgDRZh/JF0TWRNtApXSxlHRZLTAle6BywxBasbasPRQL hZ2nUIJtNAaZuFAGuWdhhTF3Jr/zYkiLKI3fLa8hUprtl+HjAhNSihYkdZ2oCe7CxpHsj3 VR9AAPJ8CR8X5keaUDfV4N/iC/z1R6hSagvrZLLSMJpkgC0IWvc2fB54KLsK/TgzPhRw/c DTV6Cm/97d3FNeeAfPW9Ao+CtCDBGJgSbwnmZN6EwPDTnZF1GrPLujVIoI+Q8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681501422; a=rsa-sha256; cv=none; b=nJxzNVHW/mQEkB+ioqJbp0arL/sn2sM9Vffb4jr7YEWAzo5uEMW0nPKnuEGKkSRuAeU9yi ld9XQxsvpsc1pHQh4CHpHiCLGtcEj8OE59E6egcNw6lOCYU2bQM0M4gf7zP/eQy1f9IPP1 1T7JFX60zcUkt/FG9o9Ss+iy/PUa09rE7IzsiugIaimL0gMSbeKtLTR/5pBIh33v4KYdm0 ty4kykfVU4U9KiNSDgGmYHz+AdpK9US+FaJf9yvIx+tVTctp4su7lmh2bpqeZ/hMf+q5bC Mcn/f6NhwxdeMKwqSd+dR7G4xfLOZpwiRQ/fdyCb61fRtVkGQVktPLiNghBOlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pyn1p2mtfzd6W; Fri, 14 Apr 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.16.1/8.16.1) with ESMTP id 33EJhgpj051467; Fri, 14 Apr 2023 19:43:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EJhghd051466; Fri, 14 Apr 2023 19:43:42 GMT (envelope-from git) Date: Fri, 14 Apr 2023 19:43:42 GMT Message-Id: <202304141943.33EJhghd051466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 3cc7b6673280 - main - tcp: stack unloading crash in rack and bbr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc7b66732808a5f7f703f4b887fe6c60a3e7d4e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc7b66732808a5f7f703f4b887fe6c60a3e7d4e commit 3cc7b66732808a5f7f703f4b887fe6c60a3e7d4e Author: Randall Stewart AuthorDate: 2023-04-14 19:42:23 +0000 Commit: Randall Stewart CommitDate: 2023-04-14 19:42:23 +0000 tcp: stack unloading crash in rack and bbr Its possible to induce a crash in either rack or bbr. This would be done if the rack stack were say the default and bbr was being used by a connection. If the bbr stack is then unloaded and it was active, we will trigger a MPASS assert in tcp_hpts since the new stack (default rack) would start a timer, and the old stack (bbr) would have the inp already in hpts. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39576 --- sys/netinet/tcp_stacks/bbr.c | 3 +++ sys/netinet/tcp_stacks/rack.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 623b65f2c159..bce17b57205c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -9854,6 +9854,9 @@ bbr_stop_all_timers(struct tcpcb *tp, struct tcp_bbr *bbr) /* We enter in persists, set the flag appropriately */ bbr->rc_in_persist = 1; } + if (tcp_in_hpts(bbr->rc_inp)) { + tcp_hpts_remove(bbr->rc_inp); + } } static void diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a6a15514ff53..7b97a8e9c5d9 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -8113,6 +8113,9 @@ rack_stop_all_timers(struct tcpcb *tp, struct tcp_rack *rack) /* We enter in persists, set the flag appropriately */ rack->rc_in_persist = 1; } + if (tcp_in_hpts(rack->rc_inp)) { + tcp_hpts_remove(rack->rc_inp); + } } static void From nobody Fri Apr 14 20:16:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PynlQ1XMDz44hRq; Fri, 14 Apr 2023 20: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 4PynlQ15bJz3DKc; Fri, 14 Apr 2023 20:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681503378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=45DtQRukQJQEq9xXfkLXmwzBKFDIlb6lo0z04GpeYi4=; b=I9v8flQrUQnHXDad68mLsiasUrODb/2uiLfbYxZrf99sgSr5kXCnao8PTj2CoFQPskvrYu +i84AZBJs55xWc1yTCe8lar9r9LEQi5wz+O/EhCeShYIMVNEmYTnSa9VE1eaKGM5430X9z P9ClUdxasQc/mHGxb6UliYQTDqygTw6KdOVh1QacYVC2nA6eKNztuX31vRd94fnzRDD/LF 2NfJE+uwaoKV5jgB98KRk4lBJbylez+H1taTW3IoNLSONQno+PLc2zqNP6qyiew/HJR6Ge Pg2zKNgO0/BISBcxPIkQr5zBmxuECNAdcDu7hJUppkP3lKvapSNgH6CT7n1PRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681503378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=45DtQRukQJQEq9xXfkLXmwzBKFDIlb6lo0z04GpeYi4=; b=X8Kxgt+jps4ucUkjMymm39ux4vBP1Gin3Dvy8FkbgrcBuKA1dWs7tiVp6F5xcxpF0dw8cc E08WVRDWNCXDL/sHPL++ARVRipDerm0sL+t/yJaUnESBlxSQNuAfT9gSzagrYN3TlgbhB0 VuwzihGD7DvViq3DSwakfbykkB8rGs+AABUfJrIk7U/2QKjepzaxjgwl5F2m8N4dqwJnQA JsQUY0RbpqBJY0Q7tCepFFTiaYYdIM1SISxTbdQu2mgI30Jz2xwx5/X9mmpki8/sKwKnXf vL0WaKwWwIJX/nVEdTC1zxjgdAN42lBAGWub7+W9Rhs5Evd8p6YTZoyFrzjncQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681503378; a=rsa-sha256; cv=none; b=A7UjElHI/dwC6QPCxc4dYb7dzmzIV9NDNVG92GQjEPl9nCXSNxGvn5oQUBiJO1P4p9+Xik +h0VlxjMZvUc7nZfjxsT0Ws4Ukd0kZQ3Rk4erHNupDFKz6KxZC1aLLqO7aikIudTYAhl/P yqT7sgs2AAE0PthbfjUhSZB/U9+xeosf4ETw6LUp1rU6/qEYuLlSf2QrFJaMtXhXnP5Aus jgw3yi3MSeUHE9wnBrnc7Uap5vBRQLLlRT+prp92eR99oDEV/u0LFc9qUdBtphM3KXhzRQ sqW/YEjv5jhRZMTZAF7B4/sQmaemuk4+f6/Mq4MhUrzJW0a60+LgIqeG/OaS5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PynlQ08MRzdfX; Fri, 14 Apr 2023 20:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EKGHJ3000906; Fri, 14 Apr 2023 20:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EKGHen000905; Fri, 14 Apr 2023 20:16:17 GMT (envelope-from git) Date: Fri, 14 Apr 2023 20:16:17 GMT Message-Id: <202304142016.33EKGHen000905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 485f783f882e - main - limits_test: validate CPU time used, not real time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 485f783f882ed026cdbfede89aa7bddad3fffdf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=485f783f882ed026cdbfede89aa7bddad3fffdf3 commit 485f783f882ed026cdbfede89aa7bddad3fffdf3 Author: Eric van Gyzen AuthorDate: 2023-04-14 21:11:29 +0000 Commit: Eric van Gyzen CommitDate: 2023-04-14 21:16:05 +0000 limits_test: validate CPU time used, not real time RLIMIT_CPU applies to CPU time, not real (wall-clock) time. This test failed in AWS, where the real time was 5-7 seconds. Sum the user and system CPU time used, and validate that. While I'm here, don't bother specifying -s exit:0 or -e empty, since those are checked by default. MFC after: 1 week Sponsored by: Dell EMC Isilon --- usr.bin/limits/tests/limits_test.sh | 44 ++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/usr.bin/limits/tests/limits_test.sh b/usr.bin/limits/tests/limits_test.sh index 63f60e8eedf5..195813d322a6 100755 --- a/usr.bin/limits/tests/limits_test.sh +++ b/usr.bin/limits/tests/limits_test.sh @@ -31,30 +31,58 @@ # shell interpretation of time(1) TIME=/usr/bin/time -atf_test_case cputime_hard_flag +validate_time_output() +{ + local time_output=$1 + + # RLIMIT_CPU is enforced by a 1-second timer. Allow 3 + 1 + a little. + atf_check awk ' + /^(user|sys) / { + sum += $2 + } + END { + if (sum < 3 || sum >= 4.5) { + print(sum); + exit(1); + } + } + ' < $time_output +} + +atf_test_case cputime_hard_flag cleanup cputime_hard_flag_body() { - atf_check -e empty -o match:'cputime[[:space:]]+3 secs' -s exit:0 \ + atf_check -o match:'cputime[[:space:]]+3 secs' \ limits -H -t 3 limits -H - atf_check -e empty -o match:'cputime[[:space:]]+3 secs' -s exit:0 \ + atf_check -o match:'cputime[[:space:]]+3 secs' \ limits -H -t 3 limits -S - atf_check -e match:'real[[:space:]]+[34]\.[0-9][0-9]' -o empty -s signal:sigkill \ + atf_check -e save:time_output -s signal:sigkill \ limits -H -t 3 $TIME -p sh -c 'while : ; do : ; done' + validate_time_output time_output +} +cputime_hard_flag_cleanup() +{ + rm -f time_output } SIGXCPU=24 # atf_check doesn't know sigxcpu -atf_test_case cputime_soft_flag +atf_test_case cputime_soft_flag cleanup cputime_soft_flag_body() { - atf_check -e empty -o match:'cputime-max[[:space:]]+infinity secs' -s exit:0 \ + atf_check -o match:'cputime-max[[:space:]]+infinity secs' \ limits -S -t 3 limits -H - atf_check -e empty -o match:'cputime-cur[[:space:]]+3 secs' -s exit:0 \ + atf_check -o match:'cputime-cur[[:space:]]+3 secs' \ limits -S -t 3 limits -S - atf_check -e match:'real[[:space:]]+[34]\.[0-9][0-9]' -o empty -s signal:$SIGXCPU \ + atf_check -e save:time_output -s signal:$SIGXCPU \ limits -S -t 3 $TIME -p sh -c 'while : ; do : ; done' + validate_time_output time_output +} +cputime_soft_flag_cleanup() +{ + rm -f time_output } atf_init_test_cases() From nobody Fri Apr 14 23:54:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PytZn4qYGz454pZ; Fri, 14 Apr 2023 23:54: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 4PytZn454vz4Mcq; Fri, 14 Apr 2023 23:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jnz2Lw5jDilY9pt1FvTjk8HxQP0UgjRJr4HtM0SNx9I=; b=duNQ4LGdj/aoF2wBUVEyuDyEZ66KlVxzXdoEZ8NC7+plfso1JnalbV3FSSYjh49ruVnc9U nOps4wBAF2LhU5kO4LS7vpaXzOJVBjzjKO9s6ph93N7qKCC57fcIM0Yo9/5D3MqOcNjJl3 eRULC0/kiRHOCyoiLm5s2BEAEOZk4HUNTHHGNbhYE8/PAX5dJa3W2WnIM5V2vM+Lp9S+lR QrpmG0zTIv0/lXhGhClyCrx3Mg6oSb9KVWWqkqwbzE56GpSrtzndqd41fDcHQYBjwym2Rd vTkoy7tMvpeoyJAS+qvuIuF3xDWTU9glzsIH50luzAXTdln/cnEAJqm+yPhDhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jnz2Lw5jDilY9pt1FvTjk8HxQP0UgjRJr4HtM0SNx9I=; b=rygl71JzYg5ePzVKOnFR+9KBL6cmvkEmrwkiP9+5LuccV2670GdCUjxBj/XntsbmcX/qoU v+3S2mctJQrJyysPfq3qwHR5nDdrItwdyQBm1QBEYl854fKfF9qRADNwUx6xyzNzp+y86y mXxOdpNdLys0FZq2KsXllrL9dzcBwNxNhN9oNTnf8OhLIIJjvrQYh1EMSA0sfZAscQhbrc IQWu1CPJGyEJYqrAgtOnfZM8u1i/NkHoiJWfzmjcVvqySxEmr7TOMVpuCtPE6tJTVvLYaK kW4ZOMdZGDZJFpKAPv1Xc+vvcIPfubC8bKwaWA26et9IQsSm+SaWXWQx9k/pLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681516449; a=rsa-sha256; cv=none; b=xBeuZQe/9IeglaPPXgAF8/kw3reCoRaThpr6usTUUsNtEj5dTShSAUCClRTvAGIZ0l3+L7 a0e0qVCRw0ZrRdA1AJxk4EeBnHXWvt5GaZOMWxOGoXzCY8ZSk8MXFUxRK1Yr8QIvVM3cGX k074ziObvvk1s10YN1xS766XXCx0a4Ls4XLTWs6qcq+sWdIdLKq8M6/gukBJOz9NX6MnkD Srz16QoAukWcqOhbzhIzip5fGsEEszM7OxT9vk0aam1p9p9UoPTbq5QMA3v+pGMks6+FS8 D+oJEF+LRjKmZ23kvEGxMN5HioOMcZSwePVSWT7AeksCHLy8POAFUHwCO5QY4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PytZn397Vzl74; Fri, 14 Apr 2023 23:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ENs9R4062221; Fri, 14 Apr 2023 23:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ENs9MH062220; Fri, 14 Apr 2023 23:54:09 GMT (envelope-from git) Date: Fri, 14 Apr 2023 23:54:09 GMT Message-Id: <202304142354.33ENs9MH062220@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: 1e0e335b0f0d - main - amd64: fix PKRU and swapout interaction List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e0e335b0f0dbae8ce49307377b23ef3673bd402 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e0e335b0f0dbae8ce49307377b23ef3673bd402 commit 1e0e335b0f0dbae8ce49307377b23ef3673bd402 Author: Konstantin Belousov AuthorDate: 2023-04-13 11:37:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-14 23:53:59 +0000 amd64: fix PKRU and swapout interaction When vm_map_remove() is called from vm_swapout_map_deactivate_pages() due to swapout, PKRU attributes for the removed range must be kept intact. Provide a variant of pmap_remove(), pmap_map_delete(), to allow pmap to distinguish between real removes of the UVA mappings and any other internal removes, e.g. swapout. For non-amd64, pmap_map_delete() is stubbed by define to pmap_remove(). Reported by: andrew Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39556 --- sys/amd64/amd64/pmap.c | 37 ++++++++++++++++++++++++++++--------- sys/amd64/include/pmap.h | 1 + sys/arm/include/pmap.h | 1 + sys/arm64/include/pmap.h | 1 + sys/i386/include/pmap.h | 1 + sys/powerpc/include/pmap.h | 1 + sys/riscv/include/pmap.h | 1 + sys/vm/vm_map.c | 2 +- 8 files changed, 35 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index a31cdb2a8215..e8a88aab3225 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6280,14 +6280,8 @@ pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, return (anyvalid); } -/* - * Remove the given range of addresses from the specified map. - * - * It is assumed that the start and end are properly - * rounded to the page size. - */ -void -pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +static void +pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) { struct rwlock *lock; vm_page_t mt; @@ -6319,7 +6313,8 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) pmap_delayed_invl_start(); PMAP_LOCK(pmap); - pmap_pkru_on_remove(pmap, sva, eva); + if (map_delete) + pmap_pkru_on_remove(pmap, sva, eva); /* * special handling of removing one page. a very @@ -6441,6 +6436,30 @@ out: vm_page_free_pages_toq(&free, true); } +/* + * Remove the given range of addresses from the specified map. + * + * It is assumed that the start and end are properly + * rounded to the page size. + */ +void +pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove1(pmap, sva, eva, false); +} + +/* + * Remove the given range of addresses as part of a logical unmap + * operation. This has the effect of calling pmap_remove(), but + * also clears any metadata that should persist for the lifetime + * of a logical mapping. + */ +void +pmap_map_delete(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove1(pmap, sva, eva, true); +} + /* * Routine: pmap_remove_all * Function: diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index a7e456d80fcf..d74f25cc8024 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -486,6 +486,7 @@ void pmap_force_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void pmap_get_mapping(pmap_t pmap, vm_offset_t va, uint64_t *ptr, int *num); boolean_t pmap_map_io_transient(vm_page_t *, vm_offset_t *, int, boolean_t); void pmap_unmap_io_transient(vm_page_t *, vm_offset_t *, int, boolean_t); +void pmap_map_delete(pmap_t, vm_offset_t, vm_offset_t); void pmap_pti_add_kva(vm_offset_t sva, vm_offset_t eva, bool exec); void pmap_pti_remove_kva(vm_offset_t sva, vm_offset_t eva); void pmap_pti_pcid_invalidate(uint64_t ucr3, uint64_t kcr3); diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h index b16651f789cc..977a1e989b42 100644 --- a/sys/arm/include/pmap.h +++ b/sys/arm/include/pmap.h @@ -45,6 +45,7 @@ extern vm_offset_t virtual_end; void *pmap_kenter_temporary(vm_paddr_t, int); #define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) void pmap_page_set_memattr(vm_page_t, vm_memattr_t); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(void *, vm_size_t); diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 2847fa8dd439..8e3e81f2a5d3 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -154,6 +154,7 @@ int pmap_pinit_stage(pmap_t, enum pmap_stage, int); bool pmap_ps_enabled(pmap_t pmap); uint64_t pmap_to_ttbr0(pmap_t pmap); void pmap_disable_promotion(vm_offset_t sva, vm_size_t size); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void *pmap_mapdev(vm_paddr_t, vm_size_t); void *pmap_mapbios(vm_paddr_t, vm_size_t); diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 1ee13871bc32..87570929e0dd 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -258,6 +258,7 @@ void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void pmap_force_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void *pmap_trm_alloc(size_t size, int flags); void pmap_trm_free(void *addr, size_t size); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void invltlb_glob(void); diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index 5746378c64ee..4ee9b6a67ef6 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -326,6 +326,7 @@ const char *pmap_mmu_name(void); bool pmap_ps_enabled(pmap_t pmap); int pmap_nofault(pmap_t pmap, vm_offset_t va, vm_prot_t flags); boolean_t pmap_page_is_mapped(vm_page_t m); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void pmap_page_array_startup(long count); diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index 04808422c2c2..88579e6448b5 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -57,6 +57,7 @@ #define pmap_page_get_memattr(m) ((m)->md.pv_memattr) #define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) void pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) /* * Pmap stuff diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index a7efa00da1e2..f5863a9b9939 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -3964,7 +3964,7 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end) */ if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0 || entry->object.vm_object != NULL) - pmap_remove(map->pmap, entry->start, entry->end); + pmap_map_delete(map->pmap, entry->start, entry->end); if (entry->end == map->anon_loc) map->anon_loc = entry->start; From nobody Fri Apr 14 23:54:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PytZq0Wmxz454dS; Fri, 14 Apr 2023 23:54: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 4PytZp67B6z4MRg; Fri, 14 Apr 2023 23: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=1681516450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NSrQkzKBCtSaEKiiYxnXpeeR+qZ3rUUjI0BR8ZL3iek=; b=CQp07rE23MHeUxBObRbUlWHf7JD+ph1Rcy2tW97bLONThxESztrvmpVmPVOE0xKCPpUXxz mbGx+f2QuZWq7f7wa3caMbifL5JU076mhrJa5DeFpj84KFly1POkWFq/qYUwCfbnzeAevC oSdMJfy+7sNBRTKDWarKEkVgPyCmSsGrFTMsxE9hOQX/RM7Xg7n4xrORc5PHSaJnXtfshF F+XO8VhnlJ+OKEUuOvX208ewt0ZIZAt/ZkxrfsPcTq8zueYY4JtkSB/neyfQ9xpsG7monO clPz7G5cDcbF4HEw9+vSfDUMg+0cAq81NgN+FcRTZO/R58sSQj83NdKNU72rfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NSrQkzKBCtSaEKiiYxnXpeeR+qZ3rUUjI0BR8ZL3iek=; b=V9A5wkDEVtLpTuk/x0GeV1jxxWX80P/eHmma+tr08cYiJewG2CloPekdwkk2vDKjlajPfe 7beYGbVUgwgL54E6vrz2xL04zbR7ZtouM96Iv0d10uvaQMWKxn6RUVmSkciRQ7TqptVWnp WYkAG2bvvayyDbfgPKBF4TG8ZHi5VDv1DnI1vt161pdR1d+R2y95Hy1Off+bnSdHiQKTMT RBBgUhXNzhRlxr8YiaKVbu+nLXfqdUkSaM8ZOHAJinHLyp9nJ1KTifqto5j46qOaiN5zGp 4F7WKIm6v6W3zim9MT/YU8YIo8NbfJRm494ZpDQyvRwgBQiHg/kinyCzKEf+Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681516450; a=rsa-sha256; cv=none; b=G8VNMojK27pU2a7xHSIPxtX/vmY91U85/eyDqcFstTcX7vYGZ/IwEwETiqdX95l8lKWGfZ BXRBxZjDFsMQw6UtWZx95Jo2tru4wg32RmZTxcuRgSmd7fZUie9epcCc67P7lvhMOZMnAk mykR8k4s69wTIxPZ4NZPx8CLt2A5HYriNL7H+5tPrAJvnVyjjhrv3/X/ETzytlisnhnODG ICcVDoPiM7QBMNOuOFVVYh01SXEx0Lyb6D4M2R5yZAwarHMi3biVZ3yzvcRxDKcKJ1l+b4 3YwaoyKM5TaseSyWBYfF6aKc43hhBpFMb/i4nelX0NUmjHniazn2Au6WSN6n1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PytZp46JLzkfd; Fri, 14 Apr 2023 23:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ENsAoh062240; Fri, 14 Apr 2023 23:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ENsA86062239; Fri, 14 Apr 2023 23:54:10 GMT (envelope-from git) Date: Fri, 14 Apr 2023 23:54:10 GMT Message-Id: <202304142354.33ENsA86062239@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: dcc19c6701ea - main - pkru.3: fix markup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcc19c6701ea789ac109a132df032c61feacf9ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc19c6701ea789ac109a132df032c61feacf9ea commit dcc19c6701ea789ac109a132df032c61feacf9ea Author: Konstantin Belousov AuthorDate: 2023-04-14 23:29:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-14 23:53:59 +0000 pkru.3: fix markup Sponsored by: The FreeBSD Foundation MFC after: 3 days --- lib/libc/x86/sys/pkru.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 41cbf465b452..28272b25dff5 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -149,13 +149,13 @@ flag. The .Fn x86_pkru_get_perm function returns access rights for the key specified by the -.Fn keyidx +.Fa keyidx argument. If the value pointed to by .Fa access is zero after the call, no read or write permissions is granted for mappings which are assigned the key -.Fn keyidx . +.Fa keyidx . If .Fa access is not zero, read access is permitted. From nobody Fri Apr 14 23:57:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PytfS0cFrz4559M; Fri, 14 Apr 2023 23:57: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 4PytfR6jrlz3DkV; Fri, 14 Apr 2023 23:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xx/DKMgpRLYRxguCyi5IXSqUOFOGiE1AxIBErc114kI=; b=rQmNU2HG2bgXgoKuQD8FDtaKbOdLYzUDVKMz8h9zEWS1FsDuByItu0bk2cRNCF554BEuP7 /1eRHZwP0WdAQHLacnfVRqMDbWBTl0S0o6v4kDul7jBDK4A/DzKC6RUFj2wk0wpxdnLox4 IzYtTZ/HE/6MjQlEuJwzDDzmZ7/wgKsAn1E7nZP2vKuqv5nhpylJiAeIBMjTe0rLb4YRug 6IythrEtNxaoyXnamcESaZvY2O2WDzFRki4EsEfJMO+E8iEakpNVkmWhA6YA9bHjrsW3jJ 6s8NQVcSPn3AbLWJAYHMhTXQ6Ew4YsTF87CIwiufXrsubftRG6LBM/9PnEMjKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xx/DKMgpRLYRxguCyi5IXSqUOFOGiE1AxIBErc114kI=; b=uC9f11T3leQddRvrRj8I2MslwLjz/k9X/3BiaAV2rKsLDlD032CG/P7iqViVnpDjTmYo8B Qs/rGHcDVNR+nl5L7YCbOLQm6/R+jcPmkKB5FnNLYLHK4pS8mj8rLRvwoxLJVMQDmzaxqb AZd02xEWDziRfWNwEx1eTWx9RdAFFSwMxza8trNtcy10OJBjpiwVygCNpciEujmL+s6lX5 lKhvo+nI13Dl9Q9a5Ab7RbApAyLHmDMfS+35JlAk8XFGRuNLyXZDX6YTB57HeAwV0ZjGNp Pt4nBhpcnL3zVxojlGI1N+LgHpd5T3dLhD6hAvNZ+yD4I+S6ZUdbfSOcRFRr6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681516640; a=rsa-sha256; cv=none; b=N9GJiHsmvMxhqKMGPrcPs04EX9NwoJwvr6ifi3Mc4HvlmIrI6kk5CU7l5lGBrPsYTbVgrR VzOD/9zW6tgdtIjZ7ZBQodJmf9kSCSluwM/2RYeWzTpbOZV75uX7rvESOD/dfy/CH7/jJ+ l69BbcrwTIBNZqe2AlCKVAChKziDMpCf11wpUGiEQAHyzU4UamUX1M/iXgt+WWEP7ilB8G S110MvHyylwwoMfPt6fF+j7rJfftFJv6ymatwci66JTq/Z3SJ0vaZd/qZpq9Hd6reD5CEm iW3ErKNpV5CSMPuavc4TKnBvFEw8hXj/sAt0d6Vwb3d2t+SPIA7dr4rjRDsQjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PytfR5qzKzl1n; Fri, 14 Apr 2023 23:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ENvJYR062814; Fri, 14 Apr 2023 23:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ENvJ5k062813; Fri, 14 Apr 2023 23:57:19 GMT (envelope-from git) Date: Fri, 14 Apr 2023 23:57:19 GMT Message-Id: <202304142357.33ENvJ5k062813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2b8331622f0b - main - Fix DIRDEPS_BUILD for libgcc_eh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8331622f0b212cf3bb4fc4914a501e5321d506 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2b8331622f0b212cf3bb4fc4914a501e5321d506 commit 2b8331622f0b212cf3bb4fc4914a501e5321d506 Author: Simon J. Gerraty AuthorDate: 2023-04-14 23:56:30 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-14 23:56:30 +0000 Fix DIRDEPS_BUILD for libgcc_eh --- lib/libbearssl/Makefile.depend | 1 - lib/libgcc_eh/Makefile.inc | 6 ++++++ lib/libssp_nonshared/Makefile.depend | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/libbearssl/Makefile.depend b/lib/libbearssl/Makefile.depend index 6cfaab1c3644..8d409f5263ac 100644 --- a/lib/libbearssl/Makefile.depend +++ b/lib/libbearssl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 08e5db419840..c48b15412c42 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -43,4 +43,10 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC .if ${MK_DIRDEPS_BUILD} == "yes" # Avoid dependency on lib/libc++ CFLAGS+= -isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++ + +# we need this for __config_site +CFLAGS+= -I${SRCTOP}/lib/libc++ +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= Nlib/libc++ +.endif .endif diff --git a/lib/libssp_nonshared/Makefile.depend b/lib/libssp_nonshared/Makefile.depend new file mode 100644 index 000000000000..79506ce16b79 --- /dev/null +++ b/lib/libssp_nonshared/Makefile.depend @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From nobody Sat Apr 15 00:29:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyvMg4V6fz457pt; Sat, 15 Apr 2023 00: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 4PyvMg3n9Wz49bd; Sat, 15 Apr 2023 00: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=1681518575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RyBi+uf0YBb4GjpnsJl3tc/KMTYiXttopIg+TeFpmc=; b=et6LUO2wGycltlZAxMn4T9rwNVZE61k9vLx1NPDHWaAy2mIAv/cWxjTQ31oDb8amU0PZZo Ke2g400pgKixk64ZSWCC4dSx783mt3hvR3OZ1AzSoVPHDExgh1XSIwghXyalhcGyPEGVr2 W8awvj87VvM7cxL7AHmrEm0/0nxSh7J6fBK0izJuoDHMy0M2Md/csKvUrfAacKtl/vtfXs JkKHU5/GWw3+MzuN1BMcM1BE/vAdYxDWAGHk1miw4H+Vv37YnzAxem4x5t4bze0pBtQFWd vIKYKDZTnejgvnaPaowMPSKnPwitxRcE5V+C/74EuOr72gh094MJUB4kuxwNOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681518575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RyBi+uf0YBb4GjpnsJl3tc/KMTYiXttopIg+TeFpmc=; b=P3/IkJTC3YU8HDkslVW0eYcChXynd5CVwXYLEntHexxeroKv5v9uz+mfxvMKnHVLGdPljO JBUVfSs6ZS02aaZwI5l3zxEK3aqzVvQ4IYfZybHAMLSQzsWXmL4ejd81Ls4O9JMAmk8Mvg TotT7IWmrA3tmZz18ugmAZrtAdkrKoz5cBV6bvyZ+it8Mvu8o1xJnGzHh3mAH+Ev2H0mzn lEdMhBcneX9ZOBDDQHeUTqr5Klf+60APQ87WbmO1i5PR4lIZ+25Q05r96G+mxTdsdSw1vH 6hASEqCRTH4+nnd1sGBMYzc5f7YhNWS/e8dV/qbeQ7DXOxOXCqhNGV81Ou9UQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681518575; a=rsa-sha256; cv=none; b=Lz2xi7HwS1kDVsTk5HcES+F9966EMMR7RvAxaPHU9miUZM0e0yDwxuXTK6M0SZLJFqmomf QDujk3Yb8vKxRM3z1dZttACNJkVFNLtVyRaUjoRSQ7wuwSDp3D7tlgOEu2Ol7WKNNEzFin p7MdS1pYxvuf9nWBTiGk3XyUf/MkgL92aTQrI6b+2MtE3WqLdEIOS+d+6oLhCkmZwPU8Yo cZXsXwHF7PJPSWTUQsDhhooWPKCESH3zoEhe9hdLb02GIkGCoCPUAczUXVz6HkifU8PZR6 SxXwuPwaesEcDTpT73boJRK5t3e8Ktx8rctBfx6raXIk4JXNz6LAoOSEC22oyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyvMg2s1dzlkG; Sat, 15 Apr 2023 00:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F0TZOi013132; Sat, 15 Apr 2023 00:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F0TZjW013131; Sat, 15 Apr 2023 00:29:35 GMT (envelope-from git) Date: Sat, 15 Apr 2023 00:29:35 GMT Message-Id: <202304150029.33F0TZjW013131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d1dfe419acc0 - main - libsecureboot allow site.trust.mk to override settings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1dfe419acc06d9239f324a219ee9df36dbed817 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d1dfe419acc06d9239f324a219ee9df36dbed817 commit d1dfe419acc06d9239f324a219ee9df36dbed817 Author: Simon J. Gerraty AuthorDate: 2023-04-15 00:28:10 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-15 00:28:10 +0000 libsecureboot allow site.trust.mk to override settings The current content of local.trust.mk is mostly for example purposes. --- lib/libsecureboot/local.trust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk index b28e5ee2d1ef..cc88528ba707 100644 --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -37,6 +37,9 @@ VE_SIGNATURE_EXT_LIST+= \ VE_SIGNATURE_LIST+= OPENPGP VE_SIGNATURE_EXT_LIST+= asc +# allow site override of all the above +.-include "site.trust.mk" + SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py .if exists(${SIGNER}) @@ -109,7 +112,7 @@ ta.h: vc_rsa.pem TRUST_ANCHORS!= cd ${.CURDIR} && 'ls' -1 *.pem t*.asc 2> /dev/null .endif .if empty(TRUST_ANCHORS) && ${MK_LOADER_EFI_SECUREBOOT} != "yes" -.error Need TRUST_ANCHORS see ${.CURDIR}/README.rst +.error Need TRUST_ANCHORS see ${.PARSEDIR}/README.rst .endif .if ${TRUST_ANCHORS:T:Mt*.pem} != "" ta.h: ${TRUST_ANCHORS:M*.pem} From nobody Sat Apr 15 04:00:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pz03P1CW2z45Rqs; Sat, 15 Apr 2023 04:00: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 4Pz03P0Zjzz3G3v; Sat, 15 Apr 2023 04:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681531249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PmOAXlzqWD+5T/VE2HngcB+yAL7ewg3+jnw4i0rkuqQ=; b=PYQhNhOKxaxipT15ysrKLDeqhuzZuax3pyuxoihXlAyVyS4E52v+OEhp/wDt8ay1uIF1sJ 09qbZtfmpWHS9G0PfHA9EypwLte0uaK34Wy1c+THdrTpqStjx7Lp6eMg0YPuoNPO/VjZtc BuOzAxMchV/Fk44BnN5Syqs0cc5JKZjk0gt9fXS6PLkUOyCmZ2khgVCoejlbYhOwnFDOu/ /GHyCoEWQC5zjNqqZsLw77X4stGg2gShUUilIIl+VdzgvOJiVb7rIyDeJf62AiHcNYit8v 7lnXOsqETRpy/Id39NBebJt/lqUrFcXM3jYhoEV1P1zm5pm9wKTdV9Xpsh45FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681531249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PmOAXlzqWD+5T/VE2HngcB+yAL7ewg3+jnw4i0rkuqQ=; b=Sjegeyr/BrRD8nSdFJivYN2eV8GNpgWENy9/fXgnc+Odwxxs8O6Wf50JoBD7VLnR1eAPkm We2Gf/wqgmQa7jp4XKPugKOFXJGfQ7/RQ9hQWDYl73MlpiKcUomolQ1ybsZ7HBKqhbNC0J 7FY9hcS6tcyZMVwFBkFzCeSaqyYt4Z/E2bHelRUbwXaAWz02si3Z9IWNBY6JPN1FirJN2e f5Tnz/7EqeHBYU15+eFW3/lvC1H3ho1JKS3VHRAxd1Pd5mL1PCLF3h+gn/62Lw07RMXaIL I4sAwHoh2sGuD8TNoqUlTvdnDxvaKYjxfVn6edMBuyTxwgXCwFEXj/4i1u4Atw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681531249; a=rsa-sha256; cv=none; b=TaFZuf9vF8iu73rYvB2EwZtGj4+Jn82pkwrb6Ji+Vu12tlwHcbPdwTQfI7XV0buwQ7Acj6 xa8PRnE0wGA+qjOkEvJpGi++QATRJQQwLHiDufI7RrhgRVmtrYRtvQVtyQ+ZUq1+uAbz9m ZJbF14GsLcKPiELtQtdnN6t1RKaGxnFGnzre9B7qXrgqAKRIUX80+suNDOrQn8M4ncJwJx q+PrLWj4a5inU+uPC3CB/NBSqfVwiwiZFSedb5OG3vWDTvQ+IKcG9ET5Gz6kxrz08SnezV +zTexO3hQOME7am9kIAhtWt9RYz0GlkayKVh93crfqg6JjHqAk2KWopJY2Jj2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pz03N6lLDzrKF; Sat, 15 Apr 2023 04:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F40mrX070810; Sat, 15 Apr 2023 04:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F40mvM070809; Sat, 15 Apr 2023 04:00:48 GMT (envelope-from git) Date: Sat, 15 Apr 2023 04:00:48 GMT Message-Id: <202304150400.33F40mvM070809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 5ee1c90e50ce - main - tmpfs: unbreak module build outside of kernel build environment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ee1c90e50ce8832c79aa61c8c2bbb71bd097799 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=5ee1c90e50ce8832c79aa61c8c2bbb71bd097799 commit 5ee1c90e50ce8832c79aa61c8c2bbb71bd097799 Author: Eugene Grosbein AuthorDate: 2023-04-15 04:00:03 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-15 04:00:03 +0000 tmpfs: unbreak module build outside of kernel build environment MFC after: 3 days --- sys/modules/tmpfs/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile index 231c1d55fd88..de4921408805 100644 --- a/sys/modules/tmpfs/Makefile +++ b/sys/modules/tmpfs/Makefile @@ -4,6 +4,7 @@ KMOD= tmpfs SRCS= vnode_if.h \ - tmpfs_vnops.c tmpfs_fifoops.c tmpfs_vfsops.c tmpfs_subr.c opt_tmpfs.h + tmpfs_vnops.c tmpfs_fifoops.c tmpfs_vfsops.c tmpfs_subr.c \ + opt_tmpfs.h opt_ddb.h .include From nobody Sat Apr 15 09:54:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pz7wB5yFLz451nr; Sat, 15 Apr 2023 09:55:06 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (using TLSv1.3 with cipher TLS_AES_256_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 4Pz7w91Pfqz3Jrq; Sat, 15 Apr 2023 09:55:04 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=walstatt-de.de header.s=DKIM001 header.b="raU/61px"; spf=none (mx1.freebsd.org: domain of freebsd@walstatt-de.de has no SPF policy when checking 2001:1640:5::8:31) smtp.mailfrom=freebsd@walstatt-de.de; dmarc=none Received: from hub2.goneo.de (hub2.goneo.de [85.220.129.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id 0086710A1E9D; Sat, 15 Apr 2023 11:54:56 +0200 (CEST) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 3AB1310A1EBD; Sat, 15 Apr 2023 11:54:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1681552494; 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=/SKma2CDm4Tq3PyBxolimAVWhIgMjFYov+oBA8rjk/Y=; b=raU/61pxch6QZvzICiBxAfXgLWv6NAuKXMHUfOzpZj/IKBeFloHqZvmUoiqhlJbR2mFvi2 3WwrYLAYqXgAhvczBEvDpAnUZJBQBvy9DdogvdZJpx61sur7JJUt5x4pi9GXVGr4a3XKn9 reMfVeKXyg223Yb+c+Rh6Y0w+CcdqwkktunGkwFybRnWsoSw8zYKeNXThRuGaGe4RNznV2 v7NiTgcFnPGUU1yRdUkObThMoC5dOczCKXC+3rZXSBioCuPiR0NyndbUWYhzY0pyJFh3Ox ako56tPzMhSSiY9WOC1GLMgbOmHDW0eMZPIMQunZWMJJ0Tb/x51wj9gcUJUtEw== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-013-073-163.77.13.pool.telefonica.de [77.13.73.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id A5FBD10A32E6; Sat, 15 Apr 2023 11:54:53 +0200 (CEST) Date: Sat, 15 Apr 2023 11:54:25 +0200 From: FreeBSD User To: Mark Millard Cc: Charlie Li , Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> In-Reply-To: References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 439d1d X-Rspamd-UID: 853c3a X-Spamd-Result: default: False [-3.29 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.993]; R_DKIM_ALLOW(-0.20)[walstatt-de.de:s=DKIM001]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_TO(0.00)[yahoo.com]; RCPT_COUNT_SEVEN(0.00)[7]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,freebsd-current@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,FreeBSD.org,cschubert.com,gmail.com]; DKIM_TRACE(0.00)[walstatt-de.de:+]; RCVD_COUNT_THREE(0.00)[4]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record]; DMARC_NA(0.00)[walstatt-de.de]; HAS_ORG_HEADER(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Pz7w91Pfqz3Jrq X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N Am Thu, 13 Apr 2023 22:18:04 -0700 Mark Millard schrieb: > On Apr 13, 2023, at 21:44, Charlie Li wrote: > > > Mark Millard wrote: > >> FYI: in my original report for a context that has never had > >> block_cloning enabled, I reported BOTH missing files and > >> file content corruption in the poudriere-devel bulk build > >> testing. This predates: > >> https://people.freebsd.org/~pjd/patches/brt_revert.patch > >> but had the changes from: > >> https://github.com/openzfs/zfs/pull/14739/files > >> The files were missing from packages installed to be used > >> during a port's build. No other types of examples of missing > >> files happened. (But only 11 ports failed.) > > I also don't have block_cloning enabled. "Missing files" prior to brt_revert may actually > > be present, but as the corruption also messes with the file(1) signature, some tools like > > ldconfig report them as missing. > > For reference, the specific messages that were not explicit > null-byte complaints were (some shown with a little context): > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - not found > ===> Installing existing package /packages/All/libxml2-2.10.3_1.pkg > [CA72_ZFS] Installing libxml2-2.10.3_1... > [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - found > (/usr/local/lib/libxml2.so) . . . > [CA72_ZFS] Extracting libxslt-1.1.37: .......... done > ===> py39-lxml-4.9.2 depends on shared library: libxslt.so - found > (/usr/local/lib/libxslt.so) ===> Returning to build of py39-lxml-4.9.2 > . . . > ===> Configuring for py39-lxml-4.9.2 > Building lxml version 4.9.2. > Building with Cython 0.29.33. > Error: Please make sure the libxml2 and libxslt development packages are installed. > > > [CA72_ZFS] Extracting libunistring-1.1: .......... done > ===> libidn2-2.3.4 depends on shared library: libunistring.so - not found > > > [CA72_ZFS] Extracting gmp-6.2.1: .......... done > ===> mpfr-4.2.0,1 depends on shared library: libgmp.so - not found > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > ===> Installing existing package /packages/All/gmp-6.2.1.pkg > [CA72_ZFS] Installing gmp-6.2.1... > the most recent version of gmp-6.2.1 is already installed > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > *** Error code 1 > > > autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 > > > checking for GNU > M4 that supports accurate traces... configure: error: no acceptable m4 could be found in > $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended. > GNU M4 1.4.15 uses a buggy replacement strstr on some systems. > Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. > > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > > === > Mark Millard > marklmi at yahoo.com > > Hello whar is the recent status of fixing/mitigate this desatrous bug? Especially for those with the new option enabled on ZFS pools. Any advice? In an act of precausion (or call it panic) I shutdown several servers to prevent irreversible damages to databases and data storages. We face on one host with /usr/ports residing on ZFS always errors on the same files created while staging (using portmaster, leaves the system with noninstalled software, i.e. www/apache24 in our case). Deleting the work folder doesn't seem to change anything, even when starting a scrubbing of the entire pool (RAIDZ1 pool) - cause unknown, why it affects always the same files to be corrupted. Same with deve/ruby-gems. Poudriere has been shutdown for the time being to avoid further issues. Are there any advies to proceed apart from conserving the boxes via shutdown? Thank you ;-) oh -- O. Hartmann From nobody Sat Apr 15 14:36:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzG8s5Hj0z45RJx; Sat, 15 Apr 2023 14:36:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzG8s3JFXz3CRn; Sat, 15 Apr 2023 14:36:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id nezCpDQRvjvm1nh0upINE6; Sat, 15 Apr 2023 14:36:28 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id nh0spyKNyyAOenh0tpiHoL; Sat, 15 Apr 2023 14:36:28 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=643ab66c a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=2iz5XMn2izFUwJidrLYA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D86219FC; Sat, 15 Apr 2023 07:36:25 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 99388387; Sat, 15 Apr 2023 07:36:25 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: FreeBSD User cc: Mark Millard , Charlie Li , Pawel Jakub Dawidek , Cy Schubert , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> Comments: In-reply-to FreeBSD User message dated "Sat, 15 Apr 2023 11:54:25 +0200." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 15 Apr 2023 07:36:25 -0700 Message-Id: <20230415143625.99388387@slippy.cwsent.com> X-CMAE-Envelope: MS4xfBC5KK+FGweuTH2Bwo9Fgf2E1NVmkxk65aZu3jql7QWlfdUg1ENrNMGw9W3tgL/GUyC/Jxt1LOXwkv3E1rGXb4Io5cACxlu9Fflm/TtpyUGqb/9AlIej gsw5JXntb7xu5FFJkBc5WmEVMnu1E0RndsKKXJ1ZRDFMZVMwht8SglG5uq+DGi3lpyBwT1f2yhvAuu70OobSKqprpKCL58kTcx4MDsWyRIj7hGg8qHH9FOsz NuqgKrU8ybYumtoifv66hL4kGBmP/xzVnchNamJf/KuRBGfLpTXp4NQNMCm+EZwXvbVZCA0AsYdnNCEtVGdCMuTbsWDEsFlRuBhD5ccXR8Eu5pyJey/8BJoP euTru4iUP/pANRevPFWG+wh7uOY0XDeedx7jfr03LJ0sWU8WYAA= X-Rspamd-Queue-Id: 4PzG8s3JFXz3CRn X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, FreeBSD Us er writes: > Am Thu, 13 Apr 2023 22:18:04 -0700 > Mark Millard schrieb: > > > On Apr 13, 2023, at 21:44, Charlie Li wrote: > > > > > Mark Millard wrote: > > >> FYI: in my original report for a context that has never had > > >> block_cloning enabled, I reported BOTH missing files and > > >> file content corruption in the poudriere-devel bulk build > > >> testing. This predates: > > >> https://people.freebsd.org/~pjd/patches/brt_revert.patch > > >> but had the changes from: > > >> https://github.com/openzfs/zfs/pull/14739/files > > >> The files were missing from packages installed to be used > > >> during a port's build. No other types of examples of missing > > >> files happened. (But only 11 ports failed.) > > > I also don't have block_cloning enabled. "Missing files" prior to brt_rev > ert may actually > > > be present, but as the corruption also messes with the file(1) signature, > some tools like > > > ldconfig report them as missing. > > > > For reference, the specific messages that were not explicit > > null-byte complaints were (some shown with a little context): > > > > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - not found > > ===> Installing existing package /packages/All/libxml2-2.10.3_1.pkg > > [CA72_ZFS] Installing libxml2-2.10.3_1... > > [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - found > > (/usr/local/lib/libxml2.so) . . . > > [CA72_ZFS] Extracting libxslt-1.1.37: .......... done > > ===> py39-lxml-4.9.2 depends on shared library: libxslt.so - found > > (/usr/local/lib/libxslt.so) ===> Returning to build of py39-lxml-4.9.2 > > . . . > > ===> Configuring for py39-lxml-4.9.2 > > Building lxml version 4.9.2. > > Building with Cython 0.29.33. > > Error: Please make sure the libxml2 and libxslt development packages are in > stalled. > > > > > > [CA72_ZFS] Extracting libunistring-1.1: .......... done > > ===> libidn2-2.3.4 depends on shared library: libunistring.so - not found > > > > > > > [CA72_ZFS] Extracting gmp-6.2.1: .......... done > > ===> mpfr-4.2.0,1 depends on shared library: libgmp.so - not found > > > > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > ===> Installing existing package /packages/All/gmp-6.2.1.pkg > > [CA72_ZFS] Installing gmp-6.2.1... > > the most recent version of gmp-6.2.1 is already installed > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > *** Error code 1 > > > > > > autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 > > > > > > checking for GNU > > M4 that supports accurate traces... configure: error: no acceptable m4 coul > d be found in > > $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended. > > GNU M4 1.4.15 uses a buggy replacement strstr on some systems. > > Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. > > > > > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > > > > > === > > Mark Millard > > marklmi at yahoo.com > > > > > > Hello > > whar is the recent status of fixing/mitigate this desatrous bug? Especially f > or those with the > new option enabled on ZFS pools. Any advice? > > In an act of precausion (or call it panic) I shutdown several servers to prev > ent irreversible > damages to databases and data storages. We face on one host with /usr/ports r > esiding on ZFS > always errors on the same files created while staging (using portmaster, leav > es the system > with noninstalled software, i.e. www/apache24 in our case). Deleting the work > folder doesn't > seem to change anything, even when starting a scrubbing of the entire pool (R > AIDZ1 pool) - > cause unknown, why it affects always the same files to be corrupted. Same wit > h deve/ruby-gems. > > Poudriere has been shutdown for the time being to avoid further issues. > > Are there any advies to proceed apart from conserving the boxes via shutdown? > > Thank you ;-) > oh > > > > -- > O. Hartmann With an up-to-date tree + pjd@'s "Fix data corruption when cloning embedded blocks. #14739" patch I didn't have any issues, except for email messages with corruption in my sent directory, nowhere else. I'm still investigating the email messages issue. IMO one is generally safe to run poudriere on the latest ZFS with the additional patch. My tests of the additional patch concluded that it resolved my last problems, except for the sent email problem I'm still investigating. I'm sure there's a simple explanation for it, i.e. the email thread was corrupted by the EXDEV regression which cannot be fixed by anything, even reverting to the previous ZFS -- the data in those files will remain damaged regardless. I cannot speak to the others who have had poudriere and other issues. I never had any problems with poudriere on top of the new ZFS. WRT reverting block_cloning pools to without, your only option is to backup your pool and recreate it without block_cloning. Then restore your data. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Apr 15 15:51:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzHrY3d2Qz45YRP; Sat, 15 Apr 2023 15:52:29 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_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 4PzHrY1Szzz3Nmk; Sat, 15 Apr 2023 15:52:29 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 2B68510A1E8E; Sat, 15 Apr 2023 17:52:21 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 4B57110A32F4; Sat, 15 Apr 2023 17:52:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1681573939; 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=uQ5Y1tWOxt2kTlzDq2zDNlVZOkYI/NI/BsFrnymjmwY=; b=Xel4bsbEYNEJMJMioBJ054+n2DZw5bYIt9pEcAFTK8lP4vhDAoqRPfwhCnf6LH84+3yxyp Eb0UVrgX8QM/PrSosoIz0wIcQOKaPhe7oUd8IcmO9Ppovrysyhw2Fg33nOlShsHLcSWmD8 2bPS73BKIusgZH/s7c2/wLGNalTwCN7rSe6QvdnT6mahjOwP9lml4/iaCdPptPfgGWOGGH kJujjvXwbMAo38mtD5AlO62VplFaVn8JFRBrCL9O4QxC0c2dacWHEP5Ve7WE2tyRy4KNSv PzRt3VY3ggfwUuAOcgZBg44a/u6RUKjw48bou3TmqcwZxW7+w9EkwluakYhKCQ== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-013-073-163.77.13.pool.telefonica.de [77.13.73.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id DB4B110A32E3; Sat, 15 Apr 2023 17:52:18 +0200 (CEST) Date: Sat, 15 Apr 2023 17:51:51 +0200 From: FreeBSD User To: Cy Schubert Cc: Mark Millard , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20230415143625.99388387@slippy.cwsent.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: ccd090 X-Rspamd-UID: dbcd85 X-Rspamd-Queue-Id: 4PzHrY1Szzz3Nmk X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Am Sat, 15 Apr 2023 07:36:25 -0700 Cy Schubert schrieb: > In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, > FreeBSD Us > er writes: > > Am Thu, 13 Apr 2023 22:18:04 -0700 > > Mark Millard schrieb: > > > > > On Apr 13, 2023, at 21:44, Charlie Li wrote: > > > > > > > Mark Millard wrote: > > > >> FYI: in my original report for a context that has never had > > > >> block_cloning enabled, I reported BOTH missing files and > > > >> file content corruption in the poudriere-devel bulk build > > > >> testing. This predates: > > > >> https://people.freebsd.org/~pjd/patches/brt_revert.patch > > > >> but had the changes from: > > > >> https://github.com/openzfs/zfs/pull/14739/files > > > >> The files were missing from packages installed to be used > > > >> during a port's build. No other types of examples of missing > > > >> files happened. (But only 11 ports failed.) > > > > I also don't have block_cloning enabled. "Missing files" prior to brt_rev > > ert may actually > > > > be present, but as the corruption also messes with the file(1) signature, > > some tools like > > > > ldconfig report them as missing. > > > > > > For reference, the specific messages that were not explicit > > > null-byte complaints were (some shown with a little context): > > > > > > > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - not found > > > ===> Installing existing package /packages/All/libxml2-2.10.3_1.pkg > > > [CA72_ZFS] Installing libxml2-2.10.3_1... > > > [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - found > > > (/usr/local/lib/libxml2.so) . . . > > > [CA72_ZFS] Extracting libxslt-1.1.37: .......... done > > > ===> py39-lxml-4.9.2 depends on shared library: libxslt.so - found > > > (/usr/local/lib/libxslt.so) ===> Returning to build of py39-lxml-4.9.2 > > > . . . > > > ===> Configuring for py39-lxml-4.9.2 > > > Building lxml version 4.9.2. > > > Building with Cython 0.29.33. > > > Error: Please make sure the libxml2 and libxslt development packages are in > > stalled. > > > > > > > > > [CA72_ZFS] Extracting libunistring-1.1: .......... done > > > ===> libidn2-2.3.4 depends on shared library: libunistring.so - not found > > > > > > > > > > > [CA72_ZFS] Extracting gmp-6.2.1: .......... done > > > ===> mpfr-4.2.0,1 depends on shared library: libgmp.so - not found > > > > > > > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > > ===> Installing existing package /packages/All/gmp-6.2.1.pkg > > > [CA72_ZFS] Installing gmp-6.2.1... > > > the most recent version of gmp-6.2.1 is already installed > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > > *** Error code 1 > > > > > > > > > autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 > > > > > > > > > checking for GNU > > > M4 that supports accurate traces... configure: error: no acceptable m4 coul > > d be found in > > > $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended. > > > GNU M4 1.4.15 uses a buggy replacement strstr on some systems. > > > Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. > > > > > > > > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > > > > > > > > === > > > Mark Millard > > > marklmi at yahoo.com > > > > > > > > > > Hello > > > > whar is the recent status of fixing/mitigate this desatrous bug? Especially f > > or those with the > > new option enabled on ZFS pools. Any advice? > > > > In an act of precausion (or call it panic) I shutdown several servers to prev > > ent irreversible > > damages to databases and data storages. We face on one host with /usr/ports r > > esiding on ZFS > > always errors on the same files created while staging (using portmaster, leav > > es the system > > with noninstalled software, i.e. www/apache24 in our case). Deleting the work > > folder doesn't > > seem to change anything, even when starting a scrubbing of the entire pool (R > > AIDZ1 pool) - > > cause unknown, why it affects always the same files to be corrupted. Same wit > > h deve/ruby-gems. > > > > Poudriere has been shutdown for the time being to avoid further issues. > > > > Are there any advies to proceed apart from conserving the boxes via shutdown? > > > > Thank you ;-) > > oh > > > > > > > > -- > > O. Hartmann > > With an up-to-date tree + pjd@'s "Fix data corruption when cloning embedded > blocks. #14739" patch I didn't have any issues, except for email messages > with corruption in my sent directory, nowhere else. I'm still investigating > the email messages issue. IMO one is generally safe to run poudriere on the > latest ZFS with the additional patch. > > My tests of the additional patch concluded that it resolved my last > problems, except for the sent email problem I'm still investigating. I'm > sure there's a simple explanation for it, i.e. the email thread was > corrupted by the EXDEV regression which cannot be fixed by anything, even > reverting to the previous ZFS -- the data in those files will remain > damaged regardless. > > I cannot speak to the others who have had poudriere and other issues. I > never had any problems with poudriere on top of the new ZFS. > > WRT reverting block_cloning pools to without, your only option is to backup > your pool and recreate it without block_cloning. Then restore your data. > > All right, I interpret the answer that way, that I need a most recent source tree (and accordingly built and installed OS) AND a patch that isn't officially commited? On a box I'm with: FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 07:57:16 CEST 2023 amd64 The box is crashing while trying to update ports with the well known issue: Panic String: VERIFY(!zil_replaying(zilog, tx)) failed At the moment all alarm bells are ringing and I lost track about what has been patched and already commited and what is still as patch available but in the phase of evaluation or inofficially emmited here. According to the EXDEV issue: in cases of poudriere or ports trees on ZFS, what do I have to do to ensure that those datasets are clean? The OS should detect file corruption but in my case the box is crashing :-( I did several times scrubbing, but this seems to be the action of a helpless and desperate man ... ;-/ Greetings Oliver -- O. Hartmann From nobody Sat Apr 15 16:07:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzJB94pd4z45ZVq; Sat, 15 Apr 2023 16:07:45 +0000 (UTC) (envelope-from flo@smeets.xyz) Received: from mail-out.smeets.xyz (mail-out.smeets.xyz [88.99.165.53]) (using TLSv1.3 with cipher TLS_AES_256_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 4PzJB91qCjz40LX; Sat, 15 Apr 2023 16:07:45 +0000 (UTC) (envelope-from flo@smeets.xyz) Authentication-Results: mx1.freebsd.org; none Received: from mail.smeets.xyz (mail.smeets.xyz [IPv6:2a01:4f8:10a:3543::25:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail-out.smeets.xyz (Postfix) with ESMTPS id 3DB5A1DD7FA; Sat, 15 Apr 2023 18:07:37 +0200 (CEST) Received: from amavis.smeets.xyz (amavis.smeets.xyz [IPv6:2a01:4f8:10a:3543::aa:4]) by mail.smeets.xyz (Postfix) with ESMTP id 355B5675D; Sat, 15 Apr 2023 18:07:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at smeets.xyz Received: from mail.smeets.xyz ([IPv6:2a01:4f8:10a:3543::25:3]) by amavis.smeets.xyz (amavis.smeets.xyz [IPv6:2a01:4f8:10a:3543::aa:4]) (amavisd-new, port 10025) with ESMTP id Zor0VW2wTrRJ; Sat, 15 Apr 2023 18:07:37 +0200 (CEST) Received: from [IPV6:2a01:4f8:10a:fd43::666] (unknown [IPv6:2a01:4f8:10a:fd43::666]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.smeets.xyz (Postfix) with ESMTPSA id 00FDD6858; Sat, 15 Apr 2023 18:07:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smeets.xyz; s=dkim; t=1681574856; 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:autocrypt:autocrypt; bh=cf7gcAbp7coGQ1urueINcwVqbdBfJ9gamF+1kbK3Cw8=; b=bRQse3vHIcAIjz2n4UW6xbwFirzNK/bTih/3UhFSphG+A3a5ZGaWZMgcuQo4DtMMQNZ8md 1t9ZFAV9oiYX1zB3C4znUPuilcnzgbnMHsCDroszYTD/krk2uP3qNieHLg7sSdnmq4mHZj 1NY5ET7RFOYY6bbhwzMXvYs+WYASq+IX8Qgq/na03Wg2OCt29FK+Y50Qb1/a6szGR2lm3j OQ4sukpvNvGSxV4BnUmQK/u3J4CHBqSe5f/UVfxSPFDmOoAQKpXV5n+PH2WhGBAc4JzDc7 HekXXht/PfIgItPaoj7Jj5q9/RxIJRqF/JxTb0gxuCQCWRWjC46W1M4y+R7grA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=smeets.xyz; s=ed25519_2022; t=1681574856; 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:autocrypt:autocrypt; bh=cf7gcAbp7coGQ1urueINcwVqbdBfJ9gamF+1kbK3Cw8=; b=+wRBy/3MaoD9JFHCe5ABlrz+0QfmovEDXd19l4kr+5w+AwOa60CyMV+tQOp7WE5+InR6Og TUcZ03XRUzo3HGAA== Message-ID: <6792aded-6e2e-a118-259d-0df0f80c361c@smeets.xyz> Date: Sat, 15 Apr 2023 18:07:34 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Daily Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: FreeBSD User , Cy Schubert Cc: Mark Millard , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> From: Florian Smeets Autocrypt: addr=flo@smeets.xyz; keydata= xsFNBFpyBwsBEADLq0c46orEtbMn4SptX+VJxR1wB4YwaErZme1bqF4nZHIhlRNET22HsHdQ doagaB4uACq0Rj5kHcu614ZnnNkLPyCxWQATx+cbdiFO4/hfT8tAvKnBtiy3awKJ5uGCNO2E zJwXW6KwdDA8XPRySqN8m1yPl+dW0Cls+/vO/QL/6+YLMupmEpSvFxRzAZTQuKyX4+xl+dYI d24JiPd1yfCuDNOY3+OZ3QBMT00u/699N8lUWRtiTwaQMwAOww8r/26YM6/SgcgFuLH2E/CV plY0sDvfoISlAj8agxdomNXfPjCMQ6w5yGZmA+huFpPCVBTi3on/SWgbQO7dLVpN4BNPuScP osCb/dsOg0S74zCClsIU3gdUGh9rwJY00/Ebid6V0R3c1Czwbg8LQedzlGDuXYXmzp6W2ujg r1cqbUD6lUWikUv2IMdCbb8MxYhHLi3GYUs5Xpi+W7vM6T45KbuMr7O/1SjtcGOlNeDvGNgj cDk20fOgPPZ+M6i9vX5Q2oI9HoYaeTiYNwILkBLVP/L40kTo5EkiQOt4OW6BMbylqXPOaQMW uGVbmhCJQpbx8Vo80s2yiBBVWkLkWQIcIm3KZlLldJqKEFpQBWLBE1eFFqboYgAWzFn73CaV 5tihobijMmmOV3a8cI1fI4kREyl3g+8bW+O0u3m3tuzVOpDpjwARAQABzR9GbG9yaWFuIFNt ZWV0cyA8ZmxvQHNtZWV0cy54eXo+wsGXBBMBCgBBAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4B AheAAhkBFiEE7LNouHkIv7aRTXJp71uk3NWp88AFAmHwU9QFCQtIlt8ACgkQ71uk3NWp88D6 dA//YNhcYVDRSpLDNMLE9rqJ0DHJFaIRafpExGxQhHHiQKoeXwj87VCKRP++sbewS43g0hw6 3Nh/v/L2WbAwF4QvF3MOAhoiiGaNZoHpPK2XwaWcqa8nh2QK28G51PzLooAx78tagIBYyP3Z oRlhu22Ye3tNnN0f1ckEJMRoJAPO7hDGzFE03kcaFvOu9AOOJNuaZxdVspni6s8B4n9xrHVX NOIlwMoq2UT8irtMJb+ZWsBb/Oj/ZU0+oni8VWJMEMWwVgEOlwweAw8PK+C24F2vAj+tY3DU Q9ZQB6nX4PZesRnah95IKrDFJjOGhmdSls0uGRQkmY/U3ESuD+3AkRGXnXZ7kz6BrTVqoneg mGzG6If3BulvLqv/bdwE32JOe8UIY6cLNhgoRfMlx58Po9DZCnG4uwPr5zVpuRO4SvOC3Rz1 Q9tUV1rbrWa/QWsDlDbwzIX92eXeVs1nrQokO9VE5Fg3279ktyVJGdcSd53h5xXCvO0SKVIk fvNtTOxodhhFzhgfBgDa4eYpJfSlgSMEDOab/vRgjAjqWFbqjY+fa2OAvGXuPhCO8aofKtgn QxCK9yASayptn+3KKNy005/Q5Kuh1C89csjRxhZSw6dB+gLdyZggtD8mv12+aaFIep3FITOK KmA4H/CUcKGDozXVvhL0r90o+BfzjopmIHn6V7LOwU0EWnIHCwEQANHrOm5vydK/ij1zkDyL Zzbogk5zjMh6oAr3cH4oGbJHPLlyFZTCVBYUwD4kh6NV1sKuZOeX/aygyVg1RyLulnzsc6Yj XOIxlqhqQwGI8k8ssAIpMSf029781CNF2HC42CrJeHtXNONDNOjsMuoxzga9zLQCh4jLTlE/ TUJo6KVABWBVRtTVh2Z77pKtN7j2NPFBHvp7K0WHfV+TYnlsgjhUA0ACZnUdHS2YRzBhCzzQ eludxBz54S9xbUq1mfZfVx8AbAGXF2zxo68nvvAAJn48HiBS3dMhCGYJDdZdja6QdUFPiemi nOxwkUzCqmKxm+Aj7USue1SbZZqJxmMI1eF4Ork/BJJI74Z/FnJgYR4UkEiD3J/KUocQCIH3 daB1+/CXlh99Ib7AP+QGuKk3vnNHh7VBq3E+VAiM5LU0BmgW+cdRPHkiwM7sDa2VnV3VqvV7 QmoMKnHFzUB6Nn8uE+iakp5J81Pr68kDOq7kLW3UnGmg1PUqbsnCaTimJb3JAYWzOW/9CYcP lbAdIqi+wH7MOoeL+PA99A3kW/881rGmeOYFzzrsNVLtea+AJfXtp4LN5gOVIPIpovCNSVXX EKgl7a4vjUGzVBzrH7PzT+k4XUEQwNCACfGZxEExtny19bjvumZ0rv+AEAHvsWSKXHUVJzIN jqd9UioaEbKGAPlPABEBAAHCwXwEGAEKACYCGwwWIQTss2i4eQi/tpFNcmnvW6Tc1anzwAUC YfBT/gUJC0iW4AAKCRDvW6Tc1anzwHKpD/9znRaNN0u5+TwJxSD3baeA2OqeebO6gjpscfoT 1z1LOTJiG/pPMz7TB5K2bo+0JwzRV29nfiSeNGQqBx1THZ3Y0ph5tFB8rfF4aEddjhtwxP80 Q4SzxToSZAGMBkndNXlEpMeyHoVpcGoR7qkKAtrr7M9g9ocf8kTO3hzvDzASVIwiASVwl4QB GAv4slShbxJ86DbhtUgvv+6kSe1qm62hMTri8cD/0mVBAEwmAf6k4l9pwYW2oAdl0vjS5sz0 0uqB8nuT22NuiB3XBjSB5CFbeKhy3EZkcpG1taMmuXtwhAgQTmmknruMv9OvP8joSK1nrSyR BwzcMbYW4PS5px4c/RSsdVIcyhQLQ084c1ak9cDImiyU9pZhHnvNIdp84qfEWXOrXtWSUfUy Ej0npK9vAjKH4Vrfakw+WtRrleFC/muTSu1FfskeBphts9gk0fox1VZ+pWMLsxwsKlpgCqhC FzpN5ey+hsawjbOA8X2KJjl2Lr7fYuvmxu/FOgRxPhiO08UMkFAIlHWn+sXivGTbxZxagGos zOr6MZmKT31IcU1WqY3EIjA/ZodDkBz/cT8se4hvh5whroRuGUGfcp5KmVUJhkCvSxnVwMYz 4uDpr8I+TYWU+LnJbIBZcHs8wvNuaSMLd9CLS/4Mi2bJDRvAdmReOwiIxzzxdirXq7KkaA== In-Reply-To: <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------ZtsMrSGEuxkWLArxNyW80EFQ" X-Rspamd-Queue-Id: 4PzJB91qCjz40LX X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------ZtsMrSGEuxkWLArxNyW80EFQ Content-Type: multipart/mixed; boundary="------------k9EyQdLWX0g08eualvhqQ70P"; protected-headers="v1" From: Florian Smeets To: FreeBSD User , Cy Schubert Cc: Mark Millard , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Message-ID: <6792aded-6e2e-a118-259d-0df0f80c361c@smeets.xyz> Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> --------------k9EyQdLWX0g08eualvhqQ70P Content-Type: multipart/mixed; boundary="------------stAJM5daP76iyIEBXMKjSENZ" --------------stAJM5daP76iyIEBXMKjSENZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMTUuMDQuMjMgMTc6NTEsIEZyZWVCU0QgVXNlciB3cm90ZToNCj4gQW0gU2F0LCAxNSBB cHIgMjAyMyAwNzozNjoyNSAtMDcwMA0KPiBDeSBTY2h1YmVydCA8Q3kuU2NodWJlcnRAY3Nj aHViZXJ0LmNvbT4gc2NocmllYjoNCj4+DQo+PiBXaXRoIGFuIHVwLXRvLWRhdGUgdHJlZSAr IHBqZEAncyAiRml4IGRhdGEgY29ycnVwdGlvbiB3aGVuIGNsb25pbmcgZW1iZWRkZWQNCj4+ IGJsb2Nrcy4gIzE0NzM5IiBwYXRjaCBJIGRpZG4ndCBoYXZlIGFueSBpc3N1ZXMsIGV4Y2Vw dCBmb3IgZW1haWwgbWVzc2FnZXMNCj4+IHdpdGggY29ycnVwdGlvbiBpbiBteSBzZW50IGRp cmVjdG9yeSwgbm93aGVyZSBlbHNlLiBJJ20gc3RpbGwgaW52ZXN0aWdhdGluZw0KPj4gdGhl IGVtYWlsIG1lc3NhZ2VzIGlzc3VlLiBJTU8gb25lIGlzIGdlbmVyYWxseSBzYWZlIHRvIHJ1 biBwb3VkcmllcmUgb24gdGhlDQo+PiBsYXRlc3QgWkZTIHdpdGggdGhlIGFkZGl0aW9uYWwg cGF0Y2guDQoNClRoaXMgaXMgYWxzbyBteSBjdXJyZW50IG9ic2VydmF0aW9uLiBJIGhhdmUg MiBob3N0cyB3aGVyZSBJIHdhcyANCnVuZm9ydHVuYXRlIGVub3VnaCB0byB1cGRhdGUgYXQg dGhlIHdyb25nIHRpbWUuIEkgY3VycmVudGx5ICp0aGluayogdGhhdCANCkknbSAqbm90KiBz ZWVpbmcgZGF0YSBjb3JydXB0aW9uIHdpdGggaGVhZCBmcm9tIEFwcmlsIDEydGggYW5kIHRo aXMgDQpwYXRjaCANCmh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuemZzL3pmcy9jb21taXQvZDNh NmU1Y2EzYjJmNjg0MTMyMjM4Y2E5NjhiZjBiOTZmMTdlYzdlMS5kaWZmIA0KYXBwbGllZC4N Cg0KT25lIHBvb2wgaGFzIGJlZW4gdXBncmFkZWQgd2l0aCBmZWF0dXJlQGJsb2NrX2Nsb25p bmcgYW5kIHRoZSBvdGhlciBoYXNuJ3QuDQo+IA0KPiBGcmVlQlNEIDE0LjAtQ1VSUkVOVCAj OCBtYWluLW4yNjIxNzUtNWVlMWM5MGU1MGNlOiBTYXQgQXByIDE1IDA3OjU3OjE2IENFU1Qg MjAyMyBhbWQ2NA0KPiANCj4gVGhlIGJveCBpcyBjcmFzaGluZyB3aGlsZSB0cnlpbmcgdG8g dXBkYXRlIHBvcnRzIHdpdGggdGhlIHdlbGwga25vd24gaXNzdWU6DQo+IA0KPiBQYW5pYyBT dHJpbmc6IFZFUklGWSghemlsX3JlcGxheWluZyh6aWxvZywgdHgpKSBmYWlsZWQNCj4gDQpP biB0aGUgcG9vbCB0aGF0IGhhcyBibG9ja19jbG9uaW5nIGVuYWJsZWQgSSBzZWUgdGhlIGFi b3ZlIGluc3RhIHBhbmljIA0Kd2hlbiBwb3VkcmllcmUgc3RhcnRzIGJ1aWxkaW5nLiBJIGZv dW5kIGEgd29ya2Fyb3VuZCB0aG91Z2g6DQoNCi0tLSAvdXNyL2xvY2FsL3NoYXJlL3BvdWRy aWVyZS9pbmNsdWRlL2ZzLnNoLm9yaWcJMjAyMy0wNC0xNSANCjE4OjAzOjUwLjA5MDgyMzAw MCArMDIwMA0KKysrIC91c3IvbG9jYWwvc2hhcmUvcG91ZHJpZXJlL2luY2x1ZGUvZnMuc2gJ MjAyMy0wNC0xNSANCjE4OjA0OjA0LjE0NDczNjAwMCArMDIwMA0KQEAgLTI5NSw3ICsyOTUs NiBAQA0KICAJCWZpDQoNCiAgCQl6ZnMgY2xvbmUgLW8gbW91bnRwb2ludD0ke21udH0gXA0K LQkJCS1vIHN5bmM9ZGlzYWJsZWQgXA0KICAJCQktbyBhdGltZT1vZmYgXA0KICAJCQktbyBj b21wcmVzc2lvbj1vZmYgXA0KICAJCQkke2ZzfUAke3NuYXB9IFwNCg0KV2l0aCB0aGlzIHdv cmthcm91bmQgSSB3YXMgYWJsZSB0byBidWlsZCB0aG91c2FuZHMgb2YgcGFja2FnZXMgd2l0 aG91dCANCnBhbmljcyBvciBmYWlsdXJlcyBkdWUgdG8gZGF0YSBjb3JydXB0aW9uLg0KDQpG bG9yaWFuDQo= --------------stAJM5daP76iyIEBXMKjSENZ Content-Type: application/pgp-keys; name="OpenPGP_0xEF5BA4DCD5A9F3C0.asc" Content-Disposition: attachment; filename="OpenPGP_0xEF5BA4DCD5A9F3C0.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFpyBwsBEADLq0c46orEtbMn4SptX+VJxR1wB4YwaErZme1bqF4nZHIhlRNE T22HsHdQdoagaB4uACq0Rj5kHcu614ZnnNkLPyCxWQATx+cbdiFO4/hfT8tAvKnB tiy3awKJ5uGCNO2EzJwXW6KwdDA8XPRySqN8m1yPl+dW0Cls+/vO/QL/6+YLMupm EpSvFxRzAZTQuKyX4+xl+dYId24JiPd1yfCuDNOY3+OZ3QBMT00u/699N8lUWRti TwaQMwAOww8r/26YM6/SgcgFuLH2E/CVplY0sDvfoISlAj8agxdomNXfPjCMQ6w5 yGZmA+huFpPCVBTi3on/SWgbQO7dLVpN4BNPuScPosCb/dsOg0S74zCClsIU3gdU Gh9rwJY00/Ebid6V0R3c1Czwbg8LQedzlGDuXYXmzp6W2ujgr1cqbUD6lUWikUv2 IMdCbb8MxYhHLi3GYUs5Xpi+W7vM6T45KbuMr7O/1SjtcGOlNeDvGNgjcDk20fOg PPZ+M6i9vX5Q2oI9HoYaeTiYNwILkBLVP/L40kTo5EkiQOt4OW6BMbylqXPOaQMW uGVbmhCJQpbx8Vo80s2yiBBVWkLkWQIcIm3KZlLldJqKEFpQBWLBE1eFFqboYgAW zFn73CaV5tihobijMmmOV3a8cI1fI4kREyl3g+8bW+O0u3m3tuzVOpDpjwARAQAB zR9GbG9yaWFuIFNtZWV0cyA8ZmxvQHNtZWV0cy54eXo+wsGXBBMBCgBBAhsDBQsJ CAcDBRUKCQgLBRYDAgEAAh4BAheAAhkBFiEE7LNouHkIv7aRTXJp71uk3NWp88AF AmHwU9QFCQtIlt8ACgkQ71uk3NWp88D6dA//YNhcYVDRSpLDNMLE9rqJ0DHJFaIR afpExGxQhHHiQKoeXwj87VCKRP++sbewS43g0hw63Nh/v/L2WbAwF4QvF3MOAhoi iGaNZoHpPK2XwaWcqa8nh2QK28G51PzLooAx78tagIBYyP3ZoRlhu22Ye3tNnN0f 1ckEJMRoJAPO7hDGzFE03kcaFvOu9AOOJNuaZxdVspni6s8B4n9xrHVXNOIlwMoq 2UT8irtMJb+ZWsBb/Oj/ZU0+oni8VWJMEMWwVgEOlwweAw8PK+C24F2vAj+tY3DU Q9ZQB6nX4PZesRnah95IKrDFJjOGhmdSls0uGRQkmY/U3ESuD+3AkRGXnXZ7kz6B rTVqonegmGzG6If3BulvLqv/bdwE32JOe8UIY6cLNhgoRfMlx58Po9DZCnG4uwPr 5zVpuRO4SvOC3Rz1Q9tUV1rbrWa/QWsDlDbwzIX92eXeVs1nrQokO9VE5Fg3279k tyVJGdcSd53h5xXCvO0SKVIkfvNtTOxodhhFzhgfBgDa4eYpJfSlgSMEDOab/vRg jAjqWFbqjY+fa2OAvGXuPhCO8aofKtgnQxCK9yASayptn+3KKNy005/Q5Kuh1C89 csjRxhZSw6dB+gLdyZggtD8mv12+aaFIep3FITOKKmA4H/CUcKGDozXVvhL0r90o +BfzjopmIHn6V7LCwZcEEwEKAEECGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgMCAQAC HgECF4AWIQTss2i4eQi/tpFNcmnvW6Tc1anzwAUCWnIHWAIZAQAKCRDvW6Tc1anz wMHxEAC7Bd/rmRO1XAMAkQWddCZHHyr9t9XlZYxVVkwz3Mw6YszTTo+UmWez28MT B9eRSxM4qkL0YRER0JXGypD9apis7Q7zIthExjQhDrDYHlxXO9/UPBjoWhzvM6kS C8C3mYJH0GgnV4d/3QqsdhTF/wBpaMn8ITgR03jAO8Rjbe1DWi/RF6I1miQp8opE XytFsGGnBFxHLNXh5qHda8orI7I8gYqq5cbQZaGC3Let822KifwCiYWhCUrSUKrn uiRCPQctLe8tPNd7G99awtz6ctdPx6jztyUxBpjPuHkSOozSvgU9GYYnXydDnACu 3m85/mhG/3RFIfdAktrFV2+3QEIOvazUnm1MbuBk/+srLP0Gs+1W8HCIcRbyOHDi UNtXfEhQRWSPhQSwz1eQesep3wmIU1lk48TblWS4B6h7IHeP2SZ9lzMX9/jVwenm /lHJNq+1r1BYDpDTsBE+7YkIEww36Un0b86TwmVSBIY7Adn7dHuOO8MwQWHgMmEX YHvsN0vGktUlLSHlxLxYzpr+ObVKToMCLhuCSx6293IT83/LFCYeiR0phbYsYOB3 tzB0zZfrrRq8VF7iiBnQ94tGKY9vIm5I3b6FkL9/LmMS/k+9n7qym7BgxgMKV59G m8EOqYILG18zUs0VGJeN1i9R0e9Dd9pwPM2k6Q8unRV7GMknYc0gRmxvcmlhbiBT bWVldHMgPGZsb0BGcmVlQlNELm9yZz7CwZQEEwEKAD4CGwMFCwkIBwMFFQoJCAsF FgMCAQACHgECF4AWIQTss2i4eQi/tpFNcmnvW6Tc1anzwAUCYfBT1QUJC0iW3wAK CRDvW6Tc1anzwE+0EACIw1ITj7Nd1WvigN6eJJzumzGuUJuNVC9foilOJQHQ7ukd yGbnHDIaXaECdg2VkUoqn5ouv8TOqsFdFdcMe07CBAqEN2McJ3D5b6IGSzoAO5Zr fDleE8n2UrRHas9ZiOJqmeeo5WGep5IzlOJegs9R39/ZVFx2Z0qhKvclvs5MsskI GE3dC8MK9qw5SxRhdQ0Ew7SHwOWyzszUhcNO/cIs1G0mSKgzMhnBYGqdqLbwjNO0 AkrASw7Vr69UMYp5ffeaFpH7SjMMm/Ts5MLPWihy+WpJ3clEoc/T+duLLMlGKTkE MXgwIHSNUs+PIn21hb7yc59DB5JH2XhqjmCdLr5fkifKHxAuMPrp02KI1nyqeHT4 2dlUBvpMxDdD/xpCF7LueakO61NnnfMkjlzVhDuFyPMAPNO4yQegxkz2gdHUdqjB mUytapVA6/9nnn0Ux5Oixpy8Fq8/Ojtb0D3yyYKG6NsnDla6sK2QzpGjt+K3WNw8 KjgZRc19PXnYoYd4OSFW8dqwFsCQtsElnDH6Xsc71Oq8Te25gmnOugr8q8z7kAM+ WImGcd5ro3mWTVOtaYsZSHIzxqfYQlZN1FeH126pnZrzOuHvCRTYefQek2ojB1L7 KYeB9xeWurRTKvTTp/LZ/kCmaQ1hq6V94ON2chMseQeJe6yT0z0zCv5r/HnfusLB lAQTAQoAPhYhBOyzaLh5CL+2kU1yae9bpNzVqfPABQJacgdXAhsDBQkHhh+ABQsJ CAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEO9bpNzVqfPAu2MP/j3MvBdI6rtfraSz pUHfPJ7HDy/YN1HD+oqqK9VTP00JgREoMQpPmC3Y1mtggUhODdteXS2hLqq0pbsr 2V81p5Rybjz6IcAztvtPGFtSNilhjP5jDuYlaxL52JYEYdkjg43zqzGQtJtSuNxv ZWCcuJdPbHqzQOflMC7KGuAF+acBDJIqd5xV+nRQtOgHaRUM9hMRS//63wXZVwgM MwdxTW7rHuTWIofwZLYNWQpOhq9Rx768ytI1QfDJdmb1NsfHMTqmCTHRj+c+wEML p8uvoczBQFeJM4iHiHSy9qaqzZGvNYWMfk+EseWcw230Acn2LV9o41eFwQiMr1h/ sxiI3wWiCaZmWNxCtubg5y75pWJef5DaFYEAgywzpNAdEXHTNuqSfBtnzQQ5ZCfH Wl00fMKKFQwjVgttEt63/Bqei2hVJoqlLzuKZzMIOg+sC6Wv4ZcYBhDuDRCsqOv9 fr69c/Ev4a6q55TlUAghjcncAcnCEOv6BVaPDqO2qyDKoRyyx3x7Df1HAOXyc7r/ qKCPTu5yGeA9RVhHOs53QyWk3rqDd0PoiHekPxnSp8RZ29UUaMq4oxztppHlEDXR Lej6n1umFbhUu0bpRurubiaLszXrarckCdQu0R97d5jwZvvjKx4TiWL7oHiEs3TY NZAx8xmMWZiBOZrO6z5vq1moCf++zsFNBFpyBwsBEADR6zpub8nSv4o9c5A8i2c2 6IJOc4zIeqAK93B+KBmyRzy5chWUwlQWFMA+JIejVdbCrmTnl/2soMlYNUci7pZ8 7HOmI1ziMZaoakMBiPJPLLACKTEn9Nve/NQjRdhwuNgqyXh7VzTjQzTo7DLqMc4G vcy0AoeIy05RP01CaOilQAVgVUbU1Ydme+6SrTe49jTxQR76eytFh31fk2J5bII4 VANAAmZ1HR0tmEcwYQs80HpbncQc+eEvcW1KtZn2X1cfAGwBlxds8aOvJ77wACZ+ PB4gUt3TIQhmCQ3WXY2ukHVBT4npopzscJFMwqpisZvgI+1ErntUm2WaicZjCNXh eDq5PwSSSO+GfxZyYGEeFJBIg9yfylKHEAiB93Wgdfvwl5YffSG+wD/kBripN75z R4e1QatxPlQIjOS1NAZoFvnHUTx5IsDO7A2tlZ1d1ar1e0JqDCpxxc1AejZ/LhPo mpKeSfNT6+vJAzqu5C1t1JxpoNT1Km7Jwmk4piW9yQGFszlv/QmHD5WwHSKovsB+ zDqHi/jwPfQN5Fv/PNaxpnjmBc867DVS7XmvgCX17aeCzeYDlSDyKaLwjUlV1xCo Je2uL41Bs1Qc6x+z80/pOF1BEMDQgAnxmcRBMbZ8tfW477pmdK7/gBAB77Fkilx1 FScyDY6nfVIqGhGyhgD5TwARAQABwsF8BBgBCgAmAhsMFiEE7LNouHkIv7aRTXJp 71uk3NWp88AFAmHwU/4FCQtIluAACgkQ71uk3NWp88ByqQ//c50WjTdLufk8CcUg 922ngNjqnnmzuoI6bHH6E9c9SzkyYhv6TzM+0weStm6PtCcM0VdvZ34knjRkKgcd Ux2d2NKYebRQfK3xeGhHXY4bcMT/NEOEs8U6EmQBjAZJ3TV5RKTHsh6FaXBqEe6p CgLa6+zPYPaHH/JEzt4c7w8wElSMIgElcJeEARgL+LJUoW8SfOg24bVIL7/upEnt aputoTE64vHA/9JlQQBMJgH+pOJfacGFtqAHZdL40ubM9NLqgfJ7k9tjbogd1wY0 geQhW3ioctxGZHKRtbWjJrl7cIQIEE5ppJ67jL/Trz/I6EitZ60skQcM3DG2FuD0 uaceHP0UrHVSHMoUC0NPOHNWpPXAyJoslPaWYR57zSHafOKnxFlzq17VklH1MhI9 J6SvbwIyh+Fa32pMPlrUa5XhQv5rk0rtRX7JHgaYbbPYJNH6MdVWfqVjC7McLCpa YAqoQhc6TeXsvobGsI2zgPF9iiY5di6+32Lr5sbvxToEcT4YjtPFDJBQCJR1p/rF 4rxk28WcWoBqLMzq+jGZik99SHFNVqmNxCIwP2aHQ5Ac/3E/LHuIb4ecIa6EbhlB n3KeSplVCYZAr0sZ1cDGM+Lg6a/CPk2FlPi5yWyAWXB7PMLzbmkjC3fQi0v+DItm yQ0bwHZkXjsIiMc88XYq16uypGjCwXwEGAEKACYWIQTss2i4eQi/tpFNcmnvW6Tc 1anzwAUCWnIHCwIbDAUJB4YfgAAKCRDvW6Tc1anzwM/8D/9IbDzMvsz4O+Gcz1oU x4IMxbQDw99qgJexR5cjW207GkRnKVJ0zqx7Xc+U3AytniuwqHEXeV4qIqP6h14p EuCqdRJ+fSm65rB4+ZdeM2Y5YYvUBByOM78Mbs6SZy2k5X0EL5FXjNVIMOv2Imbl yeRWhWK6gCfc/l7kV1EYVx9LV3umsc7K+ceZlfE1U8hWbie8r7tl3V9ggF2g1cyc 9ru0qW3sg8D4vNTS1uwdqeccKRc3osrVw4WrW1nGxTmTTCqVYGHjF2sANF9o1JB9 3hoXz8lydmDdhJ/62/XHapeT1FB8m7gulinM33VeOCCjN+dUgLQk5tAGg+iHQWhC 4Q/o4m0OqfdcSYdhCJ7h2I4GwOoGaxzoXqEL47Guxz+zE4osAFP5JLxCTbi2x5sd uCvxx3WbO95kZJKp7D0BIKpbKcfkyWse53YBI9wSrkIil+InnqvSDzU9nMvIyKSj v4uiwvZi1HY7tPiir/P2naZaiQ1SAM0KLP3g123WcnhRKo++ZRHhay5/70SKGdxE mKf3nld8xNCs9EIWOTpRaqc9+zOcD1zVTZwnwgBrnPqzfPW9+d7FwAP1MdJbrROu C2bfzNZyoR4uHAnDOyNWwGSmShv7hhdettO8dJblneTY8vhzxo36pWmojEdgghXN w9Ji7kyInAmWq9kwV5Vou3ZNFw=3D=3D =3DCZJt -----END PGP PUBLIC KEY BLOCK----- --------------stAJM5daP76iyIEBXMKjSENZ-- --------------k9EyQdLWX0g08eualvhqQ70P-- --------------ZtsMrSGEuxkWLArxNyW80EFQ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEE7LNouHkIv7aRTXJp71uk3NWp88AFAmQ6y8YFAwAAAAAACgkQ71uk3NWp88Ah rw//UWfouJekp/rbLBKnDc4u8C7O9D3M8q6/+NwGW+/GauF9PjjCitBUwSUHMSGnrc44b0V+rVvW +v4kq2PbrNuLh96SLiSfPemZc9FAQzp490fh58l7eWvrwgv/SR7jvei/VAUNtoL6LPglfOLMEkdm W1cja/j8rcbB3JOGC2arVjgQAHCCxr9EzyeVL95v4ERyymLGDZdEVrxwy8zbroOLYYlgC1ThMyUj JIHlrm+YSGTYm15dgWWUAJ+ZJZjcdqvYJ2BdLpjB9TpFNSJdOjFAqUBecqmy3txNEjE5grVe5Aut 50n482ocuwsYuUJvf+/FojThrmqAKYZZSNLlKzzfkmQ0hQtjhjuUBXQfnRB0SIVPYL8sCTjh8Z5K teWnmmu7MF0L4S04vhbpjzkWvWuKEdJ5OMwKocF9ZeZM73Oup0EEsTGpYfy7Nmtto0jLAiFZQwsT LKzUiIKzA9cFAGc/KIPuSmh2+a8TD8v3P+nAiIxp89PE0GKia/vLrulXrV20bvQX4qvnKpe22DKz lCq9eMPAaKCp/ZR1dWWqfgT9wZVI3+qWGrf5O604rP2qh6kHJhtlHvG74Cy0E78C90NOH6mt5aPi r13kRBulJVMCX7At6bgh6pROW/JOi55YPs74cTnqenFGgmxxzUnPDh8GJOvXpSsHBSwZbnEdeHpA H/c= =s9Qn -----END PGP SIGNATURE----- --------------ZtsMrSGEuxkWLArxNyW80EFQ-- From nobody Sat Apr 15 16:09:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzJDD2fc4z45ZcT; Sat, 15 Apr 2023 16:09:32 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzJDD0gmJz43lG; Sat, 15 Apr 2023 16:09:32 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id niKqp7scauZMSniSxpWqDS; Sat, 15 Apr 2023 16:09:31 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id niSupkkeQ3fOSniSvpk2vg; Sat, 15 Apr 2023 16:09:31 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=643acc3b a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=YxBL1-UpAAAA:8 a=CjxXgO3LAAAA:8 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=zfX4q9hhoeRGHETbNR8A:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 7FFAFA7D; Sat, 15 Apr 2023 09:09:28 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 6779826E; Sat, 15 Apr 2023 09:09:28 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: FreeBSD User cc: Cy Schubert , Mark Millard , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> Comments: In-reply-to FreeBSD User message dated "Sat, 15 Apr 2023 17:51:51 +0200." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 15 Apr 2023 09:09:28 -0700 Message-Id: <20230415160928.6779826E@slippy.cwsent.com> X-CMAE-Envelope: MS4xfA3hYRYkpzrM6zEzVLrv5Mg5wDzl4dkfqQc7xkpy38JapMH6TXj9ZcCD9p1LK956upp/v0B9bjaNpLbweB0224y0fMLpmMq6CM9S/Yw8jm/iWgqxUJE0 pbwkgE9IndCpJzXWVxvI2PiR1ZbXvVmqd9rvaOJGRCEvjjrLQ1r1vOGN5+KeZy+ehMWtEaw/jM3/GtCpfa3vwOs1gPed9WEnGUtNOQZRewXnSZ7HnhFNYh8r +UEEtRWIvcMK1Hn/EQC2Px6qJmFYNIaOMB9JjrV3dKHnVcniuByepSugbsmso/Y+olb6VSK8bm27dJVCM1X81pi3x8RG4XxU5ymMRI/lrUgKnHy0aN9zwBmA EAPswYAvMju7dW4pPAGU2QfvQXvI/51YMfHfE5x4s89Kq9Joncg= X-Rspamd-Queue-Id: 4PzJDD0gmJz43lG X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de>, FreeBSD Us er writes: > Am Sat, 15 Apr 2023 07:36:25 -0700 > Cy Schubert schrieb: > > > In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, > > FreeBSD Us > > er writes: > > > Am Thu, 13 Apr 2023 22:18:04 -0700 > > > Mark Millard schrieb: > > > > > > > On Apr 13, 2023, at 21:44, Charlie Li wrote: > > > > > > > > > Mark Millard wrote: > > > > >> FYI: in my original report for a context that has never had > > > > >> block_cloning enabled, I reported BOTH missing files and > > > > >> file content corruption in the poudriere-devel bulk build > > > > >> testing. This predates: > > > > >> https://people.freebsd.org/~pjd/patches/brt_revert.patch > > > > >> but had the changes from: > > > > >> https://github.com/openzfs/zfs/pull/14739/files > > > > >> The files were missing from packages installed to be used > > > > >> during a port's build. No other types of examples of missing > > > > >> files happened. (But only 11 ports failed.) > > > > > I also don't have block_cloning enabled. "Missing files" prior to brt > _rev > > > ert may actually > > > > > be present, but as the corruption also messes with the file(1) signat > ure, > > > some tools like > > > > > ldconfig report them as missing. > > > > > > > > For reference, the specific messages that were not explicit > > > > null-byte complaints were (some shown with a little context): > > > > > > > > > > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - not foun > d > > > > ===> Installing existing package /packages/All/libxml2-2.10.3_1.pkg > > > > > [CA72_ZFS] Installing libxml2-2.10.3_1... > > > > [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done > > > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - found > > > > (/usr/local/lib/libxml2.so) . . . > > > > [CA72_ZFS] Extracting libxslt-1.1.37: .......... done > > > > ===> py39-lxml-4.9.2 depends on shared library: libxslt.so - found > > > > (/usr/local/lib/libxslt.so) ===> Returning to build of py39-lxml-4.9. > 2 > > > > . . . > > > > ===> Configuring for py39-lxml-4.9.2 > > > > Building lxml version 4.9.2. > > > > Building with Cython 0.29.33. > > > > Error: Please make sure the libxml2 and libxslt development packages ar > e in > > > stalled. > > > > > > > > > > > > [CA72_ZFS] Extracting libunistring-1.1: .......... done > > > > ===> libidn2-2.3.4 depends on shared library: libunistring.so - not f > ound > > > > > > > > > > > > > > > [CA72_ZFS] Extracting gmp-6.2.1: .......... done > > > > ===> mpfr-4.2.0,1 depends on shared library: libgmp.so - not found > > > > > > > > > > > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > > > ===> Installing existing package /packages/All/gmp-6.2.1.pkg > > > > [CA72_ZFS] Installing gmp-6.2.1... > > > > the most recent version of gmp-6.2.1 is already installed > > > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found > > > > > *** Error code 1 > > > > > > > > > > > > autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 > > > > > > > > > > > > checking for GNU > > > > M4 that supports accurate traces... configure: error: no acceptable m4 > coul > > > d be found in > > > > $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommende > d. > > > > GNU M4 1.4.15 uses a buggy replacement strstr on some systems. > > > > Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. > > > > > > > > > > > > ld: error: /usr/local/lib/libblkid.a: unknown file type > > > > > > > > > > > > === > > > > Mark Millard > > > > marklmi at yahoo.com > > > > > > > > > > > > > > Hello > > > > > > whar is the recent status of fixing/mitigate this desatrous bug? Especial > ly f > > > or those with the > > > new option enabled on ZFS pools. Any advice? > > > > > > In an act of precausion (or call it panic) I shutdown several servers to > prev > > > ent irreversible > > > damages to databases and data storages. We face on one host with /usr/por > ts r > > > esiding on ZFS > > > always errors on the same files created while staging (using portmaster, > leav > > > es the system > > > with noninstalled software, i.e. www/apache24 in our case). Deleting the > work > > > folder doesn't > > > seem to change anything, even when starting a scrubbing of the entire poo > l (R > > > AIDZ1 pool) - > > > cause unknown, why it affects always the same files to be corrupted. Same > wit > > > h deve/ruby-gems. > > > > > > Poudriere has been shutdown for the time being to avoid further issues. > > > > > > Are there any advies to proceed apart from conserving the boxes via shutd > own? > > > > > > Thank you ;-) > > > oh > > > > > > > > > > > > -- > > > O. Hartmann > > > > With an up-to-date tree + pjd@'s "Fix data corruption when cloning embedded > > > blocks. #14739" patch I didn't have any issues, except for email messages > > with corruption in my sent directory, nowhere else. I'm still investigating > > > the email messages issue. IMO one is generally safe to run poudriere on the > > > latest ZFS with the additional patch. > > > > My tests of the additional patch concluded that it resolved my last > > problems, except for the sent email problem I'm still investigating. I'm > > sure there's a simple explanation for it, i.e. the email thread was > > corrupted by the EXDEV regression which cannot be fixed by anything, even > > reverting to the previous ZFS -- the data in those files will remain > > damaged regardless. > > > > I cannot speak to the others who have had poudriere and other issues. I > > never had any problems with poudriere on top of the new ZFS. > > > > WRT reverting block_cloning pools to without, your only option is to backup > > > your pool and recreate it without block_cloning. Then restore your data. > > > > > > All right, I interpret the answer that way, that I need a most recent source > tree (and > accordingly built and installed OS) AND a patch that isn't officially commite > d? Yes. > > On a box I'm with: > > FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 07:57:16 CEST 2 > 023 amd64 > > The box is crashing while trying to update ports with the well known issue: > > Panic String: VERIFY(!zil_replaying(zilog, tx)) I never had that problem because I didn't enable block_cloning, except on one pool, which I created a zpool checkpoint to allow for simple rollback if needed. That pool, when tested, had all the patches applied when block_cloning was enabled. It never experienced the panic. > > At the moment all alarm bells are ringing and I lost track about what has bee > n patched and > already commited and what is still as patch available but in the phase of eva > luation or > inofficially emmited here. I maintain a separate branch which contains my own patches on top of what is main. I committed the additional patches on top of it, now a new branch, to keep track of this issue. Maintaining a separate branch saves a lot of grief. I can't help you with this. > > According to the EXDEV issue: in cases of poudriere or ports trees on ZFS, wh > at do I have to > do to ensure that those datasets are clean? The OS should detect file corrupt > ion but in my > case the box is crashing :-( File corruption will not cause a crash. Corruption of metadata might. AFAICT metadata was never corrupted. Only file contents were. > > I did several times scrubbing, but this seems to be the action of a helpless > and desperate man > ... ;-/ Scrubbing doesn't fix file contents that were corrupted prior to the checksum being calculated and written to disk. As far as ZFS is concerned the data is correct. > > Greetings > > Oliver > > -- > O. Hartmann I have for the time being reverted the ZFS import in my day-to-day branch. My branch with the new ZFS + pjd@ patch is currently building. I won't be able to test it until Monday -- because of life things that have taken precedence this weekend. The plan is, starting Monday, to install the branch on my sandbox machine and give it a thorough workout there. Once satisfied I will install it elsewhere. I will report my findings next week. I think it's a good policy for people who track -CURRENT, if they apply patches, commit them to a branch (not main), building and installing from that branch. This avoids all kinds of confusion. This policy will allow you to create your own personal patches you don't wish to share with others. My day-to-day branch contains at a minimum seven patches I never plan on committing. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Apr 15 16:13:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzJKC0Jkfz45bBh; Sat, 15 Apr 2023 16:13:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzJKB6Dm3z4Dn4; Sat, 15 Apr 2023 16:13:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id nbnTp7UrxuZMSniX8pWrBU; Sat, 15 Apr 2023 16:13:50 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id niX6pklvc3fOSniX7pk3Xw; Sat, 15 Apr 2023 16:13:50 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=643acd3e a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=pIhXSETnAAAA:8 a=YxBL1-UpAAAA:8 a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Paoh2FSOps8af3h1t30A:9 a=CjuIK1q_8ugA:10 a=aStlkcwk48vnf0XRxVrg:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 6B176AEB; Sat, 15 Apr 2023 09:13:48 -0700 (PDT) Received: from localhost (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 2477026F; Sat, 15 Apr 2023 09:13:48 -0700 (PDT) Date: Sat, 15 Apr 2023 09:13:47 -0700 From: Cy Schubert To: Florian Smeets Cc: FreeBSD User , Mark Millard , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Message-ID: <20230415091342.75009659@cschubert.com> In-Reply-To: <6792aded-6e2e-a118-259d-0df0f80c361c@smeets.xyz> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> <6792aded-6e2e-a118-259d-0df0f80c361c@smeets.xyz> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfCSL93zqe2hzlbT+rN0mtdsNDcYLe6PAakrNqlaNvC6WGkAjG20z7r/moR5K9lHkrQr6GuPNrLme3GKKTIT4JdqVclocQG3TcUsNYQkAZ05Mtuoucwg7 BRcIF5K8VJFCG2SfpdY7rkRd9qxDNx+kA925eDmCzkFW/TgZO296hG9Y5iF+VRNaiOn6O8k+ATgsENHnOfLCPfCrst/9WkPpCQBZJcIH84xOreqOpHacjoJN xp2VS+huqlD5U5E0UGb+Vm57eYdhBen/WPokplwHg3GTrD4Tg3po/t/6+XnSBIsIohiMQPz7SyeKIlU1/aydMQeFT62Cz4MBNpm2bfv72e8qV1E1hHusbz/B 7wB4iO3qqkpWzk+xzxB82scS7x974yKM5BimwScYLWLGS9IpMTcAyZM+f3oMuiaEkByavSPeQB0VpNXuncVgXMg+CLqcmg== X-Rspamd-Queue-Id: 4PzJKB6Dm3z4Dn4 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sat, 15 Apr 2023 18:07:34 +0200 Florian Smeets wrote: > On 15.04.23 17:51, FreeBSD User wrote: > > Am Sat, 15 Apr 2023 07:36:25 -0700 > > Cy Schubert schrieb: > >> > >> With an up-to-date tree + pjd@'s "Fix data corruption when cloning embedded > >> blocks. #14739" patch I didn't have any issues, except for email messages > >> with corruption in my sent directory, nowhere else. I'm still investigating > >> the email messages issue. IMO one is generally safe to run poudriere on the > >> latest ZFS with the additional patch. > > This is also my current observation. I have 2 hosts where I was > unfortunate enough to update at the wrong time. I currently *think* that > I'm *not* seeing data corruption with head from April 12th and this > patch > https://github.com/openzfs/zfs/commit/d3a6e5ca3b2f684132238ca968bf0b96f17ec7e1.diff > applied. > > One pool has been upgraded with feature@block_cloning and the other hasn't. > > > > FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 07:57:16 CEST 2023 amd64 > > > > The box is crashing while trying to update ports with the well known issue: > > > > Panic String: VERIFY(!zil_replaying(zilog, tx)) failed > > > On the pool that has block_cloning enabled I see the above insta panic > when poudriere starts building. I found a workaround though: > > --- /usr/local/share/poudriere/include/fs.sh.orig 2023-04-15 > 18:03:50.090823000 +0200 > +++ /usr/local/share/poudriere/include/fs.sh 2023-04-15 > 18:04:04.144736000 +0200 > @@ -295,7 +295,6 @@ > fi > > zfs clone -o mountpoint=${mnt} \ > - -o sync=disabled \ > -o atime=off \ > -o compression=off \ > ${fs}@${snap} \ > > With this workaround I was able to build thousands of packages without > panics or failures due to data corruption. Thanks for this. I'll test this next week. A one should be able to test this by hand to capture a dump. > > Florian -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Apr 15 16:14:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzJLT4sBzz45bN6; Sat, 15 Apr 2023 16:14: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 4PzJLT49S5z4HKH; Sat, 15 Apr 2023 16:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681575297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZiDaQPW5kIUK51SeBOcUH5+28J662l5S95qjwXXoWk=; b=nZWxI74E86WeqpIZdCWaCjNJK/yNMa1LBtNB/HCWU3uXbjiQ8Qjgm0nPiEuLCanKBfwujx NQQtuJEqzThBPrFuW6gtTW07BrZE51d2MhOmVvJCHZigAEnVsmLNv8Hnpe4AKBYV80iMej xI3A/VQnPKnktpa5tMelxh1XR6wiludusbagvf27Y7YonYO3BJ+Vb1cI3uqCLDMeXY80Ni kgky+Y3IM7T6GKgmCdNHCax0degzHb1uQyLJN0nOI/m/KCi3BQqyrAfRy23OK48NhADoiJ FHVaA/a5tWzxM5iKzBEQaJhHrVZtXl22hRs0z+ZHAkaBYXRCDpbRbvRYGQRyBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681575297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZiDaQPW5kIUK51SeBOcUH5+28J662l5S95qjwXXoWk=; b=GK0fc/an8ASlM/JmgXp3HW2TU8Dw81GbjseN3oPgFQhfwe5c7ZxNlCCrgnU25gIF0/2XbL H8vW95wfFuk4n1e8cyTPslj7mUZasSNSdRMbm/0LE2TBb7u496/SL/g6YlsGYa/1HWWi+0 +HkrgAuPlXMNJ40aahZeSdBcHoH9HqRi79mjXOqupx/n8Oe81Qms/8Xq1dR1GYddc4ITMf 48d32iwDWjExm3T130GC/ivlwkRefCHHr9VJ8BJcuVkldFbOajY7jR6WHLoyj9/9yWG7Ah nOA7WzbfQBHLJ+tpoocnP0+fapZuB4g9gUV9qO17IKdSphn2Iwl//znxvooWqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681575297; a=rsa-sha256; cv=none; b=JjaziN6/7LP5Vpu7O0BRJrxYPSdFFP1jM5LH5pt6MrtWtbToDVWPmYEacKV9hJ7mLtO7NP yGmt17biDsAfIT9bCobyC4WehpbqNrJldcxYE/huJoy6iK07vOPyY7+34L/OgmM+5PB+FQ Za/kqLCBWKXSqs0xUO3baIQGLYhgRB0MKoorTTKYZ+HONeXcJL4RtfOV3NPOE2oSk6jzXV dJ7+pmYvpom9Me07/Iubez6jdU+dQ/2bvGm+NgsltARWhfN//aMdZ+dFMavENB92Ruvq3/ ZV8as7y3o5T3KjbCpQh6jOK0n1hGpt+PaMy4roAP0bMBZ5hsODUqjTNjEygvdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzJLT3Dzlz1BZP; Sat, 15 Apr 2023 16:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FGEvEG075344; Sat, 15 Apr 2023 16:14:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FGEvQC075343; Sat, 15 Apr 2023 16:14:57 GMT (envelope-from git) Date: Sat, 15 Apr 2023 16:14:57 GMT Message-Id: <202304151614.33FGEvQC075343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 42742fe72510 - main - KASAN: add bus_space*read*_8 for aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42742fe725102a73b09800f4d041ad69b5d81edb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=42742fe725102a73b09800f4d041ad69b5d81edb commit 42742fe725102a73b09800f4d041ad69b5d81edb Author: Bjoern A. Zeeb AuthorDate: 2023-04-15 15:35:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-04-15 16:13:56 +0000 KASAN: add bus_space*read*_8 for aarch64 Add the remaining bus_space*read*_8 functions conditionally for only arm64 in order to not break KASAN builds with new code using one of them. Suggested by: markj Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39581 --- sys/kern/subr_asan.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 8a70b525648b..e7dea254da08 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -957,6 +957,13 @@ ASAN_BUS_READ_PTR_FUNC(region, 4, uint32_t) ASAN_BUS_READ_PTR_FUNC(region_stream, 4, uint32_t) ASAN_BUS_READ_FUNC(, 8, uint64_t) +#if defined(__aarch64__) +ASAN_BUS_READ_FUNC(_stream, 8, uint64_t) +ASAN_BUS_READ_PTR_FUNC(multi, 8, uint64_t) +ASAN_BUS_READ_PTR_FUNC(multi_stream, 8, uint64_t) +ASAN_BUS_READ_PTR_FUNC(region, 8, uint64_t) +ASAN_BUS_READ_PTR_FUNC(region_stream, 8, uint64_t) +#endif #define ASAN_BUS_WRITE_FUNC(func, width, type) \ void kasan_bus_space_write##func##_##width(bus_space_tag_t tag, \ From nobody Sat Apr 15 17:44:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzLL56mdtz44lLF for ; Sat, 15 Apr 2023 17:44:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-19.consmr.mail.gq1.yahoo.com (sonic314-19.consmr.mail.gq1.yahoo.com [98.137.69.82]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzLL51bTrz4VPw for ; Sat, 15 Apr 2023 17:44:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681580683; bh=ZrcTxurK9d5UwjEFLNbzf6XObLroMR1smTK6w0slaP0=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=HWLW8b95Y//vR8DV/vtP+5lDt24PVKvE1pirek45s9Nzvyn8hxzkFztHiHQbjZF6hPWbgEuZdbgHcaOaUXH9zN/pDD70z83qbXmXMO9qIbwCQ8rvtl7PDAwYM3ol07S6mNnZ7ZYxSaaVKSGOo20JybgIe1i2dmnIwaXkMslO8V+QILIiCXEr5oRMG0a4FOnzF6Jho41synNjBKgRNGFXWOKYxFW7/XjyZiMjowffq/2P21VavDs/iZZi0peqiUrhghCP0TOv/b01L6wHFqVnLUkiHWaZL6KXyqa1y4eKIjLoE1PqAzp6v4gyjUiBGqNwj9V657jguRViA3EwCS1eRg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681580683; bh=KmVwmZ6OGecjTyNjv9Ga2ZU7Kb3BbmUQoHPc8E0o0eF=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=QnwrYUH+kE10i87vVWzRIkzNun2W44Xr4RTI4bx05cQdfSP74PEGQove+XWw11H2AXN7uhJFuTWC062H6b/23opeiaYer7TbaruPkRTxBGJLlMb6U/7seTOmOGTx1hkmnk8gFuPJ7xgK0XKh+2Iyu1EoVMVHJAr+pLG/eMzfRnJPH0symEurxhG29GuGqrG3nPyGysvhioLVVYHEQKdwvwqNW7WhejOnRD+A6la3vIMwHBnBXt7RRVQvdbr+f03tgCxTjI3qGt1H+oKksI+Qc40bgQAU3M4pcc0FB+1oUsygcPPjumrqP0yiX6++tBGR2NEZ+VKNMHr3XY15fINIpQ== X-YMail-OSG: ziZLTjoVM1li2vHARzQBVnvieb_HH12r26BBvcAxPwVw_VDpkrUTsnE2QqSmhKe .zgCQ_rBSL9wDZwqakey3X.wPYjpBYcMagyogXykPc6NWPuygVoXzbLP2ZmLH06KwMd95xJFBx2P wZg2TS6BZzmT7OM2BF7UWEPqo6WMaRsuG.QFbd3WBE.hCtu68duMBkB.vlG0b84.ll1hTNyXWjFS TTbFk_.yyTlwNfVBwG3SfdIjvFrojqml2RVBQgXFf2puzC5wJ9qBPnV_Ratsa0RpFzXuLYGSN_XC hNcg.yOsliytcKPcMtCl.dKdECLNl41aQGU.WzW_M7AzLcmis3Dsz5wqfyidLuwJZ5z5ivXoMy5l pjmhk8.JbHqIia2N2JEGDTXDyrHQB4ldeEuubkkmS7D7kFQ8Fln2SbRMOnFqL1KXDG4HK9T.TiS5 BIYVmHE0givi4A6szG5S3zc2LYNx_7KddYOtbOftZtKm.qXGZI3aYlUkgUDbYPbZKuraKsczQjz7 xlWN5icjnrL7x_WyczhMRDtn13HQh4ucE39BlgBn13_FaYh_BAecW6c5KrqhEMX9_W.qoxKhiZAj CUBLbSD7EJhhfLghx_Byk1cu44g2xbT14pcc2oJUJNuJTVGU_R6A.npS1JXSsSlEBIqngMzgMjdc QxIoqIlcuixqegcTgnBk4fBBG9ZqsUSAH_l1inNtGsLFtqO4M1bUorFQi7gcvhERYk6YUDwSD6Eb 5rs4QajclMZFs0u2nIjp.wvUIrISOOKueBxFy8dbEnGHwuE2di9TvputG0fMRKfu95aAXsmW1vxN g_SyuHP9vSwplSWkz_Nb0FRXeemqju7zhQpODE7LlxB33OYz5WPUe4QB.NOjuc0EWq3AviBtk7Un 9OwcEjB9sBenPbbS9TRzvPcWLBC_mEjmlAE9h3a_0gKQpB7uk11Ky0GlYPWJMRqgDLNWHJJyg_3n vPaEuQ1_yCYmhfXpg3Z7mPP2NScbUVNSGGokYi16SsacdAo_UvHdVWfmnJZMrr8NT4JkYeIwYVzq ULwj.5TdJoVd.5v1lhT5efnelDcN3ayzd0T4Nt1N6nEXMyoVyRs.KFESmr40cQcY6ekSAG35rPqG aBQ2HZLgjdbGl410wIaV3bdqfD6ewHb4Yojaauzd3IO3s2TM3y63H4xIhXkDvurKUeIcG0_KrKlt sI.4TFAx0.tBnP6gX8NjewhA8cnEC6B3R3L37GmiaTD6o7Sy1hdLOE3SnOZ0bpF.akixkFWHuws3 Mm5knQLtCPS7P97f2zS3c.t309As76RzHD_O.ljIEc.sc9QnD6tCg1DcZOWgirlcHuY_ndAZLxdG ChJQAG7eYV5wZK4OWRfjdJdps7BDo51cZGs7I1lKFdnv3DNMvzhMzvQx8ELQOWv.q.aY4cPqiYXK rkka7O7BhA9ghIZOmYdzutWwgpA9s.Tk37xpsczuFWiCELtDs9veQFE67AOpIGjSwip2YRohG1nu S01RwEhHNO6echm78yZhPeLyT8ypirJOCdk8LtIlWhS.JLrkhHXhx0FDBXoMmshRXkQ4GFgGt.re r3k5pbmYxOqEH0VRSrhJf_laI399pHZr5ljx3h58OLmvgLMsIzj_Ql3WoVDglxHT7aBe6rVywJYf NaFF1aDhKMqQcnBH_U8Te_qHrpQmhb3KhdmvaV5Tm3XexQHh3kyWRnbBd_hhaJATtLr2m8NmcQHt 7mfrlZoiBqFgizfJ7CbS16Z6_lKHVVyUr9bIBO6w08ntCSeqjdvWY4wpCMpIdZ4nOw8MqqRIssL1 27Xl.uEC4O18T4gPbbqr8L9cYgkXxBbiGL.QcB4PCrfa2zoSaLHKuyElegZJbqUkvT53VkLKSRdH 8jbdUw1nqxTAKCmW8PqrenMFWPQW8.uI995nezHOVsdFCAC_IVH8rwUJiN_STgM7eF4Ntx9q9oTv e9PwZ9DIf.fXaHG6qd0z1gp1tAfQtt3SRK2Qe0Wx97BigVDUrYjSkD.UvrnS4zlhJppjfyM7JNe5 xPmZ3Xevip5jeVAqF_uZCXVDbMSjGMJn1lAN5EAjVTdqMMTSUn_7pM7wDMyH2evEBFbEWjdzruwp VsrW7i21qZ87m.ZZZ4NgMdD7upFowIt0AI9KhkavdN7vyHWQCiR._uLvIKpNh5VOxPwBlzdnJeBs jAkQIRdKJ6znJ9XOKjXRh5XOyX.KEtQ6YFq9Q3H2PHB7ICTH.0b6sN4RtztB1KHOspiT6vLxQiHf zgC59Qx8tv9HvsDDYxTWt1Ymv3JLzANGwrfFkVniZi18AqerRN_M.hErmBXfoSp00VOThxEkvB6l jjBRVlw-- X-Sonic-MF: X-Sonic-ID: 6e967237-709d-47c4-aa42-43619a05bffe Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Sat, 15 Apr 2023 17:44:43 +0000 Received: by hermes--production-bf1-5f9df5c5c4-lwjq6 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID fdf4869d8b16ad3ffd6f52e10113979a; Sat, 15 Apr 2023 17:44:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <20230415143625.99388387@slippy.cwsent.com> Date: Sat, 15 Apr 2023 10:44:27 -0700 Cc: Cy Schubert , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> To: FreeBSD User X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PzLL51bTrz4VPw X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 15, 2023, at 07:36, Cy Schubert = wrote: > In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>,=20= > FreeBSD Us > er writes: >> Am Thu, 13 Apr 2023 22:18:04 -0700 >> Mark Millard schrieb: >>=20 >>> On Apr 13, 2023, at 21:44, Charlie Li wrote: >>>=20 >>>> Mark Millard wrote: =20 >>>>> FYI: in my original report for a context that has never had >>>>> block_cloning enabled, I reported BOTH missing files and >>>>> file content corruption in the poudriere-devel bulk build >>>>> testing. This predates: >>>>> https://people.freebsd.org/~pjd/patches/brt_revert.patch >>>>> but had the changes from: >>>>> https://github.com/openzfs/zfs/pull/14739/files >>>>> The files were missing from packages installed to be used >>>>> during a port's build. No other types of examples of missing >>>>> files happened. (But only 11 ports failed.) =20 >>>> I also don't have block_cloning enabled. "Missing files" prior to = brt_rev >> ert may actually >>>> be present, but as the corruption also messes with the file(1) = signature, >> some tools like >>>> ldconfig report them as missing. =20 >>>=20 >>> For reference, the specific messages that were not explicit >>> null-byte complaints were (some shown with a little context): >>>=20 >>>=20 >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - = not found >>> =3D=3D=3D> Installing existing package = /packages/All/libxml2-2.10.3_1.pkg =20 >>> [CA72_ZFS] Installing libxml2-2.10.3_1... >>> [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - = found >>> (/usr/local/lib/libxml2.so) . . . >>> [CA72_ZFS] Extracting libxslt-1.1.37: .......... done >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxslt.so - = found >>> (/usr/local/lib/libxslt.so) =3D=3D=3D> Returning to build of = py39-lxml-4.9.2 =20 >>> . . . >>> =3D=3D=3D> Configuring for py39-lxml-4.9.2 =20 >>> Building lxml version 4.9.2. >>> Building with Cython 0.29.33. >>> Error: Please make sure the libxml2 and libxslt development packages = are in >> stalled. >>>=20 >>>=20 >>> [CA72_ZFS] Extracting libunistring-1.1: .......... done >>> =3D=3D=3D> libidn2-2.3.4 depends on shared library: = libunistring.so - not found >>=20 >>>=20 >>>=20 >>> [CA72_ZFS] Extracting gmp-6.2.1: .......... done >>> =3D=3D=3D> mpfr-4.2.0,1 depends on shared library: libgmp.so - not = found =20 >>>=20 >>>=20 >>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = found >>> =3D=3D=3D> Installing existing package /packages/All/gmp-6.2.1.pkg = =20 >>> [CA72_ZFS] Installing gmp-6.2.1... >>> the most recent version of gmp-6.2.1 is already installed >>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = found =20 >>> *** Error code 1 >>>=20 >>>=20 >>> autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 >>>=20 >>>=20 >>> checking for GNU=20 >>> M4 that supports accurate traces... configure: error: no acceptable = m4 coul >> d be found in >>> $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is = recommended. >>> GNU M4 1.4.15 uses a buggy replacement strstr on some systems. >>> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. >>>=20 >>>=20 >>> ld: error: /usr/local/lib/libblkid.a: unknown file type >>>=20 >>>=20 >>> =3D=3D=3D >>> Mark Millard >>> marklmi at yahoo.com >>>=20 >>>=20 >>=20 >> Hello=20 >>=20 >> whar is the recent status of fixing/mitigate this desatrous bug? = Especially f >> or those with the >> new option enabled on ZFS pools. Any advice? >>=20 >> In an act of precausion (or call it panic) I shutdown several servers = to prev >> ent irreversible >> damages to databases and data storages. We face on one host with = /usr/ports r >> esiding on ZFS >> always errors on the same files created while staging (using = portmaster, leav >> es the system >> with noninstalled software, i.e. www/apache24 in our case). Deleting = the work >> folder doesn't >> seem to change anything, even when starting a scrubbing of the entire = pool (R >> AIDZ1 pool) - >> cause unknown, why it affects always the same files to be corrupted. = Same wit >> h deve/ruby-gems. >>=20 >> Poudriere has been shutdown for the time being to avoid further = issues.=20 >>=20 >> Are there any advies to proceed apart from conserving the boxes via = shutdown? >>=20 >> Thank you ;-) >> oh >>=20 >>=20 >>=20 >> --=20 >> O. Hartmann >=20 > With an up-to-date tree + pjd@'s "Fix data corruption when cloning = embedded=20 > blocks. #14739" patch I didn't have any issues, except for email = messages=20 > with corruption in my sent directory, nowhere else. I'm still = investigating=20 > the email messages issue. IMO one is generally safe to run poudriere = on the=20 > latest ZFS with the additional patch. My poudriere testing failed when I tested such (14739 included), per what I reported, block_cloning never have been enabled. Others have also reported poudriere bulk build failures absent block_cloning being involved and 14739 being in place. My tests do predate: https://people.freebsd.org/~pjd/patches/brt_revert.patch and I'm not sure of if Cy's activity had brt_revert.patch in place or not. Other's notes include Mateusz Guzik's: = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014534.= html which said: QUOTE There is corruption with the recent import, with the https://github.com/openzfs/zfs/pull/14739/files patch applied and block cloning disabled on the pool. There is no corruption with top of main with zfs merge reverted = altogether. Which commit results in said corruption remains to be seen, a variant of the tree with just block cloning support reverted just for testing purposes is about to be evaluated. END QUOTE Charlie Li's later related notes that helps interpret that were in: = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014545.= html QUOTE Testing with mjg@ earlier today revealed that block_cloning was not the=20= cause of poudriere bulk build (and similar cp(1)/install(1)-based)=20 corruption, although may have exacerbated it. END QUOTE Mateusz later indicated had a hope to have is sorted out sometime Friday for what the cause(s) were: = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014551.= html QUOTE I'm going to narrow down the non-blockcopy corruption after my testjig gets off the ground. Basically I expect to have it sorted out on Friday. END QUOTE But the lack of later related messages suggests that did not happen. > My tests of the additional patch (I'm guessing that is a reference to 14739, not to brt_revert.patch .) > concluded that it resolved my last=20 > problems, except for the sent email problem I'm still investigating. = I'm=20 > sure there's a simple explanation for it, i.e. the email thread was=20 > corrupted by the EXDEV regression which cannot be fixed by anything, = even=20 > reverting to the previous ZFS -- the data in those files will remain=20= > damaged regardless. Again: my test jump from prior to the import to after the EXDEV changes, including having 14739. I still had poudriere bulk produce file corruptions. > I cannot speak to the others who have had poudriere and other issues. = I=20 > never had any problems with poudriere on top of the new ZFS. Part of the mess is the variability. As I remember, I had 252 ports build fine in my test before the 11th failure meant that the rest (213) had all been classified as skipped. It is not like most of the port builds failed: relatively uncommon. Also, one port built on a retry, indicating random/racy behavior is involved. (The original failure was not from a file from installing build dependencies but something that the builder generated during the build. The 2nd try did not fail there or anywhere.) > WRT reverting block_cloning pools to without, your only option is to = backup=20 > your pool and recreate it without block_cloning. Then restore your = data. >=20 Given what has been reported by multiple people and Cy's own example of unexplained corruptions in email handling, I'd be cautious risking important data until reports from testing environment activity consistently report not having corruptions. Another thing my activity does not include any testing of the suggestion in: = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014607.= html to use "-o sync=3Ddisabled" in a clone, reporting: QUOTE With this workaround I was able to build thousands of packages without=20= panics or failures due to data corruption. END QUOTE If reliable, that consequence to the change might help folks that are trying to isolate the problem(s) figure out what is involved. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Apr 15 18:07:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzLrD6T01z44nBP; Sat, 15 Apr 2023 18:07:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzLrD5Pltz3ptR; Sat, 15 Apr 2023 18:07:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id nfRep7gETuZMSnkJ1pXA6g; Sat, 15 Apr 2023 18:07:23 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id nkIzpYyrCHFsOnkJ0pZWpu; Sat, 15 Apr 2023 18:07:23 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=643ae7db a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=CjxXgO3LAAAA:8 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=prghdMYoeJGcPJPqXUcA:9 a=CjuIK1q_8ugA:10 a=UJ0tAi3fqDAA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C845AC2B; Sat, 15 Apr 2023 11:07:20 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id AC396404; Sat, 15 Apr 2023 11:07:20 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mark Millard cc: FreeBSD User , Cy Schubert , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 In-reply-to: <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com> Comments: In-reply-to Mark Millard message dated "Sat, 15 Apr 2023 10:44:27 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 15 Apr 2023 11:07:20 -0700 Message-Id: <20230415180720.AC396404@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCDP39lIXqdix0YHS8OJ95czLgtmj+dK9h+5b5rp5lmoDN01+SkRJE06GU348XBHm6uKgt1J2D6+iHeJuzrXpmspKDwQBj1B8Mscj/v0rs74pIr4iAJJ dE6kjG/dSWrdq/jTggzB/EWlG4l0qqtRiG2EeOjeOKNXb2lGRH3iwxh+DyGRQNROIQysqlij7vqmKTYrbWOtdssS2eMyuXjzFC8msW0cyM+aIL3HnOLjmK7g 0IlUjw4jkwN0gA0xOBvsfETy5ap17YnnQ86HsFmMQJjVxhOGlXDL+4wzilvargA2VoXABZZWYJRwZDtl9XUGU4z3qwB1wKXVvDFSDzuMFyLo0QZT8XsomFQp KnkBIgiCm/Q8FNVXwyyREewHkTq7GzEXTmYVgHlzWYCtUMCKrQo= X-Rspamd-Queue-Id: 4PzLrD5Pltz3ptR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com>, Mark Millard write s: > On Apr 15, 2023, at 07:36, Cy Schubert = > wrote: > > > In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>,=20= > > > FreeBSD Us > > er writes: > >> Am Thu, 13 Apr 2023 22:18:04 -0700 > >> Mark Millard schrieb: > >>=20 > >>> On Apr 13, 2023, at 21:44, Charlie Li wrote: > >>>=20 > >>>> Mark Millard wrote: =20 > >>>>> FYI: in my original report for a context that has never had > >>>>> block_cloning enabled, I reported BOTH missing files and > >>>>> file content corruption in the poudriere-devel bulk build > >>>>> testing. This predates: > >>>>> https://people.freebsd.org/~pjd/patches/brt_revert.patch > >>>>> but had the changes from: > >>>>> https://github.com/openzfs/zfs/pull/14739/files > >>>>> The files were missing from packages installed to be used > >>>>> during a port's build. No other types of examples of missing > >>>>> files happened. (But only 11 ports failed.) =20 > >>>> I also don't have block_cloning enabled. "Missing files" prior to = > brt_rev > >> ert may actually > >>>> be present, but as the corruption also messes with the file(1) = > signature, > >> some tools like > >>>> ldconfig report them as missing. =20 > >>>=20 > >>> For reference, the specific messages that were not explicit > >>> null-byte complaints were (some shown with a little context): > >>>=20 > >>>=20 > >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - = > not found > >>> =3D=3D=3D> Installing existing package = > /packages/All/libxml2-2.10.3_1.pkg =20 > >>> [CA72_ZFS] Installing libxml2-2.10.3_1... > >>> [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done > >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so - = > found > >>> (/usr/local/lib/libxml2.so) . . . > >>> [CA72_ZFS] Extracting libxslt-1.1.37: .......... done > >>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxslt.so - = > found > >>> (/usr/local/lib/libxslt.so) =3D=3D=3D> Returning to build of = > py39-lxml-4.9.2 =20 > >>> . . . > >>> =3D=3D=3D> Configuring for py39-lxml-4.9.2 =20 > >>> Building lxml version 4.9.2. > >>> Building with Cython 0.29.33. > >>> Error: Please make sure the libxml2 and libxslt development packages = > are in > >> stalled. > >>>=20 > >>>=20 > >>> [CA72_ZFS] Extracting libunistring-1.1: .......... done > >>> =3D=3D=3D> libidn2-2.3.4 depends on shared library: = > libunistring.so - not found > >>=20 > >>>=20 > >>>=20 > >>> [CA72_ZFS] Extracting gmp-6.2.1: .......... done > >>> =3D=3D=3D> mpfr-4.2.0,1 depends on shared library: libgmp.so - not = > found =20 > >>>=20 > >>>=20 > >>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = > found > >>> =3D=3D=3D> Installing existing package /packages/All/gmp-6.2.1.pkg = > =20 > >>> [CA72_ZFS] Installing gmp-6.2.1... > >>> the most recent version of gmp-6.2.1 is already installed > >>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - not = > found =20 > >>> *** Error code 1 > >>>=20 > >>>=20 > >>> autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 > >>>=20 > >>>=20 > >>> checking for GNU=20 > >>> M4 that supports accurate traces... configure: error: no acceptable = > m4 coul > >> d be found in > >>> $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is = > recommended. > >>> GNU M4 1.4.15 uses a buggy replacement strstr on some systems. > >>> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. > >>>=20 > >>>=20 > >>> ld: error: /usr/local/lib/libblkid.a: unknown file type > >>>=20 > >>>=20 > >>> =3D=3D=3D > >>> Mark Millard > >>> marklmi at yahoo.com > >>>=20 > >>>=20 > >>=20 > >> Hello=20 > >>=20 > >> whar is the recent status of fixing/mitigate this desatrous bug? = > Especially f > >> or those with the > >> new option enabled on ZFS pools. Any advice? > >>=20 > >> In an act of precausion (or call it panic) I shutdown several servers = > to prev > >> ent irreversible > >> damages to databases and data storages. We face on one host with = > /usr/ports r > >> esiding on ZFS > >> always errors on the same files created while staging (using = > portmaster, leav > >> es the system > >> with noninstalled software, i.e. www/apache24 in our case). Deleting = > the work > >> folder doesn't > >> seem to change anything, even when starting a scrubbing of the entire = > pool (R > >> AIDZ1 pool) - > >> cause unknown, why it affects always the same files to be corrupted. = > Same wit > >> h deve/ruby-gems. > >>=20 > >> Poudriere has been shutdown for the time being to avoid further = > issues.=20 > >>=20 > >> Are there any advies to proceed apart from conserving the boxes via = > shutdown? > >>=20 > >> Thank you ;-) > >> oh > >>=20 > >>=20 > >>=20 > >> --=20 > >> O. Hartmann > >=20 > > With an up-to-date tree + pjd@'s "Fix data corruption when cloning = > embedded=20 > > blocks. #14739" patch I didn't have any issues, except for email = > messages=20 > > with corruption in my sent directory, nowhere else. I'm still = > investigating=20 > > the email messages issue. IMO one is generally safe to run poudriere = > on the=20 > > latest ZFS with the additional patch. > > My poudriere testing failed when I tested such (14739 included), > per what I reported, block_cloning never have been enabled. > Others have also reported poudriere bulk build failures absent > block_cloning being involved and 14739 being in place. My tests > do predate: > > https://people.freebsd.org/~pjd/patches/brt_revert.patch IIRC this patch doesn't build. My tree includes this patch. Pardon the cut&paste. This will not apply. diff --git a/sys/contrib/openzfs/module/zfs/dmu.c b/sys/contrib/openzfs/modu le/zfs/dmu.c985d833f58..cda1472a77aa 100644 --- a/sys/contrib/openzfs/module/zfs/dmu.c +++ b/sys/contrib/openzfs/module/zfs/dmu.c @@ -2312,8 +2312,10 @@ dmu_brt_clone(objset_t *os, uint64_t object, uint64_t offset, uint64_t length, dl->dr_overridden_by.blk_phys_birth = 0; } else { dl->dr_overridden_by.blk_birth = dr->dr_txg; - dl->dr_overridden_by.blk_phys_birth = - BP_PHYSICAL_BIRTH(bp); + if (!BP_IS_EMBEDDED(bp)) { + dl->dr_overridden_by.blk_phys_birth = + BP_PHYSICAL_BIRTH(bp); + } } mutex_exit(&db- > > and I'm not sure of if Cy's activity had brt_revert.patch in > place or not. I don't know if your poudriere has any residual file corruption or not. My poudriere working 100% ok and yours not indicates there may be something amiss with your poudriere tree. Remember I rolled back to the last nightly snapshot whereas you did not. I don't know the state of your poudriere tree. I know with 100% certainty that my tree is good. > > Other's notes include Mateusz Guzik's: > > = > https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014534.= > html My tree included this patch + pjd@'s last patch on people.freebsd.org. > > which said: > > QUOTE > There is corruption with the recent import, with the > https://github.com/openzfs/zfs/pull/14739/files patch applied and > block cloning disabled on the pool. I had zero poudriere corruption with this patch. My only corruption was in my sent-items in my MH mail directory, which I think was due to email threads already containing nulls. > > There is no corruption with top of main with zfs merge reverted = > altogether. > > Which commit results in said corruption remains to be seen, a variant > of the tree with just block cloning support reverted just for testing > purposes is about to be evaluated. > END QUOTE > > Charlie Li's later related notes that helps interpret that were in: > > = > https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014545.= > html > > QUOTE > Testing with mjg@ earlier today revealed that block_cloning was not the=20= > > cause of poudriere bulk build (and similar cp(1)/install(1)-based)=20 > corruption, although may have exacerbated it. > END QUOTE > > Mateusz later indicated had a hope to have is sorted out sometime > Friday for what the cause(s) were: > > = > https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014551.= > html > > QUOTE > I'm going to narrow down the non-blockcopy corruption after my testjig > gets off the ground. > > Basically I expect to have it sorted out on Friday. > END QUOTE > > But the lack of later related messages suggests that did not happen. > > > My tests of the additional patch > > (I'm guessing that is a reference to 14739, not to brt_revert.patch .) > > > concluded that it resolved my last=20 > > problems, except for the sent email problem I'm still investigating. = > I'm=20 > > sure there's a simple explanation for it, i.e. the email thread was=20 > > corrupted by the EXDEV regression which cannot be fixed by anything, = > even=20 > > reverting to the previous ZFS -- the data in those files will remain=20= > > > damaged regardless. > > Again: my test jump from prior to the import to after the EXDEV > changes, including having 14739. I still had poudriere bulk > produce file corruptions. > > > I cannot speak to the others who have had poudriere and other issues. = > I=20 > > never had any problems with poudriere on top of the new ZFS. > > Part of the mess is the variability. As I remember, I had 252 > ports build fine in my test before the 11th failure meant that > the rest (213) had all been classified as skipped. > > It is not like most of the port builds failed: relatively uncommon. > > Also, one port built on a retry, indicating random/racy behavior > is involved. (The original failure was not from a file from > installing build dependencies but something that the builder > generated during the build. The 2nd try did not fail there or > anywhere.) > > > WRT reverting block_cloning pools to without, your only option is to = > backup=20 > > your pool and recreate it without block_cloning. Then restore your = > data. > >=20 > > Given what has been reported by multiple people and > Cy's own example of unexplained corruptions in email > handling, I'd be cautious risking important data > until reports from testing environment activity > consistently report not having corruptions. The "unexplained" email corruptions occurred in only the threads that already had corruption. I haven't been able to reproduce it anywhere else. I will continue testing on Monday. I expect my testing to confirm this hypothesis. > > Another thing my activity does not include any testing > of the suggestion in: > > = > https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014607.= > html > > to use "-o sync=3Ddisabled" in a clone, reporting: This is a different issue. We need a core dump to resolve this. I'll test this on my sandbox on Monday. We can now reproduce this panic by hand. If there is no panic a diff -qr will confirm/deny this bug. > > QUOTE > With this workaround I was able to build thousands of packages without=20= > > panics or failures due to data corruption. > END QUOTE > > If reliable, that consequence to the change might help > folks that are trying to isolate the problem(s) figure > out what is involved. > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com IMO we've had a lack of systematic testing of the various bugs. The fact that this has caused some corrupt files has led to human panic over the issue. Now that I've reverted my laptop to the old ZFS, the MH sent-email issue continues to exhibit itself. This is because the files I forward to myself already contain corrupt data. The old ZFS will not magically remove this. This testing is necessary to prove my hypothesis. I expect brand new email threads not to exhibit this problem with the new ZFS. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Apr 15 20:25:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzPwR205dz451N2 for ; Sat, 15 Apr 2023 20:26:15 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic313-20.consmr.mail.gq1.yahoo.com (sonic313-20.consmr.mail.gq1.yahoo.com [98.137.65.83]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzPwP4rXvz3wkF for ; Sat, 15 Apr 2023 20:26:13 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681590372; bh=dzamcM83+dMvkGB+6hTezxhTVemFsAK40GYmtefBGso=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=BZFJOgKBndDRvM8noHywJd2j81lTTJfbdmOW1vw+3ytVThpcupIjFJb7GOFDvy2VkRKluo+1w795Q81XFLqJrb/thoTHmkDYKLUhGzY5ixJmT6ssEZpvJEt5hMqRETEVkF8eOdECjpkx0JrVsvF1r2ss1ewCxb0LOFXo7J97Ti4xncdd+HAwbnu04gol5dRyFWRxrrV48sibLy14G65/jAU8YQ4XAA1IWT8MS3ZROqtsMJ/FUWbAK+rLlUFIbsd81usA4+CfC7RFqwWErqMf6GArwqF4UNexaNVvALEEw1qKcR3jUt0glFW4lK+6eyRD8UCrxlP1Ww5NWtN8FCL9ug== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681590372; bh=77zPJ87CMjHMihv9mGIcc5bygCMVuqX81GZdXWBfEC+=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=Zf0uRyRyHPzarARNjvuQDrtvBEXgTo0A881CjHMkau3CgwFO89sQzwZtny+zeRtsZ6RjhZQ4Fr06v2oUUgg9N5Umv61lYwozNMbAetn3pHr8dL9mwvOLe+TMc0hnV8RJN0aXdyDHqrFs8ZrSrAZhEkeIi1JV8RFv6JnH3R7UJeBI+tBJ3HC3UTuVPAN8v/U0Rhr4TBhIa201YFHjyZcFQD+Fsj9sMVDL59Rnl/G2iCIiqPWPfeE6aX3uYxByy/+q47wZZd69QylocslGIwrsVIH7alQYfSH+pMnQKSwremLJGt25aO90QpfbYRsrSePDaB2TdHb9e/QemhQIJb1oCA== X-YMail-OSG: k3TIrwAVM1nI59W9wUcQNSUpqWdgf3mdkM.cuYsue9VO.n4rhcxnfu6w9.jdJow Wg6XJUwQWGj0teCWQ0TrwyfA.QY6Xq14HsyjIizkQAbefinLAeifmqzkNteF8IGKqL5.jrcOme9L 7.EIOQ0ZN7Ig.OBYsjqI8EY1qtu1oKz0JznJWOSusfea63ib.tEPbKQnJFv9.5BOlJAsOzkLFQTY l._lMXeu84F1BBEoK83pBe5GfwXaG8nErvqC_CkFQFFhboLLcVPAEpk8P3zTSEyc9zjwMFuFbT_d Af4cfMNSnFcFABT4wmN9FdLap8FfbukqzdeASGhAGXgVuWVRxZQ_WCjpFdO7u04hLLr06.xoSusB LwT7cT7gSWVe_3GJl6QhdJ4Kj8YUluvO1JwOGvbqTtPkP..VxQbJ13VcBVWX1jJQaXodiJq8msHK bEV0.fxQR8l.KtlyhfyYLFhJXQprSCGcJL6o4N96y2JbiOi.q0ccw6bSBEwYR0ueswkRkotRwBLS ZyLsS1U7is_rxNLw9T9jxNdX9p0NaRSpK.9Osqt1.8fnLE7MTuACF0gqw60PdOJLR41aVITlTbeR pen_1MEXGXNqXgJ9Mwh3buAueJItun9gzoz4REbsWlKqoAusUEGvLnjGd5h5WGMDQPrRsfMOIcPP qARx9.akDFK0S2P1w1WwfYEKfRO8GKmCtGdqU_3YW7ns21YfNKB3p2g.8MqJDlwji4gnuK3gejkI SlRg_FBwF_8sSoo1P9gUR7FoG_J0xBq2hQYq8ip1u1ak.cIBQqSFNN9f1X0Pmi2sCozi1XnS5dYY 0QyGOqor54zNeKUXvhT1xTmqUoJdWACUbUwCUlF9gwnBfJ1V3jfQMBjSBHt8FK849ky4woq6OLax D4EeOkm8pQNfwCfcDUNAXg3Xg4w58z3z2Nv_M9GQNe0mtZHo_yySH6Lu_kDwbtH3XocDFPERaBXV 0D1Q2tcsh5WcCUJgF64.G7dZ13nmf0A5Y.5.mCNr5DEQBgxGcsYErU0YuAXirJGbjeE29R7wlnut jF82GOdIcOrjvcx3wBJc3jyz91ZUPTvZ9sH75NEsPQKBUUEFRRpRU2D.fEYE7LvlM4kJqE9i4Aks Nw.6nMpmO8oH22wqVxWQ9fOD5VMglLcg1lclnsjowD125xmlbtT.SDsuaa9Szb6iuesKKxqI2xmd ZfuuueQX3Ez3tlN9X5zU7fJjC9YHDF1TJ3SJXDA0Fzjy05a8vP5pXrqc_Ps_XVqoeCTViuxNw2sG ggbpb8Zm48Vqg42aogrJhr6s1rlIRe3lSmCQLHa8eRW0WE0y1OF10tI6oBKcOJhpHslJjsp2w4UK urNZ7mqbEgUkUndRtmuEGbGNMy3CpbMGc9mWRbvmEJjRiv1eqb4jhb6P58QyXFygj6JYqT7Ptykk hVzv5ie8sBnbh4mUIzOMLMluVLll0qMWeC98lgNn1EB3fZFR5HUXJFQJ9W5gxk7ulZd0f9ZU3fHc vHUZgjk1p1iWcz5HQCc.sLLk1hrStQWFrehe6cgI0uUrrNd0qzDNc8uoW3yXGh.nSGihPZ_59P8D ZrYNqDc_jHTzlHKp43gmOLiFZQZUQRn8Mfdzli6zzUUbjWBeEfm6q7a6X9Bjtf5YSCTpkqlimaWb zgb77Jm0QNG.aZPfxqIBOlbVIH7QUw9MV5dWbyMrlN3U328ZLrAEopdFd5RE8_mPGeU7TkfUaIY5 TpbwtgBABKeoUrTotaMXC0dKh3K3F140i8u6HKfQ_cLZf2KnhR9xI3c_Djgob0SEy60zdvmG1DgG nWEdZxS_rehJEUG0.YUMe4gwqHa_fE5idhSDP9KxnBcxuX9zcl8TcZ3uf7ird4Gosuwe6Z_Tfzx3 rhJZZyYQ4tD2rKV0ixavAdjRXUKuCHdu9ZNHoJdEUxrmvGEHfEqTmUWGbtMSfSnHtY66hOronRPa Qh3HGYeVt8NXArQ8S1aV4rNiq.SDIcGbvbJOhfq.LGn0XbcMjAV5iPu6fUWRU8xLgFftQe3lSl.1 .8boYXRm3P22Jp_F.grvQsNoea1J_wAzJNF4vjJGQis2.X5_UTS8eZRwqIxfONee.XvG6YnWmH0I 0MY5jmdSu.0DXTSC00Sg8Q3u99XvrbRmJqgSd2cYoe6aw8ZxqgbKeeT2WameKFuUp6hImNvaln4e m9.wlOaKkplJZS9Ju1qYzabStI33dh07zg1lDwn4i9W3gc4iqQT5GXmxreinriw36H68w5A8fE9T iS0T8gB1oCGGJbfSSiHxGfvxZDTPKfKm._AKIQozl78fNIxwXNqlpZQOMyiKcE8TjA7QliRx48w4 nBltgOOc- X-Sonic-MF: X-Sonic-ID: 1baa7b56-7719-49c5-b103-d876314db669 Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Sat, 15 Apr 2023 20:26:12 +0000 Received: by hermes--production-bf1-5f9df5c5c4-fgkgh (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 240970ddb4e6aea88d95ffeaa746f9cd; Sat, 15 Apr 2023 20:26:08 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <20230415180720.AC396404@slippy.cwsent.com> Date: Sat, 15 Apr 2023 13:25:56 -0700 Cc: FreeBSD User , Charlie Li , Pawel Jakub Dawidek , Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <7963CD10-C44A-4C4D-B760-FA6E0A053FA9@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com> <20230415180720.AC396404@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PzPwP4rXvz3wkF X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 15, 2023, at 11:07, Cy Schubert = wrote: > In message <5A47F62D-0E78-4C3E-84C0-45EEB03C7640@yahoo.com>, Mark = Millard=20 > write > s: >> On Apr 15, 2023, at 07:36, Cy Schubert =3D >> wrote: >>=20 >>> In message = <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>,=3D20=3D >>=20 >>> FreeBSD Us >>> er writes: >>>> Am Thu, 13 Apr 2023 22:18:04 -0700 >>>> Mark Millard schrieb: >>>> =3D20 >>>>> On Apr 13, 2023, at 21:44, Charlie Li wrote: >>>>> =3D20 >>>>>> Mark Millard wrote: =3D20 >>>>>>> FYI: in my original report for a context that has never had >>>>>>> block_cloning enabled, I reported BOTH missing files and >>>>>>> file content corruption in the poudriere-devel bulk build >>>>>>> testing. This predates: >>>>>>> https://people.freebsd.org/~pjd/patches/brt_revert.patch >>>>>>> but had the changes from: >>>>>>> https://github.com/openzfs/zfs/pull/14739/files >>>>>>> The files were missing from packages installed to be used >>>>>>> during a port's build. No other types of examples of missing >>>>>>> files happened. (But only 11 ports failed.) =3D20 >>>>>> I also don't have block_cloning enabled. "Missing files" prior to = =3D >> brt_rev >>>> ert may actually >>>>>> be present, but as the corruption also messes with the file(1) =3D >> signature, >>>> some tools like >>>>>> ldconfig report them as missing. =3D20 >>>>> =3D20 >>>>> For reference, the specific messages that were not explicit >>>>> null-byte complaints were (some shown with a little context): >>>>> =3D20 >>>>> =3D20 >>>>> =3D3D=3D3D=3D3D> py39-lxml-4.9.2 depends on shared library: = libxml2.so - =3D >> not found >>>>> =3D3D=3D3D=3D3D> Installing existing package =3D >> /packages/All/libxml2-2.10.3_1.pkg =3D20 >>>>> [CA72_ZFS] Installing libxml2-2.10.3_1... >>>>> [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done >>>>> =3D3D=3D3D=3D3D> py39-lxml-4.9.2 depends on shared library: = libxml2.so - =3D >> found >>>>> (/usr/local/lib/libxml2.so) . . . >>>>> [CA72_ZFS] Extracting libxslt-1.1.37: .......... done >>>>> =3D3D=3D3D=3D3D> py39-lxml-4.9.2 depends on shared library: = libxslt.so - =3D >> found >>>>> (/usr/local/lib/libxslt.so) =3D3D=3D3D=3D3D> Returning to build = of =3D >> py39-lxml-4.9.2 =3D20 >>>>> . . . >>>>> =3D3D=3D3D=3D3D> Configuring for py39-lxml-4.9.2 =3D20 >>>>> Building lxml version 4.9.2. >>>>> Building with Cython 0.29.33. >>>>> Error: Please make sure the libxml2 and libxslt development = packages =3D >> are in >>>> stalled. >>>>> =3D20 >>>>> =3D20 >>>>> [CA72_ZFS] Extracting libunistring-1.1: .......... done >>>>> =3D3D=3D3D=3D3D> libidn2-2.3.4 depends on shared library: =3D >> libunistring.so - not found >>>> =3D20 >>>>> =3D20 >>>>> =3D20 >>>>> [CA72_ZFS] Extracting gmp-6.2.1: .......... done >>>>> =3D3D=3D3D=3D3D> mpfr-4.2.0,1 depends on shared library: = libgmp.so - not =3D >> found =3D20 >>>>> =3D20 >>>>> =3D20 >>>>> =3D3D=3D3D=3D3D> nettle-3.8.1 depends on shared library: = libgmp.so - not =3D >> found >>>>> =3D3D=3D3D=3D3D> Installing existing package = /packages/All/gmp-6.2.1.pkg =3D >> =3D20 >>>>> [CA72_ZFS] Installing gmp-6.2.1... >>>>> the most recent version of gmp-6.2.1 is already installed >>>>> =3D3D=3D3D=3D3D> nettle-3.8.1 depends on shared library: = libgmp.so - not =3D >> found =3D20 >>>>> *** Error code 1 >>>>> =3D20 >>>>> =3D20 >>>>> autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 >>>>> =3D20 >>>>> =3D20 >>>>> checking for GNU=3D20 >>>>> M4 that supports accurate traces... configure: error: no = acceptable =3D >> m4 coul >>>> d be found in >>>>> $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is =3D >> recommended. >>>>> GNU M4 1.4.15 uses a buggy replacement strstr on some systems. >>>>> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr = bug. >>>>> =3D20 >>>>> =3D20 >>>>> ld: error: /usr/local/lib/libblkid.a: unknown file type >>>>> =3D20 >>>>> =3D20 >>>>> =3D3D=3D3D=3D3D >>>>> Mark Millard >>>>> marklmi at yahoo.com >>>>> =3D20 >>>>> =3D20 >>>> =3D20 >>>> Hello=3D20 >>>> =3D20 >>>> whar is the recent status of fixing/mitigate this desatrous bug? =3D >> Especially f >>>> or those with the >>>> new option enabled on ZFS pools. Any advice? >>>> =3D20 >>>> In an act of precausion (or call it panic) I shutdown several = servers =3D >> to prev >>>> ent irreversible >>>> damages to databases and data storages. We face on one host with =3D >> /usr/ports r >>>> esiding on ZFS >>>> always errors on the same files created while staging (using =3D >> portmaster, leav >>>> es the system >>>> with noninstalled software, i.e. www/apache24 in our case). = Deleting =3D >> the work >>>> folder doesn't >>>> seem to change anything, even when starting a scrubbing of the = entire =3D >> pool (R >>>> AIDZ1 pool) - >>>> cause unknown, why it affects always the same files to be = corrupted. =3D >> Same wit >>>> h deve/ruby-gems. >>>> =3D20 >>>> Poudriere has been shutdown for the time being to avoid further =3D >> issues.=3D20 >>>> =3D20 >>>> Are there any advies to proceed apart from conserving the boxes via = =3D >> shutdown? >>>> =3D20 >>>> Thank you ;-) >>>> oh >>>> =3D20 >>>> =3D20 >>>> =3D20 >>>> --=3D20 >>>> O. Hartmann >>> =3D20 >>> With an up-to-date tree + pjd@'s "Fix data corruption when cloning =3D= >> embedded=3D20 >>> blocks. #14739" patch I didn't have any issues, except for email =3D >> messages=3D20 >>> with corruption in my sent directory, nowhere else. I'm still =3D >> investigating=3D20 >>> the email messages issue. IMO one is generally safe to run poudriere = =3D >> on the=3D20 >>> latest ZFS with the additional patch. >>=20 >> My poudriere testing failed when I tested such (14739 included), >> per what I reported, block_cloning never have been enabled. >> Others have also reported poudriere bulk build failures absent >> block_cloning being involved and 14739 being in place. My tests >> do predate: >>=20 >> https://people.freebsd.org/~pjd/patches/brt_revert.patch >=20 > IIRC this patch doesn't build. >=20 > My tree includes this patch. Pardon the cut&paste. This will not = apply. >=20 > diff --git a/sys/contrib/openzfs/module/zfs/dmu.c = b/sys/contrib/openzfs/modu > le/zfs/dmu.c985d833f58..cda1472a77aa 100644 > --- a/sys/contrib/openzfs/module/zfs/dmu.c > +++ b/sys/contrib/openzfs/module/zfs/dmu.c > @@ -2312,8 +2312,10 @@ dmu_brt_clone(objset_t *os, uint64_t object,=20 > uint64_t offset, uint64_t length, = dl->dr_overridden_by.blk_phys_birth =3D 0; > } else { > dl->dr_overridden_by.blk_birth =3D dr->dr_txg; > - dl->dr_overridden_by.blk_phys_birth =3D > - BP_PHYSICAL_BIRTH(bp); > + if (!BP_IS_EMBEDDED(bp)) { > + dl->dr_overridden_by.blk_phys_birth =3D > + BP_PHYSICAL_BIRTH(bp); > + } > } >=20 > mutex_exit(&db-=C2=B0=18=02=C2=93=1D>db_mtx); >=20 >>=20 >> and I'm not sure of if Cy's activity had brt_revert.patch in >> place or not. >=20 > I don't know if your poudriere has any residual file corruption or = not. I've only done the one test sequence that started from a context predating the import of the openzfs update. There was no prior corruption involved and no stage without the source fixes involved. > My=20 > poudriere working 100% ok and yours not indicates there may be = something=20 > amiss with your poudriere tree. The original media still predates the import and still is fine. The snapshot of the transfer state to the test media has no corruptions. > Remember I rolled back to the last nightly=20 > snapshot whereas you did not. You are confused: I had nothing to roll back as I started from pre-import and jumped in one step to a build that had the commits and 14739 with no intermediate steps. I then did the poudriere bulk for a jail that had no packages, one I use for temporary odd experiments that I clean out afterwards. Please quit attributing to my activities things that were not involved in my activites. It is likely confusing folks about what I'm reporting. I'll give a more detailed sequencing below, in case that helps. > I don't know the state of your poudriere=20 > tree. I know with 100% certainty that my tree is good. Remember my sequence for that (as reported before, but with a different presentation in case that helps): A) Start with root on ZFS media that predates the openzfs import. Note: This is a bectl context that looks like: # bectl list BE Active Mountpoint Space Created main-CA72 NR / 4.02G 2023-03-15 21:29 old-main-CA72 - - 1.82G 2023-03-01 17:25 (Lots of stuff is outside the BE's, so common to both.) It shows: # uname -apKU FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 B) Establish a copy of the normal media on a 2nd media. C) Use the 2nd media for all the following steps, leanving my normal environment alone. D) Update git and /usr/main-src/ worktree to: main-n262122-2ef2c26f3f13-dirty E) Also apply 14739. F) buildworld buildkernel G) Do a sequence that in overall effect deletes old-main-CA72 and renames main-CA72 to old-main-CA72 and has the installkernel installworld results in a (new) main-CA72. (This is a normal update result for me.) H) Boot the new main-CA72. It showed: # uname -apKU FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #91 = main-n262122-2ef2c26f3f13-dirty: Wed Apr 12 19:23:35 PDT 2023 = root@CA72_4c8G_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400086 1400086 (Taken from the report I made at the time.) I) Next I did the poudriere bulk run, for a jail with no packages present, even pkg needing to be built. That poudriere bulk run had the 11 failures, 252 successes and 213 skipped. It was based on USE_TMPF=3Ddata instead of, say, USE_TMPFS=3Dall . This was in order to be sure there was more file system activity. (I'd not be surprised of USE_TMPFS=3Dall would have finished fine because of having far less zfs I/O involved.) An odd aspect that may be relevant: I do bulk builds in a manor that at times can have 100+ for one or more of the 3 load averages --on a system with just 16 cores (16 hardware threads). (I do not have specific maximum observed load average figures for the specific bulk run. But I could set up a retest and get such if desired. I use a modified top to get the "MaxObs" figures.) At no point in that sequence is a rollback relevant! Please quit assuming that I had ever built, installed, or booted something from a middle time frame compared to what I've explicitly reported. I did not, as I've reported multiple times. But you seem to forget or not believe such each time. >>=20 >> Other's notes include Mateusz Guzik's: >>=20 >> =3D >> = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014534.= =3D >> html >=20 > My tree included this patch + pjd@'s last patch on people.freebsd.org. >>=20 >> which said: >>=20 >> QUOTE >> There is corruption with the recent import, with the >> https://github.com/openzfs/zfs/pull/14739/files patch applied and >> block cloning disabled on the pool. >=20 > I had zero poudriere corruption with this patch. But I did. > My only corruption was in=20 > my sent-items in my MH mail directory, which I think was due to email=20= > threads already containing nulls. >=20 >>=20 >> There is no corruption with top of main with zfs merge reverted =3D >> altogether. >>=20 >> Which commit results in said corruption remains to be seen, a variant >> of the tree with just block cloning support reverted just for testing >> purposes is about to be evaluated. >> END QUOTE >>=20 >> Charlie Li's later related notes that helps interpret that were in: >>=20 >> =3D >> = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014545.= =3D >> html >>=20 >> QUOTE >> Testing with mjg@ earlier today revealed that block_cloning was not = the=3D20=3D >>=20 >> cause of poudriere bulk build (and similar cp(1)/install(1)-based)=3D20= >> corruption, although may have exacerbated it. >> END QUOTE >>=20 >> Mateusz later indicated had a hope to have is sorted out sometime >> Friday for what the cause(s) were: >>=20 >> =3D >> = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014551.= =3D >> html >>=20 >> QUOTE >> I'm going to narrow down the non-blockcopy corruption after my = testjig >> gets off the ground. >>=20 >> Basically I expect to have it sorted out on Friday. >> END QUOTE >>=20 >> But the lack of later related messages suggests that did not happen. >>=20 >>> My tests of the additional patch >>=20 >> (I'm guessing that is a reference to 14739, not to brt_revert.patch = .) >>=20 >>> concluded that it resolved my last=3D20 >>> problems, except for the sent email problem I'm still investigating. = =3D >> I'm=3D20 >>> sure there's a simple explanation for it, i.e. the email thread = was=3D20 >>> corrupted by the EXDEV regression which cannot be fixed by anything, = =3D >> even=3D20 >>> reverting to the previous ZFS -- the data in those files will = remain=3D20=3D >>=20 >>> damaged regardless. >>=20 >> Again: my test jump from prior to the import to after the EXDEV >> changes, including having 14739. I still had poudriere bulk >> produce file corruptions. >>=20 >>> I cannot speak to the others who have had poudriere and other = issues. =3D >> I=3D20 >>> never had any problems with poudriere on top of the new ZFS. >>=20 >> Part of the mess is the variability. As I remember, I had 252 >> ports build fine in my test before the 11th failure meant that >> the rest (213) had all been classified as skipped. >>=20 >> It is not like most of the port builds failed: relatively uncommon. >>=20 >> Also, one port built on a retry, indicating random/racy behavior >> is involved. (The original failure was not from a file from >> installing build dependencies but something that the builder >> generated during the build. The 2nd try did not fail there or >> anywhere.) >>=20 >>> WRT reverting block_cloning pools to without, your only option is to = =3D >> backup=3D20 >>> your pool and recreate it without block_cloning. Then restore your =3D= >> data. >>> =3D20 >>=20 >> Given what has been reported by multiple people and >> Cy's own example of unexplained corruptions in email >> handling, I'd be cautious risking important data >> until reports from testing environment activity >> consistently report not having corruptions. >=20 > The "unexplained" email corruptions occurred in only the threads that=20= > already had corruption. Good to know. > I haven't been able to reproduce it anywhere else.=20 > I will continue testing on Monday. I expect my testing to confirm this=20= > hypothesis. Your evidence can not cancel what I and others have reported. It is just more evidence of observed variability (that is, as, yet, unexplained as far as I know). >> Another thing my activity does not include any testing >> of the suggestion in: >>=20 >> =3D >> = https://lists.freebsd.org/archives/dev-commits-src-main/2023-April/014607.= =3D >> html >>=20 >> to use "-o sync=3D3Ddisabled" in a clone, reporting: >=20 > This is a different issue. We need a core dump to resolve this. I'll = test=20 > this on my sandbox on Monday. >=20 > We can now reproduce this panic by hand. My sequence has appearently avoided what leads to panics so my only contribution to evidence about them is the lack of getting any panics for my sequence. > If there is no panic a diff -qr=20 > will confirm/deny this bug. Up to possible lack of reproducible builds for the activity done on the clone? Some files might be expected to be different if I understand the sequence that was being suggested. >>=20 >> QUOTE >> With this workaround I was able to build thousands of packages = without=3D20=3D >>=20 >> panics or failures due to data corruption. >> END QUOTE >>=20 >> If reliable, that consequence to the change might help >> folks that are trying to isolate the problem(s) figure >> out what is involved. >>=20 >> =3D3D=3D3D=3D3D >> Mark Millard >> marklmi at yahoo.com >=20 > IMO we've had a lack of systematic testing of the various bugs. What about my sequence would be an example of lack of being systematic? > The fact=20 > that this has caused some corrupt files has led to human panic over = the=20 > issue. I've no personal panic: the only context with the corruptions for me was a specially created context to test to see if I'd get corruption based on what was commited at the time (+1 separate patch). My standard/normal environment still predates the import of the openzfs update and has no problems. > Now that I've reverted my laptop to the old ZFS, the MH sent-email = issue=20 > continues to exhibit itself. This is because the files I forward to = myself=20 > already contain corrupt data. The old ZFS will not magically remove = this.=20 > This testing is necessary to prove my hypothesis. I expect brand new = email=20 > threads not to exhibit this problem with the new ZFS. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Apr 15 20:30:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzQ144xkFz451J2; Sat, 15 Apr 2023 20:30:16 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) (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 4PzQ140t2Xz44jc; Sat, 15 Apr 2023 20:30:16 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-1879edfeff5so8940048fac.4; Sat, 15 Apr 2023 13:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681590615; x=1684182615; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=XS26ZCFyDqYHCZnay/VuIVQSOWVO9Vx56anBOmfV3Zw=; b=BVjYLBoh5FrR4HYd9jgz/LjZAi7o4MhGeyjqiHPylrUmZRVX5XPnC55MvmasK7uAYQ ufgnldYL3RYwAnQzb0mR5dn9XaCX+Ga6a1paW1QGOwSGyegd9tww7lJhvLS4+p2IKvef JvfFcZ0gFvCVkweEAXu8n02eQa81+nJzHkHjDJnAX0gOOEcAwW98Vn0Z9t5YfRGLlO5R gZv4mqDh6hW/Tjn1S87hGbytv8lB3ZwDpUrNHg7PchJabCZ2mnjFXZH1RChfSGNw0D3B VPoLbVoMDcEzAGUcbJS+QmGt1ZWlYegmxwX2HjKLNNMK3yFbzyyXcdoEGN7Fm/es4JIb xRPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681590615; x=1684182615; 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=XS26ZCFyDqYHCZnay/VuIVQSOWVO9Vx56anBOmfV3Zw=; b=I4ROf5/y4OjmSlDkMIluy1mYbEqlQyFZfuae88plZ7yrbdegCh25bUJTqznZaPJDDo 374CHN8cXGllN/nQug/m4JRIjf1ylEiJje6/556NS6HzKmzpNfVNhbm3/9WEmopXFqRh L0Ceq2hlKUOLZe788m1JJojViPPHkI1cZV6GHuSBfSIjYBix9w1RD+W/czHFevipnupd WDAzv63pX3uI+ER6nEtLc4uIsAlzT3tD4Iki7hfM9UiF6U/alfC6M49sKfUJ9ijbS7OC QMf3799+2ETkoV0cTn4cmWOuo4QqU9n+AS2m9ytjESIz8O0+oCK0cG2/YbrWYY4Q7tNQ adfw== X-Gm-Message-State: AAQBX9dLgW+Gxch7N5tkdQTiufTh8qx92Xlsiz+yjIRgSc0vvry/HhAC htAQI9nQSGi+bNXDD7SThRWGU/HoPVlK/hDGWi0= X-Google-Smtp-Source: AKy350Zfd8XaGMQzhrASWvIcu8ZWBisEHr+qKOnRZlwkPZ80jf06/q4tYfdYxibFFBphsWAftliSVUEBXEZrhcv2Z94= X-Received: by 2002:a05:6870:46ab:b0:184:1a2c:83df with SMTP id a43-20020a05687046ab00b001841a2c83dfmr4702330oap.4.1681590614721; Sat, 15 Apr 2023 13:30:14 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:46:0:b0:49c:b071:b1e3 with HTTP; Sat, 15 Apr 2023 13:30:13 -0700 (PDT) In-Reply-To: <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> From: Mateusz Guzik Date: Sat, 15 Apr 2023 22:30:13 +0200 Message-ID: Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 To: FreeBSD User Cc: Cy Schubert , Mark Millard , Charlie Li , Pawel Jakub Dawidek , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PzQ140t2Xz44jc X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/15/23, FreeBSD User wrote: > Am Sat, 15 Apr 2023 07:36:25 -0700 > Cy Schubert schrieb: > >> In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, >> FreeBSD Us >> er writes: >> > Am Thu, 13 Apr 2023 22:18:04 -0700 >> > Mark Millard schrieb: >> > >> > > On Apr 13, 2023, at 21:44, Charlie Li wrote: >> > > >> > > > Mark Millard wrote: >> > > >> FYI: in my original report for a context that has never had >> > > >> block_cloning enabled, I reported BOTH missing files and >> > > >> file content corruption in the poudriere-devel bulk build >> > > >> testing. This predates: >> > > >> https://people.freebsd.org/~pjd/patches/brt_revert.patch >> > > >> but had the changes from: >> > > >> https://github.com/openzfs/zfs/pull/14739/files >> > > >> The files were missing from packages installed to be used >> > > >> during a port's build. No other types of examples of missing >> > > >> files happened. (But only 11 ports failed.) >> > > > I also don't have block_cloning enabled. "Missing files" prior to >> > > > brt_rev >> > ert may actually >> > > > be present, but as the corruption also messes with the file(1) >> > > > signature, >> > some tools like >> > > > ldconfig report them as missing. >> > > >> > > For reference, the specific messages that were not explicit >> > > null-byte complaints were (some shown with a little context): >> > > >> > > >> > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - not >> > > found >> > > ===> Installing existing package /packages/All/libxml2-2.10.3_1.pkg >> > > >> > > [CA72_ZFS] Installing libxml2-2.10.3_1... >> > > [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done >> > > ===> py39-lxml-4.9.2 depends on shared library: libxml2.so - found >> > > >> > > (/usr/local/lib/libxml2.so) . . . >> > > [CA72_ZFS] Extracting libxslt-1.1.37: .......... done >> > > ===> py39-lxml-4.9.2 depends on shared library: libxslt.so - found >> > > >> > > (/usr/local/lib/libxslt.so) ===> Returning to build of >> > > py39-lxml-4.9.2 >> > > . . . >> > > ===> Configuring for py39-lxml-4.9.2 >> > > Building lxml version 4.9.2. >> > > Building with Cython 0.29.33. >> > > Error: Please make sure the libxml2 and libxslt development packages >> > > are in >> > stalled. >> > > >> > > >> > > [CA72_ZFS] Extracting libunistring-1.1: .......... done >> > > ===> libidn2-2.3.4 depends on shared library: libunistring.so - not >> > > found >> > >> > > >> > > >> > > [CA72_ZFS] Extracting gmp-6.2.1: .......... done >> > > ===> mpfr-4.2.0,1 depends on shared library: libgmp.so - not found >> > > >> > > >> > > >> > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found >> > > ===> Installing existing package /packages/All/gmp-6.2.1.pkg >> > > [CA72_ZFS] Installing gmp-6.2.1... >> > > the most recent version of gmp-6.2.1 is already installed >> > > ===> nettle-3.8.1 depends on shared library: libgmp.so - not found >> > > >> > > *** Error code 1 >> > > >> > > >> > > autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 >> > > >> > > >> > > checking for GNU >> > > M4 that supports accurate traces... configure: error: no acceptable m4 >> > > coul >> > d be found in >> > > $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is >> > > recommended. >> > > GNU M4 1.4.15 uses a buggy replacement strstr on some systems. >> > > Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug. >> > > >> > > >> > > ld: error: /usr/local/lib/libblkid.a: unknown file type >> > > >> > > >> > > === >> > > Mark Millard >> > > marklmi at yahoo.com >> > > >> > > >> > >> > Hello >> > >> > whar is the recent status of fixing/mitigate this desatrous bug? >> > Especially f >> > or those with the >> > new option enabled on ZFS pools. Any advice? >> > >> > In an act of precausion (or call it panic) I shutdown several servers to >> > prev >> > ent irreversible >> > damages to databases and data storages. We face on one host with >> > /usr/ports r >> > esiding on ZFS >> > always errors on the same files created while staging (using portmaster, >> > leav >> > es the system >> > with noninstalled software, i.e. www/apache24 in our case). Deleting the >> > work >> > folder doesn't >> > seem to change anything, even when starting a scrubbing of the entire >> > pool (R >> > AIDZ1 pool) - >> > cause unknown, why it affects always the same files to be corrupted. >> > Same wit >> > h deve/ruby-gems. >> > >> > Poudriere has been shutdown for the time being to avoid further issues. >> > >> > >> > Are there any advies to proceed apart from conserving the boxes via >> > shutdown? >> > >> > Thank you ;-) >> > oh >> > >> > >> > >> > -- >> > O. Hartmann >> >> With an up-to-date tree + pjd@'s "Fix data corruption when cloning >> embedded >> blocks. #14739" patch I didn't have any issues, except for email messages >> >> with corruption in my sent directory, nowhere else. I'm still >> investigating >> the email messages issue. IMO one is generally safe to run poudriere on >> the >> latest ZFS with the additional patch. >> >> My tests of the additional patch concluded that it resolved my last >> problems, except for the sent email problem I'm still investigating. I'm >> sure there's a simple explanation for it, i.e. the email thread was >> corrupted by the EXDEV regression which cannot be fixed by anything, even >> >> reverting to the previous ZFS -- the data in those files will remain >> damaged regardless. >> >> I cannot speak to the others who have had poudriere and other issues. I >> never had any problems with poudriere on top of the new ZFS. >> >> WRT reverting block_cloning pools to without, your only option is to >> backup >> your pool and recreate it without block_cloning. Then restore your data. >> >> > > All right, I interpret the answer that way, that I need a most recent source > tree (and > accordingly built and installed OS) AND a patch that isn't officially > commited? > > On a box I'm with: > > FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 07:57:16 CEST > 2023 amd64 > > The box is crashing while trying to update ports with the well known issue: > > Panic String: VERIFY(!zil_replaying(zilog, tx)) failed > > At the moment all alarm bells are ringing and I lost track about what has > been patched and > already commited and what is still as patch available but in the phase of > evaluation or > inofficially emmited here. > > According to the EXDEV issue: in cases of poudriere or ports trees on ZFS, > what do I have to > do to ensure that those datasets are clean? The OS should detect file > corruption but in my > case the box is crashing :-( > > I did several times scrubbing, but this seems to be the action of a helpless > and desperate man > ... ;-/ > > Greetings > Using block cloning is still not safe, but somewhere in this thread pjd had a patch to keep it operatinal for already cloned files without adding new ones. Anyhow, as was indicated by vishwin@ there was data corruption *unrelated* to block cloning which also came with the import, I narrowed it down: https://github.com/openzfs/zfs/issues/14753 That said now I'm testing a kernel which does not do block cloning and does not have the other problematic commit, we will see if things work. -- Mateusz Guzik From nobody Sat Apr 15 21:36:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzRTZ6Jtpz457PB; Sat, 15 Apr 2023 21:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzRTZ5kwTz3yBg; Sat, 15 Apr 2023 21:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5H/DK6VGgbgaJO5f/8uNsWIeXfel9r2O354bFfMyYJA=; b=DUKVfYiwi1+khrCUCQlalQ4brEHryJR1cmeppowQRy8Bqc/fvstNJzwBIjzjbxDIZEHuPt gA7c7hAqSZVIViXRyAID6tw6Nr1SiO8Vo8T8/JzhQAiVSG/MZGU/tduydQCz23wSMjFE/8 jWmdo5vJtkxeh242NhB7ikx2uNYGj5FP8RyUl3WvWNfdyhK0BJgo4m9+ZIeRgKuPY4g7PQ 6+hMwVVUi4BX5fudNgo4iSxGZnoSc/iU+FegWrR5HiWT/52psv2+/PapPWtHWlC/rA7ggw Vte+fh1QNAbzbDPsPAKdVwnSgFPTLHL34sU54XkYIsQp8HqV1NPWr4Wl2rrxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5H/DK6VGgbgaJO5f/8uNsWIeXfel9r2O354bFfMyYJA=; b=lVclwAJcHcSACDncbka1pOaNoro9XPf/UQqZlMHpVi7kDsQIWSppLZ4zFiwi6tQ7t9PU0b kQ6yit/58PPcGG8biAjlnrUZxRGu+1kDGjw9+b4oP5gmZS1UvG6VnsF0MOpdeO5TOyXwVt lztTVdMRNHhjzENqNzMtA0E7eb4RxsNiYmFFupLdfW4LxhCodHpqpTzpfq3pUFIV26h9tD CwmKSSdb5M53R9pokv1HjH78mo6quXzDN6eYdfes0cybcCMGfsVY35iAbyQ77v7+bHe5Dp 6jDXdmfB6ebSFYgFYC2bmKHqrNdxgnNEpCHtGtIkyBMw6oWDMuNW8JC15hW0sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681594594; a=rsa-sha256; cv=none; b=SSO/Zja7QyvnuELVIvVOHuR6J1MC2efHJ8d/S3Loiujv+IP7gz6p438wek6PaJNiMGe/uW ulhNoZCaFMz/Up8Ko33En5Z+4MfK/0gmiS1NT2FpZJVJfQrFbZa53casrkEx8DYZszI0SL jiqEAF8YBFrVzQPqHuADax3I12zbgEy9GwGUBRq2tuyQxCl6KqCt5oqxbRP4uXhvuQX7EQ cVQQR9MQaDTiW7Z9cl1QJPDYgu0VtvtKjRuZwaODSCRz/qrwvT4PIqeoHUZVy03akwMphL 0zrPayaSCTfGAGKJGrJmRkVZrisOu0GkHqVTyX3yKGzMbZrjMsJlwgr+w/bFIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzRTZ4psQzMXj; Sat, 15 Apr 2023 21:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FLaYdL004803; Sat, 15 Apr 2023 21:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FLaYvO004802; Sat, 15 Apr 2023 21:36:34 GMT (envelope-from git) Date: Sat, 15 Apr 2023 21:36:34 GMT Message-Id: <202304152136.33FLaYvO004802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 46ac8f2e7d96 - main - zfs: don't use zfs_freebsd_copy_file_range List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 commit 46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 Author: Mateusz Guzik AuthorDate: 2023-04-15 20:23:24 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-15 21:34:54 +0000 zfs: don't use zfs_freebsd_copy_file_range There is one data corruption problem reported and fixed upstream, not cherry-picked here yet. On top of it the following fires under load: VERIFY(zil_replaying(zfsvfs->z_log, tx)); The patch which introduced the entire machinery is a revert candidate, but as the machinery came with a dedicated feature flag, doing so would render affected pools read-only at best. To be figured out. As a temporary bandaid at least stop the active usage. Note this patch does not make the feature disappear from zpool upgrade. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 8a0a1d07c590..7b5fe8a3abe0 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6214,6 +6214,7 @@ zfs_deallocate(struct vop_deallocate_args *ap) } #endif +#if 0 #ifndef _SYS_SYSPROTO_H_ struct vop_copy_file_range_args { struct vnode *a_invp; @@ -6309,6 +6310,7 @@ bad_write_fallback: ap->a_incred, ap->a_outcred, ap->a_fsizetd); return (error); } +#endif struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; @@ -6373,7 +6375,6 @@ struct vop_vector zfs_vnodeops = { #if __FreeBSD_version >= 1400043 .vop_add_writecount = vop_stdadd_writecount_nomsync, #endif - .vop_copy_file_range = zfs_freebsd_copy_file_range, }; VFS_VOP_VECTOR_REGISTER(zfs_vnodeops); From nobody Sat Apr 15 21:36:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzRTc5wzJz457Xy; Sat, 15 Apr 2023 21:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzRTb6wtVz3yfh; Sat, 15 Apr 2023 21:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjTjaqnxvYxXg3avJX0pi691wUTvDqgXSwsuH1/zUlU=; b=s+O3vhWsgr/ldkYXsLViA8jUyv0IH0/HPOEx5aAr2xv+gsCVtbfXIi631Z4u5ok6aLJfRX v36rerw3HrIl8RMwOS6gtPA0SihWoYFylFG0oekVtbNTIx1rSSuCXyvgR/2+oXGZVesoAW 3578XedTCfibyBmak2D3sT+oopQ1XSaIfg4o+5BTnUj53wsaxylVnaqN/9Wq1MXdWOtWN5 KZftlMeKhbI7TK8Bx893mSuBhgT3twZZLSBVU4VbjrERD6fCwjnkc58cT4w6oUycRL/mKf qzXe6YBtFp8wyofdPXbvtMvDpIo+XeLr6DiQEfkVz/3mTCgpu9fN9heUHqCHpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjTjaqnxvYxXg3avJX0pi691wUTvDqgXSwsuH1/zUlU=; b=qrGf959sMvNi8FgnpeckF7QeduBWRI8WNegriAd/CbEBE02oCxtCS/rp3s8KONW8HQ+9GY 0BIQ4omRDww/onZzRkRw+ZLIrORLnwSUoYTSAs81u0C5gqda1dMqLvgEWsICJQ9oLF0+Ce 9kXR2Lgm8tDNVuK6iGhqYyucKe0xArXrm5T58l7/kKm4piAJ0IRUATHSJQJx9udgPXTRNm O6sw58+xBn8hOtOl7dgH2zj+nad+P9PzTJcRkbBwGgYXIeJwg5f20Qilf3JqRR3M6IoGB+ ghG1/xqyA8hwDfHxo5k7eHId26ydOmy7O25+m+8VlKU9BdotZFdIuXirLx5RrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681594596; a=rsa-sha256; cv=none; b=rQQPclcwmom88KRBChgMroVSek2qky/o8vzkmmxJGR6iGn5vd+aqnfO7quVLDr3zz0qH6J voLnveHPTqkpObb6WUalom1HbTp3HjOsVn79SKBalvVSYzMJyhFUL8gPyLGpKe1PMfKlXW 45FsiMFnuwMOuuBN3UAPKvUr/ZRi23T/QaMCEQY+tD7/2TSSmwnrzQG0ZF3RxmzXILKqLg ZE9keHKJTbsOxCvw+SVxIsInvSfUuvmPIZDlBL8fEwEapbP167vKM4nV/98/3kUoVpiR02 7p4M6yJiK6BWRgyJn6g7adrsMNSAkGXKD5nrteheMSH1VLSM5WqSnkqGU9Phvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzRTb58YVzMM6; Sat, 15 Apr 2023 21:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FLaZcY004825; Sat, 15 Apr 2023 21:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FLaZ9L004824; Sat, 15 Apr 2023 21:36:35 GMT (envelope-from git) Date: Sat, 15 Apr 2023 21:36:35 GMT Message-Id: <202304152136.33FLaZ9L004824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 63ee747febbf - main - zfs: Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63ee747febbf024be0aace61161241b53245449e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=63ee747febbf024be0aace61161241b53245449e commit 63ee747febbf024be0aace61161241b53245449e Author: Mateusz Guzik AuthorDate: 2023-04-15 20:24:51 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-15 21:34:54 +0000 zfs: Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" This reverts commit 519851122b1703b8445ec17bc89b347cea965bb9. It results in data corruption, see: https://github.com/openzfs/zfs/issues/14753 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/contrib/openzfs/module/zfs/dnode.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 367bfaa80726..d15268cd7bc7 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,29 +1764,20 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode might contain any uncommitted changes to data blocks. - * Dirty metadata (e.g. bonus buffer) does not count. + * Checks if the dnode contains any uncommitted dirty records. */ boolean_t dnode_is_dirty(dnode_t *dn) { mutex_enter(&dn->dn_mtx); + for (int i = 0; i < TXG_SIZE; i++) { - list_t *list = &dn->dn_dirty_records[i]; - for (dbuf_dirty_record_t *dr = list_head(list); - dr != NULL; dr = list_next(list, dr)) { - if (dr->dr_dbuf == NULL || - (dr->dr_dbuf->db_blkid != DMU_BONUS_BLKID && - dr->dr_dbuf->db_blkid != DMU_SPILL_BLKID)) { - mutex_exit(&dn->dn_mtx); - return (B_TRUE); - } - } - if (dn->dn_free_ranges[i] != NULL) { + if (multilist_link_active(&dn->dn_dirty_link[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } } + mutex_exit(&dn->dn_mtx); return (B_FALSE); @@ -2650,9 +2641,7 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset, rw_enter(&dn->dn_struct_rwlock, RW_READER); if (dn->dn_phys->dn_nlevels == 0) { - if (!(flags & DNODE_FIND_HOLE)) { - error = SET_ERROR(ESRCH); - } + error = SET_ERROR(ESRCH); goto out; } From nobody Sat Apr 15 22:32:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzSkQ6VXsz45Cr0; Sat, 15 Apr 2023 22:32: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 4PzSkQ0KN9z4K7S; Sat, 15 Apr 2023 22:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681597966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1wQyM80S4IEs//Yek0TlhKcJBdI3zlYtWfocQR6Qdc=; b=MlLbSrz8371oVBBt2L1KumWocVvOXlaCApnNar++H0sVnIy+uLGb9e5vS9EmXkNFpCyrgO 9XXKxo7n0/92R3nhgxaZ/d1Sa+sJ13rhhfM0krRUHqYynTKBjZNwTDuiW8DU3fBv1a1Yl+ FhjRmFXW2V0CIE7WmtxCiN2kO9seqsTsy6yY+aRcVa7esTbuvj1RyEG242dTZ0Wn7DlFk4 +Uk0DIS2+GZ5Pp4ETTRNABEG9YZs3vIjmEcjcLVhJ+BRCi1CUFCmsBB/tYwph+3GMFg2lC sgX0XGVFEGXiQ7Wjsyf1Sjy5oCaXgfy8f42T7J5Z8WJK8a4cp5MvfXNPeCeh2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681597966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1wQyM80S4IEs//Yek0TlhKcJBdI3zlYtWfocQR6Qdc=; b=gxnp63VET5fPkeoHnd5uUZXsB9GkHgUcEtOlJ1v2IkPRM5VQ+I6AlJXpUOBIcAosnxenOW 099YAiL/BL15X1I/0fD7mDmoOYwEV8kKk9DK5pzFO2X7zyEp1iajdYkf44LO+Js/Exr+vQ ZOXtI3vRE/E8wwUeYVZ4NqrW5AaZU7snvSTrkgMIVh5IVMiCVIOfHcYOMP9jlWbmtsSW9y lDAc46WT//2nhiHUfmuE2tGWVhyul7zWqSZJu/QhXSNzrBOu8yaYuf+jNuE8Y1sxr539kl GqVUwMpcD9ghWJr8tMIWbJHDZx1pSH7e0UkwLgM105GFllrYpDeHh514P02uuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681597966; a=rsa-sha256; cv=none; b=Tv2nJOaqyAAnHK/+UaLawv1fJ/Po+ozmUGarAK/sIFijCcHQxSTXG3nE9nZJy0Kkemd38I mBZdFIp8lX/1y86P/kDIxvzsh/Q5IkZTCjrWOLDkraeBV3pPd389SNU3V1HNyyBBZFvUbq NxOW19mZ9aoMaWz1j36LTdMFS3+P+l9r51SVni0tHIEZCz/NKLWOHGhS7ZxjmRHXsqmkZh tmNICZXJuoYIvnnCzMT5CPKUXu2VgK4UkukfsSFwF2e+hAwhPLW35g0zEALrfJKUVvFZmv bi9FzCmeLDCpVz6p8r3ceuGzERQn/a5xZp6DCfoJi8MF83jQAGKj5rtLaX9YOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzSkP6S0TzNnY; Sat, 15 Apr 2023 22:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FMWj9u002835; Sat, 15 Apr 2023 22:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FMWjsd002834; Sat, 15 Apr 2023 22:32:45 GMT (envelope-from git) Date: Sat, 15 Apr 2023 22:32:45 GMT Message-Id: <202304152232.33FMWjsd002834@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: fd02926a68c9 - main - cam: Properly mask out the status bits to get completion code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd02926a68c9570f00f7e50d64c1d0673581fb35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd02926a68c9570f00f7e50d64c1d0673581fb35 commit fd02926a68c9570f00f7e50d64c1d0673581fb35 Author: Warner Losh AuthorDate: 2023-04-14 14:32:20 +0000 Commit: Warner Losh CommitDate: 2023-04-15 22:32:41 +0000 cam: Properly mask out the status bits to get completion code ccb_h.status has two parts: the actual status and some addition bits to indicate additional information. It must be masked before comparing against completion codes. Add new inline function cam_ccb_success to simplify this to test whether or not the request succeeded. Most of the code already does this, but a few places don't (the rest likely should be converted to use cam_ccb_status and/or cam_ccb_success, but that's for another day). This caused at least one bug in recognizing devices behind a SATA port multiplexer, though some of these checks were fine with the special knowledge of the code paths involved. PR: 270459 Sponsored by: Netflix MFC After: 1 week (and maybe a EN requst) Reviewed by: ken, mav Differential Revision: https://reviews.freebsd.org/D39572 --- sys/cam/ata/ata_xpt.c | 4 ++-- sys/cam/cam_ccb.h | 6 ++++++ sys/cam/cam_xpt.c | 2 +- sys/cam/nvme/nvme_da.c | 3 +-- sys/cam/scsi/scsi_enc_ses.c | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 2b299412b48e..643508c5d395 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -1003,7 +1003,7 @@ noerror: path->bus->sim->max_tagged_dev_openings != 0) { /* Check if the SIM does not want queued commands. */ xpt_path_inq(&cpi, path); - if (cpi.ccb_h.status == CAM_REQ_CMP && + if (cam_ccb_success((union ccb *)&cpi) && (cpi.hba_inquiry & PI_TAG_ABLE)) { /* Report SIM which tags are allowed. */ bzero(&cts, sizeof(cts)); @@ -1481,7 +1481,7 @@ ata_scan_bus(struct cam_periph *periph, union ccb *request_ccb) /* If there is PMP... */ if ((scan_info->cpi->hba_inquiry & PI_SATAPM) && (scan_info->counter == scan_info->cpi->max_target)) { - if (work_ccb->ccb_h.status == CAM_REQ_CMP) { + if (cam_ccb_success(work_ccb)) { /* everything else will be probed by it */ /* Free the current request path- we're done with it. */ xpt_free_path(work_ccb->ccb_h.path); diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 1ae310d399b7..a6b12b6a3584 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -1516,6 +1516,12 @@ cam_ccb_status(union ccb *ccb) return ((cam_status)(ccb->ccb_h.status & CAM_STATUS_MASK)); } +static inline bool +cam_ccb_success(union ccb *ccb) +{ + return (cam_ccb_status(ccb) == CAM_REQ_CMP); +} + void cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended); static __inline void diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index f3e9f2772e62..efedcaf5cf92 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -4018,7 +4018,7 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, uint32_t bus) xpt_path_inq(&cpi, path); - if (cpi.ccb_h.status == CAM_REQ_CMP) { + if (cam_ccb_success((union ccb *)&cpi)) { struct xpt_xport **xpt; SET_FOREACH(xpt, cam_xpt_xport_set) { diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 51689d0e4a23..94915ec6a726 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -441,8 +441,7 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag, */ cam_periph_unlock(periph); cam_periph_unmapmem(ccb, &mapinfo); - error = (ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ? - 0 : EIO; + error = cam_ccb_success(ccb) ? 0 : EIO; out: cam_periph_lock(periph); xpt_release_ccb(ccb); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 557038d9b9f6..58b0a5af74cd 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -986,7 +986,7 @@ ses_paths_iter(enc_softc_t *enc, enc_element_t *elm, xpt_setup_ccb(&cgd.ccb_h, path, CAM_PRIORITY_NORMAL); cgd.ccb_h.func_code = XPT_GDEV_TYPE; xpt_action((union ccb *)&cgd); - if (cgd.ccb_h.status == CAM_REQ_CMP) + if (cam_ccb_success((union ccb *)&cgd)) callback(enc, elm, path, callback_arg); xpt_free_path(path); @@ -1065,7 +1065,7 @@ ses_setphyspath_callback(enc_softc_t *enc, enc_element_t *elm, xpt_action((union ccb *)&cdai); if ((cdai.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(cdai.ccb_h.path, 0, 0, 0, FALSE); - if (cdai.ccb_h.status == CAM_REQ_CMP) + if (cam_ccb_success((union ccb *)&cdai)) args->num_set++; } xpt_path_unlock(path); From nobody Sat Apr 15 22:33:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzSlW1Pbtz45Cwr for ; Sat, 15 Apr 2023 22:33:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-20.consmr.mail.gq1.yahoo.com (sonic314-20.consmr.mail.gq1.yahoo.com [98.137.69.83]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzSlV5Cq2z4LbY for ; Sat, 15 Apr 2023 22:33:42 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681598020; bh=85V/PKGt5V5ybBJVyXh4zGi5ejYzsZ5Py6tHUoKxHWM=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=qkCMbKqUYSd0JRDdE8/3UQwImGwSHh8LGIQxsAvVndBYw07FQBi6HSjwdg1FYORRwBRi513udmynKHF3o4Me/maXiRaedX9hQrCDcdFneGgUpLB8rf9cQEVolS7BebBvPQ4Rc9izastpFlZtpkfKLzXRo1cMqEPIDYAkk7zvpJ47EZKXhFb0Ha+rO0f+nc+m0SnE5dZHj6Gd+iGdfmsiYgKKcMmRnXXh/W6MujOjfjHRQruxc2kdc+fU0xnasX/JX8TQVS7lIHWwV1B5NhdoEq0MhOAhd7UfhWHIRnexwVjDQw0hRuoxmH7PnApCmJ4dL7iM1Ri/wN/Mzyd8TGqECA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681598020; bh=V1rYuhG5LZGX+IFHbptqLYGLMlX+3GwKW1WCNi76rvB=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=D9ZWEylAt7Q+0jArUGqg/GczR4vH5eprgPxt2EoYFdqlx9aPZ5aoB8QLZe+mIqQWTufOKomGWVR0Cl+ZJKCCrTCV2ZqHhsZAlxbVE50B7vapDOjqMmH1wKoWNkuD0e2NltDe3810Q+vsD158ZdIkeusD982HpVxOXg+K5IvUg9SLlML8MHZ3yyJcLbQoKmn6Edl3A7B/x2BFt0HOSdO6UuGCE2U1PfF5IhqdE6Jlp2dwSzDfEhAoD3ofvnu085FqfKhiPPwY7LixkjbbKfcnQOkUFwWRI2F5bevcDvQV2R2vKXZUwp2a9HEtRutYBMZJiIPMF9jHvk+ZYqJyHkCDpw== X-YMail-OSG: Nl6NyXkVM1kCO1iXCPjap0sJBNinSVHph7LOWnR6371MSjwjg0KjZ_rlv.cCPET aIr5N9bnCKtvbrf1afeQ5mBYTlAgzYTct7_6lGm14RirykjpVwyk73mOan.Yii8LlOUbrKoqfUCf b9JmS3pthmNecK9XBs7fSFvaRXDTdJvjCYFg8RVBT4evmUqgut_aMOQzUzhhjNiqoSxXXH40a3kv pT3QIP6Z6gE5pC.B.4Lp.J6VcH3N.czNVq72h3VSt1V_aFDZ9uL7jh3H0pxSuX07GYgVCGlfdklf nl310M4Dt8WR6obC5B3qHVZK_89ak5pmNOPM0_w8zIFRu4RpndlQSfIQ4brRp37D2UuOr2mRsCwu LGRtvjr3Bt4.pH4_rUUkziibKZnY07gGQEV8tpKiogjPgW19ZoqR.ZphIV9hibEsY62OeT2SVBaJ cy6_iVhdACUGETScuB.V6ivhk0hNQbeuN67XIuHq0RcwwYdBM5Mu7Xz91G4jamBf0DLdE3NoF56i ZJnLJykzuI.a5I1H1qT8LAWRFB0qvhd4VZI3gkVzc1gE0HEALlzVWfV9Gah7X2NQjQexw3UN4_Jr 6ofWsT5x43zmMS0vkJF0SiwWhXHFjB_i8M76EssE7CCUfBl598KdzCwGHjFKkkH4dBfomYmzgzY. bNogiot4QSjkjrt1Aq6A4LuAMFrfknw4EwwcpsZpXMi0EsPphLIG6G.minKsjjhkeogAzu1Jc03a YaomoGJXeoLmV7E02LJoGPuGNJRLfmRCfGNni6dCm2dw1qmzMpGTEmCZbQ5aDQztDO98_ANx.v3o zH5WHP4SSZUVaP_2IqcJu3SQGj1tRrzungIJQmHc_Pd8agUZJTa1yqXbFBmTE_OUh1viIhTcdveG PbVN8ts_BTh41CtZVWjoJ5MqwY1WipwKzOG3vb6jKnOukxB9RLnXUYFkJB3O8wftOzi4aAtEtDSL hGHPuE.0K9lnUuubjseRg5dGRrtVA4CsytgYiQ_MGG44c8Pf4hO6SUyervRbR64pksDIKYRpiC7Z VqX3vgh.3yb46QYVIp1WofjPC2Za3nmYXyVVMtwRs0nqWv_EfY4Zrj05mZlCe2OOVVMypH15B0ld 3ffKM5gwZUjpfXVCpc7NeRiTHAopXBsMoao4r80zxpQb5N8ePjMBuDs1ZxwO5C8ObKWMHFLn86dO WEa5QcKs3awuuJ7AodAa9KEsLcQ1e.C8LIzKUn7u9I3Z0PmCrWk9rwf4.rNQsKnojdRZaNotBCz7 u86bCPXmd7fwsxVdNAC67oDRgPQNO3bbFpnci6ADAe_Unno80H.7kT81rGhytjxi99bSs178lyR_ zhXTjUclVdBHLm46a25rSRZbuJgQxdBNDUOUBjjYIBrjD1KuNNJv5RfM6dRhuURlkfrI1cEWs3Vp f11QEiWkTQP9LmZ1s.CjPoQRD.wSxG.TNiCZ4o26K0JSIsToIpQCM.rw.pcsLLTM7r7yW8bliHK5 WvMCzgz0vEJAXET94ezP6c8GbuL0OPlKPmXeIjZJtmpvfYQ8LS8omHcfmATjdGUW_vY03Gf_F98P ENRNCs29mINmuhrXJanp8ZsQRjbr7jRrp2veale7AtlBZTku9RRyK.shepi73GnzLwVawIm90PDO TeiYULu2rH_VJrY3Geg8HahCF38_Njk2FTLJ_.7gOBhgWWVmtP.POpCGe6IwG0fBdIOePg77l2AO M1uBhqxBcx20JurPM78d_nRG9CTyohz6WxxnE_3Q70pVFKkaFy6pE8U_auwSHgovM40QyhbeE8v5 a9n37IzqbyzswH6c7dOJIkOd9Hqo1ZGII64wQ4ChNyqUyn5xeX0uht6wG4EhoZ2EgCX94DiYgxws 1Kxa.7NK7T65uO08tHFsTKCpP3gfxOMqUGmxFjBYyeAGoyy8VDI60ckMvbeJg8DONLZQpU2SprqB 9aNT7P5ikXXoU7u_Pu0Wri0CAoyXQaCcPj3B1Bi87G7boHB9YenvbWVTf2nj8p.irbuqgyUJmaXo icXBJ7gSbtpta.t4zerHPRwIgVOASB2gKVJ5nbt.g9JAAjaz0QS2qG9x1TO9WFKuNasS1oPzVB_k nt..86AexyWeUpVYkYI6vIu.bFbFF8HP_hij7GwRpnLpQoSHelw8JLUdWR4uc9TwHwWP9PnJIdqF kGx_kbds8BbsjsvpCjWhreVTWbG2UE.WT606Z5R358clsg8hKxZTMgJijDqerrmf3opYiZnQr2xE 2VkVHo8atpphPPrUNi.VoOu.rW1lkDf0xJOfyHE_KaobcrIwL0XWst.MTd0NDuviPcGdEZe6Mrso P6l0oU2OF X-Sonic-MF: X-Sonic-ID: 4ae83902-7143-49cd-a613-dd893f24f2d4 Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Sat, 15 Apr 2023 22:33:40 +0000 Received: by hermes--production-gq1-546798879c-sq6s2 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID d9a580fb6ff9402335a56291fba522ef; Sat, 15 Apr 2023 22:33:39 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: Date: Sat, 15 Apr 2023 15:33:28 -0700 Cc: FreeBSD User , Cy Schubert , Charlie Li , Pawel Jakub Dawidek , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <62F8DD62-8E09-4A07-926B-5DE3DB399609@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> To: Mateusz Guzik X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PzSlV5Cq2z4LbY X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Apr 15, 2023, at 13:30, Mateusz Guzik wrote: > On 4/15/23, FreeBSD User wrote: >> Am Sat, 15 Apr 2023 07:36:25 -0700 >> Cy Schubert schrieb: >>=20 >>> In message <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, >>> FreeBSD Us >>> er writes: >>>> Am Thu, 13 Apr 2023 22:18:04 -0700 >>>> Mark Millard schrieb: >>>>=20 >>>>> On Apr 13, 2023, at 21:44, Charlie Li wrote: >>>>>=20 >>>>>> Mark Millard wrote: >>>>>>> FYI: in my original report for a context that has never had >>>>>>> block_cloning enabled, I reported BOTH missing files and >>>>>>> file content corruption in the poudriere-devel bulk build >>>>>>> testing. This predates: >>>>>>> https://people.freebsd.org/~pjd/patches/brt_revert.patch >>>>>>> but had the changes from: >>>>>>> https://github.com/openzfs/zfs/pull/14739/files >>>>>>> The files were missing from packages installed to be used >>>>>>> during a port's build. No other types of examples of missing >>>>>>> files happened. (But only 11 ports failed.) >>>>>> I also don't have block_cloning enabled. "Missing files" prior to >>>>>> brt_rev >>>> ert may actually >>>>>> be present, but as the corruption also messes with the file(1) >>>>>> signature, >>>> some tools like >>>>>> ldconfig report them as missing. >>>>>=20 >>>>> For reference, the specific messages that were not explicit >>>>> null-byte complaints were (some shown with a little context): >>>>>=20 >>>>>=20 >>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so = - not >>>>> found >>>>> =3D=3D=3D> Installing existing package = /packages/All/libxml2-2.10.3_1.pkg >>>>>=20 >>>>> [CA72_ZFS] Installing libxml2-2.10.3_1... >>>>> [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done >>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxml2.so = - found >>>>>=20 >>>>> (/usr/local/lib/libxml2.so) . . . >>>>> [CA72_ZFS] Extracting libxslt-1.1.37: .......... done >>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: libxslt.so = - found >>>>>=20 >>>>> (/usr/local/lib/libxslt.so) =3D=3D=3D> Returning to build of >>>>> py39-lxml-4.9.2 >>>>> . . . >>>>> =3D=3D=3D> Configuring for py39-lxml-4.9.2 >>>>> Building lxml version 4.9.2. >>>>> Building with Cython 0.29.33. >>>>> Error: Please make sure the libxml2 and libxslt development = packages >>>>> are in >>>> stalled. >>>>>=20 >>>>>=20 >>>>> [CA72_ZFS] Extracting libunistring-1.1: .......... done >>>>> =3D=3D=3D> libidn2-2.3.4 depends on shared library: = libunistring.so - not >>>>> found >>>>=20 >>>>>=20 >>>>>=20 >>>>> [CA72_ZFS] Extracting gmp-6.2.1: .......... done >>>>> =3D=3D=3D> mpfr-4.2.0,1 depends on shared library: libgmp.so - = not found >>>>>=20 >>>>>=20 >>>>>=20 >>>>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - = not found >>>>> =3D=3D=3D> Installing existing package = /packages/All/gmp-6.2.1.pkg >>>>> [CA72_ZFS] Installing gmp-6.2.1... >>>>> the most recent version of gmp-6.2.1 is already installed >>>>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - = not found >>>>>=20 >>>>> *** Error code 1 >>>>>=20 >>>>>=20 >>>>> autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 >>>>>=20 >>>>>=20 >>>>> checking for GNU >>>>> M4 that supports accurate traces... configure: error: no = acceptable m4 >>>>> coul >>>> d be found in >>>>> $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is >>>>> recommended. >>>>> GNU M4 1.4.15 uses a buggy replacement strstr on some systems. >>>>> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr = bug. >>>>>=20 >>>>>=20 >>>>> ld: error: /usr/local/lib/libblkid.a: unknown file type >>>>>=20 >>>>>=20 >>>>> =3D=3D=3D >>>>> Mark Millard >>>>> marklmi at yahoo.com >>>>>=20 >>>>>=20 >>>>=20 >>>> Hello >>>>=20 >>>> whar is the recent status of fixing/mitigate this desatrous bug? >>>> Especially f >>>> or those with the >>>> new option enabled on ZFS pools. Any advice? >>>>=20 >>>> In an act of precausion (or call it panic) I shutdown several = servers to >>>> prev >>>> ent irreversible >>>> damages to databases and data storages. We face on one host with >>>> /usr/ports r >>>> esiding on ZFS >>>> always errors on the same files created while staging (using = portmaster, >>>> leav >>>> es the system >>>> with noninstalled software, i.e. www/apache24 in our case). = Deleting the >>>> work >>>> folder doesn't >>>> seem to change anything, even when starting a scrubbing of the = entire >>>> pool (R >>>> AIDZ1 pool) - >>>> cause unknown, why it affects always the same files to be = corrupted. >>>> Same wit >>>> h deve/ruby-gems. >>>>=20 >>>> Poudriere has been shutdown for the time being to avoid further = issues. >>>>=20 >>>>=20 >>>> Are there any advies to proceed apart from conserving the boxes via >>>> shutdown? >>>>=20 >>>> Thank you ;-) >>>> oh >>>>=20 >>>>=20 >>>>=20 >>>> -- >>>> O. Hartmann >>>=20 >>> With an up-to-date tree + pjd@'s "Fix data corruption when cloning >>> embedded >>> blocks. #14739" patch I didn't have any issues, except for email = messages >>>=20 >>> with corruption in my sent directory, nowhere else. I'm still >>> investigating >>> the email messages issue. IMO one is generally safe to run poudriere = on >>> the >>> latest ZFS with the additional patch. >>>=20 >>> My tests of the additional patch concluded that it resolved my last >>> problems, except for the sent email problem I'm still investigating. = I'm >>> sure there's a simple explanation for it, i.e. the email thread was >>> corrupted by the EXDEV regression which cannot be fixed by anything, = even >>>=20 >>> reverting to the previous ZFS -- the data in those files will remain >>> damaged regardless. >>>=20 >>> I cannot speak to the others who have had poudriere and other = issues. I >>> never had any problems with poudriere on top of the new ZFS. >>>=20 >>> WRT reverting block_cloning pools to without, your only option is to >>> backup >>> your pool and recreate it without block_cloning. Then restore your = data. >>>=20 >>>=20 >>=20 >> All right, I interpret the answer that way, that I need a most recent = source >> tree (and >> accordingly built and installed OS) AND a patch that isn't officially >> commited? >>=20 >> On a box I'm with: >>=20 >> FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 = 07:57:16 CEST >> 2023 amd64 >>=20 >> The box is crashing while trying to update ports with the well known = issue: >>=20 >> Panic String: VERIFY(!zil_replaying(zilog, tx)) failed >>=20 >> At the moment all alarm bells are ringing and I lost track about what = has >> been patched and >> already commited and what is still as patch available but in the = phase of >> evaluation or >> inofficially emmited here. >>=20 >> According to the EXDEV issue: in cases of poudriere or ports trees on = ZFS, >> what do I have to >> do to ensure that those datasets are clean? The OS should detect file >> corruption but in my >> case the box is crashing :-( >>=20 >> I did several times scrubbing, but this seems to be the action of a = helpless >> and desperate man >> ... ;-/ >>=20 >> Greetings >>=20 >=20 > Using block cloning is still not safe, but somewhere in this thread > pjd had a patch to keep it operatinal for already cloned files without > adding new ones. >=20 > Anyhow, as was indicated by vishwin@ there was data corruption > *unrelated* to block cloning which also came with the import, I > narrowed it down: https://github.com/openzfs/zfs/issues/14753 >=20 > That said now I'm testing a kernel which does not do block cloning and > does not have the other problematic commit, we will see if things > work. (Mostly written as I progressed but some material later inserted into/around previously written material.) Summary: As stands, it looks like reverting the dnode_is_dirty code is what fixes the corruptions that my type of test context produced via poudriere bulk activity . The details that lead to that summary . . . Using my my build environment for updating my temporary, experimental context, an environment running a world and and kernel that predate the import: # uname -apKU FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 (Note the "nondbg": I normally run non-debug main builds, but with symbols not stripped.) The kernel and world for this are what is in old-main-CA72: # bectl list BE Active Mountpoint Space Created main-CA72 R - 3.98G 2023-04-12 20:29 old-main-CA72 N / 1.08M 2023-02-06 19:44 (Most everything else is outside the BE's and so is shared across the BE's.) I updated to also have (whitespace details likely not preserved in this note): # git -C /usr/main-src/ diff = /usr/main-src/sys/contrib/openzfs/module/zfs/dnode.c diff --git a/sys/contrib/openzfs/module/zfs/dnode.c = b/sys/contrib/openzfs/module/zfs/dnode.c index 367bfaa80726..49a7f59c0da4 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1772,17 +1772,7 @@ dnode_is_dirty(dnode_t *dn) { mutex_enter(&dn->dn_mtx); for (int i =3D 0; i < TXG_SIZE; i++) { - list_t *list =3D &dn->dn_dirty_records[i]; - for (dbuf_dirty_record_t *dr =3D list_head(list); - dr !=3D NULL; dr =3D list_next(list, dr)) { - if (dr->dr_dbuf =3D=3D NULL || - (dr->dr_dbuf->db_blkid !=3D DMU_BONUS_BLKID = && - dr->dr_dbuf->db_blkid !=3D DMU_SPILL_BLKID)) = { - mutex_exit(&dn->dn_mtx); - return (B_TRUE); - } - } - if (dn->dn_free_ranges[i] !=3D NULL) { + if (multilist_link_active(&dn->dn_dirty_link[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } I did my usual buildworld buildkernel sequence and then one of my normal install sequences into main-CA72 to update it to have the change, as well as the prior material involved in my first experiment that I'd reported on. I cleared the content of the jail that I use for temporary experiments, such as the prior testing that got the 11 builder failures: # poudriere pkgclean -jmain-CA72-bulk_a -A I then rebooted using the updated main-CA72 BE. Then I started the: # poudriere bulk -jmain-CA72-bulk_a -w -f ~/origins/CA72-origins.txt . . . [00:00:37] Building 476 packages using up to 16 builders [00:00:37] Hit CTRL+t at any time to see build progress and stats [00:00:38] [01] [00:00:00] Builder starting [00:00:40] [01] [00:00:02] Builder started [00:00:40] [01] [00:00:00] Building ports-mgmt/pkg | pkg-1.19.1_1 In the prior experiment it got: 476 =3D 252 success + 11 failed + 213 skipped and it reported the time for that as: 00:37:52. A normal from-scratch build takes many hours (multiple compiler toolchains and such) so my first report after this point will be for one of: A) It got to, say, 00:40:00 or beyond with, or without failures. vs. B) It got failures and stopped before that. . . . TIME GOES BY . . . At about 00:40:00 the status was: [00:40:00] [06] [00:00:00] Building x11/libXv | libXv-1.0.12,1 load: 30.73 cmd: sh 1508 [nanslp] 2400.88r 6.69u 11.90s 0% 3960k [main-CA72-bulk_a-default] [2023-04-15_14h47m19s] [parallel_build:] = Queued: 476 Built: 235 Failed: 0 Skipped: 0 Ignored: 0 Fetched: 0 = Tobuild: 241 Time: 00:40:01 ID TOTAL ORIGIN PKGNAME = PHASE PHASE TMPFS CPU% MEM% [15] 00:07:44 devel/py-lxml@py39 | py39-lxml-4.9.2 = stage 00:00:08 40.00 KiB 0% 0% [01] 00:00:34 x11/libXxf86vm | libXxf86vm-1.1.4_3 = build-depends 00:00:03 56.00 KiB 2.3% 0% [16] 00:01:59 x11-toolkits/libXt | libXt-1.2.1,1 = configure 00:00:52 40.00 KiB 0.3% 0% [02] 00:01:40 devel/dbus | dbus-1.14.6,1 = configure 00:00:05 36.00 KiB 0.5% 0% [03] 00:02:20 x11/libXrender | libXrender-0.9.10_2 = configure 00:01:27 40.00 KiB 0% 0% [04] 00:00:44 graphics/libglvnd | libglvnd-1.6.0 = build-depends 00:00:13 52.00 KiB 20.3% 0.1% [05] 00:01:39 x11/xprop | xprop-1.2.6 = configure 00:00:45 56.00 KiB 0.7% 0.2% [06] 00:00:14 x11/libXv | libXv-1.0.12,1 = pkg-depends 00:00:03 52.00 KiB 3.6% 0% [07] 00:01:57 x11/libXfixes | libXfixes-6.0.0 = configure 00:00:42 40.00 KiB 0.1% 0% [08] 00:03:01 devel/glib20 | glib-2.76.1,2 = configure 00:01:26 40.00 KiB 4.3% 0.1% [09] 00:01:21 shells/bash-completion | bash-completion-2.11_2,2 = configure 00:00:13 32.00 KiB 5.7% 0% [10] 00:06:26 devel/qt5-buildtools | qt5-buildtools-5.15.8p157 = package 00:01:57 44.00 KiB 76.1% 0.1% [11] 00:01:20 print/psutils | psutils-1.17_5 = stage 00:00:03 40.00 KiB 0.2% 0% [12] 00:02:09 x11/libxkbfile | libxkbfile-1.1.0 = configure 00:01:22 44.00 KiB 0.1% 0% [13] 00:08:54 devel/cmake-core | cmake-core-3.25.1 = build 00:01:43 36.00 KiB 694.9% 5.2% [14] 00:01:20 x11/xcb-util-image | xcb-util-image-0.4.0_1 = configure 00:00:14 48.00 KiB 0% 0% [00:40:14] Logs: = /usr/local/poudriere/data/logs/bulk/main-CA72-bulk_a-default/2023-04-15_14= h47m19s [00:40:22] [11] [00:01:28] Finished print/psutils | psutils-1.17_5: = Success So no failures so far, 235 ports built and a bunch in process. Note: maximum observed ("MaxObs") load averages so far as shown below (for there being only 16 cores, i.e., 16 Cortex-A72 threads, one per core): load averages: 43.75, 34.32, 27.40 MaxObs: 45.03, 34.32, 27.40 I'll report again if it gets a corruption failure. Otherwise it will be many hours before it would complete without such failures (multiple compiler toolchain builds and such). =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Apr 15 22:49:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzT644jl3z45DjR for ; Sat, 15 Apr 2023 22:49:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzT634Vwyz3nP9 for ; Sat, 15 Apr 2023 22:49:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=EME8USLL; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681598985; bh=QFriFYybrt/DkPHkifqdhSpzObbt2yFMQDV+B0+0Gpk=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=EME8USLLQlz/XvV78ekYaCznMRKJjPLkW8FW51e6QnVoPwi49dygbbdxUWqWmPSB6qFfJZXYP5zgDG3kcY44VwEBIUYXlnVz5dB6Agw/S/mOXfuD8bJXhoWmdNmivSDwI6aeeYx/Xuf6Bsnr1CqWBqZIRIeQJ4BEXyfmXsws04MzQQWrxlD5pWINULJGOT/0TwzW/G2JFHIHtKXrpaXi0IDpX4+P0oHyWmcwQXl9B6jmwsdn14rnMglgS1GZJbM+lFp1N0kV5mnt8kZJWFLudkT4bzyHYoCDuO8bnRRbEaTbyUE6f1eHttDFYDeOIXT8z52I4Ld4MhTrkM+FdezfYQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1681598985; bh=4LDDa5fezD0TEFFGxFNdBW3YyfZO9VxcraiwXPrPHgj=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=f51jeM6wt39jVRA5Ytk5To2KF1iRsFyePNxq04CsP6BtwR8b+l4dqu7/uPJ1jue9Ug1Fiau+yYkPl8ij9qsUxCjgpSSlgMb/49DwrJ7W6DOO7sIbuRJMz41sh7Y24nHcRbLjNMX461fxSg3uSpuY249R5tvltkjCRZ942ZPgec+TgCEeKugrTNJ7hWal6cylWEPt7I4eu+T3Pnq7Dx9ixcD+pprDkQsXM6N0jh4o3Fz0hYtGs0f3QnwKRE8jcYSor+W/Wy83JZoZkl8fOZldbAuHVubTc0KCI0f2P638hAOw4eMvaCegr3mZFDmWiz68YIIlK0QrxtbUgm/lkMqdxQ== X-YMail-OSG: 0K9_Kc4VM1lT3EgQBtL79GXSxYqrm6pvLoT0J7u3pFAIwL9JfbXmmTonepFPUO0 15BslKRImTRoWMqazFCTGBupxaD2eF1R._A5Wdf39zD22PrqzjRbLbQkbJzB_.dtRDiWIYfCQWew 9FnRKkD_VaiwRtt6TdrH6NJg5EDqdGqUUMdobsW56IewcUsbxbKg8_bqeGSpWLSI2rxFRejKRWaI ivTudRpKp2Lwvlx3QCwG.RxHtnjPSxaSxAq4WosZofBqXRDYdOMMTo7k7bSCHKcJo3mt.TxXBkc7 7UzXo4gnVochJ3o2PUmqA0rf3NLD.ZznQ9MN3SiBy7HEzrjnSSxv7QmInWdxBem82LFf873U2oU4 sBStdoi6cbon6GEMUDvVZuw4TGHSNy4Hz9cVowmBmxAwGJwcH0ZOpkkDKYbi5cfQxwQq8U6YlX5E vIupxm5jg9JzOOiD8eiCXnT8BWBc4w2H8T25_AE7JGxiuyZELtnnh7tp4WC9Pb0l5.7OXqlz7Xq8 C55lw9BFUi7HijHVU.9dmCsmJrHICGTte4Q3MjgmuHnoZtnQXCnwy8qd_Jneas8s5BuHH4KDpIAr cEwmQoyaIOL7XRI1_nutoSZvj82h.wigQNtsji2bwWdODgNbOf5ApLtlLFnWmAajEQOHytXXRmGq jmdrxehBE3Q6tDeyZ1HV5doXd_Ln4hgh_8xPl4HZE.RDj0kLLzxwhZ4vrkKLWswg3KOlkRA4Omrj TA7Pfkdk3lJIxTc4_Crk7omPehXbJtoFPKJLqad18ZoPjscYjrY0AAugale9mluLH5AQG3K9rh_Q j9W3GQB.dmv8OhVS4Y1zxjX5vmpXqQAnhfiE199f3eqdc0X0MXEE1DIwpZQ9cFSPqxLhposxiir9 wGFkxBLu9jFiVUYaW0KvV1u51hGrHkoHszYcwydIKQT9OnPt.gcG8dU6CateBGam3ItkyUrbdvGz Bf3scAL_YDRzzLAmZ0vAf5kFutQOfIlGfZiyIa2.S86QLLy8QjNB.QGRoAyywZaOHZBYDg2sVlMF NJD6BKIyLKDQwgh9Keblf1PDm1tM_Te5NemtCe7CBu6AbFB_UfEsKzmeF7v5O1kx.Hjk2e2JeK81 SreiU8agAcuIz8LrMb1pbMzMTREvHxorWs0uN0_px1Qdycvf5U5g.xDL5jnL0MN6SQ8LHmPotCZk zNn2KC7_36jCc0Mqx_0efVRMbweXXlYNZlFAp0jtVb8Gy1YwoCWoCkOntE1f8yy7R8AHTx7Krc1P c5dqVFYjSTP1kanWz1Xhg8MWdjMTmvods7ZmLAC6wjjY.JqsBiIJFps0nSzYmJVJ6M2qOumDfIMa TvxdZz.6syET_wxN6SRR1mSvNDbh1mFkXcahfhzWJcI_N9gc8AxkndL09zsSfl9OQNcSxST1zTxX I8FMmaMXMCHJck9Dv8Sqcn5Mdr50bJIJsakVCITacDgVOA6yXSBizkvHJ0zs6SO54Ezaxeqnshru xmtgaqpv2Bkn.baRz0AfI6rEf8Ty2F00HoNPs5dfJqzWlqfOVWxCkQFAxBtMb2f9vELWc27O5t68 sEvU1hxehcV0wScz0ONbth3z_2rDEBSIqTQ3paIMVaF1JdSYzw7CJX7.JrUFJv1OgdItszfTTPoS 0cznKDdt8n7pI4Bd3hO7BEcaXom9E8mSI60CqEEZemvZTuXMZyPRg8gQWvKAb7Nthhg3fUEIZ5Fb wYzNo87b0gPLfN4mGiq8LYrHDmw5CqihiZ5zUxVlBJiP0yq390_iOjp291PmsMJ3BweUWx1aN6xf QfS5Bge2wPWW.tMPgX3OKj27tyjuCtHMgP0May0AaXDLf9rQ3t02XJXj4xVnWk6Aj91jOGl2WVJq dO0t0Pj1QT92mTPSCPcf.C9ZvUAMTKox8we2qOWkb7ZC0DB9iftLlX08SWmV9qMMIuioNJoDRnXg IPllye2kq6XGsnrJKJ_z9qAP7aM1lt8jfdlE_jgP9Fa94EKCyd7P3pDiHLHsY.XCiMoTnTjJIS1E uwDLP2PHIofl.UNGmZgKc_rrl89yfumwJQvWNjecDFAM26BURvelxLV0tuRaWDe7DcPeEyWmsSq_ mHs99X4khE.0TnH8Itc_o3G_hPAONZWr6Gmwj4zlfhRP4mzNn0hPbHkCA0L8vdU7U14.ViomDUe2 a93C_N3Tx5o6O1whv3tAqtbxbN64rKgzUCaNts8NDQFxHY2KrImk4ovZP6sn7fSsxZvAIpEKJ0s9 migHFz.YZXGgKcSbfDEEDirLQbaNHIUJ4MS8Neah1SQYAFpzYm0P.xKMlVVmvS2_Ik_LTHUVQkPN 3Bn.K_C5k X-Sonic-MF: X-Sonic-ID: 0be95355-c582-4799-9fe4-a1c7a69b5fd6 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Sat, 15 Apr 2023 22:49:45 +0000 Received: by hermes--production-gq1-546798879c-sfj59 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID f4b3aba42658f92ddcaaff6db7af9bd6; Sat, 15 Apr 2023 22:49:43 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 From: Mark Millard In-Reply-To: <62F8DD62-8E09-4A07-926B-5DE3DB399609@yahoo.com> Date: Sat, 15 Apr 2023 15:49:32 -0700 Cc: FreeBSD User , Cy Schubert , Charlie Li , Pawel Jakub Dawidek , dev-commits-src-main@freebsd.org, Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <0C286158-8F0D-45D0-8D85-B521278E9518@yahoo.com> References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net> <5ce72375-90db-6d30-9f3b-a741c320b1bf@freebsd.org> <99382FF7-765C-455F-A082-C47DB4D5E2C1@yahoo.com> <32cad878-726c-4562-0971-20d5049c28ad@freebsd.org> <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de> <20230415143625.99388387@slippy.cwsent.com> <20230415175218.777d0a97@thor.intern.walstatt.dynvpn.de> <62F8DD62-8E09-4A07-926B-5DE3DB399609@yahoo.com> To: Mateusz Guzik X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Spamd-Result: default: False [-3.47 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.972]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_TO(0.00)[gmail.com]; RCPT_COUNT_SEVEN(0.00)[7]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4PzT634Vwyz3nP9 X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On Apr 15, 2023, at 15:33, Mark Millard wrote: > On Apr 15, 2023, at 13:30, Mateusz Guzik wrote: >=20 >> On 4/15/23, FreeBSD User wrote: >>> Am Sat, 15 Apr 2023 07:36:25 -0700 >>> Cy Schubert schrieb: >>>=20 >>>> In message = <20230415115452.08911bb7@thor.intern.walstatt.dynvpn.de>, >>>> FreeBSD Us >>>> er writes: >>>>> Am Thu, 13 Apr 2023 22:18:04 -0700 >>>>> Mark Millard schrieb: >>>>>=20 >>>>>> On Apr 13, 2023, at 21:44, Charlie Li = wrote: >>>>>>=20 >>>>>>> Mark Millard wrote: >>>>>>>> FYI: in my original report for a context that has never had >>>>>>>> block_cloning enabled, I reported BOTH missing files and >>>>>>>> file content corruption in the poudriere-devel bulk build >>>>>>>> testing. This predates: >>>>>>>> https://people.freebsd.org/~pjd/patches/brt_revert.patch >>>>>>>> but had the changes from: >>>>>>>> https://github.com/openzfs/zfs/pull/14739/files >>>>>>>> The files were missing from packages installed to be used >>>>>>>> during a port's build. No other types of examples of missing >>>>>>>> files happened. (But only 11 ports failed.) >>>>>>> I also don't have block_cloning enabled. "Missing files" prior = to >>>>>>> brt_rev >>>>> ert may actually >>>>>>> be present, but as the corruption also messes with the file(1) >>>>>>> signature, >>>>> some tools like >>>>>>> ldconfig report them as missing. >>>>>>=20 >>>>>> For reference, the specific messages that were not explicit >>>>>> null-byte complaints were (some shown with a little context): >>>>>>=20 >>>>>>=20 >>>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: = libxml2.so - not >>>>>> found >>>>>> =3D=3D=3D> Installing existing package = /packages/All/libxml2-2.10.3_1.pkg >>>>>>=20 >>>>>> [CA72_ZFS] Installing libxml2-2.10.3_1... >>>>>> [CA72_ZFS] Extracting libxml2-2.10.3_1: .......... done >>>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: = libxml2.so - found >>>>>>=20 >>>>>> (/usr/local/lib/libxml2.so) . . . >>>>>> [CA72_ZFS] Extracting libxslt-1.1.37: .......... done >>>>>> =3D=3D=3D> py39-lxml-4.9.2 depends on shared library: = libxslt.so - found >>>>>>=20 >>>>>> (/usr/local/lib/libxslt.so) =3D=3D=3D> Returning to build of >>>>>> py39-lxml-4.9.2 >>>>>> . . . >>>>>> =3D=3D=3D> Configuring for py39-lxml-4.9.2 >>>>>> Building lxml version 4.9.2. >>>>>> Building with Cython 0.29.33. >>>>>> Error: Please make sure the libxml2 and libxslt development = packages >>>>>> are in >>>>> stalled. >>>>>>=20 >>>>>>=20 >>>>>> [CA72_ZFS] Extracting libunistring-1.1: .......... done >>>>>> =3D=3D=3D> libidn2-2.3.4 depends on shared library: = libunistring.so - not >>>>>> found >>>>>=20 >>>>>>=20 >>>>>>=20 >>>>>> [CA72_ZFS] Extracting gmp-6.2.1: .......... done >>>>>> =3D=3D=3D> mpfr-4.2.0,1 depends on shared library: libgmp.so - = not found >>>>>>=20 >>>>>>=20 >>>>>>=20 >>>>>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - = not found >>>>>> =3D=3D=3D> Installing existing package = /packages/All/gmp-6.2.1.pkg >>>>>> [CA72_ZFS] Installing gmp-6.2.1... >>>>>> the most recent version of gmp-6.2.1 is already installed >>>>>> =3D=3D=3D> nettle-3.8.1 depends on shared library: libgmp.so - = not found >>>>>>=20 >>>>>> *** Error code 1 >>>>>>=20 >>>>>>=20 >>>>>> autom4te: error: need GNU m4 1.4 or later: /usr/local/bin/gm4 >>>>>>=20 >>>>>>=20 >>>>>> checking for GNU >>>>>> M4 that supports accurate traces... configure: error: no = acceptable m4 >>>>>> coul >>>>> d be found in >>>>>> $PATH. GNU M4 1.4.6 or later is required; 1.4.16 or newer is >>>>>> recommended. >>>>>> GNU M4 1.4.15 uses a buggy replacement strstr on some systems. >>>>>> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr = bug. >>>>>>=20 >>>>>>=20 >>>>>> ld: error: /usr/local/lib/libblkid.a: unknown file type >>>>>>=20 >>>>>>=20 >>>>>> =3D=3D=3D >>>>>> Mark Millard >>>>>> marklmi at yahoo.com >>>>>>=20 >>>>>>=20 >>>>>=20 >>>>> Hello >>>>>=20 >>>>> whar is the recent status of fixing/mitigate this desatrous bug? >>>>> Especially f >>>>> or those with the >>>>> new option enabled on ZFS pools. Any advice? >>>>>=20 >>>>> In an act of precausion (or call it panic) I shutdown several = servers to >>>>> prev >>>>> ent irreversible >>>>> damages to databases and data storages. We face on one host with >>>>> /usr/ports r >>>>> esiding on ZFS >>>>> always errors on the same files created while staging (using = portmaster, >>>>> leav >>>>> es the system >>>>> with noninstalled software, i.e. www/apache24 in our case). = Deleting the >>>>> work >>>>> folder doesn't >>>>> seem to change anything, even when starting a scrubbing of the = entire >>>>> pool (R >>>>> AIDZ1 pool) - >>>>> cause unknown, why it affects always the same files to be = corrupted. >>>>> Same wit >>>>> h deve/ruby-gems. >>>>>=20 >>>>> Poudriere has been shutdown for the time being to avoid further = issues. >>>>>=20 >>>>>=20 >>>>> Are there any advies to proceed apart from conserving the boxes = via >>>>> shutdown? >>>>>=20 >>>>> Thank you ;-) >>>>> oh >>>>>=20 >>>>>=20 >>>>>=20 >>>>> -- >>>>> O. Hartmann >>>>=20 >>>> With an up-to-date tree + pjd@'s "Fix data corruption when cloning >>>> embedded >>>> blocks. #14739" patch I didn't have any issues, except for email = messages >>>>=20 >>>> with corruption in my sent directory, nowhere else. I'm still >>>> investigating >>>> the email messages issue. IMO one is generally safe to run = poudriere on >>>> the >>>> latest ZFS with the additional patch. >>>>=20 >>>> My tests of the additional patch concluded that it resolved my last >>>> problems, except for the sent email problem I'm still = investigating. I'm >>>> sure there's a simple explanation for it, i.e. the email thread was >>>> corrupted by the EXDEV regression which cannot be fixed by = anything, even >>>>=20 >>>> reverting to the previous ZFS -- the data in those files will = remain >>>> damaged regardless. >>>>=20 >>>> I cannot speak to the others who have had poudriere and other = issues. I >>>> never had any problems with poudriere on top of the new ZFS. >>>>=20 >>>> WRT reverting block_cloning pools to without, your only option is = to >>>> backup >>>> your pool and recreate it without block_cloning. Then restore your = data. >>>>=20 >>>>=20 >>>=20 >>> All right, I interpret the answer that way, that I need a most = recent source >>> tree (and >>> accordingly built and installed OS) AND a patch that isn't = officially >>> commited? >>>=20 >>> On a box I'm with: >>>=20 >>> FreeBSD 14.0-CURRENT #8 main-n262175-5ee1c90e50ce: Sat Apr 15 = 07:57:16 CEST >>> 2023 amd64 >>>=20 >>> The box is crashing while trying to update ports with the well known = issue: >>>=20 >>> Panic String: VERIFY(!zil_replaying(zilog, tx)) failed >>>=20 >>> At the moment all alarm bells are ringing and I lost track about = what has >>> been patched and >>> already commited and what is still as patch available but in the = phase of >>> evaluation or >>> inofficially emmited here. >>>=20 >>> According to the EXDEV issue: in cases of poudriere or ports trees = on ZFS, >>> what do I have to >>> do to ensure that those datasets are clean? The OS should detect = file >>> corruption but in my >>> case the box is crashing :-( >>>=20 >>> I did several times scrubbing, but this seems to be the action of a = helpless >>> and desperate man >>> ... ;-/ >>>=20 >>> Greetings >>>=20 >>=20 >> Using block cloning is still not safe, but somewhere in this thread >> pjd had a patch to keep it operatinal for already cloned files = without >> adding new ones. >>=20 >> Anyhow, as was indicated by vishwin@ there was data corruption >> *unrelated* to block cloning which also came with the import, I >> narrowed it down: https://github.com/openzfs/zfs/issues/14753 >>=20 >> That said now I'm testing a kernel which does not do block cloning = and >> does not have the other problematic commit, we will see if things >> work. >=20 > (Mostly written as I progressed but some material later > inserted into/around previously written material.) >=20 > Summary: >=20 > As stands, it looks like reverting the dnode_is_dirty > code is what fixes the corruptions that my type of > test context produced via poudriere bulk activity . >=20 >=20 > The details that lead to that summary . . . >=20 > Using my my build environment for updating my temporary, > experimental context, an environment running a world and > and kernel that predate the import: >=20 > # uname -apKU > FreeBSD CA72_4c8G_ZFS 14.0-CURRENT FreeBSD 14.0-CURRENT #90 = main-n261544-cee09bda03c8-dirty: Wed Mar 15 20:25:49 PDT 2023 = root@CA72_16Gp_ZFS:/usr/obj/BUILDs/main-CA72-nodbg-clang/usr/main-src/arm6= 4.aarch64/sys/GENERIC-NODBG-CA72 arm64 aarch64 1400082 1400082 >=20 > (Note the "nondbg": I normally run non-debug main builds, > but with symbols not stripped.) >=20 > The kernel and world for this are what is in old-main-CA72: >=20 > # bectl list > BE Active Mountpoint Space Created > main-CA72 R - 3.98G 2023-04-12 20:29 > old-main-CA72 N / 1.08M 2023-02-06 19:44 >=20 > (Most everything else is outside the BE's and so is shared > across the BE's.) >=20 > I updated to also have (whitespace details likely > not preserved in this note): >=20 > # git -C /usr/main-src/ diff = /usr/main-src/sys/contrib/openzfs/module/zfs/dnode.c > diff --git a/sys/contrib/openzfs/module/zfs/dnode.c = b/sys/contrib/openzfs/module/zfs/dnode.c > index 367bfaa80726..49a7f59c0da4 100644 > --- a/sys/contrib/openzfs/module/zfs/dnode.c > +++ b/sys/contrib/openzfs/module/zfs/dnode.c > @@ -1772,17 +1772,7 @@ dnode_is_dirty(dnode_t *dn) > { > mutex_enter(&dn->dn_mtx); > for (int i =3D 0; i < TXG_SIZE; i++) { > - list_t *list =3D &dn->dn_dirty_records[i]; > - for (dbuf_dirty_record_t *dr =3D list_head(list); > - dr !=3D NULL; dr =3D list_next(list, dr)) { > - if (dr->dr_dbuf =3D=3D NULL || > - (dr->dr_dbuf->db_blkid !=3D = DMU_BONUS_BLKID && > - dr->dr_dbuf->db_blkid !=3D = DMU_SPILL_BLKID)) { > - mutex_exit(&dn->dn_mtx); > - return (B_TRUE); > - } > - } > - if (dn->dn_free_ranges[i] !=3D NULL) { > + if (multilist_link_active(&dn->dn_dirty_link[i])) { > mutex_exit(&dn->dn_mtx); > return (B_TRUE); > } >=20 >=20 >=20 >=20 > I did my usual buildworld buildkernel sequence and then > one of my normal install sequences into main-CA72 to > update it to have the change, as well as the prior > material involved in my first experiment that I'd > reported on. >=20 > I cleared the content of the jail that I use for > temporary experiments, such as the prior testing that > got the 11 builder failures: >=20 > # poudriere pkgclean -jmain-CA72-bulk_a -A >=20 > I then rebooted using the updated main-CA72 BE. >=20 > Then I started the: >=20 > # poudriere bulk -jmain-CA72-bulk_a -w -f ~/origins/CA72-origins.txt > . . . > [00:00:37] Building 476 packages using up to 16 builders > [00:00:37] Hit CTRL+t at any time to see build progress and stats > [00:00:38] [01] [00:00:00] Builder starting > [00:00:40] [01] [00:00:02] Builder started > [00:00:40] [01] [00:00:00] Building ports-mgmt/pkg | pkg-1.19.1_1 >=20 > In the prior experiment it got: >=20 > 476 =3D 252 success + 11 failed + 213 skipped >=20 > and it reported the time for that as: 00:37:52. >=20 > A normal from-scratch build takes many hours (multiple > compiler toolchains and such) so my first report after > this point will be for one of: >=20 > A) It got to, say, 00:40:00 or beyond with, or without > failures. > vs. > B) It got failures and stopped before that. >=20 > . . . TIME GOES BY . . . >=20 > At about 00:40:00 the status was: >=20 > [00:40:00] [06] [00:00:00] Building x11/libXv | libXv-1.0.12,1 > load: 30.73 cmd: sh 1508 [nanslp] 2400.88r 6.69u 11.90s 0% 3960k > [main-CA72-bulk_a-default] [2023-04-15_14h47m19s] [parallel_build:] = Queued: 476 Built: 235 Failed: 0 Skipped: 0 Ignored: 0 Fetched: 0 = Tobuild: 241 Time: 00:40:01 > ID TOTAL ORIGIN PKGNAME = PHASE PHASE TMPFS CPU% MEM% > [15] 00:07:44 devel/py-lxml@py39 | py39-lxml-4.9.2 = stage 00:00:08 40.00 KiB 0% 0% > [01] 00:00:34 x11/libXxf86vm | libXxf86vm-1.1.4_3 = build-depends 00:00:03 56.00 KiB 2.3% 0% > [16] 00:01:59 x11-toolkits/libXt | libXt-1.2.1,1 = configure 00:00:52 40.00 KiB 0.3% 0% > [02] 00:01:40 devel/dbus | dbus-1.14.6,1 = configure 00:00:05 36.00 KiB 0.5% 0% > [03] 00:02:20 x11/libXrender | libXrender-0.9.10_2 = configure 00:01:27 40.00 KiB 0% 0% > [04] 00:00:44 graphics/libglvnd | libglvnd-1.6.0 = build-depends 00:00:13 52.00 KiB 20.3% 0.1% > [05] 00:01:39 x11/xprop | xprop-1.2.6 = configure 00:00:45 56.00 KiB 0.7% 0.2% > [06] 00:00:14 x11/libXv | libXv-1.0.12,1 = pkg-depends 00:00:03 52.00 KiB 3.6% 0% > [07] 00:01:57 x11/libXfixes | libXfixes-6.0.0 = configure 00:00:42 40.00 KiB 0.1% 0% > [08] 00:03:01 devel/glib20 | glib-2.76.1,2 = configure 00:01:26 40.00 KiB 4.3% 0.1% > [09] 00:01:21 shells/bash-completion | bash-completion-2.11_2,2 = configure 00:00:13 32.00 KiB 5.7% 0% > [10] 00:06:26 devel/qt5-buildtools | qt5-buildtools-5.15.8p157 = package 00:01:57 44.00 KiB 76.1% 0.1% > [11] 00:01:20 print/psutils | psutils-1.17_5 = stage 00:00:03 40.00 KiB 0.2% 0% > [12] 00:02:09 x11/libxkbfile | libxkbfile-1.1.0 = configure 00:01:22 44.00 KiB 0.1% 0% > [13] 00:08:54 devel/cmake-core | cmake-core-3.25.1 = build 00:01:43 36.00 KiB 694.9% 5.2% > [14] 00:01:20 x11/xcb-util-image | xcb-util-image-0.4.0_1 = configure 00:00:14 48.00 KiB 0% 0% > [00:40:14] Logs: = /usr/local/poudriere/data/logs/bulk/main-CA72-bulk_a-default/2023-04-15_14= h47m19s > [00:40:22] [11] [00:01:28] Finished print/psutils | psutils-1.17_5: = Success >=20 > So no failures so far, 235 ports built and a bunch in process. >=20 > Note: maximum observed ("MaxObs") load averages so far > as shown below (for there being only 16 cores, i.e., > 16 Cortex-A72 threads, one per core): >=20 > load averages: 43.75, 34.32, 27.40 MaxObs: 45.03, 34.32, 27.40 >=20 > I'll report again if it gets a corruption failure. > Otherwise it will be many hours before it would > complete without such failures (multiple compiler > toolchain builds and such). >=20 To be explicit, since I've now seen your commit: My test does not include the change (whitespace details not preserved in this note) @@ -2650,9 +2641,7 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t = *offset, rw_enter(&dn->dn_struct_rwlock, RW_READER); if (dn->dn_phys->dn_nlevels =3D=3D 0) { - if (!(flags & DNODE_FIND_HOLE)) { - error =3D SET_ERROR(ESRCH); - } + error =3D SET_ERROR(ESRCH); goto out; } I make no claims about which way dnode_next_offset should be. I was only providing some independent evidence that might prove of some use to folks that understand the alternative code sequences. For reference, at about the 1 hr point for what I'm testing: [00:57:49] [01] [00:00:51] Finished sysutils/u-boot-tools | = u-boot-tools-2022.10: Success [main-CA72-bulk_a-default] [2023-04-15_14h47m19s] [parallel_build:] = Queued: 476 Built: 306 Failed: 0 Skipped: 0 Ignored: 0 Fetched: 0 = Tobuild: 170 Time: 00:59:49 ID TOTAL ORIGIN PKGNAME PHASE PHASE = TMPFS CPU% MEM% [06] 00:16:54 devel/binutils@native | binutils-2.40_2,1 package 00:04:22 = 56.00 KiB 100% 0.2% [09] 00:15:50 lang/ruby31 | ruby-3.1.3_2,1 package 00:00:28 = 40.00 KiB 100% 0.2% [13] 00:28:43 devel/cmake-core | cmake-core-3.25.1 package 00:14:20 = 36.00 KiB 100% 0.2% [01:00:03] Logs: = /usr/local/poudriere/data/logs/bulk/main-CA72-bulk_a-default/2023-04-15_14= h47m19s [01:00:06] [06] [00:16:57] Finished devel/binutils@native | = binutils-2.40_2,1: Success =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Apr 15 23:12:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzTbj2xlnz45GKD; Sat, 15 Apr 2023 23:12: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 4PzTbj2XHyz4PJZ; Sat, 15 Apr 2023 23:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681600321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KX8e9AyizrobnuOyKWUoLkXTKYR2XXau/bhMj/8nlko=; b=En9cDP19Gm7mKc3xwsXg6fTqcN3ZGJ5BbeD9P/SHqvHO75YuFL71dlqLDFjbMuo+Rxmf4q KQG02f3R2i0d2DEAbPXWF/h9X7qU28+ZYHn/lUMIbXX6RtdAJLsVMCwoky0j7K0PuuCLPa Iq+fqIxaFZhUxzea5f6yNI7BYGQ4qUGyXFHlj4jLa81x9afyGeju1KPOo0QLdlg76pRi0V JxBUCmMpo9W+09As9YkJ//UoaYUv28K5TNhvt92Ixntv+m+969yLbF7iw99/uqL+/+AQZh BADulur3rA4QZ7fvDXGhBRe4ckREpelbqq3AXPJnBQq8P5wk7eZRSuEr05jiDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681600321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KX8e9AyizrobnuOyKWUoLkXTKYR2XXau/bhMj/8nlko=; b=kXbC59ntCkIHuNoMPKZb2CvRL23ubxE4i5WRznpIk186pbvkArwrGb/DAzKVKC3tznPb/F nEFjVnqDjDH4C2HYoK9S9ETpUZfA4o5R8sHltf/OKI+Mvaf1ALTIHeeeKdhKEi0soKVYH8 jtOf7Fc9fkEg5E1wv4OasgdSx++koU6//U65u2cbWPUdiLhAkm8eP9ubFrd6csLDlQdxQz XGpRoDvxKGZPFa79CRtjTvbdN1eDC1TyjA4ngnvGrXChA4Tsn/dXG4Lqqnx0PM4xCYasGE kee9OnMfrErg9pQyuGFdWUglruHU5WcglFVD6ZWsC41JaS388p6HobrBFl2oZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681600321; a=rsa-sha256; cv=none; b=beAW7ub8POUAoWeFuoTBgbe4EmjetYo8CoJAtvUxSk8wkffBhotPD2V1zaJpps4hARiVoa oKXbUT7vRpsTowvKkeMbQsYF6g4ojrDuGMuqhuSdpyCZmaEbpTKG/Wqx+FCoKCp+GUKHuk K7yZpxMRgL19oCwLvzY1hZmP9BW8tjsserdEoRIJZcyJSP6Vw1AD2NHcO4P0nsS1QikyA9 UWy5ATeI1qNVs0mh3j7mJZYpIhRC5zDyfpnvcRxgIjBijrsRrdcdGcIQ+IkM9VAUnFeL47 OvooSIrCa12JvK/zGecJ/M1zkBSppkOsEigTzA56Z0hBkf0WnrpQrVDFNgpgbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzTbj1YK6zPtl; Sat, 15 Apr 2023 23:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FNC1qj065034; Sat, 15 Apr 2023 23:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FNC1FF065030; Sat, 15 Apr 2023 23:12:01 GMT (envelope-from git) Date: Sat, 15 Apr 2023 23:12:01 GMT Message-Id: <202304152312.33FNC1FF065030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 1d35493e4661 - main - cam: fix up world compilation after previous List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d35493e4661e7c79ff9910d48c460ee0c2e683a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1d35493e4661e7c79ff9910d48c460ee0c2e683a commit 1d35493e4661e7c79ff9910d48c460ee0c2e683a Author: Mateusz Guzik AuthorDate: 2023-04-15 23:11:27 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-15 23:11:27 +0000 cam: fix up world compilation after previous Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/cam/cam_ccb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index a6b12b6a3584..07ccb262023d 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -1516,11 +1516,13 @@ cam_ccb_status(union ccb *ccb) return ((cam_status)(ccb->ccb_h.status & CAM_STATUS_MASK)); } +#ifdef _KERNEL static inline bool cam_ccb_success(union ccb *ccb) { return (cam_ccb_status(ccb) == CAM_REQ_CMP); } +#endif void cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended);