From nobody Sun Apr 2 01:09: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 4PpwtC4yhsz43g1s; Sun, 2 Apr 2023 01:09: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 4PpwtC4TDvz3HCg; Sun, 2 Apr 2023 01:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3MaP2hvVpsam7gb+XUlex/nImGudQbrHUy3U7bHSjDY=; b=C2Ohfmt5iOqzcw5oZQ4NToCaafTWTmAzY1LiBcoU7/fU25TE/8/u5wm1W4Wh0u94VgD6sj /GfkpLGKHTmXgAlRjOLePwuLi9LB23Kv9eGz23oMA6Y59P/Ef0WyAe335RY/TvXhVjEOEV 7qcDBM/s+0+U4RyKtdWaOmJIZSGpfOvd+J19zicE98lpD2HxiB59jJME5VRar1VdSQ4ahz YpAPdjNbQYTQAMaw6DIdeidNyevQr3DVC7xPmedEkI2356BdMUqBU+3GxhJ6HGP49UjZNZ nb/94Frxv2QRSNGyqroxfodR3YqlK6OcSIE9h+HdMAP+rYHscXv8F1KmgzU4dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3MaP2hvVpsam7gb+XUlex/nImGudQbrHUy3U7bHSjDY=; b=gun3Aoua0XeLWyG1nAvJkpxsLyArKnCrFUgVXh3QgbdRvNTsTvski+uWuB4ZSIX6zEKnee v4WAAXSJxNLHLRywKkzUaq/4Q9aEjDoTzIKkNaIhajym8tZs21eFR5l/5s+R29kFzncuLc dcv3qOv2ZablrKANLJI0E2P9hiD7rlVp3v4AYQi01hEJX5K+UfoJ4L3AsQ5LH29rkyzywA 7gnFspFZVSqROcRemtzZNYOaQL8XvyHg6fqRDHP91DhY0ScXauci1Qw+8DhA4RHJMKzbCS Yq0+DjXYf+0P5GGi1UBVBJA4UbXHVQQ001U1c8PUXcoMilUw4psfeZHyuYFbVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680397795; a=rsa-sha256; cv=none; b=HfOBypMtr7lso8N1tuXuK+HoX/ynRCtNFOSOXnL5QxPeHg5E26yjFM1VpMY7Iv8NbLZapU YPgnWnxcS/3TKTUoFY3MyyGe7kkU9MfIwzXWoBX8nMnNiT7RxupKCLIMoklDXEWnROqgnc GgFNmJCP52HgMr6yx3InRcjRRHff3jDm8LX5ZRTFwmg7y6ZuH5ubWKmb4KbcOhBlfF/AfQ bU893ScQ8sTT0xIHEe/zr+4UrTJLJqg2YcOYBUxDQKW4DJ2evMSTGXMsjeh/hK6obyrSC+ 0tTh4xvMAvcF54Art0iU0wq5OkAcXahqgQmtuiwBN7Sn765t38DIbVnuJ8PrRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpwtC3TslzxbD; Sun, 2 Apr 2023 01:09: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 33219t5I054551; Sun, 2 Apr 2023 01:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33219tun054550; Sun, 2 Apr 2023 01:09:55 GMT (envelope-from git) Date: Sun, 2 Apr 2023 01:09:55 GMT Message-Id: <202304020109.33219tun054550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 531ef35241b5 - main - cxgbe/iw_cxgbe: Always set a vnet around calls to IN_LOOPBACK. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 531ef35241b5b5934f8cd78ca628c21cb0494d88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=531ef35241b5b5934f8cd78ca628c21cb0494d88 commit 531ef35241b5b5934f8cd78ca628c21cb0494d88 Author: Navdeep Parhar AuthorDate: 2022-10-13 22:34:56 +0000 Commit: Navdeep Parhar CommitDate: 2023-04-01 23:19:10 +0000 cxgbe/iw_cxgbe: Always set a vnet around calls to IN_LOOPBACK. This is catch up with efe58855f3ea. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/iw_cxgbe/cm.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 457290875583..045da316a0a0 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -933,7 +933,7 @@ err: return; } -static inline int c4iw_zero_addr(struct sockaddr *addr) +static inline bool c4iw_zero_addr(struct sockaddr *addr) { struct in6_addr *ip6; @@ -946,19 +946,29 @@ static inline int c4iw_zero_addr(struct sockaddr *addr) } } -static inline int c4iw_loopback_addr(struct sockaddr *addr) +#define _IN_LOOPBACK(i) (((in_addr_t)(i) & 0xff000000) == 0x7f000000) +static inline bool c4iw_loopback_addr(struct sockaddr *addr, struct vnet *vnet) { - if (addr->sa_family == AF_INET) - return IN_LOOPBACK( - ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); - else - return IN6_IS_ADDR_LOOPBACK( - &((struct sockaddr_in6 *) addr)->sin6_addr); + bool ret; + + if (addr->sa_family == AF_INET) { + if (vnet == NULL) + ret = _IN_LOOPBACK(ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); + else { + CURVNET_SET_QUIET(vnet); + ret = IN_LOOPBACK(ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); + CURVNET_RESTORE(); + } + } else { + ret = IN6_IS_ADDR_LOOPBACK(&((struct sockaddr_in6 *) addr)->sin6_addr); + } + return (ret); } +#undef _IN_LOOPBACK -static inline int c4iw_any_addr(struct sockaddr *addr) +static inline bool c4iw_any_addr(struct sockaddr *addr, struct vnet *vnet) { - return c4iw_zero_addr(addr) || c4iw_loopback_addr(addr); + return c4iw_zero_addr(addr) || c4iw_loopback_addr(addr, vnet); } static void @@ -971,7 +981,8 @@ process_newconn(struct c4iw_listen_ep *master_lep, struct socket *new_so) MPASS(new_so != NULL); - if (c4iw_any_addr((struct sockaddr *)&master_lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&master_lep->com.local_addr, + new_so->so_vnet)) { /* Here we need to find the 'real_lep' that belongs to the * incomming socket's network interface, such that the newly * created 'ep' can be attached to the real 'lep'. @@ -2734,7 +2745,7 @@ c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) * invoke solisten() as first listener callback has already created * listeners for all other devices(via solisten). */ - if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr, NULL)) { port_info = add_ep_to_listenlist(lep); /* skip solisten() if refcnt > 1, as the listeners were * already created by 'Master lep' @@ -2788,7 +2799,8 @@ c4iw_destroy_listen(struct iw_cm_id *cm_id) states[lep->com.state]); lep->com.state = DEAD; - if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr, + lep->com.so->so_vnet)) { /* if no refcount then close listen socket */ if (!rem_ep_from_listenlist(lep)) close_socket(lep->com.so); From nobody Sun Apr 2 01: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 4PpwtD5k4Tz43g95; Sun, 2 Apr 2023 01:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpwtD5Cw4z3HSY; Sun, 2 Apr 2023 01:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jkgda2uKotBUK7RlEJs43e7tswNsxavj9O/3B5LqUUo=; b=DcisqzNC9sE8hpwNFzRWLymirLNuRlfMUiQu5ZUWxXWcPKJPRnoeTptpcKNhlT+xpzxQhc lDGidBA/y3YbvHevQgMYOt6ek//0MAKDOs0zTMzjCN/HdrtL2vrzDeslRv9zSMwAyXCv8W 75CQ5hG4Fu/c148hTFBaTdOku/rbILIslFq0DDVN01lcErpki7CdEk0bmzddGxgWW9PSYc FOhHFux+Ufb3LHRpsyDQjb19qQDoZ6tQp3wdyGPybS3bSP45VnLKm6GKO+EGAI5V0Qb9A7 hdEKGgzSL8/c1tvDDnbfM4KYBYGrYQt/gv6mc5FMwp7mz/5aPW3N3hNd6JD8Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jkgda2uKotBUK7RlEJs43e7tswNsxavj9O/3B5LqUUo=; b=YN5yIsY4yGTa+Y0KsYqJVFBB1XqtLb+L1QhtmEvKeTbv9tmmHqppFJWUjfgBtagb3oAbPp gqU0uMv0PrjAzsW/GwMTCy76LU4QTHwvKIJoo8oLLvaZZInqN1UZZ/PRNQhQUYcwUd9jXE 8GI/lPIzwmozPyRINFiE9BdS6gJeMKHV19UuEk20X4ok66zcZisqu2YlLEI6JT0OEfMZxk UJ2MsBByBo+Ln4UBUDl7tXMWvr3cj5MrshjQnRiHoRAGJtVVKSqEo5yYSKz+9GqU3xXQmz wtWOKI//bWGl+8Arna/vEaKUCbGBYsOx5UpZYVAKjvUYcRBXbpm8r9/H8v0PTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680397796; a=rsa-sha256; cv=none; b=QDoZ1TvW3Wp2fYg0gXjDb/cpgo7QXRfIiOHCCGrw0XuKxvc8ij4wwQrDliN5L0XCmbTgkb oAeks3z06bXY1V0pXqK/NQq8SmX9xk+KI1Unk5Iaz1+MEMXiuSt58Oovvj5p5qvExWCtQD +B2e+pMBeiWkodXll/g3ZguVRT9FI2kmxSuHjTROKeI8cTneWBSFRfAjtUFqI3reUnDORT 27FT+cc1pDx2b7jByb3+AKbbMPvzrBnWPLWYj5tVIwGUx99IPN3fJj50OCxv9x+ek5Cab5 STncs4a26GRxSl02FY0oKQSRGsVlCtEpw+JN8OiElvsGYPYwCQ9fHQu0JzSxZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpwtD4CfbzxRt; Sun, 2 Apr 2023 01:09: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 33219uJQ054570; Sun, 2 Apr 2023 01: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 33219uj4054569; Sun, 2 Apr 2023 01:09:56 GMT (envelope-from git) Date: Sun, 2 Apr 2023 01:09:56 GMT Message-Id: <202304020109.33219uj4054569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 9f354cd3d017 - main - cxgbe(4): Allow tracing filters on loopback ports. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f354cd3d0170f0deba2a548e7894d48aa67ee23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=9f354cd3d0170f0deba2a548e7894d48aa67ee23 commit 9f354cd3d0170f0deba2a548e7894d48aa67ee23 Author: Navdeep Parhar AuthorDate: 2023-04-02 00:16:02 +0000 Commit: Navdeep Parhar CommitDate: 2023-04-02 00:50:46 +0000 cxgbe(4): Allow tracing filters on loopback ports. Each physical port has an associated loopback tx channel and anything transmitted over that channel by the driver is looped back internally by the hardware as if received on that physical port. This change allows tracing filters to be installed in this loopback path. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_tracer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c index 3d9d7038bf17..00c403b59bba 100644 --- a/sys/dev/cxgbe/t4_tracer.c +++ b/sys/dev/cxgbe/t4_tracer.c @@ -388,7 +388,8 @@ t4_set_tracer(struct adapter *sc, struct t4_tracer *t) goto done; } tp.port = sc->port[t->tp.port - 4]->tx_chan + 4; - } + } else + tp.port = t->tp.port; tpp = &tp; done: if (rc == 0) { From nobody Sun Apr 2 01:09: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 4PpwtG0KdXz43fqV; Sun, 2 Apr 2023 01: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 4PpwtF6V7fz3HdK; Sun, 2 Apr 2023 01: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=1680397797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OofaQqqKJz9JCxY4TH6TTHaepeWd/uwn8cqVDss/GJA=; b=tQVOyVLv5+zs9+Jf3iTwnUQb7PyNDWbGPXfdPn6JTCvriVDYL8vUEW8leuZy7gczQGtVEP OB4c2e1RXPpOKOQ9dqgVkKNTV5inZAJhWDAsIJ5l1mqQ0I/PIbkycXd8ZsiIG7v49GiLoW ZTunWz/lF4ekZtqqM8M7v+9vp7j5SLSHtkPAPE2nT6/5pdhdo6lxbSRy00+4kkNQW9sA+N VVuhig5+Qy5knjFFWs+TytSaNDNsYnxf5kgaXzOhE6n+4gaNvwqBIru7YEE9yBhzOG86NB uutXzrVAlm41kKpxTcZSUOq7zV4XPiZekVDcjyc4JnrSSSZZZNBwtMVTw4P2OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OofaQqqKJz9JCxY4TH6TTHaepeWd/uwn8cqVDss/GJA=; b=q1oiv/DmpKiO9yMRdbqWNimKWgmiNVX1QKHjWaSga7JsYOaJMjofydbv1EIQDtdUYMOIKZ nLy7S+BpxBGTJbY+oJNav17q4f2pi4JQa5mzCx4shK7M6+oqTIPxgbD27xAYUSDVe1rPrb fUI4w/suPuPxIwJz2K8538env3E8ciSvpH1/ponsI1ZSDLWKcX79eTOVkeI2VPkdewpj5L nuYtPjU0lJaAEwWIGfNvNF2S3rKsRKMwgar/kMV3GMvompnCRVOPk/HLws5Ej1WIEcWU7T SI1sxZCXJQ+52fOjVLhqjeU542CTRUrKdknc5tlb0lHf4/wZYoCl8tOCwNy7wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680397797; a=rsa-sha256; cv=none; b=sfeHICYRMmj7bfYOZhatTNGaLjarrWkyR/oFgZMw5vqoJd7UWfRX2dMTCzsHnOpV0y/Wjf vn+WClfMy0I0mLaPYUBZmE9kYOylew1DPF3CgP+0+j5esp749RvONx17SvPQgzfRib7gAG xMI1TGwijXxUQoHKKi4kGmXk1NhJaD8HZAL1/uno5kTAy2ZcVm1Df9Mv5F5NGmEJEJKf0t JPbJrBP5h+VlHA1ybxmGEAaQsJuCKTJCVMRohjBRjbaMJadWx7LHAMpUc7YlYSp+qcEPFS Sknuv5/UFbVeu5pegQyjbf6OW9NjvcTr98cQBBRGBUe15Fp+LyuIAieD16cpMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpwtF58KgzxRv; Sun, 2 Apr 2023 01: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 33219vZM054589; Sun, 2 Apr 2023 01:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33219vCx054588; Sun, 2 Apr 2023 01:09:57 GMT (envelope-from git) Date: Sun, 2 Apr 2023 01:09:57 GMT Message-Id: <202304020109.33219vCx054588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 4913a24e7910 - main - cxgbetool(8): Add support for tracing loopback traffic for a port. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4913a24e7910edf5a3f52536b780d1b1d4bb73a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4913a24e7910edf5a3f52536b780d1b1d4bb73a4 commit 4913a24e7910edf5a3f52536b780d1b1d4bb73a4 Author: Navdeep Parhar AuthorDate: 2023-04-02 00:43:20 +0000 Commit: Navdeep Parhar CommitDate: 2023-04-02 00:50:57 +0000 cxgbetool(8): Add support for tracing loopback traffic for a port. Use lo to tap the loopback for port . MFC after: 1 week Sponsored by: Chelsio Communications --- usr.sbin/cxgbetool/cxgbetool.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c index 43707df0b47a..149eacb54924 100644 --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -124,7 +124,7 @@ usage(FILE *fp) "\tsched-queue bind NIC queues to TX Scheduling class\n" "\tstdio interactive mode\n" "\ttcb read TCB\n" - "\ttracer tx|rx set and enable a tracer\n" + "\ttracer tx|rx|lo set and enable a tracer\n" "\ttracer disable|enable disable or enable a tracer\n" "\ttracer list list all tracers\n" ); @@ -2478,17 +2478,24 @@ set_tracer(uint8_t idx, int argc, const char *argv[]) t.valid = 1; if (argc != 1) { - warnx("must specify tx or rx."); + warnx("must specify one of tx/rx/lo"); return (EINVAL); } len = strlen(argv[0]); if (len != 3) { - warnx("argument must be 3 characters (tx or rx)"); + warnx("argument must be 3 characters (tx/rx/lo). eg. tx0"); return (EINVAL); } - if (strncmp(argv[0], "tx", 2) == 0) { + if (strncmp(argv[0], "lo", 2) == 0) { + port = argv[0][2] - '0'; + if (port < 0 || port > 3) { + warnx("'%c' in %s is invalid", argv[0][2], argv[0]); + return (EINVAL); + } + port += 8; + } else if (strncmp(argv[0], "tx", 2) == 0) { port = argv[0][2] - '0'; if (port < 0 || port > 3) { warnx("'%c' in %s is invalid", argv[0][2], argv[0]); From nobody Sun Apr 2 02:18: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 4PpyP705MTz43lTq; Sun, 2 Apr 2023 02:18: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 4PpyP66fgfz3PvQ; Sun, 2 Apr 2023 02:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680401898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qpd4wg/SMj9mG48ypr5qoB1j1Z3hMRgHPjoiGrLgskM=; b=fxlHqLxcJ7JtxoNFgTs10xACPO/0LRBJVGSOHbcfi6SDTO92CHBJKVyq0BTD9Fe3KSUBT+ lkG6RQzZJ/C3yZlxIPm9fKcBTyByWdVYR+p3dwuitcN6cmwGT3n5V1UKShmROWAdX63G2c Sh0AF3Er3jchQSdKwlx2tx2kGuB8psZsEEVMJDNk5glvXGpH/X1JkMLAgZPbw/86ieWsDg DhCriiL9uahLdCH3UHJ/Uwfc7mrbQ2ZPxEP+b3SpzlvOa1pJKzzozfIM52ij2w4YgiTejW 08amz/WpaD7Yr0Rved2MpJswJKy4T2G26KP79nQyLIDXIynODLCHyV1o5YaYGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680401898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qpd4wg/SMj9mG48ypr5qoB1j1Z3hMRgHPjoiGrLgskM=; b=JwyMa3bNN6X8p9EFOGaKIw1lmUrnO+Hjsj5DvQQILa18LFW+OYVMhPX1IRYflYlM4CAl5L EqGgD4X8NieFtpDcmVRrxgvQSHod4ZlluzBYugWFr69jhftnyNUDtRG4ZoAr1S9lTPMNI6 lrQPilnOXI/9p5dZ+vRbPypoFy1pienwjUxMVmNEu7Cr8FePDQPUZzEz44rPjN9XPVqs3X vMG91SC/nqFE1oRWdbdXpj7YZv5EYaFHIv4sVgvMcOR0OFpwkaiD0HXdsxzETitqaacKqm JU07zh7XByr1UI9HZIz2oq3uLYZapY3V3cP3cXJJv9/7pGkdbNhZwaReISCUkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680401898; a=rsa-sha256; cv=none; b=f0yVfMXsoYWNOL2brw6b3B/XorC+a+KAlhAGMewM8OaS6sMq5XokDat3i27qmQYRwELVyu /1ZYgycZUYvKc4P9Y5S8gX24hhqDKbWPSru3A+UZ9lKd++9gK1fydy7Kpho2ekuJQc3sY1 CDvT3UDDPmdl4dO6YeGN9xO0G5nstViuGkr6IeqLmfllEwUkJNsJDpsSViOCecNwE35ofU RwOjfQQmjmbbr4TfCO271ULIDzMyf21p96BdQGig1dw1Nq/nXKQkGEQJoLrHIuv0gvtjf5 8n5k9tHWmASA+jDPvrNcKIF4UUTTHD3t/8e1+oJdKbLuFUt+OZEFh6w8Cy/dlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpyP65jWnzyfH; Sun, 2 Apr 2023 02:18: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 3322IIr8068849; Sun, 2 Apr 2023 02:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3322IIKT068848; Sun, 2 Apr 2023 02:18:18 GMT (envelope-from git) Date: Sun, 2 Apr 2023 02:18:18 GMT Message-Id: <202304020218.3322IIKT068848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 7ee18f5aada0 - main - heimdal: Do not build a redundant source file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ee18f5aada07f03433504545c1b7bed91cbda82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7ee18f5aada07f03433504545c1b7bed91cbda82 commit 7ee18f5aada07f03433504545c1b7bed91cbda82 Author: Cy Schubert AuthorDate: 2023-04-01 03:43:10 +0000 Commit: Cy Schubert CommitDate: 2023-04-02 02:18:05 +0000 heimdal: Do not build a redundant source file Heimdal's lib/hdb/db3.c is only built if DB3 is enabled, i.e. #if HAVE_DB3. FreeBSD's bdb is DB1. Therefore the entire db3.c file is #ifdef'd out. Let's avoid building a file that results in a useless object file. MFC after: 1 week --- kerberos5/lib/libhdb/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index f39d54d6c2d7..26caf43e5429 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -43,7 +43,6 @@ INCS= hdb-protos.h \ SRCS= common.c \ db.c \ - db3.c \ dbinfo.c \ ext.c \ hdb-ldap.c \ From nobody Sun Apr 2 08:24: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 4Pq6Wc0v0nz43Dym; Sun, 2 Apr 2023 08:24: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 4Pq6Wc0PzGz47g4; Sun, 2 Apr 2023 08:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uRNxxapFtLvO5Lga9cpGzcvoc3LG8G9rVa2AEcN18Q=; b=XXA4SLhwfQEjH7DTyc3qDO3tr/JRnXr3MUmiJ+tF/i3fqYEOjMyKve6oOsm6/+pQOh9lAI mQjpcXMJKvQIKAwD2GHv6FC7OFzhfCHcpzShUUSDTbiZQ76UdCnpFoTRJvHIYsS6q/ANzJ T1WobLLaN78GHxGAN9AbqcVCtJqb+CtCxGfU3NXs1wbpZTo/71laDFQ9d+a7m5SrQGmXxR aQ5XdqFClLUJPmcLK28Y/9azQwIZLOSb7iKENP36+QOL/qgAfAXwHxUPv4UcdFLs8+ykUW ttSZzL5Ut6C8BGePy9l8RVtoVfXXvlw3xLbSX1Rxk8QJdCJMOk7KMMwMUh7wzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uRNxxapFtLvO5Lga9cpGzcvoc3LG8G9rVa2AEcN18Q=; b=VEVJp3Q6YnVEJByO5oDxbdO0E56tJLXbzfG2zeslGS1C2P5ikt9X9RxFPfw/eCT/Q/6RbU s2DONdAorXFGWwHhtstp9/AeeKbX7zFE/M/QMEP0P5DEXtQ40ger9sJ9qtUCSRYCVwAfLi omHsZNpkQto6OFnt//eOJXTy9WomoVQ+KmynQnHsjXgJ2zmPZOJosBEG4DS4Vlg6qE1HTN IQpbZlYATNSKkbJiWbnyVvmyAYTo6jBk6jAjigSjIzxXsp9bzIqswgCuwyiC1nghs0wdSj axWP5uzK0JyzQ9hEy/ck2etM5LvE6ii54SZ5q6mg9VeNpLOxpY5muQlVQhEBVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680423868; a=rsa-sha256; cv=none; b=niootXetIKiQeVHrDDN75V1OCVbA8syUu0fcAARYUX8hykLhFDwtgqC4AGr9Dt+SZFB49a S9WSCA5IygY6599Jko8omMfNJIlpBjsc9Z0RvN1PWoDhZXODqRjy5YhIEAZo+9eUrKnxKc gIb4eaQJAybjthAwbPHPanlu8JTbnzlLRlL5nfpW/tjnNdCyYzUFpkhEV7Ux6Z6hnJLLdY tN7B88YmEZ263wwAycTJ1IauPmjEdw55JvkfQ7n6RNM0i8wrWhbqpVJuCBeuTJF+IQ7eZ7 g6ihaTy0m8Og/DH7Qgj2rrU3X3SdfG3njWf2fvw865y3g/sO9b5dBcJvOFIZww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pq6Wb6bDvz18Yy; Sun, 2 Apr 2023 08:24: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 3328ORsu076329; Sun, 2 Apr 2023 08:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3328ORl6076328; Sun, 2 Apr 2023 08:24:27 GMT (envelope-from git) Date: Sun, 2 Apr 2023 08:24:27 GMT Message-Id: <202304020824.3328ORl6076328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7f72324346ea - main - pseudofs: Microoptimize struct pfs_node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f72324346ea154a92671fc913dbe82c0287501a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7f72324346ea154a92671fc913dbe82c0287501a commit 7f72324346ea154a92671fc913dbe82c0287501a Author: Dmitry Chagin AuthorDate: 2023-04-02 08:20:07 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-02 08:20:07 +0000 pseudofs: Microoptimize struct pfs_node Since 81167243b the size of struct pfs_node is 280 bytes, so the kernel memory allocator takes memory from 384 bytes sized bucket. However, the length of the node name is mostly short, e.g., for Linux emulation layer it is up to 16 bytes. The size of struct pfs_node w/o pfs_name is 152 bytes, i.e., we have 104 bytes left to fit the node name into the 256 bytes-sized bucket. Reviewed by: des Differential revision: https://reviews.freebsd.org/D39381 MFC after: 1 month --- sys/fs/pseudofs/pseudofs.c | 8 +++++--- sys/fs/pseudofs/pseudofs.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index 44473a926182..29071b34bd06 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -72,18 +72,20 @@ pfs_alloc_node_flags(struct pfs_info *pi, const char *name, pfs_type_t type, int { struct pfs_node *pn; int malloc_flags; + size_t len; - KASSERT(strlen(name) < PFS_NAMELEN, + len = strlen(name); + KASSERT(len < PFS_NAMELEN, ("%s(): node name is too long", __func__)); if (flags & PFS_NOWAIT) malloc_flags = M_NOWAIT | M_ZERO; else malloc_flags = M_WAITOK | M_ZERO; - pn = malloc(sizeof *pn, M_PFSNODES, malloc_flags); + pn = malloc(sizeof(*pn) + len + 1, M_PFSNODES, malloc_flags); if (pn == NULL) return (NULL); mtx_init(&pn->pn_mutex, "pfs_node", NULL, MTX_DEF | MTX_DUPOK); - strlcpy(pn->pn_name, name, sizeof pn->pn_name); + memcpy(pn->pn_name, name, len); pn->pn_type = type; pn->pn_info = pi; return (pn); diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h index 158f74575e33..e355e5f5609f 100644 --- a/sys/fs/pseudofs/pseudofs.h +++ b/sys/fs/pseudofs/pseudofs.h @@ -219,7 +219,6 @@ struct pfs_info { * is not enforcable by WITNESS. */ struct pfs_node { - char pn_name[PFS_NAMELEN]; pfs_type_t pn_type; int pn_flags; struct mtx pn_mutex; @@ -240,6 +239,7 @@ struct pfs_node { struct pfs_node *pn_nodes; /* (o) */ struct pfs_node *pn_last_node; /* (o) */ struct pfs_node *pn_next; /* (p) */ + char pn_name[]; /* Keep it last */ }; /* From nobody Sun Apr 2 08:24: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 4Pq6Wd284Sz43Dyv; Sun, 2 Apr 2023 08:24: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 4Pq6Wd1cr1z47RB; Sun, 2 Apr 2023 08:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCiakM9HFDog9Iv2/JmfunxjvcMCsgj+Lrv4BfFJor8=; b=KgGGwFVOseF/p2vPBLCd99yAC7USrA8FobFQZ1CiE/sghwHQTYKGmBytVCb0P+s7cENKei ksgZ4sVnyZ80EKHd5OVDWesn7vdYbcyANTsNQLDoJT8/4OHnaF7FKjQXAf+O/eTmad8Bm9 /T/2Y9xWu+LLqeGyvpXUGlCOuwouqQ7f+SXA673khca9JXRBfLc6R1ehPTx8//TrMzJU5n ssUn4JacZsXWrjeSehoz2F31inm8TJLNfE/LaYdwmwb06LyHryr6/zNgx4ValApxJiwkDb YQRyER2FovUJZgbaVcja2s6jUY8KZ9vNEc7Eon8pG5DShADozKagY8YtdKVw8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCiakM9HFDog9Iv2/JmfunxjvcMCsgj+Lrv4BfFJor8=; b=onTdpcKSShlcrUAyNJKSYQh0BCMC5+WxCpY8XA8lsG5oxfOU+G/s5WwXRF5Nh/HeJJtrii GwrJuGxJA+F2o2cm2nfz6iGwAfIlcbF9lmajei11O34TzKExZv1yY2mhu63Z/52X+8OixF NtQT8DLbeDeyuBdiuL4mXxCy7tXVXAflmyxSx08jwNg3IEMjBCrmPYK7f/GgYwlPvmiveV ZBSUXGeotOudaz2yfs/CaJGhpzYjlFFaOxy9985DNIeEx8xlWYO96Qk5ou9pe6dGBwaeDQ TePxmhSUgLjO6KSulnQPIlO2R40NiB9+tANTFsmGujFCOGPyGEj9Pk1TQJqqFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680423869; a=rsa-sha256; cv=none; b=ezPDmIO/vo9frMj0R3UZL7ZYIr2zUOz0Owu7RjbT5TyBR6KZEuZrUUz8alhuxSIDAJpbU6 d/TQPepQiFRFYbjuPONYoIoe0BspGMC5PsHIDuGxaBDchtFgtd4IdN3TzpOIpuolLYqYIT bwJGdnLniUBbg8FyUuN84L14aGa9mGo1E9erP7odU09tk1l6W2G2wWCAuwf9jqTfRUSiFP Sm4/XxVBtlcnGko80JftO7pcshz+KfWuQLMf6jLih11SffltGYZStGynEyX2d4uiwB6TkO reaG8yEjrJoQRckC/YVLjXK3Fi9x/UFO9sR94rplo4F2qL0L+RimS+3RqtrVFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pq6Wd0f38z18rM; Sun, 2 Apr 2023 08:24: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 3328OSSc076348; Sun, 2 Apr 2023 08:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3328OSLH076347; Sun, 2 Apr 2023 08:24:28 GMT (envelope-from git) Date: Sun, 2 Apr 2023 08:24:28 GMT Message-Id: <202304020824.3328OSLH076347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 405c0c04edb6 - main - pseudofs: Allow vis callback to be called for a named node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 405c0c04edb6143405426da6a5273f4c5998d594 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=405c0c04edb6143405426da6a5273f4c5998d594 commit 405c0c04edb6143405426da6a5273f4c5998d594 Author: Dmitry Chagin AuthorDate: 2023-04-02 08:21:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-02 08:21:15 +0000 pseudofs: Allow vis callback to be called for a named node This will be used later in the linsysfs module to filter out VNETs. Reviewed by: des Differential revision: https://reviews.freebsd.org/D39382 MFC after: 1 month --- sys/fs/pseudofs/pseudofs_internal.h | 7 ++++--- sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h index 2cc8f32b1d01..85df317d30cc 100644 --- a/sys/fs/pseudofs/pseudofs_internal.h +++ b/sys/fs/pseudofs/pseudofs_internal.h @@ -156,9 +156,10 @@ pn_vis(PFS_VIS_ARGS) { PFS_TRACE(("%s", pn->pn_name)); - KASSERT(pn->pn_vis != NULL, ("%s(): no callback", __func__)); - KASSERT(p != NULL, ("%s(): no process", __func__)); - PROC_LOCK_ASSERT(p, MA_OWNED); + if (pn->pn_vis == NULL) + return (1); + if (p != NULL) + PROC_LOCK_ASSERT(p, MA_OWNED); pfs_assert_not_owned(pn); return ((pn->pn_vis)(PFS_VIS_ARGNAMES)); } diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index f4e27b469213..96c59d7c023d 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -119,7 +119,7 @@ pfs_visible(struct thread *td, struct pfs_node *pn, pid_t pid, if (p) *p = NULL; if (pid == NO_PID) - PFS_RETURN (1); + PFS_RETURN (pn_vis(td, NULL, pn)); proc = pfind(pid); if (proc == NULL) PFS_RETURN (0); @@ -826,7 +826,7 @@ pfs_iterate(struct thread *td, struct proc *proc, struct pfs_node *pd, } else if (proc != NULL) { visible = pfs_visible_proc(td, *pn, proc); } else { - visible = 1; + visible = pn_vis(td, NULL, *pn); } if (!visible) goto again; From nobody Sun Apr 2 08:24: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 4Pq6Wf3GMWz43FLm; Sun, 2 Apr 2023 08:24: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 4Pq6Wf2RgTz47mJ; Sun, 2 Apr 2023 08:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAINMYwo7XCVtCRm7lrpOZdlD+/XFJ51v1DvEvVylkg=; b=Unlrb0LZ+KkbJg614aqgwY9Q9T7dwcEZg3yRcluQs369ftwcm2GK6cx9OsWQSfi/fNDWAh eOnXiCTySzhSvmFfBE356liRZ3xMqdcq0OzigjijOAxgeoUxr4RRkUwhVqdINyw1REH/zx RbiGsXQ8aAcS4H1nVpT3wyCMYq938fe/tzAzLAGaRWpAs4c4s/gGrpePqmLXPSngXYMwCK KSTCzlIfp2apovCNongpehwxsSpJFA+r+tAg7mS7NWq9XD6ZS+84LRKQlCVDITw5+ZdItW bq1ZxJazBJ9U6tDB1OTZW+Lmz6g2eqUWD+dyiQoGzESLhNJvzE5fHKO9Co8xAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAINMYwo7XCVtCRm7lrpOZdlD+/XFJ51v1DvEvVylkg=; b=EN3ICXy0Hm+zuPxI4P+zhQG+SR4fsXr72Tuz0RkXzi18EzNLBh4TOuvsWYzOW9TH2WhxGr m3zTezjRYrnVjJbP/qLKjyrnzCDBQf9Lv41jAGxaUmXCEJcprXKtWZWOIjrdJ0nmX5ibHf pemglBII2/FJ5b6Kf+2y2YrjUb0/jdqDDid8QhHpjw+SUyxnAH4MVa38hj0zm7oLthA41E YfqQf6B3j4EL5yH2c4wkE/GlxHhLXWIbWdsUgj1cMgwkKVXrb415VjvYQxXhwGoAwj8Vb3 c8PU04Tsgf4//Qgh9cWjNeZNdZQk18Z9uIb6Sh64cUNaI20WiT6jlQttHsoufQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680423870; a=rsa-sha256; cv=none; b=u7AH71xJPqXxSLOJQko2ec6maxSjAtsJVQP/ZDnSWB8uTnMxXr5suy8u/qhTr7bvnrr+TK FJ+qLXnyC9NIPH5b6YqKv553nTUHYfxlnLdDL2dMm5olwRldFqantSLMP1YVjN4SrWEUus PSNMB86Q+gK5quX9uRhM6jITzHcRh4vnMTECjLImu1nikm8SHMAHRhUc+gSSFuzPOwqaUp JhJW0k9rgdQxXJzmaaHnfT23Nc1H9VpEy3OP4JROr4JSA3d51Jb2OVw3PRiWePyeO0AxSe URTaLCi6vuKsgQazy32nh32ailuwZt70z10s6g9Ije4ZIrcB5S/o3FQ20JaiVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pq6Wf1Y1pz18Z0; Sun, 2 Apr 2023 08:24: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 3328OUhM076367; Sun, 2 Apr 2023 08:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3328OU1h076366; Sun, 2 Apr 2023 08:24:30 GMT (envelope-from git) Date: Sun, 2 Apr 2023 08:24:30 GMT Message-Id: <202304020824.3328OU1h076366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a32ed5ec05d9 - main - pseudofs: Simplify pfs_visible_proc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a32ed5ec05d9bc01b8e70b45ff510d2f972a0877 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a32ed5ec05d9bc01b8e70b45ff510d2f972a0877 commit a32ed5ec05d9bc01b8e70b45ff510d2f972a0877 Author: Dmitry Chagin AuthorDate: 2023-04-02 08:24:10 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-02 08:24:10 +0000 pseudofs: Simplify pfs_visible_proc Reviewed by: des Differential revision: https://reviews.freebsd.org/D39383 MFC after: 1 month --- sys/fs/pseudofs/pseudofs_vnops.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 96c59d7c023d..53e4c2b6b85c 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -90,21 +90,17 @@ pn_fileno(struct pfs_node *pn, pid_t pid) static int pfs_visible_proc(struct thread *td, struct pfs_node *pn, struct proc *proc) { - int visible; if (proc == NULL) return (0); PROC_LOCK_ASSERT(proc, MA_OWNED); - visible = ((proc->p_flag & P_WEXIT) == 0); - if (visible) - visible = (p_cansee(td, proc) == 0); - if (visible && pn->pn_vis != NULL) - visible = pn_vis(td, proc, pn); - if (!visible) + if ((proc->p_flag & P_WEXIT) != 0) return (0); - return (1); + if (p_cansee(td, proc) != 0) + return (0); + return (pn_vis(td, proc, pn)); } static int From nobody Sun Apr 2 09:42: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 4Pq8Fr4wF6z43LM5; Sun, 2 Apr 2023 09:42:40 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_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 4Pq8Fq4Mzzz4J2j; Sun, 2 Apr 2023 09:42:39 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of dchagin@heemeyer.club has no SPF policy when checking 195.93.173.158) smtp.mailfrom=dchagin@heemeyer.club; dmarc=none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 3329gUiS082433; Sun, 2 Apr 2023 12:42:30 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 3329gUqt082431; Sun, 2 Apr 2023 12:42:30 +0300 (MSK) (envelope-from dchagin) Date: Sun, 2 Apr 2023 12:42:30 +0300 From: Dmitry Chagin To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f3f3e3c44d3b - main - fd: add close_range(..., CLOSE_RANGE_CLOEXEC) Message-ID: References: <202203031730.223HUr6e052966@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: <202203031730.223HUr6e052966@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4Pq8Fq4Mzzz4J2j X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 03, 2022 at 05:30:53PM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f3f3e3c44d3b1776653bbf19eab17ce006a815d8 > > commit f3f3e3c44d3b1776653bbf19eab17ce006a815d8 > Author: Mateusz Guzik > AuthorDate: 2022-03-03 12:45:11 +0000 > Commit: Mateusz Guzik > CommitDate: 2022-03-03 17:21:58 +0000 > > fd: add close_range(..., CLOSE_RANGE_CLOEXEC) > > For compatibility with Linux. > 10x, are we have any reason not to implement CLOSE_RANGE_UNSHARE? From nobody Sun Apr 2 10:19: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 4Pq93p6D7Bz43Nrx; Sun, 2 Apr 2023 10:19: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 4Pq93p5j19z4Lql; Sun, 2 Apr 2023 10:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680430742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lm/P+A6RioiByUegEL8zT+58RY5FR5r0TeVFZtmRODo=; b=wHCyydxaUe5dVBtwgvSdo+o//Rd32iVzEgq/mfo8y3vm9DrKWo6PWnWqTY7HlwWXy8nIty 9KuytjULS17cqH/wbveUE35G5cTWRJTrI10C6GQCvGC8zZm0/U4kE7EoHzsvIOmNcd2MDT dvfE3wc/BPVRsxKdpz7TafxaN2R2iXRoe0yZShlrDfVP/Gf+yyiP0Gl27DQstOhf7kvwV4 FADJZ9EO/ZckO754amEFkWjX2DKlMjVwuDvGpUIXahvCz3zWRiajMlgFSGxlvc4lvnxHjg QFhmMGhw1WY09zk/NRQXYE0AGoQSxBWq4nqJKm1Ybo1kia1asX/TM78yw0jYBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680430742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lm/P+A6RioiByUegEL8zT+58RY5FR5r0TeVFZtmRODo=; b=COG02f6iIXoGCLvrgKsOQ2fKsDUBbpXJvzWQDY76sZaamPyqu2I3Qx3fKxYrrsVDr79b5Z MFethxCTUTKyNq9wn1xYrSTNqOFmllv8dWb1ngiH7z1Y59bjatlj3p2OuAvAdJCVAfevpp oTMPDc1gTUdyhEmtppiu0V4YThGyoRePY904CJf/YwN1L+eo0ohqdVZhak2H4dvoLohLIw s/rrJJmKkTii0C8Gaz7gwI3cqeaVWoQ0yO9X9p7ntdEJlFPQMizjT+eKgc9Hi1M6t1DYSZ bwZIMyg5hsEDj4DI8KTky0sJxCJz36pXQR4ioQnBgLV5PQrdz6AUEdAaopVUkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680430742; a=rsa-sha256; cv=none; b=SURgO7gpzrUtwPCg1IPmeZgQcx8wO12p3o7FkbpWUj2atwIKBvGUDkAdYr31sj0SFLM9Km 75N4YQbd1kenucGWotm7RYWhVa2EYe7wjJVgfb8dFp4iXGsYrtukewpaHMiywHo9NisrOX VVTApq8fFdLhFBDSekjyRp7+wJof4E45/ZYfdOKxCUgldL2opjkWcnfk6ObYwdu6UnWgfD AZFEU/onUSn7RNGUyNI2AUSma/Iv/qXZ3XC1J8Rl2wlRRMteTy0ymfLq6L6OGazZ2Iy/rE AzAUEYnPbdFyXHP/wru5iIlACKbtEKwap8iE8KQxgY7qLfjgtqMP+AxBrpKHHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pq93p4lW7z1CV1; Sun, 2 Apr 2023 10:19: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 332AJ2q2058077; Sun, 2 Apr 2023 10:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332AJ2Y0058076; Sun, 2 Apr 2023 10:19:02 GMT (envelope-from git) Date: Sun, 2 Apr 2023 10:19:02 GMT Message-Id: <202304021019.332AJ2Y0058076@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: 388420e61318 - main - tests: fix utils import in netlink 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: 388420e61318280931eec684bcd0c2917e9cb9ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=388420e61318280931eec684bcd0c2917e9cb9ba commit 388420e61318280931eec684bcd0c2917e9cb9ba Author: Alexander V. Chernikov AuthorDate: 2023-04-02 10:17:37 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 10:17:37 +0000 tests: fix utils import in netlink tests MFC after: 2 weeks --- tests/atf_python/sys/netlink/attrs.py | 4 ++-- tests/atf_python/sys/netlink/utils.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/atf_python/sys/netlink/attrs.py b/tests/atf_python/sys/netlink/attrs.py index 142341b1b729..f6fe9ee43c98 100644 --- a/tests/atf_python/sys/netlink/attrs.py +++ b/tests/atf_python/sys/netlink/attrs.py @@ -2,8 +2,8 @@ import socket import struct from enum import Enum -from atf_python.sys.net.netlink.utils import align4 -from atf_python.sys.net.netlink.utils import enum_or_int +from atf_python.sys.netlink.utils import align4 +from atf_python.sys.netlink.utils import enum_or_int class NlAttr(object): diff --git a/tests/atf_python/sys/netlink/utils.py b/tests/atf_python/sys/netlink/utils.py index 86a910ce6590..7a41791b5318 100644 --- a/tests/atf_python/sys/netlink/utils.py +++ b/tests/atf_python/sys/netlink/utils.py @@ -5,8 +5,6 @@ from typing import Dict from typing import List from typing import NamedTuple -from atf_python.sys.netlink.attrs import NlAttr - class NlConst: AF_NETLINK = 38 From nobody Sun Apr 2 12:27: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 4PqCw63B22z43Y1p; Sun, 2 Apr 2023 12:27:34 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (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 4PqCw616Ztz3JGm; Sun, 2 Apr 2023 12:27:34 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22b.google.com with SMTP id f14so6357787oiw.10; Sun, 02 Apr 2023 05:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680438453; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=UTKG5JDExbYLMoX0rRhT28U43Lg06TtoxswCXHuEdIY=; b=Ie5+EpV72y+JzAssYVKNxI5xuAPmNZ5C8cexmUMPiKVOqBL4JxXD1do4HCWl2i/biO BRjXVAKJ5TUjByZm0EkcILYbYQ9Ix7M56uVS4S0MRBLVPifWorQjqN7w4RTWtXRiY1gG VDRWfGLub0u24o2N24F9teH1Ojx7XN6hMkSWi9ECzKAwia4f33xGrW5N+qtwVhsmaalO 62fucTdM+uTuLQAHoTWOi1lciCCybcunATrLSy5Foy4cJNAwDMhMaVmOueB4OAlORnz6 Hej1M1TR0sc8Y22cViZE/akiYB82R5koIc9VLP8dK2rs0sfmvchQYhI9SusEd37e5M+0 JWKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680438453; 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=UTKG5JDExbYLMoX0rRhT28U43Lg06TtoxswCXHuEdIY=; b=VoAcvCm1kpXKP+D+IZPuHSRq9jgLdrFsp4ghBtUpj4sFjjtMPYZIf0acOhGp2Sz4BT 9JM0Pq8uV7ZiA5hk1npBdJ61lZ74Oi1Ssfni1kcXaBEQbK3kyI1KKyjFkC/749elYuTl KHCNFBbABGPDB/Nph4l+8g7muxhRjy/irm5wWlA2ctqEYh0+G7PpbyXYQes49IFQI0oK CaEjakjjS7Cyc8i+7As9i2zhjzkZJHEnRsVbwDoSDIIo1wmIBdT+SzPgNFUe0T6QPIWO M/TTheKJDDM3JNQw0dEgzgHvXiPfKPGcfPZPbTXgIQhb5iVLJ4tNMNIuzCq7anvW2TyZ tY3Q== X-Gm-Message-State: AO0yUKVx73SBP+B1mrnQhtOEyTkqNpAdDsCzJlwlvv9gNkglKHgRIvAT +YgsYEjbGUyQoBj3GbidQJX1WnyJQtltHCjFPcglnpVL X-Google-Smtp-Source: AK7set9+YMmn6ZCUjtXW9R7Mshovqyb7b7EhaFbDnno8GBy1L4esGB4n8iesuiQ82qi6wxz4zQOvoAUk1DN9bt6ZG4w= X-Received: by 2002:aca:916:0:b0:386:d8a5:d80b with SMTP id 22-20020aca0916000000b00386d8a5d80bmr8430875oij.4.1680438452926; Sun, 02 Apr 2023 05:27:32 -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:115:0:b0:49c:b071:b1e3 with HTTP; Sun, 2 Apr 2023 05:27:32 -0700 (PDT) In-Reply-To: References: <202203031730.223HUr6e052966@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 2 Apr 2023 14:27:32 +0200 Message-ID: Subject: Re: git: f3f3e3c44d3b - main - fd: add close_range(..., CLOSE_RANGE_CLOEXEC) To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PqCw616Ztz3JGm 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 are there real users out there? it should probably get added for linux compat, but exposing it for native binaries is rather weird. anyhow fell free to patch :] On 4/2/23, Dmitry Chagin wrote: > On Thu, Mar 03, 2022 at 05:30:53PM +0000, Mateusz Guzik wrote: >> The branch main has been updated by mjg: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=f3f3e3c44d3b1776653bbf19eab17ce006a815d8 >> >> commit f3f3e3c44d3b1776653bbf19eab17ce006a815d8 >> Author: Mateusz Guzik >> AuthorDate: 2022-03-03 12:45:11 +0000 >> Commit: Mateusz Guzik >> CommitDate: 2022-03-03 17:21:58 +0000 >> >> fd: add close_range(..., CLOSE_RANGE_CLOEXEC) >> >> For compatibility with Linux. >> > > 10x, are we have any reason not to implement CLOSE_RANGE_UNSHARE? > > -- Mateusz Guzik From nobody Sun Apr 2 12:42: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 4PqDDw4Yv8z43ZMn; Sun, 2 Apr 2023 12:42: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 4PqDDw482kz3L5t; Sun, 2 Apr 2023 12:42:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680439328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvjorkQaJPi6cw1+1qTsyMxhk3zIvKHardI7bJaPa4w=; b=nkUKCF8MJWpuqL6dPvaVA5lcpa6w29RajbVYvecyCdroYyoLCNdYa5kM4o6CPTnWd934G2 PA9N7FOz4u9BBGBuowIklj0eN1Js4qDYdbJdCtO646U+8IbKYdpiDubwW8yAqAf5z5rVg3 qtvUmsNMvLAmQB2YJqLu1HLuBE3LIAvQTl8CBFo3ArTNepBo+/HwtSVK5vwYnRw2JwbbMJ ehqBh2OiAaeCRBw29VGBIb1R5mXAsopkq7o0xoYeL0BKL72ad/jJEmbjvBzrhFlyb3Wkks ITYXI1SWb44XMw5QA40Jtvzz7tzBefdAAuVhVV8U737Lpm7744JjZb735jf4Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680439328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvjorkQaJPi6cw1+1qTsyMxhk3zIvKHardI7bJaPa4w=; b=gZpX9aURpWG/HXi7OwVWRXPAFJzeboGBnOWdUc/GYIeyX2pk1LzR2pnM94TE9zmGfkF8NT W8SeY9L9TYk/ZG2r11LwT8sQluLk1nNE/S/WVcs5SvfReiJ2Oj+j7Vid7607M/F5oX/lFv eSW25Mupo5rFUQV/9nbQskiX6unmE+haPYPFRAsOfOVmkVzp90fQRporN6iK6/PoGVk7WR bUPFI0jSXJIFJCylrdYyzRDVjlPrgQ+OkNhmjWhF2qC55OYBXFDQTpZnV8TlWtQY7H95p3 fcomo34AtX6fJkI1qKiuyefP1XTmSQc3HvsBs7/M6/eJoj3ACWEEQhnNiPe0wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680439328; a=rsa-sha256; cv=none; b=g/VZLXz4M+3+HUHr3BQ4IQ8mN3lR67oMvBAdTYBRr4ZXrx/wBa2MYjZ9ZwLm85efyLqHhq 71tNhaLCDtP2nxyE2Kijb0FKYuj2byIcR6ncIZhTCexa7pm/DgmvA4ZLOiJoZu/yml0KVa xqUHjaTzknsl83bMU5oy43Ih89fEjRPsXe5tAqUXSTf9AzN4Dik9wD2Bv96K9as2KMCviX LYQzceZ5gZ0pljS+i4QeOpco0lzDvqHZt2nTijZurdo8JT4t5Ng6RKuMthO1U1tKneS/CQ 400Dj6GmfA0kORRhvbo66hEY6ajMmupwmoibCrUgIIT1kg6M6FB3L8TMhD+P5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqDDw3CHHzHbb; Sun, 2 Apr 2023 12:42:08 +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 332Cg8C0002809; Sun, 2 Apr 2023 12:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332Cg8qv002808; Sun, 2 Apr 2023 12:42:08 GMT (envelope-from git) Date: Sun, 2 Apr 2023 12:42:08 GMT Message-Id: <202304021242.332Cg8qv002808@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: 27cbc1a7fe74 - main - netlink: fix snl_read_reply_multi(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 27cbc1a7fe742b53935cca79e741738dfd7b59df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=27cbc1a7fe742b53935cca79e741738dfd7b59df commit 27cbc1a7fe742b53935cca79e741738dfd7b59df Author: Alexander V. Chernikov AuthorDate: 2023-04-02 12:41:04 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 12:41:53 +0000 netlink: fix snl_read_reply_multi(). CID: 1506956 MFC after: 2 weeks --- sys/netlink/netlink_snl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 399e1d6781c8..88d7c3a1fc22 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -667,7 +667,7 @@ snl_read_reply_multi(struct snl_state *ss, uint32_t nlmsg_seq, struct snl_errmsg } else if (hdr->nlmsg_type == NLMSG_ERROR) { if (!snl_parse_errmsg(ss, hdr, e)) e->error = EINVAL; - } if (hdr->nlmsg_type == NLMSG_DONE) { + } else if (hdr->nlmsg_type == NLMSG_DONE) { snl_parse_nlmsg(ss, hdr, &snl_donemsg_parser, e); } else return (hdr); From nobody Sun Apr 2 12:45: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 4PqDJm0x5rz43ZYx; Sun, 2 Apr 2023 12:45: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 4PqDJm0QSLz3LV0; Sun, 2 Apr 2023 12:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680439528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALTH7Cdt5nBQUTmhtaknLJBs64nNHLththsvtBH0DRQ=; b=cjRF311xk4LeBMmIwUXXAVELRHDSVbC74Qgw6haULKAxTXXcYoqdGbLVvuOslNQkHYd43J OZcF3YAsGwfbNyiSJonQk1nohudmKQYOkx7vdZjJ1Sx7LusPypdZABijvH++zPIFwOEolE slcQExJytsrwLrTi7PpsTBWW+3SULopJop4y2LT9584U2cV8AmBzKzyv7NFE9W+bBw7UHq R+QT0Ip27kBJp2dw+toBTcf3DwEKCKJlvV/HtQce/mljI1IiiH6YPK19DGz9/zFOoqYHNe oDy5oI3qLbCRxP+EfCBGycIfXwYMIYVA5gjw9T8iSeue48GY6a+qYcprj/r9RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680439528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALTH7Cdt5nBQUTmhtaknLJBs64nNHLththsvtBH0DRQ=; b=GZm6IECGNy0vU0G+b/ZM1owkIqZd6idn03ZTP6NitPg05Ka0gnTYIRd12A9I9NmtWGw7Qu 0ORQj57NLP/gV12KuERRuifi5yjKpag41zh4JhGX7EKr1GJt1OWlhHzGCOzDq51BqklVMH Vm0ty84P+tjhjUudxb8oLG8+EYSXvqcF7GUCPkR7f8l9a0HT6Ak1oCWnyofTtt+jKvkedc 9GGMrA8Ngp8eYLQUMJ/NKpcjL3TWcFtOq3YT4TahN11HOcXo8dIn9VA69rGzLeKtrz9V9Z XB7POQa8eit1JO2xdJ946j88QMv8M03HntXwS1hQ32aEOY7bn7+MAfXwrKoSoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680439528; a=rsa-sha256; cv=none; b=Qch3qoh2gB8K6jFoTVnMAia4ozcz7EQ4l9iSZN776vPT3LLDjKDHIotSoBXHKnRysZM77p PQ+TSymI28nVWM/r97lF5AyGT6aQ634a+Pq04jdB1Zycbu0F5SwXh/reXWNZjKLXC1eJnw Hh/eAc1JdZqWcPP3sbTMNCTqoaLCsEDSCJtwDHXKWRSKz4pomlPqalFKlv9s/aeG1YVfJj iTRRLvvPunCdFyJ2weEueW0ZqqSKvL2kXuff8iXPfVgC2rKOFEvAm9VA1p1mlNsdZbEI+H nVI6GKiDz8lkwrUTI7MGDKX697D39dgjANrtpg4jNYIPwe+dQOr/PeSEtAjNvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqDJl6byHzHf1; Sun, 2 Apr 2023 12:45: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 332CjRkH003325; Sun, 2 Apr 2023 12:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332CjRAk003324; Sun, 2 Apr 2023 12:45:27 GMT (envelope-from git) Date: Sun, 2 Apr 2023 12:45:27 GMT Message-Id: <202304021245.332CjRAk003324@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: 4aeb939ecf8b - main - netlink: fix NULL check in the default route snl(3) parser. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 4aeb939ecf8b2b6913ae51d828416743bad812ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=4aeb939ecf8b2b6913ae51d828416743bad812ab commit 4aeb939ecf8b2b6913ae51d828416743bad812ab Author: Alexander V. Chernikov AuthorDate: 2023-04-02 12:44:20 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 12:44:20 +0000 netlink: fix NULL check in the default route snl(3) parser. CID: 1506959 MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index ba9ead461c80..1d6680cb5597 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -82,6 +82,8 @@ nlattr_get_multipath(struct snl_state *ss, struct nlattr *nla, const void *arg _ size_t sz = (max_nhops + 2) * sizeof(struct rta_mpath_nh); struct rta_mpath *mp = snl_allocz(ss, sz); + if (mp == NULL) + return (false); mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(void *)(nla + 1); data_len > 0; ) { From nobody Sun Apr 2 13:31: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 4PqFL43vvbz43dGW; Sun, 2 Apr 2023 13:31:40 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_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 4PqFL40Wg4z3Q29; Sun, 2 Apr 2023 13:31:39 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 332DVbw1083216; Sun, 2 Apr 2023 16:31:37 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 332DVbOh083215; Sun, 2 Apr 2023 16:31:37 +0300 (MSK) (envelope-from dchagin) Date: Sun, 2 Apr 2023 16:31:37 +0300 From: Dmitry Chagin To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f3f3e3c44d3b - main - fd: add close_range(..., CLOSE_RANGE_CLOEXEC) Message-ID: References: <202203031730.223HUr6e052966@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-Rspamd-Queue-Id: 4PqFL40Wg4z3Q29 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, Apr 02, 2023 at 02:27:32PM +0200, Mateusz Guzik wrote: > are there real users out there? > > it should probably get added for linux compat, but exposing it for > native binaries is rather weird. > > anyhow fell free to patch :] > Thanks, for linux I already have a patch :) so could commit it w/o modifiyng the kernel > > > On 4/2/23, Dmitry Chagin wrote: > > On Thu, Mar 03, 2022 at 05:30:53PM +0000, Mateusz Guzik wrote: > >> The branch main has been updated by mjg: > >> > >> URL: > >> https://cgit.FreeBSD.org/src/commit/?id=f3f3e3c44d3b1776653bbf19eab17ce006a815d8 > >> > >> commit f3f3e3c44d3b1776653bbf19eab17ce006a815d8 > >> Author: Mateusz Guzik > >> AuthorDate: 2022-03-03 12:45:11 +0000 > >> Commit: Mateusz Guzik > >> CommitDate: 2022-03-03 17:21:58 +0000 > >> > >> fd: add close_range(..., CLOSE_RANGE_CLOEXEC) > >> > >> For compatibility with Linux. > >> > > > > 10x, are we have any reason not to implement CLOSE_RANGE_UNSHARE? > > > > > > > -- > Mateusz Guzik From nobody Sun Apr 2 13:50: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 4PqFm545kvz43fd3; Sun, 2 Apr 2023 13:50: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 4PqFm53J32z3hVL; Sun, 2 Apr 2023 13:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BaJoXrQN5e9PEiDU5TxGv0n2rDVqKNu3akch+DFlFo0=; b=H3anQkFB9ZrfGIKMVHkdr08snd3R1vuMatASKDTFxmm9w8lLk/yAHxcEw67oqFhbJd0owC jLXLfaVcb/MTWEpZXln1HchDC9pP2HlsqB2Js95kTapqB2arVrQSmvInGViO6qrJf6oHDi e+GSJ1w7L2Iz9Yc4qe/SSN8peB19nCJ9UePgmen5A6UOiQ0sCU5+6FIjNO4Kc7/CZPG89U CzuoiyRxiqLKLQjWhai6+wZhBYn3v5CH/bD6hCPkL0l1SavFNv+A2Rh6hD2fvlr7pX3ya5 zjjNg9Zby1GBBd/JzwopEH0lKzLfe3mFHkeiEtwIacuf6yKljWTH4wFJ/Tl8Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BaJoXrQN5e9PEiDU5TxGv0n2rDVqKNu3akch+DFlFo0=; b=RiG6tt72Rxl9Ui/hbBSvZb+nPh7Xr+c/PTlFhep+XytsK30A5zlkfYhhSXUN2KNMAXYk2E NAkfj8rrsF3Q4djb6Ik1ELUv+C8LE8/z0AJoqPbfjlUbVZBOxqhMY4qPn+kJevsgLi5pKr LX9JqzAGPaVP5R7mF1kxHwLnFKVAKn+RBUWqe4IVAiTqj0GRv34x0+7RSp8b2DoV6jGeJh D4JjLEeqUbHW0aKPCaJfNWMkUalmBN6IouvNkd5WZeybBg9YAFPvw78ogCbgKItGJn/h9G HtVOI3nnonz8Jt4sECGnUOtW9l2YjV+0IUX3Ftvw0sbwwzwfcwBQF5L+9cY3nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680443445; a=rsa-sha256; cv=none; b=EqdSX+PCE8vEs33omRqcSTufnBZ2jDorvPUQmYmVUBuvlPWaazt/e8Mq5AsDfN4Ubf4wTY wAYGRl2RlMY6cw8gHUYj2mQakA0sPJeEOM30sdH0I/+oxwm80q57WIPcnS7ojwumUZCobB lrna2kG2zr0x0RAWno81QyEhzRcbZX8haJLBis/K0AdD91HOx3KAgoA8m0zcvz6OozCMmJ vYPo71p9X+tiUoX9m1ixnEbRnFaMjUKyfxrXeNyrt04ddOxxOUqcE5XgZh67oHlk9VzvNK ad35FaaKSn899CCOUMtIrc9OyJ4SXCxfw9SSDsxQ8c18DlaFNzkeicQhWxzF8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqFm52MjkzJyt; Sun, 2 Apr 2023 13:50: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 332Dojwj012473; Sun, 2 Apr 2023 13:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332Dojpt012472; Sun, 2 Apr 2023 13:50:45 GMT (envelope-from git) Date: Sun, 2 Apr 2023 13:50:45 GMT Message-Id: <202304021350.332Dojpt012472@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: c35a43b261f8 - main - netlink: allow exact-match route lookups via RTM_GETROUTE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c35a43b261f807fd85b8cc30306112eee9dd62ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c35a43b261f807fd85b8cc30306112eee9dd62ce commit c35a43b261f807fd85b8cc30306112eee9dd62ce Author: Alexander V. Chernikov AuthorDate: 2023-04-02 13:47:10 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 13:47:10 +0000 netlink: allow exact-match route lookups via RTM_GETROUTE. Use already-existing RTM_F_PREFIX rtm_flag to indicate that the request assumes exact-prefix lookup instead of the longest-prefix-match. MFC after: 2 weeks --- sys/net/route/route_ctl.c | 14 ++++++++++++++ sys/net/route/route_ctl.h | 6 ++---- sys/netlink/route/rt.c | 13 ++++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 755765869e84..db3728c3cd88 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -96,6 +96,8 @@ static int delete_route(struct rib_head *rnh, struct rtentry *rt, static int rt_delete_conditional(struct rib_head *rnh, struct rtentry *rt, int prio, rib_filter_f_t *cb, void *cbdata, struct rib_cmd_info *rc); +static bool fill_pxmask_family(int family, int plen, struct sockaddr *_dst, + struct sockaddr **pmask); static int get_prio_from_info(const struct rt_addrinfo *info); static int nhop_get_prio(const struct nhop_object *nh); @@ -391,6 +393,18 @@ lookup_prefix(struct rib_head *rnh, const struct rt_addrinfo *info, return (rt); } +const struct rtentry * +rib_lookup_prefix_plen(struct rib_head *rnh, struct sockaddr *dst, int plen, + struct route_nhop_data *rnd) +{ + union sockaddr_union mask_storage; + struct sockaddr *netmask = &mask_storage.sa; + + if (fill_pxmask_family(dst->sa_family, plen, dst, &netmask)) + return (lookup_prefix_bysa(rnh, dst, netmask, rnd)); + return (NULL); +} + static bool fill_pxmask_family(int family, int plen, struct sockaddr *_dst, struct sockaddr **pmask) diff --git a/sys/net/route/route_ctl.h b/sys/net/route/route_ctl.h index b65b64fcdaa0..7a4ed804feb7 100644 --- a/sys/net/route/route_ctl.h +++ b/sys/net/route/route_ctl.h @@ -123,11 +123,9 @@ struct nhop_object; struct nhgrp_object; struct ucred; -const struct rtentry *rib_lookup_prefix(uint32_t fibnum, int family, - const struct sockaddr *dst, const struct sockaddr *netmask, +const struct rtentry * +rib_lookup_prefix_plen(struct rib_head *rnh, struct sockaddr *dst, int plen, struct route_nhop_data *rnd); -const struct rtentry *rib_lookup_lpm(uint32_t fibnum, int family, - const struct sockaddr *dst, struct route_nhop_data *rnd); /* rtentry accessors */ bool rt_is_host(const struct rtentry *rt); diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 6d76390016dd..288ff111a038 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -461,6 +461,7 @@ struct nl_parsed_route { uint8_t rtm_dst_len; uint8_t rtm_protocol; uint8_t rtm_type; + uint32_t rtm_flags; }; #define _IN(_field) offsetof(struct rtmsg, _field) @@ -488,6 +489,7 @@ static const struct nlfield_parser nlf_p_rtmsg[] = { { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_flags), .off_out = _OUT(rtm_flags), .cb = nlf_get_u32 }, }; #undef _IN #undef _OUT @@ -581,7 +583,8 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, { RIB_RLOCK_TRACKER; struct rib_head *rnh; - struct rtentry *rt; + const struct rtentry *rt; + struct route_nhop_data rnd; uint32_t fibnum = attrs->rta_table; sa_family_t family = attrs->rtm_family; @@ -596,13 +599,17 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, RIB_RLOCK(rnh); - rt = (struct rtentry *)rnh->rnh_matchaddr(attrs->rta_dst, &rnh->head); + struct sockaddr *dst = attrs->rta_dst; + + if (attrs->rtm_flags & RTM_F_PREFIX) + rt = rib_lookup_prefix_plen(rnh, dst, attrs->rtm_dst_len, &rnd); + else + rt = (const struct rtentry *)rnh->rnh_matchaddr(dst, &rnh->head); if (rt == NULL) { RIB_RUNLOCK(rnh); return (ESRCH); } - struct route_nhop_data rnd; rt_get_rnd(rt, &rnd); rnd.rnd_nhop = nhop_select_func(rnd.rnd_nhop, 0); From nobody Sun Apr 2 13:50: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 4PqFm647Thz43g0f; Sun, 2 Apr 2023 13:50: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 4PqFm63dMyz3hKT; Sun, 2 Apr 2023 13:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuP5fve2Fs6EYmMZc3uPRdy9M01eyf0Gj7IlzOO9EHw=; b=pbg4Sv751PeBahHG2G4d8kGpJMik6zqpK6lupj2tf6vwy9/z+hodH/6paQPx57qoT+Z7xa tW6D118QGWb7REzGz3INpgDt6WUGknKS3nqj9hPGnoMjRHnFvkkH4XVK7Yh1XToKg0WszT dYS5mI6osahbPLBWj7lFPiCJvh0e5+po6174rs6bM4s5U4d9D7n18szzRvvEOfjA25P6eT PX8xlezbtVXg8ri5rDKy8PdyKOu0ouw2YBStZ41bK6Rc/dSArFLDBi59JFE0s+MguDUH60 7J/klgP+eBdeZh938yqrKrrR6204kzbpIwftjnefzfH5GsvAlTiO2mucESDOJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuP5fve2Fs6EYmMZc3uPRdy9M01eyf0Gj7IlzOO9EHw=; b=sxciWzM2VLKGifbDyQ4KaadTBo6tnwU5xhe8r7wYjM6nxaByrVi5nsm2JkAzkGX7mjUg+q d6UTerCZ+at9HjfCLvzYykTmi23H8aZv9iJx0DUUUGonL8jeI6nk6t6/WBXKTs0gAofoaw NhDtEC44Vd/LRRGCx6/xOv2oZKoj7j9Ex9Rhb5dAhvCTGxkBplMLvjQ95L+706VqWTW27e yh8/0vXgtOBYWTWTGP/rMgMviJ+5W0IF61z9XxYJORwu1sFYNMeIEqXf15eqm0aeeJEVdd BZvwO5sSoHvInJEe5X7VbhBTezK2RWvRZu2so88zCt0ubvjzWCzEvMXUM3KDPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680443446; a=rsa-sha256; cv=none; b=rS+/f0OzGTzrMAzayWkNSxkkSIQ4yZIjLGWqFD/jkXDBnaNpp690JKzJW0j0EsWzzCyOMC slhF4LsXK+Szgiw0AD+/il6f6CNPi0OijWdrC1yjj0l6W5krwuCJx/eevfq+DEs3bAaesu JUyxsE4oyReYVECKitL40f5GL9IJ4zH7bI4EsA1LmGy5rdwMFlYTqjF4kDE8LuFj2B0A+7 fVkuDh88TsJBE9ZGT1LA75SKSjVc+qyKkKNy8jWd5qnb5F0eqZROjcYktYF9S7eSdaiAHw MW6tJG7PwzxdNC08+fqhW4K0a5QPjglE/hDcuSbQAntlhdWg2nPelHufmRJ3KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqFm62ZzmzK5B; Sun, 2 Apr 2023 13:50: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 332DokPX012492; Sun, 2 Apr 2023 13:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332DokN7012491; Sun, 2 Apr 2023 13:50:46 GMT (envelope-from git) Date: Sun, 2 Apr 2023 13:50:46 GMT Message-Id: <202304021350.332DokN7012491@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: 68f9e13563f6 - main - route: add support for exact-prefix-match via netlink. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68f9e13563f677169728f55f5523142530d26c11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=68f9e13563f677169728f55f5523142530d26c11 commit 68f9e13563f677169728f55f5523142530d26c11 Author: Alexander V. Chernikov AuthorDate: 2023-04-02 13:50:05 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 13:50:05 +0000 route: add support for exact-prefix-match via netlink. --- sbin/route/route_netlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 66b1920a58db..ce7da288496f 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -203,6 +203,10 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, rtm->rtm_type = rtm_type; rtm->rtm_dst_len = plen; + /* Request exact prefix match if mask is set */ + if ((cmd == RTSOCK_RTM_GET) && (mask != NULL)) + rtm->rtm_flags = RTM_F_PREFIX; + snl_add_msg_attr_ip(&nw, RTA_DST, dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); From nobody Sun Apr 2 14:11: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 4PqGCS3ccQz43h6q; Sun, 2 Apr 2023 14:11: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 4PqGCS3B4gz3k1T; Sun, 2 Apr 2023 14:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680444660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzkClbYVPX2ZfLVE7skGuY2bU7e58BO4/hNZaO6T888=; b=SzMBBQxjz+5zq7l4sVcVnRnJJLdvFgiRvCcp5awsT7hRQJ6h84jpNhZ1h5ixB+Majclnwr W95yagBan3HEqEYeTRnW9Ftc/sg0BcHQarkOo1wGd4Soq6Xq0ZYmo+H28hV3bqTr3XJImM u7qcZjf9jGZG7SXsUbPt8/8BFMajHXvKHTnuSVsIQJrNFVUUR8bW1QwjpdTq2B1Z38j8ti 0Buorzrb0oISUX/mSjGvOOMAGQC1LE2ReGzgHFvZi7QrgFpsvEOzj42oZYHBeIMymKyNfY K+OEZT26AqkdtoSZp8LJ9wsN/jfDctbWfN/3HW2P4JuGhRPteomPeGVvCByyYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680444660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzkClbYVPX2ZfLVE7skGuY2bU7e58BO4/hNZaO6T888=; b=CH7hePwIBMh9te0SOKwVuM9vT/osz8VRRErPJnccUlon2Q5NP/TdBcn4O3H56eK/s61wHo qjsEqkKPviPff3pavy2Bzp4oULBbwJFTtFbWXbAYuetID3/8f1GygrUFyevctrAsL3LsTR II9yZkxDPi+d8sMTn7ORA6PwkfSkaCVgcW5foA2cmdNCC/N6SH3wKnjW1myTgvvvsQseCw DZEvISf8NemutOKS7XoGi11G7ojCInabZosg8UpuXt6IsY+4Iqnfq7WjzHuc5N9jxKAwtR DVHIX/tzqtYUVKPYO0Bimk0dI9OX0UQVjzPlQbUorZpzpnhuMVWpnMSkTpSRNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680444660; a=rsa-sha256; cv=none; b=fD2iZGwgt8QQqLUFPr17EOdsbB7ZvFEZz5OF/tiAZzjoNSnKMQoSt77qrDXiDMLkgX3jkg BKaccu+uZSi5bIAZq/l/Gf8/LD417GP8vEFB9xnSYDiek3YRQOLl2usK7tyJpaWTRTFZEa ZtsmKOngGRJS0Y6ICRdIYKUJwv9NTras/Z8Mn66IJTnVoAmn0pTjBEJU4tiWff+R34mqlM JiAzyTo2O0Ag+VREniM9YsC0owM54haj6j1bN/s8QqmlzGBxsdFwHmLWjnCTgp+PfiVg27 V3AsJT4spaAsno9l4zKyviYpVGrKAzm9wZvanZmpPzwjZ6P+vetBt+BmdPEjfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqGCS2CPHzKNX; Sun, 2 Apr 2023 14:11: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 332EB0B8045239; Sun, 2 Apr 2023 14:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332EB0et045238; Sun, 2 Apr 2023 14:11:00 GMT (envelope-from git) Date: Sun, 2 Apr 2023 14:11:00 GMT Message-Id: <202304021411.332EB0et045238@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: 25b86f8559c2 - main - ping: fix failing test_pinger[_3_1_verbose_false] test. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 25b86f8559c2e7076daff56933217e95cd4398d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=25b86f8559c2e7076daff56933217e95cd4398d4 commit 25b86f8559c2e7076daff56933217e95cd4398d4 Author: Alexander V. Chernikov AuthorDate: 2023-04-02 14:10:16 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 14:10:16 +0000 ping: fix failing test_pinger[_3_1_verbose_false] test. --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 79cde1f4936c..26a69b62f8fb 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -1231,7 +1231,7 @@ ping: quoted data too short (28 bytes) from 192.0.2.2 PING 192.0.2.2 (192.0.2.2): 56 data bytes 92 bytes from 192.0.2.2: Destination Host Unreachable Vr HL TOS Len ID Flg off TTL Pro cks Src Dst - 4 5 00 0054 0001 0 0000 40 01 f6a4 192.0.2.1 192.0.2.2 + 4 5 00 0054 0001 0 0000 40 01 f6a4 192.0.2.1 192.0.2.2 --- 192.0.2.2 ping statistics --- From nobody Sun Apr 2 14:57: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 4PqHFC4vm0z43l2M; Sun, 2 Apr 2023 14:57: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 4PqHFC4P7tz3n5G; Sun, 2 Apr 2023 14:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680447455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gQs2N3BM3HTKXK/lHQ3K66xX8ymJy2xp0wh/X/NBMys=; b=wJePpwGS8ypnkwijZk5X/4cFQ+8o7Zz21K/hRYDFAtVmegUAA4JAEb4SVmwSMS2VCmHk2O RRhGVFrKFWjcH0mjz+3vc/4+tkPipFuuhtQb4AzfxQBILuzH2ot22R3maUy0f8oz5VEJrx fAj3H64e19Qw09UlFJ+NJvd1RpK5SOQUKWzukFN+UCUYyYQsin+J6xA1wtiQ00NbkaxEtZ Dr8uOzkjpyTSIg6G5d5FP2Zug9CqCyGpNh9LyhsAcKM+HoVSyZNNeOSVNqL5zPETrk4pLy jMi//GPNjrGBxINSUfkZtMEslzWtxlT5CVjsEZU79B10RuFuzbGZJWgMBHWyNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680447455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gQs2N3BM3HTKXK/lHQ3K66xX8ymJy2xp0wh/X/NBMys=; b=CXf32FuF49YrCzDZbGDm//ZZB/OskovIwZD6jQ+ua/hKitCSKB0bWGjj2+4pf54kWCC29o CEyp4W7qj7+3OrhHrfmHCqJd2gR+pFWYqwxCD/5qG9l9hf2wW/irU41Xo4Es82hfZ48Cgg cTliToDza4zBIN5nDv0pGnAV0kxdJsD63ICjlEif2GKHcJrD9hCxRrItx2zgH7FGhNcZLR ttun6QItpt1gPnFp13dDKIAVbhwFt6s7g2gkjBSAWAuN18YwC/QuoNV3rsJDiJLUQtqm3b SMZXISVmrfoLNiVcBLimFoReXmuPiyv7SDCmE9xqg6l6XZaCyuUc7xjlZQtGJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680447455; a=rsa-sha256; cv=none; b=uAu7mL3aT8gsIBAWfhjz5J9GronMuYVxq/LNB4h1rCOzVu6iqq/d70cXGzyZccG8ptwh5u wMaqSzggoyhHYgFXTi4d9hkuJO1aPpOmULYEnxbXf8jukZQZu0RRTjHHC0EwdLkdENY7Ve 4H7VEO5B+VRkaFWKQvExHT9kLEc7AoianDFNYQmXwFMbGCW/BTuN6WLjNxoTq422jgHrVk KpOOkaRYyEMPB0RnKqHtBPsYN4SVGgjp7BZv0rEEgoTjliEGzP7aUuLP5ubc5n3+CGndUT LDoH+MgEWfuX8chMxPyJ65bFIHXRcHAvtWZGnnn1RmOI7eBhszAv7TF8CuaAkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqHFC3PyhzLkp; Sun, 2 Apr 2023 14:57: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 332EvZH9017129; Sun, 2 Apr 2023 14:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332EvZoJ017128; Sun, 2 Apr 2023 14:57:35 GMT (envelope-from git) Date: Sun, 2 Apr 2023 14:57:35 GMT Message-Id: <202304021457.332EvZoJ017128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4fd9e206716d - main - linuxkpi: hdmi: Remove wrong dependency on wlan List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fd9e206716d019f46300aad40e5aa750ebb2e9d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd9e206716d019f46300aad40e5aa750ebb2e9d commit 4fd9e206716d019f46300aad40e5aa750ebb2e9d Author: Emmanuel Vadot AuthorDate: 2023-04-02 14:56:23 +0000 Commit: Emmanuel Vadot CommitDate: 2023-04-02 14:56:23 +0000 linuxkpi: hdmi: Remove wrong dependency on wlan Copy-paste mistake. Reported by: Alastair Hogge Fixes: f1d7ae31d4aa ("linuxkpi: Add hdmi helpers") --- sys/compat/linuxkpi/common/src/linux_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_hdmi.c b/sys/compat/linuxkpi/common/src/linux_hdmi.c index 5a9b5c552e49..172616306506 100644 --- a/sys/compat/linuxkpi/common/src/linux_hdmi.c +++ b/sys/compat/linuxkpi/common/src/linux_hdmi.c @@ -1919,4 +1919,3 @@ EXPORT_SYMBOL(hdmi_infoframe_unpack); MODULE_VERSION(linuxkpi_hdmi, 1); MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); -MODULE_DEPEND(linuxkpi_hdmi, wlan, 1, 1, 1); From nobody Sun Apr 2 14: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 4PqHFy4J9Qz43lM0; Sun, 2 Apr 2023 14:58:14 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqHFx4dFQz3nYs; Sun, 2 Apr 2023 14:58:13 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1680447485; 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=cbx93UVVCbm4OnRMVe88Z17JSd+1yO4cujSv5Tqxnmc=; b=X2keEws0CiwRF0yTB5NDyNMMxMLu9aEyGQFfdg840N2UQBpe50JGB28T2szb6LmOSBLlI9 ezrWBuH6fu0aECwZUcNLe+YLGDfJTx6OX1xX0a3152vOIIO8qPJ+BdPKE4YxKmrcGeUUTt BsrMwwxI8dFkpAer5JybfGfzgcBltdo= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 2cddb4f6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 2 Apr 2023 14:58:04 +0000 (UTC) Date: Sun, 2 Apr 2023 16:58:00 +0200 From: Emmanuel Vadot To: Alastair Hogge Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f1d7ae31d4aa - main - linuxkpi: Add hdmi helpers Message-Id: <20230402165800.47188c41ebf5d9b8c120758c@bidouilliste.com> In-Reply-To: <818d6db4dfaf420427d38f0491ec29b7@riseup.net> References: <202303280725.32S7P5eF036507@gitrepo.freebsd.org> <818d6db4dfaf420427d38f0491ec29b7@riseup.net> X-Mailer: Sylpheed 3.7.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-Rspamd-Queue-Id: 4PqHFx4dFQz3nYs X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sat, 01 Apr 2023 23:34:37 +0000 Alastair Hogge wrote: > On 2023-03-28 07:25, Emmanuel Vadot wrote: > > Hello manu, > > > The branch main has been updated by manu: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=f1d7ae31d4aa7b352611c43a9fb3b04986cff622 > > > > commit f1d7ae31d4aa7b352611c43a9fb3b04986cff622 > > Author: Emmanuel Vadot > > AuthorDate: 2023-03-16 15:12:12 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2023-03-28 07:11:06 +0000 > > > > linuxkpi: Add hdmi helpers > > > > This is a direct port of the Linux code as the licence allows it, so > > style(9) isn't respected to allow applying directly the upstream commits. > > Do not add it to linuxkpi directly but add a new linuxkpi_hdmi module > > that drm modules will require later, no need to bloat linuxkpi more. > > > > Sponsored by: Beckhoff Automation GmbH & Co. KG > > Differential Revision: https://reviews.freebsd.org/D39122 > > --- > > sys/compat/linuxkpi/common/include/linux/hdmi.h | 440 ++++++ > > sys/compat/linuxkpi/common/src/linux_hdmi.c | 1922 +++++++++++++++++++++++ > > sys/modules/Makefile | 1 + > > sys/modules/linuxkpi_hdmi/Makefile | 13 + > > 4 files changed, 2376 insertions(+) > > [leading diff removed] > > diff --git a/sys/compat/linuxkpi/common/src/linux_hdmi.c > b/sys/compat/linuxkpi/common/src/linux_hdmi.c > new file mode 100644 > index 000000000000..5a9b5c552e49 > --- /dev/null > +++ b/sys/compat/linuxkpi/common/src/linux_hdmi.c > @@ -0,0 +1,1922 @@ > > [most of module removed] > > +} > +EXPORT_SYMBOL(hdmi_infoframe_unpack); > + > + > +MODULE_VERSION(linuxkpi_hdmi, 1); > +MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); > +MODULE_DEPEND(linuxkpi_hdmi, wlan, 1, 1, 1); > > Is this module meant to depend on wlan? I was unable to boot a working X > after updating past this commit; upon booting the kernel, it did not > load linuxkpi_hdmi because wlan was missing. I did not want to rebuild > world and kernel WITH_WIRELESS and with the wlan device, so I removed > the MODULE_DEPEND declaration on wlan. Not sure what is going on, and if > linuxkpi will depend on the networking stack in future? > > Thanks for the amazing work on continuing FreeBSD work on the desktop > for the 14 or so of us users ;-) > Alastair Oops, fixed now, thanks for reporting :) -- Emmanuel Vadot From nobody Sun Apr 2 15: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 4PqHw75Gl4z43nJ8; Sun, 2 Apr 2023 15:27: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 4PqHw74hJ5z3py6; Sun, 2 Apr 2023 15:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680449271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=484MfaEs5jDdhBqnFNzsLpcSjQ9LKvLSN9fAjfrRs+M=; b=kKpsPgm8TLa0LYfs4CUFYDxFb4hiLOGlpkB2u8Mf0MlhQbgQDUkmbFwJBd359kpqE7XQ4r 4ptJEjk43iQctOahMkB9fvk3z93x2UiC9KfZIxzt/lfb6Qn8JHQUUXH7P8jGK21kEZCNUY M60W1ZMSjQVjoJUat8BZ4YJia86ZiYNVyCUbDHrgssw7MUXVLYpsYZT03F2+8j/trgmuQa spymNh4sL59vT4YmMkfc9DVwldWLGyXu/cNM234zrGvYTVKy+CGrS1IWmFWAou9ZIh1yB1 /60+uXlv4pmgHX7HCTwQ1LSXNjuXpYchEW4vqM+p4/hNNtwCSJnvcZ4Bjx3iEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680449271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=484MfaEs5jDdhBqnFNzsLpcSjQ9LKvLSN9fAjfrRs+M=; b=TEQI6dTsSvSEDUYuw9qS2o6ZQzZdz7VRaKhNHU533Y/tfeA4cGfO+ub19c2lbu//RUxUM9 l4NbdhvZAKyScju5VJy6f3uu9Yk2jF7aq2ENZqDOf0N0p05H3DdGImuoBmx9T65u4o5SJn wKAnWCAgjlxFbC367myT+/R07NiZbd16qlctxjTplKGTFyP9T4ij9lJOuM2jTahdixDTIw Q2TBCMpfTzAOC/xUYaMxZjcDmFaaQGTJEDnHdpbgjCvDdabVsLg7ZtkFV/h1yRHt7pfAnI XkKczQjROiwI+3TPLFwyKFEW7ig2meOOi523Fcz9F7Py+tDMlT+RbE0gnGewew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680449271; a=rsa-sha256; cv=none; b=kKhi3Kq9sEoYfGOv9o/nXn8o/MXPrN3gCJXOMiL97b8TG35hX37BKlEL+gd99iCblcZhXM Mh070D37P3G3XhKD5NIyDSC+Z9NQYb5YGD7Mpd3dEq1YDpaYg8C/2LLWvbCPgqNOr/jtJz VKqEMfGAaS8mzADUmcCpGa3cj3mMjXdMz0QoNynF1QNDa/UC1xBcDW5ax+8POTb7xcO3oo E/iyFje+E3XSg1PCmz8XeqSAdctCGfQxzjFksft7rtfDCVl0AberSm9XGNq9H5SjiFrc6N Ob2orYpZW+RFm3Vq2mf5Vp5ksDRdvM2ji0f3T+IVaHznT86qxa3U8E5jlM29tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqHw73RV8zMd1; Sun, 2 Apr 2023 15:27: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 332FRpxc065774; Sun, 2 Apr 2023 15:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332FRpXp065773; Sun, 2 Apr 2023 15:27:51 GMT (envelope-from git) Date: Sun, 2 Apr 2023 15:27:51 GMT Message-Id: <202304021527.332FRpXp065773@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: 3091d980f581 - main - netlink: add NETLINK to the DEFAULTS for each 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3091d980f581753f86df4155057b4ef23eb3ad27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3091d980f581753f86df4155057b4ef23eb3ad27 commit 3091d980f581753f86df4155057b4ef23eb3ad27 Author: Alexander V. Chernikov AuthorDate: 2023-04-02 11:50:04 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 15:27:21 +0000 netlink: add NETLINK to the DEFAULTS for each architecture NETLINK is going to replace rtsock and a number of other ioctl/sysctl interfaces. In-base utilies such as route(8), netstat(8) and soon ifconfig(8) are being converted to use netlink sockets as a transport between kernel and userland. In the current configuration, it still possible have the kernel without NETLINK (`nooptions NETLINK`) and use the aforementioned utilies by buidling the world with `WITHOUT_NETLINK` src.conf knob. However, this approach does not cover the cases when person unintentionally builds a custom kernel without netlink and tries to use the standard userland. This change adds `option NETLINK` to the default options for each architecture, fixing the custom kernel issue. For arm, this change uses `std.armv6` and `std.armv7` (netlink already in) instead of DEFAULTS. Reviewed By: imp Differential Revision: https://reviews.freebsd.org/D39339 --- sys/amd64/conf/DEFAULTS | 2 ++ sys/amd64/conf/GENERIC | 1 - sys/arm/conf/std.armv6 | 1 + sys/arm64/conf/DEFAULTS | 2 ++ sys/arm64/conf/std.arm64 | 1 - sys/i386/conf/DEFAULTS | 2 ++ sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/DEFAULTS | 2 ++ sys/powerpc/conf/GENERIC64 | 1 - sys/riscv/conf/DEFAULTS | 2 ++ sys/riscv/conf/GENERIC | 1 - 11 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 733823e931d6..bc8a268e1ea4 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -25,3 +25,5 @@ options GEOM_PART_GPT options CC_CUBIC # include CUBIC congestion control options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 46c901300371..67463e1013f8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -31,7 +31,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 17087f30f4f1..eb61ca42bf9d 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -11,6 +11,7 @@ options CC_CUBIC # include CUBIC congestion control options TCP_HHOOK # hhook(9) framework for TCP device crypto # core crypto support options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 +options NETLINK # netlink(4) support options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support diff --git a/sys/arm64/conf/DEFAULTS b/sys/arm64/conf/DEFAULTS index db76185154e1..d55a957f4b5b 100644 --- a/sys/arm64/conf/DEFAULTS +++ b/sys/arm64/conf/DEFAULTS @@ -18,3 +18,5 @@ options CC_CUBIC # include CUBIC congestion control options NEW_PCIB options INTRNG + +options NETLINK # netlink(4) support diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index ff2acef22a4d..6480ca6530e4 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -13,7 +13,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options CC_CUBIC # include CUBIC congestion control options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 820ff0ff30f0..f4956183b85c 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -29,3 +29,5 @@ options CC_CUBIC # include CUBIC congestion control device atpic options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 8e688bd6581b..475b584f366b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -32,7 +32,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_HHOOK # hhook(9) framework for TCP options TCP_OFFLOAD # TCP offload diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 984283c5bf5f..b9ce3e41c123 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -16,3 +16,5 @@ options GEOM_PART_MBR options CC_CUBIC # include CUBIC congestion control options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 6c40b031bee6..c4277983b66a 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -42,7 +42,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS index 363186d28904..dbf94f9e0335 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -18,3 +18,5 @@ options CC_CUBIC # include CUBIC congestion control options NEW_PCIB options INTRNG + +options NETLINK # netlink(4) support diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index df7d680ff3ff..49e3f07c0f96 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -31,7 +31,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging From nobody Sun Apr 2 16:54: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 4PqKr33WJgz43typ; Sun, 2 Apr 2023 16:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqKr32vqRz436H; Sun, 2 Apr 2023 16:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680454467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M42SxJ2SK5cuXWvNaOUSVJWz9Jsn+OUaSeiJ5lC+nG4=; b=LAVd/tZQhSV10v4d15RJ2ALl43hQ0MYmbSO9HqwIwkccYyZK0iw+BdnLPp5QOjXCSHnyQF vHwiTaDwn2pWXU3L4zcNpOXfo9a1uBbjQ6RqMcKKyIWgj+qSL8cxJ6mtMESnJv8R60EWf1 U4jGSgvWbqRiu4QKHUOUv6m6mfc/xezVt19OhxJ8gzBMIuUxzVec5CSNr0X/IgceEB/gye WuNZdPZyuhWN/R3ghuxYv38nOvlrMlo4WpHMFjrUlBA9B3EQN6wW7ngAhjJ2ZuCnljjM0S xWHNgQRSOVoTx71Wtj/OgxkYlrKDCRwkSKaoxjAZ3IDQTz1QslD5eUl5/uOaQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680454467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M42SxJ2SK5cuXWvNaOUSVJWz9Jsn+OUaSeiJ5lC+nG4=; b=vv+Fw6MTBfqkA+7VZVOt9AuQ5xzptIlsDO4mssKwIB0YGwAiXgF2zjLr5bg9Run6pumZN0 NeVzfkRjEe0iAFfxS4SINe29nYp7qDM2BGXqhy0iuUt75Qr1AH7tQcOatlDbJNzrXFO7vj SR9rbGw5cKSu/TE4G2PDgZCDtWZK93+DRxx0ZaBGM12S1ptWxDBkw1VxFtdqfBh+kkIKkx 5tx/aOKsvd6wZKCWHKoWUHnHCeQxAvLj6f/JrZbiSMpSh26nHhzTnvs6b+omH+SDXq649I 1ylEWqC/hDwj6oUdhjIi9R5yv/c9emQkQb2YCQeUBT0wmGaubNbu3DoYbkMpmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680454467; a=rsa-sha256; cv=none; b=OklsS74S2vsjcYrymAZjFlaPEkugjUXht57hOYmQdzWo9Z4WcyD4UgxOCJsfdtjW25d6nh rGWmXJcJi1J76LrXHQQfOTsrwZHfSJGSoaP6YwRgjXDGcHobpOlM181Hox/6WPISbKcTEz 12wmTrCpF6GnloUWehsnZAjuzagQnFmiKPAbRrDWgD5ZHyYytv5FUo9/+J0bfDFN9gEoxr olYv+2WLTEYXTuH6gvSkCDD0EIOQ+GZSD4X1AU+8ERcRAR/ljW2ZZ21pgyAonTNV9Qu9nD XIZsCU07yNkm5etlXHmSW2VBrS71lrxEgigpJr5B4mYUYD5zlOl7pvCjhQO9tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqKr31yWZzPWT; Sun, 2 Apr 2023 16:54: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 332GsRVU013493; Sun, 2 Apr 2023 16:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332GsRMB013492; Sun, 2 Apr 2023 16:54:27 GMT (envelope-from git) Date: Sun, 2 Apr 2023 16:54:27 GMT Message-Id: <202304021654.332GsRMB013492@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: 90820ef121b3 - main - infiniband: Widen NET_EPOCH coverage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 90820ef121b38479f2479c03c12c69f940f5fa33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=90820ef121b38479f2479c03c12c69f940f5fa33 commit 90820ef121b38479f2479c03c12c69f940f5fa33 Author: Zhenlei Huang AuthorDate: 2023-04-02 16:51:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-02 16:51:49 +0000 infiniband: Widen NET_EPOCH coverage From static code analysis, some device drivers (cxgbe, mlx4, mthca, and qlnx) do not enter net epoch before lagg_input_infiniband(). If IPoIB interface is a member of lagg(4) interface, and after returning from lagg_input_infiniband() the receiving interface of mbuf is set to lagg(4) interface, then when concurrently destroying the lagg(4) interface, there is a small window that the interface gets destroyed and becomes invalid before infiniband_input() re-enter net epoch, thus leading use-after-free. Widen NET_EPOCH coverage to prevent use-after-free. Thanks hselasky@ for testing with mlx5 devices. Reviewed by: hselasky Tested by: hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39275 --- sys/net/if_infiniband.c | 4 ++-- sys/net/if_lagg.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index 6ca90ba1d8c7..b3cdd15c76f7 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -417,6 +417,7 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) int isr; CURVNET_SET_QUIET(ifp->if_vnet); + NET_EPOCH_ENTER(et); if ((ifp->if_flags & IFF_UP) == 0) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); @@ -504,10 +505,9 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) mac_ifnet_create_mbuf(ifp, m); #endif /* Allow monitor mode to claim this frame, after stats are updated. */ - NET_EPOCH_ENTER(et); netisr_dispatch(isr, m); - NET_EPOCH_EXIT(et); done: + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); } diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index cf78b55f4c34..b3475839a2c1 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2192,16 +2192,14 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) static struct mbuf * lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_port *lp = ifp->if_lagg; struct lagg_softc *sc = lp->lp_softc; struct ifnet *scifp = sc->sc_ifp; - NET_EPOCH_ENTER(et); + NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || lp->lp_detaching != 0 || sc->sc_proto == LAGG_PROTO_NONE) { - NET_EPOCH_EXIT(et); m_freem(m); return (NULL); } @@ -2214,7 +2212,6 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) m = NULL; } - NET_EPOCH_EXIT(et); return (m); } From nobody Sun Apr 2 17:12: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 4PqLDk0Xwfz43vw2; Sun, 2 Apr 2023 17:12: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 4PqLDk06T2z44mF; Sun, 2 Apr 2023 17:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680455542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lc9RkXu8jAWX2qFUH2nDGOYMq6ZwltQek0yEYkwNNPk=; b=XSLB9i5fk5s3LvEUatc9nUerVJZchrLR4byvjvJsy/sS1DgJTACRN/2FPz1GY3Sigh7wPT 1XpIdyJ+/d1VzzbXrFtMvh4whgH281hqxKpNL2m1lxZ7Uyfo3zHyNYWhNKbuy0XPo/L8Vo HgHr3n/3A9Z/JmSpRQJwL4v2RqrqlZ+adqnUWU2Xp0QGSTkkPV+7Nx+DHzbmXlC+2ba6QA lkLmY9W/HaAO5hhqZrsKtVU3weYx6b0nEIXSPaNGkqYPeIe2wlJ8wwjzKmEw6coxebg/4O ajlknLmkHKPHPsQe0yCSh2lLC70ztCN1KP8Wrskj6RwodbcSlEBbmCcld+DbgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680455542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lc9RkXu8jAWX2qFUH2nDGOYMq6ZwltQek0yEYkwNNPk=; b=xa/bdot2nvy6L3KvmIjitWixSjke+YePzR+GvFlbeg+kHm0f227y4stgNzHWFxVOIBGnig /J/FlG3DTgkDZcX8pxOBA/e3vsB9yc8Hsl086U49rbsBDiNyg7eD999GS7ZzVZUDNZ4smV lEwBV6me5S3vc8QjuR4vQKtLKxEFdqoNe3O7Ywg4P4++DcjOMZB4bEIPRqmcMiCpIsqTbb Q3p30eKc1a4mHBNoRiz7ITmfWiq3rk0zb9JhvJDwZzDDEletWAD2uhRuQCg9vN7CCQ1hOn nBNiTxWv8+E3lfx/42qLMe3MHiu8v7C1cHCcQBye/Cz2HCOqSp5i72pTcra9VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680455542; a=rsa-sha256; cv=none; b=rr6kAIYVoQ4AoolvnXnmsrCxlzrktLcib3Sz2xi2b5nHXXJ0EwP0vwDEO9yY1UrFpV98OV wdU45zvcB8dtu3sUpWJRiiqW5lpZ1V3IF/Y8nbekQ2GBwEDbT+Dv/4PGxIFd/X01ynNbwV CnHtblWFRZhu/8VEMv4/UqaGrvRXxAac68bSYDGiEi2zox2JG4MsKbgWshx9Y6K5ttn2do CFQCwTEAhhDNxVyqHbemrcyvVGpOhAC9ywAcu6FlpqyN8g5t3ckqu2GTdmoce+lV3UsPq3 A9DKsCYvow58wEYNLCAMRQgkaD2lF6Zyg0ORQux0oUzi5sADpVv7nYm+fAYu6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqLDj5zl9zQQh; Sun, 2 Apr 2023 17:12: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 332HCLlC045661; Sun, 2 Apr 2023 17:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332HCL00045660; Sun, 2 Apr 2023 17:12:21 GMT (envelope-from git) Date: Sun, 2 Apr 2023 17:12:21 GMT Message-Id: <202304021712.332HCL00045660@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: 5f3d0399e903 - main - lagg(4): Tap traffic after protocol processing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 5f3d0399e903573e9648385ea6585e54af4d573f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5f3d0399e903573e9648385ea6585e54af4d573f commit 5f3d0399e903573e9648385ea6585e54af4d573f Author: Zhenlei Huang AuthorDate: 2023-04-02 17:01:51 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-02 17:01:51 +0000 lagg(4): Tap traffic after protocol processing Different lagg protocols have different means and policies to process incoming traffic. For example, for failover protocol, by default received traffic is only accepted when they are received through the active port. For lacp protocol, LACP control messages are tapped off, also traffic will be dropped if they are received through the port which is not in collecting state or is not joined to the active aggregator. It confuses if user dump and see inbound traffic on lagg(4) interfaces but they are actually silently dropped and not passed into the net stack. Tap traffic after protocol processing so that user will have consistent view of the inbound traffic, meanwhile mbuf is set with correct receiving interface and bpf(4) will diagnose the right direction of inbound packets. PR: 270417 Reviewed by: melifaro (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39225 --- sys/net/if_lagg.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index b3475839a2c1..c07deb3217fa 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2171,12 +2171,14 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) return (NULL); } - ETHER_BPF_MTAP(scifp, m); - m = lagg_proto_input(sc, lp, m); - if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) { - m_freem(m); - m = NULL; + if (m != NULL) { + ETHER_BPF_MTAP(scifp, m); + + if ((scifp->if_flags & IFF_MONITOR) != 0) { + m_freem(m); + m = NULL; + } } #ifdef DEV_NETMAP @@ -2204,12 +2206,14 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) return (NULL); } - infiniband_bpf_mtap(scifp, m); - m = lagg_proto_input(sc, lp, m); - if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) { - m_freem(m); - m = NULL; + if (m != NULL) { + infiniband_bpf_mtap(scifp, m); + + if ((scifp->if_flags & IFF_MONITOR) != 0) { + m_freem(m); + m = NULL; + } } return (m); From nobody Sun Apr 2 18:18: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 4PqMjY4T6Zz441C3; Sun, 2 Apr 2023 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqMjY3w00z4DjB; Sun, 2 Apr 2023 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680459537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhThXMa9dfer+x03yZJALHTurOuvYkCukfdffAiXTCg=; b=nRJWERPkHQnQN2YMBkSNQ5uYf/MOL4ioSX3ULMxWROMCKgc4Ht+zXiD4WV1s2zwbwJMLbJ pIon+xspfJJLAsJezVIE07jxAvFgjNW6wtTO3HWjZerCrZwyFfU6LADVqV+XF6nRnJx4b8 5JcJ1u8zqUam8+hxMuPQNFsM5ZwVhAXDFOXcqk6BSkv/Xuxv3wVMyKDdMxse4Zl1cfeumU DepNS9i4RX/tZGjtCJQ7WgiHXHjZL8nLtkTzXq+modDSor23gECFtOTt3LgL7Rw/wtSdf8 6wHme0R0gGvWUdTqj4hs5+pPjOywZj2ODCreUsQwKGm0ERhFqEW1sq/+ytsM5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680459537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhThXMa9dfer+x03yZJALHTurOuvYkCukfdffAiXTCg=; b=H+x7u0X5Rgi8gL7UoLAEQigD7QiFJHGlfuzbYE9Yd5MjHKZhd4M5i9cQLBf0be9e44JN4y Ese1qPhPRv92xxjZeQYgnWjrVkFvj3SUk48ybJahrxxajlcAv1dQFgQl5sGt62DmjrUfMh 0IaB6uZyCU/OI0AiAOG3kck0JdvA/WflZtpr+SHnnVLCMqcDJMLO3PO2OLIHQBVEzWEoBM 6P+UlO5Nk3cRWX/u0s45Ecf8dR/Ex9RXyE1BuTgclw9RYdiERf9Q/XLSZmSWwItLrtj5Ox XZMUvItQwWgUHeyjh+xdgWvzxdbhcnVcP2usBtFFaQG7k3Srtdigco5iz7jxCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680459537; a=rsa-sha256; cv=none; b=RWL/oxpG1SWJdUxI4e/KHgKhn5ypkzlhrJ8JJ5RxA6rHJD1eXw+oRqutZ431Ki7reG3fq0 2eKzuaTZUE0G2NV+zouqXzrHAbsnOmV1Kj4dZx5BR2YygaCktlMKo34ktD1Jrdx7hSNPIa Y1MAkSubPFXxpWWcmNcA1DuBZAUqqJwc4xEBCdeQu6dstwNLNUfSKcWORtua+QOFmj+x7g Zxcwaz3u2J4OWnRVpxIldWnlRwukklJqPAzT/Eb1ltcQwnQ+/u3HIkhQoSvHBB986ZhxBC d06L5aSZyzlytxTEtyM0fnC5Nj5xZglWBBZaPdVM6AnpgtC7kmeJu4vkBNEXow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqMjY2x7QzRXh; Sun, 2 Apr 2023 18:18: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 332IIvgY046665; Sun, 2 Apr 2023 18:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332IIvEn046664; Sun, 2 Apr 2023 18:18:57 GMT (envelope-from git) Date: Sun, 2 Apr 2023 18:18:57 GMT Message-Id: <202304021818.332IIvEn046664@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: 28b498e65ab4 - main - ifconfig: Improve VLAN identifier parsing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 28b498e65ab40975ea12393498bacd6249b7204c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=28b498e65ab40975ea12393498bacd6249b7204c commit 28b498e65ab40975ea12393498bacd6249b7204c Author: Zhenlei Huang AuthorDate: 2023-04-02 17:54:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-02 17:54:31 +0000 ifconfig: Improve VLAN identifier parsing VLAN identifier 0xFFF is reserved. It must not be configured or transmitted. Also validate during parsing to prevent potential integer overflow. Reviewed by: #network, melifaro Fixes: c7cffd65c5d85 Add support for stacked VLANs (IEEE 802.1ad, AKA Q-in-Q) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39282 --- sbin/ifconfig/ifvlan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index 74d683ebb55a..53f2e68fa2fd 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -121,7 +121,7 @@ vlan_parse_ethervid(const char *name) { char ifname[IFNAMSIZ]; char *cp; - int vid; + unsigned int vid; strlcpy(ifname, name, IFNAMSIZ); if ((cp = strrchr(ifname, '.')) == NULL) @@ -134,9 +134,12 @@ vlan_parse_ethervid(const char *name) errx(1, "invalid vlan tag"); vid = *cp++ - '0'; - while ((*cp >= '0') && (*cp <= '9')) + while ((*cp >= '0') && (*cp <= '9')) { vid = (vid * 10) + (*cp++ - '0'); - if ((*cp != '\0') || (vid & ~0xFFF)) + if (vid >= 0xFFF) + errx(1, "invalid vlan tag"); + } + if (*cp != '\0') errx(1, "invalid vlan tag"); /* From nobody Sun Apr 2 22:26: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 4PqTCG4qVPz435cf; Sun, 2 Apr 2023 22:26: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 4PqTCG4PMBz3kJ0; Sun, 2 Apr 2023 22:26:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680474394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iIfbKoQZQ3+Ovkqtzbjb73yu2oihJAeivjImItKhAQ=; b=XTVymMbt4hGGPlMkPyAUqp7j2ZHrPG+yzU19wFOPDK5fDpKJnDSKqzN1i5vA+jhEhUCPlk rEAv3e9MikLDbAjQgkNndebCrC/1DJU/s9Ak+dvDon7yRSx1++IFxh4lmIdmv36rnwhtAG SDIHbci7zxmBVF78E/VfTbKgCTELEC1CQvHcRGpATzgZAbo5ifm+TLXiJXCE/RxV4DSdjI Vhr7xg8VIK3yDFMUcw77ig4IgFtrEZSVFiqyzedyDCoOXtiqyR6++1wajGsENnrbNrtZ5J /ERvs3kjKHvmsRzn5E/8GkNnM+iQ9P1H9QtNGPoffdyS7VtsNCF8ZLFzFjoQgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680474394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iIfbKoQZQ3+Ovkqtzbjb73yu2oihJAeivjImItKhAQ=; b=j4j8fFV9bzuz3F4Xernkt5eJieUp6JNNfxl/pcWyt7CxpFDMnyE++oFcvVw4au0DIjq2RG kj7oMVAQ7WCrTHPJARloeK2dH1odALYQchHRUVgqH8wOVDIkFIdbLqhnUAEekL/tefpDg/ x2tcljV/F8klKbEzpppajIFDN6dZ/WJAOy7VekKbt8JbLDnz1/t75hQOm0lvruPiPahYKc WXP+1SJs3gwDlNHAk+dHOnqD8bbk7Ptxjrp43FAInF+WDTi/vzeQqVzxIpWPp5WyZmGxsG kUy8THFSjtcUezGKQv18vZTkDzDsuXd/BIiD+qBahvqutmHvYi0PwuZSKtxV7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680474394; a=rsa-sha256; cv=none; b=k70twppPqPYgyB84xeymZBrop2GwD7lXXFvijflLFPzEzbk52ic3u6KPhWZz4C2bqqOW+R sJ46Lv3UaGxMwvCVoBH9aRAPBeH8+Sz4Ymn4VdNvc7JqybJ+AXuiA0uMplEIb2M5VJ2lhW Vl4/G5LNEpvkVsQapRC4OaneEIIUfH6Z1eOD23luLHpFvNVPT6oYZXHfRFbiMYKBPV1ixF sO6m6F+LVUHyDiCQwdwmZzzVruV0j3kKUjFgEjrl7tVy7wiWn5OSywNVqRWg1GI3mDwaBb 61K7UAmhjY8188VQsrD/EODpPK4M5zOlRmRDEc8ZbhBDv0ZbrUxXyNLeW5cJDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqTCG3RwKzZ8N; Sun, 2 Apr 2023 22:26: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 332MQY3x056550; Sun, 2 Apr 2023 22:26:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332MQYKZ056549; Sun, 2 Apr 2023 22:26:34 GMT (envelope-from git) Date: Sun, 2 Apr 2023 22:26:34 GMT Message-Id: <202304022226.332MQYKZ056549@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: cfccc7f30a01 - main - LinuxKPI: 802.11: remove extra spaces List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfccc7f30a01bb6f00672e4be4abfe4107d645bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cfccc7f30a01bb6f00672e4be4abfe4107d645bb commit cfccc7f30a01bb6f00672e4be4abfe4107d645bb Author: Bjoern A. Zeeb AuthorDate: 2023-04-02 22:25:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-04-02 22:25:28 +0000 LinuxKPI: 802.11: remove extra spaces Remove two extra spaces. No functional change. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 453230d54452..53ddd16413bb 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2380,9 +2380,9 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], ic->ic_set_channel(ic); /* XXX-BZ do we need to be able to update these? */ - hw->wiphy->frag_threshold = vap->iv_fragthreshold; + hw->wiphy->frag_threshold = vap->iv_fragthreshold; lkpi_80211_mo_set_frag_threshold(hw, vap->iv_fragthreshold); - hw->wiphy->rts_threshold = vap->iv_rtsthreshold; + hw->wiphy->rts_threshold = vap->iv_rtsthreshold; lkpi_80211_mo_set_rts_threshold(hw, vap->iv_rtsthreshold); /* any others? */ IMPROVE(); From nobody Mon Apr 3 06:45: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 4PqhGb02LHz43kRc; Mon, 3 Apr 2023 06:45:11 +0000 (UTC) (envelope-from zlei@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 4PqhGZ6fPDz4Kyy; Mon, 3 Apr 2023 06:45:10 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680504310; 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=pGavLjSKj3skXyTaw/jp2tcXTBgyvsXHO9xY/WFdUpc=; b=HgIpsxxzq8UQGYeqbYdUfRvhbMOQMFR4XfFZJEr6TW3H14pXijAp2OqL4tR2Xx2yPtWR1M kjicxEvb0AfBiT85MdmpgfkT1HCm3jBvtfA9JCYPdYA+i8hksBukdrT1w2ygpcgj6K/N+u vBjGhWX7Bv70Sbj+/okKEtOgH2+cwqzYHM1K24EedBeea7Xw04pv5VdPwogTq8ZxrEB7Ap XNtQtj6la9ZHjthTElyloInvgBQGkMcD3114bhBnVk/GQZf637OtQcoZerpkG09Tb2t36b L/AWs01oYmWm14Vh4GyGvQrMCzdPXMoRgQoI6CNLNLw6b1fRu8Nt56xs1uvkDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680504310; 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=pGavLjSKj3skXyTaw/jp2tcXTBgyvsXHO9xY/WFdUpc=; b=jyWjm+WBXWewUZwegiilC0JNgAvO99reMh3LH579Hsrlbi4MjpMT1C69k0GU1bi5pLFFXi LefK7XqW9PxJdDxB2/2RFpvMJmECDdyJImW4BhvxQavhs+l3mvU1BPYVYgxyY8Oe3q3c2c G55vx9O5kVzL69vkVa7OAZJH07PoDLLHM1tw4Rj/GT1C3MqKqttS499ozFB6odpgeFUfjv hp0RBt+g94RmCl6gq2qlUI90IbgOvBafdrx2QKhE2nbRZs9x7FD2YTgHWRFPJuqNiZ5efK c0g6cjnKTOrEnOwJP+mtKMVoLX4mVTjA6XPJlbnVexUpgobUpRF8VdGzva4LEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680504310; a=rsa-sha256; cv=none; b=kWKcIWrxmP4I2d9R42M3lytRfTeOudG62BTtLGg52jK6rCaLXR26kteEmBQvqyIymfYCXu zsuMissyLUjxb1bNeBsCHJqI6f+6MTgjYXez+Klb94YEUyO2QyDqQibsRm3TXvRwbwowTe d3/TUPh7/q+M9UVrYJ7cxzTioZmMgsM4+E7y7f5EJ2VTjB1y7kojiU5jid1XoNxP1bI64s 3NdEdWQ0AL7/pOI3ziZG6yMPepdhiCtr0WdF1btU5uxwz0PEhssfNSiBdTvcVcCyPz3wsS lClNB4fgly9zrHOwx4d9rzBXO0Zsii8x+mEWsI/FuZTvlZ5N7f4FtwAcJABkjg== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PqhGY1r2vzMDN; Mon, 3 Apr 2023 06:45:08 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_C0CD3504-5809-4FF9-840B-DD3D05A38511" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: 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.2\)) Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." Date: Mon, 3 Apr 2023 14:45:03 +0800 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , tuexen@freebsd.org To: Cheng Cui References: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.2) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_C0CD3504-5809-4FF9-840B-DD3D05A38511 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Apr 2, 2023, at 12:27 AM, Cheng Cui wrote: >=20 > Thanks for the concern. It was a mistake that placed my name in the = wrong place. > The correct change is in 95940a2d2442. I think this is an impressive start as a committer ;) >=20 > Best Regards, > Cheng Cui >=20 >=20 > On Fri, Mar 31, 2023 at 11:46=E2=80=AFAM Zhenlei Huang = > wrote: > Hi Cheng, >=20 > Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 = ? >=20 > Best regards, > Zhenlei >=20 > > On Mar 31, 2023, at 9:58 PM, Cheng Cui wrote: > >=20 > > The branch main has been updated by cc: > >=20 > > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec50880e3ac95768= 1badf55f = > >=20 > > commit fcad8ada9afcc60cec50880e3ac957681badf55f > > Author: Cheng Cui > > AuthorDate: 2023-03-31 06:53:16 +0000 > > Commit: Cheng Cui > > CommitDate: 2023-03-31 09:58:14 +0000 > >=20 > > Revert "Add myself (cc) as a src commiter." > >=20 > > Summary: This reverts commit = 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0. > >=20 > > Reviewers: rscheff, tuexen > > Subscribers: imp > > Approved by: tuexen (mentor) > > Differential Revision: https://reviews.freebsd.org/D39363 = > > --- > > share/misc/committers-src.dot | 4 ---- > > 1 file changed, 4 deletions(-) > >=20 > > diff --git a/share/misc/committers-src.dot = b/share/misc/committers-src.dot > > index 76ab7441fd46..6e7b5b6c63b3 100644 > > --- a/share/misc/committers-src.dot > > +++ b/share/misc/committers-src.dot > > @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. = Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] > > bmilekic [label=3D"Bosko = Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] > > bushman [label=3D"Michael = Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] > > carl [label=3D"Carl = Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] > > -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] > > ceri [label=3D"Ceri = Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] > > cjc [label=3D"Crist J. = Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] > > davidxu [label=3D"David = Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"] > > @@ -846,8 +845,6 @@ rrs -> bcran > > rrs -> jchandra > > rrs -> tuexen > >=20 > > -rscheff -> cc > > - > > rstone -> markj > > rstone -> mjoras > >=20 > > @@ -923,7 +920,6 @@ thompsa -> eri > > trasz -> jh > > trasz -> mjg > >=20 > > -tuexen -> cc > > tuexen -> rscheff > >=20 > > ume -> jinmei >=20 >=20 >=20 --Apple-Mail=_C0CD3504-5809-4FF9-840B-DD3D05A38511 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On Apr 2, 2023, at 12:27 AM, Cheng Cui <cc@freebsd.org> = wrote:

Thanks for the = concern. It was a mistake that placed my name in the wrong = place.
The correct change is in 95940a2d2442.

I think this is an = impressive start as a committer ;)


Best Regards,
Cheng = Cui


On Fri, Mar = 31, 2023 at 11:46=E2=80=AFAM Zhenlei Huang <zlei@freebsd.org> = wrote:
Hi Cheng,

Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 = ?

Best regards,
Zhenlei

> On Mar 31, 2023, at 9:58 PM, Cheng Cui <cc@FreeBSD.org> = wrote:
>
> The branch main has been updated by cc:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec508= 80e3ac957681badf55f
>
> commit fcad8ada9afcc60cec50880e3ac957681badf55f
> Author:     Cheng Cui <cc@FreeBSD.org>
> AuthorDate: 2023-03-31 06:53:16 +0000
> Commit:     Cheng Cui <cc@FreeBSD.org>
> CommitDate: 2023-03-31 09:58:14 +0000
>
>    Revert "Add myself (cc) as a src commiter."
>
>    Summary: This reverts commit = 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0.
>
>    Reviewers: rscheff, tuexen
>    Subscribers: imp
>    Approved by: tuexen (mentor)
>    Differential Revision: https://reviews.freebsd.org/D39363
> ---
> share/misc/committers-src.dot | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/share/misc/committers-src.dot = b/share/misc/committers-src.dot
> index 76ab7441fd46..6e7b5b6c63b3 100644
> --- a/share/misc/committers-src.dot
> +++ b/share/misc/committers-src.dot
> @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"]
> bmilekic [label=3D"Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"]
> bushman [label=3D"Michael Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"]
> carl [label=3D"Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"]
> -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"]
> ceri [label=3D"Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"]
> cjc [label=3D"Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"]
> davidxu [label=3D"David Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"]
> @@ -846,8 +845,6 @@ rrs -> bcran
> rrs -> jchandra
> rrs -> tuexen
>
> -rscheff -> cc
> -
> rstone -> markj
> rstone -> mjoras
>
> @@ -923,7 +920,6 @@ thompsa -> eri
> trasz -> jh
> trasz -> mjg
>
> -tuexen -> cc
> tuexen -> rscheff
>
> ume -> jinmei





= --Apple-Mail=_C0CD3504-5809-4FF9-840B-DD3D05A38511-- From nobody Mon Apr 3 07:32: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 4PqjJr4VfKz43n7c; Mon, 3 Apr 2023 07:32:12 +0000 (UTC) (envelope-from grog@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 4PqjJr3xZnz4Q2s; Mon, 3 Apr 2023 07:32:12 +0000 (UTC) (envelope-from grog@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680507132; 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=eF5XvhgGFLcrmox/+yBibeZjgGE0+SOoARbJs/01quQ=; b=n1rVPbLEAJmdZ2afSFLY4DpAkEcbWQSFaH4fOhY+zgNr2xx6y3EqjwesMw18zH0/ieRjsb rEe3nWOC0bs5HE7ASFDgps3KwTroM0htdnIXSoluC6qBcJ365pNiFlYKcGTPr/z3su8FT+ S7O4bkoK6RcS0nGO4WAV9vGtMzf80tJDV0PQCFcIhzQ5VOn7UydzamfXa6mePnK/fjd6UX TWEpASeYcBqNx8OW3QN0nWKSbYukX1HoSkHbIrKipEOogNIDipE0StsWzk8QjwrkJuiTr+ 7JSP5O2aXThiSSlk5T10j08THzx3eExdH/HGi/530EZg0Y+RY6hL7uweKL32QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680507132; 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=eF5XvhgGFLcrmox/+yBibeZjgGE0+SOoARbJs/01quQ=; b=dyF5QwWZUU2Kxcv066p5vuj7FUMyj8ZzTurIWqA/ntC8kuAbnGM627nvSX7ZvIz4nZGI3P fGzGkfxt/gAR/oDLNLO5cDm12OPEeh5zhZpLOeh2Q9iPUUqEG5rcydjeOVTCY7miVLwaaC /i79m+ti7JNNqy474QhgFg2zdJhj/cxzdnt86u9GcKGFt0Jv3+IMKG5468wLfd6SrqYo54 z0urxUH0zoLtF1aQW/tMaNyoMzQ5Kn6zckqKEVF+YJiJd7MHk6DPVKrK1COurlBXMyu2c0 inMpGa3KM32ED9dNpDmuLjfxuBEQiP1vAbZLi/TqMtdls1zIQ7FT5qEYZMSD0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680507132; a=rsa-sha256; cv=none; b=DLPHFTihQAVkWa3wKu586A6V76l+yaxhGZVfog+Yw+YDzsGqyaMJeHWJh/NuDrhWjAqP6B x8E8cJgUp7gvcK3jWLItRussuqScWzQ02HN4FbXSM82bZPhqZ1yuatgmF0xOneKmcjha5B bH3CxFiFa2lOgPXk4hpyccGCThjt9eV4dJEcBxFxw2i8W2rbrnAddpaBS2JUFxVnTWSclc l7Cnj525OaK9XpWOkKSG0bOOc8KuQpYIL7HMjNnKg0tVc+CHacG7NUPm4fsmlk0nnf1E8g 4d9F9d/HUFM4AkhWBGC6SgWdER/CnNUoSlsfJD9G6OzJujvuvqc4KvJOylkLjg== Received: from eureka.lemis.com (121-200-11-253.79c80b.mel.nbn.aussiebb.net [121.200.11.253]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: grog/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PqjJp2RnXzM9R; Mon, 3 Apr 2023 07:32:10 +0000 (UTC) (envelope-from grog@FreeBSD.org) Date: Mon, 3 Apr 2023 17:32:04 +1000 From: Greg 'groggy' Lehey To: Zhenlei Huang Cc: Cheng Cui , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , tuexen@freebsd.org Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." Message-ID: <20230403073204.GF89483@eureka.lemis.com> References: <202303311358.32VDwPUA083636@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: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="d8Lz2Tf5e5STOWUP" Content-Disposition: inline In-Reply-To: Organization: The FreeBSD Project Phone: +61-3-5309-0418 Mobile: +61-490-494-038. Use only as instructed. WWW-Home-Page: https://www.FreeBSD X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 User-Agent: Mutt/1.6.1 (2016-04-27) X-ThisMailContainsUnwantedMimeParts: N --d8Lz2Tf5e5STOWUP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Monday, 3 April 2023 at 14:45:03 +0800, Zhenlei Huang wrote: >> On Apr 2, 2023, at 12:27 AM, Cheng Cui wrote: >> >> Thanks for the concern. It was a mistake that placed my name in the wrong place. >> The correct change is in 95940a2d2442. > > I think this is an impressive start as a committer ;) By far not the worst. My first commit was not quite 25 years ago, on 15 September 1998, and it included: * N src/lkm/vinum/emacs.core For those youngsters who don't remember CVS, the N means "new file in repo". More details at http://www.lemis.com/grog/diary-sep1998.php#16 Greg -- Sent from my desktop computer. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft mail program reports problems, please read http://lemis.com/broken-MUA.php --d8Lz2Tf5e5STOWUP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAmQqgPQACgkQIubykFB6QiMGswCghRSwr5/aioQlIud1K7X8Ijcz n6wAnjQTKmVDuyjT+/++F2aoKTvWJSci =GBuP -----END PGP SIGNATURE----- --d8Lz2Tf5e5STOWUP-- From nobody Mon Apr 3 07: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 4PqjLc52Hhz43nWL; Mon, 3 Apr 2023 07:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqjLc4b8Zz4Qfd; Mon, 3 Apr 2023 07:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680507224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqkKVIyTf5/qy4W57w7oJrb7YfqaOoXyu6vegXBXtg0=; b=l8ma360UNhjq1OGQ0KFS+XCmLN/xEwHleYw1yR6AzcfUImGA/MBX3mIz0ZvqaLD+/0YdPD LnPsgGBZ79fdm2GbL/tgRjOs5Kb77wVPBcnJD6N7IRbGV3CrJdoxWwsubLTxha8HXIGpjf 25slyDi2xK7gYg+k1zC78bFEi7EkiYc1DAqkadccsmaq+4d86ELUfgm8BfQelDXLvPe3FZ JcrijTkl53z5CyhnIkFZb6iOqhJPRd3xQc/ulemKnU4dF30Ao5G08f1+u4KZj/nIoNmPi6 r20VdxW5eFkQF3pTo4vzspHIULlAbY2nD+ToDCnOgNfBAij3316bjwlmwb8KqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680507224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqkKVIyTf5/qy4W57w7oJrb7YfqaOoXyu6vegXBXtg0=; b=kaRFCOnUXOn+xfbHGzqmvu9TV74GTWt1QxXSpbIlRPrG4OWfcUuWqozjr4n6SGHCDXACNs FbKdZar9gwgSgZHRXla0OxoM/jh4oQG9UHH6PoMQTzyRiNPP6hkw3DPnHNewTEeWI8ffOn p06jCKOmvYwysTRyPPYNvzwAytO8QSYchbBGDr21xcXB61nOXahay26xrEikbRhW/s6HQ1 WKk+l6n5Miwua7J8B3MiynifjeYYvRuUGPpwEcJ/hcq1RfkjwG4Wd0+kQ6HKd8vqH2QfSJ 6IGR8WU7hLuw2Sb9wAwf8/UuG3z+BoE10EMRhqoiVXKxglK60YUdrHQDDfChVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680507224; a=rsa-sha256; cv=none; b=T6nvCXq8hm7eHGULwMOVkjDlipDwyTfaRyT7MU1sdF9jbBtLJV5lhL8PTETrSApo2GlBGw kYbvVzlXM3fHrPNETbrhDLJZym2VVQYfyPQIqSCDZ3LEJYKd70gdCgqEGcmTDqQ3uADovq ddcwetlnOFp+kctUvPICWRSzzM4qFvbM3YOvYHCyD9X2ZzugJmrBx0AbRS0fC8+sXO4pak pP7+81bNlBu2k8nQT4/jdThCCaV54Z5SvFTnbXZkNuV5S99joIsPJDH6QXZraVI+9gR+RR JWk+ZWBjTecISbfynzpPQUblGuXcrN1XlTrTvmKgAC07V8tobX8ES1xAiAFTLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqjLc3gqzzq52; Mon, 3 Apr 2023 07: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 3337XiXC059375; Mon, 3 Apr 2023 07: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 3337Xibt059374; Mon, 3 Apr 2023 07:33:44 GMT (envelope-from git) Date: Mon, 3 Apr 2023 07:33:44 GMT Message-Id: <202304030733.3337Xibt059374@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: 74901941fc86 - main - stress2: Add comment about problem found. Disable run of this test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 74901941fc865a1793f4e83437fdf7899faf14fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=74901941fc865a1793f4e83437fdf7899faf14fe commit 74901941fc865a1793f4e83437fdf7899faf14fe Author: Peter Holm AuthorDate: 2023-04-03 07:33:03 +0000 Commit: Peter Holm CommitDate: 2023-04-03 07:33:03 +0000 stress2: Add comment about problem found. Disable run of this test --- tools/test/stress2/misc/all.exclude | 1 + tools/test/stress2/misc/mlockall6.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index 022075e63cb4..bca9dac4c1bf 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -38,6 +38,7 @@ memguard.sh https://people.freebsd.org/~pho/stress/log/log0088.txt 20210402 memguard2.sh Waiting for fix commit memguard3.sh Waiting for fix commit mlockall2.sh Unrecoverable OOM killing seen 20190203 +mlockall6.sh https://people.freebsd.org/~pho/stress/log/log0430.txt 20230403 mlockall7.sh Needs further investigation 20210123 msetdomain.sh May change policy for random threads to domainset_fixed 20210104 newfs4.sh watchdog fired. newbuf 20190225 diff --git a/tools/test/stress2/misc/mlockall6.sh b/tools/test/stress2/misc/mlockall6.sh index 33b20ce3137a..3041c56573e1 100755 --- a/tools/test/stress2/misc/mlockall6.sh +++ b/tools/test/stress2/misc/mlockall6.sh @@ -30,6 +30,9 @@ # "panic: Lock (rw) vm object not locked @ vm/vm_page.c:1013" seen: # https://people.freebsd.org/~pho/stress/log/mlockall6-2.txt +# "panic: vm_page_unwire: wire count underflow for page..." seen: +# https://people.freebsd.org/~pho/stress/log/log0430.txt + . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 From nobody Mon Apr 3 08:22: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 4PqkQy0LHwz43rbG; Mon, 3 Apr 2023 08:22: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 4PqkQy05Vzz3Gx7; Mon, 3 Apr 2023 08:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680510154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeJD7/sTDPslQU2/p7QPaE0FhbDVC6hJvIxjl6BwUic=; b=k/c/po6ACj1ZW89jdPeY6VnaIO/cDQaJBM9mHilOjDXQjUmit2Tz+DrCZ/WmnHQURw9IY+ oVMtEy1kFI0miHtCxyg/5OUc92Yfl/JM8W63EErKjdtMhZxtI4kPV/rOBfXzC0TYlFq+sJ n8d281ePZywpxOUW51ho6SaBaeWBbiWxWiC6IxPPjs/8XF3BC7xi7fMGX8/R204rJ8fRVM cq3r16Nu1I1XqzTfrXCUVPdXu1JWMZ0cGDJDEWFf1JjVBtDKUkay8kHWH3DZFwobwklqor aoYNE8paV4p2I+mPnHlnJgpAsImJeyT9sR+zTzEZZ5+Gm9giY8hnT472cn8WeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680510154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeJD7/sTDPslQU2/p7QPaE0FhbDVC6hJvIxjl6BwUic=; b=eVAmYwYr3jfi0kSZwUXiO6sbNzn9J3kns4iAUQE8dM2Sz0xCCd/ccbDoTEXCZEPk5QWIkM PpbKDe8h1gbklrLukuf993fNWuqrToLCwGN3S8OvR6ipoMu/mqKYVDj7X/O/h/Wr7ITii9 qA+UvDoXRekMQ0UHvVcF9der+ygf8BrcoWRvXJkHGf6tW0LSz/TDHtCDCsMXJP7H89Fif2 tcO+Hu5/U5hiAswGOSLNUCnspflsZ8K8i88e1v90CAJdirVQ+FX7peZBZkclAG0Z5c6fOP TrEfa5DP4XgH5NxD9rsxIoUlH29aTQwfEWPq2rBU51hakZB74n9HL4HMlknoFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680510154; a=rsa-sha256; cv=none; b=mm8sGJ77RgiUY6CgWmsYsw+u0vYFNY0B2nDBgqFolWLiaVdIHBomSYeqQr9PmgzEUgn9zC 8Q8OLfnZzcL5IQnBYT6jSSU1/FJ21zup3qK04FNotjo3aaEK54JeY2gsVmPimQhGRmmsqO jW8KHIqzqRlFVF6ngPsclG73JyaOv8ms2HGtElCUJv/YLGQFweRvgaHd9CYfscCptgjsuJ xmOh8Lhg/hxSP6bciSlj1Ohiwruxp39au+6vdwFcj+JkuBhO12wEk8YFZ1ziyh3eOSDDqE BmCZ6u1etb/Jp18Sa0xRKOkQsv8Urb7V9wB/upK4ZqucDQKvCxFvPt0VjVOPWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqkQx5yqHzrmZ; Mon, 3 Apr 2023 08:22: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 3338MXoB042362; Mon, 3 Apr 2023 08:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3338MXmY042361; Mon, 3 Apr 2023 08:22:33 GMT (envelope-from git) Date: Mon, 3 Apr 2023 08:22:33 GMT Message-Id: <202304030822.3338MXmY042361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7ae0972c7b8c - main - linsysfs(4): Reimplement listnics() using ifAPI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ae0972c7b8cb46d23ff1e9e5f4a07a72f9bd0cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7ae0972c7b8cb46d23ff1e9e5f4a07a72f9bd0cb commit 7ae0972c7b8cb46d23ff1e9e5f4a07a72f9bd0cb Author: Dmitry Chagin AuthorDate: 2023-04-03 08:22:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-03 08:22:16 +0000 linsysfs(4): Reimplement listnics() using ifAPI Handle if arrival/departure events and VNETs. Differential Revision: https://reviews.freebsd.org/D38901 MFC after: 1 month XMFC with: ifAPI, pseudofs --- sys/compat/linsysfs/linsysfs.c | 186 +------------------ sys/compat/linsysfs/linsysfs.h | 38 ++++ sys/compat/linsysfs/linsysfs_net.c | 356 +++++++++++++++++++++++++++++++++++++ sys/modules/linsysfs/Makefile | 2 +- 4 files changed, 403 insertions(+), 179 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index 356f1af7f1ac..23abd2c32743 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -37,22 +37,19 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include -#include -#include -#include - -#include -#include #include #include +#include + +MALLOC_DEFINE(M_LINSYSFS, "linsysfs", "Linsysfs structures"); + struct scsi_host_queue { TAILQ_ENTRY(scsi_host_queue) scsi_host_next; char *path; @@ -69,175 +66,6 @@ atoi(const char *str) return (int)strtol(str, (char **)NULL, 10); } -static int -linsysfs_ifnet_addr(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", - lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], - lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_addrlen(PFS_FILL_ARGS) -{ - - sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); - return (0); -} - -static int -linsysfs_ifnet_flags(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_ifindex(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_mtu(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) -{ - - /* XXX */ - sbuf_printf(sb, "1000\n"); - return (0); -} - -static int -linsysfs_ifnet_type(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%d\n", lsa.sa_family); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static void -linsysfs_listnics(struct pfs_node *dir) -{ - struct pfs_node *nic; - struct pfs_node *lo; - - nic = pfs_create_dir(dir, "eth0", NULL, NULL, NULL, 0); - - pfs_create_file(nic, "address", &linsysfs_ifnet_addr, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "addr_len", &linsysfs_ifnet_addrlen, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "flags", &linsysfs_ifnet_flags, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "ifindex", &linsysfs_ifnet_ifindex, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "mtu", &linsysfs_ifnet_mtu, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "type", &linsysfs_ifnet_type, - NULL, NULL, NULL, PFS_RD); - - lo = pfs_create_dir(dir, "lo", NULL, NULL, NULL, 0); - - pfs_create_file(lo, "address", &linsysfs_ifnet_addr, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "addr_len", &linsysfs_ifnet_addrlen, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "flags", &linsysfs_ifnet_flags, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "ifindex", &linsysfs_ifnet_ifindex, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "mtu", &linsysfs_ifnet_mtu, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "type", &linsysfs_ifnet_type, - NULL, NULL, NULL, PFS_RD); -} - /* * Filler function for proc_name */ @@ -650,7 +478,6 @@ linsysfs_init(PFS_INIT_ARGS) struct pfs_node *drm; struct pfs_node *pci; struct pfs_node *scsi; - struct pfs_node *net; struct pfs_node *devdir, *chardev; struct pfs_node *kernel; devclass_t devclass; @@ -702,13 +529,14 @@ linsysfs_init(PFS_INIT_ARGS) NULL, NULL, NULL, PFS_RD); linsysfs_listcpus(cpu); - linsysfs_listnics(net); /* /sys/kernel */ kernel = pfs_create_dir(root, "kernel", NULL, NULL, NULL, 0); /* /sys/kernel/debug, mountpoint for lindebugfs. */ pfs_create_dir(kernel, "debug", NULL, NULL, NULL, 0); + linsysfs_net_init(); + return (0); } @@ -727,6 +555,8 @@ linsysfs_uninit(PFS_INIT_ARGS) free(scsi_host, M_TEMP); } + linsysfs_net_uninit(); + return (0); } diff --git a/sys/compat/linsysfs/linsysfs.h b/sys/compat/linsysfs/linsysfs.h new file mode 100644 index 000000000000..005c0e090a6b --- /dev/null +++ b/sys/compat/linsysfs/linsysfs.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Dmitry Chagin + * + * 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 _COMPAT_LINSYSFS_LINSYSFS_H_ +#define _COMPAT_LINSYSFS_LINSYSFS_H_ + +MALLOC_DECLARE(M_LINSYSFS); + +extern struct pfs_node *net; + +void linsysfs_net_init(void); +void linsysfs_net_uninit(void); + +#endif /* _COMPAT_LINSYSFS_LINSYSFS_H_ */ diff --git a/sys/compat/linsysfs/linsysfs_net.c b/sys/compat/linsysfs/linsysfs_net.c new file mode 100644 index 000000000000..bd695da2cbb0 --- /dev/null +++ b/sys/compat/linsysfs/linsysfs_net.c @@ -0,0 +1,356 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Dmitry Chagin + * + * 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 +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +struct pfs_node *net; +static eventhandler_tag if_arrival_tag, if_departure_tag; + +static uint32_t net_latch_count = 0; +static struct mtx net_latch_mtx; +MTX_SYSINIT(net_latch_mtx, &net_latch_mtx, "lsfnet", MTX_DEF); + +struct ifp_nodes_queue { + TAILQ_ENTRY(ifp_nodes_queue) ifp_nodes_next; + if_t ifp; + struct vnet *vnet; + struct pfs_node *pn; +}; +TAILQ_HEAD(,ifp_nodes_queue) ifp_nodes_q; + +static void +linsysfs_net_latch_hold(void) +{ + + mtx_lock(&net_latch_mtx); + if (net_latch_count++ > 0) + mtx_sleep(&net_latch_count, &net_latch_mtx, PDROP, "lsfnet", 0); + else + mtx_unlock(&net_latch_mtx); +} + +static void +linsysfs_net_latch_rele(void) +{ + + mtx_lock(&net_latch_mtx); + if (--net_latch_count > 0) + wakeup_one(&net_latch_count); + mtx_unlock(&net_latch_mtx); +} + +static int +linsysfs_if_addr(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + if_t ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", + lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], + lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_if_addrlen(PFS_FILL_ARGS) +{ + + sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); + return (0); +} + +static int +linsysfs_if_flags(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + if_t ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_if_ifindex(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + if_t ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_if_mtu(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + if_t ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_if_txq_len(PFS_FILL_ARGS) +{ + + /* XXX */ + sbuf_printf(sb, "1000\n"); + return (0); +} + +static int +linsysfs_if_type(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + if_t ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%d\n", lsa.sa_family); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_if_visible(PFS_VIS_ARGS) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + struct epoch_tracker et; + if_t ifp; + int visible; + + visible = 0; + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_name); + if (ifp != NULL) { + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->ifp == ifp && nq->vnet == curvnet) { + visible = 1; + break; + } + } + } + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (visible); +} + +static int +linsysfs_net_addif(if_t ifp, void *arg) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + struct pfs_node *nic, *dir = arg; + char ifname[LINUX_IFNAMSIZ]; + struct epoch_tracker et; + int ret __diagused; + + NET_EPOCH_ENTER(et); + ret = ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); + NET_EPOCH_EXIT(et); + KASSERT(ret > 0, ("Interface (%s) is not converted", if_name(ifp))); + + nic = pfs_find_node(dir, ifname); + if (nic == NULL) { + nic = pfs_create_dir(dir, ifname, NULL, linsysfs_if_visible, + NULL, 0); + pfs_create_file(nic, "address", &linsysfs_if_addr, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "addr_len", &linsysfs_if_addrlen, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "flags", &linsysfs_if_flags, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "ifindex", &linsysfs_if_ifindex, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "mtu", &linsysfs_if_mtu, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "tx_queue_len", &linsysfs_if_txq_len, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "type", &linsysfs_if_type, + NULL, NULL, NULL, PFS_RD); + } + /* + * There is a small window between registering the if_arrival + * eventhandler and creating a list of interfaces. + */ + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->ifp == ifp && nq->vnet == curvnet) + return (0); + } + nq = malloc(sizeof(*nq), M_LINSYSFS, M_WAITOK); + nq->pn = nic; + nq->ifp = ifp; + nq->vnet = curvnet; + TAILQ_INSERT_TAIL(&ifp_nodes_q, nq, ifp_nodes_next); + return (0); +} + +static void +linsysfs_net_delif(if_t ifp) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + struct pfs_node *pn; + + pn = NULL; + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->ifp == ifp && nq->vnet == curvnet) { + TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); + pn = nq->pn; + free(nq, M_LINSYSFS); + break; + } + } + if (pn == NULL) + return; + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->pn == pn) + return; + } + pfs_destroy(pn); +} + +static void +linsysfs_if_arrival(void *arg __unused, if_t ifp) +{ + + linsysfs_net_latch_hold(); + (void)linsysfs_net_addif(ifp, net); + linsysfs_net_latch_rele(); +} + +static void +linsysfs_if_departure(void *arg __unused, if_t ifp) +{ + + linsysfs_net_latch_hold(); + linsysfs_net_delif(ifp); + linsysfs_net_latch_rele(); +} + +void +linsysfs_net_init(void) +{ + VNET_ITERATOR_DECL(vnet_iter); + + MPASS(net != NULL); + TAILQ_INIT(&ifp_nodes_q); + + if_arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, + linsysfs_if_arrival, NULL, EVENTHANDLER_PRI_ANY); + if_departure_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, + linsysfs_if_departure, NULL, EVENTHANDLER_PRI_ANY); + + linsysfs_net_latch_hold(); + VNET_LIST_RLOCK(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + if_foreach_sleep(NULL, NULL, linsysfs_net_addif, net); + CURVNET_RESTORE(); + } + VNET_LIST_RUNLOCK(); + linsysfs_net_latch_rele(); +} + +void +linsysfs_net_uninit(void) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + + EVENTHANDLER_DEREGISTER(ifnet_arrival_event, if_arrival_tag); + EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_departure_tag); + + linsysfs_net_latch_hold(); + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); + free(nq, M_LINSYSFS); + } + linsysfs_net_latch_rele(); +} diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile index 058fbbc521b1..8ec02da435e4 100644 --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -5,7 +5,7 @@ KMOD= linsysfs SRCS= vnode_if.h \ device_if.h bus_if.h pci_if.h \ - linsysfs.c + linsysfs.c linsysfs_net.c .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense From nobody Mon Apr 3 10:54:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PqnpS71h7z442fd; Mon, 3 Apr 2023 10:54:40 +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 4PqnpS6WV6z3lBm; Mon, 3 Apr 2023 10:54:40 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680519280; 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=DWFRpeBvACnDU5lEg3H3lpoothJArd7286UzOGECQcs=; b=d6ax/rOAQdu+M5j2/zUdwJ7j3VQNt4xTY5Zg4t3xMIEkIfBfLv7cB9LaA3YBEya7JFiicw gx15BfvKbDxpxVKIQ99WI8tVkwPGdu4+dfwarAnAZKfWJ6orOGDOLHj2YEGGa6i1mK9COn EG7ikttVH7+u5Hm6SMJ/YMv5QQuwqo3EVfGPBfFwgHykl0Kz8Bg3jZqttnsXcOMguFhEqC BgO8Y/augGwPgLbKbqpz2gW1+ZuGCBiCdkRQwxo7YBPwdWeEDKUIdSKkY7Tp3Ig/D4HjUT g3qc2dE+tHwgr5c/79g5pJrkZRVc/ygEo4SLg/BFboYzZ38j/sAOx2+1jb3x9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680519280; 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=DWFRpeBvACnDU5lEg3H3lpoothJArd7286UzOGECQcs=; b=lC00IeY/xI8wodNN6PY0RICF1GLX5/PCrMA2yuFICXfMGuqJQ64ZQSaiZFL04HM55YMMdQ lxSRBZKsYYaRr3EzNoIQFsXulhQeK7X0Yf78Czv+JCiuBRVmIpm2EvXZXQi0T9YO+3i2wz dP2krNGrMgcygk9/rUfaRarEllItR1RGjODTen27NZECybbyR4Pxd0b07IbA81rrzW46Qf ctA1ozS0sBNiS19fRXQ7mRTXulWNqOSaB8f0z9jRifw7KKV6zAleqh2hMCIQS26jyDmrBC pb4jDWg+y6MKpZ9bCzhFtRaGQd4z6AatAtw905+PjegERt8UXu7zYMLT+yi8Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680519280; a=rsa-sha256; cv=none; b=l7kzUjndP4UaSdhku1F4YnmysgLGT9sgjLSXhSsjIcnX88Igm3aH/H8BWz5rDuY9yvrkMz J426ZQarl7Sj9WjXa6FX1EsIIPUuWpNX/FChrU11jhCv+aq1HpeiafxL5MgzakOCGcqqnH 5POZP3jhTrsRhlhxxMi67rA+Ko7KYIiT089iK9KljoPUFQiGQLFeN33XAsh4hSrtGaOKk/ V0b2I9Kp4SzmOr0y00PtnXF0gmlIBT1gok2u0co4HTzkvtuoLYPBhFb22j/YZ1Zm4+c9c6 oY02pgbjCAa8tchA0G8L4QrVGwltWF9wnHZUpjP4KqeKVkQBFnbrpKxBkD4JFA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id C378813734; Mon, 3 Apr 2023 10:54:40 +0000 (UTC) Date: Mon, 3 Apr 2023 10:54:40 +0000 From: Alexey Dokuchaev To: Greg 'groggy' Lehey Cc: Zhenlei Huang , Cheng Cui , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , tuexen@freebsd.org Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." Message-ID: References: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> <20230403073204.GF89483@eureka.lemis.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: <20230403073204.GF89483@eureka.lemis.com> X-ThisMailContainsUnwantedMimeParts: N On Mon, Apr 03, 2023 at 05:32:04PM +1000, Greg 'groggy' Lehey wrote: > On Monday, 3 April 2023 at 14:45:03 +0800, Zhenlei Huang wrote: > >> On Apr 2, 2023, at 12:27 AM, Cheng Cui wrote: > >> > >> Thanks for the concern. It was a mistake that placed my name in the > >> wrong place. The correct change is in 95940a2d2442. > > > > I think this is an impressive start as a committer ;) > > By far not the worst. My first commit was not quite 25 years ago, on > 15 September 1998, and it included: > > * N src/lkm/vinum/emacs.core > > For those youngsters who don't remember CVS, the N means "new file in > repo". > > More details at http://www.lemis.com/grog/diary-sep1998.php#16 > > [quoting the above diary entry] > > [...] > typing the commit message into an Emacs window, the Emacs crashed. That's why one should always prepare commit message first, then pass it via -F option. > Peter was one of the few people allowed to physically remove anything > from the repository, and he did so. Ah, don't we all miss CVS for that. Repocopies were also done with this type of surgery, and that was annoying, but being able to prune those accidentally committed blobs wins it for me (or rather did back in those times ;-). ./danfe From nobody Mon Apr 3 12:20: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 4PqqjR2zlbz447Ps; Mon, 3 Apr 2023 12:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqqjR2HdHz3t5T; Mon, 3 Apr 2023 12:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680524427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jPQwZV0p2Nt7J85WUiJEL2XmiIfZQPMjmfTGWFIGs6M=; b=ELmj1sABPN1xstPEgrJchgRKtFBkT8FcPMEg3uuRCtdfHWuef4tkNvL5ON34R2OQJFksnU x7PWjxht/ww8mk+vpSGOfo/L2GbOEaEt35EncVPF7Bur9ZhV2R1ezDJtuhk/rrf5E1gfMY XV9411YhbGYf2tccTgOnoXFWN5Bmba592dPHeN/Qdss4YBesdgk3vflQYOv1VWo5gto+0t NQyUeKM5a07cmofMNArfNybMPWJxraV/MACqiqPxGcW1vya9uBeQyujkssgmdY9vJSIW49 tMO0yPJGsXeRh/KqEP7iMd3hnVcGUBGDK7x4L22vxr/hD73THTppbBW+Or0IEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680524427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jPQwZV0p2Nt7J85WUiJEL2XmiIfZQPMjmfTGWFIGs6M=; b=dPADRP6zPkCxmJjy34axFt+620ym2BIvhQ0dspmjtGb8U3l4HdVZ6k0bt+F98PdhVwvwYY gJBZpXwv4URj+9XTr5GBzQWizhIB93A4EYQsBaYaixhYt17xtsqfwp0l87AAzMJa4TFBgY 0vkTVtGzyef8fLvO2v0TgmfwxcqrUUyMEQtrDFF4oZFa17dblJxApHHErvPByou7g9AsFT EtNX56xuuZLXk673NSnCNf2E7GuZw1MThpM51Od8JWI7WygJsTAENyrSw9J8yAD2QN4Ydn Z7z9aphr13HFLxm1i3YSDv35soqD7vYXabdcGIwNsfhOga8YZEfFNEHgtO3GXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680524427; a=rsa-sha256; cv=none; b=LTE/QvLXVanYmgV/J6NdZwZZ0ZjC706yAx9/JhUcqRZA7KhKd1PQLY0+cADoX3gT+aHPku 9N1t7lzsJOGnUJO/d/mxAGbuN6u+oeeQVNaleb7KKNE+cnq2DBQq8ghbJL6XA7Jy6vPpiE frn8oFNzizeq94caYLk76BoMaVSzNjzgXP0gdkLdxLyJcUx5iUgGzoaZ3CTPQvqJsi6NW1 VEW6/i1UFr2m9JX3MjKvJvk8QRJlIsJS3kvplrBKb1FDww7V/WWAX1pUTtXGRphORysEtK ABcQECN/bdj/92KQawf/KP7PL0gwxXv6Dj8NPBkU4bHMA396aYZYGt6EE3a+2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqqjR1Fnhzy6P; Mon, 3 Apr 2023 12:20: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 333CKRff029395; Mon, 3 Apr 2023 12:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333CKRCd029394; Mon, 3 Apr 2023 12:20:27 GMT (envelope-from git) Date: Mon, 3 Apr 2023 12:20:27 GMT Message-Id: <202304031220.333CKRCd029394@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: 41236539d8dd - main - Add non-posted device memory to the arm64 mem 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41236539d8ddd9244bd8d7c0a20f239ac7d952d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=41236539d8ddd9244bd8d7c0a20f239ac7d952d2 commit 41236539d8ddd9244bd8d7c0a20f239ac7d952d2 Author: Andrew Turner AuthorDate: 2023-03-31 15:58:57 +0000 Commit: Andrew Turner CommitDate: 2023-04-03 11:59:11 +0000 Add non-posted device memory to the arm64 mem map Add VM_MEMATTR_DEVICE_NP to the arm64 vm.pmap.kernel_maps sysctl. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39371 --- sys/arm64/arm64/pmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index b62673f999e6..2e5b2c23efd7 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -7843,6 +7843,9 @@ sysctl_kmaps_dump(struct sbuf *sb, struct pmap_kernel_map_range *range, index = range->attrs & ATTR_S1_IDX_MASK; switch (index) { + case ATTR_S1_IDX(VM_MEMATTR_DEVICE_NP): + mode = "DEV-NP"; + break; case ATTR_S1_IDX(VM_MEMATTR_DEVICE): mode = "DEV"; break; @@ -7863,7 +7866,7 @@ sysctl_kmaps_dump(struct sbuf *sb, struct pmap_kernel_map_range *range, break; } - sbuf_printf(sb, "0x%016lx-0x%016lx r%c%c%c%c %3s %d %d %d %d\n", + sbuf_printf(sb, "0x%016lx-0x%016lx r%c%c%c%c %6s %d %d %d %d\n", range->sva, eva, (range->attrs & ATTR_S1_AP_RW_BIT) == ATTR_S1_AP_RW ? 'w' : '-', (range->attrs & ATTR_S1_PXN) != 0 ? '-' : 'x', From nobody Mon Apr 3 13:25:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pqs8V4qmMz44CFM; Mon, 3 Apr 2023 13:25:30 +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 4Pqs8V1gKbz40cC; Mon, 3 Apr 2023 13:25:30 +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 j1p2psyjIjvm1jKBdpejXg; Mon, 03 Apr 2023 13:25:29 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id jKBbpEjTsHFsOjKBcp7cPU; Mon, 03 Apr 2023 13:25:29 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=642ad3c9 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=VY3jW7vHAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=tIO1hq_KO8r6tQODacgA:9 a=CjuIK1q_8ugA:10 a=McxduvrkwQ4A:10 a=IjZwj45LgO3ly-622nXo:22 a=UKjBECWEfCFPfndWmoCD: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 C1D234B6D; Mon, 3 Apr 2023 06:25:26 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 794B51DE; Mon, 3 Apr 2023 06:25: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: Alexey Dokuchaev cc: Greg 'groggy' Lehey , Zhenlei Huang , Cheng Cui , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , tuexen@freebsd.org Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." In-reply-to: References: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> <20230403073204.GF89483@eureka.lemis.com> Comments: In-reply-to Alexey Dokuchaev message dated "Mon, 03 Apr 2023 10:54:40 -0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 03 Apr 2023 06:25:26 -0700 Message-Id: <20230403132526.794B51DE@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNpA8wxsl0ckyBRcqD0SdpDiPREiWhPMxBnmzxG7GHAcKyYnbiItUXju+IFCjGJRUVWcOCyC+ieljARVj3t1NFq8SCuUovmLypfi7wkjJ16NnAz4+Wci BU9/cU1fApOXXthTyytv5iBCTSO4GEdAaWJdayjCytf4Me6Xg9BDA5wxQ5lpebBrKU3+Wtq/q3PE5fUi6gbvR72K9FLeiNp+kyE+oDXAriJHqZPA0o1kin4Z A3ErlJbe3vPSq95gIjB9vDZek6CIXCiHBb8q1i+B4svoZz/WkjAXUWng41vXA+mr7Lhs5vxuKxT7yfe9XLv1ST1KT1gYZjgAMqCI+wJTEdWYOwGRSvebl5HU BTpkiX6cdnohgyhn9zJbZjb+PBSq0sHy11T4P8MzqUBxv9xthY0PqhdZcOJP4OC5J9krPpTBXwp6SSzGrJMS4YKpOt7yeQ== X-Rspamd-Queue-Id: 4Pqs8V1gKbz40cC 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 , Alexey Dokuchaev writes: > On Mon, Apr 03, 2023 at 05:32:04PM +1000, Greg 'groggy' Lehey wrote: > > On Monday, 3 April 2023 at 14:45:03 +0800, Zhenlei Huang wrote: > > >> On Apr 2, 2023, at 12:27 AM, Cheng Cui wrote: > > >> > > >> Thanks for the concern. It was a mistake that placed my name in the > > >> wrong place. The correct change is in 95940a2d2442. > > > > > > I think this is an impressive start as a committer ;) > > > > By far not the worst. My first commit was not quite 25 years ago, on > > 15 September 1998, and it included: > > > > * N src/lkm/vinum/emacs.core > > > > For those youngsters who don't remember CVS, the N means "new file in > > repo". > > > > More details at http://www.lemis.com/grog/diary-sep1998.php#16 > > > > [quoting the above diary entry] > > > > [...] > > typing the commit message into an Emacs window, the Emacs crashed. > > That's why one should always prepare commit message first, then pass > it via -F option. > > > Peter was one of the few people allowed to physically remove anything > > from the repository, and he did so. > > Ah, don't we all miss CVS for that. Repocopies were also done with this > type of surgery, and that was annoying, but being able to prune those > accidentally committed blobs wins it for me (or rather did back in those > times ;-). I recall doing that king of CVS surgery at $JOB at the time. And I use the term surgery very loosely. It was a hack. Check out the deve/git-filter-repo port. It allows you to rewrite history from years ago as if those commits were never made. I used it to rewrite telnet and ftp from the FreeBSD repo into their own repos, as if they were the only things in the repo from the beginning. The real trick is to reduce the size of the repo from its GB to MB or even KB if possible. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Apr 3 14:23: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 4PqtRh53BHz42p6C; Mon, 3 Apr 2023 14:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqtRh4S1Fz44Hl; Mon, 3 Apr 2023 14:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680531824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnpG2hTT/aZsczG8YTvP0O0YHcRJkr/u3xddvXhPXoE=; b=AdexTeTbhwrTDJ81ltKfTxpTN4FJmarRIvbK4WxfoA09ooc0wUwCgbbhbtQrtEglFJWA1X 2eC5P6HKWi+HmQWr5VvbYRRp3EmoOZWIeTqpWf1fVVisvqHcM9DccFGjxFMust/YU4A06B H8NG69Y0Iufg466mgnt9DD5UZrRNvTqDJN9sdmarui8YD1yHRf4e0RTKnvBVnHBW3zgW1l fjqReEDoLR1MxltgGRbYXJ3fbMDXxdU1DYt3xW2owPE/0rOS4hL+nNPNy9hb2uTrYjhndA vvlBQli6Q6edabfQKTf+K7LgaFaYmdjsAFISQtsCqG4kbqA5xvicnavyCQEbWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680531824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnpG2hTT/aZsczG8YTvP0O0YHcRJkr/u3xddvXhPXoE=; b=NulcwPJQ/dMgghGqbQ10mZB+kghMf0/DJRWo0vlwtA6FJwVDUVd8o1ulONkfFyF5Wyd7/4 Di5QbxBzcmAV54zbBs7JSrx+WlAdS37XJAcU3RPk95shUxFPqoAIMnBEVLE/HbLFja6LiJ KinEDk1Mg7Caloxx+dGa+ApvSgO6MyINMMDvvS0f7nQ/jYzo3/ZksORS+bb60V3ZDRgcV1 mEtRz71Du5rdueynz3oQg1lkC//A5e3dx7NH7TLTuTl9/1o+7+mcMfeTzK19zLOMxlGAJZ R1h7B9Ix0jZDdDXqrM3icewcSba/GgbQ+7eCv33U3D0eGUB1IZifPsxKRcLt6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680531824; a=rsa-sha256; cv=none; b=AMc7NhpBbfgsPsUrmmBAJk9co47HpypD+Pk2ZrVEsQNIQaui5kkVzxxc89fuvWhM6kfw5B jFsHqvPdBr5z0vTlE52vMBp1xAz5/lqhezYKtBbffH0di7bKtTLciCEkx85CuEzOGv5DhK 0IpOlDqK0WOdAcuTMUmSlQWy0vc1fCn+2VJ62+aLVrIk8LNUfhnZeUt/FJGfn20a83R87t IxoLsWsY1hh/Iv75eHbXVRXSHrc/TAYyugOb708Nb9k4dcs6Wr48lCDmRxTlGPmjFTruO/ a/nTAAekxK+0uyAaHCTXFVtszs9UJo1CfI2Vq7xntQPjcT5EJRw6B/bBKsV4mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqtRh3Vd7z12Fb; Mon, 3 Apr 2023 14:23: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 333ENi8h033310; Mon, 3 Apr 2023 14:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333ENiWj033309; Mon, 3 Apr 2023 14:23:44 GMT (envelope-from git) Date: Mon, 3 Apr 2023 14:23:44 GMT Message-Id: <202304031423.333ENiWj033309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ganbold Tsagaankhuu Subject: git: b98fbf3781df - main - Fix driver name. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ganbold X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b98fbf3781df16f7797b2bbeabf205dc7d4985ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ganbold: URL: https://cgit.FreeBSD.org/src/commit/?id=b98fbf3781df16f7797b2bbeabf205dc7d4985ae commit b98fbf3781df16f7797b2bbeabf205dc7d4985ae Author: Ganbold Tsagaankhuu AuthorDate: 2023-04-03 14:20:28 +0000 Commit: Ganbold Tsagaankhuu CommitDate: 2023-04-03 14:20:28 +0000 Fix driver name. Submitted by: Tyuryukanov S.Y. --- sys/arm64/rockchip/rk3568_pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c index 7626cfb10015..525b1356ae2e 100644 --- a/sys/arm64/rockchip/rk3568_pcie.c +++ b/sys/arm64/rockchip/rk3568_pcie.c @@ -394,4 +394,4 @@ static device_method_t rk3568_pcie_methods[] = { DEFINE_CLASS_1(pcib, rk3568_pcie_driver, rk3568_pcie_methods, sizeof(struct rk3568_pcie_softc), pci_dw_driver); -DRIVER_MODULE(mv_pcie, simplebus, rk3568_pcie_driver, NULL, NULL); +DRIVER_MODULE(rk3568_pcie, simplebus, rk3568_pcie_driver, NULL, NULL); From nobody Mon Apr 3 15:13: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 4PqvXn1Xqyz42sCh; Mon, 3 Apr 2023 15: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 4PqvXn1DpCz485T; Mon, 3 Apr 2023 15: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=1680534793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kucRAGyeHF+77zdZcMduLiYpfmkBSqZ+WgL0Mk8Nba4=; b=tMOUPItoAunXZjnLJXaUaojEULfHiP6H+1F6G5svBPBJMjLa2R1lAOJhUYz9Y7fXZjhIWX H2XQBuDN9NZTOFumMKK39dz10NYtkVzF3LUaA7HquRA4iR+kuoYn6y8Bhqlv9KNF/vmDm6 q2aq2zfls0gK/23LNDDi9Jp+MrrqQAhJNd9mH2fhZLyfbbo56DOZMOJykjsfyjyvMjdfEV /vK3CpesWjQTP3ObJ6Vl0VIeORNMZF1Ho/lBuvDRgU3pLav01Mu4m137uToJ4VM+QRq8rY VODmc8hBUUOekB2plcIwU303RiFArLMdwPvf3woF1wdWOiCm3feTIpoIKbX6gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680534793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kucRAGyeHF+77zdZcMduLiYpfmkBSqZ+WgL0Mk8Nba4=; b=NnZAhq7XFWpRh24mSd50+7fjhRyUCSM/pNPzBmW3O5ymMmXMicjLHZJZIZvsgbP48eoP2S zpVoFPTDLl/WdDwN4vxLmmG7e9z1YBVHsUtqEQcqosa5q3klcrlStGwzccytPThJBqAoQK Dz7b81T+J/uGRtKu5nFu7YzkVvGn1+pcwOyJ57ir7+lVTTBP48Byp/Gf3vb/XNwTHfMWOa LvGmggU1x8H0u7F9tkY/0tgQcOFvS9HEu3Qa8uxiqVI7asdRCKn9BGLftOBcdQfVZFtS9f oIb82kVXWE9Lf6YJF7hVpMm8f2DnPRNGNrRg3Lapj3f+90GEyT2HLk72HpWBrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680534793; a=rsa-sha256; cv=none; b=xZG3yFMsUf33GskBkR+lahzpVbnXOfS+4vRm5AQvh+m1+77wYDWGtET7l1RRgk0VM7Cqz8 HGfd7+EkQI5MJ+cnHvVjs7w2ajDGeG0Qpoom2L58yfmdu+C9pFvOXH5u1RPkoD88QsUWpn pMKLysNTfb2rAPDwQSs7BZwaij9ZDnSLwzhrQgDrw2idMPHrSPa3zugjAgxrsLAdmlipFw FTMQ8XwQM4AnSnzTbB58f9wgYKljP0bCt8IwoyTrduyvyDH6MRAXGPd1Cxa8nNCJ8dWsfI 8QSMkWfDhxPIb93u+5WKdKlrVZiyGRC6EAZZkpMPSECcaO4o+mz0aa/wuZotXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqvXn0GBjz12by; Mon, 3 Apr 2023 15:13: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 333FDCns014912; Mon, 3 Apr 2023 15: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 333FD6qw014903; Mon, 3 Apr 2023 15:13:06 GMT (envelope-from git) Date: Mon, 3 Apr 2023 15:13:06 GMT Message-Id: <202304031513.333FD6qw014903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a58b312b62f908ec92311d1bd8536dbaeb8e55b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2a58b312b62f908ec92311d1bd8536dbaeb8e55b commit 2a58b312b62f908ec92311d1bd8536dbaeb8e55b Merge: b98fbf3781df 431083f75bdd Author: Martin Matuska AuthorDate: 2023-04-03 14:49:30 +0000 Commit: Martin Matuska CommitDate: 2023-04-03 14:49:30 +0000 zfs: merge openzfs/zfs@431083f75 Notable upstream pull request merges: #12194 Fix short-lived txg caused by autotrim #13368 ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced() #13392 Implementation of block cloning for ZFS #13741 SHA2 reworking and API for iterating over multiple implementations #14282 Sync thread should avoid holding the spa config write lock when possible #14283 txg_sync should handle write errors in ZIL #14359 More adaptive ARC eviction #14469 Fix NULL pointer dereference in zio_ready() #14479 zfs redact fails when dnodesize=auto #14496 improve error message of zfs redact #14500 Skip memory allocation when compressing holes #14501 FreeBSD: don't verify recycled vnode for zfs control directory #14502 partially revert PR 14304 (eee9362a7) #14509 Fix per-jail zfs.mount_snapshot setting #14514 Fix data race between zil_commit() and zil_suspend() #14516 System-wide speculative prefetch limit #14517 Use rw_tryupgrade() in dmu_bonus_hold_by_dnode() #14519 Do not hold spa_config in ZIL while blocked on IO #14523 Move dmu_buf_rele() after dsl_dataset_sync_done() #14524 Ignore too large stack in case of dsl_deadlist_merge #14526 Use .section .rodata instead of .rodata on FreeBSD #14528 ICP: AES-GCM: Refactor gcm_clear_ctx() #14529 ICP: AES-GCM: Unify gcm_init_ctx() and gmac_init_ctx() #14532 Handle unexpected errors in zil_lwb_commit() without ASSERT() #14544 icp: Prevent compilers from optimizing away memset() in gcm_clear_ctx() #14546 Revert zfeature_active() to static #14556 Remove bad kmem_free() oversight from previous zfsdev_state_list patch #14563 Optimize the is_l2cacheable functions #14565 FreeBSD: zfs_znode_alloc: lock the vnode earlier #14566 FreeBSD: fix false assert in cache_vop_rmdir when replaying ZIL #14567 spl: Add cmn_err_once() to log a message only on the first call #14568 Fix incremental receive silently failing for recursive sends #14569 Restore ASMABI and other Unify work #14576 Fix detection of IBM Power8 machines (ISA 2.07) #14577 Better handling for future crypto parameters #14600 zcommon: Refactor FPU state handling in fletcher4 #14603 Fix prefetching of indirect blocks while destroying #14633 Fixes in persistent error log #14639 FreeBSD: Remove extra arc_reduce_target_size() call #14641 Additional limits on hole reporting #14649 Drop lying to the compiler in the fletcher4 code #14652 panic loop when removing slog device #14653 Update vdev state for spare vdev #14655 Fix cloning into already dirty dbufs #14678 Revert "Do not hold spa_config in ZIL while blocked on IO" Obtained from: OpenZFS OpenZFS commit: 431083f75bdd3efaee992bdd672625ec7240d252 cddl/lib/libicp/Makefile | 52 +- cddl/lib/libicp_rescue/Makefile | 50 +- cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzpool/Makefile | 5 +- cddl/usr.sbin/zdb/Makefile | 2 +- cddl/usr.sbin/zfsd/case_file.cc | 5 +- cddl/usr.sbin/zfsd/vdev.cc | 4 +- cddl/usr.sbin/zfsd/zfsd_exception.cc | 2 +- lib/libbe/be.c | 4 +- sbin/bectl/bectl.c | 9 +- sbin/bectl/bectl_jail.c | 5 +- sbin/bectl/bectl_list.c | 15 +- stand/libsa/zfs/Makefile.inc | 22 +- stand/libsa/zfs/blake3_impl_hack.c | 2 + sys/conf/files | 15 +- sys/conf/files.amd64 | 15 + sys/conf/files.arm | 5 + sys/conf/files.arm64 | 15 + sys/conf/files.powerpc | 9 + sys/contrib/openzfs/.github/workflows/README.md | 51 + .../openzfs/.github/workflows/checkstyle.yaml | 6 +- .../.github/workflows/scripts/generate-summary.sh | 119 + .../workflows/scripts/reclaim_disk_space.sh | 20 - .../workflows/scripts/setup-dependencies.sh | 93 + .../.github/workflows/scripts/setup-functional.sh | 24 + .../openzfs/.github/workflows/zfs-linux-tests.yml | 124 + .../openzfs/.github/workflows/zfs-linux.yml | 64 + .../.github/workflows/zfs-tests-functional.yml | 84 - .../openzfs/.github/workflows/zfs-tests-sanity.yml | 80 - sys/contrib/openzfs/.github/workflows/zloop.yml | 63 - sys/contrib/openzfs/cmd/arc_summary | 101 +- sys/contrib/openzfs/cmd/mount_zfs.c | 2 +- sys/contrib/openzfs/cmd/zdb/Makefile.am | 3 + sys/contrib/openzfs/cmd/zdb/zdb.c | 190 +- sys/contrib/openzfs/cmd/zdb/zdb_il.c | 19 + sys/contrib/openzfs/cmd/zed/agents/fmd_api.c | 6 +- sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c | 6 +- sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 4 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 26 +- sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c | 8 +- sys/contrib/openzfs/cmd/zed/zed_disk_event.c | 10 +- sys/contrib/openzfs/cmd/zed/zed_event.c | 6 +- sys/contrib/openzfs/cmd/zfs/zfs_iter.c | 2 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 70 +- sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 4 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 125 +- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 33 +- .../openzfs/cmd/zpool_influxdb/zpool_influxdb.c | 6 +- sys/contrib/openzfs/cmd/ztest.c | 13 +- sys/contrib/openzfs/config/always-arch.m4 | 6 +- sys/contrib/openzfs/config/kernel-blk-queue.m4 | 4 +- .../openzfs/config/kernel-cpu_has_feature.m4 | 29 + .../openzfs/config/kernel-flush_dcache_page.m4 | 26 + .../openzfs/config/kernel-generic_io_acct.m4 | 98 +- sys/contrib/openzfs/config/kernel.m4 | 12 + sys/contrib/openzfs/config/user.m4 | 2 +- .../contrib/debian/openzfs-zfsutils.install | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 11 +- .../contrib/pyzfs/libzfs_core/_constants.py | 1 + sys/contrib/openzfs/include/Makefile.am | 4 + sys/contrib/openzfs/include/libnvpair.h | 11 +- sys/contrib/openzfs/include/libzfs.h | 2 +- sys/contrib/openzfs/include/libzutil.h | 6 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 3 +- .../openzfs/include/os/freebsd/spl/sys/cmn_err.h | 33 + .../openzfs/include/os/freebsd/spl/sys/mod_os.h | 6 + .../openzfs/include/os/freebsd/spl/sys/simd.h | 6 + .../include/os/freebsd/spl/sys/simd_aarch64.h | 84 + .../openzfs/include/os/freebsd/spl/sys/simd_arm.h | 74 + .../include/os/freebsd/spl/sys/simd_powerpc.h | 50 +- .../openzfs/include/os/freebsd/spl/sys/simd_x86.h | 18 + .../openzfs/include/os/freebsd/spl/sys/vnode.h | 4 + .../openzfs/include/os/freebsd/zfs/sys/sha2.h | 197 - .../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 5 +- sys/contrib/openzfs/include/os/linux/Makefile.am | 2 +- .../include/os/linux/kernel/linux/blkdev_compat.h | 10 +- .../include/os/linux/kernel/linux/dcache_compat.h | 15 + .../include/os/linux/kernel/linux/mod_compat.h | 1 + .../openzfs/include/os/linux/kernel/linux/simd.h | 5 +- .../include/os/linux/kernel/linux/simd_aarch64.h | 76 +- .../include/os/linux/kernel/linux/simd_arm.h | 80 + .../include/os/linux/kernel/linux/simd_powerpc.h | 66 +- .../include/os/linux/kernel/linux/simd_x86.h | 15 + sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h | 3 - .../openzfs/include/os/linux/spl/sys/cmn_err.h | 17 + .../openzfs/include/os/linux/spl/sys/mutex.h | 1 + .../openzfs/include/os/linux/zfs/sys/sha2.h | 148 - .../include/os/linux/zfs/sys/zfs_vnops_os.h | 2 +- .../include/os/linux/zfs/sys/zfs_znode_impl.h | 3 +- sys/contrib/openzfs/include/sys/arc.h | 1 - sys/contrib/openzfs/include/sys/arc_impl.h | 44 +- sys/contrib/openzfs/include/sys/bitmap.h | 93 + sys/contrib/openzfs/include/sys/blake3.h | 26 +- sys/contrib/openzfs/include/sys/brt.h | 62 + sys/contrib/openzfs/include/sys/dbuf.h | 2 + sys/contrib/openzfs/include/sys/ddt.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 8 + sys/contrib/openzfs/include/sys/dmu_recv.h | 4 +- sys/contrib/openzfs/include/sys/dmu_tx.h | 1 + sys/contrib/openzfs/include/sys/dsl_dataset.h | 1 - sys/contrib/openzfs/include/sys/edonr.h | 41 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 + sys/contrib/openzfs/include/sys/nvpair.h | 21 +- sys/contrib/openzfs/include/sys/sha2.h | 127 + sys/contrib/openzfs/include/sys/spa.h | 5 +- sys/contrib/openzfs/include/sys/spa_impl.h | 2 + sys/contrib/openzfs/include/sys/vdev.h | 5 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_trim.h | 1 + sys/contrib/openzfs/include/sys/zfs_debug.h | 1 + sys/contrib/openzfs/include/sys/zfs_impl.h | 69 + sys/contrib/openzfs/include/sys/zfs_vnops.h | 4 + sys/contrib/openzfs/include/sys/zfs_znode.h | 3 + sys/contrib/openzfs/include/sys/zil.h | 25 +- sys/contrib/openzfs/include/sys/zil_impl.h | 1 + sys/contrib/openzfs/include/sys/zio.h | 7 +- sys/contrib/openzfs/include/sys/zio_checksum.h | 6 +- sys/contrib/openzfs/include/sys/zio_compress.h | 2 +- sys/contrib/openzfs/include/sys/zio_impl.h | 41 +- sys/contrib/openzfs/include/zfeature_common.h | 1 + sys/contrib/openzfs/include/zfs_fletcher.h | 27 +- sys/contrib/openzfs/lib/libicp/Makefile.am | 28 +- sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 4452 +++++----- sys/contrib/openzfs/lib/libnvpair/libnvpair.c | 41 +- sys/contrib/openzfs/lib/libnvpair/libnvpair_json.c | 4 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 - .../openzfs/lib/libspl/include/sys/cmn_err.h | 34 + sys/contrib/openzfs/lib/libspl/include/sys/sha2.h | 148 - sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 122 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 980 ++- sys/contrib/openzfs/lib/libzfs/Makefile.am | 3 - sys/contrib/openzfs/lib/libzfs/libzfs.abi | 8853 ++++++++++++++------ sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 13 +- sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 30 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 6 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_import.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_iter.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 46 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 54 +- sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 17 +- .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 2 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 1838 ++-- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 507 +- .../openzfs/lib/libzfsbootenv/lzbe_device.c | 17 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 3 +- sys/contrib/openzfs/lib/libzpool/util.c | 9 +- .../lib/libzutil/os/linux/zutil_import_os.c | 12 +- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 48 +- sys/contrib/openzfs/lib/libzutil/zutil_import.h | 4 +- sys/contrib/openzfs/man/Makefile.am | 1 + sys/contrib/openzfs/man/man4/zfs.4 | 82 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 15 + sys/contrib/openzfs/man/man7/zpoolprops.7 | 27 +- sys/contrib/openzfs/man/man8/zdb.8 | 28 + sys/contrib/openzfs/man/man8/zfs-receive.8 | 15 +- sys/contrib/openzfs/man/man8/zfs.8 | 2 + sys/contrib/openzfs/man/man8/zpool-events.8 | 34 +- sys/contrib/openzfs/man/man8/zpool.8 | 2 + sys/contrib/openzfs/module/Kbuild.in | 39 +- sys/contrib/openzfs/module/Makefile.bsd | 219 +- sys/contrib/openzfs/module/avl/avl.c | 6 +- .../openzfs/module/icp/algs/blake3/blake3.c | 3 +- .../module/icp/algs/blake3/blake3_generic.c | 6 +- .../openzfs/module/icp/algs/blake3/blake3_impl.c | 423 +- .../openzfs/module/icp/algs/blake3/blake3_impl.h | 31 +- .../openzfs/module/icp/algs/blake3/blake3_x86-64.c | 252 - sys/contrib/openzfs/module/icp/algs/edonr/edonr.c | 783 +- .../module/icp/algs/edonr/edonr_byteorder.h | 216 - sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 228 +- sys/contrib/openzfs/module/icp/algs/modes/modes.c | 53 +- sys/contrib/openzfs/module/icp/algs/sha2/sha2.c | 957 --- .../openzfs/module/icp/algs/sha2/sha256_impl.c | 309 + .../openzfs/module/icp/algs/sha2/sha2_generic.c | 562 ++ .../openzfs/module/icp/algs/sha2/sha512_impl.c | 285 + .../module/icp/asm-aarch64/sha2/sha256-armv8.S | 1999 +++++ .../module/icp/asm-aarch64/sha2/sha512-armv8.S | 1558 ++++ .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 2769 ++++++ .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 1822 ++++ .../openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S | 1505 ++++ .../openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S | 2712 ++++++ .../openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S | 1706 ++++ .../openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S | 2958 +++++++ .../module/icp/asm-x86_64/sha2/sha256-x86_64.S | 5104 +++++++++++ .../module/icp/asm-x86_64/sha2/sha256_impl.S | 2090 ----- .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 4011 +++++++++ .../module/icp/asm-x86_64/sha2/sha512_impl.S | 2115 ----- .../openzfs/module/icp/include/generic_impl.c | 233 + .../openzfs/module/icp/include/modes/modes.h | 2 + .../openzfs/module/icp/include/sha2/sha2_consts.h | 219 - .../openzfs/module/icp/include/sha2/sha2_impl.h | 27 +- sys/contrib/openzfs/module/icp/io/aes.c | 25 +- sys/contrib/openzfs/module/icp/io/sha2_mod.c | 1 - sys/contrib/openzfs/module/nvpair/fnvpair.c | 12 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 27 +- sys/contrib/openzfs/module/os/freebsd/spl/sha224.h | 96 - sys/contrib/openzfs/module/os/freebsd/spl/sha256.h | 99 - .../openzfs/module/os/freebsd/spl/sha256c.c | 378 - sys/contrib/openzfs/module/os/freebsd/spl/sha384.h | 96 - sys/contrib/openzfs/module/os/freebsd/spl/sha512.h | 101 - .../openzfs/module/os/freebsd/spl/sha512c.c | 508 -- .../openzfs/module/os/freebsd/spl/sha512t.h | 143 - .../openzfs/module/os/freebsd/spl/spl_sysevent.c | 4 +- sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 4 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 2 +- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 79 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 7 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 102 +- .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 41 +- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 3 + .../openzfs/module/os/linux/spl/spl-generic.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 2 +- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 172 +- .../openzfs/module/os/linux/zfs/zfs_znode.c | 2 +- .../openzfs/module/os/linux/zfs/zio_crypt.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 17 +- .../openzfs/module/os/linux/zfs/zpl_super.c | 22 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 3 +- .../openzfs/module/zcommon/zfeature_common.c | 6 + sys/contrib/openzfs/module/zcommon/zfs_comutil.c | 4 +- sys/contrib/openzfs/module/zcommon/zfs_deleg.c | 4 +- sys/contrib/openzfs/module/zcommon/zfs_fletcher.c | 29 +- .../module/zcommon/zfs_fletcher_aarch64_neon.c | 5 +- .../openzfs/module/zcommon/zfs_fletcher_avx512.c | 6 +- .../openzfs/module/zcommon/zfs_fletcher_intel.c | 5 +- .../openzfs/module/zcommon/zfs_fletcher_sse.c | 6 +- .../module/zcommon/zfs_fletcher_superscalar.c | 5 +- .../module/zcommon/zfs_fletcher_superscalar4.c | 5 +- sys/contrib/openzfs/module/zcommon/zfs_prop.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 9 + sys/contrib/openzfs/module/zfs/arc.c | 986 +-- sys/contrib/openzfs/module/zfs/bpobj.c | 1 + sys/contrib/openzfs/module/zfs/brt.c | 1884 +++++ sys/contrib/openzfs/module/zfs/dbuf.c | 200 +- sys/contrib/openzfs/module/zfs/ddt.c | 55 + sys/contrib/openzfs/module/zfs/dmu.c | 204 +- sys/contrib/openzfs/module/zfs/dmu_object.c | 2 + sys/contrib/openzfs/module/zfs/dmu_objset.c | 38 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 51 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_traverse.c | 24 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 47 +- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 29 +- sys/contrib/openzfs/module/zfs/dnode.c | 26 +- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 16 +- sys/contrib/openzfs/module/zfs/dsl_crypt.c | 21 +- sys/contrib/openzfs/module/zfs/dsl_dataset.c | 42 +- sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 28 +- sys/contrib/openzfs/module/zfs/dsl_destroy.c | 2 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 + sys/contrib/openzfs/module/zfs/dsl_pool.c | 1 + sys/contrib/openzfs/module/zfs/dsl_prop.c | 2 +- sys/contrib/openzfs/module/zfs/dsl_scan.c | 17 +- sys/contrib/openzfs/module/zfs/dsl_userhold.c | 4 +- sys/contrib/openzfs/module/zfs/edonr_zfs.c | 8 +- sys/contrib/openzfs/module/zfs/fm.c | 2 +- sys/contrib/openzfs/module/zfs/sa.c | 3 +- .../openzfs/module/zfs/{sha256.c => sha2_zfs.c} | 14 +- sys/contrib/openzfs/module/zfs/spa.c | 82 +- sys/contrib/openzfs/module/zfs/spa_config.c | 4 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 340 +- sys/contrib/openzfs/module/zfs/spa_history.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 7 +- sys/contrib/openzfs/module/zfs/vdev.c | 49 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 6 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 37 +- sys/contrib/openzfs/module/zfs/vdev_raidz_math.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 72 +- sys/contrib/openzfs/module/zfs/zap_leaf.c | 2 +- sys/contrib/openzfs/module/zfs/zcp.c | 2 +- sys/contrib/openzfs/module/zfs/zcp_get.c | 2 +- sys/contrib/openzfs/module/zfs/zcp_iter.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_chksum.c | 124 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_impl.c | 61 + sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 70 +- sys/contrib/openzfs/module/zfs/zfs_log.c | 52 + sys/contrib/openzfs/module/zfs/zfs_quota.c | 3 +- sys/contrib/openzfs/module/zfs/zfs_replay.c | 30 + sys/contrib/openzfs/module/zfs/zfs_vnops.c | 469 +- sys/contrib/openzfs/module/zfs/zil.c | 191 +- sys/contrib/openzfs/module/zfs/zio.c | 74 +- sys/contrib/openzfs/module/zfs/zio_checksum.c | 11 +- sys/contrib/openzfs/module/zfs/zio_compress.c | 7 +- sys/contrib/openzfs/module/zfs/zvol.c | 55 + sys/contrib/openzfs/scripts/kmodtool | 30 +- sys/contrib/openzfs/scripts/mancheck.sh | 2 +- sys/contrib/openzfs/tests/runfiles/common.run | 41 +- .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 3 + .../tests/zfs-tests/callbacks/zfs_dmesg.ksh | 3 +- .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 1 + .../tests/zfs-tests/cmd/checksum/blake3_test.c | 18 +- .../tests/zfs-tests/cmd/checksum/edonr_test.c | 83 +- .../tests/zfs-tests/cmd/checksum/sha2_test.c | 34 +- sys/contrib/openzfs/tests/zfs-tests/cmd/draid.c | 2 +- sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c | 4 +- .../tests/zfs-tests/cmd/libzfs_input_check.c | 2 +- .../openzfs/tests/zfs-tests/cmd/mmap_sync.c | 2 +- .../openzfs/tests/zfs-tests/cmd/nvlist_to_lua.c | 2 +- .../openzfs/tests/zfs-tests/cmd/renameat2.c | 2 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 6 + .../tests/functional/cli_root/zdb/zdb_args_neg.ksh | 2 +- .../functional/cli_root/zdb/zdb_encrypted.ksh | 69 + .../zfs_receive/zfs_receive_corrective.ksh | 2 +- .../zfs_receive_large_block_corrective.ksh | 194 + .../functional/cli_root/zpool_get/zpool_get.cfg | 4 + .../cli_root/zpool_status/zpool_status_003_pos.ksh | 2 + .../cli_root/zpool_status/zpool_status_005_pos.ksh | 20 +- .../cli_root/zpool_status/zpool_status_006_pos.ksh | 97 + .../cli_root/zpool_status/zpool_status_007_pos.ksh | 98 + .../functional/migration/migration_012_pos.ksh | 4 +- .../zfs-tests/tests/functional/mmap/mmap_mixed.ksh | 86 + .../tests/functional/renameat2/cleanup.ksh | 2 +- .../functional/renameat2/renameat2_exchange.ksh | 2 +- .../functional/renameat2/renameat2_noreplace.ksh | 2 +- .../functional/renameat2/renameat2_whiteout.ksh | 2 +- .../zfs-tests/tests/functional/renameat2/setup.ksh | 2 +- .../tests/functional/rsend/rsend_031_pos.ksh | 63 + .../tests/functional/snapshot/snapshot_018_pos.ksh | 2 +- .../openzfs/tests/zfs-tests/tests/perf/perf.shlib | 1 - sys/modules/zfs/Makefile | 242 +- sys/modules/zfs/zfs_config.h | 10 +- sys/modules/zfs/zfs_gitrev.h | 2 +- usr.sbin/fstyp/zfs.c | 2 +- 332 files changed, 47407 insertions(+), 17330 deletions(-) diff --cc cddl/lib/libicp/Makefile index d00a47f2529a,000000000000..db791854efae mode 100644,000000..100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@@ -1,121 -1,0 +1,143 @@@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp + +PACKAGE= zfs +LIB= icp +LIBADD= + - +.if ${MACHINE_ARCH} == "amd64" +ASM_SOURCES_C = asm-x86_64/aes/aeskey.c +ASM_SOURCES_AS = \ + asm-x86_64/aes/aes_amd64.S \ + asm-x86_64/aes/aes_aesni.S \ + asm-x86_64/modes/gcm_pclmulqdq.S \ + asm-x86_64/modes/aesni-gcm-x86_64.S \ + asm-x86_64/modes/ghash-x86_64.S \ - asm-x86_64/sha2/sha256_impl.S \ - asm-x86_64/sha2/sha512_impl.S \ ++ asm-x86_64/sha2/sha256-x86_64.S \ ++ asm-x86_64/sha2/sha512-x86_64.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S + +CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES ++.elif ${MACHINE_ARCH} == "armv7" ++ASM_SOURCES_C = ++ASM_SOURCES_AS = \ ++ asm-arm/sha2/sha256-armv7.S \ ++ asm-arm/sha2/sha512-armv7.S +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ - asm-aarch64/blake3/b3_aarch64_sse41.S ++ asm-aarch64/blake3/b3_aarch64_sse41.S \ ++ asm-aarch64/sha2/sha256-armv8.S \ ++ asm-aarch64/sha2/sha512-armv8.S ++.elif ${MACHINE_ARCH} == "powerpc64" ++ASM_SOURCES_C = ++ASM_SOURCES_AS = \ ++ asm-ppc64/sha2/sha256-ppc.S \ ++ asm-ppc64/sha2/sha512-ppc.S \ ++ asm-ppc64/sha2/sha256-p8.S \ ++ asm-ppc64/sha2/sha512-p8.S +.elif ${MACHINE_ARCH} == "powerpc64le" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ - asm-ppc64/blake3/b3_ppc64le_sse41.S ++ asm-ppc64/blake3/b3_ppc64le_sse41.S \ ++ asm-ppc64/sha2/sha256-ppc.S \ ++ asm-ppc64/sha2/sha512-ppc.S \ ++ asm-ppc64/sha2/sha256-p8.S \ ++ asm-ppc64/sha2/sha512-p8.S +.else +ASM_SOURCES_C = +ASM_SOURCES_AS = +.endif + - +KERNEL_C = \ + spi/kcf_spi.c \ + api/kcf_ctxops.c \ + api/kcf_cipher.c \ + api/kcf_mac.c \ + algs/aes/aes_impl_aesni.c \ + algs/aes/aes_impl_generic.c \ + algs/aes/aes_impl_x86-64.c \ + algs/aes/aes_impl.c \ + algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ - algs/blake3/blake3_x86-64.c \ + algs/edonr/edonr.c \ + algs/modes/modes.c \ + algs/modes/cbc.c \ + algs/modes/gcm_generic.c \ + algs/modes/gcm_pclmulqdq.c \ + algs/modes/gcm.c \ + algs/modes/ctr.c \ + algs/modes/ccm.c \ + algs/modes/ecb.c \ - algs/sha2/sha2.c \ ++ algs/sha2/sha2_generic.c \ ++ algs/sha2/sha256_impl.c \ ++ algs/sha2/sha512_impl.c \ + algs/skein/skein.c \ + algs/skein/skein_block.c \ + algs/skein/skein_iv.c \ + illumos-crypto.c \ + io/aes.c \ + io/sha2_mod.c \ + io/skein_mod.c \ + core/kcf_sched.c \ + core/kcf_prov_lib.c \ + core/kcf_callprov.c \ + core/kcf_mech_tabs.c \ + core/kcf_prov_tabs.c \ + $(ASM_SOURCES_C) + - - - - ++.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs ++KERNEL_C+= zfs_impl.c + +SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) + +WARNS?= 2 +SHLIB_MAJOR= 3 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + - +CFLAGS.aes_amd64.S+= -DLOCORE +CFLAGS.aes_aesni.S+= -DLOCORE +CFLAGS.gcm_pclmulqdq.S+= -DLOCORE +CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.ghash-x86_64.S+= -DLOCORE - CFLAGS.sha256_impl.S+= -DLOCORE - CFLAGS.sha512_impl.S+= -DLOCORE ++CFLAGS.sha256-x86_64.S+= -DLOCORE ++CFLAGS.sha512-x86_64.S+= -DLOCORE +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE ++CFLAGS.sha256-armv7.S = -DLOCORE ++CFLAGS.sha256-armv8.S = -DLOCORE ++CFLAGS.sha512-armv7.S = -DLOCORE ++CFLAGS.sha512-armv8.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE ++CFLAGS.sha256-p8.S = -DLOCORE ++CFLAGS.sha256-ppc.S = -DLOCORE ++CFLAGS.sha512-p8.S = -DLOCORE ++CFLAGS.sha512-ppc.S = -DLOCORE + + +LDFLAGS.bfd+= -Wl,-znoexecstack + +.include diff --cc cddl/lib/libicp_rescue/Makefile index 6c6c3998f85c,000000000000..7173f94238bb mode 100644,000000..100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@@ -1,114 -1,0 +1,140 @@@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp + +PACKAGE= utilities +LIB= icp_rescue +LIBADD= + - +.if ${MACHINE_ARCH} == "amd64" +ASM_SOURCES_C = asm-x86_64/aes/aeskey.c +ASM_SOURCES_AS = \ + asm-x86_64/aes/aes_amd64.S \ + asm-x86_64/aes/aes_aesni.S \ + asm-x86_64/modes/gcm_pclmulqdq.S \ + asm-x86_64/modes/aesni-gcm-x86_64.S \ - asm-x86_64/sha2/sha256_impl.S \ - asm-x86_64/sha2/sha512_impl.S \ ++ asm-x86_64/sha2/sha256-x86_64.S \ ++ asm-x86_64/sha2/sha512-x86_64.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S + +CFLAGS+= -D__amd64 -D_SYS_STACK_H ++.elif ${MACHINE_ARCH} == "armv7" ++ASM_SOURCES_C = ++ASM_SOURCES_AS = \ ++ asm-arm/sha2/sha256-armv7.S \ ++ asm-arm/sha2/sha512-armv7.S +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ - asm-aarch64/blake3/b3_aarch64_sse41.S ++ asm-aarch64/blake3/b3_aarch64_sse41.S \ ++ asm-aarch64/sha2/sha256-armv8.S \ ++ asm-aarch64/sha2/sha512-armv8.S ++.elif ${MACHINE_ARCH} == "powerpc64" ++ASM_SOURCES_C = ++ASM_SOURCES_AS = \ ++ asm-ppc64/sha2/sha256-ppc.S \ ++ asm-ppc64/sha2/sha512-ppc.S \ ++ asm-ppc64/sha2/sha256-p8.S \ ++ asm-ppc64/sha2/sha512-p8.S +.elif ${MACHINE_ARCH} == "powerpc64le" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ - asm-ppc64/blake3/b3_ppc64le_sse41.S ++ asm-ppc64/blake3/b3_ppc64le_sse41.S \ ++ asm-ppc64/sha2/sha256-ppc.S \ ++ asm-ppc64/sha2/sha512-ppc.S \ ++ asm-ppc64/sha2/sha256-p8.S \ ++ asm-ppc64/sha2/sha512-p8.S +.else +ASM_SOURCES_C = +ASM_SOURCES_AS = +.endif + - +KERNEL_C = \ + spi/kcf_spi.c \ + api/kcf_ctxops.c \ + api/kcf_cipher.c \ + api/kcf_mac.c \ + algs/aes/aes_impl_aesni.c \ + algs/aes/aes_impl_generic.c \ + algs/aes/aes_impl_x86-64.c \ + algs/aes/aes_impl.c \ + algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ - algs/blake3/blake3_x86-64.c \ + algs/edonr/edonr.c \ + algs/modes/modes.c \ + algs/modes/cbc.c \ + algs/modes/gcm_generic.c \ + algs/modes/gcm_pclmulqdq.c \ + algs/modes/gcm.c \ + algs/modes/ctr.c \ + algs/modes/ccm.c \ + algs/modes/ecb.c \ - algs/sha2/sha2.c \ ++ algs/sha2/sha2_generic.c \ ++ algs/sha2/sha256_impl.c \ ++ algs/sha2/sha512_impl.c \ + algs/skein/skein_block.c \ + illumos-crypto.c \ + io/aes.c \ + io/sha2_mod.c \ + io/skein_mod.c \ + core/kcf_sched.c \ + core/kcf_prov_lib.c \ + core/kcf_callprov.c \ + core/kcf_mech_tabs.c \ + core/kcf_prov_tabs.c \ + $(ASM_SOURCES_C) + ++.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs ++KERNEL_C+= zfs_impl.c ++ +SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) + +WARNS?= 2 +SHLIB_MAJOR= 3 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + - +CFLAGS.aes_amd64.S+= -DLOCORE +CFLAGS.aes_aesni.S+= -DLOCORE +CFLAGS.gcm_pclmulqdq.S+= -DLOCORE +CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.ghash-x86_64.S+= -DLOCORE - CFLAGS.sha256_impl.S+= -DLOCORE - CFLAGS.sha512_impl.S+= -DLOCORE ++CFLAGS.sha256-x86_64.S+= -DLOCORE ++CFLAGS.sha512-x86_64.S+= -DLOCORE +CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE ++CFLAGS.sha256-armv7.S = -DLOCORE ++CFLAGS.sha512-armv7.S = -DLOCORE ++CFLAGS.sha256-armv8.S = -DLOCORE ++CFLAGS.sha512-armv8.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE - ++CFLAGS.sha256-ppc.S = -DLOCORE ++CFLAGS.sha256-p8.S = -DLOCORE ++CFLAGS.sha512-ppc.S = -DLOCORE ++CFLAGS.sha512-p8.S = -DLOCORE + +LDFLAGS.bfd+= -Wl,-znoexecstack + +.include diff --cc cddl/lib/libzfs/Makefile index 2551b9ebdd57,000000000000..c8e61202d687 mode 100644,000000..100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@@ -1,108 -1,0 +1,107 @@@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib + +PACKAGE= zfs +LIB= zfs +LIBADD= \ + avl \ + bsdxml \ + crypto \ + geom \ + m \ + md \ + nvpair \ + pthread \ + umem \ + util \ + uutil \ + z \ + zfs_core \ + zutil + +INCS= libzfs.h +USER_C = \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_crypto.c \ + libzfs_dataset.c \ + libzfs_diff.c \ + libzfs_import.c \ + libzfs_iter.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_sendrecv.c \ + libzfs_status.c \ + libzfs_util.c + +# FreeBSD +USER_C += \ + libzfs_compat.c \ + libzfs_zmount.c + +# libshare +USER_C += \ + libshare.c \ + nfs.c \ + os/freebsd/nfs.c \ + os/freebsd/smb.c + +KERNEL_C = \ - algs/sha2/sha2.c \ + cityhash.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zpool_prop.c \ + zprop_common.c + + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) + +WARNS?= 2 +SHLIB_MAJOR= 4 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -DSYSCONFDIR=\"/etc\" +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" + + +.include diff --cc cddl/lib/libzpool/Makefile index aeb2b4175a3b,000000000000..5dbeb9cb1721 mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,337 -1,0 +1,338 @@@ +# $FreeBSD$ + +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + +.PATH: ${ZFSTOP}/module/os/linux/zfs + +.PATH: ${ZFSTOP}/lib/libzpool + +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB= zpool + +USER_C = \ + kernel.c \ + taskq.c \ + util.c + +KERNEL_C = \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ + abd_os.c \ + aggsum.c \ + arc.c \ + arc_os.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ - btree.c \ + bqueue.c \ ++ btree.c \ ++ brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ + huf_decompress.c \ + lzjb.c \ + lz4.c \ + lz4_zfs.c \ + metaslab.c \ + mmp.c \ + multilist.c \ + objlist.c \ + pathname.c \ + pool.c \ + range_tree.c \ + refcount.c \ + rrwlock.c \ + sa.c \ - sha256.c \ ++ sha2_zfs.c \ + skein_zfs.c \ + spa.c \ + spa_checkpoint.c \ + spa_config.c \ + spa_errlog.c \ + spa_history.c \ + spa_log_spacemap.c \ + spa_misc.c \ + spa_stats.c \ + space_map.c \ + space_reftree.c \ + txg.c \ + trace.c \ + uberblock.c \ + unique.c \ + vdev.c \ + vdev_cache.c \ + vdev_draid.c \ + vdev_draid_rand.c \ + vdev_file.c \ + vdev_indirect_births.c \ + vdev_indirect.c \ *** 14923 LINES SKIPPED *** From nobody Mon Apr 3 16:05: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 4Pqwjc3nySz42wjC; Mon, 3 Apr 2023 16:05: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 4Pqwjc3C50z4Dsn; Mon, 3 Apr 2023 16:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680537956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4r1b15LvXRHu3DbLLa6CRTcx+wfqLDEB/l1avfiK0s=; b=TlADbCjQMNCBQpZOXpOHxsf7aehpUxE2xpusa6mTFNJq706FpoeUMTFwBqvDnY7HTuVwQX lEtET9c34SHA39ywChBTy8Sqp6cZjrBbkwbZq76y2MtRQ8r015EgS4iOwzH4093t2dsx9U xRmTR8/ZQZfMSlOCLynnVOHAyKwZ27feCPCEYkM0YfXt/4eddMQ69uklc13qxtI12cqZR1 F4Zciq7GDpPtirv8x55+JEil852q329Tm/d4iZXYXKkCNFI+6TvpRR2mV7V0IKxYhOmauW 5SgrxdDVi3FrL1cKEpV++rRO2EACHJQSJAt02pn6ab+ByDqoBtd1YJzQq895Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680537956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4r1b15LvXRHu3DbLLa6CRTcx+wfqLDEB/l1avfiK0s=; b=Z23Mn2qGkv6C5j2CwbLFZakK+5nVSqJR9ZnfSIFi8yoeCxW4DPakoEgashkO2+bqI2JchS IkZppK6eduxj+FyWOrQ9H038h+7xP0bD71DmAMJInBEQhbyiaFMp2OkMKSA0JLGHID2z8w 6CTRqjdaHkLxJiVDdk4xhAg59K58y+W6JSatTTbkPsq44ZxfWj+G5eOjlwIlO6F+14thdS i3Rc3QairMGBCiyaGUw9GeUgN1x4l9kmedMAyYhyvKkteJ5ksLjz8DJpvZp1ILbi0CwV4O Dp6HZCoG9GK9lgjwxOW3fAFTurRa/uf4zxGzvZGgvGyaL/UENAvMS1BKk9tFZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680537956; a=rsa-sha256; cv=none; b=wYDzK/HcjHYDqma1jVhnPyXo1qGvLbok66WbBHJwIUJnTGrFoJOLzlEoVx9BwuLoE0zDF4 +gAyWR4nFqWX+qjrk/hkhgJwxunQc6CahH4F+4n83XMF5ZlXC0nX/Km2d+mrW4N+HgQzfg +Qc/1ZdltyJoS7Vq6b3ZUcRpbNbIHEbSxTSvrTroyIG0lUOt6qTy46ulBReVCUX6eGfOL+ ER6+ctTLxAb9N3bPrTBtwM5yjDT1XUzZVvnEkwM43rSc5lT2ddKkzcib6jKOhI09EA1JDZ QF4s2u4qGB3elU3t35cwf7J6zINtT9pd+CVKyssgWGsVSWOSOUeQInaRzrbcbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pqwjc2GyHz14QW; Mon, 3 Apr 2023 16:05: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 333G5ua4097881; Mon, 3 Apr 2023 16:05:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333G5uT7097880; Mon, 3 Apr 2023 16:05:56 GMT (envelope-from git) Date: Mon, 3 Apr 2023 16:05:56 GMT Message-Id: <202304031605.333G5uT7097880@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: 04bab189b8a5 - main - llvm/lld: damage control threading List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 04bab189b8a54974fcd9530140e4eed6ad137f48 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=04bab189b8a54974fcd9530140e4eed6ad137f48 commit 04bab189b8a54974fcd9530140e4eed6ad137f48 Author: Mateusz Guzik AuthorDate: 2023-04-02 12:38:49 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-03 16:05:42 +0000 llvm/lld: damage control threading See the comment inside. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D39389 --- contrib/llvm-project/llvm/lib/Support/Threading.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Support/Threading.cpp b/contrib/llvm-project/llvm/lib/Support/Threading.cpp index 04a1a9e19428..3ac3695fa9ed 100644 --- a/contrib/llvm-project/llvm/lib/Support/Threading.cpp +++ b/contrib/llvm-project/llvm/lib/Support/Threading.cpp @@ -62,8 +62,19 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { : sys::getHostNumPhysicalCores(); if (MaxThreadCount <= 0) MaxThreadCount = 1; - if (ThreadsRequested == 0) - return MaxThreadCount; + // Damage control threading. + // + // There are no heuristics to figure out how many threads makes sense to spawn, + // all while rolling with all available hw threads starts being detrimental to + // performance really early. + // + // Work around by putting a hard cap unless the user explicitly requested a certain amount. + // + // See https://discourse.llvm.org/t/avoidable-overhead-from-threading-by-default/69160 + // for more details. + if (ThreadsRequested == 0) { + return std::min(MaxThreadCount, 4); + } if (!Limit) return ThreadsRequested; return std::min((unsigned)MaxThreadCount, ThreadsRequested); From nobody Mon Apr 3 19:45: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 4Pr1Zs73wgz43D45; Mon, 3 Apr 2023 19:45:25 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pr1Zs4bjTz4WVF; Mon, 3 Apr 2023 19:45:25 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f44.google.com with SMTP id c9so29090359lfb.1; Mon, 03 Apr 2023 12:45:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680551124; 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=Dg10hzPDvpiAytWhUOfvGhoIsQFaR0Q69TOr+ud/yro=; b=aq8sD21xgRklwzWTQsqdX9IA59EZ7UbT+jxAy2q8Yj2VW9oEioc2G10ZZEICqz8QWu UcUGW5X4C7q2me8E/GPq3cyPdbjZ5HijpoHvGn3QN5ZgMOdnEnIPbP7ZbgO4RGBc8QVg XV183lPT+YbUxgP+qZO+lMoL1zrmW+ShstDKrFQtbgDI6az/sSLCT2w9nrniGRTDjs2g 8keobkt7FeSj/w3DenBZ03Z7TBpSIAttS6IgZl9IGaLsKR1KLIs5Ch4Nl4Y7TgKEj4KQ 4bNfrJY0qvKeTmKWeeKefuzBknNz51hhII5GBypo36xCfIWhD8LDlV8kQHjopZtrQJum Pwbg== X-Gm-Message-State: AAQBX9erFG55lse3cmo6VT/nDTz9OmuJ3EXMXfQ8QMSSqN2ldPl8comm 7yBitshJYx+BI7sxhp+Cjr6t4ugjZB4= X-Google-Smtp-Source: AKy350YcyuFhydfS1I6el/AIvtMTTDgl5ngX7uQVOkWJo6QM1BTl7LKGSKoukPMWD5WbTDKE3xbKnQ== X-Received: by 2002:ac2:5104:0:b0:4eb:3615:4c35 with SMTP id q4-20020ac25104000000b004eb36154c35mr2479945lfb.33.1680551123567; Mon, 03 Apr 2023 12:45:23 -0700 (PDT) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com. [209.85.167.44]) by smtp.gmail.com with ESMTPSA id x6-20020ac24886000000b004eb143fdb43sm1918897lfc.112.2023.04.03.12.45.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Apr 2023 12:45:23 -0700 (PDT) Received: by mail-lf1-f44.google.com with SMTP id y15so39505084lfa.7; Mon, 03 Apr 2023 12:45:23 -0700 (PDT) X-Received: by 2002:ac2:568d:0:b0:4eb:c44:ed50 with SMTP id 13-20020ac2568d000000b004eb0c44ed50mr9071404lfr.9.1680551122834; Mon, 03 Apr 2023 12:45:22 -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: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> <20230403073204.GF89483@eureka.lemis.com> In-Reply-To: <20230403073204.GF89483@eureka.lemis.com> From: Cheng Cui Date: Mon, 3 Apr 2023 15:45:11 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." To: "Greg 'groggy' Lehey" Cc: Zhenlei Huang , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , tuexen@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b41cc405f873cc24" X-Rspamd-Queue-Id: 4Pr1Zs4bjTz4WVF 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 --000000000000b41cc405f873cc24 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Apr 3, 2023 at 3:32=E2=80=AFAM Greg 'groggy' Lehey wrote: > On Monday, 3 April 2023 at 14:45:03 +0800, Zhenlei Huang wrote: > >> On Apr 2, 2023, at 12:27 AM, Cheng Cui wrote: > >> > >> Thanks for the concern. It was a mistake that placed my name in the > wrong place. > >> The correct change is in 95940a2d2442. > > > > I think this is an impressive start as a committer ;) > > By far not the worst. My first commit was not quite 25 years ago, on > 15 September 1998, and it included: > > * N src/lkm/vinum/emacs.core > > For those youngsters who don't remember CVS, the N means "new file in > repo". > > More details at http://www.lemis.com/grog/diary-sep1998.php#16 > > Greg > -- > Thanks! Both sound very encouraging to me. :) Best Regards, Cheng Cui --000000000000b41cc405f873cc24 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, Apr 3, 2023 at 3:32=E2=80=AFAM Greg 'groggy' Lehey &= lt;grog@freebsd.org> wrote:
<= /div>
On Monday,=C2=A0 3 A= pril 2023 at 14:45:03 +0800, Zhenlei Huang wrote:
>> On Apr 2, 2023, at 12:27 AM, Cheng Cui <cc@freebsd.org> wrote:
>>
>> Thanks for the concern. It was a mistake that placed my name in th= e wrong place.
>> The correct change is in 95940a2d2442.
>
> I think this is an impressive start as a committer ;)

By far not the worst.=C2=A0 My first commit was not quite 25 years ago, on<= br> 15 September 1998, and it included:

=C2=A0*=C2=A0 =C2=A0N src/lkm/vinum/emacs.core

For those youngsters who don't remember CVS, the N means "new file= in
repo".

More details at http://www.lemis.com/grog/diary-sep199= 8.php#16

Greg
--
=C2=A0
Thanks! Both sound very encouragin= g to me. :)

Best Regards,
Cheng Cui
=C2=A0
--000000000000b41cc405f873cc24-- From nobody Mon Apr 3 19:50: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 4Pr1hY4qNXz43D7D; Mon, 3 Apr 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pr1hY40W8z4X4x; Mon, 3 Apr 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680551421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RalKKREZ4cNPsU5C/LkxkTq/F5GPDsLMqfNc+ZwXlaw=; b=tbNW6yBPFeesDUNPFnnbmRkqgkvHfKoSZon38dC7Kqrrhu4c4oqbm0EkE/mbUqmTekA4L6 UOxuORmiSgRxo+MitJ9sDtzKDVwO82e7IExHLJ/fAoMV9bPHJfMBY/PHIk3Un+VYKX1ceb ON8HhMVER3jIMZzxmcOWU4ZNnWriPYDGOiDIsE3Rhx0Ghfur0TH52MAlje2/iaMnKRWgl7 WXbhH6qPuvBnLD155PvOUAG9joQrILDWsueTgIApZOKJOQAmTO+QAqujTTgL8BOlyjAEow b7T4530xhcHnHTdkvhzvX8KQT6lTAUroH0+1jAnk8qSxtsx0jPbrQ6bnLyC8+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680551421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RalKKREZ4cNPsU5C/LkxkTq/F5GPDsLMqfNc+ZwXlaw=; b=Fw/B1aEQOQ9vb/8/2uXUNtHwRTzYtnmqiuxdjNcXckj/W4Si1HLT/5KTlyatJkOiEfENfX BU2EFYseIukIdwfMG7uErsC7w2bZm6gJKXmFO+50l1csc0wAgX9/jmqinVNV3QxdOZD2t+ bULqD6WlDhPaQtqXqQeIIcdi0KAvN9D5nqvDVekZ3Az+7Ni5SAWF3lpoS9ukvzT01o/3dF ZpRRNh0ClHpNPSwxkGV2RRgSW0B/I4GPh8Pygu6m+DY/9MbJ+QRjAfipP/72TmfFIAGvZx DeRE1mW31u7L6hdbdjf0kCSEOFqk95LGGjUFLOAMU9rBA087zGDL0Sok3QjrWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680551421; a=rsa-sha256; cv=none; b=KSVUfsDt9eEQpD9MddOSfv3NWFj0Isi7bdVMlDFOebnwvzKvygpR1/hfsYT2NIM8zbcs8B LnwidRsO4PSmWhYt/WwUZDr5daAO/Y9VzVwOnq5pDp3b/Yi4MleKk4RXZXa83OdxmpmadL 2s6UPoZ31kNZWdiQYOlloMAfA+6aZ87jDdiDFCVKcyyYfxWF4FSQpceYZou8N89PWaiY8v CWrwlu7U3GEFuihR1GxZTKXDSRBXzMpqyaV8uLW9aKN+nsPPSxwX/TGpfxQTJj/mTnWxEb 7jEP6WoX3VJSydY65lDwf5VO/gd2exo8TlDpCYYe0O6D5BMS3YcrmVFHG7dHvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pr1hY32xxz1B1Z; Mon, 3 Apr 2023 19:50: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 333JoL1d068562; Mon, 3 Apr 2023 19:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333JoLY5068561; Mon, 3 Apr 2023 19:50:21 GMT (envelope-from git) Date: Mon, 3 Apr 2023 19:50:21 GMT Message-Id: <202304031950.333JoLY5068561@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: 3cb808226c1f - main - setkey(8): add -e option to take script from the command line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 3cb808226c1f62ed5c726480073eb9035a24d2cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb808226c1f62ed5c726480073eb9035a24d2cc commit 3cb808226c1f62ed5c726480073eb9035a24d2cc Author: Konstantin Belousov AuthorDate: 2023-04-03 01:03:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-03 19:48:48 +0000 setkey(8): add -e option to take script from the command line Reviewed by: ae Sponsored by: Nvidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39393 --- sbin/setkey/setkey.8 | 14 ++++++++++---- sbin/setkey/setkey.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 6df1839ca6e4..38c10546cccb 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 19, 2022 +.Dd April 3, 2023 .Dt SETKEY 8 .Os .\" @@ -45,6 +45,9 @@ .Op Fl v .Fl f Ar filename .Nm +.Op Fl v +.Fl e Ar script +.Nm .Op Fl Pgltv .Fl D .Nm @@ -65,11 +68,14 @@ The .Nm utility takes a series of operations from the standard input (if invoked with -.Fl c ) -or the file named +.Fl c ) , +from the file named .Ar filename (if invoked with -.Fl f Ar filename ) . +.Fl f Ar filename ) , +or from the command line argument following the option +(if invoked with +.Fl e Ar script ) . .Bl -tag -width indent .It Fl D Dump the SAD entries. diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c index faf6373b312e..50f1c7056381 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -99,6 +99,7 @@ usage(void) printf("usage: setkey [-v] -c\n"); printf(" setkey [-v] -f filename\n"); + printf(" setkey [-v] -e \"