From nobody Sun Sep 10 04:28:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjxfq6JLzz4sMKL; Sun, 10 Sep 2023 04:28: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 4Rjxfq5q38z3WgP; Sun, 10 Sep 2023 04:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfP8UqCKbYUISDi4g5esV/uKbQPirL5aBfygXXpGyrc=; b=hifshi2q7D4UoxfAc6yqeKOb4irEwOYzS3KRKwprIF/CO6zPHr2M0/3s5rz5SSg9DVAozB YxHSUA91l8JfBIOY1msiuLWbokAZy47PPRhC1OkdhBAavvG/BzRODNCAFiKeJ/9xSo/unM n1FWs9DUF58qvETjsNLWpkjCdhTumkJ4ukipR/CNG6kDnoj7OOuFYC9KXBz+iX5dKbrCke fp8TmFAU2r9hwGPPDQUUkyCATebYI0FLdgKiNnSMPBcxYtyAb9Ot1BEh1ZcO69OSyFRtNG 27L4YUbLox8cV6S00dS57EVyiW3ylLYJFsMhqPL9tFi9V1uaJaV4/8zbT1VxUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694320099; a=rsa-sha256; cv=none; b=wHXPIPT/VLyOxgHCp/ci2AzzulsjrQzLwF7fGUwg3Ns7+guRCb/SKzMjGde1RRL3FAMKxA YxOwWy4TMmOWmdsCMN7pqlwO2ZAVm4SdWDv+j4lERU7TVwKjCqNPVDsua3WpG1mddHd9Rw cq521hDK07Dw4t7DTQOre0OviHDzPu7GVF/BjAR6961SUrP6QnVZQa1TfGdSeyw/mswnbt 8mWI6izjfHJCXko1KIOJm0Pl+MFczdAPT65gTJtyvuXGhDyDE/jBWd8R4uF2yJOe7+F1vX kft84E1ovhckH7Ld8P8PrS3IY+ew+Ky+OLtQwv+o6RLZjUbZxs5NTWwoZUsBlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfP8UqCKbYUISDi4g5esV/uKbQPirL5aBfygXXpGyrc=; b=hTyiOuGfydXz+11bZE2/crtB8SLMDWKgfWE+/YeJyDdCw17OS5D2S70xCICFipQP0uJkbn NbMZRCFDhCmV+gNeLe9t74kxTcjb+nN8Q6UMHvTWq99cc3RuccVUVr95wZj2ZADg4eSU24 GhrIVtJdc8iMTiYQmNKwZavfMkAala/sga68nFV6skIovgnljoyHppMBRV1lVHESo4aIas zcZIrCgLwr0XTsz+iKxtO+CAastLwnV7D0StsuE8B8eC3v77UtPFa4EpeUsicvGAhUI/L+ jXRWjXThoPwPlsDCIcMXkP3lJk3OnPcjziqw1GY3uB36RluA2eqJt0tHItds3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rjxfq4n3Lzsp1; Sun, 10 Sep 2023 04:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A4SJOJ046396; Sun, 10 Sep 2023 04:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4SJpI046393; Sun, 10 Sep 2023 04:28:19 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:28:19 GMT Message-Id: <202309100428.38A4SJpI046393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3d36161bc3aa - releng/14.0 - localedef: correct definition of right-parenthesis in default charmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3d36161bc3aa90d329c10b10bbb27a17d33a2b13 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3d36161bc3aa90d329c10b10bbb27a17d33a2b13 commit 3d36161bc3aa90d329c10b10bbb27a17d33a2b13 Author: Kyle Evans AuthorDate: 2023-09-02 05:56:31 +0000 Commit: Kyle Evans CommitDate: 2023-09-10 04:27:50 +0000 localedef: correct definition of right-parenthesis in default charmap It turns out that right parentheses do exist and are different than left parentheses, so let's switch to that. Approved by: re (kib) Sponsored by: Klara, Inc. (cherry picked from commit 07bc20e4740d09f554c3787bb1940fc503300822) (cherry picked from commit 8d98eb4e51eb1777b6bdb3682dbd7472c9cc2c71) --- usr.bin/localedef/charmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index bc302965de1a..44b7e3292eae 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -86,7 +86,7 @@ static const struct { { "ampersand", '&' }, { "apostrophe", '\'' }, { "left-parenthesis", '(' }, - { "right-parenthesis", '(' }, + { "right-parenthesis", ')' }, { "asterisk", '*' }, { "plus-sign", '+' }, { "comma", ','}, From nobody Sun Sep 10 04:28:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjxfs0KGCz4sMVQ; Sun, 10 Sep 2023 04:28: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 4Rjxfr6rk8z3WZT; Sun, 10 Sep 2023 04:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8S2+ikeR08FbFDDOQTcKrmhK5ydrFjld4dWfq9dt1kw=; b=S2NgBl/xeHapYJOnX93JGkj7tekuTiDOyqIjx3J0EFeJCx9rcCMh8XLxAjVFSkT/SL9JqU B2hEznTPGJItgGBL3Rq9DybkA6MvPol12pnKEJTngMH8d06YDMXNMZqcej5KGqqPG9XvHw RdzHHMZBdjdFFVwSg7An/V3L3BLv4E1QCsC5nabBoRPGwV5FjCZZvRZ8TCzmVKxoGGipTL 94bzZPYJFAd6wR08+IJ62GZsLqmI65MWlN6BjnuvaIYWjukqT0F9BZAi+QrbG+Xv7F1I0G bPIJixejn1HMqN88Ckb4UZgqMfyFWUCdDQdBZAeBTFd7rf5R0gOhHqN86tXj4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694320101; a=rsa-sha256; cv=none; b=eYn3qrMFn3+JJMxHSfu5c1Wld83BTPCQRXwafBpwH/ZYNqkezW1kJ3D5sImLhUgkj0EKuh QHBHHiF6T7rJGDYUb6zjfNOl98T3EYrtdR7gOh4Qd2iTamk7hOTm60+ac0JpUgFaKYvQ7A 7JylOSGvUtmcsZoYc28VtBRJd57IHtKa2ulszNcLznzsfX8Ul4zcF9AGqBbCUrp+s+eHkg 8yBkvuJGbPQLPzjudi+pyfbSn3FI5BvwT6vxLsKKITDYILwK3fDNX7yQJeeZi/qcJ376zF W23aI+qdDe4XtU1FezqU1eLe8mlz7aRRadtEf3epVk4sRNBR7tiAkh6Mlyg1FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8S2+ikeR08FbFDDOQTcKrmhK5ydrFjld4dWfq9dt1kw=; b=ypWZ7vjY5nSHcX3fvsYklO49Om71gdmWDZG6Ynub5xtZt2R6ee1GrYVQmsKft3bKIKCZMn nkaJRYxjlo9p0tt1Wkfd3yFJEU3O4Avq6xPp2BMV3TO3JqlDMlna2DODZ5ItaC2lQDJoSj UkfTqt/88cblwwqJwUPuhSFxyusTReF/FBOeSFWc5UnKpGJvwc9RaT3KuA3oodgmjtAOKc kM4rJyvr1XoP8kGyXpEQHqitrfPfKdETVE87No3Hn93j11FSlveIexsbDkf1u8OuDcx4rE HRT0+ptv5PtC2xEQUSrtUNOWvhdaoSP3uj2laCfI5dkMXBYIjtjljUJ8XzKfQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rjxfr5kgHzsFr; Sun, 10 Sep 2023 04:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A4SKMF046449; Sun, 10 Sep 2023 04:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4SKNB046446; Sun, 10 Sep 2023 04:28:20 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:28:20 GMT Message-Id: <202309100428.38A4SKNB046446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2f215895ef67 - releng/14.0 - localedef: add newlines to error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 commit 2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 Author: Kyle Evans AuthorDate: 2023-09-02 06:24:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-10 04:28:02 +0000 localedef: add newlines to error messages These won't be added elsewhere, so add a little bit of room to make these messages a little easier to read. The existing set is a mixed bag, there are somewhere in the ballpark of 45, 46 printfs to stderr and 19 of those had newlines. Reviewed by: yuripv Approved by: re (kib) Sponsored by: Klara, Inc. (cherry picked from commit 3141e51d2e38fa7b9e6d81477dfa860d087c514d) (cherry picked from commit dc8ee27074d4060549c6ecdc88eeec386691b479) --- usr.bin/localedef/collate.c | 34 +++++++++++++++++----------------- usr.bin/localedef/localedef.c | 4 ++-- usr.bin/localedef/localedef.h | 2 +- usr.bin/localedef/monetary.c | 4 ++-- usr.bin/localedef/numeric.c | 2 +- usr.bin/localedef/time.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index d76c2c2c08b2..2a080773a95e 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -272,7 +272,7 @@ new_pri(void) maxpri = maxpri ? maxpri * 2 : 1024; prilist = realloc(prilist, sizeof (collpri_t) * maxpri); if (prilist == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return (-1); } for (i = numpri; i < maxpri; i++) { @@ -333,7 +333,7 @@ resolve_pri(int32_t ref) if (pri->pass == pass) { /* report a line with the circular symbol */ lineno = pri->lineno; - fprintf(stderr,"circular reference in order list"); + fprintf(stderr,"circular reference in order list\n"); return (-1); } if ((pri->pri < 0) || (pri->pri >= numpri)) { @@ -494,7 +494,7 @@ define_collsym(char *name) collsym_t *sym; if ((sym = calloc(1, sizeof(*sym))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } sym->name = name; @@ -541,7 +541,7 @@ get_collundef(char *name) if ((ud = RB_FIND(collundefs, &collundefs, &srch)) == NULL) { if (((ud = calloc(1, sizeof(*ud))) == NULL) || ((ud->name = strdup(name)) == NULL)) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); free(ud); return (NULL); } @@ -565,7 +565,7 @@ get_collchar(wchar_t wc, int create) cc = RB_FIND(collchars, &collchars, &srch); if ((cc == NULL) && create) { if ((cc = calloc(1, sizeof(*cc))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return (NULL); } for (i = 0; i < NUM_WT; i++) { @@ -687,7 +687,7 @@ start_order(int type) /* this is used to protect ELLIPSIS processing */ if ((lastorder == T_ELLIPSIS) && (type != T_CHAR)) { - fprintf(stderr, "character value expected"); + fprintf(stderr, "character value expected\n"); } for (i = 0; i < COLL_WEIGHTS_MAX; i++) { @@ -728,7 +728,7 @@ start_order_char(wchar_t wc) int i; if (wc < ellipsis_start) { - fprintf(stderr, "malformed range!"); + fprintf(stderr, "malformed range!\n"); return; } while (ellipsis_start < wc) { @@ -776,7 +776,7 @@ start_order_ellipsis(void) start_order(T_ELLIPSIS); if (lastorder != T_CHAR) { - fprintf(stderr, "illegal starting point for range"); + fprintf(stderr, "illegal starting point for range\n"); return; } @@ -792,12 +792,12 @@ define_collelem(char *name, wchar_t *wcs) int i; if (wcslen(wcs) >= COLLATE_STR_LEN) { - fprintf(stderr,"expanded collation element too long"); + fprintf(stderr,"expanded collation element too long\n"); return; } if ((e = calloc(1, sizeof(*e))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } e->expand = wcs; @@ -816,7 +816,7 @@ define_collelem(char *name, wchar_t *wcs) /* A character sequence can only reduce to one element. */ if ((RB_FIND(elem_by_symbol, &elem_by_symbol, e) != NULL) || (RB_FIND(elem_by_expand, &elem_by_expand, e) != NULL)) { - fprintf(stderr, "duplicate collating element definition"); + fprintf(stderr, "duplicate collating element definition\n"); free(e); return; } @@ -932,7 +932,7 @@ add_order_subst(void) if (s == NULL) { if ((s = calloc(1, sizeof(*s))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } s->key = new_pri(); @@ -976,7 +976,7 @@ static void add_subst_pri(int32_t ref) { if (curr_subst >= COLLATE_STR_LEN) { - fprintf(stderr,"substitution string is too long"); + fprintf(stderr,"substitution string is too long\n"); return; } subst_weights[curr_subst] = ref; @@ -1040,7 +1040,7 @@ add_weight(int32_t ref, int pass) return; if ((w = calloc(1, sizeof(*w))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } w->pri = srch.pri; @@ -1214,7 +1214,7 @@ dump_collate(void) RB_COUNT(temp, substs, &substs[i], n); subst_count[i] = n; if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1245,7 +1245,7 @@ dump_collate(void) RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, chain_count); chain = calloc(chain_count, sizeof(collate_chain_t)); if (chain == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1265,7 +1265,7 @@ dump_collate(void) RB_NUMNODES(collchar_t, collchars, &collchars, n); large = calloc(n, sizeof(collate_large_t)); if (large == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c index ae0bd052b40c..5ff146d6f655 100644 --- a/usr.bin/localedef/localedef.c +++ b/usr.bin/localedef/localedef.c @@ -167,7 +167,7 @@ copy_category(char *src) } if (rv != 0) { - fprintf(stderr,"source locale data unavailable: %s", src); + fprintf(stderr,"source locale data unavailable: %s\n", src); return; } @@ -182,7 +182,7 @@ copy_category(char *src) (void) mkdir(dirname(category_file()), 0755); if (link(srcpath, category_file()) != 0) { - fprintf(stderr,"unable to copy locale data: %s", + fprintf(stderr,"unable to copy locale data: %s\n", strerror(errno)); return; } diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 2aece1543d5b..4b141ac8dc09 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -174,4 +174,4 @@ const char *get_wide_encoding(void); int max_wide(void); //#define _(x) gettext(x) -#define INTERR fprintf(stderr,"internal fault (%s:%d)", __FILE__, __LINE__) +#define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__) diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c index 659c495a71fe..7a77ac7e256c 100644 --- a/usr.bin/localedef/monetary.c +++ b/usr.bin/localedef/monetary.c @@ -93,7 +93,7 @@ add_monetary_num(int n) (void) asprintf(&str, "%d", n); if (str == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } @@ -167,7 +167,7 @@ add_monetary_group(int n) (void) asprintf(&s, "%s;%d", mon.mon_grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)mon.mon_grouping); mon.mon_grouping = s; diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c index 358355fe96ae..5533b7c10e1a 100644 --- a/usr.bin/localedef/numeric.c +++ b/usr.bin/localedef/numeric.c @@ -93,7 +93,7 @@ add_numeric_group(int n) (void) asprintf(&s, "%s;%d", numeric.grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)numeric.grouping); numeric.grouping = s; diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c index 2de922a8eb12..7a56e244c921 100644 --- a/usr.bin/localedef/time.c +++ b/usr.bin/localedef/time.c @@ -104,7 +104,7 @@ add_list(const char *ptr[], char *str, int limit) return; } } - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); } void @@ -137,7 +137,7 @@ add_time_list(wchar_t *wcs) } else if (tm.pm == NULL) { tm.pm = str; } else { - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); free(str); } break; @@ -180,11 +180,11 @@ check_time_list(void) case T_ALT_DIGITS: return; default: - fprintf(stderr,"unknown list"); + fprintf(stderr,"unknown list\n"); break; } - fprintf(stderr,"too few items in list (%d)", last_kw); + fprintf(stderr,"too few items in list (%d)\n", last_kw); } void From nobody Sun Sep 10 04:50:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjy8n56psz4scKV for ; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjy8n4hQKz3ddY; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694321449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tXtsE898G87z4hXEPPIuUWZqaSjWlXXozLS5QqURlE=; b=wOs40ScpqYSYV2bNcPtidYbsnjnlqjw2i93ZFSOIsh9/nscouS6q1T17TxGcri6zyjgkbB mpYFt3Vr11kBb2Waa7W5+m0zsUDOmCuhq6sQInW64XpPIrQnHNuvqIsaoYfMBjQahkLr1C Ms+xbQY93EVCDZ3tWKKFGY4bjN4iSeX4NZ40Cl1FOijrUwLUnxy3r/5XBbAU9yNHxhPcVd hj2SMi5XBN89SVCisBxwA1DT+xlsuaJuFzQLzqYwsY2ViS3GU3FmzmWmWY2VkyuEIsx3gT TZr43SPmb2kabL4mtq0CFrIOqYKmQTDzq+QDkrU7AeLfc5c5tJx4rqLJx5/vkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694321449; a=rsa-sha256; cv=none; b=iJ0E8FlNli/EmBdzG3eeYcBnS3sD0Qz9QZ7ncnKoKc+TE/aZsppu11AA8qV+nRBFoYaP4K EqrkUlf4XH3+86xnwhJE7QO9WKFjTgUXsLox8jjafJO0t1OuUs4PnBVqLllfojHulc/1oX Wbol2V7p6Sv8VqLYfSUFzg1gwUbKxOFFCQmYp5U9knZ1Hi75bxmncjWocxMzZ5NMxf+iST wpmf+woyw6frJoPjQxK3mD3gG/Dv6QfxswV+SVDDS31MATNQVA1diJSfaxAsACb/tThhNi LF5mfGwGe3uMc1kmVyUwLcLVTFDeY9NgptG/foDwbb1lXMw0Yel4cEiEM5YmxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694321449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tXtsE898G87z4hXEPPIuUWZqaSjWlXXozLS5QqURlE=; b=HxoCySbTqKIMcgyuO3GBj7QSCbCQRW4HD2rQoSW1dL8JvCjLq2+ic/riM/njdMuAIivxPr F4MjzadKHWUea/5SIV5YsCdE0b8orEwVXYksWAyi0NxixWIWSWf4y1/3/cHTP44E2FpK5y 5FckY3rGVyE9k8N/B52Bm/QpFviyBTwgih6pCWA25+hGeZHpe8QWBjRAKmFkgMZNg3vP30 G4MC493qwR+zhc0fx5YJMYH7zFbQ+sAM8P0B7pAF/4DzMqLPCCMj6QLG5qplXs+jNURFCp fXYmGVPKh1QXeea+NLSjqTR7zY40Sk5GHW0Emq09CKfrCiShjeIBjM7xNeOEyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rjy8n3QvlzsmW; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A4onFb089654; Sun, 10 Sep 2023 04:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4onn2089653; Sun, 10 Sep 2023 04:50:49 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:50:49 GMT Message-Id: <202309100450.38A4onn2089653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 5d5531f83be2..72d4668c77f0 - vendor/file - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/file X-Git-Reftype: branch X-Git-Commit: 72d4668c77f014e21af1db10648768e4843ce5d2 X-Git-Oldrev: 5d5531f83be2e504e0128532d46dcfaf512da16d X-Git-Newrev: 72d4668c77f014e21af1db10648768e4843ce5d2 Auto-Submitted: auto-generated The branch vendor/file has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=5d5531f83be2..72d4668c77f0 72d4668c77f0 Vendor import of file 5.45. From nobody Sun Sep 10 04:50:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjy8n5gGNz4scMV for ; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjy8n56KKz3dgn; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694321449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLM3ItwER25YUizhXA3/rIjt6EbzUlgrPyMSVxOnrvw=; b=Zo3MY2uqKY6uGKJaT8hs4ryV3bmZ9Af/4J6DFYGmcg72/0kMMYlPxaClPYaIPUHtn5Txl5 T1OkUfOIQiwiKrw/GRSgua96nRoYdDlK7QkO7tfvZPssWlfzuGg3mS+w/ETDYcTI6r+VTe KtjbxgJsADLKvv0eqJ8XWkfYfU8ztIYXNxQj9y7ljIP0VL40V17a+iKk0Tl61R6L8fzi5O /BA5l4CVpvS2ASy7hyfeB0yToCa7cYnfu58KkNgJy4P28fLqFA1ceJrQBx2WuarY7/FgEZ echwqBf0uS+A/95pKyCf7J12eqzDz9R2FFIz9vAT21VKpAj6+OsnTgiaPbWsEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694321449; a=rsa-sha256; cv=none; b=hVe6lw6sGbOSoEkT82C3URs/8sk2H00JDAflW2nwJfu+MI5CtjcjI1aqWq6z2QtNn9IEvm RRnuzx0XwlMLxYVB4Ik+C3C9A39ROTdyLuwzWLlhxC3kdecjxn9T0CO5qpwSfIt87hw2Kl qsVYuW3owgutK60RYHMlmWpUxoNNSyNBJJTAyZu8KxL1+eJllfTtRSidEURax+i9NGyB8e qevJ9lIjKM2rKSFvym4m49IOCwA3L9J7dsU/czbt9UUH4jBaDj3TF8zbLl6wz9BNiHQQS7 yjS3Eh+lkeQ+Iq4i/rL0XG7suztVCH7UJOSJYn6jHbANcJV+oeli2G4WSvBGeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694321449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLM3ItwER25YUizhXA3/rIjt6EbzUlgrPyMSVxOnrvw=; b=AIZcGaIT5ovG/Au2G3gswAHs9A36litK2OHk5DrQHuTiODmcaMFChtys/hUQGfYAVs43Ny TWEIQ5WQRkThrwd7xk9RW/0DNXEAKNSbuxmHs/eidiNiexbmMd8zp/pNkqLNScaQffJwWb KRXJLsaQjzLAo9MywIcXMg3/UBIj6LYXhERY7xq1tta5UFooerIaCbDXIiTW0eUmC06d/d d9ZZnUOIwGSyJPipsJjZda7vSwJBCMxZJ1kaHkvP7s3c+7/OXwzhPB8vrgKvIKdYz0g9yS 476Q+amJJM6HfX+CK7fUmyM88+UKKOZnCGO5OFPHEFTes08b7GnMNnsbMA+oDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rjy8n3t9HztZt; Sun, 10 Sep 2023 04:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A4on2n089673; Sun, 10 Sep 2023 04:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4onGc089672; Sun, 10 Sep 2023 04:50:49 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:50:49 GMT Message-Id: <202309100450.38A4onGc089672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: b8f319429a40 - Create tag vendor/file/5.45 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/file/5.45 X-Git-Reftype: annotated tag X-Git-Commit: b8f319429a40114a99601cc743d83b80a5a1a3b6 Auto-Submitted: auto-generated The annotated tag vendor/file/5.45 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/file/5.45 tag vendor/file/5.45 Tagger: Xin LI TaggerDate: 2023-09-10 04:50:18 +0000 Tag file 5.45. commit 72d4668c77f014e21af1db10648768e4843ce5d2 Author: Xin LI AuthorDate: 2023-09-10 04:50:07 +0000 Commit: Xin LI CommitDate: 2023-09-10 04:50:07 +0000 Vendor import of file 5.45. From nobody Sun Sep 10 09:01:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rk3k5029Vz4t2T4; Sun, 10 Sep 2023 09:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk3k46glHz4VLH; Sun, 10 Sep 2023 09:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694336492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0wa1tHtnMtG0i+iF021w9yq5c9FSUJLyKll7cAMZH8=; b=xbDl8xQ2CY3+M+TP8Y63hzWX78cNqgGx81TqcC4vVFgmUU6zZLTgMrsl/sqa6jQai7ZoEI uWcgmKvklnQ5DCpisF9lRDDxzGcZJFRqNaOVmkc0dL4/oYf/YsSa5hGZOyqhGkD/WZ1gY6 mZY88cCMO2hBcQQpPdZ2VXoCiveN+UYqstqQpmummDGfeIrN85KtUVqmKmgj8PD40HW8iS uZwCAE7uV+zcXzOcYcKfgruuBg4r8YszUf2QzRtbRmjN3+op7M5XDWATj8uoaxUUE3hUur 7EV/t3VorkZsjPwTg+k9AIcPzL9JOpGSlA1BC80XzEvRny5SEF3SOh0ugMfCLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694336492; a=rsa-sha256; cv=none; b=s71KvKLbwKhNMQ7CMipo9zp3Fof8Do1FbY3gxyEAoAWOr7JooiOj3VjY1x/ZK6Q49XoGN+ NSAlURJl2RukhkstJunFGuMXo/WS9OY957ouTc9wJycyxnaAAoSJNfEAk3gjU36gqmcV4o SZN45Q6cFXYbiDWrtqpyDJUMCZLFt5GzZ8aoKNANAmEpG7Hu+Ahg6t8oTL+Hj9OLkUhETd pRpIg6hPbNf+iX730q4vr0jNBETuCzRbCYWY4iZjAYvdZkkkN+vn0Q4bT7t+WxcMlrD1R3 PM5e8WWud+YSwLwYhQylkwqs4OcXuDETWvK5C9Xux0iT7EOLx20kxUmSF0LWmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694336492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0wa1tHtnMtG0i+iF021w9yq5c9FSUJLyKll7cAMZH8=; b=rSj112Ak4LXTnLeHS27+6s1/9n8uK/i8lV5UZTdtJpLsWNWZYy1cV1W+yygltoztXUZuSc lt73mPfzf+bEIEpATyQVe6ppR6FCm2qFL4WaHZMobbZB0+Mx3H+y+OYnBHMQLSkAyP8yo9 RAaQAqhWxkAg/GLJ+ntPEwQwwAPKDvyYXyJO83Joxt+8S8a05ylIZTCzYuZtTSrkBOOJg0 oi4y+HIiRtFCp3WrLko6jhn3wcFhobko+sBfJAa8T0kWyFtLIqIY31D/fYds+akMegZMcq u36A8xRlWHO9w6nBOuVCD9IXJTJp7rui6q33eWWewoW9dDiD2dLx4XjmYr85KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rk3k45Zt4z11Rk; Sun, 10 Sep 2023 09:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A91W1q004280; Sun, 10 Sep 2023 09:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A91WIt004277; Sun, 10 Sep 2023 09:01:32 GMT (envelope-from git) Date: Sun, 10 Sep 2023 09:01:32 GMT Message-Id: <202309100901.38A91WIt004277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jens Schweikhardt Subject: git: 4fc08109fe32 - main - Correct the grammo in "will underlined". List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: schweikh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fc08109fe32264485a54a7ea45f4ec09a8fcf86 Auto-Submitted: auto-generated The branch main has been updated by schweikh: URL: https://cgit.FreeBSD.org/src/commit/?id=4fc08109fe32264485a54a7ea45f4ec09a8fcf86 commit 4fc08109fe32264485a54a7ea45f4ec09a8fcf86 Author: Jens Schweikhardt AuthorDate: 2023-09-10 09:00:21 +0000 Commit: Jens Schweikhardt CommitDate: 2023-09-10 09:00:21 +0000 Correct the grammo in "will underlined". --- bin/ls/ls.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index c26e7767f88f..9c62f2cc1e38 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -743,7 +743,7 @@ where is the foreground color and .Ar b is the background color. -When the background color is capitalized, the text will underlined. +When the background color is capitalized, the text is underlined. .Pp The color designators are as follows: .Pp From nobody Sun Sep 10 12:59:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rk90P0c2pz4s6RK; Sun, 10 Sep 2023 12:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk90N6kWjz3FHh; Sun, 10 Sep 2023 12:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694350757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=giqbapB2RqNFddha9MhFYfZNPQJ4zjCpYFO1+Mjdlgk=; b=WCTibTBRDcW7Y3FPzqcLAU0KQ4leV89m2bV9d3cbmweuYT5YbnlN2W8O6ONP2JR9czsntL 3QwFKUpe98Bnw7Gp0MAUP5u0IKg1ibtJGLSYT6ClyfHmWpHdXYuLszKOK3eLAIPwXT0jpE gN6MnUI+niL2yMgS4G95W212wbVMM/tKXi0NXEXKYG/0RL2SfWvfeuANslIYEe9akTbn51 Io6bVmbn/2D9N3qBQacJwYrmNFWrXbI4rGfyDPpUX3tAW5XSyOIy7kVW3DQg5UlrFYCpwN R/ejA++shp9iQuQ9c0o3veo3Mu2B2gXlN/XSJKCznEWwDHWHGSumzhLQjqJWvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694350757; a=rsa-sha256; cv=none; b=DEAV91y1Gq+6313HyLblwWgn17fKKnLVCyHViQb7WKNvE+J3aNgu9Q5c01MhBr9qEF1ZHH Ue77/1SMCRzac2dqtC1zlh53GB8HfxoPVhHzPRbwI8BP07V5LHGDSKx3WxUcXHKoziF+cU PqdtA4YbAjEb4H+ELbA06DL3Clza3GFwUSVZMR6Sy8ST4uwFSXGlyX0CsR1Mftvb3dmRyz 0kEgF10Wqv1eZ5N4xb8BbrLScFSau99UF+yhqsSSk62Uwd8MoZ3UAfaGaWaGbXLrf4xFlK mvZ2bjoQq6Y32Y47Z411hWntvgRs/laUe4t9S1PW+rlkjRvpAprs2PVytIkWNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694350757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=giqbapB2RqNFddha9MhFYfZNPQJ4zjCpYFO1+Mjdlgk=; b=ZqI4Qlpxws87hp91iKTBOaQk2H+TVMF9hNC1b2b1/8tZ1Qyhle6Vk/3Vm7VsyLtj1y1uYK Hfjcn6sLtYCvNDUAtoDYNz2FKio/OQ/GTbofCTysWXzaNAYe2JWJJho/vhOOGnwZJ+A+CJ zYSoeeXba8WqSlV3l9S5nTgN27M5k9BDCNZJgwl/eLSbfJiBp3utKrTap3s9oXvx/ahcT3 yOUD86D3kNM43NtwfTQPz381Wf0C0iaUxC/vSD19rSkjG2LYRpghxG40x7OXrJk31Q2/iQ EC+b/rjjjE1J7UNWUR+/NqWz9eplvDnoEhH61nDN9V1ii9G8QJbC1Lhs1zaqsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rk90N5SgCz16bZ; Sun, 10 Sep 2023 12:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ACxGLD090167; Sun, 10 Sep 2023 12:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ACxGYQ090164; Sun, 10 Sep 2023 12:59:16 GMT (envelope-from git) Date: Sun, 10 Sep 2023 12:59:16 GMT Message-Id: <202309101259.38ACxGYQ090164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: b2618b651b28 - main - lib/libc/amd64/string/memchr.S: fix behaviour with overly long buffers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2618b651b28fd29e62a4e285f5be09ea30a85d4 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=b2618b651b28fd29e62a4e285f5be09ea30a85d4 commit b2618b651b28fd29e62a4e285f5be09ea30a85d4 Author: Robert Clausecker AuthorDate: 2023-09-10 04:11:07 +0000 Commit: Robert Clausecker CommitDate: 2023-09-10 12:52:59 +0000 lib/libc/amd64/string/memchr.S: fix behaviour with overly long buffers When memchr(buf, c, len) is called with a phony len (say, SIZE_MAX), buf + len overflows and we have buf + len < buf. This confuses the implementation and makes it return incorrect results. Neverthless we must support this case as memchr() is guaranteed to work even with phony buffer lengths, as long as a match is found before the buffer actually ends. Sponsored by: The FreeBSD Foundation Reported by: yuri, des Tested by: des Approved by: mjg (blanket, via IRC) MFC after: 1 week MFC to: stable/14 PR: 273652 --- lib/libc/amd64/string/memchr.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libc/amd64/string/memchr.S b/lib/libc/amd64/string/memchr.S index e10bd6c22f90..cfab9b1302de 100644 --- a/lib/libc/amd64/string/memchr.S +++ b/lib/libc/amd64/string/memchr.S @@ -44,7 +44,9 @@ ARCHENTRY(__memchr, scalar) je .Lnomatch lea (, %rdi, 8), %ecx - add %rdi, %rdx # pointer to end of buffer + mov $-1, %rax + add %rdi, %rdx # pointer to end of buffer or to end of + cmovc %rax, %rdx # address space (whichever comes first) and $~7, %rdi # align to 8 bytes mov (%rdi), %rax # load first word movzbl %sil, %esi # clear stray high bits @@ -118,14 +120,15 @@ ARCHENTRY(__memchr, baseline) movd %esi, %xmm2 mov %edi, %ecx - add %rdi, %rdx # pointer to end of buffer + mov $-1, %r9 + add %rdi, %rdx # pointer to end of buffer or to end of + cmovc %r9, %rdx # address space (whichever comes first) and $~0x1f, %rdi # align to 32 bytes movdqa (%rdi), %xmm0 # load first 32 bytes movdqa 16(%rdi), %xmm1 punpcklbw %xmm2, %xmm2 # c -> cc - mov $-1, %r9d shl %cl, %r9d # mask with zeroes before the string punpcklwd %xmm2, %xmm2 # cc -> cccc From nobody Sun Sep 10 13:13:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rk9JR2lR4z4sH3j; Sun, 10 Sep 2023 13:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk9JR2KPRz3LyV; Sun, 10 Sep 2023 13:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694351591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ViEIBRVEpcr8w3hHTWazjko1BdG+277i91m6vura2Do=; b=RoEU4RVMODIChAHbujYCyQi0S0VlDR4lZ0ZG6rVzLeVtlUPbJYXbAlJIcYlJDYQu4hTI9G CZLzouKixgC+ibQo79cw7CX0vglYfSzsJjKHxM9wZ4Er88p28cJa691zVWM9JP1jgmY7F8 bb62S2h+fi0hgXccvkdSemtaqkIkIdX5Tp+b13d+pG+4Z5TM9dPNKy3G2RPpkJz9EN3LHI IPSWzRUp/7HUmRRFs0yD61kHE4pU8yB4aqnPgdKjBSba7FLZVcmMaXwNec03UMAHxXjaib 59VMynwkN3ZvmrS7Cs6rbswl02iIJ1c1T1NQLcx/M1RvQPf55wEbMHN8yCMHvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694351591; a=rsa-sha256; cv=none; b=EZvyU3UVejI+R/JKf6vNTL/Xpg2h9dJWr54Q3NtmYGsswYpTJJs/qxho0S6eB5iF5obCL8 Vkfwc3xfhC2wtp2wCax1M+WthfNMjOn/3B5aZH7LKbadb1fOYbnJt152BE2V3hjq7oU6LN Z2FYOQL3iCiCD05pZBb5oK3nZbo/rCUNSUOK3lHz0n/v15tgAcVOaka25m/xhtIfC99BYd ekkasQsM+aOaOzaSUwYH+0TYAEqp519q+v6dmTjG4wjdmrkKkBuW/jpu+UF3RioIFEi1KY lvkjEZEjxrpj5xGfuFXKFTM+Ao4armDaweqgwmU02DhYehZ7vRDmiYxF5R6Cbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694351591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ViEIBRVEpcr8w3hHTWazjko1BdG+277i91m6vura2Do=; b=rs6KEfEmeX7o39KKXH0YZj3rFmREAlFIvl/i789vLuUnuIPqTKXOeul00AzOHE3/IpxrVb 6y7auzJzh8ya3IDQjlQwOKaPCZzGG3zZh3Y41YIkMCyCLxjCHogA0DTBDJGo9o/jJ1KJZE /IzgFlNxc0HuuvAmkwBWFH1ePJdCOdCkeJ0xev7lHRxmRPY1F3O9NpnlTrbyXg7uECx3qD /OMSw/iaQrlCnvxTXMjjZj+luFpXGykL8/ttHdKDLQucyh7gWh0/i1Lz+NBYN4Unb9xO09 plgh6K6Sl8HKDsamznt6gUpbl1EM8xZ3j3ZjDF3lxpp93bLuM+u1Do8G5nCs8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rk9JR1Pmnz16x8; Sun, 10 Sep 2023 13:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ADDBXx023511; Sun, 10 Sep 2023 13:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ADDB0D023508; Sun, 10 Sep 2023 13:13:11 GMT (envelope-from git) Date: Sun, 10 Sep 2023 13:13:11 GMT Message-Id: <202309101313.38ADDB0D023508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f415a5c1bd56 - main - pfsync: fix state leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f415a5c1bd56933367e42312731e4ec553e256ed Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f415a5c1bd56933367e42312731e4ec553e256ed commit f415a5c1bd56933367e42312731e4ec553e256ed Author: Kristof Provost AuthorDate: 2023-09-08 09:21:12 +0000 Commit: Kristof Provost CommitDate: 2023-09-10 13:12:51 +0000 pfsync: fix state leak If we receive a state with a route-to interface name set and we can't find the interface we do not insert the state. However, in that case we must still clean up the state (and state keys). Do so, so we do not leak states. Reviewed by: Kajetan Staszkiewicz MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41779 --- sys/netpfil/pf/if_pfsync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db448c9bbc48..e29c00fcb879 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -685,8 +685,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) printf("%s: unknown route interface: %s\n", __func__, sp->pfs_1400.rt_ifname); if (flags & PFSYNC_SI_IOCTL) - return (EINVAL); - return (0); /* skip this state */ + error = EINVAL; + else + error = 0; + goto cleanup_keys; } break; default: @@ -734,6 +736,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) cleanup: error = ENOMEM; +cleanup_keys: if (skw == sks) sks = NULL; uma_zfree(V_pf_state_key_z, skw); From nobody Sun Sep 10 14:30:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkC1W2hqwz4t6FJ; Sun, 10 Sep 2023 14:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkC1W1g50z4KLH; Sun, 10 Sep 2023 14:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694356223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B641uCPP61dWJ6VzZIsO4LQLBICbrAV2M5JOv3FGaq0=; b=oH5JnXOhyEcz9NGL8e99mq07ESHCYRHNY1dG8wv6vRJD6c8xT3bBy60gWv8uj1Ed7KzYpv nOIVJdi67GAuppJ34IqL4/KK+eZJMnTHn5Nco+J99r3pki6nTq+SCpZ7K3lS5RD60m7D8t 0YvM2pmAH+nz99nGzXCuJV0V8Elypi2vcplWlSKXrY2FMUD+1Wj++xHEGA3tfmRydTk5U5 icn0Y5hiRUMJt+SPCoIeV1GMpee3DIKiqJ0hyfbeqa2lsbCqv5bJ9ob41lE4b9Bk2UJesw Gu8+W3+0HuxvUTv+SndSEbvP4tqSaICtMxPFK+t2nwkUWJRSx0LuoCgFIRD3gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694356223; a=rsa-sha256; cv=none; b=IqevWDy2vPNTRdKfatOCwRYXbmJvN4YVFupE1aPuQbKkYDRLr6K5yvpeDqHEvW1VBPv1Wp vInlC9jNBWXpSeprKqZkAaNESxC/8/GYlbZKpyDR5XHaCX5nWmrcIaE0zJETt4ta8CDJC6 aTIkbxOGrE1lRndodlshu60VBYr05iAQxua3O7bIYkbYgXMg727XutDrZFVE6NAjieSCqZ ED34L19pLZ48ZzajN75Fnjz2z4QP6QS+z4YMqJ3m4ecECUjnW2ymMu8piRmWdHvnciVHyY b2PQniwZ9kltCy/iQkLNsVo8ZQ+R0ZzPxHY4CPf7CbPUKULfo4c48MoIvyDqMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694356223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B641uCPP61dWJ6VzZIsO4LQLBICbrAV2M5JOv3FGaq0=; b=nlPMUQg41XUxJrvXVHSDglbTZAkGQUHifiWDN/gzSvDFCvAETCGWriGHkSOGcN5BCa9jM9 B6uQlzlEA64XM4vhVpjhnTnfwS7XZeKGwer3Iq/se7OiSSWc91e557yJc4+0OgWcy7xjJJ Vh9iejtckJlhRtrCoDvUvKNnny95cCQUvOWkS464MKB6dTF9bzC+6tUpJnRfPVjLV1jG3q EgI3WvqowIRnZCw6Du7EDEmC0iPOmE5FBMvYfvxHlg51WS91Mzn30YJKz31WoXy0yEzE4A W1q1gg8/1oozAR9ygWxpXfGPK26C62YZghUe/tcF2lVtebIynnFW1qIX3gbVUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkC1W0TBZz19K1; Sun, 10 Sep 2023 14:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AEUMBa049968; Sun, 10 Sep 2023 14:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AEUMCg049965; Sun, 10 Sep 2023 14:30:22 GMT (envelope-from git) Date: Sun, 10 Sep 2023 14:30:22 GMT Message-Id: <202309101430.38AEUMCg049965@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: e203cb393fe0 - main - cxgbe(4): Fix tracing with netlink enabled kernels. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e203cb393fe0b963dd585d0576dcc6a47a28c386 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e203cb393fe0b963dd585d0576dcc6a47a28c386 commit e203cb393fe0b963dd585d0576dcc6a47a28c386 Author: Navdeep Parhar AuthorDate: 2023-09-09 19:39:15 +0000 Commit: Navdeep Parhar CommitDate: 2023-09-10 14:06:32 +0000 cxgbe(4): Fix tracing with netlink enabled kernels. 1. The tracing ifnet's name must match the nexus name. One way to do this is to not use a unit number. 2. Do not hold the tracer lock around ether_ifattach or ether_ifdetach. netlink calls back into the driver (see stack below) and that leads to illegal lock recursion. tracer_ioctl if_ioctl get_operstate_ether get_operstate dump_iface rtnl_handle_ifevent rtnl_handle_ifattach if_attach_internal if_attach ether_ifattach t4_cloner_create MFC after: 3 days Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_tracer.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c index 4190aa627b14..d9b336c4b64a 100644 --- a/sys/dev/cxgbe/t4_tracer.c +++ b/sys/dev/cxgbe/t4_tracer.c @@ -138,7 +138,7 @@ t4_cloner_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) struct match_rr mrr; struct adapter *sc; if_t ifp; - int rc, unit; + int rc; const uint8_t lla[ETHER_ADDR_LEN] = {0, 0, 0, 0, 0, 0}; mrr.name = name; @@ -166,21 +166,14 @@ t4_cloner_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) goto done; } - - unit = -1; - rc = ifc_alloc_unit(ifc, &unit); - if (rc != 0) - goto done; - ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { - ifc_free_unit(ifc, unit); rc = ENOMEM; goto done; } - /* Note that if_xname is not . */ - if_initname(ifp, name, unit); + /* Note that if_xname is identical to the nexus nameunit */ + if_initname(ifp, name, -1); if_setdname(ifp, t4_cloner_name); if_setinitfn(ifp, tracer_init); if_setflags(ifp, IFF_SIMPLEX | IFF_DRV_RUNNING); @@ -192,12 +185,14 @@ t4_cloner_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) tracer_media_status); ifmedia_add(&sc->media, IFM_ETHER | IFM_FDX | IFM_NONE, 0, NULL); ifmedia_set(&sc->media, IFM_ETHER | IFM_FDX | IFM_NONE); + sx_xunlock(&t4_trace_lock); ether_ifattach(ifp, lla); - + sx_xlock(&t4_trace_lock); mtx_lock(&sc->ifp_lock); if_setsoftc(ifp, sc); sc->ifp = ifp; mtx_unlock(&sc->ifp_lock); + rc = 0; done: sx_xunlock(&t4_trace_lock); end_synchronized_op(sc, 0); @@ -208,7 +203,6 @@ static int t4_cloner_destroy(struct if_clone *ifc, if_t ifp) { struct adapter *sc; - int unit = if_getdunit(ifp); sx_xlock(&t4_trace_lock); sc = if_getsoftc(ifp); @@ -219,10 +213,9 @@ t4_cloner_destroy(struct if_clone *ifc, if_t ifp) mtx_unlock(&sc->ifp_lock); ifmedia_removeall(&sc->media); } + sx_xunlock(&t4_trace_lock); ether_ifdetach(ifp); if_free(ifp); - ifc_free_unit(ifc, unit); - sx_xunlock(&t4_trace_lock); return (0); } From nobody Sun Sep 10 18:34:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkJR31NFlz4sPms; Sun, 10 Sep 2023 18:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkJR30kH7z4lrM; Sun, 10 Sep 2023 18:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694370863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbtUPoZi+xFgkavbG100BStgCx9h30Y/Sym+E/shylM=; b=t3Fz88m0ZozqlYmkeBXRWnsZXs75L1vYJKF2i5q0EfreX+AoQ61YVOUaMMAL5QIoZbGQW0 Fea6yIdoCVsaxrWxnCIvNYNBT7frlU5kDxwaDc3Lo69eedp9iwRqH7gtfZnTm2bkhP7Nqw 1OpmD3YyWDQUeiz7+g/gO7GqwvxiQwx0aFC7tCkq6lfN9QJLK88WuKeGYs+t2d/y5gNcQp htkwE5JXczywpDil3/cn1w7rR2MLo9QjKCbF4SXjitHA/3n+BWl5Pg9S7xfkBC37kP341c cH9DUqbH9Hcd3pDwKiFAGNLYk1RAg/jCYyoUrJxuX9VAw05Do4Ds6+EYPiRRkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694370863; a=rsa-sha256; cv=none; b=fvK1/EAYfv0c4pnd/JfHikDEU2fMHF2ErLHGcsZ2bLsmcUAphKKFlRBwy0rrlMcADKOV6T JHi/Yj9+tcC2HRGSZklkh11DbmrUOtEi795xTcTDXmju+QnrxwbOb9yeX/cLsbGzRZBiQL KVZ5br7AzFS+pEqSscu9DU6ws8OYD2bGMkllC+/s9V6m6FaUT1dc57Tgr3RN9xn4RPCI/P FNPGg46zyYjQLn69d5a9O7tffT1LrZx8F5HnkpXuZlNXv9crutPkOt4EtYhfNjkA42S6k7 rc8S5mrV8adHfIjUllKsXN/B0b76EBt07Wu9VS35hSl0dshzOcBUhExcopZd9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694370863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbtUPoZi+xFgkavbG100BStgCx9h30Y/Sym+E/shylM=; b=G2weYR/bPMzq9e5jaGpQfGSxuaNO1fGOBdaeLZohBBOfpoboAB14hJsuql1fdjLjIt14m0 NZbY3tBy+s85VBNFbHzIrTwExN1NS/JErrvtCjOsNGBpMX1GhanaWbOsCwtHr6pxfieMW2 Jj1bSzO/ArhPsQ4IZEEoF7xyq98KKbXnslRycd1mrkVdHRfhdufMK7UwOzQQ0bl54Dsys1 pdLCVo2MEz1o6RQWGcdm6zX54FpR5c2BOo9awkofhcCqMPZ0uV9+lJjMpwURBwx/yyZ/11 jM+FtcbiBm/6Yic66gdg1uwGE9wLxfS72Cdd4zNuu6Ro2exhqkDwKJI0EU3izw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkJR26vHsz31p; Sun, 10 Sep 2023 18:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AIYMcU059244; Sun, 10 Sep 2023 18:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AIYMZ6059241; Sun, 10 Sep 2023 18:34:22 GMT (envelope-from git) Date: Sun, 10 Sep 2023 18:34:22 GMT Message-Id: <202309101834.38AIYMZ6059241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ef8abddf103d - main - mkfile: getopt() returns an int, not a char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62 commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-10 18:33:32 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Sun Sep 10 19:21:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkKTj6Cqsz4svjt; Sun, 10 Sep 2023 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkKTj5xHPz3GgM; Sun, 10 Sep 2023 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694373705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qOISdwmVSW84eiX7ettxhUnqkup3zr8nT77kGk7Wq/k=; b=ySDH0BJDCDCv+GMDscQOjdNlRJ09B9R9cwxWcXCcZJHvPit7lhrRVUwhnORBZkK4b7nc2T 0+rw69x6HT6b/GfPKSrJwwJIOLQHdzBseXyyLvq3OUikLUwujB8IoS/8ZoAGpRJzC5CQ2D 03nBc4wAcQrBGnj/vtjb7LMX9x6iNde00QQ0AInVZbUpSbRGd6I7JOYZcrWGtwoWbHNCXs vDLDOWk/8bPhWuaWL1yzSet7wWyvt3/9F42lHlK8ztHfjw/dd0XF9GhDUn8gK+V9GaeDkR i5QEkSFsBW2fH4lPZzwqm0yRNQI75Bkj94vOLH0WkQOmAXhcTb6bVQDaN+UGcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694373705; a=rsa-sha256; cv=none; b=YrBauijMQZ4eSePMN5lZYz4LsDBB+keiAa5I/4qnlMLe6tBq/uXyzZZ436IBrI1ftFpmvX 4KNRCMWKsW4zjJ/1obacY1QPhBtfNHg5G2/xO9YLWY27kFGdAN0sx7pFEAX+v4p9cpbTHW k1eRSMTHAYvZLwgg5TSMjB2YMHpT6tseUwkJ4D8EyYxl4qcirxOa71iTCU6j6Os8oXdfXA p8STdBBks8T63f3j2UheJ3HQOyb5HxiOxeJbJk2ZpnG7UmQah1M0xUM+pbIKNRKkByA689 +F1X9Z4rOOJ6a401RJwV0hdwz1NWYWG3CY7A1fBwMZCUfj3PxT36FNgVtNiqLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694373705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qOISdwmVSW84eiX7ettxhUnqkup3zr8nT77kGk7Wq/k=; b=k7WYMp1C7YYRNXw9Oqxub831YqoiUINtJ2Mp7ioN2p2zSI6EvKy/0Yx5B0cPGRR84wBN2H UbiH4dmaqtIunveGHD8rLgYtJwvmz9tIsK5MaSBvTqgKMUuYmiQ4U3cg/v33TXiOTLAsbg OKuZFeon718T6ee+vYKNvH1Qjx6C0/Xexm+aqN/JTtkQ5O9LPM/EGD6wt9HLZ1MZtYPhlr e2yefNHoF0dyiiGWZM9iH9fZrkeCs+1rcR5tIbchVkxCxafEXXCAbgLQwiND0htMmUcEaM ydEspb7kWya+IasbMTArpmA75OXlhqmtMBqXszo49Xvga6t+I0qSsWmJXjfiDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkKTj50XJz4Lb; Sun, 10 Sep 2023 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AJLjAW040022; Sun, 10 Sep 2023 19:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AJLjXM040019; Sun, 10 Sep 2023 19:21:45 GMT (envelope-from git) Date: Sun, 10 Sep 2023 19:21:45 GMT Message-Id: <202309101921.38AJLjXM040019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 898496ee09ed - main - MFV: file 5.45. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 898496ee09ed2b7d25f6807edc4515628196ec0a Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=898496ee09ed2b7d25f6807edc4515628196ec0a commit 898496ee09ed2b7d25f6807edc4515628196ec0a Merge: ef8abddf103d 72d4668c77f0 Author: Xin LI AuthorDate: 2023-09-10 19:20:33 +0000 Commit: Xin LI CommitDate: 2023-09-10 19:21:16 +0000 MFV: file 5.45. MFC after: 3 days contrib/file/ChangeLog | 64 ++- contrib/file/README.md | 3 +- contrib/file/acinclude.m4 | 5 +- contrib/file/config.guess | 2 + contrib/file/config.h.in | 21 + contrib/file/config.sub | 1 + contrib/file/configure | 184 ++++++- contrib/file/configure.ac | 40 +- contrib/file/doc/file.man | 21 +- contrib/file/doc/libmagic.man | 26 +- contrib/file/doc/magic.man | 88 ++-- contrib/file/libmagic.pc.in | 1 + contrib/file/magic/Magdir/algol68 | 12 +- contrib/file/magic/Magdir/android | 52 +- contrib/file/magic/Magdir/animation | 25 +- contrib/file/magic/Magdir/apple | 299 +++++++++-- contrib/file/magic/Magdir/archive | 547 ++++++++++++++++++++- contrib/file/magic/Magdir/arm | 11 +- contrib/file/magic/Magdir/asf | 4 +- contrib/file/magic/Magdir/audio | 17 +- contrib/file/magic/Magdir/blender | 15 +- contrib/file/magic/Magdir/bytecode | 13 +- contrib/file/magic/Magdir/c-lang | 8 +- contrib/file/magic/Magdir/c64 | 357 +++++++++++++- contrib/file/magic/Magdir/cad | 40 +- contrib/file/magic/Magdir/coff | 3 +- contrib/file/magic/Magdir/commands | 18 +- contrib/file/magic/Magdir/compress | 88 +++- contrib/file/magic/Magdir/console | 52 +- contrib/file/magic/Magdir/crypto | 46 +- contrib/file/magic/Magdir/database | 62 ++- contrib/file/magic/Magdir/der | 9 +- contrib/file/magic/Magdir/dsf | 25 - contrib/file/magic/Magdir/dwarfs | 45 ++ contrib/file/magic/Magdir/elf | 10 +- contrib/file/magic/Magdir/filesystems | 211 ++++---- contrib/file/magic/Magdir/firmware | 133 +++++ contrib/file/magic/Magdir/games | 198 +++++++- contrib/file/magic/Magdir/gentoo | 9 +- contrib/file/magic/Magdir/geo | 42 +- contrib/file/magic/Magdir/images | 342 +++++++++++-- contrib/file/magic/Magdir/intel | 8 +- contrib/file/magic/Magdir/java | 9 +- contrib/file/magic/Magdir/javascript | 64 ++- contrib/file/magic/Magdir/jpeg | 8 +- contrib/file/magic/Magdir/lif | 9 +- contrib/file/magic/Magdir/linux | 99 +++- contrib/file/magic/Magdir/llvm | 3 +- contrib/file/magic/Magdir/macintosh | 56 ++- contrib/file/magic/Magdir/magic | 65 ++- contrib/file/magic/Magdir/mail.news | 4 +- contrib/file/magic/Magdir/map | 7 +- contrib/file/magic/Magdir/mathematica | 69 ++- contrib/file/magic/Magdir/meteorological | 8 +- contrib/file/magic/Magdir/misctools | 66 ++- contrib/file/magic/Magdir/modem | 12 +- contrib/file/magic/Magdir/msdos | 460 +++++++++++++++-- contrib/file/magic/Magdir/msooxml | 12 +- contrib/file/magic/Magdir/ole2compounddocs | 155 ++++-- contrib/file/magic/Magdir/pdf | 6 +- contrib/file/magic/Magdir/perl | 8 +- contrib/file/magic/Magdir/playdate | 57 +++ contrib/file/magic/Magdir/printer | 144 +++++- contrib/file/magic/Magdir/qt | 13 +- contrib/file/magic/Magdir/rst | 6 +- contrib/file/magic/Magdir/rust | 21 + contrib/file/magic/Magdir/scientific | 43 +- contrib/file/magic/Magdir/sendmail | 4 +- contrib/file/magic/Magdir/sgml | 13 +- contrib/file/magic/Magdir/sniffer | 75 ++- contrib/file/magic/Magdir/softquad | 9 +- contrib/file/magic/Magdir/spectrum | 118 ++++- contrib/file/magic/Magdir/sql | 65 ++- contrib/file/magic/Magdir/ssh | 11 +- contrib/file/magic/Magdir/svf | 5 + contrib/file/magic/Magdir/sysex | 6 +- contrib/file/magic/Magdir/terminfo | 3 +- contrib/file/magic/Magdir/tex | 10 +- contrib/file/magic/Magdir/tplink | 13 +- contrib/file/magic/Magdir/troff | 8 +- contrib/file/magic/Magdir/uterus | 4 +- contrib/file/magic/Magdir/varied.script | 64 +-- contrib/file/magic/Magdir/web | 8 +- contrib/file/magic/Magdir/windows | 532 ++++++++++++++++++-- contrib/file/magic/Magdir/wordprocessors | 72 ++- contrib/file/magic/Magdir/xenix | 18 +- contrib/file/magic/Magdir/xilinx | 20 +- contrib/file/magic/Makefile.am | 8 +- contrib/file/magic/Makefile.in | 8 +- contrib/file/src/Makefile.am | 8 +- contrib/file/src/Makefile.in | 23 +- contrib/file/src/apprentice.c | 275 ++++++----- contrib/file/src/apptype.c | 8 +- contrib/file/src/ascmagic.c | 38 +- contrib/file/src/asctime_r.c | 4 +- contrib/file/src/asprintf.c | 2 +- contrib/file/src/buffer.c | 11 +- contrib/file/src/cdf.c | 2 +- contrib/file/src/cdf_time.c | 6 +- contrib/file/src/compress.c | 389 +++++++++++---- contrib/file/src/ctime_r.c | 4 +- contrib/file/src/der.c | 12 +- contrib/file/src/dprintf.c | 2 +- contrib/file/src/encoding.c | 40 +- contrib/file/src/file.c | 131 ++--- contrib/file/src/file.h | 187 +++---- contrib/file/src/file_opts.h | 4 +- contrib/file/src/fmtcheck.c | 2 +- contrib/file/src/fsmagic.c | 8 +- contrib/file/src/funcs.c | 120 +++-- contrib/file/src/getline.c | 4 +- contrib/file/src/getopt_long.c | 2 +- contrib/file/src/gmtime_r.c | 4 +- contrib/file/src/is_csv.c | 12 +- contrib/file/src/is_json.c | 6 +- contrib/file/src/is_simh.c | 209 ++++++++ contrib/file/src/is_tar.c | 14 +- contrib/file/src/localtime_r.c | 4 +- contrib/file/src/magic.c | 60 ++- contrib/file/src/magic.h.in | 9 +- contrib/file/src/memtest.c | 3 +- contrib/file/src/pread.c | 2 +- contrib/file/src/print.c | 30 +- contrib/file/src/readcdf.c | 26 +- contrib/file/src/readelf.c | 72 +-- contrib/file/src/seccomp.c | 3 +- contrib/file/src/softmagic.c | 252 ++++++---- contrib/file/src/strlcat.c | 2 +- contrib/file/src/strlcpy.c | 2 +- contrib/file/src/tar.h | 4 +- contrib/file/src/vasprintf.c | 7 +- contrib/file/tests/CVE-2014-1943.result | 2 +- contrib/file/tests/HWP2016.hwp.result | 1 + contrib/file/tests/HWP2016.hwp.testfile | Bin 0 -> 9216 bytes contrib/file/tests/HWP2016.hwpx.zip.result | 1 + contrib/file/tests/HWP2016.hwpx.zip.testfile | Bin 0 -> 14377 bytes contrib/file/tests/HWP97.hwp.result | 1 + contrib/file/tests/HWP97.hwp.testfile | Bin 0 -> 8975 bytes contrib/file/tests/JW07022A.mp3.result | 2 +- contrib/file/tests/Makefile.am | 70 ++- contrib/file/tests/Makefile.in | 70 ++- contrib/file/tests/android-vdex-1.result | 2 +- contrib/file/tests/android-vdex-2.result | 2 +- contrib/file/tests/arj.result | 2 +- contrib/file/tests/bcachefs.result | 2 +- contrib/file/tests/bcachefs2.result | 1 + contrib/file/tests/bcachefs2.testfile | Bin 0 -> 8192 bytes contrib/file/tests/cl8m8ocofedso.result | 2 +- contrib/file/tests/cmd1.result | 1 + contrib/file/tests/cmd1.testfile | 1 + contrib/file/tests/cmd2.result | 1 + contrib/file/tests/cmd2.testfile | 1 + contrib/file/tests/cmd3.result | 1 + contrib/file/tests/cmd3.testfile | 2 + contrib/file/tests/cmd4.result | 1 + contrib/file/tests/cmd4.testfile | 2 + contrib/file/tests/dsd64-dff.result | 2 +- contrib/file/tests/dsd64-dsf.result | 2 +- contrib/file/tests/escapevel.result | 2 +- contrib/file/tests/ext4.result | 2 +- contrib/file/tests/fit-map-data.result | 2 +- contrib/file/tests/gedcom.result | 2 +- contrib/file/tests/hddrawcopytool.result | 2 +- contrib/file/tests/hello-racket_rkt.result | 1 + contrib/file/tests/hello-racket_rkt.testfile | Bin 0 -> 1664 bytes contrib/file/tests/issue311docx.result | 2 +- contrib/file/tests/issue359xlsx.result | 2 +- contrib/file/tests/jpeg-text.result | 1 + contrib/file/tests/jpeg-text.testfile | 1 + contrib/file/tests/json1.result | 2 +- contrib/file/tests/json2.result | 2 +- contrib/file/tests/json3.result | 2 +- contrib/file/tests/json4.result | 2 +- contrib/file/tests/json5.result | 2 +- contrib/file/tests/json6.result | 2 +- contrib/file/tests/json7.result | 2 +- contrib/file/tests/json8.result | 2 +- contrib/file/tests/jsonlines1.result | 2 +- contrib/file/tests/matilde.arm.result | 2 +- contrib/file/tests/multiple-A.magic | 2 + contrib/file/tests/multiple-B.magic | 2 + contrib/file/tests/multiple.flags | 1 + contrib/file/tests/multiple.result | 1 + contrib/file/tests/multiple.testfile | 1 + contrib/file/tests/pcjr.result | 2 +- contrib/file/tests/pgp-binary-key-v2-phil.result | 2 +- contrib/file/tests/pgp-binary-key-v3-lutz.result | 2 +- contrib/file/tests/pgp-binary-key-v4-dsa.result | 2 +- .../pgp-binary-key-v4-ecc-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-ecc-secret-key.result | 2 +- .../file/tests/pgp-binary-key-v4-rsa-key.result | 2 +- .../pgp-binary-key-v4-rsa-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-rsa-secret-key.result | 2 +- contrib/file/tests/pnm1.result | 1 + contrib/file/tests/pnm1.testfile | 5 + contrib/file/tests/pnm2.result | 1 + contrib/file/tests/pnm2.testfile | Bin 0 -> 15 bytes contrib/file/tests/pnm3.result | 1 + contrib/file/tests/pnm3.testfile | 5 + contrib/file/tests/regex-eol.result | 2 +- contrib/file/tests/registry-pol.result | 1 + contrib/file/tests/registry-pol.testfile | Bin 0 -> 7094 bytes contrib/file/tests/test.c | 70 ++- contrib/file/tests/uf2.result | 2 +- contrib/file/tests/xclbin.result | 1 + contrib/file/tests/xclbin.testfile | Bin 0 -> 512 bytes contrib/file/tests/zstd-3-skippable-frames.result | 2 +- contrib/file/tests/zstd-dictionary-0.result | 2 +- contrib/file/tests/zstd-dictionary-1.result | 2 +- contrib/file/tests/zstd-dictionary-2.result | 2 +- contrib/file/tests/zstd-skippable-frame-0.result | 2 +- contrib/file/tests/zstd-skippable-frame-4.result | 2 +- contrib/file/tests/zstd-skippable-frame-8.result | 2 +- contrib/file/tests/zstd-skippable-frame-C.result | 2 +- contrib/file/tests/zstd-v0.2-FF.result | 2 +- contrib/file/tests/zstd-v0.3-FF.result | 2 +- contrib/file/tests/zstd-v0.4-FF.result | 2 +- contrib/file/tests/zstd-v0.5-FF.result | 2 +- contrib/file/tests/zstd-v0.6-FF.result | 2 +- contrib/file/tests/zstd-v0.7-00.result | 2 +- contrib/file/tests/zstd-v0.7-21.result | 2 +- contrib/file/tests/zstd-v0.7-22.result | 2 +- contrib/file/tests/zstd-v0.8-00.result | 2 +- contrib/file/tests/zstd-v0.8-01.result | 2 +- contrib/file/tests/zstd-v0.8-02.result | 2 +- contrib/file/tests/zstd-v0.8-03.result | 2 +- contrib/file/tests/zstd-v0.8-16.result | 2 +- contrib/file/tests/zstd-v0.8-20.result | 2 +- contrib/file/tests/zstd-v0.8-21.result | 2 +- contrib/file/tests/zstd-v0.8-22.result | 2 +- contrib/file/tests/zstd-v0.8-23.result | 2 +- contrib/file/tests/zstd-v0.8-F4.result | 2 +- contrib/file/tests/zstd-v0.8-FF.result | 2 +- lib/libmagic/Makefile | 1 + lib/libmagic/config.h | 29 +- 235 files changed, 6485 insertions(+), 1560 deletions(-) diff --cc contrib/file/README.md index 37a3b17856c6,000000000000..26e38045812c mode 100644,000000..100644 --- a/contrib/file/README.md +++ b/contrib/file/README.md @@@ -1,155 -1,0 +1,156 @@@ +## README for file(1) Command and the libmagic(3) library ## + - @(#) $File: README.md,v 1.4 2021/10/21 01:51:31 christos Exp $ ++ @(#) $File: README.md,v 1.5 2023/05/28 13:59:47 christos Exp $ + +- Bug Tracker: +- Build Status: +- Download link: +- E-mail: +- Fuzzing link: +- Home page: https://www.darwinsys.com/file/ +- Mailing List archives: +- Mailing List: +- Public repo: +- Test framework: + +Phone: Do not even think of telephoning me about this program. Send +cash first! + +This is Release 5.x of Ian Darwin's (copyright but distributable) +file(1) command, an implementation of the Unix File(1) command. +It knows the 'magic number' of several thousands of file types. +This version is the standard "file" command for Linux, *BSD, and +other systems. (See "patchlevel.h" for the exact release number). + +The major changes for 5.x are CDF file parsing, indirect magic, +name/use (recursion) and overhaul in mime and ascii encoding +handling. + +The major feature of 4.x is the refactoring of the code into a +library, and the re-write of the file command in terms of that +library. The library itself, libmagic can be used by 3rd party +programs that wish to identify file types without having to fork() +and exec() file. The prime contributor for 4.0 was Mans Rullgard. + +UNIX is a trademark of UNIX System Laboratories. + +The prime contributor to Release 3.8 was Guy Harris, who put in +megachanges including byte-order independence. + +The prime contributor to Release 3.0 was Christos Zoulas, who put +in hundreds of lines of source code changes, including his own +ANSIfication of the code (I liked my own ANSIfication better, but +his (__P()) is the "Berkeley standard" way of doing it, and I wanted +UCB to include the code...), his HP-like "indirection" (a feature +of the HP file command, I think), and his mods that finally got +the uncompress (-z) mode finished and working. + +This release has compiled in numerous environments; see PORTING +for a list and problems. + +This fine freeware file(1) follows the USG (System V) model of the +file command, rather than the Research (V7) version or the V7-derived +4.[23] Berkeley one. That is, the file /etc/magic contains much of +the ritual information that is the source of this program's power. +My version knows a little more magic (including tar archives) than +System V; the /etc/magic parsing seems to be compatible with the +(poorly documented) System V /etc/magic format (with one exception; +see the man page). + +In addition, the /etc/magic file is built from a subdirectory +for easier(?) maintenance. I will act as a clearinghouse for +magic numbers assigned to all sorts of data files that +are in reasonable circulation. Send your magic numbers, +in magic(5) format please, to the maintainer, Christos Zoulas. + +COPYING - read this first. +* `README` - read this second (you are currently reading this file). +* `INSTALL` - read on how to install +* `src/apprentice.c` - parses /etc/magic to learn magic +* `src/apptype.c` - used for OS/2 specific application type magic +* `src/ascmagic.c` - third & last set of tests, based on hardwired assumptions. +* `src/asctime_r.c` - replacement for OS's that don't have it. +* `src/asprintf.c` - replacement for OS's that don't have it. +* `src/buffer.c` - buffer handling functions. +* `src/cdf.[ch]` - parser for Microsoft Compound Document Files +* `src/cdf_time.c` - time converter for CDF. +* `src/compress.c` - handles decompressing files to look inside. +* `src/ctime_r.c` - replacement for OS's that don't have it. +* `src/der.[ch]` - parser for Distinguished Encoding Rules +* `src/dprintf.c` - replacement for OS's that don't have it. +* `src/elfclass.h` - common code for elf 32/64. +* `src/encoding.c` - handles unicode encodings +* `src/file.c` - the main program +* `src/file.h` - header file +* `src/file_opts.h` - list of options +* `src/fmtcheck.c` - replacement for OS's that don't have it. +* `src/fsmagic.c` - first set of tests the program runs, based on filesystem info +* `src/funcs.c` - utilility functions +* `src/getline.c` - replacement for OS's that don't have it. +* `src/getopt_long.c` - replacement for OS's that don't have it. +* `src/gmtime_r.c` - replacement for OS's that don't have it. +* `src/is_csv.c` - knows about Comma Separated Value file format (RFC 4180). +* `src/is_json.c` - knows about JavaScript Object Notation format (RFC 8259). ++* `src/is_simh.c` - knows about SIMH tape file format. +* `src/is_tar.c, tar.h` - knows about Tape ARchive format (courtesy John Gilmore). +* `src/localtime_r.c` - replacement for OS's that don't have it. +* `src/magic.h.in` - source file for magic.h +* `src/mygetopt.h` - replacement for OS's that don't have it. +* `src/magic.c` - the libmagic api +* `src/names.h` - header file for ascmagic.c +* `src/pread.c` - replacement for OS's that don't have it. +* `src/print.c` - print results, errors, warnings. +* `src/readcdf.c` - CDF wrapper. +* `src/readelf.[ch]` - Stand-alone elf parsing code. +* `src/softmagic.c` - 2nd set of tests, based on /etc/magic +* `src/mygetopt.h` - replacement for OS's that don't have it. +* `src/strcasestr.c` - replacement for OS's that don't have it. +* `src/strlcat.c` - replacement for OS's that don't have it. +* `src/strlcpy.c` - replacement for OS's that don't have it. +* `src/strndup.c` - replacement for OS's that don't have it. +* `src/tar.h` - tar file definitions +* `src/vasprintf.c` - for systems that don't have it. +* `doc/file.man` - man page for the command +* `doc/magic.man` - man page for the magic file, courtesy Guy Harris. + Install as magic.4 on USG and magic.5 on V7 or Berkeley; cf Makefile. + +Magdir - directory of /etc/magic pieces +------------------------------------------------------------------------------ + +If you submit a new magic entry please make sure you read the following +guidelines: + +- Initial match is preferably at least 32 bits long, and is a _unique_ match +- If this is not feasible, use additional check +- Match of <= 16 bits are not accepted +- Delay printing string as much as possible, don't print output too early +- Avoid printf arbitrary byte as string, which can be a source of + crash and buffer overflow + +- Provide complete information with entry: + * One line short summary + * Optional long description + * File extension, if applicable + * Full name and contact method (for discussion when entry has problem) + * Further reference, such as documentation of format + +gpg for dummies: +------------------------------------------------------------------------------ + +``` +$ gpg --verify file-X.YY.tar.gz.asc file-X.YY.tar.gz +gpg: assuming signed data in `file-X.YY.tar.gz' +gpg: Signature made WWW MMM DD HH:MM:SS YYYY ZZZ using DSA key ID KKKKKKKK +``` + +To download the key: + +``` +$ gpg --keyserver hkp://keys.gnupg.net --recv-keys KKKKKKKK +``` +------------------------------------------------------------------------------ + + +Parts of this software were developed at SoftQuad Inc., developers +of SGML/HTML/XML publishing software, in Toronto, Canada. +SoftQuad was swallowed up by Corel in 2002 and does not exist any longer. diff --cc contrib/file/magic/Magdir/dwarfs index 000000000000,3700a33c5d7a..3700a33c5d7a mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/dwarfs +++ b/contrib/file/magic/Magdir/dwarfs diff --cc contrib/file/magic/Magdir/firmware index 000000000000,4835b12e8d04..4835b12e8d04 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/firmware +++ b/contrib/file/magic/Magdir/firmware diff --cc contrib/file/magic/Magdir/playdate index 000000000000,77f8c689378d..77f8c689378d mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/playdate +++ b/contrib/file/magic/Magdir/playdate diff --cc contrib/file/magic/Magdir/rust index 000000000000,b1bbd9d9702c..b1bbd9d9702c mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/rust +++ b/contrib/file/magic/Magdir/rust diff --cc contrib/file/magic/Magdir/svf index 000000000000,b0d5c980f944..b0d5c980f944 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/svf +++ b/contrib/file/magic/Magdir/svf diff --cc contrib/file/src/is_simh.c index 000000000000,4e78173fc44c..4e78173fc44c mode 000000,100644..100644 --- a/contrib/file/src/is_simh.c +++ b/contrib/file/src/is_simh.c diff --cc contrib/file/tests/HWP2016.hwp.result index 000000000000,2edd0b53aca7..2edd0b53aca7 mode 000000,100644..100644 --- a/contrib/file/tests/HWP2016.hwp.result +++ b/contrib/file/tests/HWP2016.hwp.result diff --cc contrib/file/tests/HWP2016.hwp.testfile index 000000000000,75ab61d2103b..75ab61d2103b mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/HWP2016.hwpx.zip.result index 000000000000,6077a602a5cf..6077a602a5cf mode 000000,100644..100644 --- a/contrib/file/tests/HWP2016.hwpx.zip.result +++ b/contrib/file/tests/HWP2016.hwpx.zip.result diff --cc contrib/file/tests/HWP2016.hwpx.zip.testfile index 000000000000,7f1706369900..7f1706369900 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/HWP97.hwp.result index 000000000000,d77b46e2935f..d77b46e2935f mode 000000,100644..100644 --- a/contrib/file/tests/HWP97.hwp.result +++ b/contrib/file/tests/HWP97.hwp.result diff --cc contrib/file/tests/HWP97.hwp.testfile index 000000000000,eeabcce5e090..eeabcce5e090 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/bcachefs2.result index 000000000000,9ebf64bb55bc..9ebf64bb55bc mode 000000,100644..100644 --- a/contrib/file/tests/bcachefs2.result +++ b/contrib/file/tests/bcachefs2.result diff --cc contrib/file/tests/bcachefs2.testfile index 000000000000,3391822a79a4..3391822a79a4 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/cmd1.result index 000000000000,d77043f6046c..d77043f6046c mode 000000,100644..100644 --- a/contrib/file/tests/cmd1.result +++ b/contrib/file/tests/cmd1.result diff --cc contrib/file/tests/cmd1.testfile index 000000000000,8277edf20418..8277edf20418 mode 000000,100644..100644 --- a/contrib/file/tests/cmd1.testfile +++ b/contrib/file/tests/cmd1.testfile diff --cc contrib/file/tests/cmd2.result index 000000000000,77627c3607e9..77627c3607e9 mode 000000,100644..100644 --- a/contrib/file/tests/cmd2.result +++ b/contrib/file/tests/cmd2.result diff --cc contrib/file/tests/cmd2.testfile index 000000000000,104a0170d847..104a0170d847 mode 000000,100644..100644 --- a/contrib/file/tests/cmd2.testfile +++ b/contrib/file/tests/cmd2.testfile diff --cc contrib/file/tests/cmd3.result index 000000000000,2d100e007008..2d100e007008 mode 000000,100644..100644 --- a/contrib/file/tests/cmd3.result +++ b/contrib/file/tests/cmd3.result diff --cc contrib/file/tests/cmd3.testfile index 000000000000,8287acab425d..8287acab425d mode 000000,100644..100644 --- a/contrib/file/tests/cmd3.testfile +++ b/contrib/file/tests/cmd3.testfile diff --cc contrib/file/tests/cmd4.result index 000000000000,af635a43ae80..af635a43ae80 mode 000000,100644..100644 --- a/contrib/file/tests/cmd4.result +++ b/contrib/file/tests/cmd4.result diff --cc contrib/file/tests/cmd4.testfile index 000000000000,529053ee86de..529053ee86de mode 000000,100644..100644 --- a/contrib/file/tests/cmd4.testfile +++ b/contrib/file/tests/cmd4.testfile diff --cc contrib/file/tests/hello-racket_rkt.result index 000000000000,ca2000968f42..ca2000968f42 mode 000000,100644..100644 --- a/contrib/file/tests/hello-racket_rkt.result +++ b/contrib/file/tests/hello-racket_rkt.result diff --cc contrib/file/tests/hello-racket_rkt.testfile index 000000000000,22e944001066..22e944001066 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/jpeg-text.result index 000000000000,c35c5b716e7f..c35c5b716e7f mode 000000,100644..100644 --- a/contrib/file/tests/jpeg-text.result +++ b/contrib/file/tests/jpeg-text.result diff --cc contrib/file/tests/jpeg-text.testfile index 000000000000,fe119bdce020..fe119bdce020 mode 000000,100644..100644 --- a/contrib/file/tests/jpeg-text.testfile +++ b/contrib/file/tests/jpeg-text.testfile diff --cc contrib/file/tests/multiple-A.magic index 000000000000,7709bb2c6bf7..7709bb2c6bf7 mode 000000,100644..100644 --- a/contrib/file/tests/multiple-A.magic +++ b/contrib/file/tests/multiple-A.magic diff --cc contrib/file/tests/multiple-B.magic index 000000000000,ccc452d7ab34..ccc452d7ab34 mode 000000,100644..100644 --- a/contrib/file/tests/multiple-B.magic +++ b/contrib/file/tests/multiple-B.magic diff --cc contrib/file/tests/multiple.flags index 000000000000,b68fde2a051d..b68fde2a051d mode 000000,100644..100644 --- a/contrib/file/tests/multiple.flags +++ b/contrib/file/tests/multiple.flags diff --cc contrib/file/tests/multiple.result index 000000000000,8a8c5dfad20f..8a8c5dfad20f mode 000000,100644..100644 --- a/contrib/file/tests/multiple.result +++ b/contrib/file/tests/multiple.result diff --cc contrib/file/tests/multiple.testfile index 000000000000,388979a6a744..388979a6a744 mode 000000,100644..100644 --- a/contrib/file/tests/multiple.testfile +++ b/contrib/file/tests/multiple.testfile diff --cc contrib/file/tests/pnm1.result index 000000000000,15d9e82d3edd..15d9e82d3edd mode 000000,100644..100644 --- a/contrib/file/tests/pnm1.result +++ b/contrib/file/tests/pnm1.result diff --cc contrib/file/tests/pnm1.testfile index 000000000000,448108c5596d..448108c5596d mode 000000,100644..100644 --- a/contrib/file/tests/pnm1.testfile +++ b/contrib/file/tests/pnm1.testfile diff --cc contrib/file/tests/pnm2.result index 000000000000,e1d9ec93eff0..e1d9ec93eff0 mode 000000,100644..100644 --- a/contrib/file/tests/pnm2.result +++ b/contrib/file/tests/pnm2.result diff --cc contrib/file/tests/pnm2.testfile index 000000000000,baaeb2a1a14c..baaeb2a1a14c mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/pnm3.result index 000000000000,49b800049583..49b800049583 mode 000000,100644..100644 --- a/contrib/file/tests/pnm3.result +++ b/contrib/file/tests/pnm3.result diff --cc contrib/file/tests/pnm3.testfile index 000000000000,e28b9ab8b80b..e28b9ab8b80b mode 000000,100644..100644 --- a/contrib/file/tests/pnm3.testfile +++ b/contrib/file/tests/pnm3.testfile diff --cc contrib/file/tests/registry-pol.result index 000000000000,7ca512f0c402..7ca512f0c402 mode 000000,100644..100644 --- a/contrib/file/tests/registry-pol.result +++ b/contrib/file/tests/registry-pol.result diff --cc contrib/file/tests/registry-pol.testfile index 000000000000,643e4a6dffd7..643e4a6dffd7 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/xclbin.result index 000000000000,11e31fe5e253..11e31fe5e253 mode 000000,100644..100644 --- a/contrib/file/tests/xclbin.result +++ b/contrib/file/tests/xclbin.result diff --cc contrib/file/tests/xclbin.testfile index 000000000000,7a965c15075d..7a965c15075d mode 000000,100644..100644 Binary files differ diff --cc lib/libmagic/Makefile index 98fcc7168d79,000000000000..5aff4c1a478d mode 100644,000000..100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@@ -1,90 -1,0 +1,91 @@@ +# Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009 + +PACKAGE=lib${LIB} +CONTRDIR= ${SRCTOP}/contrib/file +.PATH: ${CONTRDIR} +.PATH: ${CONTRDIR}/src +.PATH: ${CONTRDIR}/doc + +LIB= magic +SHLIB_MAJOR= 4 +.if !make(build-tools) +LIBADD= z +.endif +MAN= libmagic.3 magic.5 + +SRCS= apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \ + compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \ + is_csv.c \ ++ is_simh.c \ + is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c +INCS= magic.h + +MAGICPATH?= /usr/share/misc + +CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H +CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src + +WARNS?= 3 + +CLEANFILES+= magic magic.mgc + +FILES= magic magic.mgc +FILESDIR= ${MAGICPATH} + +MAGFILES= ${CONTRDIR}/magic/Header \ + ${CONTRDIR}/magic/Localstuff \ + ${CONTRDIR}/magic/Magdir/[a-z]* + + +PACKAGE_VERSION!= sed -n '/define.*PACKAGE_VERSION/{s,[^0-9.],,gp;q;}' ${.CURDIR}/config.h + +libmagic.pc: libmagic.pc.in + sed -e 's,@prefix@,/usr,g ; \ + s,@exec_prefix@,$${prefix},g ; \ + s,@libdir@,${LIBDIR},g ; \ + s,@sharedlibdir@,${SHLIBDIR},g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ + s,@VERSION@,${PACKAGE_VERSION},g ; \ + s,@LIBS@,,g ;' \ + ${.ALLSRC} > ${.TARGET} + +magic: ${MAGFILES} + cat ${.ALLSRC:O} > ${.TARGET} + +magic.mgc: magic + ${BTOOLSPATH:U.}/mkmagic magic + +.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" +CLEANFILES+= mkmagic +DEPENDOBJS+= mkmagic +build-tools: mkmagic +mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} + ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ + ${.ALLSRC:N*.h:O:u} ${LDADD} + +.endif +.if ${MK_DIRDEPS_BUILD} == "yes" +BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} +.else +magic.mgc: mkmagic +.endif + +FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ + ${.CURDIR}/config.h +CLEANFILES+= ${MAN} +.for mp in ${MAN} +${mp}: ${mp:C/[0-9]/man/} + sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \ + -e 's/__VERSION__/${FILEVER}/g' \ + -e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET} +.endfor + +CLEANFILES+= ${INCS} +.for inc in ${INCS} +${inc}: ${inc}.in + sed -e 's,X.YY,${FILEVER:S,",,g:S,.,,g},g' ${.ALLSRC} > ${.TARGET} +.endfor + +PCFILES= libmagic.pc + +.include diff --cc lib/libmagic/config.h index 220321c64af7,000000000000..b842859fc2ab mode 100644,000000..100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@@ -1,502 -1,0 +1,523 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define in built-in ELF support is used */ +#define BUILTIN_ELF 1 + +/* Enable bzlib compression support */ +/* #undef BZLIBSUPPORT */ + +/* Define for ELF core file support */ +#define ELFCORE 1 + +/* Define to 1 if you have the `asctime_r' function. */ +#define HAVE_ASCTIME_R 1 + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the header file. */ - /* #undef HAVE_BYTESWAP_H */ ++#define HAVE_BYTESWAP_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BZLIB_H */ + +/* Define to 1 if you have the `ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* HAVE_DAYLIGHT */ +/* #undef HAVE_DAYLIGHT */ + +/* Define to 1 if you have the declaration of `daylight', and to 0 if you + don't. */ +#define HAVE_DECL_DAYLIGHT 0 + +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#define HAVE_DECL_TZNAME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `dprintf' function. */ +#define HAVE_DPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fmtcheck' function. */ +#define HAVE_FMTCHECK 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `freelocale' function. */ +#define HAVE_FREELOCALE 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the `getline' function. */ +#define HAVE_GETLINE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if the system has the type `intptr_t'. */ +#define HAVE_INTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `bz2' library (-lbz2). */ +/* #undef HAVE_LIBBZ2 */ + +/* Define to 1 if you have the `gnurx' library (-lgnurx). */ +/* #undef HAVE_LIBGNURX */ + ++/* Define to 1 if you have the `lz' library (-llz). */ ++/* #undef HAVE_LIBLZ */ ++ +/* Define to 1 if you have the `lzma' library (-llzma). */ +/* #undef HAVE_LIBLZMA */ + +/* Define to 1 if you have the `seccomp' library (-lseccomp). */ +/* #undef HAVE_LIBSECCOMP */ + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + ++/* Define to 1 if you have the `zstd' library (-lzstd). */ ++/* #undef HAVE_LIBZSTD */ ++ +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LZLIB_H */ ++ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LZMA_H */ + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if declares mbstate_t. */ +#define HAVE_MBSTATE_T 1 + +/* Define to 1 if you have the `memmem' function. */ +#define HAVE_MEMMEM 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the `mkostemp' function. */ +#define HAVE_MKOSTEMP 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `newlocale' function. */ +#define HAVE_NEWLOCALE 1 + +/* Define to 1 if you have the `pipe2' function. */ +#ifndef __APPLE__ /* Cross building tools on macOS */ +#define HAVE_PIPE2 1 +#endif + +/* Define to 1 if you have the `posix_spawnp' function. */ +#define HAVE_POSIX_SPAWNP 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Have sig_t type */ +#define HAVE_SIG_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SPAWN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasestr' function. */ +#define HAVE_STRCASESTR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strndup' function. */ +#define HAVE_STRNDUP 1 + +/* Define to 1 if you have the `strtof' function. */ +#define HAVE_STRTOF 1 + +/* HAVE_STRUCT_OPTION */ +#define HAVE_STRUCT_OPTION 1 + +/* Define to 1 if `st_rdev' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_RDEV 1 + +/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_GMTOFF 1 + +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BSWAP_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSMACROS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UTIME_H */ + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* HAVE_TM_ISDST */ +#define HAVE_TM_ISDST 1 + +/* HAVE_TM_ZONE */ +#define HAVE_TM_ZONE 1 + +/* HAVE_TZNAME */ +#define HAVE_TZNAME 1 + +/* Define to 1 if the system has the type `uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `uselocale' function. */ +#define HAVE_USELOCALE 1 + +/* Define to 1 if you have the `utime' function. */ +#define HAVE_UTIME 1 + +/* Define to 1 if you have the `utimes' function. */ +#define HAVE_UTIMES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#define HAVE_VASPRINTF 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 *** 255 LINES SKIPPED *** From nobody Sun Sep 10 20:40:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkMDf4X8tz4sWNc; Sun, 10 Sep 2023 20:40: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 4RkMDf45lTz3gZ5; Sun, 10 Sep 2023 20:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694378434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3kGFx+mPRJqbm0JoktleJJO+lKA6lq8LJMJtlb37+4=; b=P9Gcszkty9boGiFXq/Lg/4/tj7X5JdUj3xHIGFbdGtrkLLad67EUZ8DhEMf3PYSybq37UX EC8v/j1ouJQJ02NNE6jAnznr/vEG1Pvz9SHRgYH5M0FqKGsqGFLMs1d4UnoUgGGsefzLbM Wgr4K5UwUmzATf36gYFZTZcrT8HnWVIy8HST2G3+3cAnjlOvkrjc5tukPlq3RpBHJ4Pcu+ bBtiEC/Ue3U5is3pEzU29zE8Icd7I4mpWZ8sZ5Yeqj07o/PNFZDQ5mCkPNTjQdk6rP+iVG QG3ykt14gG9c/JRgajERvSUadkcrrDgb3YtWHjIugb0OD0XTfChf8jOp59DboQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694378434; a=rsa-sha256; cv=none; b=N89+FP4kqXHEM0///fGUWzeMXm9J+WO5RF6/YgzFZoBhWVicjNYB7ryxPhfJ8JE2jhU0YZ l40cqfAHtFLa1Rs1j/qGBdzplp+RPPXDGacFQ+pQckuqIjOOBnntMW7X/FlV43QE8lBJCD +Kiny/Fd2gxMqSV5rv51BERehlHLNE1wPhHqCzf3cDvvWthea7ec9C13v16owzPbE4cKJX smeLuJQbFeMh6J9WcjbYwTghBtYtgjMUjTWJ8t+dQCR7XxU48LjrssHTiWPIabGzk3OSbS qlMHxN9Q0UkmedsIEDr1IY8SZajopCKU9XIqAGROgPYDoNP8+5km3CpOvc4QMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694378434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3kGFx+mPRJqbm0JoktleJJO+lKA6lq8LJMJtlb37+4=; b=BpWFhKMUdKK2VQ/s3ARW6zrxsLJLmrwFiPS86mFsqSKnej3R+J2mTFgun7a6HGl6cnPMiq lOn/+TvHs7aYhdc1Ng6mcKJDqlfe0VQRjdFYLqUycLBAVWpafKl892YZTpgu3Gx+aKGaBC om08Ez7mvVrOT/pBJmK0R5sU2O/rkACTkqrVQGpDE9NzB/u/rihoccHQAHd0woOPx4gPjP iU7tH6hNGXsuUOgufelwNfbtjTaHdOspyi2qZSZq5DTOj0Warmo64TajzVK6de0zlr9Kkc 0YeRVZI+igbUiv1Zw4jMS1htBfPCNNhEcZ2Xn/ZpVQ9mbX9hh+EZWdDF3RSY3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkMDf399pz6CZ; Sun, 10 Sep 2023 20:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AKeYUb067302; Sun, 10 Sep 2023 20:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AKeYjw067299; Sun, 10 Sep 2023 20:40:34 GMT (envelope-from git) Date: Sun, 10 Sep 2023 20:40:34 GMT Message-Id: <202309102040.38AKeYjw067299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b6ce41118bb1 - main - pf: fix state leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6ce41118bb11d3db86eae8fbebc8c198e8b330d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ce41118bb11d3db86eae8fbebc8c198e8b330d commit b6ce41118bb11d3db86eae8fbebc8c198e8b330d Author: Kristof Provost AuthorDate: 2023-09-06 07:58:07 +0000 Commit: Kristof Provost CommitDate: 2023-09-10 20:40:22 +0000 pf: fix state leak If we hit the csfailed case in pf_create_state() we may have allocated a state, so we must also free it. While here reduce the amount of duplicated cleanup code. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41772 --- sys/netpfil/pf/pf.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 21d2e16e83dc..df4bd47c35d5 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4885,13 +4885,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (r->rt) { /* pf_map_addr increases the reason counters */ if ((reason = pf_map_addr(pd->af, r, pd->src, &s->rt_addr, - &s->rt_kif, NULL, &sn)) != 0) { - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); + &s->rt_kif, NULL, &sn)) != 0) goto csfailed; - } s->rt = r->rt; } @@ -4947,11 +4942,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, (pd->dir == PF_IN) ? sk : nk, (pd->dir == PF_IN) ? nk : sk, s)) { REASON_SET(&reason, PFRES_STATEINS); - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); - return (PF_DROP); + goto drop; } else *sm = s; @@ -5020,13 +5011,14 @@ csfailed: PF_SRC_NODE_UNLOCK(nsn); } - return (PF_DROP); - drop: - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); + if (s != NULL) { + pf_src_tree_remove_state(s); + s->timeout = PFTM_UNLINKED; + STATE_DEC_COUNTERS(s); + pf_free_state(s); + } + return (PF_DROP); } From nobody Mon Sep 11 06:56:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkcvc1wFHz4t5Zp; Mon, 11 Sep 2023 06:56: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 4Rkcvc1Z5yz4QcT; Mon, 11 Sep 2023 06:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/5pFb15ARNa5yncvOKaX5ch+ih9mGt8iCyIjRDmCjw=; b=F0JyoddMSzn0ZoUeX1cFV2+74CVh2Xw54Dj+qEqCL1UTSDO61AagU258yJBDkPsWWl7fKk dl2IJPNrdO+7hWQslgQCcBfZKp9RbUN0lykKaI02nqEcct7aEe8w7HbX+VvabYYubIoYFB 0BWUt/Q4SXQJVVVcvXkBU/o4KUv2y3mMGkMEudVatY9haICPGaAq2RH7qEDOtEzo+6i5tT LiqcSij/L3rtWNekeYVaVcMttQj/H2zeNMH2mWMZKpLZxbi7uU5jJ7qBYTWNfgOwWi0AMi 1o1tHZIIRXpvG8sNhlNBTbZINUyV5eIkbSMNY1KbvZovJ0h6xyr1n2icfYk5oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415404; a=rsa-sha256; cv=none; b=F7qZ/qn/oL2nDp/wKwJBOPUmOXls3DWhJAK1RFmICRXoLtp66djNz9aj8YyXx0izsEzrgT TbrC7W5PCxX1G+KStaeXorpVc3xjgUCV4JeBA3mw5on3uATzBdraADiwkFpn0AoWOjr3S9 WsnVg/ATflNEUjL4EEje6dg4ShvOVCU2I57/v6Hq64WcKQ1cOJaRIixxACGuQPBoecWxgh hORHWl4Kb3CzXOxjqRzsK7jfjyqDTJnrVuUAKrMt8HWKsKi3Tu/EzdujupAbXiQ1OlquR5 xVI0OhboP/zVTaKMk6cW0YmmEusxCL0PBIBkFyxJaercIN7cKUW9Pzciiyl6MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/5pFb15ARNa5yncvOKaX5ch+ih9mGt8iCyIjRDmCjw=; b=THxndjETaP5oi9ExgsDbW21X61YgeZQelxa1reDe+X2HCFWXux0yDxaNP1Al+2lhLQB6Kg St8mhbi4n+7HR99mJqRdulHVm5/iqtCPtgYYX+FlJRGYn9TsuWkhRJYPXfk3WwVg1vOzhJ y1VhH/p+d4d5CF+5+w0wUm0u26GR9JAL+9WW/LL/o5ujWctYZ9tzrvjdYfsg2SuRPNtBQ2 BXCiyI9DxGmz1gUjZ6/Tyzx++TL0Q9Pcw5GMCID6izvCQZupkJQuqB09cSKe1D45LZwelT 6S1ukfSGQisoWW3MaaX789PfUYJJDW/MMzjydzNmHscJ+EKzxqX6/HZzVOO6dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkcvc0cvnzfWj; Mon, 11 Sep 2023 06:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B6uixo092113; Mon, 11 Sep 2023 06:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B6uiiS092110; Mon, 11 Sep 2023 06:56:44 GMT (envelope-from git) Date: Mon, 11 Sep 2023 06:56:44 GMT Message-Id: <202309110656.38B6uiiS092110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: a494d30465f2 - main - radix_trie: have vm_radix use pctrie code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a494d30465f21e8cb014a5c788a43001397325d7 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=a494d30465f21e8cb014a5c788a43001397325d7 commit a494d30465f21e8cb014a5c788a43001397325d7 Author: Doug Moore AuthorDate: 2023-09-11 06:53:40 +0000 Commit: Doug Moore CommitDate: 2023-09-11 06:53:40 +0000 radix_trie: have vm_radix use pctrie code Implement everything currently in vm_radix.c with calls to functions in subr_pctrie.c, asccessed via the interface provided by the DEFINE_PCTRIE_SMR macro. Reviewed by: alc, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D41344 --- sys/vm/_vm_radix.h | 9 +- sys/vm/vm_radix.c | 696 +---------------------------------------------------- sys/vm/vm_radix.h | 113 +++++++-- 3 files changed, 109 insertions(+), 709 deletions(-) diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h index 01eb25a9dccf..2d9b05c7b52a 100644 --- a/sys/vm/_vm_radix.h +++ b/sys/vm/_vm_radix.h @@ -31,16 +31,13 @@ #ifndef __VM_RADIX_H_ #define __VM_RADIX_H_ -/* - * Radix tree node. - */ -struct vm_radix_node; +#include /* - * Radix tree root. + * Radix tree */ struct vm_radix { - struct vm_radix_node *rt_root; + struct pctrie rt_trie; }; #endif /* !__VM_RADIX_H_ */ diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 768a56ed76f7..b8c693eca66f 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -54,302 +54,26 @@ #include "opt_ddb.h" #include -#include -#include -#include -#include -#include -#include -#include +#include #include #include -#include -#include #include #include -#ifdef DDB -#include -#endif - -/* - * These widths should allow the pointers to a node's children to fit within - * a single cache line. The extra levels from a narrow width should not be - * a problem thanks to path compression. - */ -#ifdef __LP64__ -#define VM_RADIX_WIDTH 4 -#else -#define VM_RADIX_WIDTH 3 -#endif - -#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) -#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) -#define VM_RADIX_LIMIT \ - (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) - -#if VM_RADIX_WIDTH == 3 -typedef uint8_t rn_popmap_t; -#elif VM_RADIX_WIDTH == 4 -typedef uint16_t rn_popmap_t; -#elif VM_RADIX_WIDTH == 5 -typedef uint32_t rn_popmap_t; -#else -#error Unsupported width -#endif -_Static_assert(sizeof(rn_popmap_t) <= sizeof(int), - "rn_popmap_t too wide"); - -/* Set of all flag bits stored in node pointers. */ -#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) -#define VM_RADIX_PAD VM_RADIX_FLAGS - -enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; - -struct vm_radix_node; -typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; - -struct vm_radix_node { - vm_pindex_t rn_owner; /* Owner of record. */ - rn_popmap_t rn_popmap; /* Valid children. */ - uint8_t rn_clev; /* Level * WIDTH. */ - smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ -}; - static uma_zone_t vm_radix_node_zone; -static smr_t vm_radix_smr; - -static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, - enum vm_radix_access access); - -/* - * Map index to an array position for the children of rnode, - */ -static __inline int -vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) -{ - return ((index >> rnode->rn_clev) & VM_RADIX_MASK); -} - -/* - * Returns true if index does not belong to the specified rnode. Otherwise, - * sets slot value, and returns false. - */ -static __inline bool -vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *slot) -{ - index = (index - rnode->rn_owner) >> rnode->rn_clev; - if (index >= VM_RADIX_COUNT) - return (true); - *slot = index; - return (false); -} - -/* - * Allocate a radix node. - */ -static struct vm_radix_node * -vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) -{ - struct vm_radix_node *rnode; - - rnode = uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); - if (rnode == NULL) - return (NULL); - - /* - * We want to clear the last child pointer after the final section - * has exited so lookup can not return false negatives. It is done - * here because it will be cache-cold in the dtor callback. - */ - if (rnode->rn_popmap != 0) { - vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], - VM_RADIX_NULL, UNSERIALIZED); - rnode->rn_popmap = 0; - } - - /* - * From the highest-order bit where the indexes differ, - * compute the highest level in the trie where they differ. Then, - * compute the least index of this subtrie. - */ - KASSERT(index != newind, ("%s: passing the same key value %jx", - __func__, (uintmax_t)index)); - _Static_assert(sizeof(long long) >= sizeof(vm_pindex_t), - "vm_pindex_t too wide"); - _Static_assert(sizeof(vm_pindex_t) * NBBY <= - (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); - rnode->rn_clev = rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); - rnode->rn_owner = VM_RADIX_COUNT; - rnode->rn_owner = index & -(rnode->rn_owner << rnode->rn_clev); - return (rnode); -} - -/* - * Free radix node. - */ -static __inline void -vm_radix_node_put(struct vm_radix_node *rnode) -{ -#ifdef INVARIANTS - int slot; - - KASSERT(powerof2(rnode->rn_popmap), - ("vm_radix_node_put: rnode %p has too many children %04x", rnode, - rnode->rn_popmap)); - for (slot = 0; slot < VM_RADIX_COUNT; slot++) { - if ((rnode->rn_popmap & (1 << slot)) != 0) - continue; - KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) == - VM_RADIX_NULL, - ("vm_radix_node_put: rnode %p has a child", rnode)); - } -#endif - uma_zfree_smr(vm_radix_node_zone, rnode); -} - -/* - * Fetch a node pointer from a slot in another node. - */ -static __inline struct vm_radix_node * -vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) -{ - - switch (access) { - case UNSERIALIZED: - return (smr_unserialized_load(p, true)); - case LOCKED: - return (smr_serialized_load(p, true)); - case SMR: - return (smr_entered_load(p, vm_radix_smr)); - } - __assert_unreachable(); -} - -static __inline void -vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, - enum vm_radix_access access) -{ - - switch (access) { - case UNSERIALIZED: - smr_unserialized_store(p, v, true); - break; - case LOCKED: - smr_serialized_store(p, v, true); - break; - case SMR: - panic("vm_radix_node_store: Not supported in smr section."); - } -} - -/* - * Get the root node for a radix tree. - */ -static __inline struct vm_radix_node * -vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) -{ +smr_t vm_radix_smr; - return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); -} - -/* - * Set the root node for a radix tree. - */ -static __inline void -vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, - enum vm_radix_access access) -{ - - vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); -} - -/* - * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. - */ -static __inline bool -vm_radix_isleaf(struct vm_radix_node *rnode) -{ - - return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0); -} - -/* - * Returns page cast to radix node with leaf bit set. - */ -static __inline struct vm_radix_node * -vm_radix_toleaf(vm_page_t page) -{ - return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); -} - -/* - * Returns the associated page extracted from rnode. - */ -static __inline vm_page_t -vm_radix_topage(struct vm_radix_node *rnode) -{ - - return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); -} - -/* - * Make 'child' a child of 'rnode'. - */ -static __inline void -vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, - struct vm_radix_node *child, enum vm_radix_access access) -{ - int slot; - - slot = vm_radix_slot(rnode, index); - vm_radix_node_store(&rnode->rn_child[slot], child, access); - rnode->rn_popmap ^= 1 << slot; - KASSERT((rnode->rn_popmap & (1 << slot)) != 0, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); -} - -/* - * Internal helper for vm_radix_reclaim_allnodes(). - * This function is recursive. - */ -static void -vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) +void * +vm_radix_node_alloc(struct pctrie *ptree) { - struct vm_radix_node *child; - int slot; - - while (rnode->rn_popmap != 0) { - slot = ffs(rnode->rn_popmap) - 1; - child = vm_radix_node_load(&rnode->rn_child[slot], - UNSERIALIZED); - KASSERT(child != VM_RADIX_NULL, - ("%s: bad popmap slot %d in rnode %p", - __func__, slot, rnode)); - if (!vm_radix_isleaf(child)) - vm_radix_reclaim_allnodes_int(child); - rnode->rn_popmap ^= 1 << slot; - vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, - UNSERIALIZED); - } - vm_radix_node_put(rnode); + return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); } -/* - * radix node zone initializer. - */ -static int -vm_radix_zone_init(void *mem, int size, int flags) +void +vm_radix_node_free(struct pctrie *ptree, void *node) { - struct vm_radix_node *rnode; - - rnode = mem; - rnode->rn_popmap = 0; - for (int i = 0; i < nitems(rnode->rn_child); i++) - vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, - UNSERIALIZED); - return (0); + uma_zfree_smr(vm_radix_node_zone, node); } #ifndef UMA_MD_SMALL_ALLOC @@ -383,412 +107,14 @@ void vm_radix_zinit(void) { - vm_radix_node_zone = uma_zcreate("RADIX NODE", - sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, - VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); + vm_radix_node_zone = uma_zcreate("RADIX NODE", pctrie_node_size(), + NULL, NULL, pctrie_zone_init, NULL, + PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); vm_radix_smr = uma_zone_get_smr(vm_radix_node_zone); } -/* - * Inserts the key-value pair into the trie. - * Panics if the key already exists. - */ -int -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) -{ - vm_pindex_t index, newind; - struct vm_radix_node *leaf, *parent, *rnode; - smrnode_t *parentp; - int slot; - - index = page->pindex; - leaf = vm_radix_toleaf(page); - - /* - * The owner of record for root is not really important because it - * will never be used. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - parent = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if (rnode == VM_RADIX_NULL) { - if (parent == NULL) - rtree->rt_root = leaf; - else - vm_radix_addnode(parent, index, leaf, - LOCKED); - return (0); - } - newind = vm_radix_topage(rnode)->pindex; - if (newind == index) - panic("%s: key %jx is already present", - __func__, (uintmax_t)index); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - newind = rnode->rn_owner; - break; - } - parent = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - - /* - * A new node is needed because the right insertion level is reached. - * Setup the new intermediate node and add the 2 children: the - * new object and the older edge or object. - */ - parentp = (parent != NULL) ? &parent->rn_child[slot]: - (smrnode_t *)&rtree->rt_root; - parent = vm_radix_node_get(index, newind); - if (parent == NULL) - return (ENOMEM); - /* These writes are not yet visible due to ordering. */ - vm_radix_addnode(parent, index, leaf, UNSERIALIZED); - vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); - /* Serializing write to make the above visible. */ - vm_radix_node_store(parentp, parent, LOCKED); - return (0); -} - -/* - * Returns the value stored at the index. If the index is not present, - * NULL is returned. - */ -static __always_inline vm_page_t -_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, - enum vm_radix_access access) -{ - struct vm_radix_node *rnode; - vm_page_t m; - int slot; - - rnode = vm_radix_root_load(rtree, access); - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex == index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) - break; - rnode = vm_radix_node_load(&rnode->rn_child[slot], access); - } - return (NULL); -} - -/* - * Returns the value stored at the index assuming there is an external lock. - * - * If the index is not present, NULL is returned. - */ -vm_page_t -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) -{ - - return _vm_radix_lookup(rtree, index, LOCKED); -} - -/* - * Returns the value stored at the index without requiring an external lock. - * - * If the index is not present, NULL is returned. - */ -vm_page_t -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) -{ - vm_page_t m; - - smr_enter(vm_radix_smr); - m = _vm_radix_lookup(rtree, index, SMR); - smr_exit(vm_radix_smr); - - return (m); -} - -/* - * Returns the page with the least pindex that is greater than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -vm_page_t -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *rnode, *succ; - vm_page_t m; - int slot; - - /* - * Descend the trie as if performing an ordinary lookup for the page - * with the specified pindex. However, unlike an ordinary lookup, as we - * descend the trie, we use "succ" to remember the last branching-off - * point, that is, the interior node under which the page with the least - * pindex that is both outside our current path down the trie and more - * than the specified pindex resides. (The node's popmap makes it fast - * and easy to recognize a branching-off point.) If our ordinary lookup - * fails to yield a page with a pindex that is greater than or equal to - * the specified pindex, then we will exit this loop and perform a - * lookup starting from "succ". If "succ" is not NULL, then that lookup - * is guaranteed to succeed. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - succ = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex >= index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - /* - * If all pages in this subtree have pindex > index, - * then the page in this subtree with the least pindex - * is the answer. - */ - if (rnode->rn_owner > index) - succ = rnode; - break; - } - - /* - * Just in case the next search step leads to a subtree of all - * pages with pindex < index, check popmap to see if a next - * bigger step, to a subtree of all pages with pindex > index, - * is available. If so, remember to restart the search here. - */ - if ((rnode->rn_popmap >> slot) > 1) - succ = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - - /* - * Restart the search from the last place visited in the subtree that - * included some pages with pindex > index, if there was such a place. - */ - if (succ == NULL) - return (NULL); - if (succ != rnode) { - /* - * Take a step to the next bigger sibling of the node chosen - * last time. In that subtree, all pages have pindex > index. - */ - slot = vm_radix_slot(succ, index) + 1; - KASSERT((succ->rn_popmap >> slot) != 0, - ("%s: no popmap siblings past slot %d in node %p", - __func__, slot, succ)); - slot += ffs(succ->rn_popmap >> slot) - 1; - succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); - } - - /* - * Find the page in the subtree rooted at "succ" with the least pindex. - */ - while (!vm_radix_isleaf(succ)) { - KASSERT(succ->rn_popmap != 0, - ("%s: no popmap children in node %p", __func__, succ)); - slot = ffs(succ->rn_popmap) - 1; - succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); - } - return (vm_radix_topage(succ)); -} - -/* - * Returns the page with the greatest pindex that is less than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -vm_page_t -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *pred, *rnode; - vm_page_t m; - int slot; - - /* - * Mirror the implementation of vm_radix_lookup_ge, described above. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - pred = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex <= index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - if (rnode->rn_owner < index) - pred = rnode; - break; - } - if ((rnode->rn_popmap & ((1 << slot) - 1)) != 0) - pred = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - if (pred == NULL) - return (NULL); - if (pred != rnode) { - slot = vm_radix_slot(pred, index); - KASSERT((pred->rn_popmap & ((1 << slot) - 1)) != 0, - ("%s: no popmap siblings before slot %d in node %p", - __func__, slot, pred)); - slot = fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; - pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); - } - while (!vm_radix_isleaf(pred)) { - KASSERT(pred->rn_popmap != 0, - ("%s: no popmap children in node %p", __func__, pred)); - slot = fls(pred->rn_popmap) - 1; - pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); - } - return (vm_radix_topage(pred)); -} - -/* - * Remove the specified index from the trie, and return the value stored at - * that index. If the index is not present, return NULL. - */ -vm_page_t -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *child, *parent, *rnode; - vm_page_t m; - int slot; - - rnode = NULL; - child = vm_radix_root_load(rtree, LOCKED); - for (;;) { - if (vm_radix_isleaf(child)) - break; - parent = rnode; - rnode = child; - slot = vm_radix_slot(rnode, index); - child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - if ((m = vm_radix_topage(child)) == NULL || m->pindex != index) - return (NULL); - if (rnode == NULL) { - vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); - return (m); - } - KASSERT((rnode->rn_popmap & (1 << slot)) != 0, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); - rnode->rn_popmap ^= 1 << slot; - vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); - if (!powerof2(rnode->rn_popmap)) - return (m); - KASSERT(rnode->rn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); - slot = ffs(rnode->rn_popmap) - 1; - child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - KASSERT(child != VM_RADIX_NULL, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); - if (parent == NULL) - vm_radix_root_store(rtree, child, LOCKED); - else { - slot = vm_radix_slot(parent, index); - KASSERT(rnode == - vm_radix_node_load(&parent->rn_child[slot], LOCKED), - ("%s: invalid child value", __func__)); - vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); - } - /* - * The child is still valid and we can not zero the - * pointer until all smr references are gone. - */ - vm_radix_node_put(rnode); - return (m); -} - -/* - * Remove and free all the nodes from the radix tree. - * This function is recursive but there is a tight control on it as the - * maximum depth of the tree is fixed. - */ -void -vm_radix_reclaim_allnodes(struct vm_radix *rtree) -{ - struct vm_radix_node *root; - - root = vm_radix_root_load(rtree, LOCKED); - if (root == VM_RADIX_NULL) - return; - vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); - if (!vm_radix_isleaf(root)) - vm_radix_reclaim_allnodes_int(root); -} - -/* - * Replace an existing page in the trie with another one. - * Panics if there is not an old page in the trie at the new page's index. - */ -vm_page_t -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) -{ - struct vm_radix_node *leaf, *parent, *rnode; - vm_page_t m; - vm_pindex_t index; - int slot; - - leaf = vm_radix_toleaf(newpage); - index = newpage->pindex; - rnode = vm_radix_root_load(rtree, LOCKED); - parent = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex == index) { - if (parent == NULL) - rtree->rt_root = leaf; - else - vm_radix_node_store( - &parent->rn_child[slot], leaf, - LOCKED); - return (m); - } - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) - break; - parent = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - panic("%s: original replacing page not found", __func__); -} - void vm_radix_wait(void) { uma_zwait(vm_radix_node_zone); } - -#ifdef DDB -/* - * Show details about the given radix node. - */ -DB_SHOW_COMMAND(radixnode, db_show_radixnode) -{ - struct vm_radix_node *rnode, *tmp; - int slot; - rn_popmap_t popmap; - - if (!have_addr) - return; - rnode = (struct vm_radix_node *)addr; - db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", - (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, - rnode->rn_clev / VM_RADIX_WIDTH); - for (popmap = rnode->rn_popmap; popmap != 0; popmap ^= 1 << slot) { - slot = ffs(popmap) - 1; - tmp = vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); - db_printf("slot: %d, val: %p, page: %p, clev: %d\n", - slot, (void *)tmp, - vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, - rnode->rn_clev / VM_RADIX_WIDTH); - } -} -#endif /* DDB */ diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index 231edda65102..a332618fc0e6 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -34,36 +34,113 @@ #include #ifdef _KERNEL +#include +#include -int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); -vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index); -void vm_radix_reclaim_allnodes(struct vm_radix *rtree); -vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); void vm_radix_zinit(void); - -/* - * Each search path in the trie terminates at a leaf, which is a pointer to a - * page marked with a set 1-bit. A leaf may be associated with a null pointer - * to indicate no page there. - */ -#define VM_RADIX_ISLEAF 0x1 -#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF +void *vm_radix_node_alloc(struct pctrie *ptree); +void vm_radix_node_free(struct pctrie *ptree, void *node); +extern smr_t vm_radix_smr; static __inline void vm_radix_init(struct vm_radix *rtree) { - rtree->rt_root = VM_RADIX_NULL; + pctrie_init(&rtree->rt_trie); } static __inline bool vm_radix_is_empty(struct vm_radix *rtree) { - return (rtree->rt_root == VM_RADIX_NULL); + return (pctrie_is_empty(&rtree->rt_trie)); +} + +PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix_node_free, + vm_radix_smr); + +/* + * Inserts the key-value pair into the trie. + * Panics if the key already exists. + */ +static __inline int +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) +{ + return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); +} + +/* + * Returns the value stored at the index assuming there is an external lock. + * + * If the index is not present, NULL is returned. + */ +static __inline vm_page_t +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); +} + +/* + * Returns the value stored at the index without requiring an external lock. + * + * If the index is not present, NULL is returned. + */ +static __inline vm_page_t +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); +} + +/* + * Returns the page with the least pindex that is greater than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +static __inline vm_page_t +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); +} + +/* + * Returns the page with the greatest pindex that is less than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +static __inline vm_page_t +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); +} + +/* + * Remove the specified index from the trie, and return the value stored at + * that index. If the index is not present, return NULL. + */ +static __inline vm_page_t +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); +} + +/* + * Remove and free all the nodes from the radix tree. + */ +static __inline void +vm_radix_reclaim_allnodes(struct vm_radix *rtree) +{ + VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); +} + +/* + * Replace an existing page in the trie with another one. + * Panics if there is not an old page in the trie at the new page's index. + */ +static __inline vm_page_t +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +{ + return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); } #endif /* _KERNEL */ From nobody Mon Sep 11 07:02:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkd1z755Jz4t8NQ; Mon, 11 Sep 2023 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkd1z6f9Kz4VZ2; Mon, 11 Sep 2023 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRgeB3VIbIItdajM/2XKS4i+sGhBJHZDjRIWlnowoak=; b=D7UL5Yd3kW+Urez777aeRiNjghJinBRJdFsIsDO6Oapt2HMkqnwIS+R9VtLl19Ox4aOxV8 22MbCFyDNTGHmZQHgDtiz3LclPNbtxap57Pk5tdjHyV4XGQwFhknBzQzZb/T1VOKYpR971 PD4FEIX9S6loNX81AFl6VbSrcpuSuRA6MalMjsI2XrVfZu8q6QVh5gpJYv4ypcQnYf+UQ7 HS7waU/pw26LJhFdyTQbPq++OhD0wDfwDnK2wamtoBZIcLNRszC6XR5hWONp30toV0EWwA aNkOPjgFmTVSQeGEKZznfquQkYJ/IPfKBsnvt2Ox+nLfKbux0JtsZSFTnuZKqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415735; a=rsa-sha256; cv=none; b=su1jwCibaIEeeoNHYYdaAD9eFsmHdw6R17wcyqB7KkqR//X1pAdkYC5+a893atb2F4DMFJ Oo2uDON7NCTww+S9SeurMq7t256U5jsm/kS9L2kfs/LLyRopqky3N1kCY2uFEbpOaOSJWF yAh513P4tOSY8YVog9eDsZP/4ASsRAge6yDKuotYpgBDgvpidw2p/UZTwoz54MEnlkXeLi DVXjHrQNK5fQpWyZdclbefOF8vyL/Alxcd1rcipNvjSv5eOkGD9Z5oVl/QsD4tTr33+xGy S/5FUbkAPXrEIDjwgralQ6N0w3vLR456tVE3K0cvsTP31W+1Ga7FPSOno/gYaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRgeB3VIbIItdajM/2XKS4i+sGhBJHZDjRIWlnowoak=; b=x6rUSni7VXM51TjQY38XoHPOZ7YLxPuOj3jqvK3ST5rJjF9qkZ6KNvw7C0j0rP8QSsTYwY gk7OI1/GoIvIGEo1vX7IX4sbj8KHAPDupG+K8aYpJOSQFSb+Ek+Me4tLXrPwrFXSsXym8P 6bgxbC+XMj8D/gLNirFv/DKBg5jMh70NtW5q46n6LJRNFKJ9TurtC7IglhbY4xCrtPfwce R13R3N9cEQaZ0W0KtpgG/iGVet/DVDSfE9KYendDpSlLlU2HkC0bydAaRqUOZFh7UxyFff XAGJLpzqQeNibNJ9RRzf9wMguIpY8kB4R5MhkAGqhjS6av2zMElU5Dt6fsZlHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkd1z5jx2zgN1; Mon, 11 Sep 2023 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B72FUw007530; Mon, 11 Sep 2023 07:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B72F2u007512; Mon, 11 Sep 2023 07:02:15 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:02:15 GMT Message-Id: <202309110702.38B72F2u007512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 0c9b0086715b - stable/14 - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c9b0086715b3b354d471de9dee2ea113aa94481 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0c9b0086715b3b354d471de9dee2ea113aa94481 commit 0c9b0086715b3b354d471de9dee2ea113aa94481 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:02:07 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index 661b7013e0d2..8ce1d18c61e5 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -368,10 +368,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -404,17 +406,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -423,6 +430,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:03:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkd2y20tvz4t9L8; Mon, 11 Sep 2023 07:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkd2y1ZTzz4WGJ; Mon, 11 Sep 2023 07:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ube8wdr/a4L13S2wdmx6nkz98GBry9D3gFAifL/qQG8=; b=INpV7GztidsexeyUlPPPDWfx3RTINjGwRfpHCtzToUrddi0VNJKHA6iEgZ8wepsdQoQOuH tMPGJwhtiwAvoXHsKZhJJterJyY2CCaF0Z1VXqeB7ZyhP87mmzByVxTE3XxjXgHYFeu4tU zkHjr7XK/toIUXeqZoSjeyhRNa5oNuGXUtQQTTjj72jlxLNKUMZVmRPYHYs0PxIA22rF3W RIznsxPGIHMdJJMluq/fKp0M4D0VM6zzt+0GOGJuI7dibAhjUzwc37SUN0a00bJRtFRWZe jRtsjdan+WnQpOMgqqfrflEsO8i+KGpD0f64+gjTE0l2luvyi85KdAClzp0yXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415786; a=rsa-sha256; cv=none; b=EmthzXQGrdSmi/cmkEufPmJ4JSURbuKfWiT8AlELDP8ashi38C7HvK2bsSoeAlOSYZQ7qT Ypy0YVbpHL2A5YPm6yggvuTXt3fEhF/Ba2WCsM6YaM8FZK0yl1a8AgXVRHA9lf91zq9hvb 5o8bfwpMZes6bUqbh66lvawJ1I8TMvTEtEpmT1084422v/snXS+Qt9TzeHLnsXic7nnsXW pnG6MDr1Nk2KcI8PKFRhohmo7ltkymISKv39y/HP1Lu8X1UVTVZf0QIqo3Cu/uO/k14iX9 QskEyA/aOB0xWmxOHjZ1we/afHn4QBwmFBnvNepQmxM0/MLIzndhClUX7/XoBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ube8wdr/a4L13S2wdmx6nkz98GBry9D3gFAifL/qQG8=; b=Ai+yuaNS7zR2q+RuYM6KuhscJ7Wt81Fw5lLHXMCuVyvDV9WAqOr3Mdtwuzb0ZhDyG9h2xh YdtYvHQTTRTHI51DaB3PvrWqd5SaZsNGbOSkJVyyCgpp5T9eIGqiBghaPw2zRbH9kUfrJh b02rhSf56TpoUqv6HelhaGUGgFcQxZ14D1Xo7SZxUCk3aV1Lx9U1XM3FNoUwkaLg5ZEP6p YteMca/68rUKpX9qeJfhqjdMkPQw2goqKPF4Qq+8pugIIqPpHVGq6BH87kiRL2WjHx4abC tVyhyN/h+05JXG2+xmD4g8nMLRb9OSSkOoZ6R8zCpQbyWLkDcMVdWGta0+c6fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkd2y0gK0zg8G; Mon, 11 Sep 2023 07:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B735ZW009923; Mon, 11 Sep 2023 07:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B735Da009920; Mon, 11 Sep 2023 07:03:05 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:03:05 GMT Message-Id: <202309110703.38B735Da009920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 914c7f5f2a67 - stable/13 - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 914c7f5f2a6764eeabe4446d47ab3521526f5f5c Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=914c7f5f2a6764eeabe4446d47ab3521526f5f5c commit 914c7f5f2a6764eeabe4446d47ab3521526f5f5c Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:02:52 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:04:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkd42554jz4t9kR; Mon, 11 Sep 2023 07:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkd423xXPz4WcX; Mon, 11 Sep 2023 07:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KVzUyLLwdfjnYe/BL3Df3U+eIZuD86O0SSVZEUyYndo=; b=BHrtXaeUI3syephMsnjWrG0Vk0ZpEpPD/vU3FD1l5XlIun1fvQsgEmUYGmJCcXQu7Nm4l5 AkShV2rMsaRUqBaWx9HeYCzWq03Q9DNw744ZW8Q51nvQRss5VhiDJrv439mf67ztz2gZjh cuSgWwaxaChHXZq/Eh3Kr8L+01NwMAvjsYVqZiq8iJcS9hNG/POGXwvuOAvQ+6l8FsgBAA GtevLMw5HhqK/6i/D3YSt0PQWooyXlQDsQKpZ4+34keTeNh+PfvrCcEyRA0D+qB0PB92gB Fegt04djd6AIFWZoypuv1H7IaN+wLHOJHDxzAKOe6OLnThygFCdFVD9WfSgT3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415842; a=rsa-sha256; cv=none; b=r/dAX7hwkncGRhRx4ZNN9azHOaSftoS7ZgEPhOOi3TfO7+/mpCYBV2PYz/pMFh9wGYEgsB A1eT2Hv3AVIuQyQFJscVM5gD6ACa9Aafz6Dm8f7QWmK1tWeK8jwq0x1Pm1ZJtS4OxwNOk6 8wzc7PW9f+SRVMSrktflhaESTrdtp0pdSkPbu4OoTJbs6iwpuJNS1VzwTqzTkOnUOtFhmg w/EdSbUpnZyrMqCs8ugYMuXtJ4Qcri/eqI79fSHtbnM6WrGc6jCKDt8lboNpfAJTY6nBx/ NZEvzXp1U5mXDz7oV6uf8m2mcvKl0Khtn0JxEb448GHWbZCbWDpp0G06wGGFzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KVzUyLLwdfjnYe/BL3Df3U+eIZuD86O0SSVZEUyYndo=; b=F0yVVPe0GBwh4QHntc+ia2nuwlcW5ryJdbV3tlkCoNgCqL0PjC3s3ECTVgN+hdfwloLBdJ 27O4+nXWbMuypzfUzo07SDFX5Z51y27LrXE3Y6jYZEWUcOyEi5/z8q7QoFDQqSw3dr9v75 fbkfhmmmXnRnbLctzwkcsD0FZ4vcVEU4Tqaa/FL78TwTv2ThhYmFgm20jzr3H4xWmWqbbl 3jdnzogllDhzQcu2GPcs8yC7FmA/QgmKMTKJbyIWeDIAiqOx/ouP7wFF2G4oj3786K6yjv AhH/ChsAcVknhicj3yx1YeU+ZTXIDxpP7f+gSAQgnh9wHkSvsh0zNRvK7seHaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkd4232VpzgN8; Mon, 11 Sep 2023 07:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B742nE010164; Mon, 11 Sep 2023 07:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B742jB010161; Mon, 11 Sep 2023 07:04:02 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:04:02 GMT Message-Id: <202309110704.38B742jB010161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: af386f70fa0c - stable/12 - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: af386f70fa0c8d0a605c50710283f6f59525bd05 Auto-Submitted: auto-generated The branch stable/12 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=af386f70fa0c8d0a605c50710283f6f59525bd05 commit af386f70fa0c8d0a605c50710283f6f59525bd05 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:03:43 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 MFC after: 3 days (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:05:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkd645lyqz4tB4B; Mon, 11 Sep 2023 07:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkd645JjBz4ZDK; Mon, 11 Sep 2023 07:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57RFNqGA7KJdmAH0j/itJdVo8AkPjSdq9inbYJjrSKs=; b=JxYyQ4wstpglzDSqsM+WY8xAg0jhwOXkYJb/oNopprhDKbniaQ5+ualOOE9SvJnUSxTfxG S7qj5pdhRFVwT7DAcUscPlykucdQXGeO/dKkO9tCHfiR1PRAkO7Yipb0a5KAoz7DGv8sid fvlC2OjQW99eNcu30YIIVUWhEZPi3TM6t2LU0MEuWY5Sl7a+4s+iOHbsyu2OLtKfp4/pr/ rHOYXO2cFUIrdMUiQA7SLDpDtGJ9qrESFyuyX36cMaG75GkA40EgkSDqvd8pYtREbG6ETE KgcWd0qR5KcfNsuJnq7lxlx9eZvBYYcmQ71VN5VZFy7k/MU0XBHmhxIi2bWL/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415948; a=rsa-sha256; cv=none; b=BdulzxmZq9EHFxpXI6/D8GboLwy51VxeOt8g9j5xxQAJIRS56ka7Zt79XCEwJm41R6pdCo stUd1kXZ/YzERdH+1mq5818M2zKJ/pSs85vNuRHz3odsvm4g0zYtToMGlWH3Z7XNpI921T 6dDKMqn2a4c7WlMzXXnM9RiV60l7RwVba5Pmbi43hNQbAmlaFRU5NCFd0NbWtSwMGSi3BS Bc1nGTE2KjvGSNBw0YARKlnIwF0hqn2ysKaeGLE6p6jdSjvjehLmNWeSAiVdVc7yxgSd6A HtwFS/xfgLDceWuBB9YgM4MPxf7L+Qu+duRL5SnBTmCHbAKKy4ibXwwKNrePRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57RFNqGA7KJdmAH0j/itJdVo8AkPjSdq9inbYJjrSKs=; b=FICYsdXlqZ8Fme9XYF3STvaqb8Sz8UCqTEvFhmFF5IVt0AGL++dlRDBCtEOKyZEcieKF+H CU1uci1sVL23rEt9HdxSbjmcUdc2pfMZ2D3FrNFRA70aKcaK629j8z+S0mb4AfGdu68qrU 9kBviYa+qQTl34mAFhzJBdBErdlhslcmEXDCpzpG0EHtntvlaa7VhOioF82yTpZm7sdtcy NMDl4/mcwBSSE6Jk8A0GoyipCFO8jEYi/nxFIDRT27uoEq6IL4ohKru6OjN2zXa1lGfYBK 6DJgONJjtTyMxjPQvpIQlf5J3jX0Dq21VrnuFnHwOTKmdtKniMRBDt88UaYMew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkd644Pf3zffk; Mon, 11 Sep 2023 07:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B75mla010516; Mon, 11 Sep 2023 07:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B75mF6010513; Mon, 11 Sep 2023 07:05:48 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:05:48 GMT Message-Id: <202309110705.38B75mF6010513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 5ed7eb0d97ba - stable/11 - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: 5ed7eb0d97ba4436218e810f61bd059acba984c2 Auto-Submitted: auto-generated The branch stable/11 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed7eb0d97ba4436218e810f61bd059acba984c2 commit 5ed7eb0d97ba4436218e810f61bd059acba984c2 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:05:29 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 MFC after: 3 days (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:12:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkdFH68w6z4sG1g for ; Mon, 11 Sep 2023 07:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkdFH5lP0z4cJ2; Mon, 11 Sep 2023 07:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfrokZ2HCtXAGysnFq9u2hpGeWiFKwM5N63fm1AYVCg=; b=Rqyh6kF6w2IPaYsAjfYiTpbvX2zSBNmrCt8fZowDGHjP5fpytSgHHpEcb9KMoPNAhPR2nx dNQgLrpgGPW/C+jnIFR7Gy5qdvRicYxoFgm88io87NqoVF+77YOPzbAnaMNvWO2juwNqjU +0fjaBznKePS5bEuwqDdyZRhs0yiof9d/W3vbm3FRU/hW7HsfZyhY/HPlz11iKI1wlJQDP 3Ianf81Rk41yYQOBRwf1y1odO9nSnD1avk73d6MXBF9Jjk2Q8x8FqpfIkSUmGHliuE/9gI 2r/Zk9yUda4JQ4sa2d1dBuag8igaeJfRWv/QTy+ymmkoH1J7RhDSQYEGAtwvEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694416323; a=rsa-sha256; cv=none; b=ihGhzqbsgkHvfcWzTqxy65gOxw61Dk+xhZYYwF6+LpWnpl8fBL8nKNmqeXU5Qon8eNwf8p u0z/viH7jauckET/4AVl+P7/7z4sjOz7l+fPotZTG72wjTLiTOOBInLPQbKy+jK+mmba7q hCQeiarGQxUrKcbzE+EKDSUD8FcEWwh5IKnYk4goM6Blw+0l4aLdCIKBuepMWJXwZ7DAGl OGC291VE/vnTNeMAKoNzVOCy70lSWgcW8PDUgCYgVjjG9lKo2JNbwqHnSKLRHYed7vOD51 OuLYWg1JpVvTACy9WQ6KgvN3Sb1U88lfyfcATZRAFlu+15TkMK+opQPjwhYQvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfrokZ2HCtXAGysnFq9u2hpGeWiFKwM5N63fm1AYVCg=; b=UtJCqVmRKpjCxiea1vWHGRto3bf5fim6PE/4LeowAd1RkP7+jXu0Xte3aSmH7PUxDGvcbh Dq1Mh+2ZPQuKBZRcx7iRQZsaqXtMngmTWGvLOzSp7WblsmkWKJQFPbnwj84dcyinm5my17 aMnKtMBfjjZAQtsm861J9XAbotvXM+hZum3mc3p8Do98LDAm7RsOOikCt/BRsqLB1dii6x R7qYlV4tLx21sdfXkVLlhERJMUy6FX+Zm16ntdg8dK5UlFByqOinYKMd4RpDBXsw42KMGk Z5fUatlaH2Al+C3lwajLrP3cEP47+L50qS03qyIi/Vc9WkllBr64uS/XxRtpOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkdFH4rMBzgYd; Mon, 11 Sep 2023 07:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B7C3l3026016; Mon, 11 Sep 2023 07:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B7C3ul026015; Mon, 11 Sep 2023 07:12:03 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:12:03 GMT Message-Id: <202309110712.38B7C3ul026015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 95f71c019d7c..0ee9b02390d5 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 0ee9b02390d57c10a4dee0f3d19fcb115b424ca5 X-Git-Oldrev: 95f71c019d7c3e3b728a9b05e2117ce6b09f1b87 X-Git-Newrev: 0ee9b02390d57c10a4dee0f3d19fcb115b424ca5 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=95f71c019d7c..0ee9b02390d5 3602775330b3 Linux 6.5 compat: spl: properly unregister sysctl entries 12ce45f2606c Intel QAT 1.7 compatibility 5cc1876f14f9 Add more constraints for block cloning. 0ee9b02390d5 update max_variance limit in zdb_block_size_histogram test for CI From nobody Mon Sep 11 07:12:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkdG82THDz4sGCS for ; Mon, 11 Sep 2023 07:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkdG822bKz4ck3; Mon, 11 Sep 2023 07:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vxcoPB46g3wtyRPZGLuq6qv7/Ur9f9J3vhTNH+P/Fs=; b=qROCrDkQQz5PlgY9gIjA+m8xHZZSLI+U01qXIAY70OHDMpuSJQEY5jdrYb9JeQncFj88sK bBjLzJ/yIQV2MBEKPmtYPvAxuvnpoJXMZ+ou2OZbAiv/b6rQXrEBSYueKidp/DFeGJCA+y nPNH4atGtJ9b5tMFhpdpXPD7xykNrTk8HHlfhVK+7uavBSFmqMwLRiwjPnww28iXS9uYLe WyoZ3WLeOwfTiKL3O9UuO21jZ1d3zTS5v23ziddz/RkMPn6RJ/OLwOWlOGbEB5fVqapBIE iI44mrnXHF9MNxtAmcBdFWq+0khoNpDXGTUEVITjs8aHW/mI646/3kc3Tjc9QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694416368; a=rsa-sha256; cv=none; b=ka5oII839GUAoc/ZgV3SCr8WBQpK8PWnT7ObTet85tnaV4QK8Xem39FgP8HTC6UqX7axSn x30YOq1Sr2EDvyfyCZxDCrSpuI3ycjHDWej1CPeh0bfsnDQClyDSthh8akjLS5PmI44OB8 PGh1zPTbmUgXWp/0HUtqe7fKHVPo7yViKo1eoXN883uxA9Rj0MSiamPcHz7+6QePsd0ciu wi792Eg2OO86xqC2M5st1ZNSyP1eS0W1sg05kCuDtjPc5ULnv3K+TxyxqYqEJvSOx7/MFq oIvgpwN292Ipm/5z5XTN+ZLH5PI2bcagY44VrYEOaowGeB58jpTzGDmklu7Wvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vxcoPB46g3wtyRPZGLuq6qv7/Ur9f9J3vhTNH+P/Fs=; b=iyr3bne4NGNlkVJfVlFN5Ei5DqVLTO3bH9m/8UmDmBqJOQkCtwyR5o3t8Lwo0TZ0t4SbNJ 4gsHIpOwZBdBVwoy4Bnyq/Q0jUn27FAz+roLEZzjfCcoPp2AO/RoEo/2DK5SzHCtsgshFS 1kEMBRsx4OaJ7TYZN975LHPw7orzluhPvMOPwKxueOmYbYNTmItU4hMESnJycxHVycxUj3 T2gSreVFukXK9eoJMAMTFjgfj2J/FNIxMSzP8qkozDyFwcbC/5sYkTC6VYM9ux/UzR5ScT 3hEQMr/H2PEuKsnvSg7y06CTuym8VsN/VKKRmfo3cPNAgCtwAivc/tvsgw2TQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkdG80p5Pzg49; Mon, 11 Sep 2023 07:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B7Cme0027078; Mon, 11 Sep 2023 07:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B7Cmtv027077; Mon, 11 Sep 2023 07:12:48 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:12:48 GMT Message-Id: <202309110712.38B7Cmtv027077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 32949f2560bf..e96fbdba344e - vendor/openzfs/zfs-2.2-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.2-release X-Git-Reftype: branch X-Git-Commit: e96fbdba344e9c25cad624a10d4a4b300fd35f6c X-Git-Oldrev: 32949f2560bf35ec86dfa5d984514908e0eb3ecc X-Git-Newrev: e96fbdba344e9c25cad624a10d4a4b300fd35f6c Auto-Submitted: auto-generated The branch vendor/openzfs/zfs-2.2-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=32949f2560bf..e96fbdba344e 4da8c7d11e6a Intel QAT 1.7 compatibility 739db06ce7d4 Tag 2.2.0-rc4 e96fbdba344e Add more constraints for block cloning. From nobody Mon Sep 11 07:19:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkdQ75Rl4z4sM9N; Mon, 11 Sep 2023 07:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkdQ75HDJz3CSx; Mon, 11 Sep 2023 07:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7WJwO4UV5rDWGSYaUB4vePehnuofPHlTQf095QkxJg=; b=vMwF8NgQjQrIYtMG5YvcAcjkU/itd8zrljSo5RqgLPiSU8h2nreQhLhVkCHLdspX10xRZO 02ihYAFD5tMKlUkSME7DcmP8dQ6i28fpyELGAjdokRVu3XSOour/N9xdjwthEHnoTzLAXI unyieizPEwYoKOdCE3Lj++oe7bA74VR1OGVkPd9ybpaqNHf/skE2TJtsP7E4zFnvaRE/MI 4udlhiMga8XmcXHM4vioP4UuNidaImVqybPNIPyUe2vgCrsLFUe0imTeUMdOn+TFggVgn2 pApx55Jh1iTCVy2uoQuNrGSm9a/aPUoX+9f7M9cyTaPNX/Z2Zdt5bIAGHH1pSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694416783; a=rsa-sha256; cv=none; b=v0CL/GT952G0A37U3+TUPBxpT6h9DNSHmobuFQwJwGwke1PovnDQZRVtqMMX3EEib0cZSl SnRxe1ccLff8eO2ttSUrlJQ1SkdWNxcOga0MU6RS5fZkJyOiXNpzOdxNgBuE+iLTW47dSJ w53Sn+MNF3VulP+lyrfMtWRzswweFM/aCXdyyLL0RXO7aXhi2KNgwzKsNQpqombn0j7yob wolzbJi3CFFGG+jDK8VcjXd3Z3yd2lXiYdytaQeppeV4tTZkYDXOxhewDUHhIhfTvGSiIW rneX5+V/OpslekDF8RhL/0v7VbQNOwZyZ6QrI56enLlRM/Jle3mIm4/6AaQxLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694416783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7WJwO4UV5rDWGSYaUB4vePehnuofPHlTQf095QkxJg=; b=mmljZiAmdDSZKU9X8iRkx0tZKxbkHSRI3NSqh0lz/KFAsD6+Qvl2Bx6r8Hk9yqOgVpWDrE /Vm92fiSv8TAkdb1m8APcSft35TtfNkCR04IvWDEK09syCyqYnllYuk0zNJbNQ8e8dO+nK LsvGY4EpXnwr1OD7eGfgGYHSBiGbPxV6YOPwcVMbHHdy+3acXGB5aFfaAz2DvFsQhbOMCv M5V3spOO39vuFIIV7MQMD9nhj0sn0YTYKWf2c4x3eQFezhSTNl9Bkw65VpU9Q1/T1woDg3 dpExjr/fsgfmFveET9qL25eVto86EOuAhVQf+IcH/cnZqD7pnrzJVQ91iP0P3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkdQ74KgCzflx; Mon, 11 Sep 2023 07:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B7JhpX028048; Mon, 11 Sep 2023 07:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B7Jbui028038; Mon, 11 Sep 2023 07:19:37 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:19:37 GMT Message-Id: <202309110719.38B7Jbui028038@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: 3159b89b6198 - main - zfs: merge openzfs/zfs@0ee9b0239 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3159b89b6198c9a1d903c9de6654c6d863728617 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3159b89b6198c9a1d903c9de6654c6d863728617 commit 3159b89b6198c9a1d903c9de6654c6d863728617 Merge: a494d30465f2 0ee9b02390d5 Author: Martin Matuska AuthorDate: 2023-09-11 07:13:30 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:18:48 +0000 zfs: merge openzfs/zfs@0ee9b0239 Notable upstream pull request merges: #15251 Add more constraints for block cloning Obtained from: OpenZFS OpenZFS commit: 0ee9b02390d57c10a4dee0f3d19fcb115b424ca5 sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 21 ++++++++++++++++++--- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 ++ sys/contrib/openzfs/module/zfs/zfs_vnops.c | 21 +++++++++++++++++++-- .../cli_root/zdb/zdb_block_size_histogram.ksh | 8 ++++---- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 6 files changed, 46 insertions(+), 12 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 49b699b24018,000000000000..55cb3596bc17 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1134 -1,0 +1,1134 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ +/* #undef HAVE_VFS_ITERATE_SHARED */ + +/* fops->readdir() is available */ +/* #undef HAVE_VFS_READDIR */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* fops->read/write_iter() are available */ +/* #undef HAVE_VFS_RW_ITERATE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* yes */ +/* #undef HAVE_WAIT_ON_BIT_ACTION */ + +/* wait_queue_entry_t exists */ +/* #undef HAVE_WAIT_QUEUE_ENTRY_T */ + +/* wq_head->head and wq_entry->entry exist */ +/* #undef HAVE_WAIT_QUEUE_HEAD_ENTRY */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry */ +/* #undef HAVE_XATTR_GET_DENTRY */ + +/* xattr_handler->get() wants both dentry and inode */ *** 190 LINES SKIPPED *** From nobody Mon Sep 11 07:27:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkdZh4xdLz4sRtW; Mon, 11 Sep 2023 07:27: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 4RkdZh4nv7z3G86; Mon, 11 Sep 2023 07:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694417228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQ3VTuDBQIEGHfzv/EsrV6voNtQz61pDZGG61X3l+YQ=; b=nvtmuRbKr47PUFgbsv1cnOchKqVvheaPDdidHyjdD4qErvc3E9eZoUQ/+xmLzOYNWr+6FJ 3UK1Lv0qJ90pjIfA4K4dTNFdZpwGIvLe4nF1ZwUmLl9+56AHZU+3KsB68EuqntgkxQDSfv Fxn6aAuQhhuVii+CVztgWhlyHPTUhrMVZnS1LtNhKhLKtxGa9/+GU7fNLt78VYZWzkfXY2 WhPcE875yomaZ8jJpQyobL/IhwUnyw+XQ2mXwRI1BC/cHI+6c+DLYLEaowLl5teO8p6RvC QjqLhrcouN8yMcBGNzsZuGYGTYZ/XTmnh2krtaz0U46O0PgwmBWJ3KCb8zFiSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694417228; a=rsa-sha256; cv=none; b=XIA/ngKWNnEZ4nVarxYpxSzBKkv1U9ST264vzYVrp8pVBYStiZReYZQ6tRvWr2zfhTLjUe WhZGj9xWXlGHz0X6IdWoL2e1htcHjfDKNsND83Gb9QDXXWvUrCiKC4t71DUE7wfyk+OZ2p oeQlBWUOn0UMQUrS3R9/h6vgtLtFsMg6DkqiHRUgp7CnhNoepwSxWk+PlEcaIJdLt3icQW sdIRG2wvOVnMg1uYzTUOPi5zGgmGF9pyRBtktRTgDDA61WB3MF1Ehpr/HufhNoewDassMJ WFlcPOW13hOVoy8WAWlDYl1P6FVFYvIJ7wNiokRWr6Bk6Extsg9rDECduInZxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694417228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQ3VTuDBQIEGHfzv/EsrV6voNtQz61pDZGG61X3l+YQ=; b=YdQ8UW8sH5u9CxnKYhtsygTkiLgmVd6CTAAv6G7JQvaMStRU1GQnUNupBuz32iQ0H+EZLk Rl2qLzLzoC+XRVorP6KttUxu1/DrgMDeBrxofKQ1YAIbvBSjrWE1o5r2eeXLkJLOpvYn+6 kY+nEvHaUCOijL0hrmXJ8UgZc3N6WHj/ubt0inIzdBqSq6uznYHWaC/BRx1jndDv+WLNKB Aq5+UWkA1rQDaAcehdlGQYsLDiZlosc1vxqppnpmWe9pddn5Gvt0Wtq9cEo4tAbgJpXbrd j3/xxbCsdFZZvYHslg4DuFmyIiFwEk/jZozcJ1vSVTYHqJKZobPr70NnvnA+mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkdZh3tGmzgst; Mon, 11 Sep 2023 07:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B7R8Oc044013; Mon, 11 Sep 2023 07:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B7R2lO043997; Mon, 11 Sep 2023 07:27:02 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:27:02 GMT Message-Id: <202309110727.38B7R2lO043997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2b2fbeb3a97b - stable/14 - zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f commit 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f Merge: 0c9b0086715b e96fbdba344e Author: Martin Matuska AuthorDate: 2023-09-11 07:20:55 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:24:58 +0000 zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15251 Add more constraints for block cloning Obtained from: OpenZF OpenZFS commit: e96fbdba344e9c25cad624a10d4a4b300fd35f6c sys/contrib/openzfs/META | 2 +- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 ++ sys/contrib/openzfs/module/zfs/zfs_vnops.c | 21 +++++++++++++++++++-- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 29425d3368e0,000000000000..122a7a3f032e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1113 -1,0 +1,1113 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ +/* #undef HAVE_VFS_ITERATE_SHARED */ + +/* fops->readdir() is available */ +/* #undef HAVE_VFS_READDIR */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* fops->read/write_iter() are available */ +/* #undef HAVE_VFS_RW_ITERATE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* yes */ +/* #undef HAVE_WAIT_ON_BIT_ACTION */ + +/* wait_queue_entry_t exists */ +/* #undef HAVE_WAIT_QUEUE_ENTRY_T */ + +/* wq_head->head and wq_entry->entry exist */ +/* #undef HAVE_WAIT_QUEUE_HEAD_ENTRY */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry */ +/* #undef HAVE_XATTR_GET_DENTRY */ + +/* xattr_handler->get() wants both dentry and inode */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->get() wants xattr_handler */ +/* #undef HAVE_XATTR_GET_HANDLER */ + +/* xattr_handler has name */ +/* #undef HAVE_XATTR_HANDLER_NAME */ + +/* xattr_handler->list() wants dentry */ +/* #undef HAVE_XATTR_LIST_DENTRY */ + +/* xattr_handler->list() wants xattr_handler */ +/* #undef HAVE_XATTR_LIST_HANDLER */ + +/* xattr_handler->list() wants simple */ +/* #undef HAVE_XATTR_LIST_SIMPLE */ + +/* xattr_handler->set() wants dentry */ *** 169 LINES SKIPPED *** From nobody Mon Sep 11 08:35:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkg5w11YRz4t9xS; Mon, 11 Sep 2023 08:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkg5w0qZLz3bJ9; Mon, 11 Sep 2023 08:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694421348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Em68LQ3jqeP1LRFyrFxyfbO2TWXpjG+JnmW1rjsz6nM=; b=cyyyeyvSMiOYosXLSS56cRo2C4/P8qn5tbtuOlD6xG2i+Hx1J1n8Ilod5OVLAdGb78qCna xcI3+1vjJLcTHaRrQ4dLt6SIZJYbrx8oD3IsAzQQQSaHmZXtPS87hrFrBAbXyYylgx5dBM S/DsmcJSNTNAoaKrrlB97IBmA+Kz2qWIAXu1IAwtvdQiWd9B1tkH5ECd3jxOT1iULJtHBw OA33C3XtuGWc9LYK3Ih1bSwkCQdL+/+0kgJ6FCczUZc0EhOIIglhSx/2ZAWjD0ppoH1xUW 4nfWV4sexbZVyoDCgDLHADl9Ouolws3bk78OG7ZnmXdKsIu10Ydzz5wJTYaSGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694421348; a=rsa-sha256; cv=none; b=KCNrUwVDZBqo5bAJEQASa2Ey1SGxQ/8b1A7wEkKIkv8T2xWgd5NtmjhjLkelPIpMD4EtGB n+1jkMIBTenxjMRZMb+JiQ8+28F0INbREZxreIAsUHNNi8eq9ATXw+2d48uWTS0So4r4jL nKqOth5540gIlwy3UzFaW8v8k9FuyAsHm6YiG7A+MvnRZaTCzDr3Wgmh6xdpvfIPvbHdFg hoDY+HS5B8Tqy5yM8axF1/O01vD3LFrTnrQrViPHK14ZSXhy/4zsoqr2z+JIJtSCIaHWZU +uzLPNsc4nCNoHIPusHF0iEiF5vLj09Mt3qT3iol4xmyLKHGAoNbymNq883cOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694421348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Em68LQ3jqeP1LRFyrFxyfbO2TWXpjG+JnmW1rjsz6nM=; b=r4rYm328/w0kpUA2/zp4nTU2xUizFO39ccqKxTOVfoW7g2f0k5BbAmI9wGftHa68I7VnTI PIYmWjN2syYfIFtrE9fnhoSGe+nkepWreLGmOtO8t5pEKBFt5iVMOn3zIktWGx6lXopOhp TpBDh5X3DF4rWg40D0M8tpfmNs+se+VpTreRiyvbWhQHZtiRuY2ubQKUMmni6BqxvVqGUx B2qW5fTugoJWW8Vsl/K3biRRvfFpUnCwQdx7QIM2jrr4rRPRoetmxUxgvILirfy2NMcb58 TA+6sJgsGuKYzjpKFz7AqXCkG1JlDgil+MfSaK4f9GbZpK2PPgCw/kds+agjhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkg5v719yzj7n; Mon, 11 Sep 2023 08:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B8Zl4R059629; Mon, 11 Sep 2023 08:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B8Zl9t059626; Mon, 11 Sep 2023 08:35:47 GMT (envelope-from git) Date: Mon, 11 Sep 2023 08:35:47 GMT Message-Id: <202309110835.38B8Zl9t059626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cec93da46c4a91a042b0be488844052c0f8985a Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=6cec93da46c4a91a042b0be488844052c0f8985a commit 6cec93da46c4a91a042b0be488844052c0f8985a Author: Doug Moore AuthorDate: 2023-09-11 08:34:46 +0000 Commit: Doug Moore CommitDate: 2023-09-11 08:35:36 +0000 Revert "radix_trie: have vm_radix use pctrie code" This reverts commit a494d30465f21e8cb014a5c788a43001397325d7. --- sys/vm/_vm_radix.h | 9 +- sys/vm/vm_radix.c | 696 ++++++++++++++++++++++++++++++++++++++++++++++++++++- sys/vm/vm_radix.h | 113 ++------- 3 files changed, 709 insertions(+), 109 deletions(-) diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h index 2d9b05c7b52a..01eb25a9dccf 100644 --- a/sys/vm/_vm_radix.h +++ b/sys/vm/_vm_radix.h @@ -31,13 +31,16 @@ #ifndef __VM_RADIX_H_ #define __VM_RADIX_H_ -#include +/* + * Radix tree node. + */ +struct vm_radix_node; /* - * Radix tree + * Radix tree root. */ struct vm_radix { - struct pctrie rt_trie; + struct vm_radix_node *rt_root; }; #endif /* !__VM_RADIX_H_ */ diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index b8c693eca66f..768a56ed76f7 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -54,26 +54,302 @@ #include "opt_ddb.h" #include -#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include #include +#ifdef DDB +#include +#endif + +/* + * These widths should allow the pointers to a node's children to fit within + * a single cache line. The extra levels from a narrow width should not be + * a problem thanks to path compression. + */ +#ifdef __LP64__ +#define VM_RADIX_WIDTH 4 +#else +#define VM_RADIX_WIDTH 3 +#endif + +#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) +#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) +#define VM_RADIX_LIMIT \ + (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) + +#if VM_RADIX_WIDTH == 3 +typedef uint8_t rn_popmap_t; +#elif VM_RADIX_WIDTH == 4 +typedef uint16_t rn_popmap_t; +#elif VM_RADIX_WIDTH == 5 +typedef uint32_t rn_popmap_t; +#else +#error Unsupported width +#endif +_Static_assert(sizeof(rn_popmap_t) <= sizeof(int), + "rn_popmap_t too wide"); + +/* Set of all flag bits stored in node pointers. */ +#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) +#define VM_RADIX_PAD VM_RADIX_FLAGS + +enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; + +struct vm_radix_node; +typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; + +struct vm_radix_node { + vm_pindex_t rn_owner; /* Owner of record. */ + rn_popmap_t rn_popmap; /* Valid children. */ + uint8_t rn_clev; /* Level * WIDTH. */ + smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ +}; + static uma_zone_t vm_radix_node_zone; -smr_t vm_radix_smr; +static smr_t vm_radix_smr; + +static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, + enum vm_radix_access access); -void * -vm_radix_node_alloc(struct pctrie *ptree) +/* + * Map index to an array position for the children of rnode, + */ +static __inline int +vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) { - return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); + return ((index >> rnode->rn_clev) & VM_RADIX_MASK); } -void -vm_radix_node_free(struct pctrie *ptree, void *node) +/* + * Returns true if index does not belong to the specified rnode. Otherwise, + * sets slot value, and returns false. + */ +static __inline bool +vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *slot) +{ + index = (index - rnode->rn_owner) >> rnode->rn_clev; + if (index >= VM_RADIX_COUNT) + return (true); + *slot = index; + return (false); +} + +/* + * Allocate a radix node. + */ +static struct vm_radix_node * +vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) +{ + struct vm_radix_node *rnode; + + rnode = uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); + if (rnode == NULL) + return (NULL); + + /* + * We want to clear the last child pointer after the final section + * has exited so lookup can not return false negatives. It is done + * here because it will be cache-cold in the dtor callback. + */ + if (rnode->rn_popmap != 0) { + vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], + VM_RADIX_NULL, UNSERIALIZED); + rnode->rn_popmap = 0; + } + + /* + * From the highest-order bit where the indexes differ, + * compute the highest level in the trie where they differ. Then, + * compute the least index of this subtrie. + */ + KASSERT(index != newind, ("%s: passing the same key value %jx", + __func__, (uintmax_t)index)); + _Static_assert(sizeof(long long) >= sizeof(vm_pindex_t), + "vm_pindex_t too wide"); + _Static_assert(sizeof(vm_pindex_t) * NBBY <= + (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); + rnode->rn_clev = rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); + rnode->rn_owner = VM_RADIX_COUNT; + rnode->rn_owner = index & -(rnode->rn_owner << rnode->rn_clev); + return (rnode); +} + +/* + * Free radix node. + */ +static __inline void +vm_radix_node_put(struct vm_radix_node *rnode) +{ +#ifdef INVARIANTS + int slot; + + KASSERT(powerof2(rnode->rn_popmap), + ("vm_radix_node_put: rnode %p has too many children %04x", rnode, + rnode->rn_popmap)); + for (slot = 0; slot < VM_RADIX_COUNT; slot++) { + if ((rnode->rn_popmap & (1 << slot)) != 0) + continue; + KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) == + VM_RADIX_NULL, + ("vm_radix_node_put: rnode %p has a child", rnode)); + } +#endif + uma_zfree_smr(vm_radix_node_zone, rnode); +} + +/* + * Fetch a node pointer from a slot in another node. + */ +static __inline struct vm_radix_node * +vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) +{ + + switch (access) { + case UNSERIALIZED: + return (smr_unserialized_load(p, true)); + case LOCKED: + return (smr_serialized_load(p, true)); + case SMR: + return (smr_entered_load(p, vm_radix_smr)); + } + __assert_unreachable(); +} + +static __inline void +vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, + enum vm_radix_access access) +{ + + switch (access) { + case UNSERIALIZED: + smr_unserialized_store(p, v, true); + break; + case LOCKED: + smr_serialized_store(p, v, true); + break; + case SMR: + panic("vm_radix_node_store: Not supported in smr section."); + } +} + +/* + * Get the root node for a radix tree. + */ +static __inline struct vm_radix_node * +vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) +{ + + return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); +} + +/* + * Set the root node for a radix tree. + */ +static __inline void +vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, + enum vm_radix_access access) +{ + + vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); +} + +/* + * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. + */ +static __inline bool +vm_radix_isleaf(struct vm_radix_node *rnode) +{ + + return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0); +} + +/* + * Returns page cast to radix node with leaf bit set. + */ +static __inline struct vm_radix_node * +vm_radix_toleaf(vm_page_t page) +{ + return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); +} + +/* + * Returns the associated page extracted from rnode. + */ +static __inline vm_page_t +vm_radix_topage(struct vm_radix_node *rnode) +{ + + return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); +} + +/* + * Make 'child' a child of 'rnode'. + */ +static __inline void +vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, + struct vm_radix_node *child, enum vm_radix_access access) +{ + int slot; + + slot = vm_radix_slot(rnode, index); + vm_radix_node_store(&rnode->rn_child[slot], child, access); + rnode->rn_popmap ^= 1 << slot; + KASSERT((rnode->rn_popmap & (1 << slot)) != 0, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); +} + +/* + * Internal helper for vm_radix_reclaim_allnodes(). + * This function is recursive. + */ +static void +vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) +{ + struct vm_radix_node *child; + int slot; + + while (rnode->rn_popmap != 0) { + slot = ffs(rnode->rn_popmap) - 1; + child = vm_radix_node_load(&rnode->rn_child[slot], + UNSERIALIZED); + KASSERT(child != VM_RADIX_NULL, + ("%s: bad popmap slot %d in rnode %p", + __func__, slot, rnode)); + if (!vm_radix_isleaf(child)) + vm_radix_reclaim_allnodes_int(child); + rnode->rn_popmap ^= 1 << slot; + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, + UNSERIALIZED); + } + vm_radix_node_put(rnode); +} + +/* + * radix node zone initializer. + */ +static int +vm_radix_zone_init(void *mem, int size, int flags) { - uma_zfree_smr(vm_radix_node_zone, node); + struct vm_radix_node *rnode; + + rnode = mem; + rnode->rn_popmap = 0; + for (int i = 0; i < nitems(rnode->rn_child); i++) + vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, + UNSERIALIZED); + return (0); } #ifndef UMA_MD_SMALL_ALLOC @@ -107,14 +383,412 @@ void vm_radix_zinit(void) { - vm_radix_node_zone = uma_zcreate("RADIX NODE", pctrie_node_size(), - NULL, NULL, pctrie_zone_init, NULL, - PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); + vm_radix_node_zone = uma_zcreate("RADIX NODE", + sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, + VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); vm_radix_smr = uma_zone_get_smr(vm_radix_node_zone); } +/* + * Inserts the key-value pair into the trie. + * Panics if the key already exists. + */ +int +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) +{ + vm_pindex_t index, newind; + struct vm_radix_node *leaf, *parent, *rnode; + smrnode_t *parentp; + int slot; + + index = page->pindex; + leaf = vm_radix_toleaf(page); + + /* + * The owner of record for root is not really important because it + * will never be used. + */ + rnode = vm_radix_root_load(rtree, LOCKED); + parent = NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if (rnode == VM_RADIX_NULL) { + if (parent == NULL) + rtree->rt_root = leaf; + else + vm_radix_addnode(parent, index, leaf, + LOCKED); + return (0); + } + newind = vm_radix_topage(rnode)->pindex; + if (newind == index) + panic("%s: key %jx is already present", + __func__, (uintmax_t)index); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + newind = rnode->rn_owner; + break; + } + parent = rnode; + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + + /* + * A new node is needed because the right insertion level is reached. + * Setup the new intermediate node and add the 2 children: the + * new object and the older edge or object. + */ + parentp = (parent != NULL) ? &parent->rn_child[slot]: + (smrnode_t *)&rtree->rt_root; + parent = vm_radix_node_get(index, newind); + if (parent == NULL) + return (ENOMEM); + /* These writes are not yet visible due to ordering. */ + vm_radix_addnode(parent, index, leaf, UNSERIALIZED); + vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); + /* Serializing write to make the above visible. */ + vm_radix_node_store(parentp, parent, LOCKED); + return (0); +} + +/* + * Returns the value stored at the index. If the index is not present, + * NULL is returned. + */ +static __always_inline vm_page_t +_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, + enum vm_radix_access access) +{ + struct vm_radix_node *rnode; + vm_page_t m; + int slot; + + rnode = vm_radix_root_load(rtree, access); + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m = vm_radix_topage(rnode)) != NULL && + m->pindex == index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) + break; + rnode = vm_radix_node_load(&rnode->rn_child[slot], access); + } + return (NULL); +} + +/* + * Returns the value stored at the index assuming there is an external lock. + * + * If the index is not present, NULL is returned. + */ +vm_page_t +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) +{ + + return _vm_radix_lookup(rtree, index, LOCKED); +} + +/* + * Returns the value stored at the index without requiring an external lock. + * + * If the index is not present, NULL is returned. + */ +vm_page_t +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) +{ + vm_page_t m; + + smr_enter(vm_radix_smr); + m = _vm_radix_lookup(rtree, index, SMR); + smr_exit(vm_radix_smr); + + return (m); +} + +/* + * Returns the page with the least pindex that is greater than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +vm_page_t +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *rnode, *succ; + vm_page_t m; + int slot; + + /* + * Descend the trie as if performing an ordinary lookup for the page + * with the specified pindex. However, unlike an ordinary lookup, as we + * descend the trie, we use "succ" to remember the last branching-off + * point, that is, the interior node under which the page with the least + * pindex that is both outside our current path down the trie and more + * than the specified pindex resides. (The node's popmap makes it fast + * and easy to recognize a branching-off point.) If our ordinary lookup + * fails to yield a page with a pindex that is greater than or equal to + * the specified pindex, then we will exit this loop and perform a + * lookup starting from "succ". If "succ" is not NULL, then that lookup + * is guaranteed to succeed. + */ + rnode = vm_radix_root_load(rtree, LOCKED); + succ = NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m = vm_radix_topage(rnode)) != NULL && + m->pindex >= index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + /* + * If all pages in this subtree have pindex > index, + * then the page in this subtree with the least pindex + * is the answer. + */ + if (rnode->rn_owner > index) + succ = rnode; + break; + } + + /* + * Just in case the next search step leads to a subtree of all + * pages with pindex < index, check popmap to see if a next + * bigger step, to a subtree of all pages with pindex > index, + * is available. If so, remember to restart the search here. + */ + if ((rnode->rn_popmap >> slot) > 1) + succ = rnode; + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + + /* + * Restart the search from the last place visited in the subtree that + * included some pages with pindex > index, if there was such a place. + */ + if (succ == NULL) + return (NULL); + if (succ != rnode) { + /* + * Take a step to the next bigger sibling of the node chosen + * last time. In that subtree, all pages have pindex > index. + */ + slot = vm_radix_slot(succ, index) + 1; + KASSERT((succ->rn_popmap >> slot) != 0, + ("%s: no popmap siblings past slot %d in node %p", + __func__, slot, succ)); + slot += ffs(succ->rn_popmap >> slot) - 1; + succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); + } + + /* + * Find the page in the subtree rooted at "succ" with the least pindex. + */ + while (!vm_radix_isleaf(succ)) { + KASSERT(succ->rn_popmap != 0, + ("%s: no popmap children in node %p", __func__, succ)); + slot = ffs(succ->rn_popmap) - 1; + succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); + } + return (vm_radix_topage(succ)); +} + +/* + * Returns the page with the greatest pindex that is less than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +vm_page_t +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *pred, *rnode; + vm_page_t m; + int slot; + + /* + * Mirror the implementation of vm_radix_lookup_ge, described above. + */ + rnode = vm_radix_root_load(rtree, LOCKED); + pred = NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m = vm_radix_topage(rnode)) != NULL && + m->pindex <= index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + if (rnode->rn_owner < index) + pred = rnode; + break; + } + if ((rnode->rn_popmap & ((1 << slot) - 1)) != 0) + pred = rnode; + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + if (pred == NULL) + return (NULL); + if (pred != rnode) { + slot = vm_radix_slot(pred, index); + KASSERT((pred->rn_popmap & ((1 << slot) - 1)) != 0, + ("%s: no popmap siblings before slot %d in node %p", + __func__, slot, pred)); + slot = fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; + pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); + } + while (!vm_radix_isleaf(pred)) { + KASSERT(pred->rn_popmap != 0, + ("%s: no popmap children in node %p", __func__, pred)); + slot = fls(pred->rn_popmap) - 1; + pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); + } + return (vm_radix_topage(pred)); +} + +/* + * Remove the specified index from the trie, and return the value stored at + * that index. If the index is not present, return NULL. + */ +vm_page_t +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *child, *parent, *rnode; + vm_page_t m; + int slot; + + rnode = NULL; + child = vm_radix_root_load(rtree, LOCKED); + for (;;) { + if (vm_radix_isleaf(child)) + break; + parent = rnode; + rnode = child; + slot = vm_radix_slot(rnode, index); + child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + if ((m = vm_radix_topage(child)) == NULL || m->pindex != index) + return (NULL); + if (rnode == NULL) { + vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); + return (m); + } + KASSERT((rnode->rn_popmap & (1 << slot)) != 0, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); + rnode->rn_popmap ^= 1 << slot; + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); + if (!powerof2(rnode->rn_popmap)) + return (m); + KASSERT(rnode->rn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); + slot = ffs(rnode->rn_popmap) - 1; + child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + KASSERT(child != VM_RADIX_NULL, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); + if (parent == NULL) + vm_radix_root_store(rtree, child, LOCKED); + else { + slot = vm_radix_slot(parent, index); + KASSERT(rnode == + vm_radix_node_load(&parent->rn_child[slot], LOCKED), + ("%s: invalid child value", __func__)); + vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); + } + /* + * The child is still valid and we can not zero the + * pointer until all smr references are gone. + */ + vm_radix_node_put(rnode); + return (m); +} + +/* + * Remove and free all the nodes from the radix tree. + * This function is recursive but there is a tight control on it as the + * maximum depth of the tree is fixed. + */ +void +vm_radix_reclaim_allnodes(struct vm_radix *rtree) +{ + struct vm_radix_node *root; + + root = vm_radix_root_load(rtree, LOCKED); + if (root == VM_RADIX_NULL) + return; + vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); + if (!vm_radix_isleaf(root)) + vm_radix_reclaim_allnodes_int(root); +} + +/* + * Replace an existing page in the trie with another one. + * Panics if there is not an old page in the trie at the new page's index. + */ +vm_page_t +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +{ + struct vm_radix_node *leaf, *parent, *rnode; + vm_page_t m; + vm_pindex_t index; + int slot; + + leaf = vm_radix_toleaf(newpage); + index = newpage->pindex; + rnode = vm_radix_root_load(rtree, LOCKED); + parent = NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m = vm_radix_topage(rnode)) != NULL && + m->pindex == index) { + if (parent == NULL) + rtree->rt_root = leaf; + else + vm_radix_node_store( + &parent->rn_child[slot], leaf, + LOCKED); + return (m); + } + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) + break; + parent = rnode; + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + panic("%s: original replacing page not found", __func__); +} + void vm_radix_wait(void) { uma_zwait(vm_radix_node_zone); } + +#ifdef DDB +/* + * Show details about the given radix node. + */ +DB_SHOW_COMMAND(radixnode, db_show_radixnode) +{ + struct vm_radix_node *rnode, *tmp; + int slot; + rn_popmap_t popmap; + + if (!have_addr) + return; + rnode = (struct vm_radix_node *)addr; + db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", + (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, + rnode->rn_clev / VM_RADIX_WIDTH); + for (popmap = rnode->rn_popmap; popmap != 0; popmap ^= 1 << slot) { + slot = ffs(popmap) - 1; + tmp = vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); + db_printf("slot: %d, val: %p, page: %p, clev: %d\n", + slot, (void *)tmp, + vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, + rnode->rn_clev / VM_RADIX_WIDTH); + } +} +#endif /* DDB */ diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index a332618fc0e6..231edda65102 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -34,113 +34,36 @@ #include #ifdef _KERNEL -#include -#include +int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); +vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index); +void vm_radix_reclaim_allnodes(struct vm_radix *rtree); +vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); void vm_radix_zinit(void); -void *vm_radix_node_alloc(struct pctrie *ptree); -void vm_radix_node_free(struct pctrie *ptree, void *node); -extern smr_t vm_radix_smr; - -static __inline void -vm_radix_init(struct vm_radix *rtree) -{ - pctrie_init(&rtree->rt_trie); -} - -static __inline bool -vm_radix_is_empty(struct vm_radix *rtree) -{ - return (pctrie_is_empty(&rtree->rt_trie)); -} - -PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix_node_free, - vm_radix_smr); /* - * Inserts the key-value pair into the trie. - * Panics if the key already exists. + * Each search path in the trie terminates at a leaf, which is a pointer to a + * page marked with a set 1-bit. A leaf may be associated with a null pointer + * to indicate no page there. */ -static __inline int -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) -{ - return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); -} - -/* - * Returns the value stored at the index assuming there is an external lock. - * - * If the index is not present, NULL is returned. - */ -static __inline vm_page_t -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); -} - -/* - * Returns the value stored at the index without requiring an external lock. - * - * If the index is not present, NULL is returned. - */ -static __inline vm_page_t -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); -} +#define VM_RADIX_ISLEAF 0x1 +#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF -/* - * Returns the page with the least pindex that is greater than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -static __inline vm_page_t -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); -} - -/* - * Returns the page with the greatest pindex that is less than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -static __inline vm_page_t -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); -} - -/* - * Remove the specified index from the trie, and return the value stored at - * that index. If the index is not present, return NULL. - */ -static __inline vm_page_t -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); -} - -/* - * Remove and free all the nodes from the radix tree. - */ static __inline void -vm_radix_reclaim_allnodes(struct vm_radix *rtree) +vm_radix_init(struct vm_radix *rtree) { - VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); + rtree->rt_root = VM_RADIX_NULL; } -/* - * Replace an existing page in the trie with another one. - * Panics if there is not an old page in the trie at the new page's index. - */ -static __inline vm_page_t -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +static __inline bool +vm_radix_is_empty(struct vm_radix *rtree) { - return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); + return (rtree->rt_root == VM_RADIX_NULL); } #endif /* _KERNEL */ From nobody Mon Sep 11 08:55:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkgXX569sz4tNby; Mon, 11 Sep 2023 08:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkgXX3zQyz4GX9; Mon, 11 Sep 2023 08:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694422524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSj39F9yE8lZ5pqLwjRfE9L5cBBz5UjRRbve/VlR3bY=; b=RNuzcMhpD9XBQgf+aRgr6HZQ/gkZbf5k+xrGLgq2NRyHFj1RLTgovbuYHLyJTXG0rVacyX hVbwMfJ7YovEtw4FQAJOCsM944EKCnjBiodn0SJ2/0B7v9cDKTUcL5CVZhpDkP7/QxLXDF G5aJm4Me5GPBNWK3rBHfyrb8QHcQXtQpCtywGV+J3JklQVX5h2b3M9fxvozQE4abvwLN7I gUL10TQmb/ZWqrlTnzpGfnACPDA73tp/fh3sz0upfPHSQygQaArz3Yr9sOxs5hfqpDu7gQ qLGdNHMfH5vmJv8zKln3sgVQ9avUzQfpj7upzrO4QGgwMKkm2ojMk20hjG66CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694422524; a=rsa-sha256; cv=none; b=RW8j/i+csPrzh2zfmOOmQ9JUNHRnGd7465902vmIeg5fXtoidco9VEnHQrrbXUnxZ5b72o DPeb3q0CFX5lgArK4LuXtb8dGLpiZa8muuBTD3/jozxxNb209Z75FHxPKslIkK7iPJ6TbU TtcM58iaW0VYXMx2umxVv8skVVu3AWVaw59eHrgWgweetFNCa8DcvpxGhuug5o1HgcL4+I YMnlECxn0nq4VIQ0Bwaxh4ri35oqKMZfJrQi5ErrK8TGknJxlogGQARyhE+JU1Ci18NKuq ppEXGFPdpKlWjjAODsva3/9QckgdJ9IeYW2GamK3wraaG/E8gxWqzMC5T8cGWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694422524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSj39F9yE8lZ5pqLwjRfE9L5cBBz5UjRRbve/VlR3bY=; b=ZOXoUO2mcvU5d2lQeI4sA25nIOeK9ScEATP3zdFwNMFjzQRosNZlazUhdAY+U9WmU/X2eD u8pP7yKw7dKAAJJq+Cup3gK/P3p3pLBLNLtDH+0/6LQzMYB1zJAqFi1Yo/5fEu1d4T2a8m ldG08auZuIvj3288ri2vUK5H1S7qS2Eioye/MiWVgONZmIHqGxofBO11CiX8O2adbkV8QP ovTEkh1O7Padwd0IZroAlgZY4ET7hj0d4sFT3hbgiRWY9TXVJ+4fyIvPerl2IL4RKu1QhX TKjML87qxpRVxM/gycr5vtmUYVvO0Dl8BnOVFfAOhVxJeCshdynXN4+ZNcUntQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkgXX2pgdzk2K; Mon, 11 Sep 2023 08:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B8tOfO092560; Mon, 11 Sep 2023 08:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B8tOfG092558; Mon, 11 Sep 2023 08:55:24 GMT (envelope-from git) Date: Mon, 11 Sep 2023 08:55:24 GMT Message-Id: <202309110855.38B8tOfG092558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 4196186dbfd0 - main - hyperv/vmbus: Flip a message to only be emitted on failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4196186dbfd0949cfa2c51979fb169b7a79a80e4 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=4196186dbfd0949cfa2c51979fb169b7a79a80e4 commit 4196186dbfd0949cfa2c51979fb169b7a79a80e4 Author: Li-Wen Hsu AuthorDate: 2023-09-11 08:51:46 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-11 08:51:46 +0000 hyperv/vmbus: Flip a message to only be emitted on failure This message is not very useful when things are working well. Flip its meaning and let it only be emitted on failure. While here, pet style(9). Reviewed by: mhorne, whu Differential Revision: https://reviews.freebsd.org/D41788 --- sys/dev/hyperv/pcib/vmbus_pcib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c index da722eb0b834..ee7b82c10f23 100644 --- a/sys/dev/hyperv/pcib/vmbus_pcib.c +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c @@ -1705,9 +1705,9 @@ vmbus_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, if (res == NULL && start + count - 1 == end) res = bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags); - if (res) { - device_printf(dev,"vmbus_pcib_alloc_resource is successful\n"); - } + if (res == NULL) + device_printf(dev, "vmbus_pcib_alloc_resource failed\n"); + return (res); } From nobody Mon Sep 11 12:00:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkldp2lmHz4stvC; Mon, 11 Sep 2023 12:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkldp2JWkz3QWW; Mon, 11 Sep 2023 12:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gL78C7Fj8ONWK031i3KE0hmi/Ol8R7jbJEsyG5N6y60=; b=lBdRQnOT/Vc/la2f59mqRsp3PcIaUB5Yipq4EqpVCLNUNup3S7Urx6P/Awtz5SQsgHbv39 ETaPNNrHPS9qMONJx3m1ez4otafz9LD7nl2/RYjL3165gPyv0Zo+cigWYNXYZF8GugveN/ IlmLlq37mWHicGJkU1MqALx4O0ghJP5wxMBGL8meo551loyvocRoKddMHVjRXD+Jwdw3SN c1P12fgIxWy6sPn35/tt0uj8gw8O4l6cXBUU0usw4U2148y9Q4oGSYTMcknCiPBHTnomD7 fckXaCDXUY3+t+GWfy5H5eaJl2x3JYk8lu/AOZdMgd9aIhUB71bOKP6f/kNKBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433614; a=rsa-sha256; cv=none; b=Lfsm/S40OhTc+v8Qx8UNZYqUW0MqK7GqfjP0zMHLj0i2WPNpsFF+eqnucncLNxjQ8D9SnL weUr/yEJuCZ4d9JKobRAm/whCgiA8s1DGa6LF+QYTE+uFgKSw8WFb1o7Y+BU3ALaO+rkLc huIkNSDdVwWXKSoOcdqtiQq5vU9J0E897NFlAU8aH30SZmP4kMfJWdW/0rXkNuyTvk/YiC 1xyvjEGJJ642bACT0X1PbZFS3rc5/Pjt7lHtigBllZb5FxlPRuc8djTt1ndV0EmMLpi5GY EAsrI928ZuKFDk8G8nfkqJe3CT0fX4zjgZFPou0Jy0E976OCM4xfod+5AMMUAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gL78C7Fj8ONWK031i3KE0hmi/Ol8R7jbJEsyG5N6y60=; b=EvR4BNcOlmh5NO3UFynM5i1UQhSYJSyP6jRLh1EeAOc9kUqj+fWZaJIvmyp+yOpdt4cw9t 9pESTRFaq7jTKjPs19Y5E5+qMwoWy2Mv8Z4JcjJ1HenDHnxLd9aSBMgDEYEzsJioYx/PN4 qn9cpnElskRmkrGt0Fc5rxhZupRath3N9dVD1y9L7YcSxevdVnS0z9K5wF+5EbvwRoPBLk nO7KWvMk2FBWeyeJNBODSNTYxv3J/c7p0EdMg+PdBGWLECFC83GAHr5u88X28Vk0460y8k Mm04jtAcYC+xZut5T4VrIT6QZXv0JIKBRj3yQSC0dmdUvne+gTlNmtUvrUbJ2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkldp1NgYzpJg; Mon, 11 Sep 2023 12:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0EDp098946; Mon, 11 Sep 2023 12:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0EBZ098937; Mon, 11 Sep 2023 12:00:14 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:14 GMT Message-Id: <202309111200.38BC0EBZ098937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 803280ea07e9 - stable/14 - linux(4): Merge getxattr for future error recode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 803280ea07e9c07007e0acd3864a18d40b86de2a Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=803280ea07e9c07007e0acd3864a18d40b86de2a commit 803280ea07e9c07007e0acd3864a18d40b86de2a Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:58:50 +0000 linux(4): Merge getxattr for future error recode Tested by: zirias MFC after: 1 week (cherry picked from commit 6b46ec66129d9490c91876f72d98e514121996a6) --- sys/compat/linux/linux_xattr.c | 62 ++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b54a0d2f89ad..901123684154 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -68,6 +68,15 @@ struct setxattr_args { int follow; }; +struct getxattr_args { + int fd; + const char *path; + const char *name; + void *value; + l_size_t size; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -262,47 +271,66 @@ linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) } static int -linux_path_getxattr(struct thread *td, const char *upath, const char *uname, - void *value, l_size_t size, int follow) +getxattr(struct thread *td, struct getxattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_get_path(td, upath, attrnamespace, - attrname, value, size, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_get_path(td, args->path, attrnamespace, + attrname, args->value, args->size, args->follow, UIO_USERSPACE); + else + error = kern_extattr_get_fd(td, args->fd, attrnamespace, + attrname, args->value, args->size); + return (error); } int linux_getxattr(struct thread *td, struct linux_getxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = FOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, FOLLOW)); + return (getxattr(td, &eargs)); } int linux_lgetxattr(struct thread *td, struct linux_lgetxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = NOFOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, NOFOLLOW)); + return (getxattr(td, &eargs)); } int linux_fgetxattr(struct thread *td, struct linux_fgetxattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct getxattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_get_fd(td, args->fd, attrnamespace, - attrname, args->value, args->size)); + return (getxattr(td, &eargs)); } static int From nobody Mon Sep 11 12:00:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkldq5Kslz4sv1R; Mon, 11 Sep 2023 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkldq2yRRz3QTM; Mon, 11 Sep 2023 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zXsIuI8FnnA2dOxs3KxTT7QunUBdzz3hZDKvSeapGmc=; b=Py/3niSib4gv5ePmniDdFlRVsRJ5nRP8bWdGrJwpyCq9zB5lTsoBEuudzl6b1PIwRtmNfz iCm9S/gyVInHc6EBty6EvD3lj2+rxoB9H9C0KabTjmv6WNuG8Esyq8HayiBNiOBTeHQXBY aL9wO9qDntKMVyPxewEaTC8ANOMekEy2PlnzOzuqCGbeoceUmBPEyr+xD+lRILf/ziQ2aE YPsL0avwLelN9GJgWtx8vVNNdTXt146sWHeajt+c05P4jHECQf9roqyBLJi/ZIBUnxYxx0 4eSfuKDXONeGkW506oaCZnx93cEiMRK9lBbM50n3zK370OfhF6n1MsWf1t47zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433615; a=rsa-sha256; cv=none; b=UXj0nvHBlDMvmWkS7VQho+6lKPxdQhHq13SO4MBok6l5u5+iA6dzr1lkHmarbg7xSC4Amf ciDoyHAXLRmgRz4sLqZu6BB4Zgnh1SjFvxS4fDvNxC/CnB4K1RqgNhIwj3K6RmQ0TXjz6s 6O5E6EtryXuGMJbDl3nra6OjOxADVJ1SRgn/ZHWyUjv986x1reKd12/B3SN+M/K0jgQ63L h9rx9GJC9GIYPGXqWm4ZtyrRidAbJzujke1LrMHGIONau3hd/6kfOnw5onRmN0RfZ0uvUG 7D2V7KgxhklKa6XFR+3Ccar+4idtTIyd2xuqoa8Q3hc60Zeft4yQ12zgWn1nGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zXsIuI8FnnA2dOxs3KxTT7QunUBdzz3hZDKvSeapGmc=; b=eWAPrD/Nilgj9rxZ3DZGCuJ+vqjZPWrz9JHHGih6HeK4gP/7jXQshfrpyGedAxKb6iJ47h LI7bcb1IIeodJHft6K5LG/cYQtzljErEpWy4+A23KPXfICR7RPZimqOmhjoph0jFKqqppk 3AQpWtpkgRjyLLEqPHpaSGCbWLrnW1TFoYUpZEiIjHLe+MveV54MbQyrbZR2QCXGxPV1W+ IgPIBCUdaYomua33eH6ZCGq6vDY4kjGLQw+SEzMHRiPzRxSWIDdK98p+3pwxYHPq4l2PrD UqCYjK+Va+wLl2jknlwgBgI/lFY5rmxHePLlIqmm/P/8Yqq1/a5kAizh3w0uAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkldq20jTzp7R; Mon, 11 Sep 2023 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0FF4099648; Mon, 11 Sep 2023 12:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0FaJ099642; Mon, 11 Sep 2023 12:00:15 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:15 GMT Message-Id: <202309111200.38BC0FaJ099642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a9b8a0ced46e - stable/14 - linux(4): Return ENODATA from getxattr syscalls instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9b8a0ced46efe72ec118a749d191b29ce47712b Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a9b8a0ced46efe72ec118a749d191b29ce47712b commit a9b8a0ced46efe72ec118a749d191b29ce47712b Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:58:50 +0000 linux(4): Return ENODATA from getxattr syscalls instead of EPERM On Linux ENODATA mean the named attribute does not exist, or the process has no access to this attribute. Reported by: zirias PR: 273517 Tested by: zirias MFC after: 1 week (cherry picked from commit 4d59b790553ef75b9a4b6a673eab3354f3d012b3) --- sys/compat/linux/linux_xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 901123684154..b9717c62133c 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -285,7 +285,7 @@ getxattr(struct thread *td, struct getxattr_args *args) else error = kern_extattr_get_fd(td, args->fd, attrnamespace, attrname, args->value, args->size); - return (error); + return (error == EPERM ? ENOATTR : error); } int From nobody Mon Sep 11 12:00:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkldr4WFzz4stn9; Mon, 11 Sep 2023 12:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkldr3jp0z3Qcg; Mon, 11 Sep 2023 12:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE494aq4ByRDJUBRidFVYUR9S8JppemvaT5iV7f2WKc=; b=eFZ/Kvw7F38YN456Q+2Y75rbO5+J4BedzKN/UiuBpDiFJRnMdIOWj2TeDAAREmZv/HPxqw XeB6ggi4v2ERc5HTl90zySybVdF7SGYs3dk/eUa9mILb9aT7Q9CkGUsRmtfZuk+dU+yP5D VIBq/sukQgFYOrvpsREgaevev8Bs5zM1s8gu//fK8Dy0DOLi4vWWpeOS5d87Jf7Xpgi1N7 MqwezRTTd7TyZ6/fStkDQh+2+BAEcbCYxE4iEAIQ0DiPU7RZHlkvz6Ri1DjEyUkHnxd2YD hj5/RUoBzgDE3Gg3Adi5UzhFFMd4MXvJc/8IlBgtOCbDQo3pD+tgRa0koV2FEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433616; a=rsa-sha256; cv=none; b=VwthqqIk4PbFTT2s0P4i1dMhqG0hdgqBQc9ShpbWNjHSDkhx8K9bvvRm4KfwF4Dbe6gj0U VSc8wWvxDZbzjyKOjz0ME3Is/j17IL2f7d8GNc0tYIPCoMmFOuZLl6o9rR9cJqXnf8onLx x1dErgK7oXVFmMOEmjqY86yutP0MKd6TX+bQaBccQPt18ZHoMUVeVj18tn9Xk87QCcq12y F/ovYqMq/ZyTW7jSOZxLP9JQlQs2Ib+X4Ywjedn2lzt00TN38njyq6Z1Iqf+ZjH8sAWIBo Vg1S4b9ulvxsRbd6dyuXvhjX2OprmUzXEul0rOXL0K2oouSNjcZ/jde5YVp0bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE494aq4ByRDJUBRidFVYUR9S8JppemvaT5iV7f2WKc=; b=rCYRdCCJp9umbacOCT+YtRxwXzWk5OZnTDEwVNhRU+GsWFvQKEKAM/t6v1tk7KNN/DPyoO /IWFbsxK5pxhtuBTmwL/SVspMv+f4UwD8PKpsdpVHc3aEXnPBLq+bhNaVdPwK8q8ZmW7Kd 7g3tvS+UFYlNU2TvF3Eyy+hNtjEFiUlG8bDFI7W/RQ85a+sl+W4Ww0U/ejV/IYuUkaWg3L zP3ysqK8266zYseS1b+jcg4yYw/KfPtyv6YjwGQ7gPjWRFcsfC82XoyUveIJeP+EPyFjsG 5E3nZ8dzptD4DBroIcJxiYwOszfFyvUS1BwG2Fp0FLMiukl3U1ZDFLSVhDKIrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkldr2Yxzzp5J; Mon, 11 Sep 2023 12:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0Gb1000354; Mon, 11 Sep 2023 12:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0GHN000346; Mon, 11 Sep 2023 12:00:16 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:16 GMT Message-Id: <202309111200.38BC0GHN000346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0f35bf8b294e - stable/14 - linux(4): Merge removexattr for future error recode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be commit 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Merge removexattr for future error recode Tested by: zirias MFC after: 1 week (cherry picked from commit dfcc0237c3a97f4f7962da854389f3c5d976145a) --- sys/compat/linux/linux_xattr.c | 54 +++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b9717c62133c..2b46cf708c7d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -77,6 +77,13 @@ struct getxattr_args { int follow; }; +struct removexattr_args { + int fd; + const char *path; + const char *name; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -227,47 +234,60 @@ linux_flistxattr(struct thread *td, struct linux_flistxattr_args *args) } static int -linux_path_removexattr(struct thread *td, const char *upath, const char *uname, - int follow) +removexattr(struct thread *td, struct removexattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_delete_path(td, upath, attrnamespace, - attrname, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_delete_path(td, args->path, attrnamespace, + attrname, args->follow, UIO_USERSPACE); + else + error = kern_extattr_delete_fd(td, args->fd, attrnamespace, + attrname); + return (error); } int linux_removexattr(struct thread *td, struct linux_removexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = FOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - FOLLOW)); + return (removexattr(td, &eargs)); } int linux_lremovexattr(struct thread *td, struct linux_lremovexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = NOFOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - NOFOLLOW)); + return (removexattr(td, &eargs)); } int linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct removexattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_delete_fd(td, args->fd, attrnamespace, - attrname)); + return (removexattr(td, &eargs)); } static int From nobody Mon Sep 11 12:00:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rklds4bGdz4sts3; Mon, 11 Sep 2023 12:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rklds436gz3QMW; Mon, 11 Sep 2023 12:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIiBv3HVuNsqGwODix3BL2g5d1ETfcjXCV9s7g7WCcI=; b=pjYHsxovpzTPmOCz4iAJdNqZh5poRpAbgOjL59bCcAJastzGaagEzEU+clEvc/Gee+KBGT dvab+gAgQnz0Pq5QjrgFf3vulGJxhOP2cPkcCZWmW0sGt5uBe0qg3cpo7r4FkR6haVlj3o CnKiD8rDWxIN56IDI0JxDNsgcD970pmdROe08kcN5uilOv9rF9XyFmcBiFyWcSzmZ/SSc3 ZfWvzeDzSrTu5VkM5A8PUukoZzlL4XCpNfAHx+FXBFHo0gk136fS4n24E+RRJYgR7BlxAI /9u/+D0Ojn6jJOwgkFnrlZ2MIGfZlc1LsoUPOzNZOKbj7EH1dMWbjd63CBdmjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433617; a=rsa-sha256; cv=none; b=ItTonDkp6qQWe8fn1U9u/E7Sl6TWeLqSCcbLHgLwUZMLduQsOEjLswEsvgH2vy86w1//cb lLeunppQnW1WCnPX6pry5pd1ik6pQjhfj2y4yExBCNdEjXsyRQBHrxuDZKLWZ+/3lvIry9 0g7WaW7IjXOTWQCnjI2hK5ZdejNBpmSwMroz4v24kzNktpYk2vqJ2xms8R0dDU7AXqnwjh pnXwSGoyDz8UPNHjC3xTRvomeBlPlpPvgCyfmr5e230Q6IlBNSjBK2AOH0F3lnU169Jq/P qzwaIVgG5btsaVSdSVQjH7dtW5KXgtw+M1aLEqBjRYfoAelxrfsFmjBKY1MNiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIiBv3HVuNsqGwODix3BL2g5d1ETfcjXCV9s7g7WCcI=; b=My7V4uD96xR3jBm1ZmFT7btcpWQQM00ou1ExuOpZd/z0Sp5ZpLNRQx5TFYefwDXXrs/h7W xVQejz1uhGMaipoRTEihgBURQhJAKd9GqkUDAkoIj7snbNZpcvzD65G/o9Z+Rk8LZF+iur iFL0mlsq3ZBMyQ3kh+woNN8fPs7kdT8dVR9ZG0PP0qeAg7QHLso0Yemwg3M6WbBLUAnUFQ 2kJFrAnkc2jaV4bE7w8eFIbOPtpOax4EayCv4SvwumZCTpuUeSrUF/m7CC5yKzIJJO5GJs Cdew7iGka81mIdsWu+4fMrsJySpTJYmS0m+CsBSQzglx/FGTrou5+63RrQbIqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rklds37qbznbX; Mon, 11 Sep 2023 12:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0Hxx000976; Mon, 11 Sep 2023 12:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0HGd000969; Mon, 11 Sep 2023 12:00:17 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:17 GMT Message-Id: <202309111200.38BC0HGd000969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: bce9c2e34006 - stable/14 - linux(4): Return ENOTSUP from xattr syscalls instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bce9c2e34006dd70fb77a72f8cce1ead8a01db9e Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bce9c2e34006dd70fb77a72f8cce1ead8a01db9e commit bce9c2e34006dd70fb77a72f8cce1ead8a01db9e Author: Dmitry Chagin AuthorDate: 2023-09-01 08:11:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Return ENOTSUP from xattr syscalls instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 1bfc4574f78653e4b64ac9dd31518c96a17fe52b) --- sys/compat/linux/linux_xattr.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2b46cf708c7d..74b47f1cbaec 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -87,6 +87,16 @@ struct removexattr_args { static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; +static int +error_to_xattrerror(int attrnamespace, int error) +{ + + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && error == EPERM) + return (ENOTSUP); + else + return (error); +} + static int xatrr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname) { @@ -188,7 +198,7 @@ listxattr(struct thread *td, struct listxattr_args *args) if (error == 0) td->td_retval[0] = cnt; free(data, M_LINUX); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -248,7 +258,7 @@ removexattr(struct thread *td, struct removexattr_args *args) else error = kern_extattr_delete_fd(td, args->fd, attrnamespace, attrname); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -392,7 +402,7 @@ setxattr(struct thread *td, struct setxattr_args *args) attrname, args->value, args->size); out: td->td_retval[0] = 0; - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int From nobody Mon Sep 11 12:00:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkldt5q9rz4sts9; Mon, 11 Sep 2023 12:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkldt4zRhz3Qdc; Mon, 11 Sep 2023 12:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLcb5dnF0MTQjG353yQcUDHgUvm8Nx9pdNFbUSWTlPY=; b=PF6Vngr2nVrNTKQ4PXILd5xNsAkJ0q3y/1R5RYVL/MeFtH57X0VfQMWsuv5AhvxAZlKzcY txHYjFYtnIK9CdBujEJxlM/V2qBmKmFOl5hqtrnZjKa4HcjcMpO8ySVV0ZpMYTsg5/xFEz EJWO6kLhFOZ5jyCq5woPFzQMdvz+KASysaGuKpY/Q6vobv6SMt/4wE40NVSQqXlok/glg2 tDc9nlr7TjNoVD0K6cisrDZdzKGVD32XU1dUDJx3+QWG7ziPNsHwu4JlKRs6oPTTJ9nHdF 5d+Az4FZilyqRTnKPGd9wzbcfW/DBbP9MQEYhLPjLp3wq9BuCbqogKe0S5k42Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433618; a=rsa-sha256; cv=none; b=b6gsIQm3mgBWylw2q4ez6HZt2wm9G01GkEw1UZ2EkccJs85D5i0ejjHHn7akDgv8SIDcvF R4Eu3RCV1DCJhgS47WhBm7SvOi1kuGLMavzXdggiH+Nx5msj7VAlgaolNBsujr57rW4Sm2 FKr62OxiNZ28aXXrO6lzISlRrBaDFkUtdi+96u2/xbM+QrmMC8QxXX7uWH1oMOA6U1JuZg ZzsvU71RiomHyhlFtMVF8F2Qg8jXLHPD+8SL2PiF7tbgbIjrNStvrYN1V5kK8ZeuVUvXkZ qJ0hKo3GP4W/HxHLxceVENlAJtH5v04J1ulUUNJhHZQxkZqRpVihMtkYVQJODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLcb5dnF0MTQjG353yQcUDHgUvm8Nx9pdNFbUSWTlPY=; b=G5TFE80ldjHtVb+UZNrOYw9/76PjongXwwjl7V6uvvQz5gDN4wc1dpcpm86bfOgBIlFIYi VvRoHz5qxHTVaTTzDJLxJJjxltzMWOZxAxnUpdJRin9RfOcHDKTNR5Je4iePXFVf4x5nQq 5QufqhkjQ5+gJkNEsDfYb1148whBFrvIf8kvOUhzoXfE+zv4Wpz7wigpao56/FUNOGrSk/ qgi3uTY+pGcqtXjbJSZ3VrHpwekMAVsTM0V1tJn/OpUkIDKssrhXCfnvvfKkUoy+S3EcQf e99fP5xDuih2O55SLYTKEKnvakY51KpxBljAyBtqmSJYL2tDR4Hg90n5RJb5Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkldt3xZCznpJ; Mon, 11 Sep 2023 12:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0IuS001505; Mon, 11 Sep 2023 12:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0I86001502; Mon, 11 Sep 2023 12:00:18 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:18 GMT Message-Id: <202309111200.38BC0I86001502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 53b3e15d732f - stable/14 - linux(4): Fix listxattr for the case when the size is 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b3e15d732ff6ff0df7870107d45a371a376e73 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=53b3e15d732ff6ff0df7870107d45a371a376e73 commit 53b3e15d732ff6ff0df7870107d45a371a376e73 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Tested by: zirias MFC after: 1 week (cherry picked from commit 18d1c86788f66f42c4e096142f4f8d168f68732c) --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); } From nobody Mon Sep 11 12:00:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkldv6S6wz4stsK; Mon, 11 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkldv5qXFz3Qhd; Mon, 11 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s76PCtNkuZYDRnTcf7579S+mY2+nKVY9psE1+tF/0hk=; b=Qg00NCXj+jySzHdKTA254KuwUmGe+SvWEsl2+pTtoiFBFCl+C3zBeFrPtdtRwE9Y4lKHpQ 1GqY3plRQSv/RX747lQ/3m5wiF8Ti3pI80tnV0sGB4lqwywvLrjsaXYiGA2fUaeG4m0kx+ nMlYnHdJjhSsmvasWoH3RVZ5gi85uP/CfEtSIdduAlTc/+PB89DEf86bFxaAiyG0CDnCUu HM7j8v79juvBHJYFve4ajwyDRw/+cODft65oqZImtJfSG3luWa6ScIEDtlK9zG6uA0Z5pM Uhcu0uMNywQcn3OMhcJfuTq4T8Z243ELbCK5/yBW/9VHY8XPI+EX+zCs4dHKDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433619; a=rsa-sha256; cv=none; b=WvjNbBRawm0aD35DhHN5rcF3pxjrX5CcHyCyklz6a/R+vjfKvnM0IXtwQs3epykiTV7sF4 txnoRDTfb/zoYj2ba1r9w4zbSOPHfRpZ1HBCG0A+vRS+PQEJSSqqsmwQdQR0kDZjHZ9pO6 w7AgWDlFTSxJ0JpwMAdDC4dtSFrjFdr7yOFajTfFNYI3W/g6zsWr4L1KRdFtHFrxb99KaY 72ZfsMlWJXV7YasdFXQ4XD1CX1ZMasnd40JgHTVGuq6zBP/5G+ujRS//6/FdQQcP/c5XYh 58ySyrnJjFPBvOFINBAEfmJPd+XMosz+L63SuBgFRCoeSxc9PTE3DuXBAlQEbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s76PCtNkuZYDRnTcf7579S+mY2+nKVY9psE1+tF/0hk=; b=d+XRdIm5l0n5WdVFWAAccCOd2lUXEItTNVbpy01/kubGn2tnNRlL30kKkYZHi9fEYSfEwl anZRmvGe3+X9d/OMNjx7TjSx5/l+dBp0U82NW7Su4yp0p8qsRA8jbLrpiMZPDX0vxNhkdd ooloNNSjnYRR7DTbVHr+uzxaY94l06Qv2sCWtIN2Y4BPETPToJn5/02c+A0N7o1f5Wyj5T GgP48LEAeUnIbnSU17+ozw0pCcutoIXJkD6jQWekKkhxfQQxhY93Fx7eVe+eCNYVn2vIYC xINc+yRkytQUjcONzQ2CxQdYVBpgVY58HsMQMqOs1SNQ9FShyLH9rJqZ+d+d+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkldv4xHXznrg; Mon, 11 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BC0JNr001556; Mon, 11 Sep 2023 12:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0J2s001553; Mon, 11 Sep 2023 12:00:19 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:19 GMT Message-Id: <202309111200.38BC0J2s001553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e975d1b72507 - stable/14 - linux(4): Return ENOTSUP from listxattr instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e975d1b72507def7a699adf1cb38c68b48d80f51 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e975d1b72507def7a699adf1cb38c68b48d80f51 commit e975d1b72507def7a699adf1cb38c68b48d80f51 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:52:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Return ENOTSUP from listxattr instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls, cp. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 11e37048db35d7fcfc285b867965de1aeefec2c8) --- sys/compat/linux/linux_xattr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 71d7ae58439e..6979fff9c82d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -165,6 +165,8 @@ listxattr(struct thread *td, struct listxattr_args *args) error = kern_extattr_list_fd(td, args->fd, attrnamespace, &auio); rs = sz - auio.uio_resid; + if (error == EPERM) + break; if (error != 0 || rs == 0) continue; prefix = extattr_namespace_names[attrnamespace]; From nobody Mon Sep 11 13:18:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RknNC1xmmz4slWN; Mon, 11 Sep 2023 13:18: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 4RknNC12C8z4L1s; Mon, 11 Sep 2023 13:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694438315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gir5HoOnlQgeskxYphksbp4tRGIIuGJ0gByGpEykYo0=; b=kSenShAB5KAxz7+BlSFvVMXroE6J15nUPDVMvXNBc876g1lwQxbQcp2D+ywcwBed274PHn Wf5I726oF7sKDwTE95ualHZO/VPHu5stIJbx1vmWYiZTf7kCdo305Tnun2OOmquDUPLURR CAEb9MbrRS/yH+c5eQ2jaY7/9tW5uNrDosSc/WglJ73pf/DJNiyyK8tB574dr8nQ3acMZL yNes0pUiLdSLHz0jGmeNL5gQ073UGHEh4PCe/FlvkULiEbTExIOd9jC2THyqwraUNC7+kf +n3CgX4mZsd5jxReiJQMhkh39Hi+xA2dPx2lYsykuRI3CZtjig7oZ6SbL20thw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694438315; a=rsa-sha256; cv=none; b=p+q51ko2XCg/zQaDpS3b8tpJUFRBaX6T/UoNURItkCSTW6Vhn/PpIsf3i59uAQBg0S0ZMn uxDllLrt12cSXeBitB/iu59sBNL4G4uYqzsC2A1cAcS0Qc8fIz+cprzYaOBaY5a2GsoejZ 0idK6bDlPaqZ2D2lHVokIX6kxCASsxIJofcbtd+IfTpIAwT9oLXwFkUnC7wyqwNproL/pA wF2cGWL6fk5Krs2U8GjPqO5XSEQ6IEYPJsYWT8taq/J8yrHiks16o4UC6o00gwBRvh8aoo h+AoJ7B9JADzMv/wbiVMaC/MArxYPD/yXR6D3Nrb1xigDI8xkoDTmAO7/72ywg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694438315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gir5HoOnlQgeskxYphksbp4tRGIIuGJ0gByGpEykYo0=; b=f0sC3GTK0/zgBWQX8KWlkAsWz5EMDCJH9vW98F4YN5udDmek+l+6vNqzaV6QWcJukOqNRb RRaj0xbv6DYH3tLOtcn5FS/klUFBZKKCn3q60A6Hm0ajXCJDeW1gne8H+jc/zeeM8D3BIa Z3fWl+EtbIwRk8a6y+5me0Nz1xODaoaELVaC5fwm6UekcWmiGjKZ+z3BfWkUzaFgCak2ue Xuk66h+A6OGresdPebcpnNhuLwsBbMxEFrOSc6dEkAM5I2WNmqwLnS9gs/elSPC6vrRebl sxop0H50GJsZ5pj1ew4Cq0w1xVeW+PyAwBruzXwMeUFONii7dlDNFuKJ24At+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RknNC05VLzqv8; Mon, 11 Sep 2023 13:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BDIYwe024733; Mon, 11 Sep 2023 13:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BDIYp0024730; Mon, 11 Sep 2023 13:18:34 GMT (envelope-from git) Date: Mon, 11 Sep 2023 13:18:34 GMT Message-Id: <202309111318.38BDIYp0024730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 88a9b6e1ed82 - main - libc: Don't assume signed char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88a9b6e1ed82b562f52bae26b3de257495cd1983 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=88a9b6e1ed82b562f52bae26b3de257495cd1983 commit 88a9b6e1ed82b562f52bae26b3de257495cd1983 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-11 13:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-11 13:18:25 +0000 libc: Don't assume signed char. MFC after: 3 days Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41814 --- lib/libc/tests/stdio/snprintf_test.c | 4 ++-- lib/libc/tests/stdio/swprintf_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 323356b37a7d..29b908b65120 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -131,8 +131,8 @@ ATF_TC_WITHOUT_HEAD(snprintf_wN); ATF_TC_BODY(snprintf_wN, tc) { SNPRINTF_TEST("0", "%w8d", (int8_t)0); - SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SNPRINTF_TEST("0", "%w8u", (uint8_t)0); SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index f5dde349412b..f00ecc7f1c1d 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -132,8 +132,8 @@ ATF_TC_WITHOUT_HEAD(swprintf_wN); ATF_TC_BODY(swprintf_wN, tc) { SWPRINTF_TEST("0", "%w8d", (int8_t)0); - SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SWPRINTF_TEST("0", "%w8u", (uint8_t)0); SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); From nobody Mon Sep 11 13:47:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkp1Q3FXFz4t361 for ; Mon, 11 Sep 2023 13:47: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 4Rkp1Q2lPcz4TH8; Mon, 11 Sep 2023 13:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694440042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR3OLPe+A4PLCxCEU0LU38U07RL/gcjflPucVJyHhXU=; b=O3Pvu5wx+VoX7qFRPDqlyScchQ89E9qcdqoXEIlq1uIwwgJy5zv/pR8oe5txj4kBfsYFfu 1T38MbZS3OEixhhcV4F9AByqeLvZtIxNWxjZByBW9GTZqze3fEjPVxRg+edcROuUtziXGs le/3fTMEepuc33ogR6AfTEO4yd0wzXEhYd0sP2/Xav1XW15CaLvUpO9+AlgUHxvOid9KCB 4df3/CngH1l41WPhzmS0AnMXFyo6sBKg7xsXZXs6/LgL7PSsW58OscYAP47aX0L5Yj2FBl lwPD/Fo8nE69Aecct/z2yPr/egsXliEgz9QfgZLQ8nV+ilTlsPOqp2LF21JDvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694440042; a=rsa-sha256; cv=none; b=MLxJ3kvLxSoqaZ+m2ofbtLd48sUkKW2bw0tnuWQMfU8zatiGmLmvNhfKAHkOqNjygU3bm7 8nbwyxgSoHmtxm8XhwF/x9Pqgn3af37ur/yp+fef/SJnZDvYTiUsOwjg54BCjRy/0XEG/Z Ki0hdj4HHN+0LSl9E8trmOp04rMGRDxdXENW52VaMvWA8T13t7o26tk+7y45Uo6hiYi4ux mQ0BcMEiGwu4ftCcawsL1bxTcgSJrGvk72Zc2ioP7Ve+DfZboqzkdSnys0sOQ6T3Ar3WmA 3iNQIfIKGPcstPWbR7OYjHd9K3EhK5DQk0A/JEihterkKnSgW3U141biQFCvsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694440042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR3OLPe+A4PLCxCEU0LU38U07RL/gcjflPucVJyHhXU=; b=PkTBSS2TLp6aisqOus86SwK7032NXXrwUvkpzlQ2eTpYLBpwSQz+uniZK1SrhltIRDjU+K k9Ai/R8W8q3f5fW93tXQZq2Fl8ulGkAO6NpAWwevbKyWfLGaLHtZlOPOM1PwUyllbPAHBV 5XuZcppFSm1hWyjfGBm5Vb3vHKmC13OikUkCoA5rgJGYsDBlfukKOFpRoNjfrkGqWFgKoQ HuH57MXd8TcgA6qSPDT8Ny/ot28DkCEmwgmTo+m8sVDpuWkByBT45Lc8VcPWbxorVRGUzm +7lAPUzMGBPfZtPDOEzdAf6BNGR2kWkifv6sBbrVDKLuTXl0vePtdqYuIq2YqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkp1Q1WfCzrrW; Mon, 11 Sep 2023 13:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BDlMTn073863; Mon, 11 Sep 2023 13:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BDlMfR073862; Mon, 11 Sep 2023 13:47:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 13:47:22 GMT Message-Id: <202309111347.38BDlMfR073862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: c938c0a64320..8092e001bcd7 - vendor/llvm-project/release-17.x - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-17.x X-Git-Reftype: branch X-Git-Commit: 8092e001bcd76c0b9fec2311f3a515aa60d2ed07 X-Git-Oldrev: c938c0a643200ec844981864ac587bc6c1f576aa X-Git-Newrev: 8092e001bcd76c0b9fec2311f3a515aa60d2ed07 Auto-Submitted: auto-generated The branch vendor/llvm-project/release-17.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=c938c0a64320..8092e001bcd7 8092e001bcd7 Vendor import of llvm-project branch release/17.x llvmorg-17.0.0-rc4-10-g0176e8729ea4. From nobody Mon Sep 11 13:47:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkp1Q3fgqz4t38L for ; Mon, 11 Sep 2023 13:47: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 4Rkp1Q37pLz4TMn; Mon, 11 Sep 2023 13:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694440042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPTZCtxqbfK3NOiUJ9IINo7ovPJwE3zgbBQ9m3oC1GM=; b=AfKoaY+tbz6wTVutZmmFOkFrxxL3NgPUako2zFy4UrjtC4aKoRu59spT4I9xzkb3BUSy9b ba5JyPj7I6649oFKt2Cqc71HKXeFicbwbANOxRAgLpzP9hAsLLRfpr1aLVh17qE4ekeUVU AOcawIe+O3zwtgkerZehVXTFH8eLKrgLI8ipvWL/KefBLVH1ajbRxn4QilM6kKUyFARZ4n BXZGeaymlRM2LPDaV6Mk6uEspRzNhOKNbi/rJFOV1Eh0I196/wqFx2T0MK5JpQYG5KnPGZ pJeUqwXoocMisZBswD/EPaabyM4BUo6nJv99yJqs/1Z/d8hja+p8QRfdHYLNLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694440042; a=rsa-sha256; cv=none; b=j7ZGM5PH+ID/izqH6Yb3SSmJHWxjvYABWsznXSui2OLnEqCBHeHdbDuHiQMJmJ1ebpZJyn lGF1Tet5G89rSVCZYx2mEtTWDm73Yt6MtB0ZKrlX+WMOexFlpQLVSt3r0Ez+bT2T1laR9+ FfsiJeKiqUMqtpzbMTj4/h6m+YHYRcDfxEX+XqvfNMZFYrlCqgPtS7zdjp97OZ33GnHn42 5bPLFllnuwN7qXd40rAVBiy12J+EVkei+fW8UwRJD5eXEL1rAo6cFIqpm/SG8FE7ZJ03Jz 8nQztJ36J71S+lI4/wqXQoSQFkA+126QBhb4eAzrxcazW7myRjvIB758SLdX5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694440042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPTZCtxqbfK3NOiUJ9IINo7ovPJwE3zgbBQ9m3oC1GM=; b=lhnPmh7Nhp+Qjgids63xUMC3DJOCB8PNDQf68FPYqOWKDE0KDXT9Jpre6kVYAN6IaQMYVk 8yAftrJFMrMaaArKKcDtf0J8QDX0sm4246kr+VPHmdygBm6aemba9z0/gBed1CrzUe7b3g pKEFDZfxlMVv2OwovlSXM4SO6x2wx1N69FKOFQfXtE0CuQav+ViwwBtIYcceeVyZFebk6C 2WLRm8X3YQkYWrxrKDuJly5RXdvrN4Zxlj48/LUqX8LWRxgHBOifx6jYDwD5qRCFyBGhiX pJETaA1vJ3pc5xJKGrBOWBb39WviovyBletQHWi/SGTeVL7knqxR3lCIoGw33g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkp1Q277Yzryr; Mon, 11 Sep 2023 13:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BDlMLN073886; Mon, 11 Sep 2023 13:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BDlMAo073884; Mon, 11 Sep 2023 13:47:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 13:47:22 GMT Message-Id: <202309111347.38BDlMAo073884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: dbc319889e76 - Create tag vendor/llvm-project/llvmorg-17.0.0-rc4-10-g0176e8729ea4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-17.0.0-rc4-10-g0176e8729ea4 X-Git-Reftype: annotated tag X-Git-Commit: dbc319889e763ca62d5243de848bb8307457f430 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-17.0.0-rc4-10-g0176e8729ea4 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-17.0.0-rc4-10-g0176e8729ea4 tag vendor/llvm-project/llvmorg-17.0.0-rc4-10-g0176e8729ea4 Tagger: Dimitry Andric TaggerDate: 2023-09-11 13:45:10 +0000 Tag llvm-project branch release/17.x llvmorg-17.0.0-rc4-10-g0176e8729ea4. commit 8092e001bcd76c0b9fec2311f3a515aa60d2ed07 Author: Dimitry Andric AuthorDate: 2023-09-11 13:44:52 +0000 Commit: Dimitry Andric CommitDate: 2023-09-11 13:44:52 +0000 Vendor import of llvm-project branch release/17.x llvmorg-17.0.0-rc4-10-g0176e8729ea4. From nobody Mon Sep 11 14:28:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkpxH3KsNz4tSKK; Mon, 11 Sep 2023 14:28: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 4RkpxH2wDpz3GhS; Mon, 11 Sep 2023 14:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S7LIhOtBWu5OrgDQYdx4XJGg+It8oikkFneYj3czps4=; b=YLqYYbNgF3HA39G5bKyI+zM3y5XZId1bOi8yOpnLGcdnSOyKrc+5wTMPkyUHGNgmEsonDu mR3IjEh8TXRa8+mhE+3dbV1O7MPoiSFUnGu1JyztWwx8QLecYADya4/we1xDyhB7XksoKt ODbu/D3/o6tKO9caUq69OcJ5yRPSK3Ddx/TzFws+Cos5EvPhl441IsaqNI6nRHBThV3M4A DX28HxfO153ZOh3FbH7v+TJrqvJt7GhaGOaTCPeEZ8r7Byr6Pib46dMM/uGDvhwg/tbsCt nCusxNocwGZQDSVWq8zLrMQjSsY7kpSopwUtYbIoRdK5ZP73XIPoL1956d8qWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694442531; a=rsa-sha256; cv=none; b=LbWUNy3JMA/DWO/DSSKhSuQw7PxSc1aCaqI0FBCwEm1zYrsocTKkAyTk2olebP3mpOACCN Eo8EDkpf8PMtELDVn4pm1JaYxae0bTm2s/c7cJLP/wsJKfXG3o1PkWQ6/py/6LFhSwBK4J KvQt8x03KHSZJXYzij/4Gu0x5dsr+zelewFppyJuuWb8lkSkYFWV+nEcwEFWGIpJuu+qlm ndiKJifGEpuCl4bwrNfWf4C8W0jiVlwh0JaqQZwpLJlaq7zGlrS6k9yVTYdgZMv+e3A1/u Fw34xb1yL//EsGGeHVy2eqdwDiq09k2kUGNsU71IDHTiR7B+dUlilLl2deRfCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S7LIhOtBWu5OrgDQYdx4XJGg+It8oikkFneYj3czps4=; b=Zj1L8YOwFCS5yjFbcB1PXbsKl0pZ/QEERJHbtz2in4KPH7II8ISKCAADBmIQbKWTvDFBM2 LIUUpLAX4Q1PrFikw2m0HTADsQlrKeTNtptHsbSuEkEiN5sziT/rOLKgDGQisvDPIx3QOh kvhMrQrbSTxpTC1izm+FttKWUn28G0ogz97JghFb9FJ5exAdhwGyabNwmowbqrOV27vcPA 59ZXlc+mz2Ct4vjlan9Fe1XYb43fhdVmVW8vW25XLohhg+nI56jHgfCdvNSxzH5stotLvD 61MF9PgiML681JOP8km1NKkzfz/axZzjyO3WTJFz1ufqAEiyzOEkbCIXfHPmzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkpxH1zs7zt0k; Mon, 11 Sep 2023 14:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BESp9W040960; Mon, 11 Sep 2023 14:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BESp5x040957; Mon, 11 Sep 2023 14:28:51 GMT (envelope-from git) Date: Mon, 11 Sep 2023 14:28:51 GMT Message-Id: <202309111428.38BESp5x040957@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: c45d05b71817 - main - net80211: fix ddb print alignment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c45d05b71817e478953d6f235d921c2b4acc82de Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c45d05b71817e478953d6f235d921c2b4acc82de commit c45d05b71817e478953d6f235d921c2b4acc82de Author: Bjoern A. Zeeb AuthorDate: 2023-09-11 14:23:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-11 14:28:04 +0000 net80211: fix ddb print alignment Add missing \ts after new lines to properly align output of ddb show commands. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/net80211/ieee80211_ddb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index 7a6ee49d7705..4e2df134c7a9 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -506,7 +506,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf(" ht_sta_assoc %u", vap->iv_ht_sta_assoc); db_printf(" ht40_sta_assoc %u", vap->iv_ht40_sta_assoc); db_printf("\n"); - db_printf(" nonerpsta %u", vap->iv_nonerpsta); + db_printf("\tnonerpsta %u", vap->iv_nonerpsta); db_printf(" longslotsta %u", vap->iv_longslotsta); db_printf(" lastnonerp %d", vap->iv_lastnonerp); db_printf(" lastnonht %d", vap->iv_lastnonht); @@ -550,7 +550,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf(" phytype %d", ic->ic_phytype); db_printf(" opmode %s", ieee80211_opmode_name[ic->ic_opmode]); db_printf("\n"); - db_printf(" inact %p", &ic->ic_inact); + db_printf("\tinact %p", &ic->ic_inact); db_printf("\n"); db_printf("\tflags=%b\n", ic->ic_flags, IEEE80211_F_BITS); From nobody Mon Sep 11 14:28:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkpxJ4mqWz4tS5k; Mon, 11 Sep 2023 14:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkpxJ3Zdfz3GTK; Mon, 11 Sep 2023 14:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+tTL9Ic6AYfYie1wooH29/JHFIh6O3Ab3B7Oj8CUCM=; b=ERfOj5zgxB/W6IJZ8B5dFibsLInWjAgezVkfbvZNSossu8FarjQOpqymGe2/o4JIoDo0Lh oNpJClyIH7vxTJe4Mbl/hdDlZ/iAplw6iQSlw7zf+fGNN3xrAF6qDyml+fwt1z/46on7cl jXYEo9JveArgpIZSHc+DNtcWVCAoK49JP1Uj2vOfRAzYvpYNvru7dJ+Ev0KZ/WRAqV6U6j +KTuRR+4uyClHPOOkl/d2aNI44MHpTj2LImG0g5BVM4rH2C9NViQdCd7MJPdkhXLObJ0CY 2kDXOcy06GZ4OWjuH7XdosdROibpt1rJAXZowFTvnLt1G9O5C6sXEbLiDN9mRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694442532; a=rsa-sha256; cv=none; b=amVDbghJylqF71IR/oVPwl3JftyxNli+qFIV+TG0nlPbd7SgLhbK/vp3QRArKe4EXevtkd ImiEfmDDvP7ys7AQqWjjP5loA1xl9wlxG8Szrnq4niwAE9zWQDfp5MisoSDTt1zGkySVVp jP3qPczLIuq+ZFIaUntbMAW78sQl9jVPYsP2CoaGgJSd9gbkngjfAvU04Rco7aJgNVjGhK 903wpLhU/EecoHVZURqlgSzB7ZHLwpC6TWwf333kaExJRu/JW1bjVcQ5J5UDc6UFiA7sqy wLztVuosrYWB60tqN0glWO/g4S5QIQPFd/P8H+pW/LcuGUG9WUdTQnaFuVOw/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+tTL9Ic6AYfYie1wooH29/JHFIh6O3Ab3B7Oj8CUCM=; b=kDKZAGgTUgD/7g15Vbaawmy3krXd5JbwbvGt9/Vj/QRrZPZvjnb6ZUv7BX1B10wm3/EHji DiO+mnwPHuDjJ2hROy3BuEONUb2z2mSzj7Y2xlCZJ6rQS/+J1+srPAHOOAAd52FT9a1+Eu RtnOq/IiFCOlXrNniVJ+isE+UgrnWIoT0X7oKHvc0rDY4pdGMaz7rWEggh2aB3pb2f+Bnc h7vE6VWde1G0pu76k8KeWCj2m/CtEAhTxsbgElALuF1e5xvaWDAZiIHOCCTay1gNO6Cd+L Aup5xOjGjzpOPo+Dno7Y/Dmwg6suZ+E2lMV6wly/VTd6q2a9nLFGf8x0bxtACQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkpxJ2bPBzsnv; Mon, 11 Sep 2023 14:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BESqw2041002; Mon, 11 Sep 2023 14:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BESqmI040999; Mon, 11 Sep 2023 14:28:52 GMT (envelope-from git) Date: Mon, 11 Sep 2023 14:28:52 GMT Message-Id: <202309111428.38BESqmI040999@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: 530c13c5401c - main - tools/wlanstats: fix -Wunused-but-set-variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 530c13c5401c1f29f8325cf851d96778852a1ba3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=530c13c5401c1f29f8325cf851d96778852a1ba3 commit 530c13c5401c1f29f8325cf851d96778852a1ba3 Author: Bjoern A. Zeeb AuthorDate: 2023-09-11 14:11:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-11 14:28:07 +0000 tools/wlanstats: fix -Wunused-but-set-variable The "allnodes" code is currently #if 0 so also #if 0 the setting of the command line option and variable in order to keep wlanstats compiling. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- tools/tools/net80211/wlanstats/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/tools/net80211/wlanstats/main.c b/tools/tools/net80211/wlanstats/main.c index 4c0cf4db0505..ac100a70622e 100644 --- a/tools/tools/net80211/wlanstats/main.c +++ b/tools/tools/net80211/wlanstats/main.c @@ -168,18 +168,26 @@ main(int argc, char *argv[]) struct ether_addr *ea; const uint8_t *mac = NULL; const char *ifname; +#if 0 int allnodes = 0; +#endif int c, mode; ifname = getenv("WLAN"); if (ifname == NULL) ifname = "wlan0"; wf = wlanstats_new(ifname, getfmt("default")); +#if 0 while ((c = getopt(argc, argv, "ahi:lm:o:")) != -1) { +#else + while ((c = getopt(argc, argv, "hi:lm:o:")) != -1) { +#endif switch (c) { +#if 0 case 'a': allnodes++; break; +#endif case 'h': usage(); exit(0); From nobody Mon Sep 11 14:32:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkq0x45hKz4sG70; Mon, 11 Sep 2023 14:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkq0x3hJwz3J3T; Mon, 11 Sep 2023 14:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01Mzoe5lVqrEwaQgL/J040Mj2XJpwamxenvO+6F5k3s=; b=ChK/OrCM7wbSaBKHyDoH4jDj2vjPw5/aWnqcGAItktX7ScKMxdzl83lUtqN8CzDf0qFUeC jLZizKLxMhGhuIjxoOx0rMTLuDmAOrRylYl93YcYdtHWDKzO/lmwBqECreHWDlJCvqAIX9 G9SdKsTJAwa3XxsP10M2peoAj/1oYxArOzjHRuuPSlFDqBzbohBkCEa8yMBmnGoWQCzuAm IWzNNFFEoFF6H9jHV7SNC5EVXOZA4bauyaTAtDRwhURF//WkI+B3/dHLlqvxh27uR4fGqW WO5KwAR/tZks0jAM18t2IFA7kK+g8/k4o9jVc0Y/NhhCXAiEfKkvXIfcSXVCDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694442721; a=rsa-sha256; cv=none; b=SAk8C3T4eJ91pU/wKMR+WDA2bY7rg6m4KHp3/AxKQAhzukW6zj7k9ZiUTHc00xEpBnkQ59 lUwLZkOQ3bvPO4lAUOet+2tNWYzEwal+rJMK1ezxOEszCwyjveqzRR6hjncA2A96vnaOI/ xXgC6WquD3BmIJL0oNx5i0Ge3gfu25eQI+Si+DL0zQ3wo9447i72zC9+73nBlwD70YkP75 qPkjbFxCB2CtQiTrYF0BYYsouItW34eYF+SSHnlJvx8vk8pUxN/ZI0bgSleDAFyV3SlBtG auvqXVqLBQJJRG0i+dXXaFfzM3taDq9GrGjT5zS9ihbTStFbLT/lszvZQOo9Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01Mzoe5lVqrEwaQgL/J040Mj2XJpwamxenvO+6F5k3s=; b=bXl/md8B9rJTPjFrDi+U596qgjkeLjtvsWLT5WqTJkzjtiQpUpdwjNoPERamRycGR3QD7y GdDamOeSH3N4VCLGmwiC1J9fCajOSOcA4Fk8hy1MAq+7TSjbLWbLoQxMcJGfAOhiQrC1kX NVDL7i1s0hBIKO2hzB1dD7eHhNLO1RQe6Wf5LwYmjm3BVPN+P9lH6Fij9+IxEH5jwgtMqY V5xoj4gkbJIoFxuS3Skj8EYxECCnNUOGwkZKfISeh1KARblAcMJQ0fWEtlvLUNoGrNvaoI sRfk1gZuguGDiohvlhNRgBl2rJZeAYUCahq2F6lWTThbxgdmk2mvm1y+smjnOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkq0x2n3VzsbY; Mon, 11 Sep 2023 14:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BEW1Zd054761; Mon, 11 Sep 2023 14:32:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BEW1Ep054758; Mon, 11 Sep 2023 14:32:01 GMT (envelope-from git) Date: Mon, 11 Sep 2023 14:32:01 GMT Message-Id: <202309111432.38BEW1Ep054758@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: f0e59b6903c8 - main - LinuxKPI: skbuff: remove assumption about mac_header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0e59b6903c881859d7f4eaf269b2336b774c7bc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0e59b6903c881859d7f4eaf269b2336b774c7bc commit f0e59b6903c881859d7f4eaf269b2336b774c7bc Author: Bjoern A. Zeeb AuthorDate: 2023-09-08 12:47:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-11 14:31:35 +0000 LinuxKPI: skbuff: remove assumption about mac_header It seems the mac_header can be set to offset 0 for frames received. Remove the warning splattering messages to the console for each packet. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index c917b3f09ac9..f8ce212e7853 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -935,10 +935,9 @@ static inline uint8_t * skb_mac_header(const struct sk_buff *skb) { SKB_TRACE(skb); - /* Make sure the mac_header was set as otherwise we return garbage. */ - WARN_ON(skb->mac_header == 0); return (skb->head + skb->mac_header); } + static inline void skb_reset_mac_header(struct sk_buff *skb) { From nobody Mon Sep 11 15:42:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkrZ119nlz4t2js; Mon, 11 Sep 2023 15:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkrZ10lL9z3dhh; Mon, 11 Sep 2023 15:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694446937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrbFJfndnB6YPALsVC8GnQ+EKecCEzJrjUHxf+k0jbQ=; b=Zi1Lhgd4JA9Vhejg97rGFdbKGw7bzqc5z9EDxyyqvxZRtWGo/4V54ISrcVBB9peL+WClVU aNxnlgWZcRexF04lc1+8pxhnOPvT9YhaJ5BHz0z1SiqVvCbBiiA6/o+xEv6DNzNhNGQUT9 ztxSO7RVqpQuXrDhTfHJJFmJEKBDYyoY331l9p+zuPdozX6YdeY9CQkEIMlq5cjpiBnFAv mZwr6+TxVzKi/oLgVjC6MU5n1lIHtN/s8jjhe2E7f0lxTKf0VKAbW4WjbN8W1UX8pAwnJE N0DEv+rA1y+LjUWKvxHxqPR9TJVSSFTxiE/2ZluJF4N+XLQpXK+h4mpSoUYoDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694446937; a=rsa-sha256; cv=none; b=ebLGpEF8+3o1EOK9uXrDuI21/AvpEvGi0dP6xqDUvxswEQxzqc79ULU58PNw1bFqp+n6MR 7Os7+Qne3q8uzzNsu51oEU8EgZ9rMe/HfnrEsUpHMPiGsuDT2NO02GcC14AOUKV44ExJWP OZoU9k+rUNOGuz0v9/noa7QZS5fTqx/IoFWfbMjNPKv74dhkkIf2rSIK2GlH11ZCU/k9Yj iUzL6tDO96hXA7NgdEz0+RRey+3FOemKev3jDXDmY1P6PRDL4z55iw3nQUUPir/TZ73tP8 t71P3kST7VqlChDGcPb3lrwc+OjLyZJjb0VRID1Ab5xlwbgOD/XBbVKYz0BiKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694446937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrbFJfndnB6YPALsVC8GnQ+EKecCEzJrjUHxf+k0jbQ=; b=WVVbJCbPOAK47xdnfaxGOgH8M5zZi4eFqUgsuFAmsmPTLOk4jkfiecN2ACpwYeAcbsA9jR X8v/dLAaURbnNtv5dnPfx8dEqkLnAsS/tnV+IecSNVF/D61V3pOA46Vtgtw71qIVzA573q iRyGHRZiAqdbsdShit/coxidbZGI6SrhYE7FJd+loy9VUdecvsXrVZfIsDdYqsv7sVFCYx 0kt2HZKKbVo//rb2m9ZMkXGgcey3ecCOh5e5n0R5SwOvpUFzMVCMWarQV6o7o7ELczA2gm 50nqMu7jnefMQBpTjWD1Hi6LYQNZOBKAODi4JkcPvhMh5zbRtPHAp8UBmjRmmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkrZ06x0BzvPf; Mon, 11 Sep 2023 15:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BFgGUp071428; Mon, 11 Sep 2023 15:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BFgGZO071425; Mon, 11 Sep 2023 15:42:16 GMT (envelope-from git) Date: Mon, 11 Sep 2023 15:42:16 GMT Message-Id: <202309111542.38BFgGZO071425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d557a86c879a - main - pkg: use https by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d557a86c879a8515d59e8380b083b2265e9a3547 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d557a86c879a8515d59e8380b083b2265e9a3547 commit d557a86c879a8515d59e8380b083b2265e9a3547 Author: Baptiste Daroussin AuthorDate: 2023-06-08 21:37:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-11 15:41:32 +0000 pkg: use https by default Switch the repository to use https by default, base is providing a CA root bundle suitable to validate the certificates used by the project. This can now be activated without requiring another packages to be installed Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40473 --- usr.sbin/pkg/FreeBSD.conf.latest | 2 +- usr.sbin/pkg/FreeBSD.conf.quarterly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index 3f0c4a6243cb..a75b0703386f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 31dc1bde8c2a..645053820dda 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Mon Sep 11 16:52:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkt7W2YhPz4sP33 for ; Mon, 11 Sep 2023 16:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkt7W0Txbz4MjB; Mon, 11 Sep 2023 16:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694451175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+8l6UhjyParvT6z97uw6HHgfTDvTsF2ScXdaOBQZUQ=; b=UJvdrIjHX+wyv2iEo1VOR2xxJH2CdZ2J5SduGiIuc47eadeBNIZIvQ5whBqP3+JpzXO+4S 9ZynvLhOykcr8kOlvIqOurd2x67OuxcWbqRmIKlol6IzHVgQ2Kv8jwVCONDTVkWu1W6AqG wBPSrrGa7ozvz4H64wj8Q6XtyybZx93UWSRWRI0/wa6f0PKQHJOECzXWIvbPqmAe0QsFKK ZXjVw9KCmfOtjbvqwolH6govQ8lqm0RHBxQLdJG0Ga3bQypQFbfj0nOPAwnD9OZh0iGYkJ FeUR5WN2nfxHNcFsul7VU/xJEoH8JLuxN+GTq8erWsoafGPcwg8zup8/arWvwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694451175; a=rsa-sha256; cv=none; b=dGc0FT1VFktr/BtHm2jjtGgUlfkW6wx687fr1XQ8adE5bTKO+zHMucTVZVMRVYoK5g7fVW HD0ELT+0XrXUOY+XhLupdVxo6E6WHzy8f6WOfC4Ww7Gw550fNH/RpWLMQ83PdsxwyZXy+i dbcucrqxbmUN3jcqJCcxMqEupCwHWqTBZkl49wQlKTfUrEvxkRxi9tSv2HozIwcCqhKneM CrmoQFvKOcIvz7hOxWUPwXVJKMxGnjC3EtFDD77Tz3Zi8K1MwTVUAPoG+o5CQIiG8ES2c3 MPZB4mCggPZta7Bp4cOwM3ZfNO9vLC6sCtBcah797Mbk7zNU/gKogmt+nBswew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694451175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+8l6UhjyParvT6z97uw6HHgfTDvTsF2ScXdaOBQZUQ=; b=GZARAOScT/KZF5U8iN/ab48iLpv1k+sVfvIoOzie/h3ADOEpV+qYueKKYG51YSQO6jz+hD HaxUXNX0D+uVFE0xjr4EzUShPjKvg67sPHr6FqFGBg6wOmwXHSSxoQJMv72xwZlZm9Y7vv m7qnPT1Z4CKdx1HFW5+YlJzFyu+GqXv9QY+dEvVnPt4PA/SHKxRszDP6BQemeOe4CyUFCe WGP5LWTlJIgeg4o+YpEpOjrIizsX5e53qkJvkQBVX15vk09s780quv/5M3BA4gFgB+4Bk0 pbIY8FjS4Wkybs+M0n+YYm5tWozKcMmO0NwFYCJLnm6iSW8hnrXvvAezeYQFzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkt7V6NLPzxRs; Mon, 11 Sep 2023 16:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BGqsC9090024; Mon, 11 Sep 2023 16:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BGqs1M090023; Mon, 11 Sep 2023 16:52:54 GMT (envelope-from git) Date: Mon, 11 Sep 2023 16:52:54 GMT Message-Id: <202309111652.38BGqs1M090023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: cc0d356166e3..a1860b94f624 - vendor/openssl-1.1.1 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openssl-1.1.1 X-Git-Reftype: branch X-Git-Commit: a1860b94f62494288804faebb1bf6ea8110ca148 X-Git-Oldrev: cc0d356166e39da7f956c39f874e6dee67fd5d60 X-Git-Newrev: a1860b94f62494288804faebb1bf6ea8110ca148 Auto-Submitted: auto-generated The branch vendor/openssl-1.1.1 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/log/?id=cc0d356166e3..a1860b94f624 a1860b94f624 Import OpenSSL 1.1.1w From nobody Mon Sep 11 16:53:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkt8M5N1Lz4sNjB for ; Mon, 11 Sep 2023 16:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkt8M4fD2z4MkW; Mon, 11 Sep 2023 16:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694451219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMfMTa7HZVh4t1gUC9SyRBvM5+2O8gpmsYu8tooXhXk=; b=dNI5lxFCNuf9MP9AW7TzCFXgQqXO1r3EvrDeV1BC0Dg2p9wehGaFqWsjuoRGF7bHTGDfs/ 7XGr86vXdE1kN3rDQ/Z9X9Q3tBwCyDnwmb+pB8aTWdbFJGDVgjhyxMDAZ/iBu9Rhpsdkpj gmghWoKTJMBPQBNPVAu8RC5fEOh8zxL48pls+1L9YLJH8NvcGwaHAOiiOkwJ93Thc637UZ g+aMa3xcPn/A3IWR2E60VWPWmyWuw9ermF/h+51xI7uIeb9z8DLTIJRTG+CNF2/HckiBkb E2Pf1nzSXQ/JgflnPWwDIwNggYRPEA5a5aUT9lbzxxubo9J5+VXovCedMuli6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694451219; a=rsa-sha256; cv=none; b=GNApmq3z5d3T7j9vfR/KTiVOi5Jtu7nGxxfVbqSDdIxhHhXUomhLc5fpTjWdMc0/QUPgD1 qrk7HdxyhSueqnMvfnTanAB4wdfBb3u2DT9YotObv42P3gN1WKneEBY0+sI+jVWpmyAFHA 77AH7gRxH6myviJx9khsIbpIvNgicznrEsttmSj9EjO1RoGULYm99tBPnZzPX+lyxl/+G9 +TjImgqwBUfVHIRMT5Vv7sG+a3OmOqATBWX4UQ1GmlmDlmJdAB5xM5byfZGjY8XOCTLA78 g2GQdvo/mK0vrckqtME0+pQyC/J1xGvOKYYrTfOaoBLp2uHa9mck2v4T/8Fj2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694451219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMfMTa7HZVh4t1gUC9SyRBvM5+2O8gpmsYu8tooXhXk=; b=tWgQjRADMwU1Ulm8qLEa8JfJvhxVIN5r6ursbUkktaKqVZyItm3QBZwybcznBEAWEdBw8q x4+F7OCJVAFt35r6qp9hU19NJuhFgKSMsih7UrWo1h3Qz+Y+BMUF3YqVqzuWZIYadJkpUZ TLcLQgkemPLDrRbDBUYnXqhGTDCGMSZ/OfxeFryKounbOz9xycbtCGQA/BW4snQ7KRGYz9 FmdPCSpXXrSMFNNoY0xRCa0jFTloQ6M4hTapfFQQx3OPFOZNcGpsqA/SL5nx2RYXgly5/r ZXB6L/HfpVPoEr6JZbrbbf9nGI0XtbEyDRG3e3ZNbiSLVU0ucgx9rxo3YX8b+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkt8M3hhBzxPW; Mon, 11 Sep 2023 16:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BGrdKJ090188; Mon, 11 Sep 2023 16:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BGrdYC090187; Mon, 11 Sep 2023 16:53:39 GMT (envelope-from git) Date: Mon, 11 Sep 2023 16:53:39 GMT Message-Id: <202309111653.38BGrdYC090187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: ede5fbbe8d50 - Create tag vendor/openssl/1.1.1w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/openssl/1.1.1w X-Git-Reftype: annotated tag X-Git-Commit: ede5fbbe8d504da983869d66a974fa1396f93801 Auto-Submitted: auto-generated The annotated tag vendor/openssl/1.1.1w has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/1.1.1w tag vendor/openssl/1.1.1w Tagger: Jung-uk Kim TaggerDate: 2023-09-11 16:51:57 +0000 Tag OpenSSL 1.1.1w commit a1860b94f62494288804faebb1bf6ea8110ca148 Author: Jung-uk Kim AuthorDate: 2023-09-11 16:50:12 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 16:50:12 +0000 Import OpenSSL 1.1.1w From nobody Mon Sep 11 17:17:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rktgp3y8fz4sRk5; Mon, 11 Sep 2023 17:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rktgp2kHvz4QHQ; Mon, 11 Sep 2023 17:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09q9POFHoWjbmsBj+wlI+VGav0W0bjiF1pw/NTfP784=; b=tOZ8XAsI8zoPvdMSbvG9WNSFXpd6IFwj8Jja9zME2zVMqz40bo4fhHCq+thS1iPBasbMwY NiRpKucxMMZ/D4kBMCDlIc4JqkxKBSbDKoXBFX1k/DXCcgKbrkc04N5cuNtm++UkC9RhAP NzM0TGU39q87kSDV3a9kVg3rKA7Sxriy0BVdH83h5ExGWdUv4cHI7rNShsaT0YsZ3dmCog g5p8p1cmtvskEcmOCPz3Ajrm307MdjpWwp3h9cgs6Klh0tC0zxXd5l+i+FLBxu94GdZawy W7fBPy1g6V3JQL27zX46vqVNNoEsUmbpp3R+exRFmbK1QjGZqtpOyayb7UO+IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694452646; a=rsa-sha256; cv=none; b=Wl17cluBTMDOCEhm+SHM/2Tt0sO32H4WJCKvW8F9MffvDWiVpu76CqbbRVTTtpwc7+UHyg OH3EaZ+SoKb4Qjt0sQeqkOaSI9kPlR0Op4n4Yz9oG8zTpgPv2Gnv3d2ei0pxekNwjyAPIO /qyARSTCmaeQU2Teiy42IAUYSMFPqaDVdLnrgCi9zqR1Q3K+uYZDcblKBuc2FYEyb+VhQM sIbgEhxBUF+ppuyPyrijR4w6qp+WONCT183p7uT7phaS2/zc0BXnjVHcNNY00UnutfrNsJ jcQuIOgtC/LeG97Y0JBnvdomy6Yqlcs0+TgFsZsrl3COQZM8CK3VZyyczqZQrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09q9POFHoWjbmsBj+wlI+VGav0W0bjiF1pw/NTfP784=; b=NPJzbQhNc5lJedBo87DyZc4AnUVHkrtfoFLJQQl2D2xRt0KeCwrXLTe0WmhsmsVVR2npCq I/1gH5QoZJ/MrgOfSiny1N+GlmYJl9pQI4pCYJKajoIoB3quWILrMqbQs9SyvBhz7O3pXZ V0wly1F33oNtjFFFO/rvo3ZcgTiBXvBWCEcRKu/9p7cjoWxNRZSOQ+CSH+heXEwQbY4Dyi gHBsQCQq98f9GdI9BV86Cck+ILs4Fxn/xKyOg+G2lOv0ivAuLGWA30YlpDl2s1sKcAFiPx LvD2ru86lsuIkkiENTNoP5w9n1EU8TJQ8pwppeAECLJxRzFD4XPB7b0+WXklrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rktgp1lNBzxNJ; Mon, 11 Sep 2023 17:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BHHQYV023898; Mon, 11 Sep 2023 17:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHHQuC023895; Mon, 11 Sep 2023 17:17:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:17:26 GMT Message-Id: <202309111717.38BHHQuC023895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: cf3d446e18bf - stable/13 - OpenSSL: Merge OpenSSL 1.1.1w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 commit cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 Author: Jung-uk Kim AuthorDate: 2023-09-11 16:50:12 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:14:49 +0000 OpenSSL: Merge OpenSSL 1.1.1w (cherry picked from commit a1860b94f62494288804faebb1bf6ea8110ca148) --- crypto/openssl/CHANGES | 24 +++++++ crypto/openssl/NEWS | 5 ++ crypto/openssl/README | 2 +- crypto/openssl/appveyor.yml | 78 ---------------------- crypto/openssl/crypto/asn1/ameth_lib.c | 11 ++- crypto/openssl/crypto/cms/cms_asn1.c | 17 ++++- crypto/openssl/crypto/cms/cms_local.h | 3 +- crypto/openssl/crypto/cms/cms_sd.c | 16 ++++- crypto/openssl/crypto/cms/cms_smime.c | 5 +- crypto/openssl/crypto/ec/ec_ameth.c | 19 ++++-- .../openssl/crypto/poly1305/asm/poly1305-x86_64.pl | 6 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 7 +- crypto/openssl/doc/man3/CMS_sign.pod | 4 +- crypto/openssl/include/openssl/opensslv.h | 4 +- crypto/openssl/ssl/ssl_sess.c | 7 +- 15 files changed, 102 insertions(+), 106 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 612aaf56f6e6..12d965d47521 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,30 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1v and 1.1.1w [11 Sep 2023] + + *) Fix POLY1305 MAC implementation corrupting XMM registers on Windows. + + The POLY1305 MAC (message authentication code) implementation in OpenSSL + does not save the contents of non-volatile XMM registers on Windows 64 + platform when calculating the MAC of data larger than 64 bytes. Before + returning to the caller all the XMM registers are set to zero rather than + restoring their previous content. The vulnerable code is used only on newer + x86_64 processors supporting the AVX512-IFMA instructions. + + The consequences of this kind of internal application state corruption can + be various - from no consequences, if the calling application does not + depend on the contents of non-volatile XMM registers at all, to the worst + consequences, where the attacker could get complete control of the + application process. However given the contents of the registers are just + zeroized so the attacker cannot put arbitrary values inside, the most likely + consequence, if any, would be an incorrect result of some application + dependent calculations or a crash leading to a denial of service. + + (CVE-2023-4807) + [Bernd Edlinger] + + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] *) Fix excessive time spent checking DH q parameter value. diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index c71c02911db0..1b849cdf7686 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [11 Sep 2023] + + o Fix POLY1305 MAC implementation corrupting XMM registers on Windows + (CVE-2023-4807) + Major changes between OpenSSL 1.1.1u and OpenSSL 1.1.1v [1 Aug 2023] o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) diff --git a/crypto/openssl/README b/crypto/openssl/README index dbe6bf756e94..e924e1529a9c 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1v 1 Aug 2023 + OpenSSL 1.1.1w 11 Sep 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/appveyor.yml b/crypto/openssl/appveyor.yml deleted file mode 100644 index 6210391f204a..000000000000 --- a/crypto/openssl/appveyor.yml +++ /dev/null @@ -1,78 +0,0 @@ -image: - - Visual Studio 2017 - -platform: - - x64 - - x86 - -environment: - fast_finish: true - matrix: - - VSVER: 15 - -configuration: - - shared - - plain - - minimal - -before_build: - - ps: >- - Install-Module VSSetup -Scope CurrentUser - - ps: >- - Get-VSSetupInstance -All - - ps: >- - gci env:* | sort-object name - - ps: >- - If ($env:Platform -Match "x86") { - $env:VCVARS_PLATFORM="x86" - $env:TARGET="VC-WIN32 no-asm --strict-warnings" - } Else { - $env:VCVARS_PLATFORM="amd64" - $env:TARGET="VC-WIN64A-masm" - } - - ps: >- - If ($env:Configuration -Match "shared") { - $env:SHARED="no-makedepend" - } ElseIf ($env:Configuration -Match "minimal") { - $env:SHARED="no-shared no-dso no-makedepend no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_SMALL_FOOTPRINT" - } Else { - $env:SHARED="no-shared no-makedepend" - } - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - - mkdir _build - - cd _build - - perl ..\Configure %TARGET% %SHARED% - - perl configdata.pm --dump - - cd .. - - ps: >- - if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER` - -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT | - Select-String "\[extended tests\]") ) { - $env:EXTENDED_TESTS="yes" - } - -build_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" - } - - cd .. - -test_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - if ($env:EXTENDED_TESTS) { - cmd /c "nmake test V=1 2>&1" - } Else { - cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1" - } - } - - ps: >- - if ($env:EXTENDED_TESTS) { - mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" - } - - cd .. diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c index 5e8c3ed1d5b0..4ab246e98719 100644 --- a/crypto/openssl/crypto/asn1/ameth_lib.c +++ b/crypto/openssl/crypto/asn1/ameth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -264,6 +264,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->pkey_size = src->pkey_size; dst->pkey_bits = src->pkey_bits; + dst->pkey_security_bits = src->pkey_security_bits; dst->param_decode = src->param_decode; dst->param_encode = src->param_encode; @@ -271,6 +272,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->param_copy = src->param_copy; dst->param_cmp = src->param_cmp; dst->param_print = src->param_print; + dst->sig_print = src->sig_print; dst->pkey_free = src->pkey_free; dst->pkey_ctrl = src->pkey_ctrl; @@ -281,6 +283,13 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->siginf_set = src->siginf_set; dst->pkey_check = src->pkey_check; + dst->pkey_public_check = src->pkey_public_check; + dst->pkey_param_check = src->pkey_param_check; + + dst->set_priv_key = src->set_priv_key; + dst->set_pub_key = src->set_pub_key; + dst->get_priv_key = src->get_priv_key; + dst->get_pub_key = src->get_pub_key; } diff --git a/crypto/openssl/crypto/cms/cms_asn1.c b/crypto/openssl/crypto/cms/cms_asn1.c index 08069d72a29e..a62e11ecbd90 100644 --- a/crypto/openssl/crypto/cms/cms_asn1.c +++ b/crypto/openssl/crypto/cms/cms_asn1.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, EVP_PKEY_free(si->pkey); X509_free(si->signer); EVP_MD_CTX_free(si->mctx); + EVP_PKEY_CTX_free(si->pctx); } return 1; } @@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = { ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1) } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo) -ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { +static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) +{ + CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval; + + if (operation == ASN1_OP_FREE_POST) + OPENSSL_clear_free(ec->key, ec->keylen); + return 1; +} + +ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = { ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT), ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR), ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0) -} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo) +} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo) ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = { ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32), diff --git a/crypto/openssl/crypto/cms/cms_local.h b/crypto/openssl/crypto/cms/cms_local.h index a0ce4448f603..09c0bdfe5a47 100644 --- a/crypto/openssl/crypto/cms/cms_local.h +++ b/crypto/openssl/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -342,6 +342,7 @@ struct CMS_Receipt_st { DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_ITEM(CMS_SignerInfo) +DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo) DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) DECLARE_ASN1_ITEM(CMS_Attributes_Sign) DECLARE_ASN1_ITEM(CMS_Attributes_Verify) diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 3f2a782565a8..9f67f91297ea 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -375,6 +375,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } else if (EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, pk) <= 0) goto err; + else + EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); } if (!sd->signerInfos) @@ -600,6 +602,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms, unsigned char md[EVP_MAX_MD_SIZE]; unsigned int mdlen; pctx = si->pctx; + si->pctx = NULL; if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) goto err; siglen = EVP_PKEY_size(si->pkey); @@ -680,6 +683,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) EVP_MD_CTX_reset(mctx); if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); si->pctx = pctx; } @@ -745,8 +749,13 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) return -1; } mctx = si->mctx; + if (si->pctx != NULL) { + EVP_PKEY_CTX_free(si->pctx); + si->pctx = NULL; + } if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); if (!cms_sd_asn1_ctrl(si, 1)) goto err; @@ -859,8 +868,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain) if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0) goto err; si->pctx = pkctx; - if (!cms_sd_asn1_ctrl(si, 1)) + if (!cms_sd_asn1_ctrl(si, 1)) { + si->pctx = NULL; goto err; + } + si->pctx = NULL; r = EVP_PKEY_verify(pkctx, si->signature->data, si->signature->length, mval, mlen); if (r <= 0) { diff --git a/crypto/openssl/crypto/cms/cms_smime.c b/crypto/openssl/crypto/cms/cms_smime.c index 6e7dbc4da1fa..f6c1c7d17705 100644 --- a/crypto/openssl/crypto/cms/cms_smime.c +++ b/crypto/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -211,7 +211,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, if (cms == NULL) return NULL; if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen)) - return NULL; + goto err; if (!(flags & CMS_DETACHED)) CMS_set_detached(cms, 0); @@ -220,6 +220,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, || CMS_final(cms, in, NULL, flags)) return cms; + err: CMS_ContentInfo_free(cms); return NULL; } diff --git a/crypto/openssl/crypto/ec/ec_ameth.c b/crypto/openssl/crypto/ec/ec_ameth.c index 5098bd7a6602..5a63590a9fbd 100644 --- a/crypto/openssl/crypto/ec/ec_ameth.c +++ b/crypto/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,7 +38,6 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key) ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid); if (asn1obj == NULL || OBJ_length(asn1obj) == 0) { - ASN1_OBJECT_free(asn1obj); ECerr(EC_F_ECKEY_PARAM2TYPE, EC_R_MISSING_OID); return 0; } @@ -98,9 +97,7 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) ptype, pval, penc, penclen)) return 1; err: - if (ptype == V_ASN1_OBJECT) - ASN1_OBJECT_free(pval); - else + if (ptype == V_ASN1_SEQUENCE) ASN1_STRING_free(pval); OPENSSL_free(penc); return 0; @@ -256,24 +253,32 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) eplen = i2d_ECPrivateKey(&ec_key, NULL); if (!eplen) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } ep = OPENSSL_malloc(eplen); if (ep == NULL) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE); return 0; } p = ep; if (!i2d_ECPrivateKey(&ec_key, &p)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0, ptype, pval, ep, eplen)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); return 0; } diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl index 5f834d8faf2a..5e2bb18f2bac 100755 --- a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -193,7 +193,7 @@ $code.=<<___ if ($avx>1); bt \$`5+32`,%r9 # AVX2? cmovc %rax,%r10 ___ -$code.=<<___ if ($avx>3); +$code.=<<___ if ($avx>3 && !$win64); mov \$`(1<<31|1<<21|1<<16)`,%rax shr \$32,%r9 and %rax,%r9 @@ -2722,7 +2722,7 @@ $code.=<<___; .cfi_endproc .size poly1305_blocks_avx512,.-poly1305_blocks_avx512 ___ -if ($avx>3) { +if ($avx>3 && !$win64) { ######################################################################## # VPMADD52 version using 2^44 radix. # diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c index 2c9c46ea53c8..00ed9820b0d2 100644 --- a/crypto/openssl/crypto/rsa/rsa_ameth.c +++ b/crypto/openssl/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,13 +82,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) if (!rsa_param_encode(pkey, &str, &strtype)) return 0; penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc); - if (penclen <= 0) + if (penclen <= 0) { + ASN1_STRING_free(str); return 0; + } if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id), strtype, str, penc, penclen)) return 1; OPENSSL_free(penc); + ASN1_STRING_free(str); return 0; } diff --git a/crypto/openssl/doc/man3/CMS_sign.pod b/crypto/openssl/doc/man3/CMS_sign.pod index 79446b129889..884be8fdd315 100644 --- a/crypto/openssl/doc/man3/CMS_sign.pod +++ b/crypto/openssl/doc/man3/CMS_sign.pod @@ -95,7 +95,7 @@ The function CMS_sign() is a basic CMS signing function whose output will be suitable for many purposes. For finer control of the output format the B, B and B parameters can all be B and the B flag set. Then one or more signers can be added using the -function CMS_sign_add1_signer(), non default digests can be used and custom +function CMS_add1_signer(), non default digests can be used and custom attributes added. CMS_final() must then be called to finalize the structure if streaming is not enabled. @@ -119,7 +119,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index c1063dc589e4..65209e1f6d77 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010116fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" +# define OPENSSL_VERSION_NUMBER 0x1010117fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-freebsd 11 Sep 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/crypto/openssl/ssl/ssl_sess.c b/crypto/openssl/ssl/ssl_sess.c index cda6b7cc5bcf..68d1737ac521 100644 --- a/crypto/openssl/ssl/ssl_sess.c +++ b/crypto/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use @@ -139,8 +139,11 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->references = 1; dest->lock = CRYPTO_THREAD_lock_new(); - if (dest->lock == NULL) + if (dest->lock == NULL) { + OPENSSL_free(dest); + dest = NULL; goto err; + } if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data)) goto err; From nobody Mon Sep 11 17:17:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rktgq6CNtz4sRk7; Mon, 11 Sep 2023 17:17: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 4Rktgq53RGz4QVt; Mon, 11 Sep 2023 17:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttKVCjrwZbYZPTTlrzLiLky4eTT9wq1FjkKkkvtCntg=; b=pw9E+vVvuDaHdRB64AwF9fxVBZaJySGfwifj8OLOP2J8pP7t/dfgAOFkqd5gtK1V4O7KIe P6twSurkJfIr4nttqJ1iotioin3H9sv24zCq1ngPWw9foxyxBdV+1yZFDEGa+FCmEQcIbM NYLBQl3GPGd9wCSbHxvFUva3AB0l/6ZK9yuOY+8XriGNLrtAx84qvMR0HrUCoJXos2LCnq n+nvQ8LDdWXw1qGyu/VGm92IwJXsa7QXuoJPIHOKLdFIgVXjiNFTbxsuKy0ysUdGfSXOw7 /tFvfB7wtzfxG/gNoC1d45dBkHZRyOJQhBedhIx7mDYGPu1IUsRBuHmiXGZf/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694452647; a=rsa-sha256; cv=none; b=WZGidqF5zlWpHWj77bh9pXoG/qo2+tgjObQKCW1Q20Qv4afZIr/SdvPoEEY64sCQ7r3Ti+ YjT8Y4uZXCC+CNocT02ND3QyXTt77764Qs0ZsX2TbUR/KtWR8YUj5Xng8wk4gh1fIxh21C iVn8+eDQuVdozr6d4iVux9xXIuqbH0PajtWJohfD4GZSIeU2VXo0QtNR71MpJHe89pfD1p P6XAQXMF7njjvNRP69CUCsQcZrMt9RL9OHWTpc1gFPzZhFJ/WVzN7iYPwOzjOJ7LHD46JV Wj4NEjjtWZkYraZA72F4cS1PJ/BV5vPbvYwpvENd+juhah7Wfr765lZ//XEzmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttKVCjrwZbYZPTTlrzLiLky4eTT9wq1FjkKkkvtCntg=; b=Cu9ki5CVxFxfwubP/RCwcdjSrDbHa5FniCINkOoNHuh0ghN2ZjFHSgbFTxFw9UWYjJoL0Z u6+bY3GqDzCw4rb2YKnZS5i8BhQIDYuU0bN3dOl8my51JT20anhL5/tkq5AYzvCUjISI8M 1+Mx1C/P9j9N/9e3oN89Zn+hp4pXjmmPuEgVRRmr6cyMA7VG7gRnTcZ5ov25LmkcFDW8v1 VV8PzK/bhOlC2/c8MYDMAP7Zen3equLV5QOgrXC2WeRKHD39LLPpYdjh93JjEbviKc4kCE J22hB9qzIIm/7e7CHU18Nam/RAg9hXRMcd/jsl/vbLI0O1IOfSUYy4oQNW5uhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rktgq3dtNzxd3; Mon, 11 Sep 2023 17:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BHHRkD023962; Mon, 11 Sep 2023 17:17:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHHRF2023953; Mon, 11 Sep 2023 17:17:27 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:17:27 GMT Message-Id: <202309111717.38BHHRF2023953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: ab5435791cc7 - stable/13 - OpenSSL: Regen manual pages for OpenSSL 1.1.1w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ab5435791cc727316bb504b15fa019fcd134a007 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=ab5435791cc727316bb504b15fa019fcd134a007 commit ab5435791cc727316bb504b15fa019fcd134a007 Author: Jung-uk Kim AuthorDate: 2023-09-11 17:16:21 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:16:21 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1w --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 4 ++-- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_printf.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_push.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add_word.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_rand.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_swap.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_zero.3 | 4 ++-- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_compress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_final.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_sign.3 | 8 ++++---- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 4 ++-- secure/lib/libcrypto/man/man3/DES_random_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 4 ++-- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aes.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aria.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_des.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md5.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 4 ++-- secure/lib/libcrypto/man/man3/HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/MD5.3 | 4 ++-- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 4 ++-- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_egd.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_validate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_clear.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_pending.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_want.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_write.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_create_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_digest.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_X509.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 4 ++-- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 4 ++-- secure/lib/libcrypto/man/man5/x509v3_config.5 | 4 ++-- secure/lib/libcrypto/man/man7/Ed25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 4 ++-- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 4 ++-- secure/lib/libcrypto/man/man7/SM2.7 | 4 ++-- secure/lib/libcrypto/man/man7/X25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/bio.7 | 4 ++-- secure/lib/libcrypto/man/man7/ct.7 | 4 ++-- secure/lib/libcrypto/man/man7/des_modes.7 | 4 ++-- secure/lib/libcrypto/man/man7/evp.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store.7 | 4 ++-- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 4 ++-- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 4 ++-- secure/lib/libcrypto/man/man7/scrypt.7 | 4 ++-- secure/lib/libcrypto/man/man7/ssl.7 | 4 ++-- secure/lib/libcrypto/man/man7/x509.7 | 4 ++-- secure/usr.bin/openssl/man/CA.pl.1 | 4 ++-- secure/usr.bin/openssl/man/asn1parse.1 | 4 ++-- secure/usr.bin/openssl/man/ca.1 | 4 ++-- secure/usr.bin/openssl/man/ciphers.1 | 4 ++-- secure/usr.bin/openssl/man/cms.1 | 4 ++-- secure/usr.bin/openssl/man/crl.1 | 4 ++-- secure/usr.bin/openssl/man/crl2pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/dgst.1 | 4 ++-- secure/usr.bin/openssl/man/dhparam.1 | 4 ++-- secure/usr.bin/openssl/man/dsa.1 | 4 ++-- secure/usr.bin/openssl/man/dsaparam.1 | 4 ++-- secure/usr.bin/openssl/man/ec.1 | 4 ++-- secure/usr.bin/openssl/man/ecparam.1 | 4 ++-- secure/usr.bin/openssl/man/enc.1 | 4 ++-- secure/usr.bin/openssl/man/engine.1 | 4 ++-- secure/usr.bin/openssl/man/errstr.1 | 4 ++-- secure/usr.bin/openssl/man/gendsa.1 | 4 ++-- secure/usr.bin/openssl/man/genpkey.1 | 4 ++-- secure/usr.bin/openssl/man/genrsa.1 | 4 ++-- secure/usr.bin/openssl/man/list.1 | 4 ++-- secure/usr.bin/openssl/man/nseq.1 | 4 ++-- secure/usr.bin/openssl/man/ocsp.1 | 4 ++-- secure/usr.bin/openssl/man/openssl.1 | 4 ++-- secure/usr.bin/openssl/man/passwd.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs12.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs8.1 | 4 ++-- secure/usr.bin/openssl/man/pkey.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyparam.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyutl.1 | 4 ++-- secure/usr.bin/openssl/man/prime.1 | 4 ++-- secure/usr.bin/openssl/man/rand.1 | 4 ++-- secure/usr.bin/openssl/man/req.1 | 4 ++-- secure/usr.bin/openssl/man/rsa.1 | 4 ++-- secure/usr.bin/openssl/man/rsautl.1 | 4 ++-- secure/usr.bin/openssl/man/s_client.1 | 4 ++-- secure/usr.bin/openssl/man/s_server.1 | 4 ++-- secure/usr.bin/openssl/man/s_time.1 | 4 ++-- secure/usr.bin/openssl/man/sess_id.1 | 4 ++-- secure/usr.bin/openssl/man/smime.1 | 4 ++-- secure/usr.bin/openssl/man/speed.1 | 4 ++-- secure/usr.bin/openssl/man/spkac.1 | 4 ++-- secure/usr.bin/openssl/man/srp.1 | 4 ++-- secure/usr.bin/openssl/man/storeutl.1 | 4 ++-- secure/usr.bin/openssl/man/ts.1 | 4 ++-- secure/usr.bin/openssl/man/tsget.1 | 4 ++-- secure/usr.bin/openssl/man/verify.1 | 4 ++-- secure/usr.bin/openssl/man/version.1 | 4 ++-- secure/usr.bin/openssl/man/x509.1 | 4 ++-- 535 files changed, 1072 insertions(+), 1072 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index c34e0a4561c3..9d3be14562e3 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -2,8 +2,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1v -OPENSSL_DATE= 2023-08-01 +OPENSSL_VER= 1.1.1w +OPENSSL_DATE= 2023-09-11 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 385b65a1f57a..2d8787d31487 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ADMISSIONS 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 3e7cfc2223f7..4421d0012528 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index 056eb016fe06..6b83902a0521 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index 9ad6dae7622d..a16f6153140c 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 631ac1c07009..eabb00f8ff57 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index 157b2389eb33..e4f0ef5d03b1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 38d8efcd109b..94d342e11a24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index fa6d233333c6..9cb79d051446 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 32f0f90b4422..71038b0131c3 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index 6354f8053f24..c086ed1abefe 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9d091a577ae0..43a657966d8d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 707354c38646..995482e568ac 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index 94286577dceb..6a1dc5ed8577 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 6979284edb61..0e07eeefb911 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index 1680ec8ddedd..978d6fd7e505 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDR 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index d9ef260a9541..798a7e99ab35 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index ec4eda157305..d65c4609cc77 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CONNECT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index 6a04ce5db063..4dca8d2e5d66 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CTRL 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 8e85ff854025..f7ed3c0af9b7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index caecb053ed94..fb767e246edc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 775a375f5bf9..b05cfd7ecf8e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index 7778f5a4cf49..526297c272bf 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_MD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 799e399146e9..c557319fc30e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 *** 9742 LINES SKIPPED *** From nobody Mon Sep 11 17:21:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RktmP41Gjz4sSFL; Mon, 11 Sep 2023 17:21:25 +0000 (UTC) (envelope-from rpokala@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 4RktmP3s9Mz4R9S; Mon, 11 Sep 2023 17:21:25 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tXPD1TIDtjVituhKSQv8kr1UIWmUC4FUN8vDbGj9gc8=; b=cmQA7gOrrW8iX19sTaQ42YldanlxORvVBRLUmp2g1a40aQKPLXsq7uTqa4hHMCeLTatvMJ oXw6lUjx4yOAElePiCUy9H5ZBPqTybEaF9a2gpaAlV3hg6woTTE2JLHTQYQJjlzIl2Kj89 ZRipi07F/pTAFy5o7Pl3mcBrbZnYzAooHJO3dn/V1IzxqBFfMo/BmUyIKHFSKVW79f18Yb WE2d7Lzf/3nt8afXWW2Z+lWqyWxFH6A+AU+MovGYPdBXGYms6LhqmENDxCKsRn+vqvCDW7 rtYWCeIfjp3osjm+SmhapxbaneXNayY7SEmd8QWPpxIxEqol0rQmqA3PuL3O+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694452885; a=rsa-sha256; cv=none; b=YZx0Seio0e2AkmXNmI7SMsGknvD7b2tPsPFT/1H9V/z4kswN3bHnbj8CzcLQZyZCi8z8fx KAD/Y5tNbzan10FAx6gACdwgoXM1k6a/YP+z/Uc3L4IOaZPYfUkVj2BO/jePS582/5pUGa q6+GbMcfaafyneGiJC1V0Qxtz3nbjmnkq5asRc5tBRWyba1H5y6LERgsYEkHBUGJdMWEpz y0WuopI3V4TwQlIv5nbQalWWFMzAwhhPQ0/TF9DZXjqeHeQjudjlRmA7wSfy/+40FWp7Xu ObuSRgEILG9ONvwM/xbnXPdZsGCKwjVZuhMxZ9bx60itCrI37hM0DQlaJVszyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tXPD1TIDtjVituhKSQv8kr1UIWmUC4FUN8vDbGj9gc8=; b=Ms5ua284aHpQ3WeO195coVpEUiJv9FJ8wBLgmJDbyTked6sgQJfxzFKyBlouH32pcmLf7V pKNHv2xXkQdyVGiL7Cc0GyoQAxsRO13IEZ7b8eQZ6q5FdtcO3cewuIIfNzfTXXV+Ng3Yrf zp7P11P3sLylzNHOrbo5U8S4Y+KOmkWZiGsE7RAgzzRhMp74UnLcPA+XYqvqsEqP86mDIL A2VpEoIg8IGpd9gjKMQJQNMGD5lMQQaJKOf8RqvAw/W6BIyf42OdaAOFG8JrvhEO0sU6/3 bsV6OYsYUyl/R3iLGq4T6NlmSFdliHX74wTsjfZ876nq3yWTjJmrrYodeQuFEA== Received: from [192.168.1.12] (c-98-248-120-44.hsd1.ca.comcast.net [98.248.120.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RktmN5BMGz16m9; Mon, 11 Sep 2023 17:21:24 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.76.23082700 Date: Mon, 11 Sep 2023 10:21:18 -0700 Subject: Re: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" From: Ravi Pokala To: Doug Moore , , , Message-ID: <25DD750F-38F2-4151-9E34-350844CE705C@panasas.com> Thread-Topic: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" References: <202309110835.38B8Zl9t059626@gitrepo.freebsd.org> In-Reply-To: <202309110835.38B8Zl9t059626@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable Hi Doug, > Revert "radix_trie: have vm_radix use pctrie code" That's "what", not "why". Why are you reverting the change? Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Doug Moore > Date: Monday, September 11, 2023 at 01:35 To: >, >, > Subject: git: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use p= ctrie code" The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=3D6cec93da46c4a91a042b0be4888440= 52c0f8985a commit 6cec93da46c4a91a042b0be488844052c0f8985a Author: Doug Moore > AuthorDate: 2023-09-11 08:34:46 +0000 Commit: Doug Moore > CommitDate: 2023-09-11 08:35:36 +0000 Revert "radix_trie: have vm_radix use pctrie code" This reverts commit a494d30465f21e8cb014a5c788a43001397325d7. --- sys/vm/_vm_radix.h | 9 +- sys/vm/vm_radix.c | 696 +++++++++++++++++++++++++++++++++++++++++++++++++++= +- sys/vm/vm_radix.h | 113 ++------- 3 files changed, 709 insertions(+), 109 deletions(-) diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h index 2d9b05c7b52a..01eb25a9dccf 100644 --- a/sys/vm/_vm_radix.h +++ b/sys/vm/_vm_radix.h @@ -31,13 +31,16 @@ #ifndef __VM_RADIX_H_ #define __VM_RADIX_H_ -#include +/* + * Radix tree node. + */ +struct vm_radix_node; /* - * Radix tree + * Radix tree root. */ struct vm_radix { - struct pctrie rt_trie; + struct vm_radix_node *rt_root; }; #endif /* !__VM_RADIX_H_ */ diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index b8c693eca66f..768a56ed76f7 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -54,26 +54,302 @@ #include "opt_ddb.h" #include -#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include #include +#ifdef DDB +#include +#endif + +/* + * These widths should allow the pointers to a node's children to fit with= in + * a single cache line. The extra levels from a narrow width should not be + * a problem thanks to path compression. + */ +#ifdef __LP64__ +#define VM_RADIX_WIDTH 4 +#else +#define VM_RADIX_WIDTH 3 +#endif + +#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) +#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) +#define VM_RADIX_LIMIT \ + (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) + +#if VM_RADIX_WIDTH =3D=3D 3 +typedef uint8_t rn_popmap_t; +#elif VM_RADIX_WIDTH =3D=3D 4 +typedef uint16_t rn_popmap_t; +#elif VM_RADIX_WIDTH =3D=3D 5 +typedef uint32_t rn_popmap_t; +#else +#error Unsupported width +#endif +_Static_assert(sizeof(rn_popmap_t) <=3D sizeof(int), + "rn_popmap_t too wide"); + +/* Set of all flag bits stored in node pointers. */ +#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) +#define VM_RADIX_PAD VM_RADIX_FLAGS + +enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; + +struct vm_radix_node; +typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; + +struct vm_radix_node { + vm_pindex_t rn_owner; /* Owner of record. */ + rn_popmap_t rn_popmap; /* Valid children. */ + uint8_t rn_clev; /* Level * WIDTH. */ + smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ +}; + static uma_zone_t vm_radix_node_zone; -smr_t vm_radix_smr; +static smr_t vm_radix_smr; + +static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, + enum vm_radix_access access); -void * -vm_radix_node_alloc(struct pctrie *ptree) +/* + * Map index to an array position for the children of rnode, + */ +static __inline int +vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) { - return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); + return ((index >> rnode->rn_clev) & VM_RADIX_MASK); } -void -vm_radix_node_free(struct pctrie *ptree, void *node) +/* + * Returns true if index does not belong to the specified rnode. Otherwise= , + * sets slot value, and returns false. + */ +static __inline bool +vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *slot= ) +{ + index =3D (index - rnode->rn_owner) >> rnode->rn_clev; + if (index >=3D VM_RADIX_COUNT) + return (true); + *slot =3D index; + return (false); +} + +/* + * Allocate a radix node. + */ +static struct vm_radix_node * +vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) +{ + struct vm_radix_node *rnode; + + rnode =3D uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); + if (rnode =3D=3D NULL) + return (NULL); + + /* + * We want to clear the last child pointer after the final section + * has exited so lookup can not return false negatives. It is done + * here because it will be cache-cold in the dtor callback. + */ + if (rnode->rn_popmap !=3D 0) { + vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], + VM_RADIX_NULL, UNSERIALIZED); + rnode->rn_popmap =3D 0; + } + + /* + * From the highest-order bit where the indexes differ, + * compute the highest level in the trie where they differ. Then, + * compute the least index of this subtrie. + */ + KASSERT(index !=3D newind, ("%s: passing the same key value %jx", + __func__, (uintmax_t)index)); + _Static_assert(sizeof(long long) >=3D sizeof(vm_pindex_t), + "vm_pindex_t too wide"); + _Static_assert(sizeof(vm_pindex_t) * NBBY <=3D + (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); + rnode->rn_clev =3D rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); + rnode->rn_owner =3D VM_RADIX_COUNT; + rnode->rn_owner =3D index & -(rnode->rn_owner << rnode->rn_clev); + return (rnode); +} + +/* + * Free radix node. + */ +static __inline void +vm_radix_node_put(struct vm_radix_node *rnode) +{ +#ifdef INVARIANTS + int slot; + + KASSERT(powerof2(rnode->rn_popmap), + ("vm_radix_node_put: rnode %p has too many children %04x", rnode, + rnode->rn_popmap)); + for (slot =3D 0; slot < VM_RADIX_COUNT; slot++) { + if ((rnode->rn_popmap & (1 << slot)) !=3D 0) + continue; + KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) =3D=3D + VM_RADIX_NULL, + ("vm_radix_node_put: rnode %p has a child", rnode)); + } +#endif + uma_zfree_smr(vm_radix_node_zone, rnode); +} + +/* + * Fetch a node pointer from a slot in another node. + */ +static __inline struct vm_radix_node * +vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) +{ + + switch (access) { + case UNSERIALIZED: + return (smr_unserialized_load(p, true)); + case LOCKED: + return (smr_serialized_load(p, true)); + case SMR: + return (smr_entered_load(p, vm_radix_smr)); + } + __assert_unreachable(); +} + +static __inline void +vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, + enum vm_radix_access access) +{ + + switch (access) { + case UNSERIALIZED: + smr_unserialized_store(p, v, true); + break; + case LOCKED: + smr_serialized_store(p, v, true); + break; + case SMR: + panic("vm_radix_node_store: Not supported in smr section."); + } +} + +/* + * Get the root node for a radix tree. + */ +static __inline struct vm_radix_node * +vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) +{ + + return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); +} + +/* + * Set the root node for a radix tree. + */ +static __inline void +vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, + enum vm_radix_access access) +{ + + vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); +} + +/* + * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. + */ +static __inline bool +vm_radix_isleaf(struct vm_radix_node *rnode) +{ + + return (((uintptr_t)rnode & VM_RADIX_ISLEAF) !=3D 0); +} + +/* + * Returns page cast to radix node with leaf bit set. + */ +static __inline struct vm_radix_node * +vm_radix_toleaf(vm_page_t page) +{ + return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); +} + +/* + * Returns the associated page extracted from rnode. + */ +static __inline vm_page_t +vm_radix_topage(struct vm_radix_node *rnode) +{ + + return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); +} + +/* + * Make 'child' a child of 'rnode'. + */ +static __inline void +vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, + struct vm_radix_node *child, enum vm_radix_access access) +{ + int slot; + + slot =3D vm_radix_slot(rnode, index); + vm_radix_node_store(&rnode->rn_child[slot], child, access); + rnode->rn_popmap ^=3D 1 << slot; + KASSERT((rnode->rn_popmap & (1 << slot)) !=3D 0, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); +} + +/* + * Internal helper for vm_radix_reclaim_allnodes(). + * This function is recursive. + */ +static void +vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) +{ + struct vm_radix_node *child; + int slot; + + while (rnode->rn_popmap !=3D 0) { + slot =3D ffs(rnode->rn_popmap) - 1; + child =3D vm_radix_node_load(&rnode->rn_child[slot], + UNSERIALIZED); + KASSERT(child !=3D VM_RADIX_NULL, + ("%s: bad popmap slot %d in rnode %p", + __func__, slot, rnode)); + if (!vm_radix_isleaf(child)) + vm_radix_reclaim_allnodes_int(child); + rnode->rn_popmap ^=3D 1 << slot; + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, + UNSERIALIZED); + } + vm_radix_node_put(rnode); +} + +/* + * radix node zone initializer. + */ +static int +vm_radix_zone_init(void *mem, int size, int flags) { - uma_zfree_smr(vm_radix_node_zone, node); + struct vm_radix_node *rnode; + + rnode =3D mem; + rnode->rn_popmap =3D 0; + for (int i =3D 0; i < nitems(rnode->rn_child); i++) + vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, + UNSERIALIZED); + return (0); } #ifndef UMA_MD_SMALL_ALLOC @@ -107,14 +383,412 @@ void vm_radix_zinit(void) { - vm_radix_node_zone =3D uma_zcreate("RADIX NODE", pctrie_node_size(), - NULL, NULL, pctrie_zone_init, NULL, - PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); + vm_radix_node_zone =3D uma_zcreate("RADIX NODE", + sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, + VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); vm_radix_smr =3D uma_zone_get_smr(vm_radix_node_zone); } +/* + * Inserts the key-value pair into the trie. + * Panics if the key already exists. + */ +int +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) +{ + vm_pindex_t index, newind; + struct vm_radix_node *leaf, *parent, *rnode; + smrnode_t *parentp; + int slot; + + index =3D page->pindex; + leaf =3D vm_radix_toleaf(page); + + /* + * The owner of record for root is not really important because it + * will never be used. + */ + rnode =3D vm_radix_root_load(rtree, LOCKED); + parent =3D NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if (rnode =3D=3D VM_RADIX_NULL) { + if (parent =3D=3D NULL) + rtree->rt_root =3D leaf; + else + vm_radix_addnode(parent, index, leaf, + LOCKED); + return (0); + } + newind =3D vm_radix_topage(rnode)->pindex; + if (newind =3D=3D index) + panic("%s: key %jx is already present", + __func__, (uintmax_t)index); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + newind =3D rnode->rn_owner; + break; + } + parent =3D rnode; + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + + /* + * A new node is needed because the right insertion level is reached. + * Setup the new intermediate node and add the 2 children: the + * new object and the older edge or object. + */ + parentp =3D (parent !=3D NULL) ? &parent->rn_child[slot]: + (smrnode_t *)&rtree->rt_root; + parent =3D vm_radix_node_get(index, newind); + if (parent =3D=3D NULL) + return (ENOMEM); + /* These writes are not yet visible due to ordering. */ + vm_radix_addnode(parent, index, leaf, UNSERIALIZED); + vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); + /* Serializing write to make the above visible. */ + vm_radix_node_store(parentp, parent, LOCKED); + return (0); +} + +/* + * Returns the value stored at the index. If the index is not present, + * NULL is returned. + */ +static __always_inline vm_page_t +_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, + enum vm_radix_access access) +{ + struct vm_radix_node *rnode; + vm_page_t m; + int slot; + + rnode =3D vm_radix_root_load(rtree, access); + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && + m->pindex =3D=3D index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) + break; + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], access); + } + return (NULL); +} + +/* + * Returns the value stored at the index assuming there is an external loc= k. + * + * If the index is not present, NULL is returned. + */ +vm_page_t +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) +{ + + return _vm_radix_lookup(rtree, index, LOCKED); +} + +/* + * Returns the value stored at the index without requiring an external loc= k. + * + * If the index is not present, NULL is returned. + */ +vm_page_t +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) +{ + vm_page_t m; + + smr_enter(vm_radix_smr); + m =3D _vm_radix_lookup(rtree, index, SMR); + smr_exit(vm_radix_smr); + + return (m); +} + +/* + * Returns the page with the least pindex that is greater than or equal to= the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +vm_page_t +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *rnode, *succ; + vm_page_t m; + int slot; + + /* + * Descend the trie as if performing an ordinary lookup for the page + * with the specified pindex. However, unlike an ordinary lookup, as we + * descend the trie, we use "succ" to remember the last branching-off + * point, that is, the interior node under which the page with the least + * pindex that is both outside our current path down the trie and more + * than the specified pindex resides. (The node's popmap makes it fast + * and easy to recognize a branching-off point.) If our ordinary lookup + * fails to yield a page with a pindex that is greater than or equal to + * the specified pindex, then we will exit this loop and perform a + * lookup starting from "succ". If "succ" is not NULL, then that lookup + * is guaranteed to succeed. + */ + rnode =3D vm_radix_root_load(rtree, LOCKED); + succ =3D NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && + m->pindex >=3D index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + /* + * If all pages in this subtree have pindex > index, + * then the page in this subtree with the least pindex + * is the answer. + */ + if (rnode->rn_owner > index) + succ =3D rnode; + break; + } + + /* + * Just in case the next search step leads to a subtree of all + * pages with pindex < index, check popmap to see if a next + * bigger step, to a subtree of all pages with pindex > index, + * is available. If so, remember to restart the search here. + */ + if ((rnode->rn_popmap >> slot) > 1) + succ =3D rnode; + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + + /* + * Restart the search from the last place visited in the subtree that + * included some pages with pindex > index, if there was such a place. + */ + if (succ =3D=3D NULL) + return (NULL); + if (succ !=3D rnode) { + /* + * Take a step to the next bigger sibling of the node chosen + * last time. In that subtree, all pages have pindex > index. + */ + slot =3D vm_radix_slot(succ, index) + 1; + KASSERT((succ->rn_popmap >> slot) !=3D 0, + ("%s: no popmap siblings past slot %d in node %p", + __func__, slot, succ)); + slot +=3D ffs(succ->rn_popmap >> slot) - 1; + succ =3D vm_radix_node_load(&succ->rn_child[slot], LOCKED); + } + + /* + * Find the page in the subtree rooted at "succ" with the least pindex. + */ + while (!vm_radix_isleaf(succ)) { + KASSERT(succ->rn_popmap !=3D 0, + ("%s: no popmap children in node %p", __func__, succ)); + slot =3D ffs(succ->rn_popmap) - 1; + succ =3D vm_radix_node_load(&succ->rn_child[slot], LOCKED); + } + return (vm_radix_topage(succ)); +} + +/* + * Returns the page with the greatest pindex that is less than or equal to= the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +vm_page_t +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *pred, *rnode; + vm_page_t m; + int slot; + + /* + * Mirror the implementation of vm_radix_lookup_ge, described above. + */ + rnode =3D vm_radix_root_load(rtree, LOCKED); + pred =3D NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && + m->pindex <=3D index) + return (m); + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) { + if (rnode->rn_owner < index) + pred =3D rnode; + break; + } + if ((rnode->rn_popmap & ((1 << slot) - 1)) !=3D 0) + pred =3D rnode; + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + if (pred =3D=3D NULL) + return (NULL); + if (pred !=3D rnode) { + slot =3D vm_radix_slot(pred, index); + KASSERT((pred->rn_popmap & ((1 << slot) - 1)) !=3D 0, + ("%s: no popmap siblings before slot %d in node %p", + __func__, slot, pred)); + slot =3D fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; + pred =3D vm_radix_node_load(&pred->rn_child[slot], LOCKED); + } + while (!vm_radix_isleaf(pred)) { + KASSERT(pred->rn_popmap !=3D 0, + ("%s: no popmap children in node %p", __func__, pred)); + slot =3D fls(pred->rn_popmap) - 1; + pred =3D vm_radix_node_load(&pred->rn_child[slot], LOCKED); + } + return (vm_radix_topage(pred)); +} + +/* + * Remove the specified index from the trie, and return the value stored a= t + * that index. If the index is not present, return NULL. + */ +vm_page_t +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) +{ + struct vm_radix_node *child, *parent, *rnode; + vm_page_t m; + int slot; + + rnode =3D NULL; + child =3D vm_radix_root_load(rtree, LOCKED); + for (;;) { + if (vm_radix_isleaf(child)) + break; + parent =3D rnode; + rnode =3D child; + slot =3D vm_radix_slot(rnode, index); + child =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + if ((m =3D vm_radix_topage(child)) =3D=3D NULL || m->pindex !=3D index) + return (NULL); + if (rnode =3D=3D NULL) { + vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); + return (m); + } + KASSERT((rnode->rn_popmap & (1 << slot)) !=3D 0, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); + rnode->rn_popmap ^=3D 1 << slot; + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); + if (!powerof2(rnode->rn_popmap)) + return (m); + KASSERT(rnode->rn_popmap !=3D 0, ("%s: bad popmap all zeroes", __func__)); + slot =3D ffs(rnode->rn_popmap) - 1; + child =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + KASSERT(child !=3D VM_RADIX_NULL, + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); + if (parent =3D=3D NULL) + vm_radix_root_store(rtree, child, LOCKED); + else { + slot =3D vm_radix_slot(parent, index); + KASSERT(rnode =3D=3D + vm_radix_node_load(&parent->rn_child[slot], LOCKED), + ("%s: invalid child value", __func__)); + vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); + } + /* + * The child is still valid and we can not zero the + * pointer until all smr references are gone. + */ + vm_radix_node_put(rnode); + return (m); +} + +/* + * Remove and free all the nodes from the radix tree. + * This function is recursive but there is a tight control on it as the + * maximum depth of the tree is fixed. + */ +void +vm_radix_reclaim_allnodes(struct vm_radix *rtree) +{ + struct vm_radix_node *root; + + root =3D vm_radix_root_load(rtree, LOCKED); + if (root =3D=3D VM_RADIX_NULL) + return; + vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); + if (!vm_radix_isleaf(root)) + vm_radix_reclaim_allnodes_int(root); +} + +/* + * Replace an existing page in the trie with another one. + * Panics if there is not an old page in the trie at the new page's index. + */ +vm_page_t +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +{ + struct vm_radix_node *leaf, *parent, *rnode; + vm_page_t m; + vm_pindex_t index; + int slot; + + leaf =3D vm_radix_toleaf(newpage); + index =3D newpage->pindex; + rnode =3D vm_radix_root_load(rtree, LOCKED); + parent =3D NULL; + for (;;) { + if (vm_radix_isleaf(rnode)) { + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && + m->pindex =3D=3D index) { + if (parent =3D=3D NULL) + rtree->rt_root =3D leaf; + else + vm_radix_node_store( + &parent->rn_child[slot], leaf, + LOCKED); + return (m); + } + break; + } + if (vm_radix_keybarr(rnode, index, &slot)) + break; + parent =3D rnode; + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); + } + panic("%s: original replacing page not found", __func__); +} + void vm_radix_wait(void) { uma_zwait(vm_radix_node_zone); } + +#ifdef DDB +/* + * Show details about the given radix node. + */ +DB_SHOW_COMMAND(radixnode, db_show_radixnode) +{ + struct vm_radix_node *rnode, *tmp; + int slot; + rn_popmap_t popmap; + + if (!have_addr) + return; + rnode =3D (struct vm_radix_node *)addr; + db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", + (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, + rnode->rn_clev / VM_RADIX_WIDTH); + for (popmap =3D rnode->rn_popmap; popmap !=3D 0; popmap ^=3D 1 << slot) { + slot =3D ffs(popmap) - 1; + tmp =3D vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); + db_printf("slot: %d, val: %p, page: %p, clev: %d\n", + slot, (void *)tmp, + vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, + rnode->rn_clev / VM_RADIX_WIDTH); + } +} +#endif /* DDB */ diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index a332618fc0e6..231edda65102 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -34,113 +34,36 @@ #include #ifdef _KERNEL -#include -#include +int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); +vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t ind= ex); +void vm_radix_reclaim_allnodes(struct vm_radix *rtree); +vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); +vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); void vm_radix_zinit(void); -void *vm_radix_node_alloc(struct pctrie *ptree); -void vm_radix_node_free(struct pctrie *ptree, void *node); -extern smr_t vm_radix_smr; - -static __inline void -vm_radix_init(struct vm_radix *rtree) -{ - pctrie_init(&rtree->rt_trie); -} - -static __inline bool -vm_radix_is_empty(struct vm_radix *rtree) -{ - return (pctrie_is_empty(&rtree->rt_trie)); -} - -PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix= _node_free, - vm_radix_smr); /* - * Inserts the key-value pair into the trie. - * Panics if the key already exists. + * Each search path in the trie terminates at a leaf, which is a pointer t= o a + * page marked with a set 1-bit. A leaf may be associated with a null poin= ter + * to indicate no page there. */ -static __inline int -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) -{ - return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); -} - -/* - * Returns the value stored at the index assuming there is an external loc= k. - * - * If the index is not present, NULL is returned. - */ -static __inline vm_page_t -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); -} - -/* - * Returns the value stored at the index without requiring an external loc= k. - * - * If the index is not present, NULL is returned. - */ -static __inline vm_page_t -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); -} +#define VM_RADIX_ISLEAF 0x1 +#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF -/* - * Returns the page with the least pindex that is greater than or equal to= the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -static __inline vm_page_t -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); -} - -/* - * Returns the page with the greatest pindex that is less than or equal to= the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -static __inline vm_page_t -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); -} - -/* - * Remove the specified index from the trie, and return the value stored a= t - * that index. If the index is not present, return NULL. - */ -static __inline vm_page_t -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) -{ - return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); -} - -/* - * Remove and free all the nodes from the radix tree. - */ static __inline void -vm_radix_reclaim_allnodes(struct vm_radix *rtree) +vm_radix_init(struct vm_radix *rtree) { - VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); + rtree->rt_root =3D VM_RADIX_NULL; } -/* - * Replace an existing page in the trie with another one. - * Panics if there is not an old page in the trie at the new page's index. - */ -static __inline vm_page_t -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +static __inline bool +vm_radix_is_empty(struct vm_radix *rtree) { - return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); + return (rtree->rt_root =3D=3D VM_RADIX_NULL); } #endif /* _KERNEL */ From nobody Mon Sep 11 17:26:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rktt90jjkz4sVMr; Mon, 11 Sep 2023 17:26:25 +0000 (UTC) (envelope-from unkadoug@gmail.com) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (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 4Rktt90HNlz4SGb; Mon, 11 Sep 2023 17:26:25 +0000 (UTC) (envelope-from unkadoug@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d8032efa2bfso4268412276.1; Mon, 11 Sep 2023 10:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694453184; x=1695057984; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=ysXrtsKaDkN5m1Q7ceFoVohWfGH1FksCNtZEUwJlYTw=; b=DccO9Ym9gSLpgLQvfONxIYLbCqd3lc46/5i4ZZjfitvjrmlz8B1oK9RylUF7WrSI3p oZearOMgVU/XSyDGMKBTpiXaaNuCGNHTtcgrG8OYoiaC4ewwSWwCOKW3lKh5umvO1A/Q HqnbKlSQ8VDp9znlagxBg3j5ZLI7bwQWVkLZf7k5ZIyMxSu8TukDVp+lD5k3ScaYPz6i Ro4iooIuTx/bBmHrNsV4knsXshfU4TDx7wT0MoiODbV8BT7/15OdsqbooXMIOXGUuUbe T6ekGAnSMcFMSevOjcKj8kTxZCQ6uUDrF3wuHZfCWf7EA+omABCcA2mgA1CHHJz0V8S5 bYSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694453184; x=1695057984; h=content-transfer-encoding:in-reply-to:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ysXrtsKaDkN5m1Q7ceFoVohWfGH1FksCNtZEUwJlYTw=; b=f8gxjJFUPEJKT9NUjR0cZ7/ePJE228LsiAd5wbhndnVCZH4CwMaTuSH8qCLcprRAt3 XdGIch5Kw01eXhPuAKlPntVwvMaZk62QqW+4Ha98mol/pe5PZacBLXMFZxMNcPUjupT3 DjMjbTvF7tf6GLmTa3nAKGpjg6WdgO0DW8n26WOE1eLhX+SCGqPwfDDQ1rstGr7Cpd0e uWmHt6m2TNo4C252xqUMDzvUFLsIH7XeWe+MiweNAQC6VdpdUPg7kC1PKN+ALBf+whwj KP+ByPmnTD6fCoupWxsfrkCmOj4xw/citXpKMS2/ZwbuFWCo+6MFrhEDEWrpn48o5/GA G18w== X-Gm-Message-State: AOJu0YzVg/Gk7ca8ZvKDrWsTdZhQXHvISg9MgYHXox2W+AATkEg86tj9 Ox9aGEgvy39g9JD0WLMnmEtzi3Cu1drfnA== X-Google-Smtp-Source: AGHT+IEjtYDmAAeCqKDIOVWfy+Pkqm3D7Dh2jTmMUc1+owjoEd0h5zqHP1ezUqOMwiV/doaY5OsOcQ== X-Received: by 2002:a25:ad87:0:b0:d60:eb09:8885 with SMTP id z7-20020a25ad87000000b00d60eb098885mr319189ybi.27.1694453183632; Mon, 11 Sep 2023 10:26:23 -0700 (PDT) Received: from [108.254.203.202] (108-254-203-202.lightspeed.hstntx.sbcglobal.net. [108.254.203.202]) by smtp.gmail.com with ESMTPSA id a131-20020a254d89000000b00d801440ed1dsm1794545ybb.23.2023.09.11.10.26.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 Sep 2023 10:26:23 -0700 (PDT) From: Doug Moore X-Google-Original-From: Doug Moore Message-ID: <835d7376-4289-9ec5-415f-e94ea2c9b6d2@freebsd.org> Date: Mon, 11 Sep 2023 12:26:21 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" Content-Language: en-US To: Ravi Pokala , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202309110835.38B8Zl9t059626@gitrepo.freebsd.org> <25DD750F-38F2-4151-9E34-350844CE705C@panasas.com> In-Reply-To: <25DD750F-38F2-4151-9E34-350844CE705C@panasas.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Rktt90HNlz4SGb Because jenkins reported failures on most of the non-amd64 architectures, and leaving 'main' broken while I figured out the problem was not a sensible choice. Doug On 9/11/23 12:21, Ravi Pokala wrote: > Hi Doug, > >> Revert "radix_trie: have vm_radix use pctrie code" > That's "what", not "why". Why are you reverting the change? > > Thanks, > > Ravi (rpokala@) > > -----Original Message----- > From: > on behalf of Doug Moore > > Date: Monday, September 11, 2023 at 01:35 > To: >, >, > > Subject: git: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" > > > The branch main has been updated by dougm: > > > URL: https://cgit.FreeBSD.org/src/commit/?id=6cec93da46c4a91a042b0be488844052c0f8985a > > > commit 6cec93da46c4a91a042b0be488844052c0f8985a > Author: Doug Moore > > AuthorDate: 2023-09-11 08:34:46 +0000 > Commit: Doug Moore > > CommitDate: 2023-09-11 08:35:36 +0000 > > > Revert "radix_trie: have vm_radix use pctrie code" > > > This reverts commit a494d30465f21e8cb014a5c788a43001397325d7. > --- > sys/vm/_vm_radix.h | 9 +- > sys/vm/vm_radix.c | 696 ++++++++++++++++++++++++++++++++++++++++++++++++++++- > sys/vm/vm_radix.h | 113 ++------- > 3 files changed, 709 insertions(+), 109 deletions(-) > > > diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h > index 2d9b05c7b52a..01eb25a9dccf 100644 > --- a/sys/vm/_vm_radix.h > +++ b/sys/vm/_vm_radix.h > @@ -31,13 +31,16 @@ > #ifndef __VM_RADIX_H_ > #define __VM_RADIX_H_ > > > -#include > +/* > + * Radix tree node. > + */ > +struct vm_radix_node; > > > /* > - * Radix tree > + * Radix tree root. > */ > struct vm_radix { > - struct pctrie rt_trie; > + struct vm_radix_node *rt_root; > }; > > > #endif /* !__VM_RADIX_H_ */ > diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c > index b8c693eca66f..768a56ed76f7 100644 > --- a/sys/vm/vm_radix.c > +++ b/sys/vm/vm_radix.c > @@ -54,26 +54,302 @@ > #include "opt_ddb.h" > > > #include > -#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > > > #include > #include > +#include > +#include > #include > #include > > > +#ifdef DDB > +#include > +#endif > + > +/* > + * These widths should allow the pointers to a node's children to fit within > + * a single cache line. The extra levels from a narrow width should not be > + * a problem thanks to path compression. > + */ > +#ifdef __LP64__ > +#define VM_RADIX_WIDTH 4 > +#else > +#define VM_RADIX_WIDTH 3 > +#endif > + > +#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) > +#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) > +#define VM_RADIX_LIMIT \ > + (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) > + > +#if VM_RADIX_WIDTH == 3 > +typedef uint8_t rn_popmap_t; > +#elif VM_RADIX_WIDTH == 4 > +typedef uint16_t rn_popmap_t; > +#elif VM_RADIX_WIDTH == 5 > +typedef uint32_t rn_popmap_t; > +#else > +#error Unsupported width > +#endif > +_Static_assert(sizeof(rn_popmap_t) <= sizeof(int), > + "rn_popmap_t too wide"); > + > +/* Set of all flag bits stored in node pointers. */ > +#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) > +#define VM_RADIX_PAD VM_RADIX_FLAGS > + > +enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; > + > +struct vm_radix_node; > +typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; > + > +struct vm_radix_node { > + vm_pindex_t rn_owner; /* Owner of record. */ > + rn_popmap_t rn_popmap; /* Valid children. */ > + uint8_t rn_clev; /* Level * WIDTH. */ > + smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ > +}; > + > static uma_zone_t vm_radix_node_zone; > -smr_t vm_radix_smr; > +static smr_t vm_radix_smr; > + > +static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, > + enum vm_radix_access access); > > > -void * > -vm_radix_node_alloc(struct pctrie *ptree) > +/* > + * Map index to an array position for the children of rnode, > + */ > +static __inline int > +vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) > { > - return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); > + return ((index >> rnode->rn_clev) & VM_RADIX_MASK); > } > > > -void > -vm_radix_node_free(struct pctrie *ptree, void *node) > +/* > + * Returns true if index does not belong to the specified rnode. Otherwise, > + * sets slot value, and returns false. > + */ > +static __inline bool > +vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *slot) > +{ > + index = (index - rnode->rn_owner) >> rnode->rn_clev; > + if (index >= VM_RADIX_COUNT) > + return (true); > + *slot = index; > + return (false); > +} > + > +/* > + * Allocate a radix node. > + */ > +static struct vm_radix_node * > +vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) > +{ > + struct vm_radix_node *rnode; > + > + rnode = uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); > + if (rnode == NULL) > + return (NULL); > + > + /* > + * We want to clear the last child pointer after the final section > + * has exited so lookup can not return false negatives. It is done > + * here because it will be cache-cold in the dtor callback. > + */ > + if (rnode->rn_popmap != 0) { > + vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], > + VM_RADIX_NULL, UNSERIALIZED); > + rnode->rn_popmap = 0; > + } > + > + /* > + * From the highest-order bit where the indexes differ, > + * compute the highest level in the trie where they differ. Then, > + * compute the least index of this subtrie. > + */ > + KASSERT(index != newind, ("%s: passing the same key value %jx", > + __func__, (uintmax_t)index)); > + _Static_assert(sizeof(long long) >= sizeof(vm_pindex_t), > + "vm_pindex_t too wide"); > + _Static_assert(sizeof(vm_pindex_t) * NBBY <= > + (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); > + rnode->rn_clev = rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); > + rnode->rn_owner = VM_RADIX_COUNT; > + rnode->rn_owner = index & -(rnode->rn_owner << rnode->rn_clev); > + return (rnode); > +} > + > +/* > + * Free radix node. > + */ > +static __inline void > +vm_radix_node_put(struct vm_radix_node *rnode) > +{ > +#ifdef INVARIANTS > + int slot; > + > + KASSERT(powerof2(rnode->rn_popmap), > + ("vm_radix_node_put: rnode %p has too many children %04x", rnode, > + rnode->rn_popmap)); > + for (slot = 0; slot < VM_RADIX_COUNT; slot++) { > + if ((rnode->rn_popmap & (1 << slot)) != 0) > + continue; > + KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) == > + VM_RADIX_NULL, > + ("vm_radix_node_put: rnode %p has a child", rnode)); > + } > +#endif > + uma_zfree_smr(vm_radix_node_zone, rnode); > +} > + > +/* > + * Fetch a node pointer from a slot in another node. > + */ > +static __inline struct vm_radix_node * > +vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) > +{ > + > + switch (access) { > + case UNSERIALIZED: > + return (smr_unserialized_load(p, true)); > + case LOCKED: > + return (smr_serialized_load(p, true)); > + case SMR: > + return (smr_entered_load(p, vm_radix_smr)); > + } > + __assert_unreachable(); > +} > + > +static __inline void > +vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, > + enum vm_radix_access access) > +{ > + > + switch (access) { > + case UNSERIALIZED: > + smr_unserialized_store(p, v, true); > + break; > + case LOCKED: > + smr_serialized_store(p, v, true); > + break; > + case SMR: > + panic("vm_radix_node_store: Not supported in smr section."); > + } > +} > + > +/* > + * Get the root node for a radix tree. > + */ > +static __inline struct vm_radix_node * > +vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) > +{ > + > + return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); > +} > + > +/* > + * Set the root node for a radix tree. > + */ > +static __inline void > +vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, > + enum vm_radix_access access) > +{ > + > + vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); > +} > + > +/* > + * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. > + */ > +static __inline bool > +vm_radix_isleaf(struct vm_radix_node *rnode) > +{ > + > + return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0); > +} > + > +/* > + * Returns page cast to radix node with leaf bit set. > + */ > +static __inline struct vm_radix_node * > +vm_radix_toleaf(vm_page_t page) > +{ > + return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); > +} > + > +/* > + * Returns the associated page extracted from rnode. > + */ > +static __inline vm_page_t > +vm_radix_topage(struct vm_radix_node *rnode) > +{ > + > + return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); > +} > + > +/* > + * Make 'child' a child of 'rnode'. > + */ > +static __inline void > +vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, > + struct vm_radix_node *child, enum vm_radix_access access) > +{ > + int slot; > + > + slot = vm_radix_slot(rnode, index); > + vm_radix_node_store(&rnode->rn_child[slot], child, access); > + rnode->rn_popmap ^= 1 << slot; > + KASSERT((rnode->rn_popmap & (1 << slot)) != 0, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > +} > + > +/* > + * Internal helper for vm_radix_reclaim_allnodes(). > + * This function is recursive. > + */ > +static void > +vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) > +{ > + struct vm_radix_node *child; > + int slot; > + > + while (rnode->rn_popmap != 0) { > + slot = ffs(rnode->rn_popmap) - 1; > + child = vm_radix_node_load(&rnode->rn_child[slot], > + UNSERIALIZED); > + KASSERT(child != VM_RADIX_NULL, > + ("%s: bad popmap slot %d in rnode %p", > + __func__, slot, rnode)); > + if (!vm_radix_isleaf(child)) > + vm_radix_reclaim_allnodes_int(child); > + rnode->rn_popmap ^= 1 << slot; > + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, > + UNSERIALIZED); > + } > + vm_radix_node_put(rnode); > +} > + > +/* > + * radix node zone initializer. > + */ > +static int > +vm_radix_zone_init(void *mem, int size, int flags) > { > - uma_zfree_smr(vm_radix_node_zone, node); > + struct vm_radix_node *rnode; > + > + rnode = mem; > + rnode->rn_popmap = 0; > + for (int i = 0; i < nitems(rnode->rn_child); i++) > + vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, > + UNSERIALIZED); > + return (0); > } > > > #ifndef UMA_MD_SMALL_ALLOC > @@ -107,14 +383,412 @@ void > vm_radix_zinit(void) > { > > > - vm_radix_node_zone = uma_zcreate("RADIX NODE", pctrie_node_size(), > - NULL, NULL, pctrie_zone_init, NULL, > - PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); > + vm_radix_node_zone = uma_zcreate("RADIX NODE", > + sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, > + VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); > vm_radix_smr = uma_zone_get_smr(vm_radix_node_zone); > } > > > +/* > + * Inserts the key-value pair into the trie. > + * Panics if the key already exists. > + */ > +int > +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) > +{ > + vm_pindex_t index, newind; > + struct vm_radix_node *leaf, *parent, *rnode; > + smrnode_t *parentp; > + int slot; > + > + index = page->pindex; > + leaf = vm_radix_toleaf(page); > + > + /* > + * The owner of record for root is not really important because it > + * will never be used. > + */ > + rnode = vm_radix_root_load(rtree, LOCKED); > + parent = NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if (rnode == VM_RADIX_NULL) { > + if (parent == NULL) > + rtree->rt_root = leaf; > + else > + vm_radix_addnode(parent, index, leaf, > + LOCKED); > + return (0); > + } > + newind = vm_radix_topage(rnode)->pindex; > + if (newind == index) > + panic("%s: key %jx is already present", > + __func__, (uintmax_t)index); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + newind = rnode->rn_owner; > + break; > + } > + parent = rnode; > + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + > + /* > + * A new node is needed because the right insertion level is reached. > + * Setup the new intermediate node and add the 2 children: the > + * new object and the older edge or object. > + */ > + parentp = (parent != NULL) ? &parent->rn_child[slot]: > + (smrnode_t *)&rtree->rt_root; > + parent = vm_radix_node_get(index, newind); > + if (parent == NULL) > + return (ENOMEM); > + /* These writes are not yet visible due to ordering. */ > + vm_radix_addnode(parent, index, leaf, UNSERIALIZED); > + vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); > + /* Serializing write to make the above visible. */ > + vm_radix_node_store(parentp, parent, LOCKED); > + return (0); > +} > + > +/* > + * Returns the value stored at the index. If the index is not present, > + * NULL is returned. > + */ > +static __always_inline vm_page_t > +_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, > + enum vm_radix_access access) > +{ > + struct vm_radix_node *rnode; > + vm_page_t m; > + int slot; > + > + rnode = vm_radix_root_load(rtree, access); > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m = vm_radix_topage(rnode)) != NULL && > + m->pindex == index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) > + break; > + rnode = vm_radix_node_load(&rnode->rn_child[slot], access); > + } > + return (NULL); > +} > + > +/* > + * Returns the value stored at the index assuming there is an external lock. > + * > + * If the index is not present, NULL is returned. > + */ > +vm_page_t > +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) > +{ > + > + return _vm_radix_lookup(rtree, index, LOCKED); > +} > + > +/* > + * Returns the value stored at the index without requiring an external lock. > + * > + * If the index is not present, NULL is returned. > + */ > +vm_page_t > +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) > +{ > + vm_page_t m; > + > + smr_enter(vm_radix_smr); > + m = _vm_radix_lookup(rtree, index, SMR); > + smr_exit(vm_radix_smr); > + > + return (m); > +} > + > +/* > + * Returns the page with the least pindex that is greater than or equal to the > + * specified pindex, or NULL if there are no such pages. > + * > + * Requires that access be externally synchronized by a lock. > + */ > +vm_page_t > +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *rnode, *succ; > + vm_page_t m; > + int slot; > + > + /* > + * Descend the trie as if performing an ordinary lookup for the page > + * with the specified pindex. However, unlike an ordinary lookup, as we > + * descend the trie, we use "succ" to remember the last branching-off > + * point, that is, the interior node under which the page with the least > + * pindex that is both outside our current path down the trie and more > + * than the specified pindex resides. (The node's popmap makes it fast > + * and easy to recognize a branching-off point.) If our ordinary lookup > + * fails to yield a page with a pindex that is greater than or equal to > + * the specified pindex, then we will exit this loop and perform a > + * lookup starting from "succ". If "succ" is not NULL, then that lookup > + * is guaranteed to succeed. > + */ > + rnode = vm_radix_root_load(rtree, LOCKED); > + succ = NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m = vm_radix_topage(rnode)) != NULL && > + m->pindex >= index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + /* > + * If all pages in this subtree have pindex > index, > + * then the page in this subtree with the least pindex > + * is the answer. > + */ > + if (rnode->rn_owner > index) > + succ = rnode; > + break; > + } > + > + /* > + * Just in case the next search step leads to a subtree of all > + * pages with pindex < index, check popmap to see if a next > + * bigger step, to a subtree of all pages with pindex > index, > + * is available. If so, remember to restart the search here. > + */ > + if ((rnode->rn_popmap >> slot) > 1) > + succ = rnode; > + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + > + /* > + * Restart the search from the last place visited in the subtree that > + * included some pages with pindex > index, if there was such a place. > + */ > + if (succ == NULL) > + return (NULL); > + if (succ != rnode) { > + /* > + * Take a step to the next bigger sibling of the node chosen > + * last time. In that subtree, all pages have pindex > index. > + */ > + slot = vm_radix_slot(succ, index) + 1; > + KASSERT((succ->rn_popmap >> slot) != 0, > + ("%s: no popmap siblings past slot %d in node %p", > + __func__, slot, succ)); > + slot += ffs(succ->rn_popmap >> slot) - 1; > + succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); > + } > + > + /* > + * Find the page in the subtree rooted at "succ" with the least pindex. > + */ > + while (!vm_radix_isleaf(succ)) { > + KASSERT(succ->rn_popmap != 0, > + ("%s: no popmap children in node %p", __func__, succ)); > + slot = ffs(succ->rn_popmap) - 1; > + succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); > + } > + return (vm_radix_topage(succ)); > +} > + > +/* > + * Returns the page with the greatest pindex that is less than or equal to the > + * specified pindex, or NULL if there are no such pages. > + * > + * Requires that access be externally synchronized by a lock. > + */ > +vm_page_t > +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *pred, *rnode; > + vm_page_t m; > + int slot; > + > + /* > + * Mirror the implementation of vm_radix_lookup_ge, described above. > + */ > + rnode = vm_radix_root_load(rtree, LOCKED); > + pred = NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m = vm_radix_topage(rnode)) != NULL && > + m->pindex <= index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + if (rnode->rn_owner < index) > + pred = rnode; > + break; > + } > + if ((rnode->rn_popmap & ((1 << slot) - 1)) != 0) > + pred = rnode; > + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + if (pred == NULL) > + return (NULL); > + if (pred != rnode) { > + slot = vm_radix_slot(pred, index); > + KASSERT((pred->rn_popmap & ((1 << slot) - 1)) != 0, > + ("%s: no popmap siblings before slot %d in node %p", > + __func__, slot, pred)); > + slot = fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; > + pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); > + } > + while (!vm_radix_isleaf(pred)) { > + KASSERT(pred->rn_popmap != 0, > + ("%s: no popmap children in node %p", __func__, pred)); > + slot = fls(pred->rn_popmap) - 1; > + pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); > + } > + return (vm_radix_topage(pred)); > +} > + > +/* > + * Remove the specified index from the trie, and return the value stored at > + * that index. If the index is not present, return NULL. > + */ > +vm_page_t > +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *child, *parent, *rnode; > + vm_page_t m; > + int slot; > + > + rnode = NULL; > + child = vm_radix_root_load(rtree, LOCKED); > + for (;;) { > + if (vm_radix_isleaf(child)) > + break; > + parent = rnode; > + rnode = child; > + slot = vm_radix_slot(rnode, index); > + child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + if ((m = vm_radix_topage(child)) == NULL || m->pindex != index) > + return (NULL); > + if (rnode == NULL) { > + vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); > + return (m); > + } > + KASSERT((rnode->rn_popmap & (1 << slot)) != 0, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > + rnode->rn_popmap ^= 1 << slot; > + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); > + if (!powerof2(rnode->rn_popmap)) > + return (m); > + KASSERT(rnode->rn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); > + slot = ffs(rnode->rn_popmap) - 1; > + child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + KASSERT(child != VM_RADIX_NULL, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > + if (parent == NULL) > + vm_radix_root_store(rtree, child, LOCKED); > + else { > + slot = vm_radix_slot(parent, index); > + KASSERT(rnode == > + vm_radix_node_load(&parent->rn_child[slot], LOCKED), > + ("%s: invalid child value", __func__)); > + vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); > + } > + /* > + * The child is still valid and we can not zero the > + * pointer until all smr references are gone. > + */ > + vm_radix_node_put(rnode); > + return (m); > +} > + > +/* > + * Remove and free all the nodes from the radix tree. > + * This function is recursive but there is a tight control on it as the > + * maximum depth of the tree is fixed. > + */ > +void > +vm_radix_reclaim_allnodes(struct vm_radix *rtree) > +{ > + struct vm_radix_node *root; > + > + root = vm_radix_root_load(rtree, LOCKED); > + if (root == VM_RADIX_NULL) > + return; > + vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); > + if (!vm_radix_isleaf(root)) > + vm_radix_reclaim_allnodes_int(root); > +} > + > +/* > + * Replace an existing page in the trie with another one. > + * Panics if there is not an old page in the trie at the new page's index. > + */ > +vm_page_t > +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) > +{ > + struct vm_radix_node *leaf, *parent, *rnode; > + vm_page_t m; > + vm_pindex_t index; > + int slot; > + > + leaf = vm_radix_toleaf(newpage); > + index = newpage->pindex; > + rnode = vm_radix_root_load(rtree, LOCKED); > + parent = NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m = vm_radix_topage(rnode)) != NULL && > + m->pindex == index) { > + if (parent == NULL) > + rtree->rt_root = leaf; > + else > + vm_radix_node_store( > + &parent->rn_child[slot], leaf, > + LOCKED); > + return (m); > + } > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) > + break; > + parent = rnode; > + rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + panic("%s: original replacing page not found", __func__); > +} > + > void > vm_radix_wait(void) > { > uma_zwait(vm_radix_node_zone); > } > + > +#ifdef DDB > +/* > + * Show details about the given radix node. > + */ > +DB_SHOW_COMMAND(radixnode, db_show_radixnode) > +{ > + struct vm_radix_node *rnode, *tmp; > + int slot; > + rn_popmap_t popmap; > + > + if (!have_addr) > + return; > + rnode = (struct vm_radix_node *)addr; > + db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", > + (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, > + rnode->rn_clev / VM_RADIX_WIDTH); > + for (popmap = rnode->rn_popmap; popmap != 0; popmap ^= 1 << slot) { > + slot = ffs(popmap) - 1; > + tmp = vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); > + db_printf("slot: %d, val: %p, page: %p, clev: %d\n", > + slot, (void *)tmp, > + vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, > + rnode->rn_clev / VM_RADIX_WIDTH); > + } > +} > +#endif /* DDB */ > diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h > index a332618fc0e6..231edda65102 100644 > --- a/sys/vm/vm_radix.h > +++ b/sys/vm/vm_radix.h > @@ -34,113 +34,36 @@ > #include > > > #ifdef _KERNEL > -#include > -#include > > > +int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); > void vm_radix_wait(void); > +vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index); > +void vm_radix_reclaim_allnodes(struct vm_radix *rtree); > +vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); > void vm_radix_zinit(void); > -void *vm_radix_node_alloc(struct pctrie *ptree); > -void vm_radix_node_free(struct pctrie *ptree, void *node); > -extern smr_t vm_radix_smr; > - > -static __inline void > -vm_radix_init(struct vm_radix *rtree) > -{ > - pctrie_init(&rtree->rt_trie); > -} > - > -static __inline bool > -vm_radix_is_empty(struct vm_radix *rtree) > -{ > - return (pctrie_is_empty(&rtree->rt_trie)); > -} > - > -PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix_node_free, > - vm_radix_smr); > > > /* > - * Inserts the key-value pair into the trie. > - * Panics if the key already exists. > + * Each search path in the trie terminates at a leaf, which is a pointer to a > + * page marked with a set 1-bit. A leaf may be associated with a null pointer > + * to indicate no page there. > */ > -static __inline int > -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) > -{ > - return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); > -} > - > -/* > - * Returns the value stored at the index assuming there is an external lock. > - * > - * If the index is not present, NULL is returned. > - */ > -static __inline vm_page_t > -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); > -} > - > -/* > - * Returns the value stored at the index without requiring an external lock. > - * > - * If the index is not present, NULL is returned. > - */ > -static __inline vm_page_t > -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); > -} > +#define VM_RADIX_ISLEAF 0x1 > +#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF > > > -/* > - * Returns the page with the least pindex that is greater than or equal to the > - * specified pindex, or NULL if there are no such pages. > - * > - * Requires that access be externally synchronized by a lock. > - */ > -static __inline vm_page_t > -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); > -} > - > -/* > - * Returns the page with the greatest pindex that is less than or equal to the > - * specified pindex, or NULL if there are no such pages. > - * > - * Requires that access be externally synchronized by a lock. > - */ > -static __inline vm_page_t > -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); > -} > - > -/* > - * Remove the specified index from the trie, and return the value stored at > - * that index. If the index is not present, return NULL. > - */ > -static __inline vm_page_t > -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); > -} > - > -/* > - * Remove and free all the nodes from the radix tree. > - */ > static __inline void > -vm_radix_reclaim_allnodes(struct vm_radix *rtree) > +vm_radix_init(struct vm_radix *rtree) > { > - VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); > + rtree->rt_root = VM_RADIX_NULL; > } > > > -/* > - * Replace an existing page in the trie with another one. > - * Panics if there is not an old page in the trie at the new page's index. > - */ > -static __inline vm_page_t > -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) > +static __inline bool > +vm_radix_is_empty(struct vm_radix *rtree) > { > - return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); > + return (rtree->rt_root == VM_RADIX_NULL); > } > > > #endif /* _KERNEL */ > > > > From nobody Mon Sep 11 17:28:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rktx623dlz4sWxb; Mon, 11 Sep 2023 17:28: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 4Rktx61w77z4TD2; Mon, 11 Sep 2023 17:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=foCTafJAJSIAXr3YWRzDNo+v8rMUf1xVX+UtMZpD5bU=; b=nU2vQ55bMz7NVZtnH4HCQGIWuye2a/fQHhAlrBvU48XMd2HG1nmdGMUwVvt4Sid2oxwBMC 3BVgGwFizbCqdCbio37ykLsuStJo3el87VYcOUnIvCfPijITPiWT5MZNTGkU1mNmm8QnJ8 DvY7oUHVdccghGjOVPJmiuoSyThGZzOdd9d2zbBZUxJlfKb81MhaOKSTKUtw/g+koGezCb sSkfje7CDzEQYC/1E5RRTNivgCOrYPo6YJSbicVpVQz2eZEd2e9scdtGCzZX95Ek5Gh5Pd xpyd+bSBJP17WubZ8NSZPZ9NVY3pBvTHj5wZn987P5aOZP3pjTgVVBKIBOC85w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694453338; a=rsa-sha256; cv=none; b=kO6gvZ0PDgcjAZAV3FJDX15DdJIOiM3hSe+Yk2FxsfsI8H+Vb4ZuJLjjBPwtWEojJnUXEx 7Bd+KgHFUDrG8rwr+yjR55g4ruBAOMQLdmKYHVPHvIWI6+4zDu2YQnOpnC7UzMiGWNOYuX B9HWBO6vpOCMDQMUOjdkG5TBev/hFfcTQFyeWzTRyv0zcp3efHom6roJPtXHEcn4LzhUky wdpWtDyRfXpt/7QMkz8iaAAz3Xd3KkPFkAS2Jgu0HQl4ohAq2GeuHhgjKZsk5A4DDm4k7d SqjtDOdPbPQyFzUcgpxvMxGwrjWx3kfQfp+fanPDaLZPlpdtL2NABSX96ywvzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=foCTafJAJSIAXr3YWRzDNo+v8rMUf1xVX+UtMZpD5bU=; b=QFrx/lIDxnVAEqsywHZ9KbJgw0kJQe156Cwsh6T9qHBd2/7IE7QaYaCnjxbO5x2V2vMJzS LvffOEfPBbtP0XOjv+Gj5mlfSnGesU+fwwzwQnj/Pug0D2F3a3wIK4ZZxK7rqxALb5ZoEK 0MBZIAYCjIJ6Nrz2wzQOJfJvjrmucerqatVkM6cRNx4WQksOzeI0CXHxN84WHxw1q4G++6 KeWfz1YkvzFvoAwpLywXepYZ72tXFk7EgZNt9qi0nyVYaEQtwVVnW47vVItABHhm3L/pEK kwHack5Mta/buTGkHAR6UFEmFnrMBHHS2U/u+a1u0VBx0WmHfbv2j/QcRJT1ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rktx60zyXzyHL; Mon, 11 Sep 2023 17:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BHSwCW040561; Mon, 11 Sep 2023 17:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHSwxa040558; Mon, 11 Sep 2023 17:28:58 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:28:58 GMT Message-Id: <202309111728.38BHSwxa040558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 70337f73e914 - stable/12 - OpenSSL: Merge OpenSSL 1.1.1w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 70337f73e914d684ffd832797cd07d68cdcf17bc Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=70337f73e914d684ffd832797cd07d68cdcf17bc commit 70337f73e914d684ffd832797cd07d68cdcf17bc Author: Jung-uk Kim AuthorDate: 2023-09-11 16:50:12 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:27:54 +0000 OpenSSL: Merge OpenSSL 1.1.1w (cherry picked from commit a1860b94f62494288804faebb1bf6ea8110ca148) --- crypto/openssl/CHANGES | 24 +++++++ crypto/openssl/NEWS | 5 ++ crypto/openssl/README | 2 +- crypto/openssl/appveyor.yml | 78 ---------------------- crypto/openssl/crypto/asn1/ameth_lib.c | 11 ++- crypto/openssl/crypto/cms/cms_asn1.c | 17 ++++- crypto/openssl/crypto/cms/cms_local.h | 3 +- crypto/openssl/crypto/cms/cms_sd.c | 16 ++++- crypto/openssl/crypto/cms/cms_smime.c | 5 +- crypto/openssl/crypto/ec/ec_ameth.c | 19 ++++-- .../openssl/crypto/poly1305/asm/poly1305-x86_64.pl | 6 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 7 +- crypto/openssl/doc/man3/CMS_sign.pod | 4 +- crypto/openssl/include/openssl/opensslv.h | 4 +- crypto/openssl/ssl/ssl_sess.c | 7 +- 15 files changed, 102 insertions(+), 106 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 52c2edf150e9..c4409489e79e 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,30 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1v and 1.1.1w [11 Sep 2023] + + *) Fix POLY1305 MAC implementation corrupting XMM registers on Windows. + + The POLY1305 MAC (message authentication code) implementation in OpenSSL + does not save the contents of non-volatile XMM registers on Windows 64 + platform when calculating the MAC of data larger than 64 bytes. Before + returning to the caller all the XMM registers are set to zero rather than + restoring their previous content. The vulnerable code is used only on newer + x86_64 processors supporting the AVX512-IFMA instructions. + + The consequences of this kind of internal application state corruption can + be various - from no consequences, if the calling application does not + depend on the contents of non-volatile XMM registers at all, to the worst + consequences, where the attacker could get complete control of the + application process. However given the contents of the registers are just + zeroized so the attacker cannot put arbitrary values inside, the most likely + consequence, if any, would be an incorrect result of some application + dependent calculations or a crash leading to a denial of service. + + (CVE-2023-4807) + [Bernd Edlinger] + + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] *) Fix excessive time spent checking DH q parameter value. diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index c71c02911db0..1b849cdf7686 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [11 Sep 2023] + + o Fix POLY1305 MAC implementation corrupting XMM registers on Windows + (CVE-2023-4807) + Major changes between OpenSSL 1.1.1u and OpenSSL 1.1.1v [1 Aug 2023] o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) diff --git a/crypto/openssl/README b/crypto/openssl/README index dbe6bf756e94..e924e1529a9c 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1v 1 Aug 2023 + OpenSSL 1.1.1w 11 Sep 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/appveyor.yml b/crypto/openssl/appveyor.yml deleted file mode 100644 index 6210391f204a..000000000000 --- a/crypto/openssl/appveyor.yml +++ /dev/null @@ -1,78 +0,0 @@ -image: - - Visual Studio 2017 - -platform: - - x64 - - x86 - -environment: - fast_finish: true - matrix: - - VSVER: 15 - -configuration: - - shared - - plain - - minimal - -before_build: - - ps: >- - Install-Module VSSetup -Scope CurrentUser - - ps: >- - Get-VSSetupInstance -All - - ps: >- - gci env:* | sort-object name - - ps: >- - If ($env:Platform -Match "x86") { - $env:VCVARS_PLATFORM="x86" - $env:TARGET="VC-WIN32 no-asm --strict-warnings" - } Else { - $env:VCVARS_PLATFORM="amd64" - $env:TARGET="VC-WIN64A-masm" - } - - ps: >- - If ($env:Configuration -Match "shared") { - $env:SHARED="no-makedepend" - } ElseIf ($env:Configuration -Match "minimal") { - $env:SHARED="no-shared no-dso no-makedepend no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_SMALL_FOOTPRINT" - } Else { - $env:SHARED="no-shared no-makedepend" - } - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - - mkdir _build - - cd _build - - perl ..\Configure %TARGET% %SHARED% - - perl configdata.pm --dump - - cd .. - - ps: >- - if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER` - -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT | - Select-String "\[extended tests\]") ) { - $env:EXTENDED_TESTS="yes" - } - -build_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" - } - - cd .. - -test_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - if ($env:EXTENDED_TESTS) { - cmd /c "nmake test V=1 2>&1" - } Else { - cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1" - } - } - - ps: >- - if ($env:EXTENDED_TESTS) { - mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" - } - - cd .. diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c index 5e8c3ed1d5b0..4ab246e98719 100644 --- a/crypto/openssl/crypto/asn1/ameth_lib.c +++ b/crypto/openssl/crypto/asn1/ameth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -264,6 +264,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->pkey_size = src->pkey_size; dst->pkey_bits = src->pkey_bits; + dst->pkey_security_bits = src->pkey_security_bits; dst->param_decode = src->param_decode; dst->param_encode = src->param_encode; @@ -271,6 +272,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->param_copy = src->param_copy; dst->param_cmp = src->param_cmp; dst->param_print = src->param_print; + dst->sig_print = src->sig_print; dst->pkey_free = src->pkey_free; dst->pkey_ctrl = src->pkey_ctrl; @@ -281,6 +283,13 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->siginf_set = src->siginf_set; dst->pkey_check = src->pkey_check; + dst->pkey_public_check = src->pkey_public_check; + dst->pkey_param_check = src->pkey_param_check; + + dst->set_priv_key = src->set_priv_key; + dst->set_pub_key = src->set_pub_key; + dst->get_priv_key = src->get_priv_key; + dst->get_pub_key = src->get_pub_key; } diff --git a/crypto/openssl/crypto/cms/cms_asn1.c b/crypto/openssl/crypto/cms/cms_asn1.c index 08069d72a29e..a62e11ecbd90 100644 --- a/crypto/openssl/crypto/cms/cms_asn1.c +++ b/crypto/openssl/crypto/cms/cms_asn1.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, EVP_PKEY_free(si->pkey); X509_free(si->signer); EVP_MD_CTX_free(si->mctx); + EVP_PKEY_CTX_free(si->pctx); } return 1; } @@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = { ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1) } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo) -ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { +static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) +{ + CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval; + + if (operation == ASN1_OP_FREE_POST) + OPENSSL_clear_free(ec->key, ec->keylen); + return 1; +} + +ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = { ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT), ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR), ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0) -} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo) +} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo) ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = { ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32), diff --git a/crypto/openssl/crypto/cms/cms_local.h b/crypto/openssl/crypto/cms/cms_local.h index a0ce4448f603..09c0bdfe5a47 100644 --- a/crypto/openssl/crypto/cms/cms_local.h +++ b/crypto/openssl/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -342,6 +342,7 @@ struct CMS_Receipt_st { DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_ITEM(CMS_SignerInfo) +DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo) DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) DECLARE_ASN1_ITEM(CMS_Attributes_Sign) DECLARE_ASN1_ITEM(CMS_Attributes_Verify) diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 3f2a782565a8..9f67f91297ea 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -375,6 +375,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } else if (EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, pk) <= 0) goto err; + else + EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); } if (!sd->signerInfos) @@ -600,6 +602,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms, unsigned char md[EVP_MAX_MD_SIZE]; unsigned int mdlen; pctx = si->pctx; + si->pctx = NULL; if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) goto err; siglen = EVP_PKEY_size(si->pkey); @@ -680,6 +683,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) EVP_MD_CTX_reset(mctx); if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); si->pctx = pctx; } @@ -745,8 +749,13 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) return -1; } mctx = si->mctx; + if (si->pctx != NULL) { + EVP_PKEY_CTX_free(si->pctx); + si->pctx = NULL; + } if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); if (!cms_sd_asn1_ctrl(si, 1)) goto err; @@ -859,8 +868,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain) if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0) goto err; si->pctx = pkctx; - if (!cms_sd_asn1_ctrl(si, 1)) + if (!cms_sd_asn1_ctrl(si, 1)) { + si->pctx = NULL; goto err; + } + si->pctx = NULL; r = EVP_PKEY_verify(pkctx, si->signature->data, si->signature->length, mval, mlen); if (r <= 0) { diff --git a/crypto/openssl/crypto/cms/cms_smime.c b/crypto/openssl/crypto/cms/cms_smime.c index 6e7dbc4da1fa..f6c1c7d17705 100644 --- a/crypto/openssl/crypto/cms/cms_smime.c +++ b/crypto/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -211,7 +211,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, if (cms == NULL) return NULL; if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen)) - return NULL; + goto err; if (!(flags & CMS_DETACHED)) CMS_set_detached(cms, 0); @@ -220,6 +220,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, || CMS_final(cms, in, NULL, flags)) return cms; + err: CMS_ContentInfo_free(cms); return NULL; } diff --git a/crypto/openssl/crypto/ec/ec_ameth.c b/crypto/openssl/crypto/ec/ec_ameth.c index 5098bd7a6602..5a63590a9fbd 100644 --- a/crypto/openssl/crypto/ec/ec_ameth.c +++ b/crypto/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,7 +38,6 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key) ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid); if (asn1obj == NULL || OBJ_length(asn1obj) == 0) { - ASN1_OBJECT_free(asn1obj); ECerr(EC_F_ECKEY_PARAM2TYPE, EC_R_MISSING_OID); return 0; } @@ -98,9 +97,7 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) ptype, pval, penc, penclen)) return 1; err: - if (ptype == V_ASN1_OBJECT) - ASN1_OBJECT_free(pval); - else + if (ptype == V_ASN1_SEQUENCE) ASN1_STRING_free(pval); OPENSSL_free(penc); return 0; @@ -256,24 +253,32 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) eplen = i2d_ECPrivateKey(&ec_key, NULL); if (!eplen) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } ep = OPENSSL_malloc(eplen); if (ep == NULL) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE); return 0; } p = ep; if (!i2d_ECPrivateKey(&ec_key, &p)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0, ptype, pval, ep, eplen)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); return 0; } diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl index 5f834d8faf2a..5e2bb18f2bac 100755 --- a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -193,7 +193,7 @@ $code.=<<___ if ($avx>1); bt \$`5+32`,%r9 # AVX2? cmovc %rax,%r10 ___ -$code.=<<___ if ($avx>3); +$code.=<<___ if ($avx>3 && !$win64); mov \$`(1<<31|1<<21|1<<16)`,%rax shr \$32,%r9 and %rax,%r9 @@ -2722,7 +2722,7 @@ $code.=<<___; .cfi_endproc .size poly1305_blocks_avx512,.-poly1305_blocks_avx512 ___ -if ($avx>3) { +if ($avx>3 && !$win64) { ######################################################################## # VPMADD52 version using 2^44 radix. # diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c index 2c9c46ea53c8..00ed9820b0d2 100644 --- a/crypto/openssl/crypto/rsa/rsa_ameth.c +++ b/crypto/openssl/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,13 +82,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) if (!rsa_param_encode(pkey, &str, &strtype)) return 0; penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc); - if (penclen <= 0) + if (penclen <= 0) { + ASN1_STRING_free(str); return 0; + } if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id), strtype, str, penc, penclen)) return 1; OPENSSL_free(penc); + ASN1_STRING_free(str); return 0; } diff --git a/crypto/openssl/doc/man3/CMS_sign.pod b/crypto/openssl/doc/man3/CMS_sign.pod index 79446b129889..884be8fdd315 100644 --- a/crypto/openssl/doc/man3/CMS_sign.pod +++ b/crypto/openssl/doc/man3/CMS_sign.pod @@ -95,7 +95,7 @@ The function CMS_sign() is a basic CMS signing function whose output will be suitable for many purposes. For finer control of the output format the B, B and B parameters can all be B and the B flag set. Then one or more signers can be added using the -function CMS_sign_add1_signer(), non default digests can be used and custom +function CMS_add1_signer(), non default digests can be used and custom attributes added. CMS_final() must then be called to finalize the structure if streaming is not enabled. @@ -119,7 +119,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 7a8ba63d9603..5598a9ea4989 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010116fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" +# define OPENSSL_VERSION_NUMBER 0x1010117fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-freebsd 11 Sep 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/crypto/openssl/ssl/ssl_sess.c b/crypto/openssl/ssl/ssl_sess.c index cda6b7cc5bcf..68d1737ac521 100644 --- a/crypto/openssl/ssl/ssl_sess.c +++ b/crypto/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use @@ -139,8 +139,11 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->references = 1; dest->lock = CRYPTO_THREAD_lock_new(); - if (dest->lock == NULL) + if (dest->lock == NULL) { + OPENSSL_free(dest); + dest = NULL; goto err; + } if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data)) goto err; From nobody Mon Sep 11 17:28:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rktx74QZwz4sWkl; Mon, 11 Sep 2023 17:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rktx73tsDz4TJh; Mon, 11 Sep 2023 17:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jTpfwOJ9kSElM2HHMTqcPwtTbO118YiMCBULHrflOGo=; b=TwxQRjhUF8OeVnT1kT3ye9jR5AZrbYvCgZALL1it4w1cPQxXIB54gHg9PDZIPKd2K9BkKG jjSejBgQlxRhwDBMlT4hlS0Hc0VzueIBeLt5QcP6I3vjedEIctol5oj8Shsnp5u1UO5o0C RtOvC2i1Nj3UqlUuuO2eaIbWOgD+rAaJGk45O0c647X5OVJAiKjrs30RXiS8RwN3ikG6Xi QuMh9E8xE8mk0j+G4Wvyrwl7yfrztmYX1rxFzrFxHFFGqhDvOG6hiw/H7FgQ0FzTYZwXzC AEPehCPGGE9HunKvLLrZnrpw33eh0uEac8J5Hh+xJqqqZ71Ian/+bloOUY7hMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694453339; a=rsa-sha256; cv=none; b=YNRAba+PI5XQuznTvb+S44G3nJu1U//tWEy4tm2x34RpdsfgqyxK6XiEpZt546T0KK+AtU wketFSNb3NW6xESyf1aCUcPFwBA/VCZClqIoNAD9GhXXkQ/NGJMmIi/0s/N9/FI+meJD0M YTD+0YAIKmfde3HC1or56pWAbldsBa12c0JEGcm+j539yAhpdnwV5G1DSjHhsOmTBO+2lY y0O9OuNQyA2uEPNXPpBotPEcxqycwu/ykfYzkDanm4z59bRo0loC6fZcFBDq6t3QBcMXvo 1fI4Z9GTupfMUyUV5MgxWoLwiBd+Ul809WmA3LMrF2EeaNhiEiYhEFXlDxaO9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jTpfwOJ9kSElM2HHMTqcPwtTbO118YiMCBULHrflOGo=; b=grqjXeo6PO86TvFZWZGERbslkl+bwQ29d9Ydh529wKP4y53SkkXPYK1GqV6UajY7YagmwT hyVS7WLPBmrIN/pp84dCwXwtfgZU/JfYlLdF3uoCK7JLcDH6vML9NJM1+Io96X3oYPM0hj 9ss/+8wk107ZHM0hExt160I7oOQrTkqhsomVl/Rz+S9yzRWhTSoW7RvjU+zA5dHPKB7a4n b+eFhp/hZHPQYBcAMIf4C5z+CslulrqNXrRb7vDDNnIKAlvcDbqMJilk9hcxh7drdgKKla Rnj4c7c79GzBrky3yV6aTdNWAda30RZ5pFROVn13SVp3ktPL/43ZPS0aQX0Hqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rktx72mZMzyHM; Mon, 11 Sep 2023 17:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BHSxmo040610; Mon, 11 Sep 2023 17:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHSxPj040607; Mon, 11 Sep 2023 17:28:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:28:59 GMT Message-Id: <202309111728.38BHSxPj040607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 43842be195da - stable/12 - OpenSSL: Regen manual pages for OpenSSL 1.1.1w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 43842be195dabebb0ae35169d042fe5e99c5418e Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=43842be195dabebb0ae35169d042fe5e99c5418e commit 43842be195dabebb0ae35169d042fe5e99c5418e Author: Jung-uk Kim AuthorDate: 2023-09-11 17:28:31 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:28:31 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1w --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 4 ++-- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_printf.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_push.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add_word.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_rand.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_swap.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_zero.3 | 4 ++-- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_compress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_final.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_sign.3 | 8 ++++---- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 4 ++-- secure/lib/libcrypto/man/man3/DES_random_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 4 ++-- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aes.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aria.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_des.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md5.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 4 ++-- secure/lib/libcrypto/man/man3/HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/MD5.3 | 4 ++-- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 4 ++-- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_egd.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_validate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_clear.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_pending.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_want.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_write.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_create_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_digest.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_X509.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 4 ++-- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 4 ++-- secure/lib/libcrypto/man/man5/x509v3_config.5 | 4 ++-- secure/lib/libcrypto/man/man7/Ed25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 4 ++-- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 4 ++-- secure/lib/libcrypto/man/man7/SM2.7 | 4 ++-- secure/lib/libcrypto/man/man7/X25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/bio.7 | 4 ++-- secure/lib/libcrypto/man/man7/ct.7 | 4 ++-- secure/lib/libcrypto/man/man7/des_modes.7 | 4 ++-- secure/lib/libcrypto/man/man7/evp.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store.7 | 4 ++-- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 4 ++-- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 4 ++-- secure/lib/libcrypto/man/man7/scrypt.7 | 4 ++-- secure/lib/libcrypto/man/man7/ssl.7 | 4 ++-- secure/lib/libcrypto/man/man7/x509.7 | 4 ++-- secure/usr.bin/openssl/man/CA.pl.1 | 4 ++-- secure/usr.bin/openssl/man/asn1parse.1 | 4 ++-- secure/usr.bin/openssl/man/ca.1 | 4 ++-- secure/usr.bin/openssl/man/ciphers.1 | 4 ++-- secure/usr.bin/openssl/man/cms.1 | 4 ++-- secure/usr.bin/openssl/man/crl.1 | 4 ++-- secure/usr.bin/openssl/man/crl2pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/dgst.1 | 4 ++-- secure/usr.bin/openssl/man/dhparam.1 | 4 ++-- secure/usr.bin/openssl/man/dsa.1 | 4 ++-- secure/usr.bin/openssl/man/dsaparam.1 | 4 ++-- secure/usr.bin/openssl/man/ec.1 | 4 ++-- secure/usr.bin/openssl/man/ecparam.1 | 4 ++-- secure/usr.bin/openssl/man/enc.1 | 4 ++-- secure/usr.bin/openssl/man/engine.1 | 4 ++-- secure/usr.bin/openssl/man/errstr.1 | 4 ++-- secure/usr.bin/openssl/man/gendsa.1 | 4 ++-- secure/usr.bin/openssl/man/genpkey.1 | 4 ++-- secure/usr.bin/openssl/man/genrsa.1 | 4 ++-- secure/usr.bin/openssl/man/list.1 | 4 ++-- secure/usr.bin/openssl/man/nseq.1 | 4 ++-- secure/usr.bin/openssl/man/ocsp.1 | 4 ++-- secure/usr.bin/openssl/man/openssl.1 | 4 ++-- secure/usr.bin/openssl/man/passwd.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs12.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs8.1 | 4 ++-- secure/usr.bin/openssl/man/pkey.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyparam.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyutl.1 | 4 ++-- secure/usr.bin/openssl/man/prime.1 | 4 ++-- secure/usr.bin/openssl/man/rand.1 | 4 ++-- secure/usr.bin/openssl/man/req.1 | 4 ++-- secure/usr.bin/openssl/man/rsa.1 | 4 ++-- secure/usr.bin/openssl/man/rsautl.1 | 4 ++-- secure/usr.bin/openssl/man/s_client.1 | 4 ++-- secure/usr.bin/openssl/man/s_server.1 | 4 ++-- secure/usr.bin/openssl/man/s_time.1 | 4 ++-- secure/usr.bin/openssl/man/sess_id.1 | 4 ++-- secure/usr.bin/openssl/man/smime.1 | 4 ++-- secure/usr.bin/openssl/man/speed.1 | 4 ++-- secure/usr.bin/openssl/man/spkac.1 | 4 ++-- secure/usr.bin/openssl/man/srp.1 | 4 ++-- secure/usr.bin/openssl/man/storeutl.1 | 4 ++-- secure/usr.bin/openssl/man/ts.1 | 4 ++-- secure/usr.bin/openssl/man/tsget.1 | 4 ++-- secure/usr.bin/openssl/man/verify.1 | 4 ++-- secure/usr.bin/openssl/man/version.1 | 4 ++-- secure/usr.bin/openssl/man/x509.1 | 4 ++-- 535 files changed, 1072 insertions(+), 1072 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 76d23befcea2..68eacee7d00e 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,8 +3,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1v -OPENSSL_DATE= 2023-08-01 +OPENSSL_VER= 1.1.1w +OPENSSL_DATE= 2023-09-11 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 385b65a1f57a..2d8787d31487 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ADMISSIONS 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 3e7cfc2223f7..4421d0012528 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index 056eb016fe06..6b83902a0521 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index 9ad6dae7622d..a16f6153140c 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 631ac1c07009..eabb00f8ff57 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index 157b2389eb33..e4f0ef5d03b1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 38d8efcd109b..94d342e11a24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index fa6d233333c6..9cb79d051446 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 32f0f90b4422..71038b0131c3 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index 6354f8053f24..c086ed1abefe 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9d091a577ae0..43a657966d8d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 707354c38646..995482e568ac 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index 94286577dceb..6a1dc5ed8577 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 6979284edb61..0e07eeefb911 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index 1680ec8ddedd..978d6fd7e505 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDR 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index d9ef260a9541..798a7e99ab35 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index ec4eda157305..d65c4609cc77 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CONNECT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index 8e67876428d1..f13aabee4d88 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CTRL 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 8e85ff854025..f7ed3c0af9b7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index caecb053ed94..fb767e246edc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 775a375f5bf9..b05cfd7ecf8e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index 7778f5a4cf49..526297c272bf 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_MD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 799e399146e9..c557319fc30e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 *** 9742 LINES SKIPPED *** From nobody Mon Sep 11 17:36:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkv5S2h0Dz4sbDS; Mon, 11 Sep 2023 17:36:12 +0000 (UTC) (envelope-from rpokala@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 4Rkv5S2GDSz4WcR; Mon, 11 Sep 2023 17:36:12 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TAjj2a1OO0QwT00e0bA5DGmxkYHNFXwg77C8t/yUtuc=; b=iiWaLvgEooI2u2gTKfno8PX9+ZppSjyViVuRTPIwub9hTz3LG2Uo91/gCLajC9TvPCDHbj qnPoUByQSRsKJgBK99BbBE3TD3WHmBQQmtW63O2dWvvEAIw8NfHE7EUJHtGML5VJ83vW7R v4064SN3qmwYQ2zydyefaruynuMSIZSh8DGXivM4Ef+vRQfQYy8GC7S2ox7556Fz9/BTt2 WOxRNLN7qkUifYw4KTBGlVxO4SCLggXqxSVgNVn+GFz3dmk9maawPPreYpyDzTjzK9nLzy Gz5zpFwsrD+kL0XCd5UgUbv8U6wbn5/aTRQkwmoQXH/Jd0hrM6OMJ7SdRqJMtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694453772; a=rsa-sha256; cv=none; b=D8qNMmFRdBPt+iBvHqD3DP+8sCssvwJEBo5+tS2+sDp+KEx7I3Azd2CX3LkFnzswuAXOuy q7PCTSHrDgeGWqbtNjXSfVzd/MLjGD/ey5OcZJYvw3k2Rp6rBh2Fq9pkK8kP62rnIttqez RWJCO4s/KS6bzPwEYX+WtQaDRyJLtiJba9GTzslNK4t0jFXlAbhttk/uLNyEVld/ff8n0e 3kd5gnurWkxiJsqB6dO9RKO+JQ9hYDMWJCTm4ACzfmJ4xSAJGwnwPu5U4kzPXcWK35z+kC 6SqBJRdZI0phQVRWPbVhCoR9/0c0uhl+BcSvCCqtxE9Fi2Ych6pChoS9wFgvMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TAjj2a1OO0QwT00e0bA5DGmxkYHNFXwg77C8t/yUtuc=; b=DUpEvqSfyLVNUjssdM7UrS1kiuaesP/Pc7l3DOFQLWrWWHnN7HOgdnL/q76xMw6hjAxDMP JA7ce7PBPG08Av3m3k6LEMUKss4XKNFuir/i5q5OGnJSri49wHEUA3PoK5n2NX3fbecrBn Oh6dgG46AE2YT0Ba/C3gXH3cg/JaDgCzlyXnM+uBhvRaQCz7Mpg3GyVFiOjzjOKlNxQzRR tjZKOUt/B74MDHQDVRfhevZCrmNug4EIueakSN2Txo8ITfvSScHC34I6STMX8jcgzME3he DnxFZbNVzQzxnDPCHlU32nhapZLJ5S5/WBlh7QbGdnO45g4ig8vGOazs20s2Pw== Received: from [192.168.1.12] (c-98-248-120-44.hsd1.ca.comcast.net [98.248.120.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rkv5R4TzBz1785; Mon, 11 Sep 2023 17:36:11 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.76.23082700 Date: Mon, 11 Sep 2023 10:36:07 -0700 Subject: Re: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" From: Ravi Pokala To: Doug Moore , , , Message-ID: <4D14E962-56B8-4C06-9252-0BEEDFA465AE@panasas.com> Thread-Topic: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pctrie code" References: <202309110835.38B8Zl9t059626@gitrepo.freebsd.org> <25DD750F-38F2-4151-9E34-350844CE705C@panasas.com> <835d7376-4289-9ec5-415f-e94ea2c9b6d2@freebsd.org> In-Reply-To: <835d7376-4289-9ec5-415f-e94ea2c9b6d2@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable Thanks! -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: Doug Moore > Date: Monday, September 11, 2023 at 10:26 To: Ravi Pokala >, >, >, > Subject: Re: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use pc= trie code" Because jenkins reported failures on most of the non-amd64=20 architectures, and leaving 'main' broken while I figured out the problem=20 was not a sensible choice. Doug On 9/11/23 12:21, Ravi Pokala wrote: > Hi Doug, > >> Revert "radix_trie: have vm_radix use pctrie code" > That's "what", not "why". Why are you reverting the change? > > Thanks, > > Ravi (rpokala@) > > =EF=BB=BF-----Original Message----- > From: >> on behalf of Doug Moore >> > Date: Monday, September 11, 2023 at 01:35 > To: >>, >>, <= dev-commits-src-main@FreeBSD.org <= mailto:dev-commits-src-main@FreeBSD.org >> > Subject: git: 6cec93da46c4 - main - Revert "radix_trie: have vm_radix use= pctrie code" > > > The branch main has been updated by dougm: > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D6cec93da46c4a91a042b0be48884= 4052c0f8985a > > > commit 6cec93da46c4a91a042b0be488844052c0f8985a > Author: Doug Moore >> > AuthorDate: 2023-09-11 08:34:46 +0000 > Commit: Doug Moore >> > CommitDate: 2023-09-11 08:35:36 +0000 > > > Revert "radix_trie: have vm_radix use pctrie code" > > > This reverts commit a494d30465f21e8cb014a5c788a43001397325d7. > --- > sys/vm/_vm_radix.h | 9 +- > sys/vm/vm_radix.c | 696 +++++++++++++++++++++++++++++++++++++++++++++++++= +++- > sys/vm/vm_radix.h | 113 ++------- > 3 files changed, 709 insertions(+), 109 deletions(-) > > > diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h > index 2d9b05c7b52a..01eb25a9dccf 100644 > --- a/sys/vm/_vm_radix.h > +++ b/sys/vm/_vm_radix.h > @@ -31,13 +31,16 @@ > #ifndef __VM_RADIX_H_ > #define __VM_RADIX_H_ > > > -#include > +/* > + * Radix tree node. > + */ > +struct vm_radix_node; > > > /* > - * Radix tree > + * Radix tree root. > */ > struct vm_radix { > - struct pctrie rt_trie; > + struct vm_radix_node *rt_root; > }; > > > #endif /* !__VM_RADIX_H_ */ > diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c > index b8c693eca66f..768a56ed76f7 100644 > --- a/sys/vm/vm_radix.c > +++ b/sys/vm/vm_radix.c > @@ -54,26 +54,302 @@ > #include "opt_ddb.h" > > > #include > -#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > > > #include > #include > +#include > +#include > #include > #include > > > +#ifdef DDB > +#include > +#endif > + > +/* > + * These widths should allow the pointers to a node's children to fit wi= thin > + * a single cache line. The extra levels from a narrow width should not = be > + * a problem thanks to path compression. > + */ > +#ifdef __LP64__ > +#define VM_RADIX_WIDTH 4 > +#else > +#define VM_RADIX_WIDTH 3 > +#endif > + > +#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) > +#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) > +#define VM_RADIX_LIMIT \ > + (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) > + > +#if VM_RADIX_WIDTH =3D=3D 3 > +typedef uint8_t rn_popmap_t; > +#elif VM_RADIX_WIDTH =3D=3D 4 > +typedef uint16_t rn_popmap_t; > +#elif VM_RADIX_WIDTH =3D=3D 5 > +typedef uint32_t rn_popmap_t; > +#else > +#error Unsupported width > +#endif > +_Static_assert(sizeof(rn_popmap_t) <=3D sizeof(int), > + "rn_popmap_t too wide"); > + > +/* Set of all flag bits stored in node pointers. */ > +#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) > +#define VM_RADIX_PAD VM_RADIX_FLAGS > + > +enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; > + > +struct vm_radix_node; > +typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; > + > +struct vm_radix_node { > + vm_pindex_t rn_owner; /* Owner of record. */ > + rn_popmap_t rn_popmap; /* Valid children. */ > + uint8_t rn_clev; /* Level * WIDTH. */ > + smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ > +}; > + > static uma_zone_t vm_radix_node_zone; > -smr_t vm_radix_smr; > +static smr_t vm_radix_smr; > + > +static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, > + enum vm_radix_access access); > > > -void * > -vm_radix_node_alloc(struct pctrie *ptree) > +/* > + * Map index to an array position for the children of rnode, > + */ > +static __inline int > +vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) > { > - return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); > + return ((index >> rnode->rn_clev) & VM_RADIX_MASK); > } > > > -void > -vm_radix_node_free(struct pctrie *ptree, void *node) > +/* > + * Returns true if index does not belong to the specified rnode. Otherwi= se, > + * sets slot value, and returns false. > + */ > +static __inline bool > +vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *sl= ot) > +{ > + index =3D (index - rnode->rn_owner) >> rnode->rn_clev; > + if (index >=3D VM_RADIX_COUNT) > + return (true); > + *slot =3D index; > + return (false); > +} > + > +/* > + * Allocate a radix node. > + */ > +static struct vm_radix_node * > +vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) > +{ > + struct vm_radix_node *rnode; > + > + rnode =3D uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); > + if (rnode =3D=3D NULL) > + return (NULL); > + > + /* > + * We want to clear the last child pointer after the final section > + * has exited so lookup can not return false negatives. It is done > + * here because it will be cache-cold in the dtor callback. > + */ > + if (rnode->rn_popmap !=3D 0) { > + vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], > + VM_RADIX_NULL, UNSERIALIZED); > + rnode->rn_popmap =3D 0; > + } > + > + /* > + * From the highest-order bit where the indexes differ, > + * compute the highest level in the trie where they differ. Then, > + * compute the least index of this subtrie. > + */ > + KASSERT(index !=3D newind, ("%s: passing the same key value %jx", > + __func__, (uintmax_t)index)); > + _Static_assert(sizeof(long long) >=3D sizeof(vm_pindex_t), > + "vm_pindex_t too wide"); > + _Static_assert(sizeof(vm_pindex_t) * NBBY <=3D > + (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); > + rnode->rn_clev =3D rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); > + rnode->rn_owner =3D VM_RADIX_COUNT; > + rnode->rn_owner =3D index & -(rnode->rn_owner << rnode->rn_clev); > + return (rnode); > +} > + > +/* > + * Free radix node. > + */ > +static __inline void > +vm_radix_node_put(struct vm_radix_node *rnode) > +{ > +#ifdef INVARIANTS > + int slot; > + > + KASSERT(powerof2(rnode->rn_popmap), > + ("vm_radix_node_put: rnode %p has too many children %04x", rnode, > + rnode->rn_popmap)); > + for (slot =3D 0; slot < VM_RADIX_COUNT; slot++) { > + if ((rnode->rn_popmap & (1 << slot)) !=3D 0) > + continue; > + KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) =3D=3D > + VM_RADIX_NULL, > + ("vm_radix_node_put: rnode %p has a child", rnode)); > + } > +#endif > + uma_zfree_smr(vm_radix_node_zone, rnode); > +} > + > +/* > + * Fetch a node pointer from a slot in another node. > + */ > +static __inline struct vm_radix_node * > +vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) > +{ > + > + switch (access) { > + case UNSERIALIZED: > + return (smr_unserialized_load(p, true)); > + case LOCKED: > + return (smr_serialized_load(p, true)); > + case SMR: > + return (smr_entered_load(p, vm_radix_smr)); > + } > + __assert_unreachable(); > +} > + > +static __inline void > +vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, > + enum vm_radix_access access) > +{ > + > + switch (access) { > + case UNSERIALIZED: > + smr_unserialized_store(p, v, true); > + break; > + case LOCKED: > + smr_serialized_store(p, v, true); > + break; > + case SMR: > + panic("vm_radix_node_store: Not supported in smr section."); > + } > +} > + > +/* > + * Get the root node for a radix tree. > + */ > +static __inline struct vm_radix_node * > +vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) > +{ > + > + return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); > +} > + > +/* > + * Set the root node for a radix tree. > + */ > +static __inline void > +vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, > + enum vm_radix_access access) > +{ > + > + vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); > +} > + > +/* > + * Returns TRUE if the specified radix node is a leaf and FALSE otherwis= e. > + */ > +static __inline bool > +vm_radix_isleaf(struct vm_radix_node *rnode) > +{ > + > + return (((uintptr_t)rnode & VM_RADIX_ISLEAF) !=3D 0); > +} > + > +/* > + * Returns page cast to radix node with leaf bit set. > + */ > +static __inline struct vm_radix_node * > +vm_radix_toleaf(vm_page_t page) > +{ > + return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); > +} > + > +/* > + * Returns the associated page extracted from rnode. > + */ > +static __inline vm_page_t > +vm_radix_topage(struct vm_radix_node *rnode) > +{ > + > + return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); > +} > + > +/* > + * Make 'child' a child of 'rnode'. > + */ > +static __inline void > +vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, > + struct vm_radix_node *child, enum vm_radix_access access) > +{ > + int slot; > + > + slot =3D vm_radix_slot(rnode, index); > + vm_radix_node_store(&rnode->rn_child[slot], child, access); > + rnode->rn_popmap ^=3D 1 << slot; > + KASSERT((rnode->rn_popmap & (1 << slot)) !=3D 0, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > +} > + > +/* > + * Internal helper for vm_radix_reclaim_allnodes(). > + * This function is recursive. > + */ > +static void > +vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) > +{ > + struct vm_radix_node *child; > + int slot; > + > + while (rnode->rn_popmap !=3D 0) { > + slot =3D ffs(rnode->rn_popmap) - 1; > + child =3D vm_radix_node_load(&rnode->rn_child[slot], > + UNSERIALIZED); > + KASSERT(child !=3D VM_RADIX_NULL, > + ("%s: bad popmap slot %d in rnode %p", > + __func__, slot, rnode)); > + if (!vm_radix_isleaf(child)) > + vm_radix_reclaim_allnodes_int(child); > + rnode->rn_popmap ^=3D 1 << slot; > + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, > + UNSERIALIZED); > + } > + vm_radix_node_put(rnode); > +} > + > +/* > + * radix node zone initializer. > + */ > +static int > +vm_radix_zone_init(void *mem, int size, int flags) > { > - uma_zfree_smr(vm_radix_node_zone, node); > + struct vm_radix_node *rnode; > + > + rnode =3D mem; > + rnode->rn_popmap =3D 0; > + for (int i =3D 0; i < nitems(rnode->rn_child); i++) > + vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, > + UNSERIALIZED); > + return (0); > } > > > #ifndef UMA_MD_SMALL_ALLOC > @@ -107,14 +383,412 @@ void > vm_radix_zinit(void) > { > > > - vm_radix_node_zone =3D uma_zcreate("RADIX NODE", pctrie_node_size(), > - NULL, NULL, pctrie_zone_init, NULL, > - PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); > + vm_radix_node_zone =3D uma_zcreate("RADIX NODE", > + sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, > + VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); > vm_radix_smr =3D uma_zone_get_smr(vm_radix_node_zone); > } > > > +/* > + * Inserts the key-value pair into the trie. > + * Panics if the key already exists. > + */ > +int > +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) > +{ > + vm_pindex_t index, newind; > + struct vm_radix_node *leaf, *parent, *rnode; > + smrnode_t *parentp; > + int slot; > + > + index =3D page->pindex; > + leaf =3D vm_radix_toleaf(page); > + > + /* > + * The owner of record for root is not really important because it > + * will never be used. > + */ > + rnode =3D vm_radix_root_load(rtree, LOCKED); > + parent =3D NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if (rnode =3D=3D VM_RADIX_NULL) { > + if (parent =3D=3D NULL) > + rtree->rt_root =3D leaf; > + else > + vm_radix_addnode(parent, index, leaf, > + LOCKED); > + return (0); > + } > + newind =3D vm_radix_topage(rnode)->pindex; > + if (newind =3D=3D index) > + panic("%s: key %jx is already present", > + __func__, (uintmax_t)index); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + newind =3D rnode->rn_owner; > + break; > + } > + parent =3D rnode; > + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + > + /* > + * A new node is needed because the right insertion level is reached. > + * Setup the new intermediate node and add the 2 children: the > + * new object and the older edge or object. > + */ > + parentp =3D (parent !=3D NULL) ? &parent->rn_child[slot]: > + (smrnode_t *)&rtree->rt_root; > + parent =3D vm_radix_node_get(index, newind); > + if (parent =3D=3D NULL) > + return (ENOMEM); > + /* These writes are not yet visible due to ordering. */ > + vm_radix_addnode(parent, index, leaf, UNSERIALIZED); > + vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); > + /* Serializing write to make the above visible. */ > + vm_radix_node_store(parentp, parent, LOCKED); > + return (0); > +} > + > +/* > + * Returns the value stored at the index. If the index is not present, > + * NULL is returned. > + */ > +static __always_inline vm_page_t > +_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, > + enum vm_radix_access access) > +{ > + struct vm_radix_node *rnode; > + vm_page_t m; > + int slot; > + > + rnode =3D vm_radix_root_load(rtree, access); > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && > + m->pindex =3D=3D index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) > + break; > + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], access); > + } > + return (NULL); > +} > + > +/* > + * Returns the value stored at the index assuming there is an external l= ock. > + * > + * If the index is not present, NULL is returned. > + */ > +vm_page_t > +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) > +{ > + > + return _vm_radix_lookup(rtree, index, LOCKED); > +} > + > +/* > + * Returns the value stored at the index without requiring an external l= ock. > + * > + * If the index is not present, NULL is returned. > + */ > +vm_page_t > +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) > +{ > + vm_page_t m; > + > + smr_enter(vm_radix_smr); > + m =3D _vm_radix_lookup(rtree, index, SMR); > + smr_exit(vm_radix_smr); > + > + return (m); > +} > + > +/* > + * Returns the page with the least pindex that is greater than or equal = to the > + * specified pindex, or NULL if there are no such pages. > + * > + * Requires that access be externally synchronized by a lock. > + */ > +vm_page_t > +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *rnode, *succ; > + vm_page_t m; > + int slot; > + > + /* > + * Descend the trie as if performing an ordinary lookup for the page > + * with the specified pindex. However, unlike an ordinary lookup, as we > + * descend the trie, we use "succ" to remember the last branching-off > + * point, that is, the interior node under which the page with the least > + * pindex that is both outside our current path down the trie and more > + * than the specified pindex resides. (The node's popmap makes it fast > + * and easy to recognize a branching-off point.) If our ordinary lookup > + * fails to yield a page with a pindex that is greater than or equal to > + * the specified pindex, then we will exit this loop and perform a > + * lookup starting from "succ". If "succ" is not NULL, then that lookup > + * is guaranteed to succeed. > + */ > + rnode =3D vm_radix_root_load(rtree, LOCKED); > + succ =3D NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && > + m->pindex >=3D index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + /* > + * If all pages in this subtree have pindex > index, > + * then the page in this subtree with the least pindex > + * is the answer. > + */ > + if (rnode->rn_owner > index) > + succ =3D rnode; > + break; > + } > + > + /* > + * Just in case the next search step leads to a subtree of all > + * pages with pindex < index, check popmap to see if a next > + * bigger step, to a subtree of all pages with pindex > index, > + * is available. If so, remember to restart the search here. > + */ > + if ((rnode->rn_popmap >> slot) > 1) > + succ =3D rnode; > + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + > + /* > + * Restart the search from the last place visited in the subtree that > + * included some pages with pindex > index, if there was such a place. > + */ > + if (succ =3D=3D NULL) > + return (NULL); > + if (succ !=3D rnode) { > + /* > + * Take a step to the next bigger sibling of the node chosen > + * last time. In that subtree, all pages have pindex > index. > + */ > + slot =3D vm_radix_slot(succ, index) + 1; > + KASSERT((succ->rn_popmap >> slot) !=3D 0, > + ("%s: no popmap siblings past slot %d in node %p", > + __func__, slot, succ)); > + slot +=3D ffs(succ->rn_popmap >> slot) - 1; > + succ =3D vm_radix_node_load(&succ->rn_child[slot], LOCKED); > + } > + > + /* > + * Find the page in the subtree rooted at "succ" with the least pindex. > + */ > + while (!vm_radix_isleaf(succ)) { > + KASSERT(succ->rn_popmap !=3D 0, > + ("%s: no popmap children in node %p", __func__, succ)); > + slot =3D ffs(succ->rn_popmap) - 1; > + succ =3D vm_radix_node_load(&succ->rn_child[slot], LOCKED); > + } > + return (vm_radix_topage(succ)); > +} > + > +/* > + * Returns the page with the greatest pindex that is less than or equal = to the > + * specified pindex, or NULL if there are no such pages. > + * > + * Requires that access be externally synchronized by a lock. > + */ > +vm_page_t > +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *pred, *rnode; > + vm_page_t m; > + int slot; > + > + /* > + * Mirror the implementation of vm_radix_lookup_ge, described above. > + */ > + rnode =3D vm_radix_root_load(rtree, LOCKED); > + pred =3D NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && > + m->pindex <=3D index) > + return (m); > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) { > + if (rnode->rn_owner < index) > + pred =3D rnode; > + break; > + } > + if ((rnode->rn_popmap & ((1 << slot) - 1)) !=3D 0) > + pred =3D rnode; > + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + if (pred =3D=3D NULL) > + return (NULL); > + if (pred !=3D rnode) { > + slot =3D vm_radix_slot(pred, index); > + KASSERT((pred->rn_popmap & ((1 << slot) - 1)) !=3D 0, > + ("%s: no popmap siblings before slot %d in node %p", > + __func__, slot, pred)); > + slot =3D fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; > + pred =3D vm_radix_node_load(&pred->rn_child[slot], LOCKED); > + } > + while (!vm_radix_isleaf(pred)) { > + KASSERT(pred->rn_popmap !=3D 0, > + ("%s: no popmap children in node %p", __func__, pred)); > + slot =3D fls(pred->rn_popmap) - 1; > + pred =3D vm_radix_node_load(&pred->rn_child[slot], LOCKED); > + } > + return (vm_radix_topage(pred)); > +} > + > +/* > + * Remove the specified index from the trie, and return the value stored= at > + * that index. If the index is not present, return NULL. > + */ > +vm_page_t > +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) > +{ > + struct vm_radix_node *child, *parent, *rnode; > + vm_page_t m; > + int slot; > + > + rnode =3D NULL; > + child =3D vm_radix_root_load(rtree, LOCKED); > + for (;;) { > + if (vm_radix_isleaf(child)) > + break; > + parent =3D rnode; > + rnode =3D child; > + slot =3D vm_radix_slot(rnode, index); > + child =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + if ((m =3D vm_radix_topage(child)) =3D=3D NULL || m->pindex !=3D index) > + return (NULL); > + if (rnode =3D=3D NULL) { > + vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); > + return (m); > + } > + KASSERT((rnode->rn_popmap & (1 << slot)) !=3D 0, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > + rnode->rn_popmap ^=3D 1 << slot; > + vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); > + if (!powerof2(rnode->rn_popmap)) > + return (m); > + KASSERT(rnode->rn_popmap !=3D 0, ("%s: bad popmap all zeroes", __func__))= ; > + slot =3D ffs(rnode->rn_popmap) - 1; > + child =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + KASSERT(child !=3D VM_RADIX_NULL, > + ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); > + if (parent =3D=3D NULL) > + vm_radix_root_store(rtree, child, LOCKED); > + else { > + slot =3D vm_radix_slot(parent, index); > + KASSERT(rnode =3D=3D > + vm_radix_node_load(&parent->rn_child[slot], LOCKED), > + ("%s: invalid child value", __func__)); > + vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); > + } > + /* > + * The child is still valid and we can not zero the > + * pointer until all smr references are gone. > + */ > + vm_radix_node_put(rnode); > + return (m); > +} > + > +/* > + * Remove and free all the nodes from the radix tree. > + * This function is recursive but there is a tight control on it as the > + * maximum depth of the tree is fixed. > + */ > +void > +vm_radix_reclaim_allnodes(struct vm_radix *rtree) > +{ > + struct vm_radix_node *root; > + > + root =3D vm_radix_root_load(rtree, LOCKED); > + if (root =3D=3D VM_RADIX_NULL) > + return; > + vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); > + if (!vm_radix_isleaf(root)) > + vm_radix_reclaim_allnodes_int(root); > +} > + > +/* > + * Replace an existing page in the trie with another one. > + * Panics if there is not an old page in the trie at the new page's inde= x. > + */ > +vm_page_t > +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) > +{ > + struct vm_radix_node *leaf, *parent, *rnode; > + vm_page_t m; > + vm_pindex_t index; > + int slot; > + > + leaf =3D vm_radix_toleaf(newpage); > + index =3D newpage->pindex; > + rnode =3D vm_radix_root_load(rtree, LOCKED); > + parent =3D NULL; > + for (;;) { > + if (vm_radix_isleaf(rnode)) { > + if ((m =3D vm_radix_topage(rnode)) !=3D NULL && > + m->pindex =3D=3D index) { > + if (parent =3D=3D NULL) > + rtree->rt_root =3D leaf; > + else > + vm_radix_node_store( > + &parent->rn_child[slot], leaf, > + LOCKED); > + return (m); > + } > + break; > + } > + if (vm_radix_keybarr(rnode, index, &slot)) > + break; > + parent =3D rnode; > + rnode =3D vm_radix_node_load(&rnode->rn_child[slot], LOCKED); > + } > + panic("%s: original replacing page not found", __func__); > +} > + > void > vm_radix_wait(void) > { > uma_zwait(vm_radix_node_zone); > } > + > +#ifdef DDB > +/* > + * Show details about the given radix node. > + */ > +DB_SHOW_COMMAND(radixnode, db_show_radixnode) > +{ > + struct vm_radix_node *rnode, *tmp; > + int slot; > + rn_popmap_t popmap; > + > + if (!have_addr) > + return; > + rnode =3D (struct vm_radix_node *)addr; > + db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", > + (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, > + rnode->rn_clev / VM_RADIX_WIDTH); > + for (popmap =3D rnode->rn_popmap; popmap !=3D 0; popmap ^=3D 1 << slot) { > + slot =3D ffs(popmap) - 1; > + tmp =3D vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); > + db_printf("slot: %d, val: %p, page: %p, clev: %d\n", > + slot, (void *)tmp, > + vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, > + rnode->rn_clev / VM_RADIX_WIDTH); > + } > +} > +#endif /* DDB */ > diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h > index a332618fc0e6..231edda65102 100644 > --- a/sys/vm/vm_radix.h > +++ b/sys/vm/vm_radix.h > @@ -34,113 +34,36 @@ > #include > > > #ifdef _KERNEL > -#include > -#include > > > +int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); > void vm_radix_wait(void); > +vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t i= ndex); > +void vm_radix_reclaim_allnodes(struct vm_radix *rtree); > +vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); > +vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); > void vm_radix_zinit(void); > -void *vm_radix_node_alloc(struct pctrie *ptree); > -void vm_radix_node_free(struct pctrie *ptree, void *node); > -extern smr_t vm_radix_smr; > - > -static __inline void > -vm_radix_init(struct vm_radix *rtree) > -{ > - pctrie_init(&rtree->rt_trie); > -} > - > -static __inline bool > -vm_radix_is_empty(struct vm_radix *rtree) > -{ > - return (pctrie_is_empty(&rtree->rt_trie)); > -} > - > -PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_rad= ix_node_free, > - vm_radix_smr); > > > /* > - * Inserts the key-value pair into the trie. > - * Panics if the key already exists. > + * Each search path in the trie terminates at a leaf, which is a pointer= to a > + * page marked with a set 1-bit. A leaf may be associated with a null po= inter > + * to indicate no page there. > */ > -static __inline int > -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) > -{ > - return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); > -} > - > -/* > - * Returns the value stored at the index assuming there is an external l= ock. > - * > - * If the index is not present, NULL is returned. > - */ > -static __inline vm_page_t > -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); > -} > - > -/* > - * Returns the value stored at the index without requiring an external l= ock. > - * > - * If the index is not present, NULL is returned. > - */ > -static __inline vm_page_t > -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); > -} > +#define VM_RADIX_ISLEAF 0x1 > +#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF > > > -/* > - * Returns the page with the least pindex that is greater than or equal = to the > - * specified pindex, or NULL if there are no such pages. > - * > - * Requires that access be externally synchronized by a lock. > - */ > -static __inline vm_page_t > -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); > -} > - > -/* > - * Returns the page with the greatest pindex that is less than or equal = to the > - * specified pindex, or NULL if there are no such pages. > - * > - * Requires that access be externally synchronized by a lock. > - */ > -static __inline vm_page_t > -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); > -} > - > -/* > - * Remove the specified index from the trie, and return the value stored= at > - * that index. If the index is not present, return NULL. > - */ > -static __inline vm_page_t > -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) > -{ > - return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); > -} > - > -/* > - * Remove and free all the nodes from the radix tree. > - */ > static __inline void > -vm_radix_reclaim_allnodes(struct vm_radix *rtree) > +vm_radix_init(struct vm_radix *rtree) > { > - VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); > + rtree->rt_root =3D VM_RADIX_NULL; > } > > > -/* > - * Replace an existing page in the trie with another one. > - * Panics if there is not an old page in the trie at the new page's inde= x. > - */ > -static __inline vm_page_t > -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) > +static __inline bool > +vm_radix_is_empty(struct vm_radix *rtree) > { > - return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); > + return (rtree->rt_root =3D=3D VM_RADIX_NULL); > } > > > #endif /* _KERNEL */ > > > > From nobody Mon Sep 11 18:05:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkvl66v00z4stg9; Mon, 11 Sep 2023 18:05: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 4Rkvl66Rzhz4g6Z; Mon, 11 Sep 2023 18:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694455522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgwVdFmZLgBrVkExRx1rev4lipMm+u+drLW1bpXC/Xc=; b=GvS8NHvmZdJqUqXaUoUsDFCrh+Deu4nLtNqGteLFG+qaHiUTemO3amfej9DPAK5RjWOySv 4WExJvgJB3ILGPp6FWjQdqXLRDDay/prg7H0ZQIIecDfhfFkIrTGBdfTcITGkfUf+EVr8v bP4yhwXelUSc+t+xQPZXKT53YZal3k1NI5q0jcbQk0EvmR4qZcJzT/GCHIWvcqHNCvV7eu VD8/3GjVqRa+8QKSslge6ie77b6FupEQfAOszAmctWdEjJYvWb7FHqfol/wA0NkYAR9/cQ nuY6mBXSrOfjzTbS6kgCRshl8ighjCtv5Q7UbIAerUFZ3sjy4wvyxs3Womm2uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694455522; a=rsa-sha256; cv=none; b=UDxMsYu0UCSfyb2QxYJJnvE7M4EZsKNrMf0vHSBNi4/oycG8SQFr1eyoQg0BtaGUdknDjm XXWjY+sT0KLNK9OMVaW5RjOcKfWDy5erD7nQnYkK7LklALfbOsnzqsZCPP7U3g5K+1WZSw 5ioxJb1dMgzgy/0R0PW+Px64LxaE9HgFftBPr0i9hFkFEPusnPeu2mve6NDO0jWQdqHpn+ nlQpqfbp+PkGM2p6rFQgOd27dMSTQVf3QjXhL8GnAdixcM3V9STKTtyforfYheQhN8vgZP aOxbSgxgFoqszNoxrfgBpwFkGOUyLby29/lAQQCaGd2HmVGVSrs9YsxflkFazA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694455522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgwVdFmZLgBrVkExRx1rev4lipMm+u+drLW1bpXC/Xc=; b=d4+6MepXnM4YN9V0PXFba04aSSSY0X2zEzUo91n9m4ofdJlgjrM5hqtEm5qjzlSHYZcOI3 GlL7JzJamH/UHBUleSAPFW4WwjwAYruk1yCIG5NIM2sG3nVSCQNgb3+R0Pap6j35zjOV4d x/8PUqxmFEMj9bb4Fpw37K/dKkLj/gqEXiw0U2yJTnLIxe3RJFNct0tKa0i30RzXiErRzC QF31ek0zbN6+v7ABGdpf4NX2uhmfhWrXEEvRwS8i28e/1vYQY9ehKfEmnjjOkjGXl4YsRA DjScGW967r0uxIOqJNIkEdlRZqj/lrKjdKL0puupKYs/Y/T1E1Tok0u4HYAgig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkvl65PPBz10Pp; Mon, 11 Sep 2023 18:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BI5MUC007417; Mon, 11 Sep 2023 18:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BI5M9Y007414; Mon, 11 Sep 2023 18:05:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:05:22 GMT Message-Id: <202309111805.38BI5M9Y007414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d13550f0c9c2 - main - stand/loader.efi: fix regression with ignoring nvstore List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 commit d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 Author: Gleb Smirnoff AuthorDate: 2023-09-11 18:04:48 +0000 Commit: Gleb Smirnoff CommitDate: 2023-09-11 18:04:48 +0000 stand/loader.efi: fix regression with ignoring nvstore To read/update the boot loader nvstore, we always need to call zfs_attach_nvstore() regardless of whether we use bootonce key in nvstore or the bootfs property of the pool. The call was unintentionally left in the block of code that is processed only when bootonce key is present. In particular this fixes broken 'nextboot -k'. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41795 Fixes: e3e2681d0ec28d6661fef6da76c9479049e2761c --- stand/efi/loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 39e32a56adc0..11b10dd44d5e 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -264,8 +264,8 @@ probe_zfs_currdev(uint64_t guid) printf("zfs bootonce: %s\n", buf); set_currdev(buf); setenv("zfs-bootonce", buf, 1); - (void)zfs_attach_nvstore(&currdev); } + (void)zfs_attach_nvstore(&currdev); return (sanity_check_currdev()); } From nobody Mon Sep 11 18:29:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkwHT0cKYz4t7Lw; Mon, 11 Sep 2023 18:29: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 4RkwHT09NNz3KB7; Mon, 11 Sep 2023 18:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUSUEnkPbRx3cDHcGpf9A0tTs7SY2T//Wi/PKmDe3YE=; b=mcasScf7MOb9PftL/O8wUNxtfuqFLz6ktvEC6pligCqOnERXc0eHsH8ON2Y59LB0urwwV7 2Kx1G4PzuFi4uUS4qy4WbJwLbwmExkx2V/Z/rOaueTaR0cXqQS19BL3pNlVmKXdO9Hl+zh rNAUk6UjoRhr25ZuYMAMSAcHZqOoGHYBGaFTGxBV21gzrmny11zG7gPDupOl8vQxXMLsIr y1p87kX0v/+KWABKcyxF0P1ocPbCaRO9u1g6N0x0306t3xJNZm4ZthXvYtQMvvS3965QBA fL9j23ro3//FLjBbR6B+c7VRu9gHuDjWWkoidao1pFxNgMQmxq76TxY3LJ7ltA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694456997; a=rsa-sha256; cv=none; b=p6l+NwemvXwjkSaZJltQ8RzrZuWJDtLuclgRetWnsh8BPpkIYCS2+GLu996JoKq2gZyVTH eQFeBeOcM5a0HaqsDOSgS+Bu0cDLNFAV5HhAaROgBf1uqQ/T9U+/5mvlrx01oPuJyPl2XO B/yJ2pp5Qd6piZqFnDKryBR1mun9clKnpJh+T5S7iO+mOlgPkcHUSCQRD1x3ywYrR1TUtq ufJLrYja3YAF6jhGM+uGEXMvNF1tMmrSwISv6G0qNgsL6crcAU5kyCQ1q0SDcIMIdk+57V 9/V/HTIFQNSsTAV422AA9lK6vYNbabYnxM7I1f+L47cEXE+/NfHf7hZFPyXVFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUSUEnkPbRx3cDHcGpf9A0tTs7SY2T//Wi/PKmDe3YE=; b=nTUonoOJRRKZpwR6IBYfUF3oU5iQdjp4jZl6rn7MgM1W//MsdgkpzUV7axOdaPxC9P/qMH s4cTNLDIeG7YcX+QR1x9YrMUFj1AXQxg9V1ZgW8jVgjgG2NnjpbymB/5Vu5yTlP2C3CzAe ClPrJZ3BGWqqtfh6zla5rIi+CLxmnPosDmqlE3wWm7+X8dM0DU1UEdtjIanQZQ6O8DoCSm lo2Ip8HAnkz2wyAWvAbrUmg5lMySKytUQBoxfyTfzJmCoJUp2E2lH/eBU1iMBX/tZ/430+ Efx1EXBUPiJTI/6s5khaTFNhDmTly0EZYa3Qd2I0KHB6BvoWX4X4ITRg59T7Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkwHS6Fhgz10Rc; Mon, 11 Sep 2023 18:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BITu9F040986; Mon, 11 Sep 2023 18:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BITuug040983; Mon, 11 Sep 2023 18:29:56 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:29:56 GMT Message-Id: <202309111829.38BITuug040983@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: 027d727d4071 - main - linux(4): Cleanup includes under arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027d727d4071435376017d3789fe603a8aec805a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=027d727d4071435376017d3789fe603a8aec805a commit 027d727d4071435376017d3789fe603a8aec805a Author: Dmitry Chagin AuthorDate: 2023-09-11 18:29:28 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 18:29:28 +0000 linux(4): Cleanup includes under arm64 No functional changes. MFC after: 1 week --- sys/arm64/linux/linux_machdep.c | 2 -- sys/arm64/linux/linux_sysvec.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 3ba5683941b5..3bc2923b9d4d 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -27,8 +27,6 @@ */ #include -#include -#include #include #include #include diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 3072732de768..5f9252accb5f 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -44,10 +44,8 @@ #include #include -#include #include -#include -#include +#include #include #include From nobody Mon Sep 11 18:29:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkwHV1Xfpz4t7cN; Mon, 11 Sep 2023 18:29: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 4RkwHV12m9z3KKM; Mon, 11 Sep 2023 18:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jn2yNhh3rI08/syFuxOsTwrez5KF65+tNO5yJdjN4t0=; b=GXvo/WxhzDKuicYIu5lpf1ZRa6fCvJSAqDY32QSJ7oC2VB84WzZac9Ti1AvVEVZH1W/l2Z fJmNTz6Y4Sf6FNXzaKR7hML3hj4QTeu/DzLp9zkp2sytny/DWf6XHdADsPSqWQodAZE1ul pHVcqKNqx7KDwj25urLvZ50BzIefx6ZF938XGFeqgugOY5/kW8sbqk+VKWmjeuIohPe/KP azYViVptnio1YFIbGklp2aQS6n6exo4BVI95emeqGGQEj/0hsB+RclJ5j5oh4wMR0gCgTL ZAyyDzEGRnqq/oOtOEtm0jq9u+ySQCs7nAdHoXX+dt9x2VdU19Ol5fRboaDDiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694456998; a=rsa-sha256; cv=none; b=B+R6WoQlre30SH/HpLbce5QtXQlAv64G81zHwm75eCWXqO0szSagx1yww1B7fnWuXDkvD6 GznpEeAyntIZt7nNHIE0SjQu3XtoVRLLeob/C9Y/dhbD5xchN8zUknmouEXAqJb/MTgRku lGC/+p7AYEiLCOsUftHvs6pzAtU7SKdWfYp6mpGAU9iy1IIUlXc1vTl0ilZfT2DvtqQXMu fIkxXdqBwo/Vwc3R4KqiYVanAFe7/1LUDjz1k18qcc5gZ8Cem3FRx7gEISnrMNZK9YcWRs Hvm6NYJX3MsUPT6k3X9HnZbfxzHyGoDQh7+1qCF3q8zNUDeC/UxTLKNwoyeRqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jn2yNhh3rI08/syFuxOsTwrez5KF65+tNO5yJdjN4t0=; b=wsRS/KeLgUCepfqyOUaRkhXPSPTWwMTTPvyuQi7flFCsV3gEKlrGBXZyGYIW8y1e5pCzGN 4RNVx6Kl7f3awCHEz/2O8JzZY/8yhNmFQ0GyrmFoYdpZOUq2teAb/mj/YF6QhWVtmVn4/F 869EQJ2rQh0UUCu/x82cZDmiwZOSF9Ojg2vDMQqu8uLCDqs8BiAwyxQ3VbDZEJdYGrslgr 2yNLrvfE3p5D53Gw0PiLR2pq69IhLeCKFPPvERWJwYYCU6YmCS67pYTKH3ZOPytZnfla3w maed3JkUfSMthVz6jSYieRwP91AG8O8kydTsG3+8gXRo+Uf+RQ45uavu/FXEKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkwHT6x8Hz10cC; Mon, 11 Sep 2023 18:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BITvGw041037; Mon, 11 Sep 2023 18:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BITvMI041034; Mon, 11 Sep 2023 18:29:57 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:29:57 GMT Message-Id: <202309111829.38BITvMI041034@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: 68df2376e0e5 - main - linux(4): Cleanup includes under amd64/linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68df2376e0e50cea0f8c3c04dc2d8a7b63515773 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=68df2376e0e50cea0f8c3c04dc2d8a7b63515773 commit 68df2376e0e50cea0f8c3c04dc2d8a7b63515773 Author: Dmitry Chagin AuthorDate: 2023-09-11 18:29:34 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 18:29:34 +0000 linux(4): Cleanup includes under amd64/linux No functional changes. MFC after: 1 week --- sys/amd64/linux/linux_machdep.c | 13 ------------- sys/amd64/linux/linux_sysvec.c | 7 +------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 33ce902a45bd..7ec1ec56bb95 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -41,25 +40,13 @@ #include #include -#include - -#include -#include -#include - -#include #include #include -#include -#include #include #include #include #include -#include -#include -#include #include #include diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 55eb34b6d329..2907323d903c 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -51,13 +50,9 @@ #include #include -#include -#include +#include -#include #include -#include -#include #include #include From nobody Mon Sep 11 18:29:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkwHW2Fttz4t7M3; Mon, 11 Sep 2023 18:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkwHW1kJYz3K8g; Mon, 11 Sep 2023 18:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ExFzoTgmgrFC6F+DzV6bxB1xvWTadZqUFUMlyDtmMk=; b=T7CoW4GYswbHqcbJJCIG5LS/axKV2BURxdieZMmJAXJRZAUfb6X+WXUXdZkIEK9FefY2bF Bn/ChkqTOGvYrmvnZ8WAVXbfb4fTm209OeGSJjRgL+po4jJa/kbVlNPHBrO8KyvSilySWC ZDjkUZPjH7vGCRsmLGRDBU5cNoKxobJ7+6hz51tc0xGFU+PpDgTmXGrkJLc7mSOY3h58OW ZyWN17bj6dCKVdXAOdF+F0JXDlsrNvOwTbNj9pPflkD1V6PhaybXQQQ57UagtJHRAfKXl/ 57n8OXWQNQkgivUAtDl+6MWZtTl52c17MFaqOVSkboCKE3DkyUHLhjz2LVWLfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694456999; a=rsa-sha256; cv=none; b=MX55fZmMg6wZPV/Z7VZXDy+MfPmBSXWYX7nJaHjtKLSxlucYryegNXSvcPowOBHDrwj3vb SpCVVY9t39/tWQ2rs1ryWcTC7JOMMj0z4p+toro2o4zGHqmlSO5Br96JAjerkmXbG6OW6v Ptizs/k/nxN8r0bCjoLM8wr1x+O8r6oU87K5SA4P5TWRUtYB7PGFg6jrNWJPSUiXFXXdjd d9P5+84ogkrEgr+zU4B8+0N9H34DFt1FsdI8FRCh/kmQ91fOConvUTsRQk2ltGshWHJsO1 KasmwRK60unu5STRbM2L4mjtktObwswpDzgb1GcJ5t69EqNnrKA8bQ8q+1y8Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694456999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ExFzoTgmgrFC6F+DzV6bxB1xvWTadZqUFUMlyDtmMk=; b=IlsPkq1qtBML7WVYfXqzrtWnQbFR0ceHBNCXwaPT5IaUlTf04QwEnuKkxn5iKqIbJU6qtq GpvqwHJYKZzm6LD2+/SLWMOfh8jweyoVcUce0aF5EK8e0K/yHBg8Pe3jyg3sNBpIhhZ+CJ g6cUNREuLYQptpCRucvVWyO7XFrSD9KDNgR+h/uBPtrkUtQmci7ypQmFFkv9L0qFIXyHdn dFYT7F1g/ckinaG9NNJvXb1O9ktPw7tC7argOmZu4iZzLORZOdBNliF4Pp04blcrj23iHc MK+AB9epRLyp1VnL2udSG3ophRwb3tm5IEoqByhlzcHuuhRaS9Jw4kMmrMobKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkwHW0prcz10Rd; Mon, 11 Sep 2023 18:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BITxgH041079; Mon, 11 Sep 2023 18:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BITxhk041076; Mon, 11 Sep 2023 18:29:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:29:59 GMT Message-Id: <202309111829.38BITxhk041076@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: ba90a31d08e4 - main - linux(4): Cleanup includes under amd64/linux32 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba90a31d08e413b82c1d1d4d697c2cdb32a13674 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ba90a31d08e413b82c1d1d4d697c2cdb32a13674 commit ba90a31d08e413b82c1d1d4d697c2cdb32a13674 Author: Dmitry Chagin AuthorDate: 2023-09-11 18:29:40 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 18:29:40 +0000 linux(4): Cleanup includes under amd64/linux32 No functional changes. MFC after: 1 week --- sys/amd64/linux32/linux32_machdep.c | 14 -------------- sys/amd64/linux32/linux32_sysvec.c | 7 +------ 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index e10502f9bd80..ba4dcc61af76 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -31,31 +31,17 @@ */ #include -#include -#include -#include #include -#include #include #include #include #include #include -#include #include -#include -#include -#include #include #include -#include -#include -#include - -#include - #include #include #include diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index f2a379a66860..31436ee7162a 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -40,12 +40,10 @@ #include #include -#include #include #include #include #include -#include #include #include #include @@ -57,12 +55,9 @@ #include #include #include -#include +#include -#include #include -#include -#include #include #include From nobody Mon Sep 11 18:50:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkwl536RPz4tL1d; Mon, 11 Sep 2023 18:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkwl52g4rz3RCZ; Mon, 11 Sep 2023 18:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aF/jRpvR2zT+qX8eBzyP52CgiDFaPzjw4ha4iaVAz5g=; b=vTOVN5JUAU5EDKgMmldvzzUGnWEBfYjDICiQ47nQ8ScxKlfj3CAQCIwuBFPozt3EC6r3mm 4JNPuZHgZH7P4PH8QgET0xo8LM523JtV6kTlBWzwvXtNufvHqJJs1+X2Xrxs2CTTVnuYTh OMqUbv9g2HrA64KA074cTLLabASBPZwncr2A5rlwy30q/fKZgpqHdvf5WKuFNUYPu73mNA xTEGG5i8JSCJ55qxgPs1k0dFhODiR6t6lhTJOVWCDTfFp4/bVdFkpJdviqlwGGM7lN2pHf V5c2hXDP8howIfVm4oEwzj5/BT4iIgqlhokGLj8VDv0uk6pG2A+QGWtVtfcbpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458225; a=rsa-sha256; cv=none; b=YfESWZZHp1MxSbyRuX1y5kFxBD473iq6onbJgpahPvc/CdBtSTEPBmWbrYkU7TjIl4K9iI Rvyxdf1e/x2Sb02FCMupmZVqaMBnYsnMfTnGwwAU+nwyKz5cUsh8Gbz+veZYglV/9me5zD 6M7CxzjLtWIz32bgnIIKLOCuganfN9UcyA/fz2z1sFRtgtScffNL1AcN46kla6eNfNjgpZ fVfTpv1YZwIkRNXf+07X9EZhKRmEuRVYXE4pPvoFI9UKvmW+d4H2lYUlFsxfCfM/y8NjQy pr1sXGqy49goOCwEmwL5rACQVZDFLD2sk8gtffZpHzvQnuYaTlOSLmPDpFKJbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aF/jRpvR2zT+qX8eBzyP52CgiDFaPzjw4ha4iaVAz5g=; b=Xwr6M9QjLJE2cpQF+H3BWJzPUErm1XYAnP6Cz6J0r9XihHYCUcmNnwWOv53qjblfpi6rNH 79In8vUti9iEfQ2BbeDl+mLpWdLImfniqZfy7eRJGeyqFTNaqTJ0AaAW9aMb/l0lk1JR31 +ok3q7e5h0RlJDAgVRhHexcAmG+pfQ6cIjpsOFralHz1NxQujXjE6tUFyMIyBt9PY/Zn/D todZjr02+OLH4TtnLXT9w0f+fPFq56TykJy65XTHqSymjyxRXiMwbP6cKvFm4zHVTe1xjU 5th01WQXOqRsR3GJ0UAf46ggDAT95kXVkyEkENrPMUIhGzvNwPDbgcPFRh42tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkwl51l4gz11C5; Mon, 11 Sep 2023 18:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BIoPPG083120; Mon, 11 Sep 2023 18:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoPDX083117; Mon, 11 Sep 2023 18:50:25 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:25 GMT Message-Id: <202309111850.38BIoPDX083117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8b95f9fe925e - stable/12 - msdosfs: correct handling of vnode pager size on file extension error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8b95f9fe925e844e5e763e50b592c4dddd113310 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b95f9fe925e844e5e763e50b592c4dddd113310 commit 8b95f9fe925e844e5e763e50b592c4dddd113310 Author: Konstantin Belousov AuthorDate: 2023-02-10 04:58:43 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:29 +0000 msdosfs: correct handling of vnode pager size on file extension error (cherry picked from commit e59180ea09a1d1d1463f2a269e94efa0f0b677c5) (cherry picked from commit 64152225022bea784ca1948a67e7c040a8bb040a) --- sys/fs/msdosfs/msdosfs_denode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index db9e0712d2b1..beb615ec7a34 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -365,10 +365,8 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) return (EINVAL); } - if (dep->de_FileSize < length) { - vnode_pager_setsize(DETOV(dep), length); + if (dep->de_FileSize < length) return deextend(dep, length, cred); - } /* * If the desired length is 0 then remember the starting cluster of @@ -509,6 +507,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } + vnode_pager_setsize(DETOV(dep), length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); From nobody Mon Sep 11 18:50:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkwl646Pdz4tL9J; Mon, 11 Sep 2023 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkwl63RmVz3RYk; Mon, 11 Sep 2023 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=HblH8mBH9AHjeV+7yFq3/0YWZ+EfOBR+OmQ5qK4sPpiSWSo4bnArYPU6nYLtdkxKJZfOLG H0Snw55F+Iard+OXteMo6tV33iUaUEJpf3sb7d8lwX4ysWFO4z+D8ynWRkb4z264SwL3IH fOT+Kos/M1Q9JMz4OjbOU6iu135h32kyvV0nkTJtg9gSsoTGISC88JW2tKzvEdi++WSKAZ Um+Q5j+2oRBkk2pfUlGXbLfXap9pWqRMtGmUZfB57KN1UwYCPgSDbIPDg1sWAmvWxrziko XHqcogSenLgdjJRQ3IpaXPHMlXG0crqgaFn+gY5Zc80bzKgavEMBIp3vGIMh0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458226; a=rsa-sha256; cv=none; b=rXeWMeOJh24+hLIbf5Pbuq7aIiW34kWsQnQBV2ufLWfG4hQJEVxufCr4NexXzG+h3Inpo9 uR310iGeCwdEgN7eYD8FlsTRZLoVQDE6Unr/UokwYmJKpWsDUAsEFKhR8Y1EMjbvlRfIG1 5cD34AKYIESAGN9ik/RlWnm8cIo7zU93TSxVWQ4taPKJyPrDz1/ol8lcKTU70qJtnhLEFo XfWuFDwhwRkiPteNHBa5dbnABrsCTQ3JfurmVYosVlqc8ZEQqSliW/Ac6SBmRaUZi31fAF 2kd9/qrPtR2fZ2N4/TbK+bsCYJgFZO4C0taQ3NvOGnvhBHwJ2O35FIKnYWXaVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=tJzcRQjcnidk5Jh2Z+c9V5N8xECMwVZcEm/2sY4Z2CzWS/f0u9bdVOWdQ9GwNpVY4Yi18z wp7VQ/9sxbTIs49w9iXSZxsDqT6P8qfVaQstNGBVT7aDHksh2JDfIH1dXF1N6qXuenT/00 1X2so5BnBjYVDKdppwLr4Qtemp8R7Yan8cTaTwVb/Bf5pR04tAxoseD6vxume/2waOp7ui 7QCg9KfNBE+QVsnWuHI6UTZy9Qg6yBNeoNTl7iQ/jlMWY182pTXkzUpuQ+PfD7niS3xTfZ fUANnpBk94OJwX2uyud5dUOWuIvim0ysNozS/oCA9eXd5HdHQqpC7ZuZGPW2Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkwl62YzLz11C6; Mon, 11 Sep 2023 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BIoQhq083159; Mon, 11 Sep 2023 18:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoQ1A083156; Mon, 11 Sep 2023 18:50:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:26 GMT Message-Id: <202309111850.38BIoQ1A083156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0754c27f4926 - stable/12 - msdosfs deextend(): memoize DETOV(dep) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0754c27f49262e395d5814947a334dbd5b077504 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0754c27f49262e395d5814947a334dbd5b077504 commit 0754c27f49262e395d5814947a334dbd5b077504 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:05:14 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:52 +0000 msdosfs deextend(): memoize DETOV(dep) (cherry picked from commit 67dc1e7b0457ec014a1291c5874decdefe7bffdd) (cherry picked from commit 03562adbefb80ba94bebe602fc051bbc4292cb37) --- sys/fs/msdosfs/msdosfs_denode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index beb615ec7a34..b251c2797467 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -475,13 +475,14 @@ int deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; + struct vnode *vp = DETOV(dep); u_long count; int error; /* * The root of a DOS filesystem cannot be extended. */ - if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp)) + if ((vp->v_vflag & VV_ROOT) != 0 && !FAT32(pmp)) return (EINVAL); /* @@ -507,10 +508,10 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } - vnode_pager_setsize(DETOV(dep), length); + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; - return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); + return (deupdat(dep, !DOINGASYNC(vp))); } /* From nobody Mon Sep 11 18:50:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkwl80SQYz4tLLF; Mon, 11 Sep 2023 18:50: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 4Rkwl74VZ8z3Rc5; Mon, 11 Sep 2023 18:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3bZjszuZxEevcDGZ6oq+oxB+LUQk5JaZZAKxx8F1Hs=; b=vhXBN6tH1iBr1ywseSPIxgoNVKKHbd1BCtvcTHC24wqW4KgxDEBtjZDAGF1qeytbCSYa3L 5Y9eStJQt2kF5/KV8VbuNAWamQKMnx+CLL97t/vpzo0eK9eZ0EXoO5EbYmzWk5SQaBoTfG 1A03D52UjjM10RoSjPmjSBE3G4uz1oqAvondHZ5Hq9aqlLUoaHy5zdjcxcm0sL/WSW+KzM mEOLJOmy3wUu4WUGFCTgzzLzAIGPLAWyDoI6ia+xAdts8+ZbQnZuTS6dCMlM1uIZAuDNbm RLTKwpPmE8OfSjlAFwYdh0qbMGdTxTTr2l9/5sqKGS1qaUYGM+nRl47O76uMgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458227; a=rsa-sha256; cv=none; b=JMVJwnpFhHgAw04hGvd65zIl1zAwEDZT5MP78Au2ySD8i9QuzDhBcZv2KMzNtFMmYqDdZe 2/8FSWnqiQKAxWRu+e+5xQSlvSHOGE/+0/PN+/clsEjaF8aFp5zXWQlTe8kE2VJjg3iwbC eIyLq5Y6tcd47roAeFPR+p4fc2xV8q7Diaw4QpVjBI5NPi88FzaO0IToIOwpHEXOuPVPLb ye4rvAx8iwNQms0RDT6ROuZY7EuXJietjolHxf9jjJDQv5ChQVYg8Akzvbpm0LzJ9tx3n4 qOc+wzRv8fvCNEyFwx0vpdTAOB065HEfGoQiCdP9E8xc/pxfQ08QwPK1JSqgCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e3bZjszuZxEevcDGZ6oq+oxB+LUQk5JaZZAKxx8F1Hs=; b=bjZo+fJnGP9CrflffpuM+BveFO60urrZ2MG6vWhDzvyudgSh85XEl5QttOQp9SH88GI54q u3fv9kpAS6CafTjT9hQyzjJdWvNxYTiKrpgXIUhssk6RZmF3uevEYstJIknZX37gUWgn4+ mmQL+yCUBpGSlbMJYCtGEmBozTZ2f7uiPB/xK4HBPlmV5GqxqyVsNV4SBoGuYSlqJpf2VJ +glPhpYACQNEyw1bxCWl9PHqS9TLI8SBtPCEXcnJ5+QuiwF0tzxP8biuLFl0o4uMnnEBtx 1HisVW3GV7I03U2n2UCD2LWAKL2C4vH2xcFPmz3ya6PB8zTrudS5rQaaS3dL3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkwl73bcDz10M7; Mon, 11 Sep 2023 18:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BIoRjN083211; Mon, 11 Sep 2023 18:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoR0O083208; Mon, 11 Sep 2023 18:50:27 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:27 GMT Message-Id: <202309111850.38BIoR0O083208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b2e3ab898cd2 - stable/12 - msdosfs deextend: validate pages of the partial buffer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b2e3ab898cd2a8517858f32cc7397cf026013548 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e3ab898cd2a8517858f32cc7397cf026013548 commit b2e3ab898cd2a8517858f32cc7397cf026013548 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:09:30 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:59 +0000 msdosfs deextend: validate pages of the partial buffer PR: 269341 (cherry picked from commit 0152d453a08fa2bad694dc04a8184fce2b7faa10) (cherry picked from commit c2ee668306bbe3edf4a05246ed3a88f52dfc94ae) --- sys/fs/msdosfs/msdosfs_denode.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index b251c2797467..57d1c96a561b 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -476,6 +476,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); + struct buf *bp; u_long count; int error; @@ -502,16 +503,41 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) if (count > pmp->pm_freeclustercount) return (ENOSPC); error = extendfile(dep, count, NULL, NULL, DE_CLEAR); - if (error) { - /* truncate the added clusters away again */ - (void) detrunc(dep, dep->de_FileSize, 0, cred); - return (error); - } + if (error != 0) + goto rewind; } + + /* + * For the case of cluster size larger than the page size, we + * need to ensure that the possibly dirty partial buffer at + * the old end of file is not filled with invalid pages by + * extension. Otherwise it has a contradictory state of + * B_CACHE | B_DELWRI but with invalid pages, and cannot be + * neither written out nor validated. + * + * Fix it by proactively clearing extended pages. + */ + error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, + NOCRED, &bp); + if (error != 0) + goto rewind; + vfs_bio_clrbuf(bp); + if (!DOINGASYNC(vp)) + (void)bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) + bawrite(bp); + else + bdwrite(bp); + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; return (deupdat(dep, !DOINGASYNC(vp))); + +rewind: + /* truncate the added clusters away again */ + (void)detrunc(dep, dep->de_FileSize, 0, cred); + return (error); } /* From nobody Mon Sep 11 18:50:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkwl86qznz4tLLJ; Mon, 11 Sep 2023 18:50: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 4Rkwl85Ss1z3Rnl; Mon, 11 Sep 2023 18:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEMdPyZKbYGK2hSh3krev31BQT8FYC4+KfDd1pq/HmU=; b=JRedIZLEMV0rPDizNNwhVofNUJI/tqmqsp8qR94rubpS2PGn2MdqWY9JABE7qZtyVBbOAE ncvRbrbd1SckTl95gcWGf6m8jz+B8T9znjv3ZwyGy+YdAbT9yo2GUoy1b3xKbi9OTgGK41 m6nRUFCesnU9ztWZ+LWscipNViqHs1l+EeMtRr86b43Z8abYGuQk5TQqhipmz4X+Eh0etS 6es1wJDhie+VRwYA7ExDox3E5CfmtgzKessdHmc+MYVau6LTKeLuC4JXRzM3RQ2VCSYlWc gg5IkcbeI7tcid8889JtcPvX9Ez14FR/i+MOZlrmsTxSPzRMMHc0aey03Uov8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458228; a=rsa-sha256; cv=none; b=AmNOXu//8MJo0Ypk/GhsPNTW8FBre0Y7HPnHwm8FX0HMP3QaHtlF8FP7DmDTPr6jXSWTZk tgqfgZ32g/RmNTdRfxAfAZeUxObqCeCUZlUUEOiyY43Cs/0XGNKb/BEzi3FkMZT2BSN+c8 y6CBBRthPNWuXyGc+12v3jozy39rBb9h651LJLr6QyB3SfoiEkzWaNbY824tnPCU5qPXu9 2g8+qtNLaooHLPAf+EX2mFTn/n9u4YJrfuKGTjfSkdX2IZh9j8OvNb5ratgLOevZikn8hn dfxOspQtG8iFNZjlfo+jvjiS9D3S46UF035HRKba/AoPggcP5AZH3JvMg57KEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEMdPyZKbYGK2hSh3krev31BQT8FYC4+KfDd1pq/HmU=; b=tWrJfIkY0ohNTXblWVDLf/qgs5Bzn4slD0s6Xt7mdxs1AcrJ1jJ+QRlV1i1VVCLz2WfE6g 8lI6yJIM6rRPElKXEZMOTGxplDe7z6CF8KrnFCnp7qq8mrz0X8ZV/XWsoo4txdOR2fIVpW AymSGTt6xROPdIYlqOPwKl5i9dQtM3AfsCvW0YDefKh7ZlNQWIAvKjPLm5tGYwHc5Js66N MTpHjjJXPweTcu/jBsSnJh8Pnq6zFY1bvKxcgT/kxZUbLTNzvcLew/oocO/GajVt86wlYZ zcoYKOjtURGA6vS7jVOO6GKuJfCqJEMWln/j/c9Ve1aler+MmT4/HvIYuC0xGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkwl84ZNbz10dH; Mon, 11 Sep 2023 18:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BIoSxl083263; Mon, 11 Sep 2023 18:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoSAR083260; Mon, 11 Sep 2023 18:50:28 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:28 GMT Message-Id: <202309111850.38BIoSAR083260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 79802c179a5d - stable/12 - msdosfs: zero partially valid extended cluster List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 79802c179a5de367a0c16b07e746b280d4813a2c Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79802c179a5de367a0c16b07e746b280d4813a2c commit 79802c179a5de367a0c16b07e746b280d4813a2c Author: Konstantin Belousov AuthorDate: 2023-07-06 01:51:07 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:05:09 +0000 msdosfs: zero partially valid extended cluster (cherry picked from commit 7e4c6b2163fbed6be92b1e19f0eec4da973cfaec) (cherry picked from commit 868f3eadc5e0b50863c13457074ac1a0b03958dd) --- sys/fs/msdosfs/msdosfs_denode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 57d1c96a561b..3b4e809d6196 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -477,6 +477,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); struct buf *bp; + off_t eof_clusteroff; u_long count; int error; @@ -515,13 +516,19 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) * B_CACHE | B_DELWRI but with invalid pages, and cannot be * neither written out nor validated. * - * Fix it by proactively clearing extended pages. + * Fix it by proactively clearing extended pages. Need to do + * both vfs_bio_clrbuf() to mark pages valid, and to zero + * actual buffer content which might exist in the tail of the + * already valid cluster. */ error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) goto rewind; vfs_bio_clrbuf(bp); + eof_clusteroff = de_cn2off(pmp, de_cluster(pmp, dep->de_FileSize)); + vfs_bio_bzero_buf(bp, dep->de_FileSize - eof_clusteroff, + pmp->pm_bpcluster - dep->de_FileSize + eof_clusteroff); if (!DOINGASYNC(vp)) (void)bwrite(bp); else if (vm_page_count_severe() || buf_dirty_count_severe()) From nobody Mon Sep 11 18:51:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkwn44JFjz4tMBC; Mon, 11 Sep 2023 18:52:08 +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 4Rkwn34Wg2z3TJB; Mon, 11 Sep 2023 18:52:07 +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.2/8.16.1) with ESMTP id 38BIpxFH002386; Mon, 11 Sep 2023 21:51:59 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 38BIpxEU002385; Mon, 11 Sep 2023 21:51:59 +0300 (MSK) (envelope-from dchagin) Date: Mon, 11 Sep 2023 21:51:59 +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: a87c6962affc - main - ufs: restore name cache fast path lookup Message-ID: References: <202309092150.389LovR0091943@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202309092150.389LovR0091943@gitrepo.freebsd.org> X-Spamd-Bar: - X-Spamd-Result: default: False [-1.75 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.95)[-0.946]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4Rkwn34Wg2z3TJB On Sat, Sep 09, 2023 at 09:50:57PM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a87c6962affc2d1994d8f30806c934eb4cb7af22 > > commit a87c6962affc2d1994d8f30806c934eb4cb7af22 > Author: Mateusz Guzik > AuthorDate: 2023-09-09 21:48:57 +0000 > Commit: Mateusz Guzik > CommitDate: 2023-09-09 21:48:57 +0000 > > ufs: restore name cache fast path lookup > 10x, do you plan to merge this to the stable/14 releng/14.0? I just cherry-picked this to my stable/14 prod, so compile and runtime tested > Found by: dchagin > Fixes: f3c81b973897 ("ufs: add missing vop_fplookup ops") > --- > sys/ufs/ffs/ffs_vnops.c | 6 ++++-- > sys/ufs/ufs/ufs_vnops.c | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c > index 0dd64f696e0c..2b11a15c46c9 100644 > --- a/sys/ufs/ffs/ffs_vnops.c > +++ b/sys/ufs/ffs/ffs_vnops.c > @@ -135,6 +135,8 @@ static vop_setextattr_t ffs_setextattr; > static vop_vptofh_t ffs_vptofh; > static vop_vput_pair_t ffs_vput_pair; > > +vop_fplookup_vexec_t ufs_fplookup_vexec; > + > /* Global vfs data structures for ufs. */ > struct vop_vector ffs_vnodeops1 = { > .vop_default = &ufs_vnodeops, > @@ -151,7 +153,7 @@ struct vop_vector ffs_vnodeops1 = { > .vop_write = ffs_write, > .vop_vptofh = ffs_vptofh, > .vop_vput_pair = ffs_vput_pair, > - .vop_fplookup_vexec = VOP_EAGAIN, > + .vop_fplookup_vexec = ufs_fplookup_vexec, > .vop_fplookup_symlink = VOP_EAGAIN, > }; > VFS_VOP_VECTOR_REGISTER(ffs_vnodeops1); > @@ -192,7 +194,7 @@ struct vop_vector ffs_vnodeops2 = { > .vop_setextattr = ffs_setextattr, > .vop_vptofh = ffs_vptofh, > .vop_vput_pair = ffs_vput_pair, > - .vop_fplookup_vexec = VOP_EAGAIN, > + .vop_fplookup_vexec = ufs_fplookup_vexec, > .vop_fplookup_symlink = VOP_EAGAIN, > }; > VFS_VOP_VECTOR_REGISTER(ffs_vnodeops2); > diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c > index a7d5e8ba96fc..79cca75fc563 100644 > --- a/sys/ufs/ufs/ufs_vnops.c > +++ b/sys/ufs/ufs/ufs_vnops.c > @@ -101,7 +101,7 @@ VFS_SMR_DECLARE; > #include > > static vop_accessx_t ufs_accessx; > -static vop_fplookup_vexec_t ufs_fplookup_vexec; > +vop_fplookup_vexec_t ufs_fplookup_vexec; > static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); > static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, > struct thread *); > @@ -475,7 +475,7 @@ ufs_accessx( > * VOP_FPLOOKUP_VEXEC routines are subject to special circumstances, see > * the comment above cache_fplookup for details. > */ > -static int > +int > ufs_fplookup_vexec( > struct vop_fplookup_vexec_args /* { > struct vnode *a_vp; From nobody Mon Sep 11 19:20:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkxPR5j0jz4sfdP; Mon, 11 Sep 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkxPR5Httz3blM; Mon, 11 Sep 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gqa9nQySvhcOzWgf5dMbWbB8DBSWGErAmtCecA8eU98=; b=btCGpEgXzhUL6kXEWFoEwNrq6dAW888UbXgcCOqrJF13GCBAniIp65tLy3N3vaOPRxDvUe onzrnXa4wLJR/DFf63HfJDqBZwj19QQWFGy6YI6//BcglKzAJF1qZXih6lvntBMVg0wj3c VDoprR7YyIXBvm7lCxpF21aSI6XlgR2Jiyxx4xXUMkz83aGqW2ww+Q4jXmQLXlqiVyYFK7 qvt7pGlWyN69Bt4UeupcKyyJx1IjV0mk7DWIXfk47B1eHMCDzQZtce1010LILYN0FfpkQW 84Uh8Z5HDdkQeexVCfgjk3KFVHZLGQ6CoqjydNJnFgoicQ5qmEDX0mbYPptY2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694460011; a=rsa-sha256; cv=none; b=SLFDitTK8wyXjrAYg/9MrRWCleH49eBleeviDmsyK52FexrEqp48Ooh6HdsnQOt3qUcIPt pUmkWPqaFQ7kEkKCZkJGCDIDPZQiGnUtd8usBOk4f1/7ie6rSQmuuLvjdOhBLiMPKWOC7O h1JXd3XPqNEXCgOv66aX5kY+lJymtNSBYCDOvt8UwaGOcC9Ur/mdRJakX82+IbgRSTFdeb qK6ZjliKzS4lEVQjYvwXiMjRa5+n9NEHkEqUo0nn39E7tMDR7Xu7C28Ykc+ptuBUVrHAZk Tm1CaAPnmO+7tH8TNVB5MkUFFCFJreAF1dg6+L2wqUt6bCuJKiUQkZf3hisCoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gqa9nQySvhcOzWgf5dMbWbB8DBSWGErAmtCecA8eU98=; b=Lv4wEtQFKe19IEn+EQGQxPMKlrcY5HIx+45a/HTKTjQ07PFrBmmhO1wbIt5INnbr0Rwfhc sCLEMAws5z61fYPq2Lpce3kYKLfGRt6/J6i7RNWgG6YXh7A1plBXaVt/nVkTsOTtoT0JGq XgkXU+ou3XyGWqeQsFRJvTuKxAf/+chqJwGSRxgUgqbn5MVCE0grDN6SqyDQBqhFaNzyNR YZb33jaI6SF8WieghwZMHYSc5mbE4b+jnLfSnlo1dgM6zhNcC7oBqySQD5uV8JiSZTISFP pQ5aI/5c1sHfCc465jNhzIxsp7naaMDQXkO4GR8mqjGDOBzI+undA/7qprTljQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkxPR4HhGz120Q; Mon, 11 Sep 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BJKBdF029648; Mon, 11 Sep 2023 19:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJKBgE029639; Mon, 11 Sep 2023 19:20:11 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:20:11 GMT Message-Id: <202309111920.38BJKBgE029639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 196bb0e152cf - stable/14 - libpmc: make pmc_pmu_pmcallocate() machine-independent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 196bb0e152cf2d3a0ba61bda8a2d09c8107a809a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=196bb0e152cf2d3a0ba61bda8a2d09c8107a809a commit 196bb0e152cf2d3a0ba61bda8a2d09c8107a809a Author: Mitchell Horne AuthorDate: 2023-06-19 22:32:22 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 19:19:58 +0000 libpmc: make pmc_pmu_pmcallocate() machine-independent Have it call the platform-dependent version. For better layering, move the reset logic inside the new function. This is mainly to facilitate an upcoming change. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40752 (cherry picked from commit 45dcc17e2fb8f0f9838ba167b311f271a08fcea9) --- lib/libpmc/libpmc.c | 5 ----- lib/libpmc/libpmc_pmu_util.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 71fba89237ff..a7ed1c3d9ac8 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -1091,11 +1091,6 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, assert(pmc_config.pm_ev < PMC_EVENT_FIRST); goto found; } - - /* Otherwise, reset any changes */ - pmc_config.pm_ev = 0; - pmc_config.pm_caps = 0; - pmc_config.pm_class = 0; } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index a61f81f7d2c7..772dec7a9d53 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -572,8 +572,8 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, return (0); } -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -604,8 +604,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__powerpc64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -631,8 +631,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__aarch64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -658,9 +658,27 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #else -int -pmc_pmu_pmcallocate(const char *e __unused, struct pmc_op_pmcallocate *p __unused) +static int +pmc_pmu_pmcallocate_md(const char *e __unused, struct pmc_op_pmcallocate *p __unused) { return (EOPNOTSUPP); } #endif + +int +pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +{ + int error; + + error = pmc_pmu_pmcallocate_md(event_name, pm); + if (error != 0) { + /* Reset any changes. */ + pm->pm_ev = 0; + pm->pm_caps = 0; + pm->pm_class = 0; + + return (error); + } + + return (0); +} From nobody Mon Sep 11 19:20:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkxPS6t6gz4sfr0; Mon, 11 Sep 2023 19:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkxPS6LRCz3c2J; Mon, 11 Sep 2023 19:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otJ54/QHiU4cKRycOdV+9mTN0cjV8aNKDo315TDImRk=; b=HdEIFh6mrc/H/QMrvlmK0mQa4qInpRThe4cGjx4mCBNOtC2WmbNRP+0u56yoJPbucFWccp 61Hs66KNC17otwDrvWICWfOOPqHUF1tQFFYz25mM3irS4tflHn2NVJfep1DMBCO0xSLYiM Qv4anRnnmp634S60Rj40VoCI6CKTG/9RCbq4vhDJD6HLQqM+OWw1Z6XPMZaoRk5oUNbSlD BLA9SaQP7prQNv9gY5SndLiuZNA1aiu87FCSWBfsQefyuErb1uH25H3WwbZJOwsOEkKoNH aLTcXzHDOyu9F1GhIubjO+qvMsrgWgkFeKBB7Ebi4tm0BCUkXmXbb5/ki/SWHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694460012; a=rsa-sha256; cv=none; b=ODxtUT9YDf61w6LjBA1nIhtuQRZjLQRTjLC4c51DJU2GPnmrzkhetQuZ84P4gZ/baw06Sw E6yr2kzZ/HLRhH0xuTIxJfpb2g2wLCbZ81e8VOdN5PWLogCePn2RAX14owA907JalutLtk QTKVjpvuyGMzsqpfpQn44FkvpXYL0MBHHtxKVFaOSPZAeuY3H8zfATS5N7ykxFTmJD2DVT k3ddvHVPI22/nFCC3r2wMiEcEJt2mFIW1w/hM11gexq2a0jnErF/GAPbfz43vYrZL0aWnN QKKYLB8EEmZfvjK8FhW7Kla9KWDLBnUbLiHmWCw3rXjOe/nP+3CX3ixOIBlA7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otJ54/QHiU4cKRycOdV+9mTN0cjV8aNKDo315TDImRk=; b=OOJsREiz+etIvTCjmSZpG3J97AGCZs2UX7jOnQQsAvIf3zCzhNhHadNdMQD4QXbjQE/EMz cMa8A0u6r+54NQwER3tg6FePaitR9BCEpAVfF3YCyScsbQkN5EZxXUYpewxO6cqrTtRVym uLqfql49l8PCseCic6/jnyvQ44KSd14cO1XCOYQJj3R2ooFPGZd0GTdOCBmkdw0iZXXZsn ZSKqVMBNkoTJPCA8Zccp7nolzv1UHPRz6iMYfg7txggNAzI2rUqOLWku0WWJ7yDruvEHLH +/imKoq0RklGXQGc2c76ybrVkz/hUgGPnoO4SC8zvyoURZzBc0DhDd3ttX0a4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkxPS58Wbz11Tt; Mon, 11 Sep 2023 19:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BJKC13030332; Mon, 11 Sep 2023 19:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJKCNh030314; Mon, 11 Sep 2023 19:20:12 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:20:12 GMT Message-Id: <202309111920.38BJKCNh030314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5adb91c72985 - stable/14 - pmc: better distinguish pmu-events allocation path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5adb91c72985b840b2c7fbf3c3308619acd2b61a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5adb91c72985b840b2c7fbf3c3308619acd2b61a commit 5adb91c72985b840b2c7fbf3c3308619acd2b61a Author: Mitchell Horne AuthorDate: 2023-06-06 17:26:46 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 19:19:58 +0000 pmc: better distinguish pmu-events allocation path Background: The pm_ev field of struct pmc_op_pmcallocate and struct pmc traditionally contains the index of the chosen event, corresponding to the __PMC_EVENTS array in pmc_events.h. This is a static list of events, maintained by FreeBSD. In the usual case, libpmc translates the user supplied event name (string) into the pm_ev index, which is passed as an argument to the allocation syscall. On the kernel side, the allocation method for the relevant hwpmc class translates the given index into the event code that will be written to an event selection register. In 2018, a new source of performance event definitions was introduced: the pmu-events json files, which are maintained by the Linux kernel. The result was better coverage for newer Intel processors with a reduced maintenance burden for libpmc/hwpmc. Intel and AMD CPUs were unconditionally switched to allocate events from pmu-events instead of the traditional scheme (959826ca1bb0a, 81eb4dcf9e0d). Under the pmu-events scheme, the pm_ev field contains an index corresponding to the selected event from the pmu-events table, something which the kernel has no knowledge of. The configuration for the performance counting registers is instead passed via class-dependent fields (struct pmc_md_op_pmcallocate). In 2021 I changed the allocation logic so that it would attempt to pull from the pmu-events table first, and fall-back to the traditional method (dfb4fb41166bc3). Later, pmu-events support for arm64 and power8 CPUs was added (28dd6730a5d6 and b48a2770d48b). The problem that remains is that the pm_ev field is overloaded, without a definitive way to determine whether the event allocation came from the pmu-events table or FreeBSD's statically-defined PMC events. This resulted in a recent fix, 21f7397a61f7. Change: To disambiguate these two supported but separate use-cases, add a new flag, PMC_F_EV_PMU, to be set as part of the allocation, indicating that the event index came from pmu-events. This is useful in two ways: 1. On the kernel side, we can validate the syscall arguments better. Some classes support only the traditional event scheme (e.g. hwpmc_armv7), while others support only the pmu-events method (e.g. hwpmc_core for Intel). We can now check for this. The hwpmc_arm64 class supports both methods, so the new flag supersedes the existing MD flag, PM_MD_EVENT_RAW. 2. The flag will be tracked in struct pmc for the duration of its lifetime, meaning it is communicated back to userspace. This allows libpmc to perform the reverse index-to-event-name translation without speculating about the meaning of the index value. Adding the flag is a backwards-incompatible ABI change. We recently bumped the major version of the hwpmc module, so this breakage is acceptable. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40753 (cherry picked from commit c190fb35f35cc163b61e582a49115680b0d49dcc) --- lib/libpmc/libpmc.c | 9 +-------- lib/libpmc/libpmc_pmu_util.c | 2 +- lib/libpmc/pmclog.c | 11 +++-------- sys/arm64/include/pmc_mdep.h | 2 -- sys/dev/hwpmc/hwpmc_amd.c | 3 +++ sys/dev/hwpmc/hwpmc_arm64.c | 6 +++--- sys/dev/hwpmc/hwpmc_core.c | 6 ++++++ sys/dev/hwpmc/hwpmc_mod.c | 3 ++- sys/dev/hwpmc/hwpmc_power8.c | 3 +++ sys/dev/hwpmc/hwpmc_uncore.c | 6 ++++++ sys/sys/pmc.h | 8 ++++++++ 11 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index a7ed1c3d9ac8..f10a64e28cac 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -1083,14 +1082,8 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, r = spec_copy = strdup(ctrspec); ctrname = strsep(&r, ","); if (pmc_pmu_enabled()) { - if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) { - /* - * XXX: pmclog_get_event exploits this to disambiguate - * PMU from PMC event codes in PMCALLOCATE events. - */ - assert(pmc_config.pm_ev < PMC_EVENT_FIRST); + if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) goto found; - } } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 772dec7a9d53..fa2e76e8d026 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -649,7 +649,6 @@ pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) assert(idx >= 0); pm->pm_ev = idx; pm->pm_md.pm_md_config = ped.ped_event; - pm->pm_md.pm_md_flags |= PM_MD_RAW_EVENT; pm->pm_class = PMC_CLASS_ARMV8; pm->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); @@ -680,5 +679,6 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) return (error); } + pm->pm_flags |= PMC_F_EV_PMU; return (0); } diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index a21fe42c9947..3b1572baaa2c 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -357,15 +357,10 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate); /* - * Could be either a PMC event code or a PMU event index; - * assume that their encodings don't overlap (i.e. no PMU event - * table is more than 0x1000 entries) to distinguish them here. - * Otherwise pmc_pmu_event_get_by_idx will go out of bounds if - * given a PMC event code when it knows about that CPU. - * - * XXX: Ideally we'd have user flags to give us that context. + * pl_event could contain either a PMC event code or a PMU + * event index. */ - if (ev->pl_u.pl_a.pl_event < PMC_EVENT_FIRST) + if ((ev->pl_u.pl_a.pl_flags & PMC_F_EV_PMU) != 0) ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ps->ps_cpuid, ev->pl_u.pl_a.pl_event); diff --git a/sys/arm64/include/pmc_mdep.h b/sys/arm64/include/pmc_mdep.h index 5c43a7924b01..97d0f30c9c09 100644 --- a/sys/arm64/include/pmc_mdep.h +++ b/sys/arm64/include/pmc_mdep.h @@ -45,8 +45,6 @@ union pmc_md_op_pmcallocate { struct { uint32_t pm_md_config; - uint32_t pm_md_flags; -#define PM_MD_RAW_EVENT 0x1 }; struct pmc_md_cmn600_pmu_op_pmcallocate pm_cmn600; struct pmc_md_dmc620_pmu_op_pmcallocate pm_dmc620; diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index b15d223bc7a5..fbbaf92a1547 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -582,6 +582,9 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, if (pd->pd_class != a->pm_class) return EINVAL; + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + caps = pm->pm_caps; PMCDBG2(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps); diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 995b7158ac20..9a5debb8016b 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -177,9 +177,9 @@ arm64_allocate_pmc(int cpu, int ri, struct pmc *pm, } pe = a->pm_ev; - /* Adjust the config value if needed. */ - config = a->pm_md.pm_md_config; - if ((a->pm_md.pm_md_flags & PM_MD_RAW_EVENT) == 0) { + if ((a->pm_flags & PMC_F_EV_PMU) != 0) { + config = a->pm_md.pm_md_config; + } else { config = (uint32_t)pe - PMC_EV_ARMV8_FIRST; if (config > (PMC_EV_ARMV8_LAST - PMC_EV_ARMV8_FIRST)) return (EINVAL); diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 15b875e3af94..3829a03eb729 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -239,6 +239,9 @@ iaf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; config = iap->pm_iap_config; ev = IAP_EVSEL_GET(config); @@ -721,6 +724,9 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; ev = IAP_EVSEL_GET(iap->pm_iap_config); diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index de012b74d558..5dd8bc67d60a 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -3349,7 +3349,8 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) * Look for valid values for 'pm_flags'. */ if ((flags & ~(PMC_F_DESCENDANTS | PMC_F_LOG_PROCCSW | - PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) != 0) + PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN | + PMC_F_EV_PMU)) != 0) return (EINVAL); /* PMC_F_USERCALLCHAIN is only valid with PMC_F_CALLCHAIN. */ diff --git a/sys/dev/hwpmc/hwpmc_power8.c b/sys/dev/hwpmc/hwpmc_power8.c index fc6b878eff7d..d7ccbc5c6c0a 100644 --- a/sys/dev/hwpmc/hwpmc_power8.c +++ b/sys/dev/hwpmc/hwpmc_power8.c @@ -168,6 +168,9 @@ power8_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_POWER8) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + /* * PMC5 and PMC6 are not programmable and always count instructions * completed and cycles, respectively. diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index c16800c14ce1..fd4266b605ef 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -199,6 +199,9 @@ ucf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + flags = UCF_EN; pm->pm_md.pm_ucf.pm_ucf_ctrl = (flags << (ri * 4)); @@ -498,6 +501,9 @@ ucp_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + ucp = &a->pm_md.pm_ucp; ev = UCP_EVSEL(ucp->pm_ucp_config); switch (uncore_cputype) { diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index a4d03efb6aac..714d8a7c65b7 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -369,6 +369,14 @@ enum pmc_ops { #define PMC_F_CALLCHAIN 0x00000080 /*OP ALLOCATE capture callchains */ #define PMC_F_USERCALLCHAIN 0x00000100 /*OP ALLOCATE use userspace stack */ +/* V10 API */ +#define PMC_F_EV_PMU 0x00000200 /* + * OP ALLOCATE: pm_ev has special + * userspace meaning; counter + * configuration is communicated + * through class-dependent fields + */ + /* internal flags */ #define PMC_F_ATTACHED_TO_OWNER 0x00010000 /*attached to owner*/ #define PMC_F_NEEDS_LOGFILE 0x00020000 /*needs log file */ From nobody Mon Sep 11 19:32:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkxgP2q7bz4sqxx; Mon, 11 Sep 2023 19:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkxgP2PQyz3gPs; Mon, 11 Sep 2023 19:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ATf95KPhG6fJpKzVEHdeFvg4cfYVDWNIX/pIwRRfZc=; b=gUEURdcNVPHa+PW+lkVJu1OnWrqJUqE5sr13fFVBlI1h03pK97WPRz2oYqy5T/GL2wA+3c 9Ge4PSUQV2K5nX7VlltBeYL+9PPo6OY7h/UV3S2crec4u3BWtFJhvrq8WhKOINZyu5M6lA Jg5wcOPazkE2o9Lftp2XDSBJUdGngHZO9UwLWt5gpm5WppKBJBAWqHe2VqgZ5Q2AsT5yX0 yk5cteF4UkV4RZRbPl/PhF8LWHlbuIyd4sO3Jz7UgTDhcHKaJ3zWuMPTqfm/6CV4keMtAD I+9tDy8PoScuxCIYVLKGR70ko+LM6CNyvJBoHDyMJoQjbqc3/8FhhDGSycxkZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694460737; a=rsa-sha256; cv=none; b=UclTKDMrW96Us7YKn4V3ithhzAC9LLgAkLPzGW+bPb4XPPtQmKW1wOVG/Y4pkvnZ9UA8/j 7ESSXkevIn5BxgMEY/qHt2F/L1kDQggrMBQcroubjFta7KEnq78WVdTWqeSuUXc9uGy6PF 6Y7JMjkgzdkshaggW73ojUKcculmOiwv+XfElI1jNvMFoovft/QtiLNjx4TKZ5eMpYb5kl 9ij3A11C2izTDfqQ2/x2jBlAty2nD3zJIfGLIP2TsnS51y29jTx/4JzDhugtuStoLi47Jv z6yzG4uuopOFm1iOARhm/VjCakMaduFSh9wal8TqkSyD0zyrW8zr1MEYyK41lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ATf95KPhG6fJpKzVEHdeFvg4cfYVDWNIX/pIwRRfZc=; b=PxhTNh9JrhSYZzQmHwg1CZnkKsSbv1lOSPM7kd0skYdjUBhcT5+qctOeGMj8/s/3qT7MP0 vKiuliqNiogZz96Xdw1YOpmNly+bveNOTpwcxCL1anZNpMMpQfqQwKE0E2tKjflD7O75lJ 2eqaX6rY90rIJzuyoLnUg+YEzOHszFVjEgE70k+fEjbJ6VgOynb4U2KurHi/WTMTXIuYYa +r+Gx3QaAp1H2eOyiqNeGYOC3bF3NGiYpjvVA4FrIgBnUc49wahF9lNyR+8l3yQ7BpuZDA V3Bs4LaDHJFn5hjWOpor4mKGzJIXd8MEA3l27htQyEVttA3dWZreImWLAgmt3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkxgP1TMKz123b; Mon, 11 Sep 2023 19:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BJWHFB056411; Mon, 11 Sep 2023 19:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJWHhm056408; Mon, 11 Sep 2023 19:32:17 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:32:17 GMT Message-Id: <202309111932.38BJWHhm056408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: fafb03ab4254 - main - siftr: flush pkt_nodes to the log file in batch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fafb03ab4254ab0d3927bc8ec22e4ba432efdbeb Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=fafb03ab4254ab0d3927bc8ec22e4ba432efdbeb commit fafb03ab4254ab0d3927bc8ec22e4ba432efdbeb Author: Cheng Cui AuthorDate: 2023-07-25 13:53:55 +0000 Commit: Cheng Cui CommitDate: 2023-09-11 15:23:27 +0000 siftr: flush pkt_nodes to the log file in batch Reviewed by: rscheff, tuexen Differential Revision: https://reviews.freebsd.org/D41175 --- sys/netinet/siftr.c | 73 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 58603e4aa53c..fbb47fc4a521 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -370,12 +370,12 @@ siftr_new_hash_node(struct flow_info info, int dir, } } -static void -siftr_process_pkt(struct pkt_node * pkt_node) +static int +siftr_process_pkt(struct pkt_node * pkt_node, char *buf) { struct flow_hash_node *hash_node; struct listhead *counter_list; - struct ale *log_buf; + int ret_sz; if (pkt_node->flowid == 0) { panic("%s: flowid not available", __func__); @@ -385,7 +385,7 @@ siftr_process_pkt(struct pkt_node * pkt_node) hash_node = siftr_find_flow(counter_list, pkt_node->flowid); if (hash_node == NULL) { - return; + return 0; } else if (siftr_pkts_per_log > 1) { /* * Taking the remainder of the counter divided @@ -401,16 +401,11 @@ siftr_process_pkt(struct pkt_node * pkt_node) * we wrote a log message for this connection, return. */ if (hash_node->counter > 0) - return; + return 0; } - log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN, ALQ_WAITOK); - - if (log_buf == NULL) - return; /* Should only happen if the ALQ is shutting down. */ - /* Construct a log message. */ - log_buf->ae_bytesused = snprintf(log_buf->ae_data, MAX_LOG_MSG_LEN, + ret_sz = snprintf(buf, MAX_LOG_MSG_LEN, "%c,%jd.%06ld,%s,%hu,%s,%hu,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u," "%u,%u,%u,%u,%u,%u,%u,%u\n", direction[pkt_node->direction], @@ -442,7 +437,7 @@ siftr_process_pkt(struct pkt_node * pkt_node) pkt_node->flowid, pkt_node->flowtype); - alq_post_flags(siftr_alq, log_buf, 0); + return ret_sz; } static void @@ -452,6 +447,9 @@ siftr_pkt_manager_thread(void *arg) STAILQ_HEAD_INITIALIZER(tmp_pkt_queue); struct pkt_node *pkt_node, *pkt_node_temp; uint8_t draining; + struct ale *log_buf; + int ret_sz, cnt; + char *bufp; draining = 2; @@ -487,12 +485,51 @@ siftr_pkt_manager_thread(void *arg) */ mtx_unlock(&siftr_pkt_mgr_mtx); - /* Flush all pkt_nodes to the log file. */ - STAILQ_FOREACH_SAFE(pkt_node, &tmp_pkt_queue, nodes, - pkt_node_temp) { - siftr_process_pkt(pkt_node); - STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); - free(pkt_node, M_SIFTR_PKTNODE); +try_again: + pkt_node = STAILQ_FIRST(&tmp_pkt_queue); + if (pkt_node != NULL) { + if (STAILQ_NEXT(pkt_node, nodes) != NULL) { + cnt = 3; + } else { + cnt = 1; + } + + log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * cnt, + ALQ_WAITOK); + + if (log_buf != NULL) { + log_buf->ae_bytesused = 0; + bufp = log_buf->ae_data; + } else { + /* + * Should only happen if the ALQ is shutting + * down. + */ + bufp = NULL; + } + + /* Flush all pkt_nodes to the log file. */ + STAILQ_FOREACH_SAFE(pkt_node, &tmp_pkt_queue, nodes, + pkt_node_temp) { + if (log_buf != NULL) { + ret_sz = siftr_process_pkt(pkt_node, + bufp); + bufp += ret_sz; + log_buf->ae_bytesused += ret_sz; + cnt--; + } + + STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); + free(pkt_node, M_SIFTR_PKTNODE); + + if (cnt <= 0 && !STAILQ_EMPTY(&tmp_pkt_queue)) { + alq_post_flags(siftr_alq, log_buf, 0); + goto try_again; + } + } + if (log_buf != NULL) { + alq_post_flags(siftr_alq, log_buf, 0); + } } KASSERT(STAILQ_EMPTY(&tmp_pkt_queue), From nobody Mon Sep 11 19:45:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkxy56N2nz4sywP; Mon, 11 Sep 2023 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkxy54WjWz4GmS; Mon, 11 Sep 2023 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PgUEbMkpaamzYyzkFvk1G0sUgEJguQq4cJBveZQRjwQ=; b=yJFVFMp5CxSiyZo2zdGdsxIENy0726rYca17yD6dfIL/LZ5gAvdsJqYdEnMCBuN4Z4nfhU 3qRpiGmKrHAIvlMO121QyAF6/l9P5JwUegEHynNCvqcyMRFgm7VFQtOscc2X73U7Sw+LuF uBjRg5PSmnr4729TX8TRqwm2ZTqkEUq8WfopOwnmukrVAEfq+vw/+tW4dluqMfNBe3HQbF e7Uh0r8UkGiZwGiH0Y/wSnAktZjDT5XR5+twAFMRbiQ52DgV/v17GPmDof4Wf2J2Y1QsdP lnRbGxXM0wfQA7gxkzBifrlnWSnA5yC4ux6tO+TdtuTdVnsPiiP4VmrgnC0r3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694461501; a=rsa-sha256; cv=none; b=S+iDLAt+wo926QYPE27X1z8DDjghv010RFV1nz6Qn/q30IfGtZ5lpLmUA6vtSwROxVaMMi 0RscMwmEW9qQRirucJ4jvXbw+kSQyjCQ2I6UDrS322kuE6OEe8FWbDQDIs8eJianh0mwsU Wep/RiwV1HeHhso8sS7OKFfgsT81p7FNaHm6eY5xhOgBEu8HJJcnW5UMkDpVF/STXFUnKx q0xV4wUgnCsDVaxHV28hQMD2pjt0ARAbBFPEOo0/O+iv+cza9ohf11miS2sq3Bhi5VPwu1 vkWNE1WPJs1xmoZme5mEsl9A9YU9YjrFllsFS6y4uIlt58G2dmwtQIBH2S2lZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PgUEbMkpaamzYyzkFvk1G0sUgEJguQq4cJBveZQRjwQ=; b=vNdt2j4cu8ICRQkSFbhLcrhaitwC85qr2Zkb/N2XPX7cuU49wf5c0+GICbSCk9Juy6ciTg HmfweQwRU2lm/tluOJpE5dbm8+J1ix84jbLLAKMZIOf5vR9hUT1Wh21+KLLhUx3k3mGXU6 F+Il1psxofDXP6zBF7d8XqRRb71lVP+xQC+rzHonDIZH3rigfVn+BW05sVSDodq+mlOEZq 1+025gKVrYJO3ee1ZNHCdqeGPLaIRf3J7W5saxWbc0oy64iqhm+e1b9gawIu1CnEJAFX6O KWwkTfkCH0RRvnCW1GT03RlVVoFq165Qlv3nGEB+7Ls0qEVz3Bl2+osokWumuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkxy53Z80z12q1; Mon, 11 Sep 2023 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BJj1Hs073107; Mon, 11 Sep 2023 19:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJj1i6073104; Mon, 11 Sep 2023 19:45:01 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:45:01 GMT Message-Id: <202309111945.38BJj1i6073104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: f0ed478f0596 - releng/14.0 - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f0ed478f0596deb99db65738baa73d18ea4368ee Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ed478f0596deb99db65738baa73d18ea4368ee commit f0ed478f0596deb99db65738baa73d18ea4368ee Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 19:44:49 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 Approved by: re (gjb) (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) (cherry picked from commit 0c9b0086715b3b354d471de9dee2ea113aa94481) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index 661b7013e0d2..8ce1d18c61e5 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -368,10 +368,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -404,17 +406,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -423,6 +430,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 19:48:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rky203bjPz4t1Tt; Mon, 11 Sep 2023 19:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rky2038fKz4Hhn; Mon, 11 Sep 2023 19:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOG2wHRuA2Ma7bvlpZV+Fn37EmBzANP7fo8U+5ySzkg=; b=tiTIbpyor6151Q7wMZKEPQevJ8EIBj5dTcDtroTupPzVR+YUjl/8fEQunuLEJK766eGPLF D3NttoNev/ZDndRAjGUsgXCKJ1awzwk/faAX1CBoMXXw2FiPe+M4saICQvQg7UGidkSR6T 7hifKjvg4IMAOy73OQfCfIieWD/aYqLb5Z1nWSfOFvLIbljjgsvf92SiuYCrMlq3NHcxk0 m8XFaTTvKSZAzvl8tr4LV/2BlPu0Y11mxEZt6ojVh7c04AhNXDRRTr2sjtD/DNYfPpHJha ofXpghClxXEiQH9uFBoacArLmfWnVcNa4bs/7EfF9Kca0yaxUMhafBNOzwhppw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694461704; a=rsa-sha256; cv=none; b=or4lHpZA17mZ3IEJXF85c9OlVclEW0HRUd+qq8EV1x/0PjGRZ5lmO6fcmhf5CQFxPqUwQg NWtd+sR0y3C+92ZI8SWmD4XdZsRtqOt5Cet9efWpAz8OFTnhlLPCF2HfMvrnt2TEQLQvV2 nulhhDrReHrLvf82nNfmJ1G4T3neygxya80qaSV7rqqb0mrFIIHoUvgqejAdVs7lOCRQ8T tx+mbBL7U9P6cw7hx7r5duDUhBwGB+tUg5HrON2mqpgfgdck7Fd/VzU+seYz4MO8C6hXzB r09sJUgSPo81nlBxmzTf+flw4jM0PLd18hoGSGdjSU1JO2A92zxKA6Bp6DVETQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOG2wHRuA2Ma7bvlpZV+Fn37EmBzANP7fo8U+5ySzkg=; b=AYJ36gUq7P1iV2SPyp+7hJryAXSC7K8zZ+TUVyrCzBqmrLA78TiNj5Cfbt+Ie9/SF2mICH JgxaAFX3g0f5V1WoksLwnce2m12m6IEcG+A7voY75G+fyDczSUEBa5Nf8W10n2gG40BGPU oGuWewNNR2ijbm/c3DwucMtVD5VHsn/ScO71zzBTzkXbgYxkZpfgnWuihi56X7rlrQ7qtP lgmPv8QQZZk3SpdcR2mj+uUS/AT7HyA0/XG0Otoj0s/OuPFKulC0r8CaVlo33DHWHd9it1 wr8WKcCz2v+mciEHNm6+VxBmBG4JpH0ySVCO99fo3G1bFbtettil5ym6nccAYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rky2026Pdz12gQ; Mon, 11 Sep 2023 19:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BJmOfR073706; Mon, 11 Sep 2023 19:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJmO4Q073703; Mon, 11 Sep 2023 19:48:24 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:48:24 GMT Message-Id: <202309111948.38BJmO4Q073703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 9dcf00aa404b - releng/14.0 - zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9dcf00aa404bb62052433c45aaa5475e2760f5ed Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcf00aa404bb62052433c45aaa5475e2760f5ed commit 9dcf00aa404bb62052433c45aaa5475e2760f5ed Author: Martin Matuska AuthorDate: 2023-09-11 07:20:55 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 19:47:08 +0000 zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15251 Add more constraints for block cloning Obtained from: OpenZFS OpenZFS commit: e96fbdba344e9c25cad624a10d4a4b300fd35f6c Approved by: re (gjb) (cherry picked from commit 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f) --- sys/contrib/openzfs/META | 2 +- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 ++ sys/contrib/openzfs/module/zfs/zfs_vnops.c | 21 +++++++++++++++++++-- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index e4e770026b57..0953cc51922f 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.2.0 -Release: rc3 +Release: rc4 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c b/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c index 07d5d34dae33..6d0595dd5f76 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c @@ -193,7 +193,9 @@ qat_dc_init(void) sd.huffType = CPA_DC_HT_FULL_DYNAMIC; sd.sessDirection = CPA_DC_DIR_COMBINED; sd.sessState = CPA_DC_STATELESS; +#if (CPA_DC_API_VERSION_NUM_MAJOR == 1 && CPA_DC_API_VERSION_NUM_MINOR < 6) sd.deflateWindowSize = 7; +#endif sd.checksum = CPA_DC_ADLER32; status = cpaDcGetSessionSize(dc_inst_handles[i], &sd, &sess_size, &ctx_size); diff --git a/sys/contrib/openzfs/module/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/zfs/zfs_vnops.c index f8d13075d5c0..a64e1e2dc83d 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/zfs/zfs_vnops.c @@ -1172,9 +1172,20 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp, inblksz = inzp->z_blksz; /* - * We cannot clone into files with different block size. + * We cannot clone into files with different block size if we can't + * grow it (block size is already bigger or more than one block). */ - if (inblksz != outzp->z_blksz && outzp->z_size > inblksz) { + if (inblksz != outzp->z_blksz && (outzp->z_size > outzp->z_blksz || + outzp->z_size > inblksz)) { + error = SET_ERROR(EINVAL); + goto unlock; + } + + /* + * Block size must be power-of-2 if destination offset != 0. + * There can be no multiple blocks of non-power-of-2 size. + */ + if (outoff != 0 && !ISP2(inblksz)) { error = SET_ERROR(EINVAL); goto unlock; } @@ -1358,6 +1369,12 @@ unlock: *inoffp += done; *outoffp += done; *lenp = done; + } else { + /* + * If we made no progress, there must be a good reason. + * EOF is handled explicitly above, before the loop. + */ + ASSERT3S(error, !=, 0); } zfs_exit_two(inzfsvfs, outzfsvfs, FTAG); diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 29425d3368e0..122a7a3f032e 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1074,7 +1074,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g32949f256" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_ge96fbdba3" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1104,7 +1104,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g32949f256" +#define ZFS_META_RELEASE "FreeBSD_ge96fbdba3" /* Define the project version. */ #define ZFS_META_VERSION "2.2.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 71be2d813a0a..f29b7621500d 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.0-rc3-31-g32949f256" +#define ZFS_META_GITREV "zfs-2.2.0-rc4-1-ge96fbdba3" From nobody Mon Sep 11 21:43:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl0ZZ3r5Mz4tDXr; Mon, 11 Sep 2023 21:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl0ZZ2t2cz3KtY; Mon, 11 Sep 2023 21:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0JmOODnkYkDsvZDDhQkMWcA5qJkhdWo0QYD/YGX+yQ=; b=Ykxc00enIZI0573r7K1h0CkX06ShQSotrUSFE5ULtFbyvAVEZy3Wb573ZRWJgXLRZcp9Hr Rv53yATfooc92SmmvMWwi3dJUlSbqIXapKcnuThYdMjvR0JlKQ7IHIGRy87ZekKdPvjSXB 4BuZFC3HfrLB57WVtBcF/WDf49tojjDeUiuaSC8YIekYckIrA/jIwEwPjlCP+5oZQaL2GC WiheI4OhrJRIqFsspNgyCnBLKGGlJDslMy4UiulPQKDD+nzOlBdcKdNTmmkiuQWNLP6zfj igH4SXs80n0m5ijpOj69pdCAfmEhkNNINKM69BPsglVuPyxm8vMcRmc8GP/Csw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468598; a=rsa-sha256; cv=none; b=ZE6pm2stjBbuKoDVJdeWNz9aiEaAJeOlz76I4v/I/cMsZGmwE4HGCPKXuaLPplfIwEpBqc iJLZAK2K+Sw3+zh0kRngzvYZSGFtfz/JwRHJoQL3eh9b1zL5fEd+qEPh0dNclzgy7+sPG0 rWrpJw83fbdPEO7GxEgmVw8qA8GifI+YRPpLMHvZ0/LSzOZdZKfsIFFvvtSdzEoRfHdPcW vJMjnUP5IefV1KcU3xrfmr8imsw3BWfufzgofvVL200ubhy/Z3BWYL1OmoaKDMjfuRlFoY d+Ug2lM9NkPcHYK4Tj/bYhF8YFHPPXMve2LSN+01lU79LvJErin8p6BuW8Bhnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0JmOODnkYkDsvZDDhQkMWcA5qJkhdWo0QYD/YGX+yQ=; b=BpEYpAHI/3JMDC2GIKG5T2J8n0y1Wpz2cDWwHB6HchK4m/etQGbjj0lcOhwMZYI0mmJmh3 3kTl5Ug4XFVUmpIja67qW1I++Oikkt57/NSB5pWgU8fMc9hRUmVp96w55HNv+AOK07Ccx0 4bywjmqjYt28HUB+f3T6I5lgzN/88Nl82fJLAxR3LZaeMTdED9/QXMkPmru2wWr4vKhbSL 2+j57T2saUcgZshcZl0bJdtl3VTah+cvB7Or59hSHhPMXXefemo5iY2dW+5XR2APjCOl2j iNB6bazK/3nfCywCwvxJ+KDbMZpf5rOItgIUc4OZYGhovqzisqt0CH1N7D8jWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl0ZZ1wr1z158y; Mon, 11 Sep 2023 21:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BLhIVU071988; Mon, 11 Sep 2023 21:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLhIYq071984; Mon, 11 Sep 2023 21:43:18 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:43:18 GMT Message-Id: <202309112143.38BLhIYq071984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d01bbdf4572b - stable/14 - uefi(8): Refer to a related manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d01bbdf4572bd8e8e709f6c0020e7352f7727cff Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d01bbdf4572bd8e8e709f6c0020e7352f7727cff commit d01bbdf4572bd8e8e709f6c0020e7352f7727cff Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 21:42:03 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 9ee501047337..42642bb48260 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 21:45:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl0cf5y1Dz4tFZ2; Mon, 11 Sep 2023 21:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl0cf5XJqz3Lqv; Mon, 11 Sep 2023 21:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YINupwjGsPmyuPXkXIjo8rEM2VDfXgOdQP+CtzLnSR0=; b=tY83prh/Ich2AimUO8Ug3LSNx/arTTJAghwAst9uuFN2/I63PHQ4yfCUhDAlL7FP7ZuTG/ +5pJr8dmML0WOAvvdfgDW+OpG7q6cLXGaQG1tDoAjTGRK2zu1tckAvr6UceoqJc+DyRBjn M/Zn526FpWfd3i78v6DKBM9fXl/2W3M/3iu7TkUHNdyxxhDaVCxFU1d5qB1qT+mouqmttm 9xtv1MZcZOlUjxh7i7jUsd9Owb5j3LQVjSjbm6iErqPG5Z3SbHyY3CcX7o2ld1qk8PL5xJ rPd0ywjJOZuzrNESRLqV6VHC2b4ivWVK5KVBhN1eb9WfSaj80NOZa+up09Ke6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468706; a=rsa-sha256; cv=none; b=gVWU/7iflqSVRZSUYHDkLY6uwTVHd1X2wBVT3WwhpQB7fqXt6hvPkg1ZaJzBCsrH2Dathr ZEhAIo0IJMhSUTe3cA8Wr5l/w9A/At8ZwT794IK+69hIaDbNWhBtcIomnzFRs7XDlvp2Mr ehosy1QISPZWu8W0oo4KhBazEaJdxtRoLzXNpk4kue8ZU1HUx4qBs9M5qHfzNNN7RLtp67 o+rSNYF3ZnFr41IWK57i5UfCZsCc+W6v0X2MJlehghv2kggchHLlAlHbKTU4XXUI+Zudpp fWE+uzUht3S8FlJ8HQQ6Z8R188V79b0jBE1NbWEaVYlBNJU6a0HPTV3TQ/+4XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YINupwjGsPmyuPXkXIjo8rEM2VDfXgOdQP+CtzLnSR0=; b=DLJhMEoiyzjrykwaujw1JWKm7zg8A/NQZOXEOGytC8XPP/Tje/EN25DoeNOmGLxKFjuF/P k8LlFMyn5v1ek1LpaHYqvbk5YBHcvZamX1br/b6AfN5zYC9iF51uczdHSCGoyZOvX6d4hE /pHhZkuqLqE3UByGm1QgpRkFcyInulsL3KeSVC3qOPGu6iK5oxxEwaM+u4nhWFZoj/tdVf EZIJoGBJLNmhJUaIY5Adjn06uoldSyLP5yBaIeeYok4T5xJ+GrlGnN6cBOgW3m0/peFbFq nX/tjyGH5AW17wIbUuyKeqkaA/9klzE6IhA4wBpZkQlmtyn8kYCz30+XDF0Dag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl0cf4djNz15LX; Mon, 11 Sep 2023 21:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BLj6ct072368; Mon, 11 Sep 2023 21:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLj67L072365; Mon, 11 Sep 2023 21:45:06 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:45:06 GMT Message-Id: <202309112145.38BLj67L072365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9c6710cd2453 - stable/13 - uefi(8): Refer to a related manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c6710cd2453b84b115bbdc029de74876fcf6b2f Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6710cd2453b84b115bbdc029de74876fcf6b2f commit 9c6710cd2453b84b115bbdc029de74876fcf6b2f Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 21:44:24 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 898f2cd7234e..ee0263c89599 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 21:47:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl0gB0Plfz4tGhM; Mon, 11 Sep 2023 21:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl0g972Grz3Mwx; Mon, 11 Sep 2023 21:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoE62oHs+Z2Kvz4cOePNTi63EFED3Vn78P19ZBqf474=; b=DiW1LK0kMBnEsvSAMqEcqlDsLKhG9IjU7E4SDdZ9+G3jDnX+l6dwoaOeAQ/E6m6BA7Daa5 iqOp5VnhbhYRO+2gVnkgvMGx4vUkDhZb5Sgs2sVBwiB+RmbqqqsMQCu+dNhykRak+9CDic p5iMp2OFaRHEWC4/Kmzpr9NAoNDsZTtDzw1ZRG9ZoDdYH+DvMbtTrnp6hGrNa9VZ0ZchNw SGnxtqtfi7LNZrvEfHyVQ/iTj+tGJ6o1y2hW6z0uycgMbjhLkx8Hm2vXCm/tY7gSqfAq+n 7T2exAJ4/baFAO7lbtlbJW0NTDqrrwzPZYU8/GLY12Rh0AkJTs98Ls+FMdVnNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468838; a=rsa-sha256; cv=none; b=V45I948Mab4vA/5FxTHhlhr/o+BzPdO+6sw2/OAGW1NAr3D4+Ok5rsAO3tv2YX+AVjzFZd OVDExqGwElg29aR2u+y0UdX/HyTGsHn66HYr3NYMkdQYzkOif3RI7C7f7c/qqox5MG+TQQ 4i55Oz7c4ebgl0xBx8bYlP0SfdgVuYu32yvSPhlUOy3zS35TT/Ew47W7Ole19aaeDIg58p Q9uvOnWx+h65ny+oK4drFeu3EBFoR1t9iv/K6/nfMSFWF6nl/kAdA6k82Ei906uwOfNwG8 6WcImbCxCBkCk6hoUxuDGR/w/ZybkkJN0pD3JCIVzeajXo6Omiag+vG6bYYv4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoE62oHs+Z2Kvz4cOePNTi63EFED3Vn78P19ZBqf474=; b=GBQYWTGpNih9VTQaly7SqKO+rA28PpGASDuQEE/7kLNY/Vpw6C7tnq3luSIvTuFbrCU5z7 1y8jKuUWzfUWDlSrVwnql72zt82lgLf8gNryakJnQxrUPWLHENxLPyx93UIZOcU6tnzZFZ FjImG8oxMKv32vE/t9q9M0oZO6VWw79esM3ESqZHncY+Wdt05qatcX3l3kkXrA1ciSm+93 3msqTiEIBUpfXOEPiTuCFAtf02Z2hfBYzWOVnGwgJMhJ305ZyL5w+5m4l6BIv8KaScPN2x YIDQ5conbjcMlnIjHsYlRjXd7dFXNgk35vECr9EwWYeHFQ6hK9EFFA0bJ85SBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl0g95wtLz1593; Mon, 11 Sep 2023 21:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BLlHY3072804; Mon, 11 Sep 2023 21:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLlHsF072801; Mon, 11 Sep 2023 21:47:17 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:47:17 GMT Message-Id: <202309112147.38BLlHsF072801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2f269a3532b2 - stable/14 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f269a3532b279a215d527ef67949ff020476e8c Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2f269a3532b279a215d527ef67949ff020476e8c commit 2f269a3532b279a215d527ef67949ff020476e8c Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 21:46:57 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Mon Sep 11 21:47:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl0gf5Kpyz4tH1L; Mon, 11 Sep 2023 21:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl0gd3zRyz3NW0; Mon, 11 Sep 2023 21:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tGqhYeu3vj14P4fnUg4pY8HIeRLCQriz4jU4gkwik8=; b=vKDB0skD/3D0AjeaoYy6Mk8CFWZdxvp/ErEGCJ/ebE8dJSQ5HXw0g6I9azNbInMMyjyeKP DnI+IeWsY0MS0/Rog6S0hmNqBNjDR6yos+gW/zb66VkgaMspg0NsTf5ghfFNOBEGFQUPUd KF1c/aqIdvUvlJVHzhGdgtBoxGYMhJgvxGdlqPgUoZo1UEctxe8tNA6q+9oysNKtDVHSyz pRW3ClgQoKf0wlefkSJUmcm3y3iLViq98Y2mG89lydNyIzxmg1wL4wCnCf6ICNQvVo9pKX HhV58Fc1p2VS/OJkWJ7eB44FDedcLjl9VPiao7IO3IthTy/RZrowTvGltY8Qug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468861; a=rsa-sha256; cv=none; b=OPyV4vCKEE5M/HHcGbMBha0SuKcXgqL/bVEfiehQN/7DFjbwFV0dI5II+DGlTyS+s3Ib9A z6YlRh3OiA7lWlApAFXgtN3qeyoecQJgTbUqe3+yifsxOCF7XGHalDTPQFJ3dxe5NIsYvu BMMBA+ogWHNdUBTyQctwscpCASnqrGyfwe3AOnjHxlVD0Mk94orGY0gsOy8XvjvRfS59M9 D59YBhFyNL5ClBQQV9ujb58lY5x3kcRx/doAkfFzICcSDMhxFq06XQKzrfk8TsSzIuT8nG qe3yzoK1DQtyKeefyBdQ/hzLw16qXGxRwzgGrJANdjVaRlYWsvM2IF1YucI3+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tGqhYeu3vj14P4fnUg4pY8HIeRLCQriz4jU4gkwik8=; b=Lwt6Fk8/DNo3vukBhkXWQC/CF+l3F7mJ/+rOEPQD4Fq6VYPJgH8jbrRe8jaJvHgMPPo8oX +QrukzDd/iZ4RN995hpDJZ+1o5bt6HPTKCKFnesOSZv3J0Xm/KfB5qT5LP/Dr94W+hZZm4 LlHgxAt3qsGVP9F+xwt0AHqq4ENRNrCb8td5LTsbqp+N6OQUuKCKfiIprSbYp83ZDPyxoP jI/U+uipgxecIfgT0Xjdfd26HmKLESD8GNzU9qZxPGpYnsc5yZi/CzLkLgI+iHvepaEmUN EdDiYZ6lD+InlLgWRR8QR8aM02aeIIxOA3kd03XmFu0Vv1rCl/9S5Q7gbU/1wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl0gd162sz15cq; Mon, 11 Sep 2023 21:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BLlesq073055; Mon, 11 Sep 2023 21:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLle0I073052; Mon, 11 Sep 2023 21:47:40 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:47:40 GMT Message-Id: <202309112147.38BLle0I073052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 7652c49af66d - stable/13 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7652c49af66de526522793b6614acde515f9e5af Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7652c49af66de526522793b6614acde515f9e5af commit 7652c49af66de526522793b6614acde515f9e5af Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 21:47:28 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Mon Sep 11 22:01:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1073NRpz4tQQb; Mon, 11 Sep 2023 22:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1072rwCz3S9y; Mon, 11 Sep 2023 22:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=YTM/X/ZCmc0xHpXUtYRe+/0vieJelBck5TqQ2IN6qBSlMb0ttgXdyvZFEPMSdzw6U0XSgi EDopQPGqdmy1DcmWVZw/77oB1K0rJsaqqJtgQ8v8HHwCPRHA6b/GFUxUz+OtFyVhEi+iuN toqz4McM6wNeM6wFJ3ce/h0AGeQ/aIz5BwU5cQ5+WJr9cp8PJ3poYWW8J+ryDVkyagYF0h OSbcuW5xVTZ1JvG0elI6DpauSdpZL+8xIalj3r8wsX9C2pwrjDvKhGY16MH+oHDGH0d/E2 gRYUdRW6dZUCbxQDq7zaNA3Hx4mwVKcHSWO9IfdwDfMlcSTxSeT4KFpMeMkkMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469719; a=rsa-sha256; cv=none; b=DPE8s+qVj7DaVIQOUalZ2sVJyUTuZXZNSQ6Gi7Oi9AvjEm8B5BmLQacfkWQWa9q4Lq/DtD Yy/sBJYpqA9HmanbgYCBlzNqgHn3RgapLLPPdxp2yzVSuI7Nf453ZUvcJEiKI/tZHMtnAz p1ptK/DHNmLiMTf9aWujd7/crwyLNjtnQpB0WRdcvJVIRiHV4EGj4LFoBDddXMHWSfcA9v iLNGn8bM4IYVo9LU8WW369BkC5AfV7vgqwhONUD++kHCoQv3CglPzKqSyx/SWaQ5XRY3p3 EcQovZH3NYhTQZtuRC/j89SpMqqt8DNQ3kFaKyM5HJvJczXpeBQ1HGPoFrLj5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=WPSgIuD+fVg8EMzEZF9jk6BnrqaOQf4FCiFiKujBb6mWVmDm5ibUTI5doMVtHyneerfAmn qKelrcAxYyQQVJiHiYireuatjhTQeSTLBAReOZa/gY190t9yzLCxSCt7gu71MH+/kyBh59 CIcYtwFI/ysTqDnprsg5WPcaWdDOBd13yurcU2qMvrlh9PqGfo6IwCiVkCgzkV8a6joxqa JjCnTgiYs/D6XjpbP0JRCW5cqp8mFyxpwCkafu2z/N7bP6KSuEhy+VoIfOXnYP6WFp9fQf eMf/nfg1kiWS6VwE+51plR59x8iAGi7SxEdmpY3BFYYtcCdytQPZsruGh90Gvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1071ypkz15fS; Mon, 11 Sep 2023 22:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM1xxe005024; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM1xWU005021; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:01:59 GMT Message-Id: <202309112201.38BM1xWU005021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6b2f0a3c31db - stable/14 - stand: lua: module names should permit more List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2f0a3c31dbf9268b49d64c859da136ca8dc201 commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:01:52 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Mon Sep 11 22:02:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl11830K7z4tQbf; Mon, 11 Sep 2023 22:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1182Yq2z3T01; Mon, 11 Sep 2023 22:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjwOQdepOeJgFWCsDdAgmFWlLz11GVEdMENWGGRYNGA=; b=pCNeYcj7TQPREA/nE7POwGoPI80RY+KXQlWntOjbHiEVU8LTakRO7gpwS1NacLzW9LQ+4a TdpiKkf7Uz2ECniUCaxA7B9gIeE/wqvutp6/HEyb5umjd1mSflLhPJ2u0dJuHOuhdHOtie e0OXukcTumut+Ul6KfwatwIZCtrdLmWeOuA8OGWcvtz0j0+qN5FqhdS/zSuTrOoSOA0Ij8 49xj+fzEFa5v+3vxhqjSMLSOolcBjxtg82nbnl6saK9igEb9jc7f2V9bUm9WzF+PQtsGCz G/08F7j/EB+5leCfa21jVuykUgf5MRdJtBZ85YkgNYm6NNZ9fDHlAO79khwcLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469772; a=rsa-sha256; cv=none; b=Acaq3J3GChyV+EKfpLuECV9//6M1/EEYNsyKCBLTuakb1WxYranZ95fUODCiUzuB01g6zs a6+G9fPGiTg4jAa9Cxp/FCqQKr5UOmIOtSKxG8iwzRoFE5x7xk+ac9xpUo7MO4nzl43BiF U0Aq5gJhRHT3jOP+DR/7bzr/Yftw561TTLg2AQpIsrxlTGvA3GWGiMSCgbxh+FVltAAJx9 PkueeolosCD56DqxQRgK6oUcRQPUL82OyN6r6i9MsdkQ4YlUpd51kiFkOtdnTB9GGcwv4b W1UptqySBF8rhJ9eHKruqht1L8s7Uzpnep6Qx08gOV1t55VDbSuEYUXehf6Jpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjwOQdepOeJgFWCsDdAgmFWlLz11GVEdMENWGGRYNGA=; b=Dgc9U8TMunsWkzejwlCNJPlTkrCL2u6NYE79cQeBx2s4OOovoFKZ/WbIy1Pp7a1HuXy1RT 0wIR6O6mWhcvXjAkbAX4y5ujaGNpUcDsccMZVgFdrXwE1RohNuNBhjgqDg4ctfkLizESHI t/qBQboe6imK0GaibXhmXxrOX/wLugK28Ewpdz6NjLqwirsOh74aQhC9EFgBLCCc6kc7H6 1Z0IYbYNll+/M4GbtQZ5TK7JjIREtptI3oiMf98eHuFUzF320+qV243a0j5mIOD67Yo3ng U4SpGprd+nUgvS8aRR+78hqjrVjOfUBNGW6m2O6C3rSqULyF7OFkAVTp6HhUnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1181dtrz15fj; Mon, 11 Sep 2023 22:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM2qXi006163; Mon, 11 Sep 2023 22:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2q1x006160; Mon, 11 Sep 2023 22:02:52 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:52 GMT Message-Id: <202309112202.38BM2q1x006160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3dbc67da504c - stable/13 - caroot: drop VERSION tags from certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3dbc67da504cf318a3f1928aac77d6d2be35001b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3dbc67da504cf318a3f1928aac77d6d2be35001b commit 3dbc67da504cf318a3f1928aac77d6d2be35001b Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: drop VERSION tags from certs With this change, we'll drop the "with $FreeBSD$" lines from trusted/ certs in the next update. untrusted/ will need to be done manually, but I'll likely just do them all manually, commit, then run the script and commit any legitimate updates after confirming the output matches what I did manually. Reported by: imp Reviewed by: imp (cherry picked from commit bbc8585ef557be36b3fda75e3a41d725aedb1c1e) --- secure/caroot/MAca-bundle.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 8521b620337f..4feced90d782 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -38,7 +38,6 @@ use Carp; use MIME::Base64; use Getopt::Long; -my $VERSION = '$FreeBSD$'; my $generated = '@' . 'generated'; my $inputfh = *STDIN; my $debug = 0; @@ -79,7 +78,6 @@ sub print_header($$) ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## @@ -96,7 +94,6 @@ EOFH ## It contains certificates trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## From nobody Mon Sep 11 22:02:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1193twNz4tQkv; Mon, 11 Sep 2023 22:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1193dVtz3SjP; Mon, 11 Sep 2023 22:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSMRFliMfRv+4JA0WoMjAxiR3YSbDUAmevyuD9YdPxI=; b=cWD2mWLl4LP+0gQ0+jzKoJK7hglBFC9lrrHnxkZwq/ytyh0YeJEOArOqBIS+DTInQNFUpI W6+UgPt5nPcItEFrxogrRWvRtBSXAcJNJI8Zt1Pf/Z73txI0qKSBdE1HgzgzLpBjM9hW0R c4woiSGkpg6T48DVfAoSHEpQAMbHDpG3WnCQ/KVW1Uidx1VQhRQbR381pIOzPDNExPx4BI M2H42QZOnQN7lQ05h1HGqDt1sBWhwzhZu4BDk/T2mldIbS+dYqlxjVhl9naAvycm0iV0/i LegUIdWQuZks7enNLS1zy3sdcmZGtBSv/N9KtECFhoiDG7FAu7VokjBLGMySiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469773; a=rsa-sha256; cv=none; b=maJKNma6/gB8tRsYedJbg+r6CtcP1pYyZ3rKIg8YjBQ9gHog4SIeurhaPLgb1q6k09jN/l 0C/Up2+rDRMegxUpyrIFeGBSxQnfbQUVg5VzzEZW65/2JhS4w4SzI2x/OtJG5x6uWH1eVO dl6fvkuH2sjOegofB+GH8eZZH0Ewl9T+fxZGmYQVXNNQ60MHFpZyKXMNOxwje+8qngAvYK WrIzXoAVABCedXp2JJqyayUXAo/4i3mCFdVeKPEm2FMq7xXmgijqy19SNKyPF8BuHqko2N ZAiNCJy82DGdndQEjGQ6cbBDELD8b+6MtEgpDyYO+MIc9db9jNaZpbJsWClVXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSMRFliMfRv+4JA0WoMjAxiR3YSbDUAmevyuD9YdPxI=; b=uph7EOaDKFBfwAvd0HAgwYzTMm5WMJRKEv0f/+U7e3rJ6iwTFYkkPwjXJLyoWkItMqJuOV rT0aqHcYt/+SjSZy3uUps+jzu4Q2JLsbJx6nhHxKjg7ijFCjI/4tFQRQawFb4v/VUjXXHB cLR4ZtF5A7X1+/4qyhHIJWLDfFZzF+uPHOA6LwamvyXOw9PUtqAdUlShQezi9dQ/yWMxzK 7MZdelQ4+WXmwK3EYXLuL7/6/II4m7rMsAB3i/VvlTvxHgwbadvsbeWFaLwVVF/WZiIpSQ eNjdJgcmN4+OakSfV2lEO37ZsBh7b4EmFm8bHstIDJqBFkqOVpAZZZJDJ5ljQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1192dVwz15fk; Mon, 11 Sep 2023 22:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM2rD6006218; Mon, 11 Sep 2023 22:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2rrm006215; Mon, 11 Sep 2023 22:02:53 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:53 GMT Message-Id: <202309112202.38BM2rrm006215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3ff148ad9274 - stable/13 - caroot: drop the VERSION tag from already-processed certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ff148ad9274a0433ac63582cbe50138517d8744 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff148ad9274a0433ac63582cbe50138517d8744 commit 3ff148ad9274a0433ac63582cbe50138517d8744 Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: drop the VERSION tag from already-processed certs An update is imminent; drop these now to make it easier to audit the results. (cherry picked from commit 3f84d4b0fe1445bca5f3b6a70fc5641b88c31217) --- secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem | 1 - secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem | 1 - secure/caroot/blacklisted/Certum_Root_CA.pem | 1 - secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem | 1 - secure/caroot/blacklisted/Cybertrust_Global_Root.pem | 1 - secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem | 1 - secure/caroot/blacklisted/DST_Root_CA_X3.pem | 1 - secure/caroot/blacklisted/EC-ACC.pem | 1 - .../caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem | 1 - secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem | 1 - secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem | 1 - secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem | 1 - secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem | 1 - secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 1 - secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 1 - secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem | 1 - secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem | 1 - secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem | 1 - .../Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem | 1 - .../Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem | 1 - secure/caroot/blacklisted/TrustCor_ECA-1.pem | 1 - secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem | 1 - secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem | 1 - secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 1 - .../blacklisted/VeriSign_Universal_Root_Certification_Authority.pem | 1 - .../Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem | 1 - .../Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem | 1 - secure/caroot/trusted/ACCVRAIZ1.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 1 - secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem | 1 - secure/caroot/trusted/Actalis_Authentication_Root_CA.pem | 1 - secure/caroot/trusted/AffirmTrust_Commercial.pem | 1 - secure/caroot/trusted/AffirmTrust_Networking.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_1.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_2.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_3.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_4.pem | 1 - secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 1 - .../Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 1 - secure/caroot/trusted/Baltimore_CyberTrust_Root.pem | 1 - secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 1 - secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 1 - secure/caroot/trusted/CA_Disig_Root_R2.pem | 1 - secure/caroot/trusted/CFCA_EV_ROOT.pem | 1 - secure/caroot/trusted/COMODO_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/Certainly_Root_E1.pem | 1 - secure/caroot/trusted/Certainly_Root_R1.pem | 1 - secure/caroot/trusted/Certigna.pem | 1 - secure/caroot/trusted/Certigna_Root_CA.pem | 1 - secure/caroot/trusted/Certum_EC-384_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem | 1 - secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 1 - secure/caroot/trusted/Comodo_AAA_Services_root.pem | 1 - secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 1 - secure/caroot/trusted/E-Tugra_Certification_Authority.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem | 1 - secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem | 1 - secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 1 - secure/caroot/trusted/GLOBALTRUST_2020.pem | 1 - secure/caroot/trusted/GTS_Root_R1.pem | 1 - secure/caroot/trusted/GTS_Root_R2.pem | 1 - secure/caroot/trusted/GTS_Root_R3.pem | 1 - secure/caroot/trusted/GTS_Root_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 1 - secure/caroot/trusted/GlobalSign_Root_E46.pem | 1 - secure/caroot/trusted/GlobalSign_Root_R46.pem | 1 - secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 1 - secure/caroot/trusted/Go_Daddy_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 1 - secure/caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_ECC_RootCA_2015.pem | 1 - .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2015.pem | 1 - secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 1 - secure/caroot/trusted/ISRG_Root_X1.pem | 1 - secure/caroot/trusted/ISRG_Root_X2.pem | 1 - secure/caroot/trusted/IdenTrust_Commercial_Root_CA_1.pem | 1 - secure/caroot/trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 1 - secure/caroot/trusted/Izenpe_com.pem | 1 - secure/caroot/trusted/Microsec_e-Szigno_Root_CA_2009.pem | 1 - secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/NAVER_Global_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/NetLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_RSA_R2.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_RSA.pem | 1 - secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 1 - secure/caroot/trusted/SecureSign_RootCA11.pem | 1 - secure/caroot/trusted/SecureTrust_CA.pem | 1 - secure/caroot/trusted/Secure_Global_CA.pem | 1 - secure/caroot/trusted/Security_Communication_ECC_RootCA1.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA2.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA3.pem | 1 - secure/caroot/trusted/Security_Communication_Root_CA.pem | 1 - secure/caroot/trusted/Starfield_Class_2_CA.pem | 1 - secure/caroot/trusted/Starfield_Root_Certificate_Authority_-_G2.pem | 1 - .../trusted/Starfield_Services_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_3.pem | 1 - secure/caroot/trusted/TUBITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 1 - secure/caroot/trusted/TWCA_Global_Root_CA.pem | 1 - secure/caroot/trusted/TWCA_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 1 - secure/caroot/trusted/Telia_Root_CA_v2.pem | 1 - secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem | 1 - secure/caroot/trusted/TunTrust_Root_CA.pem | 1 - secure/caroot/trusted/UCA_Extended_Validation_Root.pem | 1 - secure/caroot/trusted/UCA_Global_G2_Root.pem | 1 - secure/caroot/trusted/USERTrust_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/USERTrust_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/XRamp_Global_CA_Root.pem | 1 - secure/caroot/trusted/certSIGN_ROOT_CA.pem | 1 - secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 1 - secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 1 - secure/caroot/trusted/ePKI_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 1 - secure/caroot/trusted/vTrus_Root_CA.pem | 1 - 166 files changed, 166 deletions(-) diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem index cf7de6cc122b..f708097b5023 100644 --- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem index b1fa96bc405e..1ba719b3690a 100644 --- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/blacklisted/Certum_Root_CA.pem index f815c49ddae0..c94db94aecaa 100644 --- a/secure/caroot/blacklisted/Certum_Root_CA.pem +++ b/secure/caroot/blacklisted/Certum_Root_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem index 1e3864180a66..0133aff5f03f 100644 --- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem index b780a314ccd1..0a1c5a632dce 100644 --- a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem +++ b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem index debf7b30c2ef..0de1a5b43dce 100644 --- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem +++ b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem index 8cb0d1c990db..e9574b162807 100644 --- a/secure/caroot/blacklisted/DST_Root_CA_X3.pem +++ b/secure/caroot/blacklisted/DST_Root_CA_X3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/EC-ACC.pem b/secure/caroot/blacklisted/EC-ACC.pem index a4b43b39414b..bb354b09137a 100644 --- a/secure/caroot/blacklisted/EC-ACC.pem +++ b/secure/caroot/blacklisted/EC-ACC.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem b/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem index b03758a63c98..ac41a1521a7a 100644 --- a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem +++ b/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem b/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem index c9b9c9282c19..b44e2fa5eca3 100644 --- a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem +++ b/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem b/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem index cd9bebaf8c0f..d46ed10b3dec 100644 --- a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem b/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem index 827d7b869e60..52f8b75fdc3b 100644 --- a/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem +++ b/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem b/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem index 7ab99c211f49..9758150ed3ee 100644 --- a/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem +++ b/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem b/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem index 08ea553a9e80..a2b6cf37436b 100644 --- a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem +++ b/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem b/secure/caroot/blacklisted/QuoVadis_Root_CA.pem index 25e6300f5231..6fab6f44448a 100644 --- a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem +++ b/secure/caroot/blacklisted/QuoVadis_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem b/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem index b23c237e319f..67ae4c366eb6 100644 --- a/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem +++ b/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem b/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem index 701ca2161990..adac12a0b9ac 100644 --- a/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem +++ b/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem b/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem index 14a79c4c3e24..f1c93f823fcc 100644 --- a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem +++ b/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem b/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem index f4678f629684..34ecf8b7a6af 100644 --- a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem +++ b/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem index 019c97a13d34..80c89f49a928 100644 --- a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem +++ b/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem index df9468c1249e..66262ee01796 100644 --- a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem +++ b/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_ECA-1.pem b/secure/caroot/blacklisted/TrustCor_ECA-1.pem index 3a250cc86edd..66538e08dcc3 100644 --- a/secure/caroot/blacklisted/TrustCor_ECA-1.pem +++ b/secure/caroot/blacklisted/TrustCor_ECA-1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem b/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem index 883336da67ba..a45119f243a3 100644 --- a/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem +++ b/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem b/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem index 0335e3418491..7a99eb6df173 100644 --- a/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem +++ b/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem b/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem index 476ba64dfd63..693b9dceffdd 100644 --- a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem +++ b/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem b/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem index 353f709ad531..dfad2a5dcbd8 100644 --- a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem +++ b/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem index d060de75b329..b20bfacf4566 100644 --- a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem +++ b/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem index 89400caf7eb6..43f963a0ac6b 100644 --- a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem +++ b/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index 1c96e53b8f17..dbe720481fe4 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 6a64be5ce138..22f5764a5d3f 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index 71ee49574e84..bbd47304c5c9 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 6114a5ccdb2d..4369ffbf1b30 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 7c971e1229a2..8ea77deeda58 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index 282d1a5dcf6f..b1031ad0f348 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 830cf3f0c3c2..1d6a82f767f7 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index 725747aafdaf..ef4c3286bf1c 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 6fe75939863e..1a1b7b14e7be 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 2aca2eee3e9b..996e32e056e9 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index 95ca81db30bb..fbcb6a47f445 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 294f7dc8f0b6..1e45a816b669 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 649917b9638a..889f1dc33d52 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index 7058d3fb6edf..b65333ef383d 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index db4f44195dbd..12342b79afc9 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem index 889f140decc8..5023b4465d21 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem index da44a530a038..e2b2579a9cdf 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem index 0f356d59962f..d253c062d876 100644 --- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem +++ b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem index 0168f641fd42..c94745194a1f 100644 --- a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem index 7ae24799e638..b86299675116 100644 --- a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CA_Disig_Root_R2.pem b/secure/caroot/trusted/CA_Disig_Root_R2.pem index 0dda6d97e2aa..aa2b13653811 100644 --- a/secure/caroot/trusted/CA_Disig_Root_R2.pem +++ b/secure/caroot/trusted/CA_Disig_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CFCA_EV_ROOT.pem b/secure/caroot/trusted/CFCA_EV_ROOT.pem index 722499b9ed42..01bb0463a686 100644 --- a/secure/caroot/trusted/CFCA_EV_ROOT.pem +++ b/secure/caroot/trusted/CFCA_EV_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/trusted/COMODO_Certification_Authority.pem index fc3e4b554cc3..57fb36edd969 100644 --- a/secure/caroot/trusted/COMODO_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem index 5f839a858d00..792e7744bda1 100644 --- a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem index 7faefe98b8bf..c467be08adde 100644 --- a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem index 0750f7128ae6..286022c90cfd 100644 --- a/secure/caroot/trusted/Certainly_Root_E1.pem +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem index a4e6f28e33a6..c94f1f4f5e04 100644 --- a/secure/caroot/trusted/Certainly_Root_R1.pem +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/trusted/Certigna.pem index e9104ef6c3da..87ed4d66d4eb 100644 --- a/secure/caroot/trusted/Certigna.pem +++ b/secure/caroot/trusted/Certigna.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna_Root_CA.pem b/secure/caroot/trusted/Certigna_Root_CA.pem index a0a7248b51ea..e7f9fd8ea2b5 100644 --- a/secure/caroot/trusted/Certigna_Root_CA.pem +++ b/secure/caroot/trusted/Certigna_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_EC-384_CA.pem b/secure/caroot/trusted/Certum_EC-384_CA.pem index 67b5d644f809..46ea4ccb4f32 100644 --- a/secure/caroot/trusted/Certum_EC-384_CA.pem +++ b/secure/caroot/trusted/Certum_EC-384_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem index 5f92008a47ab..e0141e43298e 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem index 8dcc08c17b07..57c438e0ff71 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem index d6034eb6e081..86f0fcc8cc03 100644 --- a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/trusted/Comodo_AAA_Services_root.pem index b74de8633a65..2de8ec9b993a 100644 --- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem +++ b/secure/caroot/trusted/Comodo_AAA_Services_root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem index 758d61032898..56b6765b9b3e 100644 --- a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem index 76991855eaa1..9de2c038f456 100644 --- a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem index 5d2077a83e4c..0aa7731fe9f2 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem index d70caff62777..85d054b99954 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem index 517dab4f837a..b81c4744a9a6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ *** 1191 LINES SKIPPED *** From nobody Mon Sep 11 22:02:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl11C0WHBz4tQj1; Mon, 11 Sep 2023 22:02: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 4Rl11B5LHhz3T0p; Mon, 11 Sep 2023 22:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA5uXW0jmSqycu9WU0aEsqY65MvjpwLXqhdoJnUbvtA=; b=M4XukfE5nxVZwVZdScs4FFJ0irnge1agZwCdNeJb8i9P/wSXoBxpQJ+gh5p2asUrl7kIsf DZQANrd3zwCbuwSSz48L9pON0skZPPVFYnrHa88d7Jr/Y3xAY3//yWT91xKVdCrp1JsnLt RM+F/gR5xSDWijH/tZxIE7MbYW4tS18PGMJGAwNWKBJ2SB/j6Yl0KDUb0vayugf4ZK8Ey3 LBJrcTji2dLQm6JueYVOjxS1E8a5oH4ZQ/QOWxNIi3j2poQvE5zcNnS43hac9Fl63lnMlv KOeCCX5DMRHYmPqBhNc8XWqd50Wb4/gnfX9/8YpMdMy+hzHGt5tn4NSvhVt4NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469774; a=rsa-sha256; cv=none; b=ckuHLCm69LLok3VlKgndN9Ef2yhzZ9FBEVKf0nXgFQSriFqCcoeEDzktZ0xV3XZAnizovL gOi/DjwDfIdqN8J6vZYtlMVMdpBokcbqDvH9PakrM6vkpqgQ2VaLSIXUAMoS89S7P8iSPZ 1FaFpObAJJKP60YUiRYqwxOU8uDXFAklkjE6NI2JkQ+PNhpb4rBFh3qn17kFFYtPo/rPSq R9vxavUpCxDA5INBYZSful+9jihVupeZRWpEx/ccIAHiKoHyIMvQnILsOXoJ4xDpBUxovt GkSXzB2OEbkRaN0GnhgmnZKdfzJ0UN/zPNdNFlDZJrS35sVFeEbfUPlO2MA99w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA5uXW0jmSqycu9WU0aEsqY65MvjpwLXqhdoJnUbvtA=; b=WACDdeCZYSR4wfXrz0VhWWLKE+gbP2TNhokJNkZqB4kPsDDQcLmcbKBWQEBNZSLUkqw8dL eTjIFOBT2O1FTzN1bmy1HWzki/BxihzMFSovOEEum47tpq0CW0lj8kAwtRMnzBUQf6MhIz LSdhk1TM83FGCtAbqKdoj28Lf+OQLpdfKOMTmtXLEFZnSW4c9IBksPlu/+40A1y+NUns1Z zD9Xw7DV2JIgzkhnAgUa6JSSmmzkucr14wWAZ2Xzx/7JBcPeuzvEzfKeVUrJCKCnWun6lG SkSJyAxb9mw98x+lil7zCYRcjaZmkVhRDdbDuJAW6wm8/OwzzarUyUKnyt8AfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl11B4NQmz15cJ; Mon, 11 Sep 2023 22:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM2sOl006279; Mon, 11 Sep 2023 22:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2skI006276; Mon, 11 Sep 2023 22:02:54 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:54 GMT Message-Id: <202309112202.38BM2skI006276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 25f07248916f - stable/13 - caroot: update the root bundle and regenerate with OpenSSL 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 25f07248916f0108bd62b3deb58e21bff880b391 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=25f07248916f0108bd62b3deb58e21bff880b391 commit 25f07248916f0108bd62b3deb58e21bff880b391 Author: Kyle Evans AuthorDate: 2023-08-26 01:01:47 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: update the root bundle and regenerate with OpenSSL 3 Summary: - Six (6) new roots - Four (4) distrusted roots Note that this was intentionally generated with OpenSSL 1.1.1 to avoid mixing updates and non-functional changes -- there will be some churn with OpenSSL 3. The next commit will update the current batch of trusted certs with the format OpenSSL 3 produces, which I've tested against OpenSSL 1.1.1 to be sure that that doesn't hurt us in older branches. This MFC also regenerates all of the trusted certs with OpenSSL 3 to reduce the diff of future ENs -- this update has no existing certs modified, so it's the perfect time. (cherry picked from commit 65fd80909e196c8be2ce5e948775e9cbda2ef069) (cherry picked from commit 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6) --- ObsoleteFiles.inc | 6 + .../caroot/blacklisted/AddTrust_External_Root.pem | 34 ++--- .../AddTrust_Low-Value_Services_Root.pem | 34 ++--- .../Camerfirma_Chambers_of_Commerce_Root.pem | 36 +++--- .../Camerfirma_Global_Chambersign_Root.pem | 36 +++--- secure/caroot/blacklisted/Certum_Root_CA.pem | 33 ++--- .../Chambers_of_Commerce_Root_-_2008.pem | 65 +++++----- .../caroot/blacklisted/Cybertrust_Global_Root.pem | 38 +++--- .../caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem | 36 +++--- secure/caroot/blacklisted/DST_Root_CA_X3.pem | 33 ++--- .../E-Tugra_Certification_Authority.pem | 64 +++++----- .../E-Tugra_Global_Root_CA_ECC_v3.pem | 16 +-- .../E-Tugra_Global_Root_CA_RSA_v3.pem | 64 +++++----- secure/caroot/blacklisted/EC-ACC.pem | 34 ++--- .../EE_Certification_Centre_Root_CA.pem | 33 ++--- secure/caroot/blacklisted/GeoTrust_Global_CA.pem | 36 +++--- .../GeoTrust_Primary_Certification_Authority.pem | 33 ++--- ...oTrust_Primary_Certification_Authority_-_G2.pem | 13 +- ...oTrust_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/GeoTrust_Universal_CA.pem | 64 +++++----- .../caroot/blacklisted/GeoTrust_Universal_CA_2.pem | 64 +++++----- .../caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem | 38 +++--- .../blacklisted/Global_Chambersign_Root_-_2008.pem | 65 +++++----- ...demic_and_Research_Institutions_RootCA_2011.pem | 34 ++--- .../Hongkong_Post_Root_CA_1.pem | 33 ++--- .../caroot/blacklisted/LuxTrust_Global_Root_2.pem | 65 +++++----- .../Network_Solutions_Certificate_Authority.pem | 35 +++--- .../OISTE_WISeKey_Global_Root_GA_CA.pem | 33 ++--- secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 36 +++--- .../caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 33 ++--- .../Staat_der_Nederlanden_EV_Root_CA.pem | 61 ++++----- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 62 +++++----- .../Staat_der_Nederlanden_Root_CA_-_G3.pem | 61 ++++----- .../blacklisted/SwissSign_Platinum_CA_-_G2.pem | 65 +++++----- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- secure/caroot/blacklisted/Taiwan_GRCA.pem | 61 ++++----- secure/caroot/blacklisted/TrustCor_ECA-1.pem | 36 +++--- .../caroot/blacklisted/TrustCor_RootCert_CA-1.pem | 36 +++--- .../caroot/blacklisted/TrustCor_RootCert_CA-2.pem | 64 +++++----- secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 36 +++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G5.pem | 33 ++--- ...Sign_Universal_Root_Certification_Authority.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/thawte_Primary_Root_CA.pem | 33 ++--- .../blacklisted/thawte_Primary_Root_CA_-_G2.pem | 13 +- .../blacklisted/thawte_Primary_Root_CA_-_G3.pem | 33 ++--- secure/caroot/trusted/ACCVRAIZ1.pem | 68 +++++----- secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 62 +++++----- .../AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 13 +- .../caroot/trusted/ANF_Secure_Server_Root_CA.pem | 64 +++++----- .../trusted/Actalis_Authentication_Root_CA.pem | 64 +++++----- secure/caroot/trusted/AffirmTrust_Commercial.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Networking.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Premium.pem | 61 ++++----- secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 13 +- secure/caroot/trusted/Amazon_Root_CA_1.pem | 33 ++--- secure/caroot/trusted/Amazon_Root_CA_2.pem | 61 ++++----- secure/caroot/trusted/Amazon_Root_CA_3.pem | 9 +- secure/caroot/trusted/Amazon_Root_CA_4.pem | 13 +- secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 37 +++--- .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 67 ++++++++++ .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 134 ++++++++++++++++++++ ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 62 +++++----- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 61 ++++----- secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 13 +- .../caroot/trusted/Baltimore_CyberTrust_Root.pem | 33 ++--- secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 61 ++++----- secure/caroot/trusted/CA_Disig_Root_R2.pem | 61 ++++----- secure/caroot/trusted/CFCA_EV_ROOT.pem | 64 +++++----- .../trusted/COMODO_Certification_Authority.pem | 35 +++--- .../trusted/COMODO_ECC_Certification_Authority.pem | 13 +- .../trusted/COMODO_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/Certainly_Root_E1.pem | 13 +- secure/caroot/trusted/Certainly_Root_R1.pem | 61 ++++----- secure/caroot/trusted/Certigna.pem | 34 ++--- secure/caroot/trusted/Certigna_Root_CA.pem | 68 +++++----- secure/caroot/trusted/Certum_EC-384_CA.pem | 13 +- .../caroot/trusted/Certum_Trusted_Network_CA.pem | 33 ++--- .../caroot/trusted/Certum_Trusted_Network_CA_2.pem | 61 ++++----- secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Comodo_AAA_Services_root.pem | 36 +++--- .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 16 ++- .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 16 ++- .../trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 36 +++--- .../trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 33 ++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 13 +- secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 36 +++--- secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 33 ++--- secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 13 +- .../trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 36 +++--- .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 13 +- .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 61 ++++----- secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 61 ++++----- .../Entrust_Root_Certification_Authority.pem | 36 +++--- .../Entrust_Root_Certification_Authority_-_EC1.pem | 13 +- .../Entrust_Root_Certification_Authority_-_G2.pem | 33 ++--- .../Entrust_Root_Certification_Authority_-_G4.pem | 61 ++++----- .../Entrust_net_Premium_2048_Secure_Server_CA.pem | 33 ++--- secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 61 ++++----- secure/caroot/trusted/GLOBALTRUST_2020.pem | 64 +++++----- secure/caroot/trusted/GTS_Root_R1.pem | 61 ++++----- secure/caroot/trusted/GTS_Root_R2.pem | 61 ++++----- secure/caroot/trusted/GTS_Root_R3.pem | 13 +- secure/caroot/trusted/GTS_Root_R4.pem | 13 +- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 9 +- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_CA.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 64 +++++----- secure/caroot/trusted/GlobalSign_Root_E46.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_R46.pem | 61 ++++----- secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 34 ++--- .../Go_Daddy_Root_Certificate_Authority_-_G2.pem | 33 ++--- .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 13 +- .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 61 ++++----- ...c_and_Research_Institutions_ECC_RootCA_2015.pem | 13 +- ...demic_and_Research_Institutions_RootCA_2015.pem | 61 ++++----- secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 61 ++++----- secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 64 +++++----- secure/caroot/trusted/ISRG_Root_X1.pem | 61 ++++----- secure/caroot/trusted/ISRG_Root_X2.pem | 13 +- .../trusted/IdenTrust_Commercial_Root_CA_1.pem | 61 ++++----- .../trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 61 ++++----- secure/caroot/trusted/Izenpe_com.pem | 61 ++++----- .../trusted/Microsec_e-Szigno_Root_CA_2009.pem | 36 +++--- ...crosoft_ECC_Root_Certificate_Authority_2017.pem | 13 +- ...crosoft_RSA_Root_Certificate_Authority_2017.pem | 61 ++++----- .../NAVER_Global_Root_Certification_Authority.pem | 61 ++++----- ...etLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 13 +- secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 62 +++++----- secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 63 +++++----- secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 61 ++++----- ...SSL_com_EV_Root_Certification_Authority_ECC.pem | 16 +-- ..._com_EV_Root_Certification_Authority_RSA_R2.pem | 64 +++++----- .../SSL_com_Root_Certification_Authority_ECC.pem | 16 +-- .../SSL_com_Root_Certification_Authority_RSA.pem | 64 +++++----- .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 69 +++++++++++ .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 137 +++++++++++++++++++++ secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 33 ++--- ...ctigo_Public_Server_Authentication_Root_E46.pem | 67 ++++++++++ ...ctigo_Public_Server_Authentication_Root_R46.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/SecureSign_RootCA11.pem | 33 ++--- secure/caroot/trusted/SecureTrust_CA.pem | 35 +++--- secure/caroot/trusted/Secure_Global_CA.pem | 35 +++--- .../trusted/Security_Communication_ECC_RootCA1.pem | 13 +- .../trusted/Security_Communication_RootCA2.pem | 33 ++--- .../trusted/Security_Communication_RootCA3.pem | 61 ++++----- .../trusted/Security_Communication_Root_CA.pem | 33 ++--- secure/caroot/trusted/Starfield_Class_2_CA.pem | 34 ++--- .../Starfield_Root_Certificate_Authority_-_G2.pem | 33 ++--- ...ld_Services_Root_Certificate_Authority_-_G2.pem | 33 ++--- secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 65 +++++----- secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 65 +++++----- .../trusted/T-TeleSec_GlobalRoot_Class_2.pem | 33 ++--- .../trusted/T-TeleSec_GlobalRoot_Class_3.pem | 33 ++--- ...BITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 33 ++--- secure/caroot/trusted/TWCA_Global_Root_CA.pem | 61 ++++----- .../trusted/TWCA_Root_Certification_Authority.pem | 33 ++--- secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 61 ++++----- secure/caroot/trusted/Telia_Root_CA_v2.pem | 64 +++++----- .../Trustwave_Global_Certification_Authority.pem | 61 ++++----- ...ave_Global_ECC_P256_Certification_Authority.pem | 9 +- ...ave_Global_ECC_P384_Certification_Authority.pem | 13 +- secure/caroot/trusted/TunTrust_Root_CA.pem | 64 +++++----- .../trusted/UCA_Extended_Validation_Root.pem | 61 ++++----- secure/caroot/trusted/UCA_Global_G2_Root.pem | 61 ++++----- .../USERTrust_ECC_Certification_Authority.pem | 13 +- .../USERTrust_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/XRamp_Global_CA_Root.pem | 35 +++--- secure/caroot/trusted/certSIGN_ROOT_CA.pem | 33 ++--- secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 61 ++++----- secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 12 +- .../trusted/ePKI_Root_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 13 +- secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 13 +- secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 33 ++--- secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 33 ++--- secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 13 +- secure/caroot/trusted/vTrus_Root_CA.pem | 61 ++++----- 192 files changed, 4371 insertions(+), 3679 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 14a806699b8b..3ff61da559ab 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20230911: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem + # 20230806: Removal of support for the VTOC8 partitioning scheme OLD_FILES+=usr/include/sys/disk/vtoc.h OLD_FILES+=usr/include/sys/vtoc.h diff --git a/secure/caroot/blacklisted/AddTrust_External_Root.pem b/secure/caroot/blacklisted/AddTrust_External_Root.pem index 701bc7bce072..97fe312d0e8f 100644 --- a/secure/caroot/blacklisted/AddTrust_External_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_External_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: @@ -54,23 +54,23 @@ Certificate: keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root serial:01 - Signature Algorithm: sha1WithRSAEncryption - b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: - 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: - 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: - bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: - de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: - 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: - 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: - 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: - a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: - 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: - 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: - 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: - 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: - 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: - 8f:4e:86:04 + Signature Value: + b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: + 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: + 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: + bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: + de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: + 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: + 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: + 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: + a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: + 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: + 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: + 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: + 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: + 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: + 8f:4e:86:04 SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 -----BEGIN CERTIFICATE----- MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU diff --git a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem index 0595db909a49..afb471de944f 100644 --- a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: @@ -54,23 +54,23 @@ Certificate: keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root serial:01 - Signature Algorithm: sha1WithRSAEncryption - 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: - ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: - cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: - e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: - 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: - 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: - d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: - c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: - 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: - 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: - 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: - 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: - cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: - 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: - 8e:d6:71:d9 + Signature Value: + 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: + ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: + cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: + e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: + 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: + 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: + d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: + c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: + 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: + 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: + 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: + 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: + cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: + 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: + 8e:d6:71:d9 SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D -----BEGIN CERTIFICATE----- MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem index f708097b5023..12bb099e2312 100644 --- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Chambers of Commerce Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b7:36:55:e5:a5:5d:18:30:e0:da:89:54:91:fc: c8:c7:52:f8:2f:50:d9:ef:b1:75:73:65:47:7d:1b: @@ -46,10 +46,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersroot.crl - X509v3 Subject Key Identifier: E3:94:F5:B1:4D:E9:DB:A1:29:5B:57:8B:4D:76:06:76:E1:D1:A2:8A X509v3 Key Usage: critical @@ -63,23 +61,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.3.1 CPS: http://cps.chambersign.org/cps/chambersroot.html - Signature Algorithm: sha1WithRSAEncryption - 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: - 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: - 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: - 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: - 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: - 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: - c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: - ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: - 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: - 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: - 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: - 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: - c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: - 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: - 3c:8b:f8:dc + Signature Value: + 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: + 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: + 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: + 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: + 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: + 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: + c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: + ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: + 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: + 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: + 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: + 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: + c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: + 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: + 3c:8b:f8:dc SHA1 Fingerprint=6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1 -----BEGIN CERTIFICATE----- MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem index 1ba719b3690a..da95297880f6 100644 --- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Global Chambersign Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:a2:70:a2:d0:9f:42:ae:5b:17:c7:d8:7d:cf:14: 83:fc:4f:c9:a1:b7:13:af:8a:d7:9e:3e:04:0a:92: @@ -46,10 +46,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersignroot.crl - X509v3 Subject Key Identifier: 43:9C:36:9F:B0:9E:30:4D:C6:CE:5F:AD:10:AB:E5:03:A5:FA:A9:14 X509v3 Key Usage: critical @@ -63,23 +61,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.1.1 CPS: http://cps.chambersign.org/cps/chambersignroot.html - Signature Algorithm: sha1WithRSAEncryption - 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: - 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: - 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: - d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: - a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: - 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: - be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: - a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: - f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: - b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: - 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: - 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: - 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: - 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: - f5:26:8f:f0 + Signature Value: + 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: + 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: + 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: + d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: + a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: + 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: + be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: + a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: + f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: + b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: + 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: + 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: + 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: + 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: + f5:26:8f:f0 SHA1 Fingerprint=33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9 -----BEGIN CERTIFICATE----- MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/blacklisted/Certum_Root_CA.pem index c94db94aecaa..1df73e0c7336 100644 --- a/secure/caroot/blacklisted/Certum_Root_CA.pem +++ b/secure/caroot/blacklisted/Certum_Root_CA.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = PL, O = Unizeto Sp. z o.o., CN = Certum CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:ce:b1:c1:2e:d3:4f:7c:cd:25:ce:18:3e:4f:c4: 8c:6f:80:6a:73:c8:5b:51:f8:9b:d2:dc:bb:00:5c: @@ -46,21 +46,22 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE Signature Algorithm: sha1WithRSAEncryption - b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: - 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: - b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: - 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: - 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: - 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: - bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: - 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: - 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: - 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: - f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: - 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: - 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: - 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: - 06:16:2c:73 + Signature Value: + b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: + 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: + b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: + 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: + 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: + 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: + bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: + 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: + 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: + 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: + f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: + 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: + 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: + 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: + 06:16:2c:73 SHA1 Fingerprint=62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18 -----BEGIN CERTIFICATE----- MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem index 0133aff5f03f..b40288095005 100644 --- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = EU, L = Madrid (see current address at www.camerfirma.com/address), serialNumber = A82743287, O = AC Camerfirma S.A., CN = Chambers of Commerce Root - 2008 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:af:00:cb:70:37:2b:80:5a:4a:3a:6c:78:94:7d: a3:7f:1a:1f:f6:35:d5:bd:db:cb:0d:44:72:3e:26: @@ -67,45 +67,44 @@ Certificate: F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 X509v3 Authority Key Identifier: keyid:F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 - DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 + DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com\/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 serial:A3:DA:42:7E:A4:B1:AE:DA - X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://policy.camerfirma.com - Signature Algorithm: sha1WithRSAEncryption - 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: - 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: - e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: - c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: - 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: - c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: - 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: - 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: - 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: - 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: - 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: - 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: - ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: - 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: - 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: - f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: - b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: - a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: - d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: - cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: - 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: - f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: - c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: - 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: - bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: - be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: - 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: - 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: - 7c:80:c5:f0:d9:77:48:d0 + Signature Value: + 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: + 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: + e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: + c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: + 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: + c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: + 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: + 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: + 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: + 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: + 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: + 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: + ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: + 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: + 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: + f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: + b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: + a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: + d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: + cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: + 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: + f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: + c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: + 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: + bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: + be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: + 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: + 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: + 7c:80:c5:f0:d9:77:48:d0 SHA1 Fingerprint=78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C -----BEGIN CERTIFICATE----- MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD diff --git a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem index 0a1c5a632dce..657a1b7b683c 100644 --- a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem +++ b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem @@ -24,7 +24,7 @@ Certificate: Subject: O = "Cybertrust, Inc", CN = Cybertrust Global Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:f8:c8:bc:bd:14:50:66:13:ff:f0:d3:79:ec:23: f2:b7:1a:c7:8e:85:f1:12:73:a6:19:aa:10:db:9c: @@ -53,29 +53,27 @@ Certificate: X509v3 Subject Key Identifier: B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 X509v3 CRL Distribution Points: - Full Name: URI:http://www2.public-trust.com/crl/ct/ctroot.crl - X509v3 Authority Key Identifier: - keyid:B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 - + B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 Signature Algorithm: sha1WithRSAEncryption - 56:ef:0a:23:a0:54:4e:95:97:c9:f8:89:da:45:c1:d4:a3:00: - 25:f4:1f:13:ab:b7:a3:85:58:69:c2:30:ad:d8:15:8a:2d:e3: - c9:cd:81:5a:f8:73:23:5a:a7:7c:05:f3:fd:22:3b:0e:d1:06: - c4:db:36:4c:73:04:8e:e5:b0:22:e4:c5:f3:2e:a5:d9:23:e3: - b8:4e:4a:20:a7:6e:02:24:9f:22:60:67:7b:8b:1d:72:09:c5: - 31:5c:e9:79:9f:80:47:3d:ad:a1:0b:07:14:3d:47:ff:03:69: - 1a:0c:0b:44:e7:63:25:a7:7f:b2:c9:b8:76:84:ed:23:f6:7d: - 07:ab:45:7e:d3:df:b3:bf:e9:8a:b6:cd:a8:a2:67:2b:52:d5: - b7:65:f0:39:4c:63:a0:91:79:93:52:0f:54:dd:83:bb:9f:d1: - 8f:a7:53:73:c3:cb:ff:30:ec:7c:04:b8:d8:44:1f:93:5f:71: - 09:22:b7:6e:3e:ea:1c:03:4e:9d:1a:20:61:fb:81:37:ec:5e: - fc:0a:45:ab:d7:e7:17:55:d0:a0:ea:60:9b:a6:f6:e3:8c:5b: - 29:c2:06:60:14:9d:2d:97:4c:a9:93:15:9d:61:c4:01:5f:48: - d6:58:bd:56:31:12:4e:11:c8:21:e0:b3:11:91:65:db:b4:a6: - 88:38:ce:55 + Signature Value: + 56:ef:0a:23:a0:54:4e:95:97:c9:f8:89:da:45:c1:d4:a3:00: + 25:f4:1f:13:ab:b7:a3:85:58:69:c2:30:ad:d8:15:8a:2d:e3: + c9:cd:81:5a:f8:73:23:5a:a7:7c:05:f3:fd:22:3b:0e:d1:06: + c4:db:36:4c:73:04:8e:e5:b0:22:e4:c5:f3:2e:a5:d9:23:e3: + b8:4e:4a:20:a7:6e:02:24:9f:22:60:67:7b:8b:1d:72:09:c5: + 31:5c:e9:79:9f:80:47:3d:ad:a1:0b:07:14:3d:47:ff:03:69: + 1a:0c:0b:44:e7:63:25:a7:7f:b2:c9:b8:76:84:ed:23:f6:7d: + 07:ab:45:7e:d3:df:b3:bf:e9:8a:b6:cd:a8:a2:67:2b:52:d5: + b7:65:f0:39:4c:63:a0:91:79:93:52:0f:54:dd:83:bb:9f:d1: + 8f:a7:53:73:c3:cb:ff:30:ec:7c:04:b8:d8:44:1f:93:5f:71: + 09:22:b7:6e:3e:ea:1c:03:4e:9d:1a:20:61:fb:81:37:ec:5e: + fc:0a:45:ab:d7:e7:17:55:d0:a0:ea:60:9b:a6:f6:e3:8c:5b: + 29:c2:06:60:14:9d:2d:97:4c:a9:93:15:9d:61:c4:01:5f:48: + d6:58:bd:56:31:12:4e:11:c8:21:e0:b3:11:91:65:db:b4:a6: + 88:38:ce:55 SHA1 Fingerprint=5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 -----BEGIN CERTIFICATE----- MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem index 0de1a5b43dce..81d66de7a736 100644 --- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem +++ b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST Root CA 3 2013 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:c4:7b:42:92:82:1f:ec:ed:54:98:8e:12:c0:ca: 09:df:93:6e:3a:93:5c:1b:e4:10:77:9e:4e:69:88: @@ -50,29 +50,27 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 CRL Distribution Points: - Full Name: URI:ldap://directory.d-trust.net/CN=D-TRUST%20Root%20CA%203%202013,O=D-Trust%20GmbH,C=DE?certificaterevocationlist - Full Name: URI:http://crl.d-trust.net/crl/d-trust_root_ca_3_2013.crl - Signature Algorithm: sha256WithRSAEncryption - 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: - 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: - c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: - 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: - 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: - a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: - c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: - 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: - ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: - a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: - 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: - ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: - 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: - 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: - 75:49:5f:5c + Signature Value: + 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: + 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: + c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: + 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: + 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: + a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: + c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: + 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: + ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: + a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: + 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: + ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: + 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: + 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: + 75:49:5f:5c SHA1 Fingerprint=6C:7C:CC:E7:D4:AE:51:5F:99:08:CD:3F:F6:E8:C3:78:DF:6F:EF:97 -----BEGIN CERTIFICATE----- MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRF diff --git a/secure/caroot/blacklisted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem index e9574b162807..2b0739bfe36e 100644 --- a/secure/caroot/blacklisted/DST_Root_CA_X3.pem +++ b/secure/caroot/blacklisted/DST_Root_CA_X3.pem @@ -24,7 +24,7 @@ Certificate: Subject: O = Digital Signature Trust Co., CN = DST Root CA X3 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:df:af:e9:97:50:08:83:57:b4:cc:62:65:f6:90: 82:ec:c7:d3:2c:6b:30:ca:5b:ec:d9:c3:7d:c7:40: @@ -53,21 +53,22 @@ Certificate: X509v3 Subject Key Identifier: C4:A7:B1:A4:7B:2C:71:FA:DB:E1:4B:90:75:FF:C4:15:60:85:89:10 Signature Algorithm: sha1WithRSAEncryption - a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f: - 4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b: - a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3: - 20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd: - b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94: - 3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9: - dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce: - e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf: - 0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52: - 67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31: - 85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64: - 63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65: - b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77: - 96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d: - 82:35:35:10 + Signature Value: + a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f: + 4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b: + a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3: + 20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd: + b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94: + 3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9: + dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce: + e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf: + 0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52: + 67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31: + 85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64: + 63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65: + b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77: + 96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d: + 82:35:35:10 SHA1 Fingerprint=DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13 -----BEGIN CERTIFICATE----- MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem similarity index 75% rename from secure/caroot/trusted/E-Tugra_Certification_Authority.pem rename to secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem index 95a0ba7e8de6..c37e3aa0ce59 100644 --- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem +++ b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = TR, L = Ankara, O = E-Tu\C4\9Fra EBG Bili\C5\9Fim Teknolojileri ve Hizmetleri A.\C5\9E., OU = E-Tugra Sertifikasyon Merkezi, CN = E-Tugra Certification Authority Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:e2:f5:3f:93:05:51:1e:85:62:54:5e:7a:0b:f5: 18:07:83:ae:7e:af:7c:f7:d4:8a:6b:a5:63:43:39: @@ -67,40 +67,40 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 - + 2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 05:37:3a:f4:4d:b7:45:e2:45:75:24:8f:b6:77:52:e8:1c:d8: - 10:93:65:f3:f2:59:06:a4:3e:1e:29:ec:5d:d1:d0:ab:7c:e0: - 0a:90:48:78:ed:4e:98:03:99:fe:28:60:91:1d:30:1d:b8:63: - 7c:a8:e6:35:b5:fa:d3:61:76:e6:d6:07:4b:ca:69:9a:b2:84: - 7a:77:93:45:17:15:9f:24:d0:98:13:12:ff:bb:a0:2e:fd:4e: - 4c:87:f8:ce:5c:aa:98:1b:05:e0:00:46:4a:82:80:a5:33:8b: - 28:dc:ed:38:d3:df:e5:3e:e9:fe:fb:59:dd:61:84:4f:d2:54: - 96:13:61:13:3e:8f:80:69:be:93:47:b5:35:43:d2:5a:bb:3d: - 5c:ef:b3:42:47:cd:3b:55:13:06:b0:09:db:fd:63:f6:3a:88: - 0a:99:6f:7e:e1:ce:1b:53:6a:44:66:23:51:08:7b:bc:5b:52: - a2:fd:06:37:38:40:61:8f:4a:96:b8:90:37:f8:66:c7:78:90: - 00:15:2e:8b:ad:51:35:53:07:a8:6b:68:ae:f9:4e:3c:07:26: - cd:08:05:70:cc:39:3f:76:bd:a5:d3:67:26:01:86:a6:53:d2: - 60:3b:7c:43:7f:55:8a:bc:95:1a:c1:28:39:4c:1f:43:d2:91: - f4:72:59:8a:b9:56:fc:3f:b4:9d:da:70:9c:76:5a:8c:43:50: - ee:8e:30:72:4d:df:ff:49:f7:c6:a9:67:d9:6d:ac:02:11:e2: - 3a:16:25:a7:58:08:cb:6f:53:41:9c:48:38:47:68:33:d1:d7: - c7:8f:d4:74:21:d4:c3:05:90:7a:ff:ce:96:88:b1:15:29:5d: - 23:ab:d0:60:a1:12:4f:de:f4:17:cd:32:e5:c9:bf:c8:43:ad: - fd:2e:8e:f1:af:e2:f4:98:fa:12:1f:20:d8:c0:a7:0c:85:c5: - 90:f4:3b:2d:96:26:b1:2c:be:4c:ab:eb:b1:d2:8a:c9:db:78: - 13:0f:1e:09:9d:6d:8f:00:9f:02:da:c1:fa:1f:7a:7a:09:c4: - 4a:e6:88:2a:97:9f:89:8b:fd:37:5f:5f:3a:ce:38:59:86:4b: - af:71:0b:b4:d8:f2:70:4f:9f:32:13:e3:b0:a7:57:e5:da:da: - 43:cb:84:34:f2:28:c4:ea:6d:f4:2a:ef:c1:6b:76:da:fb:7e: - bb:85:3c:d2:53:c2:4d:be:71:e1:45:d1:fd:23:67:0d:13:75: - fb:cf:65:67:22:9d:ae:b0:09:d1:09:ff:1d:34:bf:fe:23:97: - 37:d2:39:fa:3d:0d:06:0b:b4:db:3b:a3:ab:6f:5c:1d:b6:7e: - e8:b3:82:34:ed:06:5c:24 + Signature Value: + 05:37:3a:f4:4d:b7:45:e2:45:75:24:8f:b6:77:52:e8:1c:d8: + 10:93:65:f3:f2:59:06:a4:3e:1e:29:ec:5d:d1:d0:ab:7c:e0: + 0a:90:48:78:ed:4e:98:03:99:fe:28:60:91:1d:30:1d:b8:63: + 7c:a8:e6:35:b5:fa:d3:61:76:e6:d6:07:4b:ca:69:9a:b2:84: + 7a:77:93:45:17:15:9f:24:d0:98:13:12:ff:bb:a0:2e:fd:4e: + 4c:87:f8:ce:5c:aa:98:1b:05:e0:00:46:4a:82:80:a5:33:8b: + 28:dc:ed:38:d3:df:e5:3e:e9:fe:fb:59:dd:61:84:4f:d2:54: + 96:13:61:13:3e:8f:80:69:be:93:47:b5:35:43:d2:5a:bb:3d: + 5c:ef:b3:42:47:cd:3b:55:13:06:b0:09:db:fd:63:f6:3a:88: + 0a:99:6f:7e:e1:ce:1b:53:6a:44:66:23:51:08:7b:bc:5b:52: + a2:fd:06:37:38:40:61:8f:4a:96:b8:90:37:f8:66:c7:78:90: + 00:15:2e:8b:ad:51:35:53:07:a8:6b:68:ae:f9:4e:3c:07:26: + cd:08:05:70:cc:39:3f:76:bd:a5:d3:67:26:01:86:a6:53:d2: + 60:3b:7c:43:7f:55:8a:bc:95:1a:c1:28:39:4c:1f:43:d2:91: + f4:72:59:8a:b9:56:fc:3f:b4:9d:da:70:9c:76:5a:8c:43:50: + ee:8e:30:72:4d:df:ff:49:f7:c6:a9:67:d9:6d:ac:02:11:e2: + 3a:16:25:a7:58:08:cb:6f:53:41:9c:48:38:47:68:33:d1:d7: + c7:8f:d4:74:21:d4:c3:05:90:7a:ff:ce:96:88:b1:15:29:5d: + 23:ab:d0:60:a1:12:4f:de:f4:17:cd:32:e5:c9:bf:c8:43:ad: + fd:2e:8e:f1:af:e2:f4:98:fa:12:1f:20:d8:c0:a7:0c:85:c5: + 90:f4:3b:2d:96:26:b1:2c:be:4c:ab:eb:b1:d2:8a:c9:db:78: + 13:0f:1e:09:9d:6d:8f:00:9f:02:da:c1:fa:1f:7a:7a:09:c4: + 4a:e6:88:2a:97:9f:89:8b:fd:37:5f:5f:3a:ce:38:59:86:4b: + af:71:0b:b4:d8:f2:70:4f:9f:32:13:e3:b0:a7:57:e5:da:da: + 43:cb:84:34:f2:28:c4:ea:6d:f4:2a:ef:c1:6b:76:da:fb:7e: + bb:85:3c:d2:53:c2:4d:be:71:e1:45:d1:fd:23:67:0d:13:75: + fb:cf:65:67:22:9d:ae:b0:09:d1:09:ff:1d:34:bf:fe:23:97: + 37:d2:39:fa:3d:0d:06:0b:b4:db:3b:a3:ab:6f:5c:1d:b6:7e: + e8:b3:82:34:ed:06:5c:24 SHA1 Fingerprint=51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39 -----BEGIN CERTIFICATE----- MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem similarity index 86% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem rename to secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem index 3e58355e78a5..80e67454926a 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -39,19 +39,19 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 - + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 X509v3 Subject Key Identifier: FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: ecdsa-with-SHA384 - 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: - bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: - 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: - 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: - 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: - ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 + Signature Value: + 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: + bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: + 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: + 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: + 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: + ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 -----BEGIN CERTIFICATE----- MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem similarity index 75% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem rename to secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem index d48fb141df67..fd076cdd2649 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:a2:66:f0:89:b7:72:7b:ee:09:c9:63:d2:d3:43: dd:5e:c3:a6:84:38:4a:f1:8d:81:bb:14:bd:47:e8: @@ -66,42 +66,42 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF - + B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF X509v3 Subject Key Identifier: B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 89:a8:72:7f:8c:eb:ce:2e:18:c4:10:80:2d:10:0c:ff:fb:14: - cd:04:e0:14:3c:4e:9a:fb:9f:29:bf:22:9e:57:b9:82:73:12: - 63:26:b5:cc:90:e9:d2:2a:29:ee:9c:2d:cc:2c:99:be:45:27: - e4:b1:71:ed:e4:38:95:31:41:f2:7d:7a:63:78:df:ca:36:16: - 2f:82:88:9f:bc:11:47:4f:76:4d:c8:2d:8e:eb:df:2d:7c:4e: - 3b:da:ae:f6:e3:da:5d:14:a6:ae:e8:85:44:9d:06:6e:8e:fb: - ef:7a:4a:6a:2d:2b:28:18:fe:bf:90:2c:75:16:9f:0f:ea:96: - 7d:05:ee:9b:13:a5:44:6c:f8:03:d0:dd:23:e1:fd:03:12:12: - 08:f4:18:34:b3:e0:37:0b:77:11:01:48:bf:61:b4:b5:f8:19: - d9:cb:4d:ea:a3:8c:ef:fd:f0:06:b5:6d:92:f4:4a:61:50:84: - ed:ec:49:d3:e4:be:68:e6:2e:e3:31:0b:54:0b:1a:92:d6:82: - d8:b6:a2:65:3c:66:04:f9:55:da:6c:fb:db:b5:14:66:4d:94: - 83:3b:cd:1e:a6:2b:b2:fe:77:40:86:ab:e7:df:0a:c9:fd:f6: - dd:87:56:18:d8:b0:2c:55:60:96:fa:08:7e:52:90:f5:4b:a6: - 2e:87:7c:cb:20:db:06:3e:a0:5d:03:77:7d:a2:3c:13:1b:29: - a2:13:55:a0:3d:14:22:af:6f:b8:d0:9a:1b:72:dd:05:01:8d: - 86:60:bf:a4:67:ee:b5:a5:0d:d1:7f:e6:1a:2b:62:66:c3:07: - ba:e7:a0:48:1c:38:c3:e9:45:fb:a7:7f:fc:ed:02:68:1a:ca: - 77:12:77:a6:00:55:28:14:ec:d6:c7:12:a2:1b:65:42:e9:91: - e8:cb:3e:87:89:54:5d:d9:af:9d:97:9c:69:e7:0a:ff:0f:5a: - 78:8b:63:2a:4c:7d:47:94:3f:de:4b:e9:53:d0:30:f1:c5:f6: - 9e:49:df:3b:a0:91:a3:a3:fe:cd:58:cc:ea:df:af:6f:28:3b: - a0:69:9b:8f:ec:ac:ae:2b:54:9d:9b:04:b1:47:20:af:96:12: - 3e:63:94:1d:04:e7:2e:bb:86:c7:0c:9a:88:bf:76:47:ef:f7: - b0:0b:97:66:d2:44:cf:60:52:07:e1:d5:2c:4a:3a:27:61:77: - ca:d7:8f:e7:87:0e:30:ff:0c:bb:04:e2:61:c3:a2:c8:97:61: - 8e:b4:30:6a:3c:6d:c2:07:5f:4a:73:2f:3f:f9:16:8a:01:66: - ef:ba:91:ca:52:57:7b:ae:d4:e6:0f:dd:0b:7a:7f:8b:9e:26: - 20:cf:3b:ef:81:71:83:59 + Signature Value: + 89:a8:72:7f:8c:eb:ce:2e:18:c4:10:80:2d:10:0c:ff:fb:14: + cd:04:e0:14:3c:4e:9a:fb:9f:29:bf:22:9e:57:b9:82:73:12: + 63:26:b5:cc:90:e9:d2:2a:29:ee:9c:2d:cc:2c:99:be:45:27: + e4:b1:71:ed:e4:38:95:31:41:f2:7d:7a:63:78:df:ca:36:16: + 2f:82:88:9f:bc:11:47:4f:76:4d:c8:2d:8e:eb:df:2d:7c:4e: + 3b:da:ae:f6:e3:da:5d:14:a6:ae:e8:85:44:9d:06:6e:8e:fb: + ef:7a:4a:6a:2d:2b:28:18:fe:bf:90:2c:75:16:9f:0f:ea:96: + 7d:05:ee:9b:13:a5:44:6c:f8:03:d0:dd:23:e1:fd:03:12:12: + 08:f4:18:34:b3:e0:37:0b:77:11:01:48:bf:61:b4:b5:f8:19: + d9:cb:4d:ea:a3:8c:ef:fd:f0:06:b5:6d:92:f4:4a:61:50:84: + ed:ec:49:d3:e4:be:68:e6:2e:e3:31:0b:54:0b:1a:92:d6:82: + d8:b6:a2:65:3c:66:04:f9:55:da:6c:fb:db:b5:14:66:4d:94: + 83:3b:cd:1e:a6:2b:b2:fe:77:40:86:ab:e7:df:0a:c9:fd:f6: + dd:87:56:18:d8:b0:2c:55:60:96:fa:08:7e:52:90:f5:4b:a6: + 2e:87:7c:cb:20:db:06:3e:a0:5d:03:77:7d:a2:3c:13:1b:29: + a2:13:55:a0:3d:14:22:af:6f:b8:d0:9a:1b:72:dd:05:01:8d: + 86:60:bf:a4:67:ee:b5:a5:0d:d1:7f:e6:1a:2b:62:66:c3:07: + ba:e7:a0:48:1c:38:c3:e9:45:fb:a7:7f:fc:ed:02:68:1a:ca: + 77:12:77:a6:00:55:28:14:ec:d6:c7:12:a2:1b:65:42:e9:91: *** 10683 LINES SKIPPED *** From nobody Mon Sep 11 22:02:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl11D09mQz4tQkx; Mon, 11 Sep 2023 22:02: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 4Rl11C6WF2z3Sgq; Mon, 11 Sep 2023 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=LtXz+CAwBXzQ8V69doZO8iE8FroVdNdBoiEHkBPRL/ZIAeTy8wYSWXLvlZ+7QS7pYvtDhE IjP7f14b2RZlPWAlxJxcj9myOsNo1S5KFBK+Wgwk7dV/VAa44wz+piaQnEgkZYQOtlwka2 xigftDft3pJr6Pfjuy0muWAZBkSx1/hlzwzeDQtC2Ul40jfVxLmxunTUnz9y1Wy30EA6CO J5hsLHS5YTSlZJ7C+OcdDcoj6rGCnwHdahXpJ2INadwU7G7+yyi7UhzT7jON3niZ0vMAav FiL7D7fYAkkpkyWJrVSoctNwVhYvhnVRoeEm5vQysWlhg2fvVAxtehlRA5z4xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469775; a=rsa-sha256; cv=none; b=ikeYF9Emwqc8mpOa5wpj5RxiDFMCkyq+sKwYKXBJwUdXJNqIYjjuWuoSoW59fvHVJ40u4+ jyrt35xdVLofnzXxEPaOrbQ1qnw72Z2i+n65X5Cz2JXocwAb9+NFwbmGLki6Qj3vwt3H30 3PpqwCusxjh0Nsw4ZFihbYpbYz6mbh9V+k9GImXVZyNETkYsLvujab/23j3O+SvJMuTghS 7vPqFqxtq7Y5PhxtUz6Rc7FDarn7bPqgcU0cQX1/p541lNukSQXDdFH/4rKTfeIdN1nVU6 +3lAntOm72QGwSVPBL5ZzVrPHRWZFHhfszEKlKJVFjfjzaB3rMyqyqDASV3vtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=vFwRqy3gbLKQR5NWLhOiliA0JQFuQeSClOAcm3gaoUrZ78IrzRowuleanukgmELJcwvW5R Osr3pmTAo8yVwunGzjSiO1gKOWMBCtSmN1iJg6akrazs+NQAcdwIi6Jcl4PSFVSZNz89aF iax36CYWhMFmazy6nzUo+iOans8sSdgMu5EnHyW7Q+gi5dmNI6aPCtdu9h8IjyWki5ud2e WzD8fVa1b+0+ipWzrNupzrHWdQhO2vhDFKvd3Y7yoz/dd327Ktmmwpni6YAJ9d4Qo7MlVj 2fAdGkoPVDD7vlSa4ZYq4KfTsYLyHmZNWcELJ4akXSJ52PRx+klctNzxOS0yuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl11C5dQvz15cK; Mon, 11 Sep 2023 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BM2tKd006346; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2tsE006343; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:55 GMT Message-Id: <202309112202.38BM2tsE006343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: babfcc0aa662 - stable/13 - stand: lua: module names should permit more List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: babfcc0aa66256ffa5142a621ee9eba67d564efb Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=babfcc0aa66256ffa5142a621ee9eba67d564efb commit babfcc0aa66256ffa5142a621ee9eba67d564efb Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:38 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 2f66d715016e..2f22056efde2 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -60,7 +60,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Mon Sep 11 22:35:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1kw3QFCz4sTZY; Mon, 11 Sep 2023 22:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1kw2Rlsz3ft6; Mon, 11 Sep 2023 22:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=rMCK6osaPJDO2a5wGw2NoW6zavkTj7amet8tGZK3Ab27BUM+ojET6aIPrTx0NNAOvJS+Iv fKCSiT7YdKAp+aLtZdyOLU86D1DOAxz3YsYtBc9mqz7KYheHku4kGsqkBMTDaCiQx8BeRp 82idWeHP9j36DsXcSWliUPN0bLXwnPQZSr6VdoyfJ3knbm3GvFblZUHjofciXA9Nz2V6hB Byu7fdSGXVe0fGDWZeSBS+mrWLB8NPv8AzZwn/MjiLfD5f5UBMRqs5MV3hs5yst8PuxWYC eTv1mbXDTbWqKpRnjoZ8Bh0WC2zadveWAAyqwmWWo39sXKPWe3+LH8C+9qk8Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471736; a=rsa-sha256; cv=none; b=nY2ZwHPezUU+GOWYzaNLPoXpYZn7FT6p3aYTiBLTEmkmjwDS2hh9B85fYfCCI46+UDyU5F gIVFBrA7Gb5epDLNLt0JtOdRtXQmiG48fnOmwhuzk5YNOGvFjXK32WlE318HRjCy26Kz0t 57tqtbo/PCcOQsGjnN++KTpO8+q4CW26y2zqXcY3QAkdjwKhOxu3vgJ7ZWjZmip9jUYBvG o28bmTz8/zBomKgiGquhFfYKuc+pnhFEjlE9RtgGydwhxugFUcV3qe3QgGhKORmzHMBDHf g7ED+FjjDEIyZQxcE0L6lqdQaP4ccV9eenW39dMRc7vvDi+Fs790ifAyNKxosQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=VTqmwqTOad5UIAhixDXrr77LwRUyUuXpdJu3WDyQVg6Zmd4Js8kMKtBtVlbXl6nBlJp2lG +ze57ZhGHkpq3L6rIZRLryE5D7AnPdM7n/u1doQffI8l+G3LyuDMPq0DHh9xYy4R4FAcgZ tAsUW5GB8ZqqUzKj/tObvcYTUHEb13cBFmsIqfPEALUW4k+UkMpR4Tz0+qXxPFMsskIEaq /AIJ/EV1nqZfYARscF58To75TXlfzVzlossGmMDHjxLEFQwO9i9l9NeuCbJjKgKyQEQgnk yUZ61GWTNGpn5vyyjaFleuJy47OzRCA0INNFs/hIsClQCz9ukwqkL0wbOA/5Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1kw1VfMz168r; Mon, 11 Sep 2023 22:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZaF7056830; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZax9056827; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:36 GMT Message-Id: <202309112235.38BMZax9056827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ca3fc7aabe39 - stable/13 - bnxt: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca3fc7aabe3998822c6e1357df922618afb18648 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3fc7aabe3998822c6e1357df922618afb18648 commit ca3fc7aabe3998822c6e1357df922618afb18648 Author: Kevin Bowling AuthorDate: 2023-08-24 20:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 bnxt: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This is unintentional for bnxt(4) and is causing another bug in its VLAN initialization code to affect the common case of adding and removing VLANs on an existing interface. PR: 269133 Tested by: kp Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit bce864d1c274faeb6678028aad1e07e91fe430ac) --- sys/dev/bnxt/if_bnxt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 2eb41cf7ade8..db8b4125e5bd 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -224,6 +224,7 @@ static uint8_t get_phy_type(struct bnxt_softc *softc); static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); +static bool bnxt_if_needs_restart(if_ctx_t, enum iflib_restart_event); /* * Device Interface Declaration @@ -288,6 +289,8 @@ static device_method_t bnxt_iflib_methods[] = { DEVMETHOD(ifdi_shutdown, bnxt_shutdown), DEVMETHOD(ifdi_resume, bnxt_resume), + DEVMETHOD(ifdi_needs_restart, bnxt_if_needs_restart), + DEVMETHOD_END }; @@ -2497,6 +2500,16 @@ bnxt_wol_config(if_ctx_t ctx) return 0; } +static bool +bnxt_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + static int bnxt_shutdown(if_ctx_t ctx) { From nobody Mon Sep 11 22:35:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1kx4lBKz4sTq0; Mon, 11 Sep 2023 22:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1kx3qRlz3g25; Mon, 11 Sep 2023 22:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5zFeMeRfMVsuQLXSga11p0P+yHsb+UHSC2igjtA/hdY=; b=f24LYYlGgSWZstOgkxr00wfZDYGWe0uRcKSlMgRMhP06fx5utWHLGbmZrEG9hPm5sHchMV l5YNyIQtcLqxTgM5Z4U4dfwhM0Ycics0V7peAp362Ru4KSJ8NJmwTAjesLhx+5Sp5ZW8rJ xba32/eya5lgJUyXLEUiJMLkEObHzb8ZIeEJgx0H5jbQO4v6oOTvwDzOE8kLuQxsOuOxDF sQrsf8JeFM1390O4I71kihQII5lzQC8CnpQ2SyrOBWZBo6kWhSJ1p12DBeELFGIMdXXfUJ ZPdNIz2Blsx1szZ4TK7Xab1d4/6OpgZLJVeLXpolQ3LNDGDcG+GsWvw5LvAuTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471737; a=rsa-sha256; cv=none; b=SsDFiqX1sC9wE5Vg3bFiUGoo+zkykwIjiuDW9LdWW3DhHAub/VmkHFqxmu5lZrqRaxCoEs g9VbuJg8KebSXSsnKO6jpfvU6ArAi1SPQONbT727wKlAID8TWnV7OgAFMEO13/sKsC6AJH WhZ+G1qLWU4geR5FRCyC4Lp+hnjFZK5relS5ptH5vSyWC913kIZCUalDN/1EI6h8tjHAkS CFn9YrMntm755DD7AnWURMy6+t7GN9/Q485wKfuMx+Oah268s80pagOdhF9Jfa1as6Qo+g H2yeJ+rRQILHLJGdoHbxOaGFSqzCzBkIg6fl2t2rBC1ptYBEEfFGOxw2TrOvQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5zFeMeRfMVsuQLXSga11p0P+yHsb+UHSC2igjtA/hdY=; b=JgGcfHo5rsKwWCgCqMLOOZ98MGtGMXFyd9LGQWrZ+BrYW22m6vzRqySbD1Qt8s085iOgrN oUdfgCoXY8NRttVZIGkXEmwg+Y4b4fu6GrPGNCE1c5BQLWgwC4pj9hAvj1BK/SwsHb5dpu pMo8CkTuWTTW+rJuo1ySHehxdsT5yb2HY62nv5lDeLJaVQBNPcCC9bQPzoYbln9Zs29yLl xepJTN3oGtsbByllZFqTx7fJKj8LxV5I44nZngNEuh9YKHJ7QImB4TbFh9Jz6veDxe4CQU vgJ8Z+z+Ttct1dhZWMpSYo2PxEyf/RrDMBLMvRGXxM2iIWKEJjdjQ4lIszCB4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1kx2pPKz168s; Mon, 11 Sep 2023 22:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZbIh056878; Mon, 11 Sep 2023 22:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZb6G056875; Mon, 11 Sep 2023 22:35:37 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:37 GMT Message-Id: <202309112235.38BMZb6G056875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 08647a110843 - stable/13 - iavf: Add explicit ifdi_needs_reset for VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 08647a110843ab7f4b09917413ed9cb1c3d4a7ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=08647a110843ab7f4b09917413ed9cb1c3d4a7ca commit 08647a110843ab7f4b09917413ed9cb1c3d4a7ca Author: Kevin Bowling AuthorDate: 2023-08-24 20:36:00 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 iavf: Add explicit ifdi_needs_reset for VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. iavf(4) was the original need for this, because VLAN filter changes currently have negative interactions with Malicious Driver Detection. Add iavf_if_needs_restart and explicitly enable VLAN re-init. Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 1d6c12c511ae2a394d3ca1998a10f3d3bd25d313) --- sys/dev/iavf/if_iavf_iflib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/dev/iavf/if_iavf_iflib.c b/sys/dev/iavf/if_iavf_iflib.c index 5ae1b9308c1e..ef3a36674a55 100644 --- a/sys/dev/iavf/if_iavf_iflib.c +++ b/sys/dev/iavf/if_iavf_iflib.c @@ -74,6 +74,7 @@ static void iavf_if_vlan_unregister(if_ctx_t ctx, u16 vtag); static uint64_t iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt); static void iavf_if_init(if_ctx_t ctx); static void iavf_if_stop(if_ctx_t ctx); +static bool iavf_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int iavf_allocate_pci_resources(struct iavf_sc *); static void iavf_free_pci_resources(struct iavf_sc *); @@ -170,6 +171,7 @@ static device_method_t iavf_if_methods[] = { DEVMETHOD(ifdi_vlan_register, iavf_if_vlan_register), DEVMETHOD(ifdi_vlan_unregister, iavf_if_vlan_unregister), DEVMETHOD(ifdi_get_counter, iavf_if_get_counter), + DEVMETHOD(ifdi_needs_restart, iavf_if_needs_restart), DEVMETHOD_END }; @@ -1497,6 +1499,25 @@ iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt) } } +/* iavf_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +iavf_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + return (true); + default: + return (false); + } +} + /** * iavf_free_pci_resources - Free PCI resources * @sc: device softc From nobody Mon Sep 11 22:35:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1ky5TcLz4sTx9; Mon, 11 Sep 2023 22:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1ky4hs2z3g33; Mon, 11 Sep 2023 22:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9WZ/VtzR16IEAZZcqE6YFyNo7xIQOHwJmZuBw0UCc4=; b=ZfLOq08jb1kS6xmVMLsJnfmdB5/gcGN7YCgNR5/UxZIQuTzwxVJo96jyubr3Y1CkBn5u7i 0MArfx2Nv5uzfmfUwh7W9mAf275qkTHDYF/GITAOgNxBC1k+qCcvB7f3Lwyh71VI1IibeZ ONi7at1OcNfaZ2lZZXh5Yh8bIgy1jRAwSjbMazNBN3KqqCrIqXLcNdvTEto1+Rn9KhbXHS MWjZJ5jhcojG6/KOO1GbTrAHA4ivKDvz8RVdMpdfxblnWl1SUYF8MccQJ8/67jcGpMXLe6 gOBH4IJW2sHgjT3D1cwGR829cn49drB+wISb+m6jhg0MNT7y0T30pEL0fODjIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471738; a=rsa-sha256; cv=none; b=TkdZd7B5kOWM5qKRA46j96g9K93m06yGhZCON/1A0YHeO3tYqyfe5AIFA5ju28Sft4Atf9 PcRYalYRYT7W05i30zKA/bkGsxSLewIA39zF3+SdKo+yj3/vL6O5X4g5N8a9v4sOcnxu0+ Bbdcvhdk/Zd6zFgjpVs8Uuq/7zu8AU9nQMowo4WqqSJb4qCHu9q8RFLm6L/u8jCBZ8TSU6 NEwmoKMJoZViv6X1FsxnSJYxB2B37Vn3tedUB/HidWDxTsv/fj0uq6RC1vt00SbkJ7n/s4 lzU88BGOavoE1sQwKLzkDfc8g28hE7iWFeYA6I/jIqlWmPlH/7+Vejtag8f8xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9WZ/VtzR16IEAZZcqE6YFyNo7xIQOHwJmZuBw0UCc4=; b=t6jicR2q8fUVYlfeJpB3vtKjjHG4Dlp3Jd0aqu6CGAG0xvqiL/0jjtXtu02A0mXy3Ac/Fv hwyblB5y/4k7SyvlD7kAHzfJw/Ydl4vwDOliN0beFPT1C2BK3jHv69HnpoYS2aEfHGivKA UkKtHWpSggBQQNrZUxPHr036PJkuGAfws8vQHrbNUXApkVXTuspxe5522zZic3b7/5Nvd/ sIiHrWayoc8vtTe/HCwgQhJpAK8D1hA+PsHBWmY3yQ/OkknO4XlNwfoziNo2izU1Nawu/m 5Rs879xk+tae9lcpXBAoJ393X1lanM0d0bh1fqjVtzcXIv7COx2QHS6bRwm/6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1ky3nbQz16gK; Mon, 11 Sep 2023 22:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZcKX056923; Mon, 11 Sep 2023 22:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZcGv056920; Mon, 11 Sep 2023 22:35:38 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:38 GMT Message-Id: <202309112235.38BMZcGv056920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 699014f7981b - stable/13 - ice: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 699014f7981bdda8826ecb6aab783911a0f5c43c Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=699014f7981bdda8826ecb6aab783911a0f5c43c commit 699014f7981bdda8826ecb6aab783911a0f5c43c Author: Kevin Bowling AuthorDate: 2023-08-24 20:40:35 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 ice: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unnecessary for ice(4). Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 14a14e36aee2e6b848c239ac29090ad4cb66fbf7) --- sys/dev/ice/if_ice_iflib.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 58e4b77585ee..be1aa86234c7 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -83,6 +83,7 @@ static int ice_if_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data); static int ice_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req); static int ice_if_suspend(if_ctx_t ctx); static int ice_if_resume(if_ctx_t ctx); +static bool ice_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int ice_msix_que(void *arg); static int ice_msix_admin(void *arg); @@ -170,6 +171,7 @@ static device_method_t ice_iflib_methods[] = { DEVMETHOD(ifdi_i2c_req, ice_if_i2c_req), DEVMETHOD(ifdi_suspend, ice_if_suspend), DEVMETHOD(ifdi_resume, ice_if_resume), + DEVMETHOD(ifdi_needs_restart, ice_if_needs_restart), DEVMETHOD_END }; @@ -3084,3 +3086,21 @@ ice_if_resume(if_ctx_t ctx) return (0); } +/* ice_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +ice_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + From nobody Mon Sep 11 22:35:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1l00TZgz4sTZh; Mon, 11 Sep 2023 22:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1kz5yH7z3gDG; Mon, 11 Sep 2023 22:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+nhcrN7v/QgdMGChKmmgGjdHHRcGsL/kYFZ94WylWQ=; b=hVQlO6ifv79AsmSh9++5RVyzyroq6PHJQfDlpoVasq+yX/t9FmcLBDNs/xHMdiAORIjaWB kyqWxvxa8IdN0DuJU0Q8lfPrIBTED0dia3LcaJPRFqPH536hDtQpw4c7DvIb5Ur672nxKn 6B3D0MJZIzAOOFFkHL6Zil1LYHfXJoeyxz7uKJg4NuvgrDYG+B62br0V7mfq38+DuTnJfE s9AVXlJao4WME1f+zhPuheYDydhY4fme4DBMLCncLJKvQoQj+14c1J1nGEnGYoM+JROEFe 03pqn8PSpwX+zs07CeDkdpGI9crUoFkYnu5hltwPuRm9dYs72IObcGLrU5/UVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471739; a=rsa-sha256; cv=none; b=Vt09dwFRERlMMd9nssBOZtO+WpeedXCbj8AwdJa6MoSdFsiY/0pONG6gFLT+pVRbM2zD5g rVGtuMDd2AgvcUT0NjHAm23eBtrRYdJH/hjJPhbxFdfex9YXyxWxQpGJ5UzG34rxAVW16R 5VPdIm971298Zj9g8RL2T7CrIQfK3NUjsJ9WhsHzOxpZAGKM8aSWAz1CejMzdoUnjl1E6L Blx8MvpEpCdNNAA79MMyhdSiR3FvTXLGv5LVgTbcJRF6YcIpow5XlpCxUYo6oKlkfMOA/E LOJ2iyw3vCZEo2yGJ+xky7ceT+XZTveW0x2JWsJO52NhPBthqxqBD9XHzAJhEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+nhcrN7v/QgdMGChKmmgGjdHHRcGsL/kYFZ94WylWQ=; b=rlX9ucsj5NMuxlSiOdqieQAsmCtSU5LVR96p1o+xDGYf46QZdWDLF1uVnw+URE9I2wgYQ4 VBw6T+lAFgurdBIFvRyvNK1dyRodZYF5mCthqS5y8/+b2LGmUolMGGQlgweIZqfOJ/xqxt rvn0fUGRVNsNnq/Dg56pMikYJpDBXdWyhFc4khfEEjEuxWnZ7AskHmEG+W/7/pIaekP+L6 hv4EKZ84w+spalW20wr41h7JHOlcD4+RqEcTiR1G2LYvWf//cs92Q1AMqkoaormS1eOWjz kQbh3Ns5mO4P3BmqOGY7k3aXw7TUpHF6qgyzUv7tP9Swh4y/Ij46wXGZF0Y4zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1kz5427z16M8; Mon, 11 Sep 2023 22:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZd9x056980; Mon, 11 Sep 2023 22:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZd3B056977; Mon, 11 Sep 2023 22:35:39 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:39 GMT Message-Id: <202309112235.38BMZd3B056977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 6cb4a544e00f - stable/13 - iflib: invert default restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 commit 6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 Author: Kevin Bowling AuthorDate: 2023-08-24 20:42:23 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:21 +0000 iflib: invert default restart on VLAN changes In rS360398, a new iflib device method was added to opt out of VLAN events needing an interface reset. I am switching the default to not requiring a restart for: * VLAN events * unknown events After fixing various bugs, I do not think this would be a common need of hardware and it is undesirable from the user's perspective causing link flaps and much slower VLAN configuration. Currently, there are no other restart events besides VLAN events, and setting the ifdi_needs_restart default to false will alleviate the need to churn every driver if an odd event is added in the future for specific hardware. markj points out this could cause churn in the other direction; I will solve that problem with an event registration system as he mentions in the review should we need it in the future. These drivers will opt into restart and need further inspection or work: * ixv (needs code audit, 61a8231 fixed principal issue; re-init probably not necessary) * axgbe (needs code audit; re-init probably not necessary) * iavf - (needs code audit; interaction with Malicious Driver Detection mentioned in rS360398) * mgb - no VLAN functions are currently implemented. Left a comment. Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 725e4008efef32dfbe57b3e21635fa80dde8ee38) --- sys/dev/e1000/if_em.c | 5 ++--- sys/dev/igc/if_igc.c | 5 ++--- sys/dev/ixgbe/if_ix.c | 5 ++--- sys/dev/mgb/if_mgb.c | 1 + sys/net/ifdi_if.m | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 3aae0ef4377e..8cf130048128 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4385,7 +4385,7 @@ em_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -4394,9 +4394,8 @@ em_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 4680dd434174..82fb0d72070b 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2403,7 +2403,7 @@ igc_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -2412,9 +2412,8 @@ igc_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index db54b0edf7be..b1cba9f24929 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1257,7 +1257,7 @@ ixgbe_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -1266,9 +1266,8 @@ ixgbe_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index b2962d5ff3d8..e3806300ed9a 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -252,6 +252,7 @@ static device_method_t mgb_iflib_methods[] = { */ DEVMETHOD(ifdi_vlan_register, mgb_vlan_register), DEVMETHOD(ifdi_vlan_unregister, mgb_vlan_unregister), + DEVMETHOD(ifdi_needs_restart, mgb_if_needs_restart), /* * Needed for WOL support diff --git a/sys/net/ifdi_if.m b/sys/net/ifdi_if.m index 6e8661920394..fb36b898c1d0 100644 --- a/sys/net/ifdi_if.m +++ b/sys/net/ifdi_if.m @@ -172,7 +172,7 @@ CODE { static bool null_needs_restart(if_ctx_t _ctx __unused, enum iflib_restart_event _event __unused) { - return (true); + return (false); } }; From nobody Mon Sep 11 22:35:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1l10Xr1z4sV0v; Mon, 11 Sep 2023 22:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1l06wg0z3gBM; Mon, 11 Sep 2023 22:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+XMj0fJRKogAyUb6ftPi43hwh/azndSsqofsq3DTrHw=; b=Sllvt6xJVkvRsZzxImoyLt0IeheQWpfmBxamWTPNOnzgfGi31ZXaFT59Y9/oX0T9kWjBcD T0GiQVQuhGqdHSWxOZ9gr0KU/tR0MDmreIRM4vbzvYx0+75gUcarU0CnYtX12OPgbDvKLo gdkwN7l8R3dd5A+L+RxJXCV+5l0rLtj6p6nhLMEvdYM6Z9HdYbXB50co9QdvDWFp0J4Rfi BQVzFMT1W8MpESUAsPPjhSYwgrV5ZeKxJeJ31UOYvoMVuiihhwkF6xuJwNr5vf/KNaog/O h1D6OUuHB8b0BH3CwrVJLhYn9U2txz+IqMllpnmGn+FrLYGxHcQ2tlpimjH8VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471741; a=rsa-sha256; cv=none; b=soSXi1tbKGwAWjEJ89lq/TCoKejA9DYTVpiwup1KThfue6/Gq1jUbERKVHqeOWqXhNtJEE FHtJoWxozisUg1Z0HxBB2JCc8OgXPEaq6xAIGhRmHp1juP6/hz3XoajxmfMGPpTRZLObp4 L0kqphvXVLz8V9TEnOz2UUD1fxEebejbWWIX/mYY1rVm/95fZQ84jfMkPMfYVEJkBHAluP /eeAt7FPbk01uJa9FczV8ybuTAescf2czPCcCQnMBvqlXFwPgPc/UqO9iKzPhG0SUGzex8 JP89qcazgfOq2hsaq7SXz+v0szGQd4s7+DvlCbCB77ueFBCw30gkUODyTobb3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+XMj0fJRKogAyUb6ftPi43hwh/azndSsqofsq3DTrHw=; b=F0J5rGrqfdCgTHwNY6HxlVCN4cnRRSDnioS/x3e0PIp1XBYYzq9YMSuhj68kNf80Y3EI5T 2ZHr0rcoIJETGil6hfHMOaP32p0qWMP30x6dIijM7j1EVEO3tJQ7qv5/Hi99ZlvZRxYf0H UX1iRTyHG3F0r5YQI68WuH9GbZUEzvF348yKG6n/m2wq7yo86MLJ88d0fNGqNKM0KvpoTd AGodfFYr3IkS/ginaenc9ihiP4DxfMNICnrPNB7dgtPVrqKQeG5FjJKP/n+Q05iwm20rmZ QW0u69azcZDsVRo7h9xiafe9yDrp5+bta3s/wuKL+asETXkc/1jrCH6PeiFxsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1l05s28z16Ng; Mon, 11 Sep 2023 22:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZenp057025; Mon, 11 Sep 2023 22:35:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZeDZ057022; Mon, 11 Sep 2023 22:35:40 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:40 GMT Message-Id: <202309112235.38BMZeDZ057022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 5c4f04ff008c - stable/13 - vmxnet3: do restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c4f04ff008ca920219655e401fef48a5806f77d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4f04ff008ca920219655e401fef48a5806f77d commit 5c4f04ff008ca920219655e401fef48a5806f77d Author: Kevin Bowling AuthorDate: 2023-08-24 20:25:21 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:21 +0000 vmxnet3: do restart on VLAN changes vmxnet3: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for vmxnet3(4). Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit b6b75424c57d6da49967fef39f69080ce6939207) vmxnet3: do restart on VLAN changes At least one user reports issues with vmx interfaces after 725e4008ef, where we default to not resetting the interface on VLAN changes. This was on an ESXi 7.0.3 setup. Reported by: Marcos Mendoza Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8c1274138a20ee2342c4f217adb605e3abc14042) --- sys/dev/vmware/vmxnet3/if_vmx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index adf69c320281..cd313b5b8084 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -180,6 +180,7 @@ static void vmxnet3_enable_intr(struct vmxnet3_softc *, int); static void vmxnet3_disable_intr(struct vmxnet3_softc *, int); static void vmxnet3_intr_enable_all(if_ctx_t); static void vmxnet3_intr_disable_all(if_ctx_t); +static bool vmxnet3_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { VMXNET3_BARRIER_RD, @@ -248,6 +249,8 @@ static device_method_t vmxnet3_iflib_methods[] = { DEVMETHOD(ifdi_suspend, vmxnet3_suspend), DEVMETHOD(ifdi_resume, vmxnet3_resume), + DEVMETHOD(ifdi_needs_restart, vmxnet3_if_needs_restart), + DEVMETHOD_END }; @@ -2516,6 +2519,17 @@ vmxnet3_intr_disable_all(if_ctx_t ctx) vmxnet3_disable_intr(sc, i); } +static bool +vmxnet3_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + return (true); + default: + return (false); + } +} + /* * Since this is a purely paravirtualized device, we do not have * to worry about DMA coherency. But at times, we must make sure From nobody Mon Sep 11 22:35:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1lL1xZBz4sV3n; Mon, 11 Sep 2023 22:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1lL0pKgz4CwB; Mon, 11 Sep 2023 22:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fb0tv+QYGBk8bvp60jKcER3nLglR7DRCV5gaVwtjkc0=; b=C2b1zCTuoKeO0hJjDNnpXr52IkPgiH0i/n0+IQCA+hnCd/LzfOKAKAOv1YikiJbP0OnwNg /sPndt/hJeShZXJgkjtaZGfuADrsf/BNWZwnctY3ZJ66NX9nT9Kkzn3he16HPUU4TNPAiC SSf77NzVCl7+SJB0BtDrirEB7cow7FSLDh6XybgcB08zrRVf3T12AGWSzztQhhfhpwUrBm ila5AKHIL4jbz3YsDfawOyhuVkwqNQLNe9e7WzYkZ+kWbkOZD1H6jD77FaX9Ce0opmKU+a QUG+YHN5Fq2AHxgxMWInNnZ3gGkrr8cua9FNX0tlSH8f9D2g6BZ7o0sNf6+XoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471758; a=rsa-sha256; cv=none; b=OD5dRG41Y1jgsKrpHbpMqXxkLsZ1XHcJU4h6azDIxMhbkVc18mOR9HhZHOXQpH88VEH3hQ yLbhe5ex+z/R/WTpCK+KWyWU3rQ6qDHDmxAbvxD0as+/nG7yJ9gQPIm/S3IWiPejhxEM3o pEfv+ZduyvTtLMaRBa/cjBMQ84MEZ94JAidA8w1q155GXayUomet/ujdTL+si9a0hc6HkG WHOK1/KYJA0QMBLtE3M8KnSl0Z/QZmgCxtjmNnI7fOfZ8dxyzWLkm0UBViMPpadcSPpPfd fUmTogRjj2O6WpaN8CKXSdzWmxYk3BoUhL0DnjJOGNkBzItiEAiM3U4CsRZ+Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fb0tv+QYGBk8bvp60jKcER3nLglR7DRCV5gaVwtjkc0=; b=sISvccWJW27mY0YiS0tzBDuntqGn3Se9prVO0ii32aZyEw5P4NfDrgD8xTd3meETqiltkO uq8NkbsudEDHqb5tKUXWNH7af9PEw6cB7DAa72HsgIaNDE/CXm00zUzZWjim+mrAL4PUea /K/47THHVVVFEaeaIMLwumnRQvQxgek7tTNbrd6GlKXLSI1tleaQGTyht3j2s5VfCrAHJz zDSsZulD92TQaEcSy4ehhvLUo5o/vy8mJdkdl5io+f+4d8nIlwqWhwNIxDibKTVgZuVk1X SI7jcMKIcFC4R6Hhye6dfwCoCNdJhjNcbsEzXwYa3J2PuQUoIQTWFfBVGv6wng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1lK6qdtz168t; Mon, 11 Sep 2023 22:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMZvtV057218; Mon, 11 Sep 2023 22:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZvOA057215; Mon, 11 Sep 2023 22:35:57 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:57 GMT Message-Id: <202309112235.38BMZvOA057215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 481d727f3ede - releng/14.0 - uefi(8): Refer to a related manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 481d727f3ede5362991b89545f072c28c07745c5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=481d727f3ede5362991b89545f072c28c07745c5 commit 481d727f3ede5362991b89545f072c28c07745c5 Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:34:08 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne Approved by: re (delphij) Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) (cherry picked from commit d01bbdf4572bd8e8e709f6c0020e7352f7727cff) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 9ee501047337..42642bb48260 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 22:44:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x218tXz4sZfD; Mon, 11 Sep 2023 22:44: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 4Rl1x20kMQz4HLs; Mon, 11 Sep 2023 22:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmYxZ3cRMf1aPrZbGOj6MuIrqtX9lrEqgWklgqY17XE=; b=BmtysKlNWuNaxDQtGIQ5Celqgg6PDuZTgBiXDPEX+TZs46m3oNYA1a4rEHX17y8gOXeJWL A6P/jULKJp00GzYXaFBmwAD2XIywJb/wD/rWHE0N3ab22Xolun7fSofbHTe18iqBQWyETK fj55TcsVUO2PgqDVFZccFA8oGI/54wcbE9q3G49s5/tOUseGNCPozzw3d4hvq1Iv/wCXj7 O/S/HMSMkiksY4nUgpZATZQQzQ4mGM4DxMog4beK9byvLehXUfI1Zv6/Fcs4vT8wr9z+v3 kY1yEOaH+px/Wl2dvljQ7gdAco4ualqc5sQGSnffZKM9Kpt0lgxuFenR+NKL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472262; a=rsa-sha256; cv=none; b=JOIq2KXWQGh7mBkHUK00K+Tlgbkyd7qFpIimp0ktB1ofGElfW7PGDP2Vb7HjAyJM4i5FPO a0x0dVNVNfjsdaijN8cO/S7m7G1LfrFHDbYFkbysO8LhHvjDxqF7bmwHtEIVkKIrR7I/3U 72KltNaLEBEBfuYasz6oX4McVKcvIt7ob8fvV02XWOlQXreFayfmNtUnc0iMpHZs3PL+Wd 2tV4zrKpLxj92zmW3W21QmFr9QJoPKXU8ZlEcy0JhKKU+oeD2FcBO9t+mpR7keqAqkBcCX zkZF0cZvNYmTMGpDj629zS0YIuo1olQWZOSZ8STHKWo52dqLO18mx9ziWfVXUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmYxZ3cRMf1aPrZbGOj6MuIrqtX9lrEqgWklgqY17XE=; b=efbnY6QCAvhhqrHkVmuU1V2Hz+IwT/DOS0BGVp0spu8uqBu1NKBgpyk32NKrrrAHmPtxwS 2fmODF4fkTkJxGhO3b/fbwSYoj3I1o5r1PFhMg+eAoZzZHyULLEau8HRYqStCr8Yd9oZR8 jk6R8NrDBh2fkjzZk6rhYKfSTaHCdMMkW8siPHsi9EcocWsySSDMoz5k33Dl6ErhBld4yY VH3pbfz5Y+OyGmEjVwfqjApzE1M0f+WBuI5+eb+dCZ1E34PF5/dj0/KYQCg1exLq7Cl+c6 3MaohKNJar00LODA45KVGrjG24VRUQKpY2wkgEVWUX0nVR+XeaBYbm+sFrxJqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x16x1Sz171N; Mon, 11 Sep 2023 22:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiLKJ073803; Mon, 11 Sep 2023 22:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiLR5073800; Mon, 11 Sep 2023 22:44:21 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:21 GMT Message-Id: <202309112244.38BMiLR5073800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a8e364b140dc - stable/13 - g_bio(9): add link to bio(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a8e364b140dcf967f9df208a627e158629ab9bb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e364b140dcf967f9df208a627e158629ab9bb6 commit a8e364b140dcf967f9df208a627e158629ab9bb6 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:11 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:40:33 +0000 g_bio(9): add link to bio(9) This page documents 'struct bio', so this can be helpful with finding or referencing it. Reviewed by: imp, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41252 (cherry picked from commit d441ec1c218991421d08ac4661878ed5c182cd64) --- share/man/man9/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 038ffc95703d..f1c7c2622e86 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1115,7 +1115,8 @@ MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \ fpu_kern.9 fpu_kern_thread.9 \ fpu_kern.9 is_fpu_kern_thread.9 MLINKS+=g_attach.9 g_detach.9 -MLINKS+=g_bio.9 g_alloc_bio.9 \ +MLINKS+=g_bio.9 bio.9 \ + g_bio.9 g_alloc_bio.9 \ g_bio.9 g_clone_bio.9 \ g_bio.9 g_destroy_bio.9 \ g_bio.9 g_duplicate_bio.9 \ From nobody Mon Sep 11 22:44:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x31q2vz4sZpR; Mon, 11 Sep 2023 22:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1x31Q5pz4Hg6; Mon, 11 Sep 2023 22:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwYLTUD3xGsOnRCxL76+4jhI7WWRIp1dsXEu+OxnW4o=; b=harB1TQqkZ1VvS9xqjjoubaGCGw0RSEkSMdpyftymbkLxoyZcDNxyb0OWRqL0cjeKIdW3S RNGv0ZDq/aVwZSPfYDwcXraAujHdfAJlZlvX252Bgbg01f9JvvZ5wmj2pSrK9BIZinqqK3 oiYpO/2dkV3efghXscbevSjnf018ic7i2+f5ljJcGiVrTzNm6h5WAwwnyVC4mZjLBZphGb RreZT46BoxHVZScSwHcj9faiV6/qSNbl49y9rIxotWcuH1nkOjKPbIsMpe7iNm1kM0aVXY cF5UhJiE0NH7Q199xzR7HIWMzBaGMr00wTpPs9nZAryjl5wE9PalH37GasDlUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472263; a=rsa-sha256; cv=none; b=VxB8AExmOu+AFHU1rekloIlqMP/EWnj1wbYas+bgIOdVrS5jhWfH/mY1JIo967mJauaZ72 qG8bE3psSWMmHSngGvFoEMZglrW/wb6Vw6Vw8zF6vVd2yBUYsyhmKRY921kJQijvy7qykN oBP1f4vLuUPNHHT/4pxeZPIJdh1PdKJ884Lo99QL3wczGL4SaOd1E3aiOh88v/xpc17uYl naa6P0VF1VFCw92gr+JMWVMJ8hO0Tn1OVRL/sJErdgL3eTMqmuGYplr1gVPcAJcCjkLxBx CoP7aBKfVJsmpfyHVb+6IPw6DWrS60zsh9HKGF/mtPCXWHCUbiMD4oUbjXSYqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwYLTUD3xGsOnRCxL76+4jhI7WWRIp1dsXEu+OxnW4o=; b=PZhX/2yOyh6ibfh8nTcW+ItAamUTDyWmSjPYBC6cgh1hgtWX9+R1kfAqwAofsLXC+kCoW8 e81fMEqd240mRf4CFZU/5sTt84RWSzsnINrY912hevIb9YpLJ/cPgXfnuLrXv12+qMKGSP 5njKtthYV95Ik5y0rurNqVmUmDabpsAKJl5tbwv6tJlrrm1GlknBQ/DgTrFGuhvcUn2Ltp 51JgmbX/2HjPpu40lAzl/PgJY7Jg3RGSXMK8vlajQylUBebzkKa/6PpGzom/0n81h2I5PT ErVIt+E+10mQa+/u0tqKYxknl0TvDpm/WRmYVxSAmEoB4n8fLIZwa/me1ZLgCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x30Vh1z16PL; Mon, 11 Sep 2023 22:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiMU7073848; Mon, 11 Sep 2023 22:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiMN4073845; Mon, 11 Sep 2023 22:44:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:22 GMT Message-Id: <202309112244.38BMiMN4073845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aa26195de58d - stable/13 - sys/README.md: Add a section for documentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 commit aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:17 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:40:33 +0000 sys/README.md: Add a section for documentation Add web links to intro(9) and the Architecture Handbook. Reviewed by: lwhsu, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41253 (cherry picked from commit 32e47f62724e6cce2df0bc69d6ceba2d058d3585) --- sys/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/README.md b/sys/README.md index ad7ff9efa578..5836ade3deaa 100644 --- a/sys/README.md +++ b/sys/README.md @@ -9,6 +9,17 @@ architecture. `GENERIC` is the configuration used in release builds. `NOTES` contains documentation of all possible entries. `LINT` is a compile-only configuration used to maximize build coverage and detect regressions. +Documentation: +-------------- + +Source code documentation is maintained in a set of man pages, under section 9. +These pages are located in [`share/man/man9`](../share/man/man9), from the +top-level of the src tree. Consult [`intro(9)`](https://man.freebsd.org/intro/9) +for an overview of existing pages. + +Some additional high-level documentation of the kernel is maintained in the +[Architecture Handbook](https://docs.freebsd.org/en/books/arch-handbook/). + Source Roadmap: --------------- | Directory | Description | From nobody Mon Sep 11 22:44:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x42s1Cz4sZlt; Mon, 11 Sep 2023 22:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1x42Kjtz4HdL; Mon, 11 Sep 2023 22:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NY5Izn2bThZpH8gAEjukFSQMMaEGkPvVFDr/4qPLNMo=; b=ZkpPrDyDLLJirtBSVM6D9iwMQ7KN56R5w4/ql27Gbj2BM1TM0Ctc3yJpoFTRnumGB1wqmj vmGtwk7zvAE+BLlPa+6hHeMjndsmGmxr2ntpn8PoU1f7s6Ig98yKWUVvS/Rhlvn5lnckLH g4cDvAI1EBkKsf32qjMdbVjF09YJK+gyJyoRjYDgmaIN//g8uNgyNWiB98Oy920Fxrglzj UFJ7v9xhfFj1tT146zYYLf1VS5qTXmyffei4daIm5I3q72ElMvCoCCHaEF+T6lX2BOAokk TKx1Y18etcxJLOhM2kwUhKlhVxSB/g7XUfRgms2nb4dU34qMbq5+kuQ4sQ5fpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472264; a=rsa-sha256; cv=none; b=pkAgzueUNWaomao+CyolC31o1Bqs7qc99KvWbJE74lZnP2JOJDMOHZPvNL3/O8nGOUR8F9 DCmJRut9pJ7Hrqev+AGzHTbnhr0d0/iDnbr/uyFBLnosdS2WkTXHLxgsTVAiO5sDj+nHPo ed7Xo90OIdNsakOe7jlT8kM3FechdiBF6Ckw6s/MLaKYpGeBu9cWspiLb5HYzSB9Arj2eb 4Fu55PqH3cpMFyH3UoE3tpvHDjaelASkfirhcC7lIgQrdZ7TWOYCU4QX8RfcHm3v9/+FAU vz4sZYia63iAVC8h0Nl2c9Dn+IAC9uVeswOtlipgoQ3taYPu9YP5ZwRRN2Dl6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NY5Izn2bThZpH8gAEjukFSQMMaEGkPvVFDr/4qPLNMo=; b=xGEEJbi9Fukqkm64xp+pE1Gj/SO8OESrVh2V5nW4Ki3VMoSN2bAbPh+sQIKYEA/u0vNL49 MjGkisF6t+JX1oQr2vjkFaIRzR1AzoTNqUQL/vSzKDfUzdLJuCBSeNJkXEodAgGdLJ2fqd 7VB82hGWuWprVpdXm/krG7O65WxBfQrLIq03BinEryR/SRfvi0sK47zYCrbuOUOnP/0oGu /a5grw1I7iWRLT8GHzp6DjcshMfW6TtzGmJTywdJVgPlxOoF6z6IvLpcXDR4ZIIzdlhiZO +okCRKBpqkbkEMAaTEYTEkPg9FYR+JjYz8yOMFkPiy/aV4cpflH6XkCBAQMVQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x41FDZz16yx; Mon, 11 Sep 2023 22:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiOPr073891; Mon, 11 Sep 2023 22:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiORv073888; Mon, 11 Sep 2023 22:44:24 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:24 GMT Message-Id: <202309112244.38BMiORv073888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5a0c410787b8 - stable/13 - intro(9): rewrite from scratch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a0c410787b8b2f92a0c3f6126c95ffe34de344c Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5a0c410787b8b2f92a0c3f6126c95ffe34de344c commit 5a0c410787b8b2f92a0c3f6126c95ffe34de344c Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:15 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:42:15 +0000 intro(9): rewrite from scratch This page has existed as a placeholder since its creation in 1995. It does not provide a useful introduction to the content in this section. Reimagine it as a top-level overview page containing brief descriptions and links to existing pages in section 9. It is roughly organized into sub-sections, grouped by topic or subsystem. In other words, the page is meant to function as a map to other content. There is a balance to be found here between providing as many links as possible and keeping the page concise and searchable. In general the aim is to reference pages which provide the best entry point to a particular topic. For example, a link is given to locking(9), but not to the specific lock pages such as mutex(9) or rwlock(9). NetBSD has done something similar with their intro(9), so some inspiration has been taken from there, although their content doesn't align that closely with what we have. I have done a thorough review of our existing pages and formed these subsections around them, but they are meant to evolve. PR: 270481 Reviewed by: imp, emaste MFC after: 3 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41104 (cherry picked from commit 84f9f2c5cf7841fffc03ccb1833814892ae15132) --- share/man/man9/intro.9 | 594 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 505 insertions(+), 89 deletions(-) diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9 index 4777ee2b8504..458ee0ab4697 100644 --- a/share/man/man9/intro.9 +++ b/share/man/man9/intro.9 @@ -1,103 +1,519 @@ -.\" Copyright (c) 1983, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. .\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" Copyright (c) 2023 The FreeBSD Foundation .\" -.Dd December 13, 1995 +.\" This manual page was written by Mitchell Horne under +.\" sponsorship from the FreeBSD Foundation. +.\" +.Dd August 2, 2023 .Dt INTRO 9 .Os .Sh NAME .Nm intro -.Nd "introduction to system kernel interfaces" +.Nd "introduction to kernel programming interfaces" .Sh DESCRIPTION -This section contains information about the interfaces and -subroutines in the kernel. -.Sh PROTOTYPES ANSI-C AND ALL THAT -Yes please. -.Pp -We would like all code to be fully prototyped. -.Pp -If your code compiles cleanly with -.Nm cc -.Ar -Wall -we would feel happy about it. -It is important to understand that this is not a question of just shutting up -.Nm cc , -it is a question about avoiding the things it complains about. -To put it bluntly, do not hide the problem by casting and other -obfuscating practices, solve the problem. -.Sh INDENTATION AND STYLE -Believe it or not, there actually exists a guide for indentation and style. -It is not generally applied though. -.Pp -We would appreciate if people would pay attention to it, and at least not -violate it blatantly. -.Pp -We do not mind it too badly if you have your own style, but please make -sure we can read it too. -.Pp -Please take time to read +Welcome to the +.Fx +kernel documentation. +Outside of the source code itself, this set of +.Xr man 1 +pages is the primary resource for information on usage of the numerous +programming interfaces available within the kernel. +In some cases, it is also a source of truth for the implementation details +and/or design decisions behind a particular subsystem or piece of code. +.Pp +The intended audience of this documentation is developers, and the primary +authors are also developers. +It is written assuming a certain familiarity with common programming or +OS-level concepts and practices. +However, this documentation should also attempt to provide enough background +information that readers approaching a particular subsystem or interface for +the first time will be able to understand. +.Pp +To further set expectations, we acknowledge that kernel documentation, like the +source code itself, is forever a work-in-progress. +There will be large sections of the codebase whose documentation is subtly or +severely outdated, or missing altogether. +This documentation is a supplement to the source code, and can not always be +taken at face value. +.Pp +At its best, section 9 documentation will provide a description of a particular +piece of code that, paired with its implementation, fully informs the reader of +the intended and realized effects. +.Pp +.Xr man 1 +pages in this section most frequently describe functions, but may also +describe types, global variables, macros, or high-level concepts. +.Sh CODING GUIDELINES +Code written for the +.Fx +kernel is expected to conform to the established style and coding conventions. +Please see .Xr style 9 -for more information. -.Sh NAMING THINGS -Some general rules exist: -.Bl -enum -.It -If a function is meant as a debugging aid in DDB, it should be enclosed -in -.Bd -literal -offset indent -#ifdef DDB - -#endif /* DDB */ +for a detailed set of rules and guidelines. +.Sh OVERVIEW +Below is presented various subsystems. +.Ss Data Structures +There are implementations for many well-known data structures available in the +kernel. +.Bl -tag -width "Xr bitstring 3" +.It Xr bitstring 3 +Simple bitmap implementation. +.It Xr counter 9 +An SMP-safe general-purpose counter implementation. +.It Xr hash 9 +Hash map implementation. +.It Xr nv 9 +Name/value pairs. +.It Xr queue 3 +Singly-linked and doubly-linked lists, and queues. +.It Xr refcount 9 +An SMP-safe implementation of reference counts. +.It Xr sbuf 9 +Dynamic string composition. +.It Xr sglist 9 +A scatter/gather list implementation. +.El +.Ss Utility Functions +Functions or facilities of general usefulness or convenience. +See also the +.Sx Testing and Debugging Tools +or +.Sx Miscellaneous +sub-sections below. +.Pp +Formatted output and logging functions are described by +.Xr printf 9 . +.Pp +Endian-swapping functions: +.Xr byteorder 9 . +.Pp +Data output in hexadecimal format: +.Xr hexdump 9 . +.Pp +A rich set of macros for declaring +.Xr sysctl 8 +variables and functions is described by +.Xr sysctl 9 . +.Pp +Non-recoverable errors in the kernel should trigger a +.Xr panic 9 . +Run-time assertions can be verified using the +.Xr KASSERT 9 +macros. +Compile-time assertions should use +.Fn _Static_assert . +.Pp +The SYSINIT framework provides macros for declaring functions that will be +executed during start-up and shutdown; see +.Xr SYSINIT 9 . +.Pp +Deprecation messages may be emitted with +.Xr gone_in 9 . +.Pp +A unit number facility is provided by +.Xr unr 9 . +.Ss Synchronization Primitives +The +.Xr locking 9 +man page gives an overview of the various types of locks available in the +kernel and advice on their usage. +.Pp +Atomic primitives are described by +.Xr atomic 9 . +.Pp +The +.Xr epoch 9 +and +.Xr smr 9 +facilities are used to create lock-free data structures. +There is also +.Xr seqc 9 . +.Ss Memory Management +Dynamic memory allocations inside the kernel are generally done using +.Xr malloc 9 . +Frequently allocated objects may prefer to use +.Xr uma 9 . +.Pp +.\" MHTODO: It would be useful to have a vm_page(9) or similar +.\" high-level page which points to the following contents instead. +Much of the virtual memory system operates on +.Vt vm_page_t +structures. +The following functions are documented: +.Bd -ragged -offset indent +.Xr vm_page_advise 9 , +.Xr vm_page_alloc 9 , +.Xr vm_page_bits 9 , +.Xr vm_page_aflag 9 , +.Xr vm_page_alloc 9 , +.Xr vm_page_bits 9 , +.Xr vm_page_busy 9 , +.Xr vm_page_deactivate 9 , +.Xr vm_page_free 9 , +.Xr vm_page_grab 9 , +.Xr vm_page_insert 9 , +.Xr vm_page_lookup 9 , +.Xr vm_page_rename 9 , +.Xr vm_page_sbusy 9 , +.Xr vm_page_wire 9 +.Ed +.Pp +Virtual address space maps are managed with the +.Xr vm_map 9 +API. +.Pp +The machine-dependent portion of the virtual memory stack is the +.Xr pmap 9 +module. +.Pp +Allocation policies for NUMA memory domains are managed with the +.Xr domainset 9 +API. +.Ss File Systems +The kernel interface for file systems is +.Xr VFS 9 . +File system implementations register themselves with +.Xr vfsconf 9 . +.Pp +The abstract and filesystem-independent representation of a file, directory, or +other file-like entity within the kernel is the +.Xr vnode 9 . +.Pp +The implementation of access control lists for filesystems is described by +.Xr acl 9 . +Also +.Xr vaccess 9 . +.Ss I/O and Storage +.\" TODO: This page needs to be rewritten before it can be included here. +.\" The buffer cache is described by: +.\" .Xr buf 9 +.\" .Pp +The GEOM framework represents I/O requests using the +.Xr bio 9 +structure. +.Pp +Disk drivers connect themselves to GEOM using the +.Xr disk 9 +API. +.Pp +The +.Xr devstat 9 +facility provides an interface for recording device statistics in disk drivers. +.Ss Networking +Much of the networking stack uses the +.Xr mbuf 9 , +a flexible memory management unit commonly used to store network packets. +.Pp +Network interfaces are implemented using the +.Xr ifnet 9 +API, which has functions for drivers and consumers. +.Pp +A framework for managing packet output queues is described by +.Xr altq 9 . +.Pp +To receive incoming packets, network protocols register themselves with +.Xr netisr 9 . +.Pp +Virtualization of the network stack is provided by +.Xr VNET 9 . +.Pp +The front-end for interfacing with network sockets from within the kernel is +described by +.Xr socket 9 . +The back-end interface for socket implementations is +.Xr domain 9 . +.Pp +The low-level packet filter interface is described by +.Xr pfil 9 . +.Pp +The +.Xr bpf 9 +interface provides a mechanism to redirect packets to userspace. +.Pp +The subsystem for IEEE 802.11 wireless networking is described by +.Xr ieee80211 9 . +.Pp +A framework for modular TCP implementations is described by +.Xr tcp_functions 9 . +.Pp +A framework for modular congestion control algorithms is described by +.Xr mod_cc 9 . +.Ss Device Drivers +.\" TODO: a bus(9) or newbus(9) page, as well as updates to existing pages +.\" would be helpful in laying out the high-level concepts of FreeBSD's device +.\" structure, and explaining the organization of existing documentation. +Consult the +.Xr device 9 +and +.Xr driver 9 +pages first. +.Pp +Most drivers act as devices, and provide a set of methods implementing the +device interface. +This includes methods such as +.Xr DEVICE_PROBE 9 , +.Xr DEVICE_ATTACH 9 , +and +.Xr DEVICE_DETACH 9 . +.Pp +In addition to devices, there are buses. +Buses may have children, in the form of devices or other buses. +Bus drivers will implement additional methods, such as +.Xr BUS_ADD_CHILD 9 , +.Xr BUS_READ_IVAR 9 , +or +.Xr BUS_RESCAN 9 . +.Pp +Buses often perform resource accounting on behalf of their children. +For this there is the +.Xr rman 9 +API. +.Pp +Drivers can request and manage their resources (e.g. memory-space or IRQ +number) from their parent using the following sets of functions: +.Bd -ragged -offset indent +.Xr bus_alloc_resource 9 , +.Xr bus_adjust_resource 9 , +.Xr bus_get_resource 9 , +.Xr bus_map_resource 9 , +.Xr bus_release_resource 9 , +.Xr bus_set_resource 9 .Ed .Pp -And the name of the procedure should start with the prefix -.Li DDB_ -to clearly identify the procedure as a debugger routine. +Direct Memory Access (DMA) is handled using the +.Xr busdma 9 +framework. +.Pp +Functions for accessing bus space (i.e. read/write) are provided by +.Xr bus_space 9 . +.Ss Clocks and Timekeeping +The kernel clock frequency and overall system time model is described by +.Xr hz 9 . +.Pp +A few global time variables, such as system up-time, are described by +.Xr time 9 . +.Pp +Raw CPU cycles are provided by +.Xr get_cyclecount 9 . +.Ss Userspace Memory Access +Direct read/write access of userspace memory from the kernel is not permitted, +and memory transactions that cross the kernel/user boundary must go through one +of several interfaces built for this task. +.Pp +Most device drivers use the +.Xr uiomove 9 +set of routines. +.Pp +Simpler primitives for reading or writing smaller chunks of memory are +described by +.Xr casuword 9 , +.Xr copy 9 , +.Xr fetch 9 , +and +.Xr store 9 . +.Ss Kernel Threads, Tasks, and Callbacks +Kernel threads and processes are created using the +.Xr kthread 9 +and +.Xr kproc 9 +interfaces, respectively. +.Pp +Where dedicated kernel threads are too heavyweight, there is also the +.Xr taskqueue 9 +interface. +.Pp +For low-latency callback handling, the +.Xr callout 9 +framework should be used. +.Pp +Dynamic handlers for pre-defined event hooks are registered and invoked using +the +.Xr EVENTHANDLER 9 +API. +.Ss Thread Switching and Scheduling +The machine-independent interface to a context switch is +.Xr mi_switch 9 . +.Pp +To prevent preemption, use a +.Xr critical 9 +section. +.Pp +To voluntarily yield the processor, use +.Xr kern_yield 9 . +.Pp +The various functions which will deliberately put a thread to sleep are +described by +.Xr sleep 9 . +Sleeping threads are removed from the scheduler and placed on a +.Xr sleepqueue 9 . +.\" TODO: This page is outdated and can't be included here yet. +.\".Pp +.\"The thread scheduler interface is described by +.\".Xr scheduler 9 . +.Ss Processes and Signals +To locate a process or process group by its identifier, use +.Xr pfind 9 +and +.Xr pgfind 9 . +Alternatively, the +.Xr pget 9 +function provides additional search specificity. +.Pp +The "hold count" of a process can be manipulated with +.Xr PHOLD 9 . +.Pp +The kernel interface for signals is described by +.Xr signal 9 . +.Pp +Signals can be sent to processes or process groups using the functions +described by +.Xr psignal 9 . +.Ss Security +See the generic security overview in +.Xr security 7 . +.Pp +The basic structure for user credentials is +.Vt struct ucred , +managed by the +.Xr ucred 9 +API. +Thread credentials are verified using +.Xr priv 9 +to allow or deny certain privileged actions. +.Pp +Policies influenced by +.Va kern.securelevel +must use the +.Xr securelevel_gt 9 +or +.Xr securelevel_ge 9 +functions. +.Pp +The Mandatory Access Control (MAC) framework provides a wide set of hooks, +supporting dynamically-registered security modules; +see +.Xr mac 9 . +.Pp +Cryptographic services are provided by the OpenCrypto framework. +This API provides and interface for both consumers and crypto drivers; +see +.Xr crypto 9 . +.Pp +For information on random number generation, see +.Xr random 9 +and +.Xr prng 9 . +.Ss Kernel Modules +The interfaces for declaring loadable kernel modules are described by +.Xr module 9 . +.Ss Interrupts +The machine-independent portion of the interrupt framework supporting the +registration and execution of interrupt handlers is described by +.Xr intr_event 9 . +.Pp +Software interrupts are provided by +.Xr swi 9 . +.Pp +Device drivers register their interrupt handlers using the +.Xr bus_setup_intr 9 +function. +.Ss Testing and Debugging Tools +A kernel test framework: +.Xr kern_testfrwk 9 +.Pp +A facility for defining configurable fail points is described by +.Xr fail 9 . +.Pp +Commands for the +.Xr ddb 4 +kernel debugger are defined with the +.Xr DB_COMMAND 9 +family of macros. +.Pp +The +.Xr ktr 4 +tracing facility adds static tracepoints to many areas of the kernel. +These tracepoints are defined using the macros described by +.Xr ktr 9 . +.Pp +Static probes for DTrace are defined using the +.Xr SDT 9 +macros. +.Pp +Stack traces can be captured and printed with the +.Xr stack 9 +API. +.Pp +Kernel sanitizers can perform additional compiler-assisted checks against +memory use/access. +These runtimes are capable of detecting difficult-to-identify classes of bugs, +at the cost of a large overhead. +Supported is the Kernel Address Sanitizer +.Xr KASAN 9 , +and the Kernel Memory Sanitizer +.Xr KMSAN 9 . +.Pp +The +.Cd LOCK_PROFILING +kernel config option enables extra code to assist with profiling and/or +debugging lock performance; +see +.Xr LOCK_PROFILING 9 . +.Ss Driver Tools +Defined functions/APIs for specific types of devices. +.Bl -tag -width "Xr usbdi 9" +.It Xr iflib 9 +Programming interface for +.Xr iflib 4 +based network drivers. +.It Xr pci 9 +Peripheral Component Interconnect (PCI) and PCI Express (PCIe) programming API. +.It Xr pwmbus 9 +Pulse-Width Modulation (PWM) bus interface methods. +.It Xr usbdi 9 +Universal Serial Bus programming interface. +.It Xr superio 9 +Functions for Super I/O controller devices. .El -.Sh SCOPE OF SYMBOLS -It is important to carefully consider the scope of symbols in the kernel. -The default is to make everything static, unless some reason requires -the opposite. -.Pp -There are several reasons for this policy, -the main one is that the kernel is one monolithic name-space, -and pollution is not a good idea here either. -.Pp -For device drivers and other modules that do not add new internal interfaces -to the kernel, the entire source should be in one file if possible. -That way all symbols can be made static. -.Pp -If for some reason a module is split over multiple source files, then try -to split the module along some major fault-line and consider using the -number of global symbols as your guide. -The fewer the better. +.Ss Miscellaneous +Dynamic per-CPU variables: +.Xr dpcpu 9 . +.Pp +CPU bitmap management: +.Xr cpuset 9 . +.Pp +Kernel environment management: +.Xr getenv 9 . +.Pp +Contexts for CPU floating-point registers are managed by the +.Xr fpu_kern 9 +facility. +.Pp +For details on the shutdown/reboot procedure and available shutdown hooks, see +.Xr reboot 9 . +.Pp +A facility for asynchronous logging to files from within the kernel is provided +by +.Xr alq 9 . +.Pp +The +.Xr osd 9 +framework provides a mechanism to dynamically extend core structures in a way +that preserves KBI. +See the +.Xr hhook 9 +and +.Xr khelp 9 +APIs for information on how this is used. +.Pp +The kernel object implementation is described by +.Xr kobj 9 . .Sh SEE ALSO +.Xr man 1 , .Xr style 9 -.Sh HISTORY -The -.Nm -section manual page appeared in -.Fx 2.2 . +.Rs +.%T "The FreeBSD Architecture Handbook" +.%U "https://docs.freebsd.org/en/books/arch-handbook/" +.Re From nobody Mon Sep 11 22:44:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x542p2z4sZg6; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1x537xgz4HYV; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=cYD+z70czbhcyRMQ+c545zz2dCpHWnvkzgWMlCviBTU5dcBMCFQ4eIqVae4AvMWW0SI1v3 JavH666qXM7dzGSJJrp+31MEYKozlEbxyjQC5PALlbyUrpqBIwZERpfcybCmkQE5B6VWW9 Bx4En6XiCGr1tSZjUz9OB3X7RB5Cu+v21+764slUgeWTrXXdtEFo8rULS8WlaoN/y5ghAe XgLMdXg3Z3/fH7/IUNITrjjwKQppmvVSdBFa1RM9NkO05b6z8dUYg+8XfW3aqul3gYXAPh l5zPQ1RzKN4nzrhJKCmlDetbaYTNw/ax6lGuIEQFpipEiucuCXmfkGIiXm518g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472265; a=rsa-sha256; cv=none; b=VLlZ9g9iqSVtUVTtyegz5HjoB1uYKh4YujOOzdN2RMUL+xvBNjOsNXnhUVCOc2v2QYJc1Z +LE0tp0rQH57txuO62mvPz8bBF/boWA0A84y2ZuJej0YU4jkK8PNQiDD8m9nxXp6N6lbb+ bPTXp6pW90uPOg0g+sJOdyNPWzRrKlK19vjtadeeIU12Cqw776qHbWvQ5Jw+8ijM12zxpF PQs2A6H8rgn+nW4pssnEME8hgpIgtcHPP/cgtJJtaNgXjLKmgMlkCqtw/DpCR8AbAAZdMW IXdaz6DGcQ9L/Dj/84erz5AtUzv0TN7Gpel+vkR/IDSVV6gyLvVHZ1sRU1yoIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=j0kWQ62c8cV5Bpx/eDErTPEmBpH/mLkxrujUFa7sfmfECZn5zvfKi41KZKjyIRY3pNzMk5 Gbvde4yWcZKXFOdsUOrxZHhOUU80Dw+bstjbzKva0+CKwUvH2uGs3dNk5oY0vbN4mknEfd xz6rCTGQGt7oBh3HLWkr599w+kSfkoZJoiBPFv5lyr17agRWPwyFNXRSWtk27ywZB311le sIPUajLyj3BGXMLQv92AlbRd5vChyfKfhkcdnT9nYLHsstN0Pis0kW0XxQU5ycRUi+D17Q zawWfDIf6itphYisJA+f2ZX5wicB1f2l/HKKrWwispupsCgQK3cbVMXo2TJ8Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x52DBdz16PM; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiPBE073930; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiPLI073927; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:25 GMT Message-Id: <202309112244.38BMiPLI073927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: dd70f2b48c9c - stable/13 - hwpmc_arm64: plug memory leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd70f2b48c9c0235e52721c2a6930285c3b6939e Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dd70f2b48c9c0235e52721c2a6930285c3b6939e commit dd70f2b48c9c0235e52721c2a6930285c3b6939e Author: Mitchell Horne AuthorDate: 2023-08-03 14:09:48 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:43:59 +0000 hwpmc_arm64: plug memory leak Free allocated per-CPU structures in the pcpu_fini and finalize methods. While here, add debug trace entries to these methods. Reviewed by: jkoshy, andrew MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41268 (cherry picked from commit 8bdceaecabd91ce5ed23646d91cef878681e19d6) --- sys/dev/hwpmc/hwpmc_arm64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index f0a487cf7d21..65f55108cecb 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -452,7 +452,7 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[arm64,%d] wrong cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP, INI, 1, "arm64-init cpu=%d", cpu); + PMCDBG0(MDP, INI, 1, "arm64-pcpu-init"); arm64_pcpu[cpu] = pac = malloc(sizeof(struct arm64_cpu), M_PMC, M_WAITOK | M_ZERO); @@ -493,10 +493,16 @@ arm64_pcpu_fini(struct pmc_mdep *md, int cpu) { uint32_t pmcr; + PMCDBG0(MDP, INI, 1, "arm64-pcpu-fini"); + pmcr = arm64_pmcr_read(); pmcr &= ~PMCR_E; arm64_pmcr_write(pmcr); + free(arm64_pcpu[cpu]->pc_arm64pmcs, M_PMC); + free(arm64_pcpu[cpu], M_PMC); + arm64_pcpu[cpu] = NULL; + return (0); } @@ -588,5 +594,7 @@ pmc_arm64_initialize(void) void pmc_arm64_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "arm64-finalize"); + free(arm64_pcpu, M_PMC); } From nobody Mon Sep 11 22:44:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x66LQpz4sZkL; Mon, 11 Sep 2023 22:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1x640dPz4Hml; Mon, 11 Sep 2023 22:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8lPO/SpbDq2wdt+5GrCnGX4+vuGTfNTeqVg/VxVD7c=; b=gKTbsdUvma1NwU9hNBWOIZAaDoZ94Z1l1Q1tHLrRs2kncAxlA77VHt31t0jT2IomLyGfs5 6EdFxHPonPr2KfthuweWqRYpHms/wIiyHqslyYdo8ueIs/RFU6CPuqVrDABm7F0dAAsLET TRZyAIcs3qyGaEdEqj+4u05mBd06YPt3J4a5vd6v2H+ebLhranJCA6ir1UkW0qDJjSHiYR pMpBuVQqafdzWLuuiiDw7swq56IgsuWc3G3yArH/d2dKXcWRdbVHUqmAfnpAl7C4bhSTvD v1KdK5nA8DEZbex0bNZAD4yCrDRRadG3i7LiykGzkesDtX2f++IzZKPiK7CliQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472266; a=rsa-sha256; cv=none; b=rx98RGNuxk3XoHunq+/YtZtpadja7428KrRtLGRyGpGLFxYNFY7b/4cLS1/200RyKN5mOh Fxvwp0jewLOkgdt6t2zhJ80IiqFTRYODPXQetbSygzjOh86RKiVWuYTkFZ5SHsBiRCkSdn CXDcm87K4JlZpBjECqjZ84J2cc2fUXZenWJbShy4ULAHAzVEG4TFAvH9PebL59S5WajAnw f48DgJNrqtZFrzwOPJsz0H4gMnnhFBIWd0B2DqLFrA4UogQcbijEqMf6TyLHC1A8DK9t+b E6uhX9RwTeO9NVwofG1cN1dSU/NwTx1CRkAuflL2m+EjugJynN1KwjI5csC+3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8lPO/SpbDq2wdt+5GrCnGX4+vuGTfNTeqVg/VxVD7c=; b=Y6YRD3PKnsw3Ig4hsc84M2mzKCXpODGiPW1WqLaEMTyaAsA6Lb7hr4FirZFW1FvcNgdJ0I nN9rdp7y1+HODtpcarfx3UTpL51I6T+o9Z4XbFocwtOzSAuLCd4y6QAx6pALt90SY4xihe W0tgpBKzC9IJiNc7dT2JR6K7FkgaOglnPEwTvPH4vvHm6bmb/FX7N7uN1lVNsa6CrYZ2yz Jv44nbALNAh8OrSrRW0UZQ2+e3baKfpexorjxw25kEPg74pcqE622Xxk/iOcxeRUJpm/Mf 95zaC6L8v2Dp/cM+EElsClauR9IGCVUWkMNUzsxq85mTgt+KdqYw1YPN+fXNvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x630pXz16h2; Mon, 11 Sep 2023 22:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiQpo073969; Mon, 11 Sep 2023 22:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiQP8073966; Mon, 11 Sep 2023 22:44:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:26 GMT Message-Id: <202309112244.38BMiQP8073966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9f66a42db74e - stable/13 - hwpmc_armv7: plug memory leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f66a42db74ed703f4b590d3e8037ba982f2af20 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9f66a42db74ed703f4b590d3e8037ba982f2af20 commit 9f66a42db74ed703f4b590d3e8037ba982f2af20 Author: Mitchell Horne AuthorDate: 2023-08-03 14:10:26 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:43:59 +0000 hwpmc_armv7: plug memory leak Free allocated per-CPU structures in the pcpu_fini and finalize methods. While here, add debug trace entries to these methods. Reviewed by: jkoshy, andrew MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41269 (cherry picked from commit 9c0a2d522f3a18fc795a7dd6266d2be2aff4b084) --- sys/dev/hwpmc/hwpmc_armv7.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index fb4292792bb9..43c662dfcd39 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -417,7 +417,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[armv7,%d] wrong cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP, INI, 1, "armv7-init cpu=%d", cpu); + PMCDBG0(MDP, INI, 1, "armv7-pcpu-init"); armv7_pcpu[cpu] = pac = malloc(sizeof(struct armv7_cpu), M_PMC, M_WAITOK|M_ZERO); @@ -453,6 +453,8 @@ armv7_pcpu_fini(struct pmc_mdep *md, int cpu) { uint32_t pmnc; + PMCDBG0(MDP, INI, 1, "armv7-pcpu-fini"); + pmnc = cp15_pmcr_get(); pmnc &= ~ARMV7_PMNC_ENABLE; cp15_pmcr_set(pmnc); @@ -462,6 +464,10 @@ armv7_pcpu_fini(struct pmc_mdep *md, int cpu) cp15_pminten_clr(pmnc); cp15_pmovsr_set(pmnc); + free(armv7_pcpu[cpu]->pc_armv7pmcs, M_PMC); + free(armv7_pcpu[cpu], M_PMC); + armv7_pcpu[cpu] = NULL; + return 0; } @@ -532,5 +538,7 @@ pmc_armv7_initialize(void) void pmc_armv7_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "armv7-finalize"); + free(armv7_pcpu, M_PMC); } From nobody Mon Sep 11 23:36:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl3591zTwz4t8HB; Mon, 11 Sep 2023 23:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl3591X5Bz4ZLr; Mon, 11 Sep 2023 23:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694475389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOoBbOL2DqHHCur+ZHFl82IaQlpifIlZtVCT79icGjY=; b=FsTy2D8IPIyZkGmaZHKvyDdi39m7vjMnnhjvgYTr7LIM62T4lr3MLhLA5nWo+8VkXU0VSh NNwu/oz8XkgsFRvkYV/XLkchjI6QbAeom2uM+Fm7Cmu843w8B2e6ve+seshnq2IwU70FHd RnJ93lv61J3WkxzDtyzXmR+kuksTldA5XHEBeNPilGV1kg/8dm1ltSA6ScgkG3A0EQR92P OfHpQZWPx2e7BH3YcmcPJkmExBzZfx5R3vaJ0YAqzth2eYZiyNLmx585GwDlXbYueL1Mk2 1+2BQ3UmT+Z9NHWrqu60mwM3akdNVcakqIerzSW3+m32QJmYjlcIEVZswRLxKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694475389; a=rsa-sha256; cv=none; b=vnarofGas/ViCX2O/mD9Bc1EVgy0piSR6nzfGIpT5a89OC9QRE2yGu4Ip3zA4I58zIrZd9 r8ks6py0aItiV9gz8OQPeMIq8YA6AbxnEErgDGkzWC3enFwJR/TFP/rn8iWA7W3fi0THjI ATuoyuXYpaYa8Wc3h4Sfqvl/dCdLInd+6s1SYxOXalPFVNyGTWiimu7aTyLWqRBXyPn514 KVSFlYYYYb2E+VjHkWt+JCv5lz2BL2AwUcOtEWZeFv4m2X7wl78X9fWZF2NrWaATvHhctS ghiOeqhjuaXDSCJeX8bHhxm2SHJVMJx2HRePRbRH5hVD+/LvnZ33NhYWY6nRJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694475389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOoBbOL2DqHHCur+ZHFl82IaQlpifIlZtVCT79icGjY=; b=ogOvBxuh35d61v1fZWvwfVT99NRWnZIL5jBCyypGiWlt9PvtgRR+zZ588ZPXywXqpWbwKM 8ktGloXWVQjrvhumlUlVdLY4HRPERInhJXbb3+C8pG4/VqghaP2g353MI0kIVkbmKgHw4x 2t6XGSBjLO0u/44SqXx3tT+bhqEUaLVW6ALYs1ZenPt1RFFtCIhF0vtI3tQ1eNo2uC8NDT ljdfWiH0k/zPm0wRd2l09EQCQ7bVFTGPwSGSCi2DPhqg2IjBhoK2kw4Krisek5TIJQwWXf NLYTegs25cVmwG3mKHRBg0iSTGFLgoEHrFRIjsX24eDZwprgZkSY8z2oy3ZMPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl3590bNNz17Hg; Mon, 11 Sep 2023 23:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BNaSVV057021; Mon, 11 Sep 2023 23:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BNaSJX057018; Mon, 11 Sep 2023 23:36:28 GMT (envelope-from git) Date: Mon, 11 Sep 2023 23:36:28 GMT Message-Id: <202309112336.38BNaSJX057018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 34cffc25b720 - releng/14.0 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 34cffc25b7207331e104dc561bdd2097fef6e661 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=34cffc25b7207331e104dc561bdd2097fef6e661 commit 34cffc25b7207331e104dc561bdd2097fef6e661 Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 23:35:58 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) (cherry picked from commit 2f269a3532b279a215d527ef67949ff020476e8c) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Tue Sep 12 01:49:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl62X47l9z4sWMd; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl62X3dTPz3S8S; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694483364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=wxqNlgwxbFo8/ShT5Pt56Emqnt90Ab3tV/Ve1jc2KU7UN56KW0tpCOUiTkH0f/NO5ZDUl0 tuw78A1uIUyr+tVXsTtxrUYmm6qd1Q1HpUKTT7MMvKI5ENkm5AyQFWCSmMyid/Ag8bs54B i6nv+jDGHOpDYCJv6j00ue0vCIV2jZG0uyLoMruquibtf6Og8trsYJ6OePfQAofuC1TDfs WYBwxherTRfYapVUfREeAKkGLTPCkPB5MdxA6yK+qjGCGeC+V24FoGEPzpZ8E4/jpdt9GA q8MTfj9q0DGBzWXAxOy8cmN2OTRswnashrx08UeD5rO0dczB6150nxGWZKLG5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694483364; a=rsa-sha256; cv=none; b=s2gClYaZxew10JRtv24BN+xsAs9o2le9VxDiOlMXh4/SyKjpjIPfeQplJpDyK6cKYqDOBj KIH9BFkx/4LdaUyj22u2JbtV1qlTwKE+zXTVK/jX4MpTduH/a8+IyWg5XJL+EVAwCVXEe+ VS1wUC4rIuQ9YxBp1/enroQqotTxkR1SAwMMeROoWtw/Go7Bhw06HY/9/irUSycPpwszkb vlz3KucjmfOkqOglgBMD0TZ+o1lw/lZHHNkf1bO4VrAvLA2JM9HDXJQxdTMyqz28YM/5Lv ozDuDvbNG5wl4nOpIldtQl8aw07GTZG6NGR26uAUvLQtNv2y/yRU4xsisNaHJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694483364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=qUaolr1Cx54q/z9LrTPXZTFNIfDLfeyjN6cO8eEJxDGvkmsK+0qWKQs0uQhCLKxE9ewGXF 8mc2ZikxXyfAuN0lBjHHsNVBWw/vMmPdf2q/v+ClU2+jFug3KLXtI98Trh0MxMNf28XzBI J2kc2ilP9hVb64S34UerNugKF2lAh20QLiH8KKzdCDpp4bpBCsHEQ5XkrDWNPHmPSe4amW juoToZbizLLUs1lv00gwT7fXUDk8wp3O1e2l1S/Qe3DV7dyYp9LfYBAYFiUAREpyE07oht IrRd+uxkSIAp6PWMRqgjZwCAS7Z+DdG5xxqOuXoVkRxLa3tVZy7I6kevEwYuAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl62X2kB5z1Bsn; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C1nORx072563; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C1nO97072561; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git) Date: Tue, 12 Sep 2023 01:49:24 GMT Message-Id: <202309120149.38C1nO97072561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 380f42e2ed36 - releng/14.0 - stand: lua: module names should permit more List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 380f42e2ed3627d47696a1409a1a3ea07aebff17 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=380f42e2ed3627d47696a1409a1a3ea07aebff17 commit 380f42e2ed3627d47696a1409a1a3ea07aebff17 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-12 01:48:51 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ Approved by: re (gjb) (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) (cherry picked from commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Tue Sep 12 03:41:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl8XB5Tptz4tSYD; Tue, 12 Sep 2023 03:41: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 4Rl8XB4h5Bz4Syg; Tue, 12 Sep 2023 03:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694490106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+8OJjgghTyTC0wT1cyZcwvwNeGj/FdiCLUlTTIuGwo=; b=aaZuJgyTl7NDDnTqolyDDhBst/xlC6xEOqOGdJgbpkycnjK8Lwu/ir/WG7p34ZfaF17q+p fqqSCBMiwE2Mo4D23WUgGe1bB7yARQpu33klByziSWDmFxvFxdm1mQub/uhKh8JXvDgiMN Lj56129PTDcxVmONOIXReJ0UVA7hUdUjMZcctXi1jMOoKFuFU5CEJF0zzP8CKNpWqzsM7U q6pNxYqtgQiRPhL3NIFETMJ1fHEhKaQUN3AM7dDG0uU9MIlrMVZ3EpkEhMiJHNkSDKO/1f fzGL+kWX1balme89Vh2AEPgmlF/Da4sZ/5NubZ+3PRB3XIllieFDrbHg0oGwKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694490106; a=rsa-sha256; cv=none; b=u1bIV/+q7poBXkcrDW9hjAbeHfC11EQ/43K1LniKiWooohonoGFcPRmkucVlD3ANmI6app qV+jSnuLarmcWHQFQeI7V1uvjDoB+xF3Lb2L+9LWSQGjgGGdkib8LpPX+DgVyW6nfQhKTf A3R8BROcwPPfcS2vwap/k0bPbqFhHTjoBm4fC21YggsuyFmtPWd4KH+/HePYT6khI1mOrG Aau8hwsOYNkuDIhUh9oNOYE7wTx9mQZB6FilKUAZVu0lnLt2a585Svks4WRt0q9xqudyaC 0R/xUosH4IeWccu8O9YJimA8clReTtlAbx4XLg6ODxBkFuNHRjCawNYkh5mf8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694490106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+8OJjgghTyTC0wT1cyZcwvwNeGj/FdiCLUlTTIuGwo=; b=ZwQCPQbhl6tOmJylmc4zfBcvgU7Ay5m5aX5lSLo/sAjLr1fNOozS+KBirZN68kZl2MQ4Q8 6kdueOQgjr01H3GL5XWosPLvruBmyLYNrTl/UAe9+/Es8qd4fY5BZR6T/2fQq6hyaCsQ1u oFOCpNunhxQHwJXqHmk8W2fvVqErjGfeDjamCJ5ygvKXDhR2ijqMWdKC9dOOFnrTS4NfkV VkXRtIXICi+KJZ9m/+r2HTvYCUxCIrbsy6b5QrH7RHJmcgZnjdiI/V5wDA8DozJucgZd4u DNxK0l+2ATE37P/xEq7DAPgtkRc55beFqYRzECChl/XhF/MzqZeqUFB2Kzg+jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl8XB3n3Vz1kR; Tue, 12 Sep 2023 03:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C3fkZ4070756; Tue, 12 Sep 2023 03:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C3fkuE070753; Tue, 12 Sep 2023 03:41:46 GMT (envelope-from git) Date: Tue, 12 Sep 2023 03:41:46 GMT Message-Id: <202309120341.38C3fkuE070753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 52d4a4d4e0de - main - lib/libc/amd64/string/strcspn.S: fix behaviour with sets of 17--32 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52d4a4d4e0dedc72bc33082a3f84c2d0fd6f2cbb Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=52d4a4d4e0dedc72bc33082a3f84c2d0fd6f2cbb commit 52d4a4d4e0dedc72bc33082a3f84c2d0fd6f2cbb Author: Robert Clausecker AuthorDate: 2023-09-11 23:56:30 +0000 Commit: Robert Clausecker CommitDate: 2023-09-12 02:58:43 +0000 lib/libc/amd64/string/strcspn.S: fix behaviour with sets of 17--32 When a string is matched against a set of 17--32 characters, each chunk of the string is matched first against the first 16 characters of the set and then against the remaining characters. We also check at the same time if the string has a nul byte in the current chunk, terminating the search if it does. Due to misconceived logic, the order of checks was "first half of set, nul byte, second half of set", meaning that a match with the second half of the set was ignored when the string ended in the same 16 bytes. Reverse the order of checks to fix this problem. Sponsored by: The FreeBSD Foundation Approved by: mjg (blanket, via IRC) MFC after: 1 week MFC to: stable/14 --- lib/libc/amd64/string/strcspn.S | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/libc/amd64/string/strcspn.S b/lib/libc/amd64/string/strcspn.S index de409db6d472..53100eeea9a5 100644 --- a/lib/libc/amd64/string/strcspn.S +++ b/lib/libc/amd64/string/strcspn.S @@ -259,27 +259,32 @@ ARCHENTRY(strcspn, x86_64_v2) movdqu 48(%rsp, %rcx, 1), %xmm3 # second part of set /* set is 17--32 bytes in size */ - pcmpistri $0, %xmm0, %xmm2 # match in head? - jbe .Lheadmatchv2 - pcmpistri $0, %xmm0, %xmm3 # ZF=1 not possible here + pcmpistri $0, %xmm0, %xmm2 # match in first set half? jb .Lheadmatchv2 + pcmpistri $0, %xmm0, %xmm3 # match in second set half or end of string? + jbe .Lheadmatchv2 ALIGN_TEXT 0: movdqa (%rax), %xmm0 pcmpistri $0, %xmm0, %xmm2 - jbe 1b + jb 2f # match in first set half? pcmpistri $0, %xmm0, %xmm3 - jb 1f # ZF=1 not possible here + jbe 1f # match in second set half or end of string? movdqa 16(%rax), %xmm0 add $32, %rax pcmpistri $0, %xmm0, %xmm2 - jbe 3b + jb 3f # match in first set half? pcmpistri $0, %xmm0, %xmm3 - jae 0b # ZF=1 not possible here + ja 0b # neither match in 2nd half nor string end? - sub $16, %rax # go back to second half -1: add %rcx, %rax - sub %rdi, %rax +3: lea -16(%rax), %rax # go back to second half +1: jc 2f # jump if match found + pxor %xmm1, %xmm1 + pcmpeqb %xmm1, %xmm0 # where is the NUL byte? + pmovmskb %xmm0, %ecx + tzcnt %ecx, %ecx # location of NUL byte in (%rax) +2: sub %rdi, %rax # offset of %xmm0 from beginning of string + add %rcx, %rax # prefix length before match/NUL leave ret From nobody Tue Sep 12 06:28:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlDD83QL4z4swfl; Tue, 12 Sep 2023 06:28: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 4RlDD82pgrz4M6n; Tue, 12 Sep 2023 06:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694500088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+uwhrrihibYX5hDWFin8HlESoqLRlzzJiaxFdSAO6hk=; b=ngejUKw4Z+p7h9doC5YzWFa2qb457xQXvmgb1RljuzRLpF7VzetA8AlOD1HllzP1KYRstI NH+pRDHm78qfEtQiO5WnuLw4eHKZgXyiUF59SnavNY5gM8tmKIgWKDvRkI/XsoY2g/52U2 V5yLqC93hzWEiiL1JK8VELQPnCDIkBI9NmWIe+w/O/Ra/QkGgrkBC7zrNB7BWqJrcaVisw B3Pg50DPnBneqJa0yV5k6aZnuiQIplolsZlq71tLKK/bDAoODWCcuU6LUVJw6vaAXZ7OxF VrGUTiIE4K3b/LXYdC9jFLfKpMwm5UrMvGo5XzycNs7ewIZaDI4F3w2iS/ZFKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694500088; a=rsa-sha256; cv=none; b=uOagV5RUu3o/rK6INZeBlpEKXZJElWqvyvosqZtNo3E7VhZ3CjlLpYaAGQlMx6FWjmFyu5 T9Jkg4yUuetlHtKCIP5M5wEdNv8tYEOuMLGe95VfAvrus/X82Q5UswVAJqy8XprnCvg6Yw 9d08s4UcI3HaZ7g1zkNIBDguNS14d4hS+qveJUKMKKS5iEp6oqmNmRfoZSVpIJVGEfZ7fw 9e1tNzAb5wKclYibY0BVlZzA5WCzjyqSZ3apQ3YcwEZ/7uyopUFgG8nwEo0OKvaO76alt9 15BFaG8iO0cY5jZLF+A8SplvGUJEdnSwGSjRkxOb8c0dkiU7RpAqQd3lDd7V9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694500088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+uwhrrihibYX5hDWFin8HlESoqLRlzzJiaxFdSAO6hk=; b=qjGqmD1DaDCV/I65PH+7tQdnkDRYU1zHUjjT1jINvvszXVZ6I2KCWOQTkkCD2qvleCXW0x VALCrHSld2jY06RWok96rOU5oFVmAHNCL0WWdtyM9y6xyr17jeMpi0Ty6EilbPT59jpoe5 ieCGT3fWJH4uo6vtB3wQqxyF/+L4ioxdtQvN/3+0ZxbPzUsZ2REQsxAFgZK4Ww6Fz+icks 2wuFgpt1z/HSoiFUVAWXHtDyWKZhPLse/+J/Rh8kAkvnhKmTLmSjuTRF/8wxNv/wmE9FD5 sNyzb2jk9FhnzuAKNRWBjVeAa3rAaJBVI753Ss7/Z7kjyb9wiyqyxfJ5atXOKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlDD81vZCz5qB; Tue, 12 Sep 2023 06:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C6S8ov038742; Tue, 12 Sep 2023 06:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C6S8n6038739; Tue, 12 Sep 2023 06:28:08 GMT (envelope-from git) Date: Tue, 12 Sep 2023 06:28:08 GMT Message-Id: <202309120628.38C6S8n6038739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 90474518912f - main - Disable byteswap.h for now. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90474518912f5e5f49bc5325b7f88e94eba64d6a Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=90474518912f5e5f49bc5325b7f88e94eba64d6a commit 90474518912f5e5f49bc5325b7f88e94eba64d6a Author: Xin LI AuthorDate: 2023-09-12 06:24:08 +0000 Commit: Xin LI CommitDate: 2023-09-12 06:24:08 +0000 Disable byteswap.h for now. Ideally we should be testing __FreeBSD_version (1400079) and/or BOOTSTRAPPING from an older version, but restore compatibility to older FreeBSD versions and macOS while we find out a better way to fix it. --- lib/libmagic/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index b842859fc2ab..232d801a6512 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -20,7 +20,7 @@ #define HAVE_ASPRINTF 1 /* Define to 1 if you have the header file. */ -#define HAVE_BYTESWAP_H 1 +/* #undef HAVE_BYTESWAP_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_BZLIB_H */ From nobody Tue Sep 12 06:44:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlDb21P8hz4t6DV; Tue, 12 Sep 2023 06:44: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 4RlDb20yZqz4V5L; Tue, 12 Sep 2023 06:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694501070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gcmahwwtLiWSvEXotIDsF3W/wv+4YuOwlueMJG1fpk=; b=ck9CRWQP5JnWlBLM0LdBPTj2iKjI+EVSZ3UmnhYA5CIvIAKxEP8WQeOylYaZHdB0uh6bRd n/n6k+PD1yZ0EdeDetNSTc/x8o4WAtjatVPQONZS3i8Li8JyxkZWU9PP1iZgY9s/8wisqm oZW5pSZoy69HhIsOQZBsT1zAZQi2qw8RY3rmXG5fIf5Xbjf/9F+yBvGyEQfH19fPNsS5re njfMyT7QNQETSTjOz8ticyM6MGSLGoHzQYgmlFj8l9+GBiaLlBlbDgiBHxf0CoLHE0w4cl KXZLVZ1JVCm7jtwWrW6VNe/z4jmOGx2b/69GgLAUA9WR16ZwgeWw/eSXHS1+oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694501070; a=rsa-sha256; cv=none; b=fqQiHXEB/FCLPesY6J4KHryzhKsDZfNSIJ2ux4w6KRhCVbbHGI5bOhAPJluk1gibgHcAFd zBVFBvKOpWIYIMNOYYj8TJZclo2K/4klNbsymSrlnJiJ0jsb2ns5XMomxuuVu2M0kdJnHN 7/sZtgAMHLv+pEL1bwc3jwCnie6VU/yWBLQ6F5Snw4n+IEgT42vO5EtxpbF8ezQwlsoaAe rHQAc3Q0uol6ttbAn5/NIpQyKQw3xRw/w20ppXOcR8AWPl4vZBPGTgaTLV9BI8jHsb6m6M P90tedhuq5Z+zwQqDBn3XEWDt8W+j6YR9WXP5XIel1/i6fqgkzahGZcdCvV6Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694501070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gcmahwwtLiWSvEXotIDsF3W/wv+4YuOwlueMJG1fpk=; b=diYZITeDG1EIRqdknPNhIt7npVRS3v9cXmH4y+3HHGAYhZA+duaB5eSVyqLPTE9CpLJzHu 2LAEDQjNFYNnsuv2pHmVIjJry+Djnm4bZknQYvJkdPdPALlVCfni1yL9juMrUoiSF+M9s/ MZhAqV+UJxUTtKgXsGdiyYRP8GjrSJvLqwX+2BuseN1JJieOmhGrW5Be4TtRLg0AqGmhEL K0aWWFk5WLMkhRHjL5ZUI8+GH5lqe2+SbmtXUxQkTxAxulRoWcN752QpBQhF1YpMxotGgN zS12LvrNC+Qr58CpZhK51aSymJuPdXKl4YIkr8PqjFxHRxZh6zn5eBlwiNOSkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlDb2039fz6n4; Tue, 12 Sep 2023 06:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C6iT6u071903; Tue, 12 Sep 2023 06:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C6iT1T071900; Tue, 12 Sep 2023 06:44:29 GMT (envelope-from git) Date: Tue, 12 Sep 2023 06:44:29 GMT Message-Id: <202309120644.38C6iT1T071900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: e47a47b2150f - main - no trailing dot (".") for FreeBSD releases PR: 273690 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e47a47b2150f86216e6eca666d902ce20bd5031a Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e47a47b2150f86216e6eca666d902ce20bd5031a commit e47a47b2150f86216e6eca666d902ce20bd5031a Author: Wolfram Schneider AuthorDate: 2023-09-12 06:42:47 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-12 06:42:47 +0000 no trailing dot (".") for FreeBSD releases PR: 273690 --- share/man/man4/atopcase.4 | 2 +- share/man/man4/hconf.4 | 2 +- share/man/man4/hcons.4 | 2 +- share/man/man4/hgame.4 | 2 +- share/man/man4/hidbus.4 | 2 +- share/man/man4/hpen.4 | 2 +- share/man/man4/hsctrl.4 | 2 +- share/man/man4/iichid.4 | 2 +- share/man/man4/man4.powerpc/llan.4 | 2 +- share/man/man4/ps4dshock.4 | 2 +- share/man/man4/usbhid.4 | 2 +- share/man/man4/xb360gp.4 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man4/atopcase.4 b/share/man/man4/atopcase.4 index fc93b7094466..33e47ec64ee8 100644 --- a/share/man/man4/atopcase.4 +++ b/share/man/man4/atopcase.4 @@ -108,7 +108,7 @@ device node. The .Nm driver first appeared in -.Fx 14.0. +.Fx 14.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hconf.4 b/share/man/man4/hconf.4 index b271434698d9..179d95a29832 100644 --- a/share/man/man4/hconf.4 +++ b/share/man/man4/hconf.4 @@ -77,7 +77,7 @@ Default is 0. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hcons.4 b/share/man/man4/hcons.4 index 993425e5773e..6cdf0a7dc170 100644 --- a/share/man/man4/hcons.4 +++ b/share/man/man4/hcons.4 @@ -87,7 +87,7 @@ input event device node. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index 58f09e8f4d50..3309833c1720 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -91,7 +91,7 @@ input event device node. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hidbus.4 b/share/man/man4/hidbus.4 index 8593d1d2c222..f8ebaca8d659 100644 --- a/share/man/man4/hidbus.4 +++ b/share/man/man4/hidbus.4 @@ -91,7 +91,7 @@ Default is 0. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hpen.4 b/share/man/man4/hpen.4 index 64f4200b3b21..d3b69ff1b332 100644 --- a/share/man/man4/hpen.4 +++ b/share/man/man4/hpen.4 @@ -98,7 +98,7 @@ Pen battery charge level reporting is not supported. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/hsctrl.4 b/share/man/man4/hsctrl.4 index 64db32f09d41..fa8ae897e64c 100644 --- a/share/man/man4/hsctrl.4 +++ b/share/man/man4/hsctrl.4 @@ -87,7 +87,7 @@ input event device node. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/iichid.4 b/share/man/man4/iichid.4 index 62af1e57c6cc..02a91d7811a2 100644 --- a/share/man/man4/iichid.4 +++ b/share/man/man4/iichid.4 @@ -80,7 +80,7 @@ variables for tuning of sampling parameters. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/man4.powerpc/llan.4 b/share/man/man4/man4.powerpc/llan.4 index 45f08e7478d1..c32ddbca6a00 100644 --- a/share/man/man4/man4.powerpc/llan.4 +++ b/share/man/man4/man4.powerpc/llan.4 @@ -50,7 +50,7 @@ but these are not currently supported by the driver. The .Nm device driver appeared in -.Fx 10.0. +.Fx 10.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/ps4dshock.4 b/share/man/man4/ps4dshock.4 index a6d0df87af76..282a58c49e63 100644 --- a/share/man/man4/ps4dshock.4 +++ b/share/man/man4/ps4dshock.4 @@ -98,7 +98,7 @@ does not support force-feedback events. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/usbhid.4 b/share/man/man4/usbhid.4 index 156f53a051ea..c47afaff3534 100644 --- a/share/man/man4/usbhid.4 +++ b/share/man/man4/usbhid.4 @@ -75,7 +75,7 @@ Default is 0. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/xb360gp.4 b/share/man/man4/xb360gp.4 index a08063bef42d..4e8d4b65fcfd 100644 --- a/share/man/man4/xb360gp.4 +++ b/share/man/man4/xb360gp.4 @@ -84,7 +84,7 @@ input event device node. The .Nm driver first appeared in -.Fx 13.0. +.Fx 13.0 . .Sh AUTHORS .An -nosplit The From nobody Tue Sep 12 07:45:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlFxN6RGQz4tf3c; Tue, 12 Sep 2023 07: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 4RlFxN6FWZz3L6m; Tue, 12 Sep 2023 07: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=1694504728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i+gssaAm0IsdcfugEUZzTVMvRQTdZ4uMJ7z0uEKvD9s=; b=jdkzr2BtQbO2kZhRUBQmphMn2T2vuYrxWOce3ZynjMxsvFlSHk2iSRxasgTzT+Im3CARqG dX2AlwqT8DrAaqgcJQ4/4eUJd5C0zdCXxblkyzua4IbfMK6b4A7tw/SACyTP1/vulztoKL nChVs1lwG9ZoYd6OzBL90wkVKeX3kecbul4T8Do48QLIFJyQ+cw7vwTR4V0gbzThzZ8lwW UBfhONSBOTaY5kfQ6bTDAeBlJIhSL0+9kQkyA5z3a4SUuwQ02i9IFPo4895OIgGeqbD87u /QVFOT43F+HU1DZm+Sy/ch5/k1dXrCeAbeY+eQSduhRydppEoZDHj7D8yMAvKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504728; a=rsa-sha256; cv=none; b=XcWjfJ7DAMsZXlAsYRZMi1gjEti9ATFtw7BF3yabsXLDzpwnDx8Saxic45QC55j8/c8o+h VGLe+FGPvDuNAybKlZQwcxDvZRxTg8dbX76fu28fwPnIlLxoD/w02bwJx13WZ7hi4YqZSs GKKMPcuQ/Wwi0YV9g8YTV6aMI7b6iTPuuU98VjlBYY553+L4Y3FXPuBDwKkLwVos71dLck SrkTexIakrmnjtZTsyxOreiqdHo7hM24C8k7M4g7ORlXn6Q+PoT0P5FPak02tZFciN85IW GQEeJp0YRvEX7IW4G9S+rtOBJAoZISrwgib8kmpa8T3Qr9Um9rUeUKRj+tgYwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i+gssaAm0IsdcfugEUZzTVMvRQTdZ4uMJ7z0uEKvD9s=; b=qA3s1b8iBbjREtZcfXlL//gVi1u/uxb29eDiWQSqzQ593pNAMdM619p07tF7YGqx8LV0as OEQRMitENe1HcwWjDEAw4Uvc8bar5+p0dhOBQtv/rBtqkQiVl1mr4nsX6sfUpz6ewiMWRy Bp37ctTPuof+Y3m7ARlG3vTtQIOhXEYUjEZsIZ48t37mfQ9wJvqzeIXwzwOVM6R3g9dSEn DHOAWKqvKPutjL29cRY36MAHCo36Kr75Yn6S3+SMH8a65zeh5olusZ7wSSxjlLb1zrta13 NaCQd1MWCmwpf+JqAu7SWWmwOwMp0Y+SEKLhg6OCKaRizeB/58t/bbSTYvLmew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlFxN5JDfz86x; Tue, 12 Sep 2023 07:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C7jSmM071510; Tue, 12 Sep 2023 07:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7jSmp071507; Tue, 12 Sep 2023 07:45:28 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:45:28 GMT Message-Id: <202309120745.38C7jSmp071507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 429c871dddda - main - radix_trie: have vm_radix use pctrie code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5 commit 429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5 Author: Doug Moore AuthorDate: 2023-09-12 07:42:38 +0000 Commit: Doug Moore CommitDate: 2023-09-12 07:42:38 +0000 radix_trie: have vm_radix use pctrie code Implement everything currently in vm_radix.c with calls to functions in subr_pctrie.c, asccessed via the interface provided by the DEFINE_PCTRIE_SMR macro. Add back some #includes removed in the first attempt, and avoid the use of a discontinued type in a bit of conditionally compiled code. Reviewed by: alc, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D41344 --- sys/vm/_vm_radix.h | 9 +- sys/vm/vm_radix.c | 692 +---------------------------------------------------- sys/vm/vm_radix.h | 114 +++++++-- 3 files changed, 111 insertions(+), 704 deletions(-) diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h index 01eb25a9dccf..2d9b05c7b52a 100644 --- a/sys/vm/_vm_radix.h +++ b/sys/vm/_vm_radix.h @@ -31,16 +31,13 @@ #ifndef __VM_RADIX_H_ #define __VM_RADIX_H_ -/* - * Radix tree node. - */ -struct vm_radix_node; +#include /* - * Radix tree root. + * Radix tree */ struct vm_radix { - struct vm_radix_node *rt_root; + struct pctrie rt_trie; }; #endif /* !__VM_RADIX_H_ */ diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 768a56ed76f7..57c39d8d89d7 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -64,292 +65,21 @@ #include #include -#include -#include -#include #include -#ifdef DDB -#include -#endif - -/* - * These widths should allow the pointers to a node's children to fit within - * a single cache line. The extra levels from a narrow width should not be - * a problem thanks to path compression. - */ -#ifdef __LP64__ -#define VM_RADIX_WIDTH 4 -#else -#define VM_RADIX_WIDTH 3 -#endif - -#define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) -#define VM_RADIX_MASK (VM_RADIX_COUNT - 1) -#define VM_RADIX_LIMIT \ - (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) - -#if VM_RADIX_WIDTH == 3 -typedef uint8_t rn_popmap_t; -#elif VM_RADIX_WIDTH == 4 -typedef uint16_t rn_popmap_t; -#elif VM_RADIX_WIDTH == 5 -typedef uint32_t rn_popmap_t; -#else -#error Unsupported width -#endif -_Static_assert(sizeof(rn_popmap_t) <= sizeof(int), - "rn_popmap_t too wide"); - -/* Set of all flag bits stored in node pointers. */ -#define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) -#define VM_RADIX_PAD VM_RADIX_FLAGS - -enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; - -struct vm_radix_node; -typedef SMR_POINTER(struct vm_radix_node *) smrnode_t; - -struct vm_radix_node { - vm_pindex_t rn_owner; /* Owner of record. */ - rn_popmap_t rn_popmap; /* Valid children. */ - uint8_t rn_clev; /* Level * WIDTH. */ - smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ -}; - static uma_zone_t vm_radix_node_zone; -static smr_t vm_radix_smr; - -static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, - enum vm_radix_access access); - -/* - * Map index to an array position for the children of rnode, - */ -static __inline int -vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) -{ - return ((index >> rnode->rn_clev) & VM_RADIX_MASK); -} - -/* - * Returns true if index does not belong to the specified rnode. Otherwise, - * sets slot value, and returns false. - */ -static __inline bool -vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t index, int *slot) -{ - index = (index - rnode->rn_owner) >> rnode->rn_clev; - if (index >= VM_RADIX_COUNT) - return (true); - *slot = index; - return (false); -} - -/* - * Allocate a radix node. - */ -static struct vm_radix_node * -vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) -{ - struct vm_radix_node *rnode; - - rnode = uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT); - if (rnode == NULL) - return (NULL); - - /* - * We want to clear the last child pointer after the final section - * has exited so lookup can not return false negatives. It is done - * here because it will be cache-cold in the dtor callback. - */ - if (rnode->rn_popmap != 0) { - vm_radix_node_store(&rnode->rn_child[ffs(rnode->rn_popmap) - 1], - VM_RADIX_NULL, UNSERIALIZED); - rnode->rn_popmap = 0; - } - - /* - * From the highest-order bit where the indexes differ, - * compute the highest level in the trie where they differ. Then, - * compute the least index of this subtrie. - */ - KASSERT(index != newind, ("%s: passing the same key value %jx", - __func__, (uintmax_t)index)); - _Static_assert(sizeof(long long) >= sizeof(vm_pindex_t), - "vm_pindex_t too wide"); - _Static_assert(sizeof(vm_pindex_t) * NBBY <= - (1 << (sizeof(rnode->rn_clev) * NBBY)), "rn_clev too narrow"); - rnode->rn_clev = rounddown(flsll(index ^ newind) - 1, VM_RADIX_WIDTH); - rnode->rn_owner = VM_RADIX_COUNT; - rnode->rn_owner = index & -(rnode->rn_owner << rnode->rn_clev); - return (rnode); -} - -/* - * Free radix node. - */ -static __inline void -vm_radix_node_put(struct vm_radix_node *rnode) -{ -#ifdef INVARIANTS - int slot; - - KASSERT(powerof2(rnode->rn_popmap), - ("vm_radix_node_put: rnode %p has too many children %04x", rnode, - rnode->rn_popmap)); - for (slot = 0; slot < VM_RADIX_COUNT; slot++) { - if ((rnode->rn_popmap & (1 << slot)) != 0) - continue; - KASSERT(smr_unserialized_load(&rnode->rn_child[slot], true) == - VM_RADIX_NULL, - ("vm_radix_node_put: rnode %p has a child", rnode)); - } -#endif - uma_zfree_smr(vm_radix_node_zone, rnode); -} - -/* - * Fetch a node pointer from a slot in another node. - */ -static __inline struct vm_radix_node * -vm_radix_node_load(smrnode_t *p, enum vm_radix_access access) -{ - - switch (access) { - case UNSERIALIZED: - return (smr_unserialized_load(p, true)); - case LOCKED: - return (smr_serialized_load(p, true)); - case SMR: - return (smr_entered_load(p, vm_radix_smr)); - } - __assert_unreachable(); -} - -static __inline void -vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, - enum vm_radix_access access) -{ - - switch (access) { - case UNSERIALIZED: - smr_unserialized_store(p, v, true); - break; - case LOCKED: - smr_serialized_store(p, v, true); - break; - case SMR: - panic("vm_radix_node_store: Not supported in smr section."); - } -} - -/* - * Get the root node for a radix tree. - */ -static __inline struct vm_radix_node * -vm_radix_root_load(struct vm_radix *rtree, enum vm_radix_access access) -{ +smr_t vm_radix_smr; - return (vm_radix_node_load((smrnode_t *)&rtree->rt_root, access)); -} - -/* - * Set the root node for a radix tree. - */ -static __inline void -vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, - enum vm_radix_access access) -{ - - vm_radix_node_store((smrnode_t *)&rtree->rt_root, rnode, access); -} - -/* - * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. - */ -static __inline bool -vm_radix_isleaf(struct vm_radix_node *rnode) -{ - - return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0); -} - -/* - * Returns page cast to radix node with leaf bit set. - */ -static __inline struct vm_radix_node * -vm_radix_toleaf(vm_page_t page) -{ - return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); -} - -/* - * Returns the associated page extracted from rnode. - */ -static __inline vm_page_t -vm_radix_topage(struct vm_radix_node *rnode) -{ - - return ((vm_page_t)((uintptr_t)rnode & ~VM_RADIX_FLAGS)); -} - -/* - * Make 'child' a child of 'rnode'. - */ -static __inline void -vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, - struct vm_radix_node *child, enum vm_radix_access access) -{ - int slot; - - slot = vm_radix_slot(rnode, index); - vm_radix_node_store(&rnode->rn_child[slot], child, access); - rnode->rn_popmap ^= 1 << slot; - KASSERT((rnode->rn_popmap & (1 << slot)) != 0, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); -} - -/* - * Internal helper for vm_radix_reclaim_allnodes(). - * This function is recursive. - */ -static void -vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) +void * +vm_radix_node_alloc(struct pctrie *ptree) { - struct vm_radix_node *child; - int slot; - - while (rnode->rn_popmap != 0) { - slot = ffs(rnode->rn_popmap) - 1; - child = vm_radix_node_load(&rnode->rn_child[slot], - UNSERIALIZED); - KASSERT(child != VM_RADIX_NULL, - ("%s: bad popmap slot %d in rnode %p", - __func__, slot, rnode)); - if (!vm_radix_isleaf(child)) - vm_radix_reclaim_allnodes_int(child); - rnode->rn_popmap ^= 1 << slot; - vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, - UNSERIALIZED); - } - vm_radix_node_put(rnode); + return (uma_zalloc_smr(vm_radix_node_zone, M_NOWAIT)); } -/* - * radix node zone initializer. - */ -static int -vm_radix_zone_init(void *mem, int size, int flags) +void +vm_radix_node_free(struct pctrie *ptree, void *node) { - struct vm_radix_node *rnode; - - rnode = mem; - rnode->rn_popmap = 0; - for (int i = 0; i < nitems(rnode->rn_child); i++) - vm_radix_node_store(&rnode->rn_child[i], VM_RADIX_NULL, - UNSERIALIZED); - return (0); + uma_zfree_smr(vm_radix_node_zone, node); } #ifndef UMA_MD_SMALL_ALLOC @@ -371,7 +101,7 @@ vm_radix_reserve_kva(void) */ if (!uma_zone_reserve_kva(vm_radix_node_zone, ((vm_paddr_t)vm_cnt.v_page_count * PAGE_SIZE) / (PAGE_SIZE + - sizeof(struct vm_radix_node)))) + pctrie_node_size())) panic("%s: unable to reserve KVA", __func__); } #endif @@ -383,412 +113,14 @@ void vm_radix_zinit(void) { - vm_radix_node_zone = uma_zcreate("RADIX NODE", - sizeof(struct vm_radix_node), NULL, NULL, vm_radix_zone_init, NULL, - VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); + vm_radix_node_zone = uma_zcreate("RADIX NODE", pctrie_node_size(), + NULL, NULL, pctrie_zone_init, NULL, + PCTRIE_PAD, UMA_ZONE_VM | UMA_ZONE_SMR); vm_radix_smr = uma_zone_get_smr(vm_radix_node_zone); } -/* - * Inserts the key-value pair into the trie. - * Panics if the key already exists. - */ -int -vm_radix_insert(struct vm_radix *rtree, vm_page_t page) -{ - vm_pindex_t index, newind; - struct vm_radix_node *leaf, *parent, *rnode; - smrnode_t *parentp; - int slot; - - index = page->pindex; - leaf = vm_radix_toleaf(page); - - /* - * The owner of record for root is not really important because it - * will never be used. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - parent = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if (rnode == VM_RADIX_NULL) { - if (parent == NULL) - rtree->rt_root = leaf; - else - vm_radix_addnode(parent, index, leaf, - LOCKED); - return (0); - } - newind = vm_radix_topage(rnode)->pindex; - if (newind == index) - panic("%s: key %jx is already present", - __func__, (uintmax_t)index); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - newind = rnode->rn_owner; - break; - } - parent = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - - /* - * A new node is needed because the right insertion level is reached. - * Setup the new intermediate node and add the 2 children: the - * new object and the older edge or object. - */ - parentp = (parent != NULL) ? &parent->rn_child[slot]: - (smrnode_t *)&rtree->rt_root; - parent = vm_radix_node_get(index, newind); - if (parent == NULL) - return (ENOMEM); - /* These writes are not yet visible due to ordering. */ - vm_radix_addnode(parent, index, leaf, UNSERIALIZED); - vm_radix_addnode(parent, newind, rnode, UNSERIALIZED); - /* Serializing write to make the above visible. */ - vm_radix_node_store(parentp, parent, LOCKED); - return (0); -} - -/* - * Returns the value stored at the index. If the index is not present, - * NULL is returned. - */ -static __always_inline vm_page_t -_vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, - enum vm_radix_access access) -{ - struct vm_radix_node *rnode; - vm_page_t m; - int slot; - - rnode = vm_radix_root_load(rtree, access); - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex == index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) - break; - rnode = vm_radix_node_load(&rnode->rn_child[slot], access); - } - return (NULL); -} - -/* - * Returns the value stored at the index assuming there is an external lock. - * - * If the index is not present, NULL is returned. - */ -vm_page_t -vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) -{ - - return _vm_radix_lookup(rtree, index, LOCKED); -} - -/* - * Returns the value stored at the index without requiring an external lock. - * - * If the index is not present, NULL is returned. - */ -vm_page_t -vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) -{ - vm_page_t m; - - smr_enter(vm_radix_smr); - m = _vm_radix_lookup(rtree, index, SMR); - smr_exit(vm_radix_smr); - - return (m); -} - -/* - * Returns the page with the least pindex that is greater than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -vm_page_t -vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *rnode, *succ; - vm_page_t m; - int slot; - - /* - * Descend the trie as if performing an ordinary lookup for the page - * with the specified pindex. However, unlike an ordinary lookup, as we - * descend the trie, we use "succ" to remember the last branching-off - * point, that is, the interior node under which the page with the least - * pindex that is both outside our current path down the trie and more - * than the specified pindex resides. (The node's popmap makes it fast - * and easy to recognize a branching-off point.) If our ordinary lookup - * fails to yield a page with a pindex that is greater than or equal to - * the specified pindex, then we will exit this loop and perform a - * lookup starting from "succ". If "succ" is not NULL, then that lookup - * is guaranteed to succeed. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - succ = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex >= index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - /* - * If all pages in this subtree have pindex > index, - * then the page in this subtree with the least pindex - * is the answer. - */ - if (rnode->rn_owner > index) - succ = rnode; - break; - } - - /* - * Just in case the next search step leads to a subtree of all - * pages with pindex < index, check popmap to see if a next - * bigger step, to a subtree of all pages with pindex > index, - * is available. If so, remember to restart the search here. - */ - if ((rnode->rn_popmap >> slot) > 1) - succ = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - - /* - * Restart the search from the last place visited in the subtree that - * included some pages with pindex > index, if there was such a place. - */ - if (succ == NULL) - return (NULL); - if (succ != rnode) { - /* - * Take a step to the next bigger sibling of the node chosen - * last time. In that subtree, all pages have pindex > index. - */ - slot = vm_radix_slot(succ, index) + 1; - KASSERT((succ->rn_popmap >> slot) != 0, - ("%s: no popmap siblings past slot %d in node %p", - __func__, slot, succ)); - slot += ffs(succ->rn_popmap >> slot) - 1; - succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); - } - - /* - * Find the page in the subtree rooted at "succ" with the least pindex. - */ - while (!vm_radix_isleaf(succ)) { - KASSERT(succ->rn_popmap != 0, - ("%s: no popmap children in node %p", __func__, succ)); - slot = ffs(succ->rn_popmap) - 1; - succ = vm_radix_node_load(&succ->rn_child[slot], LOCKED); - } - return (vm_radix_topage(succ)); -} - -/* - * Returns the page with the greatest pindex that is less than or equal to the - * specified pindex, or NULL if there are no such pages. - * - * Requires that access be externally synchronized by a lock. - */ -vm_page_t -vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *pred, *rnode; - vm_page_t m; - int slot; - - /* - * Mirror the implementation of vm_radix_lookup_ge, described above. - */ - rnode = vm_radix_root_load(rtree, LOCKED); - pred = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex <= index) - return (m); - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) { - if (rnode->rn_owner < index) - pred = rnode; - break; - } - if ((rnode->rn_popmap & ((1 << slot) - 1)) != 0) - pred = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - if (pred == NULL) - return (NULL); - if (pred != rnode) { - slot = vm_radix_slot(pred, index); - KASSERT((pred->rn_popmap & ((1 << slot) - 1)) != 0, - ("%s: no popmap siblings before slot %d in node %p", - __func__, slot, pred)); - slot = fls(pred->rn_popmap & ((1 << slot) - 1)) - 1; - pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); - } - while (!vm_radix_isleaf(pred)) { - KASSERT(pred->rn_popmap != 0, - ("%s: no popmap children in node %p", __func__, pred)); - slot = fls(pred->rn_popmap) - 1; - pred = vm_radix_node_load(&pred->rn_child[slot], LOCKED); - } - return (vm_radix_topage(pred)); -} - -/* - * Remove the specified index from the trie, and return the value stored at - * that index. If the index is not present, return NULL. - */ -vm_page_t -vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) -{ - struct vm_radix_node *child, *parent, *rnode; - vm_page_t m; - int slot; - - rnode = NULL; - child = vm_radix_root_load(rtree, LOCKED); - for (;;) { - if (vm_radix_isleaf(child)) - break; - parent = rnode; - rnode = child; - slot = vm_radix_slot(rnode, index); - child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - if ((m = vm_radix_topage(child)) == NULL || m->pindex != index) - return (NULL); - if (rnode == NULL) { - vm_radix_root_store(rtree, VM_RADIX_NULL, LOCKED); - return (m); - } - KASSERT((rnode->rn_popmap & (1 << slot)) != 0, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); - rnode->rn_popmap ^= 1 << slot; - vm_radix_node_store(&rnode->rn_child[slot], VM_RADIX_NULL, LOCKED); - if (!powerof2(rnode->rn_popmap)) - return (m); - KASSERT(rnode->rn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); - slot = ffs(rnode->rn_popmap) - 1; - child = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - KASSERT(child != VM_RADIX_NULL, - ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); - if (parent == NULL) - vm_radix_root_store(rtree, child, LOCKED); - else { - slot = vm_radix_slot(parent, index); - KASSERT(rnode == - vm_radix_node_load(&parent->rn_child[slot], LOCKED), - ("%s: invalid child value", __func__)); - vm_radix_node_store(&parent->rn_child[slot], child, LOCKED); - } - /* - * The child is still valid and we can not zero the - * pointer until all smr references are gone. - */ - vm_radix_node_put(rnode); - return (m); -} - -/* - * Remove and free all the nodes from the radix tree. - * This function is recursive but there is a tight control on it as the - * maximum depth of the tree is fixed. - */ -void -vm_radix_reclaim_allnodes(struct vm_radix *rtree) -{ - struct vm_radix_node *root; - - root = vm_radix_root_load(rtree, LOCKED); - if (root == VM_RADIX_NULL) - return; - vm_radix_root_store(rtree, VM_RADIX_NULL, UNSERIALIZED); - if (!vm_radix_isleaf(root)) - vm_radix_reclaim_allnodes_int(root); -} - -/* - * Replace an existing page in the trie with another one. - * Panics if there is not an old page in the trie at the new page's index. - */ -vm_page_t -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) -{ - struct vm_radix_node *leaf, *parent, *rnode; - vm_page_t m; - vm_pindex_t index; - int slot; - - leaf = vm_radix_toleaf(newpage); - index = newpage->pindex; - rnode = vm_radix_root_load(rtree, LOCKED); - parent = NULL; - for (;;) { - if (vm_radix_isleaf(rnode)) { - if ((m = vm_radix_topage(rnode)) != NULL && - m->pindex == index) { - if (parent == NULL) - rtree->rt_root = leaf; - else - vm_radix_node_store( - &parent->rn_child[slot], leaf, - LOCKED); - return (m); - } - break; - } - if (vm_radix_keybarr(rnode, index, &slot)) - break; - parent = rnode; - rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); - } - panic("%s: original replacing page not found", __func__); -} - void vm_radix_wait(void) { uma_zwait(vm_radix_node_zone); } - -#ifdef DDB -/* - * Show details about the given radix node. - */ -DB_SHOW_COMMAND(radixnode, db_show_radixnode) -{ - struct vm_radix_node *rnode, *tmp; - int slot; - rn_popmap_t popmap; - - if (!have_addr) - return; - rnode = (struct vm_radix_node *)addr; - db_printf("radixnode %p, owner %jx, children popmap %04x, level %u:\n", - (void *)rnode, (uintmax_t)rnode->rn_owner, rnode->rn_popmap, - rnode->rn_clev / VM_RADIX_WIDTH); - for (popmap = rnode->rn_popmap; popmap != 0; popmap ^= 1 << slot) { - slot = ffs(popmap) - 1; - tmp = vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); - db_printf("slot: %d, val: %p, page: %p, clev: %d\n", - slot, (void *)tmp, - vm_radix_isleaf(tmp) ? vm_radix_topage(tmp) : NULL, - rnode->rn_clev / VM_RADIX_WIDTH); - } -} -#endif /* DDB */ diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index 231edda65102..815c915b5fb1 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -34,36 +34,114 @@ #include #ifdef _KERNEL +#include +#include +#include -int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); -vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index); -void vm_radix_reclaim_allnodes(struct vm_radix *rtree); -vm_page_t vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); void vm_radix_zinit(void); - -/* - * Each search path in the trie terminates at a leaf, which is a pointer to a - * page marked with a set 1-bit. A leaf may be associated with a null pointer - * to indicate no page there. - */ -#define VM_RADIX_ISLEAF 0x1 -#define VM_RADIX_NULL (struct vm_radix_node *)VM_RADIX_ISLEAF +void *vm_radix_node_alloc(struct pctrie *ptree); +void vm_radix_node_free(struct pctrie *ptree, void *node); +extern smr_t vm_radix_smr; static __inline void vm_radix_init(struct vm_radix *rtree) { - rtree->rt_root = VM_RADIX_NULL; + pctrie_init(&rtree->rt_trie); } static __inline bool vm_radix_is_empty(struct vm_radix *rtree) { - return (rtree->rt_root == VM_RADIX_NULL); + return (pctrie_is_empty(&rtree->rt_trie)); +} + +PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix_node_free, + vm_radix_smr); + +/* + * Inserts the key-value pair into the trie. + * Panics if the key already exists. + */ +static __inline int +vm_radix_insert(struct vm_radix *rtree, vm_page_t page) +{ + return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); +} + +/* + * Returns the value stored at the index assuming there is an external lock. + * + * If the index is not present, NULL is returned. + */ +static __inline vm_page_t +vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP(&rtree->rt_trie, index)); +} + +/* + * Returns the value stored at the index without requiring an external lock. + * + * If the index is not present, NULL is returned. + */ +static __inline vm_page_t +vm_radix_lookup_unlocked(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_UNLOCKED(&rtree->rt_trie, index)); +} + +/* + * Returns the page with the least pindex that is greater than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +static __inline vm_page_t +vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_GE(&rtree->rt_trie, index)); +} + +/* + * Returns the page with the greatest pindex that is less than or equal to the + * specified pindex, or NULL if there are no such pages. + * + * Requires that access be externally synchronized by a lock. + */ +static __inline vm_page_t +vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_LOOKUP_LE(&rtree->rt_trie, index)); +} + +/* + * Remove the specified index from the trie, and return the value stored at + * that index. If the index is not present, return NULL. + */ +static __inline vm_page_t +vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) +{ + return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); +} + +/* + * Remove and free all the nodes from the radix tree. + */ +static __inline void +vm_radix_reclaim_allnodes(struct vm_radix *rtree) +{ + VM_RADIX_PCTRIE_RECLAIM(&rtree->rt_trie); +} + +/* + * Replace an existing page in the trie with another one. + * Panics if there is not an old page in the trie at the new page's index. + */ +static __inline vm_page_t +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) +{ + return (VM_RADIX_PCTRIE_REPLACE(&rtree->rt_trie, newpage)); } #endif /* _KERNEL */ From nobody Tue Sep 12 07:49:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlG2G6Nmvz4tglv; Tue, 12 Sep 2023 07:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlG2G5xcjz3M3f; Tue, 12 Sep 2023 07:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=Kcb1+b+znq/MU6nTIvFt/M57eD9W+PnZSLSrLL6/cQ2cL3Bor1h8PafrLlLCUtRsTLiRFT 456sag7urnckOaQ0xxdjOhmdIm0UAMcuWgGKl8ayGeZT5C6xtMMp5aqKtWjKyAffGcDXWG rymTY9nFecWm88+AjwPkUVVZ6DeSOrfciBPIhi6/EdGl9UGLBJcrEn5B01tqLPD1OTPufU zbSFz4qOfsrmK9OdLfGzwA+MOG78yX1wcM6SHNIympwEOcdRMSgVeK7n8E+DJPy2yTzsUw 2LNllhhwpJvN3obe0qp0FPm4gK+LybzkPAsbdfdD6dZxq23CLNjtdfnHA73k4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504982; a=rsa-sha256; cv=none; b=ynAfyFiDceyaTCZWr+hx9MLgkb0z0QYVAobgUfTflAtpkhhQWCkKceEcZhI2ESB59zJd5u oXpj+DS5xdX8w4jm5Ui2Kjg5vTtN3wu54s3qjN6AF0TuKbnQjDcg8df9ozmTrRwJNFzqy7 S3YBVLaLofb4ScA4Y36V7sPlajPbXc8AWLVAdDUpfLp5zYgE51iireEv7sdIQL7TeD/XMp y144X5jZICzKSyTFt8wR4SpbQ/Cp7IlD3GDSPwt/+7MPM3RPm7vjLhnVnssoXUr/mYgKYs 73/mI68tRRX8YtZ6OB2uIwugcOpx8K2z3wz8XKxUVMuV56ptUP4pqkVmlsdjKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=vwGO1C6eiejtaCfwp9DSbaHPVxaEoU6OvJGLn5fx5xh28KbNkKcKIU8MXL0XRdSVPUhgCv YMWa0bEfMeM+6uK4tXOXqPkkBT3Wrus8nwkBT9znFFQXgbGb7GIgnxRuKJHekADc0jMCHS W/4yokG5FuA8L0et0CVnU6TVCIY118hpnlld59oHHAkGnFFo4Xyytdsn5uvMWJUvoZtBHy e05eGos1lSa6BngCFnmdOVOlj80shvDJzojsFnj8pSV/Y7IAMiHLOHe5VDvNJydjFeS+hu GvFqzq6BkVax/IkxyfHyj6MoOBOx3+HXyIkoVad+teU/+k3CdA+Kl0DECdwYnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlG2G50swz8ST; Tue, 12 Sep 2023 07:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C7ngxd072203; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7ng0A072200; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:42 GMT Message-Id: <202309120749.38C7ng0A072200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 3c93ba3d7f7c - stable/14 - linux(4): Convert flags in timerfd_create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:47:54 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */ From nobody Tue Sep 12 07:49:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlG2J0Tx7z4tgYX; Tue, 12 Sep 2023 07:49: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 4RlG2H6z2dz3M6K; Tue, 12 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8d+35yov/Fg9Yxjvso3ckFVHWQCXXNTGhdzynSFIQw=; b=cCYJs4B8sgp89bD2IbO3dQLEW64OI6zys21kttcFnrsV9LrscTN/tG8AvCVJMMhPmxGsha V0IIPG+P9v2B0yUNnD7GQlnr2Lhg67Uejb+og5W9V/cqdAUS2vkDT3xc93hdsMLYF2T9RS GNfQPuJmKnbfLVhKxATbnO/cydLvP0+6/KKf/kqK3qBgi53b9dzwyoYd/N2m+Lo7c133Oh u2k3pXTb0Xfu600XEbBNk7S8MEsSpNTS6XJMCor3S2V4pBFWkQUdUabs44ccxGziKBRM2c 8Uyv1C5O+K/DrgCJ/CUe7J0E1Q8QAx6Ip+0WDw+GXgALmIZv3SnBqnXopQH/hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504984; a=rsa-sha256; cv=none; b=dYyOJWXbcH8EOfEndVrgFZuVZSf4Gqg9JyGjCUF/GK6JzXkzao6q/GSin0oLnlyHRqI2iq zqM2KvUaN4u4Qhv5oT75m5vV64+Jo0EE4Hb+T5aUnCGfId6zIidKgWZox4f2ldpj+RfODv RzvnO/jpPLviFGk9YXtSau4mqlEXgaEirBGQrmQ8C/EoGxFruSYkqJxBlvW4yDg74Zojpa oUCt4CfLmIJEw8XEbBI5BI5NsC+VZ91nbM0y25pQkrQl4D2bmaWUcDjZP513L53WL5FlNb xvJpOM2r7wdLr/wwMYhlh9IzYgYcuLZHdl4sJmrUf17dBQeKt7PeI1bbvtG5pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8d+35yov/Fg9Yxjvso3ckFVHWQCXXNTGhdzynSFIQw=; b=XbnmyqqYpKe4AwjEEEgiM8UAM+kDELGgUTANozGrlzrqxdGgCzTEFU150i+a+8bca8DVUY GuvS4PwvKI21KC/D9rTbvfTlA6RbTgyicPMSgctLxvJO+6mWXp1Teq8KGLYV86iXabgnrB +9nBb1CWlMa4bMC4Px3kHWHjpVNUp0pOpMUJUqrT9mwt9aZv5H7ylEZRtzv2r8PgpuIOAE KKNDs54VaUv8gaaH6octQwYZ0wRi3XXyutLjY+aqA97RRevBQjUdPZbws51PpEMALYvdMl fbhoDzm+DzBWgwkMiGjlwrk0oAo8q3xkOGrMGXMZ6RJyGKXy9gW82qJUXSny9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlG2H604jz871; Tue, 12 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C7nhTP072243; Tue, 12 Sep 2023 07:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7nhuG072240; Tue, 12 Sep 2023 07:49:43 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:43 GMT Message-Id: <202309120749.38C7nhuG072240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4d1723961743 - stable/14 - linux(4): Deduplicate mprotect, madvise List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d17239617439b9a500f4c7a59f5f4d323d252b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4d17239617439b9a500f4c7a59f5f4d323d252b7 commit 4d17239617439b9a500f4c7a59f5f4d323d252b7 Author: Dmitry Chagin AuthorDate: 2023-09-05 18:15:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:48:39 +0000 linux(4): Deduplicate mprotect, madvise MFC after: 1 week (cherry picked from commit 553b1a4e4eb426d2c29a033b284c13bfbab30334) --- sys/amd64/linux/linux_machdep.c | 14 -------------- sys/amd64/linux32/linux32_machdep.c | 15 --------------- sys/arm64/linux/linux_machdep.c | 15 --------------- sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux_machdep.c | 14 -------------- 5 files changed, 17 insertions(+), 58 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 2d2c5bb55ac8..7da1dccd6b45 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -97,20 +97,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *args) args->flags, args->fd, args->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, uap->addr, uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, uap->addr, uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index f6b14d8e4653..fb088ae37b26 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -345,20 +344,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 9c9d56ca9949..b9548387315b 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -77,21 +77,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) uap->flags, uap->fd, uap->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, - uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 5e692fea1ea7..b9c67d513cd3 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -348,6 +349,22 @@ linux_msync(struct thread *td, struct linux_msync_args *args) args->fl & ~LINUX_MS_SYNC)); } +int +linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) +{ + + return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, + uap->prot)); +} + +int +linux_madvise(struct thread *td, struct linux_madvise_args *uap) +{ + + return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, + uap->behav)); +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 8dbcbcd2609e..7f1738cda845 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -332,20 +332,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_ioperm(struct thread *td, struct linux_ioperm_args *args) { From nobody Tue Sep 12 07:49:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlG2K12p3z4tggx; Tue, 12 Sep 2023 07:49: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 4RlG2K0ZLDz3MFh; Tue, 12 Sep 2023 07:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fATr2Zr6TlOKlGnOaGcqxhL87tIE8wT2dZpC4M1cJ/o=; b=M1omLLfpxLa0t3ql4WDFm7p628HE5yoaJiqyOlZOoeyuTmWjgKO2+GmYkocDVKF7g/nruq 9VOLybuCFoUR4ocP8iG2lyVdYILQwxfCRvtl49KOmZJa5rEuYclMOG2rqpvv0vNDUeLyJd euIcmF3Gr+LAplFB6C66DHHhfzp4ZOlcSqwlxircVLTopr8NswbWasEdIhoPyDM5s/dU6G Uv6rBG61X00cr4oHS4SFcKrnKvHAWf/hJsi/I1z4H330wGDtFavY4chtTl6VQJRQ3pjp46 G0TO5/iGikaBy9CiDzyxD+jjmeAHuot2dkcZ31u5RP08SKm2OPhUavGvL1WxaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504985; a=rsa-sha256; cv=none; b=JwVuvkMpWGEpzUptJ6NjC5ZS7JvSFURFDjyNiIDVJt8ZiqDVCX+UTDWL5hzOmrmVcSWjcW 6FSVoOYjDnQU5UfXFtTuZuw/EdA6dmhXeQ2Bh/Jao9JO9yfQGQrid68C4unPzWwIak+Shf aU1KyR9FWh/RBBXxyX5XXuvC8ZZYVEmZZktZWjsh6voQB50GukVaJatqcHhNjkpI1E4g2v IDJvnUyuUKdgd/3laLa7wIoJ3006Kq75qiRS8aHwbiiC+QR9J1Ge6RUXjkN9Eh39lpw2vZ Jg2j2ZnqGCqzAt9m/rAO5ch79mW3UKGQjsINgOM1KkNtpOMnG2cuAV+BkWbSUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fATr2Zr6TlOKlGnOaGcqxhL87tIE8wT2dZpC4M1cJ/o=; b=iSldzn/9EKYDe1nTPat1WlndeJ6TYuuVvJjCuuY+zWUsJk8nEqVs0yXhP0h3YWUTgio+/q KxXFE57WT+yQmXl/7hE55B0vywAq00tRkjfqqy9iLPNaHrcluH3KryjgIegTPGfHHUxAR9 UrEolG97CAUeFtHXysUMqouybZZ2k3vhSyQlUcY7S79AQAcMelKnWCGiUpDdXIclnvdop0 9udHSselR8+djx+PuK1puQzbVaV0tV5YmcCq8K6+8aJ+sL75DhHaTTY9o6YnapwgF5Cwef M6jkTSZiW/C2ajexnaxwysd6fdUi34CuWP2pB0Hd7DuIlfuOEQyng5dFMB/dUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlG2J6nRqz7tn; Tue, 12 Sep 2023 07:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C7nidr072279; Tue, 12 Sep 2023 07:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7nial072276; Tue, 12 Sep 2023 07:49:44 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:44 GMT Message-Id: <202309120749.38C7nial072276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a321b17b8e6d - stable/14 - linux(4): Deduplicate mmap2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a321b17b8e6deb83249b685357631dfd8fafc9e8 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a321b17b8e6deb83249b685357631dfd8fafc9e8 commit a321b17b8e6deb83249b685357631dfd8fafc9e8 Author: Dmitry Chagin AuthorDate: 2023-09-05 18:16:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:48:56 +0000 linux(4): Deduplicate mmap2 To help porting the Linux emulation layer to a new platforms start using Linux names for conditional builds instead of architecture-specific ifdefs. MFC after: 1 week (cherry picked from commit 2a1cf1b6b55c8326bbe85d0fdf17b0f2fb9b34ce) --- sys/amd64/linux/linux_machdep.c | 9 --------- sys/amd64/linux32/linux.h | 4 ++++ sys/amd64/linux32/linux32_machdep.c | 9 --------- sys/arm64/linux/linux_machdep.c | 18 ------------------ sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux.h | 2 ++ sys/i386/linux/linux_machdep.c | 9 --------- 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 7da1dccd6b45..33ce902a45bd 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -69,7 +69,6 @@ #include #include #include -#include #include #define LINUX_ARCH_AMD64 0xc000003e @@ -89,14 +88,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, args->pgoff)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 395548b3c93f..5542df1b3185 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -46,6 +46,10 @@ #define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ #define LINUX32_MAXVMEM 0 /* Unlimited */ +#define LINUX_ARCHWANT_MMAP2PGOFF 1 /* 32-bit off_t want offset + * represented in multiples + * of page size. */ + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index fb088ae37b26..e10502f9bd80 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -320,15 +320,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index b9548387315b..3ba5683941b5 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -32,25 +32,17 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include #define LINUX_ARCH_AARCH64 0xc00000b7 -/* DTrace init */ -LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); - -/* DTrace probes */ -LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); int linux_set_upcall(struct thread *td, register_t stack) @@ -67,16 +59,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -/* LINUXTODO: deduplicate arm64 linux_mmap2 */ -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) -{ - - LIN_SDT_PROBE0(machdep, linux_mmap2, todo); - return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, - uap->flags, uap->fd, uap->pgoff)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b9c67d513cd3..cb781f3bad75 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -365,6 +365,23 @@ linux_madvise(struct thread *td, struct linux_madvise_args *uap) uap->behav)); } +int +linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) +{ +#if defined(LINUX_ARCHWANT_MMAP2PGOFF) + /* + * For architectures with sizeof (off_t) < sizeof (loff_t) mmap is + * implemented with mmap2 syscall and the offset is represented in + * multiples of page size. + */ + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, (uint64_t)(uint32_t)uap->pgoff * PAGE_SIZE)); +#else + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, uap->pgoff)); +#endif +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 643c240f8e37..914dc9c9ae84 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -38,6 +38,8 @@ #define LINUX_DTRACE linuxulator +#define LINUX_ARCHWANT_MMAP2PGOFF 1 + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 7f1738cda845..b5d42dc22162 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -308,15 +308,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { From nobody Tue Sep 12 09:21:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlJ4C0jt1z4tFmt; Tue, 12 Sep 2023 09:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlJ4C0HkBz4GPV; Tue, 12 Sep 2023 09:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694510491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+zGZHMY1F7/arPjqaEy8XiKKl6lStTfAb6Uy5+N4KQ=; b=PDe1IxHXzG1BFHxCN89LlpXImLyv6GSMeLtEX/rjBhnCzTvVxMoniFX586/nCOHf2m/yUB Z6w0hyjjV6HeJjXPlH8ZdzkSNWOFSC6kvTeG1jh70O7fhrZDfC5M8FMqYu+T0t4gFn4bII tQETUZdlUsluI4bI6FSHhU9hQ/N8BTo6F33vAkozeQVlmPK4kng8/U/4Gj6SgnB3CfStEe REjWeNwI4YDh0sYl9pkL2RYgMSQo+ZdtVbIdhEhJjJQGcdNIem2bpJHoSML+dc8hdPjl5o 51hJ9vOTYA7fmuwq2xME20sws5bYaLbot2hlLD475yo0zNAr/wPsMmt3WaKWOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694510491; a=rsa-sha256; cv=none; b=hg2ObkTHJAheF+71ncEP4bmhpM4aJVEDVaHRpxK2j2KaezC/cBNqIbVrK8ChP/5e785n5f JMxqcfdEH5NbSp8ZMSPLG/WcePRFwHfWnQf0AKZP86aR++eJeAAs1BfvHO5ZJXyKfc0koP zVfUs5xes07Ti8vWVYq6v2xu7o/Y6b4wOvlHUz1k3tcIeh8rDVPI3y74RZzNdXVWXsdOA7 R43HcxPw7oJKGzreyiAbzl4bq8pwPxRtL2qrYdIG/k4iAFoE72BRZ/W+UKSEeS3378uTwV LgX2/L2yrJJ0/lqq67qbPRCgcmArC0JWoRitUuDFE/wF2qyhFTmiZI0FgixsxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694510491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+zGZHMY1F7/arPjqaEy8XiKKl6lStTfAb6Uy5+N4KQ=; b=cJwQXm1fB4xvtmqe1hi6tQSqBSjXact2cnmHMGXSAQvNVsyiP3PVXgMt94MXfj2Ollf+yk +lACchSiBKRDLdM/c29foBjfMhRDwInNLeLgGj4hO6hMJ1Gz3DXvKu+xEZd9uUJBcTSRRb CCaUWgtOnM0CJjTof+mfz2EOhb8hNzle9zOzaRNj1qzBgUO1J+N77/xL9M0vCEYw4CfJpL Y1QvZBfISaKMq+vPsV9swJf6PtXo8d9OvIvBGO4oxjejw5Ajioh2ruPuddTf1WMzjTgcPt qwoc2F7+q2yRBKQmGDpbIY7SCVMdo7zSrbdO2A6KDfpBKks3CnV+OG2LAiaGUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlJ4B6TFmzBWg; Tue, 12 Sep 2023 09:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C9LUwp032308; Tue, 12 Sep 2023 09:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C9LUpI032305; Tue, 12 Sep 2023 09:21:30 GMT (envelope-from git) Date: Tue, 12 Sep 2023 09:21:30 GMT Message-Id: <202309120921.38C9LUpI032305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 10db91ecec98 - main - vm_radix: add a missing paren List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10db91ecec98b151046c8c5dce63b2995910fb1b Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=10db91ecec98b151046c8c5dce63b2995910fb1b commit 10db91ecec98b151046c8c5dce63b2995910fb1b Author: Doug Moore AuthorDate: 2023-09-12 09:19:51 +0000 Commit: Doug Moore CommitDate: 2023-09-12 09:19:51 +0000 vm_radix: add a missing paren 429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5 left parens unbalanced in a powerpc case that my testing missed. Restore balance. Reported by: jenkins --- sys/vm/vm_radix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 57c39d8d89d7..cfc5a82eacc8 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -101,7 +101,7 @@ vm_radix_reserve_kva(void) */ if (!uma_zone_reserve_kva(vm_radix_node_zone, ((vm_paddr_t)vm_cnt.v_page_count * PAGE_SIZE) / (PAGE_SIZE + - pctrie_node_size())) + pctrie_node_size()))) panic("%s: unable to reserve KVA", __func__); } #endif From nobody Tue Sep 12 10:37:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlKmN60yxz4sx7b; Tue, 12 Sep 2023 10:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlKmN5ZsWz4bW1; Tue, 12 Sep 2023 10:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694515076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SvW+uw2+drm4rVCELkCd5ev0EpxCoc0T4j6R07ThxY4=; b=MI+G5j3rD2aWj2TaD+MFGhYMMAgrGHZWh0QYEco3E1pf9FKXiKG6nHK1xt+9tQ2ibuhxle qdhPKuPl+m5rKFKb5oZa/7J3iltMC47Re5/0llVrl+BAqULJQr8tmSeqiuff7VIXN+AayI s2/UB9wj5B95LtkPirD58oc19dZE8pOauKCiW+dxuT/UZJzOZ5FUdw/WhZrqhiW73KZD9J UvdwbNk5lzDdNkVwP8/wKl+MRcAHDeYHsjdwY712qq59NAQ+iTgls7ThgBJp53oEZJyfYD hXPTM4cOHBrkTa1yyWrKrRmvw9a/hlWPcw3vMAncJf0tFWcyJYgmAFbNTChxrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694515076; a=rsa-sha256; cv=none; b=e1uPr9mqy0HrGsWxyai6uiS3nv3uLECHkL24utiESPwtk3YoE9nHHhK0BvbOzHTQ/X07Mz cGys2J8kYNaLN8wnM/lMOpBm+XeHd6zfnPiyD4e5wuVKQuf957/5xi9ePBk4v0hGSwalo4 eDJsoUMnK5OGlg03a4+GIxRLNMDPJNZBwkvhJtww05i1GPTa2DFHnn7OhJLmMi6iTXNBjy 5dN/2bl8rRd/gs1fSgAEyihwyouC6au2i3ycUDJMmhzcphxxPNaepVle+eFkYRU5pcLgSi 0d373kjuRE+sE2nCCx6v0zrKnkk+f1YVeblOeA8v1Npu13l2E7GJiH8TZqCxug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694515076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SvW+uw2+drm4rVCELkCd5ev0EpxCoc0T4j6R07ThxY4=; b=uYpXzr1wrtME5JswKfJVocX8YweR6e9MAiFXlCIDCgqWteL6M5xnYXLeCu4b+FhlMN4IZa IyqQ5AlrIERloRt8H1+5AVnp1s2WnjVfh3Z+3zuFWitOscwQCGkldHOdVbNyJ/DEg00MYI KXEzpCY4vNtlWGHIU1gKipoBzE2Ml6GCo/t9sUYHG8L53TQPitq/yn+F7dmopG9LogEL37 Y7UNpsJ3DnYZdRwOw5BP7qM+FBQFRKUMM88zWOeTFUzG7yFBTzcO5q/HlCbi3vy6E5tgjf RikOYfujRIjc8qi4ogC0FyI0xB+pK0MyUo8lrN/ASE3PY12Au/pzL2e8b4Le9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlKmN4YBVzCdX; Tue, 12 Sep 2023 10:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CAbu61053849; Tue, 12 Sep 2023 10:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CAbuNm053846; Tue, 12 Sep 2023 10:37:56 GMT (envelope-from git) Date: Tue, 12 Sep 2023 10:37:56 GMT Message-Id: <202309121037.38CAbuNm053846@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: d0266fbab9b8 - main - linux(4): Cleanup dummy syscall list on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0266fbab9b8eafc1aedffbedf66dedb4774794c Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d0266fbab9b8eafc1aedffbedf66dedb4774794c commit d0266fbab9b8eafc1aedffbedf66dedb4774794c Author: Dmitry Chagin AuthorDate: 2023-09-12 10:37:45 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 10:37:45 +0000 linux(4): Cleanup dummy syscall list on arm64 These syscalls do not exist on arm64 Linux. MFC after: 1 week --- sys/arm64/linux/linux_dummy_machdep.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c index d38cea2ff1a4..a7a7795f573d 100644 --- a/sys/arm64/linux/linux_dummy_machdep.c +++ b/sys/arm64/linux/linux_dummy_machdep.c @@ -42,11 +42,6 @@ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); * Before adding new stubs to this file, please check if a stub can be added to * the machine-independent code in sys/compat/linux/linux_dummy.c. */ - -UNIMPLEMENTED(get_thread_area); -UNIMPLEMENTED(set_thread_area); -UNIMPLEMENTED(uselib); - DUMMY(mq_open); DUMMY(mq_unlink); DUMMY(mq_timedsend); From nobody Tue Sep 12 11:55:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTM4yZLz4tYR3; Tue, 12 Sep 2023 11:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTL6mv5z3QPs; Tue, 12 Sep 2023 11:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRihcxutJXBV/JPn3kc6IXc9k1LDls8QW4VPYd2buUM=; b=B1+IBPP5NTRLfdvg/e8Pn5BL+ooDm4H/vZgN7PAVaEUU/vd/CeXG450Wh3LTCNLyJWfQ7w r5OqhE+cp6LG78yofUMFmuoqTibRcz52poFzOC4CeB1yrE9EX9UYVmkc2FTqmD/C/fyDU6 kk4XjrrD/HAotjui3tLDTvM9gcY6QOORNiQjRuwxs9bmDRpAr5tXVwpHZrOHu6VdAWvFl6 Pwhvge7X+9o2DY2OR47FtECNsDoL/9qiFR6vilzePbV2YtYf82ZLH28WZouSpuD2c4ebO2 vuAMrvaIYyBnK1MTzP5kOSPhUf2r6H3UifvDDc9ssICKfXy+J8Y1/6jEjEGBAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519702; a=rsa-sha256; cv=none; b=Fcp7Tv53rM/6AhKEjO7dXr72/cO+Mz8d5y1AWx7yVw1i1OZZz9NkAPRdxnSY6aZKFDKqel 0MT1ZG+Fsy83Z24bfrfDlIpYLsK0Zlmd/xfy4CfujPqhEFiNhpLtBph+DMlVJbp1pTwiAA KXM1wFhd+DGjqEadyRdKqkGOHCQ8AIV7gy8jEdmwRa9Ais/W+Y/mDAoSyGcAKBhlDA0T7m 6OI3BoUry+YmJZaJSNbNvC8TbCEl+Mdg5gO0ZrGtyc0jjSRFkztX7DPBCvHfB7qpy0tYKP k/5apli566xl65A9KStw43e5CwhgOZn7vew6xgKtodf5VlvckhU/y6y5Q57zVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRihcxutJXBV/JPn3kc6IXc9k1LDls8QW4VPYd2buUM=; b=eI7WDn1x9QM4rFIhXDD8J/nAnGVXbm2DrWBLQKQ0a0Ry3+64h5F3FESCLdS8M7CEp0Uph/ 54weAF0yfTm5xNngEyJs+UzrUvJlPhZi3LLQqej7YE+/uuYizPX3NvqjLwSLZEht8hj5U3 Ks4zcCvMM+6SgL5IhmLrl7gkD3PS6vLo6H5zSzr7sUF40ihLh1tH7wMdpKvMgn4bYgnss0 v+dI1l5wQ8gXuUE8LlIPw9E5CLUtUhXxXdjerfxXW2SO0NrIjTAE71BraBSO3Au5WXtjJi 2Zu/AUCbpHNfQTliOfWAa69gT+XtOxCAKGUns4gXOLSHHWud2YiejiPw1+tw+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTL5lrVzWj5; Tue, 12 Sep 2023 11:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBt2j1085871; Tue, 12 Sep 2023 11:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt2Ic085868; Tue, 12 Sep 2023 11:55:02 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:02 GMT Message-Id: <202309121155.38CBt2Ic085868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 01e15ca6c828 - stable/12 - getdirentries.2: Reference directory(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 01e15ca6c82835cd541c228c91a2913540815d32 Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=01e15ca6c82835cd541c228c91a2913540815d32 commit 01e15ca6c82835cd541c228c91a2913540815d32 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:10 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 658be9459af5..ebe5848772fe 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -28,7 +28,7 @@ .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" $FreeBSD$ .\" -.Dd February 14, 2021 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -196,7 +196,8 @@ Corrupted data was detected while reading from the file system. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTN2RHzz4tYG1; Tue, 12 Sep 2023 11:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTN0HX3z3QJb; Tue, 12 Sep 2023 11:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZM2mJt2xgrY2xzmOGDn5KHaPDqGKZ/s70inU2OiZhXY=; b=TP0xVPfDiqRmi7ELRUMR5eJiaJXJjdeHH8L/84KvkX9n8XDklebwvVUTeu5JONP8CZYJby sDZIaq+AYFYjNqtUmm2HNdPrMRgQLOSPh6lcStvG4jE7i6LEWGoaM/ECWcxvlLnUtScwD3 Yeoh0z6b5d6spvErGyVV3jjjKbQ3IiOHP9a76shzzlOoRBWdvd1lkmDdjJ4N8EwlVqrJtP ek1Pqt3H9l3TDq+aYrHhXBE+IayYJhXEDz9vONoCdI2FICKuGVaHausMY+pI1s/QAbEKAD 3nwBEar9rjH8oBlMC40Puvos7iTHGhYiK0FC59vCyRhWAD0DFDopTGlYJcuhNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519704; a=rsa-sha256; cv=none; b=xp/qsIb3rvt+/8QMC0P/zHqQjhlbjEIBZcd9Mk39E5yuodtco93PPEJfKBogO5USdts5C1 F+tZQoTB5SI+FbFaQeeamPJw8kg4mRduNxxVA2k7E0K3STETxrpu6cQvwEa+nrU/3AuBZy AY2pdH5aegzv9RL2k57ifmaP1AXjeFYHK0K2bY/fpFvagJPy8bkFPNSN+cUHWlZqBd7kTP uE3QrKI81oirj4N8wjFIgkNFt9i6z4ENVoupnLvhqrIkGw1/r0Vqr3TCYFMgFJ5GC6DWMK z7cyYtUa7zlrknPEUbZwLY2yPHyP5tAcm3AuB0YEkc3S2g1l7gVB3ihdze2Rsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZM2mJt2xgrY2xzmOGDn5KHaPDqGKZ/s70inU2OiZhXY=; b=Z/LQ1+qieg4WHwzbS9DyvuQe/8KmCWgIyZyrQakHRmPY3gmgfkAQRmSwVn1GYAu+tYb+yV sMHvqNYV/EJCybpfMnweDf014ZLV8afM2vACjRMZHMxNl78Y6Gjld8oiTF8lGDbdHBd3E1 yznNmov5z2LUe+axWEX0ChtidlWISmHS0aD7zujMJrJy5xN63UIW9Ha7SnRvFjrhvAoiAB zdvVdQXgXz7LA4UaZswHyZuq5f3t17ZftQ+AxW4BIqIcF8GN9XDLjpmyWayRQXGLaDDTuN bEgrw9SYSJVk4nGKMz/KEIwIcjNwO9LFY+futt0eNzMB6eZEtWLRnThYr08oWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTM6VcjzWKk; Tue, 12 Sep 2023 11:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBt33d085916; Tue, 12 Sep 2023 11:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt3JD085913; Tue, 12 Sep 2023 11:55:03 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:03 GMT Message-Id: <202309121155.38CBt3JD085913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 9cc3b0704e13 - stable/12 - getdirentries.2: Improve readability of dirent members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9cc3b0704e13f7ccb24c50b84b2460506a52c77a Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc3b0704e13f7ccb24c50b84b2460506a52c77a commit 9cc3b0704e13f7ccb24c50b84b2460506a52c77a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:11 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index ebe5848772fe..99ebd79784a1 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -71,12 +71,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTP28y9z4tYR7; Tue, 12 Sep 2023 11:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTP1DsKz3QZl; Tue, 12 Sep 2023 11:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I769juO9xJQrXQ+B10L2u2xlTztmiDASw+pOjIidqUg=; b=SeKLrW/qXPLT+UfBgQT/y9vMXh6b0/G4lzw4VlwV6gmG1xYcmBCsX8TP9aZkF9RqJpEC9t qoREp/J0ndOvgi98cyJ1BuT+yT8Y+4yTI64O1SCIHkycZOdido73N6T5TrYsrSGiZBHVyi q5+MJP+zOwOmovCAh/viU6eCIBIfZmZr7JY2TjqQGaKqJIyscuBBfbOMSGlMP3QHZWBXp+ oCeKldBQVCgUDXFz/e4lkTiLfUZx0BfeINS/CG5Po0O2xJF0Jw0019xbI0biL4G7MWgyP4 vTjDPrPPFGPEJynPYLX6j/RTnIPUhNndGVbdTduh2fQSlL9lwdeMbIlue8Lqxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519705; a=rsa-sha256; cv=none; b=s3ajixBSYMm8Xry3x37lFT3fvq+ecy9H/UoDU6m0Cxh1nVoC0v+PG1dfuVTvTok7eEgyiZ Bl021hRwBcF3Yf4t1yBYZDu7jAHFA5ZHm8QYT18+oj2PSaBegrkWzxyxnfxWT9jz3zLzEz zLioCB4Z5NqWDsE6RzWhn1Glp+mclXwXYyP1cmKUAs5xh8b5I9chEJb3zmWW9eOg6xT8/l DDePCyxmgqxxFEg3MBSj5FrnJJZBz+gph86vUOofzVdO+FxUix8QwPbloxipgQO9O4IAla KQVXvrYezEhWv4BjJV+62HPKCfj5fLbIcvzPQ2s2lzPLDACXogWgGEV/wXG7MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I769juO9xJQrXQ+B10L2u2xlTztmiDASw+pOjIidqUg=; b=iztCoyL7HxC1ul3NmXW4TFdu6eQ6yxcKCvu+kqnnz3T+eHDkT0O5Lc6EtgtdDBEwveRkx6 noZhLu3TZ+mPtPAFNLuScOxjbB+94cB5MTHwi5r9I5BmxeA2+WYMD/KzFiSInAtv3dD2v7 he1v7RKVMbUdAHvQ53nE+L1530HIbpPOtg+b1w0duBxfLuid7ksxs1UOqatiLuGIguUN2a YYuomHQ5Irko23MoS3GLacJJJZc3iYmi21BwHLUQafjrcKCd0bpptk/wjzFf5FIKZ/vnri TLiuTGfotMjxgnucl2I7a7OGkIdsPdU1J16btfGAx5vhoIXL5MrzepWy1IqgIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTP07f0zWl5; Tue, 12 Sep 2023 11:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBt4AB085954; Tue, 12 Sep 2023 11:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt4mG085951; Tue, 12 Sep 2023 11:55:04 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:04 GMT Message-Id: <202309121155.38CBt4mG085951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8e9979050a8e - stable/12 - getdirentries.2: Reference dir(5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8e9979050a8e21b66c8c0748e8782651b66860fe Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9979050a8e21b66c8c0748e8782651b66860fe commit 8e9979050a8e21b66c8c0748e8782651b66860fe Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:11 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 99ebd79784a1..9e09ff7f9f5a 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -197,7 +197,8 @@ Corrupted data was detected while reading from the file system. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTl6y4vz4tYfh; Tue, 12 Sep 2023 11:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTl6Xbkz3RHP; Tue, 12 Sep 2023 11:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eerohcgmEvbKsr18aeol19STvFgeng+Ln93Bwbwrad0=; b=vR0KCYMq9g3Nbp0b8dqvUNlGk9Tq1tdg7nc+GR51bWNntzGVJLJVJw0DmDMIVLrUoCzf42 lDQUk9VsbpjmSOt76QpFfkiyiU+pe6ka9Ybfrmw7+vHk0YZDl3dQfjKm7fPQuqIof2Ruc4 EB7tMXTKbM9I4zwwZbLAUFaFjiMA/lvgrpgcrvsGhtH2A5EPqA3qE3jEY0l/2abkeKpobp BTA2nVDtov1LIVHUveMbela5/dvaTAh4J1q3kxZrRDttuLH3oRr+HVAbOjcbdrKPcM6pYp DKm8y/tC3LNcIFfKK1pgof3c/ZiTrrpWlDs9kQcH5bzEIxOgbwpxv1Zk56/Vyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519723; a=rsa-sha256; cv=none; b=nyj23bFXLC1gh5UUdkq3bUyybm6/Sb+1rjyWyddOSJIk/Rf+Ptpu0F+KmZKT1ahBq+anNa zkpJwjN0gn5INM5gbTl7PqnlNAVxIERpRgeeQu5kHkM3EArHeIkAgjb7OTn5V+SyMr+hB2 7GiwDY1W7JU1hq/Fw1O33li2xLuTcdlZ/FeJo1XxBLPh/Nxh+WwWmm95P3I6ySJhIqWE7r t5a5EARzGDElrxS4SxIGjFoS3R5EWNJcaehNNVRD7/EaGbWyoMA7kDoQFfFsUf0HT3g5Ez ugmiXx1180O/AhrxwHbyQbzQrf0xseW/lVq4d+4AhGJUmFSpqSX8HO+OsbJ5Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eerohcgmEvbKsr18aeol19STvFgeng+Ln93Bwbwrad0=; b=tEqD0wiFu+OZcWx0uJBHavEkdeDxgtmZHet1R0CcrFYkMZAczKboWxo7fLYAvc9tDZ5FMC lLDCDNqXgS6E/9kDCEHrytAXaq6F56gMkezl3V5tjqsqYLf8kyN+ao0foBVMMaEumpTZ50 1/sIpEuO/uTJSp1z/lvBzHZM+8CGFWpjdxJinQ9LUlAhpncr5XXlIPaPTcsYvgaXwi8wsR QchaK0AaLl/rwwt+gIXDkA9Vm7tLp04HjhvwsZZ3vZLordGvWvdE34k3ay50Ohw/QDA2Dt xuJIGQCmLLGRjZbVCpQrEaL+5n9QAUWpPZRr19WmrUMqmzlxAXWpef9gxQ06Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTl5fZCzWTD; Tue, 12 Sep 2023 11:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtNlL086145; Tue, 12 Sep 2023 11:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtN2Q086142; Tue, 12 Sep 2023 11:55:23 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:23 GMT Message-Id: <202309121155.38CBtN2Q086142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3c0bae278f2d - stable/13 - getdirentries.2: Reference directory(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c0bae278f2dcb5e68ec3c37387d6bf28127634b Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c0bae278f2dcb5e68ec3c37387d6bf28127634b commit 3c0bae278f2dcb5e68ec3c37387d6bf28127634b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 38d5c1e525b0..1c623fa59124 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -27,7 +27,7 @@ .\" .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" -.Dd April 11, 2022 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -197,7 +197,8 @@ Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTn2dtsz4tYMM; Tue, 12 Sep 2023 11:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTn1Gg7z3RPk; Tue, 12 Sep 2023 11:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4ucfAA5o57usFiRJSzrI8k4dNK6ngsZ8sX9jUl/03I=; b=k3QvNHaYfuXnK1duHJNphCmRutgBDFQK+vwCwmXZWa6MMwjxWE18eDsWdQJR0yr2rii32N GNQV7eQldhMQS+Pp0ITCAms7ucIloZQx5/Sp1EoGxACv5ruWEcHIXbcm28/RcCvBl6mNCF SpZmWZNq8nnM8ukE0qpnhP95vhvvvLBApbO3NeisyZdSuPjPjaPTnkd/On0tSzJDahLu8T o4IaMcdjSxfTVNCW2dfR3ZVyFLfrDFKaRGWfjB+xdVO+hpkwTtW3eZD+xjk304A5i2pL3x EOTIhFGXcuz+3OejYFzKAQTYneZiw3OqxkfrhwIQsQtYfd+765HFTQbiHVCtzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519725; a=rsa-sha256; cv=none; b=NpGITWFo2YwTme7i6yw/B6pKp5990t7TmJRjm211cw6Mg6Q0wuw8UWpZP+KG/P5ryKz6OL b3DNBy/8kG6K6Mb6Gbd46MqamGH1OtIFSDPVdFfG3tA4MqqGC7s6VSyXp2Mt8FQAx/8AO9 dMHH0d2pf6P6/Xai3VBRlJ6kjnV6LVZkpx8Zn7gzL02Q4VWA6Zkku2+878aFBvaNW2eb/w urDehMrlm86isJeEomWMH47axeyOXWFwXa4N2eYGzWseTEJFwp3lHQ3Pc4kRRx2LD/h6sU uI70czUcuo2E6tQFXMfkunhzEbR6k56QfFpF90LXPtcPGjqTeICP2yufaOZSZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4ucfAA5o57usFiRJSzrI8k4dNK6ngsZ8sX9jUl/03I=; b=rMnwCAqbQ/0rPTW26qAShspEa3dTtZNh4/U5tpAPXHYYW4FmMz9rqKSCVAA7aLwVC4lNzp J80V1ubV1YLEnTKIxbS65tZ0AdETWFxqXenhmmImysJTzOsQsa5H1PuEttPIopizGlWoc/ q2quyFUskarzIO2osOQORykmJowkf+YhvM3fKQZk80cDULxQs/nQV8eHnBl99bWimLpWed 46sLn+4k7jbDMzy816C2d+7+AclerY2bFSWyQm21sO8BvpAxXAWiGgcpLASxH3MRDw158E Ynrf8mPUgpQYwSGFqXIBmFAGIxwptN9z964BDqC2w5IugXXdNvaCovJFJpqdgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTm6xCFzWRL; Tue, 12 Sep 2023 11:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtO2U086191; Tue, 12 Sep 2023 11:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtOVh086188; Tue, 12 Sep 2023 11:55:24 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:24 GMT Message-Id: <202309121155.38CBtOVh086188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: db3e4532afdb - stable/13 - getdirentries.2: Improve readability of dirent members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db3e4532afdbbed61c016e04b1feea2d046f9909 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=db3e4532afdbbed61c016e04b1feea2d046f9909 commit db3e4532afdbbed61c016e04b1feea2d046f9909 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 1c623fa59124..0a06cd6b947e 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -70,12 +70,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMTp3Pz3z4tYTt; Tue, 12 Sep 2023 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMTp1SRRz3RLC; Tue, 12 Sep 2023 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evhr1/Osh4PzSrmvxOKJkdHjJ7UdXWEJ5wjbLR0thgI=; b=YXpVCWbCAedLyTOsW00cI4qsniYokmai97Cl/uUEz4OaEJokJOMDKRJx8aXurXwA3HDvl1 +ka2ZxyVdEHKDOtmZ5IZSf9dcBIy/zd/3JWoBm+NNQ8aNJbrqeNp4hzE+ytISWz2hFtBGq TUOHGcG/g0Y/t3L5LQ1WdWRn8RW0XALep4ClSUbVpqACvBRQ8kaWJMb9LaIGeDWDSSJy2+ ZFGNJ2FrZOu7ACZ2o1wYgDVXhZmWKVEqRBaY5DxvXXA/XM0kwtZGp9IpqDzyJRpNgCxmeb b4JgNFKcNOWfmogDc4pwRrIGJ5VP4mhXWZWElNMsjWmm32rXbQ3VVC313WBU0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519726; a=rsa-sha256; cv=none; b=lnPL2iZLFflrrtWVH40CwNmE/IZ3KPrHiUbr1nLnEd+UHvI+Atwuf2kN3c/hamQFfX/KbB k/uUpqndbLWSdvpdEvRKWkjlEXDZI5c8XF09/lpG9bElnasLLps3fysrWlWF+RKupNFTfK 3KQPrcSYRd3EEFolH+vEjUWc5o8ALT3qMKdp+Oc4UXSTaaaumwG9nYfRGRSM/yiYKfBeRN t5Jj85AjviqxVyxw4Nc7o6lEYEVTLgOEh+/CWmKdJy3xOGLnT7Z2N4jRgTCi2oWRI/mOIl sKqV53or+r67DUYwtWoNJjvVAZuNuanUAEk6gEdnlOtGuf+pQXaajs76IsbtqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evhr1/Osh4PzSrmvxOKJkdHjJ7UdXWEJ5wjbLR0thgI=; b=H90f0hddOIuF74JM1WYNXfkvaIGpyo/R+hPe7dVVI1cnxx6T6qaTQ0WoRrjuviWcWIdNL/ K4H78xvDeuYqzmEWpY1nZ2MU1SciNllZq9hUgvPUAotdXMEo6d4BMCGmMjABYGWnOmUVla MM+rUc0OYbIRP1p9Xvy1tjn9nVp2+suGKKK0rbaDLq+en5WbWGTJj1XTqKUu0Gku5Et9BW 6Vrslm2aoFVfmyK/O5fWikff077LTKKsBhN7qcHSlvnNlX/9kBvHAbR1zMdZwkYxh8tPmu zcd48DPKfZvcfY5qZdpZL+H0B3uzGphNHX9L0iIulFgdEcHcvBf/eIxB9oU1FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMTp0Wh5zWRM; Tue, 12 Sep 2023 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtPAi086229; Tue, 12 Sep 2023 11:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtPYt086226; Tue, 12 Sep 2023 11:55:25 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:25 GMT Message-Id: <202309121155.38CBtPYt086226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 691f3e7fcfc9 - stable/13 - getdirentries.2: Reference dir(5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 691f3e7fcfc91e3e0dde095f536de881e6762b67 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=691f3e7fcfc91e3e0dde095f536de881e6762b67 commit 691f3e7fcfc91e3e0dde095f536de881e6762b67 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 0a06cd6b947e..74fd57f9d74f 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -198,7 +198,8 @@ Directory unlinked but still open. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMV36xHtz4tYm7; Tue, 12 Sep 2023 11:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMV34PjFz3RwW; Tue, 12 Sep 2023 11:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWpfGgZLxAfrYdsXQq5UfFEBScwD30jhJULmKq6D48o=; b=EKPrIneZ82KEq3g7+B+Bp4K4iu+dlD6jvfKYqw1Br5uh+wwmA+nHt/wjYQzvEOqwghiesa oY1mZw/tMDOpLsmn4tkgrT/7zlKEuAf4UmhA/ZqGCBnEL4utxlSe0Ka2jSXwLPcOyIakdM oU2Jimuo73xkmSfzExt4Dk87GCkKwsnCfG006+ICs9JmQ58aA6VOcHJb6BJ2LTuenB5Z4q +ke75B+LwYAWfEeYv7KS+4DdUUqQfy8Dq/qMx1lLXFU19TodOGWruHJIOtEucmS+yjvE3x 45YkmhOVkuy/C/60jXvJfuIMRN8Tm+AUsinPphBdrnZrxCcQrVymhV4ddlpF6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519739; a=rsa-sha256; cv=none; b=DKA6zLay8pUrdq2gEKxxmVyKFCqNAhJAmu3ug4RRvfuHRc65J2Rn5lR8sD6I8GQUDW6dGR M8q1OEU8mDPgI79QEKMvZVUGdhx3rTLRb0MP/Cjj4GeNp7t7A/M7UX18ve0dcMTUSp3w1B Wa/lcBbmGw5DPiT+kXflHajb7jR3Wqwr22YzxXhUTw6+L1HgO8Tl96V4CZ1aKenmVr9aAO cyo3TTC8pqMT6p54TeAwcqCQjajvqXRrl99iRAY6z/iB70I8hWBOrlp0Ltno4FyiwgJcuP g+7TLpevRsgE+1eBQ2lNM14oiW3hIdU9uEh4KACsyvQmIGF7gKwxHNrAne/IFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWpfGgZLxAfrYdsXQq5UfFEBScwD30jhJULmKq6D48o=; b=YATBJ4jdOe/+Kbo6JJJqUt+3QKbLV8d75rPXYahnnzSlXfi9AgnMTBrV3Uc1AxUA4yw1TR A6rLez18GlBn6XT/qdh+onUnTxQBEY/gZbqdPR8ZjPU/8xzhftxfFj3VxiRvFW/yjALjGW GnaCRkV1oB8GCKSYLGcFbh74ls11473Enr2nKwS1FcQujeN3QGIdrVXS1tsLwZLNu9SLgk TF3VgIuPRCItNilwkvruS/uj/pGigQvFf5DHatsBOC/+DbYp73NqZ/bZlmFzoxt/kRbXYg cpRDPIfbBPTHwYnHmYYoIIPOyj3Qkg4M/qypk6ShgFuExryEQMjWKVAnaleo1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMV32C69zWWQ; Tue, 12 Sep 2023 11:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtd1G086567; Tue, 12 Sep 2023 11:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtdUt086564; Tue, 12 Sep 2023 11:55:39 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:39 GMT Message-Id: <202309121155.38CBtdUt086564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 29a28b9940d5 - stable/14 - getdirentries.2: Reference directory(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29a28b9940d568519aac4574ccc293f205a732ae Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=29a28b9940d568519aac4574ccc293f205a732ae commit 29a28b9940d568519aac4574ccc293f205a732ae Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:03 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 38d5c1e525b0..1c623fa59124 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -27,7 +27,7 @@ .\" .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" -.Dd April 11, 2022 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -197,7 +197,8 @@ Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMV46KrGz4tYd0; Tue, 12 Sep 2023 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMV45W8gz3S4l; Tue, 12 Sep 2023 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AePt8sB7y+XnUrUkQ6SvOrG6Bm2S/7wz6etv0YABpQ=; b=ar2ShORf3byXl0IOqdWopVt26qxJ099wJbH4uZiZnOMouRBKYdw0rZyfU5Nw+DUTeJ4CGT C39/KlSMsFKuLQV2z5WINGXGs8kcm+fRa6wBPznzSpABs3CRmvqmH+nX4dj7Fzxse92jwD bMU+RqdC7m1w8MDNrm700qwPVQd6HLizF4oqmcGTY7R4UNxT373ASMoGIuuh18m7ZYd44n GsfzZTBULo/AvX3GY8ahMYaqJZgOaSfaiQumB+TI4WW5veTNVNO20EUYdpvC0elt7kKfno BcUWVfoG4+6zAKV860LfzD8agOxlCTr2DbWkxlo7kydMichice6f73E3HfkOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519740; a=rsa-sha256; cv=none; b=QHq3VXa+5IrFDxnno+cKH1jsVGYfEqjae9zfVUbJnhozOcZieiZcfVW9i+XhWtI8HmWE/R ZW+2vfE4yFrzEcUQqiLSAV10/1uOssm6xYknLGyrEknRlDdM5/MsPZ7uLq/Qws0ArL33PZ 8M7HZ+bX+LejbHbZh04sHMkEvMvvcAd1K4iZ0Cr3Kc85MYQbYNqzV7ReL0qy3lzRgCxzzy j7OagGes4jAUEs8gFae4A1VUDcsQMZ/TvCEJoCaQv1Ckew/MG4jzB4u9PV+4vuK8J1qfht JxTbQEEmae02ZZBFKZfdIRTQczas1PofEoF+gQcJXrkQP8A47/QVjzwSeJarog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AePt8sB7y+XnUrUkQ6SvOrG6Bm2S/7wz6etv0YABpQ=; b=K+NS8IOnGdF/AZRjkgzLe63dYiZoQrk1rJ5EipPtF+0Fw2EIEa/Qz0yldMweY+Ye/TZgln cTZ/DDtxC6/0qSSCwHDDeno1xnz+G93DNxfvovxPsk3TN8DfGW8/+4itNun0Oel7dKB7oW XTJvVx6t/D871JtC2Zyc4NehJKU2WrTbl1U6GjMwHKajOZ/8ErAEp1Yee/W6RR+QxFkaMV ua478EElyxoAerQIvjt65NvR04No7AO8bEpsuzHkfr97dfUbhB5ZOk4Ssp8Wp9pAJMhX9h w9uTn0E2TqD+adWhmIs6/D19gXu5d83BU0ggRmn9DeeelVcMvlDi+6+l5CC7Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMV431xkzWKl; Tue, 12 Sep 2023 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtePW086613; Tue, 12 Sep 2023 11:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBte7E086610; Tue, 12 Sep 2023 11:55:40 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:40 GMT Message-Id: <202309121155.38CBte7E086610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f4960baf8075 - stable/14 - getdirentries.2: Improve readability of dirent members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4960baf80758aa34e17210adf1741dd6238ed69 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4960baf80758aa34e17210adf1741dd6238ed69 commit f4960baf80758aa34e17210adf1741dd6238ed69 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:11 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 1c623fa59124..0a06cd6b947e 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -70,12 +70,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlMV64D26z4tYpS; Tue, 12 Sep 2023 11:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlMV55QVqz3S9D; Tue, 12 Sep 2023 11:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpFdX09Ss1DwCnwwkL7v99HEScRMTrFOTAI+lXNkzDk=; b=f85nMbeDBpyj53CSctX6wSUE+IFjRJI2B2RogMBHCvd4gezPhUwk/Dg49g08c+VKUtILk8 NWzYExatl3OIztgKyqmVM+GDhm9gtbcqYjKqeQ6uuvAi/M7654uen193T01C0Bl4DKrQ5p ct8qJqTQyO+xywYq0bYPQKagG8T5d//bgx+Wz2Jh/Lg+omHar3bYflzXcpwdDL3cAecple WquVC0ffv1LbQlYjpUK6zcDz4FVum8VTSexCTO/aBPtmujwHJccPXaQJ+ESv2vXYJfJYeV csg20xUIIUq1BqBzYDqtm/Lpbyf+jpfWTRtB7BG8lU0641pDDbtmPKftiAonHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519741; a=rsa-sha256; cv=none; b=Q3HLlmmb9P3PDBP31yh6ekQd0vLRFPETc4I0WN7vod+QIf7fT+GD1WEOIzhXkQlpmBSZfI T3waszbxIT1GTkMOLZCutR3vkDBbl5qjWbAp17Kg8swkMNKqbkHH6X7Uj93MCjq8o4z1RL S8mdONGaj+d+rXXQ+md7oIBCOZEOu+7Jwl3g5LqMGe2IrUnvC9uLdA9fdW1utncj6sPkC+ nQ6bpWntO5DBo/XqkuYMQgByFk6QacovBvfB7wd1LjcpCAy2u8fqRfn+Tci3GL/1xC781d 71N7EqkNlZqxWYFrLwc4WXS2EOITgKG6FeyCMHSuZBjM4h3q68Pu5lS841rBJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpFdX09Ss1DwCnwwkL7v99HEScRMTrFOTAI+lXNkzDk=; b=Q4geH29EtpmXW335WhObXybLyOl1Lq6JjyxMFY+fsJU/4FqIkJvLRfit1fu7bSg4KjNT4V +wG6gSdEMMpwR3A8vJhkR0uHDmbaabnXVryz0j0usqx0rseD/MA+89XEYtf6QsZYuphsro QsPcKYPmn13T7mpCdppb/BHih5hkERzZ2guCzWuZhLTL6M/LtX0XRJ1K8g8bKFC5v7LMas LIUBuP6W2ugvRdD5zLBHGKTvLLq9eQb5l1YaLyGzLgqIpYmeX4PfOIQZBn9yxUUlx1ZNPV SVNH8Odt7yPjgzZCjwrUbP+Qz67RSqoCaJsf585/6SU/OVnXcFYM3jNGxf0Xkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlMV53jx6zWMy; Tue, 12 Sep 2023 11:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CBtfAE086656; Tue, 12 Sep 2023 11:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtfmd086653; Tue, 12 Sep 2023 11:55:41 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:41 GMT Message-Id: <202309121155.38CBtfmd086653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d2557f02d126 - stable/14 - getdirentries.2: Reference dir(5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2557f02d126c1300b491235b1264bcd39d8de50 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2557f02d126c1300b491235b1264bcd39d8de50 commit d2557f02d126c1300b491235b1264bcd39d8de50 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:18 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 0a06cd6b947e..74fd57f9d74f 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -198,7 +198,8 @@ Directory unlinked but still open. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 12:23:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlN6f16Qwz4sTQl; Tue, 12 Sep 2023 12:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlN6f0gr9z3ZLn; Tue, 12 Sep 2023 12:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694521434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZjqybK4szpUzBQzDFuSAth0Q4JngH5T5bQUPB9Wyx0=; b=UO+WD7jnUGzp2o06o4thX8YGwNuYlAgrYow35DBRCpTJCbQIcSTk+3tKEWbjdMerS3cwHD TT56Y0OKWIFUKG/DKrj12Nfuk7c+Lzi6e77ynK04Pb2aYeIW3Q5m4rv3bnvIxcXpViY8ST Xl91AvtlW5hYP8YvVaKrRuL8r27ODmAclC0BELSsGZQdtFmGflykhIhXlxKQ11zorS14o3 f4YmEIZy+7hIihMU2TOBpeQAhPhpyPpDsYK/Z2JwvrSF4y9+jshDkz23VFC2yc1A4RKWbL PB9xAuVu0XSr9wkCTtDBO8vwkkXpiXyH/bIsgMP65EOamTQvw8E2B1dXLKYP0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694521434; a=rsa-sha256; cv=none; b=ltiTOe3Oh80Meb9yPyW1e8oIxa2G0iEhEdfFP8MF2ke940a6VjFbAnBnBdl5TN5g8dFsGZ vHNh1jQTPveshjzl/A/6f3bFnh75zIl6wyWga66Lg5H2Cs44N3aYAUXboZz1LZkP0G+Xzi 3UTyo8sTxVQ/oz0O5Cyrf7KCdVX9ya2B3NOFZc5v1GQB4Et17Tw9xn+3Sr38QSRS9ENKpA UsjoKfKmJaEeZofFe/A7kLDhyYNnpnpCtbGCTmN4o8aOdIXgu93MrBhe1MBlbKPWrA/21y vD5t4bRH2UdpZfMN3fO5+w6wyfCMZ1tjQwcSvzHsb670MrWt/c3Q3yPjJ5LOYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694521434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZjqybK4szpUzBQzDFuSAth0Q4JngH5T5bQUPB9Wyx0=; b=NoesS6buZjRqDXomv+SHglo/o7L+s2kIK1r1LV+pFmN6IxltegbEMtJixprAHqdJIE1voL Ir1vXm0bSccAn604a0YK9MvcORL5NWdej00GnYxlZRSdMX4vjH4m4OYU9LaN6Ttij3i8NQ wdZQowhOSyt4mkn2v5W0tkSS8QXaMMSU046PQ3hKwOYKJR/yA43SSzUREbOrP4LTf9p/46 XzML6avzGaILhkZQQ/XURNeqAjh70QkAUXcKYW7Tr7DmPLfcAcu5VELhkMj8P69yfgFBmt nwi2ZgyxgYL1JjReQBl1OCHtM63iuHHmpX6TY/oeBJCO8UcOdM5WAr2n4XUWrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlN6d6s6HzXJv; Tue, 12 Sep 2023 12:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CCNrXo037226; Tue, 12 Sep 2023 12:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CCNrAO037223; Tue, 12 Sep 2023 12:23:53 GMT (envelope-from git) Date: Tue, 12 Sep 2023 12:23:53 GMT Message-Id: <202309121223.38CCNrAO037223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 78847e1e5927 - main - pkgbase: Move headers and libs out of runtime and utilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 commit 78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 Author: Doug Rabson AuthorDate: 2023-09-11 08:38:46 +0000 Commit: Doug Rabson CommitDate: 2023-09-12 12:22:21 +0000 pkgbase: Move headers and libs out of runtime and utilities Headers from src/include were in the runtime-dev package but subdirectories of src/include ended up in utilities-dev by default. Neither package is a good choice - the headers in src/include are not useful without the libraries contained in clibs-dev. This moves the standard C headers to clibs-dev (C++ headers are already in this package). While working on this, I found that various clang libraries and headers were also bundled into utilities-dev by default so these are also moved to clang-dev. I also added a FreeBSD-build-essential meta package to make it simple to install all the toolchain parts. PR: 254173 Reviewed byb: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41815 --- include/Makefile | 2 +- include/Makefile.inc | 2 ++ lib/clang/Makefile.inc | 1 + lib/csu/Makefile.inc | 1 + lib/libclang_rt/Makefile.inc | 1 + release/packages/generate-ucl.sh | 3 +++ 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index bc1cfd96dfc9..736a47854534 100644 --- a/include/Makefile +++ b/include/Makefile @@ -4,7 +4,7 @@ .include -PACKAGE=runtime +PACKAGE=clibs CLEANFILES= osreldate.h version SUBDIR= arpa protocols rpcsvc rpc xlocale .if ${MACHINE_CPUARCH} == "amd64" diff --git a/include/Makefile.inc b/include/Makefile.inc new file mode 100644 index 000000000000..14d7bf96e6bc --- /dev/null +++ b/include/Makefile.inc @@ -0,0 +1,2 @@ +# Make sure all our subdirectory headers end up in clibs-dev +PACKAGE=clibs diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 0a2ae8f6b802..2dfc966726b0 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,6 +1,7 @@ .include +PACKAGE= clang MK_PIE:= no # Explicit libXXX.a references .if ${COMPILER_TYPE} == "clang" diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index faf01b293b92..55aaf589f48f 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -1,3 +1,4 @@ +PACKAGE= clibs-dev NO_WMISSING_VARIABLE_DECLARATIONS= # Can't instrument these files since that breaks non-sanitized programs. diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 4832815643ae..263d1e340f3d 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -1,6 +1,7 @@ .include +PACKAGE= clang CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt .include "compiler-rt-vars.mk" diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index de3fec3f0ca7..fa13e8e334d2 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -44,6 +44,9 @@ main() { certctl) pkgdeps="caroot openssl" ;; + clang) + pkgdeps="lld clang-dev libcompiler_rt-dev" + ;; # -dev packages that have no corresponding non-dev package # as a dependency. From nobody Tue Sep 12 13:13:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlPDR0Y0Jz4sflm; Tue, 12 Sep 2023 13:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlPDR0236z4CXZ; Tue, 12 Sep 2023 13:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694524439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8yCrjn8zDngq++nXwyuBGWdNvg8x1xiCm+Ufkyxbz0=; b=OjiC+c4hjtrpkeYXoh0SB0HDif+eyb3vEwGSobV/4/hkYMcbm8zmSJuORQUjrmaHqtisA7 C8KOAR5KoMn4UQPD+FjcwuQPnmVqO3Fe60vi6SqLgi9gVQqkEy9gHOa/yj1Psmj6iTsnbt PmCwvLL6nFvoZCvaWrMjPoEhz2dpRhxmKeLphfAFipBx+OXy4DMaRYhoZdCoPoU/Ocwtc0 6VoSQLz6m4+bFmzoXsBODuVOOr52FNt1dKt4zLHggd5i9TzXPa8yuzPadc95J9Gnxn04O+ reKmuefkeAWZGSccbw4JzIkS0MssCsTVQ5bYOT+HniAue7chWMTdP5skIExz/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694524439; a=rsa-sha256; cv=none; b=JOSRGXl18DVc5xACyvOC99Ef5PX7G5B3o1cvnuYQJxZ5h2WKJKomVfMqyBOpQZyxOh+J7S aeeA0Q8qg1Y86bXolHsrV9vXe0thRUPavlRtr3kB7udZVKHyZDDebcM1rRicr1pgKzpUSE VNCbn3FAi3rUt7zDyK+MlrGjf6pTOAC2yRGYkP8dyuFFh0mQ2+AGiA7l9UOotn+mpdIZsq rzcDOAg7bdDe47JAgdOTxy5LiobEa49wAeDR+8KnkKg3ROzn9BUhfWz9bOiP7tIZjpGpUj eEkTOQG2dwy4h+FuK1RynQFa2Nz9caTHTdhA6cTXHjcjRudCGXQhNCTBz+kOTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694524439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8yCrjn8zDngq++nXwyuBGWdNvg8x1xiCm+Ufkyxbz0=; b=PVhrvRnzKnEwFEjv0hgmb8ELxGX+aHyNYDWUJ2txV58sZEZq12GmeQV2bvWvHxJvwWGkJj GuXDPvDwD+jJfEBuB/DBc4JY9Rl7tq0Ru/fMjp0AUE58Le4/aIBNlKxMhLQsNIQ6vuHvOF zbMb+tvYvcv7l4gfM/OzB12A6xlb0MJevAAK/xdoXzQ+CQH/VUNwgx6TfGCdqGk+ewrUzv RkMLZQug3Qo9IB1jp2CxsVvEpkPNN0jeE9vrYhigOFEZ7dUpYmh50cm+8iV4Ve4TBliM4S jeEbAxRoe3pY332CeA0BYYxzE2oI8Ql6eJl7J7bXRhfT0y4wo/IXy4/+tmTCwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlPDQ6FgKzYgh; Tue, 12 Sep 2023 13:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CDDwcV020522; Tue, 12 Sep 2023 13:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CDDwGa020519; Tue, 12 Sep 2023 13:13:58 GMT (envelope-from git) Date: Tue, 12 Sep 2023 13:13:58 GMT Message-Id: <202309121313.38CDDwGa020519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: b24ed9c52dd2 - main - powerpc_pmap: include proper vm_radix file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b24ed9c52dd296730c23d48e95c5a53ef67b402f Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b24ed9c52dd296730c23d48e95c5a53ef67b402f commit b24ed9c52dd296730c23d48e95c5a53ef67b402f Author: Doug Moore AuthorDate: 2023-09-12 13:10:15 +0000 Commit: Doug Moore CommitDate: 2023-09-12 13:10:15 +0000 powerpc_pmap: include proper vm_radix file Like the pmap.h files for amd64, arm64, i386 and riscv, the one for powerpc should #include vm/_vm_radix.h, not vm/vm_radix.h, to get a definition for struct vm_radix. Fixes a problem introduced with 429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5. --- sys/powerpc/include/pmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index 642a990bb49b..e300f3750698 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -75,7 +75,7 @@ #include #include #ifdef __powerpc64__ -#include +#include #endif /* From nobody Tue Sep 12 14:19:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlQgX47vqz4t21m; Tue, 12 Sep 2023 14:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlQgX2ZQgz4PJ8; Tue, 12 Sep 2023 14:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6skAdTkJDvb9xMTM/NkOXdw2lHDo2V4vDW4oVa/4SE=; b=TaPmSsZSwIYg5575qt0auAx46rPo3AnxKeB0UkihvQiTU/TwKsLwzqJvNdeVy/+zXPo95W SEKCp0WFMqzPEaGD2k9jf68WtvY5zcqWqzvYeWG0GO57u6C/dnPvOkDaAYGCniMIb3XJmU L1H2nBDrsEbh/zMLHsEFYEdZW6E16ofQk48bw/D5JJiHG4ZOVkyQukOf8MRmpS4CefBB+Z ypQzGhpUUEHF1jBNUDlH7YDljGCr495o3S4jrB+4Xq/uuB66PRiykroBLkihJKH8ZKbVeL BXMK2Gei1SrKnXEbINJ1jjtNidIw5gw7x3YD4/jnD0FoUyHnwwcPI54V2gSC/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694528344; a=rsa-sha256; cv=none; b=a6dBsrIhYmiZbWfRV04C7hoxUWkY8psHzsNd0sFe2NmbjPIgEPxeGbBL0NvciFPw/oeCPd vhwvLUybtgrfQxN8GLQ2V4SkAxqDxquQCDkuEvPdYvI1YkFiMFGukgRnU2dbQMZDVuRVCg fBzkdmSMtQ4WvoBuEfp7HIL7Wl10STl00lqUlGW9s8I83jGW5hMpd3gpeENEPQNPMswcBC Qr6qR6j8VUD8UvgJVPuU2SEtHTovhVvZ3/TSBtRJA2mGz4sgZYiSbZDaZK/TnyKRFfnZ8u pE4MRWqtIr9gs5mIMYVv/2YOfaDcBuZFiU0J3OPa4xrIpQq+hUDYj3ngRiVvRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6skAdTkJDvb9xMTM/NkOXdw2lHDo2V4vDW4oVa/4SE=; b=AmTk2SOLO9Ur3Nm3PB+jvW8B1I0ZsWSzoPuKXqYMmIDmSk8fosZituaLBgWrNP7pzpMjPb 8jS1n59DJa8oUCbfcb+xE3u2kHkmYTBjKFzNi62Zm/+ki79eYYFPh5S6fxhGZEQOGM2Od4 uQ0V2F3EepIwwbwVU43W03QUU4Rf+ePAkCoGXklrhBKXWGGlzG9yO/stHAOauqTZzoAu+Z vQsHSnkqqTF74k0gyi/CbGhiObDV4i+gvLTfgNev/YuHfT69UNg1RA2fY7bA6IQAmFn6Bq m+ioeI8tZdadhMbTCtXjrTiwCU54G4DADMthWpQL+c+q6JLW3ycn0LPTh6u07w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlQgX1gmvzb3r; Tue, 12 Sep 2023 14:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CEJ4fA020249; Tue, 12 Sep 2023 14:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEJ4kh020246; Tue, 12 Sep 2023 14:19:04 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:19:04 GMT Message-Id: <202309121419.38CEJ4kh020246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: deaa6984ada8 - stable/14 - mountd: do not warn about using class mask with -mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: deaa6984ada80e36aea2f16e5f7211dd0d14800c Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=deaa6984ada80e36aea2f16e5f7211dd0d14800c commit deaa6984ada80e36aea2f16e5f7211dd0d14800c Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 14:18:52 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 14:19:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlQgj0xGGz4t275; Tue, 12 Sep 2023 14:19: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 4RlQgj06C8z4PML; Tue, 12 Sep 2023 14:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3srCNDMBeFpTZ+/XJKdALmAmg3qX5JQG2qQX4PXF84=; b=sCJaZT7qbfKFm17fk0G5UXJn/XU15S2kN7hqo5jAeGk0Ip110mrDju8Ocov4gD8gBh6gCe FIozYR2wUXuqv3o+98tgEPa6n+SpYB0EY0JnYU1QtvH73FR/w0OAHferLdpzTIBbsu+TW/ j5QfS43ibkxdu/cN6ZH8O+yNSearmSAk8ImwVpbG9L6hV/5vRRoRD1ZZ55RJJqZ/Ouot+A NfrdWlpe1gbAiSIzZPxFrbqhF8gxbPXkBgocUp2XB6pW9Yee45a14eNlTuRN1l+KWE9wLS lYfFEjHDRgSPk0EsfYrgqgSfZRiEDSo9d6cXqiKz8uCeyQ+oCG+kX1SJ6Cxajg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694528353; a=rsa-sha256; cv=none; b=OwWQXhrHu9GMO9uDJAGEWEvTYJ0K+2qT9MAhRcV9Pi9d4vUQH5ElUJOLV9oitJkXaf8y7i frE/31Zg/1TKNpF54eBMOI8ZI9poWcgZvQyfHkcct+sftKZHUUA24XBiacIOhIQgPxeqQP 8qD7LPs+uzQvE8ajop+WhgD+GmW/58AzscAfeFllMNl1wDbBx45fAJManpAvY7+Z+55dfp lCdde0aqYBH0gtXGWgfyvSP+dn+o9X1mHB2bWdWXRrac/mZBc4uMx2yWirZvZeKQFhVQLc lyhp4w++DYZYTnRC6xhooa1oZ8ijnxcSC6XJh0YGu269IDv6de0GgDIIjjaFdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3srCNDMBeFpTZ+/XJKdALmAmg3qX5JQG2qQX4PXF84=; b=IXr+qdSMisCDmw32V5yZif4Z6h9Ql1fIQTsc6/rj1hWHE1Q1kI2pWuOYm0/WohhsY14BVx xg1tCC73sj9hRGkI4iylWUJi5BkiRMKkSbrmlUBcnZsLvEzum+0dOdCMlCes0yZQoULPoM 1E3kmPZijT9tfiTo/T5+nArSDQQ+dgvVXW0RaCpItCRT0OOC6QaIJQjiEY9H/dThN61+Hj OdRJ9vH4HhU27NWickkZY4G1WX8JykRKP62sLRN6hOyfC+9zl3ae/egb+iRIimqTkQXwnz Vwr7T6K4ODhwSumLfPGuTN8KgTd7Ucyya75udZzr6vUChUbfX9jET8CzjHui3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlQgh6KYCzZvK; Tue, 12 Sep 2023 14:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CEJC0G020411; Tue, 12 Sep 2023 14:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEJChE020408; Tue, 12 Sep 2023 14:19:12 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:19:12 GMT Message-Id: <202309121419.38CEJChE020408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 79ce96abd6c5 - stable/13 - mountd: do not warn about using class mask with -mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79ce96abd6c5dee2ddb2e35755c7ff9156510d81 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=79ce96abd6c5dee2ddb2e35755c7ff9156510d81 commit 79ce96abd6c5dee2ddb2e35755c7ff9156510d81 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 14:18:33 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 34c3387c6236..eba59ebf00a4 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -317,6 +317,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1747,6 +1748,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3383,6 +3389,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3416,9 +3423,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3433,7 +3437,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 14:43:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlRC90C69z4t7sl; Tue, 12 Sep 2023 14:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlRC84svWz4THr; Tue, 12 Sep 2023 14:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694529780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P3xIyR8mRjHEnS2aVktq3fcwyq0zDh2y3b0Jw4I5+3o=; b=eXOvSI2B6VoBPEXEc/WW49s+19UfjMPhHZ6liSYd7AQmY94AyhBDXvfAnE8lOa+TeqLjy9 RtVLmIwXxbGQGklnIcg7owJJY7z8p+yFDuJfwPS8sa7vYISkjwyJLebPjOyPz4MuJf1PUV taTiOe1F+7tX1+IC7MdijCBfGThkx02hgtms8l7wM+bpUJODzTM0ma5R6NRvTfJ4rHJsqe JFTItITJ9ow7/6vA/nNC/CPNtJ8Z9KXWNI5teWs5CDpSPOI6sisTgBFn03jjLECSWBxZ8q yhKsJ31/8goApyqqP5m8fURDtwhhf886BHL4Hd0hPAPv0intF6qRXpzIEqIi3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694529780; a=rsa-sha256; cv=none; b=UZSn8hB1e1RbzfGHq+ALYCptdCJwsSpVucntC/gFTLTAvpOMEsoS0kIjnakyhlY/6AX+HS L8v5VdHWb4iwTlDb3LCzD4rr0TU33Flu7/Z5JpwmwzmupjbPsyleqbnj0EDgZ6W0p0wr02 s+27M5gQu9oV760EnfDLXg8+gPOHOw9qDo6/QnpeM1L4nhQMjjkYetvE7T5YDrYhXDrfqr ttCpNiltmPmKyQk28j86r2s6MOdal684170CWulr0m1qh96L9vp0DHa1iUdk+/cRxEVZb6 B4gFSj5VXi/yH27ZGZrU8V6sb8k7yeXY2DxC1un5Tv1d+etImIDzJBjbkg65BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694529780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P3xIyR8mRjHEnS2aVktq3fcwyq0zDh2y3b0Jw4I5+3o=; b=yJ2IMzgSSyXU9cl8bGPJ7Yk6dP+esYXFh1ChNWQosE3keTtFtHYEEgfVoQwCOqPzQEagAt 6oZMTytfatZmq6uUtuEb6opVKax0UVkb7GKed4ZVP3sMGm2u0NzqDAY3IFkYcjyScknYyo XyDnS+2aOLvlOtrkt7MNaJhiqXboJ92fs8dRJEjxFygqMui8edm71U/6wQm/f8fVNP+SWE hkk+cqjHfVvG/3NCW9XT4tvOCWnNTo+Kr3ayBXlfvtf9UXRJAgVVDugNxS5rdPhZuZ9o5m Qgbu+vrRlq0cjBTn83fAmY0deoTN+6+jx9Jv6ViK3SMyIkBNrXoqatFjYdmbDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlRC83xgSzbqT; Tue, 12 Sep 2023 14:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CEh0W7069104; Tue, 12 Sep 2023 14:43:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEh0eC069102; Tue, 12 Sep 2023 14:43:00 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:43:00 GMT Message-Id: <202309121443.38CEh0eC069102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 06bac0da1314 - main - usbdi(9): Fix typo to simply -> to simplify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06bac0da1314907b8de37bbad559777ab418e811 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=06bac0da1314907b8de37bbad559777ab418e811 commit 06bac0da1314907b8de37bbad559777ab418e811 Author: Damien Broka AuthorDate: 2023-09-11 11:12:27 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-12 14:41:42 +0000 usbdi(9): Fix typo to simply -> to simplify MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/839 --- share/man/man9/usbdi.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9 index c42efc1154c6..47034b87c806 100644 --- a/share/man/man9/usbdi.9 +++ b/share/man/man9/usbdi.9 @@ -350,7 +350,7 @@ Example4: SETUP + STATUS - split .Ed .Sh USB TRANSFER CONFIG -To simply the search for endpoints the +To simplify the search for endpoints the .Nm usb module defines a USB config structure where it is possible to specify the characteristics of the wanted endpoint. From nobody Tue Sep 12 14:43:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlRCB1tNhz4t86n; Tue, 12 Sep 2023 14:43: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 4RlRC95Q2Dz4TT9; Tue, 12 Sep 2023 14:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694529781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1bRZU5fv2spsKVHtk4pQzXH6zzdBHhVUWC/AWerQ5s=; b=PsGaXPNXzWyTBigQZ/0x1lilGVn+SuDICTzE763Ig9Yjb/EuALYnJHrwNsAZMWhC/yGf4r APL2+c65sXennmSP18BDksFwle9Aqaoq+LujDSCcASb611CoZg3JKTkeasiWEEBBfk1jTR x4rL4lvGuC2fMbawYnH9WfWLEUSRHIKHE5mZkE7OgizD5xN0hSXLr/ZCaIizFr2yrjGWMn M4otYsp0QDmSNIF7xmGDgYbbVoYP/ZeRGM0FPa+e/9hJAcqn9+RKchE5LH+Eqdm161lRGy I4rrnIgcHou5e/7CDF9gpeBTbWD19K5vd41E/1wMHAS1b3xVwtPGUe0QKWbZpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694529781; a=rsa-sha256; cv=none; b=xR5ywDi4+nz2LD6nGHNPDefPWcKUo/ZZg3bUKXN6aAVVTqkbvUI8C1YiIzHg5TV8lFiHjx 3UJGFhO3pJ6BCVu6EVqZ5hCriEPCAu61w7N5uBN92i1zliSen4iLEvqXUJl/LNtRGMcYwy lM/I+Zaax0JOc1YEn0QrEaShUszs3B8bhCbapljiOBRsDp8nLqWb48F9lLwUaoAMIL2es2 1rdtYpCDpKznSUr6ukCC585bMayxA6gUAsT1kV41B26/HLx70YtJAGN8o5neagEVFkKBKc 7+Qx+cV3cPkRmyuUUu5tEVAqaHfpF0LRw7dGVpaollF4xOsESftS5S5S+xyXaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694529781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1bRZU5fv2spsKVHtk4pQzXH6zzdBHhVUWC/AWerQ5s=; b=oLoeuf5+Xz85yalXguWjPjlpxl+R7E7CrYkC35k0IHVgFHFCQib4n8kLCONnNK3uHo+YlU gLBzVHqkcTe6oPCtDQ51r0rKHIeuUHyQDLZVSQodvwAaqgNFuIhh3alE74DSIuuq1CQpm+ FhjfXjrIYoktZEhk/xv2Ayp/ScCiUUl0tx9Lk2SHm+bjhvs2CLY0bBS/9teGCGnhs70eOl hTiodBiPbYqmBPzsvnWdJvovvQk54FG5E7CbeAo3/nR2/fM/AzFDTvCU2N+hfHV2LMVTyC Tq/Y6oxD8L71Qc0LA9wQ0BS0eritvQNL9xxA+77HhugjVYR62tDuXfwBxsqMCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlRC94KgdzbqV; Tue, 12 Sep 2023 14:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CEh10L069149; Tue, 12 Sep 2023 14:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEh1l9069146; Tue, 12 Sep 2023 14:43:01 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:43:01 GMT Message-Id: <202309121443.38CEh1l9069146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: ff9c4abd9fea - main - sysctl(9): Fix typo translatation -> translation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff9c4abd9feaf13cf911f4655234da7a62d0c7af Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ff9c4abd9feaf13cf911f4655234da7a62d0c7af commit ff9c4abd9feaf13cf911f4655234da7a62d0c7af Author: Damien Broka AuthorDate: 2023-09-11 11:15:18 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-12 14:42:03 +0000 sysctl(9): Fix typo translatation -> translation MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/839 --- share/man/man9/sysctl.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index d2001384c9aa..83f526b349a1 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -626,7 +626,7 @@ For example, .Fn SYSCTL_INT reports the raw value of an associated variable of type .Vt int . -However, nodes may also export a value that is a translatation of an internal +However, nodes may also export a value that is a translation of an internal representation. .Pp The From nobody Tue Sep 12 14:47:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlRJk3PpYz4t96T; Tue, 12 Sep 2023 14:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlRJk2d4Mz4VmT; Tue, 12 Sep 2023 14:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694530070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjBYs0SYcP3quJZ+cHRt0bQu6EqVtGTZ6NivNZtnAeY=; b=T2A3C7ZzkFIRJEDvRTXMku/KMa60SktCDli3N3QDBp6AYGLVw7QG/1k6YJIgUyDVwKu/qO x862+L/kXJGOfyk8i+Tc1dS1MviErMmj4ob7Y4wqmUvgG1RFsXdbyMyKx6rSyjFveTOgtN g28FdL6IjbFknGh+bmxR/ibhSqoBzQb6alglx65O7f1WMll57GCuB5b4RbXXndJ35RqI1n 1nOO7cOif6k1DjuRwMVIgL0NNeKuF+R4xqTN/yD7dC/3NcqwSsbScOBhVSTl3c1FCwHIQ7 8N7YjBbC2TYd5hNw8xHA1oJYG027K+B0/40nRcNcjojJwg3E52AJlVBEOnyOVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694530070; a=rsa-sha256; cv=none; b=W/SQEM+qkPvhN2BMhBakp7ff7bAlhU+NKlKWHFWwfSP3inO8apJ21v77BZQMInS94+IySo VZHWxQkDqw9VZtxi6zw03QnMYMsySktf+DuV4HLXS5dwfhKYvb67vyI741y0WYASd0q6Et dx028qCDpMTm7MYtgnOdlvVKfvBeih1rKcsbavZxGhINPd6Bvzr77w1DFyewuLYqzBI0KO /eKw5W0w0eLyFTSL0S+XyS3I+i7tvjRa9FVTI4Groimg+reUUlwyYK9TWWrvkmh6pAtT7A K6mEFVmcar+dPua+A9ZRZ6VkKq2gkMsqUPCGBUs4S9o8FO+e3SaN+/X2ZDL2MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694530070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjBYs0SYcP3quJZ+cHRt0bQu6EqVtGTZ6NivNZtnAeY=; b=a+WSozUGj0odSYPciETNBmFRyvyzzrt3TBnp3O0JUR75q8vyc+/LQrJinxEnP2GYtHlucG uZNuiGl/m6Q8tmO0L3ZF/8lt0IqGxoDBooK+xi7dgoDVwAMUMcmkskbQm0mDbRHY1m71OQ /H/Cfu1zB2vcAUZsXLmND/9udctFIs2p2xOwQDF8k4ywMMaaQTv2lriqMdqAZOJlnXnQvP KrGxiMJHcT1LY/zRX5QBQKALHQU6Et9q1hFZ72Hz3C0QkXTRZsbDToZH6kjf78LkdRdkP8 Dn2wBxMNTYnyIMOneZaBwGw/pa9N+4pla3nHu+v2Zs4HXbVrkwDoYTtrO8ghtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlRJk1PPSzbYG; Tue, 12 Sep 2023 14:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CEloOo069892; Tue, 12 Sep 2023 14:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CElo3w069889; Tue, 12 Sep 2023 14:47:50 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:47:50 GMT Message-Id: <202309121447.38CElo3w069889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 0b294a386d34 - main - Fix zfsd with the device_removal pool feature. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b294a386d34f6584848ed52407687df7ae59861 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=0b294a386d34f6584848ed52407687df7ae59861 commit 0b294a386d34f6584848ed52407687df7ae59861 Author: Alan Somers AuthorDate: 2023-09-12 01:20:39 +0000 Commit: Alan Somers CommitDate: 2023-09-12 14:46:12 +0000 Fix zfsd with the device_removal pool feature. Previously zfsd would crash in the presence of a pool with a top-level-vdev that had previously been removed. The crash happened because the configuration nvlist of such a TLV contains an empty ZPOOL_CONFIG_CHILDREN array, which led to a pop_front from an empty list, which has undefined behavior. The crash only happened in stable/14 and later, probably do to differences in libcxx, but the change should be MFCed anyway. PR: 273663 Reported by: Marek Zarychta MFC after: 1 week Sponsored by: Axcient Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D41818 --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 37 +++++++++++++++++++++++++++++++ cddl/usr.sbin/zfsd/vdev_iterator.cc | 5 +---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index f3fea2ca83f4..caeb077a3de8 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -766,3 +766,40 @@ TEST_F(ReEvaluateByGuidTest, ReEvaluateByGuid_five) delete CaseFile4; delete CaseFile5; } + +/* + * Test VdevIterator + */ +class VdevIteratorTest : public ::testing::Test +{ +}; + +bool VdevIteratorTestCB(Vdev &vdev, void *cbArg) { + return (false); +} + +/* + * VdevIterator::Next should not crash when run on a pool that has a previously + * removed vdev. Regression for + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273663 + */ +TEST_F(VdevIteratorTest, VdevRemoval) +{ + nvlist_t* poolConfig, *rootVdev; + + ASSERT_EQ(0, nvlist_alloc(&rootVdev, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(rootVdev, ZPOOL_CONFIG_GUID, 0x5678)); + /* + * Note: pools with previously-removed top-level VDEVs will contain a + * TLV in their labels that has 0 children. + */ + ASSERT_EQ(0, nvlist_add_nvlist_array(rootVdev, ZPOOL_CONFIG_CHILDREN, + NULL, 0)); + ASSERT_EQ(0, nvlist_alloc(&poolConfig, NV_UNIQUE_NAME, 0)); + ASSERT_EQ(0, nvlist_add_uint64(poolConfig, + ZPOOL_CONFIG_POOL_GUID, 0x1234)); + ASSERT_EQ(0, nvlist_add_nvlist(poolConfig, ZPOOL_CONFIG_VDEV_TREE, + rootVdev)); + + VdevIterator(poolConfig).Each(VdevIteratorTestCB, NULL); +} diff --git a/cddl/usr.sbin/zfsd/vdev_iterator.cc b/cddl/usr.sbin/zfsd/vdev_iterator.cc index f64b0d98440d..e9283108ed3c 100644 --- a/cddl/usr.sbin/zfsd/vdev_iterator.cc +++ b/cddl/usr.sbin/zfsd/vdev_iterator.cc @@ -109,10 +109,7 @@ VdevIterator::Next() { nvlist_t *vdevConfig; - if (m_vdevQueue.empty()) - return (NULL); - - for (;;) { + for (vdevConfig = NULL; !m_vdevQueue.empty();) { nvlist_t **vdevChildren; int result; u_int numChildren; From nobody Tue Sep 12 16:40:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTpT25lmz4ss0v; Tue, 12 Sep 2023 16:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTpT1hMrz3ZPx; Tue, 12 Sep 2023 16:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=vHHz4SEH4yEZN0n6aF8Mv8LSi4uFxwMzIB9xD76Am8B0f0ix3uvoftmanXr74dMPC0B5ps EZ2Qpqng7hossb5rPB66P3TFq7bfEb5uYviKtW/QzydnBAsDGvq9wduL3Dg72sBYyoejxi tL5tDUtU7vmlG4wQs8hX90yQje1CiDPio4ruvmr3LtxUXQXhQmCNLP5PvJNRJ5+9cPzYMJ veECP6SLBMH4iWVCTJRFvHX3b4QrolN6xL00j7/iXxURjLkTsOwLUD8dvzqfdBNn9n0nZ5 cXEyZCKuAuQBMPmsmGVVyW8U7gjX/v8L6Hgot4fUwnWDTHpx+lL/My+ipC0Qdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536817; a=rsa-sha256; cv=none; b=YfBgEmpY+bLAQCZfW2fkZUVIA4OJw3MjPov/audkg0WJq686iX961yRXwOI6YLkI7Xhuyr jmSnK+1GIydJepgTAMhZbnpsa+boizkf2YsW707MQct4hpQ5pPpDFMYJPN8ARthaMjbIjR I7tEdmHEB5CzHBUOqPygraoJGtW4uZjIhG2jyddmiCAGEiMn06wVN72BIuMJbot1bW7wQ5 LDQi9f5PkAQjNZniYCsq2Z83KlQdf/3/GJKAnwqVNfhR4I6LVqtwtz0aihTWbHtuen6DC6 ZZuz2Nfivk17U2ZTNQ+r9DLbY/aSBim3uUr5oLcDypb2FWSALyDGdcDSPMDVfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=IfeTatZpSc/x2pachwX9SrfFF+ske84Qj3RHC70WWsGbKi+sv+v60WvuL8nhTsew0oA2Ep u0U6yEGVd8c/hFQyg1z9VS7DJoTkDP/hBQ6Eq9EwPRXfH8rXhjeqguzA/bIfDjk4g0VwKb LPwlZEguML0w9UqGnk5Lbg76NvQ/m+5OzVTpXNlxH2vb5duHLwdDc+O5Y6mcUVf2rcmlhF Nn5KMbmb+V6xgcOWsE8lTgC8sSkdAmFfnMdlh9JAzzXtJOPegc+xzZjcb0Mg3zu31D4a8W t6wUTnxKxemZfaAgZh2zCSSsimFhMYZ3THfHSu6gEgbLerwRmcol2mq11UYX0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTpT0djQzfsP; Tue, 12 Sep 2023 16:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGeG2P062780; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGeG8A062775; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:40:16 GMT Message-Id: <202309121640.38CGeG8A062775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 6af462f0ec36 - releng/14.0 - mountd: do not warn about using class mask with -mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=6af462f0ec36fd8c2f1a679932e71e4afe438be4 commit 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 16:39:46 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Approved by: re (gjb) Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) (cherry picked from commit deaa6984ada80e36aea2f16e5f7211dd0d14800c) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 16:42:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTsT49m1z4st8q; Tue, 12 Sep 2023 16:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTsT3ldHz3bVT; Tue, 12 Sep 2023 16:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hia0R+yCAMGGe0aJ+1W+OHUFCX/4NqNb14NpKKvcwUQ=; b=T1pw8OAl0M9l6kDD31PJknAuskCOIw7BNXOCd37JrQvUqQJsi4zPEm0hIMXXEzmNJsKJ2J ocV8Lz0wrUbv3SFK3rotXAMw/Ea7dSUiKdPjCkOKsp1uWroSrdvLsMIhulJ12EPkwCIrSX g2FMbq8wppWdHEYnReUlFnAd3ohYY6qqz7N5hw7KaVNbABjewekTd5sKpCHpZXuf8HuPn6 PlVh6z3P8jfpuJDvVsBgzhFqEG/G5RHsRv3vmnHKghGewOWjOSTkuVuGSsN0mYRcyX2LHe uDEY3wwQkVGYcs7aBxwKQpVxSyHUN9k95hvA0yM9wtVwhfX0bn0xSL/YRO6mBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536973; a=rsa-sha256; cv=none; b=LLKJSXh5NX9exZuyuXr9FwkI6yYhjSeR9PVKnpnLitHgCmBepo/SkKoF7I13LekON4ByE5 7nvGULZm5a2meyrUEjhNKLyU5exr/WyCqw24MfEEKQ3e2oCzrB+GnzsaeubDIHZOHXJ6gu eD7O4Kdm64oOvnXQUzlxsQc9uY726VwwURMOVGKH0YPE6DrBxOBIF/EvTBPRqOHFgLuJpT gNMdVs0efihjbWBqNwcnr3cOKe0pFzKlnqT8o7EGL5sHuOJBsZBgNOS7lbx2bJIX+SBYs8 KeOYTCnc2diDoOwNISBZW6f5sDYTjkWM8qz+lSZ1aC4i621UVCEFeFEVQBLvjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hia0R+yCAMGGe0aJ+1W+OHUFCX/4NqNb14NpKKvcwUQ=; b=h0ik/uA0+NrAtpjxgEaNndOprfhM2tMmJfVwsYywl5Z3Mci7M5MaIlSZ/ROaDhvq17F0c5 VNWg/LCXzm2/8eEfH3uXfNkevnCu+QN8PiUWeq06GD0oW7RgBuAuDD+IsPqUOog3yR2jo1 BLDopQ8okkRoBTpj9hD63cawa5UwsEDHvbvSoZsiraUK3t7+nYbUhSClbYe92aB3M2h0fr M4f6HqgQ79lCLi1p4zISrac/jjkJ0ayeZOBITfWVnONVnsEVqUPCZ+0aC6v5Xyl7TQFBp6 bGuHOoZo0nzKnLPAe0ksL0A4m0TDJTfJv8z4sRUUnLeXG76Em+e85+Qwtdir9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTsT2pT3zfjb; Tue, 12 Sep 2023 16:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGgrwX070359; Tue, 12 Sep 2023 16:42:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGgrtg070356; Tue, 12 Sep 2023 16:42:53 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:42:53 GMT Message-Id: <202309121642.38CGgrtg070356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 63b6e661d25c - main - sh: reindent a for loop in parser.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63b6e661d25c67b4ab9b7743bf1c68e3876ddc1e Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=63b6e661d25c67b4ab9b7743bf1c68e3876ddc1e commit 63b6e661d25c67b4ab9b7743bf1c68e3876ddc1e Author: Piotr Pawel Stefaniak AuthorDate: 2023-01-01 19:22:28 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 16:36:32 +0000 sh: reindent a for loop in parser.c Reduce indentation level before a commit that will add new code here. Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D37926 --- bin/sh/parser.c | 242 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 123 insertions(+), 119 deletions(-) diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 044233da5d73..121c367c601c 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -2054,135 +2054,139 @@ getprompt(void *unused __unused) /* * Format prompt string. */ - for (i = 0; (i < PROMPTLEN - 1) && (*fmt != '\0'); i++, fmt++) - if (*fmt == '\\') - switch (*++fmt) { + for (i = 0; (i < PROMPTLEN - 1) && (*fmt != '\0'); i++, fmt++) { + if (*fmt != '\\') { + ps[i] = *fmt; + continue; + } - /* - * Non-printing sequence begin and end. - */ - case '[': - case ']': - ps[i] = '\001'; - break; + switch (*++fmt) { - /* - * Literal \ and some ASCII characters: - * \a BEL - * \e ESC - * \r CR - */ - case '\\': - case 'a': - case 'e': - case 'r': - if (*fmt == 'a') - ps[i] = '\007'; - else if (*fmt == 'e') - ps[i] = '\033'; - else if (*fmt == 'r') - ps[i] = '\r'; - else - ps[i] = '\\'; - break; + /* + * Non-printing sequence begin and end. + */ + case '[': + case ']': + ps[i] = '\001'; + break; - /* - * CRLF sequence - */ - case 'n': - if (i < PROMPTLEN - 3) { - ps[i++] = '\r'; - ps[i] = '\n'; - } - break; + /* + * Literal \ and some ASCII characters: + * \a BEL + * \e ESC + * \r CR + */ + case '\\': + case 'a': + case 'e': + case 'r': + if (*fmt == 'a') + ps[i] = '\007'; + else if (*fmt == 'e') + ps[i] = '\033'; + else if (*fmt == 'r') + ps[i] = '\r'; + else + ps[i] = '\\'; + break; - /* - * Hostname. - * - * \h specifies just the local hostname, - * \H specifies fully-qualified hostname. - */ - case 'h': - case 'H': - ps[i] = '\0'; - gethostname(&ps[i], PROMPTLEN - i - 1); - ps[PROMPTLEN - 1] = '\0'; - /* Skip to end of hostname. */ - trim = (*fmt == 'h') ? '.' : '\0'; - while ((ps[i] != '\0') && (ps[i] != trim)) - i++; - --i; - break; + /* + * CRLF sequence + */ + case 'n': + if (i < PROMPTLEN - 3) { + ps[i++] = '\r'; + ps[i] = '\n'; + } + break; - /* - * User name. - */ - case 'u': - ps[i] = '\0'; - getusername(&ps[i], PROMPTLEN - i); - /* Skip to end of username. */ - while (ps[i + 1] != '\0') - i++; - break; + /* + * Hostname. + * + * \h specifies just the local hostname, + * \H specifies fully-qualified hostname. + */ + case 'h': + case 'H': + ps[i] = '\0'; + gethostname(&ps[i], PROMPTLEN - i - 1); + ps[PROMPTLEN - 1] = '\0'; + /* Skip to end of hostname. */ + trim = (*fmt == 'h') ? '.' : '\0'; + while ((ps[i] != '\0') && (ps[i] != trim)) + i++; + --i; + break; - /* - * Working directory. - * - * \W specifies just the final component, - * \w specifies the entire path. - */ - case 'W': - case 'w': - pwd = lookupvar("PWD"); - if (pwd == NULL || *pwd == '\0') - pwd = "?"; - if (*fmt == 'W' && - *pwd == '/' && pwd[1] != '\0') - strlcpy(&ps[i], strrchr(pwd, '/') + 1, + /* + * User name. + */ + case 'u': + ps[i] = '\0'; + getusername(&ps[i], PROMPTLEN - i); + /* Skip to end of username. */ + while (ps[i + 1] != '\0') + i++; + break; + + /* + * Working directory. + * + * \W specifies just the final component, + * \w specifies the entire path. + */ + case 'W': + case 'w': + pwd = lookupvar("PWD"); + if (pwd == NULL || *pwd == '\0') + pwd = "?"; + if (*fmt == 'W' && + *pwd == '/' && pwd[1] != '\0') + strlcpy(&ps[i], strrchr(pwd, '/') + 1, + PROMPTLEN - i); + else { + home = lookupvar("HOME"); + if (home != NULL) + homelen = strlen(home); + if (home != NULL && + strcmp(home, "/") != 0 && + strncmp(pwd, home, homelen) == 0 && + (pwd[homelen] == '/' || + pwd[homelen] == '\0')) { + strlcpy(&ps[i], "~", PROMPTLEN - i); - else { - home = lookupvar("HOME"); - if (home != NULL) - homelen = strlen(home); - if (home != NULL && - strcmp(home, "/") != 0 && - strncmp(pwd, home, homelen) == 0 && - (pwd[homelen] == '/' || - pwd[homelen] == '\0')) { - strlcpy(&ps[i], "~", - PROMPTLEN - i); - strlcpy(&ps[i + 1], - pwd + homelen, - PROMPTLEN - i - 1); - } else { - strlcpy(&ps[i], pwd, PROMPTLEN - i); - } + strlcpy(&ps[i + 1], + pwd + homelen, + PROMPTLEN - i - 1); + } else { + strlcpy(&ps[i], pwd, PROMPTLEN - i); } - /* Skip to end of path. */ - while (ps[i + 1] != '\0') - i++; - break; + } + /* Skip to end of path. */ + while (ps[i + 1] != '\0') + i++; + break; - /* - * Superuser status. - * - * '$' for normal users, '#' for root. - */ - case '$': - ps[i] = (geteuid() != 0) ? '$' : '#'; - break; + /* + * Superuser status. + * + * '$' for normal users, '#' for root. + */ + case '$': + ps[i] = (geteuid() != 0) ? '$' : '#'; + break; - /* - * Emit unrecognized formats verbatim. - */ - default: - ps[i] = '\\'; - if (i < PROMPTLEN - 2) - ps[++i] = *fmt; - break; - } - else - ps[i] = *fmt; + /* + * Emit unrecognized formats verbatim. + */ + default: + ps[i] = '\\'; + if (i < PROMPTLEN - 2) + ps[++i] = *fmt; + break; + } + + } ps[i] = '\0'; return (ps); } From nobody Tue Sep 12 16:42:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTsV5h2wz4st8v; Tue, 12 Sep 2023 16:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTsV4qCfz3bmS; Tue, 12 Sep 2023 16:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlDQHTln0BTq7AVXw+ZfVt/gLIZgrEaVkpqeokJ8wus=; b=bJTGiavRcvDeTyY3tdSDVkLkPp07QQso86G+eosGCkx4zWc6wqMCfqg5+lzOeCYj4gHjqH mFx+RlloT99UFVaqfbfq8L4QKDorpp8l4Nw9Xm4CA/8Lt/h6Bjh7FMG7BnRCn+DaKsCfO9 p2oQ8fKbBJSJSgmdr+MNHaVlWc04vZwGH0bggDRKL/wsLJhlBvbuwN0f1xwcjcdH9AK4tT oC7oKBaoJ9NLdqEfnTZ+OBBwDXK80tZVf5uSSDMZAhppRNHSdU/zoKR9PPeL24il6cTE/x aFZCIixtIOmU8aoDMNFq1uFTEEmdD068yZr+L/ybGBoAgydFUvuYLCWWdG8i5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536974; a=rsa-sha256; cv=none; b=M9GsFYcK6tP+beU6D0yrLH6pEuNhLC5602WcxUzzZiil2NA0ZMEe5bwni3YI0pLNSyve5U rStzUbZZYQyCf63T3FhmaGrrg+x/NJkd9uhmNo66ojbyGC6yAR+xNpg0bwaQ9qfPdh/je/ n1gUKsP/nPp2iVXwGZNz8sE+w048dHUlt8ht9b3D+e3Kw1SRbzrp5DBl52l2kbhksbhCiF 1qc2bWGQbV9WSsbbirppqwXMNPdT5bf3f3rhpdhTMGzOM8KZqGG9WuMmErkCvu4L23voEZ WeJo9Cn16mWmWI1N7iOaVyVKzKhBm/jsUHnuBsdbUIVrSCatSMR8zj/aBrWQ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mlDQHTln0BTq7AVXw+ZfVt/gLIZgrEaVkpqeokJ8wus=; b=GUdMtppZIWNgdeTXrJcqSD43yicAyBQNK7YHPQhrzh27XOjPU8jwI/yXMGmrs+FZGwe+/U GH0QT938QlM5BYaRaUGMOA551MtKuNxt2rfd/9AhKkL4OmAKBDRClhXGggqjmxFSiyo3m/ aEL7tg8rhas0mH/3Yj61IFAMV268BHbF3bd1DP4+Y5P/YqApWJ/sWa84gQXQbQ0Wa+SI5E /0MxPxqwUBf5EHSWf90VM1Fr9E4xxSwBkX4RAunWoICdYGH2KXoq5vZ0/VN5Xaji1gBywW 2B2jvfiOHuP33vngGLaylncsTRrSZQcLKghj3he3TNVUaya3kQf/vXW1J4+z1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTsV3qNkzfVj; Tue, 12 Sep 2023 16:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGgsXq070416; Tue, 12 Sep 2023 16:42:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGgsQp070413; Tue, 12 Sep 2023 16:42:54 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:42:54 GMT Message-Id: <202309121642.38CGgsQp070413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 2fc4a84ed828 - main - sh: introduce a function to iterate over all aliases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fc4a84ed8288bd25be3de35d756f46ec7785030 Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=2fc4a84ed8288bd25be3de35d756f46ec7785030 commit 2fc4a84ed8288bd25be3de35d756f46ec7785030 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-29 20:23:59 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 16:39:20 +0000 sh: introduce a function to iterate over all aliases Currently the data structure holding alias information is opaque for consumers outside alias.c and there is no way to iterate over all aliases, which will become needed by a future commit. The new function "iteralias" takes a null pointer to return the first alias or an existing alias to return the next one, unless there is no alias to return, in which case it returns a null pointer. I slightly changed the static function hashalias so that it returns the index into the array holding link heads, and not the link head directly. In this form it's easier to use by iteralias and the slight adjustment in the three existing callers doesn't look too bad. Differential Revision: https://reviews.freebsd.org/D40619 --- bin/sh/alias.c | 29 +++++++++++++++++++++++------ bin/sh/alias.h | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 4bac525e2678..da860be704b6 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -53,7 +53,7 @@ static int aliases; static void setalias(const char *, const char *); static int unalias(const char *); -static struct alias **hashalias(const char *); +static size_t hashalias(const char *); static void @@ -62,7 +62,7 @@ setalias(const char *name, const char *val) struct alias *ap, **app; unalias(name); - app = hashalias(name); + app = &atab[hashalias(name)]; INTOFF; ap = ckmalloc(sizeof (struct alias)); ap->name = savestr(name); @@ -87,7 +87,7 @@ unalias(const char *name) { struct alias *ap, **app; - app = hashalias(name); + app = &atab[hashalias(name)]; for (ap = *app; ap; app = &(ap->next), ap = ap->next) { if (equal(name, ap->name)) { @@ -145,7 +145,7 @@ lookupalias(const char *name, int check) if (aliases == 0) return (NULL); - for (ap = *hashalias(name); ap; ap = ap->next) { + for (ap = atab[hashalias(name)]; ap; ap = ap->next) { if (equal(name, ap->name)) { if (check && (ap->flag & ALIASINUSE)) return (NULL); @@ -242,7 +242,7 @@ unaliascmd(int argc __unused, char **argv __unused) return (i); } -static struct alias ** +static size_t hashalias(const char *p) { unsigned int hashval; @@ -250,5 +250,22 @@ hashalias(const char *p) hashval = (unsigned char)*p << 4; while (*p) hashval+= *p++; - return &atab[hashval % ATABSIZE]; + return (hashval % ATABSIZE); +} + +const struct alias * +iteralias(const struct alias *index) +{ + size_t i = 0; + + if (index != NULL) { + if (index->next != NULL) + return (index->next); + i = hashalias(index->name) + 1; + } + for (; i < ATABSIZE; i++) + if (atab[i] != NULL) + return (atab[i]); + + return (NULL); } diff --git a/bin/sh/alias.h b/bin/sh/alias.h index 0c6ea99e8b60..a8108d44be2d 100644 --- a/bin/sh/alias.h +++ b/bin/sh/alias.h @@ -42,3 +42,4 @@ struct alias { }; struct alias *lookupalias(const char *, int); +const struct alias *iteralias(const struct alias *); From nobody Tue Sep 12 16:42:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTsX29DKz4stMf; Tue, 12 Sep 2023 16:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTsW63hhz3bYY; Tue, 12 Sep 2023 16:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lJV4JOfBuK0cfiSOyMQ1KagOb8YhOs04tAkNhQosFNg=; b=wU5S1cp/Tbz6/0m10nR31XxGfnUTeqC0z74MXZP1gJ9Vqr/Ai/y8/yl+TGgKGYrhZTcalU WnyStJl2/zo5/fK7/I9i7ZbyMc8WJXdUJ6WuQ644VQxRANmCgL5XaiSdq4gM2HHycPpMJC QTUH5Ed8/S7hh169NO8yjOTDg1uiMwlBxELMKaypuKrNuYSVMAUhRq0vhLbwfOaDtD39w/ i4iJAYMBM/3qd6BgZhM78V+tFL5znbh0zFGIqhxKUYhtZ1FgtGj+5rQML1Qodkt/uP6peU /zzdIl/t8rfboLlSHpOwxMZVI/MYQZ75IFnrriy+63ksl/jTUOKQKOkzzIMYRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536975; a=rsa-sha256; cv=none; b=Llf8nbzXj+QmDSG2SuK5hfLU2/Lip/IRdEE7dtpRrctQ3x4r0YwZNfWp3rKqH40XdGgc69 k5Oo9UEfV9LOp09Ndsr9kG6R31MJ7Gm4C+BsBjfv7zYRG7g67UqBE3p1wY1gpP99pwQmbf lb4TjivBcRg1wxyMnif2YEVZKMD8eq2HOjKDacDM6Yri1qu/5bT8+Mj5pH6Xu7Jdghe3pt o08PW5Uuh/qEeKt3dKius9WTtu36KqiCpUm/mPsXkLoyd4ZETRkIUHEXxzzc0vSIjGy9aZ GW07ECp+l3/YmuE4Ds0+GIXR7/mazUCXprDSJIEJqqu6SOYvo4WbSBNepKqd3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lJV4JOfBuK0cfiSOyMQ1KagOb8YhOs04tAkNhQosFNg=; b=GppAjTKK75geqIs5UA8DUkH2/t58rlSV/eLAmTxDdm4FIpAaIpi7Q2zSz+KKbfTsbM/soq Il/AZedAtEJ8FhJV7JArBtWQRl7btT845iitNS3y3OLPcsDSijWlqJf94/CuZyE0JwfX75 lxRBPz4XHvOd81J142nd/1plfRh9fVeE7+oqUzbPDN+Gh6D9UvbEPTE0ybw6wsgt+zg/ng yr/zcGR2YJ6R/VVALDBMg+zCcwLxRdRL//zSuo5YOdiFSIx4HUgRiOmcBG07l+JKoC7nDR MrWlpQ2TkKv/2n+KjH7wDa+yENRHJf9XphyhANqZXOyJP0GY/17AzgvzwDh9eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTsW4rvGzg6n; Tue, 12 Sep 2023 16:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGgtDA070455; Tue, 12 Sep 2023 16:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGgtSu070452; Tue, 12 Sep 2023 16:42:55 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:42:55 GMT Message-Id: <202309121642.38CGgtSu070452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 0fd450e2895e - main - sh: tab-complete aliases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fd450e2895e1f9085fbd361a2aad8421a16dc66 Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd450e2895e1f9085fbd361a2aad8421a16dc66 commit 0fd450e2895e1f9085fbd361a2aad8421a16dc66 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-29 20:38:50 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 16:39:42 +0000 sh: tab-complete aliases Differential Revision: https://reviews.freebsd.org/D40619 --- bin/sh/histedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 3ca8a0bcefa7..0d40e1c9ec1a 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95"; /* * Editline and history functions (and glue). */ +#include "alias.h" #include "shell.h" #include "parser.h" #include "var.h" @@ -671,6 +672,14 @@ static char goto out; matches = rmatches; } + for (const struct alias *ap = NULL; (ap = iteralias(ap)) != NULL;) { + if (strncmp(ap->name, text, curpos) != 0) + continue; + rmatches = add_match(matches, ++i, &size, strdup(ap->name)); + if (rmatches == NULL) + goto out; + matches = rmatches; + } out: free(free_path); if (i == 0) { From nobody Tue Sep 12 16:42:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTsY2mr4z4stQG; Tue, 12 Sep 2023 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTsY1TJBz3bYx; Tue, 12 Sep 2023 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zukko6J0j3fqF+pE2yUMtwJpyGFTJqZayiHzMoirlZs=; b=hU+B+1EH2GCE/YToFNCklmYWtLHQ4VM1nN7EhnUyLhnjaFG/03+p0B5UlrkPnPBAiH8ALH BUhBOJHi9P6PWerVRot9bEvmcLxeCocCbLIg8IA7hG0sIOqtv19kz+SBODnonkF443nmtX 1yHDb/Y16eeOciFiyaQRIO7piZhPXzJGFOHLcwC70T/g0hlkgCIIeVddF3ugAXmzorr56v P13yANDuHLZWOlKqz2x4pv9Ojqb3Gst0b1ZLOlDufKvrKiTlcFJvviXZm3XF+A5beaJM/U vCWZpYRQo2ypimsG+0DSlVqOtcQBAULS1PpCbp7GO5GPd8qLbQabsTYCplVd+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536977; a=rsa-sha256; cv=none; b=XpYnkZyft4JV5BSFV65TmjlQ82/BlERvj1KnfYiMlNHpciKKbXXCNLQTqCcXPalD0xJ/PR dgss8GHUF2gC0miJ+BzDpcq3remwRgeHA8ywQh2fQ2pQUhVrxbXWms0VXy1mD1DEEOjUi9 NhB6EDfu3P2FLclVcWckmXfEgAAQMWJOOEs2+90hwldU5wwmVWrS+N/oO3sCs2UO9QecZb +uBtNpMvht0o+BOMiotzmfppzaUcjKvB6eLijVeRuhkvu78j6eYK/MuLP2U/qjorsrhv9l ACCSnxScx/lafI/TDJcPJjXLjBJ+UcFl8r8kOmvhzvipFQ+30K1HNMdn8YkNNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zukko6J0j3fqF+pE2yUMtwJpyGFTJqZayiHzMoirlZs=; b=ExNL/Umu3SQVI9KFx7Q/26Jxs9x/n9L9y+9ad2Cdpbji3Hsy+/xoGkvJrim3ED6w2GVIVZ LBSpS4Kq7Z0Bo/qKN6ZnJR99yGxIk/mOQDM3EBQSyOi9gHJi+RA9PE7bWeTbkfSkiHJ6ds lRSR+6q2ZiEBnI77kSJrRHAbcZnBUwEMNKTCPSqsjCZQrxHtOXLi7Ka101qBGQ8mZkV/hT YNoEeVI3eehLssOgCSrv7YrvWcyJMC0QTOU7gKQCPgt5o0+HY//7sOO3yJf6WHif7UBCl8 87sfdH/dFmbQr7FwKWqUZKUclTu790XIdNxR2QjnXwMdF0Yutx9OD+e6XQykxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTsX5vczzfjc; Tue, 12 Sep 2023 16:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGguNU070519; Tue, 12 Sep 2023 16:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGguK8070516; Tue, 12 Sep 2023 16:42:56 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:42:56 GMT Message-Id: <202309121642.38CGguK8070516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: bec7b9a21979 - main - sh: introduce a function to iterate over all hashed commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bec7b9a219790199c64d11833cc34d1ea505d1f4 Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=bec7b9a219790199c64d11833cc34d1ea505d1f4 commit bec7b9a219790199c64d11833cc34d1ea505d1f4 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-30 16:30:56 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 16:39:54 +0000 sh: introduce a function to iterate over all hashed commands While aliases and built-ins are opportunistically stored in cmdtable, each function will be added to it immediately on definition. Factor out the hashing function, write the iterator function and make it use the hashing function. Add the cmdname pointer to struct cmdentry so that the command name can be exposed that way. Differential Revision: https://reviews.freebsd.org/D40619 --- bin/sh/exec.c | 46 +++++++++++++++++++++++++++++++++++++++------- bin/sh/exec.h | 2 ++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/bin/sh/exec.c b/bin/sh/exec.c index 07ed6d4173ae..a3df254a39dd 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -545,6 +545,19 @@ clearcmdentry(void) } +static unsigned int +hashname(const char *p) +{ + unsigned int hashval; + + hashval = (unsigned char)*p << 4; + while (*p) + hashval += *p++; + + return (hashval % CMDTABLESIZE); +} + + /* * Locate a command in the command hash table. If "add" is nonzero, * add the command to the table if it is not already present. The @@ -559,17 +572,11 @@ static struct tblentry **lastcmdentry; static struct tblentry * cmdlookup(const char *name, int add) { - unsigned int hashval; - const char *p; struct tblentry *cmdp; struct tblentry **pp; size_t len; - p = name; - hashval = (unsigned char)*p << 4; - while (*p) - hashval += *p++; - pp = &cmdtable[hashval % CMDTABLESIZE]; + pp = &cmdtable[hashname(name)]; for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { if (equal(cmdp->cmdname, name)) break; @@ -588,6 +595,31 @@ cmdlookup(const char *name, int add) return cmdp; } +const void * +itercmd(const void *entry, struct cmdentry *result) +{ + const struct tblentry *e = entry; + size_t i = 0; + + if (e != NULL) { + if (e->next != NULL) { + e = e->next; + goto success; + } + i = hashname(e->cmdname) + 1; + } + for (; i < CMDTABLESIZE; i++) + if ((e = cmdtable[i]) != NULL) + goto success; + + return (NULL); +success: + result->cmdtype = e->cmdtype; + result->cmdname = e->cmdname; + + return (e); +} + /* * Delete the command entry returned on the last lookup. */ diff --git a/bin/sh/exec.h b/bin/sh/exec.h index 04d1b97d7386..493be0178272 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -53,6 +53,7 @@ struct cmdentry { struct funcdef *func; } u; int special; + const char *cmdname; }; @@ -71,3 +72,4 @@ int unsetfunc(const char *); int isfunc(const char *); int typecmd_impl(int, char **, int, const char *); void clearcmdentry(void); +const void *itercmd(const void *, struct cmdentry *); From nobody Tue Sep 12 16:42:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTsZ153Bz4stVs; Tue, 12 Sep 2023 16:42: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 4RlTsZ0cTSz3bvx; Tue, 12 Sep 2023 16:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3oM3V/6V8fkZLWUivrm4W4xJPXDsTCPgIjtQaQrdvJE=; b=o2o2N8g1FgbvW6jff8WasBZRpmG9R3oNo+EM6Z6SK2n3s6c33JU1a4cBdZOTIjLO+mSQKV P0OEeXUc4b5qeJATQjGLRxSiLNSqMVWWSE2nNpm3r2r893rkls5Akx2rbXuwqU6DMLf6Ld kqdjqsW2OlLOupphBLAv4usG7Guv4NUvln3FsGxKIty3X+LW5F+TF403iUFh+9AOZM7xDE NogvwdwvnXzFmXI1KkLAToWAurEZGu2vAaMgVp5eeOt/pCdiXz19EUGxhlqfZi9Za8/h9t JOud3oMBl0r0LvDbygnyshAhDwLMmTBhe6GPzNV6EXFPh33KfgwL7aDEHmztGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536978; a=rsa-sha256; cv=none; b=rxDulXAfnmJHY6usKJnTbVq/FMvyohVID+A8q4OPqEu9KKWgMJxFYHGK6pBTzE0OQi5yLE ZP0koy+uWuLme5Y6NmXzVgBDjGzfwuaWX1A2ixApvVNw2Kj6q787+C3jh51mD8y7wnh0jv p4bj7l8p90c/ZtI2WimAojZB77mMIxQusvAKNlBQMTeGYXft9OF/45Gty6Wy3vaF7pu4OH qsdJu3FTALbaSTitpWuogHqQpv3aI36lsmcz5bWzR1AwFtYpjS7KnEowQRZFhuTcsfds28 f14kn1au//lA6zdnNvE8VaXbU5MPdLqpzdQ7pLaUKGVpjfcehFE9zY1+4ll0XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3oM3V/6V8fkZLWUivrm4W4xJPXDsTCPgIjtQaQrdvJE=; b=TReyBngZRw73966QfluUfjSpDjkvbbncfxajZogelOjgzbjMIvHI3zscsm3WT0aDm7Z/l8 mDGIf5dohYPWG05jxH6DMQ2b0iEHM6LobcPB1eafsCHORR1+lvNzZYooNgHiIyaUn/YNHF HYr6w/Fvl+dKiCSMq5xApMRdU1K2EWs8UXI+rX0+w0b5AHkBiKQ2mE9Lz+uznElG5eCYaV E3xdzxmHN/ezAbJghRTiCQuYe1UH7su8euE1L3NXtPW3MFK4zG9f8XGxDLh79sZwe87OXF cjKmd6qeRh6qwQf0mZkh42ospwxx3fLTzYCsV0LASeuYeFfpLRmVC5WsS2M+lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTsY6nTzzg6p; Tue, 12 Sep 2023 16:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGgv9r070561; Tue, 12 Sep 2023 16:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGgv4t070558; Tue, 12 Sep 2023 16:42:57 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:42:57 GMT Message-Id: <202309121642.38CGgv4t070558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 8e5c53af831b - main - sh: also auto-complete functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e5c53af831bd180af0c59f2d96c67ab9da59590 Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=8e5c53af831bd180af0c59f2d96c67ab9da59590 commit 8e5c53af831bd180af0c59f2d96c67ab9da59590 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-30 16:31:52 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 16:40:05 +0000 sh: also auto-complete functions Differential Revision: https://reviews.freebsd.org/D40619 --- bin/sh/histedit.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 0d40e1c9ec1a..842c166159bc 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -51,6 +51,7 @@ static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95"; * Editline and history functions (and glue). */ #include "alias.h" +#include "exec.h" #include "shell.h" #include "parser.h" #include "var.h" @@ -621,6 +622,7 @@ static char char **matches = NULL, **rmatches; size_t i = 0, size = 16, uniq; size_t curpos = end - start, lcstring = -1; + struct cmdentry e; in_command_completion = false; if (start > 0 || memchr("/.~", text[0], 3) != NULL) @@ -680,6 +682,16 @@ static char goto out; matches = rmatches; } + for (const void *a = NULL; (a = itercmd(a, &e)) != NULL;) { + if (e.cmdtype != CMDFUNCTION) + continue; + if (strncmp(e.cmdname, text, curpos) != 0) + continue; + rmatches = add_match(matches, ++i, &size, strdup(e.cmdname)); + if (rmatches == NULL) + goto out; + matches = rmatches; + } out: free(free_path); if (i == 0) { From nobody Tue Sep 12 16:44:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTtx69Jqz4stXv; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTtx5lSBz3dLW; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=FZslEcBYNCg41xiKGwvwgeZ15N+Zp33v7rDPcdSsy6LRShxZhQj5pEzBLYXQ9SHtY12EKb mj+t3BO0eDiWxP4MJUnyLlOGTpn++/q4/tgbhQZ540Lk3oViVL4dwEEs32xWia6NiFT0G1 K4mmdmDzVZrg0Dcf/HOJ3bIxFdxdbXutfk2Q5UfSUBt6HOubkJA0t5QNag7tYBq+vx2yRi 9jAwZsWnO3gcZTmrMofsWXWyMDggSD2E78bguTeFDwfwSS/hMHJLmue1y+/EL6wXeEGpOY r2AhFmLMHQst22O1XhtyWloQhY/ewdGiFdo12th7r2+f469rZ8XUVXHxDibiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537049; a=rsa-sha256; cv=none; b=XPRAtzNG7f4/logDl45gmd2pph92scrFj0EjbpRAMQAmci7GU0SqVhXBQ2YIrcw3qsqHfp Jq1CeojcpR55xSPtIi6lYAUVlXK69NhY4ksulrp19NcFrxizVEUU0eNeag5nDcWbE+a0oO DGJF8Dv8D3+P/KoKtWI0GMAf725m/fnstUXQl8hExC8mAKIHd4SAdMz+/4vr0fTOIVzoiu R9G+4oz16X1NrG1vQhZkyasBiXuNriptyCYt3A/zQ9Chbqo8AQlqCE1j7J9O7lJzdrW1ia oj/D2HmdfF+0X8oWAQJU/8UhNmead7dn1bAkwkNt1GRsdf5HmpS4vfrRFHtrIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=UkozN9mZPsO8nbIgTe+nxXW7VukbVGS4Nt44306cvCo/3HVl6wxt3KdJ/i45BSq/hZtAzg JeL6jR5kSYlVYTuqoKXNYLxgYe8vc4s4Ti0YQrbHe31t4LWLNKaQlEiLkQo4w52A1X6PGl ZDaIYEW0jmiqBQv0y4xlHsNGz2c+AraH4mdBXpTW83uNKENXpPRJT78fnM1VubdScPuwnX MCGE8Aeev5nUK5+9uvSc7cVySV5W3YGZ3o0+UpnLUIzH4VCOZ4fFPUZXm1BZP5nMIURlEy pv/c7BEOJw2VtBnaSiowKOhKGWEqSc4qzva3zr5BRq9/HuQnsp1hLAnzfHnr/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTtx4pbkzfjj; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGi91q070934; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGi97c070931; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:09 GMT Message-Id: <202309121644.38CGi97c070931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d64356323c10 - releng/14.0 - linux(4): Merge getxattr for future error recode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d64356323c1058909df7efe772f7ab0843a30f55 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d64356323c1058909df7efe772f7ab0843a30f55 commit d64356323c1058909df7efe772f7ab0843a30f55 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:13 +0000 linux(4): Merge getxattr for future error recode Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 6b46ec66129d9490c91876f72d98e514121996a6) (cherry picked from commit 803280ea07e9c07007e0acd3864a18d40b86de2a) --- sys/compat/linux/linux_xattr.c | 62 ++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b54a0d2f89ad..901123684154 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -68,6 +68,15 @@ struct setxattr_args { int follow; }; +struct getxattr_args { + int fd; + const char *path; + const char *name; + void *value; + l_size_t size; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -262,47 +271,66 @@ linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) } static int -linux_path_getxattr(struct thread *td, const char *upath, const char *uname, - void *value, l_size_t size, int follow) +getxattr(struct thread *td, struct getxattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_get_path(td, upath, attrnamespace, - attrname, value, size, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_get_path(td, args->path, attrnamespace, + attrname, args->value, args->size, args->follow, UIO_USERSPACE); + else + error = kern_extattr_get_fd(td, args->fd, attrnamespace, + attrname, args->value, args->size); + return (error); } int linux_getxattr(struct thread *td, struct linux_getxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = FOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, FOLLOW)); + return (getxattr(td, &eargs)); } int linux_lgetxattr(struct thread *td, struct linux_lgetxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = NOFOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, NOFOLLOW)); + return (getxattr(td, &eargs)); } int linux_fgetxattr(struct thread *td, struct linux_fgetxattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct getxattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_get_fd(td, args->fd, attrnamespace, - attrname, args->value, args->size)); + return (getxattr(td, &eargs)); } static int From nobody Tue Sep 12 16:44:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTtz1tdcz4stmc; Tue, 12 Sep 2023 16:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTty6n4Mz3dYV; Tue, 12 Sep 2023 16:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20GSvIS/ruJetSb45t+Q2oFGx6kihqJj5QWboJN+PZA=; b=lWbnXYOAtqHoArd+68tjeGPr7FwPvZql0SBb14QrF0Z6ihRzlFvO/lNp03WxqLMNzAykjs +Pb6phUlkGKaScULHVzyomeyFhNYCoabj8q0O0R+AdJ4uKllgsNlvqMVWskcZayM+aWKyu 8yOt4CyaD6mRIHeLIAK79KNmRliL3erVpiaIl6XcLQhdIBRhWva82JjumUxiGzug4kPAiK cPZbllZxkcv80sXo/yOiMIfrTgF2I14L7rhv4Y+1FknT1E1dYt8j2J5dtTbNlzYNFOM5fF VHsZErg6lEbbOvNNcaBrYS6xVsuW8YFqgzwSX+Jzjd/BByCK5MUNw3Y6YG7rfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537050; a=rsa-sha256; cv=none; b=irAb+YxfAU8smI75YgnQWM7nq97WG0jw9b1mWefgobBm0i2qVrea59mR65aua+JDUTr5XE qDqhgeCIFvgZSTKSJUArCe32Q8uz8nMmMF2PL3HZuX2OYTJk5BlpBjP5Go3FU/wwSlgXeh izZFOW2fr+1dLs9+z2RNJIhLk7AqNk4g9vr5gVjLdJ7XFJfL4pDfaCpFHjpdC8du2Qe9o2 2XV7rjlkiNJ0ZlQM6fBU/iRyQytMEjhw9cJZlGSXDA87lzqZPFHaqy98iJ9Qw9L6DOibbz /prhsCBABmm9Xuw7ONRbgTKaIcI9y9SERP2fVvDCe04N8cS2UwlfOQt1h9Fleg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20GSvIS/ruJetSb45t+Q2oFGx6kihqJj5QWboJN+PZA=; b=ISf7aCuymvz+PCNAhFeypXp281L2NRb/eQn1rJib0voJZwTk9L4/ArcYTVX76jsR2OBGHY oJUGnmV4aJa316osXu0S0F6oL7Lplj8GtRqyMq/sMdo54l+Z1/lSzc7p7ftrisuGHS29jF M7UWoT+BPK75/6it2cLPNrt0w0edI9PADS2obAmA00spLfykfaSJVfEtIJw0IxmPgc0gSA iX/kA7K7W+3LBPISLZjKLQn8X3xtMixiNlYDXXDiPyO3j1UekfYi21cM3BTtI8depUncnc p8EqdIzB4DIzb/VNBgm252yEpmUsQoqIaTB01YIskr4c8uxG6QHO4z7GCCJ6JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTty5rF5zfjk; Tue, 12 Sep 2023 16:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiABZ070988; Tue, 12 Sep 2023 16:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiAKV070985; Tue, 12 Sep 2023 16:44:10 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:10 GMT Message-Id: <202309121644.38CGiAKV070985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 01d9f0eebf8d - releng/14.0 - linux(4): Return ENODATA from getxattr syscalls instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 01d9f0eebf8dceddc465fecac919c1e9d7a586a2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=01d9f0eebf8dceddc465fecac919c1e9d7a586a2 commit 01d9f0eebf8dceddc465fecac919c1e9d7a586a2 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:31 +0000 linux(4): Return ENODATA from getxattr syscalls instead of EPERM On Linux ENODATA mean the named attribute does not exist, or the process has no access to this attribute. Approved by: re (gjb) Reported by: zirias PR: 273517 Tested by: zirias MFC after: 1 week (cherry picked from commit 4d59b790553ef75b9a4b6a673eab3354f3d012b3) (cherry picked from commit a9b8a0ced46efe72ec118a749d191b29ce47712b) --- sys/compat/linux/linux_xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 901123684154..b9717c62133c 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -285,7 +285,7 @@ getxattr(struct thread *td, struct getxattr_args *args) else error = kern_extattr_get_fd(td, args->fd, attrnamespace, attrname, args->value, args->size); - return (error); + return (error == EPERM ? ENOATTR : error); } int From nobody Tue Sep 12 16:44:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv01R8nz4stk6; Tue, 12 Sep 2023 16:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTv00y8kz3dWk; Tue, 12 Sep 2023 16:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhkvlxfUs/XetgSCxRPRhhhsAZ7jIYRoz6t+dl0wP9c=; b=kvpmFTm2xXOZPp0yq5v1/x4exaVixLPz8oyxHTKKeHK6s5uo4HC6zOQnt3rpu5+ZT0TLuF 1MGAURlkd6/sQpBaJiS5dqoT43NtAlVCW9ouBLwyZ7odAmaMmvJOvzVobRElEJEqMOB/sE W105XJI+Dqa7oPZ6QUBhaZU/A2uzLVvqdmWnAsW8dvoAsIBtmbEDOSTFy94AT9r7yELsDV VAG1Y6Sa76lMvyUdHydA9cTt3A09MInYYdPlcf6ca0bf5EGXEHv8uwN6mmyJNKXFsaBrK5 lGprcEhWFEGLq+UvZugmREXTQUHZH1rYJLoMaS0/47hCUxNeN9F7zYWrqgkGHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537052; a=rsa-sha256; cv=none; b=F7gMJmiqiNDD7xoR8vPOPw2VHhObnSpnMp5fA8gUh5qm0Astwu/3f1TufiIREgvNiosbt4 dUXSdTvE5VWos2oQtnfUV9lGlAmnEqCNa6G/b+gj7iz3URnb7YHwJyhJbjiWtjbIMkSb19 lGu0L219MkpzAcOJ0UYM7HYrhS/O8GxEaUZsj4ksitjcjAstvJCOuDFs5bJShwRHFK6xZq D9FTjySIEnScoOD2rF+NLVHfO9mrLeuZH8W/ZznMThyqIEjFANtQ/uHRl0Z+6ABZuVNvvG zuMcG+3BYdeIAG166/Eiug0eDos9BKaM78RP+eOMAwmAruV/oKfZSP0dOXWYoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhkvlxfUs/XetgSCxRPRhhhsAZ7jIYRoz6t+dl0wP9c=; b=JFmsp6jNtb1q0Q4kl/eHsqFOeKfLnTGZizqB7GthC61aQj2d575blQWeu/3aK7vlgZaUpt Xk4uD7SrTcB3/58PIWxCIpy5pkEYDQh9AtEi8EYFNld32iYWirX5eVUc4G0e+kmqELM2eL dU8kPgA9R9RVCVKVqrs+s2eiRiTBTSPXf7RiLaKIjO4S4Athg5du033EIcoWMkMa7A5bD7 LYxPnmSEpgJBPJ8bbAvibagHEgk/6ZV9UJbl6tFTk5kSPR5JsHdvs5LylN2HP76jbwrYuG i8qZCiOnR4+1a6gVBubtpwigUZdgpVcjqSy4YAR4FQZMJTMBwIrhWrdeELXv3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTtz6v9pzfVk; Tue, 12 Sep 2023 16:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiBMZ071037; Tue, 12 Sep 2023 16:44:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiBUf071034; Tue, 12 Sep 2023 16:44:11 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:11 GMT Message-Id: <202309121644.38CGiBUf071034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: ed3248554e5f - releng/14.0 - linux(4): Merge removexattr for future error recode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ed3248554e5f4806cbda5198c7af8d3b112518c7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3248554e5f4806cbda5198c7af8d3b112518c7 commit ed3248554e5f4806cbda5198c7af8d3b112518c7 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:41 +0000 linux(4): Merge removexattr for future error recode Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit dfcc0237c3a97f4f7962da854389f3c5d976145a) (cherry picked from commit 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be) --- sys/compat/linux/linux_xattr.c | 54 +++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b9717c62133c..2b46cf708c7d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -77,6 +77,13 @@ struct getxattr_args { int follow; }; +struct removexattr_args { + int fd; + const char *path; + const char *name; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -227,47 +234,60 @@ linux_flistxattr(struct thread *td, struct linux_flistxattr_args *args) } static int -linux_path_removexattr(struct thread *td, const char *upath, const char *uname, - int follow) +removexattr(struct thread *td, struct removexattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_delete_path(td, upath, attrnamespace, - attrname, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_delete_path(td, args->path, attrnamespace, + attrname, args->follow, UIO_USERSPACE); + else + error = kern_extattr_delete_fd(td, args->fd, attrnamespace, + attrname); + return (error); } int linux_removexattr(struct thread *td, struct linux_removexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = FOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - FOLLOW)); + return (removexattr(td, &eargs)); } int linux_lremovexattr(struct thread *td, struct linux_lremovexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = NOFOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - NOFOLLOW)); + return (removexattr(td, &eargs)); } int linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct removexattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_delete_fd(td, args->fd, attrnamespace, - attrname)); + return (removexattr(td, &eargs)); } static int From nobody Tue Sep 12 16:44:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv12XKwz4stxM; Tue, 12 Sep 2023 16:44: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 4RlTv11pTVz3dm7; Tue, 12 Sep 2023 16:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zel52JLvPLeU5A2eTCmLZdfdDWobqLRJADU5wK8N36U=; b=RELLaI6siF59CIGRQGbD+6L/i6EvwbqOcA3I6T3H9eTuZyZkYK+L3eS34masTDyADHbHqp tehBr8fzf26fdq0Lb85Qvvjbce6QUhJnUZET5wIu+TRWdOA+BbT/BZow16CjUVCRUrQHZZ 8Y4A2gIoKO/jCNVbitMVUp8NmOB0rBjTmZnLj5TurS6fHBmMn7XYM0dxvJbLM7AxmkTLQm feJy7Y0DWixsSPQsl/vx1VaP8dmbonHrHVlh7LNiT81DyUq5omoUpHhUdlwkLuXfP961fI fT5QzI6oH6jVh8iulwIL4R2hGXn41IicZERKH0CIIgus3PbbWCdrVotNgu8yDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537053; a=rsa-sha256; cv=none; b=CodyyTBR669gmIM7t78k6uDD+mFghyfm6e22zSD8PoFkHzC18BCKXr5dc961XqfN2W9lcC nqFcoSu89mK0QyspfzCvkgb+nj9tlqhABBnSRIHlzmXyfrT9UMwsY0N4F0YqKI+ctULmkV RYvfxzoA4kAhFQ0MuLCpfZtT8uZqbeFHzZLzi043xA6xDBcBcgGX7BZwp5Xk4hFZFxmtIX S/z8jJ86tFqHjd4oLK6SaM5Ig0JYe/0VWOVf7wRrZ+tnw7svSmqecwwGXi9GFOKij23Sj2 oKi8/uxoBI8PS+aNF8qAqdEqTRtszIpK1Sw0N42qvpeWMWJ3nuRJt7GydCOmMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zel52JLvPLeU5A2eTCmLZdfdDWobqLRJADU5wK8N36U=; b=Ntv83BGoLOsGsjj+Zp5c/0c1HjNZB0Tt7N6oNNFngD/CYYomVPd+VTUMWHpX4ueJZIZzGi e7IyjJZHTUCAuz2LEFHvuqFIpAaJWgXpz2voRdrIzXzyVLm0lw/OhbYz5IBB0xz1eP9Jcx X4+O5jsSt2sCzPxK1HrbS43Xi/pDQhUR3YlQROQmIQdnNCO1RUrLJoixXW7ORY8maNCot4 F8cgcJspM32Er+kKMktMbIyPtL3aHerVM2XpE07hheJAia3qgILx62DGivXCaqvoQZNNaq WGJ4ZPE/YVDlRhOfZvWOcjNfeoi8b/8ePZfOrTK0ywp7osyVGFr3Bb1sXysmhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTv10mPbzfvW; Tue, 12 Sep 2023 16:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiDhY071097; Tue, 12 Sep 2023 16:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiDs8071094; Tue, 12 Sep 2023 16:44:13 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:13 GMT Message-Id: <202309121644.38CGiDs8071094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 108d330fe3a3 - releng/14.0 - linux(4): Return ENOTSUP from xattr syscalls instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 108d330fe3a3e84ff86737a0ad6fa1de375023e8 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=108d330fe3a3e84ff86737a0ad6fa1de375023e8 commit 108d330fe3a3e84ff86737a0ad6fa1de375023e8 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:11:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:50 +0000 linux(4): Return ENOTSUP from xattr syscalls instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Approved by: re (gjb) Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 1bfc4574f78653e4b64ac9dd31518c96a17fe52b) (cherry picked from commit bce9c2e34006dd70fb77a72f8cce1ead8a01db9e) --- sys/compat/linux/linux_xattr.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2b46cf708c7d..74b47f1cbaec 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -87,6 +87,16 @@ struct removexattr_args { static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; +static int +error_to_xattrerror(int attrnamespace, int error) +{ + + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && error == EPERM) + return (ENOTSUP); + else + return (error); +} + static int xatrr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname) { @@ -188,7 +198,7 @@ listxattr(struct thread *td, struct listxattr_args *args) if (error == 0) td->td_retval[0] = cnt; free(data, M_LINUX); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -248,7 +258,7 @@ removexattr(struct thread *td, struct removexattr_args *args) else error = kern_extattr_delete_fd(td, args->fd, attrnamespace, attrname); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -392,7 +402,7 @@ setxattr(struct thread *td, struct setxattr_args *args) attrname, args->value, args->size); out: td->td_retval[0] = 0; - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int From nobody Tue Sep 12 16:44:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv23s8dz4stbP; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTv2352Nz3dpM; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=ol4gjBNLKE2CGhYagzEgF/fD01nmYqnkJwCYx4dc5aZjijHIPGRJ2Ip5UiEjIsbNnwugAM 2wNUDi8ztm4FBJ5fJNFWTGkmbh3ai6ZWTzTjT+xDqvk5oBWys2wm0hG1JOXEcWTpfhzFyT 56WKkRYpV2nMuYzs8FhK6aEmXXWOLJsBxg2l5nrIffKRmfWhoF0bODN+2CyjvaPxQyMS2r 5Ifg5sNcIyQY+gkZxsZYWO4y1hjTIEpJqJZHeMDldtKbNXEicMKmMeUY1HkqR80uh0X5C4 d/gr7WZgh92rkMh2iN3tDrcvOTuIGm1LJiDxHrMBVPVNRrlqJ8XZoLUD8vxjIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537054; a=rsa-sha256; cv=none; b=eE73MASnUD7stiGHtxbfIiE3pPslmtFHfcnMoInadn6bUFKIZnxMm0qXXbbZnKdG17A4Vq 3fUm5NQqYmkfaORzoYc2iNG3YZ2JsDspP13DfaXAXhIViAvNEFqAY3T99KthoMcgURPDyq tF7pMgPuUNurpEp+Ffsnk+Z6YjwwtLga1N/9ajcaKnzK9dSiL860OQFvqDeUi2pYdZJmRB IMXNK9sJNuvelbCupfp4a8jFaVMwimCeLIeOv4O324AfmANz4BeRmsfDSnI+LFxJcWAczM 6g8FRCseiEAXdJ3dETOpFp6y4K74ezKZtXnaj5JfPkT4nexgFrASNQ12uhRAYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=i0Ny3X5w7jT2xAjEnNRVwLciqQt90PL1632tGvV0iWG6u0kOEWxzthRUugNEkE/HkD+rLT 8WdAw/e9YFlliPYlPQGxVR8BZeH86vFjHv19PBmfq4uvk+sUzogoKOd8SPMrXamO3t6Gu5 TP7lKMBzZq2Sg2tShCNdC031yHiIxIcOUhsM0podryafOs7HSwgxNsQsDF34vbcZOnU2Dr wEHcjFCr3AXhet6/b/rlJOQQTd1GW36UkRVqNJTvdIoJWaENMYhKPDJOhSlugylb8+k9j7 8rL9mtfJ2tOkujOTsThQFplRisaqBmtPdXEqAWbCO8v3SqAV7QyeGXKOP98kIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTv21qXBzfjl; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiEvB071157; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiEOG071154; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:14 GMT Message-Id: <202309121644.38CGiEOG071154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 83660158953a - releng/14.0 - linux(4): Fix listxattr for the case when the size is 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 83660158953abcaa5382e35fbd1bdd75a7ccae36 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=83660158953abcaa5382e35fbd1bdd75a7ccae36 commit 83660158953abcaa5382e35fbd1bdd75a7ccae36 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:59 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 18d1c86788f66f42c4e096142f4f8d168f68732c) (cherry picked from commit 53b3e15d732ff6ff0df7870107d45a371a376e73) --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); } From nobody Tue Sep 12 16:44:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv36gQWz4stxR; Tue, 12 Sep 2023 16:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTv33lgbz3dpn; Tue, 12 Sep 2023 16:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8krLV1Y/jSr2LWiXfQQ+fek2oxm2kQUqs2TmZS/baQ=; b=TeibQqNCaFBuehpoEaBEZ5nCtcufj4zYGpJHcGCq8mNEECJdYiZ1ZlDvbRQNZcTIdrJUyh 3ghwpDcDzqUfswx2KmzXCvXtF+KH0276X0uLqFOESBIghC+M49jS34e6o8+mRSBQkccgE0 1BR2Fc1QVe3w0V8rV6jf3NBzCD1zhEAuThTsTh/1irzDgS/tszvsmofYde527Hnefc4ElD 5U3GJkzH3omNbamTR5ps/ctFeYCITLtT/7wne+ABYgb3PRrjog6D2eoTydwJn2GEmH/9xa YBGGH272101W37Q1tWvypdlK0IpMPAiZoRc1Kah+QnDC5yJiCWmkMIa7CTuzuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537055; a=rsa-sha256; cv=none; b=bgVIWr2JvvpQ+DXF8lgq5KvQpeLdjBseBnmLp9I+X3Ytv7+VFAL8+DagtCnexm7E1ShKL0 ajwsuzI/gbXYugqUBTZIa/zTMuuksF0ufpqcfZiVEdSCLk49ISUkguvsk2jxJSkNWp7unl RHyABEMjgoW8nqGwvFAgL0syLKEGesPVCLyBQwoN6WbcEfCp87vNpeRGL/Tx8bnQhkw4Yf F3bWMasojw/h1n2NLvEdY/HIK8kdA/RVzeH4UIgJCBE1Lei9YLA2CffZGRa0eTV8uj6isp UKwciWTr5Ovkn2J4EpERIdcwRU4g5wsddXbWYxG1aWpS2kIFkD6xvNvZkhunMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8krLV1Y/jSr2LWiXfQQ+fek2oxm2kQUqs2TmZS/baQ=; b=VwV109QuRMrcYzq+uAw6uhzbo1uHBcktJIoA/BST+3iXgHBdn/IxNBUNfTkJBO6W/UxqPg XN9NFZiZwiei0fgqmBEfYVvo2KqC4priFv57t+R6RksUqzJ2CrnKa1QtT9XzMO0idcPEpP x9YK9dh0QPo+YEFS84ifkzaC1j2yY6BN0xg8iEoTTv7nIJ79YVxcAZaqPjnmjWZpZg0wDA BCbMEFzaioXZDI/CoV23em3wrYmc2OI5iCQw31B4rJ7Bkjpyz7HPWiaHJ7DNBHU5Z0MaNu IFn1Ya2Jb3gcTtKF9cRBONRE5FtrcaJi+wW7wZ8t/Uw5CSG0o8aztK+DxWX4dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTv32hyKzfvX; Tue, 12 Sep 2023 16:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiFQ3071208; Tue, 12 Sep 2023 16:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiFeJ071205; Tue, 12 Sep 2023 16:44:15 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:15 GMT Message-Id: <202309121644.38CGiFeJ071205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0f07f838d059 - releng/14.0 - linux(4): Return ENOTSUP from listxattr instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0f07f838d059a2b56c33cd6340f0a172e8d97af7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0f07f838d059a2b56c33cd6340f0a172e8d97af7 commit 0f07f838d059a2b56c33cd6340f0a172e8d97af7 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:52:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:43:10 +0000 linux(4): Return ENOTSUP from listxattr instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls, cp. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Approved by: re (gjb) Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 11e37048db35d7fcfc285b867965de1aeefec2c8) (cherry picked from commit e975d1b72507def7a699adf1cb38c68b48d80f51) --- sys/compat/linux/linux_xattr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 71d7ae58439e..6979fff9c82d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -165,6 +165,8 @@ listxattr(struct thread *td, struct listxattr_args *args) error = kern_extattr_list_fd(td, args->fd, attrnamespace, &auio); rs = sz - auio.uio_resid; + if (error == EPERM) + break; if (error != 0 || rs == 0) continue; prefix = extattr_namespace_names[attrnamespace]; From nobody Tue Sep 12 16:44:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv50hjXz4stxb; Tue, 12 Sep 2023 16:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTv44LzWz3dsP; Tue, 12 Sep 2023 16:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=qSSM5OMqJfOutgHOUFh9f7yqZBRck42OBhtDaNwcif8sYEzrkIZEiivfUDt/lPPNotbeSJ sF/BcQzlqUpdVBqNOP3SY5MR131q3QflMXBgTcXHGCpQpnGFpST6T10BAnLJXiqv4SZfE1 Mgu3X0eHV6a+z6RPLqehcdIFKh3SrrQ90npG/cR2eMRyOH3qGNeNQBlwlvd6ZW17MyZxmZ XhWPaUis5ZgX3yOzmzFqRidrwvi7y+fz+XqhuiWYVmYNRl1/h8zbgZ1KcpoN9/NwmFlp1D 2UvIoVcEZnO9wj0S1G8c7W0TzcHVL4vSaJ4cz+QOib6H44MN4OLzY87CICfAig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537056; a=rsa-sha256; cv=none; b=yycRbYdEvSLQJpyy3CJdyTwqdZcNXPcgID7Q+iIUwkXgQfkZb/ChFRvNF92l7mYPb8ftv8 VXYkR9pY0I4zGNPCjC1y2LmY/NCNazKHJE06IReA8Dd8cXzc6oZ+ei8yn74NZ8vIz4Ls15 ztAH+/OQpWsrQz/+IeKKuuvag3VGJCUw+xMwp5RGXpKVPs0MDtm0kT1R9Jxe5kBjf8euNJ C9Ee0GukXUoZxIQP5nvJg53wMuhnjZp7PKP2S1/yd60wKxIhlax7S+M1/e8BnX+0XRO29/ 71Mj6iwgnwrIe4kPvbZb9XMXrV6Syl9YmJXZNwoKL50HmX5neGVpznPOoglYZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=yArc/x0Ro9Bq0O7r/8++eKwP4VtrieZJUU1n5hfuVgWISs3b36ln9vLgtUhu/hQT4Pk+Rp aVeRK2xsP+gi2hEWOAEMCAV4D/7GLsrrJbUnPpBM/ZQhnJHf655FeSMZzE6Vl+5CmMmVU0 Xp7UkWmc5kQXCgFJLUhAKLMovUB4r0eTt6GQoLaD5gvPaA/MJccls7EOcWWhTAZS+yYTRV Xfmnw3zUaDtBC+S+qBLuE53xtR1xP78cVEe1Ckdy7spGtMrhfmMGlNHGAPrQLWT7bxDGJ/ C1btk7R+mkDyESUqYGufHjYMRa2WsO9kdEBPpvam2kfpDlqPL+73vDDNRKlW3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTv43R0lzfvY; Tue, 12 Sep 2023 16:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiGrn071251; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiGUd071248; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:16 GMT Message-Id: <202309121644.38CGiGUd071248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 80b763d4a539 - releng/14.0 - linux(4): Convert flags in timerfd_create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 80b763d4a539854d43535b2f9dcd0b2f739a6502 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=80b763d4a539854d43535b2f9dcd0b2f739a6502 commit 80b763d4a539854d43535b2f9dcd0b2f739a6502 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:43:20 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Approved by: re (gjb) Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) (cherry picked from commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71) --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */ From nobody Tue Sep 12 19:10:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlY80079Xz4tCQ6; Tue, 12 Sep 2023 19:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlY7z6p9wz4r0m; Tue, 12 Sep 2023 19:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694545840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxp+CX4Yy/1ERLYM7nfVwfX/MBNOmZEqjiMM5o6Ztxc=; b=wdslCBZ17SCKtdNLWwlrULHLEnkK2Z9PHEENn0ygTbXgOCOqfuQTB8hod2RCo4BQL123SM U775eZJeIexGH6BfWgXv1s8b+wjuWb1ZTH57GxoqTIupY7E6gR6ZJuwTdgxK3ziRWkLxYu Kj1QfcSi8t3RUVHqFZ/5dD1Cln6S1oUuqtP9B3DujEl0ggEzcZrhrkJAyekmWpbqrNANO4 rlMIDv4nZ2ch5vM1njwzbtzHwycD7ddO3pKQJlZxM/f9aOHTq1Rp44Bmv298dcqnPxeE5q +MBxmnnJ00A1RogTzCfUvTYh3uZ4MuFB0iH3LXgXQam7CHOb44f6ShtSM6SB4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694545840; a=rsa-sha256; cv=none; b=Dw8bapV2QYJUUBhSyeg0t33V5xEhLpTsRMafl+T1Wzhq74ULc2aPHfj2iJHeoxY++nxJne BJbBGxxQmY7p85KrxfC6z5ZOZrUe/BtMI9MdjR1kidIDwiXnT9fVTgqMP/7jwrTMEpMpQ/ EAbpUgH3NVSVm9WXr2JabEKoMXpEtRwcyyqIUc+GdnPEgq0ZySGyGDMTdSf8TGqADRV+lR hiKv+07sr7QeVCRV8rA53mJD3JkOUgca1btdrDAROScQ75gX7wDcUllyE7eJkKTH3rjOi5 7Btk9/bdzaslealrpKyvLVk0HQlNfVxIE+ua7d7VzsIMfemsYA+IBGMpmdxsbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694545840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxp+CX4Yy/1ERLYM7nfVwfX/MBNOmZEqjiMM5o6Ztxc=; b=YL9Aj+mDlTF2J/BqsuKdQaOj2rTRS4+3O5/rMNjxAapZcDJuOGQx/PPsejSZNrF0DL6C3q dIG6IZ12I1pDzCJRvWpDIOJQZp1ET9lqvBlx5ybokFYJjhQYLdnabWr4LeJ6Iutz54sMpi BHr7JfwNW1zb/waM1LHngMHugsLOBpIHrZT+HTipXtBS+cmHEEXl/x8vRwa6IPS9p03cR4 rj9pXYrClrrjy4rriWJdGVrNUnFL62XG4y6WTTGaqbLk5jfKMfQoocSZFEkXMmHrVKg3Uu nSn6FtZiTmv5T+rEVq5BI5D6DYWqdSJ9aJLtiYGl4LSsBqNJiuZ5DlF+u8TjIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlY7z5tl8zkFR; Tue, 12 Sep 2023 19:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CJAdTU017906; Tue, 12 Sep 2023 19:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CJAdu1017903; Tue, 12 Sep 2023 19:10:39 GMT (envelope-from git) Date: Tue, 12 Sep 2023 19:10:39 GMT Message-Id: <202309121910.38CJAdu1017903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: c996638497d1 - main - tslog.4: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c996638497d103c4ddcf097855fae7f3118f21da Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=c996638497d103c4ddcf097855fae7f3118f21da commit c996638497d103c4ddcf097855fae7f3118f21da Author: Piotr Pawel Stefaniak AuthorDate: 2023-09-12 19:10:08 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-12 19:10:08 +0000 tslog.4: fix typo --- share/man/man4/tslog.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/tslog.4 b/share/man/man4/tslog.4 index 93fb66f9e857..40397d14c3e2 100644 --- a/share/man/man4/tslog.4 +++ b/share/man/man4/tslog.4 @@ -107,7 +107,7 @@ was added in is oriented towards system developers while .Xr boottrace 4 is meant to be easy to use by system administrators. -Both faciliities provide an overview of timing and resource usage of the boot +Both facilities provide an overview of timing and resource usage of the boot process. .Ss TSLOG vs. DTrace .Xr dtrace 1 From nobody Tue Sep 12 19:37:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlYlH3YCsz4tR7c; Tue, 12 Sep 2023 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlYlH1k36z3F3g; Tue, 12 Sep 2023 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694547467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NsIX4adFqnt12JDu8iw11cbq/1Tg/wtLwHbp6HDugM8=; b=t25FzpcAheV5UCvBqQv9JWW9vshJU481FABqdw4XebVTJjstOVR61IjEuRFdTyiN1+mGwv WtdIL6Rno/j7KUN7KGVB2Wzy1LnHXwmtjFbW9M5+rbEOcmaeSHXPR+g6qSAkqNyhczFpt8 u64u6Hi8sKe6OXCRoUKZq3IPnEZyeKtMnzInMwJkCUacByPymg2aFrILKrJcfbkRnhAxZH G+KQ21ejePlbd9yXrylcbMT3+IpKwm8aRHKgXgRmX9XoDHUskbkIT10cDCmOt1YSrjXzuc 3UrtNKp6f6Cs8KIn4VierSMkTuktBXf/iQJdVdrEj9s4PFDrGxoPKnh30CwQ1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694547467; a=rsa-sha256; cv=none; b=uIcT8Bb75IV4YhfSyM8svXLib+q+1IFPbtIunt6hkVVYK+bNSb8ugf1LUdrxXxBPY/xRAS USrxcr0ppyxjXiKdKa/tmNUi4iATYGqOA1QQCU7A08o2AJQnYf5HpKHU3acFM9wPtaPEr1 gdNOYspuE+sYp61pgZcbIzQBF41Kh06FhLG9z2wNRMzidh4U2XSybV1Ok8C5BvDDA9DTm9 cbYPmd7bnbNLeeF53FdQxmwqhmpZ1bRv8RVZ8sVBhC3DHz5sfAjFBuCTGMoxjvXXAwLpmx FEuzPck59qHUd9yNeAJMciyxzGMQsZ22BH/59UjZWav1VQEOD1h4BZ/lsqoQtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694547467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NsIX4adFqnt12JDu8iw11cbq/1Tg/wtLwHbp6HDugM8=; b=HJtN5Q+d2kdhzXvWIQLKl3jyDoa/97RNNFG/72D/1Y0cGts4+96LWhRE44O6WjOsQf7Qof MFatEYi8KdkqyfAckzGlxkF4IlloKpFw5FDFRUkzVIfv67aFrLNueoPM3LIJYr0KY5TbnU mXlsEDLA4cB1/FJCg/xPZBOMIivZYPg8OFsbrBIAAoYj7rN9jzkWKKItu2Z1CR3w6zQXkA EyTewX9h5o+9vYlFHM8O/MQmaig+smOaSOZDC/I1QkooLywHXYYqYdnJ4tHvJvUhjjiPmh Fg56emXKaJgIDdLHWeBvPp2ca1gjpbxpT5NPLqgXxYhxh8F+8XQJgfeSGcW/eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlYlH0nbTzl3M; Tue, 12 Sep 2023 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CJblQi056561; Tue, 12 Sep 2023 19:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CJblE4056558; Tue, 12 Sep 2023 19:37:47 GMT (envelope-from git) Date: Tue, 12 Sep 2023 19:37:47 GMT Message-Id: <202309121937.38CJblE4056558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: e5635c3dab47 - main - powerpc_mmu_radix: include vm_radix.h file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5635c3dab47b19937622a70b4b443ffea2d5436 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e5635c3dab47b19937622a70b4b443ffea2d5436 commit e5635c3dab47b19937622a70b4b443ffea2d5436 Author: Doug Moore AuthorDate: 2023-09-12 19:35:48 +0000 Commit: Doug Moore CommitDate: 2023-09-12 19:35:48 +0000 powerpc_mmu_radix: include vm_radix.h file Replacing _vm_radix.h with vm_radix.h in one header file leaves one source file short of function definitions. Include vm_radix.h in that source file. Fixes a problem rooted in change 429c871ddddac4bbf6abf1eb9e2e6603f87c2ef5. --- sys/powerpc/aim/mmu_radix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 32d08d2d7026..9c5b67121803 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include From nobody Tue Sep 12 21:01:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlbbL6vH5z4svkn; Tue, 12 Sep 2023 21:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlbbL6Th9z3Yh6; Tue, 12 Sep 2023 21:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694552462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5a3rh/IeZZhvSf0Ff96CoG8tSxP0Ph75/s2sg5DcQc=; b=Ng+M9FTN9NdJrzOfan2OVIl1aDl9euELdnmL81bP9KnzqlnObdX0/VTsob/T7NsZowGBB6 ro1X/KLoRDTg3mw2+xzFklie97TxY6V4WSvqodbbkNfDjWoyrZAS9vDOUaKcJ1nCVG2fbi Wz3UT9cJLILRg/C4tWM+dBhrc+85LAEik9YCPa1abP43VOOAwcanakBcPejcznSt7DAZ8a Vcs5CYL06b5SkxDGg5yVEpvucSzz70v343jpPKDZKgpVkYCJkqH36YhGw4v08qt66UI9on +VAw2JN7GsJQG8gsOjP65V2OF178TDlarrGkYc60CqL8HHBvAIwGcppRiUbvTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694552462; a=rsa-sha256; cv=none; b=YmxVh6VYPXqg3bw6U+JQ/dDlFkQ1sYGta3VgntiYMrdkNBMhNScqxlQQ/mqUsDvJNvkh5h nZhhCzh2IVCqrP+Oh5OqlzFE3GA448tBaue0l1RGHJyAQpdMPRUibYn8XpSagVc9owUpaV lDdYm3ef0Mbc0NAnJnS6VtezaEBK+mqrKOxO8ajOrjCmkGTk+VWR/1BDcSNcYyL4LaXJu4 FU72LyZHgP23Dv9ZyEJp+ndieXhXpuUrL6CIOfAvmcN3UaWgQamN3hi3jetRlhEuaTnaQW qYC9GbcdVWtA70WJ2ONd7Rgj2sUf6OqcLurso39LhmFd8y2Viza63I/iUivB5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694552462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5a3rh/IeZZhvSf0Ff96CoG8tSxP0Ph75/s2sg5DcQc=; b=rTT0wB4Tq/QZADo6x1iUd+O2zFqxtA1qT4VXkEYUt5LQ3gTmhCAmv1irnUVca3iP35Wr5F Jd0hTb1ufWDc9cIe270l0aqu1lsDxuK6LwV69zAkgNp1+RGxr3GdW2qAEtgVEw12rcv7cu VK5YXas3fi2AlCuWOLKofj+JXlrzzA1qUzmNudi/BO1gmxzKwpIVd4VkGV5wQESaYsEz0h aJW3MXosItQg7VlLRuwk7wUyLAVZig3Hf4SApWy+Ux5DFSBGIZl0flNe4Sr1Pr1yZNBPdJ rHmv7B9sWOSdRfpUtL7N+NlvDna0PcZoPtfGmdEhIhlFmCKc6G+78rizC/8Kqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlbbL5XCNznCv; Tue, 12 Sep 2023 21:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CL12gw099180; Tue, 12 Sep 2023 21:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CL12V4099177; Tue, 12 Sep 2023 21:01:02 GMT (envelope-from git) Date: Tue, 12 Sep 2023 21:01:02 GMT Message-Id: <202309122101.38CL12V4099177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c086d1cbc3d1 - main - ncurses: avoid hardcoded assumptions about the layout of .OBJDIR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c086d1cbc3d13967c031e6420831349967dbcfa2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c086d1cbc3d13967c031e6420831349967dbcfa2 commit c086d1cbc3d13967c031e6420831349967dbcfa2 Author: Kyle Evans AuthorDate: 2023-09-12 21:00:45 +0000 Commit: Kyle Evans CommitDate: 2023-09-12 21:00:45 +0000 ncurses: avoid hardcoded assumptions about the layout of .OBJDIR Abstract out the details of the FreeBSD build into a $TINFO_OBJDIR that external builds can override if they orchestrate the build a bit differently and have a different objdir layout as a result. This makes the ncurses build a little bit more flexible without requiring weird backflips. Reviewed by: bapt, sjg Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41834 --- lib/ncurses/config.mk | 6 ++++-- lib/ncurses/ncurses/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk index 0016dc97a72f..8a3e7d0ffa59 100644 --- a/lib/ncurses/config.mk +++ b/lib/ncurses/config.mk @@ -6,6 +6,8 @@ NCURSES_MAJOR= 6 NCURSES_MINOR= 2 NCURSES_PATCH= 20210220 +TINFO_OBJDIR?= ${.OBJDIR:H}/tinfo + CFLAGS+= -D_XOPEN_SOURCE_EXTENDED NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h @@ -17,7 +19,7 @@ CFLAGS+= -I${.CURDIR:H}/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${NCURSES_DIR}/ncurses -CFLAGS+= -I${.OBJDIR:H}/tinfo/ +CFLAGS+= -I${TINFO_OBJDIR} CFLAGS+= -Wall @@ -27,7 +29,7 @@ CFLAGS+= -DHAVE_CONFIG_H # everyone needs this .PATH: ${NCURSES_DIR}/include -.PATH: ${.OBJDIR:H}/tinfo/ +.PATH: ${TINFO_OBJDIR} # tools and directories AWK?= awk diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index b52085780952..e1a3dbf61e49 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -180,9 +180,9 @@ libncursesw.ald: ${.CURDIR}/${STATIC_LDSCRIPT} -e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \ ${.ALLSRC} > ${.TARGET} -lib_gen.c: MKlib_gen.sh ${.OBJDIR:H}/tinfo/curses.h ncurses_dll.h +lib_gen.c: MKlib_gen.sh ${TINFO_OBJDIR}/curses.h ncurses_dll.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \ - "${AWK}" generated < ${.OBJDIR:H}/tinfo/curses.h >$@ + "${AWK}" generated < ${TINFO_OBJDIR}/curses.h >$@ expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c From nobody Tue Sep 12 23:39:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rlg5c6yS2z4t6VR; Tue, 12 Sep 2023 23:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rlg5c6XkBz3Cq6; Tue, 12 Sep 2023 23:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694561940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Xj+HWE8iaEsfz0/eduvECYvF/p86yMosxzH7rsgLsw=; b=OwnspFqrDp3FUc9sSXiRSm6j1ynDzmEqGjjjANLf3Xdd7/lqdl/1abUpS8XgPcjx8g4CW7 wVcJgwAOtqoMAR8qle4lFwNHquLkP6ZgSNMwKlxECIlPxwXxS3EXhogpY3TfHrMFH2p3a+ LsLFf9/0V/CaNu8n17lM+vGrguZOX6I/IxoAKrrQd57yS0p/2K8gCGynh+5R/FVjvguzR+ uh1D3i42UQK6OvTkQljebR0ipH7Ds7k2NjKyeecTpG1uBfSbp5yVQi6eA+CDloCDCJVDfl K4DI+bv9Di4pG9eOYnc7SgI+B6bHPpBzKKb+B14F7Gfe/OQzW++xehwQ1yVNWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694561940; a=rsa-sha256; cv=none; b=rziOIJcJ1hpHIVuZfCV+/GgOZMnUr/mJ0/TOeTnU2qj173R5l3camb3k+L/Q8dofTgD1bS C+PZMi8Cwz1k0Vi+1jGnYfscPiOpB1EGcqbSMyDACkyamL5wn2lHbFmCOj6NnfjFhV3Fg7 wCifoIhUOB94Q0hfW9gYqkJY0dc80KPF6vfOJFGKmyf1oELmTiGeppiRSqtwyF9eXGSvJM hOXumbhf9j7KCru1bfM+Z6dD0rR8eUwtTz+80cwDS0yufKcAE1z6LGADKu0UezpUc9SJs2 a5L2gvApq1tm0HZqAG7t1SM14pn9LvhYDF9JpHIl6ItozcaSXFAjth9lw/le4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694561940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Xj+HWE8iaEsfz0/eduvECYvF/p86yMosxzH7rsgLsw=; b=iZCJZFSuaXBLSqIY/dpnQnCadCuEwiu4SKbSuqfcpjrPYZFQQosjggVEkB9v/xSTuLHnIP hMBsin6svgRfXV7l8Kgs7Iw93kymns5n/ytzniUpjpq9C+syXvUTJSvlKrkDx11A6BCUqz TZBwNexWdGKFKd3uLLKIcFA6p6TJ9MlhRdJOlP7V/4lQ32kI4jwGNi8cZ0d/h2CtMICeNZ DPWKNiQmgUeE+5uK6QN/qmmHZh8xiPZmpCSddOkYCwZVfw9BdV4c7r+8KMxW1jIZU81D0j o2JspHJ6ZyeGIkv8vw8WqJZxcFHrrmAjWdOpE0GDcKswNHADjD8ezPn/N3FlSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rlg5c5GN3zrYY; Tue, 12 Sep 2023 23:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CNd0Gk054411; Tue, 12 Sep 2023 23:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CNd0Au054408; Tue, 12 Sep 2023 23:39:00 GMT (envelope-from git) Date: Tue, 12 Sep 2023 23:39:00 GMT Message-Id: <202309122339.38CNd0Au054408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 81c5f0fac91d - main - sctp: improve shutting down the read side of a socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81c5f0fac91dfae64205a6c4f9b2a469d1187372 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=81c5f0fac91dfae64205a6c4f9b2a469d1187372 commit 81c5f0fac91dfae64205a6c4f9b2a469d1187372 Author: Michael Tuexen AuthorDate: 2023-09-12 23:33:54 +0000 Commit: Michael Tuexen CommitDate: 2023-09-12 23:36:14 +0000 sctp: improve shutting down the read side of a socket When shutdown(..., SHUT_RD) or shutdown(..., SHUT_RDWR) is called, really clean up the read queue and issue an ungraceful shutdown if user messages are affected. Reported by: syzbot+d4e1d30d578891245f59@syzkaller.appspotmail.com MFC after: 3 days --- sys/netinet/sctp_usrreq.c | 90 ++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 52b4faf48574..02bb87578528 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -777,52 +777,76 @@ sctp_disconnect(struct socket *so) int sctp_flush(struct socket *so, int how) { - /* - * We will just clear out the values and let subsequent close clear - * out the data, if any. Note if the user did a shutdown(SHUT_RD) - * they will not be able to read the data, the socket will block - * that from happening. - */ + struct epoch_tracker et; + struct sctp_tcb *stcb; + struct sctp_queued_to_read *control, *ncontrol; struct sctp_inpcb *inp; + struct mbuf *m, *op_err; + bool need_to_abort = false; + /* + * For 1-to-1 style sockets, flush the read queue and trigger an + * ungraceful shutdown of the association, if and only if user + * messages are lost. Loosing notifications does not need to be + * signalled to the peer. + */ + if (how == PRU_FLUSH_WR) { + /* This function is only relevant for the read directions. */ + return (0); + } inp = (struct sctp_inpcb *)so->so_pcb; if (inp == NULL) { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); return (EINVAL); } - SCTP_INP_RLOCK(inp); - /* For the 1 to many model this does nothing */ + SCTP_INP_WLOCK(inp); if (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) { - SCTP_INP_RUNLOCK(inp); + /* For 1-to-many style sockets this function does nothing. */ + SCTP_INP_WUNLOCK(inp); return (0); } - SCTP_INP_RUNLOCK(inp); - if ((how == PRU_FLUSH_RD) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SCTP_INP_WLOCK(inp); - SCTP_INP_READ_LOCK(inp); - inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; - SCTP_INP_READ_UNLOCK(inp); + stcb = LIST_FIRST(&inp->sctp_asoc_list); + if (stcb == NULL) { SCTP_INP_WUNLOCK(inp); - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SCTP_SB_CLEAR(so->so_rcv); - SOCK_UNLOCK(so); + return (ENOTCONN); } - if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SOCK_UNLOCK(so); + SCTP_TCB_LOCK(stcb); + SCTP_INP_READ_LOCK(inp); + inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; + SOCK_LOCK(so); + TAILQ_FOREACH_SAFE(control, &inp->read_queue, next, ncontrol) { + if ((control->spec_flags & M_NOTIFICATION) == 0) { + need_to_abort = true; + } + TAILQ_REMOVE(&inp->read_queue, control, next); + control->on_read_q = 0; + for (m = control->data; m; m = SCTP_BUF_NEXT(m)) { + sctp_sbfree(control, control->stcb, &so->so_rcv, m); + } + if (control->on_strm_q == 0) { + sctp_free_remote_addr(control->whoFrom); + if (control->data) { + sctp_m_freem(control->data); + control->data = NULL; + } + sctp_free_a_readq(stcb, control); + } else { + stcb->asoc.size_on_all_streams += control->length; + } } + SOCK_UNLOCK(so); + SCTP_INP_READ_UNLOCK(inp); + if (need_to_abort) { + inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; + SCTP_INP_WUNLOCK(inp); + op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); + NET_EPOCH_ENTER(et); + sctp_abort_an_association(inp, stcb, op_err, false, SCTP_SO_LOCKED); + NET_EPOCH_EXIT(et); + return (ECONNABORTED); + } + SCTP_TCB_UNLOCK(stcb); + SCTP_INP_WUNLOCK(inp); return (0); } From nobody Wed Sep 13 02:11:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlkTF0ZZrz4sTXL; Wed, 13 Sep 2023 02:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlkTF07Y0z4Kpl; Wed, 13 Sep 2023 02:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694571073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxtmMMCY5zMzlIt/lqb3vWA63aySyiVnEmmSjFwlNa8=; b=M5+tVn5lOm7V0C9kQoarFTC+ezaIZ7xdOnCWEzaCXW8IeUK143dZBvb3FbK/zE2byLQrBb 3l/HTIThgAoIIBIWYVeGqF3KuZFSqhDAS+frOiMpqiD+RjD9kSw8JlW9YtksfP+hvUXl5Z 4cCAaelm6CpCXAsShxgwXm78Q5AE3XsQlpMUBsmNBP+v993tZZTSwoBnRfiblRjRLLku2c T7VxddrJLgkcOxc3PxSrp1W0SQd9AeepNUthcrcx/SYknG/0Xx+iE+/s2YmNKVnffg0Nv9 OyJm1LJh3kp1NUSXh3jFJHoIkTFUN8dE9La5/Tb8zDSM6/dpCKO6+YFDda/Aag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694571073; a=rsa-sha256; cv=none; b=yzp23Wfqd12xEqhu7MyTN3ZryL26TYwEYL7CMPkplYZ8MCiAknN171jXnjeQEvCg275Eyz T83+JKCVSovvAusue5qmGVd5sI9JrSrxaaj1XR7mCefJ0LC4GHoxTYWZZnuwbIgd4S5+GL 8ETJvaK71Czdh3qGDMSwEYksqxci2u12SU4ZgqUVnyBbG2Yz5X3z+Iz2GhnMiCb0fTMqLQ modfqr6K9nInxrMLriUUiozJ3OWImIuUY6TGRIco9GidJ6ftd73Kh0pTdxkTTAu4bzTA6A TcPQEJWoEYF+XotfwPFhF9wHpc8SiuK628MYUQmdtr5NyJvYn/1Ou9XLYCyOjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694571073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxtmMMCY5zMzlIt/lqb3vWA63aySyiVnEmmSjFwlNa8=; b=HMNZ25AZM4AlitE3HxIo6BuA+nO4kzi7Fhl3FmzCTRhXOyS7ZD3IiDnKFdFf74XN37B8ZZ UXjmeMBUbZU33ZHqShsKICTlRjaW8twFUpsnbfQ9UMKyVj5s5xmV//3AWGR+GwPEFSypt+ 15BO4jGIsjnrCC1hTWzxHISNwUNGl4ffXAYNExzBbb6mrzO8PRGcfyIcBBTWw7beTg7TWC DWwBhy0avFMnaQ6NPbIbf917LxFYJ7+jaCrHDT3T9qtSetftSYOZoEm4VHjQaMT4tBYcDA sy5dOuLEot7KdoM3FoyRtBvADQkZayaUYlYjnZPVXtxyFVpW3nSf5kBQiBwTiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlkTD6L3JzwR9; Wed, 13 Sep 2023 02:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38D2BCju012379; Wed, 13 Sep 2023 02:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D2BC8i012376; Wed, 13 Sep 2023 02:11:12 GMT (envelope-from git) Date: Wed, 13 Sep 2023 02:11:12 GMT Message-Id: <202309130211.38D2BC8i012376@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: 7f5e3b9fa3d1 - main - ipfilter: Avoid allocating a new ipf token when not needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f5e3b9fa3d159b7f061b4d01a767cbe5d0527f3 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7f5e3b9fa3d159b7f061b4d01a767cbe5d0527f3 commit 7f5e3b9fa3d159b7f061b4d01a767cbe5d0527f3 Author: Cy Schubert AuthorDate: 2023-09-12 20:29:29 +0000 Commit: Cy Schubert CommitDate: 2023-09-13 02:10:40 +0000 ipfilter: Avoid allocating a new ipf token when not needed Only allocate a new ipftoken_t if one cannot be found. This eliminates allocating unnecessary token structures that will never be used when performing simple lookups for existing token structures. MFC after: 2 weeks --- sys/netpfil/ipfilter/netinet/fil.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 7dee98d0c1ad..b04ec3496a65 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -7460,10 +7460,6 @@ ipf_token_find(ipf_main_softc_t *softc, int type, int uid, void *ptr) { ipftoken_t *it, *new; - KMALLOC(new, ipftoken_t *); - if (new != NULL) - bzero((char *)new, sizeof(*new)); - WRITE_ENTER(&softc->ipf_tokens); for (it = softc->ipf_token_head; it != NULL; it = it->ipt_next) { if ((ptr == it->ipt_ctx) && (type == it->ipt_type) && @@ -7472,6 +7468,10 @@ ipf_token_find(ipf_main_softc_t *softc, int type, int uid, void *ptr) } if (it == NULL) { + KMALLOC(new, ipftoken_t *); + if (new != NULL) + bzero((char *)new, sizeof(*new)); + it = new; new = NULL; if (it == NULL) { @@ -7483,11 +7483,6 @@ ipf_token_find(ipf_main_softc_t *softc, int type, int uid, void *ptr) it->ipt_type = type; it->ipt_ref = 1; } else { - if (new != NULL) { - KFREE(new); - new = NULL; - } - if (it->ipt_complete > 0) it = NULL; else From nobody Wed Sep 13 09:13:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rlvrt686Vz4sjnW; Wed, 13 Sep 2023 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rlvrt5yYSz4Hrl; Wed, 13 Sep 2023 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694596430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bx0LPqHZF7zXBch+LQrAVc0+1DMWA/1Ke6ludI9k1nw=; b=yapSVRaMrQx6udjJrjsxLUkHdXFz2fLxgmWkoOhpg7qI8GyT9g7AyKlz+5i07zPHm8QC0Q i2960naqMznBCIRVt5m6f4Y/VVrDBrWAVgezxDF6V0PftklgVKdIuo4aY1UNmFoe7/RsSS w9URupeU3nwTG4KTVHKXYar4k57p/6rRggu0tIiyvNOIyZSKHL5B4vWpOTgNjxpErMoUe2 7ym4wlDlxbxF7WRS6Fpf4ffs7O7XesGn5Hj8q/B2a6SUKQAYhom4pFNsMd7GuFcKiJfxa5 Q9Cxr8ywrZCJgarSSl3e7zXMkJXpgsI1Wfo9l9aC5kV64iXSyFIkc39zb9uQ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694596430; a=rsa-sha256; cv=none; b=jSmj0Gkw/kPX9S5+Y+5riDodmY7OS2dRIEG0I4gt0zowiVT2UU+KUz6HTv/E54MP+W9Rhq d6r6ZZK70a0Ts1xRRNUWOyFwJq9O7rSeARxmyo6TqwoE/9cGxDiHBKvCYICP7EN96dkckk JjOgL6qmhiKyxUgdPVnRqmlXd9y97X80kKWYlUM3bx2GD96n6HzlmUD8Zt4Hgd7TT+Ht54 HTsb13kKZWPBJM0uC3hoBuGzx/SDWqhntLFcWlvK61GU6ndA31BO4thM8QSRLShodxLIMv v15gPJpbEK1wHPBFaF6Rmm9aQenL1LlH9nPmsi4pPUOLADp3oNKfDwQSrlT5NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694596430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bx0LPqHZF7zXBch+LQrAVc0+1DMWA/1Ke6ludI9k1nw=; b=NYFJQhb0VeXdga9pqPbISruqHE6er7A4vdz5naVNlVxlf4xjmmYNreCnEhF+hS3JuGWUxz NnyaHNv4ZTi05Q/D7c5tQDj8qDLqsmbeuyEDrgDKTEiuHiNgZXTKhz4gaS0AUibegRC4sz omFrfSWGu1ZZPdsRfUl6TMFKqXcnua5QQyigIPH2JZaG/FR2mS5n9FxyMyjRLG4Fsn4iPq Z38K+lJ9TgC7Am5y5MBFOv9x3+DD7H/WtrYM+u9witaIcVIkZl7gYiIKvXTX/JAE2l70Ez WcteBGXT08mjKDraKrUtgnBAkJLdpkTTkAhQLHTI2etDwpHQzr2goYMV938FIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rlvrt51vzz17Yv; Wed, 13 Sep 2023 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38D9Dog2016869; Wed, 13 Sep 2023 09:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D9Doxt016866; Wed, 13 Sep 2023 09:13:50 GMT (envelope-from git) Date: Wed, 13 Sep 2023 09:13:50 GMT Message-Id: <202309130913.38D9Doxt016866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c265e6217951 - stable/14 - qat: Intel 4xxx Series driver API extension List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c265e6217951b8bf71dbf59832e06d9f2c0b0325 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c265e6217951b8bf71dbf59832e06d9f2c0b0325 commit c265e6217951b8bf71dbf59832e06d9f2c0b0325 Author: Piotr Kasierski AuthorDate: 2023-09-06 13:51:41 +0000 Commit: Mark Johnston CommitDate: 2023-09-13 09:12:52 +0000 qat: Intel 4xxx Series driver API extension This commit introduces: - Quick Assist API update for partial decompress and zero padding. - Refactor of UIO locking. - VF driver hotplug fix. - Minor code style fixes for firmware API. Patch co-authored by: Krzysztof Zdziarski Patch co-authored by: Michal Gulbicki Patch co-authored by: Piotr Kasierski Patch co-authored by: Karol Grzadziel Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41613 (cherry picked from commit 22cf89c938886d14f5796fc49f9f020c23ea8eaf) --- share/man/man4/qat.4 | 4 +- sys/dev/qat/qat_api/common/compression/dc_dp.c | 296 ++++++++++++- .../common/compression/include/dc_datapath.h | 11 + sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 8 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 18 +- .../qat/qat_api/firmware/include/icp_qat_fw_comp.h | 486 ++++++++++----------- .../qat_api/firmware/include/icp_qat_hw_20_comp.h | 63 ++- .../firmware/include/icp_qat_hw_20_comp_defs.h | 159 ++++++- sys/dev/qat/qat_api/include/dc/cpa_dc.h | 15 +- sys/dev/qat/qat_api/include/dc/cpa_dc_dp.h | 431 ++++++++++++++++++ sys/dev/qat/qat_api/include/icp_sal_versions.h | 2 +- sys/dev/qat/qat_common/adf_ctl_drv.c | 3 +- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 24 +- sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 13 +- sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 5 + sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 18 +- sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 32 +- 17 files changed, 1221 insertions(+), 367 deletions(-) diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 347f257c7aec..b0fa0b0cbc92 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -64,8 +64,8 @@ driver supports cryptography and compression acceleration. A complete API for offloading these operations is exposed in the kernel and may be used by any other entity directly. For details of usage and supported operations and algorithms refer to the -following documentation available from -.Lk 01.org : +following documentation available from Intel Download Center +.Lk https://downloadcenter.intel.com : .Bl -bullet -compact .It .Rs diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c index 1bc50d89365d..8b409d9ad7ca 100644 --- a/sys/dev/qat/qat_api/common/compression/dc_dp.c +++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c @@ -217,6 +217,89 @@ dcDataPlaneParamCheck(const CpaDcDpOpData *pOpData) return CPA_STATUS_SUCCESS; } +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Partial-read parameters validation utility. + * + * @description + * Basic check that all partial-read related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * + *****************************************************************************/ +static CpaStatus +dcDataPlanePartReadCheck(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData) +{ + sal_compression_service_t *pService = NULL; + + LAC_CHECK_NULL_PARAM(pPartReadData); + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_COMPRESS) { + /* Decompression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + if (pPartReadData->length > pOpData->bufferLenForData) { + QAT_UTILS_LOG( + "Partial read data length can not be greater than the destination buffer size\n"); + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} + +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Zero-padding parameters validation utility. + * + * @description + * Basic check that all zero-padding related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * @retval CPA_STATUS_NOT_SUPPORTED Feature not supported + * + *****************************************************************************/ +static CpaStatus +dcDataPlaneZeroPadCheck(CpaDcDpOpData *pOpData) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_DECOMPRESS) { + /* Compression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} CpaStatus cpaDcDpGetSessionSize(CpaInstanceHandle dcInstance, CpaDcSessionSetupData *pSessionData, @@ -379,8 +462,60 @@ dcDpWriteRingMsg(CpaDcDpOpData *pOpData, icp_qat_fw_comp_req_t *pCurrentQatMsg) pCurrentQatMsg->comp_pars.out_buffer_sz = pOpData->bufferLenForData; } -CpaStatus -cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +/** + ***************************************************************************** + * @ingroup cpaDcDp + * + * @description + * Updates the request decryptor with optional parameters: + * - partial read specific fields + * - zero-padding specific field + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * @param[in] zeroPadFlag Boolean indicator containing the + * zero-padding enablement flag. + * @param[in] pCurrentQatMsg Pointer to current QAT message on the ring. + * + *****************************************************************************/ +static void +dcDpUpdateRingMsg(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + icp_qat_fw_comp_req_t *pCurrentQatMsg) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + if (!isDcGen4x(pService)) { + return; + } + + /* Partial read settings */ + if (NULL != pPartReadData) { + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_offset = pPartReadData->dataOffset; + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_length = pPartReadData->length; + ICP_QAT_FW_COMP_PART_DECOMP_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_PART_DECOMP); + } + /* Zero padding settings */ + if (CPA_TRUE == zeroPadFlag) { + ICP_QAT_FW_COMP_ZEROPAD_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_ZEROPAD); + } +} + +static CpaStatus +dcDpEnqueueOpBase(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -392,6 +527,20 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) return status; } + if (NULL != pPartReadData) { + status = dcDataPlanePartReadCheck(pOpData, pPartReadData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + if ((CPA_FALSE == pOpData->compressAndVerify) && (CPA_DC_DIR_COMPRESS == pOpData->sessDirection)) { return CPA_STATUS_UNSUPPORTED; @@ -422,6 +571,13 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } dcDpWriteRingMsg(pOpData, pCurrentQatMsg); + if (NULL != pPartReadData || CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData, + pPartReadData, + zeroPadFlag, + pCurrentQatMsg); + } + pSessionDesc->pendingDpStatelessCbCount++; if (CPA_TRUE == performOpNow) { @@ -432,9 +588,36 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } CpaStatus -cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, - CpaDcDpOpData *pOpData[], - const CpaBoolean performOpNow) +cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +{ + + return dcDpEnqueueOpBase(pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartRead(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, + pPartReadData, + CPA_FALSE, + performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPad(CpaDcDpOpData *pOpData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, NULL, CPA_TRUE, performOpNow); +} + +static CpaStatus +dcDpEnqueueOpBatchBase(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartData[], + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -462,6 +645,21 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return status; } + if (NULL != pPartData) { + status = + dcDataPlanePartReadCheck(pOpData[i], pPartData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + /* Check that all instance handles and session handles are the * same */ if (pOpData[i]->dcInstance != pOpData[0]->dcInstance) { @@ -516,6 +714,18 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, for (i = 0; i < numberRequests; i++) { dcDpWriteRingMsg(pOpData[i], pCurrentQatMsg); + if (pPartData) { + dcDpUpdateRingMsg(pOpData[i], + pPartData[i], + CPA_FALSE, + pCurrentQatMsg); + } + if (CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData[i], + NULL, + CPA_TRUE, + pCurrentQatMsg); + } icp_adf_getQueueNext(trans_handle, (void **)&pCurrentQatMsg); } @@ -528,6 +738,34 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return CPA_STATUS_SUCCESS; } +CpaStatus +cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartReadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartReadData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, pPartReadData, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_TRUE, performOpNow); +} + CpaStatus icp_sal_DcPollDpInstance(CpaInstanceHandle dcInstance, Cpa32U responseQuota) { @@ -565,3 +803,51 @@ cpaDcDpPerformOpNow(CpaInstanceHandle dcInstance) return CPA_STATUS_SUCCESS; } + +CpaStatus +cpaDcDpIsPartReadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_part_read; + + return CPA_STATUS_SUCCESS; +} + +CpaStatus +cpaDcDpIsZeroPadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_zero_pad; + + return CPA_STATUS_SUCCESS; +} diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h index 5bcff65c4fb3..58fb56f3c8ae 100644 --- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h +++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h @@ -196,4 +196,15 @@ typedef enum dc_cnv_mode_s { /* CNV = TRUE, CNVNR = TRUE */ } dc_cnv_mode_t; +/* Type to access extended features bit fields */ +typedef struct dc_extended_features_s { + unsigned is_cnv : 1; /* Bit<0> */ + unsigned padding : 7; + unsigned is_cnvnr : 1; /* Bit<8> */ + unsigned reserved : 2; + unsigned is_part_read : 1; /* Bit<11> */ + unsigned is_zero_pad : 1; /* Bit<12> */ + unsigned not_used : 19; +} dc_extd_ftrs_t; + #endif /* DC_DATAPATH_H_ */ diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c index f0e8d28949ff..c0f5a411d87e 100644 --- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c +++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c @@ -52,14 +52,6 @@ /* C string null terminator size */ #define SAL_NULL_TERM_SIZE 1 -/* Type to access extended features bit fields */ -typedef struct dc_extended_features_s { - unsigned is_cnv : 1; /* Bit<0> */ - unsigned padding : 7; - unsigned is_cnvnr : 1; /* Bit<8> */ - unsigned not_used : 23; -} dc_extd_ftrs_t; - /* * Prints statistics for a compression instance */ diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h index 28dfeff6579e..b4d1f5829ba2 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h @@ -1386,21 +1386,9 @@ typedef struct icp_qat_fw_comn_resp_s { /**< Error Code constant value for submission of empty dynamic stored block to * slice */ -#define ERR_CODE_EXCEED_MAX_REQ_TIME -24 -/**< Error Code constant for exceeding max request time */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_HANDLE -20 -/**< Error Code constant for invalid handle in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_HMAC_FAILED -21 -/**< Error Code constant for failed hmac in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_WRAPPING_ALGO -22 -/**< Error Code constant for invalid wrapping algo in kpt crypto service */ - -#define ERR_CODE_KPT_DRNG_SEED_NOT_LOAD -23 -/**< Error Code constant for no drng seed is not loaded in kpt ecdsa signrs -/service */ +#define ERR_CODE_REGION_OUT_OF_BOUNDS -21 +/**< Error returned when decompression ends before the specified partial + * decompression region was produced */ #define ERR_CODE_MISC_ERROR -50 /**< Error Code constant for error detected but the source diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h index 5edf7022ee1d..fe1b7ad55de8 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h @@ -47,6 +47,7 @@ typedef enum { } icp_qat_fw_comp_cmd_id_t; + /* * REQUEST FLAGS IN COMMON COMPRESSION * In common message it is named as SERVICE SPECIFIC FLAGS. @@ -64,7 +65,8 @@ typedef enum { * are don't care. i.e., these features are removed from QAT 2.0. */ -/** Flag usage */ + +/**< Flag usage */ #define ICP_QAT_FW_COMP_STATELESS_SESSION 0 /**< @ingroup icp_qat_fw_comp @@ -108,7 +110,7 @@ typedef enum { * Flag representing secure RAM from being used as * an intermediate buffer is ENABLED. */ -/** Flag mask & bit position */ +/**< Flag mask & bit position */ #define ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS 2 /**< @ingroup icp_qat_fw_comp @@ -148,7 +150,7 @@ typedef enum { #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS 7 /**< @ingroup icp_qat_fw_comp * Starting bit position for flag used to disable secure ram from - * being used as an intermediate buffer. */ + being used as an intermediate buffer. */ #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK 0x1 /**< @ingroup icp_qat_fw_comp @@ -170,7 +172,7 @@ typedef enum { * @ret_uncomp RetUnCompressed * @secure_ram Secure Ram usage * - *********************************************************************************/ + ******************************************************************************/ #define ICP_QAT_FW_COMP_FLAGS_BUILD( \ sesstype, autoselect, enhanced_asb, ret_uncomp, secure_ram) \ (((sesstype & ICP_QAT_FW_COMP_SESSION_TYPE_MASK) \ @@ -215,7 +217,7 @@ typedef enum { * * @param flags Flags to extract the session type bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SESSION_TYPE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS, \ @@ -230,7 +232,7 @@ typedef enum { * * @param flags Flags to extract the autoSelectBest bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_AUTO_SELECT_BEST_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_AUTO_SELECT_BEST_BITPOS, \ @@ -245,7 +247,7 @@ typedef enum { * * @param flags Flags to extract the enhanced asb bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_EN_ASB_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_ENHANCED_AUTO_SELECT_BEST_BITPOS, \ @@ -260,7 +262,7 @@ typedef enum { * * @param flags Flags to extract the Ret Uncomp bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_RET_UNCOMP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_RET_DISABLE_TYPE0_HEADER_DATA_BITPOS, \ @@ -275,21 +277,21 @@ typedef enum { * * @param flags Flags to extract the Secure Ram usage from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SECURE_RAM_USE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK) /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression header cd pars block * @description * Definition of the compression processing cd pars block. * The structure is a service-specific implementation of the common * structure. - ******************************************************************************/ + *****************************************************************************/ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { /**< LWs 2-5 */ struct { @@ -301,15 +303,10 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint8_t content_desc_params_sz; /**< Size of the content descriptor parameters in quad words. - * These - * parameters describe the session setup configuration info for - * the - * slices that this request relies upon i.e. the configuration - * word and - * cipher key needed by the cipher slice if there is a request - * for - * cipher - * processing. */ + * These parameters describe the session setup configuration + * info for the slices that this request relies upon i.e. the + * configuration word and cipher key needed by the cipher slice + * if there is a request for cipher processing. */ uint8_t content_desc_hdr_resrvd2; /**< Content descriptor reserved field */ @@ -324,28 +321,28 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint32_t content_desc_resrvd4; /**< Content descriptor reserved field */ + } sl; } icp_qat_fw_comp_req_hdr_cd_pars_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression request parameters block * @description * Definition of the compression processing request parameters block. * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 14-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_req_params_s { /**< LW 14 */ uint32_t comp_len; /**< Size of input to process in bytes Note: Only EOP requests can be - * odd - * for decompression. IA must set LSB to zero for odd sized intermediate - * inputs */ + * odd for decompression. IA must set LSB to zero for odd sized + * intermediate inputs */ /**< LW 15 */ uint32_t out_buffer_sz; @@ -368,10 +365,10 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< CRC data structure pointer */ } crc; - /** LW 18 */ + /**< LW 18 */ uint32_t req_par_flags; - /** LW 19 */ + /**< LW 19 */ uint32_t rsrvd; } icp_qat_fw_comp_req_params_t; @@ -394,8 +391,10 @@ typedef struct icp_qat_fw_comp_req_params_s { * @param cnvnr Whether internal CNV recovery is to be performed * * ICP_QAT_FW_COMP_NO_CNV_RECOVERY * * ICP_QAT_FW_COMP_CNV_RECOVERY + * @param cnvdfx Whether CNV error injection is to be performed + * * ICP_QAT_FW_COMP_NO_CNV_DFX + * * ICP_QAT_FW_COMP_CNV_DFX * @param crc CRC Mode Flag - 0 legacy, 1 crc data struct - * *****************************************************************************/ #define ICP_QAT_FW_COMP_REQ_PARAM_FLAGS_BUILD( \ sop, eop, bfinal, cnv, cnvnr, cnvdfx, crc) \ @@ -411,21 +410,64 @@ typedef struct icp_qat_fw_comp_req_params_s { ((crc & ICP_QAT_FW_COMP_CRC_MODE_MASK) \ << ICP_QAT_FW_COMP_CRC_MODE_BITPOS)) + +/* + * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION + * + * +=====+-----+----- + --- + --- +-----+ --- + ----- + --- + ---- + -- + -- + + * | Bit |31-24| 20 | 19 | 18 | 17 | 16 | 15-7 | 6 | 5-2 | 1 | 0 | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + * |Flags|Resvd|xxHash| CRC | CNV |CNVNR| CNV | Resvd |BFin | Resvd|EOP |SOP | + * | |=0 |acc | MODE| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + */ + + +/** +***************************************************************************** +* @ingroup icp_qat_fw_comp +* Definition of the additional QAT2.0 Compression command types +* @description +* Enumeration which is used to indicate the ids of functions +* that are exposed by the Compression QAT FW service +* +*****************************************************************************/ +typedef enum { + ICP_QAT_FW_COMP_20_CMD_LZ4_COMPRESS = 3, + /*!< LZ4 Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4_DECOMPRESS = 4, + /*!< LZ4 Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_COMPRESS = 5, + /*!< LZ4S Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_DECOMPRESS = 6, + /*!< LZ4S Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_XP10_COMPRESS = 7, + /*!< XP10 Compress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_XP10_DECOMPRESS = 8, + /*!< XP10 Decompress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_DELIMITER + /**< Delimiter type */ + +} icp_qat_fw_comp_20_cmd_id_t; + + /* * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION * - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + - * --- + - * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 - * | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + - * | Flags | Resvd | CRC |Resvd| CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | - * SOP | - * | | =0 | Mode| =0 | | | =0 | | =0 | | | - * | | | | | | | | | | | | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + --- + + * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + + * | Flags | Resvd | CRC | CNV | CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | SOP | + * | | =0 | Mode| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + */ #define ICP_QAT_FW_COMP_NOT_SOP 0 @@ -434,15 +476,15 @@ typedef struct icp_qat_fw_comp_req_params_s { #define ICP_QAT_FW_COMP_SOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS Start of Packet */ + * * Flag representing that a request IS Start of Packet */ #define ICP_QAT_FW_COMP_NOT_EOP 0 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request is NOT Start of Packet */ + * Flag representing that a request is NOT Start of Packet */ #define ICP_QAT_FW_COMP_EOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS End of Packet */ + * Flag representing that a request IS End of Packet */ #define ICP_QAT_FW_COMP_NOT_BFINAL 0 /**< @ingroup icp_qat_fw_comp @@ -484,6 +526,30 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Flag representing to use the external CRC data struct */ +#define ICP_QAT_FW_COMP_NO_XXHASH_ACC 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash will NOT be accumulated across requests */ + +#define ICP_QAT_FW_COMP_XXHASH_ACC 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash WILL be accumulated across requests */ + +#define ICP_QAT_FW_COMP_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_NO_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_ZEROPAD 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform zero-padding in compression request */ + +#define ICP_QAT_FW_COMP_NO_ZEROPAD 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform zero-padding in compression request */ + #define ICP_QAT_FW_COMP_SOP_BITPOS 0 /**< @ingroup icp_qat_fw_comp * Starting bit position for SOP */ @@ -516,14 +582,6 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Starting bit position for the CNV bit */ -#define ICP_QAT_FW_COMP_CNV_RECOVERY_MASK 0x1 -/**< @ingroup icp_qat_fw_comp - * One bit mask for the CNV Recovery bit */ - -#define ICP_QAT_FW_COMP_CNV_RECOVERY_BITPOS 17 -/**< @ingroup icp_qat_fw_comp - * Starting bit position for the CNV Recovery bit */ - #define ICP_QAT_FW_COMP_CNVNR_MASK 0x1 /**< @ingroup icp_qat_fw_comp * One bit mask for the CNV Recovery bit */ @@ -556,6 +614,22 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * One bit mask used to determine xxHash accumulate mode */ +#define ICP_QAT_FW_COMP_PART_DECOMP_BITPOS 27 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress bit */ + +#define ICP_QAT_FW_COMP_PART_DECOMP_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress mask */ + +#define ICP_QAT_FW_COMP_ZEROPAD_BITPOS 26 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad bit */ + +#define ICP_QAT_FW_COMP_ZEROPAD_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad mask */ + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -565,7 +639,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the SOP bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SOP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SOP_BITPOS, \ @@ -585,8 +659,9 @@ typedef struct icp_qat_fw_comp_req_params_s { QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_EOP_BITPOS, \ ICP_QAT_FW_COMP_EOP_MASK) - /** + + ****************************************************************************** * @ingroup icp_qat_fw_comp * @@ -595,7 +670,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the bfinal bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_BFINAL_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_BFINAL_BITPOS, \ @@ -663,6 +738,70 @@ typedef struct icp_qat_fw_comp_req_params_s { ICP_QAT_FW_COMP_XXHASH_ACC_MODE_BITPOS, \ ICP_QAT_FW_COMP_XXHASH_ACC_MODE_MASK) +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the partial de-compress on/off bit + * + * @param flags Flags to extract the partial de-compress on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the partial de-compress on/off bit + * + * @param flags Flags to set the partial de-compress on/off bit to + * @param val partial de-compress on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the zero padding on/off bit + * + * @param flags Flags to extract the zero padding on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the zero-padding on/off bit + * + * @param flags Flags to set the zero-padding on/off bit to + * @param val zero-padding on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -670,23 +809,23 @@ typedef struct icp_qat_fw_comp_req_params_s { * @description * Definition of the translator processing request parameters block * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 20-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_xlt_req_params_s { /**< LWs 20-21 */ uint64_t inter_buff_ptr; /**< This field specifies the physical address of an intermediate - * buffer SGL array. The array contains a pair of 64-bit - * intermediate buffer pointers to SGL buffer descriptors, one pair - * per CPM. Please refer to the CPM1.6 Firmware Interface HLD - * specification for more details. - * Placeholder for QAT2.0. */ + * buffer SGL array. The array contains a pair of 64-bit + * intermediate buffer pointers to SGL buffer descriptors, one pair + * per CPM. Please refer to the CPM1.6 Firmware Interface HLD + * specification for more details. */ + } icp_qat_fw_xlt_req_params_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Compression header of the content descriptor block * @description @@ -697,7 +836,7 @@ typedef struct icp_qat_fw_xlt_req_params_s { * cd block, thus differing from the common base content descriptor * structure. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_cd_hdr_s { /**< LW 24 */ *** 1566 LINES SKIPPED *** From nobody Wed Sep 13 11:02:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlyG55lpWz4sjp0; Wed, 13 Sep 2023 11:02: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 4RlyG52VCJz4mHY; Wed, 13 Sep 2023 11:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694602941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZRnuSLytcpQ2uN2PdlNYMdBM44YDidN+ZKuQ+M9ebc=; b=we6aqTaahh2bCjDRu5+ZSiFcm7GFgshAf5W8lJkXh1yfaCMiaBBUlDHo2uzhv6rp4qtODx bcUbeiBj9DnzN2ZQKnLizZrQplhOpbxsRfENuVvr8IaFspWohWVebnv3r1Ny97t3uq6A6i Zqe8WPUF2k0vxrgT/wem/SuKl8FJZAGlSPB4FTryAH8c16kOkQbF+5diQGli74AZzxyqWw aYpmWURqIPDKTlGIjxjOUGlYRMAo0CIWkBcGFnBNtmZPnyY5K6lIdVJ2cQm0hyHev7YWzc /CD/c5CZfqS+IZOZhZjaOSitKZxizWtBISZ14ZIf0pho7i8RwO2F7/AT59Serg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694602941; a=rsa-sha256; cv=none; b=uztgtlUopLvuAjUIfVSl4PiQDgUT1wUZgHku0kY/pJ5I76I78FteJKSXmO/N3qh6wH7Rgj t63XjV/wzS1CldXBijwo7atALQDmOvuk/dXni5lSl0MVKz38ROgyoT37kBZBnj7hVwLG5Q OMstuaENkDFBHE9Yt91prw9HyqYCLORZv7U7Rw6DXzb5fzRKUPRWoXfFEFc09i6oEQH3/7 zzCx4Hq2CR5l6Aajq4cviq/cpq2omBw+biwjW/jUbgQ0TlnIltuRmFm4FO5pqgciFnafIB Wd7sdhyC9qzm9TUqnOKPI5ziPGlX8OppmPBiNHlH6HOsvUP4KUl26PYMLn1LHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694602941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZRnuSLytcpQ2uN2PdlNYMdBM44YDidN+ZKuQ+M9ebc=; b=oe1FyjFhoXzvPzxL2zcFQz2ESMkK4ozEKNrR8wL/flzfgoGR+Zn3bzJDu0C4fN5mFWdBP8 g2ur99NZLIiAa8SzZUmamGt2d5KnWTvJ1KuIXfJHOqnlY7maofw5GBtIiwOQWmZTJqgcMp AM7GG6JwyjtQzgDyfShga7Z+2XFmX3H7R48AgE7ey2n90lxUVyjSSPPkfnGi2YBpMEPow7 5L0MTdRbS73FSiR10C5iUGRLKhLZF4rp/RAVEAA3t+GGBIzRqssT9mZibsHwXa45suZ95q jQ66H48N0BIU9vRPmj93UKAX9SUnzZwKdUCVEbyDns4FES4mK07RpnDHhLxAJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlyG51Slrz19tt; Wed, 13 Sep 2023 11:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DB2LCN099547; Wed, 13 Sep 2023 11:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DB2LiJ099544; Wed, 13 Sep 2023 11:02:21 GMT (envelope-from git) Date: Wed, 13 Sep 2023 11:02:21 GMT Message-Id: <202309131102.38DB2LiJ099544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: ab7dc1ceb6d3 - main - mana: add ioctl to support toggling offloading features List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab7dc1ceb6d36fd804bedb818086ae3ff6692bf7 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7dc1ceb6d36fd804bedb818086ae3ff6692bf7 commit ab7dc1ceb6d36fd804bedb818086ae3ff6692bf7 Author: Wei Hu AuthorDate: 2023-09-13 10:48:02 +0000 Commit: Wei Hu CommitDate: 2023-09-13 10:59:40 +0000 mana: add ioctl to support toggling offloading features With this support, users can enable or disable offloading features such as txcsum, rxcsum, tso and software lro through ifconfig. To enable or disable tx features, do it on mana interface first, then hn/netvsc to sync it up with mana. For example: ifconfig mana0 -txcsum ifconfig hn0 -tscsum To enable or disable rx features, just applying on mana interface would be sufficient. Disabling txcsum imples disabling tso. Enabling tso when txcsum is disabled will result in an error message in dmesg requesting to enable txcsum first. Above applies to ipv6 offloading features as well. Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/mana/mana_en.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 56fa4e51ba26..064b28fa94a4 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -169,7 +169,7 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) struct ifrsshash *ifrh; struct ifreq *ifr; uint16_t new_mtu; - int rc = 0; + int rc = 0, mask; switch (command) { case SIOCSIFMTU: @@ -214,6 +214,81 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) } break; + case SIOCSIFCAP: + MANA_APC_LOCK_LOCK(apc); + ifr = (struct ifreq *)data; + /* + * Fix up requested capabilities w/ supported capabilities, + * since the supported capabilities could have been changed. + */ + mask = (ifr->ifr_reqcap & if_getcapabilities(ifp)) ^ + if_getcapenable(ifp); + + if (mask & IFCAP_TXCSUM) { + if_togglecapenable(ifp, IFCAP_TXCSUM); + if_togglehwassist(ifp, (CSUM_TCP | CSUM_UDP | CSUM_IP)); + + if ((IFCAP_TSO4 & if_getcapenable(ifp)) && + !(IFCAP_TXCSUM & if_getcapenable(ifp))) { + mask &= ~IFCAP_TSO4; + if_setcapenablebit(ifp, 0, IFCAP_TSO4); + if_sethwassistbits(ifp, 0, CSUM_IP_TSO); + mana_warn(NULL, + "Also disabled tso4 due to -txcsum.\n"); + } + } + + if (mask & IFCAP_TXCSUM_IPV6) { + if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); + if_togglehwassist(ifp, (CSUM_UDP_IPV6 | CSUM_TCP_IPV6)); + + if ((IFCAP_TSO6 & if_getcapenable(ifp)) && + !(IFCAP_TXCSUM_IPV6 & if_getcapenable(ifp))) { + mask &= ~IFCAP_TSO6; + if_setcapenablebit(ifp, 0, IFCAP_TSO6); + if_sethwassistbits(ifp, 0, CSUM_IP6_TSO); + mana_warn(ifp, + "Also disabled tso6 due to -txcsum6.\n"); + } + } + + if (mask & IFCAP_RXCSUM) + if_togglecapenable(ifp, IFCAP_RXCSUM); + /* We can't diff IPv6 packets from IPv4 packets on RX path. */ + if (mask & IFCAP_RXCSUM_IPV6) + if_togglecapenable(ifp, IFCAP_RXCSUM_IPV6); + + if (mask & IFCAP_LRO) + if_togglecapenable(ifp, IFCAP_LRO); + + if (mask & IFCAP_TSO4) { + if (!(IFCAP_TSO4 & if_getcapenable(ifp)) && + !(IFCAP_TXCSUM & if_getcapenable(ifp))) { + MANA_APC_LOCK_UNLOCK(apc); + if_printf(ifp, "Enable txcsum first.\n"); + rc = EAGAIN; + goto out; + } + if_togglecapenable(ifp, IFCAP_TSO4); + if_togglehwassist(ifp, CSUM_IP_TSO); + } + + if (mask & IFCAP_TSO6) { + if (!(IFCAP_TSO6 & if_getcapenable(ifp)) && + !(IFCAP_TXCSUM_IPV6 & if_getcapenable(ifp))) { + MANA_APC_LOCK_UNLOCK(apc); + if_printf(ifp, "Enable txcsum6 first.\n"); + rc = EAGAIN; + goto out; + } + if_togglecapenable(ifp, IFCAP_TSO6); + if_togglehwassist(ifp, CSUM_IP6_TSO); + } + + MANA_APC_LOCK_UNLOCK(apc); +out: + break; + case SIOCSIFMEDIA: case SIOCGIFMEDIA: case SIOCGIFXMEDIA: From nobody Wed Sep 13 11:16:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlyZZ2h9Sz4src6; Wed, 13 Sep 2023 11:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlyZX1YY5z4rt7; Wed, 13 Sep 2023 11:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694603796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6ug1KKTSE/o6UHgkAjN2n01hArIUdlY+eoEFSaMI3s=; b=Mex6mlwghDYEmvAnLOItmVu8qQ84eLsZuIY2sMp517OCG16uPag5b/Q/vKMjRSCQ+NNjOZ BCoB5sgur/XFFFl/H65Xk/z8HnHDAGZQWvqG12PH2iFRUjFA8phHTEaqJRKJLdnOUPr15q cFgZvW0rYzdqKVqmGG1X4qn/PAGyqkoEYUB5J2YCgkcExG1KxjNd4trbozWCp4102w8v9/ 66PKVnifRma+R6m0VejOnSpsl2nJtUpn40NAaXkjyr4vc8Ja8toH/EIGMs3WTAJGWQsgV+ UwZong+ohCMOPdJIqxeg3rWSPwM9bgPEzpiHGbEho8UD776G2s98TMf4C4FWkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694603796; a=rsa-sha256; cv=none; b=wtyVb4Yd8lEPvd433DkJgIwJHJm/LI6hHNeYis37GdkWemwv+26OtHHzm5IvbNnzn9BBu+ sH+VQUVu3AuTXRFBWNOpd9DtOuGymp37WAoIbn5FjGM2hWyARyxXnv0Rl9+vWHgHH1wKCK skljYjMcwUBeTANz/o9PsQGE+xC3zWOxvhoGLztzzajJ0yBI0lZ9sVPatwP8cU8yBgxjSM FFag63YYUo4djHuQpkzYAhVHcNgGX5sWt0755AlzwGX8wBbEjgsTlRXqjiVp7dlXLzxyV6 FH7WjfDxKv8TPNzWdCKmsj4+4+LxzG4JjtEZmU7QXnflGWIyTuUtuxEHCVDuCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694603796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6ug1KKTSE/o6UHgkAjN2n01hArIUdlY+eoEFSaMI3s=; b=qWGZroqHIbf+OxwtR+xF1+Nx6RxCs8NtNFfwy0BIxU3qaZ7cb/VTNsN65+uuSb0vPrRWKj yGPY54zsUwzXcd2gUe0/hnxL1E6ijSV8xDYhNng07lGh12fQtgRlIvd7eXNm3WKp4IKeAe Kf+80lg1PR6/NqNnyK0fyLEREjlWKrn5mP9fNNHjZoc+6yj3a0G5l4XwGWY6lvijQYRg2a 7FS/60yrTbNKkpyWCvekGJcaTQ5DXhoGiHnZoSA104B2uVjNbfwlZaZTiILB2NVN1mS9GX qBHliKwf3w5rb+MyS35wlDk1DpnR9vVA9HyOj3OhkYTzFmNSW47A7CXR5f5kQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlyZX0bpMz1BNY; Wed, 13 Sep 2023 11:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DBGZgX017234; Wed, 13 Sep 2023 11:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DBGZaC017231; Wed, 13 Sep 2023 11:16:35 GMT (envelope-from git) Date: Wed, 13 Sep 2023 11:16:35 GMT Message-Id: <202309131116.38DBGZaC017231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1bd8fa1dd0ba - stable/14 - pfsync: fix state leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 commit 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 Author: Kristof Provost AuthorDate: 2023-09-08 09:21:12 +0000 Commit: Kristof Provost CommitDate: 2023-09-13 10:18:38 +0000 pfsync: fix state leak If we receive a state with a route-to interface name set and we can't find the interface we do not insert the state. However, in that case we must still clean up the state (and state keys). Do so, so we do not leak states. Reviewed by: Kajetan Staszkiewicz MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41779 (cherry picked from commit f415a5c1bd56933367e42312731e4ec553e256ed) --- sys/netpfil/pf/if_pfsync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db448c9bbc48..e29c00fcb879 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -685,8 +685,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) printf("%s: unknown route interface: %s\n", __func__, sp->pfs_1400.rt_ifname); if (flags & PFSYNC_SI_IOCTL) - return (EINVAL); - return (0); /* skip this state */ + error = EINVAL; + else + error = 0; + goto cleanup_keys; } break; default: @@ -734,6 +736,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) cleanup: error = ENOMEM; +cleanup_keys: if (skw == sks) sks = NULL; uma_zfree(V_pf_state_key_z, skw); From nobody Wed Sep 13 11:23:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rlyl311V3z4swMH; Wed, 13 Sep 2023 11:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rlyl30D1mz4ttm; Wed, 13 Sep 2023 11:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694604239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bj4+x1RF+8YVHfKXRol8YqdC3PCZrY4or4wMWnr83bI=; b=NI4I5fDEstNSbG5xVniIMOaUEWHsI/JLVX42gD+U1PJ9v0RLpNwpaXliRJVixKxv7gjSf/ /DH5Lwx/iWBhe0KiPvjNcFlXVeRMNMHKukSjjGsboahsCI64bhQ1Hc46dBEiMSJyBSDvnW 9Lg/y9A2CWGStalDxaFF4NtDUnha1oj48YlxgSbaldxN3ClfLd2Vt1O/lgSJbl99aVpX4i YT7Jt1sgbt09Rm806zZzl5JEfovuJuF83AnwiD0XRU3MS8XfoAt4KGcqKGK8fumBsiuEPi FoBMBOtWv0nNr6LakRJHThcUGKOrfn/+nQBSnGRPEyEE+zJnkLarm2A0AkGnwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694604239; a=rsa-sha256; cv=none; b=mz/98oGSySY2VY0ijSnQdHNjBOljcThDUqL0Rczsnu1GgX3dL/dxp/9YXQtHLBNwf5n+39 PMgOJ6T4B1EpkCeByqfJRA7beOkRp1m9GckTzC5SE1z3y1MxWC2MAiRGYP9ghKFUjkZogY DoD2x+eXoCG/dSB2IQKUosgtLqveKRgtnDczXZCXZMaIRldfNKx9fPp5plT2cOVT3f1ruf lSJE/k2m0chv/erS5PbYOh4COR/vp2dH7bZvVM4mPNmI48K7O9FQGYTF7MIOaZs6kj3A8M gVt2RkPe1G3fdMfKZ5UWgHNlTjFU/0dpt2afQcbTXaiLhCmj/uqAmk/3EgJSZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694604239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bj4+x1RF+8YVHfKXRol8YqdC3PCZrY4or4wMWnr83bI=; b=Z/gDHvieD0zFVg4uI8qNHvs7fTzc6pSyNbE9EChgLE52dfYI+Mc2Td8ze7N3YatRGWtvka PdZp0n950ssZHuNU9M6eG2oexf0A8My6IKSfZMoAo/iZBfbYwEBSn1yPdpP/cG3TjDnX5q J1DOGzo/gGnt7Ux5TsXxxrPfAj16SkJS/13m+fSJwWJxViXjsTCTnttLmuNjgn9vF6GGAp GzeW0Hh8c4bsIsU8HZLFD4+4iPbm5Fjz1W9B266evjN+FeZKqtgsDrODwWXlSi9VQtY7M2 YW0S17MrfIk9kShZj0Dqjgqxp57Au7qjK2iE7HWu37cupgYk6ZuciBkU5TluLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rlyl26PYwz1C68; Wed, 13 Sep 2023 11:23:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DBNwbU033066; Wed, 13 Sep 2023 11:23:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DBNwUb033063; Wed, 13 Sep 2023 11:23:58 GMT (envelope-from git) Date: Wed, 13 Sep 2023 11:23:58 GMT Message-Id: <202309131123.38DBNwUb033063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7d45cdbad4d7 - main - pf tests: pfsync:defer requires scapy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d45cdbad4d7905239404e1abc25dbbae4658446 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d45cdbad4d7905239404e1abc25dbbae4658446 commit 7d45cdbad4d7905239404e1abc25dbbae4658446 Author: Kristof Provost AuthorDate: 2023-09-13 09:11:02 +0000 Commit: Kristof Provost CommitDate: 2023-09-13 09:12:27 +0000 pf tests: pfsync:defer requires scapy Add the kyua hint so we skip the test if it's not installed. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/pfsync.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index d62cdddd504a..80b81205b59d 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -118,6 +118,7 @@ defer_head() { atf_set descr 'Defer mode pfsync test' atf_set require.user root + atf_set require.progs scapy } defer_body() From nobody Wed Sep 13 11:43:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlzB15nKVz4t6Zk; Wed, 13 Sep 2023 11:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlzB15LGcz3GbJ; Wed, 13 Sep 2023 11:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694605433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go/QjVOACKp6zvYVxLNLvKscRyFsL+kS+oeUxEzMnDw=; b=Wd4WKLRd96QOIBGMPRRwQADVTQWBlG6buVHSXKZDtFE0xUD6wS4WAkmGLhIG1o27lFTgB3 FOu7TkZPCa3IJ83Kp8NHA96RDXuU1pH4hBAVejxy9hM6LYLSQYqp2WNU7/aQ0yspR/57TS M0/jDXFZ6N1wCm9ebYXCCMYRxpHUG5yWuK53ePgJJ/XtHF73tjxVWnqx2IU+YdgEk1ctaD V7FNz3kcIT3Xb8akbCVDUXXiprzDI1PjV7jigST00qxlAI5U327h5ASNOc9nf3QyDdTXDZ OSSoFnAQLJuaHgh3Iby1IxDaBn7nY5H7aBVext4fhF7gS4do0tmWCwIDrnqi+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694605433; a=rsa-sha256; cv=none; b=NsxX2n5JJzouf79Ywe1tZI+Kwjnbia4ZSMywcLJ5InSjzlkZ26951566WsrUbpWaMXdjEr qgbZiFQu+EVsOoLBIoOo6hZmGS/u9DRd6T6cIvFqo8YQgCp2jzdJB//NHXEJn87lbnnCFV yt1PXE9xEPWl1PVnpb+e/wGtHJU940aj1bUEHf1kchN0NIKv1yjTbWOWGz6P+0mZG+TNMw DGOj2Tge23fGWZcHtzFwoidYN6MT80heuWndYfGofG46HB1aLaPCUeEjCmwClpRCrhBoI5 z/Q+QmB42HMjYqiGMZWlHhmrBuN3QBOo1xlgaUn1HcH26V1aPUjiC7MRW95ypw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694605433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go/QjVOACKp6zvYVxLNLvKscRyFsL+kS+oeUxEzMnDw=; b=CtfG93r1kleke2XBuK7gE3Yfr0Za23J0jf1Kf8T7KqY8z2eKIfz34jrZtmVSEgaMPtZD1R ymc5u+DyMfT67S+S++M56OcABzsDJU+0b8uu41oqK/H/jhUX+GP28xNTdBRLHBs9qBRHBh 3WV8+QWTjUKBXmwc+aoWvtpgPaqKupLuao/YffpcmcbVNarIoHTvGD4VIA1Woe/u51umb3 ZQO/xQMzgxh648fQYzpDYOw0BA6+h+7W1p7Mngjqqz+557HII4qGnjuJZ6nY1V01s9vnU7 5pXILilhIQtPXkVFtEBfcR5w65HFwfdhWVd3BQDe5wV8Nm8vJrV0Gu3Yx2p8Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlzB14RVjz1C9g; Wed, 13 Sep 2023 11:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DBhrF0066234; Wed, 13 Sep 2023 11:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DBhrVA066232; Wed, 13 Sep 2023 11:43:53 GMT (envelope-from git) Date: Wed, 13 Sep 2023 11:43:53 GMT Message-Id: <202309131143.38DBhrVA066232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d2c839eee0d5 - main - Belatedly document OPIE removal in RELNOTES and UPDATING. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2c839eee0d5410095f5984d2126f41f4cf62a00 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c839eee0d5410095f5984d2126f41f4cf62a00 commit d2c839eee0d5410095f5984d2126f41f4cf62a00 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 11:43:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-13 11:43:45 +0000 Belatedly document OPIE removal in RELNOTES and UPDATING. MFC after: 3 days Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41822 --- RELNOTES | 7 +++++++ UPDATING | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/RELNOTES b/RELNOTES index 0ff123618e14..f3d717525929 100644 --- a/RELNOTES +++ b/RELNOTES @@ -148,6 +148,13 @@ f0bc4ed144fc: instructions may be probed instead of logical entry and return instructions. The provider is currently amd64-only. +0aa2700123e2: + OPIE has been removed from the base system. If you still wish + to use it, install the security/opie port. Otherwise, make + sure to remove or comment out any mention of pam_opie and + pam_opieaccess from your PAM policies (etcupdate will normally + take care of this for the stock policies). + 0eea46fb1f83: Removed telnetd. diff --git a/UPDATING b/UPDATING index b370f2f3ebb4..59788ab2c15d 100644 --- a/UPDATING +++ b/UPDATING @@ -207,6 +207,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: after upgrading to restore all the component that were previously installed. +20221002: + OPIE has been removed from the base system. If needed, it can + be installed from ports (security/opie) or packages (opie). + Otherwise, make sure that your PAM policies do not reference + pam_opie or pam_opieaccess. + 20220610: LinuxKPI pm.h changes require an update to the latest drm-kmod version before re-compiling to avoid errors. From nobody Wed Sep 13 13:08:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm14R4Dbxz4sbs8; Wed, 13 Sep 2023 13:09:11 +0000 (UTC) (envelope-from gallatin@fastmail.com) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.3 with cipher TLS_AES_256_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 4Rm14Q5Bgnz3fgZ; Wed, 13 Sep 2023 13:09:10 +0000 (UTC) (envelope-from gallatin@fastmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fastmail.com header.s=fm2 header.b=Y+CpIGy1; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=pLNkmIsC; spf=pass (mx1.freebsd.org: domain of gallatin@fastmail.com designates 66.111.4.29 as permitted sender) smtp.mailfrom=gallatin@fastmail.com; dmarc=pass (policy=none) header.from=fastmail.com Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 79D685C0165; Wed, 13 Sep 2023 09:09:09 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute5.internal (MEProxy); Wed, 13 Sep 2023 09:09:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1694610549; x=1694696949; bh=9c wY7QdUWHZq5dfV9kTiKsCR4mh61ym+adxvQiRsmoY=; b=Y+CpIGy16mLwDl3ar5 UPYic/APv+sRbUOMr39mGzkfO0frxJ1801M1YdarAsRJd6gXsbb5BkUAcJuhVSu0 PZy3DPQgb1rFwhezofUPUSlEJBwbTKtuiUI979NsziMX6LMnmCNH7Pw84cxnKOAX eE/T8BUTzXbAXHtb/i2Ps0rItGz2vbhbKIpB4z/GS6EHN1+LaW25R3x+GK/NRBlN zTK4HPAkNSWPVRWQtpqWgaBHtSk+9DaWVP3z+7fDVq9lotoeYP/EHn22BoNcfLWG sTRK15cCC+zA75ZFOPtVYS1zLhfN28502f5LS6IwRKIYV92EYLAPlSHi1xqPotHB eNvQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1694610549; x=1694696949; bh=9cwY7QdUWHZq5 dfV9kTiKsCR4mh61ym+adxvQiRsmoY=; b=pLNkmIsC8O2uTJ/41aZlhghRBTt5A OsbPwoY21fEasuUeEQ8TxnM6Fhxwnl1IRWF8239W2CYA9JY8xugDrV/6aiRKL4iw 983eNNoYAEsr+OaOkYJhVFWM4skWQbsdzEyTe0RXak8QNOZD/9oIWaL+qhPHRuRI j59yXY0dBqIsVJfvW7gSWistxhXr+indnjm97wW8q94gPngqUkUr3NQW9LYKXFTN DuaN1IJi3gKMZIQik52L/YOXLj/8925M42naMjWiIHTBhY1XXPkioHjCgm1TFaES EtufCE9CbVkBb1EqaH04f6O/DeuEJ/lbeE9s0g+edONfHGEnmTWmS30gA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeikedgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsegrtd erreerredtnecuhfhrohhmpedfffhrvgifucfirghllhgrthhinhdfuceoghgrlhhlrght ihhnsehfrghsthhmrghilhdrtghomheqnecuggftrfgrthhtvghrnhepheegieeltdegue eiveekveevheeikedvleduledufeetkeelhfduheehteegleehnecuffhomhgrihhnpehf rhgvvggsshgurdhorhhgpdhifhdrtghsnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepghgrlhhlrghtihhnsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i2f014658:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 16551B60089; Wed, 13 Sep 2023 09:09:08 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-745-g95dd7bea33-fm-20230905.001-g95dd7bea List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Message-Id: <7bb4a991-060d-415e-a188-192781c1f3c0@app.fastmail.com> In-Reply-To: <202307171904.36HJ4L1l013461@gitrepo.freebsd.org> References: <202307171904.36HJ4L1l013461@gitrepo.freebsd.org> Date: Wed, 13 Sep 2023 08:08:40 -0500 From: "Drew Gallatin" To: "Simon J. Gerraty" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 89f361f742ae - main - kern.post.mk allow NEWVERS_{ENV,ARGS} Content-Type: multipart/alternative; boundary=f9e3987d93394d2a80959c26188f6950 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; URI_COUNT_ODD(1.00)[9]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[fastmail.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.29]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.29:from]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; NEURAL_SPAM_SHORT(0.09)[0.086]; XM_UA_NO_VERSION(0.01)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[gallatin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; FREEMAIL_ENVFROM(0.00)[fastmail.com]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[fastmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[fastmail.com:+,messagingengine.com:+]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org] X-Rspamd-Queue-Id: 4Rm14Q5Bgnz3fgZ --f9e3987d93394d2a80959c26188f6950 Content-Type: text/plain Simon. This changes the version strings of kernels built via the buildkernel target and adds a lot of redundancy. Eg: VERSTR changes from: "FreeBSD 14.0-ALPHA1 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:17:25 EDT 2023\n gallatin@beast:/usr/src/sys/amd64/compile/GENERIC" To: "FreeBSD 14.0-ALPHA1 amd64 1400094 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:21:13 EDT 2023\n gallatin@beast:/usr/obj/usr/src/amd64.amd64/sys/GENERIC" Note the extra "amd64 1400094" This screws up some of our (Netflix) tooling, as its reflected via uname -a It appears that when using the buildkernel target, VERSION is picked up from Makefile.inc1's VERSION, which I think is intended for CTFMERGE. Was this intention? Thanks, Drew On Mon, Jul 17, 2023, at 2:04 PM, Simon J. Gerraty wrote: > The branch main has been updated by sjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=89f361f742aeae11c8b2e28eae3d015882b6c0ee > > commit 89f361f742aeae11c8b2e28eae3d015882b6c0ee > Author: Simon J. Gerraty > AuthorDate: 2023-07-17 19:03:35 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-07-17 19:03:35 +0000 > > kern.post.mk allow NEWVERS_{ENV,ARGS} > > Allow makefiles better control of newvers.sh env and args. > Also allow variable overrides on command line. > > Reviewed by: imp, stevek > Sponsored by: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D41012 > --- > sys/conf/kern.post.mk | 5 +++-- > sys/conf/newvers.sh | 16 +++++++++++++--- > 2 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk > index c368d5f40df8..45df83e2d16b 100644 > --- a/sys/conf/kern.post.mk > +++ b/sys/conf/kern.post.mk > @@ -444,11 +444,12 @@ config.o env.o hints.o vers.o vnode_if.o: > ${NORMAL_C} > ${NORMAL_CTFCONVERT} > > +NEWVERS_ENV+= MAKE="${MAKE}" > .if ${MK_REPRODUCIBLE_BUILD} != "no" > -REPRO_FLAG="-R" > +NEWVERS_ARGS+= -R > .endif > vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*} > - MAKE="${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT} > + ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT} > > vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src > ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c > diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh > index 85346b1cdc29..e21b3f5ce2e2 100644 > --- a/sys/conf/newvers.sh > +++ b/sys/conf/newvers.sh > @@ -58,13 +58,23 @@ BRANCH="CURRENT" > if [ -n "${BRANCH_OVERRIDE}" ]; then > BRANCH=${BRANCH_OVERRIDE} > fi > -RELEASE="${REVISION}-${BRANCH}" > -VERSION="${TYPE} ${RELEASE}" > > if [ -z "${SYSDIR}" ]; then > - SYSDIR=$(dirname $0)/.. > + SYSDIR=$(dirname $0)/.. > fi > > +# allow random overrides > +while : > +do > + case "$1" in > + *=*) eval "$1"; shift;; > + *) break;; > + esac > +done > + > +RELEASE="${RELEASE:-${REVISION}-${BRANCH}}" > +VERSION="${VERSION:-${TYPE} ${RELEASE}}" > + > RELDATE=$(awk '/^#define[[:space:]]*__FreeBSD_version/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h}) > > if [ -r "${SYSDIR}/../COPYRIGHT" ]; then > --f9e3987d93394d2a80959c26188f6950 Content-Type: text/html Content-Transfer-Encoding: quoted-printable
Simon.

This changes the version strings of kernels built v= ia the buildkernel target and adds a lot of redundancy.  Eg:

VERSTR changes from:

"FreeBSD 14.0-ALPHA1 #0 main-n264=
839-91d0876a20ce-dirty: Wed Sep 13 08:17:25 EDT 2023\n    gallatin@beast=
:/usr/src/sys/amd64/compile/GENERIC"

To:

"FreeBSD 14.0-ALPHA1 =
amd64 1400094 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:21:13 ED=
T 2023\n    gallatin@beast:/usr/obj/usr/src/amd64.amd64/sys/GENERIC"
=

Note the extra "amd64 1400094"   Thi= s screws up some of our (Netflix) tooling, as its reflected via uname -a=

It appears that when using the buildkernel= target, VERSION is picked up from Makefile.inc1's VERSION, which I thin= k is intended for CTFMERGE.    Was this intention?

Thanks,
Drew



On Mon, Jul 17, 2023, at 2:04 PM, S= imon J. Gerraty wrote:
The branch main has been updated by sjg:

<= /div>
<= br>
commit 89f361f742aeae11c8b2e28eae3d015882b6c0ee
<= div>Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 20= 23-07-17 19:03:35 +0000
Commit:     Si= mon J. Gerraty <sjg@FreeBSD.org>
    Also allow variable overrides on command line.
    
    Revie= wed by:    imp, stevek
    S= ponsored by:   Juniper Networks, Inc.
-= --
sys/conf/kern.post.mk |  5 +++--
sys= /conf/newvers.sh   | 16 +++++++++++++---
2 files= changed, 16 insertions(+), 5 deletions(-)

= diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index c368d5f40df8..45df83e2d16b 100644
--- a/sys/conf/ke= rn.post.mk
+++ b/sys/conf/kern.post.mk
@@ -4= 44,11 +444,12 @@ config.o env.o hints.o vers.o vnode_if.o:
${NORMAL_C}
${NORMAL_CTFCONVERT}
 
=
+NEWVERS_ENV+=3D MAKE=3D"${MAKE}"
.if ${MK_REPR= ODUCIBLE_BUILD} !=3D "no"
-REPRO_FLAG=3D"-R"
+NEWVERS_ARGS+=3D -R
.endif
vers.c: .NOMETA= _CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*}
- MAKE=3D"${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT}<= br>
+ ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${K= ERN_IDENT}
 
vnode_if.c: $S/tools/vnode= _if.awk $S/kern/vnode_if.src
${AWK} -f $S/tools/vnode_if.a= wk $S/kern/vnode_if.src -c
diff --git a/sys/conf/newvers.s= h b/sys/conf/newvers.sh
index 85346b1cdc29..e21b3f5ce2e2 1= 00644
--- a/sys/conf/newvers.sh
+++ b/sys/co= nf/newvers.sh
@@ -58,13 +58,23 @@ BRANCH=3D"CURRENT"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=3D${B= RANCH_OVERRIDE}
fi
-RELEASE=3D"${REVISION}-$= {BRANCH}"
-VERSION=3D"${TYPE} ${RELEASE}"
&n= bsp;
if [ -z "${SYSDIR}" ]; then
- &nbs= p;  SYSDIR=3D$(dirname $0)/..
+ SYSDIR=3D$(dirname $0= )/..
fi
 
+# allow random= overrides
+while :
+do
+ case= "$1" in
+ *=3D*) eval "$1"; shift;;
+ *) br= eak;;
+ esac
+done
+
=
+RELEASE=3D"${RELEASE:-${REVISION}-${BRANCH}}"
+VERSI= ON=3D"${VERSION:-${TYPE} ${RELEASE}}"
+
RELD= ATE=3D$(awk '/^#define[[:space:]]*__FreeBSD_version/ {print $3}' ${PARAM= FILE:-${SYSDIR}/sys/param.h})
 
if [ -r= "${SYSDIR}/../COPYRIGHT" ]; then

<= div>
--f9e3987d93394d2a80959c26188f6950-- From nobody Wed Sep 13 13:32:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm1bX2GH3z4sq77; Wed, 13 Sep 2023 13:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm1bX1q0mz4JRD; Wed, 13 Sep 2023 13:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694611960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSDzQSJJ0q2LBlcq6yAoth6dm25wigaNboPGAw1eZf0=; b=p9rcNXtG4AKkqLc0XIy/za1lhkP+Qids4ZqcSlSWnB10zPQIukVq0NHJNdkLuAGe/7jHrs ylxkgYU/99VFMWKB8j4h24JWr8EsVUIfUeTWrOQzi3sq/UfiNGPfsEIz6PYc1bCOyg1GDX zHiduINZhNoCWp2YDY28DQPQFDhM76x8Lw1lRz5eSyoAQjuXqd10NpcB6NpbKsDrIOGgMU 2hbQ+3aBsdIY0qILceCi61gxhw34agVnKw9GmyuovD39jQaRGaCRyZm7ZUAnYnEu4cwNIa UcJE6A8kRYFYdLzGf+kca2OiVYsK7Tk48pQ2f8+Q3kIAoayFT7D/N1LmaxgDMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694611960; a=rsa-sha256; cv=none; b=LC7MSim5cUeOKKdm5N4AXoEW4Qm/T4T0uP5rjjlDxEiyUkJ5vmqcOpxDs+Z4C+PJCKKX/9 QBklO51KdRuleRwKeHO+E2w5mA6g3rH4gzSzcnXMntNBJ/Ky5hQOKiri0Q5h1E9Wz5qKMK c1mEta4qMiP2WuV2ERY6R5laf6gG0BxhuB8Qg0sgYDAJyeriM0KwqPRBiVhivTEnjznOP4 G3WBs1rgoequvpMJ5yVlXAwc+YYxP06QiNzlEawAlSAIe+Hf2NXZyAfur+Z56dP5jNGwsU 3+bkXuDmG1qgJ7GDrKsaxTYncfUzbncsoA8qCnj0DUgqYbZVfrMegrAdAeV2zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694611960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSDzQSJJ0q2LBlcq6yAoth6dm25wigaNboPGAw1eZf0=; b=ZlbYEDU58qTZHjLn8ho44RnMfoARFu5Pgi2zxd36qG3CPjc1tow33wV23yqkTDcRQpsZq5 AN+ylEuSIf16aZyBj7u1j3u5Jb4TKHKVAJd1oCkv73TKrAuxVuIdGt9f+OzJmHzLq3yEjA pQ4htuFwQyxRmEjkutBOLeNRFLquYOL1zP5BZ/c7syMeu8mAIX2znQoEetZzGIP8FdOq/7 DnhwyozgiGywmlbejl5/QwSJ6IqAc1zXgwibwsjCwK/88+zVtqBf4yuRPKcoLyQC3njfNu Jx0QCSoogTvwEK0CSsgGxDtuAk9TXMWadEOBHEH72AJvOzNIH8xGWPTJcsTKaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm1bX0t3Dz22J; Wed, 13 Sep 2023 13:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DDWeuN048682; Wed, 13 Sep 2023 13:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DDWekl048679; Wed, 13 Sep 2023 13:32:40 GMT (envelope-from git) Date: Wed, 13 Sep 2023 13:32:40 GMT Message-Id: <202309131332.38DDWekl048679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bb56b36d7188 - main - sctp: further improve shutting down the read side of a socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb56b36d7188e004840294d0bd5dfdf7f3392a05 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bb56b36d7188e004840294d0bd5dfdf7f3392a05 commit bb56b36d7188e004840294d0bd5dfdf7f3392a05 Author: Michael Tuexen AuthorDate: 2023-09-13 11:02:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-13 11:02:51 +0000 sctp: further improve shutting down the read side of a socket Deal with the case that the association is already gone. Reported by: syzbot+e256d42e9b390564530a@syzkaller.appspotmail.com MFC after: 3 days --- sys/netinet/sctp_usrreq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 02bb87578528..29d63f989e79 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -806,11 +806,9 @@ sctp_flush(struct socket *so, int how) return (0); } stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb == NULL) { - SCTP_INP_WUNLOCK(inp); - return (ENOTCONN); + if (stcb != NULL) { + SCTP_TCB_LOCK(stcb); } - SCTP_TCB_LOCK(stcb); SCTP_INP_READ_LOCK(inp); inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; SOCK_LOCK(so); @@ -836,7 +834,7 @@ sctp_flush(struct socket *so, int how) } SOCK_UNLOCK(so); SCTP_INP_READ_UNLOCK(inp); - if (need_to_abort) { + if (need_to_abort && (stcb != NULL)) { inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; SCTP_INP_WUNLOCK(inp); op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); @@ -845,7 +843,9 @@ sctp_flush(struct socket *so, int how) NET_EPOCH_EXIT(et); return (ECONNABORTED); } - SCTP_TCB_UNLOCK(stcb); + if (stcb != NULL) { + SCTP_TCB_UNLOCK(stcb); + } SCTP_INP_WUNLOCK(inp); return (0); } From nobody Wed Sep 13 13:54:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm257625tz4t2RF; Wed, 13 Sep 2023 13:54:51 +0000 (UTC) (envelope-from gallatin@fastmail.com) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.3 with cipher TLS_AES_256_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 4Rm2570SNcz4R9Q; Wed, 13 Sep 2023 13:54:51 +0000 (UTC) (envelope-from gallatin@fastmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fastmail.com header.s=fm2 header.b=IHKkipGJ; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=UhI7yhVl; spf=pass (mx1.freebsd.org: domain of gallatin@fastmail.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=gallatin@fastmail.com; dmarc=pass (policy=none) header.from=fastmail.com Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 118A65C0150; Wed, 13 Sep 2023 09:54:50 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute5.internal (MEProxy); Wed, 13 Sep 2023 09:54:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1694613290; x=1694699690; bh=AF Q1pn+j847q3MSDW8nbM3E6zzm9v3lhSD0YcwWcWn4=; b=IHKkipGJ9HPZ/XnHxp aBDsZ5BBzhbEpb4bv69Ktqo88E3q0T4XuFZ7C2V8aESuGkzR3HwlpYaqT05JWdXP GogSMH0kywJpr1I/RL6m+0MZRcX6dhPXJcHLDmW/fMMpMzxwuKVLOL6o8WbKDcpB cNW1B9Ijn8SANvYjFu2e0pmHX0Nia62+fivfaogSfLKd/LqTzlgdFmmVZap7HXoF OV4X8AM03T0/O/l9uoS6olc7SKUIbWZmT02SHfSLP/4uY0rtzJn1irYbGq2nK9iA Fw8Sd69c7H+yzLZi8iqV2ypW04B4ZE02dvWT0EqSYRGxJHSqHHRJ9cq6MohV9z3Q XX8A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1694613290; x=1694699690; bh=AFQ1pn+j847q3 MSDW8nbM3E6zzm9v3lhSD0YcwWcWn4=; b=UhI7yhVlyySkOrD16eCj3NAwbHhiz DOlOE5rxucjUx5AXqAxRin0YqcX5RRRLXVfoZUaWWbVEybOKfc90EsemeHnHC0Vk xy7BP+pK/72SaVcj7uUQZVjLWeB5pW1J6lBtdt4R8kd+eThF0Ed1gfKZHAHTSZHH TShgM4HIXJAcdcKYEmKNZCKBVcm5W+C6hplH+YcDmpeOU7Y0OHgnHu2ZLRaHI4Tu ZC4Yrvsn82laMzJBh81LivTzWaupLxaBFG4T6jImt1LIX+NTfuzbJCEnZtWTMgPZ 6ofamFVR7jywIPHjDpA3sfuQZYrhLZT7WgwgzvoXQ/W5CZlwPN3MmPRVA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeikedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsegrtd erreerredtnecuhfhrohhmpedfffhrvgifucfirghllhgrthhinhdfuceoghgrlhhlrght ihhnsehfrghsthhmrghilhdrtghomheqnecuggftrfgrthhtvghrnhepheegieeltdegue eiveekveevheeikedvleduledufeetkeelhfduheehteegleehnecuffhomhgrihhnpehf rhgvvggsshgurdhorhhgpdhifhdrtghsnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepghgrlhhlrghtihhnsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i2f014658:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id C7F50B60089; Wed, 13 Sep 2023 09:54:49 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-745-g95dd7bea33-fm-20230905.001-g95dd7bea List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Message-Id: In-Reply-To: <7bb4a991-060d-415e-a188-192781c1f3c0@app.fastmail.com> References: <202307171904.36HJ4L1l013461@gitrepo.freebsd.org> <7bb4a991-060d-415e-a188-192781c1f3c0@app.fastmail.com> Date: Wed, 13 Sep 2023 08:54:28 -0500 From: "Drew Gallatin" To: "Simon J. Gerraty" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 89f361f742ae - main - kern.post.mk allow NEWVERS_{ENV,ARGS} Content-Type: multipart/alternative; boundary=18c6a348166849e0a8d1f1f95e8e1dbf X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.58 / 15.00]; URI_COUNT_ODD(1.00)[13]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.993]; DMARC_POLICY_ALLOW(-0.50)[fastmail.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27:c]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.27:from]; XM_UA_NO_VERSION(0.01)[]; FREEFALL_USER(0.00)[gallatin]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; BLOCKLISTDE_FAIL(0.00)[66.111.4.27:server fail]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[fastmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[fastmail.com:+,messagingengine.com:+]; FREEMAIL_ENVFROM(0.00)[fastmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org] X-Rspamd-Queue-Id: 4Rm2570SNcz4R9Q --18c6a348166849e0a8d1f1f95e8e1dbf Content-Type: text/plain des seems to be addressing this in https://reviews.freebsd.org/D41845 On Wed, Sep 13, 2023, at 8:08 AM, Drew Gallatin wrote: > Simon. > > This changes the version strings of kernels built via the buildkernel target and adds a lot of redundancy. Eg: > > VERSTR changes from: > > "FreeBSD 14.0-ALPHA1 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:17:25 EDT 2023\n gallatin@beast:/usr/src/sys/amd64/compile/GENERIC" > > To: > > "FreeBSD 14.0-ALPHA1 amd64 1400094 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:21:13 EDT 2023\n gallatin@beast:/usr/obj/usr/src/amd64.amd64/sys/GENERIC" > > Note the extra "amd64 1400094" This screws up some of our (Netflix) tooling, as its reflected via uname -a > > It appears that when using the buildkernel target, VERSION is picked up from Makefile.inc1's VERSION, which I think is intended for CTFMERGE. Was this intention? > > Thanks, > Drew > > > > On Mon, Jul 17, 2023, at 2:04 PM, Simon J. Gerraty wrote: >> The branch main has been updated by sjg: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=89f361f742aeae11c8b2e28eae3d015882b6c0ee >> >> commit 89f361f742aeae11c8b2e28eae3d015882b6c0ee >> Author: Simon J. Gerraty >> AuthorDate: 2023-07-17 19:03:35 +0000 >> Commit: Simon J. Gerraty >> CommitDate: 2023-07-17 19:03:35 +0000 >> >> kern.post.mk allow NEWVERS_{ENV,ARGS} >> >> Allow makefiles better control of newvers.sh env and args. >> Also allow variable overrides on command line. >> >> Reviewed by: imp, stevek >> Sponsored by: Juniper Networks, Inc. >> Differential Revision: https://reviews.freebsd.org/D41012 >> --- >> sys/conf/kern.post.mk | 5 +++-- >> sys/conf/newvers.sh | 16 +++++++++++++--- >> 2 files changed, 16 insertions(+), 5 deletions(-) >> >> diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk >> index c368d5f40df8..45df83e2d16b 100644 >> --- a/sys/conf/kern.post.mk >> +++ b/sys/conf/kern.post.mk >> @@ -444,11 +444,12 @@ config.o env.o hints.o vers.o vnode_if.o: >> ${NORMAL_C} >> ${NORMAL_CTFCONVERT} >> >> +NEWVERS_ENV+= MAKE="${MAKE}" >> .if ${MK_REPRODUCIBLE_BUILD} != "no" >> -REPRO_FLAG="-R" >> +NEWVERS_ARGS+= -R >> .endif >> vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*} >> - MAKE="${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT} >> + ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT} >> >> vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src >> ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c >> diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh >> index 85346b1cdc29..e21b3f5ce2e2 100644 >> --- a/sys/conf/newvers.sh >> +++ b/sys/conf/newvers.sh >> @@ -58,13 +58,23 @@ BRANCH="CURRENT" >> if [ -n "${BRANCH_OVERRIDE}" ]; then >> BRANCH=${BRANCH_OVERRIDE} >> fi >> -RELEASE="${REVISION}-${BRANCH}" >> -VERSION="${TYPE} ${RELEASE}" >> >> if [ -z "${SYSDIR}" ]; then >> - SYSDIR=$(dirname $0)/.. >> + SYSDIR=$(dirname $0)/.. >> fi >> >> +# allow random overrides >> +while : >> +do >> + case "$1" in >> + *=*) eval "$1"; shift;; >> + *) break;; >> + esac >> +done >> + >> +RELEASE="${RELEASE:-${REVISION}-${BRANCH}}" >> +VERSION="${VERSION:-${TYPE} ${RELEASE}}" >> + >> RELDATE=$(awk '/^#define[[:space:]]*__FreeBSD_version/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h}) >> >> if [ -r "${SYSDIR}/../COPYRIGHT" ]; then >> > --18c6a348166849e0a8d1f1f95e8e1dbf Content-Type: text/html Content-Transfer-Encoding: quoted-printable
des seems = to be addressing this in = https://reviews.freebsd.org/D41845

On Wed, = Sep 13, 2023, at 8:08 AM, Drew Gallatin wrote:
Simon.

= This changes the version strings of kernels built via the buildkernel ta= rget and adds a lot of redundancy.  Eg:

VERSTR changes from: 
"FreeBSD 14.0-ALPHA1 #0 main-n=
264839-91d0876a20ce-dirty: Wed Sep 13 08:17:25 EDT 2023\n    gallatin@be=
ast:/usr/src/sys/amd64/compile/GENERIC"

To:= 

"FreeBSD 14.0-A=
LPHA1 amd64 1400094 #0 main-n264839-91d0876a20ce-dirty: Wed Sep 13 08:21=
:13 EDT 2023\n    gallatin@beast:/usr/obj/usr/src/amd64.amd64/sys/GENERI=
C"

Note the extra "amd64 1400094" &nbs= p; This screws up some of our (Netflix) tooling, as its reflected via un= ame -a

It appears that when using the build= kernel target, VERSION is picked up from Makefile.inc1's VERSION, which = I think is intended for CTFMERGE.    Was this intention?<= br>

Thanks,
Drew


On Mon, Jul 17, 2023, at 2:04= PM, Simon J. Gerraty wrote:
The branch main has been updated by sjg:
<= div>
URL: https://cgit.FreeBSD= .org/src/commit/?id=3D89f361f742aeae11c8b2e28eae3d015882b6c0ee

commit 89f361f742aeae11c8b2e28eae3d015882b6c0ee<= br>
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
Auth= orDate: 2023-07-17 19:03:35 +0000
Commit:   = ;  Simon J. Gerraty <sjg@Free= BSD.org>
CommitDate: 2023-07-17 19:03:35 +0000
<= /div>

    kern.post.mk allow NEWVERS_{= ENV,ARGS}
    
 &nb= sp;  Allow makefiles better control of newvers.sh env and args.
=
    Also allow variable overrides on command l= ine.
    
  &n= bsp; Reviewed by:    imp, stevek
 &nbs= p;  Sponsored by:   Juniper Networks, Inc.
=     Differential Revision:  https://reviews.freebsd.org/D41012
---
sys/conf/kern.post.mk |  5 +++--
sys/conf/newvers.sh   | 16 +++++++++++++---
2 files changed, 16 insertions(+), 5 deletions(-)

<= /div>
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
=
index c368d5f40df8..45df83e2d16b 100644
--- a/s= ys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
=
@@ -444,11 +444,12 @@ config.o env.o hints.o vers.o vnode_if.o:
=
${NORMAL_C}
${NORMAL_CTFCONVERT}
=  
+NEWVERS_ENV+=3D MAKE=3D"${MAKE}"
.if= ${MK_REPRODUCIBLE_BUILD} !=3D "no"
-REPRO_FLAG=3D"-R"
=
+NEWVERS_ARGS+=3D -R
.endif
vers.= c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*}
- MAKE=3D"${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KE= RN_IDENT}
+ ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS= _ARGS} ${KERN_IDENT}
 
vnode_if.c: $S/t= ools/vnode_if.awk $S/kern/vnode_if.src
${AWK} -f $S/tools/= vnode_if.awk $S/kern/vnode_if.src -c
diff --git a/sys/conf= /newvers.sh b/sys/conf/newvers.sh
index 85346b1cdc29..e21b= 3f5ce2e2 100644
--- a/sys/conf/newvers.sh
++= + b/sys/conf/newvers.sh
@@ -58,13 +58,23 @@ BRANCH=3D"CURR= ENT"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BR= ANCH=3D${BRANCH_OVERRIDE}
fi
-RELEASE=3D"${R= EVISION}-${BRANCH}"
-VERSION=3D"${TYPE} ${RELEASE}"
 
if [ -z "${SYSDIR}" ]; then
-=     SYSDIR=3D$(dirname $0)/..
+ SYSDIR=3D$(= dirname $0)/..
fi
 
+# al= low random overrides
+while :
+do
<= div>+ case "$1" in
+ *=3D*) eval "$1"; shift;;
+ *) break;;
+ esac
+done
+=
+RELEASE=3D"${RELEASE:-${REVISION}-${BRANCH}}"
<= div>+VERSION=3D"${VERSION:-${TYPE} ${RELEASE}}"
+
RELDATE=3D$(awk '/^#define[[:space:]]*__FreeBSD_version/ {print $3= }' ${PARAMFILE:-${SYSDIR}/sys/param.h})
 
if [ -r "${SYSDIR}/../COPYRIGHT" ]; then



--18c6a348166849e0a8d1f1f95e8e1dbf-- From nobody Wed Sep 13 15:21:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm41b3xgbz4spmR; Wed, 13 Sep 2023 15:21: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 4Rm41b3WCXz3LXb; Wed, 13 Sep 2023 15:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694618515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNYEiq16GjwIoHI0AuwNxucNNjKHbLJElKywWrwC2Lk=; b=E7RvFS1FP93WH9oQHQ9AYGR9FYIxbj29C5YATBqxz55a/w6W1Pq9gd09K6Qts+aiF7PAlo KE4lJYq8OUwO/mQiyKMDn8A+S0Avt1RRWLziS8kIEi9oeF4PQ/h7d78mQ4FiUawLIQmlEs /SV+6+oysn4W/EskpW13dHvFzKzZx3rUVTxNdFlQ4JEjYGR7qbMlQqIKKQxvmJ9kbOOoP2 btKyexgMFaflsnttYX8V4ZopO9K7KIXsMfHaMC7CHG16waV/yjwOWu/IxuYli4O2/af+Vj 7jyAU0hRSpsrwdk3hQ5QLuvRgFlN5qJoAi9TMkgbkDygtEDNe2B2iKbBlUVgkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694618515; a=rsa-sha256; cv=none; b=el1rX179LhlLR/9j1HPksXEPG6QLUejo2uYnwvk5sY4duCz707mI/DoAuf6U/KsxU9bb7V drN8ZUuBjYLoZyCFQ9rVbagWlu0tSglhNFsWrNhmlXLYWMeu3dt7dkUW4s6L8WuwOQNkrw JkOr8Olv6R3QTlvJRt6bYt7K/f7qET6OWWGQ4PXBZ7Psr/ckyS39wex5oW1vf8dbZAYWH1 bvwdobr9FE0eYlqIKhFohbFQD+wJvYLvprR5XxEX0BI1pY0zuAcUE7LiTJy/ngEy8M0rC6 TlGuCbJG/Qtf1CXbIceU9COlXwTIeJr9yWIHgyPpaRRLCjwW51/bexxV8l7i+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694618515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNYEiq16GjwIoHI0AuwNxucNNjKHbLJElKywWrwC2Lk=; b=Z62qxqYEY3t5emngmZrUTkTM0l1kfll+3EI14/6Cy6Aa24R3aX6hYrGHa+Wa88D+uvHJdO MYxXcIErxCeGP/LUmEGv+YDK59CS066GbXYaAkti98NgneKJ3uv3+NTjRbFrFmV1pEL0Oh +ZrgjfNTa+TM861EG0xhH8DG5F6MDEYARXW1b1VxJTbtisazFyirkCE2PGfObcSl5/VqzZ cyi6/MimGIMb88sAN6Qd/F4LjmAnw+dL7M8kEw163q9qGrRcQjOce2NaFjR8EJ9vHKzfT1 qNZXx54+D1GJz8CorIWg7SOb7z3y1QlK94JBpZP6ivXYAVcyY7FDjf6Qxj0ixw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm41b2d30z4jQ; Wed, 13 Sep 2023 15:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DFLtBj029768; Wed, 13 Sep 2023 15:21:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFLtZg029765; Wed, 13 Sep 2023 15:21:55 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:21:55 GMT Message-Id: <202309131521.38DFLtZg029765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 70fbcd451b68 - main - axge: Skip dummy packet headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70fbcd451b68b7f6038d8a602cd8d5e1bb890f1d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=70fbcd451b68b7f6038d8a602cd8d5e1bb890f1d commit 70fbcd451b68b7f6038d8a602cd8d5e1bb890f1d Author: Damien Broka AuthorDate: 2023-09-13 08:23:47 +0000 Commit: Ed Maste CommitDate: 2023-09-13 14:08:11 +0000 axge: Skip dummy packet headers Newer versions of the AX88179 interweave dummies alongside valid packet headers in bulk IN transfer data. This was probably done for backward compatibility with existing drivers. However current driver records these dummy headers as dropped frames, leading to stats misreporting one Ierr per Ipkt. This skips those dummy headers silently, thereby not generating Ierrs for them. Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/842 --- sys/dev/usb/net/if_axge.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c index a3b459a553e0..385a982afd9d 100644 --- a/sys/dev/usb/net/if_axge.c +++ b/sys/dev/usb/net/if_axge.c @@ -959,8 +959,16 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen) hdr_off = pkt_end = (rxhdr >> 16) & 0xFFFF; /* + * On older firmware: * <----------------------- actlen ------------------------> * [frame #0]...[frame #N][pkt_hdr #0]...[pkt_hdr #N][rxhdr] + * + * On newer firmware: + * <----------------------- actlen ----------------- + * [frame #0]...[frame #N][pkt_hdr #0][dummy_hdr]... + * --------------------------------> + * ...[pkt_hdr #N][dummy_hdr][rxhdr] + * * Each RX frame would be aligned on 8 bytes boundary. If * RCR_IPE bit is set in AXGE_RCR register, there would be 2 * padding bytes and 6 dummy bytes(as the padding also should @@ -968,6 +976,10 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen) * IP header on 32bits boundary. Driver don't set RCR_IPE bit * of AXGE_RCR register, so there should be no padding bytes * which simplifies RX logic a lot. + * + * Further, newer firmware interweaves dummy headers that have + * pktlen == 0 and should be skipped without being seen as + * dropped frames. */ while (pkt_cnt--) { /* verify the header offset */ @@ -978,6 +990,12 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen) usbd_copy_out(pc, hdr_off, &pkt_hdr, sizeof(pkt_hdr)); pkt_hdr.status = le32toh(pkt_hdr.status); pktlen = AXGE_RXBYTES(pkt_hdr.status); + hdr_off += sizeof(pkt_hdr); + + /* Skip dummy packet header. */ + if (pktlen == 0) + continue; + if (pos + pktlen > pkt_end) { DPRINTF("Data position reached end\n"); break; @@ -989,7 +1007,6 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen) } else axge_rxeof(ue, pc, pos, pktlen, pkt_hdr.status); pos += (pktlen + 7) & ~7; - hdr_off += sizeof(pkt_hdr); } } From nobody Wed Sep 13 15:47:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm4bd2spSz4t3xJ; Wed, 13 Sep 2023 15:47: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 4Rm4bd2Qx5z3Sdq; Wed, 13 Sep 2023 15:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=DiEWV6vPM9faCUnJAwOMsvGr+4xK8Hdg6K1jSfsTH5epJpMD56M3u78Uu3oIaezv6bP+X6 q3xuzDQAbXb2MceBYORCWbo0AGL/kaKF/MaIkFirKz7VYqEXat5A01Ztc6d69fjcjiqJW/ aU2HgJM1cwUxWg9EhZl5r0n8NG+FH4Wo6W5i4wSXz1Jfdq39krMwLafTB32KOQa4SkSh3L dotAMeeyzJuJglZMEgZjh6Jr9diVaTd4G6n+APiXbA8E2y0lKPAaTN24UrGqQYQvZCS5ij YyOkMYNbeCVubjzsNQ5Dh3ml+uU542AO8yYGA1ENs1b9+gUQrzjciJ1HVqMMfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694620077; a=rsa-sha256; cv=none; b=l4wZgDBFQJm7jC3b4eWXpiyDSLIqhaRhnwjr6jydhUe1s3ibeA70gvLaVJ7ZxHS2MrFrY8 MlQQuTmTS3Kn6x8Eq7iF8jcCV749+xqxskBJ3gajW7jz5e899SNWioPRRE4I4REiKfDTAE uoc7D0Gn6ZaL9ETiCuSpnzx8LPmeBjIhlrCY/JO3kwAtabNyfW0+THHQf4hctpks42vC8k +gjGSueCH2XLmnvLN9NhCkVhuHZysTClcHDgKfIHhUM1rOa6xh+bVIp/zQ+97RFylerEJW pEJlBjxSU/KJC0mAlr7u3sm+t27GD81EzO/CiDv5z2UctvKzrfdA1V7Fywpt3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=BrQu+WPZmJapKM4zb2PbJRBKdkwmT7Vnbgl5gShl0dX1452Hbd44FZ1GlUseVj2/54FPP5 dJHRLOnJKBq4Dk0fjq8PZLCcmcIEhaYxjuAUSz0SCJ3qvWcPOrTT5oU7qtbbRRUVbqRwjz ED2b+5hDOuFV6EnZwOmF0D1orceA4uLbzHxQWbGLvQAjKMDYWMARdya9P0A7WYtTQc6H8S c0M/OqvDhtSLJtlvPYHfs/TGRpgtMcxhbSrRqDjgFhpfxVCboLNq20+L4MHlYtRX2CcbZT etp15pWkYYSiKY8QNcciX9hdtDGmih39Rsk1yeIOzXrjWxSy6QY0EYkUykVR6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm4bd1NGGz502; Wed, 13 Sep 2023 15:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DFlv2L065646; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFlvNm065643; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:47:57 GMT Message-Id: <202309131547.38DFlvNm065643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 144db6a1c9fe - stable/14 - init_main: Switch from SLIST to STAILQ, fix order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce commit 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-13 15:47:31 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 (cherry picked from commit 71679cf468ba28c0e3c88371f3fde13fccec99bd) --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; From nobody Wed Sep 13 15:47:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm4bf4lgcz4t44q; Wed, 13 Sep 2023 15:47: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 4Rm4bf3B8mz3STL; Wed, 13 Sep 2023 15:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcWZ9MQUSD9J2wUyVB+mpX425v1iqmq0UFsiRx/dXHs=; b=R/qLpM9DEFopydOnJsIeBv/zrPAce6hyAkntbqp0DxShhR5KVJIsCtK/kq6W4ZGS6yrP1x Cn9YeLLY3J36AYAyYK7nu6DDFHNPW2qndPQrnd1np6jMsSSWvzQwL2EPkD1LE6ZYInrcV+ 4w9RZsYOCww5mq86GJssfEL47EEVA7Z1ZijUuOO2jLNMxG9mO+k62IoUaYxh9poFDQzmaH 5m26NcvYP+o5QsgcNX7g7DnjluivSFRj/JusnGlGXz6+9kZYSsmCNTobeF3+B7NpvPbj2E FTWM8+QxNCsQH7UqwVT+V63WjWHuSzStld2qk+lQNPsWn7NPcxrtyWMH+28www== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694620078; a=rsa-sha256; cv=none; b=bq+pX5rJCCZMev+D+GA2eA/rMYLcE+ZKOqnQf+qPn0O7HUtdLiYnBRsnweiBXQcCnugPAC 03xJCPonY5i2M25iiU6P1Chkny0Yu8RHJYymdyZtFnjtkqYtRixNykS9bDk8+b9eNWp0Xv CoY+3TNke0f9AoO9/tiLmuPN9OVkhaPWRlpjTLtdfyURO/ruQ6liDOnaVwSZ3AB6anwHOD 20TVd0XO/BHUjLbqjm21K1EP3bg7SKggJHlZCx9jBMm2VRBA4MIeP4c3DSMEYlUT0gm1/6 ZYk4/evKlhtrXK2myQBa/lPUOPwNkIFEWmKm7qXky5W3Mn9PxsQcU2jC28ZbmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcWZ9MQUSD9J2wUyVB+mpX425v1iqmq0UFsiRx/dXHs=; b=R2sH2vDZKdsj8ZcVRwx4cJTc2SfRHHdVO9jObLZ8qbXIKzKHRbsW7oUwK9LEzbJBbDHBSk DYz0kKC09D11kVuOOnNt0gfNlB5/onO+foUpxnixHPVPss1HSmfStXbSLoYZ4WNsr1H2bB z6tEIvdBvm5s9xh2QKwDYjX6c2Y5oeSg9K2fmG5qaXPwvk/NL65lPeKzmGwek4XS5CZMYu zKp90LW1s78KLYWIF8LveauR0cW0fNk52oO3Y7a00FKN0MePsycxMpu9PjJ3VpFPj/END5 8aYHbTYTvGoxXUjsjMBZKC4+NWhNTMDZP5vZOnPKG2+W/LoBbnw2/7+6ZQ+mPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm4bf25Fkz4Rs; Wed, 13 Sep 2023 15:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DFlwoA065691; Wed, 13 Sep 2023 15:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFlwhk065688; Wed, 13 Sep 2023 15:47:58 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:47:58 GMT Message-Id: <202309131547.38DFlwhk065688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c31f2b5e6b59 - stable/14 - init_main: Record completed SYSINITs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c31f2b5e6b591c61711018c3d6e52067ae860e9c Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c31f2b5e6b591c61711018c3d6e52067ae860e9c commit c31f2b5e6b591c61711018c3d6e52067ae860e9c Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-13 15:47:36 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 (cherry picked from commit 1926d5cef6eaa1302024d6471271c930ad65f9b2) --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) From nobody Wed Sep 13 17:20:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm6fD5hd7z4tccn; Wed, 13 Sep 2023 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm6fD59Zrz4K6H; Wed, 13 Sep 2023 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694625620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBtv9+7M9gp5sEnXj2l+muMyHwsx8GUjlUxZtVti+6M=; b=pEvuovdM99oLwBM1kFEf9N+nfWpxdbfH7jgZ2qQjKI+t8Z5DQ8il02/KHl6FndOEGysOYk +vhDoUgRu9XIcTeNLbnDnNjCCC3CKUBsDa4UUfD1ICY13cWNqtv9tZ1sHY0kVLt6wRHWCT 1axGq6Fg7XfoqRf8pbPsae3iqocePibOXpzG31TuAmRaMjMUJAoHzZONM/78L0cQFKKoom SRFEw0iXY37xeXapKYECiHTvbhyrTZPEAc8oux6EXFpIOiP0JOf3IXRgyI2oGoYD4iUlV8 yttCIq9SEK/xR3LTeckpaSaTXq5qUh8d9Y63zOfN6j8JBxdGNc+xjO/nL9lSBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694625620; a=rsa-sha256; cv=none; b=RhnDaTY9AioTXvQcEdvbXi5zZn7Xke5al4KdE2XctpO8c5LNktbt1Dp8fRcngTZc/C715E qz+9jz2gS4GBz9dPPGFBQdGkEbmBl5GqtO/8m08/Vsh/bHJ3aVW0fqGINZWHnwu4F89F2v JE0Cfehg4rKRBXzu7Ouvh6gO18WMJqaa63Tw8xau256/0Q8/76155xaDsCj4f/TvpcqrM8 EffLoWRD5a678lo0Rj4rn2+XYkq9DM8U3uDQ6/Mlw+bISleyco+ItYldMIG7LWYj+wUTf+ QmqDuOwC6GwuLjAzwl23cN/XE6WUZoOGKGFGLOD02vXHdJyyTXQmgicCI6Wg6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694625620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBtv9+7M9gp5sEnXj2l+muMyHwsx8GUjlUxZtVti+6M=; b=pP6AW5+N+TR7ZDNsvAR5af/pzB0nZe+LlPqWxyH3jGL1S8VXpHtgsgxiSnJSiRLticGCXO Ew8/B53IK+WqofQUmiyYPj1kl2wbxLrJdewojt8ngRcs2dlK4ngAavdm+13yngi1OSn7YV RMcWL+x6feQ2FoBTWAq+/oV0SgVk3Kop6kqVNOjgLeVC8MLqj+vTgXM81hA+f9zA/H3sgZ HOdlC8aZh5P/DdjCYMLDIUZ25KersVfFAaYGsOFl+EM8uyBFgMwtI3oFjcfcC1mEI9N7Fh WADXrl3GGe6pO7ScwXa4LM7YFAdTNhvbSZo0iRuBaZkuNK9qSsri40CSurdZnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm6fD4DdWz7cc; Wed, 13 Sep 2023 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DHKKaO023884; Wed, 13 Sep 2023 17:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHKKOE023881; Wed, 13 Sep 2023 17:20:20 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:20:20 GMT Message-Id: <202309131720.38DHKKOE023881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cc9347cc79d3 - stable/14 - ftpd: add deprecation notice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cc9347cc79d320cac00ccf5d5f23971de2c887a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc9347cc79d320cac00ccf5d5f23971de2c887a1 commit cc9347cc79d320cac00ccf5d5f23971de2c887a1 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-13 17:19:49 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) --- libexec/ftpd/ftpd.8 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index c45df161575c..f5353be894fe 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh .Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Wed Sep 13 17:28:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm6qs2dxXz4tfWK; Wed, 13 Sep 2023 17:28:41 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_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 4Rm6qr6wg8z4MZw; Wed, 13 Sep 2023 17:28:40 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=aetern.org header.s=fm1 header.b=CrwKEqna; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="N Hnpjz6"; spf=pass (mx1.freebsd.org: domain of yuri@aetern.org designates 64.147.123.20 as permitted sender) smtp.mailfrom=yuri@aetern.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 1C1813200A44; Wed, 13 Sep 2023 13:28:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 13 Sep 2023 13:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1694626117; x=1694712517; bh=QFNrX1gtejyWkLbG2EIX988xSabFyHZ73xe VhGbcMbQ=; b=CrwKEqnaE4DXv5l1qAJvjyQOsG/tDsxXctoEcWLjUloPdOcc2fa 2cOFAcN6vzBDzfqhoT59LfSjEDxMdL51STSbkL9cKQX91Ywi3XnQVMIQ1L0Qfyx8 ro2Ll4yiNkgfTAZp9HDMP6yDUmxg8rpj6gzQXpIP13qd9v18LYn2iAcfUtXgzPWJ 8cYHKSwdRzEkRDtSF5xYVwlwm3MzK6ZsGaaOHBxW9sVQHXCXbYzT3iICVtUdJTxp TO2GjhUACWwiMCjN83Hhw/UbIvftZspa9Mbl8GxoNq4ab/nR3mOYpfksStLICykV PHUkCIH+sxtoUy3DBOJMwR2WJ+GlxQF0qrg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1694626117; x= 1694712517; bh=QFNrX1gtejyWkLbG2EIX988xSabFyHZ73xeVhGbcMbQ=; b=N Hnpjz6AVgKblT7oSZg13atgVBadnKapy1YIYVFQPEfGhZ1Wktr9GgqsOidhrArZM dZR7RhysoBtS7l78ka7a+x4Mcc9ikTt41SpjYKYTQn7VN4hXEjDYHjJ4PSyJjALz P0fkP4CXSs/yonTH6yBlD6pBs5Rdem6Vc3ZQoLXlORtmHD3cpX92k3u6O6snydjT H/XtZzKLRZsO2yEh+Hw0GyJqYnf9I1208cQAf/aYXoJq8eZknexeHcCyzdHMtS8z ke+IDB4mnLZ+i7LNt4ja0d5z+Pdk7j9HRBlWZm5QDxnNe1GYAFZbYxOI5a0HA8I1 JwVxeZzbnVDDNgU3dj5Ig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeikedguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpegjuhhr ihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeenucggtffrrghtthgvrhhnpeevkefhfe ffgefhheelgeelhfekgedtlefgvdelvdeufeehhfetjeeikeefgfffleenucffohhmrghi nhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpeihuhhrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 13 Sep 2023 13:28:36 -0400 (EDT) Message-ID: <7af75066-8b42-477a-8ea4-f64dd0970ab1@aetern.org> Date: Wed, 13 Sep 2023 19:28:22 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 98b98ec1bc7e - main - ftpd: add deprecation notice To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202309091847.389IlZed083348@gitrepo.freebsd.org> Content-Language: en-US From: Yuri In-Reply-To: <202309091847.389IlZed083348@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spamd-Bar: / X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: local_wl_from X-Spamd-Result: default: False [-0.39 / 15.00]; R_DKIM_ALLOW(-0.20)[aetern.org:s=fm1,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.20]; XM_UA_NO_VERSION(0.01)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; FREEFALL_USER(0.00)[yuri]; local_wl_from(0.00)[yuri@aetern.org]; DKIM_TRACE(0.00)[aetern.org:+,messagingengine.com:+]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Queue-Id: 4Rm6qr6wg8z4MZw Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=98b98ec1bc7e961c3d3468b0e481080580c902cf > > commit 98b98ec1bc7e961c3d3468b0e481080580c902cf > Author: Ed Maste > AuthorDate: 2023-09-09 17:34:14 +0000 > Commit: Ed Maste > CommitDate: 2023-09-09 18:46:58 +0000 > > ftpd: add deprecation notice > > Approved by: gordon > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D26447 > --- > libexec/ftpd/ftpd.8 | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 > index c45df161575c..f5353be894fe 100644 > --- a/libexec/ftpd/ftpd.8 > +++ b/libexec/ftpd/ftpd.8 > @@ -43,6 +43,16 @@ > .Op Fl T Ar maxtimeout > .Op Fl t Ar timeout > .Op Fl u Ar umask > +.Sh .Sh DEPRECATION NOTICE Duplicate .Sh, the rendered man page shows: .Sh DEPRECATION NOTICE > +The > +.Fx > +base system > +.Nm > +is deprecated, and will be removed in > +.Fx 15.0. > +Users are advised to install the > +.Pa ftp/freebsd-ftpd > +port or package instead. > .Sh DESCRIPTION > The > .Nm From nobody Wed Sep 13 17:43:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm79W2jCkz4sVf0; Wed, 13 Sep 2023 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm79W1sC1z4PvS; Wed, 13 Sep 2023 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q61sJqkZq8vzpcHfIG5GZuDavVrgE17AhWd4ELEgZ70=; b=aSXrvo1YWtrtT1P+nNaFqzBhM2cgsIVvQux6T4PsPfWIvKX0sU1jviBTXX5/YB88yL8XQj vFuClns7ai9M1TWsKWGSxtg3kUbNfifw24Pa33kYKRhbbXh0ajkVCjpjTyoD7DAFljLgJl pH85ArLNWSnsmR5IasUtEWUYqR9ZQ1Us65jPB8z90iUpkyTEY0TMClkp6UXLhwhu567opR S8zwoEE6dRQyYrP90MDpXVFbz5pk7OV2drzyx/4G5REhtGmG0oiaVlGeoa8qhmLJ7XbBql +GtkzjEpXCnOV6Ro/nuXPoXrl/JDd+BaOPjWF5CtOCirAe+eHgkYcsNCk+ptTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627039; a=rsa-sha256; cv=none; b=FyhL+GcjBE0Uuzq2I7TcPNwUsLPcX1xp8eH3A8xGSmAs2NjeAuw+1viwSuYjkOLk4qdBc0 6+ft7AxZbpJdYoMDuzYrAlmn+agMQQAvtSl+FFBDwN9pArzeOLS85QXNY3ETWTx/MokbMe kn08zyC9GkaGXiUsix+EAscSGJVYPn7sTRChGqbeiBEusBQZesZDciCbl1ptvs8ASi5AN1 V0VBDv7syW6mFpwkRBFLv3EFAfmPcj33XpXwnpBE0C+VjEsaGdgdPzyXaaT+EarHAi9qoV low/DPNKjVutPIRtr0ndUBjxtI7IEh+ZVcheYbEPOpneXUbzdv/SPBw3e8q+4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q61sJqkZq8vzpcHfIG5GZuDavVrgE17AhWd4ELEgZ70=; b=aX2cY7eCnMSwgLz2T/cZcOAa9zfGkzcJybJ0UgBKz6OiHmOLS0BXRaO5EwG7g1EbgjncYY 3syncLqOyOhK3pOSfGFmyPwQoHRQuEqFZ2zJSjk56SemA8wK3DZmXE2oldWi4W7BaGZG9S bv+Jw/1Yh75QmA5f91Z0jJ0LEkk4Ghv2GEaXlA+0jHn2uVtfgKCbiiCnnfw+wNbwworVYI KC9tjwMrsYK55femGPksmKRs47OttZWHQC1VIZdTUEclzv0Z5n7cJpdMp0+Ov4Q7ZcNTRh TqH+AD+4jd3vBoyCpWtJIexH+Yf7vnP3bJ/dA1jZ+pTbRtQlSKcQ/IUMgiGFGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm79W0wqcz8K6; Wed, 13 Sep 2023 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DHhxVm063656; Wed, 13 Sep 2023 17:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHhxVg063653; Wed, 13 Sep 2023 17:43:59 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:43:59 GMT Message-Id: <202309131743.38DHhxVg063653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 0307168d927b - stable/14 - ahci: add AMD device id in RAID mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0307168d927b5ec7a7889a29d09fe1500d0b514c Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=0307168d927b5ec7a7889a29d09fe1500d0b514c commit 0307168d927b5ec7a7889a29d09fe1500d0b514c Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:43:33 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 80ab01732c7b..93a72875b502 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -83,6 +83,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 17:45:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm7C2161Sz4sW7G; Wed, 13 Sep 2023 17:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm7C20dS9z4QQR; Wed, 13 Sep 2023 17:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hev9b8XH2RUC9RbOHnV4tdgL883vnsd0dCJO2E3iXmM=; b=QGTMa5aOCzSWR7lTO27N34QEiugmMRMXVTsuiYiABVl8k4bEYykDZz09BBZx5zSQPo6PqX Rr9Anf/jPYoK8QKO5GbOe3lckq/j3fW2Ch7inZbSTtkPdxXf97BS+t48s7GARl+2G4R42H MKaoVlgvoHPOS/sWD664cu+cx0zevj0m36aM1zdpNgYMw17YQuj9ZLBJPOb9V/RTE0ICc6 nfWbpR9bMh+UnlAhFEuYbQyNEH/PL9VjXSKrtKOwNW0Wg9uTr8zOj0GUjWKgf7BbGLDLLs 75KnDVPmx85/QQ8rTRDgN0GIriUXNbd7DrLpCchmT3MZPQSFoQmn2oyNOcl8nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627118; a=rsa-sha256; cv=none; b=xCqw6KdO/08rZmdG6dQwLyh0YZlIF/xvtCu8ELLvjniwrwFyxADiDCwxX7gSxxsWNt+9iT ASw9Q2vGQxi4xH0zrVgYLxfSP9Dtl56fRdnVWw4L5tIvHQLG62kEKTGSpVWY+EzWeQES6k agWGJBIK49d30U60M4/HOQ78H3kMHf0dTEV3U+jIOfw9zSloTOE6+8Swe05ICBFTvtVi/3 ECUtHrZfpDIQkn0enGZVQQPgAsaSEe+QgbcXU/pWUFQdUWRZ5IpYxQgzLvq5Dd2xq6Rrh4 Y9QDTc0ImFpxKgLE8MzZmAxGt6KrbvAbhWnoU4OO7Hesh9LkVi3RLKK9uFPC+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hev9b8XH2RUC9RbOHnV4tdgL883vnsd0dCJO2E3iXmM=; b=N+7BRcy9dhEACk5SQOyuZr+21ZNZcGcGExza7sqVsll26HeohSbbpbh0RIhU/8wyUt/XCH SG1X/pZVwnlXwv9EliG21brAywgyeWb+dj7VxCSTgcxoRKY+YexnYB8M20IYKmCsQjbezY a67TlPaFUHoheJf1h4SeD8EoSIiO0u1Nf10vuMaWTGF0EmcxjoH2aLgP6Lpn98s8g+2Kdv 7SrAv3WKVNeNOxAMjqMvsvlknZFOC4+KAJLCTFQv/0l9Qie2ATeTzbSFjrmfygRugUXYHu PHfgAFMCcQDGg5A2Izl2diMcIwEsGuDbudNIXpbprMmzlhYZiojyLeh7ox01GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm7C16qlhz84t; Wed, 13 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DHjHcI063958; Wed, 13 Sep 2023 17:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHjHaW063955; Wed, 13 Sep 2023 17:45:17 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:45:17 GMT Message-Id: <202309131745.38DHjHaW063955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: cf7203dba7a8 - stable/13 - ahci: add AMD device id in RAID mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf7203dba7a801454abf106449d7bf08d7b08813 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=cf7203dba7a801454abf106449d7bf08d7b08813 commit cf7203dba7a801454abf106449d7bf08d7b08813 Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:44:58 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 53f49dcd8d4a..07a1e908ad4a 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -83,6 +83,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 17:46:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm7Dp0xt9z4sWGF; Wed, 13 Sep 2023 17:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm7Dp0XY7z4R0j; Wed, 13 Sep 2023 17:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjIehjwSp4VqlDLBhLZ7wGsHHTZPgJKX4wuTIfciW80=; b=OuJBq6VbqYEm+atkaCodxaM/3BOVZS5naNGedAYHk/6lMFJk7z7tEJNNvTIQDTLO+pKx7b 5VwfD5ltzm9KXLPTR/MmXvoS5PdWnNuQlytKvuiuwI50P86ZgoireZm6oHWn7Pcdgf8qqj FrR5svPdwPlFABelYAAa9p90QqCASadKQuQIBAtkZb9QkpwGs3VPbf1SMELtcIZYxOyT2F oXkQ6kBLQQduB6kMM+MK5cp0e1anunpY1oYGzba+XEs5tILJKYPxhx7keW+ngHSRynw/az nowM+ZCRWxnbiWvKfs+X3E8w1C/z1QfpZIeCDF9InfWFFIMahoBpZ8xB0NOJxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627210; a=rsa-sha256; cv=none; b=EATE4vlRTFYpGd9v+P7q9rfuBmFRod94nym1NRVWJ7S1jy4WBrPeC06d6oFFUpNv63UPtp 9yXSr2DMq65XX0lPEARU8n0Wnvy4JuX6LOBrzaYEUCjkjKiBiR5UbOfamnzXwvtekTEkBX JI7IXSUG+n7z4CUvnltqjUgrtLAqYYgfybc7B35wiQPIHhlldg9dZJQP1wFSfQxfPEX/Gm BoCZJF4P/KwgIhgWqdSFfQd4E5vjhegAiRY5YiS/NZFsVz6IwR5pe4CWBFhf6P6j6nzzSC lFpeLEsUXtn8O+RiSftqKeu05f6KAi3q8n4DmxFCSy6TkFHpY/jjAgz7tTXopA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjIehjwSp4VqlDLBhLZ7wGsHHTZPgJKX4wuTIfciW80=; b=W/MOWHgj7sl7if8HrTd/F7gc/dVnuRIMb/el1l3rp62czMgo40jLyZmrettMgG2yIFIBUH Mwe8VKCxOqXtYuPlX7979xJKiw51ponWWCX6SCUkuIQJGeYjGA2VmqfHkZ7TApEzzT1q5t SC3Jom9TUnhfG5oEjWe6v0Cftk3OD10L+bZFNj2KhlnDCnr/Y+OYGpGwVyNxKxOJGE4P+u tgAo7VucG5BbIPhMTD1p6fHODi4XHbFe4FYpdq+jjRHKdZfqx858cv2mgGf80k1SCMb27l pruBxm5MKb1j6aqI0pL3maoDV4k7bYLoOzc4zcgeB8ufLbp5dXjcM4wHzt2MKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm7Dn6lM9z8B4; Wed, 13 Sep 2023 17:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DHknn8064294; Wed, 13 Sep 2023 17:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHknZW064291; Wed, 13 Sep 2023 17:46:49 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:46:49 GMT Message-Id: <202309131746.38DHknZW064291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 5f30a218cafe - stable/12 - ahci: add AMD device id in RAID mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5f30a218cafe8bac5cbfc5e57c3b6027f8894318 Auto-Submitted: auto-generated The branch stable/12 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=5f30a218cafe8bac5cbfc5e57c3b6027f8894318 commit 5f30a218cafe8bac5cbfc5e57c3b6027f8894318 Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:46:29 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index fd0a808f1d9c..bdca241910a5 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -81,6 +81,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 17:49:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm7JR4dqwz4sXJB; Wed, 13 Sep 2023 17:49:59 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0a-00273201.pphosted.com (mx0a-00273201.pphosted.com [208.84.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Sectigo RSA Organization Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm7JR21H8z4RM9; Wed, 13 Sep 2023 17:49:59 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108158.ppops.net [127.0.0.1]) by mx0a-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38DHLBO3015280; Wed, 13 Sep 2023 10:49:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-id : content-transfer-encoding : date : message-id; s=PPS1017; bh=/eK1KzNyiwpT5Nr+7bYjhMQVeUwPvpapGQ2EmoWMe/c=; b=Gem1yRLJ/H90W1MyYtahQwyYDEgjrZMQjBTXT+hb/oZAcE+zOFVrmg9gvBedUPHzukom nKj758fqnLPWVngmWUNbyvmfGzd8QNgkbcuzqKy5J9Xt65dDgA3l7TxUgCuy3/7mjBHE xWFKpdv0ShaWAnLxIQqIGzECfBVIKPaDNxTUpSOCBHSw5EcACkcnXusVDv13l6NvC1wz WqaPwHBve6UBxjyqbqWgQMKtLtbhfm1BBYX9Hzw11EeaMVgs8CDmNR35qnGkoGTXCbJ4 09iwjLz5wVLq/PX5JkMLSLWfKz1M1JPJhEzvQDdgm5Fi93blk8jFu/WCXi/sc2UNiejD LQ== Received: from mw2pr02cu001.outbound.protection.outlook.com (mail-westus2azlp17012026.outbound.protection.outlook.com [40.93.10.26]) by mx0a-00273201.pphosted.com (PPS) with ESMTPS id 3t2y9n2eej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Sep 2023 10:49:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mf7WA8ImnzU6nB1OxlOaoSqpzKpgJSmCeHQq+f1y5TE/PfA/FKGRbl7GRO1ttcEdYMF4yqizjtx33HUQt3eGG/wXKVAY348DxNJcS2nWbfvUJXXzlOWHcfU1UJqLmyXjz60Jba21mCrE/QnE66fqHyslSi2Mbgt888AZLPIfLaSotw+MaFBz40aky5Z97w7VuabguflaR07Q3m9T0bWwGPkg8cRU0SKh/hL4ttYBvqbu8gzYCjQUyUT618GiHr3q6DTHi5EJfL7qQesHDzh+2bUqMIfx+dY+5JMAShMJ0iyRiddND3eXR8VpLgBOTpBP8yuF8uff96czr9uozvO9/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/eK1KzNyiwpT5Nr+7bYjhMQVeUwPvpapGQ2EmoWMe/c=; b=IHWReEQ1ASVHCh7qnifVe6hmHm2OL0RdG8a0k42KDDjzz50bZC8od1nNeOzj1ZZKbnhRZbPLxCqUEmmctVrBls/vKMsHBmht9FIyMUI3/8goFsvIIS1MNLNOFCz59dQcFzfNLoRUoioDKspgl2kW5p2KyQGKXSCcoMwES2oV+g8wQNfZAzARk0aCLnWnHro8pVTYV1fw1+KNIrEUm3/VoJe2rKPXAj9lZbwKJseALIA0GfJbcqMngNZIt/LnToQD99YH5hyLnVz4FCTelkXSpRk+OfjGcuUE3xY/ZJ0ukViDK3kSZlkCN1ubZiJqf4YM9vYmKOz58LZ20JpbIhZz+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.15) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/eK1KzNyiwpT5Nr+7bYjhMQVeUwPvpapGQ2EmoWMe/c=; b=Jqp+RXZbbObXJln9QZlOmzB3b88kpborKIEq4oSemVsib7YJ0idd5caNFzRdNnSNYmhAF8UZKcjpKk602+zDcghMT1QqQYYhf/R6s2NPAowgZQIiuZimGovTDlBX0/fBuJ82Yn8o0jUenn4g+vZB/UsRr78ZxtTDnyEZKOaXh40= Received: from DS7PR06CA0028.namprd06.prod.outlook.com (2603:10b6:8:54::33) by PH0PR05MB7653.namprd05.prod.outlook.com (2603:10b6:510:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Wed, 13 Sep 2023 17:49:52 +0000 Received: from DM6NAM12FT075.eop-nam12.prod.protection.outlook.com (2603:10b6:8:54:cafe::14) by DS7PR06CA0028.outlook.office365.com (2603:10b6:8:54::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 17:49:52 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.15) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.242.15 as permitted sender) Received: from p-exchfe-eqx-02.jnpr.net (66.129.242.15) by DM6NAM12FT075.mail.protection.outlook.com (10.13.178.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.8 via Frontend Transport; Wed, 13 Sep 2023 17:49:52 +0000 Received: from p-exchbe-eqx-02.jnpr.net (10.104.9.15) by p-exchfe-eqx-02.jnpr.net (10.104.9.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 13 Sep 2023 12:49:50 -0500 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30 via Frontend Transport; Wed, 13 Sep 2023 12:49:50 -0500 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 38DHnocG023515; Wed, 13 Sep 2023 10:49:50 -0700 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id C7D0B5A54B; Wed, 13 Sep 2023 10:49:42 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id C74DD5A5BB; Wed, 13 Sep 2023 10:49:42 -0700 (PDT) To: Drew Gallatin CC: , , , Subject: Re: git: 89f361f742ae - main - kern.post.mk allow NEWVERS_{ENV,ARGS} In-Reply-To: References: <202307171904.36HJ4L1l013461@gitrepo.freebsd.org> <7bb4a991-060d-415e-a188-192781c1f3c0@app.fastmail.com> Comments: In-reply-to: "Drew Gallatin" message dated "Wed, 13 Sep 2023 08:54:28 -0500." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <21463.1694627382.1@kaos.jnpr.net> Content-Transfer-Encoding: quoted-printable Date: Wed, 13 Sep 2023 10:49:42 -0700 Message-ID: <25378.1694627382@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM12FT075:EE_|PH0PR05MB7653:EE_ X-MS-Office365-Filtering-Correlation-Id: ed4a58d1-7343-4204-51f9-08dbb481d510 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ODBXVIZEMKxQgMCF3OtTlDZI+rr/JeR7QL1ls18tmrch3zQN/e0d0w0wFQM1bByja6jJXkb786kjqwU8NLQa3521C6i9+VyfgbqwfbBlAOqShdWvOBSGpnYctzTcZGVULmQwFZ/ZTjwj4JYvNdV0E8jNI4MILUOi6uixS/zIVP40nl5iwxSOZV/0Sq+O4S3593mzJlDRvuSMQSAM6Faf//1HL7Cmd07RMjfeDKmI2kcn/t8GXdzQQW69J+rHe7+32vgy0ay+I2A1hzv/oCGpZWlMU1o/8jHAMyK8oH4pQHzRkkko3uQj2cPa37S0mZcY3K+dtlZQ1LK2zHBK67fdxf2T7TJTekZjydMJet6JhFDIB+9LNYz3Vj9Kybi005pzSpFroXrJFMJy0+fvnevDT84/2WONzvwsIkxGYiQVZEAhydfnCMp5itRgZBOVbtn1IfEGL5HzGbreexoIZHgF+HXkIBP3acz2W0u22xEhHOsWYI26MkFLZEo08+xtLy2Pnj7px7Ll7YQSOCgn5lh8eXt07eco+sm91ATjsLMPQJZjUvcCS1WI+XFv104+TdgQHYYwVyrotuQlnZ0fSxq+STthxPt/Tfd807/zQ1++XGRIRkulx/I+HdrvXpQEGguHnNe9bRukVSRyjsQhr4jNZqwKIYgPPIpPhU+vDAcfwj1eSirV/KiLwnMJP5eND1nYQeOncVY6DKad6MxdO9KTZemqgGVMr9q0QSZmXCzHtaIzK9yFBPB6HhEnEykmmaDtXhDGkndhWX3zFlu8+noQaBHPWzu2EmQD+nRfoE4FCdoNmDGeXqFZwy3z3YKRACbH X-Forefront-Antispam-Report: CIP:66.129.242.15;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-02.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(396003)(136003)(346002)(376002)(39860400002)(82310400011)(451199024)(186009)(1800799009)(46966006)(36840700001)(40470700004)(8936002)(8676002)(86362001)(4326008)(55016003)(40480700001)(5660300002)(2906002)(4744005)(40460700003)(966005)(7696005)(82740400003)(7126003)(356005)(9686003)(478600001)(6266002)(336012)(26005)(81166007)(6916009)(316002)(47076005)(70206006)(54906003)(70586007)(41300700001)(36860700001)(107886003)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 17:49:52.0517 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed4a58d1-7343-4204-51f9-08dbb481d510 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.15];Helo=[p-exchfe-eqx-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT075.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR05MB7653 X-Proofpoint-GUID: L0P7Hf94YUY85cKG2awZc8lIDo_YHSaS X-Proofpoint-ORIG-GUID: L0P7Hf94YUY85cKG2awZc8lIDo_YHSaS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-09-13_12,2023-09-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 bulkscore=0 suspectscore=0 phishscore=0 mlxscore=0 malwarescore=0 clxscore=1011 mlxlogscore=474 impostorscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309130149 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:26211, ipnet:208.84.65.0/24, country:US] X-Rspamd-Queue-Id: 4Rm7JR21H8z4RM9 Drew Gallatin wrote: > des seems to be addressing this in https://reviews.freebsd.org/D41845 That looks fine to me. Thanks des From nobody Wed Sep 13 18:11:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm7nS6K15z4sfdm; Wed, 13 Sep 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm7nS5sJkz4VNy; Wed, 13 Sep 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694628700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDHJf1r2G7i6AZTTA6wK3LyOH6T1GUbqPs7vEDTR7Do=; b=nTlL2/XIb/y5QvJaW2DPoFMP0afovyLptbCOGdjG9aLPf1MhCN7Cm2O/tO7uil0974uw8b L9nKK1Q7rTkD/JbL0XdsW5VoRp1SP04dKpU28rRjLl+HOCnlAxhCwozngwGbZrH0hshh4B XNwcdZ0/rZ8qV/fRfDWllz52tMPohaiAuLNeBZ7IPhT4RPHf7h6szMaRJio6nCjPQ2cvfL zSUNDNIqP5w4jFg4FI2UOmBzsZFHHGoAmXl4ykcMyyce6Fq8K8bt315F8b93uOhNBnJ/YG M0RCj65gTipby+dNt7PEUR6Ft6/w0VfeoTKxb373+aiDn1EITleuwK2Q9FIwcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694628700; a=rsa-sha256; cv=none; b=bzEOphUAkMiCeO+0FOG+cY6IK47noJZsEELk8Ine4QMiNSvTUy22M56u3l9AxH5GM7bQNL eir/esdUwRdOA5vfj6JU2vekQ2qo9+Id8VYaK1LtEGS92q0GarrJpxR5nDuZ3E3yhd0gt+ fPGTUQ0dGgPq2C8J5r0Sz6cMltSI2ImB1fqAJqBXrTNsBF63EYLRSc3UY2cUle2MHuS1w2 R4Ib3chl4mFL2JEfBVaI2MzSGth2uAXoOW9IX7iEzFw+wHTzumLg7xi+iZTi55b/jidEId LUlb9dqxLFgmKqDTVssad9sdSWT9L8vOW+hAxzqYqmOJ2KEh7tqwSG7SSfUZIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694628700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDHJf1r2G7i6AZTTA6wK3LyOH6T1GUbqPs7vEDTR7Do=; b=JHcYwPOpkW8+4zc8u982E5toTYrO37NWjHXyjNPqZL2S8SioSvJKLwgVTo1t65Ad1gzA4m Ovt5+v+4wGzYjIebL3KgZseNKfH+z4cazwfk8BVaSjL1p2JmYMECUZQzqGuKkfQD/NxIiZ 271bkwg3U+YXYG4IcIKneiyLqbTsyA1vWOSrbZpx7fx8sayB18Cf0YVeTYCMSZEKMwnlGm sfAZ5GegW7f/ujWKqxHCeI6AQunN8Ay/JzlWiwql5sQ1ppQOvbl0ZJj84EEcKiN0vneYya /8oBkY8LT41TviSa7TXe1/GMpZPcurnjtoYaPaHQfQ2WRA22+FiGgVTvsusi0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm7nS4wvLz8nv; Wed, 13 Sep 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DIBeJd010363; Wed, 13 Sep 2023 18:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DIBexV010360; Wed, 13 Sep 2023 18:11:40 GMT (envelope-from git) Date: Wed, 13 Sep 2023 18:11:40 GMT Message-Id: <202309131811.38DIBexV010360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f16abf8d356 - main - newvers.sh: Avoid picking up stray envars. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-13 18:10:46 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 40821c100161..73fd6857d307 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="CURRENT" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. From nobody Wed Sep 13 18:22:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm81s3Zgrz4shxP; Wed, 13 Sep 2023 18:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm81s39Byz4XHC; Wed, 13 Sep 2023 18:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694629345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hPewDvtN3BBHYhp6zTOy+e1fgNdUxQXjuYTEbmbnfdk=; b=Onvby8u95B9qMjm0MGX4wERXAwZLN0rzSkjNcaZvKEh/I56abjGCHaU8BuIh7GViqhDy0D rXYjjPG4EuWUNGoTfdDu2X8a07ySLDaCtOyYgtvlRHDz5URDwlSSyWIdirDLvACX/ACquB iTi4lJ53NyHARhCrwkqdG7qyMxdYzvkbTEwPxacPKgwTVFk/FeoFL/z0dkJTIrlrVkBS01 lhC5poY4BbEm7my//Qfj+d4jdUPyQT0AIkAKSLgr37Vc7JxEC1FW6sSfMjMSC0tgQ6gfYJ Hp/2+aFKCwgLS/2IO3sO43KNBmY4uLPe9KTCOaVJ/skcIfnZr6bQPftwqnm4Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694629345; a=rsa-sha256; cv=none; b=o1h8SnmMiBy+INMH95UA8xeljUlAnRRm+216FbHnKNGSOpvXF5olvmv/T6Ri8Qi9dIf5OW 6cmvVVEQVaEE2184vdEr5tyDP3ACskFTwgtpttwj6D/Fae2UpZsUHW/7koTXD7KAR/hEIV Ax1+vTcuEQnLEGlRgX+2ZTBAwtANegotbscCAk2ne4vg0dKxad9pBZ8dUfkAZnkdo2SCJt dUJOn6DACa2EvUjsLB3PDJtWeVeikFrl6rMmjocx6r7ubuOsU9cRMHjvjQ8Z4THm2PWbwu SJvI1pnWd4d5LbaXFZGErJIeRzEU1kypAHtf+WSGhRBO5Y9+o/zgTsqit5FZaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694629345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hPewDvtN3BBHYhp6zTOy+e1fgNdUxQXjuYTEbmbnfdk=; b=VFDfEM8YNV4wNQ+bZ4ax/XGEC5GBW0plAhweWlpZ8xO4uTj4myfp4FJXdPDS8hDpQnFSqX +6M19Vmp2/tPFS5byMsZ8SCkhy5ohPnOMscHOKvEL/64HP0k3IO7Rb+OAo1IUVS2uDq6n+ T565qvpTqunEjIgDnHsSn8896BM1r4xAkQAthqlsVeHThRNW4kerhau/5Re8vOa5F5OutB in/IK4PWu3lK7ro3oSTGGzpb8+A5IRsaYer0bHvg+k/ZWnfu9375cNeZ+xDzpD+Zv9g59A plEVITZ9yVD5Qiq37SqqmH4NdOHMlYwedXrXo398xHhxVlmZD0cSd4jnR28D1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm81s2FzCz91t; Wed, 13 Sep 2023 18:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DIMPrq030526; Wed, 13 Sep 2023 18:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DIMPQL030523; Wed, 13 Sep 2023 18:22:25 GMT (envelope-from git) Date: Wed, 13 Sep 2023 18:22:25 GMT Message-Id: <202309131822.38DIMPQL030523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 8763b9862f90 - main - powerpc pmap: initialize kernel pmap radix trie List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8763b9862f90dc3bdbbc5e3c2664890be7c1f0c4 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=8763b9862f90dc3bdbbc5e3c2664890be7c1f0c4 commit 8763b9862f90dc3bdbbc5e3c2664890be7c1f0c4 Author: Doug Moore AuthorDate: 2023-09-13 18:17:57 +0000 Commit: Doug Moore CommitDate: 2023-09-13 18:17:57 +0000 powerpc pmap: initialize kernel pmap radix trie Commit 2d2bcba7ba70141388729ed49674b36fd01146c5 changed radix trie implementation and made it necessary that radix tries be initialized with vm_radix_init. @dbaio reports that in some configurations, there is a powerpc boot panic and that this commit introduced the problem. In powerpc/aim/mmu_radix.c, the radix trie in kernel_pmap is initialized by zeroing all its fields. Add a call to vm_radix_init to properly initialize kernel_pmap->pm_radix. Reported by: dbaio Reviewed by: alc, jhibbits Fixes: 2d2bcba7ba drop NULL check from radix trie search MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41846 --- sys/powerpc/aim/mmu_radix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 9c5b67121803..e26508a3bddf 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -1844,6 +1844,7 @@ mmu_radix_setup_pagetables(vm_size_t hwphyssz) bzero(kernel_pmap, sizeof(struct pmap)); PMAP_LOCK_INIT(kernel_pmap); + vm_radix_init(&kernel_pmap->pm_radix); ptpages = allocpages(3); l1phys = moea64_bootstrap_alloc(RADIX_PGD_SIZE, RADIX_PGD_SIZE); From nobody Wed Sep 13 20:03:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmBGn5HVSz4tFpG; Wed, 13 Sep 2023 20:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmBGn3s5hz3N89; Wed, 13 Sep 2023 20:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PsRqOmI2cdpWl9Nevr4kAXiSE1cROKcdo6DlTasWrdY=; b=pv5SIsPbmCeCOnaE5AKkaG5Dxy54MSuePCcmtq9kDJsA+xu465wiqAL66hJJQ85tzaHnWN o/2+J3M0bz5lDvXcFCd1E/DRR1yqm8B/GeJjMvDLFinhVwb0zuKPHzPQVGvQcPIpjipU0m fkLIz3V1sUDhabvvg3YSWMBi/arYUNp/TMqph3uRmu2CHaFwxaD6QuOFJAxfoMu7+r2GnP 4TDSMehBlxVdFP7GkM3rrTVcaOaF+kJbCD1JdIQviRBFcr7cgLoAn7dUSIKhUnG+02WHtt p1GMkLS5iAF94tRCMW6Y833C73/fhMo0d/nWeH7UbNNM/aLYvN4cvgmTdvDoTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694635425; a=rsa-sha256; cv=none; b=YhBETKV+fXTz8qJnV14X7Ay9bF/q6N8hgYq1QChkch6/jPo4ROAMXsdkiZ28D/M38kWJMc DfSvIld8wu6VwF6taTxd3lTpy6MP/WEPKiKEn9XXuA5OAhQBtczDNXGBJiItXvWmA7tC1x 4t81gk4lC120VLt7oSphOZLJ2rUdmy9LoNL5wmR4rx5tNBwEghKsI8E3jUH1rjmdAbckFv 7iYjCf4mDOga6ohWj2hzO34tnnnPHH7zND6sSjtSB5KHrStceo15NRE+orvMuqqcPozW9o omRhP9ZyQ+Xse4PwLuhEJQXA1Sbvw8KgzehTFnCOx7SDdxMAggGaUFwhvCw+dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PsRqOmI2cdpWl9Nevr4kAXiSE1cROKcdo6DlTasWrdY=; b=EEK0WOXFLSHWP5N6yPBnAOTQ6cAvgzNeH7hd85HJsxLKbiD08XcLzXpFgI/GbcofnFqAcC YLly5gtb0jDTFgBjWB6m6PciWisdGHxLliPJ5VRYzGfG62H/KEwdED/QFonc+ePoOomPoV GQybLU/YSXUxEqqcKqty8As/PoZ8yo3DwPq7b45ypYTkyj/S4JkFG5Ww1Dr6zZgGnwop+h zxm/crtq5gvVXjNF0j0q+p4ioKFoAanKB04kXYlbQvCWO4U/dQoFJgHg06WWXxT2+0Y2UC 5uPzo9oEwEXfvB7UlUF7tYEjtK513tUOGXhTQYlSkQwfj7KpMRLXniAIpjSlxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmBGn2dsJzCfP; Wed, 13 Sep 2023 20:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DK3jiN096959; Wed, 13 Sep 2023 20:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DK3j1q096956; Wed, 13 Sep 2023 20:03:45 GMT (envelope-from git) Date: Wed, 13 Sep 2023 20:03:45 GMT Message-Id: <202309132003.38DK3j1q096956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3a9ca394c0c9 - releng/14.0 - init_main: Switch from SLIST to STAILQ, fix order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3a9ca394c0c9b2a3deb43910d05982495ef8e491 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9ca394c0c9b2a3deb43910d05982495ef8e491 commit 3a9ca394c0c9b2a3deb43910d05982495ef8e491 Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-13 20:03:09 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Approved by: re (gjb) Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 (cherry picked from commit 71679cf468ba28c0e3c88371f3fde13fccec99bd) (cherry picked from commit 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce) --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; From nobody Wed Sep 13 20:03:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmBGp5dbRz4tGG3; Wed, 13 Sep 2023 20:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmBGp4fBxz3NF2; Wed, 13 Sep 2023 20:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBlE8Iax24SBH0Wc5qbkcNtBSqeRXL3xTiZqbzaN8M=; b=U08M6fThj/Eig5+7zwvcSgU4v6D0YNo7KJCVgibdpjNkr+PMvEE7SYbPQC4PpNQVzRXfSP 9ThmerNWihshgTzi8LVXdhbRUrTpToau11oDJn+mK/y9t2jebEkelxyOQ37qwPmXi4rjfv DokWyFWfZ3rDk7UTdeiVii0qENg5EPpTjB0P/qx5qxkusoEaCg+PtdcRBXXyfZ4Q+T7FzC S9w4rDZ/a8xxoQBazrjEwwiymhOv7p9okHKHOWgs9X9Np9XOxDBjUTfDmqFhs1ZWDJttCM WDqvwzDGl/GUFLEw21gyE2mTSBOS8PxbW61wZvO1uGO7fN4BitctXRcwG/Zf+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694635426; a=rsa-sha256; cv=none; b=a1ierK1vGCB1/Dg+ifWRlZ/1tnMczQvW+AMCpaKdox2+dSIfugGhIsrLQehzBxtVS/SOXW W9QU8WxOA21P1EAZ7N1JwZXwgTE1hokPDzZgWsJnpS1BdfcJDz4JHx5SZT/0FR2bhtoGhP XhtTBCDVYOlEXGBw4x8KAt8MddnZDzm9aFBHIJPME1y5R4rP+gSmux2Z09ndQa1nEw9ak+ XxPkdco8qg6037hGi4g2K7ig6oUeLVoDEvqPTv0BPwDP0kBTnFp2d2e33suicEs9sV0AJu LGIuE6JiuMMnYifwepof62V2RG2/buTgvuMzEj7PdHi5kMD2B/DNq1U153BgfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBlE8Iax24SBH0Wc5qbkcNtBSqeRXL3xTiZqbzaN8M=; b=NiZGUrFe28TKV+MAUOJOq8+fZB8NnjOS9ihC/I8TCoapypnDJVQ8LSOFMdkBvv2wWtiDYs 7BVh2+8Ek+v+jnOWaa95jNzA5vksrHCFrH8mS2JXfPfUtQokxlnSmQS1Tx8vl92qVhG9WN jPKQXhjg2JQ7Meu0LFrzEuF4R0YaPcGP3R0kfszHIxblseJeGjHXsgnqqnPETNtv8qSC7d GYPkOnfdvB9Q4KYjj9u2ol34bl6uxcCj6DJLxTPqftEv0iMSqCzQUgqXSZiYOqRG8Zv2Pb SjZ0eZoHFtncH6rhid5xCBk9Eyj3qdP99plKlvPYir6MA9Sqgo/hRZqpCkOuMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmBGp3NvLzCqQ; Wed, 13 Sep 2023 20:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DK3kFh096998; Wed, 13 Sep 2023 20:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DK3kiW096995; Wed, 13 Sep 2023 20:03:46 GMT (envelope-from git) Date: Wed, 13 Sep 2023 20:03:46 GMT Message-Id: <202309132003.38DK3kiW096995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 81be13da3ecf - releng/14.0 - init_main: Record completed SYSINITs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 commit 81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-13 20:03:28 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 (cherry picked from commit 1926d5cef6eaa1302024d6471271c930ad65f9b2) (cherry picked from commit c31f2b5e6b591c61711018c3d6e52067ae860e9c) --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) From nobody Wed Sep 13 21:14:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmCrX1tbFz4sfKM; Wed, 13 Sep 2023 21:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmCrX1BSbz3YP6; Wed, 13 Sep 2023 21:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694639676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MiI3TU71VLFsxwy5IhISR9tIItBtoDluxFCNkxLDa+w=; b=RkVlRtK/dK/07qTxro1nRpo8V9VQYh60UFcsyXoxsh+WxTHHjeUmVcFFkTzLp+YQ1Zv60s 4a9mS1c5CJsn7emx2f5PpYEIhbXK9OqslopoJfmqhZSq1HppJDZ7ofwibxqbu+cJIZAbVK MSgwZpgX9m9t+o/58eiunDx2pnJk9oVqJsMtpp+RYskLesbgr/G6xEjExJJOsehoHOc+aB OsZxYDRbiys2YGrNIxyUdPGfbwoW6Ly+jeenuvfcG4criWdEKgrqK+pTUBXDxmoEpxRPNj bUJaw2Cti6DhVSd1xC9JuVqRdBWcfJufzuMVLbA7lK6eJrr/6X5+la8WWr2Zpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694639676; a=rsa-sha256; cv=none; b=m8rdWAk4vAGTNdb2tUDIr3VNlYzc5PzqQ3Q9HYEfYgDty6zLt5J18C3wohQIVLpSmAXVGH mS1MLxvilmbdoExYAfx3pDw+qHeUU2ga7eDg0OQ8Y6MJa9CzfM8S3XLhxXZWPkJFA3vVsi X9dAmjPC3e0jQ40E+KKTkqHbVwFtBlXrmDx8kdKT4qHGCOcCjou6GhPveINxo1eeJw7WU4 x5L4PzDH9NsfBeWIkkSJs1kYd9O6LY/ScrXSflZprqoLR7p5yRkZHkh3ODzqzUrjT20e+0 D0F5w7M6iDTrVP0bPilMjTRFhZXFjs+T7FAdsuuO+oLVJQ8vTfIT9msxFEFdZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694639676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MiI3TU71VLFsxwy5IhISR9tIItBtoDluxFCNkxLDa+w=; b=Wl0DF0M9lrfS2X9UqUHPRsZ14yqlR84xjhWVSfKhv4XZhyuomW43VV/pxZr4MggujBnsVt yJ4DlRl/gVL4vhPkjwktIMdVfHmW9GtB6JSvBl7x7zsqn5MqGRq4QNTJyYvPncCBx5fHfE VKePhipj4hRHnUnm/brbMHtn/TggwFVTHf96NiH8K2Rpc4L7HbBuBOFAODBqHxuWxd7xYB iRGreQ2QGgkcDAsr7tek2bIbVB0LdL9xnc019ZPBlOsARnQxwp6omMOC1fro8rTEsFsD9n tGp0z6VXdgERpipQCb/U3+vnxRIscSa923RlkG/0c6ALYVyUBKb6nhIq8sOuZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmCrX0DpszVMt; Wed, 13 Sep 2023 21:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DLEZE8012919; Wed, 13 Sep 2023 21:14:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DLEZ6G012916; Wed, 13 Sep 2023 21:14:35 GMT (envelope-from git) Date: Wed, 13 Sep 2023 21:14:35 GMT Message-Id: <202309132114.38DLEZ6G012916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 01d82151022c - main - ftpd: correct deprecation notice markup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01d82151022cb1383e83c331708a787f1907b00f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=01d82151022cb1383e83c331708a787f1907b00f commit 01d82151022cb1383e83c331708a787f1907b00f Author: Ed Maste AuthorDate: 2023-09-13 21:13:42 +0000 Commit: Ed Maste CommitDate: 2023-09-13 21:13:42 +0000 ftpd: correct deprecation notice markup Also bump .Dd for the original change. Reported by: karels Fixes: 98b98ec1bc7e ("ftpd: add deprecation notice") Sponsored by: The FreeBSD Foundation --- libexec/ftpd/ftpd.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index f5353be894fe..ec4ce0c65100 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,7 +43,7 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask -.Sh .Sh DEPRECATION NOTICE +.Sh DEPRECATION NOTICE The .Fx base system From nobody Wed Sep 13 21:42:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmDTD2Ybpz4spn5; Wed, 13 Sep 2023 21:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmDTD26xvz3dxY; Wed, 13 Sep 2023 21:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694641376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5sjSJdnhcUVoYAJPsMQkayaoAIPqcd50idItIZ1Oo=; b=m0Cm2iwCp+k1L2tDWKOc0+mD6USJzmCwIh24vy7RuT3fMy6A711N5d9NIExzWtN7Iiiwh1 iBwxLqys4yKUQ7P3CNKHOGaG0hrlszijc5O6CluxRQxSYmTZrILPcHc+hDXc3OhAEufTzP DZOidvW/FZpXPm2oCr47VE0/0wkfsvsYgzNQDS+7UM+JUQjb8IH/FERgsN2eyVUYgumAuU FInTY7FUyH5D15adyBxFMaMYKgt+z/gRttDQHbY18WjrCkRnT5juXUtwzn7JyKYBm0/UFn OLvqBq74NEHrDWh6kXshrST7vhZ1IyGsv25nNqStrhspfDJ0UzOMqB6jPcMJhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694641376; a=rsa-sha256; cv=none; b=wgVEZxo2GTMnwXElq98rxvntgCeoHRxK91gu65RgoFK/piaMriqUe8bOine4fVPi+B/KoI bIc9p41W9datmVVkflnOZcQuGow/DuQIDip/bZ0JpMHDjldqgJuUZN8BqjvyQZOZAA/hLw A07tCjY5GFBKsOAIlAO3nI4Cui3hnYW+1ERZhlv9Th5QvGHB9qQea3OTz3sMGGyUit5ErZ gPuQxZbs1BQERSJPQmJ98hcKo4f5Mwr/8xc3U6Q1cJ3kcQwWDHwKJXKGLCr38RA8cfE3Vd 26A6gvcS2cNDDHm3KuY3W8qjLSGfmSzmlwIhCmSfnVjmsBVWlI7SMK+ht/Ldrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694641376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5sjSJdnhcUVoYAJPsMQkayaoAIPqcd50idItIZ1Oo=; b=J0iwrZP3JM3pIT90bCGRjlZkZl0zTu+uI6cbQBT7PsINVmwWPFEhNTz4OZ9KH8NN7sU93H vLIjCNe1KNfglSU5OHVCiMUKUd5/Jwb+GxM21bupGhg+m1MF85OkVN57D4M91ic2umqZX8 YyzdkCteHsVK9nCIwLWrEF9uGpLUXBGzunhPerkq8ODg2at//HfMUIGAUJQmtItm8032de GjtJp434dk4ZdxRq8ZHOOjBhtQIPK4l5aczPns4jVwUvR8n+fblJKTjmZh3I+mWqgc8+uc yfbc3mRfZftoHPk1BQSLOGFJcftWbuztQJFJWpY+Zku8uh2Vzl2R72sG8iDEdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmDTD1C2NzWSr; Wed, 13 Sep 2023 21:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DLguQU062000; Wed, 13 Sep 2023 21:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DLguXw061997; Wed, 13 Sep 2023 21:42:56 GMT (envelope-from git) Date: Wed, 13 Sep 2023 21:42:56 GMT Message-Id: <202309132142.38DLguXw061997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3ea83e94cdfa - stable/14 - ftpd: correct deprecation notice markup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ea83e94cdfa34745641dfa5f43debfdcd79e229 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea83e94cdfa34745641dfa5f43debfdcd79e229 commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229 Author: Ed Maste AuthorDate: 2023-09-13 21:13:42 +0000 Commit: Ed Maste CommitDate: 2023-09-13 21:42:00 +0000 ftpd: correct deprecation notice markup Also bump .Dd for the original change. Reported by: karels Fixes: 98b98ec1bc7e ("ftpd: add deprecation notice") Sponsored by: The FreeBSD Foundation (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) --- libexec/ftpd/ftpd.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index f5353be894fe..ec4ce0c65100 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,7 +43,7 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask -.Sh .Sh DEPRECATION NOTICE +.Sh DEPRECATION NOTICE The .Fx base system From nobody Wed Sep 13 22:12:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmF7l60Y5z4t0cp; Wed, 13 Sep 2023 22:12: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 4RmF7l51FBz4Hg8; Wed, 13 Sep 2023 22:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a2KDkZmHnj2icv9pWckXQxBqRB6wuZw78gZhja8wrI=; b=hxe8zcfxGzfssBHQjkeK0hg+OHnPiMTbnaOf1tDJ9jSd6pC/m4rkb3tcyknLOXGvYyV+nA lTu1hq5nMfr1RpR3GH+FqcZpIwWpk/duN49DIc3xQd7kb88SFYC8H5z6xiplukdH0vHU/t piz8LFmf/NS/i8VUBCmGWxR6R/621LoVcS2VD2xT2g7goFmFgYEMcwCfHNzZ0KKIr/HdiZ nWBWMGfl6st24xzmZq8ZDb5E5QqDke6Lia4bsHk4D5xNuAeAO2TLc0X4C8eFlbON9AENhQ l/7qMgHogR3nSPBfQBDpOzTTFCjFjHpBAq9AQKwgMWeJzxqgpJYaFlNsWSj5IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694643171; a=rsa-sha256; cv=none; b=EVRUJ5pwuAV+a6CDlqu4ilwr79M/ndS8LDThnxTr3bzz4lrGagIFacinibIrUu7vklHMtE Y7AcR6/N4F1NSrlDtZN4b74Iq5R5P0VF1gYt2n6aRkmmEBdEsrs0wm/dfO1Gav7uxPJ5kn w4GvaaQT8cv8pk35wV0Bwn7VB6HuX1VFVV3ewcbI2oaQSLr6E4m82joX3AKcm0mIki0LIX mgY5QczregwUFj+DdohYoCgsyZc7EpGpXtJ2UvECv8B9IKT7Y/Z0Sn8FGA1J4DYVKRlivG bbeHxYDpOCvn62adr2Wtz2tmdCeczS97RI/YdfS1RblyJucgvHW2ZX+zzXJK3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a2KDkZmHnj2icv9pWckXQxBqRB6wuZw78gZhja8wrI=; b=YZryBKR0NGJqNaubCKdJyYWpk9yhZMX99jeyy+MJJzt5u9Bp89FkrLEjJeMd+ci80rB1DO GkgtIlsMuYyN5SWsV4cAWyhMuYlEpnprJYTzblQecbT2uNAoABSsN0ADCrEcm1k6ZJYsfN mVyiRTJ0Bwxq/s0Jgw38dt3Bs3uyiCMh/e8PEu2WXGO4iV7qKi9oZ7SN3BoCp7l9rMNJqE MZGQYRCrX8HA4gYLWwiBv+MIdPdaVcCHQkvj02WdHF55twSKXKbFiqNviXFU6UTrvOrzcH rLmKzkYNp1tTevvwoA2n7c/MtpwDMTFN3DNsFu3VS3MXwcgAm36Mbl5KESIt+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmF7l447vzWd3; Wed, 13 Sep 2023 22:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DMCp0J011735; Wed, 13 Sep 2023 22:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DMCpAY011732; Wed, 13 Sep 2023 22:12:51 GMT (envelope-from git) Date: Wed, 13 Sep 2023 22:12:51 GMT Message-Id: <202309132212.38DMCpAY011732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: da722491d3cb - releng/14.0 - ftpd: add deprecation notice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: da722491d3cbf995c1eb95a40a4402e1955fa962 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=da722491d3cbf995c1eb95a40a4402e1955fa962 commit da722491d3cbf995c1eb95a40a4402e1955fa962 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-13 22:12:42 +0000 ftpd: add deprecation notice Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) Approved by: re (gjb) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index c45df161575c..ec4ce0c65100 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Wed Sep 13 22:17:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmFDq3bG3z4t1d4; Wed, 13 Sep 2023 22:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmFDq383Nz4J1D; Wed, 13 Sep 2023 22:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDJ1FcnsQOUtDjcHwsCs9LvY3odyHvq5NzagWmVRyf8=; b=ZZpEhE/R7hBEbHyHFwQ9mu0P16MbM5RWFIFh7SGxwvwaT1fQbon5wW0PpN7J+OZ6h9AU9f 9hLIhRNdwDlWIvwDdLy3VIJtT916ruCwzA0nbCiENjyY86VW5QMyU9kfh0sSB3IJNKQmRp ZJTm3VKA/2iZARYFzFIZFjXzzfIdgYCHlt138FTuto81saSHBL4HUZHNfSy1SxRCekb9Nl 5khdiANxJbGvWjAHVo9/1ci/ysgFSHy8vJEZADTCJnagEDgX9Of9Qs1hl0zr2d3sZ4UOw2 4RJfIaidTf65PQOtvuCHDHC4G8Z+78VWXWS6yPtzdMZ1qVos/v5NX32ZNbh6og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694643435; a=rsa-sha256; cv=none; b=g2Zgs1zqlR9xH/ECnmLSzv7W7yUocP/iDGjgt2On2mDuGURigxo+RyQ24Pl6ycGZSagGyv 28ns49wAHFPuPnDFWv+Q76ccRyGBJ227IfNysZYgcF98vwNlt9A3HWqGH8JSEIiBDvwT4M L0X0RjAD38KynVC5Uex+YGOlanBqn/LiF7z2sjxtNvisXGMntaAy+oEEWVU0UMPGe1XaY3 N7Hld+fDoOfz+8xF5IeNQ7khDyqjnJtDv65izI6WNa+OdsH1FYlJ58HR1yKrm4HAo5ayGM z6lNYB0KXrPnt6M6YzsIyPu7o1EOPUyUIq9kJlxMq1kRRHQNytW9qt1KLS59CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aDJ1FcnsQOUtDjcHwsCs9LvY3odyHvq5NzagWmVRyf8=; b=dOPMeajwHoqdNY/Dryaw/e+jrUUZTb9jZGKVtTzA/l8vzsK/LaRsUVfhwqyFH/gC4BaTzx 8IyhXcsKV9IBtyy3AWwSTjfhfYpndKEyIr9BZgkygmMyHkyog2qiBo9/98IvRLZO98SKgM nMFKjhRI9updwykddMAp7EN4vCqg2axHMwHeWMiSSt13VlME/TVlv/SqdPLB/pPjfmYkZw NB0bRMhq+l4WFtoSIB3F7HIzZUQ2h7YMJwomn1KXckpe6qjD3Rcw8UIJrvi19c/phu3+3d Mt4zSV19FNgsUFZwGo/rMGCiToCPmy6RA5YLeOhR3vcobP2rbiPNjoSelHE2Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmFDq256WzXFH; Wed, 13 Sep 2023 22:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DMHFg3012452; Wed, 13 Sep 2023 22:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DMHFvJ012449; Wed, 13 Sep 2023 22:17:15 GMT (envelope-from git) Date: Wed, 13 Sep 2023 22:17:15 GMT Message-Id: <202309132217.38DMHFvJ012449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: bc3a013ccd23 - main - irdma(4): use related vnet for searching netdev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc3a013ccd23c50bb48f17211ffc36fe85d11e18 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3a013ccd23c50bb48f17211ffc36fe85d11e18 commit bc3a013ccd23c50bb48f17211ffc36fe85d11e18 Author: Bartosz Sobczak AuthorDate: 2023-09-12 21:31:39 +0000 Commit: Eric Joyner CommitDate: 2023-09-13 22:16:15 +0000 irdma(4): use related vnet for searching netdev It was found through testing that when ULP uses individual vnet, the search for the correct vlan_id may failing because of no proper interface with given address. The solution is to use vnet associated to the connection whenever possible. Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner Reviewed by: erj@ MFC after: 1 day Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41592 --- sys/dev/irdma/fbsd_kcompat.c | 6 ++---- sys/dev/irdma/fbsd_kcompat.h | 14 ++++++++++++++ sys/dev/irdma/irdma_cm.c | 35 ++++++++++++++++++++++++----------- sys/dev/irdma/irdma_main.h | 5 +++-- sys/dev/irdma/irdma_verbs.c | 4 ++-- 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/sys/dev/irdma/fbsd_kcompat.c b/sys/dev/irdma/fbsd_kcompat.c index 013f9279952e..fbfa5c9e5fc4 100644 --- a/sys/dev/irdma/fbsd_kcompat.c +++ b/sys/dev/irdma/fbsd_kcompat.c @@ -393,8 +393,7 @@ irdma_get_dst_mac(struct irdma_cm_node *cm_node, struct sockaddr *dst_sin, u8 *d { struct ifnet *netdev = cm_node->iwdev->netdev; #ifdef VIMAGE - struct rdma_cm_id *rdma_id = (struct rdma_cm_id *)cm_node->cm_id->context; - struct vnet *vnet = rdma_id->route.addr.dev_addr.net; + struct vnet *vnet = irdma_cmid_to_vnet(cm_node->cm_id); #endif struct ifnet *ifp; struct llentry *lle; @@ -492,8 +491,7 @@ irdma_resolve_neigh_lpb_chk(struct irdma_device *iwdev, struct irdma_cm_node *cm struct irdma_cm_info *cm_info) { #ifdef VIMAGE - struct rdma_cm_id *rdma_id = (struct rdma_cm_id *)cm_node->cm_id->context; - struct vnet *vnet = rdma_id->route.addr.dev_addr.net; + struct vnet *vnet = irdma_cmid_to_vnet(cm_node->cm_id); #endif int arpindex; int oldarpindex; diff --git a/sys/dev/irdma/fbsd_kcompat.h b/sys/dev/irdma/fbsd_kcompat.h index eb1e615fc048..f465f97167cc 100644 --- a/sys/dev/irdma/fbsd_kcompat.h +++ b/sys/dev/irdma/fbsd_kcompat.h @@ -121,6 +121,20 @@ static inline u64 *irdma_next_pbl_addr(u64 *pbl, struct irdma_pble_info **pinfo, return (*pinfo)->addr; } + +static inline struct vnet * +irdma_cmid_to_vnet(struct iw_cm_id *cm_id) +{ + struct rdma_cm_id *rdma_id; + + if (!cm_id) + return &init_net; + + rdma_id = (struct rdma_cm_id *)cm_id->context; + + return rdma_id->route.addr.dev_addr.net; +} + #if __FreeBSD_version < 1400026 struct ib_cq *irdma_create_cq(struct ib_device *ibdev, const struct ib_cq_init_attr *attr, diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index 48aefda681cb..c1d5875961f0 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -1624,10 +1624,13 @@ static u8 irdma_iw_get_vlan_prio(u32 *loc_addr, u8 prio, bool ipv4) * vlan id and mac for that address. */ if_t -irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac) +irdma_netdev_vlan_ipv6(struct iw_cm_id *cm_id, u32 *addr, u16 *vlan_id, u8 *mac) { if_t ip_dev = NULL; struct in6_addr laddr6; +#ifdef VIMAGE + struct vnet *vnet = irdma_cmid_to_vnet(cm_id); +#endif struct ifaddr *ifa; u16 scope_id = 0; @@ -1641,7 +1644,11 @@ irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac) IN6_IS_ADDR_MC_INTFACELOCAL(&laddr6)) scope_id = ntohs(laddr6.__u6_addr.__u6_addr16[1]); +#ifdef VIMAGE + ip_dev = ip6_ifp_find(vnet, laddr6, scope_id); +#else ip_dev = ip6_ifp_find(&init_net, laddr6, scope_id); +#endif if (ip_dev) { if (vlan_id) *vlan_id = rdma_vlan_dev_vlan_id(ip_dev); @@ -1658,12 +1665,19 @@ irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac) * @addr: local IPv4 address */ u16 -irdma_get_vlan_ipv4(u32 *addr) +irdma_get_vlan_ipv4(struct iw_cm_id *cm_id, u32 *addr) { if_t netdev; +#ifdef VIMAGE + struct vnet *vnet = irdma_cmid_to_vnet(cm_id); +#endif u16 vlan_id = 0xFFFF; +#ifdef VIMAGE + netdev = ip_ifp_find(vnet, htonl(addr[0])); +#else netdev = ip_ifp_find(&init_net, htonl(addr[0])); +#endif if (netdev) { vlan_id = rdma_vlan_dev_vlan_id(netdev); dev_put(netdev); @@ -2060,8 +2074,7 @@ irdma_cm_create_ah(struct irdma_cm_node *cm_node, bool wait) struct irdma_ah_info ah_info = {0}; struct irdma_device *iwdev = cm_node->iwdev; #ifdef VIMAGE - struct rdma_cm_id *rdma_id = (struct rdma_cm_id *)cm_node->cm_id->context; - struct vnet *vnet = rdma_id->route.addr.dev_addr.net; + struct vnet *vnet = irdma_cmid_to_vnet(cm_node->cm_id); #endif ether_addr_copy(ah_info.mac_addr, if_getlladdr(iwdev->netdev)); @@ -3520,11 +3533,11 @@ irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) if (((struct sockaddr_in *)&cm_id->local_addr)->sin_family == AF_INET) { cm_node->ipv4 = true; - cm_node->vlan_id = irdma_get_vlan_ipv4(cm_node->loc_addr); + cm_node->vlan_id = irdma_get_vlan_ipv4(cm_id, cm_node->loc_addr); } else { cm_node->ipv4 = false; - irdma_netdev_vlan_ipv6(cm_node->loc_addr, &cm_node->vlan_id, - NULL); + irdma_netdev_vlan_ipv6(cm_id, cm_node->loc_addr, + &cm_node->vlan_id, NULL); } irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "Accept vlan_id=%d\n", cm_node->vlan_id); @@ -3719,7 +3732,7 @@ irdma_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) cm_info.rem_addr[0] = ntohl(raddr->sin_addr.s_addr); cm_info.loc_port = ntohs(laddr->sin_port); cm_info.rem_port = ntohs(raddr->sin_port); - cm_info.vlan_id = irdma_get_vlan_ipv4(cm_info.loc_addr); + cm_info.vlan_id = irdma_get_vlan_ipv4(cm_id, cm_info.loc_addr); } else { if (iwdev->vsi.mtu < IRDMA_MIN_MTU_IPV6) return -EINVAL; @@ -3731,7 +3744,7 @@ irdma_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) raddr6->sin6_addr.__u6_addr.__u6_addr32); cm_info.loc_port = ntohs(laddr6->sin6_port); cm_info.rem_port = ntohs(raddr6->sin6_port); - irdma_netdev_vlan_ipv6(cm_info.loc_addr, &cm_info.vlan_id, NULL); + irdma_netdev_vlan_ipv6(cm_id, cm_info.loc_addr, &cm_info.vlan_id, NULL); } cm_info.cm_id = cm_id; cm_info.qh_qpid = iwdev->vsi.ilq->qp_id; @@ -3846,7 +3859,7 @@ irdma_create_listen(struct iw_cm_id *cm_id, int backlog) cm_info.loc_port = ntohs(laddr->sin_port); if (laddr->sin_addr.s_addr != htonl(INADDR_ANY)) { - cm_info.vlan_id = irdma_get_vlan_ipv4(cm_info.loc_addr); + cm_info.vlan_id = irdma_get_vlan_ipv4(cm_id, cm_info.loc_addr); } else { cm_info.vlan_id = 0xFFFF; wildcard = true; @@ -3860,7 +3873,7 @@ irdma_create_listen(struct iw_cm_id *cm_id, int backlog) laddr6->sin6_addr.__u6_addr.__u6_addr32); cm_info.loc_port = ntohs(laddr6->sin6_port); if (!IN6_IS_ADDR_UNSPECIFIED(&laddr6->sin6_addr)) { - irdma_netdev_vlan_ipv6(cm_info.loc_addr, + irdma_netdev_vlan_ipv6(cm_id, cm_info.loc_addr, &cm_info.vlan_id, NULL); } else { cm_info.vlan_id = 0xFFFF; diff --git a/sys/dev/irdma/irdma_main.h b/sys/dev/irdma/irdma_main.h index 25c3fcfc939e..aa5bbee2fb77 100644 --- a/sys/dev/irdma/irdma_main.h +++ b/sys/dev/irdma/irdma_main.h @@ -584,8 +584,9 @@ void irdma_gen_ae(struct irdma_pci_f *rf, struct irdma_sc_qp *qp, struct irdma_gen_ae_info *info, bool wait); void irdma_copy_ip_ntohl(u32 *dst, __be32 *src); void irdma_copy_ip_htonl(__be32 *dst, u32 *src); -u16 irdma_get_vlan_ipv4(u32 *addr); -if_t irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac); +u16 irdma_get_vlan_ipv4(struct iw_cm_id *cm_id, u32 *addr); +if_t irdma_netdev_vlan_ipv6(struct iw_cm_id *cm_id, u32 *addr, u16 *vlan_id, + u8 *mac); struct ib_mr *irdma_reg_phys_mr(struct ib_pd *ib_pd, u64 addr, u64 size, int acc, u64 *iova_start); int irdma_upload_qp_context(struct irdma_qp *iwqp, bool freeze, bool raw); diff --git a/sys/dev/irdma/irdma_verbs.c b/sys/dev/irdma/irdma_verbs.c index 8b7b34f7b2fb..cda8041ab397 100644 --- a/sys/dev/irdma/irdma_verbs.c +++ b/sys/dev/irdma/irdma_verbs.c @@ -3336,7 +3336,7 @@ irdma_attach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid) if (!ipv6_addr_v4mapped((struct in6_addr *)ibgid)) { irdma_copy_ip_ntohl(ip_addr, sgid_addr.saddr_in6.sin6_addr.__u6_addr.__u6_addr32); - irdma_netdev_vlan_ipv6(ip_addr, &vlan_id, NULL); + irdma_netdev_vlan_ipv6(iwqp->cm_id, ip_addr, &vlan_id, NULL); ipv4 = false; irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_VERBS, "qp_id=%d, IP6address=%x:%x:%x:%x\n", ibqp->qp_num, @@ -3345,7 +3345,7 @@ irdma_attach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid) } else { ip_addr[0] = ntohl(sgid_addr.saddr_in.sin_addr.s_addr); ipv4 = true; - vlan_id = irdma_get_vlan_ipv4(ip_addr); + vlan_id = irdma_get_vlan_ipv4(iwqp->cm_id, ip_addr); irdma_mcast_mac_v4(ip_addr, dmac); irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_VERBS, "qp_id=%d, IP4address=%x, MAC=%x:%x:%x:%x:%x:%x\n", From nobody Wed Sep 13 22:17:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmFDr4vfKz4t1j1; Wed, 13 Sep 2023 22:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmFDr3shPz4JMD; Wed, 13 Sep 2023 22:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gabicTM7rp29s1TfEvLep7ErbzTlkSW/afFKmbLomMw=; b=cHuBbQk648NeT2ZjWfGLmzinv6dfAbz1/ElvIAE1AH2iM64jnUJHFa8587FqGyq0egtNKy XmxOoSKJfpg8LiJj9iucp1yqYPE7sclfLtIYXZT8CxZ5rOABNdCmZQVBc/PwcB/c8suPbM 7mzZjsQ+bJd3fLNvNJb7EJTh8bJHU3oqbqoYFQETPOuaRq0oYoBnXLK6BFhs/dYUt3fNeU Y6I7Rx6ScJUHVO+PYysj5Bw1JvUmHyesmr9vtdHikSGsE6i7U2Baf7n+ROsGNadRjVrVwA brZ18SGRLgTX9jESqdsNYqDf/Ndwg15Es4rr3O2kZhwXclrgXGS7dsTLIn532Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694643436; a=rsa-sha256; cv=none; b=wLoUmYcZsac3J6ys9AhtPT4RsEYYK4Y29lqshbjpFUq/oThIsYBUAmcjrSs72TPwHBsYXq 7L7XTA95u3rhdd1AHLIIxBGS1tJRTCa9xpJQ6rZ6hYzay76LIJEysUYVCvE/4vERq1wtY6 L2IySxYglHVqx1AwUqztPB7NcwyrBMhADafkgY9IDnj2U24cVS1Zxr5koaHYf+FijRnulw hwgRzA6kKwTV7sJfniwt8iHlEXXvnXG5HAzK1ZuQ/SF/ID0KAoFzXTxqCZOQ3hzc0AXWex olEZZVUipGyotQlslmxK5R43PoIXcu48QaSobdE1KmUHUtsxWgYZFUM/WfNfPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gabicTM7rp29s1TfEvLep7ErbzTlkSW/afFKmbLomMw=; b=Oy/PbvSlwAG/p4UmHqViHwih6r8JgjsHEY6cFXu7AgoJAjqvoWsQgt7WU4cgo041H6H+me eb5GaY41aUttQwT/7yTojtaYXM+NdLnKoyvwXmX3/yOBpSNQBbcdhav5/0j875VaocCIWp x/XXEJ/gQbllodj/O7GCgole4OdpQSmE8qQBfKmLPShve291VIUPhjvnBQ5zCpxK+ChRPG aysxotd8j8GnAXOlYaLNelpW090S0iCAwcISt9/rU+JfOoym6LM3bccIPe+4KWYrLZDca2 8a0hr1vdWvA0AaHKvCfpX2icCdUBFbvtOuYOla60TjBeDRYSN2JO/KA6kqI3/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmFDr2fzszWxw; Wed, 13 Sep 2023 22:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DMHGIu012496; Wed, 13 Sep 2023 22:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DMHG1I012493; Wed, 13 Sep 2023 22:17:16 GMT (envelope-from git) Date: Wed, 13 Sep 2023 22:17:16 GMT Message-Id: <202309132217.38DMHG1I012493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: ffafa6a4d157 - main - irdma(4): remove artificial completion generator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffafa6a4d157e49e6b12567958c4ab0c9151c080 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffafa6a4d157e49e6b12567958c4ab0c9151c080 commit ffafa6a4d157e49e6b12567958c4ab0c9151c080 Author: Bartosz Sobczak AuthorDate: 2023-09-12 21:35:06 +0000 Commit: Eric Joyner CommitDate: 2023-09-13 22:16:21 +0000 irdma(4): remove artificial completion generator Removing artificial completion generator as there had been no indication of the code being required for E810 cards. Further more it was found that the code may have unpleasant side effects on user experience when using ucmatose tool. Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner Reviewed by: erj@ MFC after: 1 day Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41593 --- contrib/ofed/libirdma/irdma_umain.h | 8 -- contrib/ofed/libirdma/irdma_uverbs.c | 161 +---------------------------------- 2 files changed, 1 insertion(+), 168 deletions(-) diff --git a/contrib/ofed/libirdma/irdma_umain.h b/contrib/ofed/libirdma/irdma_umain.h index c67c5d7076f9..7ff850c46b72 100644 --- a/contrib/ofed/libirdma/irdma_umain.h +++ b/contrib/ofed/libirdma/irdma_umain.h @@ -109,11 +109,6 @@ struct verbs_cq { }; }; -struct irdma_cmpl_gen { - LIST_ENTRY(irdma_cmpl_gen) list; - struct irdma_cq_poll_info cpi; -}; - struct irdma_ucq { struct verbs_cq verbs_cq; struct verbs_mr vmr; @@ -130,7 +125,6 @@ struct irdma_ucq { struct list_head resize_list; /* for extended CQ completion fields */ struct irdma_cq_poll_info cur_cqe; - struct list_head_cmpl cmpl_generated; }; struct irdma_uqp { @@ -150,7 +144,6 @@ struct irdma_uqp { struct irdma_qp_uk qp; enum ibv_qp_type qp_type; struct irdma_sge *recv_sges; - pthread_t flush_thread; }; /* irdma_uverbs.c */ @@ -207,5 +200,4 @@ void irdma_async_event(struct ibv_context *context, void irdma_set_hw_attrs(struct irdma_hw_attrs *attrs); void *irdma_mmap(int fd, off_t offset); void irdma_munmap(void *map); -void *irdma_flush_thread(void *arg); #endif /* IRDMA_UMAIN_H */ diff --git a/contrib/ofed/libirdma/irdma_uverbs.c b/contrib/ofed/libirdma/irdma_uverbs.c index c59d409e72cd..bc6bec34e6cd 100644 --- a/contrib/ofed/libirdma/irdma_uverbs.c +++ b/contrib/ofed/libirdma/irdma_uverbs.c @@ -459,7 +459,6 @@ ucreate_cq(struct ibv_context *context, info.cq_size = get_cq_size(attr_ex->cqe, hw_rev, cqe_64byte_ena); iwucq->comp_vector = attr_ex->comp_vector; LIST_INIT(&iwucq->resize_list); - LIST_INIT(&iwucq->cmpl_generated); total_size = get_cq_total_bytes(info.cq_size, cqe_64byte_ena); cq_pages = total_size >> IRDMA_HW_PAGE_SHIFT; @@ -615,142 +614,6 @@ irdma_process_resize_list(struct irdma_ucq *iwucq, return cq_cnt; } -static void -irdma_remove_cmpls_list(struct irdma_ucq *iwucq) -{ - struct irdma_cmpl_gen *cmpl_node, *next; - - LIST_FOREACH_SAFE(cmpl_node, &iwucq->cmpl_generated, list, next) { - LIST_REMOVE(cmpl_node, list); - free(cmpl_node); - } -} - -static int -irdma_generated_cmpls(struct irdma_ucq *iwucq, struct irdma_cq_poll_info *cq_poll_info) -{ - struct irdma_cmpl_gen *cmpl; - - if (!iwucq || LIST_EMPTY(&iwucq->cmpl_generated)) - return ENOENT; - cmpl = LIST_FIRST(&iwucq->cmpl_generated); - LIST_REMOVE(cmpl, list); - memcpy(cq_poll_info, &cmpl->cpi, sizeof(*cq_poll_info)); - - free(cmpl); - - return 0; -} - -/** - * irdma_set_cpi_common_values - fill in values for polling info struct - * @cpi: resulting structure of cq_poll_info type - * @qp: QPair - * @qp_num: id of the QP - */ -static void -irdma_set_cpi_common_values(struct irdma_cq_poll_info *cpi, - struct irdma_qp_uk *qp, __u32 qp_num) -{ - cpi->comp_status = IRDMA_COMPL_STATUS_FLUSHED; - cpi->error = 1; - cpi->major_err = IRDMA_FLUSH_MAJOR_ERR; - cpi->minor_err = FLUSH_GENERAL_ERR; - cpi->qp_handle = (irdma_qp_handle) (uintptr_t)qp; - cpi->qp_id = qp_num; -} - -static bool -irdma_cq_empty(struct irdma_ucq *iwucq) -{ - struct irdma_cq_uk *ukcq; - __u64 qword3; - __le64 *cqe; - __u8 polarity; - - ukcq = &iwucq->cq; - cqe = IRDMA_GET_CURRENT_CQ_ELEM(ukcq); - get_64bit_val(cqe, 24, &qword3); - polarity = (__u8) FIELD_GET(IRDMA_CQ_VALID, qword3); - - return polarity != ukcq->polarity; -} - -/** - * irdma_generate_flush_completions - generate completion from WRs - * @iwuqp: pointer to QP - */ -static void -irdma_generate_flush_completions(struct irdma_uqp *iwuqp) -{ - struct irdma_qp_uk *qp = &iwuqp->qp; - struct irdma_ring *sq_ring = &qp->sq_ring; - struct irdma_ring *rq_ring = &qp->rq_ring; - struct irdma_cmpl_gen *cmpl; - __le64 *sw_wqe; - __u64 wqe_qword; - __u32 wqe_idx; - - if (pthread_spin_lock(&iwuqp->send_cq->lock)) - return; - if (irdma_cq_empty(iwuqp->send_cq)) { - while (IRDMA_RING_MORE_WORK(*sq_ring)) { - cmpl = malloc(sizeof(*cmpl)); - if (!cmpl) { - pthread_spin_unlock(&iwuqp->send_cq->lock); - return; - } - - wqe_idx = sq_ring->tail; - irdma_set_cpi_common_values(&cmpl->cpi, qp, qp->qp_id); - cmpl->cpi.wr_id = qp->sq_wrtrk_array[wqe_idx].wrid; - sw_wqe = qp->sq_base[wqe_idx].elem; - get_64bit_val(sw_wqe, 24, &wqe_qword); - cmpl->cpi.op_type = (__u8) FIELD_GET(IRDMAQPSQ_OPCODE, wqe_qword); - /* remove the SQ WR by moving SQ tail */ - IRDMA_RING_SET_TAIL(*sq_ring, sq_ring->tail + qp->sq_wrtrk_array[sq_ring->tail].quanta); - LIST_INSERT_HEAD(&iwuqp->send_cq->cmpl_generated, cmpl, list); - } - } - pthread_spin_unlock(&iwuqp->send_cq->lock); - if (pthread_spin_lock(&iwuqp->recv_cq->lock)) - return; - if (irdma_cq_empty(iwuqp->recv_cq)) { - while (IRDMA_RING_MORE_WORK(*rq_ring)) { - cmpl = malloc(sizeof(*cmpl)); - if (!cmpl) { - pthread_spin_unlock(&iwuqp->recv_cq->lock); - return; - } - - wqe_idx = rq_ring->tail; - irdma_set_cpi_common_values(&cmpl->cpi, qp, qp->qp_id); - cmpl->cpi.wr_id = qp->rq_wrid_array[wqe_idx]; - cmpl->cpi.op_type = IRDMA_OP_TYPE_REC; - /* remove the RQ WR by moving RQ tail */ - IRDMA_RING_SET_TAIL(*rq_ring, rq_ring->tail + 1); - LIST_INSERT_HEAD(&iwuqp->recv_cq->cmpl_generated, cmpl, list); - } - } - pthread_spin_unlock(&iwuqp->recv_cq->lock); -} - -void * -irdma_flush_thread(void *arg) -{ - __u8 i = 5; - struct irdma_uqp *iwuqp = arg; - - while (--i) { - if (pthread_spin_lock(&iwuqp->lock)) - break; - irdma_generate_flush_completions(arg); - pthread_spin_unlock(&iwuqp->lock); - sleep(1); - } - pthread_exit(NULL); -} - /** * irdma_udestroy_cq - destroys cq * @cq: ptr to cq to be destroyed @@ -771,8 +634,6 @@ irdma_udestroy_cq(struct ibv_cq *cq) if (ret) goto err; - if (!LIST_EMPTY(&iwucq->cmpl_generated)) - irdma_remove_cmpls_list(iwucq); irdma_process_resize_list(iwucq, NULL); ret = ibv_cmd_destroy_cq(cq); if (ret) @@ -1016,15 +877,6 @@ __irdma_upoll_cq(struct irdma_ucq *iwucq, int num_entries, while (npolled < num_entries) { ret = irdma_poll_one(&iwucq->cq, cur_cqe, entry ? entry + npolled : NULL); - if (ret == ENOENT) { - ret = irdma_generated_cmpls(iwucq, cur_cqe); - if (!ret) { - if (entry) - irdma_process_cqe(entry + npolled, cur_cqe); - else - irdma_process_cqe_ext(cur_cqe); - } - } if (!ret) { ++npolled; cq_new_cqe = true; @@ -1710,14 +1562,7 @@ irdma_umodify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, int attr_mask) return ret; } else { - int ret; - - ret = ibv_cmd_modify_qp(qp, attr, attr_mask, &cmd, sizeof(cmd)); - if (ret) - return ret; - if (attr_mask & IBV_QP_STATE && attr->qp_state == IBV_QPS_ERR) - pthread_create(&iwuqp->flush_thread, NULL, irdma_flush_thread, iwuqp); - return 0; + return ibv_cmd_modify_qp(qp, attr, attr_mask, &cmd, sizeof(cmd)); } } @@ -1770,10 +1615,6 @@ irdma_udestroy_qp(struct ibv_qp *qp) int ret; iwuqp = container_of(qp, struct irdma_uqp, ibv_qp); - if (iwuqp->flush_thread) { - pthread_cancel(iwuqp->flush_thread); - pthread_join(iwuqp->flush_thread, NULL); - } ret = pthread_spin_destroy(&iwuqp->lock); if (ret) goto err; From nobody Wed Sep 13 22:27:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmFSP34hzz4t42s; Wed, 13 Sep 2023 22:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmFSP2nnpz4L7f; Wed, 13 Sep 2023 22:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694644037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4xR/8vq4uEzlTELkj9JacZ4uneUqiJhXH8uBRXdGSU=; b=Gavt3U+97DiuQ6eRJR9WWJfSCQGJISB7Pept/MTR5V2w8EZp7Td1lH4EMhmK3/kCg2WaXn ug1MSOM7WZFrljnX/YhgejVsMY7AY/5tP4ZLjTqzR4qijfw5IdafSfhn+5IwBUFRh9gJ1t QIRHoT8575wVFWRrIIhheJgTsawTyyL7lmBRxygdN/WWHVqJk3LUtsmixwv1A9HO4Prz8p aK5XPIQXP/2H+llEw/+mJPQ2+nxqH1RFogTseDYm/MAEysUCvOAv31hXdvBxv4Ttu9QmyP qbxMPBK5A/Z+D7jXZe7BYWhuKZsTqUVZx2AwV1szZud2TO4yuentSQhqcahyPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694644037; a=rsa-sha256; cv=none; b=CdHufpzkHjdxp2MNf6xoh3zPQZpDRUfcMwu4iNTdq9iMd7EskqETQugmmZZQgqXH6Vb1eh PgOCxC93OtBGlqaoVXVJJAlV6LXn9eMaXW1c6YO/uM8fyT+M+ZYVyM5JnIftyukj5UJ7Zt UxHwbOocae/+B2o9ITV60sUlbm3VPatbBSVXEjh4j9zJZHjzNipBVFc6bMbwifGoK8iUnA rSleHhrATgo/p1iFQi/nqjA3f1Eqzv3y5xhe+X79O5aN4OjbywoY0gttwOEAKmS3gFW++3 1oVhrB+8npwRkFQRzxDGOBMS15kRQAQIcF2cPTUgkQIds5mKYKompSEvDDX0gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694644037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4xR/8vq4uEzlTELkj9JacZ4uneUqiJhXH8uBRXdGSU=; b=Gi4bBlfCg4RfMwNGsFeRM5xBoxUWNbe3v1Z7gG+Hf/NxOw4skEtQhxOjI1oBR7FTHusUXM 2q3qHGKUy66cSAlybOC8ImIYRQAoJclq8H7A2A9wrC3fHfQZiNiqMOFxP/CpmTtBouMuzc fsEnkFZsd1yl1F6Lyk+8sTonbo+LTkhq37Yy1eFTGVBLkWW7tcTsPs24eN1apzbpZyn0N9 tCy0UDhfZXyuMWXtihcoRImwH7YHqqjMisWmx8akS6ssqEIKcgbogEjY9DLPHDyjEYP7pL nQM2GabroHgqnhMXBqumfEEUXYMXzPEnluWF0GWFHjOhXHh5iIL9YyDK7iHXqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmFSP1sX5zXZZ; Wed, 13 Sep 2023 22:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DMRHXU029251; Wed, 13 Sep 2023 22:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DMRHOi029248; Wed, 13 Sep 2023 22:27:17 GMT (envelope-from git) Date: Wed, 13 Sep 2023 22:27:17 GMT Message-Id: <202309132227.38DMRHOi029248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 9c30461dd25b - main - ice(4): Update to 1.38.16-k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c30461dd25bac49045acbeac10e00b6cc13d2bc Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=9c30461dd25bac49045acbeac10e00b6cc13d2bc commit 9c30461dd25bac49045acbeac10e00b6cc13d2bc Author: Eric Joyner AuthorDate: 2023-08-24 23:26:13 +0000 Commit: Eric Joyner CommitDate: 2023-09-13 22:26:54 +0000 ice(4): Update to 1.38.16-k New features - Add sysctl "link_active_on_if_down" (defaults to 1 to match previous behavior): set this to 0 to have the driver bring the physical link down when the interface is brought administratively down - Add sysctl "temp" to read chip temperature on E810 devices; this requires a 4.30 or newer NVM (see package sysutils/intel-nvmupdate-100g) Bug fixes and general changes - (linked to irdma) properly propagate PF reset request from irdma driver - (linked to irdma) properly notify irdma of an impending PF reset - (linked to irdma) move Protocol Engine error handling to irdma - Print log message when using a DDP that doesn't support the "TX balancing" mode - Block LLDP agent configuration when DSCP QoS mode is enabled - Fix kernel panic when updating NVM when adapter is in the "TX balancing" mode - Remove ice_sbq_cmd.h since it's unused - Fix LLDP RX filter to still allow LLDP frames to be received by SW after a PF reset in SW LLDP mode - Add ice_if_needs_restart handler in order to fix a bad VLAN and link down interaction - Issue PF reset during unload - nvmupdate process fixes - Use pci_msix_table_bar() to get MSI-X bar index at runtime instead of hardcoding it Signed-off-by: Eric Joyner Reviewed by: anzhu@netapp.com MFC after: 3 days Sponsored by: Intel Corporation, NetApp Differential Revision: https://reviews.freebsd.org/D41655 --- sys/dev/ice/ice_adminq_cmd.h | 123 ++++++---- sys/dev/ice/ice_common.c | 490 +++++++++++++++++++++------------------- sys/dev/ice/ice_common.h | 6 +- sys/dev/ice/ice_controlq.c | 110 ++++----- sys/dev/ice/ice_controlq.h | 3 - sys/dev/ice/ice_dcb.c | 2 +- sys/dev/ice/ice_ddp_common.c | 4 + sys/dev/ice/ice_ddp_common.h | 1 + sys/dev/ice/ice_defs.h | 4 +- sys/dev/ice/ice_features.h | 2 + sys/dev/ice/ice_flow.c | 41 +++- sys/dev/ice/ice_flow.h | 6 +- sys/dev/ice/ice_fw_logging.c | 4 +- sys/dev/ice/ice_fwlog.c | 1 + sys/dev/ice/ice_lan_tx_rx.h | 1 - sys/dev/ice/ice_lib.c | 239 ++++++++++++++++++-- sys/dev/ice/ice_lib.h | 16 +- sys/dev/ice/ice_rdma.c | 16 ++ sys/dev/ice/ice_rdma.h | 80 ++++++- sys/dev/ice/ice_rdma_internal.h | 17 ++ sys/dev/ice/ice_sbq_cmd.h | 120 ---------- sys/dev/ice/ice_sched.c | 104 +++++++-- sys/dev/ice/ice_sched.h | 42 +++- sys/dev/ice/ice_strings.c | 4 + sys/dev/ice/ice_switch.c | 334 +++++++++++++++------------ sys/dev/ice/ice_switch.h | 86 ++++--- sys/dev/ice/ice_type.h | 112 ++++++++- sys/dev/ice/if_ice_iflib.c | 130 +++++++++-- sys/dev/ice/irdma_di_if.m | 5 + sys/dev/ice/irdma_if.m | 4 + sys/dev/ice/virtchnl.h | 2 +- 31 files changed, 1360 insertions(+), 749 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 710830e95a16..e4dc14b0162c 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -168,6 +168,7 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_LED 0x0061 #define ICE_AQC_CAPS_SDP 0x0062 #define ICE_AQC_CAPS_WR_CSR_PROT 0x0064 +#define ICE_AQC_CAPS_SENSOR_READING 0x0067 #define ICE_AQC_CAPS_LOGI_TO_PHYSI_PORT_MAP 0x0073 #define ICE_AQC_CAPS_SKU 0x0074 #define ICE_AQC_CAPS_PORT_MAP 0x0075 @@ -180,7 +181,8 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_EXT_TOPO_DEV_IMG3 0x0084 #define ICE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE 0x0085 #define ICE_AQC_CAPS_NAC_TOPOLOGY 0x0087 -#define ICE_AQC_CAPS_DYN_FLATTENING 0x0090 +#define ICE_AQC_CAPS_DYN_FLATTENING 0x008A +#define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE 0x0090 #define ICE_AQC_CAPS_ROCEV2_LAG 0x0092 u8 major_ver; @@ -793,12 +795,30 @@ struct ice_aqc_sw_rules { __le32 addr_low; }; +/* Add switch rule response: + * Content of return buffer is same as the input buffer. The status field and + * LUT index are updated as part of the response + */ +struct ice_aqc_sw_rules_elem_hdr { + __le16 type; /* Switch rule type, one of T_... */ +#define ICE_AQC_SW_RULES_T_LKUP_RX 0x0 +#define ICE_AQC_SW_RULES_T_LKUP_TX 0x1 +#define ICE_AQC_SW_RULES_T_LG_ACT 0x2 +#define ICE_AQC_SW_RULES_T_VSI_LIST_SET 0x3 +#define ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR 0x4 +#define ICE_AQC_SW_RULES_T_PRUNE_LIST_SET 0x5 +#define ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR 0x6 + __le16 status; +}; + /* Add/Update/Get/Remove lookup Rx/Tx command/response entry * This structures describes the lookup rules and associated actions. "index" * is returned as part of a response to a successful Add command, and can be * used to identify the rule for Update/Get/Remove commands. */ struct ice_sw_rule_lkup_rx_tx { + struct ice_aqc_sw_rules_elem_hdr hdr; + __le16 recipe_id; #define ICE_SW_RECIPE_LOGICAL_PORT_FWD 10 /* Source port for LOOKUP_RX and source VSI in case of LOOKUP_TX */ @@ -877,14 +897,17 @@ struct ice_sw_rule_lkup_rx_tx { * lookup-type */ __le16 hdr_len; - u8 hdr[STRUCT_HACK_VAR_LEN]; + u8 hdr_data[STRUCT_HACK_VAR_LEN]; }; +#pragma pack(1) /* Add/Update/Remove large action command/response entry * "index" is returned as part of a response to a successful Add command, and * can be used to identify the action for Update/Get/Remove commands. */ struct ice_sw_rule_lg_act { + struct ice_aqc_sw_rules_elem_hdr hdr; + __le16 index; /* Index in large action table */ __le16 size; /* Max number of large actions */ @@ -939,50 +962,30 @@ struct ice_sw_rule_lg_act { #define ICE_LG_ACT_STAT_COUNT_M (0x7F << ICE_LG_ACT_STAT_COUNT_S) __le32 act[STRUCT_HACK_VAR_LEN]; /* array of size for actions */ }; +#pragma pack() +#pragma pack(1) /* Add/Update/Remove VSI list command/response entry * "index" is returned as part of a response to a successful Add command, and * can be used to identify the VSI list for Update/Get/Remove commands. */ struct ice_sw_rule_vsi_list { + struct ice_aqc_sw_rules_elem_hdr hdr; + __le16 index; /* Index of VSI/Prune list */ __le16 number_vsi; __le16 vsi[STRUCT_HACK_VAR_LEN]; /* Array of number_vsi VSI numbers */ }; +#pragma pack() #pragma pack(1) /* Query VSI list command/response entry */ struct ice_sw_rule_vsi_list_query { __le16 index; - ice_declare_bitmap(vsi_list, ICE_MAX_VSI); + u8 vsi_list[DIVIDE_AND_ROUND_UP(ICE_MAX_VSI, BITS_PER_BYTE)]; }; #pragma pack() -#pragma pack(1) -/* Add switch rule response: - * Content of return buffer is same as the input buffer. The status field and - * LUT index are updated as part of the response - */ -struct ice_aqc_sw_rules_elem { - __le16 type; /* Switch rule type, one of T_... */ -#define ICE_AQC_SW_RULES_T_LKUP_RX 0x0 -#define ICE_AQC_SW_RULES_T_LKUP_TX 0x1 -#define ICE_AQC_SW_RULES_T_LG_ACT 0x2 -#define ICE_AQC_SW_RULES_T_VSI_LIST_SET 0x3 -#define ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR 0x4 -#define ICE_AQC_SW_RULES_T_PRUNE_LIST_SET 0x5 -#define ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR 0x6 - __le16 status; - union { - struct ice_sw_rule_lkup_rx_tx lkup_tx_rx; - struct ice_sw_rule_lg_act lg_act; - struct ice_sw_rule_vsi_list vsi_list; - struct ice_sw_rule_vsi_list_query vsi_list_query; - } pdata; -}; - -#pragma pack() - /* PFC Ignore (direct 0x0301) * The command and response use the same descriptor structure */ @@ -994,8 +997,8 @@ struct ice_aqc_pfc_ignore { u8 reserved[14]; }; -/* Set PFC Mode (direct 0x0303) - * Query PFC Mode (direct 0x0302) +/* Query PFC Mode (direct 0x0302) + * Set PFC Mode (direct 0x0303) */ struct ice_aqc_set_query_pfc_mode { u8 pfc_mode; @@ -1098,9 +1101,9 @@ struct ice_aqc_txsched_elem { u8 generic; #define ICE_AQC_ELEM_GENERIC_MODE_M 0x1 #define ICE_AQC_ELEM_GENERIC_PRIO_S 0x1 -#define ICE_AQC_ELEM_GENERIC_PRIO_M (0x7 << ICE_AQC_ELEM_GENERIC_PRIO_S) +#define ICE_AQC_ELEM_GENERIC_PRIO_M (0x7 << ICE_AQC_ELEM_GENERIC_PRIO_S) #define ICE_AQC_ELEM_GENERIC_SP_S 0x4 -#define ICE_AQC_ELEM_GENERIC_SP_M (0x1 << ICE_AQC_ELEM_GENERIC_SP_S) +#define ICE_AQC_ELEM_GENERIC_SP_M (0x1 << ICE_AQC_ELEM_GENERIC_SP_S) #define ICE_AQC_ELEM_GENERIC_ADJUST_VAL_S 0x5 #define ICE_AQC_ELEM_GENERIC_ADJUST_VAL_M \ (0x3 << ICE_AQC_ELEM_GENERIC_ADJUST_VAL_S) @@ -1673,6 +1676,32 @@ struct ice_aqc_set_mac_lb { u8 reserved[15]; }; +/* Get sensor reading (direct 0x0632) */ +struct ice_aqc_get_sensor_reading { + u8 sensor; +#define ICE_AQC_INT_TEMP_SENSOR 0x0 + u8 format; +#define ICE_AQC_INT_TEMP_FORMAT 0x0 + u8 reserved[6]; + __le32 addr_high; + __le32 addr_low; +}; + +/* Get sensor reading response (direct 0x0632) */ +struct ice_aqc_get_sensor_reading_resp { + union { + u8 raw[8]; + /* Output data for sensor 0x00, format 0x00 */ + struct { + s8 temp; + u8 temp_warning_threshold; + u8 temp_critical_threshold; + u8 temp_fatal_threshold; + u8 reserved[4]; + } s0f0; + } data; +}; + /* DNL Get Status command (indirect 0x0680) * Structure used for the response, the command uses the generic * ice_aqc_generic struct to pass a buffer address to the FW. @@ -2476,6 +2505,19 @@ struct ice_aqc_get_set_rss_keys { u8 extended_hash_key[ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE]; }; +enum ice_lut_type { + ICE_LUT_VSI = 0, + ICE_LUT_PF = 1, + ICE_LUT_GLOBAL = 2, + ICE_LUT_TYPE_MASK = 3 +}; + +enum ice_lut_size { + ICE_LUT_VSI_SIZE = 64, + ICE_LUT_GLOBAL_SIZE = 512, + ICE_LUT_PF_SIZE = 2048, +}; + /* Get/Set RSS LUT (indirect 0x0B05/0x0B03) */ struct ice_aqc_get_set_rss_lut { #define ICE_AQC_GSET_RSS_LUT_VSI_VALID BIT(15) @@ -2484,21 +2526,13 @@ struct ice_aqc_get_set_rss_lut { __le16 vsi_id; #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S 0 #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M \ - (0x3 << ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S) - -#define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_VSI 0 -#define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF 1 -#define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_GLOBAL 2 + (ICE_LUT_TYPE_MASK << ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S) #define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S 2 #define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M \ - (0x3 << ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) + (ICE_LUT_TYPE_MASK << ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) -#define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128 128 -#define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128_FLAG 0 -#define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512 512 #define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512_FLAG 1 -#define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K 2048 #define ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K_FLAG 2 #define ICE_AQC_GSET_RSS_LUT_GLOBAL_IDX_S 4 @@ -2686,7 +2720,7 @@ struct ice_aqc_move_rdma_qset_buffer { }; /* Download Package (indirect 0x0C40) */ -/* Also used for Update Package (indirect 0x0C42 and 0x0C41) */ +/* Also used for Update Package (indirect 0x0C41 and 0x0C42) */ struct ice_aqc_download_pkg { u8 flags; #define ICE_AQC_DOWNLOAD_PKG_LAST_BUF 0x01 @@ -2989,6 +3023,8 @@ struct ice_aq_desc { struct ice_aqc_get_phy_caps get_phy; struct ice_aqc_set_phy_cfg set_phy; struct ice_aqc_restart_an restart_an; + struct ice_aqc_get_sensor_reading get_sensor_reading; + struct ice_aqc_get_sensor_reading_resp get_sensor_reading_resp; struct ice_aqc_dnl_get_status get_status; struct ice_aqc_dnl_run_command dnl_run; struct ice_aqc_dnl_call_command dnl_call; @@ -3239,6 +3275,7 @@ enum ice_adminq_opc { ice_aqc_opc_get_link_status = 0x0607, ice_aqc_opc_set_event_mask = 0x0613, ice_aqc_opc_set_mac_lb = 0x0620, + ice_aqc_opc_get_sensor_reading = 0x0632, ice_aqc_opc_dnl_get_status = 0x0680, ice_aqc_opc_dnl_run = 0x0681, ice_aqc_opc_dnl_call = 0x0682, diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index a3f50f251533..0df73583e137 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -343,6 +343,88 @@ ice_aq_manage_mac_read(struct ice_hw *hw, void *buf, u16 buf_size, return ICE_SUCCESS; } +/** + * ice_phy_maps_to_media + * @phy_type_low: PHY type low bits + * @phy_type_high: PHY type high bits + * @media_mask_low: media type PHY type low bitmask + * @media_mask_high: media type PHY type high bitmask + * + * Return true if PHY type [low|high] bits are only of media type PHY types + * [low|high] bitmask. + */ +static bool +ice_phy_maps_to_media(u64 phy_type_low, u64 phy_type_high, + u64 media_mask_low, u64 media_mask_high) +{ + /* check if a PHY type exist for media type */ + if (!(phy_type_low & media_mask_low || + phy_type_high & media_mask_high)) + return false; + + /* check that PHY types are only of media type */ + if (!(phy_type_low & ~media_mask_low) && + !(phy_type_high & ~media_mask_high)) + return true; + + return false; +} + +/** + * ice_set_media_type - Sets media type + * @pi: port information structure + * + * Set ice_port_info PHY media type based on PHY type. This should be called + * from Get PHY caps with media. + */ +static void ice_set_media_type(struct ice_port_info *pi) +{ + enum ice_media_type *media_type; + u64 phy_type_high, phy_type_low; + + phy_type_high = pi->phy.phy_type_high; + phy_type_low = pi->phy.phy_type_low; + media_type = &pi->phy.media_type; + + /* if no media, then media type is NONE */ + if (!(pi->phy.link_info.link_info & ICE_AQ_MEDIA_AVAILABLE)) + *media_type = ICE_MEDIA_NONE; + /* else if PHY types are only BASE-T, then media type is BASET */ + else if (ice_phy_maps_to_media(phy_type_low, phy_type_high, + ICE_MEDIA_BASET_PHY_TYPE_LOW_M, 0)) + *media_type = ICE_MEDIA_BASET; + /* else if any PHY type is BACKPLANE, then media type is BACKPLANE */ + else if (phy_type_low & ICE_MEDIA_BP_PHY_TYPE_LOW_M || + phy_type_high & ICE_MEDIA_BP_PHY_TYPE_HIGH_M) + *media_type = ICE_MEDIA_BACKPLANE; + /* else if PHY types are only optical, or optical and C2M, then media + * type is FIBER + */ + else if (ice_phy_maps_to_media(phy_type_low, phy_type_high, + ICE_MEDIA_OPT_PHY_TYPE_LOW_M, 0) || + (phy_type_low & ICE_MEDIA_OPT_PHY_TYPE_LOW_M && + phy_type_low & ICE_MEDIA_C2M_PHY_TYPE_LOW_M)) + *media_type = ICE_MEDIA_FIBER; + /* else if PHY types are only DA, or DA and C2C, then media type DA */ + else if (ice_phy_maps_to_media(phy_type_low, phy_type_high, + ICE_MEDIA_DAC_PHY_TYPE_LOW_M, 0) || + (phy_type_low & ICE_MEDIA_DAC_PHY_TYPE_LOW_M && + (phy_type_low & ICE_MEDIA_C2C_PHY_TYPE_LOW_M || + phy_type_high & ICE_MEDIA_C2C_PHY_TYPE_HIGH_M))) + *media_type = ICE_MEDIA_DA; + /* else if PHY types are only C2M or only C2C, then media is AUI */ + else if (ice_phy_maps_to_media(phy_type_low, phy_type_high, + ICE_MEDIA_C2M_PHY_TYPE_LOW_M, + ICE_MEDIA_C2M_PHY_TYPE_HIGH_M) || + ice_phy_maps_to_media(phy_type_low, phy_type_high, + ICE_MEDIA_C2C_PHY_TYPE_LOW_M, + ICE_MEDIA_C2C_PHY_TYPE_HIGH_M)) + *media_type = ICE_MEDIA_AUI; + + else + *media_type = ICE_MEDIA_UNKNOWN; +} + /** * ice_aq_get_phy_caps - returns PHY capabilities * @pi: port information structure @@ -434,6 +516,9 @@ ice_aq_get_phy_caps(struct ice_port_info *pi, bool qual_mods, u8 report_mode, ice_memcpy(pi->phy.link_info.module_type, &pcaps->module_type, sizeof(pi->phy.link_info.module_type), ICE_NONDMA_TO_NONDMA); + ice_set_media_type(pi); + ice_debug(hw, ICE_DBG_LINK, "%s: media_type = 0x%x\n", prefix, + pi->phy.media_type); } return status; @@ -513,156 +598,6 @@ ice_find_netlist_node(struct ice_hw *hw, u8 node_type_ctx, u8 node_part_number, return ICE_ERR_DOES_NOT_EXIST; } -/** - * ice_is_media_cage_present - * @pi: port information structure - * - * Returns true if media cage is present, else false. If no cage, then - * media type is backplane or BASE-T. - */ -static bool ice_is_media_cage_present(struct ice_port_info *pi) -{ - struct ice_aqc_get_link_topo *cmd; - struct ice_aq_desc desc; - - cmd = &desc.params.get_link_topo; - - ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_link_topo); - - cmd->addr.topo_params.node_type_ctx = - (ICE_AQC_LINK_TOPO_NODE_CTX_PORT << - ICE_AQC_LINK_TOPO_NODE_CTX_S); - - /* set node type */ - cmd->addr.topo_params.node_type_ctx |= - (ICE_AQC_LINK_TOPO_NODE_TYPE_M & - ICE_AQC_LINK_TOPO_NODE_TYPE_CAGE); - - /* Node type cage can be used to determine if cage is present. If AQC - * returns error (ENOENT), then no cage present. If no cage present then - * connection type is backplane or BASE-T. - */ - return ice_aq_get_netlist_node(pi->hw, cmd, NULL, NULL); -} - -/** - * ice_get_media_type - Gets media type - * @pi: port information structure - */ -static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) -{ - struct ice_link_status *hw_link_info; - - if (!pi) - return ICE_MEDIA_UNKNOWN; - - hw_link_info = &pi->phy.link_info; - if (hw_link_info->phy_type_low && hw_link_info->phy_type_high) - /* If more than one media type is selected, report unknown */ - return ICE_MEDIA_UNKNOWN; - - if (hw_link_info->phy_type_low) { - /* 1G SGMII is a special case where some DA cable PHYs - * may show this as an option when it really shouldn't - * be since SGMII is meant to be between a MAC and a PHY - * in a backplane. Try to detect this case and handle it - */ - if (hw_link_info->phy_type_low == ICE_PHY_TYPE_LOW_1G_SGMII && - (hw_link_info->module_type[ICE_AQC_MOD_TYPE_IDENT] == - ICE_AQC_MOD_TYPE_BYTE1_SFP_PLUS_CU_ACTIVE || - hw_link_info->module_type[ICE_AQC_MOD_TYPE_IDENT] == - ICE_AQC_MOD_TYPE_BYTE1_SFP_PLUS_CU_PASSIVE)) - return ICE_MEDIA_DA; - - switch (hw_link_info->phy_type_low) { - case ICE_PHY_TYPE_LOW_1000BASE_SX: - case ICE_PHY_TYPE_LOW_1000BASE_LX: - case ICE_PHY_TYPE_LOW_10GBASE_SR: - case ICE_PHY_TYPE_LOW_10GBASE_LR: - case ICE_PHY_TYPE_LOW_25GBASE_SR: - case ICE_PHY_TYPE_LOW_25GBASE_LR: - case ICE_PHY_TYPE_LOW_40GBASE_SR4: - case ICE_PHY_TYPE_LOW_40GBASE_LR4: - case ICE_PHY_TYPE_LOW_50GBASE_SR2: - case ICE_PHY_TYPE_LOW_50GBASE_LR2: - case ICE_PHY_TYPE_LOW_50GBASE_SR: - case ICE_PHY_TYPE_LOW_50GBASE_FR: - case ICE_PHY_TYPE_LOW_50GBASE_LR: - case ICE_PHY_TYPE_LOW_100GBASE_SR4: - case ICE_PHY_TYPE_LOW_100GBASE_LR4: - case ICE_PHY_TYPE_LOW_100GBASE_SR2: - case ICE_PHY_TYPE_LOW_100GBASE_DR: - return ICE_MEDIA_FIBER; - case ICE_PHY_TYPE_LOW_10G_SFI_AOC_ACC: - case ICE_PHY_TYPE_LOW_25G_AUI_AOC_ACC: - case ICE_PHY_TYPE_LOW_40G_XLAUI_AOC_ACC: - case ICE_PHY_TYPE_LOW_50G_LAUI2_AOC_ACC: - case ICE_PHY_TYPE_LOW_50G_AUI2_AOC_ACC: - case ICE_PHY_TYPE_LOW_50G_AUI1_AOC_ACC: - case ICE_PHY_TYPE_LOW_100G_CAUI4_AOC_ACC: - case ICE_PHY_TYPE_LOW_100G_AUI4_AOC_ACC: - return ICE_MEDIA_FIBER; - case ICE_PHY_TYPE_LOW_100BASE_TX: - case ICE_PHY_TYPE_LOW_1000BASE_T: - case ICE_PHY_TYPE_LOW_2500BASE_T: - case ICE_PHY_TYPE_LOW_5GBASE_T: - case ICE_PHY_TYPE_LOW_10GBASE_T: - case ICE_PHY_TYPE_LOW_25GBASE_T: - return ICE_MEDIA_BASET; - case ICE_PHY_TYPE_LOW_10G_SFI_DA: - case ICE_PHY_TYPE_LOW_25GBASE_CR: - case ICE_PHY_TYPE_LOW_25GBASE_CR_S: - case ICE_PHY_TYPE_LOW_25GBASE_CR1: - case ICE_PHY_TYPE_LOW_40GBASE_CR4: - case ICE_PHY_TYPE_LOW_50GBASE_CR2: - case ICE_PHY_TYPE_LOW_50GBASE_CP: - case ICE_PHY_TYPE_LOW_100GBASE_CR4: - case ICE_PHY_TYPE_LOW_100GBASE_CR_PAM4: - case ICE_PHY_TYPE_LOW_100GBASE_CP2: - return ICE_MEDIA_DA; - case ICE_PHY_TYPE_LOW_25G_AUI_C2C: - case ICE_PHY_TYPE_LOW_40G_XLAUI: - case ICE_PHY_TYPE_LOW_50G_LAUI2: - case ICE_PHY_TYPE_LOW_50G_AUI2: - case ICE_PHY_TYPE_LOW_50G_AUI1: - case ICE_PHY_TYPE_LOW_100G_AUI4: - case ICE_PHY_TYPE_LOW_100G_CAUI4: - if (ice_is_media_cage_present(pi)) - return ICE_MEDIA_AUI; - /* fall-through */ - case ICE_PHY_TYPE_LOW_1000BASE_KX: - case ICE_PHY_TYPE_LOW_2500BASE_KX: - case ICE_PHY_TYPE_LOW_2500BASE_X: - case ICE_PHY_TYPE_LOW_5GBASE_KR: - case ICE_PHY_TYPE_LOW_10GBASE_KR_CR1: - case ICE_PHY_TYPE_LOW_10G_SFI_C2C: - case ICE_PHY_TYPE_LOW_25GBASE_KR: - case ICE_PHY_TYPE_LOW_25GBASE_KR1: - case ICE_PHY_TYPE_LOW_25GBASE_KR_S: - case ICE_PHY_TYPE_LOW_40GBASE_KR4: - case ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4: - case ICE_PHY_TYPE_LOW_50GBASE_KR2: - case ICE_PHY_TYPE_LOW_100GBASE_KR4: - case ICE_PHY_TYPE_LOW_100GBASE_KR_PAM4: - return ICE_MEDIA_BACKPLANE; - } - } else { - switch (hw_link_info->phy_type_high) { - case ICE_PHY_TYPE_HIGH_100G_AUI2: - case ICE_PHY_TYPE_HIGH_100G_CAUI2: - if (ice_is_media_cage_present(pi)) - return ICE_MEDIA_AUI; - /* fall-through */ - case ICE_PHY_TYPE_HIGH_100GBASE_KR2_PAM4: - return ICE_MEDIA_BACKPLANE; - case ICE_PHY_TYPE_HIGH_100G_CAUI2_AOC_ACC: - case ICE_PHY_TYPE_HIGH_100G_AUI2_AOC_ACC: - return ICE_MEDIA_FIBER; - } - } - return ICE_MEDIA_UNKNOWN; -} - #define ice_get_link_status_datalen(hw) ICE_GET_LINK_STATUS_DATALEN_V1 /** @@ -681,7 +616,6 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, struct ice_aqc_get_link_status_data link_data = { 0 }; struct ice_aqc_get_link_status *resp; struct ice_link_status *li_old, *li; - enum ice_media_type *hw_media_type; struct ice_fc_info *hw_fc_info; bool tx_pause, rx_pause; struct ice_aq_desc desc; @@ -694,7 +628,6 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, hw = pi->hw; li_old = &pi->phy.link_info_old; - hw_media_type = &pi->phy.media_type; li = &pi->phy.link_info; hw_fc_info = &pi->fc; @@ -716,7 +649,6 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, li->link_speed = LE16_TO_CPU(link_data.link_speed); li->phy_type_low = LE64_TO_CPU(link_data.phy_type_low); li->phy_type_high = LE64_TO_CPU(link_data.phy_type_high); - *hw_media_type = ice_get_media_type(pi); li->link_info = link_data.link_info; li->link_cfg_err = link_data.link_cfg_err; li->an_info = link_data.an_info; @@ -747,7 +679,6 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, (unsigned long long)li->phy_type_low); ice_debug(hw, ICE_DBG_LINK, " phy_type_high = 0x%llx\n", (unsigned long long)li->phy_type_high); - ice_debug(hw, ICE_DBG_LINK, " media_type = 0x%x\n", *hw_media_type); ice_debug(hw, ICE_DBG_LINK, " link_info = 0x%x\n", li->link_info); ice_debug(hw, ICE_DBG_LINK, " link_cfg_err = 0x%x\n", li->link_cfg_err); ice_debug(hw, ICE_DBG_LINK, " an_info = 0x%x\n", li->an_info); @@ -1066,7 +997,8 @@ enum ice_status ice_init_hw(struct ice_hw *hw) if (status) goto err_unroll_cqinit; - hw->port_info = (struct ice_port_info *) + if (!hw->port_info) + hw->port_info = (struct ice_port_info *) ice_malloc(hw, sizeof(*hw->port_info)); if (!hw->port_info) { status = ICE_ERR_NO_MEMORY; @@ -1205,7 +1137,7 @@ void ice_deinit_hw(struct ice_hw *hw) */ enum ice_status ice_check_reset(struct ice_hw *hw) { - u32 cnt, reg = 0, grst_timeout, uld_mask; + u32 cnt, reg = 0, grst_timeout, uld_mask, reset_wait_cnt; /* Poll for Device Active state in case a recent CORER, GLOBR, * or EMPR has occurred. The grst delay value is in 100ms units. @@ -1237,8 +1169,10 @@ enum ice_status ice_check_reset(struct ice_hw *hw) uld_mask = ICE_RESET_DONE_MASK | (hw->func_caps.common_cap.iwarp ? GLNVM_ULD_PE_DONE_M : 0); + reset_wait_cnt = ICE_PF_RESET_WAIT_COUNT; + /* Device is Active; check Global Reset processes are done */ - for (cnt = 0; cnt < ICE_PF_RESET_WAIT_COUNT; cnt++) { + for (cnt = 0; cnt < reset_wait_cnt; cnt++) { reg = rd32(hw, GLNVM_ULD) & uld_mask; if (reg == uld_mask) { ice_debug(hw, ICE_DBG_INIT, "Global reset processes done. %d\n", cnt); @@ -1247,7 +1181,7 @@ enum ice_status ice_check_reset(struct ice_hw *hw) ice_msec_delay(10, true); } - if (cnt == ICE_PF_RESET_WAIT_COUNT) { + if (cnt == reset_wait_cnt) { ice_debug(hw, ICE_DBG_INIT, "Wait for Reset Done timed out. GLNVM_ULD = 0x%x\n", reg); return ICE_ERR_RESET_FAILED; @@ -1265,7 +1199,7 @@ enum ice_status ice_check_reset(struct ice_hw *hw) */ static enum ice_status ice_pf_reset(struct ice_hw *hw) { - u32 cnt, reg; + u32 cnt, reg, reset_wait_cnt, cfg_lock_timeout; /* If at function entry a global reset was already in progress, i.e. * state is not 'device active' or any of the reset done bits are not @@ -1290,8 +1224,10 @@ static enum ice_status ice_pf_reset(struct ice_hw *hw) * timeout plus the PFR timeout which will account for a possible reset * that is occurring during a download package operation. */ - for (cnt = 0; cnt < ICE_GLOBAL_CFG_LOCK_TIMEOUT + - ICE_PF_RESET_WAIT_COUNT; cnt++) { + reset_wait_cnt = ICE_PF_RESET_WAIT_COUNT; + cfg_lock_timeout = ICE_GLOBAL_CFG_LOCK_TIMEOUT; + + for (cnt = 0; cnt < cfg_lock_timeout + reset_wait_cnt; cnt++) { reg = rd32(hw, PFGEN_CTRL); if (!(reg & PFGEN_CTRL_PFSWR_M)) break; @@ -1299,7 +1235,7 @@ static enum ice_status ice_pf_reset(struct ice_hw *hw) ice_msec_delay(1, true); } - if (cnt == ICE_PF_RESET_WAIT_COUNT) { + if (cnt == cfg_lock_timeout + reset_wait_cnt) { ice_debug(hw, ICE_DBG_INIT, "PF reset polling failed to complete.\n"); return ICE_ERR_RESET_FAILED; } @@ -2452,6 +2388,11 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, true : false; ice_debug(hw, ICE_DBG_INIT, "%s: nvm_unified_update = %d\n", prefix, caps->nvm_unified_update); + caps->netlist_auth = + (number & ICE_NVM_MGMT_NETLIST_AUTH_SUPPORT) ? + true : false; + ice_debug(hw, ICE_DBG_INIT, "%s: netlist_auth = %d\n", prefix, + caps->netlist_auth); break; case ICE_AQC_CAPS_CEM: caps->mgmt_cem = (number == 1); @@ -2534,6 +2475,8 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, (phys_id & ICE_EXT_TOPO_DEV_IMG_LOAD_EN) != 0; caps->ext_topo_dev_img_prog_en[index] = (phys_id & ICE_EXT_TOPO_DEV_IMG_PROG_EN) != 0; + caps->ext_topo_dev_img_ver_schema[index] = + (phys_id & ICE_EXT_TOPO_DEV_IMG_VER_SCHEMA) != 0; ice_debug(hw, ICE_DBG_INIT, "%s: ext_topo_dev_img_ver_high[%d] = %d\n", prefix, index, @@ -2554,6 +2497,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, "%s: ext_topo_dev_img_prog_en[%d] = %d\n", prefix, index, caps->ext_topo_dev_img_prog_en[index]); + ice_debug(hw, ICE_DBG_INIT, + "%s: ext_topo_dev_img_ver_schema[%d] = %d\n", + prefix, index, + caps->ext_topo_dev_img_ver_schema[index]); break; } case ICE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE: @@ -2564,6 +2511,11 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: dyn_flattening_en = %d\n", prefix, caps->dyn_flattening_en); break; + case ICE_AQC_CAPS_OROM_RECOVERY_UPDATE: + caps->orom_recovery_update = (number == 1); + ice_debug(hw, ICE_DBG_INIT, "%s: orom_recovery_update = %d\n", + prefix, caps->orom_recovery_update); + break; default: /* Not one of the recognized common capabilities */ found = false; @@ -2782,6 +2734,26 @@ ice_parse_nac_topo_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, dev_p->nac_topo.id); } +/** + * ice_parse_sensor_reading_cap - Parse ICE_AQC_CAPS_SENSOR_READING cap + * @hw: pointer to the HW struct + * @dev_p: pointer to device capabilities structure + * @cap: capability element to parse + * + * Parse ICE_AQC_CAPS_SENSOR_READING for device capability for reading + * enabled sensors. + */ +static void +ice_parse_sensor_reading_cap(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, + struct ice_aqc_list_caps_elem *cap) +{ + dev_p->supported_sensors = LE32_TO_CPU(cap->number); + + ice_debug(hw, ICE_DBG_INIT, + "dev caps: supported sensors (bitmap) = 0x%x\n", + dev_p->supported_sensors); +} + /** * ice_parse_dev_caps - Parse device capabilities * @hw: pointer to the HW struct @@ -2827,6 +2799,9 @@ ice_parse_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, case ICE_AQC_CAPS_NAC_TOPOLOGY: ice_parse_nac_topo_dev_caps(hw, dev_p, &cap_resp[i]); break; + case ICE_AQC_CAPS_SENSOR_READING: + ice_parse_sensor_reading_cap(hw, dev_p, &cap_resp[i]); + break; default: /* Don't list common capabilities as unknown */ if (!found) @@ -3776,8 +3751,10 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg, break; case ICE_FEC_DIS_AUTO: /* Set No FEC and auto FEC */ - if (!ice_fw_supports_fec_dis_auto(hw)) - return ICE_ERR_NOT_SUPPORTED; + if (!ice_fw_supports_fec_dis_auto(hw)) { + status = ICE_ERR_NOT_SUPPORTED; + goto out; + } cfg->link_fec_opt |= ICE_AQC_PHY_FEC_DIS; /* fall-through */ case ICE_FEC_AUTO: @@ -3852,6 +3829,7 @@ enum ice_status ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link, struct ice_sq_cd *cd) { + enum ice_status status = ICE_ERR_AQ_ERROR; struct ice_aqc_restart_an *cmd; struct ice_aq_desc desc; @@ -3866,7 +3844,16 @@ ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link, else cmd->cmd_flags &= ~ICE_AQC_RESTART_AN_LINK_ENABLE; - return ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd); + status = ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd); + if (status) + return status; + + if (ena_link) + pi->phy.curr_user_phy_cfg.caps |= ICE_AQC_PHY_EN_LINK; + else + pi->phy.curr_user_phy_cfg.caps &= ~ICE_AQC_PHY_EN_LINK; + + return ICE_SUCCESS; } /** @@ -4062,6 +4049,51 @@ ice_aq_read_topo_dev_nvm(struct ice_hw *hw, return ICE_SUCCESS; } +static u16 ice_lut_type_to_size(u16 lut_type) +{ + switch (lut_type) { + case ICE_LUT_VSI: + return ICE_LUT_VSI_SIZE; + case ICE_LUT_GLOBAL: + return ICE_LUT_GLOBAL_SIZE; + case ICE_LUT_PF: + return ICE_LUT_PF_SIZE; + default: + return 0; + } +} + +static u16 ice_lut_size_to_flag(u16 lut_size) +{ + u16 f = 0; + + switch (lut_size) { + case ICE_LUT_GLOBAL_SIZE: + f = ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512_FLAG; + break; + case ICE_LUT_PF_SIZE: + f = ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K_FLAG; + break; + default: + break; + } + return f << ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S; +} + +int ice_lut_size_to_type(int lut_size) +{ + switch (lut_size) { + case ICE_LUT_VSI_SIZE: + return ICE_LUT_VSI; + case ICE_LUT_GLOBAL_SIZE: + return ICE_LUT_GLOBAL; + case ICE_LUT_PF_SIZE: + return ICE_LUT_PF; + default: + return -1; + } +} + /** * __ice_aq_get_set_rss_lut * @hw: pointer to the hardware structure @@ -4073,7 +4105,7 @@ ice_aq_read_topo_dev_nvm(struct ice_hw *hw, static enum ice_status __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params *params, bool set) { - u16 flags = 0, vsi_id, lut_type, lut_size, glob_lut_idx, vsi_handle; + u16 flags, vsi_id, lut_type, lut_size, glob_lut_idx = 0, vsi_handle; struct ice_aqc_get_set_rss_lut *cmd_resp; struct ice_aq_desc desc; enum ice_status status; @@ -4084,16 +4116,22 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params vsi_handle = params->vsi_handle; lut = params->lut; + lut_type = params->lut_type; + lut_size = ice_lut_type_to_size(lut_type); + cmd_resp = &desc.params.get_set_rss_lut; + if (lut_type == ICE_LUT_GLOBAL) + glob_lut_idx = params->global_lut_id; - if (!ice_is_vsi_valid(hw, vsi_handle) || !lut) + if (!lut || !lut_size || !ice_is_vsi_valid(hw, vsi_handle)) return ICE_ERR_PARAM; - lut_size = params->lut_size; - lut_type = params->lut_type; - glob_lut_idx = params->global_lut_id; - vsi_id = ice_get_hw_vsi_num(hw, vsi_handle); + if (lut_size > params->lut_size) + return ICE_ERR_INVAL_SIZE; - cmd_resp = &desc.params.get_set_rss_lut; + if (set && lut_size != params->lut_size) + return ICE_ERR_PARAM; + + vsi_id = ice_get_hw_vsi_num(hw, vsi_handle); if (set) { ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_rss_lut); @@ -4107,61 +4145,15 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params ICE_AQC_GSET_RSS_LUT_VSI_ID_M) | ICE_AQC_GSET_RSS_LUT_VSI_VALID); - switch (lut_type) { - case ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_VSI: - case ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF: - case ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_GLOBAL: - flags |= ((lut_type << ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S) & - ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M); - break; - default: - status = ICE_ERR_PARAM; - goto ice_aq_get_set_rss_lut_exit; - } - - if (lut_type == ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_GLOBAL) { - flags |= ((glob_lut_idx << ICE_AQC_GSET_RSS_LUT_GLOBAL_IDX_S) & - ICE_AQC_GSET_RSS_LUT_GLOBAL_IDX_M); + flags = ice_lut_size_to_flag(lut_size) | + ((lut_type << ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S) & + ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M) | + ((glob_lut_idx << ICE_AQC_GSET_RSS_LUT_GLOBAL_IDX_S) & + ICE_AQC_GSET_RSS_LUT_GLOBAL_IDX_M); - if (!set) - goto ice_aq_get_set_rss_lut_send; - } else if (lut_type == ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF) { - if (!set) - goto ice_aq_get_set_rss_lut_send; - } else { - goto ice_aq_get_set_rss_lut_send; - } - - /* LUT size is only valid for Global and PF table types */ - switch (lut_size) { - case ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128: - flags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128_FLAG << - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) & - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M; - break; - case ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512: - flags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512_FLAG << - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) & - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M; - break; - case ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K: - if (lut_type == ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF) { - flags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K_FLAG << - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) & - ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M; - break; - } - /* fall-through */ - default: - status = ICE_ERR_PARAM; - goto ice_aq_get_set_rss_lut_exit; - } - -ice_aq_get_set_rss_lut_send: cmd_resp->flags = CPU_TO_LE16(flags); status = ice_aq_send_cmd(hw, &desc, lut, lut_size, NULL); - -ice_aq_get_set_rss_lut_exit: + params->lut_size = LE16_TO_CPU(desc.datalen); return status; } @@ -5155,7 +5147,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle, q_ctx->q_teid = LE32_TO_CPU(node.node_teid); /* add a leaf node into scheduler tree queue layer */ - status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node); + status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node, NULL); if (!status) status = ice_sched_replay_q_bw(pi, q_ctx); @@ -5390,7 +5382,7 @@ ice_ena_vsi_rdma_qset(struct ice_port_info *pi, u16 vsi_handle, u8 tc, for (i = 0; i < num_qsets; i++) { node.node_teid = buf->rdma_qsets[i].qset_teid; status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, - &node); + &node, NULL); *** 3424 LINES SKIPPED *** From nobody Thu Sep 14 07:22:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmTKR0y3Mz4tgG7; Thu, 14 Sep 2023 07:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmTKR0WB0z3WSP; Thu, 14 Sep 2023 07:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694676123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MutLbhSx+YhUj5O3k16mp82jAmY4XKIqLqd96pRdNGQ=; b=gknXaB4P5MnIL06XUnQ4tiY1QuA8enh7Q3m6neaJXWknoT3uc+Fe/Jyxqk4i/obWki0Y9I P4TKJRL/hj1MfFnMv61gUOwFFGhltK3KgsmE6omNYTLmHzKPcAcAVT9ogITYeERCOv09T0 p25joEAmtwEdrgx0gbIcUaTWDKbGlD3hFr935QxAjSu6zVd/IAOZRUvlFPeeKFrul/J7m1 SX9cwjKldrQrGgDw6+0wblYRn0DNKvU5Cq4CmX4ESu2pYbuzjodO2NFOViU3ClnaBZQ6Vd 7ohJox/zIBYDyLW1KWh6+SXwxwvKQx03oK1iE4fFwl+xe3N6U9M/g5jcwTMHww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694676123; a=rsa-sha256; cv=none; b=IrByh7m1n244EIdm0QlKYb3Lo9pBV/vP1Yz1e0CWVUaxZUAcL80M6Bps7SGT+sWn3L3Guw GKg+23FsC72Q2vRkv+StdQnNl+OBhXyvfmOvyEbVmflFBMQKerxpMWZJiG0szdmqxwlaN6 w+S3D9Xb/ff+RfxCRZXajb+MhXLRZnVYI1MDGRlK+4m6EqHpYvpPJMXRdDGps81NY+Tfdz vIGTmahg4vABb/4gk8ZV8GXKPP8E/4tFgEft42wW+Z9BueDhT2m9Wji28DGqaL/3ZRnvQL Izxr31PIVLYfzUr+7CMmWU35wndjLbZlQtkeNGOUT4qUgYMLOTrq410nZDJR/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694676123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MutLbhSx+YhUj5O3k16mp82jAmY4XKIqLqd96pRdNGQ=; b=PyCuKeOgwXCA9YMXnhfll3Dl4lqSQmj8ud5FnHjgAV2KhZnsOBJJibTnFJLUJsF0IORdEL CxNSio5ujn9Z1PFQnqrakx7lhMhh3k7/8OvniPKNl02fMiE3iDmL1lQe0vSmgYksr7LTCL 5IYIc2LZFrVj9e7DY7SSK+FB+MOaqMFoanbCP/MbFwBdOZ8lHJSWB2XYr0kPKxg/+AzF7i +Gh3x0KhZnd6Jc0JrRpRl1aEcR0s0zIdaGTOJ+3yx+8HSWvCO0mD8W80AkXGezrnS/W+3e atBbZnRyYs0Igpom70kp7f+s/dnr0l3Z3pZdzKHOohjOWCGHz95cXssDSMx+JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmTKQ6N6Jznjt; Thu, 14 Sep 2023 07:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E7M2Mq023528; Thu, 14 Sep 2023 07:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7M2tN023525; Thu, 14 Sep 2023 07:22:02 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:22:02 GMT Message-Id: <202309140722.38E7M2tN023525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: e7a9817b8d32 - main - Hyper-V: vmbus: implementat bus_get_dma_tag in vmbus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7a9817b8d328dda04069b65944ce2ed6f54c6f0 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a9817b8d328dda04069b65944ce2ed6f54c6f0 commit e7a9817b8d328dda04069b65944ce2ed6f54c6f0 Author: Souradeep Chakrabarti AuthorDate: 2023-09-14 07:11:25 +0000 Commit: Wei Hu CommitDate: 2023-09-14 07:11:25 +0000 Hyper-V: vmbus: implementat bus_get_dma_tag in vmbus In ARM64 Hyper-V UFS filesystem is getting corruption and those corruptions are consistently happening just after hitting a page boundary. It is unable to correctly read disk blocks into buffers that are not aligned to 512-byte boundaries. It happens because storvsc needs physically contiguous memory which may not be the case when bus_dma needs to create a bounce buffer. This can happen when the destination is not cache-line aligned. Hyper-V VMs have VMbus synthetic devices and PCI pass-thru devices that are added dynamically via the VMbus protocol and are not represented in the ACPI DSDT. Only the top level VMbus node exists in the DSDT. As such, on ARM64 these devices don't pick up coherence information and default to not hardware coherent. PR: 267654, 272666 Reviewed by: andrew, whu Tested by: lwhsu MFC after: 3 days Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D41728 --- sys/dev/hyperv/vmbus/vmbus.c | 33 +++++++++++++++++++++++++++++++++ sys/dev/hyperv/vmbus/vmbus_var.h | 1 + 2 files changed, 34 insertions(+) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index e0f7bbc99ca7..ee412e643b4f 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -137,6 +137,7 @@ static void vmbus_intr_teardown(struct vmbus_softc *); static int vmbus_doattach(struct vmbus_softc *); static void vmbus_event_proc_dummy(struct vmbus_softc *, int); +static bus_dma_tag_t vmbus_get_dma_tag(device_t parent, device_t child); static struct vmbus_softc *vmbus_sc; SYSCTL_NODE(_hw, OID_AUTO, vmbus, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, @@ -183,6 +184,7 @@ static device_method_t vmbus_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_get_cpus, bus_generic_get_cpus), + DEVMETHOD(bus_get_dma_tag, vmbus_get_dma_tag), /* pcib interface */ DEVMETHOD(pcib_alloc_msi, vmbus_alloc_msi), @@ -219,6 +221,13 @@ vmbus_get_softc(void) return vmbus_sc; } +static bus_dma_tag_t +vmbus_get_dma_tag(device_t dev, device_t child) +{ + struct vmbus_softc *sc = vmbus_get_softc(); + return (sc->dmat); +} + void vmbus_msghc_reset(struct vmbus_msghc *mh, size_t dsize) { @@ -1382,6 +1391,9 @@ vmbus_doattach(struct vmbus_softc *sc) struct sysctl_oid_list *child; struct sysctl_ctx_list *ctx; int ret; + device_t dev_res; + ACPI_HANDLE handle; + unsigned int coherent; if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) return (0); @@ -1402,6 +1414,27 @@ vmbus_doattach(struct vmbus_softc *sc) sizeof(struct vmbus_channel *) * VMBUS_CHAN_MAX, M_DEVBUF, M_WAITOK | M_ZERO); + /* Coherency attribute */ + dev_res = devclass_get_device(devclass_find("vmbus_res"), 0); + handle = acpi_get_handle(dev_res); + + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) + coherent = 0; + if (bootverbose) + device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n", + coherent ? "" : " not"); + + bus_dma_tag_create(bus_get_dma_tag(sc->vmbus_dev), + 1, 0, + BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, + NULL, NULL, + BUS_SPACE_MAXSIZE, + BUS_SPACE_UNRESTRICTED, + BUS_SPACE_MAXSIZE, + coherent ? BUS_DMA_COHERENT : 0, + NULL, NULL, + &sc->dmat); /* * Create context for "post message" Hypercalls */ diff --git a/sys/dev/hyperv/vmbus/vmbus_var.h b/sys/dev/hyperv/vmbus/vmbus_var.h index f6fc875deb32..023d27c52cea 100644 --- a/sys/dev/hyperv/vmbus/vmbus_var.h +++ b/sys/dev/hyperv/vmbus/vmbus_var.h @@ -129,6 +129,7 @@ struct vmbus_softc { void *icookie; int vector; #endif + bus_dma_tag_t dmat; }; #define VMBUS_FLAG_ATTACHED 0x0001 /* vmbus was attached */ From nobody Thu Sep 14 07:49:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmTxM2Jtbz4sbM8; Thu, 14 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmTxM1GYtz3dCZ; Thu, 14 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQRD2anfiWQN5YDFkI4B9YMMW/p1gyIeBJleAeZ5ovo=; b=pn5XRe7nRfNyJrRHzVj5s7rH/VJ7ZuqgqPJPdDKMVFI/54Vh7JceF0QydiRqkqyCf17JIq uy/+9OoygUouKYe90TvnEE4u97ePVVyIZgFk54/jiatf/oGc9NyaQXXlpUFVWztCYuir+q +1ZlROLfOtdrtJJIrQGt8yJREGZ+z+XxgQoUKzpkM4yBkvtWK8XqlbdG8/Ejp46W+bwL3k Fmx4BL/gCj+gjGMb0/nCQQVG9anwTIPvRjeqz/nG9X3om3ZfFETQRMUSrUWQ+pYQC881aX vnR9hExIeZVmeyUMSiw+qAb6Q8bFuDgu9C6knp8NFfD/7enoEgO5pLO0dLGlIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694677783; a=rsa-sha256; cv=none; b=bFFfSqSxv13jGF98EApvriytTJXR/fUtYGh+QoO9+cBwmcfNPvQYjNl60f7+F4TzvL3LnT uOuoUhw1eUIzeD/Ttvu5fJkaN5Hm2Icb2zhzVPlESUJ0E76C93VU9qoxq+CX04zdTiqwn5 RPaCAHk/PV1z9yugy52i6cQfZ0TqfWUSJHoGHMIUP8Sof3x+QT25r3iaXFks07/yHeUtxK gPC8oBT14DOksslLLg8HYuV8r4I8rTLkOEHTZBc6AiCofA3EIKtAuhgYHAqZbyy19srVFI UdGzPinQhKgGbAfeqmTG7It4f7zORE6Sl833VuRljyf3Dzb8+2OIU2dRQEfS/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQRD2anfiWQN5YDFkI4B9YMMW/p1gyIeBJleAeZ5ovo=; b=vC1yJMilIbkbplgOEFA4yX/GJRmkCXjsiY5HZaZ//cRiY/VoAXjI/OICDh41VwYBYye9os jsbAc6v0ZyLJTRTszG6zmuLFNJuOLUIeV8cggW4mv+/Fo5UC1V+sAg6463z2mGcF/eknXm AVdO6JX8AXoFjTV7lX9KP0XLzRqYLxHCFoGW38PPzZQckPBvfrhmqr3A6IkSek3bEBkSX3 f/NmjhUiAoxl6o3Bw3+SeHggfRBRY09bakocsWRWGEF4EULioXf2+9WcikPVPFwT7Q0GZ7 Z0Sr083jvbJm0oeyaHATwFNynfl0xdVsEn3oEQTtUsVDBWqACgfX+a+4y603+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmTxM0LDbzpGh; Thu, 14 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E7ngru059208; Thu, 14 Sep 2023 07:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7nggO059204; Thu, 14 Sep 2023 07:49:42 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:49:42 GMT Message-Id: <202309140749.38E7nggO059204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ffaa91929f2d - releng/14.0 - qat: Intel 4xxx Series driver API extension List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ffaa91929f2d30fb78ba36c768e975ecfe28124a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffaa91929f2d30fb78ba36c768e975ecfe28124a commit ffaa91929f2d30fb78ba36c768e975ecfe28124a Author: Piotr Kasierski AuthorDate: 2023-09-06 13:51:41 +0000 Commit: Mark Johnston CommitDate: 2023-09-14 07:49:18 +0000 qat: Intel 4xxx Series driver API extension This commit introduces: - Quick Assist API update for partial decompress and zero padding. - Refactor of UIO locking. - VF driver hotplug fix. - Minor code style fixes for firmware API. Patch co-authored by: Krzysztof Zdziarski Patch co-authored by: Michal Gulbicki Patch co-authored by: Piotr Kasierski Patch co-authored by: Karol Grzadziel Approved by: re (delphij) Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41613 (cherry picked from commit 22cf89c938886d14f5796fc49f9f020c23ea8eaf) (cherry picked from commit c265e6217951b8bf71dbf59832e06d9f2c0b0325) --- share/man/man4/qat.4 | 4 +- sys/dev/qat/qat_api/common/compression/dc_dp.c | 296 ++++++++++++- .../common/compression/include/dc_datapath.h | 11 + sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 8 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 18 +- .../qat/qat_api/firmware/include/icp_qat_fw_comp.h | 486 ++++++++++----------- .../qat_api/firmware/include/icp_qat_hw_20_comp.h | 63 ++- .../firmware/include/icp_qat_hw_20_comp_defs.h | 159 ++++++- sys/dev/qat/qat_api/include/dc/cpa_dc.h | 15 +- sys/dev/qat/qat_api/include/dc/cpa_dc_dp.h | 431 ++++++++++++++++++ sys/dev/qat/qat_api/include/icp_sal_versions.h | 2 +- sys/dev/qat/qat_common/adf_ctl_drv.c | 3 +- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 24 +- sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 13 +- sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 5 + sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 18 +- sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 32 +- 17 files changed, 1221 insertions(+), 367 deletions(-) diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 347f257c7aec..b0fa0b0cbc92 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -64,8 +64,8 @@ driver supports cryptography and compression acceleration. A complete API for offloading these operations is exposed in the kernel and may be used by any other entity directly. For details of usage and supported operations and algorithms refer to the -following documentation available from -.Lk 01.org : +following documentation available from Intel Download Center +.Lk https://downloadcenter.intel.com : .Bl -bullet -compact .It .Rs diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c index 1bc50d89365d..8b409d9ad7ca 100644 --- a/sys/dev/qat/qat_api/common/compression/dc_dp.c +++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c @@ -217,6 +217,89 @@ dcDataPlaneParamCheck(const CpaDcDpOpData *pOpData) return CPA_STATUS_SUCCESS; } +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Partial-read parameters validation utility. + * + * @description + * Basic check that all partial-read related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * + *****************************************************************************/ +static CpaStatus +dcDataPlanePartReadCheck(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData) +{ + sal_compression_service_t *pService = NULL; + + LAC_CHECK_NULL_PARAM(pPartReadData); + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_COMPRESS) { + /* Decompression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + if (pPartReadData->length > pOpData->bufferLenForData) { + QAT_UTILS_LOG( + "Partial read data length can not be greater than the destination buffer size\n"); + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} + +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Zero-padding parameters validation utility. + * + * @description + * Basic check that all zero-padding related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * @retval CPA_STATUS_NOT_SUPPORTED Feature not supported + * + *****************************************************************************/ +static CpaStatus +dcDataPlaneZeroPadCheck(CpaDcDpOpData *pOpData) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_DECOMPRESS) { + /* Compression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} CpaStatus cpaDcDpGetSessionSize(CpaInstanceHandle dcInstance, CpaDcSessionSetupData *pSessionData, @@ -379,8 +462,60 @@ dcDpWriteRingMsg(CpaDcDpOpData *pOpData, icp_qat_fw_comp_req_t *pCurrentQatMsg) pCurrentQatMsg->comp_pars.out_buffer_sz = pOpData->bufferLenForData; } -CpaStatus -cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +/** + ***************************************************************************** + * @ingroup cpaDcDp + * + * @description + * Updates the request decryptor with optional parameters: + * - partial read specific fields + * - zero-padding specific field + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * @param[in] zeroPadFlag Boolean indicator containing the + * zero-padding enablement flag. + * @param[in] pCurrentQatMsg Pointer to current QAT message on the ring. + * + *****************************************************************************/ +static void +dcDpUpdateRingMsg(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + icp_qat_fw_comp_req_t *pCurrentQatMsg) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + if (!isDcGen4x(pService)) { + return; + } + + /* Partial read settings */ + if (NULL != pPartReadData) { + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_offset = pPartReadData->dataOffset; + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_length = pPartReadData->length; + ICP_QAT_FW_COMP_PART_DECOMP_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_PART_DECOMP); + } + /* Zero padding settings */ + if (CPA_TRUE == zeroPadFlag) { + ICP_QAT_FW_COMP_ZEROPAD_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_ZEROPAD); + } +} + +static CpaStatus +dcDpEnqueueOpBase(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -392,6 +527,20 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) return status; } + if (NULL != pPartReadData) { + status = dcDataPlanePartReadCheck(pOpData, pPartReadData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + if ((CPA_FALSE == pOpData->compressAndVerify) && (CPA_DC_DIR_COMPRESS == pOpData->sessDirection)) { return CPA_STATUS_UNSUPPORTED; @@ -422,6 +571,13 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } dcDpWriteRingMsg(pOpData, pCurrentQatMsg); + if (NULL != pPartReadData || CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData, + pPartReadData, + zeroPadFlag, + pCurrentQatMsg); + } + pSessionDesc->pendingDpStatelessCbCount++; if (CPA_TRUE == performOpNow) { @@ -432,9 +588,36 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } CpaStatus -cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, - CpaDcDpOpData *pOpData[], - const CpaBoolean performOpNow) +cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +{ + + return dcDpEnqueueOpBase(pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartRead(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, + pPartReadData, + CPA_FALSE, + performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPad(CpaDcDpOpData *pOpData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, NULL, CPA_TRUE, performOpNow); +} + +static CpaStatus +dcDpEnqueueOpBatchBase(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartData[], + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -462,6 +645,21 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return status; } + if (NULL != pPartData) { + status = + dcDataPlanePartReadCheck(pOpData[i], pPartData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + /* Check that all instance handles and session handles are the * same */ if (pOpData[i]->dcInstance != pOpData[0]->dcInstance) { @@ -516,6 +714,18 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, for (i = 0; i < numberRequests; i++) { dcDpWriteRingMsg(pOpData[i], pCurrentQatMsg); + if (pPartData) { + dcDpUpdateRingMsg(pOpData[i], + pPartData[i], + CPA_FALSE, + pCurrentQatMsg); + } + if (CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData[i], + NULL, + CPA_TRUE, + pCurrentQatMsg); + } icp_adf_getQueueNext(trans_handle, (void **)&pCurrentQatMsg); } @@ -528,6 +738,34 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return CPA_STATUS_SUCCESS; } +CpaStatus +cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartReadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartReadData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, pPartReadData, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_TRUE, performOpNow); +} + CpaStatus icp_sal_DcPollDpInstance(CpaInstanceHandle dcInstance, Cpa32U responseQuota) { @@ -565,3 +803,51 @@ cpaDcDpPerformOpNow(CpaInstanceHandle dcInstance) return CPA_STATUS_SUCCESS; } + +CpaStatus +cpaDcDpIsPartReadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_part_read; + + return CPA_STATUS_SUCCESS; +} + +CpaStatus +cpaDcDpIsZeroPadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_zero_pad; + + return CPA_STATUS_SUCCESS; +} diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h index 5bcff65c4fb3..58fb56f3c8ae 100644 --- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h +++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h @@ -196,4 +196,15 @@ typedef enum dc_cnv_mode_s { /* CNV = TRUE, CNVNR = TRUE */ } dc_cnv_mode_t; +/* Type to access extended features bit fields */ +typedef struct dc_extended_features_s { + unsigned is_cnv : 1; /* Bit<0> */ + unsigned padding : 7; + unsigned is_cnvnr : 1; /* Bit<8> */ + unsigned reserved : 2; + unsigned is_part_read : 1; /* Bit<11> */ + unsigned is_zero_pad : 1; /* Bit<12> */ + unsigned not_used : 19; +} dc_extd_ftrs_t; + #endif /* DC_DATAPATH_H_ */ diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c index f0e8d28949ff..c0f5a411d87e 100644 --- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c +++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c @@ -52,14 +52,6 @@ /* C string null terminator size */ #define SAL_NULL_TERM_SIZE 1 -/* Type to access extended features bit fields */ -typedef struct dc_extended_features_s { - unsigned is_cnv : 1; /* Bit<0> */ - unsigned padding : 7; - unsigned is_cnvnr : 1; /* Bit<8> */ - unsigned not_used : 23; -} dc_extd_ftrs_t; - /* * Prints statistics for a compression instance */ diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h index 28dfeff6579e..b4d1f5829ba2 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h @@ -1386,21 +1386,9 @@ typedef struct icp_qat_fw_comn_resp_s { /**< Error Code constant value for submission of empty dynamic stored block to * slice */ -#define ERR_CODE_EXCEED_MAX_REQ_TIME -24 -/**< Error Code constant for exceeding max request time */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_HANDLE -20 -/**< Error Code constant for invalid handle in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_HMAC_FAILED -21 -/**< Error Code constant for failed hmac in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_WRAPPING_ALGO -22 -/**< Error Code constant for invalid wrapping algo in kpt crypto service */ - -#define ERR_CODE_KPT_DRNG_SEED_NOT_LOAD -23 -/**< Error Code constant for no drng seed is not loaded in kpt ecdsa signrs -/service */ +#define ERR_CODE_REGION_OUT_OF_BOUNDS -21 +/**< Error returned when decompression ends before the specified partial + * decompression region was produced */ #define ERR_CODE_MISC_ERROR -50 /**< Error Code constant for error detected but the source diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h index 5edf7022ee1d..fe1b7ad55de8 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h @@ -47,6 +47,7 @@ typedef enum { } icp_qat_fw_comp_cmd_id_t; + /* * REQUEST FLAGS IN COMMON COMPRESSION * In common message it is named as SERVICE SPECIFIC FLAGS. @@ -64,7 +65,8 @@ typedef enum { * are don't care. i.e., these features are removed from QAT 2.0. */ -/** Flag usage */ + +/**< Flag usage */ #define ICP_QAT_FW_COMP_STATELESS_SESSION 0 /**< @ingroup icp_qat_fw_comp @@ -108,7 +110,7 @@ typedef enum { * Flag representing secure RAM from being used as * an intermediate buffer is ENABLED. */ -/** Flag mask & bit position */ +/**< Flag mask & bit position */ #define ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS 2 /**< @ingroup icp_qat_fw_comp @@ -148,7 +150,7 @@ typedef enum { #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS 7 /**< @ingroup icp_qat_fw_comp * Starting bit position for flag used to disable secure ram from - * being used as an intermediate buffer. */ + being used as an intermediate buffer. */ #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK 0x1 /**< @ingroup icp_qat_fw_comp @@ -170,7 +172,7 @@ typedef enum { * @ret_uncomp RetUnCompressed * @secure_ram Secure Ram usage * - *********************************************************************************/ + ******************************************************************************/ #define ICP_QAT_FW_COMP_FLAGS_BUILD( \ sesstype, autoselect, enhanced_asb, ret_uncomp, secure_ram) \ (((sesstype & ICP_QAT_FW_COMP_SESSION_TYPE_MASK) \ @@ -215,7 +217,7 @@ typedef enum { * * @param flags Flags to extract the session type bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SESSION_TYPE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS, \ @@ -230,7 +232,7 @@ typedef enum { * * @param flags Flags to extract the autoSelectBest bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_AUTO_SELECT_BEST_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_AUTO_SELECT_BEST_BITPOS, \ @@ -245,7 +247,7 @@ typedef enum { * * @param flags Flags to extract the enhanced asb bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_EN_ASB_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_ENHANCED_AUTO_SELECT_BEST_BITPOS, \ @@ -260,7 +262,7 @@ typedef enum { * * @param flags Flags to extract the Ret Uncomp bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_RET_UNCOMP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_RET_DISABLE_TYPE0_HEADER_DATA_BITPOS, \ @@ -275,21 +277,21 @@ typedef enum { * * @param flags Flags to extract the Secure Ram usage from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SECURE_RAM_USE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK) /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression header cd pars block * @description * Definition of the compression processing cd pars block. * The structure is a service-specific implementation of the common * structure. - ******************************************************************************/ + *****************************************************************************/ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { /**< LWs 2-5 */ struct { @@ -301,15 +303,10 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint8_t content_desc_params_sz; /**< Size of the content descriptor parameters in quad words. - * These - * parameters describe the session setup configuration info for - * the - * slices that this request relies upon i.e. the configuration - * word and - * cipher key needed by the cipher slice if there is a request - * for - * cipher - * processing. */ + * These parameters describe the session setup configuration + * info for the slices that this request relies upon i.e. the + * configuration word and cipher key needed by the cipher slice + * if there is a request for cipher processing. */ uint8_t content_desc_hdr_resrvd2; /**< Content descriptor reserved field */ @@ -324,28 +321,28 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint32_t content_desc_resrvd4; /**< Content descriptor reserved field */ + } sl; } icp_qat_fw_comp_req_hdr_cd_pars_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression request parameters block * @description * Definition of the compression processing request parameters block. * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 14-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_req_params_s { /**< LW 14 */ uint32_t comp_len; /**< Size of input to process in bytes Note: Only EOP requests can be - * odd - * for decompression. IA must set LSB to zero for odd sized intermediate - * inputs */ + * odd for decompression. IA must set LSB to zero for odd sized + * intermediate inputs */ /**< LW 15 */ uint32_t out_buffer_sz; @@ -368,10 +365,10 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< CRC data structure pointer */ } crc; - /** LW 18 */ + /**< LW 18 */ uint32_t req_par_flags; - /** LW 19 */ + /**< LW 19 */ uint32_t rsrvd; } icp_qat_fw_comp_req_params_t; @@ -394,8 +391,10 @@ typedef struct icp_qat_fw_comp_req_params_s { * @param cnvnr Whether internal CNV recovery is to be performed * * ICP_QAT_FW_COMP_NO_CNV_RECOVERY * * ICP_QAT_FW_COMP_CNV_RECOVERY + * @param cnvdfx Whether CNV error injection is to be performed + * * ICP_QAT_FW_COMP_NO_CNV_DFX + * * ICP_QAT_FW_COMP_CNV_DFX * @param crc CRC Mode Flag - 0 legacy, 1 crc data struct - * *****************************************************************************/ #define ICP_QAT_FW_COMP_REQ_PARAM_FLAGS_BUILD( \ sop, eop, bfinal, cnv, cnvnr, cnvdfx, crc) \ @@ -411,21 +410,64 @@ typedef struct icp_qat_fw_comp_req_params_s { ((crc & ICP_QAT_FW_COMP_CRC_MODE_MASK) \ << ICP_QAT_FW_COMP_CRC_MODE_BITPOS)) + +/* + * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION + * + * +=====+-----+----- + --- + --- +-----+ --- + ----- + --- + ---- + -- + -- + + * | Bit |31-24| 20 | 19 | 18 | 17 | 16 | 15-7 | 6 | 5-2 | 1 | 0 | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + * |Flags|Resvd|xxHash| CRC | CNV |CNVNR| CNV | Resvd |BFin | Resvd|EOP |SOP | + * | |=0 |acc | MODE| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + */ + + +/** +***************************************************************************** +* @ingroup icp_qat_fw_comp +* Definition of the additional QAT2.0 Compression command types +* @description +* Enumeration which is used to indicate the ids of functions +* that are exposed by the Compression QAT FW service +* +*****************************************************************************/ +typedef enum { + ICP_QAT_FW_COMP_20_CMD_LZ4_COMPRESS = 3, + /*!< LZ4 Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4_DECOMPRESS = 4, + /*!< LZ4 Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_COMPRESS = 5, + /*!< LZ4S Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_DECOMPRESS = 6, + /*!< LZ4S Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_XP10_COMPRESS = 7, + /*!< XP10 Compress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_XP10_DECOMPRESS = 8, + /*!< XP10 Decompress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_DELIMITER + /**< Delimiter type */ + +} icp_qat_fw_comp_20_cmd_id_t; + + /* * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION * - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + - * --- + - * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 - * | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + - * | Flags | Resvd | CRC |Resvd| CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | - * SOP | - * | | =0 | Mode| =0 | | | =0 | | =0 | | | - * | | | | | | | | | | | | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + --- + + * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + + * | Flags | Resvd | CRC | CNV | CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | SOP | + * | | =0 | Mode| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + */ #define ICP_QAT_FW_COMP_NOT_SOP 0 @@ -434,15 +476,15 @@ typedef struct icp_qat_fw_comp_req_params_s { #define ICP_QAT_FW_COMP_SOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS Start of Packet */ + * * Flag representing that a request IS Start of Packet */ #define ICP_QAT_FW_COMP_NOT_EOP 0 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request is NOT Start of Packet */ + * Flag representing that a request is NOT Start of Packet */ #define ICP_QAT_FW_COMP_EOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS End of Packet */ + * Flag representing that a request IS End of Packet */ #define ICP_QAT_FW_COMP_NOT_BFINAL 0 /**< @ingroup icp_qat_fw_comp @@ -484,6 +526,30 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Flag representing to use the external CRC data struct */ +#define ICP_QAT_FW_COMP_NO_XXHASH_ACC 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash will NOT be accumulated across requests */ + +#define ICP_QAT_FW_COMP_XXHASH_ACC 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash WILL be accumulated across requests */ + +#define ICP_QAT_FW_COMP_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_NO_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_ZEROPAD 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform zero-padding in compression request */ + +#define ICP_QAT_FW_COMP_NO_ZEROPAD 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform zero-padding in compression request */ + #define ICP_QAT_FW_COMP_SOP_BITPOS 0 /**< @ingroup icp_qat_fw_comp * Starting bit position for SOP */ @@ -516,14 +582,6 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Starting bit position for the CNV bit */ -#define ICP_QAT_FW_COMP_CNV_RECOVERY_MASK 0x1 -/**< @ingroup icp_qat_fw_comp - * One bit mask for the CNV Recovery bit */ - -#define ICP_QAT_FW_COMP_CNV_RECOVERY_BITPOS 17 -/**< @ingroup icp_qat_fw_comp - * Starting bit position for the CNV Recovery bit */ - #define ICP_QAT_FW_COMP_CNVNR_MASK 0x1 /**< @ingroup icp_qat_fw_comp * One bit mask for the CNV Recovery bit */ @@ -556,6 +614,22 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * One bit mask used to determine xxHash accumulate mode */ +#define ICP_QAT_FW_COMP_PART_DECOMP_BITPOS 27 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress bit */ + +#define ICP_QAT_FW_COMP_PART_DECOMP_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress mask */ + +#define ICP_QAT_FW_COMP_ZEROPAD_BITPOS 26 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad bit */ + +#define ICP_QAT_FW_COMP_ZEROPAD_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad mask */ + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -565,7 +639,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the SOP bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SOP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SOP_BITPOS, \ @@ -585,8 +659,9 @@ typedef struct icp_qat_fw_comp_req_params_s { QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_EOP_BITPOS, \ ICP_QAT_FW_COMP_EOP_MASK) - /** + + ****************************************************************************** * @ingroup icp_qat_fw_comp * @@ -595,7 +670,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the bfinal bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_BFINAL_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_BFINAL_BITPOS, \ @@ -663,6 +738,70 @@ typedef struct icp_qat_fw_comp_req_params_s { ICP_QAT_FW_COMP_XXHASH_ACC_MODE_BITPOS, \ ICP_QAT_FW_COMP_XXHASH_ACC_MODE_MASK) +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the partial de-compress on/off bit + * + * @param flags Flags to extract the partial de-compress on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the partial de-compress on/off bit + * + * @param flags Flags to set the partial de-compress on/off bit to + * @param val partial de-compress on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the zero padding on/off bit + * + * @param flags Flags to extract the zero padding on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the zero-padding on/off bit + * + * @param flags Flags to set the zero-padding on/off bit to + * @param val zero-padding on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -670,23 +809,23 @@ typedef struct icp_qat_fw_comp_req_params_s { * @description * Definition of the translator processing request parameters block * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 20-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_xlt_req_params_s { /**< LWs 20-21 */ uint64_t inter_buff_ptr; /**< This field specifies the physical address of an intermediate - * buffer SGL array. The array contains a pair of 64-bit - * intermediate buffer pointers to SGL buffer descriptors, one pair - * per CPM. Please refer to the CPM1.6 Firmware Interface HLD - * specification for more details. - * Placeholder for QAT2.0. */ + * buffer SGL array. The array contains a pair of 64-bit + * intermediate buffer pointers to SGL buffer descriptors, one pair + * per CPM. Please refer to the CPM1.6 Firmware Interface HLD + * specification for more details. */ + } icp_qat_fw_xlt_req_params_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Compression header of the content descriptor block * @description @@ -697,7 +836,7 @@ typedef struct icp_qat_fw_xlt_req_params_s { * cd block, thus differing from the common base content descriptor * structure. * - ******************************************************************************/ + *****************************************************************************/ *** 1568 LINES SKIPPED *** From nobody Thu Sep 14 07:50:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmTyR2yVwz4sbXn; Thu, 14 Sep 2023 07:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmTyR2C2nz3dRc; Thu, 14 Sep 2023 07:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfosmuuHJo84b40Q3fBsU61YxixJ2V6+aLzz7nCd/nM=; b=yZ4Xv9VJUNQmDpQaEbJRVf3KXW7WUjIxwbzsL/zjjGt+m8pxjz3FidYA+Qni3+g70azbzy h1MdtLAiv8ffQkc3S7ND7/PwC7aM3fLV9voEzczp8v2xiGj2fX69sgWB7jW3uRpeuWvqj5 ahEKlQyaiPWdEum67MPoSXu9gMcajEDOwgNfuSftppLaXq/it5ar2M9K5uFw52kpWFFpQy O+lrod8UkkofKuLRYIp2NjxLqHkal8yOrSADDLz68Xg0vSynwaIiDyxnl5lYAMmn/jdySG 8IwW2QndntNqr1tKfjpoS1TProXsGFytcXe+qQy5U/hff5pfO2kJRxxg7qb36A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694677839; a=rsa-sha256; cv=none; b=AVwAzFLjx2+revwsam/YhJoa5oM0igEdzYzXTdSY5bxsUyLYhr7Jm+RG/GSWzinRHwbbCd aMx857fbZ2+ABYTTey6GGqhQhTO6naTxAt7LhJRZp1VrMbRPBcG9+dpdSzHtd0iXx5HEPD X/fo0VCZG+0CHOoG6vz+LLOjvnn60IlBYUXN8xejXfZ08djDtlsVJI8yHkvcG4EINXMTrQ 0sBqDVncd2+AP7CrFPR9si7njlg89TERUkbvVSHUJkzl2geCCy8UPaEiu7WvBoxyrY2GRM MQdAJvTnZeopCcD/yEpt/RTR2eo0I1neppofICehgx9f+qpEmtrK16WCnnIkeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfosmuuHJo84b40Q3fBsU61YxixJ2V6+aLzz7nCd/nM=; b=MqDFNVnsAOx8kaAlgRTiX0ojFarj8gCUr8FWyA4/mWvR1TrsW2qqZDPOIoA6OmTjXp8D61 Nki/UDO2z45e4KwoeqR1kptmF0GiyniiY/JqfvzUfgxXeY/MVVw6/FPHWiWhjuyGec2Htg SiYp9+TfP+1+I7W2q3+ig2GVacPl+XKucbp6AxsPfLL5WkNtYApTX0GwBRkh7bY5hpVD5M 6YMAlW9ZkzSRhWGEjekhOfqlPvryAaXWPQPY4jnVUl5yiZdzS0cBoCk4LVPxMAjiXNf92V j28qXeO41Ve5Z71D0n2/W75oaepc4PDxCMmkiRdp0vfbG97rxl/kEgkXsvtbIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmTyR1F9tzpPp; Thu, 14 Sep 2023 07:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E7od5d067886; Thu, 14 Sep 2023 07:50:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7odkt067884; Thu, 14 Sep 2023 07:50:39 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:50:39 GMT Message-Id: <202309140750.38E7odkt067884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 04ada3cc2b53 - stable/14 - gve: Make LRO work for jumbo packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04ada3cc2b530a5c170ebefa8c28c5625009d37a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04ada3cc2b530a5c170ebefa8c28c5625009d37a commit 04ada3cc2b530a5c170ebefa8c28c5625009d37a Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Mark Johnston CommitDate: 2023-09-14 07:50:15 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41754 (cherry picked from commit 5f62584a9adb7887bae33af617cfa4f43017abf8) --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0)) From nobody Thu Sep 14 08:03:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmVFF4FnZz4sgDZ; Thu, 14 Sep 2023 08:03: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 4RmVFF3nppz4D2Z; Thu, 14 Sep 2023 08:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694678609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9IHlboXwT3gXsHP82OJEbyCUhwnm4jFyVapnc5fMU=; b=tNFw1MzJxfkKNyGxc+JN8fcBdN6HBQcqGgjIo2fupFSAwdqwrshFBDngPZbMQq+dbs5Qxu oDJ2YUx4b319rg7WQ1SOzsHnvYKiCSJ17CeGv+iIwkclvAX3+t9GBZk5h7hu0ONAJTakm9 D9nf32q5uaa1hS6V9AqFL1Xopfbhb+PqnbJgYguCos+U92XUYPynytfXyu55jY3GDB8Oyd G7Wb26wjTVRwzaVngWwxMKY09vmHfWQFKjdtV2E6PxtliLheh8fvAaUoXQ3TLLarkn+Qpg FSen46PgawkRDBYWb5Gy5RgiSxClFTORTswTpTgcUo3BP396FZO3T0VyCq/y7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694678609; a=rsa-sha256; cv=none; b=Xya3j1VhBhu5iMf1xMUdwwbImt1We4OnUrjWpYg8dqR0EzogioegaZQWeGF5qnJo13zlEh VNlYU1QT427VM69O+1V9ORrOZpW7YCsFyqN4ZrG+BnL3J1g3zbiJg7HvNm76aY9lp13ttw VjhmWyFrDaPYGczGdgZUvZFJ88JQG6crDAWnbjWkKTnce3V+WOP+Qxx2O82HAkqfhglhTh E2WRh/tYtGKiSXFyNrb3hPn8W6dbaIH+39+xLAqL1jqHdzVlsOO2N+svlrnA3XhzQGh5Be 8ULeXhIMClTNSZ7TY/xda1KCvnRXJOLrX4AGiItsa2Rn6ZCArAzqNBvGVvNDnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694678609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9IHlboXwT3gXsHP82OJEbyCUhwnm4jFyVapnc5fMU=; b=H5nFUKW+lfs71QKbylyQQ6fYu021oxxNDEpxn0j4Q/a3TiF8zV89J/KU2XeCzvdjZoGeRh kWVLXaYgSDkrHVObJL+z/R7sJaQV1vLaGPooc3u6Q2nY3Ec6AysBiwjE/a6d1hKLG/0XkF /AgkN0yQZI5TmCAEsjzybx5W4xVWuu/QBggxeez2yaVqjyTRlI/Cjp3HzOA1QkcsZk1XtD MJJh5G3AqJNDgG5BczWTfEllL+XAm4JOQUKKhECGE1NHKCrcStS4QIF5uPRtAVR6Vw50N/ cZqI30JqRwcrVJQM5D7guCqGtZF6Zf02E74G/xD2sab37PVO25pfYE5cC0lCzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmVFF2rHCzpJ1; Thu, 14 Sep 2023 08:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E83TIb092893; Thu, 14 Sep 2023 08:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E83Tlq092890; Thu, 14 Sep 2023 08:03:29 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:03:29 GMT Message-Id: <202309140803.38E83Tlq092890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 6d221ee35544 - main - correct FreeBSD release PR: 273690 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d221ee355446a5628c23fbf6c88169602d9f1a1 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=6d221ee355446a5628c23fbf6c88169602d9f1a1 commit 6d221ee355446a5628c23fbf6c88169602d9f1a1 Author: Wolfram Schneider AuthorDate: 2023-09-14 08:03:05 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-14 08:03:05 +0000 correct FreeBSD release PR: 273690 --- share/man/man4/mlx4en.4 | 2 +- share/man/man4/mlx4ib.4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mlx4en.4 b/share/man/man4/mlx4en.4 index ae805426fb00..69d2904508b8 100644 --- a/share/man/man4/mlx4en.4 +++ b/share/man/man4/mlx4en.4 @@ -84,7 +84,7 @@ please email the specific information to The .Nm device driver first appeared in -.Fx 9.x . +.Fx 9.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/mlx4ib.4 b/share/man/man4/mlx4ib.4 index 8e3d1c03d89b..536b8cab5280 100644 --- a/share/man/man4/mlx4ib.4 +++ b/share/man/man4/mlx4ib.4 @@ -84,7 +84,7 @@ please email the specific information to The .Nm device driver first appeared in -.Fx 9.x . +.Fx 9.0 . .Sh AUTHORS .An -nosplit The From nobody Thu Sep 14 08:40:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmW4547X0z4sswn; Thu, 14 Sep 2023 08:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmW453j48z4MHj; Thu, 14 Sep 2023 08:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694680837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/OmM5QsPHqt0ySDL0uL/6o7lA+HBJwJ/cMFIW8qhLQ=; b=s/ur37FYP2Lrj9vt2gzYR5wENc/4xYN8zUdiRExHdHAMX9QDFjCJhlemBtbxQsTaNTfn0+ SiCGEhf5/xCOGOfa0za1lE7lYyeLNM/Ss7C+WwD8/0a0cEi918HqOTURRoX3U/i0b9bff2 +Cm303ca3kF4lH/WldLVECIyRxCiXerKdGwKdWNl+xhWrmbB2nLLFg7f7AmhgPRb2bgYKU SEGgI8Zi0Xi/bSA0R/6PWGJulTLN/lDc+XXUuBh4u81OBDSIZpkPf7vI9vCqZ2pMsaCXbf sb3+Z43s7o6zU1B2wFZxRvJvf0KFUNK/CBtAZXVYP9w3fzMgqBVBPNPzuus1gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694680837; a=rsa-sha256; cv=none; b=O5W6wncbQAmA2NTQyfG84XwCVq8Syh8XX/MYHLOps9g95od0rZLK5tTADNSZY1bZsU57OH 15B+qjFJQZu/rxs/hwHReOPR+vJ+t3vOs9CBEXPriKDDgi69McLE+cviHGFiIr9mjkwVoF GRitJ3qE47vMKzn/v9n2Lif5Lv7LSZlbGxtCapl8TtH6ApbbWQJO++m2dUHJXTYg5Pu5JJ cuzZu0bvDQOIq5thch6b0RCJz7kxke2Mhk4dVn3egV7OP0T5N/s6Ui2QwlQn0ulU4228Gx yVuJW4HQs8QRjSVzyQXgm0kvvUpmTqOAUWbXsdIwC+chbf/wM1Hn2Nyn1dRp3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694680837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/OmM5QsPHqt0ySDL0uL/6o7lA+HBJwJ/cMFIW8qhLQ=; b=ejsCYpdN/cxwPaw28qd468kDHt0N33nhGursH7+Q41d39WSTTxjtFkZhWFuZ7/oBK3WxXG uBCok+fyK3EFxN2WoSMFGjW4bBsuD+5gbPL3LUuEL1Jc09QAc303XSi0TRSbyFVDXxTmw+ 2/MTDs0zLUR6e3WHHOK0MsuQ6Qi6isVIuVuggXUNNOLI31nCSDwXeNRG8sgk5aOYNGAcWI IOFvMWfixEVTX9DzuvjQ/f/auURUgn4VOEBhROQXDowM1tHNuxmPygGWWbsKqXpHCgqGNA DEELA7gGUgwBUMZZfcf226dz0GmDfx28PmbezmN6qvtVTsaATGeUzJ4+rBfujg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmW452pPKzqRg; Thu, 14 Sep 2023 08:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8ebuQ052750; Thu, 14 Sep 2023 08:40:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8ebUD052747; Thu, 14 Sep 2023 08:40:37 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:40:37 GMT Message-Id: <202309140840.38E8ebUD052747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 0bf5377b6b96 - main - Avoid IPv6 source address selection on accepting TCP connections List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bf5377b6b9642acc85355062b921a07604b7c04 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=0bf5377b6b9642acc85355062b921a07604b7c04 commit 0bf5377b6b9642acc85355062b921a07604b7c04 Author: Andrey V. Elsukov AuthorDate: 2023-09-14 08:39:06 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-14 08:39:06 +0000 Avoid IPv6 source address selection on accepting TCP connections When an application listens IPv6 TCP socket, due to ipfw forwarding tag it may handle connections for addresses that do not belongs to the jail or even current host (transparent proxy). Syncache code can successfully handle TCP handshake for such connections. When syncache finally accepts connection it uses in6_pcbconnect() to properly initlize new connection info. For IPv4 this scenario just works, but for IPv6 it fails when local address doesn't belongs to the jail. This check occurs when in6_pcbladdr() applies IPv6 SAS algorithm. We need IPv6 SAS when we are connection initiator, but in the above case connection is already established and both source and destination addresses are known. Use unused argument to notify in6_pcbconnect() when we don't need source address selection. This will fix `ipfw fwd` to jailed IPv6 address. When we are connection initiator, we stil use IPv6 SAS algorithm and apply all related restrictions. MFC after: 1 month Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D41685 --- sys/netinet6/in6_pcb.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index bf81de78f992..5c4ef7570ddc 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -335,7 +335,7 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) */ static int in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, - struct in6_addr *plocal_addr6) + struct in6_addr *plocal_addr6, bool sas_required) { int error = 0; int scope_ambiguous = 0; @@ -364,13 +364,25 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, if ((error = prison_remote_ip6(inp->inp_cred, &sin6->sin6_addr)) != 0) return (error); - error = in6_selectsrc_socket(sin6, inp->in6p_outputopts, - inp, inp->inp_cred, scope_ambiguous, &in6a, NULL); - if (error) - return (error); + if (sas_required) { + error = in6_selectsrc_socket(sin6, inp->in6p_outputopts, + inp, inp->inp_cred, scope_ambiguous, &in6a, NULL); + if (error) + return (error); + } else { + /* + * Source address selection isn't required when syncache + * has already established connection and both source and + * destination addresses was chosen. + * + * This also includes the case when fwd_tag was used to + * select source address in tcp_input(). + */ + in6a = inp->in6p_laddr; + } + if (IN6_IS_ADDR_UNSPECIFIED(&in6a)) return (EHOSTUNREACH); - /* * Do not update this earlier, in case we return with an error. * @@ -398,7 +410,7 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, */ int in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, - bool rehash __unused) + bool sas_required) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct sockaddr_in6 laddr6; @@ -432,7 +444,8 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, * Call inner routine, to assign local interface address. * in6_pcbladdr() may automatically fill in sin6_scope_id. */ - if ((error = in6_pcbladdr(inp, sin6, &laddr6.sin6_addr)) != 0) + if ((error = in6_pcbladdr(inp, sin6, &laddr6.sin6_addr, + sas_required)) != 0) return (error); if (in6_pcblookup_hash_locked(pcbinfo, &sin6->sin6_addr, From nobody Thu Sep 14 08:41:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmW5g1hg1z4stp7; Thu, 14 Sep 2023 08:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmW5g0JVrz4Mwr; Thu, 14 Sep 2023 08:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694680919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWqUSJK/5rLsaoEXBKOFGq4GVWOTcanhUJrh3WlUvb4=; b=utxDn93rAzY3gcnvurrp5Qek6dCKVB6ihuZyohkho+jPcm5HO5Bovqi7vcKiZuR/L3IaL8 Sbi5pxsWMc9R46nQwshZZH7zcyw/cVsG+PjSLqVGaU4X0nAkZEmaYePUhMGMudVqQtv7cK lv2SQehsWEl85uSTcpDEKK1VSTen9uryO3NzTEWXkgHwFXvOJFJk/bqi6eL/QOCXSXQ5Vg XVFf+nuKXOP4dFXCUCDoUoEdbWXdwuus+IxgZOOrG46p2xxEomuAUuRp1wPXEEOVI5nKyp ykPgvOmlnqUPxbCAKbd1JQn9Qdm3ieajJmP00PH+R+vFrh27Ly0hbW2ysDkrOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694680919; a=rsa-sha256; cv=none; b=SgC/uZORW5eb3F7TZi6DBEqR6CeQLPL7z24mWc2q0evh3pycbxHGGCcRww5pqv7vbwdA75 5n7VYEfAkH50xOnnTjUEC9MhrDj4Mxky21cBaZz9Ab8JlSKXSkmN9cAi/gO3m6/Mfs8fGg oB06sA09Y3KBpJbweaJWOV6QhMHqwT9LNVXxrJappnN4bR2Q3VTm3jyZO/pEDG+R/Wt4Hk QyxCnZhOzxATklJ3AZKuKSwWp2qYge4H4l1INr4JTUIcIK4ELA7osRNKHDOY4vem6LEYQb NSuSnNHQ/YVo4/8qjQTlUdB5DA8INN+GRnwG6M6IzevIf3Ev+W3ak/8G2ZwoQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694680919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWqUSJK/5rLsaoEXBKOFGq4GVWOTcanhUJrh3WlUvb4=; b=ZsGIjb2caiCh0jGBds0CicS3ReoHPY5X656KyF7H3S9xtGeljLY/Hp0nzNDQeKXz947Jjc KdwAQTM4GvvHt6jLZG8Q9PYvxTzk72OhvniXXs9VxF8As2gHG0QK/tdZNYFTp4i9hMSJX6 WQyCQxtkn4VdQXqd9hbJZUY7wY4ljv3yfroViMQcCKrFglTiqFyU1Od+4phz0gjfVgSpUs c1jAsLb6EzNHJ9VHWs0hB6egK0Yd9JgDHd78JEeBika8r30dAKhOYboVhCxZqnyiGBie8U pisSm1CG/y+57iHGv3zEeHWv2AhXEdvO5SVg5FdQr3obMVdA/+8ANMeP2idghw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmW5f6WRTzqSK; Thu, 14 Sep 2023 08:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8fwrv059536; Thu, 14 Sep 2023 08:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8fw5M059533; Thu, 14 Sep 2023 08:41:58 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:41:58 GMT Message-Id: <202309140841.38E8fw5M059533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: e80697634978 - main - update homepage for FreeBSD Manual Pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e80697634978578bca84a6f28348db0fbc40118d Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e80697634978578bca84a6f28348db0fbc40118d commit e80697634978578bca84a6f28348db0fbc40118d Author: Wolfram Schneider AuthorDate: 2023-09-14 08:40:47 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-14 08:41:12 +0000 update homepage for FreeBSD Manual Pages --- share/misc/bsd-family-tree | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 208523bd1fcb..0910f577bdbd 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -907,11 +907,11 @@ URL: https://web.archive.org/web/20081230094857/http://www.byte.com/art/9410/sec Andreas Klemm, Lars Köller. If you're going to San Francisco ... Die freien BSD-Varianten von Unix. c't April 1997, page 368ff. -BSD Release Announcements collection. +FreeBSD Release Information URL: https://www.FreeBSD.org/releases/ -BSD Hypertext Man Pages -URL: https://www.FreeBSD.org/cgi/man.cgi +FreeBSD Manual Pages +URL: https://man.freebsd.org/cgi/man.cgi UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html @@ -933,5 +933,5 @@ original BSD announcements from Usenet or tapes. Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. -- -Copyright (c) 1997-2012 Wolfram Schneider +Copyright (c) 1997-2023 Wolfram Schneider URL: https://cgit.freebsd.org/src/tree/share/misc/bsd-family-tree From nobody Thu Sep 14 08:57:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWR64nBhz4t0C9; Thu, 14 Sep 2023 08:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWR64M34z4SRw; Thu, 14 Sep 2023 08:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=k0cXgXBJ00sWbhpqUhzBIB+D73CTmECuCL7Nf8ipSbmyne84duf/cEpmqi7QDAm7SedWo/ FGs/gmveMntZk6oqUT0VoHSGLOXQNjza0MBzTQBAQKbi7sqtwaYMw64xtpcoKnNfGUaDOj K/YJfE0Ez8C/MVJedJZ4yypqq8CmvCTETwED5aLZc2sgsMQQ6xFMmyNH5Lzr6pW9pVvqwj uksU7c7fhsMoULAXWNsa8AN/WZXYSa7B9f7IXsofoOaFvq1xlOESff9fc77fRn+OMSBQ6a CpbrfbUSGY0IMnvsIwrQWC2DVJX+hkHj5zCIgEQt3ZqafqldSb0MR7hibpci6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681826; a=rsa-sha256; cv=none; b=N9tr4wAdeVJvn3CX8wTp1kf3NnMFLdm76ifc+veIjHRRzj3D5QYSCuokQEwbCLbys8k6uD n1SMXUYmrpsLkdx18zie54jgIppBXZlhTMNBBlivojmNLuCOUdOGeOl8uJ1/gZm+spM8m7 2cGNRPYOKdBQ/GJ794GbZmgOKgmvvRPeIBLX3t4d/abjl4Q54TWAjqEU28EBAOfmrfMi7f aX+Od209TD+mkOUPAIbm/oGMsSSpplxsTtP12VPqLAi2yfSoGZeSAJExTXeUQb9boJYIFZ MkW6Q2lNlWk7EngzHTzrbbiLnNx5hyEC+Q/TAne6WF72r1/jPPyKKeW0rPnyFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=oA5b4m82xOEBsKoBB86Pvk7GAcVqFOX+qA2HfcG6FOYVu1DOQ+epLAdvXLvtJQBdMLRqoI K9CLb6xhab2vKpejDcyNgEJ17JmbmQvxdvjiwEE8azdfJgYdxAa6C02SsDK+xS/0rda2oB Iid7gs/rq80AD9kfd1YibtlHc6wXctRjDoti3wVLKKVsUKafaP4iTMU+OyAXNd6sYGQSCl 5MX5i3ggrvc6P++wxCwxOgPcabEFhCD7wdKxuoZVFMS4oMmO8maewPnD/kmu1oIcqedI8S adJbmW3KzijoLrIRwGoqACs64ujjs2C3vm59Zil3l1UrICF0KHOZ54390WQ/ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWR63Py1zqjv; Thu, 14 Sep 2023 08:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8v60D076559; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v6gL076556; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:06 GMT Message-Id: <202309140857.38E8v6gL076556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 24b741db5fc9 - stable/14 - grep: Suppress EISDIR when reading. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=24b741db5fc907d35e51c97f8ef8ad595474e6b9 commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 08:57:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWR75kRCz4syyL; Thu, 14 Sep 2023 08:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWR74yl8z4Sjs; Thu, 14 Sep 2023 08:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnXuoGlvX+cEQcEx/NIb++qWwocQ1GItzqVlNCL/yF0=; b=ZW1LEB1iDldP9+V++vpBmGjk6ceXl8TqAwk3Mhj1qqpXgWvkwS8m3iKQ4xShF5oBfYmG29 orc6v3307P53ZBclRTz9zQqdaKdtc/7BCUwANPXYNsbL+7MXJ6IDToaOLf4VR4Y6I+8m/y zlDgdvx9FWJuDzlFlneY+EuHBWc/wEFPXi0yn2nf2E7tpbIljKzXmblWxBruYjgSqnQ2Tu lRkXBWyREAttq4jL0Qj1xj3zWUF6W1QXZC2k8TfZ1k9NpYW7ZOnpgXwgsUc9vrtoNMc7jd PYaWVOCxiapN5hyKQ1//9I744IEseT/CS+/riZZdGnRB7WGOXAcX0N2KPGwcTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681827; a=rsa-sha256; cv=none; b=cPf5F7kJ5sqz+VW9TGhP6m1Maz+/ENLfXVTNCFmdUMXVkZSbrc17SxINenX1dtP921yarZ QMVLWGO1bWnsBE2iaK3iE0CQzCBaqtJr9SLPm/VybxlSzvf9s58qJBGDoV3QWkDU9FCb/k lbsbDoRCY8+jnr9Jc6qHxGphA7drQbzRREpDEtSc73TOx5ep0lF8zSaSR8Qt9+Ixv0aGp4 pld7e/n4ekZLj44YXHxxMBgkz5a7Ph3AROUSCL7Id1hpw/XC0/pvFnE/WcRRZMZcY5Pqn0 3aDDlef64yLVzQuaukHWtKMV+phZmooSHOn99dMBG3F5tkgXH9mT/0sH+5FYBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnXuoGlvX+cEQcEx/NIb++qWwocQ1GItzqVlNCL/yF0=; b=x3lBr25iYkXGnYHrWOlx04/O3BNUKJFwKzWqwkq8q//7bfwv1Z26Xq7tKyqgStV2OcipPn EtXX1JLd2lGvHdGPrkZzFfVCECF3I/D21WNzkgy+gM4xvi1Cq0nEgfpY9p0AS+myjsCK6A bw2avPY+lWrsRo7QH2o/uvOeBP6bnQsDV/Iqs/DCjJK8cOhr7WOsE+nTUZXcPEH+Nb9i9s aAfGipgNnZqEVFkf6SqKH7/wdIUtY7iO27Wqhq4Kpptc2TY4c8bZM/TVKZhJkVNTxoDwvE zB/qD1BPXwVWJHAO3MGZ5wjOEyZwrMK85lfZFu0o/fkMZFjkbOL7ffPtGXPVig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWR7444szqg7; Thu, 14 Sep 2023 08:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8v737076613; Thu, 14 Sep 2023 08:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v7SG076610; Thu, 14 Sep 2023 08:57:07 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:07 GMT Message-Id: <202309140857.38E8v7SG076610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6bd2be4c4971 - stable/14 - mkfile: getopt() returns an int, not a char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6bd2be4c4971f58c51509ce8856bd5331f979e85 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd2be4c4971f58c51509ce8856bd5331f979e85 commit 6bd2be4c4971f58c51509ce8856bd5331f979e85 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 08:57:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWR86TWMz4t042; Thu, 14 Sep 2023 08:57: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 4RmWR85rf4z4Sbr; Thu, 14 Sep 2023 08:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2JqYbgPex14LxNytHP2t/eGYwFe8n5IzAlCO1RBi/0=; b=q4tMAyVZWuwGB+k+uzSCkKX7/b+UuT8eziF4JEjzKfMLCik5+SLxEHoJn2dT28F96QpV9h BX/NPjlwarbHlduPfX0XFXfGEJ4Z5KPgR1ifHu/7dMjHA8aLufaKpKNWupSoIPE27ps/Or 4zLOoe4toM+BtoFdMJYBroJpXSXZJY6PY15TklC+gHKg9WOsG1WXGXhOU47YBH+kv44dbk jN41z3U7ejOm2FfHzXXwWlV2I8up6ZsnOlp3FjRPa5XNnwgCPdYalUqZD2842yqdz85f0g 3WI8iMHx6Bcvvc+6Kn5cwyZ713NcxEWIqo3TflkEgbRV90KGel3aRhiah4UYkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681828; a=rsa-sha256; cv=none; b=BIIMm41fDigApXzSNE1HG/jnmait7u6HZbyssmdJXOaXqt5sLVNapnwEo2qu3pw6GEr8iT 2cXOMWE7AUYHYVq+1oy0UBpChsAPeMRZKGukPASDyRF2pFhMqqBT2tZJ4Elgz/Mvpvso2G yyBOMJ+CQZMUsGzfj7a28POzgLXaAuEuW018TjXrrBddXv+4GbmIaSxAbqhotaqHnrNwXS jw/rEupjb4/PNrZXAutWfDKohuB0w88cYOw+m9WpSa0qFFnUcMVnpWchWKqIchJU0i/OcV 1oHamaZqCpvvlbZUPjiM2NkLztAHdJf0pWRHSgJohqBiPBT1z55snsbQlcAqcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2JqYbgPex14LxNytHP2t/eGYwFe8n5IzAlCO1RBi/0=; b=la4Pm2Db4StFyT978q3Mqb7HjzRre3vfzYIAtdYpxm6Q2HJ8d8V7v9uawC361q6ws3iX8v w/gzgfY8liXU94Lq5bf4L+WM3Gq1M6IKNgGS20rgKFq0Itztj6C0dDL5Ha84+LgoiaVVyt pjRuik1k3JeHpNwAFEKdZS8HCBu4FKOlBZ53oawfQ6fO4XhU9bOsahgOpH4h2sS5RdL8RN YuduUCH0Q5ObmLNylU4HYWhL8qLI5kqLPGQVwkGyyWv/2ewLZVZyu7irp8evlw06b4oP5c YZqQfrQR9AwHrCbDfIWRrtqnrZjPPawLt7C5YSFF1Fi0mm6GOAPVYIc/e+7IWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWR84vH0zqg8; Thu, 14 Sep 2023 08:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8v8iQ076660; Thu, 14 Sep 2023 08:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v82N076657; Thu, 14 Sep 2023 08:57:08 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:08 GMT Message-Id: <202309140857.38E8v82N076657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c1335a776b0f - stable/14 - libc: Don't assume signed char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1335a776b0ff33a715bdaa2be59412006cb4053 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c1335a776b0ff33a715bdaa2be59412006cb4053 commit c1335a776b0ff33a715bdaa2be59412006cb4053 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-11 13:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 libc: Don't assume signed char. MFC after: 3 days Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41814 (cherry picked from commit 88a9b6e1ed82b562f52bae26b3de257495cd1983) --- lib/libc/tests/stdio/snprintf_test.c | 4 ++-- lib/libc/tests/stdio/swprintf_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 323356b37a7d..29b908b65120 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -131,8 +131,8 @@ ATF_TC_WITHOUT_HEAD(snprintf_wN); ATF_TC_BODY(snprintf_wN, tc) { SNPRINTF_TEST("0", "%w8d", (int8_t)0); - SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SNPRINTF_TEST("0", "%w8u", (uint8_t)0); SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index f5dde349412b..f00ecc7f1c1d 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -132,8 +132,8 @@ ATF_TC_WITHOUT_HEAD(swprintf_wN); ATF_TC_BODY(swprintf_wN, tc) { SWPRINTF_TEST("0", "%w8d", (int8_t)0); - SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SWPRINTF_TEST("0", "%w8u", (uint8_t)0); SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); From nobody Thu Sep 14 08:57:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWRB0FqLz4t01J; Thu, 14 Sep 2023 08:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWR96ZVhz4Shn; Thu, 14 Sep 2023 08:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptIKD6KtKjcs9NyQsg1Wc0U7vBY1DNOHS8tOwXcKl8E=; b=TSMASGt4IZJ6bmL3RFtt9hjWqnkhwkwN01u+X6/9YdPLbf0oeS+JWBHOKnCgA1fopQEzmF 9A8WbYzb5ozeE2cPLrPiCOkeU0VPJGCWmNDp64yyJeNXgPNlSlhSO9OKir5p2zwuXqGjBY 8XDPksQYBPMZotBHYNpRYfi1BAfHyZnB3hvdPytE6fCv/MurirP4dw2xh4cllQDXIxRNP3 H3BuJno2upANbCrvaRFhcJvxMtZSIf71CADdFT5LgxYs//eX0Lqi6jEpisvpqgOCsuo5OE AuxPBg3giCj9qrQMiWEf5PVP40wx70/gkrQyXTeff6iJuKQ2YA3TXVNS009M8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681829; a=rsa-sha256; cv=none; b=EA0pbQ64VPRolXXilnvNlwp/qB+9vIXo1C974NqdVGsVFL8fSJdcGIXz6v/fvrHzkZ7LVW BGYmA+OR2AZtP9crTOVQ+CnItUyz4/6/LLu9wusipMhtbvKVhiTpA23IVOP0M6yg5hYBHu wBYUbALqw3FHt9bBQN2QAzusBsarZdbre0bByRxZKvlDe6VT1CBiS0P983NMjXj4kEnyg4 65YqiMPDpoH5SgCiY/zfYUV+ZvBU75KZRNfmiZrjWBGtyA5xpe695/wSLAl8EOXxCii8sK orfsCTo9G8PsIU6ODkV9hzX09alznkARmzZk1FmPbM5jwAlxmGQSSyKW4YGsKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptIKD6KtKjcs9NyQsg1Wc0U7vBY1DNOHS8tOwXcKl8E=; b=ggoAVqfrvyIOZEr3wMSDYXHkDLjoMsZnjiPM06Q7GfJEDSXcQ21zSoC3Nn2bPjtC4tOTkI EnfodXSuNev8IaCJDPDzpy0JpVsvN69zTPGJmph8tNsV67lnWyh79Hfzat29oRT3w79TOD K0BE7/TyqHuG0eNza359fhoJSl3xdGQdPSebGxr1/Uf5rZxI58Qc3vwaDEQNJSUl2h7Xzp +7uqlw5YjaZXIAyN4+d9KAcYAlVh6026+tYB2Yg9tgbf8vAdam3TW5IilUs9d7rxGoQ1dC D29OKSYnFgQV2iCIVIZFdYW39ZdbEKOUechMyFIggVTC9L5cBgEj2AYQ2gDKLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWR95gBXzqsD; Thu, 14 Sep 2023 08:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8v9pS076714; Thu, 14 Sep 2023 08:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v970076711; Thu, 14 Sep 2023 08:57:09 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:09 GMT Message-Id: <202309140857.38E8v970076711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2e38377fcda2 - stable/14 - Belatedly document OPIE removal in RELNOTES and UPDATING. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e38377fcda2eebb2f76f7f82352643a050d736e Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2e38377fcda2eebb2f76f7f82352643a050d736e commit 2e38377fcda2eebb2f76f7f82352643a050d736e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 11:43:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 Belatedly document OPIE removal in RELNOTES and UPDATING. MFC after: 3 days Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41822 (cherry picked from commit d2c839eee0d5410095f5984d2126f41f4cf62a00) --- RELNOTES | 7 +++++++ UPDATING | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/RELNOTES b/RELNOTES index 0ff123618e14..f3d717525929 100644 --- a/RELNOTES +++ b/RELNOTES @@ -148,6 +148,13 @@ f0bc4ed144fc: instructions may be probed instead of logical entry and return instructions. The provider is currently amd64-only. +0aa2700123e2: + OPIE has been removed from the base system. If you still wish + to use it, install the security/opie port. Otherwise, make + sure to remove or comment out any mention of pam_opie and + pam_opieaccess from your PAM policies (etcupdate will normally + take care of this for the stock policies). + 0eea46fb1f83: Removed telnetd. diff --git a/UPDATING b/UPDATING index ee096e9a6fa6..fe80f259cb12 100644 --- a/UPDATING +++ b/UPDATING @@ -182,6 +182,12 @@ and/or ports. after upgrading to restore all the component that were previously installed. +20221002: + OPIE has been removed from the base system. If needed, it can + be installed from ports (security/opie) or packages (opie). + Otherwise, make sure that your PAM policies do not reference + pam_opie or pam_opieaccess. + 20220610: LinuxKPI pm.h changes require an update to the latest drm-kmod version before re-compiling to avoid errors. From nobody Thu Sep 14 08:57:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWRC2J80z4t01P; Thu, 14 Sep 2023 08:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWRC0dtNz4SwM; Thu, 14 Sep 2023 08:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=S5+0ejgPTmMu9IDRDKGTar3KsDxbtYtY95CbUrBkur6uyBQ8HJeOlvs0F0XF2Aq1+zOw1S W6qUhLU6YygtW9PUdDEpsaD/d8/hZaGbOmBGL96dGUSwK8SryKW1Ebn4JtVv+k9co3NeYG Bj4ZG/vWf0ujH4qMmTNDLmp4aSYtUsJ8krmMP+rCvZOj4piImmnWqXjP4wFYWm6Ce66qKo j9iCNoUESVsK3+hA8fa3s0XM9C4oyGDiCQi4ez2+5ubMJRLQFBUc5Fscj5AM9sgxinLCxZ FPJZMdvNMnwBuVkcYsRtqh+58d68KZGgyoBYya2mzc7VA50SIWc2p9mufDX8/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681831; a=rsa-sha256; cv=none; b=mqm1gSLZwlTChLxxFg5UMI3VxpGvL5ElRWP2gSKng+FpdwqGox1Rdi8IyNE3/xU2yEnZyi H4cEnwfQLb80ct85W9Dnf5aR45oipTj/iIsJWRJV5itrD7Z7LzJOX7L9abXCCEUQR7ZJmZ Oi/9CRqiw9mBSn6UfdykVu1atA7MJ6cVnmJDbi5apvdy2IHCwIDk20TmHXhG3nmQ58Jere OlSh+dCbNzqADdN6a31AXa7H0hpKxHRsIOXkvA4BLh1ehJdIBDsDK5bpbIrfBNecOjlZTW 8pakLxe7sZHmEGFpnn6mCuJBUjR56eKSwpLfAof8PBfW6ivpw2G+arDD5vQ2xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=iTlHz1psRYKImHLsbyvWQqhcistBTz9x30zu2VEIQciFRgJc0Q4j/TO4CZFtl0zCRGZVCX pynv9RehiEDtHnktl8r0u5/4VEZN6TKMbWxjkjLODGa8qGK05hrPmYGqkM1DkkOPBzd3gL htlrxum5SOGfo6eCRw7Mn5MpAMx4PGqysF0TNQ8791nTjfVoI4BiVqWQchy8ymjAMOxN0r 09ve5sZVKYEdIRzIMRxDvRGk2YmUI3J56W205kGsSDvIcOQCN/c6EynZFAWTQySnFpNnbo /ElhULfhVbfLX0pLnuYxQtfA0wIExc4IOyrp59muW7UsvzUBh/aLvJtDNN3ILA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWRB6sdmzr7d; Thu, 14 Sep 2023 08:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8vAk9076778; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8vAMZ076775; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:10 GMT Message-Id: <202309140857.38E8vAMZ076775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f92a598782c2 - stable/14 - newvers.sh: Avoid picking up stray envars. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f92a598782c2f671559a919f353b1505f6fe09ca Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f92a598782c2f671559a919f353b1505f6fe09ca commit f92a598782c2f671559a919f353b1505f6fe09ca Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d9bccdfdf191..bb6f3349d87b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="STABLE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. From nobody Thu Sep 14 08:57:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWRF1YtCz4t06D; Thu, 14 Sep 2023 08:57: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 4RmWRF0ywCz4T0Y; Thu, 14 Sep 2023 08:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhhCmEFUz0qfmn0QxtYnDiDbafvaAp+U9bSLsLMiEFM=; b=EHuR6SqClkaLXX5LcLAaUdpto/bRiO/IPnGbgDFRG3lD8hhUWvbtTAW34BcGaDxPM7xYq+ Vs5BJL0U5cMSMdAWybSLvcpOzUwooshKcYPnATZSGVKDrQUTJILPnBCfwghFBswK6I1gVm xGxUFyk0c5dMEoPMSwpN/upVfWwekXRolKg2cI56FKWuovFvafzXhyc6NrUOd/jjcvqdG4 4vPrIOZ9dYU5NVMX5rzove/fAsQIcipyyMKrSsRn1x9jZsfa/3fop8GCIjv+hSYSSSEbSf txeI9quTPI/pDGaNb9UlOG1JPO0c9zpuRRTg9+O5rqN9CxBuYPMfYuhiflwHeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681833; a=rsa-sha256; cv=none; b=PqfWZgeYTRo+Alg7ziP7/MhMMfPBGeprHJufZDETnXQEz4e7VGqhvNTUVmA+D03H/tWoNw 56MqB+1ynXuBqXACBYC2Tb4F6iu8F+9eEzahmbzcUE7VqA2ap8wXp0NydJf3Lga0B7kXyT i0GIb2lqKec1/8Xaw/fb33aFHkAUC/uWUADn9N93wS+cM6TAyz29gZL/zG5aSqNyWyK5wh Fbfz1/vk8DztdBxn4OQeD1zuEmxLp1/NZNjR1LVHywxvRBhbcV2lc9ZQqhSiM5qMW1hDOk WL33qHZtN6ijztIt02UyGCxDmJSoF5Mm7szOgZnhFU0/aKHhj+27NhA4lv4i5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhhCmEFUz0qfmn0QxtYnDiDbafvaAp+U9bSLsLMiEFM=; b=caSFjHjRAPW/+ohKWFOoETqfLrtj0HtEhyhgLQEsruJINjhTrnhfSWhLa5NSiuEMVuZlX3 0Kkit2RKHjOkxy9W9oPvwkZ8pKahEZYzfCivMLTJxzuC+vP3Xhnw2K9dea+Oc44ZT3o80+ bpoaJmJS9fDtrWQxLESNliqX5iz80D74WBoxlY/8kk9XNPbSrkStPQ2OGemZNSgeqolmpp phO3xf37w4BVfYWXk7YF4EAtGr0lNpq+tZlkID6zH+q2JKAoVYIiRIk+sY4mD+Jqc/gQIY SOmZ+TlhV2fnPo/C1tzMGjIc7U7aIf7T3DOTBNkCL6DF5rlnLBZTyD9cMwwdVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWRF04fKzr0g; Thu, 14 Sep 2023 08:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8vCYs076927; Thu, 14 Sep 2023 08:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8vCAJ076924; Thu, 14 Sep 2023 08:57:12 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:12 GMT Message-Id: <202309140857.38E8vCAJ076924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f08b43610ea1 - releng/14.0 - pfsync: fix state leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 commit f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 Author: Kristof Provost AuthorDate: 2023-09-08 09:21:12 +0000 Commit: Kristof Provost CommitDate: 2023-09-14 08:56:49 +0000 pfsync: fix state leak If we receive a state with a route-to interface name set and we can't find the interface we do not insert the state. However, in that case we must still clean up the state (and state keys). Do so, so we do not leak states. Approved by: re (delphij) Reviewed by: Kajetan Staszkiewicz MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41779 (cherry picked from commit f415a5c1bd56933367e42312731e4ec553e256ed) (cherry picked from commit 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6) --- sys/netpfil/pf/if_pfsync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db448c9bbc48..e29c00fcb879 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -685,8 +685,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) printf("%s: unknown route interface: %s\n", __func__, sp->pfs_1400.rt_ifname); if (flags & PFSYNC_SI_IOCTL) - return (EINVAL); - return (0); /* skip this state */ + error = EINVAL; + else + error = 0; + goto cleanup_keys; } break; default: @@ -734,6 +736,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) cleanup: error = ENOMEM; +cleanup_keys: if (skw == sks) sks = NULL; uma_zfree(V_pf_state_key_z, skw); From nobody Thu Sep 14 09:20:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWyK4HyWz4t6SK; Thu, 14 Sep 2023 09:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWyK3rX2z4bBx; Thu, 14 Sep 2023 09:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694683241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NoKuwmtEb+G+hN/VHCzqjyl2p8zHtEvP97EC03zMIk=; b=RGvt7/0M+wIyAYivZ891B5dYK1MDzX16uXPxqwofOlHd8IQzmPaOiNBgQN48LpUR6f+XpL CN6mz9z+G1BThZFVjdElTd7xAfIqKNy9b+8Pmm7jDcYU2FGRa7ki1MK24qM0tCGqp65TOZ dc+z9I7Gx6HA6KUgw/YE1147tdZefLAtaxkieVMnR3NQNrRprb9DccDCXuvBxarA0tBGAR 4Pshzi3f/VAXTbzm0XdVdQuzmrGkH88kanWCp+hMObD1YZe0dwUWZb190vFQbBWZ40gEAB OERh/PxmxrEBwOtb7JPdJmuwQhD+BoqCgvNC4TbbPEwOcILHzaYhGMbxb8pDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694683241; a=rsa-sha256; cv=none; b=P8y/Ldzem+OadnLuVefNw/LQmFFhCKmjYs25M1M2CwOfrSllCM1sIdqyxj04wp8o3RPT7m /18JFVJSABJvMS8Eoupdj+ZGm91SvZXKRrv1G8jFJL9Zs5x6wjE6dCA9X/mqPmpnJ5nUDX GeWSottytOKj9Tj5RzZdQhiYGVqP50QsmgooPnnEjIvE/svUGLEJmGdZ6J4aJkRV9FYcfU AkTz8uXHjkwdboxEVpFuqGfzEzUj/KkCCGPy/T3NH5W6R4cN6VP65JltoEycFRn+jBBAFE hrXvPu3oidApzRkQTt36bnICnzdGmWR2KOn9YnoVKIAevWGm/TIe5MVqKQU8Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694683241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NoKuwmtEb+G+hN/VHCzqjyl2p8zHtEvP97EC03zMIk=; b=ycSun+5/qk12aZACv7gBE/a48cCAI5ICnWUovjeXG415ou2LkLqZ5gxH/fBmqMEMqLSnHA k3nqlupSeBtU66HeLMIycmEOFtrEs2MQM4iMqG5TimiFU2XQAESFYBNerQ0DpA9U6edZIb aKs1yW5k1PIx3dVeRxBgjPXj9g7bGCmtq9/76/wYXCWCw6X2YSg3LURQmh7FHB5OWGpEbR 7QBs69iq4Mw4NhRF8pqXdlSEtJCMUXAwWCCGJcRbwnsRsD/e0lxzVpdv2KHuLzgY8kqJui 7dW7Poxl7TpwEyW6ZxxZ/LPUlJ3TmH28DzzgB5TySjkcH28g9FlVqYChRI1AFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmWyK2vxqzrFn; Thu, 14 Sep 2023 09:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E9Kff8021177; Thu, 14 Sep 2023 09:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9KfKW021174; Thu, 14 Sep 2023 09:20:41 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:20:41 GMT Message-Id: <202309140920.38E9KfKW021174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 4e899378bf5d - main - pkgbase: put library links and symlinks in the -dev package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e899378bf5d89c20430d32982d2635657f34c04 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=4e899378bf5d89c20430d32982d2635657f34c04 commit 4e899378bf5d89c20430d32982d2635657f34c04 Author: Doug Rabson AuthorDate: 2023-09-13 10:18:09 +0000 Commit: Doug Rabson CommitDate: 2023-09-14 09:19:42 +0000 pkgbase: put library links and symlinks in the -dev package Some libraries (e.g. ncurses) install links to the main library for backwards compatibilty. This change ensures that those links are in the dev package since the files being linked to are in that package. PR: 249143 MFC after: 1 week Reviewed by: emaste, manu Differential Revision: https://reviews.freebsd.org/D41841 --- share/mk/bsd.lib.mk | 1 + share/mk/bsd.links.mk | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 90d89eeebc5d..49304463d859 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -561,6 +561,7 @@ LINKGRP?= ${LIBGRP} LINKMODE?= ${LIBMODE} SYMLINKOWN?= ${LIBOWN} SYMLINKGRP?= ${LIBGRP} +LINKTAGS= dev .include .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 990c4cb65a29..6070979612bf 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -14,8 +14,16 @@ afterinstall: _installlinks .ORDER: realinstall _installlinks _installlinks: .for s t in ${LINKS} +.if defined(LINKTAGS) + ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${DESTDIR}${s} ${DESTDIR}${t} +.else ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} +.endif .endfor .for s t in ${SYMLINKS} +.if defined(LINKTAGS) + ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${s} ${DESTDIR}${t} +.else ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}${t} +.endif .endfor From nobody Thu Sep 14 09:49:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmXbD45wXz4tGQd; Thu, 14 Sep 2023 09:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmXbD3gCxz4hLc; Thu, 14 Sep 2023 09:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694684952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW1wXhi7hzbyYVbxzfW79nfYNPd4WoVte6PTThqzb4g=; b=Sa5HklFesAxDKxb2bOS+vvh5UbWSXU2s+mmSjDNinQGw4dqPkYVu54rEdvjXa5gCfKbJCo HuWwOejPHRQSpXkHCUb9Lka2J5Ef4EHKVYKrcMg7bEEHYheL+n83OhuuXbOGypZPSu9aH/ mMcNLxlR8PgfFKUC8yxhmkIwzoOlUat4sVBde6+LplVuJpbrAVcKIHuJvUzkAKaCApCtwq TDrU0rQCfF5VvQbv++gJ49gPQQ0vFyBbYRyzDxLiDjQA4q/+MFI/15tSYGKdpGXrnEGNQ8 kNbfBQehCXzCJ8JcY1YeCo5pXOeuqrvBAg4LHlE+smj6yeqyQFtnYxgm8gLrqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694684952; a=rsa-sha256; cv=none; b=MeRAhe02h9/tfQYtSqwE6Uhh9L7OiGDDxaqbxq87blBXhpTJJw71kdccHBY1vdSwu+HbwH 0HA1SAmhdp4egooi4T97mZYwIsfyR56obZVcemSEbQ812Zn/4kDv5JGBgHCJdGZzgKNa23 sUiwWXHl8WSuCqegedb43EzgBRkgguKl5eh/AhssCVJzxxcBG4UBH1Q0LE5noow8KXWKK+ lZDYgk3MPflXFq55N/zdXEV23snuv+T1nhdOh+yTOH+nwvl1NEDdoAF+nlunM5206LW2Ut 4HVv2lj4MLNVq6TWET+ZvBMTi3a/3EVoib5lzog28yDa3QwtW28AHZPeGIqgrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694684952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW1wXhi7hzbyYVbxzfW79nfYNPd4WoVte6PTThqzb4g=; b=AC1usfwAI3CKgFIplit65z3jlNMiSoOtM5RDF3CIYIGEfdnWUAf+W6D4qdyzQd01enSu1q xuiKdgoRwkBEvlj3ems0+MWedgvxCAJ/A+UdBWW8gcOU5jW5N88WpAy90WINCX5yM79FfZ HOmpRb4O9LqibGp1oXhBLq0b24abXQCLMxkd92cRiBMTXZcnHhg2AnYTIq3gmNRBmAZKIH EgVMFXBb78yiuZAj95HqQQFtJWE1AGVqd+HGuWqrdt3w76FSws+4IHrA8MEKqJffD7qpLv kCNjrqXIAD8JW9oT6dnHo0MzxlWcf3LYw368cwVlNbgnnajXGB9NsF/iDCuKtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmXbD2l37zs9W; Thu, 14 Sep 2023 09:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E9nC6e061217; Thu, 14 Sep 2023 09:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9nCkJ061214; Thu, 14 Sep 2023 09:49:12 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:49:12 GMT Message-Id: <202309140949.38E9nCkJ061214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0e383bb3cd18 - stable/13 - ftpd: add deprecation notice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e383bb3cd1856515c4b67cbced76952280b4fb2 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e383bb3cd1856515c4b67cbced76952280b4fb2 commit 0e383bb3cd1856515c4b67cbced76952280b4fb2 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:48:24 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 7fec5aaea6d9..1c4424825833 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Thu Sep 14 09:58:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmXnk235Mz4tK73; Thu, 14 Sep 2023 09:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmXnk1VtXz4jq6; Thu, 14 Sep 2023 09:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694685498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nCMi+OO860MOmfLvbA8wp9n+2VSwx0fTZPzKZCpx5Y=; b=SqGluY0wzz0B+3i06mWX/m3KGIJ5DcEVB7X7fgIE/nin5Jt2fodf3lPlb1wPOWIExWyKE0 dWziqva/QaYx89BUoUpF9NCITT+57bIcxn+g/Z6etbuUpcnkJvUyJFDIcVzD7jWuXrj4ks 6mIcdCUp1DKo0YRMrR7xW/Vvnq+h8AtrvjNO1f2vGyzuuUMyD4GQ9yUiKJ1lw2ec1oCRri vFrYOO7oAXQGenXuuqF2hWya41WcoIP5qhpepe8XXBe0gdoEWANR3il7x738/KZ0zbJB3+ wKIt0A8FN6AT4Xs6gQ4Mzr9SCCe5QJCKkO/lzQRiqRf94NBn3qssQZnMPM8/TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694685498; a=rsa-sha256; cv=none; b=cMiJYy/AFK2qnkuRWP+vN5uDSJN+Gyt3xGGbVgtmroStYIFKXz6MqVoskOEZXhsVWdfrDr HqVekuti170G6Wj7ZmpmOUSO0UJ9GRLz4Uas4fFreCODYkva3965RxcdU5pQ7PYF0Eweg9 GRptH8T6SFGbQKLUvqUkvQbKK7dwAGr2OAizXFRmHZdpGeRX8a8IYbl4rRn6lY8//hZndB cuEjLmIBQ+//a59hDUlfkbKO6mHfaZP27XaoiRKx6qCeoDPiqyK311cGntqxjHp1nfyxpX X9IePXS3NCCaKygb60c1IRqhbHqFH2QNsa2hLKnGuc8M9QAYw8/Yi8HdTbmhMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694685498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nCMi+OO860MOmfLvbA8wp9n+2VSwx0fTZPzKZCpx5Y=; b=QiF65riHYPiBOrcnTfMtOVetNV1J74VCNZ4LDi+3O8xEMX1krel13MOlSXYdR494XxQX7W yMnqu7zH3AdZcY2sqwtAS7AN376TkBY+kFpYSrzae5vnrMVuaaRHO4XtcDOJaDMZnALxXY CFHLJtAcuQtxek76bVoYqs74veOpcuvO9wpsLGDOk+MCx2dxQGxAk/PK/1x0O6ZEXnbYsl C0hJnV25FEV2XzrSeLntl7s/wtm+RsYSBXHN2GMTwmPb9rsbGeGhcyW0bJzOwHq/coXVzz JVDKv07fkVtwF0pMB8FnvaDEpzS0Ky6OKPs0Kg5n00Oatwx48QpHuOASFdmIjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmXnk0ZNczsLV; Thu, 14 Sep 2023 09:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E9wHBC077041; Thu, 14 Sep 2023 09:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9wHmg077038; Thu, 14 Sep 2023 09:58:17 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:58:17 GMT Message-Id: <202309140958.38E9wHmg077038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4214f6cbb467 - stable/12 - ftpd: add deprecation notice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 commit 4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:57:57 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) (cherry picked from commit 0e383bb3cd1856515c4b67cbced76952280b4fb2) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 868acac61699..f9651a4987d6 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -28,7 +28,7 @@ .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -44,6 +44,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Thu Sep 14 10:09:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmY2v4XP9z4tNST; Thu, 14 Sep 2023 10:09:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 4RmY2v2jX3z4lZw; Thu, 14 Sep 2023 10:09:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2b9c907bc68so11890621fa.2; Thu, 14 Sep 2023 03:09:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694686182; x=1695290982; 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=KeQiYFNASXWKlJM1G7dqP3SA6ySW3FoByhy8hUmL3yo=; b=WHLS7O/nlemcP8XZiZZGUWFHr+bf4HsineaA3FjGyJN+mBzedHxpYAHxGSUGA+Ccgk nYZF+iklbxkwN57hjId6t56/cJVcVuuorlA4xZTzCRUptqifBKcPNLNcSB3BpKDTaiBO FeNvPJVfOBzeP80w32jmXE/Ln7o0C1pzdCRvCNcud1l3goHu882PyVKddDGWBVTBEH4G G3bVjB51MdeFypB6EJ9Ll4O3yClPS9eptd26UhH0oewjve+5bU1bVhxq0eEN7i/nEOX2 5/VjZIgisKhtsmCrrfADw3xuyB7WcHddHQrF6sZjz+YJkR136i57RRXjtJk0+qEu/vMw /uEg== X-Gm-Message-State: AOJu0YwIL/BwZDI3Crd/AKvoUjognqS8p756+fsh78DCWGtZM7Npo5+e blZPTizIVWWMsVVsmNn5bJKPtf70K4JhcaK+sZKSelYbsg4= X-Google-Smtp-Source: AGHT+IGzoI1z2v6DpABXwUcW1uahLzWd5ekcSQ2yLNQ//STneVSRlb9W5XHhwZtTvPHUKiF+nbIKK7W8YO05w5Wb9ZA= X-Received: by 2002:a05:6512:3050:b0:501:bae0:36 with SMTP id b16-20020a056512305000b00501bae00036mr5332536lfb.16.1694686181490; Thu, 14 Sep 2023 03:09:41 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202309091847.389IlZed083348@gitrepo.freebsd.org> <7af75066-8b42-477a-8ea4-f64dd0970ab1@aetern.org> In-Reply-To: <7af75066-8b42-477a-8ea4-f64dd0970ab1@aetern.org> From: Ed Maste Date: Thu, 14 Sep 2023 11:09:29 +0100 Message-ID: Subject: Re: git: 98b98ec1bc7e - main - ftpd: add deprecation notice To: Yuri Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4RmY2v2jX3z4lZw On Wed, 13 Sept 2023 at 18:28, Yuri wrote: > > Duplicate .Sh, the rendered man page shows: > > .Sh DEPRECATION NOTICE Thanks for the report (not sure how I missed that). Mike Karels also noticed it when I requested a merge to 14.0, fixed now. From nobody Thu Sep 14 10:11:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmY4V287gz4tNg9; Thu, 14 Sep 2023 10:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmY4V1jJDz4lrk; Thu, 14 Sep 2023 10:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694686266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MnE2aH34GLPrx8+FTb7glnswim8nxG7NBcf4eJHnHo=; b=bLsqYaYLwzGIXgfg+0aGFNvfeEN7x/+bRtYRPwIANcXUTCtA/GwOQCELM9j0MYIcIZ/jus Q+95o7ZWqR7SZCk7SQTP+IyZqK9AoIvSROymjp+iM/H/A93C4ehHKtSSxJSMp+FEyOQGT1 VQVr6pyWr+GhP90o4CcycFMOy1RLceHOnh28MXrU+yghRJjTvdKTcY60oqiZOK8R8+mHN0 IYPe8GyBPGbq2h7dGhYFRRsJolaKqJY/AF6wKIFTexqoEHKALcGMyczkHm0jIGYIRKjeM2 8eHoYrHRG1vdqdkIW5SdvQ41NlBAsvwLsTcCocqsjbfA9g3ZVcW+VvJp2Beyeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694686266; a=rsa-sha256; cv=none; b=VrZzJXl5vVG7yY94kUEDi4MUABM5zUA9dVZFoXPOCWX/bKGkgGv4GNxY4LG/tllZEiGr7U EuFsIt501SlLfl0R1qhm6hIo2cjikGsLha/tbqYK3tgSvBzt18Tf/4PQVxfYIZEn0by2NO vCiPqukWQ5s9fBTimU+2nChP09cQXpiJuSliNPX5PK1CcVw5G3aq5eQ1Y7lE8J/BA172ac cIBlQtJUAf1R/Aqk/bvbjjVqOcp2WgpHU8JU1t9rpSSa8gsq3jiYSZaDu6fyO/4z6eWcdM wCfsix4+1/bzTEgOCc03CPDyBOq71xHbPyGAnwX9MzqqttS9KvkSLdEIsROxkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694686266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MnE2aH34GLPrx8+FTb7glnswim8nxG7NBcf4eJHnHo=; b=gDV6eucE+Rn163Zak2itUgvXtEkO2p2Ehlu/GNpoHLGEjcWZlGddXIxizTbVkzR2J0NLGc 8EbO83vdomdJp+E5vxDawKcZ3s386D6IRc1PdlFp6KBy1Kt0MpSQB9Fah+8CK36YKO2n62 0l4u7Fef4+j0xn7ylsDhtrFo6HaIeF82X87Vb9Sx3RofEwz8txuzuZOafEQRz6IXTKxE+O 73Kt0q8HIbRjF51GNjQCCItR0SbZacO5CHqzzDopBNLOF0cqJyk/zHw4Mzs9Z+Zx7IVjTy IfqBXIz3SV8tI3YQfu8w0rGdVL72uWh98YYzsDXVbzmFeez33asomYn8r4TUAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmY4V0mFKzsrv; Thu, 14 Sep 2023 10:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EAB64Y004332; Thu, 14 Sep 2023 10:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EAB6nY004329; Thu, 14 Sep 2023 10:11:06 GMT (envelope-from git) Date: Thu, 14 Sep 2023 10:11:06 GMT Message-Id: <202309141011.38EAB6nY004329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: dd0d16cc4d99 - main - correct FreeBSD release List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd0d16cc4d99d79f3517f0ce7822c8ea48e900e7 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0d16cc4d99d79f3517f0ce7822c8ea48e900e7 commit dd0d16cc4d99d79f3517f0ce7822c8ea48e900e7 Author: Wolfram Schneider AuthorDate: 2023-09-14 10:10:35 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-14 10:10:35 +0000 correct FreeBSD release PR: 273690 --- share/man/man4/mlx5ib.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/mlx5ib.4 b/share/man/man4/mlx5ib.4 index 939239ab5d85..71d634b2f695 100644 --- a/share/man/man4/mlx5ib.4 +++ b/share/man/man4/mlx5ib.4 @@ -113,7 +113,7 @@ email all the specific information related to the issue to The .Nm device driver first appeared in -.Fx 12.x . +.Fx 12.0 . .Sh AUTHORS .An -nosplit The From nobody Thu Sep 14 10:14:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmY8J51dyz4tPnk; Thu, 14 Sep 2023 10:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmY8J4c15z4mtd; Thu, 14 Sep 2023 10:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694686464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TY6PxVNoLXLl9L4f/iGuPvsc44hODobi1l+sMt0W0kw=; b=yg9emgu2woAuFnNChM9yLsi5d0uyPNG6Nd6c7JHoKooiHKiPKEc9S03cv/7ABLyxx2qgIF JLDdOieEtAoWTRXd0ckiG3NmNsBSEPsM2mUe2HHMcZl1B7HrxEo2ipq+yb4jKAItAwvnac 8sjVx/YD9kcCI228AwkUBfJW8yAHjFDVdzkK/yfqEymnn9CgSeD6+MLMPGuNTfChPVrsmr h8t8d+kwEAprP4a1vMETWu/hzAWO2ujdPkB1wf4aB7LkrRiFI+JP2rauQKidD9y3Oius2w MK1B54ROR5wHZZPz2duApHbisSWzilOA6b0/85FOD707l1U05/466WqnuhNEAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694686464; a=rsa-sha256; cv=none; b=OmSjyiakW822urNO6KGWwceuvf03Z1izP9kIA72zdrTNm81r+6PPm2fDMRHiLRywigrzYx 7eQHURmVAhcnz+ubBfU3BA1u5QDAq7lGl+0fH0h/ZrW4v+Kzb9fPwYo5Bxi4ph5shlyjQX J14LTIWm8XVLpwL/ZTMB5CaBXRDj0KeCnj58/AlgD0BPJNj4ZNE8riDHer3hxpvmUUJOSh Ypwl1EUHEYQT044pX6bUWLfnQEBNkEDNHm9kedapdkIqG5ohlbcIf7qBSLAtDSC7OQaR27 U3e+52NgYY/O8CQFZ7lrtD6uwqkdbZErjRoG46K+jVAbkc+WX5wUE87Sceq9yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694686464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TY6PxVNoLXLl9L4f/iGuPvsc44hODobi1l+sMt0W0kw=; b=HnmacDYNpSMiy2A4J3m3KiAe3VPd+Y7DXH17bchAehqzqYsVy8ol/d/T9FTmYNsG2bobnm 7dUT63bcUPqKvWbe+DKNz/SXswISWUozGd0P04m+xAthY609k0pXmCBcnnYu92piQA/ivA r2xV5M3URlQBXw9VPQEjwlrMi6DsFZ9L2DKAFrTrqTSD45LIns05ybVd1ECE30cbtWCZY6 q4Xhww+SbEDKzPK2ag0Yrd+0jWeyOCcmy9u0VwtWY6e/uv8ZxbXYYG8hPS+4+v+GTrwRz2 mRNk8N5xKjm4H2DFjuGpmBhaRIKV4ohyNgagmE9B+PeRxDz8fd/NKA84+HTXqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmY8J3g9dzsgn; Thu, 14 Sep 2023 10:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EAEOpj011003; Thu, 14 Sep 2023 10:14:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EAEOjG011000; Thu, 14 Sep 2023 10:14:24 GMT (envelope-from git) Date: Thu, 14 Sep 2023 10:14:24 GMT Message-Id: <202309141014.38EAEOjG011000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 79278872ad96 - main - arp(8): fix by-interface and by-host filtering when using netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79278872ad966e5f54805efbeb692c8cbc0306c8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=79278872ad966e5f54805efbeb692c8cbc0306c8 commit 79278872ad966e5f54805efbeb692c8cbc0306c8 Author: R. Christian McDonald AuthorDate: 2023-09-14 07:07:24 +0000 Commit: Kristof Provost CommitDate: 2023-09-14 08:14:10 +0000 arp(8): fix by-interface and by-host filtering when using netlink arp(8) has traditionally supported filtering by interface via -i and by hostname. However, this functionality was omitted from the initial netlink-ification of arp. This patch re-introduces this filtering functionality. This patch also improves by-interface filtering by storing and using the ifindex of the requested interface for filtering instead of comparing interface name strings Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") --- usr.sbin/arp/arp.c | 34 +++++++++++++++------------------- usr.sbin/arp/arp.h | 2 ++ usr.sbin/arp/arp_netlink.c | 8 ++++++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 02b2bb1ac4f8..9a19d792f788 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -98,8 +98,6 @@ static int get_ether_addr(in_addr_t ipaddr, struct ether_addr *hwaddr); static int set_rtsock(struct sockaddr_in *dst, struct sockaddr_dl *sdl_m, char *host); -static char *rifname; - struct if_nameindex *ifnameindex; struct arp_opts opts = {}; @@ -146,7 +144,7 @@ main(int argc, char *argv[]) SETFUNC(F_FILESET); break; case 'i': - rifname = optarg; + opts.rifname = optarg; break; case '?': default: @@ -157,15 +155,15 @@ main(int argc, char *argv[]) if (!func) func = F_GET; - if (rifname) { + if (opts.rifname) { if (func != F_GET && !(func == F_DELETE && opts.aflag)) xo_errx(1, "-i not applicable to this operation"); - if (if_nametoindex(rifname) == 0) { + if ((opts.rifindex = if_nametoindex(opts.rifname)) == 0) { if (errno == ENXIO) xo_errx(1, "interface %s does not exist", - rifname); + opts.rifname); else - xo_err(1, "if_nametoindex(%s)", rifname); + xo_err(1, "if_nametoindex(%s)", opts.rifname); } } switch (func) { @@ -179,7 +177,7 @@ main(int argc, char *argv[]) xo_open_list("arp-cache"); struct in_addr all_addrs = {}; - print_entries(0, all_addrs); + print_entries(opts.rifindex, all_addrs); xo_close_list("arp-cache"); xo_close_container("arp"); @@ -448,13 +446,13 @@ get(char *host) xo_open_container("arp"); xo_open_list("arp-cache"); - found = print_entries(0, addr->sin_addr); + found = print_entries(opts.rifindex, addr->sin_addr); if (found == 0) { xo_emit("{d:hostname/%s} ({d:ip-address/%s}) -- no entry", host, inet_ntoa(addr->sin_addr)); - if (rifname) - xo_emit(" on {d:interface/%s}", rifname); + if (opts.rifname) + xo_emit(" on {d:interface/%s}", opts.rifname); xo_emit("\n"); } @@ -552,7 +550,6 @@ search(u_long addr, action_fn *action) struct rt_msghdr *rtm; struct sockaddr_in *sin2; struct sockaddr_dl *sdl; - char ifname[IF_NAMESIZE]; int st, found_entry = 0; mib[0] = CTL_NET; @@ -586,14 +583,13 @@ search(u_long addr, action_fn *action) rtm = (struct rt_msghdr *)next; sin2 = (struct sockaddr_in *)(rtm + 1); sdl = (struct sockaddr_dl *)((char *)sin2 + SA_SIZE(sin2)); - if (rifname && if_indextoname(sdl->sdl_index, ifname) && - strcmp(ifname, rifname)) + if (opts.rifindex && + (opts.rifindex != sdl->sdl_index)) continue; - if (addr) { - if (addr != sin2->sin_addr.s_addr) - continue; - found_entry = 1; - } + if (addr && + (addr != sin2->sin_addr.s_addr)) + continue; + found_entry = 1; (*action)(sdl, sin2, rtm); } free(buf); diff --git a/usr.sbin/arp/arp.h b/usr.sbin/arp/arp.h index a7de3a1a3024..487863be43e7 100644 --- a/usr.sbin/arp/arp.h +++ b/usr.sbin/arp/arp.h @@ -10,6 +10,8 @@ struct arp_opts { bool nflag; time_t expire_time; int flags; + char *rifname; + unsigned int rifindex; }; extern struct arp_opts opts; diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 4e5c8f3d9940..40b5367f330d 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -281,6 +281,7 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) struct ndmsg *ndmsg = snl_reserve_msg_object(&nw, struct ndmsg); if (ndmsg != NULL) { ndmsg->ndm_family = AF_INET; + /* let kernel filter results by interface if provided */ ndmsg->ndm_ifindex = ifindex; } @@ -296,6 +297,7 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) while ((hdr = snl_read_reply_multi(&ss_req, nlmsg_seq, &e)) != NULL) { struct snl_parsed_neigh neigh = {}; + struct sockaddr_in *neighaddr; if (!snl_parse_nlmsg(&ss_req, hdr, &snl_rtm_neigh_parser, &neigh)) continue; @@ -307,6 +309,12 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) continue; } + /* filter results based on host if provided */ + neighaddr = (struct sockaddr_in *)neigh.nda_dst; + if (addr.s_addr && + (addr.s_addr != neighaddr->sin_addr.s_addr)) + continue; + print_entry(&neigh, &link); count++; snl_clear_lb(&ss_req); From nobody Thu Sep 14 10:32:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmYXw2D6vz4sW6l; Thu, 14 Sep 2023 10:32:16 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmYXw1hGlz4rSc; Thu, 14 Sep 2023 10:32:16 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694687536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=coVzIuJ7+kMrfrOLE2aBiTMD7ag8GSGB8EOSHGwvRs4=; b=K+3rnVeyhral7JEzJ+IDGrTQAnw4kIUTCoLbW/V6ta6bF+XN1JGP0Sc0qwbn66hz3owE7E StzB6kVPcwe29CdpVwnp1rkdByYbCTTCrJ4BNzxuS4/PX+odmEoQqaHzxtl33VxG+YWhT0 cXdmXwg3glfF9Vawo00nneLtyNpLN5kspVEjMyMH85i1s9lsa22jVZxbmzImLy7DFYEyim OpCiyBhUa9i9Z76kg8Esoy7iBYFtKI7QZzCggmgWCQcG6HRAsDQRTbbZVvGmt+K3ZsfYhj qAsZXwC/Da799Gg31g59ax37WUUNOP6KlqdcBSeiAWoFGbs++zGz0GqHXgB9nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694687536; a=rsa-sha256; cv=none; b=XWSCKx0RCWhO6pvbN9KrAqiKtuFP1HrjxlhFQq7L5TIjkVCsiZI8oRrK/TExEkkFizq8LR jbT3PfKOGId+Sp+Kz+64CrHFKB5VzjCpp4dBfvhq9XXoeVCZVJer4r6UARyyOE4VhjpuG0 wtVXQM2v4cBUSMH2aR3JI/dUxlUXiyc6I+1MzSX4AzekLKuK85WEmSsTOxf+Jzfj+NM2AS MT4M8E7TxWz1ifuJWRtVypQ5XMnJjRW05vUbJJ79oFl9adKuVaQl0sAlRIp3ZAWcAxsdvT 9BQqILEU+HxEHvfSa+3P4nRvI5WVlerGUEpBz7bL7Mqo6Y4BLQdD/77JKLv73w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694687536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=coVzIuJ7+kMrfrOLE2aBiTMD7ag8GSGB8EOSHGwvRs4=; b=y1dunaVRwgRW2uXQO2gQEWQCL1gFZE0G2HMPlA5XsHQh3aKFqov3yxopsjSuJ/efRNWJba UfFG3o6RZPXKsj20gvZl9WwM4VE7RDj4zA6ScFhJ2JfGSGsb+0bhustET3eetdh8SUqbiw iBYFtJZtwrhTzIrsomfUONprxw2QkD6y8IxaZEMgizLIwaSuaSphr5ttbH09hqr7dhmu68 /WAkwB3nuilL7zW7rQ3Ae3uuGEsS27X/daLxm9ip2r5NEO9Y6U4TfKRxBJ4k3Fua0EKMDX Ctw1fy+HPdHZ8c1BUL3VH+DRBruaezDEifnPHYEVBLqYCfygH2/Ky7/pVM7DDg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RmYXw01qBz1MSH; Thu, 14 Sep 2023 10:32:15 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 567EF7B66; Thu, 14 Sep 2023 12:32:14 +0200 (CEST) From: Kristof Provost To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 79278872ad96 - main - arp(8): fix by-interface and by-host filtering when using netlink Date: Thu, 14 Sep 2023 11:32:13 +0100 X-Mailer: MailMate (1.14r5937) Message-ID: <006642B7-EA17-4292-94A4-0562FC94EC71@FreeBSD.org> In-Reply-To: <202309141014.38EAEOjG011000@gitrepo.freebsd.org> References: <202309141014.38EAEOjG011000@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 14 Sep 2023, at 11:14, Kristof Provost wrote: > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D79278872ad966e5f54805efb= eb692c8cbc0306c8 > > commit 79278872ad966e5f54805efbeb692c8cbc0306c8 > Author: R. Christian McDonald > AuthorDate: 2023-09-14 07:07:24 +0000 > Commit: Kristof Provost > CommitDate: 2023-09-14 08:14:10 +0000 > > arp(8): fix by-interface and by-host filtering when using netlink > > arp(8) has traditionally supported filtering by interface via -i an= d > by hostname. However, this functionality was omitted from the initi= al > netlink-ification of arp. This patch re-introduces this filtering > functionality. > > This patch also improves by-interface filtering by storing and usin= g the > ifindex of the requested interface for filtering instead of compari= ng > interface name strings > > Reviewed by: melifaro > Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41839 =E2=80=94 Kristof From nobody Thu Sep 14 10:34:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmYb63BVlz4sWmb; Thu, 14 Sep 2023 10:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmYb62hfzz4s3C; Thu, 14 Sep 2023 10:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694687650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTigjqPH6iW6NaJZIZ5Q7qbj8ZZvHJbic9TMPEqiqKU=; b=bWctJ6SxXM13ek+9tHqrlVZjzoTrpXQgo1HoFY65vh0oavneF1FROFg3D+g9X1g0SnPClg 2Of7xsrN9qdhWIW4WF79RypeEc8Q9K2cxieA98TtMWjrzuO1qcIw7UvUy6Ari5gKi8hRks JO+dyeCkJ/EeF2mzD/lO9RSsPS8GT9fs65dur03t9dFaC8/gRaydbqKXmjUuX4GGtSPQw7 1kynwXKvvCxguvatHVo4gyKDYGmnhvl40oE4OeJ+27Ojy7T0mK1cBv67ajWB3VTmy/VCgf pN4wqd4gI4PBvvxXWfzWarbuiuYrkjV9SZKBJUhKHykNA0Sl38l8qUZbIjgHqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694687650; a=rsa-sha256; cv=none; b=coE+bg2z+PdJc9rFrb7P73nUWyhQVYlB/iNRoITwvHNeqhcHP5dXjhEKQN04vmWTu0CA2Y 8AJ8s0SKoEmXZkbNkCfBExzosw/4xq34llE4ApuDU5unC9MZRekppn65+vQwG3D9XVYUf/ +JET3AfmCiEEd6T3Jj/ofZh0P+TIPw37NEbLr3eQ+YeQ+9cbHTkuNSI5H1+4bdMylUb43N hX72c2WCm8XaKOQp6M6cGFRGYQaQd7j87D/ugniPDZTw+9jdELMd9BKytZ+8JOmbUkgqdi X+7dXLSCzKMAD3jd++OmmnNSLdfK8XBU91q7yrA4Yvt36F+plT9goq0mhKFPLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694687650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTigjqPH6iW6NaJZIZ5Q7qbj8ZZvHJbic9TMPEqiqKU=; b=xevPJAALlvcTxEtLyS/lytpxl7Virj9V7tkqPNWadT93gCYFP5POVz/Wg/TprYZU0xkOMF pyAxGn+HPFaw87vD/NvGn3qmdHuc1U2EfTNLolDzVk5NICXZ86r05Jjhqn8Ogh11ELuzKd paCc7FWnOCQZvP9VuTlLiDsf3hsjj6ztHYxHY/nosGyjqDsju5A8aoiMnt7y+fCW2OqnG1 nuVNFTqLn9HzNpKRCDDXcpz75C0dC2GCyzhO+FERz3o8sZBIx5spXDtQPkUi9xzcBg8MgG v0vgfTr4YW+NIHfKoL/WXx6aZXH2X6tyxABYUO/OS2d3RHOzYp6Cdp1Ci0RBbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmYb61pmvztPG; Thu, 14 Sep 2023 10:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EAYAmB043620; Thu, 14 Sep 2023 10:34:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EAYAtS043617; Thu, 14 Sep 2023 10:34:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 10:34:10 GMT Message-Id: <202309141034.38EAYAtS043617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 027418a4d8bd - stable/13 - blackhole(4): disable for locally originated TCP/UDP packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 027418a4d8bdf58b606fab7505bcb841cc3a6d7c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=027418a4d8bdf58b606fab7505bcb841cc3a6d7c commit 027418a4d8bdf58b606fab7505bcb841cc3a6d7c Author: Gleb Smirnoff AuthorDate: 2021-10-28 15:11:45 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:54:04 +0000 blackhole(4): disable for locally originated TCP/UDP packets In most cases blackholing for locally originated packets is undesired, leads to different kind of lags and delays. Provide sysctls to enforce it, e.g. for debugging purposes. Reviewed by: rrs Differential revision: https://reviews.freebsd.org/D32718 (cherry picked from commit 3ea9a7cf7b09a355cde3a76824809402b99d0892) (cherry picked from commit ad3ad06477d013371b95af673a9776c62f49a97f) --- share/man/man4/blackhole.4 | 12 +++++++++++- sys/netinet/tcp_input.c | 19 +++++++++++++++++-- sys/netinet/udp_usrreq.c | 7 ++++++- sys/netinet/udp_var.h | 2 ++ sys/netinet6/udp6_usrreq.c | 3 ++- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4 index f7256146eaef..00c8e3d7a2b6 100644 --- a/share/man/man4/blackhole.4 +++ b/share/man/man4/blackhole.4 @@ -10,7 +10,7 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.Dd September 6, 2015 +.Dd November 3, 2021 .Dt BLACKHOLE 4 .Os .Sh NAME @@ -22,7 +22,9 @@ attempts .Sh SYNOPSIS .Cd sysctl net.inet.sctp.blackhole Ns Op = Ns Brq "0 | 1 | 2" .Cd sysctl net.inet.tcp.blackhole Ns Op = Ns Brq "0 | 1 | 2" +.Cd sysctl net.inet.tcp.blackhole_local Ns Op = Ns Brq "0 | 1" .Cd sysctl net.inet.udp.blackhole Ns Op = Ns Brq "0 | 1" +.Cd sysctl net.inet.udp.blackhole_local Ns Op = Ns Brq "0 | 1" .Sh DESCRIPTION The .Nm @@ -33,6 +35,14 @@ are received on SCTP, TCP, or UDP ports where there is no socket listening. The blackhole behaviour is useful to slow down an attacker who is port-scanning a system in an attempt to detect vulnerable services. It might also slow down an attempted denial of service attack. +.Pp +The blackhole behaviour is disabled by default. +If enabled, the locally originated packets would still be responded to, +unless also +.Va net.inet.tcp.blackhole_local +(for TCP) and/or +.Va net.inet.udp.blackhole_local +(for UDP) are enforced. .Ss SCTP Setting the SCTP blackhole MIB to a numeric value of one will prevent sending an ABORT packet in response to an incoming INIT. diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b57c4e667371..d3145881ecf9 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -142,6 +142,12 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(blackhole), 0, "Do not send RST on segments to closed ports"); +VNET_DEFINE(bool, blackhole_local) = false; +#define V_blackhole_local VNET(blackhole_local) +SYSCTL_BOOL(_net_inet_tcp, OID_AUTO, blackhole_local, CTLFLAG_VNET | + CTLFLAG_RW, &VNET_NAME(blackhole_local), false, + "Enforce net.inet.tcp.blackhole for locally originated packets"); + VNET_DEFINE(int, tcp_delack_enabled) = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, delayed_ack, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_delack_enabled), 0, @@ -949,8 +955,17 @@ findpcb: * When blackholing do not respond with a RST but * completely ignore the segment and drop it. */ - if ((V_blackhole == 1 && (thflags & TH_SYN)) || - V_blackhole == 2) + if (((V_blackhole == 1 && (thflags & TH_SYN)) || + V_blackhole == 2) && (V_blackhole_local || ( +#ifdef INET6 + isipv6 ? !in6_localaddr(&ip6->ip6_src) : +#endif +#ifdef INET + !in_localip(ip->ip_src) +#else + true +#endif + ))) goto dropunlock; rstreason = BANDLIM_RST_CLOSEDPORT; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 9ec671f9fbdd..a476b0d8251a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -125,6 +125,10 @@ VNET_DEFINE(int, udp_blackhole) = 0; SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(udp_blackhole), 0, "Do not send port unreachables for refused connects"); +VNET_DEFINE(bool, udp_blackhole_local) = false; +SYSCTL_BOOL(_net_inet_udp, OID_AUTO, blackhole_local, CTLFLAG_VNET | + CTLFLAG_RW, &VNET_NAME(udp_blackhole_local), false, + "Enforce net.inet.udp.blackhole for locally originated packets"); u_long udp_sendspace = 9216; /* really max datagram size */ SYSCTL_ULONG(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW, @@ -708,7 +712,8 @@ udp_input(struct mbuf **mp, int *offp, int proto) UDPSTAT_INC(udps_noportbcast); goto badunlocked; } - if (V_udp_blackhole) + if (V_udp_blackhole && (V_udp_blackhole_local || + !in_localip(ip->ip_src))) goto badunlocked; if (badport_bandlim(BANDLIM_ICMP_UNREACH) < 0) goto badunlocked; diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 39f39c3d77ee..99388acbc3b7 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -148,9 +148,11 @@ extern u_long udp_sendspace; extern u_long udp_recvspace; VNET_DECLARE(int, udp_cksum); VNET_DECLARE(int, udp_blackhole); +VNET_DECLARE(bool, udp_blackhole_local); VNET_DECLARE(int, udp_log_in_vain); #define V_udp_cksum VNET(udp_cksum) #define V_udp_blackhole VNET(udp_blackhole) +#define V_udp_blackhole_local VNET(udp_blackhole_local) #define V_udp_log_in_vain VNET(udp_log_in_vain) VNET_DECLARE(int, zero_checksum_port); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4c5651f10a58..726c79c97de6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -509,7 +509,8 @@ skip_checksum: UDPSTAT_INC(udps_noportmcast); goto badunlocked; } - if (V_udp_blackhole) + if (V_udp_blackhole && (V_udp_blackhole_local || + !in6_localaddr(&ip6->ip6_src))) goto badunlocked; icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); *mp = NULL; From nobody Thu Sep 14 11:54:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmbN56gp7z4t09s; Thu, 14 Sep 2023 11:54: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 4RmbN55wQDz3PZZ; Thu, 14 Sep 2023 11:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GE1vX8nQDA+Omw3yccRTQBEy0vGuC5OqHxqae63mPbQ=; b=I+A1Ns6VL3FfJcLH3kRj198RZIn9C19FvUQF1Ckn8T0vJ6NsqHwfevdUYyGtDIhZKaXkVO XCuLzStkMe+VtYyyrCseGE/b1TCXJzH+zqtKJEI/nkY+Xu3MPxVLypta460MB7ZcmS7J0e AHF+bE1KtC2PcBMYI3pB/sgFB2OszAdfRDuzKhTPMTWesZMqXLLJ+iraoZy51ue5OF74uU nL15fE1BCAH4BH6nBEMjKV5DTZzK2lZdLvAS4fe87YjojTkIzjQ9OHQRE6yK1Eq11MUcOL WDQnYsJF+NAO5iNayhJFzAOfMjJsji/VQHw2PkWwu8/hAulQRQ5Pf9cEhAGDEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694692485; a=rsa-sha256; cv=none; b=RIfil2Bg4OfPksd0Y16n7yTSfAJ3fHl6qNHxsaPvdbBQzWJSj80zQTGTohtTSmHZED+McS oLfqQ/zmWvcIVajrckieDlqgU/dAIDKwjXzcxvvu7CXXRq3JD6hnDNNpqeAWWpAUUSBXXM riECdqf7laB9f2/AltX/WKhiryNrFYGPrqYpbNC1A0t/PK2Ukdh+dYlm2VlvACcfLlGDm0 GOlzGhwgwMZmMLA5Y0Tt6yPcWAcf4dvgJmKcmYwbSpfZVnsjHvW3VHLmWuVDiwTmfgY9gL LRS/AR2gvx/NonTotKWKMLXAx7I/afcTEbNarVwLodzbIeWuMsKDb6tu4mSfvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GE1vX8nQDA+Omw3yccRTQBEy0vGuC5OqHxqae63mPbQ=; b=q8GGq9Fms9nbM07adltSTKgplW+Wnz+PPeDzb+VvnfUh15sS9m5/b/mSSwxumLYxxWViu6 z/KXzOlhaQqgt/2ZbeXnTgNgBv5KGVX0Fjy/frdEO1RzlO1LWqRDCdn5+iBTmBdCtP29kL MmoVIXdGL3S/dLxqXe43sYDSSN+jG19xs4OaAbcYm5j/9f5EOPPCikkJjan80zlmNoCkOH K9I/vCyT37t97/5FyKe7N0VmaZKi/wtnmI/ilPjejgx1o5lbRP902HHUoeK1yctGm1UIYW bCZJm3r+x1wT2jrtU/xj8WYX1YcFEpEZFr88Zge09+xk+Dx8IPhcscTesyhmhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmbN54w5tzwFP; Thu, 14 Sep 2023 11:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EBsjAP078066; Thu, 14 Sep 2023 11:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EBsjVt078063; Thu, 14 Sep 2023 11:54:45 GMT (envelope-from git) Date: Thu, 14 Sep 2023 11:54:45 GMT Message-Id: <202309141154.38EBsjVt078063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 361edbdc89bf - stable/14 - MFC: unbreak BEGEMOT-LM75-MIB.txt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 361edbdc89bf031955c901ca5b317eeefbc0f633 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=361edbdc89bf031955c901ca5b317eeefbc0f633 commit 361edbdc89bf031955c901ca5b317eeefbc0f633 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 11:53:35 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index c4cf536e5043..7966f6535f15 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -35,7 +35,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -59,7 +59,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -67,7 +67,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -80,7 +80,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 11:58:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmbSN0n8zz4t10K; Thu, 14 Sep 2023 11:58: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 4RmbSN0KwCz3QZ2; Thu, 14 Sep 2023 11:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3AneFQR16p7gPrfk5iiOcJEad2qEYE0t/nPtBHhFjQ=; b=Vdfr3bJ4JnX4KEGNqOABEx9GoQkmDsXlmag79rYJ7apiLhQl9pTgP1+bV8WV3I5VBa/DUc nEJTa/WivsOtxdFdQmt+zAzgYUXLyzVGu7gLPggWbHisDxieXRB3al+PP0hH9qJKn9YAFM gbwk0W4WAe8L6Tc92GWW4YZl9kiuhjQZD7NIvfs4zO6AiE+OyuAmVNFPGasjfeAwn6/2/m NgwtDs/UAFl4ZVjlwoCkV4dBhTnOEQi+K23GKfcmXO0R+QbdYEUTn3wZba2VX9D8G0+IIv v6UgD4KA0Xg0g8ZE059jXC1zEKGrbhjeoHEuLjw+yvxEFCFHSnd7dvvGK/4g3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694692708; a=rsa-sha256; cv=none; b=pKT6qnNGyWuus2znRKu14CAIKs93qC/UAZRtaiRBYbVVFU+YQm4rLvtb5q2w1Nec4Y2pt0 rmLGvxXRv0jSlNhwG6bBwwCwDFIiZfb629gM0e92oyuNY/yA+L/nnLmsfg1iTaMtRDgT1h J0XLqcmb8frja4N6EgJSc2sBYrVNJUhRmI3cYmonNRoN/yLJoM2ZKLxoDW7fvyzGvPrQQa uewFckfCe+y2Yq+BoAdzkIplXTvqV1J0k3FjirbczXjTFgSW9M7fyf8IJ05m+iLduq7HEf i0PRyzP8zj8m6IYx41OJJGFLTcaqqzxfVNXCmYBHUxqVB6XnE7Ct7puIdj+GHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3AneFQR16p7gPrfk5iiOcJEad2qEYE0t/nPtBHhFjQ=; b=i2pjHiRy1Ug/y1LcU5eioJA7lBBw9yC58uBBu72DK3bDxlYXZmAkXWK/B4arOSmu8X0vG6 9C910K+Vnak1rDqeVhMU61KH1L4jXq4ZwhbtNwxjsHQHCmRETd56yWVsWkdo8ArVn3RvK8 g52FjUhWSWz0njdsv7UVlgQo6KyXXvr/fON3JrC7Aeq0FDNUvVmKSoyueK0bZOvj5h14Mv dXKKo/Wk4Kph/qcjBWwdyZwP9denlRTRAVqtfGHfs4xaLUVHKwKrp3WdqRRaWCpmJNfyKt IcWTeOrK5ZexnQwbBqin27bNgDHZHAfqGEpKOZzxYdCcjBq4KR8WFxO5DkkqAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmbSM6Wfkzw3P; Thu, 14 Sep 2023 11:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EBwR1D078688; Thu, 14 Sep 2023 11:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EBwRCu078685; Thu, 14 Sep 2023 11:58:27 GMT (envelope-from git) Date: Thu, 14 Sep 2023 11:58:27 GMT Message-Id: <202309141158.38EBwRCu078685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 4cc4afd6660e - stable/13 - MFC: unbreak BEGEMOT-LM75-MIB.txt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4cc4afd6660e8680716ed54d13086e26833c4dd3 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=4cc4afd6660e8680716ed54d13086e26833c4dd3 commit 4cc4afd6660e8680716ed54d13086e26833c4dd3 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 11:58:23 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index c4cf536e5043..7966f6535f15 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -35,7 +35,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -59,7 +59,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -67,7 +67,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -80,7 +80,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 12:12:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmbm43Gb4z4t4Pm; Thu, 14 Sep 2023 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmbm42qyqz3SPL; Thu, 14 Sep 2023 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694693524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iswkvVUNN6fbkq8ilkWfgWJuyr2HT+QhntWx5gdjLk8=; b=P6JMXs41D734vBXFoqLbLzkze7z9V9FUJFmGOV/aonwD1uBGWMOEk6njCUcfmCl7O0jEOX 0N97sEI1D4CMO2TzVbpBslBkdwiqMUIAC340xiSi8GxAnFYcFrOl27+pAhNLVqPakVAAPs Tw66HlnAolrzkJoSiMyuqVWDq0UgLDQMaadsrft+V8da2UBh5lFqIYtjSacrbW7RS5E5F9 r8AXQdBG16bmm/sm2lk41l0sNlAMXZCQJxlPaWCiyuhsNpKMEYbaYgEXj3xHseuUoihkH+ I/udqphw4nlBVZBdfZJsIbJBUbe6jPIDzIG6+XjuymInDEWoeovcftLqm/0otQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694693524; a=rsa-sha256; cv=none; b=oKCyMsZK1j3xpGc/aRqkWeBC+Of/Djl85lLhTvUg/PDDcamI6UTCYWp0cYGF9iDKRGMvBw gwikg4MaeMCxkPt/GO+AU7+T4feQyHlomupSiavIS4Es1NyU7GcVUuiNrvTDEhfG15vCOC wWZm0rWQ3NSnEgnFdZPWWHHTXT2M39mjfCn9N7Yu0lwa5phEXN3KXmSTP5Ufgx/OsbsFsB EQ4/NtRDnbnOCg7+k1STgtaoaoUpIxWdnvR4yRYOuHzC7iLgJFI+2j6wOcamNcKCDXXQJc l92bOYRjBAdQ+8daLGZ2QnHInHe5UOImdYEaEx/CEdG6GOV4EthMosQt5Hmd/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694693524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iswkvVUNN6fbkq8ilkWfgWJuyr2HT+QhntWx5gdjLk8=; b=Lw4K0niCL+PFBwibON74pVXmkLm4QNZHuxwvKZ9D98SC8FfeUFENjw4pC5nBhvxGjsvcrb No11+bCC4Ir9EG17tw5Xb+Q7CAbU7KuZo/1dg2TtzJuY+d1P8gdgsI3YfdNPT6uK8wfa/7 GrFj83R8SgAaHboaVOseULpkTzAnfeJ8GCmMcIFfi2I5m14tff2bcVuGh7sTgNA6TlsbEE BlDtXGqfcAJWlgjrnNu7kAoh5KdgiCF+Otnd/UhKRLTPaiq/IdfLQaL+Nne5J+kmjXUjrG JhqK195w9Vi7vH1jLeNSfd/jGzdMWNtpo+UT9FeWxda23LMCdWvroByvMiL1+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmbm41vzTzx26; Thu, 14 Sep 2023 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ECC4eH009241; Thu, 14 Sep 2023 12:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ECC4Am009223; Thu, 14 Sep 2023 12:12:04 GMT (envelope-from git) Date: Thu, 14 Sep 2023 12:12:04 GMT Message-Id: <202309141212.38ECC4Am009223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: b167e449c8db - main - mana: add lro and tso stat counters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b167e449c8db01f082691503fb5c1255ad5750eb Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=b167e449c8db01f082691503fb5c1255ad5750eb commit b167e449c8db01f082691503fb5c1255ad5750eb Author: Wei Hu AuthorDate: 2023-09-14 11:56:20 +0000 Commit: Wei Hu CommitDate: 2023-09-14 12:10:49 +0000 mana: add lro and tso stat counters Add a few stat counters for tso and lro. MFC after: 3 days Sponsored by: Microsoft --- sys/dev/mana/mana.h | 5 ++ sys/dev/mana/mana_en.c | 12 ++++ sys/dev/mana/mana_sysctl.c | 136 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index 9a22ea87baa3..ab394f3203ad 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -170,6 +170,9 @@ struct mana_txq { struct mtx txq_mtx; char txq_mtx_name[16]; + uint64_t tso_pkts; + uint64_t tso_bytes; + struct task enqueue_task; struct taskqueue *enqueue_tq; @@ -423,6 +426,8 @@ struct mana_rxq { uint32_t buf_index; + uint64_t lro_tried; + uint64_t lro_failed; struct mana_stats stats; /* MUST BE THE LAST MEMBER: diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 064b28fa94a4..812a42e51dfc 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -501,6 +501,7 @@ mana_xmit(struct mana_txq *txq) struct gdma_queue *gdma_sq; struct mana_cq *cq; int err, len; + bool is_tso; gdma_sq = txq->gdma_sq; cq = &apc->tx_qp[txq->idx].tx_cq; @@ -578,7 +579,10 @@ mana_xmit(struct mana_txq *txq) pkg.wqe_req.flags = 0; pkg.wqe_req.client_data_unit = 0; + is_tso = false; if (mbuf->m_pkthdr.csum_flags & CSUM_TSO) { + is_tso = true; + if (MANA_L3_PROTO(mbuf) == ETHERTYPE_IP) pkg.tx_oob.s_oob.is_outer_ipv4 = 1; else @@ -641,6 +645,11 @@ mana_xmit(struct mana_txq *txq) packets++; bytes += len; + + if (is_tso) { + txq->tso_pkts++; + txq->tso_bytes += len; + } } counter_enter(); @@ -1697,9 +1706,12 @@ mana_rx_mbuf(struct mbuf *mbuf, struct mana_rxcomp_oob *cqe, do_if_input = true; if ((if_getcapenable(ndev) & IFCAP_LRO) && do_lro) { + rxq->lro_tried++; if (rxq->lro.lro_cnt != 0 && tcp_lro_rx(&rxq->lro, mbuf, 0) == 0) do_if_input = false; + else + rxq->lro_failed++; } if (do_if_input) { if_input(ndev, mbuf); diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index 79a4867a0abf..d03ebe44ab31 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -46,6 +46,96 @@ SYSCTL_INT(_hw_mana, OID_AUTO, log_level, CTLFLAG_RWTUN, SYSCTL_CONST_STRING(_hw_mana, OID_AUTO, driver_version, CTLFLAG_RD, DRV_MODULE_VERSION, "MANA driver version"); +static int +mana_sysctl_rx_stat_agg_u64(SYSCTL_HANDLER_ARGS) +{ + struct mana_port_context *apc = arg1; + int offset = arg2, i, err; + struct mana_rxq *rxq; + uint64_t stat; + + stat = 0; + for (i = 0; i < apc->num_queues; i++) { + rxq = apc->rxqs[i]; + stat += *((uint64_t *)((uint8_t *)rxq + offset)); + } + + err = sysctl_handle_64(oidp, &stat, 0, req); + if (err || req->newptr == NULL) + return err; + + for (i = 0; i < apc->num_queues; i++) { + rxq = apc->rxqs[i]; + *((uint64_t *)((uint8_t *)rxq + offset)) = 0; + } + return 0; +} + +static int +mana_sysctl_rx_stat_u16(SYSCTL_HANDLER_ARGS) +{ + struct mana_port_context *apc = arg1; + int offset = arg2, err; + struct mana_rxq *rxq; + uint64_t stat; + uint16_t val; + + rxq = apc->rxqs[0]; + val = *((uint16_t *)((uint8_t *)rxq + offset)); + stat = val; + + err = sysctl_handle_64(oidp, &stat, 0, req); + if (err || req->newptr == NULL) + return err; + else + return 0; +} + +static int +mana_sysctl_rx_stat_u32(SYSCTL_HANDLER_ARGS) +{ + struct mana_port_context *apc = arg1; + int offset = arg2, err; + struct mana_rxq *rxq; + uint64_t stat; + uint32_t val; + + rxq = apc->rxqs[0]; + val = *((uint32_t *)((uint8_t *)rxq + offset)); + stat = val; + + err = sysctl_handle_64(oidp, &stat, 0, req); + if (err || req->newptr == NULL) + return err; + else + return 0; +} + +static int +mana_sysctl_tx_stat_agg_u64(SYSCTL_HANDLER_ARGS) +{ + struct mana_port_context *apc = arg1; + int offset = arg2, i, err; + struct mana_txq *txq; + uint64_t stat; + + stat = 0; + for (i = 0; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; + stat += *((uint64_t *)((uint8_t *)txq + offset)); + } + + err = sysctl_handle_64(oidp, &stat, 0, req); + if (err || req->newptr == NULL) + return err; + + for (i = 0; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; + *((uint64_t *)((uint8_t *)txq + offset)) = 0; + } + return 0; +} + void mana_sysctl_add_port(struct mana_port_context *apc) { @@ -99,6 +189,52 @@ mana_sysctl_add_port(struct mana_port_context *apc) CTLFLAG_RD, &port_stats->rx_drops, "Receive packet drops"); SYSCTL_ADD_COUNTER_U64(ctx, stats_list, OID_AUTO, "tx_drops", CTLFLAG_RD, &port_stats->tx_drops, "Transmit packet drops"); + + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "rx_lro_queued", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_queued), + mana_sysctl_rx_stat_agg_u64, "LU", "LRO queued"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "rx_lro_flushed", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_flushed), + mana_sysctl_rx_stat_agg_u64, "LU", "LRO flushed"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "rx_lro_bad_csum", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_bad_csum), + mana_sysctl_rx_stat_agg_u64, "LU", "LRO bad checksum"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "rx_lro_tried", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro_tried), + mana_sysctl_rx_stat_agg_u64, "LU", "LRO tried"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "rx_lro_failed", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro_failed), + mana_sysctl_rx_stat_agg_u64, "LU", "LRO failed"); + + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "lro_ackcnt_lim", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_ackcnt_lim), + mana_sysctl_rx_stat_u16, + "LU", "Max # of ACKs to be aggregated by LRO"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "lro_length_lim", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_length_lim), + mana_sysctl_rx_stat_u32, + "LU", "Max len of aggregated data in byte by LRO"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "lro_cnt", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_rxq, lro.lro_cnt), + mana_sysctl_rx_stat_u32, + "LU", "Max # or LRO packet count"); + + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "tx_tso_packets", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_txq, tso_pkts), + mana_sysctl_tx_stat_agg_u64, "LU", "TSO packets"); + SYSCTL_ADD_PROC(ctx, stats_list, OID_AUTO, "tx_tso_bytes", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, apc, + __offsetof(struct mana_txq, tso_bytes), + mana_sysctl_tx_stat_agg_u64, "LU", "TSO bytes"); } void From nobody Thu Sep 14 12:26:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmc5448T7z4t8ZV; Thu, 14 Sep 2023 12:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmc543kF2z3VNH; Thu, 14 Sep 2023 12:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694694408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHg+uw6REb5QTSya9Vdkx9gBKEORmMiXPV5ZD5iXqIo=; b=tWVqb2Mw1lnrr5DB7JHtB4RXBJff0GHcPmyLrFhTnLm5qVKW5fs4h4+5hW3Vwzsx1+k0S0 8Blod/6RImOb1/JtcbEl2Co+wKFz9WG2cqCvToeRuNYw2arWY3XZF5zrK99Ic6cVhvdBlJ qRvaZan6YqgSe++ftJbTZpN4Klpmw44rdgsM0ZteNihXRrg1WR2ecGx/1M2fBQaH6klkF8 sFSGEy7WLzLy9lh/L3r7Mz0M4meaa3JJ2FoC7O4HbEi+PPcTQbqm7Or9c0TL/8Umnk7fZM GOBr8al/HtmaymmpBAf8Qg+8D40p6JLxVScF9OkzWWVp8XMao02LjzPWIFgIhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694694408; a=rsa-sha256; cv=none; b=ji6uX+fj2guu31YXCzW6keWc5Vi1/MgLcwvyuD/q4qFRL6BAqZUViIQCtG96WsE2Ya9hrC ouJq4rX5GinhDjUV3aNjwcNAeJ2CRxQI3m9NkeNfxHJ5CvZdn9OMsUj61IMlcgno7J2Dps mjY9XwMx91SFuTtQoHthniyCYNu/Ri1ONDujJaQhzg3gae/og2FyHAW1hvN6Mx9TU3g7cX mp6WUKGxor4HBu7BqrfGiLBznapJpL8RfAxvtAvwCyUHbDJA059hlhXRMCuAERbW3hdY+C /96GUgvhZsoRo+fGyGsOe4ku0bD9HdSdsB9lWdxSzlUMaXyn/+ajZmJTNG1IMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694694408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHg+uw6REb5QTSya9Vdkx9gBKEORmMiXPV5ZD5iXqIo=; b=qV6GupQDdnglG9m/COUbPKx2x5RY6GALaCSbLwWCszsfkxQHuZHe/CA++uCX4zXehco08v AlfbE3PNntqrM9NjQqhF0fBcEUCJp+IFHeTy5m9Vl+JsBgY43LkkIuW5zwID9xbCnMWrHX JFE+zk+2vyJWhogGQsR0/poLHqKqO5i+EPhEdYwAqtsw+Vu/3r3jHOSkt3FVljgFgjA6lc O0XmcKYSUlnIO1JYI0H9XvkXz6qRSIJjlQyMZJxoEOyVWy9eD2L77Dx+/dJ38ekahppj+t aMYjW2JwRRCm2PdmHucYUOIowjgTDJW3vDIVSNoeCbBSJ/n/Al3Fq+q/MpuE9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmc542StczwsP; Thu, 14 Sep 2023 12:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ECQm1h029042; Thu, 14 Sep 2023 12:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ECQmso029039; Thu, 14 Sep 2023 12:26:48 GMT (envelope-from git) Date: Thu, 14 Sep 2023 12:26:48 GMT Message-Id: <202309141226.38ECQmso029039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: e21f1fa8fa98 - stable/12 - MFC: unbreak BEGEMOT-LM75-MIB.txt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e21f1fa8fa98506b1bfb195b02132a84549e89a2 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e21f1fa8fa98506b1bfb195b02132a84549e89a2 commit e21f1fa8fa98506b1bfb195b02132a84549e89a2 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 12:24:51 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index f8f52a639be0..861df8192fc0 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -37,7 +37,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -61,7 +61,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -69,7 +69,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -82,7 +82,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 15:00:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVC3bHdz4sb5w; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVC2qkfz4VMC; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=sSNLCBut8TtKkrlvD+K++sivg9/unr5XN9YmWtG9W+l+k8KXyWK2OYgq3R9PttMtLqfVrG xRP6h0+GVT2YcB6EO4Ca38D6sR3pO/tHmQ7PDrXYYuZhV+ms2dxaKJWd/EnIkLwYyqmN0X 8RGgJ/P7/1mVZQLq3HTDihCv98wjw8lXOgaKkNgHCf17OEJpRsis+WZh8QXqIbmIa5iK5v sgf0TmYf/qMgbrDb0PdRbwJvTGxqsrUJH3bo60j+NuIBwnStOpLL2fUvDmll3NWuVMZzHE 6m+z4ijwv9cAU+gedMxOXPYrFXATA6P6EXPl7zvEW2Pl3SEw14C+OyaXEDGxFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703619; a=rsa-sha256; cv=none; b=pk8FNgjdDm0JWtw8V5G5v4M3F/hq4Q4oMzjNTmlJEe021OkRPaOfcfP6yZPLGRlBPs83Jt F91fW4X+nPEFH1Tk6k3cE8U3VWDU60TkrsKKIN0Kg9oqq2Qgy35zBstv4EWl7CKJ9NbEHy TfLsXFzqTuACrBoYttIzRy3slW94ZJVy0i847P7Ny+FicmThlht6dYxyCYRjw/6m0bfL2q hYHO30Qg0kT+zUMGEetp65wuGVuAeH92VR494fev+g5MrgXbTs1qnyVBBGouKSH0l7c5Di RIB7KxlLAa+S3TsAWdNg+YpNpdLBsqQMV6dcUGwkRr5kITyR26584VTLbcLyBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=n2/JWGFPLcrwaFe2zfypYrXo9vTlpd4UECbwmkesug9njmWbBeF94ZLZI7nOvmEbXbN3oI l3opZnRhkbFWXU5hlWLCKtKXXwkX0VKFw8L1viwgjVDD479KEZC+E5Ageyoqkla9z+/nl+ CkTcevLEljoGsbV6naKiO+LSxydChLyNvwwrCKCJoCmZPGe0Tar7WAJrIVmoUGQH7jZX+b twXmBTRZ6BXFDl0Sh5U8htUwJPHgnCqs619KvNyCwztSaPDaB/35l72nDnRy8ije78cJnx x1nS6eZz10d91iowcy7pvJ8Y9lpiVP2srj3gJ0DFQEdC97KBkG4wBbR/v3YZIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVC1vmPz11t9; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0JoG088938; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0JgH088935; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:19 GMT Message-Id: <202309141500.38EF0JgH088935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 15de7baddcb4 - releng/14.0 - grep: Suppress EISDIR when reading. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 15de7baddcb43398c209860d463757852bd04331 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=15de7baddcb43398c209860d463757852bd04331 commit 15de7baddcb43398c209860d463757852bd04331 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:38 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans Approved by: re (delphij) (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) (cherry picked from commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 15:00:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVD4T2Mz4sZyt; Thu, 14 Sep 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVD3v1yz4VMG; Thu, 14 Sep 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOOMyuj1yp5VLIWXvqoo0tre2TB72Pw8btw7K1anpAo=; b=CvnbViUwuNPS5m9k1I3VwPX/gKoq6lrXflt2vsMZuvIG259NDuO/jHbfMUezJmezprSHg8 3ZrFTM+JiOYP6iEiair7sfV9QRxaOGrg75OgupvxkehwVw7x2bCcuwyCnqaKpCEuyn2XaP jVN8rxhVTeEqT1WHsmsVNYBepkWwyNJhYGl/0bca/jYZy/TP8/Z7+KCpbQAlhgL5I+T4X4 Er/S1IcuAW57SklIlOTsICDMkgIV1SitR3AB9WzXSikYH+37Z0MxvdL6tyeHDjUBX+M6Kq GJUow1lv7jipCtnm6sevORiCsacJ/0XkOsBP1/qTbWdOX6YOOHWiezksvskBAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703620; a=rsa-sha256; cv=none; b=q2tFehuLjtKp54qhKuS6P7JTs28dTiPtQdQ97JmrGsfU0CLIQCW6JZS6kHwUpgOYGVrIsY zhNvw+HXqDrGpewuFCSrpUy7Z78PmoU0N+akINbrEwzf6n98QA/HgIy2A8Y3QpuNqkDYUQ h13PFwAig9PRt824rUWk9LbXvDva2BdZQ4tAMTd2x1qnuHPgnTVxuUof9GXYyf41oScKdJ HdZA94ZVN7l4TfEj3w/O0TfjUyy/iXq8CFc8zwGpgo2htRZ5v3QkQE4v9u88i7GHfiLy/c NC459amTzi050UiK/7qoHeNpdQje7ixkI9nlzsLvE2llKxp8uqmCmnUccbEzfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOOMyuj1yp5VLIWXvqoo0tre2TB72Pw8btw7K1anpAo=; b=lcR64YgfKdWMOffH8fjnQ24x4OiedySwTIImP513SV45J/XcSQ9EqAYXWlH5WLKy/8dBto wjE/y72FP+6kFnUwTon3coc7ZVMSTtobB7sWdR/Sx5ZqFMSKaTgFiikQXjWQS3gBhc8p2A tysltpqNoGMBU3HMwkxdg+krjze+XifJf8kct3HIBvGsN2rP69zjNc3NM3iPkzltcTzsPb u//Z4p7/Cz87naay1CplMdeJm/XD0Mkwn7SUB21nxMBERXajmzd0mjVevrUydCPOnyIvIT t8Juegbs0YwDkuRColgEU4p7P59RJmA6/2qIcMHX+DZoO45fz1PA/hYMyWLFuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVD2vfsz11Yv; Thu, 14 Sep 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0KnB088992; Thu, 14 Sep 2023 15:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0KGP088989; Thu, 14 Sep 2023 15:00:20 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:20 GMT Message-Id: <202309141500.38EF0KGP088989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 89872424863c - releng/14.0 - mkfile: getopt() returns an int, not a char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 89872424863c412f506e5df4adc30c96323fd432 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=89872424863c412f506e5df4adc30c96323fd432 commit 89872424863c412f506e5df4adc30c96323fd432 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:50 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 Approved by: re (delphij) (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) (cherry picked from commit 6bd2be4c4971f58c51509ce8856bd5331f979e85) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 15:00:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVF6GLjz4sb60; Thu, 14 Sep 2023 15:00: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 4RmgVF5J1Qz4VW2; Thu, 14 Sep 2023 15:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Grs90m7wxFoBZIFP5s4yiJzSHNlX+6aH3PZ6sch/Sko=; b=dmGRUKHVanoETJMECM8szKue0YIu/BEeCQPSqDyvvKMiR6LuI/MIpk3i2OmRyIRiQxuNKC qtbDlBlcoqjN0EaHsBLZws8zSkUHr1Tvh499hcI5QEmNWTP3GriQ4tUbt1DqSs/RujEJ7i 6HvnhCTTxvWRrSdfwauAJME7MLapmXuIuqhsv7NdvZptrVdIeuwvnRLDzEHRbPst7epdh+ p66xj4IeeBZj9QN5fxRIf4EFss5Tl5ENlIO2kqYaUhA3Y+SL+KmY0padDcn79SqIQn6Agb mRFTAA2yU7KFiiGG4UZUP8Z9PvvYKs2ibf3Ky6waDCKKvFEHDMOmJTGQkvfGqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703621; a=rsa-sha256; cv=none; b=lmm7HE9J4lc4b03zvfIt2wNLABPYWbNK1889MzRn1BvXEuKeQk/lj95EWKeHj8JiVfDg8s NXAiyhnCN3hI2ibxJeIYtLhlPZgUHA8uccLZ7/qvy8f5xng8g49X7lr/dnkMNdJz1M2biP FxAF62CWPV7ZC+m5KXDqmsjGyo253G99lbcxIL0Pa7lt/ZbxAM3hMqwuxBKz//dk9jtnVN o5FRAfWc9zkgfPJ57DzMV17C6Wtln/x3QoBfxjy9Fnxs/cDJi5rFOQ7fISYxkL/9iz7SPz F4s+qfUGGS5zLKdB04j+Ekfeqc/+V7dMm2blHv2QelNtf4CnAGOnjFGrcoUnug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Grs90m7wxFoBZIFP5s4yiJzSHNlX+6aH3PZ6sch/Sko=; b=QMhJ88e807ohFOPD+Kg//OWHIf9tDwYb6eEqZUjCJIkz8BdqWXIVlJm0XPMg9lb/eibFMa WuKhvYmrEpqAYaXcbB2dMOkXIWIeWoCa6kenvQlFqumtexGUzlcTYzkg+g5kO/PsLU6hW4 Ko7p1gNfYCTST7GCRlZxKr1MD07Zk9DGXZn6zbSrpv/Qg8leFmN+5YCd+WoxFqFc03G+/W R3r57jqnVka779uBxjv2TUdSV5fLZrdFW15Ubk44PvJhym9axLhPB6XCay+r8DoNK26grl eYJqR4TYAIoDEeCgM3/3wRz+vVnaGSJYlO5UDqKV1udzW6g/5V9rUreYRAln7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVF3vM7z11c3; Thu, 14 Sep 2023 15:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0LQN089037; Thu, 14 Sep 2023 15:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0L9t089034; Thu, 14 Sep 2023 15:00:21 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:21 GMT Message-Id: <202309141500.38EF0L9t089034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 108e85aa5d5c - releng/14.0 - libc: Don't assume signed char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 108e85aa5d5c347db8127fc5f50aa2efd3e266d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=108e85aa5d5c347db8127fc5f50aa2efd3e266d4 commit 108e85aa5d5c347db8127fc5f50aa2efd3e266d4 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-11 13:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:59 +0000 libc: Don't assume signed char. MFC after: 3 days Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41814 Approved by: re (delphij) (cherry picked from commit 88a9b6e1ed82b562f52bae26b3de257495cd1983) (cherry picked from commit c1335a776b0ff33a715bdaa2be59412006cb4053) --- lib/libc/tests/stdio/snprintf_test.c | 4 ++-- lib/libc/tests/stdio/swprintf_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 323356b37a7d..29b908b65120 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -131,8 +131,8 @@ ATF_TC_WITHOUT_HEAD(snprintf_wN); ATF_TC_BODY(snprintf_wN, tc) { SNPRINTF_TEST("0", "%w8d", (int8_t)0); - SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SNPRINTF_TEST("0", "%w8u", (uint8_t)0); SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index f5dde349412b..f00ecc7f1c1d 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -132,8 +132,8 @@ ATF_TC_WITHOUT_HEAD(swprintf_wN); ATF_TC_BODY(swprintf_wN, tc) { SWPRINTF_TEST("0", "%w8d", (int8_t)0); - SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SWPRINTF_TEST("0", "%w8u", (uint8_t)0); SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); From nobody Thu Sep 14 15:00:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVG6HRZz4sZXw; Thu, 14 Sep 2023 15:00: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 4RmgVG5nrpz4VSw; Thu, 14 Sep 2023 15:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQp+zuQkxSqhPK6zwkU9oXIOHeCUXjGNu/s73fvarAU=; b=cVlYpaK7kBZIsb8zr6qu1x1vGuvqdmiBB9uc6vhzy+vxsGkaRTv5so3RMS9NTmzjRVRCxH rA5GUBoywHTjtuzzmFqro28RLjV69ZNHQF5gkhERdLQWt4wTGK6SmzaIXGLEyy3JRrz4Py uCvy8zU7HGflZeHTlsYLOzmWkv+qBR5N15aJeh6EM/4DBi2AqM5R85vwJgWEUEz6ekEYr8 ULTKe6viiesYEQ3ZYusqLx0NZD5qLYxOtWud+BOnjEKEMYYkwW4Ci4qe6GPpLk+94/Vu+L 6bGv9e0+lxI3CaeIcM32/RVTYTLwcn/46ctDJMcDHWvAdiW8HCoyFzBSLADbFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703622; a=rsa-sha256; cv=none; b=pydfiXJvULnLBwy+t/e29LH+tnb9m+hDq9XfHFmIx0qot7aN3VuFalPTxxgxWWkz6wnvMP KZeYQDmdF363GZwj9EIZf8soJMIjYfrTDuXdDNpECgrRzBt7gBx7fF/iTwqKTbrn4q9h32 bRP41pfv/iL561pDueZp27YlW3KYm0j5lP8phhjY2IgmlzkKKS+AXX7CQw4q/OAIR0JGOM /W/zfgO180yREWwtGeuUfZgHBVjFk8lBkXEIJwfsMULn7bbx70yQ2kVKTEXPL/5Zlg0sUo 3WklJLNTIUbYSuIEUU5z7sIgc6IsXh394A1z12KU6t0WVUXTTazrK9LIBA+IGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQp+zuQkxSqhPK6zwkU9oXIOHeCUXjGNu/s73fvarAU=; b=NrIMkNFVnWojZwJPKPM4q8FKqNS8LuDcIm5K9AcKNVeTK6rSrb8juzGkHLrP11rCCMRVEN pKDeRHdBtob2uH0z6JaalpHl7U6Nz6PerQEB31jyLHGDX/v7e8bXIA4toPFTIEl4oMy5V/ xBLhRD7OZLQcsK8ykk4xTNoD/YLHQmCiScVWesw6sMLY0SrNrUowPEifPaJV894ixo5Ygi +gGYYJ1iYulQUh3CIZCRRTxGAC+8e/ZTrx4eYHXKAgaJSpATK7utj1luvfCwOVSa0a9xpY zP8t20rxy+12/zivITM46DQXcaC7AgyeXRSGVAQXTLGsn/CJwQa23J/+ya+sXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVG4vfmz11c4; Thu, 14 Sep 2023 15:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0Mbp089091; Thu, 14 Sep 2023 15:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0MQi089088; Thu, 14 Sep 2023 15:00:22 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:22 GMT Message-Id: <202309141500.38EF0MQi089088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3d16651a8941 - releng/14.0 - Belatedly document OPIE removal in RELNOTES and UPDATING. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3d16651a8941588997910c7e026a793f70c5a166 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d16651a8941588997910c7e026a793f70c5a166 commit 3d16651a8941588997910c7e026a793f70c5a166 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 11:43:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 09:00:05 +0000 Belatedly document OPIE removal in RELNOTES and UPDATING. MFC after: 3 days Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41822 Approved by: re (delphij) (cherry picked from commit d2c839eee0d5410095f5984d2126f41f4cf62a00) (cherry picked from commit 2e38377fcda2eebb2f76f7f82352643a050d736e) --- RELNOTES | 7 +++++++ UPDATING | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/RELNOTES b/RELNOTES index 0ff123618e14..f3d717525929 100644 --- a/RELNOTES +++ b/RELNOTES @@ -148,6 +148,13 @@ f0bc4ed144fc: instructions may be probed instead of logical entry and return instructions. The provider is currently amd64-only. +0aa2700123e2: + OPIE has been removed from the base system. If you still wish + to use it, install the security/opie port. Otherwise, make + sure to remove or comment out any mention of pam_opie and + pam_opieaccess from your PAM policies (etcupdate will normally + take care of this for the stock policies). + 0eea46fb1f83: Removed telnetd. diff --git a/UPDATING b/UPDATING index ee096e9a6fa6..fe80f259cb12 100644 --- a/UPDATING +++ b/UPDATING @@ -182,6 +182,12 @@ and/or ports. after upgrading to restore all the component that were previously installed. +20221002: + OPIE has been removed from the base system. If needed, it can + be installed from ports (security/opie) or packages (opie). + Otherwise, make sure that your PAM policies do not reference + pam_opie or pam_opieaccess. + 20220610: LinuxKPI pm.h changes require an update to the latest drm-kmod version before re-compiling to avoid errors. From nobody Thu Sep 14 15:00:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVH6szhz4sb07; Thu, 14 Sep 2023 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVH6JHYz4VRH; Thu, 14 Sep 2023 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=CjKSlU1b1xTREelhjBfnC2PLUQNZciu9pEs5/JIt3bJhXQhfuQWIjlEIiH/4QJinBcie1o eQ8araIDKAHI2iCyWjvnpLHHic+x+9iZihT8OxAamT8K0khytLM3hRl5I1OQNIfldpv/tB BoC/TFywosqMU5lURguukBmyW914DvHxWv85q45e2awvmWNKoZF1JUf+oHLW/YDgKfNqdY 3AwqBsezOgYgWjYQoFNWR3BJqxAPmHkfBedzIzW7jWbsLQ5pVhRmdoLcDjm0KM07wTVs7h Khu5GHxRsmd0ldDr6oK9+Qrs4+6+I2NGRa3WdS8x/A9/AZ6zC2fLlR+ZTX3MfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703623; a=rsa-sha256; cv=none; b=EgvCbVBN75Pa3gBzO0N0RowX6TvEmMar8BAgI9g6ugFOOGGQnLkXzYQoNVRr88GYSRSm8k 9OHlgtNcA1yBXFjIkWBfJ9vzK4xpqQi0KmnFZ7JGPQWYThnIbVRjZE5ONYdtBMxwPbT/CF tFTcrnaXANZIUwM6IejBwibn4uufNjGtVMdzpx2z0uL3gs4nYAVhv2hxuXTXSphzjJBgd5 L3E6I41KrcjShzfOUS8OnwNvoLIHaxExAdDmQyJNSPmFRAyCAWnkPtGpgYXUGnlsiAMMdH zvN+woyLsJ73FXA8cJ4T2xy3pdSsD2lraCcHXMvts8AbgK7OQuZHGZKX0sCCqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=An7XQcsTS//VyDcNqveHI7LfLkaCdEVmt6z6hRcrEN3k5kAOCeZ69j7ieZiwHE9srGLdw1 DQHywee1AlJcffjzs9EeGYBpW0d5GsXWL7iZbldH2Pb7b8o30WoXiIvamjIxem1LaNDolR y/sK4ikPxSpwQfoHhF++196IAcpbaRpix4CjS6StFUcnaax32mnAQAS9GkB/KD7ooJUNHf 20vvK68SnhaNKfWELWGaACo1tj6zlJVJWMq71yXnxnjh1YlOqt23/CPj4SFZhnL3DFfJks yrpSz7QcABjGKoIs0HGZxrRiOEL49To3fsNCiJkXhjAeQTi/n/+Bho1WOJcvsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVH5P07z11qn; Thu, 14 Sep 2023 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0Nhe089145; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0Nu9089142; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:23 GMT Message-Id: <202309141500.38EF0Nu9089142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 525c3ef318f8 - releng/14.0 - newvers.sh: Avoid picking up stray envars. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=525c3ef318f8898e4bc61e815daa8f0a9ce3b948 commit 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 09:00:16 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 Approved by: re (gjb) (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) (cherry picked from commit f92a598782c2f671559a919f353b1505f6fe09ca) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 81c35d40f6a3..9c894c4587da 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. From nobody Thu Sep 14 15:00:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVP13Gcz4sZx1; Thu, 14 Sep 2023 15:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVP0Cz1z4VvY; Thu, 14 Sep 2023 15:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TDhsN36bHaSlBzwbTSQGGGJDNhLKH7pXSQ3yMifCWlw=; b=dPbc1k21JBzNMyfKIf/mQrnJGV8JjHfho19Gs2HyXe2RiBlXzOWzgE0LcW/KNH0fbIL4f5 CycE9mWkZ0yH677i8LLIP1EQgpTiVwzI3ygWtWsI9nj6QxocXQxH5Q5pXnSkBOAoAsrTGw wp/xQZ+HnTr1ddGGLpzt1hlNPofCZOhlKGP3j9yRrh9pLM8FL3eNYS59qngF4pmmH0iuVq yLeehMOIfCab2msg4gtJxCD/QIdvrPuyFdirb/p1S65guv1mMK9x6w/+yKze38kdozd53N u4YJENh20REmei8bMueoQWJ9Sfg8ZZ2DEKestkFMS4HrxPJpzeCZ9scnOYByAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703629; a=rsa-sha256; cv=none; b=HT3h7OUVi5zK2B+eEdtLqO9gHjfXS3LEL6XXVQjQKUKpRgdzVRTdOqurygmFyFGlhL2sNu x7rwyEN9OIhPJ2yDCPPwd1K2ALK5xBRHcKZWhHP6LnjuWmSOiwM7OvMHu/p4JL08djUfsp JK0gyUO2CZ2mBBE3MdNYjJPsicYTxltDCOu3Li7VGyiLNPySIDiGTdPKjL2WCONZx5hIWr xp0XMGmd/U/LEJtpRKEILtsNe3mEKWPzRJV8xKKAqLLpF2t24VXrEZQw7yrTcKOrJdn/fk 5hc70/oH9Q8NEO6I6G8dgWr2DBvnkWEhKQjbhK+qceOtJfxHRnI+fEd7bdXCdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TDhsN36bHaSlBzwbTSQGGGJDNhLKH7pXSQ3yMifCWlw=; b=ckHLvsGfNFKNh6xvpHDZzLPncwaASejO1U8VBzGGi3Li7ZS2gwQIi5u1iPGA2+Vc0l0ZEQ o7Em19xpFEH13MYw+h5McHezlfshtbPiKPStSPcXNpw24e5OzkKZr3amDfqSAhbbdrc7B+ max5HsJmCtD64IeKriTG4eQdKChHXCR7bGS7ZSOqpkG7XbIfIR2A8UZaLXhSw0vlIIHDJM Xee+i00B6Qzp1r3fVIAH+KsFOSyXMCIMu2bRjWKIxYY9VPX3BTUcAsT64cJMRZ3KYbyDHe 8HTA/iSgSN1iJIDmP8WK1c2+dQZEsBi/4r65WanNwrdTGTn3e65xxgvSdFWAKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVN6GXNz11tB; Thu, 14 Sep 2023 15:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0Sow089335; Thu, 14 Sep 2023 15:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0S8V089332; Thu, 14 Sep 2023 15:00:28 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:28 GMT Message-Id: <202309141500.38EF0S8V089332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f01e4edfc85f - stable/13 - libipf: fix parser error message. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f01e4edfc85f0d147a3462247f053aefcbb6552c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f01e4edfc85f0d147a3462247f053aefcbb6552c commit f01e4edfc85f0d147a3462247f053aefcbb6552c Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 20:15:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 libipf: fix parser error message. MFC after: 1 week Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41652 (cherry picked from commit 4cd9d804ae8b955d47dfa0bba06e7c254d760cb1) --- sbin/ipf/libipf/parseipfexpr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipf/libipf/parseipfexpr.c b/sbin/ipf/libipf/parseipfexpr.c index 215e43b2978d..880258e5dd66 100644 --- a/sbin/ipf/libipf/parseipfexpr.c +++ b/sbin/ipf/libipf/parseipfexpr.c @@ -93,11 +93,7 @@ parseipfexpr(char *line, char **errorptr) break; } if (e->ipoe_word == NULL) { - error = malloc(32); - if (error != NULL) { - snprintf(error, sizeof(error), "keyword (%.10s) not found", - ops); - } + asprintf(&error, "keyword (%.10s) not found", ops); goto parseerror; } From nobody Thu Sep 14 15:00:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVQ2rJmz4sb9R; Thu, 14 Sep 2023 15:00: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 4RmgVQ0pdBz4Vxw; Thu, 14 Sep 2023 15:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgTZEhl4I+QZnCJ9duzxtXgnIItAuhS5nU3ntlia5lk=; b=Y9x4a5/bV5xQ4VqnSCUNpu8moRj28TVDAVaT/uXv4FLdZcfZbMyDtjv4x2ItvVUujmmcOC xw/+e6Sm6pmhq+rflW3rOrF3MSaNgLSoicbptpDMF+oQWXiBDyhx63ZC+DoVRibXRx3dOg 2kK5YQ25kNsvRH/BYSAfsW3YohOqyAJvCV3EGM2tdVdajwRyJ73bNaEpXpMbQn6RCy2aoO /QDvRR3+wjxzGqnJisd2lKN8Skdv2ROtp2E8LSvlOBCr/3SfXYfiiTIzhFatucYJt7Qicb 5FUUFgR1/+XbOSIwsQPpYvloK/bS/klZgGfpMju58/T0qLlfXkYfwTe+UhfpOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703630; a=rsa-sha256; cv=none; b=uSI8Uy5Ui9KkNczWwrlYjN0PQoW3j49JU71BqGOLdF/sKhKKv8VDttsv4e0WJmdFfjT7py V4WF5CGe1AMULEAQYXUKv5OdmCnIxJS0VB3N5jRGk/KHm8GW80KIsW60+0WlgpskEpwxxa 5koX9JTPDbjpsQDdIBe/kSpejALzSN02KH1Nbs+UjND2Eet/m+nqDfisnm1dljvA6hlH6L D0Dnmw8f4b/zI9XoZ8CzE0x34Maru4huZ5SxdsiALMju1Bq2cMYrvUyDmrsTfiFtfi9MYp l21OVuCe7OuRiuNnAgwZlEcLzucZWgcQ6oj1oAiyFQQXPPTfV5LycoL3OSOjPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgTZEhl4I+QZnCJ9duzxtXgnIItAuhS5nU3ntlia5lk=; b=qRj9miDArqsCBypdh5CqALZuoj3/Wv/f/cRupW7liSPCDMcWuiFXN0ezI7M1NsJynpIduq KrhKJqDaGrKZMkqToTAh8QzJoCEVUMWHcW4gXOz/VKp5SvIcvaQm41uOGBocXRTSh0KFJJ tcOXJ74scRhIJZiiFOr2aNeNCVtXr3wnidX+Az1qcVl5Oyelx6kXk1QDN9I+NmWI03BMYn dZQ7QVBvmRaNEEyb9ornkYkf9/yCrJrK5l5UL7k8DHSxEhgTdFplU8uewiVgiLXmx4Gj3x 3pknO0OaaQp5KmaaP3Ob+DjWu0d6HIY2Ojtamt4u04iTQBVkkXcv3DxTF3ofSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVP70NRz11c5; Thu, 14 Sep 2023 15:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0T0a089387; Thu, 14 Sep 2023 15:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0TFA089384; Thu, 14 Sep 2023 15:00:29 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:29 GMT Message-Id: <202309141500.38EF0TFA089384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 62d509951cb9 - stable/13 - iostat: getopt() / usage() cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62d509951cb97265156d232c3f720161d8ccd016 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=62d509951cb97265156d232c3f720161d8ccd016 commit 62d509951cb97265156d232c3f720161d8ccd016 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 iostat: getopt() / usage() cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41636 (cherry picked from commit 09c45b089d2f90ec04153a1b4621dd6bec142959) --- usr.sbin/iostat/iostat.8 | 40 +++++++++++++++++++--------------------- usr.sbin/iostat/iostat.c | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index 17b73f0932c7..863f8ab8466c 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -54,7 +54,7 @@ .\" .\" @(#)iostat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd May 22, 2015 +.Dd August 29, 2023 .Dt IOSTAT 8 .Os .Sh NAME @@ -64,7 +64,7 @@ statistics .Sh SYNOPSIS .Nm -.Op Fl CdhIKoTxz?\& +.Op Fl CdhIKoTxz .Op Fl c Ar count .Op Fl M Ar core .Op Fl n Ar devs @@ -90,6 +90,13 @@ averaged over that time. .Pp The options are as follows: .Bl -tag -width flag +.It Fl C +Display CPU statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl c Repeat the display .Ar count @@ -102,13 +109,6 @@ is specified. With .Fl w the default repeat count is infinity, otherwise it is 1. -.It Fl C -Display CPU statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl d Display only device statistics. If this flag is turned on, only device statistics will be displayed, unless @@ -136,6 +136,9 @@ then the device native block size. Extract values associated with the name list from the specified core instead of the default .Dq Pa /dev/kmem . +.It Fl N +Extract the name list from the specified system instead of the default +.Dq Pa /boot/kernel/kernel . .It Fl n Display up to .Ar devs @@ -145,9 +148,6 @@ The utility will display fewer devices if there are not .Ar devs devices present. -.It Fl N -Extract the name list from the specified system instead of the default -.Dq Pa /boot/kernel/kernel . .It Fl o Display old-style .Nm @@ -158,6 +158,13 @@ If .Fl I is specified, total blocks/sectors, total transfers, and milliseconds per seek are displayed. +.It Fl T +Display TTY statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl t Specify which types of devices to display. There are three different categories of devices: @@ -228,13 +235,6 @@ argument will be included in the .Nm output, up to the number of devices that can be displayed in 80 columns, or the maximum number of devices specified by the user. -.It Fl T -Display TTY statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl w Pause .Ar wait @@ -267,8 +267,6 @@ is also specified to enable the display of CPU or TTY statistics. If .Fl x is specified, omit lines for devices with no activity. -.It Fl ?\& -Display a usage statement and exit. .El .Pp The diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 6a6adb3d6090..98dd901886e6 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -168,7 +168,7 @@ usage(void) * This isn't mentioned in the man page, or the usage statement, * but it is supported. */ - fprintf(stderr, "usage: iostat [-CdhIKoTxz?] [-c count] [-M core]" + fprintf(stderr, "usage: iostat [-CdhIKoTxz] [-c count] [-M core]" " [-n devs] [-N system]\n" "\t [-t type,if,pass] [-w wait] [drives]\n"); } @@ -197,17 +197,17 @@ main(int argc, char **argv) matches = NULL; maxshowdevs = 3; - while ((c = getopt(argc, argv, "c:CdhIKM:n:N:ot:Tw:xz?")) != -1) { - switch(c) { + while ((c = getopt(argc, argv, "Cc:dhIKM:N:n:oTt:w:xz")) != -1) { + switch (c) { + case 'C': + Cflag++; + break; case 'c': cflag++; count = atoi(optarg); if (count < 1) errx(1, "count %d is < 1", count); break; - case 'C': - Cflag++; - break; case 'd': dflag++; break; @@ -223,6 +223,9 @@ main(int argc, char **argv) case 'M': memf = optarg; break; + case 'N': + nlistf = optarg; + break; case 'n': nflag++; maxshowdevs = atoi(optarg); @@ -230,21 +233,18 @@ main(int argc, char **argv) errx(1, "number of devices %d is < 0", maxshowdevs); break; - case 'N': - nlistf = optarg; - break; case 'o': oflag++; break; + case 'T': + Tflag++; + break; case 't': tflag++; if (devstat_buildmatch(optarg, &matches, &num_matches) != 0) errx(1, "%s", devstat_errbuf); break; - case 'T': - Tflag++; - break; case 'w': wflag++; f = atof(optarg); From nobody Thu Sep 14 15:00:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVR2Tmnz4sZxF; Thu, 14 Sep 2023 15:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVR1yZRz4VwM; Thu, 14 Sep 2023 15:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16bYmNIfmsyYJ0lEgsR9szTb9ryMYRuxQWpYgPxuHdg=; b=ctr1+Rgh8vv0uP4a2Mfz877LEIeR66S3jk4q75gvhjOb5WSsSFTWo4uHJLBBgU+Pj+wkeR TOgQzpFmlfZrATwOibygI47g5eCQobVTx0r2PcmVDfZastEnNp6noijj7SBqolJrj1iGrI dgbWCfdx5RxRda32OXXvSvtE2lyoJkHRfGrjfpKCUrHwjDVxcUDo4DuYTsceyBVpJDOyNu JvuMCIFXYnU8tZ7i/nd9JRgFsi//9od+5OcXctlQzgbe16TXMED1xHm3+npRrkWzZkdIof 09qsAESmJ05w9zckwYAJeFS5i+EcPMZuYdaB74QLg0iUY4s5DF6Cu/M1Rd7z1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703631; a=rsa-sha256; cv=none; b=wVKuP+GLBFvQzOaMaMDihvLkKdWSDPSaUWdHKeqQpIr+5+7AThGc3m00QAu5SnSvRrPtOo B+Qr2Ps7rxR+1nvhSdkUTxnljpnIIA9lTBGRupGSU0vOLjwQHs8s1ZhehkBV+A3nBTDnc+ Aaz0TAAfhF7A4kkJdVfgxnFSw5hY2OTPGeCYhxVL/hGm4s5kBIAIALTlBKrFBvqIeaGP8q r3bg7Fbzl5VhIs2vw/bAMdscTQDCqg+65dAyMQWBjwOud6FoEoDRXIvhcVbEo9M9NXkNCb rt4Icx/C1sAF2OICbxm6apw/GSPRM+caTW7j18jJ55puP2OgPrX+cPV3QCuH+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16bYmNIfmsyYJ0lEgsR9szTb9ryMYRuxQWpYgPxuHdg=; b=j1ZE31iG6xEbgfYm2QVnkjfrltMVvAzVX0JVz+wIRb6CDMYXJeI/H/lHudt5FZd/4Ir74A ykvjUbbush1zE3iXodzOUIgRd3U54aR9+vtC69qAGNpvMWNvshFYs1NEaWORKaqZSB0KUl X9y0MOZd24s/OAwNNVbv3HVaXLrEarJI0IdTLf/MlaLwnP+x90qUt7bg6chfRGfoNUroVB zuAVaEO0dx8dq+Yw6gwiDll7xxYHEbFlDcsIKNMnPnqws5QfWsqN9FWwIP+olPrIrTqhBa Net+huVc7G1qVLICAbbMgrajx8W+er9EEmZo9KR03ZeIK/5XODHM6lotOLR0DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVR13WNz11wX; Thu, 14 Sep 2023 15:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0VTX089438; Thu, 14 Sep 2023 15:00:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0Vkc089435; Thu, 14 Sep 2023 15:00:31 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:31 GMT Message-Id: <202309141500.38EF0Vkc089435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a721afaf8543 - stable/13 - split: Update synopsis and usage; fix examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a721afaf85437708ae45a5b3baaa6915f0f1aba0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a721afaf85437708ae45a5b3baaa6915f0f1aba0 commit a721afaf85437708ae45a5b3baaa6915f0f1aba0 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-14 11:50:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split: Update synopsis and usage; fix examples - Mark -d as an optional flag - Add a prompt to one of the examples for consistency - Add -d to the usage message Sponsored by: Klara Inc. (cherry picked from commit fb499259997c0bfd724b7b67578035cd977ef60f) --- usr.bin/split/split.1 | 12 ++++++------ usr.bin/split/split.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1 index 55f9e4f65234..6dba7489a83d 100644 --- a/usr.bin/split/split.1 +++ b/usr.bin/split/split.1 @@ -27,7 +27,7 @@ .\" .\" @(#)split.1 8.3 (Berkeley) 4/16/94 .\" -.Dd October 25, 2022 +.Dd April 18, 2023 .Dt SPLIT 1 .Os .Sh NAME @@ -35,12 +35,12 @@ .Nd split a file into pieces .Sh SYNOPSIS .Nm -.Fl d +.Op Fl d .Op Fl l Ar line_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl b Ar byte_count Ns .Oo .Sm off @@ -50,12 +50,12 @@ .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl n Ar chunk_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl p Ar pattern .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix @@ -185,7 +185,7 @@ $ echo -e "This is 22 bytes long" | split -d -b10 .Pp Split input generating 6 files: .Bd -literal -offset indent -echo -e "This is 22 bytes long" | split -n 6 +$ echo -e "This is 22 bytes long" | split -n 6 .Ed .Pp Split input creating a new file every time a line matches the regular expression diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 96cad28cb1e5..29ee0581d071 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -393,9 +393,9 @@ static void usage(void) { (void)fprintf(stderr, -"usage: split [-l line_count] [-a suffix_length] [file [prefix]]\n" -" split -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" -" split -n chunk_count [-a suffix_length] [file [prefix]]\n" -" split -p pattern [-a suffix_length] [file [prefix]]\n"); +"usage: split [-d] [-l line_count] [-a suffix_length] [file [prefix]]\n" +" split [-d] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" +" split [-d] -n chunk_count [-a suffix_length] [file [prefix]]\n" +" split [-d] -p pattern [-a suffix_length] [file [prefix]]\n"); exit(EX_USAGE); } From nobody Thu Sep 14 15:00:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVS3Yzxz4sbCV; Thu, 14 Sep 2023 15:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVS32Kxz4WBk; Thu, 14 Sep 2023 15:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNhSYxFr9w6dRPCoMuNM985irtgcMiuysVL0H1afS1M=; b=ppp9yxIijrUrCGIVx/nLupE2FtCotwHul3yY9kipuuvKHxPv7JwgDSp1Et+SaPzJ1Lo1F1 Ow04lvh7jxcA5oj96dQDXe6XjOwBRdKSNvDTdmqtJzsFOfMYjvhST65YkGzm61eeSAlNq1 JS1/wYUBJg2B6cMsxds/3s2aTPaE1ODlT90JhQK/gsTleqBuxcAa4em6P0pJ2v2ndTRq26 eUIU2vVBvwaabkrSeTZFvPVFy246uM0nmOZ1AQomnrzLA2OcI6HQZCLONNkQxMnfe/aQzW KhLVzBlmrIWRxWGIw2wmx/OAXNXcqTUfw6HeV9NQSL7Tu8ZS/ujqoe5F7b1x9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703632; a=rsa-sha256; cv=none; b=y0A4GWF4qZtgOsKwj/OchsyaIRLAGRX0EZ679i4D3N6JBLwmIYZVu4r1Khm8YvS3QM5oh/ CDXTGJE5ELgi4BSWPWCJGcgG7vg8tAUfWlrmphnwgcO7PMdyHoEBhKSCVP51QqpMNCoTwD drWz+fQk24L9YA9A409OvreCAxQ9itQaVx+sXgrg4qMt4MdkBuLIMorabvpLjECyv63RzN hhJ19OzXvx6m2kxufb7Su4zZSIq0/ZRseRcfRMvJLsgJ14l6LTF4aNNUHcKd/Rl9Vmi4Bl UjcMT8PDcJAqo0Ww0Y9Uh1ckVJxGqXyDbgk4XQqyKz8Kt/N94BqnBz8hctmMFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNhSYxFr9w6dRPCoMuNM985irtgcMiuysVL0H1afS1M=; b=uBaHB6VnoLtl4jiacVtUiU9tcnMDXJOkOrPdo/AG804gu/xbetP7SS0rqWS7shFq87vY3h XTcWbGxz4lL0RQEwjpdWmij4mn4PkbGI2izlm0aUzRD4VGb0o9z67F1uMomoq8BEYjE/OI FJG1mkK+K2dga/a2PGEZfrlVvzo4eTRYJUjUMilSapUt0cgjlkHMJOZj3xu9drSyZ3kslU +dWdw4fnJYV2xv5ntBiCW7/bf/4RSMtWcn+h+IMuIu18Kn5fwjjaxyS45CLNXqAJKxDLqT fhDcwmV2HFI4XQV0FM3Wuvc4CSV/n42mISmZje5kW7aZOvXPzslHMM/1V6cqyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVS22x1z11pf; Thu, 14 Sep 2023 15:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0WAX089486; Thu, 14 Sep 2023 15:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0WBX089483; Thu, 14 Sep 2023 15:00:32 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:32 GMT Message-Id: <202309141500.38EF0WBX089483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 31ced5c14337 - stable/13 - split(1): auto-extend suffix length if required List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 31ced5c14337a68a2e6bfde06d6f4cd9a465f218 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=31ced5c14337a68a2e6bfde06d6f4cd9a465f218 commit 31ced5c14337a68a2e6bfde06d6f4cd9a465f218 Author: Jan Schaumann AuthorDate: 2023-05-30 12:55:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split(1): auto-extend suffix length if required If the input cannot be split into the number of files resulting from the default suffix length, automatically extend the suffix length rather than bailing out with 'too many files'. Suffixes are extended such that the resulting files continue to sort lexically and "cat *" would reproduce the input. For example, splitting a 1M lines file into (default) 1000 lines per file would yield files named 'xaa', 'xab', ..., 'xyy', 'xyz', 'xzaaa', 'xzaab', ..., 'xzanl'. If '-a' is specified, the suffix length is not auto-extended. This behavior matches GNU sort(1) since around version 8.16. Reviewed by: christos Approved by: kevans Different Revision: https://reviews.freebsd.org/D38279 (cherry picked from commit c4f7198f47c15eece849d06e8fdd1fb46ed43bba) split(1): add '-c' to continue creating files Currently, split(1) will clobber any existing output files: $ split file; ls xaa xab xac xad $ split second-file; ls xaa xab xac xad xae xaf This patch adds a flag "-c" (mnemonic "create, don't overwrite" or "continue where you left off"): $ split file; ls xaa xab xac xad $ split -c second-file; ls xaa xab xac xad xae xaf xag xah xai xaj Reviewed by: christos Approved by: kevans Different Revision: https://reviews.freebsd.org/D38553 (cherry picked from commit ac17fc816e67a4e5e2e481b5001577a8d589f8b6) --- usr.bin/split/split.1 | 28 ++++++++++++++++++------ usr.bin/split/split.c | 59 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1 index 6dba7489a83d..67e3c0cd448b 100644 --- a/usr.bin/split/split.1 +++ b/usr.bin/split/split.1 @@ -27,7 +27,7 @@ .\" .\" @(#)split.1 8.3 (Berkeley) 4/16/94 .\" -.Dd April 18, 2023 +.Dd May 26, 2023 .Dt SPLIT 1 .Os .Sh NAME @@ -35,12 +35,12 @@ .Nd split a file into pieces .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl cd .Op Fl l Ar line_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl b Ar byte_count Ns .Oo .Sm off @@ -50,12 +50,12 @@ .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl n Ar chunk_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl p Ar pattern .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix @@ -111,6 +111,9 @@ or is appended to the number, the file is split into .Ar byte_count gigabyte pieces. +.It Fl c +Continue creating files and do not overwrite existing +output files. .It Fl d Use a numeric suffix instead of a alphabetic suffix. .It Fl l Ar line_count @@ -150,7 +153,11 @@ characters in the range .Dq Li a Ns - Ns Li z . If .Fl a -is not specified, two letters are used as the suffix. +is not specified, two letters are used as the initial suffix. +If the output does not fit into the resulting number of files and the +.Fl d +flag is not specified, then the suffix length is automatically extended as +needed such that all output files continue to sort in lexical order. .Pp If the .Ar prefix @@ -158,6 +165,15 @@ argument is not specified, the file is split into lexically ordered files named with the prefix .Dq Li x and with suffixes as above. +.Pp +By default, +.Nm +will overwrite any existing output files. +If the +.Fl c +flag is specified, +.Nm +will instead create files with names that do not already exist. .Sh ENVIRONMENT The .Ev LANG , LC_ALL , LC_CTYPE diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 29ee0581d071..eeb7d663ecb1 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -65,6 +65,7 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; static off_t bytecnt; /* Byte count to split on. */ static off_t chunks = 0; /* Chunks count to split into. */ +static bool clobber = true; /* Whether to overwrite existing output files. */ static long numlines; /* Line count to split on. */ static int file_open; /* If a file open. */ static int ifd = -1, ofd = -1; /* Input/output file descriptors. */ @@ -73,6 +74,7 @@ static regex_t rgx; static int pflag; static bool dflag; static long sufflen = 2; /* File name suffix length. */ +static int autosfx = 1; /* Whether to auto-extend the suffix length. */ static void newfile(void); static void split1(void); @@ -90,7 +92,7 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:dl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -114,6 +116,7 @@ main(int argc, char **argv) if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) errx(EX_USAGE, "%s: illegal suffix length", optarg); + autosfx = 0; break; case 'b': /* Byte count. */ errno = 0; @@ -121,6 +124,9 @@ main(int argc, char **argv) if (error == -1) errx(EX_USAGE, "%s: offset too large", optarg); break; + case 'c': /* Continue, don't overwrite output files. */ + clobber = false; + break; case 'd': /* Decimal suffix */ dflag = true; break; @@ -343,6 +349,10 @@ newfile(void) static char *fpnt; char beg, end; int pattlen; + int flags = O_WRONLY | O_CREAT | O_TRUNC; + + if (!clobber) + flags |= O_EXCL; if (ofd == -1) { if (fname[0] == '\0') { @@ -351,9 +361,10 @@ newfile(void) } else { fpnt = fname + strlen(fname); } - ofd = fileno(stdout); - } + } else if (close(ofd) != 0) + err(1, "%s", fname); + again: if (dflag) { beg = '0'; end = '9'; @@ -364,6 +375,35 @@ newfile(void) } pattlen = end - beg + 1; + /* + * If '-a' is not specified, then we automatically expand the + * suffix length to accomodate splitting all input. We do this + * by moving the suffix pointer (fpnt) forward and incrementing + * sufflen by one, thereby yielding an additional two characters + * and allowing all output files to sort such that 'cat *' yields + * the input in order. I.e., the order is '... xyy xyz xzaaa + * xzaab ... xzyzy, xzyzz, xzzaaaa, xzzaaab' and so on. + */ + if (!dflag && autosfx && (fpnt[0] == 'y') && + strspn(fpnt+1, "z") == strlen(fpnt+1)) { + fpnt = fname + strlen(fname) - sufflen; + fpnt[sufflen + 2] = '\0'; + fpnt[0] = end; + fpnt[1] = beg; + + /* Basename | Suffix + * before: + * x | yz + * after: + * xz | a.. */ + fpnt++; + sufflen++; + + /* Reset so we start back at all 'a's in our extended suffix. */ + tfnum = 0; + fnum = 0; + } + /* maxfiles = pattlen^sufflen, but don't use libm. */ for (maxfiles = 1, i = 0; i < sufflen; i++) if (LONG_MAX / pattlen < maxfiles) @@ -384,8 +424,11 @@ newfile(void) fpnt[sufflen] = '\0'; ++fnum; - if (!freopen(fname, "w", stdout)) + if ((ofd = open(fname, flags, DEFFILEMODE)) < 0) { + if (!clobber && errno == EEXIST) + goto again; err(EX_IOERR, "%s", fname); + } file_open = 1; } @@ -393,9 +436,9 @@ static void usage(void) { (void)fprintf(stderr, -"usage: split [-d] [-l line_count] [-a suffix_length] [file [prefix]]\n" -" split [-d] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" -" split [-d] -n chunk_count [-a suffix_length] [file [prefix]]\n" -" split [-d] -p pattern [-a suffix_length] [file [prefix]]\n"); +"usage: split [-cd] [-l line_count] [-a suffix_length] [file [prefix]]\n" +" split [-cd] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" +" split [-cd] -n chunk_count [-a suffix_length] [file [prefix]]\n" +" split [-cd] -p pattern [-a suffix_length] [file [prefix]]\n"); exit(EX_USAGE); } From nobody Thu Sep 14 15:00:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVT4tJ6z4sZxP; Thu, 14 Sep 2023 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVT4LmZz4WZ9; Thu, 14 Sep 2023 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndNhmmanG+VUABC5Y8OVoExDpQMKOvHSGIsu8zXqomU=; b=w5mb4Ug+z+cPRVHWRK1eGz+QooLdew2oRFaDWXiEqqM10XPvoz9ELg+brHXgkIdnJBI7Ea V6/DS55ORKHdMzVz3x/EXhCklKm2DRMpDN0kGmNeDXcr+cY1RoyMwvRMTy9qytRav4jxw5 dzA0BL+2TpSLLwbECF4LhgnunRy1sUrEdlVX5QFQmLaiIDq49e9/0ykOAgP1v+IipSPivt g2cVquOGpv7apmtB0/oFnnYSLF5BBXBrxiD4x3ZaP917PEk8FUIpKT5OfyMuUp2c0pL2/Y 14XTiXqA7SBT80pNo7DS5ilXPZBUE/EIbydKagz79T7pIkP7AOk/uEzLdiknPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703633; a=rsa-sha256; cv=none; b=SjXttP3JLfImP+mq1exWoYXKZowem+YPUeI3gmRAjQHN/0fcoXGFgHMTgDoez5VN1JGDbs i3TD/qkIRmm8dKhql4Og5SBOnHEawXljmx/IAN251V+Enwbaa37vKl8VV7Xqg86Izvag9l lQ82taM6jrQ4Tq+4SeJdre8eAt7UWlwALkcmTA/Cu6LnE4ettvCAo78opqiR4ZvH/10qst vEKfuhG2Yg4YVmram0A26BSkGY9cWMWiIuwmvL58SHCkDcOca8BgnXDina/3car2k6hRkK S0jIeXZOqPLgagcfPNuBgre6CtpgNmlc6nI+SaXMOmloyehQwc9qVX7X+v62rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndNhmmanG+VUABC5Y8OVoExDpQMKOvHSGIsu8zXqomU=; b=ZDoGKokGok69Aipb/S3kVHaCJBjnezZzihzSwee+Rbk3zsD+o+MV+u5igc9O+n11b+hBW7 CyKTHl/g5lpxiCAYDk/hvVyr38X/i1KgmoD7HfFTNSkbJqop1JGXz5BXRxYopEFWu7zQzU lVUQdjvrFEjQQMKW8k25bEg4Jv5X/PXf/OGGy0PlHnUdUM3yEIRn5a/pLzKob6P2tdrGBt q76st862A/YdDP//Qam2NH1xAqLH63qepv7RvECp9VhiIIrvsCJ9CaT5Spk4hGq53DieR+ 1zAlsrwq6Jlzu4tlJlGQmHWMUDvaOSrgiPNvuZ1AWjTxNK9p1ysy3xiDlFXuWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVT3CWdz11dk; Thu, 14 Sep 2023 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0XvU089552; Thu, 14 Sep 2023 15:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0X01089549; Thu, 14 Sep 2023 15:00:33 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:33 GMT Message-Id: <202309141500.38EF0X01089549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9dcbb9e681d7 - stable/13 - Mark usage function as __dead2 in programs where it does not return List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c commit 9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c Author: Alfonso Gregory AuthorDate: 2023-07-07 16:39:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 Mark usage function as __dead2 in programs where it does not return In most cases, usage does not return, so mark them as __dead2. For the cases where they do return, they have not been marked __dead2. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/735 (cherry picked from commit cccdaf507eee8fb34494b4624eb85bb951e323c8) --- usr.bin/script/script.c | 2 +- usr.bin/sed/main.c | 2 +- usr.bin/showmount/showmount.c | 2 +- usr.bin/split/split.c | 2 +- usr.bin/tail/tail.c | 2 +- usr.bin/tee/tee.c | 2 +- usr.bin/time/time.c | 2 +- usr.bin/tr/tr.c | 2 +- usr.bin/tty/tty.c | 2 +- usr.bin/ul/ul.c | 2 +- usr.bin/uname/uname.c | 2 +- usr.bin/unexpand/unexpand.c | 2 +- usr.bin/usbhidctl/usbhid.c | 2 +- usr.bin/wall/wall.c | 2 +- usr.bin/what/what.c | 2 +- usr.bin/whois/whois.c | 2 +- usr.bin/write/write.c | 2 +- usr.bin/xstr/xstr.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 7ed54674c03d..b3a1869fcb42 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -101,7 +101,7 @@ static void finish(void); static void record(FILE *, char *, size_t, int); static void consume(FILE *, off_t, char *, int); static void playback(FILE *) __dead2; -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 0b764a7dca21..efa28b5e7239 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -119,7 +119,7 @@ u_long linenum; static void add_compunit(enum e_cut, char *); static void add_file(char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index fbd1c9bbbe3c..d2b9f46792ba 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -97,7 +97,7 @@ static struct exportslist *exportslist; static int type = 0; void print_dump(struct mountlist *); -static void usage(void); +static void usage(void) __dead2; int xdr_mntdump(XDR *, struct mountlist **); int xdr_exportslist(XDR *, struct exportslist **); int tcp_callrpc(const char *host, int prognum, int versnum, int procnum, diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index eeb7d663ecb1..b5a457ab6ecd 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -80,7 +80,7 @@ static void newfile(void); static void split1(void); static void split2(void); static void split3(void); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index 9e63353f9b40..5babd89135ca 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -65,7 +65,7 @@ int Fflag, fflag, qflag, rflag, rval, no_files; fileargs_t *fa; static void obsolete(char **); -static void usage(void); +static void usage(void) __dead2; static const struct option long_opts[] = { diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index b55aa84d2f63..63f2ed5ca863 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -65,7 +65,7 @@ typedef struct _list { static LIST *head; static void add(int, const char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index 9121b1f14408..64063212170d 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -66,7 +66,7 @@ static void humantime(FILE *, long, long); static void showtime(FILE *, struct timespec *, struct timespec *, struct rusage *); static void siginfo(int); -static void usage(void); +static void usage(void) __dead2; static sig_atomic_t siginfo_recvd; static char decimal_point; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 4bd52fae1a08..75638d6b3bc6 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -64,7 +64,7 @@ static STR s1 = { STRING1, NORMAL, 0, OOBCH, 0, { 0, OOBCH }, NULL, NULL }; static STR s2 = { STRING2, NORMAL, 0, OOBCH, 0, { 0, OOBCH }, NULL, NULL }; static struct cset *setup(char *, STR *, int, int); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c index ac3249d35ff2..945e62cc6f3a 100644 --- a/usr.bin/tty/tty.c +++ b/usr.bin/tty/tty.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93"; #include #include -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index 14b1d87905d2..07a796ffd55b 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -89,7 +89,7 @@ static int halfpos; static int upln; static int iflag; -static void usage(void); +static void usage(void) __dead2; static void setnewmode(int); static void initcap(void); static void reverse(void); diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index 981d08a7a7c0..fc1f34a3e3c6 100644 --- a/usr.bin/uname/uname.c +++ b/usr.bin/uname/uname.c @@ -82,7 +82,7 @@ static void native_uservers(void); static void native_buildid(void); static void print_uname(u_int); static void setup_get(void); -static void usage(void); +static void usage(void) __dead2; static char *buildid, *ident, *platform, *hostname, *arch, *release, *sysname, *version, *kernvers, *uservers; diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index 116c4e02af4c..6dcfc497d6e8 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -59,7 +59,7 @@ static int nstops; static int tabstops[100]; static void getstops(const char *); -static void usage(void); +static void usage(void) __dead2; static int tabify(const char *); int diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index 5226958da3eb..dbb05030e908 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -57,7 +57,7 @@ static int hexdump = 0; static int wflag = 0; static int zflag = 0; -static void usage(void); +static void usage(void) __dead2; static void dumpitem(const char *label, struct hid_item *h); static void dumpitems(report_desc_t r); static void prdata(u_char *buf, struct hid_item *h); diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index 992bc9f77b22..335f83623576 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -67,7 +67,7 @@ static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; #include "ttymsg.h" static void makemsg(char *); -static void usage(void); +static void usage(void) __dead2; static struct wallgroup { struct wallgroup *next; diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index 5cd6a85f35bf..1829a6b055b2 100644 --- a/usr.bin/what/what.c +++ b/usr.bin/what/what.c @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93"; #include #include -static void usage(void); +static void usage(void) __dead2; static bool search(bool, bool, FILE *); int diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 9af40a6b998c..13b9c7d13aef 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -157,7 +157,7 @@ static const char *port = DEFAULT_PORT; static const char *choose_server(char *); static struct addrinfo *gethostinfo(const char *, const char *, int); static void s_asprintf(char **ret, const char *format, ...) __printflike(2, 3); -static void usage(void); +static void usage(void) __dead2; static void whois(const char *, const char *, const char *, int); int diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c index c0973c1ca58c..b5f484dcdf27 100644 --- a/usr.bin/write/write.c +++ b/usr.bin/write/write.c @@ -69,7 +69,7 @@ static char sccsid[] = "@(#)write.c 8.1 (Berkeley) 6/6/93"; void done(int); void do_write(int, char *, char *, const char *); -static void usage(void); +static void usage(void) __dead2; int term_chk(int, char *, int *, time_t *, int); void wr_fputs(wchar_t *s); void search_utmp(int, char *, char *, char *, uid_t); diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index b1a5bf58ae01..880fc1583542 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -81,7 +81,7 @@ static int xgetc(FILE *); static off_t hashit(char *, int); static off_t yankstr(char **); -static void usage(void); +static void usage(void) __dead2; static void flushsh(void); static void found(int, off_t, char *); From nobody Thu Sep 14 15:00:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVV6mMMz4sbCY; Thu, 14 Sep 2023 15:00: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 4RmgVV5LW3z4WTt; Thu, 14 Sep 2023 15:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obhor7Xq6yHVwil8PqMXFrK6QJVSkUj/vw9t39JqAUI=; b=h/PtT7DjKs/hJc2yuxg9IzGOdwubH8xlFMId/wdyeMK/0u/eqDrVGL6dit0z42EmVHD8WV K/0YCP1ptVkheDxm7y08BpGqPnHkA3RS2uSKoslPn7dq5jpTZLPFemaLBhFJ97BCmVN7Xv m6NKdXnMvMNa371qaKITb3zv3xxcOJIVCrbGvOdHTrsKzp/xk2DpA9aiaJ9jwbYK48M+zR i3tG9LC1Bz4qjPCtZwokhgzhFcF3I4s/P6hcU4o4wIBU7Zdv9Vhx+JUZwDuexw7L/+TGfy Q0CvBgHufyv9qXP2cLnRglS3o3s63NmMBJ35G2IplkDSRVNu3FWilpfCxiNcRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703634; a=rsa-sha256; cv=none; b=YAggUVf/j/pRqHaBkMZJCVd+vLWNR+uKUvaeOc+A09tojbGwNXPSiGNboJaCqkcre2lxo1 zYjdI8FwkV0+Km+wQ3Eg1poiovvuQ1LtvBX15SS0Icp5/wpTt1vHYW/j6zRiBeXA2nXoM+ ccgnwjenGlmYR1ynJqW4T6ncVTvn/twTH/mBtm8e23obHt+8zy0DMTdny7TMvMCr8snPy1 d56LMNMFdQ+oTkE8UW6RsasEaN6HvoD0Dzw4zbWr3cMcWnpZjncqvUgM4MIkwcCGw7kH1p UlyUhN7XhcIR8zQB9HeAeag+9mjmjMvMVhBaJuAkkGE4A/wR9ViN95MZdrOdhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obhor7Xq6yHVwil8PqMXFrK6QJVSkUj/vw9t39JqAUI=; b=ZkOw3WClWTm/YNdf6Lw90OOdvKN4OdkEQ/WqnBknG5UyX9ofYLIsmULTdi38/UPENaIwzL m3o59bZtvA29m27agHFinotNWGv5VtivbUU4/Ymg0WCDI/gQf+w0JKUryKtaf4kNLaBj0m qmbPMJlUdliHk34WX1wFi0u+D6OZmKvlWBYlr/jcQgG2k4FrFJ7s0K9y36OGyDG9e/wo+6 TITUYvj7ElTfhODYyFV/ikGfmRjFOJWXMDWIkKF9pyLYHUKDF0VxYbMOWmiH27yhq9rkM5 RHeFbFVy3JLdiXenKQ2b7p9L/CNjcGZTuUD4oOXjcAvv/aasKMkhy40vf2JCFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVV4RqGz11c6; Thu, 14 Sep 2023 15:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0YaG089597; Thu, 14 Sep 2023 15:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0YBU089594; Thu, 14 Sep 2023 15:00:34 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:34 GMT Message-Id: <202309141500.38EF0YBU089594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e035e58097ae - stable/13 - split: Add missing test cases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 commit e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split: Add missing test cases. This adds test cases for c4f7198f47c1 and ac17fc816e67. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41755 (cherry picked from commit cbea5eddb1b6ae2a101beacf00bf165517f4f2b1) split: Code cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41756 (cherry picked from commit 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503) split: Fix linecount parsing. The “undocumented kludge” which unfortunately can't be dropped for backward compatibility reasons was prone to segfaulting and would improperly allow a new linecount when one was already set. Fix these issues and add regression tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41757 (cherry picked from commit 117c54a78ccd214c236806721f21da750e512d3e) --- usr.bin/split/split.c | 45 ++++++++++++++++++++------------------- usr.bin/split/tests/split_test.sh | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index b5a457ab6ecd..af1ed69c9482 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -41,7 +41,6 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #endif #include -#include #include #include @@ -85,14 +84,14 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - int ch; - int error; - char *ep, *p; + const char *p; + char *ep; + int ch, error; setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0::1::2::3::4::5::6::7::8::9::a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -100,17 +99,15 @@ main(int argc, char **argv) * Undocumented kludge: split was originally designed * to take a number after a dash. */ - if (numlines == 0) { - p = argv[optind - 1]; - if (p[0] == '-' && p[1] == ch && !p[2]) - numlines = strtol(++p, &ep, 10); - else - numlines = - strtol(argv[optind] + 1, &ep, 10); - if (numlines <= 0 || *ep) - errx(EX_USAGE, - "%s: illegal line count", optarg); - } + if (numlines != 0) + usage(); + numlines = ch - '0'; + p = optarg ? optarg : ""; + while (numlines >= 0 && *p >= '0' && *p <= '9') + numlines = numlines * 10 + *p++ - '0'; + if (numlines <= 0 || *p != '\0') + errx(EX_USAGE, "%c%s: illegal line count", ch, + optarg ? optarg : ""); break; case 'a': /* Suffix length */ if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) @@ -157,17 +154,22 @@ main(int argc, char **argv) argv += optind; argc -= optind; - if (*argv != NULL) { /* Input file. */ + if (argc > 0) { /* Input file. */ if (strcmp(*argv, "-") == 0) ifd = STDIN_FILENO; else if ((ifd = open(*argv, O_RDONLY, 0)) < 0) err(EX_NOINPUT, "%s", *argv); ++argv; + --argc; + } + if (argc > 0) { /* File name prefix. */ + if (strlcpy(fname, *argv, sizeof(fname)) >= sizeof(fname)) + errx(EX_USAGE, "file name prefix is too long: %s", + *argv); + ++argv; + --argc; } - if (*argv != NULL) /* File name prefix. */ - if (strlcpy(fname, *argv++, sizeof(fname)) >= sizeof(fname)) - errx(EX_USAGE, "file name prefix is too long"); - if (*argv != NULL) + if (argc > 0) usage(); if (strlen(fname) + (unsigned long)sufflen >= sizeof(fname)) @@ -400,7 +402,6 @@ newfile(void) sufflen++; /* Reset so we start back at all 'a's in our extended suffix. */ - tfnum = 0; fnum = 0; } diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh index 899fd028e74b..c9b87c01618c 100755 --- a/usr.bin/split/tests/split_test.sh +++ b/usr.bin/split/tests/split_test.sh @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2022 Klara Systems +# Copyright (c) 2022-2023 Klara Systems # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -200,6 +200,45 @@ EOF atf_check -o file:foo-ab cat split-ab } +atf_test_case autoextend +autoextend_body() +{ + seq $((26*25+1)) >input + atf_check split -l1 input + atf_check -o inline:"$((26*25))\n" cat xyz + atf_check -o inline:"$((26*25+1))\n" cat xzaaa +} + +atf_test_case continue +continue_body() +{ + echo hello >input + atf_check split input + atf_check -o file:input cat xaa + atf_check -s exit:1 -e ignore cat xab + atf_check split -c input + atf_check -o file:input cat xab +} + +atf_test_case undocumented_kludge +undocumented_kludge_body() +{ + seq 5000 >input + atf_check split -1000 input + atf_check -o file:xae seq 4001 5000 + atf_check split -d1000 input + atf_check -o file:x04 seq 4001 5000 +} + +atf_test_case duplicate_linecount +duplicate_linecount_body() +{ + atf_check -s exit:64 -e ignore split -5 -5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -5 /dev/null + atf_check -s exit:64 -e ignore split -5 -l5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -l5 /dev/null +} + atf_init_test_cases() { atf_add_test_case bytes @@ -209,4 +248,8 @@ atf_init_test_cases() atf_add_test_case numeric_suffix atf_add_test_case larger_suffix_length atf_add_test_case pattern + atf_add_test_case autoextend + atf_add_test_case continue + atf_add_test_case undocumented_kludge + atf_add_test_case duplicate_linecount } From nobody Thu Sep 14 15:00:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVX0s7tz4sb12; Thu, 14 Sep 2023 15:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVW62ksz4WQ1; Thu, 14 Sep 2023 15:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v38Ne2h2zZDH8Y3Dn4lZwrOqPy0fUaxksuJvt/2xWZo=; b=jdqcNBQeNiNb0jfVRiIkeFbY/5pAqJaSoinH3qulO1MbeqsdpaTqMYxrHLOG3qmSETLpqN m7BNjvc3/QBRI8w4I9oDq56MMyOIuT2/Iva8ax+kyYFbDATWMywIB9V9+f6Ucn7xTc+XMC CxUU3GGHYWl2NhR6hIVFYWNtrY180ts9mXylu8K1dGGv/lut+er6zReJU/th6HYoBCSSIR wE6B7UWEyVDtb58r26lhhiYwGVk8yOb9tBezJniUMgfDa4xD0zhnpuzYyiaOC+GJbE9XTv ZiZiiYR+E8M4LegbLPGuOHRbHMBuEmgrWydFTUXPmtsRt9Lq4LosBD+6y9reUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703635; a=rsa-sha256; cv=none; b=yTogtMgOrrufZGqPlKMWhDSsuYk5HJ8llRxG3OnM3vpX3WHXCllaUuhe7ZDeeBLnwJtEJ3 6mGHLhOSKlK6KNxLYNP+uxivogr/QKt18rKt6HlhhGzPgb3g5b0Q8ZqQkhFyPC43fkBsUP TxhIN6dTVzUjAtBwimSMs1505C6qIsSmad8W5ATCuLpaWOMDCNdD21YHHxKcV7n0DkD5Jt uWtwni2JZ1LlGE65a03/Ab3Y9Sr5QATQvq6rHwb+Wek7GWKzahzZsN3nyG1AjxxTTI51FA xhNAnlnDwIputmZ+MsvFDFO3BnIK9UzwUSEf85E7RhKmKozSUL3UKc3QGkC9tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v38Ne2h2zZDH8Y3Dn4lZwrOqPy0fUaxksuJvt/2xWZo=; b=VNb+yCKWgoiDDSOClbwrWtxy2zu0K/otOJHqq3OWuz9+4o+RDtR/x5AqPf8e4LQnxT24H7 eGCJZAZ/uLMiPnEabQOqyjhJnYs7Calk7j33Q4g0o0vTZ9qLAkXl+ueF/IPtk2oHPj4qES 7o1LQzv0QtbTgHCPKGqb8Q6sxGfLvnXmGrTmzpihzb5E8cYb+tLg5uqxGQVJ/QBOOno/ch /zA7O5rjroM2+bYz50w50FLoqr1AOefC3dEyHwdiM6/gVMom39Z1zlkI280UTcv+9RgHqx rjquay71H5+kKs96YQHT+9npHoEqbZeS03Qc8ynfDvSOq/yf5WjZdPWndbeOYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVW52gnz1206; Thu, 14 Sep 2023 15:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0ZRR089663; Thu, 14 Sep 2023 15:00:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0ZEh089660; Thu, 14 Sep 2023 15:00:35 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:35 GMT Message-Id: <202309141500.38EF0ZEh089660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8444b3642001 - stable/13 - time.h: Fix visibility check for C11 and C23 features. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8444b3642001a915c1a22ea3cefbaaf0c54b2e85 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8444b3642001a915c1a22ea3cefbaaf0c54b2e85 commit 8444b3642001a915c1a22ea3cefbaaf0c54b2e85 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 01:37:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 time.h: Fix visibility check for C11 and C23 features. __BSD_VISIBLE is always defined; we need to check if it's true. Fixes: d02489d11aed 9b5d724cad10 MFC after: 3 days Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D41733 (cherry picked from commit 8091b82e291642f3034dc3fdc8689a4f4ba027da) --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 0a7877f3c7a1..45d3a253ed61 100644 --- a/include/time.h +++ b/include/time.h @@ -180,7 +180,7 @@ time_t posix2time(time_t t); #include #endif -#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */ From nobody Thu Sep 14 15:00:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVY0KyBz4sZxc; Thu, 14 Sep 2023 15:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVX6pn1z4Wbm; Thu, 14 Sep 2023 15:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hH3tGFqpQMOQ3GyvmMJwySzlOgYY2aTy4esKefrbWKs=; b=hbIrwDG6osFprJtVreWJXlpYGKs6f4HCGTDO7B8+sDoj8YWN7jBLz9TKwNrwq8vNY4gu4g TY7ekjscT6tgRBFIRGuYQCGgunlzeP9tYReii8bazUnmwmzUsmoF/k5kCrDMBT24tfb9RQ 9S2we4seP4HXr/SHdXRbiACzAL91DBPr2ljd1uZR48KMgtyl1g/63ylAd8Jc42qrhzbHO8 HwraaSV1+DsRKd8XGEOQhbMfhA64zWhGKHnNzwcCaTbZMj+gIKGn50J3egEam/E0tFfkLX EiWnJ9OAZ2GLYlxxfuZzaYd7iQEHXM/DLFwqSf3g2rM6yN8cmb/fuZpGDWnYGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703637; a=rsa-sha256; cv=none; b=M7zKe5C90RB13kf3poMlxMjvSFz1L1nv4ZYqRxq4Y0+4malAyPV388ZVDxpXlfNXAqc/Uk fz4bibKTTdQVaW8f9Nq0Hboi2+SViQ7rMI0UDsLVYC66MjKES+wNFRMr6sXfvvmORYNxHg HnZPPyASgKl3TCYrudZ2lDlT8kGRjcEZdlu3AcSyoZzdoHsDNTuyQdU4PNXu0tigD8zi1k PYH5ZZthUJfeSU0ZGv4op8LZKOlbn6OHjIXWqRUokaZVFsvqmo/hYR6WFNMStp3kTJG0x5 0D+JTyy2Sh6sckOEunKfyjbvZUTb8TXzGSCtRU5VppVBR4Li+nfXV0eamSC6vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hH3tGFqpQMOQ3GyvmMJwySzlOgYY2aTy4esKefrbWKs=; b=VTSRgU5Pod+XbqJSCLXBahAOTlkhykfuCnqYhbVPoXyvIiFTU2zxmN9b7H32xAsGxx6kxk Fb3S43f1jt7gi9GkloWWrJzO+pcPmKLcdME1Xinhb1DvuaI1wTGdXNvCVv4X8gqTWjCXiK NieiD7f1VgSca6te9mdPU7/sw0F0XAc6gsi1Y2mv7sA8JeYLesORMRdV2SJ31g8GAZy88q zbmqwrscwE9Br0KCQIxpz7pApJe4cSy2tcEws1g2FMUIQmeyv2Ac5IWG/JQpH86SswLvTR j+b3LdNgVEcDY/cSbIhJrNd/qfDXhVKxk4I6Y0lL6Iyxvqfs4JzcohTQcHQklg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVX5vgZz1207; Thu, 14 Sep 2023 15:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0a4Z089710; Thu, 14 Sep 2023 15:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0aKW089707; Thu, 14 Sep 2023 15:00:36 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:36 GMT Message-Id: <202309141500.38EF0aKW089707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 03f654e953f3 - stable/13 - grep: Suppress EISDIR when reading. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 03f654e953f3f1e1e0e7765318a05e36492bd163 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=03f654e953f3f1e1e0e7765318a05e36492bd163 commit 03f654e953f3f1e1e0e7765318a05e36492bd163 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 2845f0ec225d..804d75b82484 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 15:00:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgVZ1KPxz4sbJC; Thu, 14 Sep 2023 15:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgVZ0bMLz4WsB; Thu, 14 Sep 2023 15:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9CR5J37o+1Ku1n7PBGjmIe6yRP9zK9dXye8oit4TIA=; b=ewijx7BnhgDEU6h2MSq1w3eHZeBKq81Sm4vIZ6BStNBOI1B5Lm1emfk9LSBk4S2GcIUIJO VnAUi6CwXc6AbvL4uV5JTTVi98XmPEtKqh9OfUzkcxmVLDvBKA4l3QW0pxdKiQqas4as6S ynk0SOCGYbcCFH2642IjY/bPLL88beEsD1+toDe6yePexbpcj2dsX4z43mjHAn31TwEoOs EABDpGYBpepU0qsGeqvUDp7pGmjTXggYVW8MDG25zFpjWurLCh6dNcH9ULgeFFzdzSygIl oD1qOeHPH3/8GukHtQpdYqF4uGxOKEyIpvQ5U7HDBWUuRffUkWNNwAoU5KWlPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703638; a=rsa-sha256; cv=none; b=W4DLmrGafpsHizCt1vZdkgjP8aX/XWQUr9H8oDpnUQDIUYeZnY6mTsB/VsL/6jhSA2sh+D EIPUx/CD7eEnvSjedHaDQcruhqxE0vlooKyVAiP6u2ZNTl6RzPUfiVHiXG/Jpz6MHcqB1W zmYeIW5nLOSmBPw9QBm7TMgF1Uyo7/qT8xWpF/qESiI+zCJqiMiWGfz8r6XUETHbXBsLW8 CqJGgYoxlVyM5uVhGgRqyUPahg32vn6eh3oKXsV0N4hQI/xsBVPe6ie9P6D+6blV8hhFKH KAjDxKvxGJ1LZ+FrBpSFZQZQzIXWn/rao2dhT2g5vzf6brSBJZUjPRMoKoaayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9CR5J37o+1Ku1n7PBGjmIe6yRP9zK9dXye8oit4TIA=; b=vZ4X1lWl4QI02elOaOxdCg0761Vkf24979tYdh90xN8DckK7BWBSZMhAD0V3MyS30LoRls 3FH2nSL6jtHs5kFhS/XpqNNKrKHhSeSwqkAlpGjOETfx3AuMLOCIElNpVZvSk1S52ezK+m t5B3KUxEgbTtWtW3EO0NJWX4SdpSOkKPIWCfy5DjDHLGRWAIgYI9yC3KGdSbGnQN23Yvvc kjdBST82sRBreNto6eZgtR2e0T4kxkki8G+WB9o4oaDQfm2ssLAu6HD1j+ykNqjIuMgJ8W m1f4Ar225ahf+f2dNVqKcoMQqAKA9dghOl5xnrATXPYlp1NMsb3cXk13k0oVxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgVY6mhxz11c7; Thu, 14 Sep 2023 15:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EF0b8f089764; Thu, 14 Sep 2023 15:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0bFj089761; Thu, 14 Sep 2023 15:00:37 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:37 GMT Message-Id: <202309141500.38EF0bFj089761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f7523720d2ec - stable/13 - mkfile: getopt() returns an int, not a char. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f7523720d2eca9287a0bddf9d2233366fa37ae99 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f7523720d2eca9287a0bddf9d2233366fa37ae99 commit f7523720d2eca9287a0bddf9d2233366fa37ae99 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 15:10:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmgjP00Nzz4sd5g; Thu, 14 Sep 2023 15:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmgjN6hXrz4bdZ; Thu, 14 Sep 2023 15:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694704200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eeAvdgWOLA8bOJcMLyMF+oyYqZRtTHtEXVBtne3XgdY=; b=wbIvOMF49K07mTrGoGK73TP7kkpQP29y492vEGqNYZC50ecaO6LURdAunUApWhM+zghr7A EnmP1mNTZT783PeQfzsbirpZmsvSrNkdljBQMQHCzkHKAdouRkeWpZreIFHs1MHi4iVjwi D+pehDNmPjxUKulp2fQrI4RavL7pAyX06OLZ3AzS/JTvBYB66diDuU7QzdeC+NFxNkyNVt ueEn9beVM3Xd4CksSQd379wRcY0iRHtW7C8wVY2nBWmDU7sm9Hr8IWMrZMPguuPdGUOeyI JsUjR9FC5AI69QVQ3C7zOYirZpQhG75rvRpDlDniJFuxkw7TuuCgZ6ZmoBZiGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694704200; a=rsa-sha256; cv=none; b=cV5jNqYi70RsNY+92+Z0uAeCeJ5vOD4t6ivVEaxsJfGy2F6A8S73wCK2XKdjNmo46Aqt34 5mfmf+Tm9V2YMqd2nLAKzy05KyH8TAnv2lBbhjtoPz//iSJEjmcZLpDMxtWHIAtDpAzHx1 lHarVik/VEbafuPxmDK4VYFVhij/T38Ik8e/W5hwa/L3ItFdRMxBg01gkl44fxBgQ2m7LR kYnN0cV4wLnAblSDXO8mNcRp2ugNCv0y7i2lrnbQH55CrDJrSjfgF0513hrP2WxSd9KOZ8 qMzPWsDh/gg8mJpzWxhykFpIrgbklPXQs3Yy/Bmg+C+CT/W4rbfw91F25kQgBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694704200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eeAvdgWOLA8bOJcMLyMF+oyYqZRtTHtEXVBtne3XgdY=; b=BccSfVH3GzQK6lyro8dE2aU4V7SkSRdgO+wai0FSasBb4tNr37HxwKqCL2QdDzgPntFAlh wZ/eOX4coGEcRhqwbeHtQn7qghyguCFxgvqGMOsFWi1DRrs6stBj1x0VW3NTXLoWZp4gU7 P/2mP3DtwO1NFyG9/RRbUYSw86vrVKBlGAJRnDhY3c07Z58dWf6zEARySKTAeRUunoSqvq xteotysu8wK/3zbLwQKHhpTS99NwYTWvhdVjMcin6ldo/jXP48CVKeMt3p03iAnClmTbcg S7xG7jKsKDGpmN/y5iL2JJBULzMX+tqlNpLxTjuDQBDpyNCarczoj1nAfa9TIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmgjN5fHRz127K; Thu, 14 Sep 2023 15:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EFA0Q2098866; Thu, 14 Sep 2023 15:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EFA0Y4098837; Thu, 14 Sep 2023 15:10:00 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:10:00 GMT Message-Id: <202309141510.38EFA0Y4098837@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: 74be676d8774 - main - vfs: drop one vnode list lock trip during vnlru free recycle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74be676d87745eb727642f6f8329236c848929d5 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=74be676d87745eb727642f6f8329236c848929d5 commit 74be676d87745eb727642f6f8329236c848929d5 Author: Mateusz Guzik AuthorDate: 2023-09-14 14:35:40 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-14 15:03:03 +0000 vfs: drop one vnode list lock trip during vnlru free recycle vnlru_free_impl would take the lock prior to returning even though most frequent caller does not need it. Unsurprisingly vnode_list mtx is the primary bottleneck when recycling and avoiding the useless lock trip helps. Setting maxvnodes to 400000 and running 20 parallel finds each with a dedicated directory tree of 1 million vnodes in total: before: 4.50s user 1225.71s system 1979% cpu 1:02.14 total after: 4.20s user 806.23s system 1973% cpu 41.059 total That's 34% reduction in total real time. With this the block *remains* the primary bottleneck when running on ZFS. --- sys/kern/vfs_subr.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 1c6827ba0587..80ec15f78028 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1290,13 +1290,14 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) mtx_assert(&vnode_list_mtx, MA_OWNED); if (count > max_vnlru_free) count = max_vnlru_free; + if (count == 0) { + mtx_unlock(&vnode_list_mtx); + return (0); + } ocount = count; retried = false; vp = mvp; for (;;) { - if (count == 0) { - break; - } vp = TAILQ_NEXT(vp, v_vnodelist); if (__predict_false(vp == NULL)) { /* @@ -1319,6 +1320,7 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) */ TAILQ_REMOVE(&vnode_list, mvp, v_vnodelist); TAILQ_INSERT_TAIL(&vnode_list, mvp, v_vnodelist); + mtx_unlock(&vnode_list_mtx); break; } if (__predict_false(vp->v_type == VMARKER)) @@ -1366,18 +1368,28 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) */ vtryrecycle(vp); count--; + if (count == 0) { + break; + } mtx_lock(&vnode_list_mtx); vp = mvp; } + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); return (ocount - count); } +/* + * XXX: returns without vnode_list_mtx locked! + */ static int vnlru_free_locked(int count) { + int ret; mtx_assert(&vnode_list_mtx, MA_OWNED); - return (vnlru_free_impl(count, NULL, vnode_list_free_marker)); + ret = vnlru_free_impl(count, NULL, vnode_list_free_marker); + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); + return (ret); } void @@ -1389,7 +1401,7 @@ vnlru_free_vfsops(int count, struct vfsops *mnt_op, struct vnode *mvp) VNPASS(mvp->v_type == VMARKER, mvp); mtx_lock(&vnode_list_mtx); vnlru_free_impl(count, mnt_op, mvp); - mtx_unlock(&vnode_list_mtx); + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); } struct vnode * @@ -1534,7 +1546,7 @@ vnlru_under_unlocked(u_long rnumvnodes, u_long limit) } static void -vnlru_kick(void) +vnlru_kick_locked(void) { mtx_assert(&vnode_list_mtx, MA_OWNED); @@ -1544,6 +1556,15 @@ vnlru_kick(void) } } +static void +vnlru_kick(void) +{ + + mtx_lock(&vnode_list_mtx); + vnlru_kick_locked(); + mtx_unlock(&vnode_list_mtx); +} + static void vnlru_proc(void) { @@ -1574,6 +1595,7 @@ vnlru_proc(void) */ if (rnumvnodes > desiredvnodes) { vnlru_free_locked(rnumvnodes - desiredvnodes); + mtx_lock(&vnode_list_mtx); rnumvnodes = atomic_load_long(&numvnodes); } /* @@ -1751,6 +1773,7 @@ vn_alloc_hard(struct mount *mp) rnumvnodes = atomic_load_long(&numvnodes); if (rnumvnodes + 1 < desiredvnodes) { vn_alloc_cyclecount = 0; + mtx_unlock(&vnode_list_mtx); goto alloc; } rfreevnodes = vnlru_read_freevnodes(); @@ -1770,22 +1793,26 @@ vn_alloc_hard(struct mount *mp) */ if (vnlru_free_locked(1) > 0) goto alloc; + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); if (mp == NULL || (mp->mnt_kern_flag & MNTK_SUSPEND) == 0) { /* * Wait for space for a new vnode. */ - vnlru_kick(); + mtx_lock(&vnode_list_mtx); + vnlru_kick_locked(); vn_alloc_sleeps++; msleep(&vnlruproc_sig, &vnode_list_mtx, PVFS, "vlruwk", hz); if (atomic_load_long(&numvnodes) + 1 > desiredvnodes && vnlru_read_freevnodes() > 1) vnlru_free_locked(1); + else + mtx_unlock(&vnode_list_mtx); } alloc: + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1; if (vnlru_under(rnumvnodes, vlowat)) vnlru_kick(); - mtx_unlock(&vnode_list_mtx); return (uma_zalloc_smr(vnode_zone, M_WAITOK)); } From nobody Thu Sep 14 15:30:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmh8r68gsz4sjZQ; Thu, 14 Sep 2023 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmh8r5X9Hz3CwF; Thu, 14 Sep 2023 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694705420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRxnUI2HCnXj66JCCJ7vle4Bfm6a1n/z2l9PISEVIXs=; b=ZHGMIwOYYJWKnbVi1xaeyYNebW/TUV5BOJyxPNf8+KdctoCIz0cVdYQtlONfzBbxCPW4Fy d6yCS//Y4YrXE6fC/+3EdUq1lMGHY46AvwPQLkS/icj9zcRITjyFk/QdymNCvHbG0znrCl 4h3BbCJdxzblOIOROXHa/yn09Pbj4b8uTdqs91TjxB5+sRbcGJgTLYuG3vOs52XsXt7Rrj R+OLB63NYUInBZbqTq/yO9mqagmhC4f7S04XZIHeIrtMbdB4W5u80+K2zU+Fbv0p0gN34S bECr1ZsIuQ1A2TTUelQ2tvyKY9711XqdqjUSRA1Fj1mhDPEn6xokKdbOKCV3dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694705420; a=rsa-sha256; cv=none; b=QGtFByA4giPl8eMRNPDRgSPoPTQcm2bdtMO5vWJkmBnQAqR9K3Nmr3IzjQrMhU5ADyselK PcBmGFCQ+0Ifbp5h0amKpy9xPM0t7WHtQf156pfMatBzVHRPYdMN6SqvyN+uVqZVklnfev d9DL2J/7DXvLlwLMv1RhlqUDzH5ZE81FCTQiWPkdpVReG/+ERV66Q0e4gIDAtc2NGkj2Vi 4A4UgNk+XJ5afSXtJxOrI/w9wbsIeUtw5oMOUJIs9y6wIpUYFzcfSDR7wuBwN7m8rtAI8a sL6Ds8BupP1H+XXizT1XVnLPZeXjoGgLNkcuv8XgHs7vWol5MJK6zPtTMiSUrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694705420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRxnUI2HCnXj66JCCJ7vle4Bfm6a1n/z2l9PISEVIXs=; b=ozSyDTS6zlkdabejbGhJR698ofLkyPIf+F22qtzLhF9tdiOkN/UMwKKH59Mwvh8iXroAd0 dkYLQwsIk+aBhpysw7LAoIvGbbEwF5UB/zhmjfkPOqTUICvSkU54YaHoTZIfkg9UGw1pRg TFFUuSJ1Rg2OxzhOZDWzb00V7OJNhwH22L1d8yoJwExuoJsKy/Ef39YaBbcHxQhlcFkcDZ vB++BD77UgTzIzSCoYFSc4R/Y+QK0v4u0uGhQjQuIYEFMYEYUYMD9LxtkERLk/5bMJB4ew +mi5SkLpEoxvfI/0EhB/vaHjqjqPNybK495/vg2ehy8r6G5n95XL6RpfYnKmkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmh8r4cPGz12ZS; Thu, 14 Sep 2023 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EFUKOs038937; Thu, 14 Sep 2023 15:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EFUKOr038934; Thu, 14 Sep 2023 15:30:20 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:30:20 GMT Message-Id: <202309141530.38EFUKOr038934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 125bbadf6084 - main - x86: Add defines for workaround bits in AMD's MSR "Decode Configuration" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 125bbadf6084ac341673c9eb1979a740d3d5899a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=125bbadf6084ac341673c9eb1979a740d3d5899a commit 125bbadf6084ac341673c9eb1979a740d3d5899a Author: Olivier Certner AuthorDate: 2023-09-11 13:10:35 +0000 Commit: Ed Maste CommitDate: 2023-09-14 15:24:48 +0000 x86: Add defines for workaround bits in AMD's MSR "Decode Configuration" They are a bit more informative than raw hexadecimal values. While here, sort existing defines of bits for AMD MSRs to match the address order. Reviewed by: kib, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41816 --- sys/amd64/amd64/initcpu.c | 5 +++-- sys/x86/include/specialreg.h | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 4debe89426df..a048c08fc9ae 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -101,7 +101,8 @@ init_amd(void) case 0x10: case 0x12: if ((cpu_feature2 & CPUID2_HV) == 0) - wrmsr(MSR_DE_CFG, rdmsr(MSR_DE_CFG) | 1); + wrmsr(MSR_DE_CFG, rdmsr(MSR_DE_CFG) | + DE_CFG_10H_12H_STACK_POINTER_JUMP_FIX_BIT); break; } @@ -151,7 +152,7 @@ init_amd(void) (cpu_feature2 & CPUID2_HV) == 0) { /* 1021 */ msr = rdmsr(MSR_DE_CFG); - msr |= 0x2000; + msr |= DE_CFG_ZEN_LOAD_STALE_DATA_FIX_BIT; wrmsr(MSR_DE_CFG, msr); /* 1033 */ diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 548d6010e7b8..f45990a056c8 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -1162,11 +1162,16 @@ #define MSR_IC_CFG 0xc0011021 /* Instruction Cache Configuration */ #define MSR_DE_CFG 0xc0011029 /* Decode Configuration */ +/* MSR_AMDK8_IPM */ +#define AMDK8_SMIONCMPHALT (1ULL << 27) +#define AMDK8_C1EONCMPHALT (1ULL << 28) + /* MSR_VM_CR related */ #define VM_CR_SVMDIS 0x10 /* SVM: disabled by BIOS */ -#define AMDK8_SMIONCMPHALT (1ULL << 27) -#define AMDK8_C1EONCMPHALT (1ULL << 28) +/* MSR_DE_CFG */ +#define DE_CFG_10H_12H_STACK_POINTER_JUMP_FIX_BIT 0x1 +#define DE_CFG_ZEN_LOAD_STALE_DATA_FIX_BIT 0x2000 /* VIA ACE crypto featureset: for via_feature_rng */ #define VIA_HAS_RNG 1 /* cpu has RNG */ From nobody Thu Sep 14 15:51:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmhcz3xd9z4spF1; Thu, 14 Sep 2023 15:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmhcz3Qbfz3G75; Thu, 14 Sep 2023 15:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694706675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nF7QjsQ+gBUUvn1BM01WWgEn3HyC95WnUx/mueRTwEU=; b=aaTZzySPIsUMDHxIpxHGUeWi6nlHpoKC0BLQiY0waLuQcTlwKiBQdzH4KkDZPpiUTuLT05 00vTuGx6AlReVDEjUlAMulfQHvyrNjr3bKiy4h5o6ikHwhvNdjXLz3++MKtU3fkkzTAjoy fbVHBe+FiDfCXbvqiOn9o0y9g4LADGFuBQUPPLexltLDFF5gDDMy5MYpvTlpAchf+UTXlf gdkqQjO4F7YIGzqm5xMQ6vcZDKLdq9CwNCUIeJ4FKpYyRIlpW/QiaPwLsjV9tvrNoMq0mQ ue919lEaRFGPDo65QSWr/a8sp8XBbRm3v2Hhyrov2BGrALUQZt5yjsDdhvMzLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694706675; a=rsa-sha256; cv=none; b=jjirU7pttuVpsOkE0EMnJY3AXenDwsKdRUowBtmyqXS1cRXXksDLxi3q/Uh79p+r+pIdNk qC8Zo6OhUd379dA4Q84l8qOuj7Xh7b9P0msOscjo603WDSAwhQrfEfl3gUTxrS7Zzy1Zc8 RND9d634hQ0SlygoDZoYE1uGcYmaffx2dMufZwf3q6flgiwN82ILKhp3nNlpMzTwc47yPq iFs7VQGeu6GQEh95b6WasXVRU+EiLklIO3wvqCZY1RzmruIj5O5cRIy7tW6HBVIKnaAeWl FSguVRc9P1SPgysNpRGTdG3RoKb79vARAOEFMeaNJaeuAlO7Y1T7AmVPlnyQFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694706675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nF7QjsQ+gBUUvn1BM01WWgEn3HyC95WnUx/mueRTwEU=; b=SClwY+adzG4Pw20EeQ4gxEKw1VuD48fbqg+CpnwkQFVmnbpqbYJz5wswKXdPaDIaakq9ec gm+gL8cStXl1oyJ89X73rzLdP8doYYvQu/zcVjspMVzxmYuRsIHy4HSDU3YZt9WZ7/y0Nq t8CxnEcBabF0dYsMIuLeI+W9P73G5TUyxtXOIFZZ4xQXvswf3CJaFtkQIu8yIK+9fYwOAz U3yR53PRb3MN9FrP827CXxE+XOurewyS2X9uZ6jpR3gfh30adpVM6emMSMDxPKLHtO4Wa1 zrCLRKzjGhR54DfWl8nVMSoRV6e4VXEDthNgWyU1j5/Z3L2WlWmRHaGNbeS47g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmhcz2Twvz12jF; Thu, 14 Sep 2023 15:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EFpFmW074786; Thu, 14 Sep 2023 15:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EFpFJF074783; Thu, 14 Sep 2023 15:51:15 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:51:15 GMT Message-Id: <202309141551.38EFpFJF074783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 74da9c39c346 - main - pkgbase: Split out manpages by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74da9c39c3460213750477204979989b5c39cbcd Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=74da9c39c3460213750477204979989b5c39cbcd commit 74da9c39c3460213750477204979989b5c39cbcd Author: Doug Rabson AuthorDate: 2023-09-14 14:38:07 +0000 Commit: Doug Rabson CommitDate: 2023-09-14 15:50:40 +0000 pkgbase: Split out manpages by default This helps with building small container images using pkgbase. Reviewed by: manu bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41861 --- UPDATING | 4 ++++ share/man/man5/src.conf.5 | 4 ++-- share/mk/bsd.opts.mk | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index 59788ab2c15d..b1276bfe83f6 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230914: + Enable splitting out pkgbase manpages into separate packages by + default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf. + 20230909: Enable vnet sysctl variables to be loader tunable. SYSCTLs which belongs to VNETs can be initialized during early boot or module diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a5e7c501825a..64f725c7b2fa 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1152,8 +1152,8 @@ is set explicitly) .It Va WITHOUT_MANCOMPRESS Do not install compressed man pages. Only the uncompressed versions will be installed. -.It Va WITH_MANSPLITPKG -Split man pages into their own packages during make package. +.It Va WITHOUT_MANSPLITPKG +Do not split man pages into their own packages during make package. .It Va WITHOUT_MAN_UTILS Do not build utilities for manual pages, .Xr apropos 1 , diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 93b0e7184b6d..51260533e265 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -60,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ + MANSPLITPKG \ NIS \ NLS \ OPENSSH \ @@ -76,7 +77,6 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ - MANSPLITPKG \ PROFILE \ RETPOLINE \ STALE_STAGED \ From nobody Thu Sep 14 16:31:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmjWs1V1Nz4t04G; Thu, 14 Sep 2023 16:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmjWr6wWkz3MdF; Thu, 14 Sep 2023 16:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8jHhY8k/NdR3zEiLYNdmUiyvo5MTSwVBd+IKyZaBTM=; b=gFYarXdiZ5cYfzzbB9Ivj8Ab4uEzsGCLp8CXPUyNmXxjq+6jrsNt2VQBKS+96JVZ4zYUX5 SaPFd+9zE6AC4niNySrXBbdbsTcE8N4KQpe5QuvRlDAyAvVGpG7M8VGatRuyUMeS9GJo9p TKKRzTGD2Vh0bPz501vLk2cyDpxGSsfiQrhtwAc4efoIYRxsB6Y2/RRW1XLchS8Nz/ibL8 zmVBwU5bVs9vMbMs9brgTv2h54fIYAU+MWNHt8u0wFfex38QQ9xL1ORY13mN+YTUTyEdpb /2T2EsQMtSBGYR4irAY4hjObjoxr2RiyQY36Tx/ZMlI5/s4fS0d9/0/ElYsXQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694709113; a=rsa-sha256; cv=none; b=duykpMmxAQyAeTgoQG+zgKQvxaJTRFNx5Ym+H0Yuznd7NJudg5Wk0rQ/M6mSxR5V2eSm7p MipRnKSdjyQ9IgZsd/f+0jcJmsgArERyi8PH+MEovfvtcnGOvfwwbThe/+H+r0OeUCE04H PFMISDrUQvm7c8yWez2Gpjqwg8XlinB4wlhDoaw1DTVuPmfnvdYCOeZ8LcTR69gjDgPqVB OZD3JtwHE1fbjDT+WhTG40kWDe74xfqaFjgHH/4KazVVn9sAZk25tBqEpnk3mHe1mMaiab ySK7PHozt/A35AdojS/R6ZHqvkNqYwuXaQEh9n3hBqoE1JlGGs4jGpKUPOKblQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8jHhY8k/NdR3zEiLYNdmUiyvo5MTSwVBd+IKyZaBTM=; b=S75tT7lSndkoTr7sH0UnebdkMAT/WaQuHh78CAGxFpDSmP276RRN4C3gVmPi6IHQCZbCs2 uBgkXrkmfR0fXOgWhy0mJkaQl7YfSdCK9tSEh/llj0jtRON8jotgxsbpqiIZZihQt+jydI PPF8oqx4oCB4RG5GkQvZGOem4MVFHG2D2RnnJWXkCZG8jXyE08wj3GTDpcIq7Q6M37sqUY 1VrrjStwGDrYr8oCkZ7IkmTiAMvZrLqo36s7wZi3ag9k0Wu9PymhllxyL8aN/Df7DmyThy xQnzQ+onCN8DYrJOR9F2kwpn6Gx1NTL76JAFUHbembalpdNDxwvnfr4b/LFA5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmjWr627Nz1445; Thu, 14 Sep 2023 16:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EGVqu6044544; Thu, 14 Sep 2023 16:31:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EGVqxo044541; Thu, 14 Sep 2023 16:31:52 GMT (envelope-from git) Date: Thu, 14 Sep 2023 16:31:52 GMT Message-Id: <202309141631.38EGVqxo044541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: a1575a98850c - main - Fix typo in VERIEXEC_VERIFIED_FILE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1575a98850c7484edac53052bb0e4232c10002d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a1575a98850c7484edac53052bb0e4232c10002d commit a1575a98850c7484edac53052bb0e4232c10002d Author: Simon J. Gerraty AuthorDate: 2023-09-14 16:31:31 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-14 16:31:31 +0000 Fix typo in VERIEXEC_VERIFIED_FILE Reviewed by: stevek --- sys/dev/veriexec/veriexec_ioctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/veriexec/veriexec_ioctl.h b/sys/dev/veriexec/veriexec_ioctl.h index 7f41464e495e..d88998f502b4 100644 --- a/sys/dev/veriexec/veriexec_ioctl.h +++ b/sys/dev/veriexec/veriexec_ioctl.h @@ -63,7 +63,7 @@ struct verified_exec_label_params { #define VERIEXEC_DEBUG_OFF _IO('S', 0x6) /* reset debug */ #define VERIEXEC_GETSTATE _IOR('S', 0x7, int) /* get state */ #define VERIEXEC_SIGNED_LOAD32 _IOW('S', 0x8, struct verified_exec_params32) -#define VERIEXEC_VERIFIED_FILD _IOW('S', 0x9, int) /* fd */ +#define VERIEXEC_VERIFIED_FILE _IOW('S', 0x9, int) /* fd */ #define VERIEXEC_GETVERSION _IOR('S', 0xa, int) /* get version */ #define VERIEXEC_LABEL_LOAD _IOW('S', 0xb, struct verified_exec_label_params) #define VERIEXEC_SIGNED_LOAD _IOW('S', 0xc, struct verified_exec_params) From nobody Thu Sep 14 16:39:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmjj44wStz4t21r; Thu, 14 Sep 2023 16:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmjj44V4Xz3NjS; Thu, 14 Sep 2023 16:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJHwVdRO/8xXDfPO5VhJ2kWEVMZY8CYbp8rt8V7dAzE=; b=a/6BSi++r/GlbD2F3/wh2wr/Zqi0edueTvdosVlmhJm/OSFQPVQeQ/b6fvfxPoBoWAW3h8 mNBonSmL89h/EUQPnSa3rBwWButkXaHT9yAkPFtdy2p8SMah1dypp4Uo6aCHIP3TPt5oX0 GKxoTZKln1cI1x1XGge2X/ec5hPVAXfRobc9U1Q7jmnVkz18zFHlUfmzZnq6gXH9mX0+cg JIhM/JRsGILXF0/19ritcTbwI2fHgODhnGjIC7yPggvlBdZmg6mmb1Bi6xvlA4eRh0uUif dcgEjRmgVlnXOSf9VmOepBPwRrCzFm4QvsKByARhH4Z3c70Lj0BCMhw1uSeHig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694709592; a=rsa-sha256; cv=none; b=NsHyeX0sAMh2Rkz54cqGaC+Qb+DV0He9bW5khB0fNLken1pfYlpVQSlrLsUeedIRW3v74p 8sGeQ8PbeY0kfiD4CrlqVehSm9kMkNBV/hkzr5kkdlZ0TEk+EV7vqpdr6L7mBNEjKNiJZv 2Pwb1OX/WbuROsblbU9846FXeG1GLXv7aIqH66eDILd+uIv/B7LdQNHYZVkuwCaxmj8y7D UDJZVci8MIx81vW3aKDlSH1dgSMB94VKMoAt8L43oy8WgSfnGyxGi4HBoJAwzjAVvcAbTs eXDze8eL+dRKynD72T2Dx6iDrj0iIrWkjuKTR1HhovEwv83cCpfvz2m6uKrz1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJHwVdRO/8xXDfPO5VhJ2kWEVMZY8CYbp8rt8V7dAzE=; b=oxVT33zXN9deCbR4CI+PUqbrcESm1JqBQWU983lAhd1dkByJmj4LfNZjcLDkzX0C2468xg CaVaD0uF87OUFbWTbRobZ6gCMoBeDtyS+EE961lyXZzzmvIPoSZO/kyijsrYrz52hVZ0m8 /rEL/eai1KT7IJ7NSqSzvmtcIDtZquRuIUbbcmb5YPQPZ9WAORqaMh1VoVBCB0vYWOMnx2 RFEQiE/hL97LXXN0GbxxjEGbLzWvsPLw/ofljmPmDFBGVkxlCcGeL7AbuVrxU7ISTWz/7B rqdl9BaD8VfgnT7iFlrnCe1TVjAQZ1e899vzzgL02Dm4wXkM/ioT8Nu4jO1lsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmjj43Th8z13sh; Thu, 14 Sep 2023 16:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EGdqr3046833; Thu, 14 Sep 2023 16:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EGdqbG046830; Thu, 14 Sep 2023 16:39:52 GMT (envelope-from git) Date: Thu, 14 Sep 2023 16:39:52 GMT Message-Id: <202309141639.38EGdqbG046830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b9c012a60b6e - main - ObsoleteFiles: cleanup old libclang_rt files for powerpc64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9c012a60b6e98f7c3e765859195302cf3ae7f6c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c012a60b6e98f7c3e765859195302cf3ae7f6c commit b9c012a60b6e98f7c3e765859195302cf3ae7f6c Author: Dimitry Andric AuthorDate: 2023-09-14 16:39:31 +0000 Commit: Dimitry Andric CommitDate: 2023-09-14 16:39:31 +0000 ObsoleteFiles: cleanup old libclang_rt files for powerpc64 PR: 273776 MFC after: 3 days --- ObsoleteFiles.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 55a198db4d04..15e3b000de3c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -388,10 +388,13 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a @@ -402,9 +405,11 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a @@ -424,8 +429,10 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a @@ -443,34 +450,41 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a From nobody Thu Sep 14 16:40:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmjjb71QVz4t20R; Thu, 14 Sep 2023 16:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmjjb6W2Kz3P3k; Thu, 14 Sep 2023 16:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZU6vMGX5b0VoYPv5Z3D8L5mCUGE4cudm1+U4qqjsZs=; b=PP0cYX2nJTjnBtcbYsRtwGR60An8ZNurPx2KX+VhHZtX3HCyZaIdY21zln7w2CRS2SjKgz xsBCUgi74LUhwRUvZVnFZkLAHdCrc5pmOhY8w57OG7TqDcH7o5DAuYxtEZ6Qu4Swdfwkal RJGtpckoyWGAHaOrxiEaXnBK7JzDhbw0sBvCo/f07bFv165A3rr06KplcAKpnhBZ/N3BNR 5Sms5dCBQLH2d4yp0ErqZ5thr8jFzv2+LOmlsF+lGXqVXjzoctHJOVSI5wpYommJQNdorj +cpfPh60JzbIxMHFuEK4611QY+XUGpgFPqJ7cOGOGDgIPB4zP4ORHWNAu9aL/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694709619; a=rsa-sha256; cv=none; b=mglgorYdlLZ165NxVn0OWQq0xzmJiBI+xmbJqc/vUBJK7Bq8VaWd2fAl4/rob4hh2+/DiP +msfaW1FjjRqkOlEELaxRC9UmSSiHca7hbLI2GTy99j/Wm0klEO7KYG1TRkRAhRg/xQUyh DRMBdw5jeV7YTT7Fh2sKAt18Rr62231n9MN9eRdJAINeN20TPQ/5/+5I1aYLMxobi5wO9L B0XCegEL1guexZxn2YB3P0is6ZTQUfjcHIUXR2onnOE5WtFCYE0aNh7QwIyGbIcPFZSRZ6 rRW5plpcmHHwYXYPDvLgi4x9+Vkuk1LH1Xtnivc5zx432IHI9FXDoLm6yWjMEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694709619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZU6vMGX5b0VoYPv5Z3D8L5mCUGE4cudm1+U4qqjsZs=; b=T73W7gGp51odzx8Zgb0DVQHVcoKXpkStlExyC/pkLrRUS9ZnRPEtbOfmijLArmVpgTBLQr Adt6ECauvH4sPukUcZiPpBuV+fs9wL9R0gIvoqpL477wLID/Y7AweulcV+UGRWsIYvvKQ6 wUn+HVKSQ3Psp+vKwihc0Bhu6GfxwL9zMn+6qeqaQzyBtMfB5I8S8mP61rcJO/PVgclHZN au+ovNsIKUjJDzRBbYlrL2ukxDmy5dT/NVAAyRYdpMMzLuHDA+bOzV0/+XFA0hx1jd9QYf sVVgXmC26JxbPojQVguyyDWrl1WUvPvUFW8iI/NLCqhKAEU3m5pY+BzN9bz2iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmjjb5c8sz146k; Thu, 14 Sep 2023 16:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EGeJV9055502; Thu, 14 Sep 2023 16:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EGeJQn055499; Thu, 14 Sep 2023 16:40:19 GMT (envelope-from git) Date: Thu, 14 Sep 2023 16:40:19 GMT Message-Id: <202309141640.38EGeJQn055499@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: 76f1153790b6 - main - vfs: don't kick vnlru if it is already running List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76f1153790b6d2e1a4f0389c3ac24e41d08f9ba6 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=76f1153790b6d2e1a4f0389c3ac24e41d08f9ba6 commit 76f1153790b6d2e1a4f0389c3ac24e41d08f9ba6 Author: Mateusz Guzik AuthorDate: 2023-09-14 16:27:47 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-14 16:40:14 +0000 vfs: don't kick vnlru if it is already running Further shaves some lock trips. --- sys/kern/vfs_subr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 80ec15f78028..4c9cb6200f10 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1557,9 +1557,11 @@ vnlru_kick_locked(void) } static void -vnlru_kick(void) +vnlru_kick_cond(void) { + if (vnlruproc_sig) + return; mtx_lock(&vnode_list_mtx); vnlru_kick_locked(); mtx_unlock(&vnode_list_mtx); @@ -1812,7 +1814,7 @@ alloc: mtx_assert(&vnode_list_mtx, MA_NOTOWNED); rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1; if (vnlru_under(rnumvnodes, vlowat)) - vnlru_kick(); + vnlru_kick_cond(); return (uma_zalloc_smr(vnode_zone, M_WAITOK)); } From nobody Thu Sep 14 17:16:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmkW23kwYz4t9bP; Thu, 14 Sep 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmkW23HxXz3VCR; Thu, 14 Sep 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694711774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=x+g3o+K7UL4bR4Mxo1s+eK+KN9ajvEkC4IIUr+GHBXYlb8bWqgri8HfVQm3ta1O3LIiVXr lb0NVHLWwXYsDfzipHGrvs5h6bHWquwyoyFCM1H3gCBCSFE6J1He9e/QXEo9b8v7+EqrwF 5ycUNsvNCb0baENasY1eqUT/7Z1TUqkoJjDROSEiy1M7LdzWpgKnd2jL3VBh2ldrP6gwWP GJaZVnB0MDrYcVf0VV3shj6N912J5DmWoeDJjCNgizMW8238mWRpNMDVkFdmHeIPOQamTC 1Pzk8iz43jZA7idBJIwtAp8Sv91nx4VqOSiBS73Q6G5eic8bak5A7seET02Y8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694711774; a=rsa-sha256; cv=none; b=JY/dR3WdmO30vqGoaXULjxtNIqUBMWjV/8j/Jijdv5y95nGmECjfmDV4PCFtZe30qWqfgt cgjlSqURL2wB5cETTbfLRE5UBDNbKQNRNzDFYP63umwQLTVDGIjfuTa6i534rz/sB67SRh gBClFghxjK88vgUZ0QVfgjxuSOhmUe64xD3wIL37lKnhDlbmbHQDa7VGZjr4Yke01UshQH LB+CkkZ/kzJI2uSTvVDGIJPlHuM5tMXUDbjxWD0m4w7TbYsQef+EESCcU8UjU8gENpxc8n VeusAyreGCZ5c/kTwhXtOc8AHmKv3EYwD+NO3XeBkdaLDufJRx9fEdG5eUKUAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694711774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=mFqvn6h9tovujxRlLZPjw57xrftPhajNtQ7cx9hSN/Xd26TzYttrK9bGXLXiiJw4RKCtvi nAfkozj6UZ5crEPmKD1U9yNklpsALcutpvFT4ObIn3ofLY9TT1MgMP887yXO7O0+lRNDLP hDCpkcGlDW6gw7t0ZWw+TFH1qYsJ1vrsYWurcB5Yvu8dpzKTgs0KYwtIrncARxUEDqCjRp 0Sy+AwdsrW9aTVHNFBee8wBqsk/zqrFAPjWilNafoxH1Q+2eMxYsUoberbk7Q1OcNSqezE aArQXqb8HPYnKI945os4Lp/f/ivUVGYjdycw6Sof0sN2WzgfEIoqhbwlALZLHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmkW22Gcbz14j8; Thu, 14 Sep 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EHGE0Z013426; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EHGEWC013424; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git) Date: Thu, 14 Sep 2023 17:16:14 GMT Message-Id: <202309141716.38EHGEWC013424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: d737efcc1c25 - releng/14.0 - MFS jail.conf(5): Fix and expand description of ".include". List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d737efcc1c2582c793be202ed337de2589ff5301 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=d737efcc1c2582c793be202ed337de2589ff5301 commit d737efcc1c2582c793be202ed337de2589ff5301 Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-14 17:15:44 +0000 MFS jail.conf(5): Fix and expand description of ".include". Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. Approved by: re (gjb) PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 (cherry picked from commit 165234d5527440b7755b01554ff7633e33c0d285) (cherry picked from commit 402d5960cb82eaccc33177aac821dbad1b42db1c) --- usr.sbin/jail/jail.conf.5 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 33a66c85e7ea..0b82a972020c 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jun 3, 2023 +.Dd September 5, 2023 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -164,11 +164,22 @@ and .Ss Includes A line of the form .Bd -literal -offset ident -.include "filename"; +\&.include "filename"; .Ed .Pp -will include another file in the configuration. The filename must be -a literal string, and cannot contain variable expansions. +will include another file (or files) in the configuration. +The filename should be either absolute, or relative to the +configuration file's directory. It cannot contain variable +expansions, but may contain +.Xr glob 3 +patterns. +.Pp +The included file must exist, though a filename glob may match zero or +more files. This allows inclusion of any/all files in a directory, +such as +.Dq /etc/jail.conf.d/*.conf , +or conditional inclusion of a single file, such as +.Dq jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: From nobody Thu Sep 14 17:29:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmkps0mdGz4tDbQ; Thu, 14 Sep 2023 17:29: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 4Rmkps0KZ1z3XVk; Thu, 14 Sep 2023 17:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694712597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asxXv0Cl8jQw8m+jZnVx7KVOuHw8+atAu+HGAUiG97U=; b=EMZST3lVLwHOYtcpV2TWsOfdT+6iiCZHOivuFDVslGZwBUwyTk+KL2n3GI43MBHMtxixZM kG9sjZWo2kMbCDzxfvQGTkhvONAQnD861EABTHXmyruk5k2r9fBiJjo5Mg7wC3GhrvvWYF blpeLS6gOgQVrfdOdyRGB/W+nY3VJNbkh7gIvXzg93Emnissasj1mIveraVjU4tUJ7RIu9 FbzWRzszd/LTnAoXG/xSGMBPG5/ejxbMlB4PNyp7wHOrSgST7wwzble2u1m2QgVL608wJx v8xZ8qRt9Pdxg7So182WSWADI4o315Oz1zO2p2NwrxtWGSkCZZG7lHbmrn1ZzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694712597; a=rsa-sha256; cv=none; b=uJHG2w1hYNmNqzj9E3IxLp+O0tds1FT3anOQpcae2Ttqny+vRirvVGF1B6hnWOSxdPUFtO KzqpSjs1CcuK2cfCSA9PMjGhVcvuFOmnpYpxYAQBkDXZUcMpL6pr7HRkk7gjw3kAfL6N9A HJFg8zhqKmYu04aAVMSZMUY0uvT2OC9mAtdh9sDnb//j7VXvGaW1+iRPVGdx1NyyBEdV8d CZRakQpa44r3B2oq66d8o8LEocnN9HpXFpn9Bsq8IOqlTWfWHAD/lgCLR/458eWedy0xtn THRHIIiiMhZwvswYzAzYMiUncN2z/qHqB30G+0+p7QC2sYq2k6AOcS0CQdU1kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694712597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asxXv0Cl8jQw8m+jZnVx7KVOuHw8+atAu+HGAUiG97U=; b=SQOQQ35qmTepnMwaNtWtkSQ+s93YRduaoqDECIlvA1pAFnn0qC8xPlYgcWrrWVSJaOyDeg DIA8J3r40/Rvq4u/ffOi03214/NII+5sVXKKK7QHJzvGoXZxLNAM2YRfnNvOPStu841Vme /3Fhno4sjW4oWLwKb2g1oqHbOlAuZLGvOwguZXQbK/nF3LGYK/KqAkNAy7W/PT96K0F++W 2YwRbLS/G1MfTGZJvACybJvDgrfIH0PFr414wU/c3+VDBJQd1vpGt8m5ZteWo4pfgLIvWL epNMAiM3dEvCvArkyrjlEMvRH9bcYZ+tAIbWL/mCLLrjsL9txnIycFxPYXBbvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmkpr6VvCz156f; Thu, 14 Sep 2023 17:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EHTuFC030543; Thu, 14 Sep 2023 17:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EHTu7r030540; Thu, 14 Sep 2023 17:29:56 GMT (envelope-from git) Date: Thu, 14 Sep 2023 17:29:56 GMT Message-Id: <202309141729.38EHTu7r030540@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: 9dc0c983b093 - main - vfs: fix stale comment about freevnodes management List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dc0c983b0931f359c2ff10d47ad835ef74e929a Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9dc0c983b0931f359c2ff10d47ad835ef74e929a commit 9dc0c983b0931f359c2ff10d47ad835ef74e929a Author: Mateusz Guzik AuthorDate: 2023-09-14 17:28:32 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-14 17:29:52 +0000 vfs: fix stale comment about freevnodes management --- sys/kern/vfs_subr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4c9cb6200f10..ed478d33aed0 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1444,12 +1444,12 @@ static struct proc *vnlruproc; static int vnlruproc_sig; /* - * The main freevnodes counter is only updated when threads requeue their vnode - * batches. CPUs are conditionally walked to compute a more accurate total. + * The main freevnodes counter is only updated when a counter local to CPU + * diverges from 0 by more than VNLRU_FREEVNODES_SLOP. CPUs are conditionally + * walked to compute a more accurate total. * - * Limit how much of a slop are we willing to tolerate. Note: the actual value - * at any given moment can still exceed slop, but it should not be by significant - * margin in practice. + * Note: the actual value at any given moment can still exceed slop, but it + * should not be by significant margin in practice. */ #define VNLRU_FREEVNODES_SLOP 126 From nobody Thu Sep 14 20:36:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmpxz3CYqz4sMDm; Thu, 14 Sep 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmpxz2h40z4Wsr; Thu, 14 Sep 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694723783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uh7+F3jU9aGEabh96csRFHbl986sUUWAPMUbFKIoSpA=; b=elF3hQf8OzKA9Koh9e6CCOX/77nmVg876i6PAm4K018BkOzMTHW05br6oW07sTZ0isi5O0 iFysz3Yfwo2tBleePIchU8w2EM8MvmvJ7MPOLxksW0bIAydaLbGgpLMHfgRgDABCi+STdw AAe5MtohXzgJoxEdE/tZJNk+DPhxiEVlSet6N/3YI5HDDX0xUAB7Hx5t0JOK0eGpyDLFO2 2nvBdURAn9FEvJbScrc6nLUXRCsUI/KX9u+MrAU4ETWQohbQIin4PLom6VFRKyePG18HE/ FYWC5sv21pGNjNLwBTH/5zFzHGMviOGqqh5EnQER1ymfWr4flOS277+hX/Y93Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694723783; a=rsa-sha256; cv=none; b=MFsJtDqKdcvc0Y2+V2X6eM+AvL8D81CGWfHvZ51pcl5pHdlTPdoBRALAz/rfugEz7RSP/c E7QljDr9y/lv1GmToLcIBBvGXKUSAFFneEfh90s5OoJhBKyAbFlbyZ7GpzC/TCCuBsb7K1 ZwQaucOKfwJVDH3BWXR6emE+DY8YDOkZ1MF9tFCdoLMr5G50owCaFL7f4bo/oXE8FxLKCd 0JmEx2GHZori/FcQs3srfmkthRvGUp8c7ah2yQaLdBvSrnJxWaKV9yky7Tc5+P8PoQTzhm lpxn74YbSapRThJIwvJKouSjwR8du8G737QKkDPVQ+puk7I5StBA4DuzUk63SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694723783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uh7+F3jU9aGEabh96csRFHbl986sUUWAPMUbFKIoSpA=; b=hcFMOUxRNnFOhKObqjEYNJfkL9zE6C9bKGyq72mEQGzgsF0ybTe0GQPQZAg7qi7lxcfnGH dMInlSR46tZVlQyXQ9AbF6nSn6CcDLvNXAzj/n5yyVjEmoZmamvZHm7SKg7+7N/svIQIus +2X9OLR95cNiTIQzUMgbbPgXNaD9rrZnEd/L6T2sxGU6hHdqY4gRLf6z3tlGwSB0Pn6Ap/ DZmknCqzVoeVafcrGiwW5/Jn+yhnLrRDjqmHyu4xUOGQlFFZwTneFw37hyVNDdVDCNCbpu q56gQSXyqThKrMlT+qkALpwDfKuv/l96spsqhLhmHM3wPk4vKdA47/osbIvaJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmpxz1j3kz1B3y; Thu, 14 Sep 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EKaNAT045291; Thu, 14 Sep 2023 20:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EKaNfF045289; Thu, 14 Sep 2023 20:36:23 GMT (envelope-from git) Date: Thu, 14 Sep 2023 20:36:23 GMT Message-Id: <202309142036.38EKaNfF045289@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: 07f52c4b5a4f - main - vfs cache: garbage collect the fullpathfail2 counter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2 commit 07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2 Author: Mateusz Guzik AuthorDate: 2023-09-14 20:25:54 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-14 20:34:20 +0000 vfs cache: garbage collect the fullpathfail2 counter The conditions it checks cannot legally be true (modulo races against forced unmount), so assert on it instead. --- sys/kern/vfs_cache.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 5b0cd64146ad..0f4d7526ebb5 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -542,7 +542,6 @@ STATNODE_COUNTER(negzaps, numnegzaps, STATNODE_COUNTER(neghits, numneghits, "Number of cache hits (negative)"); /* These count for vn_getcwd(), too. */ STATNODE_COUNTER(fullpathcalls, numfullpathcalls, "Number of fullpath search calls"); -STATNODE_COUNTER(fullpathfail1, numfullpathfail1, "Number of fullpath search errors (ENOTDIR)"); STATNODE_COUNTER(fullpathfail2, numfullpathfail2, "Number of fullpath search errors (VOP_VPTOCNP failures)"); STATNODE_COUNTER(fullpathfail4, numfullpathfail4, "Number of fullpath search errors (ENOMEM)"); @@ -3400,14 +3399,7 @@ vn_fullpath_dir(struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, vp = vp1; continue; } - if (vp->v_type != VDIR) { - vrele(vp); - counter_u64_add(numfullpathfail1, 1); - error = ENOTDIR; - SDT_PROBE3(vfs, namecache, fullpath, return, - error, vp, NULL); - break; - } + VNPASS(vp->v_type == VDIR || VN_IS_DOOMED(vp), vp); error = vn_vptocnp(&vp, buf, &buflen); if (error) break; From nobody Thu Sep 14 21:21:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmqxf6ypVz4sRCw; Thu, 14 Sep 2023 21:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmqxf6Zghz3CDC; Thu, 14 Sep 2023 21:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1flHhotgU5T5wRMYnk4R3f/ETvN/BeclftPvWGEeoU=; b=kSAfuZBfijeCukQisFQO5AwORWqva/gvEPVirgn/euFsdJ5fKcaLbvmkLCtsBP8yE7CS5l I9SJdSuaUHzj25SSIfkUIer6RK+H9zmnGHbgUp7jEqi6mF8hRHa3IfpmTrjeqTWMott5qq xZL54oI484i6ylHMyRQdX+lBKcRFBrp6+9gBRrXxhsNnaGs6EF1HdP+ojB94M/Q+DE6x/d 9ETfZdCjTQGT04QqRX0NgocLsy4346l0u8pRr0X+NpzkDWGud6QYVRQycAq0cwxil0+paG cQQnDBeSjEw3s1gDlycaGo8s2Pzo0s2X9oLWOcF3w/B5hKxQtH3bpsxSA6RsZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726470; a=rsa-sha256; cv=none; b=yDI+ZLgPGDLh5Bki5a+E4dE8XPMFfgjcJOSj7ndAvlYfV32F9ZMxFt2Fjjzwf4fUKsJ+1b jUmqOc8OLUxpvFUFZrktZYA1YplOHfBBp53ZJ2Y+IAOiGHY2p9x2a2BwwySQk3i6iCzAsq KeUyO4phzCfYMuwEbgVGsEKJCPez0d19RhXswP08dItKzi80XR/tRfFGr73jJzVQWTVOhV XXjAMR3mG/vIm8e2OLgjE1DkyS5+P/053mZ8AGnZ5uby2dZrC2f9a5xqjm8pacg3RREfz9 gOV7+Qut6jp8MnCFVa+gFuOAS0uOQdVAgDE4d4CkaRIuvAzTwse/AyFzkjwpew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1flHhotgU5T5wRMYnk4R3f/ETvN/BeclftPvWGEeoU=; b=EErRaZxFkS0OU6HiigLGf2mnagQnE3aJ+j+JNOflB37txZ3dFPaJfSix3AIAMYdFEzXW1T 6eQv3R3FxzcMVkq5ReXRMX2eG8hecPZCJY6ASHvnqAqo9KIOMAzdZbeYrTQf4SSimJpqs+ HXS2BIM+aLGmh1J+o/Y7NYEaDi7gkTwzrX6uQYDAvFi1H7RdaFiaJ8xsQQlwBXrsCS67ll 6VyKwlenakmZb875EM7MJiaR7wFIpbVBF4DkQMI3iKlAli/ypG0TzUwhKktmB+UpEaiI+9 xSJRx4xtG7ZN5rxqek3FSacrEGkiXbMDxSpzVzjxN9KSh8uC2zaKtIrlksKOSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmqxf5gq4z1Brf; Thu, 14 Sep 2023 21:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ELLAX8023291; Thu, 14 Sep 2023 21:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLAAT023288; Thu, 14 Sep 2023 21:21:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:10 GMT Message-Id: <202309142121.38ELLAAT023288@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: ee7077f24f5b - main - iwlwifi: fix a bug in iwl_ssid_exist() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee7077f24f5b02bde8cf5c202848128f18733398 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ee7077f24f5b02bde8cf5c202848128f18733398 commit ee7077f24f5b02bde8cf5c202848128f18733398 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:22:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 iwlwifi: fix a bug in iwl_ssid_exist() Rather than always comparing a given SSID to the first SSID of the IE list, compare it to the the iterator one. That way duplicates can be found. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/mvm/scan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/scan.c b/sys/contrib/dev/iwlwifi/mvm/scan.c index a4077053e374..8c5d6860914b 100644 --- a/sys/contrib/dev/iwlwifi/mvm/scan.c +++ b/sys/contrib/dev/iwlwifi/mvm/scan.c @@ -447,7 +447,11 @@ static int iwl_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list) if (!ssid_list[i].len) break; if (ssid_list[i].len == ssid_len && +#if defined(__linux__) !memcmp(ssid_list->ssid, ssid, ssid_len)) +#elif defined(__FreeBSD__) + !memcmp(ssid_list[i].ssid, ssid, ssid_len)) +#endif return i; } return -1; From nobody Thu Sep 14 21:21:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmqxh1gPrz4sRq3; Thu, 14 Sep 2023 21:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmqxh0qdxz3CFy; Thu, 14 Sep 2023 21:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K+CNqtR1wTguIy0W7tZrSD9sZEO9CkXzGA1wx7RiUNw=; b=dXzrNFaSlI3zt4F+rNKiFY9ZA2F1GTfP2ew/eTEiwK1G0TI0yb57SedM37H7BTSslf+Frw eh89xzcDID8ks7dpeD/Qf/GP1ptphBgzY2zjJ+Prepc3D+EQlmwE/A4DJaHUv3srES73BZ oZlIeiQug/FUmrbWBkgqzzPr472eVCLp5YcgBMMTJli61sCMXUBs5vL0YsVZi8U5hunle6 3F8o2LiXUeQrDV0oba8qMjF91H8DYtXcY4JFos+8kdC2IAb3tO3+Y3yUCpwDHSJSlG9zTN rceecptLiHVN/uKR1tHJuf7xkHngX2NPmE+93Rko2Z/jCE2VyCYFauuZOwdXLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726472; a=rsa-sha256; cv=none; b=xasKzCQ+TC4sZGCZzALKGHKQnqLhvH14Ui8gPZSjVLhsp6iFXMq0iGfuVUNFx1Hze6Esyn Zi0fUhLEz3gwmz/wgA1FmAxm6S1BWQMVK2LG+3kik9aMwai9GtJLxiq1jCNSYf1rMLjiY0 Hq+JxHRz2BCvHVUOdEI4zO7c0UlbqUNW6ZdeRv+itaHv86bysigVOeFwKzfYKojsUHbWmm OBNQn8VsCWuBagsLxsA83L5R0aZ4Om1OSndV1ReNH6Ex7lOQcBMSzJ4phIj7WExlfotx8F xwZk8aiACMxFeZ2Dm1F8IMuhU3TRBKR33rOQitu1wFluiknRWLKm1u6zh6ajbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K+CNqtR1wTguIy0W7tZrSD9sZEO9CkXzGA1wx7RiUNw=; b=k+pEsFpxjact9bFVl1pUJ7iqChDyAHstU/p6+nUNpZ+ve0r7Bg3WxL38S42+zinfMqzpI1 ExJ1s5ZgW4hC5QVL7E7Nv/6SC40e/mZJCngDteufLQ8u7JtiEoGBQTcB50cbkNqklR6qkB p7aE450kuhvVbUI9W0bZj9OI63hNZ37mkwb1sBEYVxWnatjiQyly3G15oGkJulLxH9Zpyr 75LOTUfLln7W9XgM8Iadj3yqw0jvjzlaRvoOaQhUhEw229VU8qnnNV3AibUwsp2/mp09hB NlxAB03yvS9hQQBTSfKOUGInYXs27i2kKbwI1L2HyoWG1qxdp89i72CpVvNvaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmqxg6g1Pz1C3M; Thu, 14 Sep 2023 21:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ELLB31023345; Thu, 14 Sep 2023 21:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLBqr023342; Thu, 14 Sep 2023 21:21:11 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:11 GMT Message-Id: <202309142121.38ELLBqr023342@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: 778da03b1271 - main - net80211: mark argument to scan_curchan_task() __unused List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 778da03b1271f52051620ec9b053524727961c9e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=778da03b1271f52051620ec9b053524727961c9e commit 778da03b1271f52051620ec9b053524727961c9e Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:34:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 net80211: mark argument to scan_curchan_task() __unused Mostly as documentation mark an unused argument to scan_curchan_task() as __unused. We may possibly want to check all callers in the future and see if the argument was supposed to be useful or should be entirely removed. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/net80211/ieee80211_scan_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index ac97b7c14cbc..0aaa80a6c48d 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -674,7 +674,7 @@ scan_start(void *arg, int pending) } static void -scan_curchan_task(void *arg, int pending) +scan_curchan_task(void *arg, int pending __unused) { struct ieee80211_scan_state *ss = arg; struct scan_state *ss_priv = SCAN_PRIVATE(ss); From nobody Thu Sep 14 21:21:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmqxj26wsz4sRqG; Thu, 14 Sep 2023 21:21: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 4Rmqxj1JpVz3C17; Thu, 14 Sep 2023 21:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JECifPXkwhzhe68ZD717YWK4B0QFM8A9EjN9nQW4NbY=; b=EmR34MDnHl2nCcCfeu+QtJYWs+AKeDOjpkkAaLg/f2U69WcfWuziFiHJZWJHelKOj/3igc v3qrbkCS5w9D/W3GfFfHzWXUgtquy1HiseWiKCVoxAnOAC5v32mREV4Nu9rfVuzcdUA6X7 an+zvRJSAIb25Oa2bI0cXLirEpL0ne7mtYbvPChPhxOT78RF1KqKsFTujFGgSn7SiMQGAu JgZ4SLxHMwsEwbDHd447llzt45gDVpBCaiBWbtWFvxXAJcNxgw9qqg37evJydeANILpF8R WTZmEjjquz/Gzls20R++3mIb+vsR4UXq/Ymfgp6Mczyqv9I3ITNBNDibeQiUVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726473; a=rsa-sha256; cv=none; b=IiKLdCsQdABKlz2LggYGEOMeQCP50lBjB3DoXgG6kCJxoJw8MOU4eOCPYBNMuNh56IpoU7 I3CFyo0LLmp3N/TtngvrxcBH32KrAqbZvDGe7bksI5qZ/FKBSsHt818qYn+Wws3tr9DFDD lWfR5bd9tnjU+mhYbfgpn+Mgv0gbA8SsO/hI+pyhAllbrXGWyrjJzp4pztINJjZ7CMwOxB acz1MQo+3c11QqK/cM7D+n2hKpvoIT2nSg8iL/muAngn//LTXH/y/m/Lqs/YPhDtr274/h MhG+tUSzloCU+BpaXeaZq0oRl/mxylYRIhfax/ncLMSp1W4AODmPTavxeZrWjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JECifPXkwhzhe68ZD717YWK4B0QFM8A9EjN9nQW4NbY=; b=FDd47r8MC+XY66BCcc/sOSAALij86RdbtO6ekSVtL/ww/+uiLCn/E6XkP+DiFLSWfgjzZm Ef6A+sw4wYf7SkpmZAna7u7MySwblgw7OOR8o6Ajy1jJl/lIwNok+MKlqcgvYa+18oHFTM tNWRPYgPYWdrY8afZQR4joLrTd9ozB2T4jpAM4zXNHyMT7xjzjpIqHpybIa3prYh+mKmm5 +T6Lqe6OhoseQbi4NtrjGMC0uH1wmYPxxCrRsRCIPbShbWG4rwaM+5CA6PydIskli6ligI 9lGes5m4aovxpKrYWEzvb5lAx3Iw32mPjSj/qzXbyJGibdWc+Kj6zsN2WjBQbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmqxj09V8z1C3N; Thu, 14 Sep 2023 21:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ELLCuC023388; Thu, 14 Sep 2023 21:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLCsL023385; Thu, 14 Sep 2023 21:21:12 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:12 GMT Message-Id: <202309142121.38ELLCsL023385@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: 33396ec29f1d - main - net80211: improve scan debugging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33396ec29f1daae31f4738f0da98dce168ca73c6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=33396ec29f1daae31f4738f0da98dce168ca73c6 commit 33396ec29f1daae31f4738f0da98dce168ca73c6 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:36:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 net80211: improve scan debugging While debugging other problems I ran into the case where net80211 was thinking a scan was ongoing and new scans could not be started but given other logging there was clearly no more scan running. It was hard after the fact to quickly determine enough state to reconstruct or validate assumptions. Improve a MSG_SCAN debug logging and implement _db_show_scan() ddb output which can be printed along with show com /S or /a. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/net80211/ieee80211_ddb.c | 74 ++++++++++++++++++++++++++++++++++++++---- sys/net80211/ieee80211_ioctl.c | 6 ++-- sys/net80211/ieee80211_scan.h | 6 +++- 3 files changed, 77 insertions(+), 9 deletions(-) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index 4e2df134c7a9..525814d202b1 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -67,7 +67,7 @@ static void _db_show_sta(const struct ieee80211_node *); static void _db_show_vap(const struct ieee80211vap *, int, int); static void _db_show_com(const struct ieee80211com *, - int showvaps, int showsta, int showmesh, int showprocs); + int showvaps, int showsta, int showmesh, int showprocs, int); static void _db_show_all_vaps(void *, struct ieee80211com *); @@ -132,7 +132,7 @@ DB_SHOW_COMMAND(vap, db_show_vap) DB_SHOW_COMMAND(com, db_show_com) { const struct ieee80211com *ic; - int i, showprocs = 0, showvaps = 0, showsta = 0, showmesh = 0; + int i, showprocs = 0, showvaps = 0, showsta = 0, showmesh = 0, showscan = 0; if (!have_addr) { db_printf("usage: show com \n"); @@ -141,7 +141,10 @@ DB_SHOW_COMMAND(com, db_show_com) for (i = 0; modif[i] != '\0'; i++) switch (modif[i]) { case 'a': - showsta = showmesh = showvaps = showprocs = 1; + showsta = showmesh = showvaps = showprocs = showscan = 1; + break; + case 'S': + showscan = 1; break; case 's': showsta = 1; @@ -158,7 +161,7 @@ DB_SHOW_COMMAND(com, db_show_com) } ic = (const struct ieee80211com *) addr; - _db_show_com(ic, showvaps, showsta, showmesh, showprocs); + _db_show_com(ic, showvaps, showsta, showmesh, showprocs, showscan); } DB_SHOW_ALL_COMMAND(vaps, db_show_all_vaps) @@ -345,6 +348,61 @@ _db_show_tdma(const char *sep, const struct ieee80211_tdma_state *ts, int showpr } #endif /* IEEE80211_SUPPORT_TDMA */ +static void +_db_show_scan(const struct ieee80211_scan_state *ss, int showprocs) +{ + int i; + const struct ieee80211_scanner *ss_ops; + + db_printf("SCAN %p:", ss); + db_printf(" vap %p ic %p", ss->ss_vap, ss->ss_ic); + db_printf("\n"); + + db_printf("\tss_ops %p (%s) ss_priv %p", + ss->ss_ops, ss->ss_ops->scan_name, ss->ss_priv); + db_printf("\n"); + if (showprocs) { + ss_ops = ss->ss_ops; + DB_PRINTSYM("\t", "scan_attach", ss_ops->scan_attach); + DB_PRINTSYM("\t", "scan_detach", ss_ops->scan_detach); + DB_PRINTSYM("\t", "scan_start", ss_ops->scan_start); + DB_PRINTSYM("\t", "scan_restart", ss_ops->scan_restart); + DB_PRINTSYM("\t", "scan_cancel", ss_ops->scan_cancel); + DB_PRINTSYM("\t", "scan_end", ss_ops->scan_end); + DB_PRINTSYM("\t", "scan_flush", ss_ops->scan_flush); + DB_PRINTSYM("\t", "scan_pickchan", ss_ops->scan_pickchan); + DB_PRINTSYM("\t", "scan_add", ss_ops->scan_add); + DB_PRINTSYM("\t", "scan_age", ss_ops->scan_age); + DB_PRINTSYM("\t", "scan_assoc_fail", ss_ops->scan_assoc_fail); + DB_PRINTSYM("\t", "scan_assoc_success", ss_ops->scan_assoc_success); + DB_PRINTSYM("\t", "scan_iterate", ss_ops->scan_iterate); + DB_PRINTSYM("\t", "scan_spare0", ss_ops->scan_spare0); + DB_PRINTSYM("\t", "scan_spare1", ss_ops->scan_spare1); + DB_PRINTSYM("\t", "scan_spare2", ss_ops->scan_spare2); + DB_PRINTSYM("\t", "scan_spare3", ss_ops->scan_spare3); + } + + db_printf("\tss_flags %b", ss->ss_flags, IEEE80211_SS_FLAGS_BITS); + db_printf("\n"); + + db_printf("\tss_nssid %u", ss->ss_nssid); + for (i = 0; i < ss->ss_nssid && i < IEEE80211_SCAN_MAX_SSID; i++) + _db_show_ssid(" ss_nssid[%d]", i, + ss->ss_ssid[i].len, ss->ss_ssid[i].ssid); + db_printf("\n"); + + db_printf("\tss_chans:\n"); + for (i = 0; i < ss->ss_last && i < IEEE80211_SCAN_MAX; i++) { + db_printf("\t%-3d", i); + _db_show_channel(" ", ss->ss_chans[i]); + db_printf("\n"); + } + + db_printf("\tss_next %u ss_last %u ss_mindwell %lu ss_maxdwell %lu", + ss->ss_next, ss->ss_last, ss->ss_mindwell, ss->ss_maxdwell); + db_printf("\n"); +} + static void _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) { @@ -532,7 +590,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) static void _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, - int showmesh, int showprocs) + int showmesh, int showprocs, int showscan) { struct ieee80211vap *vap; @@ -679,6 +737,10 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, DB_PRINTSYM("\t", "ic_addba_response", ic->ic_addba_response); DB_PRINTSYM("\t", "ic_addba_stop", ic->ic_addba_stop); } + if (showscan) { + db_printf("\n"); + _db_show_scan(ic->ic_scan, showprocs); + } if (showvaps && !TAILQ_EMPTY(&ic->ic_vaps)) { db_printf("\n"); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) @@ -707,7 +769,7 @@ _db_show_all_vaps(void *arg, struct ieee80211com *ic) db_printf(" %s(%p)", if_name(vap->iv_ifp), vap); db_printf("\n"); } else - _db_show_com(ic, 1, 1, 1, 1); + _db_show_com(ic, 1, 1, 1, 1, 1); } static void diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 6fe39f588bab..674d163e3e67 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2590,8 +2590,10 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) sr->sr_flags |= IEEE80211_IOC_SCAN_NOPICK; IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: flags 0x%x%s duration 0x%x mindwell %u maxdwell %u nssid %d\n", - __func__, sr->sr_flags, + "%s: vap %p iv_state %#x (%s) flags 0x%x%s " + "duration 0x%x mindwell %u maxdwell %u nssid %d\n", + __func__, vap, vap->iv_state, ieee80211_state_name[vap->iv_state], + sr->sr_flags, (vap->iv_ifp->if_flags & IFF_UP) == 0 ? " (!IFF_UP)" : "", sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell, sr->sr_nssid); /* diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 4274f3948db6..a33864b102e2 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -147,6 +147,10 @@ struct ieee80211_scan_state { unsigned long ss_maxdwell; /* max dwell on channel */ }; +#define IEEE80211_SS_FLAGS_BITS \ + "\20\1NOPICK\2ACTIVE\3PICK1ST\4BGSCAN\5ONCE\6NOBCAST\7NOJOIN" \ + "\15GOTPICK" + /* * The upper 16 bits of the flags word is used to communicate * information to the scanning code that is NOT recorded in @@ -328,7 +332,7 @@ struct ieee80211_scanner { void (*scan_spare0)(void); void (*scan_spare1)(void); void (*scan_spare2)(void); - void (*scan_spare4)(void); + void (*scan_spare3)(void); }; void ieee80211_scanner_register(enum ieee80211_opmode, const struct ieee80211_scanner *); From nobody Thu Sep 14 21:21:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmqxk2d5pz4sRH0; Thu, 14 Sep 2023 21:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmqxk27r5z3CFT; Thu, 14 Sep 2023 21:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGNzUYroOQ79RjQeHymbUrAOXkPseIpr8ihocquV+sQ=; b=ipFz266xp+aAqY0N04eVhEBtpF0Za44r8I28w1cHkecqzGCQqI+VmFctmIUDRL9W57K5cK bm6RUsuXK8khQYcp35UxJgSPlr0WEjeHGPNLZ4gydmG2cAoN2cqpEMV6jjiZcTR+ATUDtV Y3GHypdlRJMS8pcHQqw1Sj+ew1CIlKo3cm7n2Uw4pxLd0jqKfadQIxgoxpIyqn99GZUmAj SkUIG2ezfnTEkNzWi/kKKm9sFvIdR/Zv+dUibtfAR1j42jPA2AB1SgKmwvdIhacqIGd30C 4DgUxHO5p0XEi452P+GrYJ0OSG9PE/zNzrdF8OFD/L+mTZ7p2kj0Dp3KOx4cvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726474; a=rsa-sha256; cv=none; b=p0rXXU7QyJpWp/DrG0x7xlszwSCGu4EXKYYzs3EU1doatFR6bxsJf2Wau2F/7x/+VHPIBR TP+xMNpUoZ6KqVF0/oEEejor1UHInkY58Cs1CApO3CV2mBwNyhof0+rqm3ef30txXqst/J tLKlQum93VuiLxYAVxIaEmV2ffCUSkESoN1mNHWLy4JCrZel45OTCkxkJdkO8Qho09H5W4 dNVIN1/4rpYBMSqu+AgVxTTwr0leAUebWB1pP6OCJFJb3d7zGSyghV8QPJMHu5WTRDjWMz obt20oTm4WGI2xyu7Hye8b/Jkt0pxJpZVEdKV9aVGux39RGqrBiuCpgKB73pIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGNzUYroOQ79RjQeHymbUrAOXkPseIpr8ihocquV+sQ=; b=b4MI2Ku85O7iMISwQnRhYoGqNE7+wNDL94w429hFKL/0H16QqVVac1QInrnPDg4qTTIMN7 R/8+f/p2xgrwc1DOQWpVAyQ87eJGmJGQ6JZsYmUaf3h6aZh90FtlPar9RJLjog2JSifac1 82Xb9Cq8NfgBC34z+SVrGfidnRIVveXQNtcym/Vo1CSQxvLzlauK1nlomFRUMu1C4y7qnU +76hvdSzT/+DntePuerC1puWrHmszbjlxDolxi+XH6VQgB7x9rzPOO1T+WurgkY1jy4VqR lc2uwsIMk/aNEjbvplVrFCZtx6TPWctfJXeESo3OsL/8vSCDxxRB9oq8XLfRng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmqxk1DB8z1BNt; Thu, 14 Sep 2023 21:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ELLEYD023449; Thu, 14 Sep 2023 21:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLEpg023446; Thu, 14 Sep 2023 21:21:14 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:14 GMT Message-Id: <202309142121.38ELLEpg023446@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: e1e90be05017 - main - LinuxKPI: 802.11: make sure bssid for scans (probe_req) is set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e90be05017c335862c938fd9d577e56f02af30 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e90be05017c335862c938fd9d577e56f02af30 commit e1e90be05017c335862c938fd9d577e56f02af30 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:48:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 LinuxKPI: 802.11: make sure bssid for scans (probe_req) is set In b0f73768220e9 we added bssid[] to struct cfg80211_scan_request likely while working on mt76 and did not need it (yet) back then. iwlwifi started to use the field in Linux f1fec51cda70f (April 2023). Without it set firmware crashes when trying to send probe requests ((empty) SSID also given to hw_scan). For now always set the field to the wildcard BSSID. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 51d5bc2c4fc1..4b9cc598740b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2728,6 +2728,7 @@ sw_scan: memcpy(hw_req->req.mac_addr, xxx, IEEE80211_ADDR_LEN); memset(hw_req->req.mac_addr_mask, 0xxx, IEEE80211_ADDR_LEN); #endif + eth_broadcast_addr(hw_req->req.bssid); hw_req->req.n_channels = nchan; cpp = (struct linuxkpi_ieee80211_channel **)(hw_req + 1); From nobody Thu Sep 14 21:21:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmqxl6trsz4sS1f; Thu, 14 Sep 2023 21:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmqxl2ySZz3Cdq; Thu, 14 Sep 2023 21:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k72vK9TJ3cq3bDJnmJ9NAy2I5xF2O64/TsyisIJXkIM=; b=kUKj0gGcVDbgt+HPN9qx0bSVQU/wpYAylB+OI6wVOceyngFOc9GnETud0SR0o+ps7eKJVC GDZgcOAo8cZfTbPwJu7pgDXg+ipl5bSO/8Ot2XwqF4fIVfn9d3at6zR1FCpJo22AbxrmaX 9CnLxPjojiXe8fA2Y5ENG2nDn9kDrSS7/cwvA9NMhjY1VDDimgHKp4D4yO9zqCgPw3ICHz Ax1faFE8tXX7RVsW5Z1l2uZXFQQUF9Zu3Q2bSk95kK3nnnp52Kd83zlzUdEb8lOnaEXig4 x6r5/9hG5kWQhBvTeAYPLPW1wKBnvOVMJKd5CxgZBkX+ACECUAmdrSeO1Est3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694726475; a=rsa-sha256; cv=none; b=rn71la/HGoVaeGFS7HSkDjopz2/I80JNzYXDW4CfXv9IPlrVBBrEuspYpyCLB9zgZ1Dh6D +R26QkwB3327CDJh00cTbpCbd0lMU3cUfP3HxfUo43iD4bnPgraZpWvSQx3YOohKdQfRNb E/a5rvrzTjmS3wd3/brU5RIuz2K8eb1bT2+z0ScyjPJXBzgOBcU0Eo6eV9Ul2+uTh6rJyb 2VPGadFcytkjp5s3DKmYWB7dAhBfs6m34lV9HU7r54gZzeSkDjM1rGpVE+LZxJNlwBrFCu qxSb0X63+ksmLNtRjfOCTsbjzRhPLyMPCyk3UF0wGCX+Ed6X9wFd3bOcqkZfdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694726475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k72vK9TJ3cq3bDJnmJ9NAy2I5xF2O64/TsyisIJXkIM=; b=kE2FnXMmbl2WiRzC6Jl3iycSJQ9E1ihUPFQeskvnYXOTJaLly9ukFe1WhvV8TC4BE52R71 X+lq9hSuz93RQwnhp0XLUWQDj4JO+VODabSIYj/4vYV4ybFhiwv7Z6slGOa9pcAWQ3c4Zu y0xfQwMHnRrgGvLnBcqQXItL0U2qZrbozU2I8/kVG4MCZMg383Ie+y62XZSpPMY8njjbWr AoC3BanbcxJgFsWuTQBF4szrmmH1LkrVF5cQWJA4JtAMM6IZlyyyPOdvraPyvbcIHFyQTf GCsnjKTTt6OMPuf3/HCgYnr8SsVvvvzJyvyMR9pUzvCKFJGUVh3tLY4MD1ZkwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmqxl229xz1C2N; Thu, 14 Sep 2023 21:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ELLF4a023505; Thu, 14 Sep 2023 21:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ELLFZw023502; Thu, 14 Sep 2023 21:21:15 GMT (envelope-from git) Date: Thu, 14 Sep 2023 21:21:15 GMT Message-Id: <202309142121.38ELLFZw023502@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: f454a4a10dc0 - main - LinuxKPI: 802.11: fix counting the number of supbands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f454a4a10dc027474a85269cb4a3f50bbbf90528 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f454a4a10dc027474a85269cb4a3f50bbbf90528 commit f454a4a10dc027474a85269cb4a3f50bbbf90528 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:57:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-14 21:20:54 +0000 LinuxKPI: 802.11: fix counting the number of supbands While the main purpose was to assign an(y) early chandef with the loop, later additions made use of it to also count supbands as well as to initialise max_rates. Due to the main goal we can exit the loop early and not properly count and initialise supbands and max_rates. Move the terminating condition into the loop and make it a continue rather than ending the loop. Fixes: d9945d7821b9b ("improve hw_scan") Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4b9cc598740b..cb919bfd3f5b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3760,8 +3760,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) * in any band so we can scale [(ext) sup rates] IE(s) accordingly. */ lhw->supbands = lhw->max_rates = 0; - for (band = 0; band < NUM_NL80211_BANDS && - hw->conf.chandef.chan == NULL; band++) { + for (band = 0; band < NUM_NL80211_BANDS; band++) { struct ieee80211_supported_band *supband; struct linuxkpi_ieee80211_channel *channels; @@ -3772,6 +3771,10 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->supbands++; lhw->max_rates = max(lhw->max_rates, supband->n_bitrates); + /* If we have a channel, we need to keep counting supbands. */ + if (hw->conf.chandef.chan != NULL) + continue; + channels = supband->channels; for (i = 0; i < supband->n_channels; i++) { From nobody Thu Sep 14 22:02:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmrrw5vMrz4scGx; Thu, 14 Sep 2023 22:02: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 4Rmrrw5cnGz3Jrg; Thu, 14 Sep 2023 22:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694728928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zR8DHK+C7CwGX46U3Qe2eSkfBPuK+7HCtpfmwT05VaU=; b=LCYhnwROqlqgchbjzb0aZSNyDxcn3GijiGNHPni8xO1SLAhj/Tzun4t5/n9qHqTDgxA46Q fqTxT6+U8OzdMgIPPSoePZ4IVQo5W2WfJ5h8bFiP1rsp9plI/b2fejchrJvVWv/PpnZ+XR ATpM10VjP6cTdkOYStsK6lpFboAR0tB8+iaZomieqIgS+l8SmFWXB30YhDg+jfuH5kGX7z NPZhv8RqVLtCeL0pBsoRAonnSRd3VGKTdnP7EizocPpT9Fwnb6N8r5uRi7npEn0tzY73GD S3L34EcNV+SPeqO3rl3CNi7gDxe08VtHj4VDq7rRdWp+wOb0LJpZtFhuuxb1Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694728928; a=rsa-sha256; cv=none; b=c/TmhF1XJLKlEoRF2MAtCDmB0345T5Q6h67ftkkKKdxULhF/AQQYWa3cj+A7a50H/5EBOb o4eZFfBEyBeMP0I8BJVqM5alWFj0cGyrw0M/jvmk9UVS9t3z+tYvajFdw/fTdL0ADlGUDt Ak8MNAvpmGQyQqI52Twhb5y8s8IU3f09Dk3pX6BxMP5ZwcHPgN1BMhz66csn43aUnKgf/D bAA/YSkXAW5a4sqIG+K0OxtbZIdEov7CAxXGfluhn8+z8w/W0ShArGI8unvEeU2X5HsAdY odB9ZXxC/ZTbhz3BtPMs0T9ELIBn5+Lckq1Xs0GZkYKuX/2pOZo/OYhR0MTeRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694728928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zR8DHK+C7CwGX46U3Qe2eSkfBPuK+7HCtpfmwT05VaU=; b=rRzgQotWo0oFMKnnDCJzpCqE8ogyxf8EQ1CK9L7sX2TAelch/r3M9VgcNRfnA7Aa/aNxeq BvPwPXd09wwIykfU9zmQRVyJ8pczLiWpOtF+ORd1P1QbgbLo8dnnCGLUXA3oX605mU4xUh mzgP/t4C+M4NCB1EHidcd8VlxpRuPM2XLiJPcLJXOeyN/s4z7DHt+yzz3DC5NOEAwXoofz l2u/SJ8/4yJeUjiOgENBBrHT/gJ/Yav55l7UUesxu/pADGS2zCPhTWBcdCLqx3aMQ6MOir lMyg9PJgmqZxaA0IILWjfhSL9peBbvqEnGBDTPELrqcQ4DfUhjKLiEryNxFb6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmrrw4bmXz1D5S; Thu, 14 Sep 2023 22:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EM28rL089422; Thu, 14 Sep 2023 22:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EM28Uc089419; Thu, 14 Sep 2023 22:02:08 GMT (envelope-from git) Date: Thu, 14 Sep 2023 22:02:08 GMT Message-Id: <202309142202.38EM28Uc089419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: acdad1f1cb47 - stable/14 - MFC: MFV: file 5.45. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: acdad1f1cb471aacbd7c372af9a79d6b3467ca93 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=acdad1f1cb471aacbd7c372af9a79d6b3467ca93 commit acdad1f1cb471aacbd7c372af9a79d6b3467ca93 Author: Xin LI AuthorDate: 2023-09-10 19:20:33 +0000 Commit: Xin LI CommitDate: 2023-09-14 22:01:08 +0000 MFC: MFV: file 5.45. (cherry picked from commit 898496ee09ed2b7d25f6807edc4515628196ec0a) Disable byteswap.h for now. (cherry picked from commit 90474518912f5e5f49bc5325b7f88e94eba64d6a) --- contrib/file/ChangeLog | 64 ++- contrib/file/README.md | 3 +- contrib/file/acinclude.m4 | 5 +- contrib/file/config.guess | 2 + contrib/file/config.h.in | 21 + contrib/file/config.sub | 1 + contrib/file/configure | 184 ++++++- contrib/file/configure.ac | 40 +- contrib/file/doc/file.man | 21 +- contrib/file/doc/libmagic.man | 26 +- contrib/file/doc/magic.man | 88 ++-- contrib/file/libmagic.pc.in | 1 + contrib/file/magic/Magdir/algol68 | 12 +- contrib/file/magic/Magdir/android | 52 +- contrib/file/magic/Magdir/animation | 25 +- contrib/file/magic/Magdir/apple | 299 +++++++++-- contrib/file/magic/Magdir/archive | 547 ++++++++++++++++++++- contrib/file/magic/Magdir/arm | 11 +- contrib/file/magic/Magdir/asf | 4 +- contrib/file/magic/Magdir/audio | 17 +- contrib/file/magic/Magdir/blender | 15 +- contrib/file/magic/Magdir/bytecode | 13 +- contrib/file/magic/Magdir/c-lang | 8 +- contrib/file/magic/Magdir/c64 | 357 +++++++++++++- contrib/file/magic/Magdir/cad | 40 +- contrib/file/magic/Magdir/coff | 3 +- contrib/file/magic/Magdir/commands | 18 +- contrib/file/magic/Magdir/compress | 88 +++- contrib/file/magic/Magdir/console | 52 +- contrib/file/magic/Magdir/crypto | 46 +- contrib/file/magic/Magdir/database | 62 ++- contrib/file/magic/Magdir/der | 9 +- contrib/file/magic/Magdir/dsf | 25 - contrib/file/magic/Magdir/dwarfs | 45 ++ contrib/file/magic/Magdir/elf | 10 +- contrib/file/magic/Magdir/filesystems | 211 ++++---- contrib/file/magic/Magdir/firmware | 133 +++++ contrib/file/magic/Magdir/games | 198 +++++++- contrib/file/magic/Magdir/gentoo | 9 +- contrib/file/magic/Magdir/geo | 42 +- contrib/file/magic/Magdir/images | 342 +++++++++++-- contrib/file/magic/Magdir/intel | 8 +- contrib/file/magic/Magdir/java | 9 +- contrib/file/magic/Magdir/javascript | 64 ++- contrib/file/magic/Magdir/jpeg | 8 +- contrib/file/magic/Magdir/lif | 9 +- contrib/file/magic/Magdir/linux | 99 +++- contrib/file/magic/Magdir/llvm | 3 +- contrib/file/magic/Magdir/macintosh | 56 ++- contrib/file/magic/Magdir/magic | 65 ++- contrib/file/magic/Magdir/mail.news | 4 +- contrib/file/magic/Magdir/map | 7 +- contrib/file/magic/Magdir/mathematica | 69 ++- contrib/file/magic/Magdir/meteorological | 8 +- contrib/file/magic/Magdir/misctools | 66 ++- contrib/file/magic/Magdir/modem | 12 +- contrib/file/magic/Magdir/msdos | 460 +++++++++++++++-- contrib/file/magic/Magdir/msooxml | 12 +- contrib/file/magic/Magdir/ole2compounddocs | 155 ++++-- contrib/file/magic/Magdir/pdf | 6 +- contrib/file/magic/Magdir/perl | 8 +- contrib/file/magic/Magdir/playdate | 57 +++ contrib/file/magic/Magdir/printer | 144 +++++- contrib/file/magic/Magdir/qt | 13 +- contrib/file/magic/Magdir/rst | 6 +- contrib/file/magic/Magdir/rust | 21 + contrib/file/magic/Magdir/scientific | 43 +- contrib/file/magic/Magdir/sendmail | 4 +- contrib/file/magic/Magdir/sgml | 13 +- contrib/file/magic/Magdir/sniffer | 75 ++- contrib/file/magic/Magdir/softquad | 9 +- contrib/file/magic/Magdir/spectrum | 118 ++++- contrib/file/magic/Magdir/sql | 65 ++- contrib/file/magic/Magdir/ssh | 11 +- contrib/file/magic/Magdir/svf | 5 + contrib/file/magic/Magdir/sysex | 6 +- contrib/file/magic/Magdir/terminfo | 3 +- contrib/file/magic/Magdir/tex | 10 +- contrib/file/magic/Magdir/tplink | 13 +- contrib/file/magic/Magdir/troff | 8 +- contrib/file/magic/Magdir/uterus | 4 +- contrib/file/magic/Magdir/varied.script | 64 +-- contrib/file/magic/Magdir/web | 8 +- contrib/file/magic/Magdir/windows | 532 ++++++++++++++++++-- contrib/file/magic/Magdir/wordprocessors | 72 ++- contrib/file/magic/Magdir/xenix | 18 +- contrib/file/magic/Magdir/xilinx | 20 +- contrib/file/magic/Makefile.am | 8 +- contrib/file/magic/Makefile.in | 8 +- contrib/file/src/Makefile.am | 8 +- contrib/file/src/Makefile.in | 23 +- contrib/file/src/apprentice.c | 275 ++++++----- contrib/file/src/apptype.c | 8 +- contrib/file/src/ascmagic.c | 38 +- contrib/file/src/asctime_r.c | 4 +- contrib/file/src/asprintf.c | 2 +- contrib/file/src/buffer.c | 11 +- contrib/file/src/cdf.c | 2 +- contrib/file/src/cdf_time.c | 6 +- contrib/file/src/compress.c | 389 +++++++++++---- contrib/file/src/ctime_r.c | 4 +- contrib/file/src/der.c | 12 +- contrib/file/src/dprintf.c | 2 +- contrib/file/src/encoding.c | 40 +- contrib/file/src/file.c | 131 ++--- contrib/file/src/file.h | 187 +++---- contrib/file/src/file_opts.h | 4 +- contrib/file/src/fmtcheck.c | 2 +- contrib/file/src/fsmagic.c | 8 +- contrib/file/src/funcs.c | 120 +++-- contrib/file/src/getline.c | 4 +- contrib/file/src/getopt_long.c | 2 +- contrib/file/src/gmtime_r.c | 4 +- contrib/file/src/is_csv.c | 12 +- contrib/file/src/is_json.c | 6 +- contrib/file/src/is_simh.c | 209 ++++++++ contrib/file/src/is_tar.c | 14 +- contrib/file/src/localtime_r.c | 4 +- contrib/file/src/magic.c | 60 ++- contrib/file/src/magic.h.in | 9 +- contrib/file/src/memtest.c | 3 +- contrib/file/src/pread.c | 2 +- contrib/file/src/print.c | 30 +- contrib/file/src/readcdf.c | 26 +- contrib/file/src/readelf.c | 72 +-- contrib/file/src/seccomp.c | 3 +- contrib/file/src/softmagic.c | 252 ++++++---- contrib/file/src/strlcat.c | 2 +- contrib/file/src/strlcpy.c | 2 +- contrib/file/src/tar.h | 4 +- contrib/file/src/vasprintf.c | 7 +- contrib/file/tests/CVE-2014-1943.result | 2 +- contrib/file/tests/HWP2016.hwp.result | 1 + contrib/file/tests/HWP2016.hwp.testfile | Bin 0 -> 9216 bytes contrib/file/tests/HWP2016.hwpx.zip.result | 1 + contrib/file/tests/HWP2016.hwpx.zip.testfile | Bin 0 -> 14377 bytes contrib/file/tests/HWP97.hwp.result | 1 + contrib/file/tests/HWP97.hwp.testfile | Bin 0 -> 8975 bytes contrib/file/tests/JW07022A.mp3.result | 2 +- contrib/file/tests/Makefile.am | 70 ++- contrib/file/tests/Makefile.in | 70 ++- contrib/file/tests/android-vdex-1.result | 2 +- contrib/file/tests/android-vdex-2.result | 2 +- contrib/file/tests/arj.result | 2 +- contrib/file/tests/bcachefs.result | 2 +- contrib/file/tests/bcachefs2.result | 1 + contrib/file/tests/bcachefs2.testfile | Bin 0 -> 8192 bytes contrib/file/tests/cl8m8ocofedso.result | 2 +- contrib/file/tests/cmd1.result | 1 + contrib/file/tests/cmd1.testfile | 1 + contrib/file/tests/cmd2.result | 1 + contrib/file/tests/cmd2.testfile | 1 + contrib/file/tests/cmd3.result | 1 + contrib/file/tests/cmd3.testfile | 2 + contrib/file/tests/cmd4.result | 1 + contrib/file/tests/cmd4.testfile | 2 + contrib/file/tests/dsd64-dff.result | 2 +- contrib/file/tests/dsd64-dsf.result | 2 +- contrib/file/tests/escapevel.result | 2 +- contrib/file/tests/ext4.result | 2 +- contrib/file/tests/fit-map-data.result | 2 +- contrib/file/tests/gedcom.result | 2 +- contrib/file/tests/hddrawcopytool.result | 2 +- contrib/file/tests/hello-racket_rkt.result | 1 + contrib/file/tests/hello-racket_rkt.testfile | Bin 0 -> 1664 bytes contrib/file/tests/issue311docx.result | 2 +- contrib/file/tests/issue359xlsx.result | 2 +- contrib/file/tests/jpeg-text.result | 1 + contrib/file/tests/jpeg-text.testfile | 1 + contrib/file/tests/json1.result | 2 +- contrib/file/tests/json2.result | 2 +- contrib/file/tests/json3.result | 2 +- contrib/file/tests/json4.result | 2 +- contrib/file/tests/json5.result | 2 +- contrib/file/tests/json6.result | 2 +- contrib/file/tests/json7.result | 2 +- contrib/file/tests/json8.result | 2 +- contrib/file/tests/jsonlines1.result | 2 +- contrib/file/tests/matilde.arm.result | 2 +- contrib/file/tests/multiple-A.magic | 2 + contrib/file/tests/multiple-B.magic | 2 + contrib/file/tests/multiple.flags | 1 + contrib/file/tests/multiple.result | 1 + contrib/file/tests/multiple.testfile | 1 + contrib/file/tests/pcjr.result | 2 +- contrib/file/tests/pgp-binary-key-v2-phil.result | 2 +- contrib/file/tests/pgp-binary-key-v3-lutz.result | 2 +- contrib/file/tests/pgp-binary-key-v4-dsa.result | 2 +- .../pgp-binary-key-v4-ecc-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-ecc-secret-key.result | 2 +- .../file/tests/pgp-binary-key-v4-rsa-key.result | 2 +- .../pgp-binary-key-v4-rsa-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-rsa-secret-key.result | 2 +- contrib/file/tests/pnm1.result | 1 + contrib/file/tests/pnm1.testfile | 5 + contrib/file/tests/pnm2.result | 1 + contrib/file/tests/pnm2.testfile | Bin 0 -> 15 bytes contrib/file/tests/pnm3.result | 1 + contrib/file/tests/pnm3.testfile | 5 + contrib/file/tests/regex-eol.result | 2 +- contrib/file/tests/registry-pol.result | 1 + contrib/file/tests/registry-pol.testfile | Bin 0 -> 7094 bytes contrib/file/tests/test.c | 70 ++- contrib/file/tests/uf2.result | 2 +- contrib/file/tests/xclbin.result | 1 + contrib/file/tests/xclbin.testfile | Bin 0 -> 512 bytes contrib/file/tests/zstd-3-skippable-frames.result | 2 +- contrib/file/tests/zstd-dictionary-0.result | 2 +- contrib/file/tests/zstd-dictionary-1.result | 2 +- contrib/file/tests/zstd-dictionary-2.result | 2 +- contrib/file/tests/zstd-skippable-frame-0.result | 2 +- contrib/file/tests/zstd-skippable-frame-4.result | 2 +- contrib/file/tests/zstd-skippable-frame-8.result | 2 +- contrib/file/tests/zstd-skippable-frame-C.result | 2 +- contrib/file/tests/zstd-v0.2-FF.result | 2 +- contrib/file/tests/zstd-v0.3-FF.result | 2 +- contrib/file/tests/zstd-v0.4-FF.result | 2 +- contrib/file/tests/zstd-v0.5-FF.result | 2 +- contrib/file/tests/zstd-v0.6-FF.result | 2 +- contrib/file/tests/zstd-v0.7-00.result | 2 +- contrib/file/tests/zstd-v0.7-21.result | 2 +- contrib/file/tests/zstd-v0.7-22.result | 2 +- contrib/file/tests/zstd-v0.8-00.result | 2 +- contrib/file/tests/zstd-v0.8-01.result | 2 +- contrib/file/tests/zstd-v0.8-02.result | 2 +- contrib/file/tests/zstd-v0.8-03.result | 2 +- contrib/file/tests/zstd-v0.8-16.result | 2 +- contrib/file/tests/zstd-v0.8-20.result | 2 +- contrib/file/tests/zstd-v0.8-21.result | 2 +- contrib/file/tests/zstd-v0.8-22.result | 2 +- contrib/file/tests/zstd-v0.8-23.result | 2 +- contrib/file/tests/zstd-v0.8-F4.result | 2 +- contrib/file/tests/zstd-v0.8-FF.result | 2 +- lib/libmagic/Makefile | 1 + lib/libmagic/config.h | 27 +- 235 files changed, 6484 insertions(+), 1559 deletions(-) diff --git a/contrib/file/ChangeLog b/contrib/file/ChangeLog index dd95543fe649..fdf1cff6e2d3 100644 --- a/contrib/file/ChangeLog +++ b/contrib/file/ChangeLog @@ -1,3 +1,63 @@ +2023-07-27 15:45 Christos Zoulas + + * release 5.45 + +2023-07-17 11:53 Christos Zoulas + + * PR/465: psrok1: Avoid muslc asctime_r crash + +2023-05-21 13:05 Christos Zoulas + + * add SIMH tape format support + +2023-02-09 12:50 Christos Zoulas + + * bump the max size of the elf section notes to be read to 128K + and make it configurable + +2023-01-08 1:08 Christos Zoulas + + * PR/415: Fix decompression with program returning empty + +2022-12-26 1:47 Christos Zoulas + + * PR/408: fix -p with seccomp + * PR/412: fix MinGW compilation + +2022-12-26 12:26 Christos Zoulas + + * release 5.44 + +2022-12-14 9:24 Christos Zoulas + + * Handle nan's so that we don't get internal floating point exceptions + when they are enabled (Vincent Mihalkovic) + +2022-10-23 10:21 Christos Zoulas + + * PR/397: Restore the ability to process files from stdin immediately. + +2022-09-20 17:12 Christos Zoulas + + * fixed various clustefuzz issues + +2022-09-19 15:54 Christos Zoulas + + * Fix error detection for decompression code (Vincent Mihalkovic) + +2022-09-15 13:50 Christos Zoulas + + * Add MAGIC_NO_COMPRESS_FORK and use it to produce a more + meaningful error message if we are sandboxing. + +2022-09-15 10:45 Christos Zoulas + + * Add built-in lzip decompression support (Michal Gorny) + +2022-09-14 10:35 Christos Zoulas + + * Add built-in zstd decompression support (Martin Rodriguez Reboredo) + 2022-09-13 14:55 Christos Zoulas * release 5.43 @@ -229,7 +289,7 @@ 2019-12-15 22:13 Christos Zoulas Document changes since the previous release: - Always accept -S (no sandbox) even if we don't support sandboxing - - More syscalls elided for sandboxiing + - More syscalls elided for sandboxing - For ELF dynamic means having an interpreter not just PT_DYNAMIC - Check for large ELF session header offset - When saving and restoring a locale, keep the locale name in our @@ -1759,7 +1819,7 @@ * Magic format checks (Dr. Werner Fink) - * Magic format function improvent (Karl Chen) + * Magic format function improvement (Karl Chen) 2006-05-03 11:11 Christos Zoulas diff --git a/contrib/file/README.md b/contrib/file/README.md index 37a3b17856c6..26e38045812c 100644 --- a/contrib/file/README.md +++ b/contrib/file/README.md @@ -1,6 +1,6 @@ ## README for file(1) Command and the libmagic(3) library ## - @(#) $File: README.md,v 1.4 2021/10/21 01:51:31 christos Exp $ + @(#) $File: README.md,v 1.5 2023/05/28 13:59:47 christos Exp $ - Bug Tracker: - Build Status: @@ -91,6 +91,7 @@ COPYING - read this first. * `src/gmtime_r.c` - replacement for OS's that don't have it. * `src/is_csv.c` - knows about Comma Separated Value file format (RFC 4180). * `src/is_json.c` - knows about JavaScript Object Notation format (RFC 8259). +* `src/is_simh.c` - knows about SIMH tape file format. * `src/is_tar.c, tar.h` - knows about Tape ARchive format (courtesy John Gilmore). * `src/localtime_r.c` - replacement for OS's that don't have it. * `src/magic.h.in` - source file for magic.h diff --git a/contrib/file/acinclude.m4 b/contrib/file/acinclude.m4 index e0811dd899aa..30242712bad3 100644 --- a/contrib/file/acinclude.m4 +++ b/contrib/file/acinclude.m4 @@ -39,11 +39,12 @@ AC_CHECK_DECLS([daylight], , , [#include #include ]) AC_CACHE_CHECK(for daylight, ac_cv_var_daylight, [AC_LINK_IFELSE( -[AC_LANG_PROGRAM([#include ], +[AC_LANG_PROGRAM([#include +#include ], [#if !HAVE_DECL_DAYLIGHT extern int daylight; #endif -atoi(daylight);])], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) +daylight = atoi("1");])], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) if test $ac_cv_var_daylight = yes; then AC_DEFINE(HAVE_DAYLIGHT,1,[HAVE_DAYLIGHT]) fi diff --git a/contrib/file/config.guess b/contrib/file/config.guess index 5d222e2ed594..cd4dbf7293fa 100755 --- a/contrib/file/config.guess +++ b/contrib/file/config.guess @@ -210,6 +210,8 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; + mipsn64eb) machine=mips64-unknown ;; + mipsn64el) machine=mips64el-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; diff --git a/contrib/file/config.h.in b/contrib/file/config.h.in index 8bf5e7ce6610..5ae30c61edd1 100644 --- a/contrib/file/config.h.in +++ b/contrib/file/config.h.in @@ -89,6 +89,9 @@ /* Define to 1 if you have the `gnurx' library (-lgnurx). */ #undef HAVE_LIBGNURX +/* Define to 1 if you have the `lz' library (-llz). */ +#undef HAVE_LIBLZ + /* Define to 1 if you have the `lzma' library (-llzma). */ #undef HAVE_LIBLZMA @@ -98,9 +101,15 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ +/* Define to 1 if you have the `zstd' library (-lzstd). */ +#undef HAVE_LIBZSTD + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_LZLIB_H + /* Define to 1 if you have the header file. */ #undef HAVE_LZMA_H @@ -276,9 +285,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ZSTD_ERRORS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ZSTD_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR +/* Enable lzlib compression support */ +#undef LZLIBSUPPORT + /* Define to 1 if `major', `minor', and `makedev' are declared in . */ #undef MAJOR_IN_MKDEV @@ -425,6 +443,9 @@ /* Enable zlib compression support */ #undef ZLIBSUPPORT +/* Enable zstdlib compression support */ +#undef ZSTDLIBSUPPORT + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/contrib/file/config.sub b/contrib/file/config.sub index d74fb6deac94..f6564f2885d4 100755 --- a/contrib/file/config.sub +++ b/contrib/file/config.sub @@ -1219,6 +1219,7 @@ case $cpu-$vendor in | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mips64vr5900 | mips64vr5900el \ + | mipsn64eb | mipsn64el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa32r3 | mipsisa32r3el \ diff --git a/contrib/file/configure b/contrib/file/configure index 143ccc5bbacb..8043072f56f7 100755 --- a/contrib/file/configure +++ b/contrib/file/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for file 5.43. +# Generated by GNU Autoconf 2.71 for file 5.45. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='file' PACKAGE_TARNAME='file' -PACKAGE_VERSION='5.43' -PACKAGE_STRING='file 5.43' +PACKAGE_VERSION='5.45' +PACKAGE_STRING='file 5.45' PACKAGE_BUGREPORT='christos@astron.com' PACKAGE_URL='' @@ -800,6 +800,8 @@ enable_elf_core enable_zlib enable_bzlib enable_xzlib +enable_zstdlib +enable_lzlib enable_libseccomp enable_fsect_man5 enable_dependency_tracking @@ -1371,7 +1373,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file 5.43 to adapt to many kinds of systems. +\`configure' configures file 5.45 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1444,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file 5.43:";; + short | recursive ) echo "Configuration of file 5.45:";; esac cat <<\_ACEOF @@ -1458,6 +1460,9 @@ Optional Features: --disable-bzlib disable bz2lib compression support [default=auto] --disable-xzlib disable liblzma/xz compression support [default=auto] + --disable-zstdlib disable zstdlib compression support [default=auto] + --disable-lzlib disable liblz (lzip) compression support + [default=auto] --disable-libseccomp disable libseccomp sandboxing [default=auto] --enable-fsect-man5 enable file formats in man section 5 --enable-dependency-tracking @@ -1562,7 +1567,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file configure 5.43 +file configure 5.45 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2129,7 +2134,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file $as_me 5.43, which was +It was created by file $as_me 5.45, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3405,7 +3410,7 @@ fi # Define the identity of the package. PACKAGE='file' - VERSION='5.43' + VERSION='5.45' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3641,6 +3646,28 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_xzlib" >&5 printf "%s\n" "$enable_xzlib" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zstdlib support" >&5 +printf %s "checking for zstdlib support... " >&6; } +# Check whether --enable-zstdlib was given. +if test ${enable_zstdlib+y} +then : + enableval=$enable_zstdlib; +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_zstdlib" >&5 +printf "%s\n" "$enable_zstdlib" >&6; } + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lzlib support" >&5 +printf %s "checking for lzlib support... " >&6; } +# Check whether --enable-lzlib was given. +if test ${enable_lzlib+y} +then : + enableval=$enable_lzlib; +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_lzlib" >&5 +printf "%s\n" "$enable_lzlib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseccomp support" >&5 printf %s "checking for libseccomp support... " >&6; } # Check whether --enable-libseccomp was given. @@ -13665,6 +13692,30 @@ then : fi +fi +if test "$enable_zstdlib" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default" +if test "x$ac_cv_header_zstd_h" = xyes +then : + printf "%s\n" "#define HAVE_ZSTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "zstd_errors.h" "ac_cv_header_zstd_errors_h" "$ac_includes_default" +if test "x$ac_cv_header_zstd_errors_h" = xyes +then : + printf "%s\n" "#define HAVE_ZSTD_ERRORS_H 1" >>confdefs.h + +fi + +fi +if test "$enable_lzlib" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "lzlib.h" "ac_cv_header_lzlib_h" "$ac_includes_default" +if test "x$ac_cv_header_lzlib_h" = xyes +then : + printf "%s\n" "#define HAVE_LZLIB_H 1" >>confdefs.h + +fi + fi ac_fn_c_check_type "$LINENO" "sig_t" "ac_cv_type_sig_t" "#include " @@ -14037,13 +14088,14 @@ else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#include int main (void) { #if !HAVE_DECL_DAYLIGHT extern int daylight; #endif -atoi(daylight); +daylight = atoi("1"); ; return 0; } @@ -15459,6 +15511,96 @@ then : fi +fi +if test "$enable_zstdlib" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD_createDStream in -lzstd" >&5 +printf %s "checking for ZSTD_createDStream in -lzstd... " >&6; } +if test ${ac_cv_lib_zstd_ZSTD_createDStream+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzstd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char ZSTD_createDStream (); +int +main (void) +{ +return ZSTD_createDStream (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_zstd_ZSTD_createDStream=yes +else $as_nop + ac_cv_lib_zstd_ZSTD_createDStream=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_createDStream" >&5 +printf "%s\n" "$ac_cv_lib_zstd_ZSTD_createDStream" >&6; } +if test "x$ac_cv_lib_zstd_ZSTD_createDStream" = xyes +then : + printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h + + LIBS="-lzstd $LIBS" + +fi + +fi +if test "$enable_lzlib" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LZ_decompress_open in -llz" >&5 +printf %s "checking for LZ_decompress_open in -llz... " >&6; } +if test ${ac_cv_lib_lz_LZ_decompress_open+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-llz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char LZ_decompress_open (); +int +main (void) +{ +return LZ_decompress_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_lz_LZ_decompress_open=yes +else $as_nop + ac_cv_lib_lz_LZ_decompress_open=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lz_LZ_decompress_open" >&5 +printf "%s\n" "$ac_cv_lib_lz_LZ_decompress_open" >&6; } +if test "x$ac_cv_lib_lz_LZ_decompress_open" = xyes +then : + printf "%s\n" "#define HAVE_LIBLZ 1" >>confdefs.h + + LIBS="-llz $LIBS" + +fi + fi if test "$enable_libseccomp" != "no"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5 @@ -15591,6 +15733,26 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t printf "%s\n" "#define XZLIBSUPPORT 1" >>confdefs.h +fi +if test "$enable_zstdlib" = "yes"; then + if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" != "yesyes"; then + as_fn_error $? "zstdlib support requested but not found" "$LINENO" 5 + fi +fi +if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" = "yesyes"; then + +printf "%s\n" "#define ZSTDLIBSUPPORT 1" >>confdefs.h + +fi +if test "$enable_lzlib" = "yes"; then + if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" != "yesyes"; then + as_fn_error $? "lzlib support requested but not found" "$LINENO" 5 + fi +fi +if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" = "yesyes"; then + +printf "%s\n" "#define LZLIBSUPPORT 1" >>confdefs.h + fi ac_config_files="$ac_config_files Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc" @@ -16131,7 +16293,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file $as_me 5.43, which was +This file was extended by file $as_me 5.45, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16199,7 +16361,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -file config.status 5.43 +file config.status 5.45 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/file/configure.ac b/contrib/file/configure.ac index 6629300fd021..aa728badb1b7 100644 --- a/contrib/file/configure.ac +++ b/contrib/file/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([file],[5.43],[christos@astron.com]) +AC_INIT([file],[5.45],[christos@astron.com]) AM_INIT_AUTOMAKE([subdir-objects foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -49,6 +49,16 @@ AC_ARG_ENABLE([xzlib], [AS_HELP_STRING([--disable-xzlib], [disable liblzma/xz compression support @<:@default=auto@:>@])]) AC_MSG_RESULT($enable_xzlib) +AC_MSG_CHECKING(for zstdlib support) +AC_ARG_ENABLE([zstdlib], +[AS_HELP_STRING([--disable-zstdlib], [disable zstdlib compression support @<:@default=auto@:>@])]) +AC_MSG_RESULT($enable_zstdlib) + +AC_MSG_CHECKING(for lzlib support) +AC_ARG_ENABLE([lzlib], +[AS_HELP_STRING([--disable-lzlib], [disable liblz (lzip) compression support @<:@default=auto@:>@])]) +AC_MSG_RESULT($enable_lzlib) + AC_MSG_CHECKING(for libseccomp support) AC_ARG_ENABLE([libseccomp], [AS_HELP_STRING([--disable-libseccomp], [disable libseccomp sandboxing @<:@default=auto@:>@])]) @@ -112,6 +122,12 @@ fi if test "$enable_xzlib" != "no"; then AC_CHECK_HEADERS(lzma.h) fi +if test "$enable_zstdlib" != "no"; then + AC_CHECK_HEADERS(zstd.h zstd_errors.h) +fi +if test "$enable_lzlib" != "no"; then + AC_CHECK_HEADERS(lzlib.h) +fi AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -180,6 +196,12 @@ fi if test "$enable_xzlib" != "no"; then AC_CHECK_LIB(lzma, lzma_stream_decoder) fi +if test "$enable_zstdlib" != "no"; then + AC_CHECK_LIB(zstd, ZSTD_createDStream) +fi +if test "$enable_lzlib" != "no"; then + AC_CHECK_LIB(lz, LZ_decompress_open) +fi if test "$enable_libseccomp" != "no"; then AC_CHECK_LIB(seccomp, seccomp_init) fi @@ -215,6 +237,22 @@ fi if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; then AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) fi +if test "$enable_zstdlib" = "yes"; then + if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" != "yesyes"; then + AC_MSG_ERROR([zstdlib support requested but not found]) + fi +fi +if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" = "yesyes"; then + AC_DEFINE([ZSTDLIBSUPPORT], 1, [Enable zstdlib compression support]) +fi +if test "$enable_lzlib" = "yes"; then + if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" != "yesyes"; then + AC_MSG_ERROR([lzlib support requested but not found]) + fi +fi +if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" = "yesyes"; then + AC_DEFINE([LZLIBSUPPORT], 1, [Enable lzlib compression support]) +fi AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) AC_OUTPUT diff --git a/contrib/file/doc/file.man b/contrib/file/doc/file.man index 91470b8e199d..b9580a970dc1 100644 --- a/contrib/file/doc/file.man +++ b/contrib/file/doc/file.man @@ -1,5 +1,5 @@ -.\" $File: file.man,v 1.146 2022/10/26 16:56:14 christos Exp $ -.Dd October 26, 2022 +.\" $File: file.man,v 1.150 2023/05/21 17:08:34 christos Exp $ +.Dd May 21, 2023 .Dt FILE __CSECTION__ .Os .Sh NAME @@ -224,6 +224,8 @@ elf magic is found. Examines JSON (RFC-7159) files by parsing them for compliance. .It soft Consults magic files. +.It simh +Examines SIMH tape files. .It tar Examines tar files by verifying the checksum of the 512 byte tar header. Excluding this test can provide more detailed content description by using @@ -337,16 +339,17 @@ attempt to preserve the access time of files analyzed, to pretend that never read them. .It Fl P , Fl Fl parameter Ar name=value Set various parameter limits. -.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent +.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" .It Sy "Name" Ta Sy "Default" Ta Sy "Explanation" -.It Li bytes Ta 1048576 Ta max number of bytes to read from file +.It Li bytes Ta 1M Ta max number of bytes to read from file .It Li elf_notes Ta 256 Ta max ELF notes processed -.It Li elf_phnum Ta 2048 Ta max ELF program sections processed -.It Li elf_shnum Ta 32768 Ta max ELF sections processed -.It Li encoding Ta 65536 Ta max number of bytes to scan for encoding evaluation +.It Li elf_phnum Ta 2K Ta max ELF program sections processed +.It Li elf_shnum Ta 32K Ta max ELF sections processed +.It Li elf_shsize Ta 128MB Ta max ELF section size processed +.It Li encoding Ta 65K Ta max number of bytes to determine encoding .It Li indir Ta 50 Ta recursion limit for indirect magic .It Li name Ta 50 Ta use count limit for name/use magic -.It Li regex Ta 8192 Ta length limit for regex searches +.It Li regex Ta 8K Ta length limit for regex searches .El .It Fl r , Fl Fl raw Don't translate unprintable characters to \eooo. @@ -728,7 +731,7 @@ variable in file.h), then we don't seek to that offset, but we give up. It would be better if buffer managements was done when the file descriptor is available so we can seek around the file. One must be careful though because this has performance and thus security -considerations, because one can slow down things by repeateadly seeking. +considerations, because one can slow down things by repeatedly seeking. .Pp There is support now for keeping separate buffers and having offsets from the end of the file, but the internal buffer management still needs an diff --git a/contrib/file/doc/libmagic.man b/contrib/file/doc/libmagic.man index b0cf0339f19d..e89c6ee0bfac 100644 --- a/contrib/file/doc/libmagic.man +++ b/contrib/file/doc/libmagic.man @@ -1,6 +1,6 @@ -.\" $File: libmagic.man,v 1.45 2019/06/08 22:16:24 christos Exp $ +.\" $File: libmagic.man,v 1.49 2023/07/20 14:32:07 christos Exp $ .\" -.\" Copyright (c) Christos Zoulas 2003, 2018. +.\" Copyright (c) Christos Zoulas 2003, 2018, 2022 .\" All Rights Reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 8, 2019 +.Dd June 16, 2023 .Dt LIBMAGIC 3 .Os .Sh NAME @@ -84,6 +84,8 @@ .Fn magic_setparam "magic_t cookie" "int param" "const void *value" .Ft int .Fn magic_version "void" +.Ft const char * +.Fn magic_getpath "const char *magicfile" "int action" .Sh DESCRIPTION These functions operate on the magic database file @@ -143,6 +145,8 @@ Don't report on compression, only report about the uncompressed data. Don't check for .Dv EMX application type (only on EMX). +.It Dv MAGIC_NO_COMPRESS_FORK +Don't allow decompressors that use fork. .It Dv MAGIC_NO_CHECK_CDF Don't get extra information on MS Composite Document Files. .It Dv MAGIC_NO_CHECK_COMPRESS @@ -163,6 +167,8 @@ Don't look for known tokens inside ascii files. Don't examine JSON files. .It Dv MAGIC_NO_CHECK_CSV Don't examine CSV files. +.It Dv MAGIC_NO_CHECK_SIMH +Don't examine SIMH tape files. .El .Pp The @@ -343,6 +349,20 @@ from .In magic.h . This can be used by client programs to verify that the version they compile against is the same as the version that they run against. +.Pp +The +.Fn magic_getpath +command returns the colon separated list of magic database locations. +If the +.Fa filename +is non-NULL, then it is returned. +Otherwise, if the +.Dv MAGIC +environment variable is defined, then it is returned. +Otherwise, if +.Fa action +is 0 (meaning "file load"), then any user-specific magic database file is included. +Otherwise, only the system default magic database path is included. .Sh RETURN VALUES The function .Fn magic_open diff --git a/contrib/file/doc/magic.man b/contrib/file/doc/magic.man index d38b0e0b4019..af4bfa89c6bd 100644 --- a/contrib/file/doc/magic.man +++ b/contrib/file/doc/magic.man @@ -1,5 +1,5 @@ -.\" $File: magic.man,v 1.100 2022/09/10 13:19:26 christos Exp $ -.Dd September 10, 2022 +.\" $File: magic.man,v 1.103 2023/07/20 14:32:07 christos Exp $ +.Dd Arpil 18, 2023 .Dt MAGIC __FSECTION__ .Os .\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems. @@ -68,54 +68,52 @@ A 32-bit single precision IEEE floating point number in this machine's native by A 64-bit double precision IEEE floating point number in this machine's native byte order. .It Dv string A string of bytes. -The string type specification can be optionally followed *** 14628 LINES SKIPPED *** From nobody Thu Sep 14 23:07:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmtHr3Sgjz4strd; Thu, 14 Sep 2023 23:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmtHr31Vyz3VBZ; Thu, 14 Sep 2023 23:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694732824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4Rr1ZDEx/Zv8PGm7NqSsPPGk/svejfhh6SFaxkOdhg=; b=mOU/g7AZNZVJasV5IM5FJh1JIFSsE3kDdefKPV2ZW4CfJyf3kFTeL8MCORWJHNIM+dRFci ZWlEbOiCu6FLg9wR9SPAuIMEA1hQGDFcAB3j8xVUs+omqe1JMrNYWDE1FtSlp7RtGZW/1E jG4a9WGlTEiHv8gtAOb7P8CgCMT0bQY5UbDNVRGIJBC5J2kAjReFDbpxBz6SS/pKiJYfVA QwI4JI3jtjcu7j3Pc0BsD+t1Wtxre1QYrtbTSEtQLhCtOQ8v3dZ0X1GAKqc/CzGtgL75U9 2uOxBRS14NSIpJHJyDJOCEwLpfpMW3XBvF0saQ5M1bo7Jrk9oj3BVyZ5pD+hTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694732824; a=rsa-sha256; cv=none; b=FlH9QD4m8cSkJ7PBqvMnxCzuB2kJ9nKLJBpK5g9icpM2a7TVfpKHeqm3tUg4JWpd4G13B1 kFHU/As4ET5ZcXKHm8jyRJaN3aaCzttoQNOVds0/4mGQxMo4cKzSryg6hPowMq6igXQsHo csx7W0BnXVTEwuEAhGGM09TN3B4If6ZoqPhcr/5iVyhETqRI2uKUmv2qpjbUwTxMTHDke/ xF0Ao9I8QBcwIy3FZOBE66WH2AaW/kXP3PR1oaoqsn9jfg9krFj8/Adq6ZetFmSc6nOfyx QryZCAyODtOfGfZAkgEZY/78roqwlJc0T9r+T4mARbrRw8GGk/baADTCGhRn5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694732824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4Rr1ZDEx/Zv8PGm7NqSsPPGk/svejfhh6SFaxkOdhg=; b=H5xKEVQuU6+Ko0r94avzzdl9xxjYAskpZpSveiXESMX50szoKVGGEm+RDgmEofegWl2IjG R1bmy5IYb28KyBog9SV/2JRVOUSzbURNtYQYKBTLCm9HfmJ3139yFsnfJHeOnql4PoIMaJ dyyqaJquUN4U5OVENL2ATEdakDCOGjQk1Tx/r+6+mnoUtJqduFJaQ2Xr2NS0m4gh+aqY/W 9BrwACzgSTt/O6b6LjwD1NXkh2AkmeeCKD4Ef6xbPcXYEhG8fSAHhgtbHhaSDyRkK5aKh1 ckj3XzFQpdfcFfySKxQykUZMrOdlzGNWLqRQ7ctwjK3ewFv148k3KWqvWQf5Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmtHr26Rbz1FDD; Thu, 14 Sep 2023 23:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38EN74uH094751; Thu, 14 Sep 2023 23:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EN74N3094748; Thu, 14 Sep 2023 23:07:04 GMT (envelope-from git) Date: Thu, 14 Sep 2023 23:07:04 GMT Message-Id: <202309142307.38EN74N3094748@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: ba5dc166e0f3 - main - vfs: retire vnlru_under_unlocked List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba5dc166e0f390c703042910b637a83c705c8af3 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ba5dc166e0f390c703042910b637a83c705c8af3 commit ba5dc166e0f390c703042910b637a83c705c8af3 Author: Mateusz Guzik AuthorDate: 2023-09-14 23:05:51 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-14 23:05:51 +0000 vfs: retire vnlru_under_unlocked It only looks at the centralized value which in corner cases can end up being negative. --- sys/kern/vfs_subr.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index ed478d33aed0..84219f3b5c12 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1528,23 +1528,6 @@ vnlru_under(u_long rnumvnodes, u_long limit) return (space < limit); } -static bool -vnlru_under_unlocked(u_long rnumvnodes, u_long limit) -{ - long rfreevnodes, space; - - if (__predict_false(rnumvnodes > desiredvnodes)) - return (true); - - space = desiredvnodes - rnumvnodes; - if (space < limit) { - rfreevnodes = atomic_load_long(&freevnodes); - if (rfreevnodes > wantfreevnodes) - space += rfreevnodes - wantfreevnodes; - } - return (space < limit); -} - static void vnlru_kick_locked(void) { @@ -1826,7 +1809,7 @@ vn_alloc(struct mount *mp) if (__predict_false(vn_alloc_cyclecount != 0)) return (vn_alloc_hard(mp)); rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1; - if (__predict_false(vnlru_under_unlocked(rnumvnodes, vlowat))) { + if (__predict_false(vnlru_under(rnumvnodes, vlowat))) { atomic_subtract_long(&numvnodes, 1); return (vn_alloc_hard(mp)); } From nobody Fri Sep 15 00:00:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmvTq3n1Jz4t75F; Fri, 15 Sep 2023 00:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmvTq33NYz3fKC; Fri, 15 Sep 2023 00:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVUlZaWtSOP/kKeHldTRvqGPI8BGu5X3S0b4jvol/so=; b=PIuMed072zie05xRMB4ffHLjZdx6o+fjPgO7VHYn23pyh9ryQ0v8K1oHROpzzGspwiASJP um9B7qbqYOt3ByCEFVdGglR5dATX4MPv5WVvp47BDUxCoMHJZYKhUEca9VCf/eLY8fRZ5P U9/56FzwqTof4lOLUyzQnQfhvuke+KKEccWfSjncheXtXYgtTjkV1HgxOBmtg8E9f2edOV A7w+32Pz/phhtsNqNaRAZ1fRCKv4YQhJrd1uqcGqkGomIjhMmPH+ayN8CEwo3WV8vH5Hjh uJeJY6QSCyD2zLeJu+zazSx1VZiMBIDz65AfTC17rQIU5xsrSbjRvfDixb9YIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694736047; a=rsa-sha256; cv=none; b=HVQprKVyAmol0ubVzgAUAGdO2sYu/Nz+qu773/H5odWrpptI34+pEoCTE1e1gMabYLhpbO pBEBbw9QJbivr35Lf8Sh94V3WPep2ZN9oc4KyflgxwFIA7uWSVKYUjvEmxz1okskwgO7vH S70dVqF8Qt/fisaAlwarqo8ltxB+0etiKtBUsi9x9pFr3Z57VsloRCNvR17QCif/Y4M+zS QGLB4k1bRrE0I53/7IvJR7mhqUu+3/5JrjQcsHMI+euVxCA0qxkng0WajA6VyUaU9+fhJs 6V4tnVSe+J2d5fPOoWIIJic0Ad5Fxp2QPJzi2NEUAksmF30EMBvjKPLJm/YzRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVUlZaWtSOP/kKeHldTRvqGPI8BGu5X3S0b4jvol/so=; b=rrCStcyxcOFhCVLQaVrDDrmI1AnfCRfJwNov1cvZ5Tin/r2v1ulqbeSqtsY7VmJICDL78h KdajJDk+1naswVdzf+T2Q567PH1NqCEqqbaJDqq1ZpWvaraCN1pzBSnik1a03AzYaP8LWk StTQIKnmUQOHOK1H/C8N7+Mb+PrLm4c1YDl5WYKgfOA2U5PBwZK2TPAem5XBC6O2mGB6m9 BGvf2gK1PnMlPGPf4bpb/T9eVutZbu5LUzlSZQRZiptS9BFC4tQRSG7I4OomBlhxgP5Mzs mJycZ9tkK95QDhot5shkBlXUZ0aBtWyv4R1M7Jb66+2lT3e0VBfdqoeeDE1v2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RmvTq23Hfz1Gq8; Fri, 15 Sep 2023 00:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38F00lY9087693; Fri, 15 Sep 2023 00:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F00lOh087691; Fri, 15 Sep 2023 00:00:47 GMT (envelope-from git) Date: Fri, 15 Sep 2023 00:00:47 GMT Message-Id: <202309150000.38F00lOh087691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: dfd44f2f0143 - releng/14.0 - release: update to BETA2 as part of the 14.0-RELEASE cycle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dfd44f2f0143e8f0e1c20392dcae776bb0a7962d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd44f2f0143e8f0e1c20392dcae776bb0a7962d commit dfd44f2f0143e8f0e1c20392dcae776bb0a7962d Author: Glen Barber AuthorDate: 2023-09-15 00:00:23 +0000 Commit: Glen Barber CommitDate: 2023-09-15 00:00:23 +0000 release: update to BETA2 as part of the 14.0-RELEASE cycle Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9c894c4587da..3dd497412d17 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Sep 15 00:07:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rmvd86ScWz4t8PW; Fri, 15 Sep 2023 00:07: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 4Rmvd860F3z3glR; Fri, 15 Sep 2023 00:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694736428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWLgHTPAk1oWx6s81rsAEbDfGvIYyG2jpheAxhbT3Zk=; b=VfW+opt2XDUytdX6ScJ8rkJq2C2rOZf2D3GrTNIOLvo3qnnF525C//8SuvpBz3H0CTl8Xv FcPGxCxbQ4fkOS1TcLn9BIrvppg7UEwTK2Vt6QHV8huiZp1ixPeK6HsPvmfyuMikU7Ukoc JUUm3zxe/sTo1JNEMMQPXbvZwE2mRWJ0ujIsgjgzzwdMSU1EA2Bj63nPenYkaquB3/TQB8 NI7PXMxwTbCXLdzPgdtY73TuxUG7DY8Qk/lw5BJXIXH2Vfx4YkKdVPkCratskEe4F1646J kvVH8IcnrK7WdLPC9vkyhwQd9wCRk/e5l3Su206G+PW0qujIW/IrMhuhJbB6HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694736428; a=rsa-sha256; cv=none; b=UotFCrMmSCpxxcCDeiw/Tauv8IW/axAC6W6hjFjaRNdYqNI8DC3Y702OMH5Rlk3LUw961Z iSkhgmZBBGizbXsEwfTIwSa4yflWamLr20H4RblWz2bTuLJFAVf6YaiKH8/FBCsCswUvr+ eX0igz8ELppa4mGsfgfruliSFb5/Ls5zTht/c63aoSYz/PfqmDU+jsANF1NdO0TW/JFeeK lhk0xZgFv0COewmHzIcjImZrLITA6BvFkmYBHL/aarAm5z26p+28HsXjuZlJTv/eSWd3rg dVwmY1B4OKLFfp0afLi1WPFX2GlZLUS8m4+igWqK3DPuPZSmWEEy6KXnNBIvtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694736428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWLgHTPAk1oWx6s81rsAEbDfGvIYyG2jpheAxhbT3Zk=; b=JB7SybDaGVXifvvUPEdVEZbx1FawrxiHdDmdyionRv6pSZPoE9WF9vQk0uooTC518XnKfY l9fTbvQQs09pxF9ucrRZU8wrUx/+zfE2djazGXuSWI/m8CbzKBNtR0HCAQ4HJ/PxL4OE5g 1bmZc2qew9jhl08Y1dD6E3N5Me1sOYA+3c2AiVqdjDLMqHqvZ2d0mbzzK9PRFuF0LIi6Ur LeXuPIUn/vUYQPiNrVDyy30SbbGiTyPGtI9vFmuyGKqLGQb2pHRTNsj3/c94KuFKK3gKcb RMqFVvRkH9g3Mi7M/kMA0HCrYfUib9/ex1cyv7MQlRcFDCz67gz0mVHPEgU76w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rmvd853qyz1GWc; Fri, 15 Sep 2023 00:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38F078cI094890; Fri, 15 Sep 2023 00:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F078mH094887; Fri, 15 Sep 2023 00:07:08 GMT (envelope-from git) Date: Fri, 15 Sep 2023 00:07:08 GMT Message-Id: <202309150007.38F078mH094887@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: 03bfee175269 - main - vfs: use vnlru_read_freevnodes for the freevnodes sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03bfee175269960c67cab64d761bbb5eb9ac5878 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=03bfee175269960c67cab64d761bbb5eb9ac5878 commit 03bfee175269960c67cab64d761bbb5eb9ac5878 Author: Mateusz Guzik AuthorDate: 2023-09-14 23:53:11 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-15 00:06:57 +0000 vfs: use vnlru_read_freevnodes for the freevnodes sysctl For a more accurate result. --- sys/kern/vfs_subr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 84219f3b5c12..823b8005aa4d 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -184,8 +184,6 @@ static struct vnode *vnode_list_reclaim_marker; */ static long wantfreevnodes; static long __exclusive_cache_line freevnodes; -SYSCTL_ULONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, - &freevnodes, 0, "Number of \"free\" vnodes"); static long freevnodes_old; static counter_u64_t recycles_count; @@ -350,6 +348,19 @@ SYSCTL_PROC(_kern, KERN_MAXVNODES, maxvnodes, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_maxvnodes, "LU", "Target for maximum number of vnodes"); +static int +sysctl_freevnodes(SYSCTL_HANDLER_ARGS) +{ + u_long rfreevnodes; + + rfreevnodes = vnlru_read_freevnodes(); + return (sysctl_handle_long(oidp, &rfreevnodes, 0, req)); +} + +SYSCTL_PROC(_vfs, OID_AUTO, freevnodes, + CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_freevnodes, + "LU", "Number of \"free\" vnodes"); + static int sysctl_wantfreevnodes(SYSCTL_HANDLER_ARGS) { From nobody Fri Sep 15 08:49:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rn7CL5Ymhz4tKm7; Fri, 15 Sep 2023 08:49: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 4Rn7CL56Hvz4TQP; Fri, 15 Sep 2023 08:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694767742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkC+uuS//wiaY9vnmkBGD6aj8bovAVPSZZdwCz7F7hU=; b=snoPzB9T0xOizWSUmpw49sKepg33QNzvMhAE5iNDaAzlgojLnlOmoo7PLfkE54cEBX7ZYa 7aV4KMyt70SDM9OVDeQPfZBgPfKxICTSoIqSFhWzoMh8ZDAcYF7peo73Pk++xxEgg551Aa QzBikXjbiLj7dIbJbCJG5AM1bE1ZbId2KkDhxCMPiA0JnesREGs3NPH50XL3p5sQIts7Gm k0UziMKwGiPy3i2RMQnuO7dEyJrxJvQi6a9vZEM3PHdHBjDKfn8F8Z3o68NAjK1MfszXl6 xMdp1Nl1ONG+CrwsWhqr1JaY2SL2EFxtPVzcoIyJ/YGkgb7xyGxMRzfQxa5OLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694767742; a=rsa-sha256; cv=none; b=mDVovEhRLA9y4pmZK6j4Ssi0Z9poPyfVfRKTPQ5CWr1k7Y16buDPYjD01k2X77K2dArcdN eBMhBRVJzcBkHbrYoJNvFEj1IT9WA+PpzVH/HWpn2iQRzocVTrf7asZ8i7RTS3kY5y9wgq jnJZWt4ah+LqKVmS9p0J/Jyf+SzcghCnIZnrrvoF/CJtMdPyIf8i5w0CGCFhTJC9TuqBdA /GVno8MdewfVT+hGwiyvnAz3E/k6eL9MRmYtTduuKZH2mYscx5HrLq6hkeWCGTeoSwYdot meaDkF/QcTkPAxBGpZkNOB3E0u96x/VaTOKp2w+iU81PK0L4NyKk0IxyJTxayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694767742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkC+uuS//wiaY9vnmkBGD6aj8bovAVPSZZdwCz7F7hU=; b=Qu6vauFw5iolZjFneDKdpaoLbPBU7BLtyuk0aElSZTTWJ0ND05gGO9hTw5dl2Sq+Qh+hi/ mBx7yjHRzvLimJ0ry5Z0nJhJPsM6zvpvRIdL+3Ua0Ufj4G95Tg5Xu9GVqJHem0tNc6Xf2Z LCb25qyB/mbprNkQmRI0D8iWfbxeq/Fmi+zwm/URAuARfT3crE2B9JICFHZG4kTns+/Y1F UuvHqqgIcEyxd4UvCMk7v4irUYjDuJFsezBhGOB29gLHyigXf4vL7BPd+rVXCww+lnE/I1 zcLuX17W0vhO+qU0IavbYkxpTGq6uffDoo/Bonw6q4Vy5K/ojBr4WTjz6ABb4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rn7CL45pPz28K; Fri, 15 Sep 2023 08:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38F8n2I5057902; Fri, 15 Sep 2023 08:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F8n29m057899; Fri, 15 Sep 2023 08:49:02 GMT (envelope-from git) Date: Fri, 15 Sep 2023 08:49:02 GMT Message-Id: <202309150849.38F8n29m057899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f799833f4fce - releng/14.0 - gve: Make LRO work for jumbo packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 commit f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Mark Johnston CommitDate: 2023-09-15 08:48:33 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Approved by: re (gjb) Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41754 (cherry picked from commit 5f62584a9adb7887bae33af617cfa4f43017abf8) (cherry picked from commit 04ada3cc2b530a5c170ebefa8c28c5625009d37a) --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0)) From nobody Fri Sep 15 09:21:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rn7wK5VqVz4tSW9; Fri, 15 Sep 2023 09:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rn7wK53Kzz4ZLC; Fri, 15 Sep 2023 09:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8VFlfNh1DeBWIQ0g3Hm0eb2YE4iKgppzhhAXYvo3cQ=; b=Z1vorlauQLKrEIAxv/s6tjeQKW4iVjJ0TPly4qg99SvEfEcr8Kj+NrEMCf/mh/O2XxfL4A 4WkVmtH76gaA1/7vq9XRSGp9qPLCFStzbAos5lsx3SgoGal8BBYtGGfY7ggTk0Q6M6wo+U pgb2hk9uimuJGE82W4FPX5BvbO9iU1GAygaRl5Y4wFhWz+25tfOzVXiieeFRMa5utNeiQ3 RhHUqcn+4+6e5lMUFT3RW5NyQfROBcL5mPYt54SXZApnZY4yANBlGiO3UYw5oFe3M5Q2P6 RU0QuUMAWvrj6zC+WVAKkxYG1AWB5xELw5I83r6ITkSwRX8fl7yzQ6T+v5RxgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694769665; a=rsa-sha256; cv=none; b=ntEu6yO2cCmnjwo8NVsCOE9ojlfAMgQhBiDF/dAy1msihtveZ1sm/9VA6c4rcrdqLhYoSY /m1dIEhRWYf4y7o+xx202PaLlSsvtShF1Zrgn6Bu7vfa01qz95B3RQsl53zL+Yga6+bp/P TV/6YVMcqPreaqKClhGpVeicoYwUNXzZatOp2wKLlDJ2JYvi0/2OGXXFfriYAsq4A2CN0D 09LXBaGMTZWnNjOGScpEJOz/EkfHqvs3XeLauUjEe8j53xgLRWUfEYJM7HcDh47bCpQVPZ 7oHxcDiM78xL/AgrhUwPJpi3V4ZXcPIvU8LBh9VdZz2tL/QxhKc6IXYfrjGEcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8VFlfNh1DeBWIQ0g3Hm0eb2YE4iKgppzhhAXYvo3cQ=; b=NGsaljWOplD/Syf55IRlBb9CZ1D67I2UpnMXf5QB3NA/lqcCakvd+zcKrUjceY7Pxe3ldm tTqHDkJos3fy396Jsc0WKaKwASllPLewk6tS8ExKC7VMJVqpAFwBBqS5hAfym7HsrrVEUP 1i5EhYj+qu7zIo9yvCdZ2HRyCwGUTHZnF6QnKk7+7Z2JncpHXSAwWtq4O0+optTI5jrtx1 gPc4lMzQh9KEa1vpxpsczqXGOsL5NPQsfmLZdwF9FKcKeo3QmnNHD46AoSmKbN6oJepPao RSzPSEyvYuK3sVE1VUnMs74vPgjJnqgY4dYhryfa4aQ+438DYqhbmubNEuWy6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rn7wK475Sz3G4; Fri, 15 Sep 2023 09:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38F9L5ED018545; Fri, 15 Sep 2023 09:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F9L5Ia018542; Fri, 15 Sep 2023 09:21:05 GMT (envelope-from git) Date: Fri, 15 Sep 2023 09:21:05 GMT Message-Id: <202309150921.38F9L5Ia018542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 2a95efe756c6 - releng/14.0 - Hyper-V: hn: use VF's capabilities when it is attached List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2a95efe756c65d459cacad89acdf7f90fe080cf6 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=2a95efe756c65d459cacad89acdf7f90fe080cf6 commit 2a95efe756c65d459cacad89acdf7f90fe080cf6 Author: Wei Hu AuthorDate: 2023-09-04 10:15:06 +0000 Commit: Wei Hu CommitDate: 2023-09-15 09:20:37 +0000 Hyper-V: hn: use VF's capabilities when it is attached Current code in hn/netvsc tries to merge (logical AND) VF and its own capability bits when a VF is attached. This results in losing some key VF features, especially in tx path. For example, the VF's txcsum, rxcsum or tso bits could be lost if any of these are not in hn/netvsc's own capablility field. Actually when VF is attached, hn just needs to use VF's caps as all the tx packets would be forwarded to the VF interface. Fix this problem by doing so. Approved by: re (gjb) Reported by: whu Tested by: whu Sponsored by: Microsoft (cherry picked from commit 289ba6b870f79d8dbd9e8022c4fa23469be11a73) (cherry picked from commit c9b4782ec336c122d8ede81be0823969e0748332) --- sys/dev/hyperv/netvsc/if_hn.c | 63 +++++++--------------------------------- sys/dev/hyperv/netvsc/if_hnvar.h | 2 ++ 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 206a35f7bac8..7d8e1914163e 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -1261,60 +1261,21 @@ hn_ifaddr_event(void *arg, if_t ifp) } static int -hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr) +hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr __unused) { if_t ifp, vf_ifp; - uint64_t tmp; - int error; HN_LOCK_ASSERT(sc); ifp = sc->hn_ifp; vf_ifp = sc->hn_vf_ifp; /* - * Fix up requested capabilities w/ supported capabilities, - * since the supported capabilities could have been changed. - */ - ifr->ifr_reqcap &= if_getcapabilities(ifp); - /* Pass SIOCSIFCAP to VF. */ - error = ifhwioctl(SIOCSIFCAP, vf_ifp, (caddr_t)ifr, curthread); - - /* - * NOTE: - * The error will be propagated to the callers, however, it - * is _not_ useful here. - */ - - /* - * Merge VF's enabled capabilities. + * Just sync up with VF's enabled capabilities. */ - if_setcapenable(ifp, if_getcapenable(vf_ifp) & if_getcapabilities(ifp)); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP6_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); + if_setcapenable(ifp, if_getcapenable(vf_ifp)); + if_sethwassist(ifp, if_gethwassist(vf_ifp)); - tmp = if_gethwassist(vf_ifp) & CSUM_IP_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO4) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & CSUM_IP6_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - return (error); + return (0); } static int @@ -1698,6 +1659,8 @@ hn_xpnt_vf_setready(struct hn_softc *sc) sc->hn_saved_tsomax = if_gethwtsomax(ifp); sc->hn_saved_tsosegcnt = if_gethwtsomaxsegcount(ifp); sc->hn_saved_tsosegsz = if_gethwtsomaxsegsize(ifp); + sc->hn_saved_capenable = if_getcapenable(ifp); + sc->hn_saved_hwassist = if_gethwassist(ifp); /* * Intersect supported/enabled capabilities. @@ -2017,18 +1980,14 @@ hn_ifnet_detevent(void *xsc, if_t ifp) * The VF was ready; restore some settings. */ if_setcapabilities(ifp, sc->hn_saved_caps); - /* - * NOTE: - * There is _no_ need to fixup if_capenable and - * if_hwassist, since the if_capabilities before - * restoration was an intersection of the VF's - * if_capabilites and the synthetic device's - * if_capabilites. - */ + if_sethwtsomax(ifp, sc->hn_saved_tsomax); if_sethwtsomaxsegcount(sc->hn_ifp, sc->hn_saved_tsosegcnt); if_sethwtsomaxsegsize(ifp, sc->hn_saved_tsosegsz); + + if_setcapenable(ifp, sc->hn_saved_capenable); + if_sethwassist(ifp, sc->hn_saved_hwassist); } if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) { diff --git a/sys/dev/hyperv/netvsc/if_hnvar.h b/sys/dev/hyperv/netvsc/if_hnvar.h index 0d8ed6bdef19..f46adcbf9245 100644 --- a/sys/dev/hyperv/netvsc/if_hnvar.h +++ b/sys/dev/hyperv/netvsc/if_hnvar.h @@ -277,6 +277,8 @@ struct hn_softc { u_int hn_saved_tsomax; u_int hn_saved_tsosegcnt; u_int hn_saved_tsosegsz; + u_int hn_saved_capenable; + u_int hn_saved_hwassist; /* * RSC switch, default off From nobody Fri Sep 15 09:21:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rn7wL6X41z4tSQg; Fri, 15 Sep 2023 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rn7wL65zPz4ZNl; Fri, 15 Sep 2023 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdVjw+y/zOUbNI4MOJaUKvZP3apcXQkfUCjZ3U/9S3A=; b=ngrJtOTU/lyGagKoFYT4Z9wxFsp99IO/7Y8D9GYwpTqdJW5R3YuehXnXO+VyLl0/UJKBAs Bw3bPeUOopQgLrG88Blk59/rB3RrkTq342c5HZY3tTk9xhz8FRSnvekxZ56N071LTXTlpi oKJ3+eWJPduylcg8RfjrAT4QMQVLW7DnYmxSeNlbBDT0pdTGpEWOnIhiqhmUw9D1GmSNxZ RMT5MJpUqwP8srFbAGq1AfJZMn2PvlzupjPR5ggDJXfErFigMPWArH9jma3unYMOa1qtGp ajigP04ErayfLiigP7/eFBT31VvQBanW1HJqm9zW3IsLTIVTcX5u8fZLQGTCTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694769666; a=rsa-sha256; cv=none; b=STTRY8ZF0dhWDq3XEJvVQ8bRQS7QIuLseOwCV4YY8RwhKdKHjV9AmXCjGK0toqOR7fFAaR xcj0DaGoTuIJDJD76EMt1U8mFNCSmXuLAzQWcF4U2MjrbMA2XcSTkgOLA/ygXKKXFehsTs ovYLm9N6nEfS/vMxKO62k4pt1nojZmc0Yu3nk6Tj8jCN8ldIxLDst6Iu+E+LNTgcVln8pZ vE1vM5gStnENIAGDDG4aQJAlDbiBFYLUBkkRDN5OTd4FC+Mm0j3jmDrJ3wPAX9kvxJwHFL rOFDOwK1JL49Tfqyv3Euixsf6iqAxs7JSxXRdkUmOomdiu0YZV4BjQyYzbFrsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdVjw+y/zOUbNI4MOJaUKvZP3apcXQkfUCjZ3U/9S3A=; b=NFqUOkbFxuAhBno7u0thpKtjO3betaQI/bA1jxN/n4JCTK0nsojm0V+eUN12sFzk/nCN1C dP9fHH2F/OH4Uk7BWBrki+z3IQxKZEtwuoSVn8PCRBqLmsfUYe/xCB478j0qqHUnbghK/e 5vqeVdvRYBxuGgGB83oB8/FCmhs04495qsNbmc+N6AefJQXz8FI3QddFabPzE1MOwoYJy1 zWz4cr48qaKw5PZ1JB2Q5H7YT+6+w0AeI60C3ajcvLeDLUj1VQzO113T9yfRkme7XuW6EX zoJTFmp/od9DR1xAUzy2a6VVt5NqUViE4D9LHxGgNgyZRv7ZdUXd9Ix68IXC6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rn7wL57Rdz3gj; Fri, 15 Sep 2023 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38F9L6MD018598; Fri, 15 Sep 2023 09:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F9L6tx018595; Fri, 15 Sep 2023 09:21:06 GMT (envelope-from git) Date: Fri, 15 Sep 2023 09:21:06 GMT Message-Id: <202309150921.38F9L6tx018595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 8d60ede293eb - releng/14.0 - mana: fix tso parameters and set hwassist bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 commit 8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 Author: Wei Hu AuthorDate: 2023-09-04 14:53:10 +0000 Commit: Wei Hu CommitDate: 2023-09-15 09:20:37 +0000 mana: fix tso parameters and set hwassist bits The parameters for tso on mana were not set correctly. Also the hwassist bits were not set. These two cause tso on mana not work. Fixed the issues and make tso working on mana. Approved by: re (gjb) Tested by: whu Sponsored by: Microsoft (cherry picked from commit 643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce) (cherry picked from commit 4b22565f8598f2890d41e179fd36a0845f781262) --- sys/dev/mana/mana.h | 1 + sys/dev/mana/mana_en.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index df527df10296..9a22ea87baa3 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -186,6 +186,7 @@ struct mana_txq { */ #define MAX_MBUF_FRAGS 30 #define MANA_TSO_MAXSEG_SZ PAGE_SIZE +#define MANA_TSO_MAX_SZ IP_MAXPACKET /* mbuf data and frags dma mappings */ struct mana_mbuf_head { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index fa49e06e4862..56fa4e51ba26 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -798,8 +798,7 @@ mana_init_port_context(struct mana_port_context *apc) uint32_t tso_maxsize; int err; - tso_maxsize = MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + tso_maxsize = MANA_TSO_MAX_SZ; /* Create DMA tag for tx bufs */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -2712,6 +2711,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, { struct gdma_context *gc = ac->gdma_dev->gdma_context; struct mana_port_context *apc; + uint32_t hwassist; if_t ndev; int err; @@ -2774,11 +2774,21 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setcapenable(ndev, if_getcapabilities(ndev)); /* TSO parameters */ - if_sethwtsomax(ndev, MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - + if_sethwtsomax(ndev, MANA_TSO_MAX_SZ - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ndev, MAX_MBUF_FRAGS); if_sethwtsomaxsegsize(ndev, PAGE_SIZE); + hwassist = 0; + if (if_getcapenable(ndev) & (IFCAP_TSO4 | IFCAP_TSO6)) + hwassist |= CSUM_TSO; + if (if_getcapenable(ndev) & IFCAP_TXCSUM) + hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP); + if (if_getcapenable(ndev) & IFCAP_TXCSUM_IPV6) + hwassist |= (CSUM_UDP_IPV6 | CSUM_TCP_IPV6); + mana_dbg(NULL, "set hwassist 0x%x\n", hwassist); + if_sethwassist(ndev, hwassist); + ifmedia_init(&apc->media, IFM_IMASK, mana_ifmedia_change, mana_ifmedia_status); ifmedia_add(&apc->media, IFM_ETHER | IFM_AUTO, 0, NULL); From nobody Fri Sep 15 15:34:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnJBw158Cz4sslv; Fri, 15 Sep 2023 15:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnJBw0clSz4ThQ; Fri, 15 Sep 2023 15:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694792056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyqyfsPXLCe0P4QAKmr6MyROZtcQlqWIu+ZbDFQkgMI=; b=vUQe5+kLrUyUvIdc+GP8V7WnvngB1O5iTxM+L4kNKBBzAR3TITXMKtmy2G21W7gUYEcT1C 2kXytHmeKY5stVMkA2m4KPyPizAoJcc/hhGDjRV53CUp5Lo0pzdWoDUa4G9FWwBNd3Bvki hrJBooAGxlBjalvLkkEu/FRru0hIK+h/LPNnKfOedp5Pk4EsCovlwRjF7OKKJoVyv3Vt5y 6SkHX7UkH8m0lf4TnMnW0IPHwa2XrPYI2Fqr+/jGdRMpTc1sfwyRnEWYlRGwlsUIb4YPX/ /VyY6BTCKOrAIVUb0JJEvajHIQSrkjtlskiC6Qgr1+k0ScF2tMp6QbIYa8DpBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694792056; a=rsa-sha256; cv=none; b=tn4/9hEUvJk1W6/ZtttJJkWi9f3KeERmMo9gxXM3cpd18yW01PVCnQfhkld3tgDCTpl/De 1fRgJ2KbH3W47p7qnqqw03Cs568aYu02mHMBHJIkkV65p5hJlbzmCHPXZdrv1PYm/B4/Dp 0Xtrh1zr1wN2VwB6SDmgrtxx4YgokT9kkEIFrZ8+IkmZaQ6GQXSWeJWn0LfKIAA0lcUOc0 1xinxRKBvnYJuNyMU6F68/X1rpfTeD+n6ajsLr2WGisgFtFeHt5ICu8EzUsHeHdaoD4kqE Yt0JBmSkshEoyVjDsU/0mjfc4eH5cDfou8lQwVcLcekdjXeXFhXLiddyiFDhBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694792056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyqyfsPXLCe0P4QAKmr6MyROZtcQlqWIu+ZbDFQkgMI=; b=u4poh/yQal5z3ZLQ5KxFNrjAHQKTzmZlqmSI4bYUSfnJZq+UMFFuX843XZQOLC3hAPM9gH +v2X/McdxoPCldUZVVC0HlAwzFYIJDLRauP0Xzq5wzAWbdzM4cLBIfn//D0V138vdzSjAe +4sFuf5iqEY0DRTu4hvXGklkF/QJgNaq6ENFnZ7Hqzge7zsB7x2QVseSNIila5Mox5/XfW bdmCGA+7YKD8VKIfxRrCKUbzbKFjL82kvWJn6gUAsHK+3XhpIJ3Xnc0XeNxbtiqFZywHTF l8Q0pVpB4JMIrDv13HRHMBTKyAG1AoXMziTIdRLnoo0hBMWZFXkK+om6Fml94Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnJBv6p62zTpF; Fri, 15 Sep 2023 15:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FFYFbB040764; Fri, 15 Sep 2023 15:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FFYFcD040761; Fri, 15 Sep 2023 15:34:15 GMT (envelope-from git) Date: Fri, 15 Sep 2023 15:34:15 GMT Message-Id: <202309151534.38FFYFcD040761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: bbe8195bfad6 - main - kinst: do not look for a function epilogue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbe8195bfad620e01a7b1cfdb0de3e4b65a72949 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe8195bfad620e01a7b1cfdb0de3e4b65a72949 commit bbe8195bfad620e01a7b1cfdb0de3e4b65a72949 Author: Christos Margiolis AuthorDate: 2023-09-15 15:33:41 +0000 Commit: Christos Margiolis CommitDate: 2023-09-15 15:33:41 +0000 kinst: do not look for a function epilogue kinst currently only traces functions that start and end with the usual function prologue and epilogue respectively. Ignoring functions that do not have an epilogue however, makes the filtering too strict, as this means that we can not trace functions that never return (e.g vnlru_proc()). This patch relaxes the filtering and only checks whether the function pushes the frame pointer. Reviewed by: markj Approved by: markj Differential Revision: https://reviews.freebsd.org/D41876 --- sys/cddl/dev/kinst/amd64/kinst_isa.c | 18 ++++++++++-------- sys/cddl/dev/kinst/riscv/kinst_isa.c | 11 +++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c index 398f30a281c0..b1d3d8727ead 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.c +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c @@ -22,7 +22,6 @@ #include "kinst.h" #define KINST_PUSHL_RBP 0x55 -#define KINST_POPL_RBP 0x5d #define KINST_STI 0xfb #define KINST_POPF 0x9d @@ -502,7 +501,7 @@ kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, const char *func; int error, instrsize, n, off; uint8_t *instr, *limit, *tmp; - bool push_found, pop_found; + bool push_found; pd = opaque; func = symval->name; @@ -521,17 +520,20 @@ kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, * manipulations since they might correspond to exception handlers. */ tmp = instr; - push_found = pop_found = false; + push_found = false; while (tmp < limit) { - if (*tmp == KINST_PUSHL_RBP) + /* + * Checking for 'pop %rbp' as well makes the filtering too + * strict as it would skip functions that never return (e.g., + * vnlru_proc()). + */ + if (*tmp == KINST_PUSHL_RBP) { push_found = true; - else if (*tmp == KINST_POPL_RBP) - pop_found = true; - if (push_found && pop_found) break; + } tmp += dtrace_instr_size(tmp); } - if (!push_found || !pop_found) + if (!push_found) return (0); n = 0; diff --git a/sys/cddl/dev/kinst/riscv/kinst_isa.c b/sys/cddl/dev/kinst/riscv/kinst_isa.c index 9c1f4a239f83..1fabde189712 100644 --- a/sys/cddl/dev/kinst/riscv/kinst_isa.c +++ b/sys/cddl/dev/kinst/riscv/kinst_isa.c @@ -448,7 +448,7 @@ kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, kinst_patchval_t *insn, v; uint8_t *instr, *limit; int instrsize, n, off; - bool lrsc_block, store_found, ret_found; + bool lrsc_block, store_found; pd = opaque; func = symval->name; @@ -464,16 +464,15 @@ kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, return (0); /* Check for the usual function prologue. */ + store_found = false; for (insn = (kinst_patchval_t *)instr; insn < (kinst_patchval_t *)limit; insn++) { - if (dtrace_instr_sdsp(&insn) || dtrace_instr_c_sdsp(&insn)) + if (dtrace_instr_sdsp(&insn) || dtrace_instr_c_sdsp(&insn)) { store_found = true; - else if (dtrace_instr_ret(&insn) || dtrace_instr_c_ret(&insn)) - ret_found = true; - if (store_found && ret_found) break; + } } - if (!store_found || !ret_found) + if (!store_found) return (0); n = 0; From nobody Fri Sep 15 17:33:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnLr30243z4tNr9; Fri, 15 Sep 2023 17:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnLr26jCSz3GlH; Fri, 15 Sep 2023 17:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=nrQyLccIY8RyqZZCmneVp5B0jgiobVOLIY1dhPnrQ7L+XBBCAAoTWsRacNHpgIPrdAMg4j iTDG1XhZhMPeEovyeedkcU9Qn7O6kTj/oAlZiaK9JF58/VkhJJELKGkecAERiLKbTITiRg vhh0A4rj1X4RhJevNYOIzaI6zUknOIMal56H2aFMQbGANqEsvtg+S1je9vUEoMRELEiUWs K1LMYJJ1IC+wpRncan2uveDHpzEAQOWglBpLZTxDNhNXuuZrO5hpvMJ/dIDro/x+95Y6TY V7O6caNVhKA2/CO9OfSxL1pTPIbK3JkztdjH1sUNSWPkpu5gp6HMOwd4XBhJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799186; a=rsa-sha256; cv=none; b=j/YZPpqgXDa8EoEgV1wYFbwJO+BteUxOZuDtnAV5LGILWntgSQY+3mTxa3Fu+62pVl4YJE ag4aLS5EEHIJ9smoojuPTTOPTFKX1Ygggo9HZoORyokBKz43Gi8O5TDwtz/H6M2O7f2WBh sZzJHSG1Stx4BKgQC68XEx4S74mG61xdtisAjdS7ATKHVsm8/lKgMKWSePz9pFL12jxK2x CGtb8BKRzNqb5IWGqTnDcg03A4y+aDNlFfaHnWjdbSRXYrC6PjuvxrFEDivDwtUFLuYRbY qt3Dy1YPY2Rb6tBNx9+gnOuWW9aVUMwowWMVbfTyuilgKDWnsQYyeEl62zpeUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=Pk+lzcoCxHqGGQMt9DeQnD/cQhO8e+QDOXXAyHuR55Ro2PcO5kYtCQg8ZtKAIJ+U7FTxOx 11FxNnx+WmKVbUMPsHpTriv2gYWEEzszqkpHo+p2mFpcKEU6aTBtJfeXAHMkhi78h2Sz5I NYT3MNztSnpmmTqzHaWj+OBfJuIPY1IT3Zh+FsjOMbdLCg5n2vmSKusQnzIjdDCdNvEbEL JCteAcS8QMSjpBtA8CZiYE1vTl0EFsZqZ7DMrkt2hl4xXDtLllHg0gZoLQ6pQbM7lQVWS/ mYGWK8a1UE4LYKgUM0XSHHyBS2kDYKgnb95ZqnUN1SUCWyjrpH9joAkqa9JPbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnLr25mGWzY8X; Fri, 15 Sep 2023 17:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHX619038847; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHX6tq038844; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:33:06 GMT Message-Id: <202309151733.38FHX6tq038844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 351792d4cfd1 - stable/14 - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 351792d4cfd1a7f7337472870f207004789db2a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=351792d4cfd1a7f7337472870f207004789db2a4 commit 351792d4cfd1a7f7337472870f207004789db2a4 Author: Michael Tuexen AuthorDate: 2023-08-25 15:23:34 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:30:51 +0000 sctp: cleanup No functional change intended. Just asserting the conditions when being called. --- sys/netinet/sctp_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index ef5eb8b89a5d..d0f3f936b34d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -87,7 +87,10 @@ static int sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, uint16_t threshold) { - if (net) { + KASSERT(stcb != NULL, ("stcb is NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + if (net != NULL) { net->error_count++; SCTPDBG(SCTP_DEBUG_TIMER4, "Error count for %p now %d thresh:%d\n", (void *)net, net->error_count, @@ -114,11 +117,6 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } } - } - if (stcb == NULL) - return (0); - - if (net) { if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_INCR, From nobody Fri Sep 15 17:35:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnLtq5TLrz4tPnV; Fri, 15 Sep 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnLtq50wHz3GyB; Fri, 15 Sep 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lnh7b7JM3Hk56K0sxWgT16S+4q8iuZMMTzvdJ0Nh0ZA=; b=Re5ivi2q2TnnJlRBoaKLG4J685s3FR4hsIyQXHbUqsFiKSJciaZa7qmL/hzaXa3E4DfQcR h5uyuG7U3LQS3z+bvAnMgJfbK99mjaODNd2aft6ByRBkGbsHrkrwIj9OxiI8a5r/X+3cIL 319Oq10N3p3hf7ohiLWFMjVWJ3UdsP5Yhd2fhhyw2hIF6bbPX1pT9AuxeRv+FFucvZ65sL vwLi0ZN4wNheqLogpF191HPzzqX+56sIPkOujBVPUISsB12hYN+VzEZVGh9k+wBv9faS5s /NxTqYY3LexDRB/QwHcFd0+E2rdjoTOqEjEj/wo+5glrByGLf7V5aCHumYTx+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799331; a=rsa-sha256; cv=none; b=MSQH5nkU/uqHkIRcF8fgYfjwvAOKxcUHbr2wsX+Xx+Q6AAyQAVE3Kl1AvJX51aU0naWZgH TvXjrDShgjvD0ErMa2LMGbxOshZVHuwLW3H4Zg36KaKsfyxf/wa//d/L9+Mf1Iiu7HSSmY YuLqKnZ5pCdYfPCNqGe5bf6OdXDHJssLTRMCC+HiT5H1XS+tjTSL7tMkOrgyN/YKPs+K5o qIx2Bwgffw0j2oC3Sb8cVRSt8kVlLU3C8PFl6npCWT+3ZzP3D+d1CYGlOWFIR1SxEhixFr sMtpz54iFVexLv+NABtXy+DNcw2iCDa0dvkS7LCywydq8HcerbrbXyTiG+4iZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lnh7b7JM3Hk56K0sxWgT16S+4q8iuZMMTzvdJ0Nh0ZA=; b=mdqBQrKkmGsLrdt/HcvpYo9XYNNDMoqQAFdEKUb0T38NEMw6ej0YQovOdcT6GUrGEJ+z3O xsVijEs5vu/nTmfPn0S3Gmehu5nyxIkT2qSC+ICK6DstVREejr0/C5Cu9FlMfZmxfzD3Cm yB1hrUkp5bBDYNP8wrIqlx9Fv/4XpwEfm/lTZ9+8QZ2MEfMm+rtOGoudY+s5xOq/2Fkfiv NeQ0eid3rMVn4yysx/lKVcGgPDQW1jzAv9fMS4qCvFiRojM0+Nni5b7nMdGNHKqFfViIuq kQ0Tzz74xVvuAb6BxeecDGwhIBvk5TIf8gbpkJF7tRQwEQnDiS/CP+bcjkUKRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnLtq466SzYlg; Fri, 15 Sep 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHZVuQ039313; Fri, 15 Sep 2023 17:35:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHZVC7039311; Fri, 15 Sep 2023 17:35:31 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:35:31 GMT Message-Id: <202309151735.38FHZVC7039311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6cf1d4a323d7 - stable/14 - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6cf1d4a323d7cd5d224950dcf494a0a13d453884 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6cf1d4a323d7cd5d224950dcf494a0a13d453884 commit 6cf1d4a323d7cd5d224950dcf494a0a13d453884 Author: Michael Tuexen AuthorDate: 2023-08-25 15:31:19 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:33:35 +0000 sctp: cleanup In particular, don't use a socket level flag, use the inp level one. After adding appropriate locking, this will close a race condition. --- sys/netinet/sctputil.c | 60 +++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 2f021c22165e..381f67f40b99 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4054,14 +4054,14 @@ void sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, uint32_t error, void *data, int so_locked) { - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } - if (stcb->sctp_socket->so_rcv.sb_state & SBS_CANTRCVMORE) { + struct sctp_inpcb *inp; + struct sctp_nets *net; + + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + inp = stcb->sctp_ep; + if (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) { return; } if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || @@ -4073,6 +4073,12 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + return; + } + switch (notification) { case SCTP_NOTIFY_ASSOC_UP: if (stcb->asoc.assoc_up_sent == 0) { @@ -4091,32 +4097,20 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_assoc_change(SCTP_SHUTDOWN_COMP, stcb, error, NULL, false, false, so_locked); break; case SCTP_NOTIFY_INTERFACE_DOWN: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_UP: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_CONFIRMED: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_SPECIAL_SP_FAIL: sctp_notify_send_failed2(stcb, error, (struct sctp_stream_queue_pending *)data, so_locked); @@ -4227,7 +4221,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", __func__, notification, notification); break; - } /* end switch */ + } } void From nobody Fri Sep 15 17:37:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnLxf6bSqz4tQBZ; Fri, 15 Sep 2023 17:37: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 4RnLxf63QSz3HV8; Fri, 15 Sep 2023 17:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/peXpAsRdXDF6X4TxdjwzJ2Pfb0NKa74Zo7edKN0gE=; b=pDFXsoQf9gr3DCNyjeKqbdE9FH+8sDMpb8nw59Gg+kcPrS3x9knr4nSTj1R2omOry0oDlq R1genDjfVrLa4FQM9AUrn19vEjHBLOVfs2M0WpiPFNqePav8d+gKxhD6AZLxJK5tT8DAOd qwIL4SwU5xPMvUC6+HQFerOdHkZtvhDYpsRIInU3kDicL8MTKwTHsgh4xMek2OZ3+Ubgdd p0MkAxPR1NkIBHmgzEuKjoM9SWa7N1xMTtLvOJOROy2BhHX4SfGL7mOhB1K+/h27UPxHRX 6XBQP8P1ToCwDEYK9RzxO8PDeC2rSEtxY7d57mHH/KG01s6FWxbp9FqKUwYInA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799478; a=rsa-sha256; cv=none; b=Pl+bqZPX6O+jvk6WEhcZ7c4h3Qy5nCIk4ADR0L0ka7+FQxMiG3ZJSwaMR9J+MHF7+WP4Ve g3zDOjbaBm+4vDPiagUiJwrnnRjH8HCWVTS8ziLOLmZ4MhQAMTuX3ymE2kusT8o/MrEUtX Ks9V8oc2FIuu9SgliJosoXWF/ojd4q61F2qXCbs1oZJXO0d0+0NDtDocsQZcHf8V62JyDL xAZqOXlR08dzLmwPsLrXLVvi3wKvyTKid1Ol2HrdiSv2U6yCprzUdyojZUNSsUJaWMkvzW AJqj+xRax+BFK+PP8L18/svKIde3Rp3NCSReNxIcXqjQAQFPHR1b0MM8p5fjMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/peXpAsRdXDF6X4TxdjwzJ2Pfb0NKa74Zo7edKN0gE=; b=l0hh38OR3LxNf/vTnJZfSf1H+CkhsBVxKB7k1nD+TV7bC9XMIIizXeHoWJqoXIeavXsqp6 7DrXkO+n6i35uoihv8v94gZQgN3v5gOShkKWl8lsczg6l/ISDaAvwZK7wYb85Y9UukXEKu 0HSSmim4aGprUjJQWPubrTm/FjtDqJLOjgj/O1GQMpY7NdY9nziuVt1yu2lNwtvxQbkvq+ AYIcyvJDZ+ROD4eEHA6sj9WIVAOZYnVLBqPXDs8+6M4q11N/gy4/G16zhqEnyFQcVVFrCC 0D28MZE5G49NH0aRnHPjX0ZRWqywANhHt8ml6Vy/n8D9UpwS/3nZNp6AXmtWMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnLxf4pZyzYTv; Fri, 15 Sep 2023 17:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHbwCt039734; Fri, 15 Sep 2023 17:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHbwuN039732; Fri, 15 Sep 2023 17:37:58 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:37:58 GMT Message-Id: <202309151737.38FHbwuN039732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 073055503957 - stable/14 - sctp: cleanup SCTP AUTH related notification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 073055503957a78daae0fdbd688a803f56e778a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=073055503957a78daae0fdbd688a803f56e778a6 commit 073055503957a78daae0fdbd688a803f56e778a6 Author: Michael Tuexen AuthorDate: 2023-09-08 11:13:43 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:35:57 +0000 sctp: cleanup SCTP AUTH related notification This makes consistent use of the parameters and ensures that all SCTP AUTH related notifications are using sctp_ulp_notify(). No functional change intended. --- sys/netinet/sctp_auth.c | 32 ++++++++++++++++---------------- sys/netinet/sctp_auth.h | 2 +- sys/netinet/sctputil.c | 15 ++++++--------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 67f0d26fa0d5..3c1962233347 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -575,7 +575,7 @@ sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t key_id, int so_locked) if ((skey->refcount <= 2) && (skey->deactivated)) { /* notify ULP that key is no longer used */ sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, - key_id, 0, so_locked); + 0, &key_id, so_locked); SCTPDBG(SCTP_DEBUG_AUTH2, "%s: stcb %p key %u no longer used, %d\n", __func__, (void *)stcb, key_id, skey->refcount); @@ -1312,7 +1312,7 @@ sctp_deact_sharedkey(struct sctp_tcb *stcb, uint16_t keyid) /* are there other refcount holders on the key? */ if (skey->refcount == 1) { /* no other users, send a notification for this key */ - sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, keyid, 0, + sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, 0, &keyid, SCTP_SO_LOCKED); } @@ -1654,15 +1654,10 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, return (-1); } /* generate a notification if this is a new key id */ - if (stcb->asoc.authinfo.recv_keyid != shared_key_id) - /* - * sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, - * shared_key_id, (void - * *)stcb->asoc.authinfo.recv_keyid); - */ - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, - shared_key_id, stcb->asoc.authinfo.recv_keyid, - SCTP_SO_NOT_LOCKED); + if (stcb->asoc.authinfo.recv_keyid != shared_key_id) { + sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, 0, + &shared_key_id, SCTP_SO_NOT_LOCKED); + } /* compute a new recv assoc key and cache it */ if (stcb->asoc.authinfo.recv_key != NULL) sctp_free_key(stcb->asoc.authinfo.recv_key); @@ -1705,7 +1700,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, */ void sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, - uint16_t keyid, uint16_t alt_keyid, int so_locked) + uint16_t keyid, int so_locked) { struct mbuf *m_notify; struct sctp_authkey_event *auth; @@ -1714,8 +1709,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, if ((stcb == NULL) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) - ) { + (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { /* If the socket is gone we are out of here */ return; } @@ -1737,7 +1731,12 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, auth->auth_flags = 0; auth->auth_length = sizeof(*auth); auth->auth_keynumber = keyid; - auth->auth_altkeynumber = alt_keyid; + /* XXXMT: The following is BSD specific. */ + if (indication == SCTP_AUTH_NEW_KEY) { + auth->auth_altkeynumber = stcb->asoc.authinfo.recv_keyid; + } else { + auth->auth_altkeynumber = 0; + } auth->auth_indication = indication; auth->auth_assoc_id = sctp_get_associd(stcb); @@ -1757,7 +1756,8 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } /*- diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h index 8bfdbaa6d4f6..279ecb6831cd 100644 --- a/sys/netinet/sctp_auth.h +++ b/sys/netinet/sctp_auth.h @@ -212,7 +212,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *ch, struct mbuf *m, uint32_t offset); extern void sctp_notify_authentication(struct sctp_tcb *stcb, - uint32_t indication, uint16_t keyid, uint16_t alt_keyid, int so_locked); + uint32_t indication, uint16_t keyid, int so_locked); extern int sctp_validate_init_auth_params(struct mbuf *m, int offset, int limit); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 381f67f40b99..ea960a3e6376 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4197,19 +4197,16 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_shutdown_event(stcb); break; case SCTP_NOTIFY_AUTH_NEW_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_AUTH_FREE_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_NO_PEER_AUTH: - sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, + 0, so_locked); break; case SCTP_NOTIFY_SENDER_DRY: sctp_notify_sender_dry_event(stcb, so_locked); From nobody Fri Sep 15 17:40:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnM0r2Cfmz4tQly; Fri, 15 Sep 2023 17:40: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 4RnM0r23n0z3J01; Fri, 15 Sep 2023 17:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQ6yAP2WHQaEmEUN7NXV7z8B6eCWQFL1lnPSo7i6V1k=; b=hHsAHitJSAA9TpKcZ/z5Iysr88ia7xlUvwYaucPBScYJtLigzKaHYL4uh4FWHACSxPp/Ft toWTGZqKfUjfashizz1O+9/Xi5DhKons97ZySm6Qxq6V1TGtrDkrckDpWEAwID/3CYbRFZ dae5UqonoYls3Rb71khBGX8zKTMWni07WZH+ePeNuAnDm0dg0HhK8XqpNFLR+l/8SaWbHN b9W6/i6GNoYTpYqYbVYB9seA7DBj6hdlhbbM5ez3HMBak0TlbU213p0nARWwOSZylFshP1 lUWzGXcbunrZets5olL2MpUXQb6sFkpy8Isd/2YzTaSLIrjG09U1OI5l65B0qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799644; a=rsa-sha256; cv=none; b=kulYfT09j7/byBnxANnZfczV7pou8ephyxHuDY5LajyXPMcz5EQqgG1cFzilo+GcjeGiew i8nIHP8l5QxvxUb6NKvX/cOPnwDToUrI90t6vY8M6wP1B5Gdi64WECoLIN12JsgYQNytuM Bpf4WHETq2LgUkD97z5BAgBr3gZuUi6xLhqeWQ5iwsL0cDo4OcHWHozT/Gx66I2qyweDPC uyUPARu/norKVe9WhMyweXBKHFPLWZwEBuwyGTcfFepwEj79Uk9eGwcP9V12B4qF0zyuMA 8c58FvA+faHayVD4g61EjJkCdEjFVtU29iOZStlyY+XkUuM9DlfYHFf+6fx10A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQ6yAP2WHQaEmEUN7NXV7z8B6eCWQFL1lnPSo7i6V1k=; b=EIJx2jdzhXDD8jrGWVuNCClQ4K1yDoJMi7znHQf6DCKTm7H7zS+h8IdEneq/lt0RRmyGpf mKSaUKvixvTLYvhK+I4q+uMpnCBGSMS9dfo7Vtz/v1Fw4qMsc2Y/fluEQxyvi1ICoMRFTp y1zcgq0mnjw3pYgUarcKvkBK2duKgV32tRSmwNm0PwFgDNG7N40DAd5AkyxHrSXKbpHKNR jZE8n92Tb+kqQ0mwVwftqeYNXnSRWr3GY38abB8oj0/NJc8TAyImb9a+ls8V0zpWj1WDkU bqS3eRpjZr50X5IAJMYc9zxlD/uXAmztE7g1po8FVn7LHiZsZiHBJj6Ah5D3lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnM0r15SLzYTx; Fri, 15 Sep 2023 17:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHeidR048734; Fri, 15 Sep 2023 17:40:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHeiTO048731; Fri, 15 Sep 2023 17:40:44 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:40:44 GMT Message-Id: <202309151740.38FHeiTO048731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8d7d28e8c807 - stable/14 - sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 commit 8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 Author: Michael Tuexen AuthorDate: 2023-09-08 12:19:56 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:38:29 +0000 sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() While there, improve consistency of the notification related code. No functional change intended. --- sys/netinet/sctp_constants.h | 14 +++-- sys/netinet/sctp_input.c | 26 ++++----- sys/netinet/sctputil.c | 135 ++++++++++++++++++++++--------------------- sys/netinet/sctputil.h | 6 -- 4 files changed, 86 insertions(+), 95 deletions(-) diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index 881db9dd87cc..2054849fd5e9 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -706,12 +706,14 @@ #define SCTP_NOTIFY_STR_RESET_FAILED_IN 20 #define SCTP_NOTIFY_STR_RESET_DENIED_OUT 21 #define SCTP_NOTIFY_STR_RESET_DENIED_IN 22 -#define SCTP_NOTIFY_AUTH_NEW_KEY 23 -#define SCTP_NOTIFY_AUTH_FREE_KEY 24 -#define SCTP_NOTIFY_NO_PEER_AUTH 25 -#define SCTP_NOTIFY_SENDER_DRY 26 -#define SCTP_NOTIFY_REMOTE_ERROR 27 -#define SCTP_NOTIFY_ASSOC_TIMEDOUT 28 +#define SCTP_NOTIFY_STR_RESET_ADD 23 +#define SCTP_NOTIFY_STR_RESET_TSN 24 +#define SCTP_NOTIFY_AUTH_NEW_KEY 25 +#define SCTP_NOTIFY_AUTH_FREE_KEY 26 +#define SCTP_NOTIFY_NO_PEER_AUTH 27 +#define SCTP_NOTIFY_SENDER_DRY 28 +#define SCTP_NOTIFY_REMOTE_ERROR 29 +#define SCTP_NOTIFY_ASSOC_TIMEDOUT 30 /* This is the value for messages that are NOT completely * copied down where we will start to split the message. diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index e6dc41e08909..6937f8a2a43f 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -3510,23 +3510,19 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, asoc->strmout[i].state = SCTP_STREAM_OPEN; } asoc->streamoutcnt += num_stream; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_ADD_IN_STREAMS) { if (asoc->stream_reset_outstanding) asoc->stream_reset_outstanding--; if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else if (action != SCTP_STREAM_RESET_RESULT_PERFORMED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_TSN_REQUEST) { /** @@ -3572,13 +3568,11 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } /* get rid of the request and get the request flags */ @@ -3707,7 +3701,7 @@ sctp_handle_str_reset_request_tsn(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_tsn(stcb, asoc->sending_seq, (asoc->mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result_tsn(chk, seq, asoc->last_reset_action[0], asoc->last_sending_seq[0], asoc->last_base_tsnsent[0]); @@ -3872,7 +3866,7 @@ sctp_handle_str_reset_add_strm(struct sctp_tcb *stcb, struct sctp_tmit_chunk *ch /* update the size */ stcb->asoc.streamincnt = num_stream; stcb->asoc.last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result(chk, seq, asoc->last_reset_action[0]); asoc->str_reset_seq_in++; diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index ea960a3e6376..17a5a098dd90 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3140,9 +3140,10 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, struct mbuf *m_notify; struct sctp_assoc_change *sac; struct sctp_queued_to_read *control; + struct sctp_inpcb *inp; unsigned int notif_len; - uint16_t abort_len; unsigned int i; + uint16_t abort_len; KASSERT(abort == NULL || from_peer, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); @@ -3151,7 +3152,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, if (stcb == NULL) { return; } - if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { + inp = stcb->sctp_ep; + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { abort_len = ntohs(abort->ch.chunk_length); @@ -3229,10 +3231,9 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, - so_locked); + sctp_add_to_readq(inp, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3242,8 +3243,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, * comes in. */ set_error: - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { SOCK_LOCK(stcb->sctp_socket); if (from_peer) { @@ -3266,8 +3267,8 @@ set_error: SOCK_UNLOCK(stcb->sctp_socket); } /* Wake ANY sleepers */ - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { socantrcvmore(stcb->sctp_socket); } @@ -3356,11 +3357,9 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3487,11 +3486,9 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3585,13 +3582,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_adaptation_layer(struct sctp_tcb *stcb) +sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_adaptation_event *sai; @@ -3632,9 +3629,9 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3702,7 +3699,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, } static void -sctp_notify_shutdown_event(struct sctp_tcb *stcb) +sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_shutdown_event *sse; @@ -3749,14 +3746,13 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_sender_dry_event(struct sctp_tcb *stcb, - int so_locked) +sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_sender_dry_event *event; @@ -3798,11 +3794,12 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t numberout, int flag) +static void +sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3837,8 +3834,8 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t stradd->strchange_flags = flag; stradd->strchange_length = sizeof(struct sctp_stream_change_event); stradd->strchange_assoc_id = sctp_get_associd(stcb); - stradd->strchange_instrms = numberin; - stradd->strchange_outstrms = numberout; + stradd->strchange_instrms = stcb->asoc.streamincnt; + stradd->strchange_outstrms = stcb->asoc.streamoutcnt; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3859,13 +3856,13 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag) +static void +sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3894,8 +3891,8 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 strasoc->assocreset_flags = flag; strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event); strasoc->assocreset_assoc_id = sctp_get_associd(stcb); - strasoc->assocreset_local_tsn = sending_tsn; - strasoc->assocreset_remote_tsn = recv_tsn; + strasoc->assocreset_local_tsn = stcb->asoc.sending_seq; + strasoc->assocreset_remote_tsn = stcb->asoc.mapping_array_base_tsn + 1; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3916,14 +3913,14 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void sctp_notify_stream_reset(struct sctp_tcb *stcb, - int number_entries, uint16_t *list, int flag) + int number_entries, uint16_t *list, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3980,13 +3977,14 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); } static void -sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_error_chunk *chunk) +sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, + struct sctp_error_chunk *chunk, int so_locked) { struct mbuf *m_notify; struct sctp_remote_error *sre; @@ -4041,10 +4039,9 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_erro control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4086,11 +4083,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, stcb->asoc.assoc_up_sent = 1; } if (stcb->asoc.adaptation_needed && (stcb->asoc.adaptation_sent == 0)) { - sctp_notify_adaptation_layer(stcb); + sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4155,31 +4151,36 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN, so_locked); break; case SCTP_NOTIFY_STR_RESET_RECV: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING, so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED), so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED), so_locked); + break; + case SCTP_NOTIFY_STR_RESET_ADD: + sctp_notify_stream_reset_add(stcb, error, so_locked); + break; + case SCTP_NOTIFY_STR_RESET_TSN: + sctp_notify_stream_reset_tsn(stcb, error, so_locked); break; case SCTP_NOTIFY_ASCONF_ADD_IP: sctp_notify_peer_addr_change(stcb, SCTP_ADDR_ADDED, data, @@ -4194,7 +4195,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, error, so_locked); break; case SCTP_NOTIFY_PEER_SHUTDOWN: - sctp_notify_shutdown_event(stcb); + sctp_notify_shutdown_event(stcb, so_locked); break; case SCTP_NOTIFY_AUTH_NEW_KEY: sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, @@ -4212,7 +4213,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_sender_dry_event(stcb, so_locked); break; case SCTP_NOTIFY_REMOTE_ERROR: - sctp_notify_remote_error(stcb, error, data); + sctp_notify_remote_error(stcb, error, data, so_locked); break; default: SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index c649611d5004..8de98b4608f8 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -80,12 +80,6 @@ int sctp_init_asoc(struct sctp_inpcb *, struct sctp_tcb *, uint32_t, uint32_t, u void sctp_fill_random_store(struct sctp_pcb *); -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, - uint16_t numberout, int flag); -void - sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag); - /* * NOTE: sctp_timer_start() will increment the reference count of any relevant * structure the timer is referencing, in order to prevent a race condition From nobody Fri Sep 15 17:43:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnM3V1ZB5z4tRJM; Fri, 15 Sep 2023 17:43: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 4RnM3V1CDXz3JjQ; Fri, 15 Sep 2023 17:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2FPs4mTtzLQw8aNkVzab5WN3L7gJffFE9YZzlbXBcdY=; b=mL7cozydiLUCutqgKJUL66M1plBTy7RjwW2tSEFtSgu74VGU4hjHs6AEa1/nI1JgbK1XAR ojwldTLkbwdENYxwlvn8ia7+y9Yy3etu/BWdCuE6W0g6V0/fG9YxpAurlxxKcn8uCPaHNW /H/RI3X+sSSiG1t/CEDUBiEepbUHJQAp0JqSHjLN3Qo8POc6zeMnf8g9h9YS2t+tCLKgph xGMvOaFQCRbiTk0MvkkZZ7ZH4T8ulnqVx1z+8ChonQTzkpyH6N9uhQUeFgyv9c6wHlc0uS xs2qj7tEHaU9Z2kuFkp7E5G2s4Jzyzc/C9Lvj92sGQq51cOeRHEwHQUf5oJ5cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799782; a=rsa-sha256; cv=none; b=mNE8pZjmzR0AdkY9Io3sHtrk8+DUQBM/fKkn1kLuVHmfmXB1XOVcu2XIDgH1u4KvT5wt9y W5qnz9NXaJW9XSqrm7eHYhLBSkQvpus/+TSKXSZmFQ7eRDE3hdDxH9eZRoOAzPQ222jXmx 6dDmNEAqeXCGWt41hCHkVehLsIrbrvV8JV8BUCVUkxa3RWYleDIBGJP+lH8xxUNWkL6Ixb EhcZPKUKYIgYiu9mJBjoCkuGBXuGaJykjFNlvAetnV1p6XATzuL9onG6UniMFkUUF/Pywn fcPdDtg+1pQNSqP/9k5pVuklZjq9ePFVCkwdHjw0DHTdawZAp37riwgvXFQv4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2FPs4mTtzLQw8aNkVzab5WN3L7gJffFE9YZzlbXBcdY=; b=gKrBRnxrdIeXBTkVLzUtN7k0xQOJiAslZL5zNnHhI3F1MUSfd4lMV0Mt3RIr9iXfz9HSrM hjkAPMQ3dCloMqc6sg2VGR5n/KMPooeZ5K8UcTXgN5j7KTLE8ihuBJOCLC6RDntddUM1jy 8t7KF5NfUXelW4lLBDk1ebeqBQs1PfY/WVUo+7K8pvR9C+fnzzqzRkWAm6LWnhwmazEP/s E+OufF4U7Zks/91Iu804kQdv2najXprDnfb66bVa3oSMs/J4POc4l2Jrud/3VGnrtEno/u 40BEGa2p+JrHJsFv8uvENgohMJFMLFGuNbytTkjIlOIvFImxBhhdqDzUYxLtng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnM3V0G5DzYq5; Fri, 15 Sep 2023 17:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHh1Gs056065; Fri, 15 Sep 2023 17:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHh1ms056062; Fri, 15 Sep 2023 17:43:01 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:43:01 GMT Message-Id: <202309151743.38FHh1ms056062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2139107d2d44 - stable/14 - sctp: cleanup locking for notifications List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2139107d2d44aed3be7f3a7401003f2879b71789 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2139107d2d44aed3be7f3a7401003f2879b71789 commit 2139107d2d44aed3be7f3a7401003f2879b71789 Author: Michael Tuexen AuthorDate: 2023-09-08 14:20:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:41:16 +0000 sctp: cleanup locking for notifications All notifications are now queued via sctp_ulp_notify(). Do the locking of the inp read lock there and validate this in all functions being used. This is one step in avoiding race conditions when closing the read end of an SCTP socket. --- sys/netinet/sctp_auth.c | 12 ++--- sys/netinet/sctputil.c | 132 ++++++++++++++++++++++++++++++------------------ 2 files changed, 87 insertions(+), 57 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 3c1962233347..8bcb6d5243db 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -1706,13 +1706,9 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, struct sctp_authkey_event *auth; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_AUTHEVNT)) /* event not enabled */ @@ -1757,7 +1753,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } /*- diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 17a5a098dd90..11469236014e 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3149,10 +3149,11 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); KASSERT(!from_peer || !timedout, ("sctp_notify_assoc_change: timeouts can only be local")); - if (stcb == NULL) { - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); inp = stcb->sctp_ep; + SCTP_INP_READ_LOCK_ASSERT(inp); + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { @@ -3233,7 +3234,7 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(inp, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3284,11 +3285,15 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, struct sctp_paddr_change *spc; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { /* event not enabled */ return; } + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_paddr_change), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) return; @@ -3359,7 +3364,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3373,9 +3378,12 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, struct sctp_chunkhdr *chkhdr; int notifhdr_len, chk_len, chkhdr_len, padding_len, payload_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } @@ -3488,7 +3496,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3501,12 +3509,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; int notifhdr_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } + if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { notifhdr_len = sizeof(struct sctp_send_failed_event); } else { @@ -3584,7 +3596,7 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3594,8 +3606,11 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) struct sctp_adaptation_event *sai; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { /* event not enabled */ return; } @@ -3631,7 +3646,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3644,15 +3659,16 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; struct sockbuf *sb; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { + KASSERT(aborted_control != NULL, ("aborted_control is NULL")); + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { /* event not enabled */ return; } - KASSERT(aborted_control != NULL, ("aborted_control is NULL")); - SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); - m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */ @@ -3705,6 +3721,10 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) struct sctp_shutdown_event *sse; struct sctp_queued_to_read *control; + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + /* * For TCP model AND UDP connected sockets we will send an error up * when an SHUTDOWN completes @@ -3714,6 +3734,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) /* mark socket closed for read/write and wakeup! */ socantsendmore(stcb->sctp_socket); } + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT)) { /* event not enabled */ return; @@ -3748,7 +3769,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3758,8 +3779,11 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) struct sctp_sender_dry_event *event; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { /* event not enabled */ return; } @@ -3795,7 +3819,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3805,13 +3829,10 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_stream_change_event *stradd; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT)) { /* event not enabled */ return; @@ -3858,7 +3879,7 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3868,13 +3889,10 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_assoc_reset_event *strasoc; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT)) { /* event not enabled */ return; @@ -3915,7 +3933,7 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3927,8 +3945,11 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, struct sctp_stream_reset_event *strreset; int len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT)) { /* event not enabled */ return; } @@ -3979,7 +4000,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3992,10 +4013,14 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, unsigned int notif_len; uint16_t chunk_len; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { return; } + if (chunk != NULL) { chunk_len = ntohs(chunk->ch.chunk_length); /* @@ -4041,7 +4066,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4070,9 +4095,15 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_LOCK(inp); + } + SCTP_INP_READ_LOCK_ASSERT(inp); + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + SCTP_INP_READ_UNLOCK(inp); return; } @@ -4220,6 +4251,9 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, __func__, notification, notification); break; } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_UNLOCK(inp); + } } void From nobody Fri Sep 15 17:45:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnM654Ggjz4tRnL; Fri, 15 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnM653nJJz3K4y; Fri, 15 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=g8KCOG+Lksl2/MN3MGq+tqq/VUOPj2DzL72odHRhA9DI8OveuZrCYeNNgGP4Y6wDx+VMCi Kvwmy5Cv2T7n/i8u67eJZauynHRs9NHTgIMFK62BgJF+VxHjgALKu+Luu48KWWRs5RMa85 nWh4s8z8HWjP0o/PR9kNG6a7QKJcXwcmaSkXpAzJlKi4vtNKlFS7Ic3qX/8CmVvG0xsJmf JtSbc9WqFZIW7FOZKId0BysPCtjOulB+QxG7i0hmB2dK1VrO3FWPk3fXk0+AlHDJPC2+1S PFR+PuFhVmIYDqNag/jFXPtw1oezTjukrLHF//9j0tPSboB+Yy+Oa3z07O4TZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799917; a=rsa-sha256; cv=none; b=kqY9SnJlgnM5fAUduGyUCk1TL+XUOa3TB78yef2f5woXsQkIpZptK2d180Bz4Po5PqzRtd N5wRw5Y5euazaL0AmjmYkG1G/7Qq0Rl5LipFlMXQfKT+3o49FnW+WVXqXff/9lCW9xVqw7 /nQV32kIW6Uu8o+K5IfJ1arddH/ATD7K2dyY4NIGsYuCnlzz/0Jo9wtehrUi6BEnhb92Xj tAumM6askU1isTQf36KgjjkoOKbdmZDKtIIj5NVASGOA/PAU/DMimKFpCggbN7Syz7T+IH eDFj5i/8vLj3YXt+YTObOtGrUKtjKqJBVpTuWd49Q8AhXAhrhUUw5gw6JfZybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=lcHPe8qBhm7xHJKHU3LkqEriDWPwZRoe/5Gi8OJWGiNjgsM3lBd5hD8PLsUn5+WeoxcQHo U57NgLbDEH9ZrUXyjGe/OJL+sgHar8Efy06kOHrI0Ot9wT8R3dj4qSYpr1i8HmbBcRRCrW EpXbApwFwpomc5DfR76bqmDw36tdbeA55R36GpEQvSiQU9qbywMvDvjbafiu6xYP2N+jlD 0fxh+lUeAxsrWYUveRFsGinnJV9APGZwi/nU2+Mw0RvIWrKKPqPyPWOXaYcRHmRPhY0qhi p/iOv4pzHDgAUjPBKV1jGGVOXERDMIIGK0BM8OrXZthvHTTyHBgn/okStmRUPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnM652rPvzYhm; Fri, 15 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHjHYE056539; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHjHjZ056536; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:45:17 GMT Message-Id: <202309151745.38FHjHjZ056536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 78e5017cbe52 - stable/14 - sctp: don't call sctp_ulp_notify() recursively List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 commit 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:43:30 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. --- sys/netinet/sctputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 11469236014e..19180b3cf725 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4117,7 +4117,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4182,7 +4182,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: From nobody Fri Sep 15 17:47:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnM8h6qrYz4tSMD; Fri, 15 Sep 2023 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnM8h6NlSz3KFN; Fri, 15 Sep 2023 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIsOdxzV5cTHWV+EhqZ09oR6+FVwC1wZuyIqvTt9YCY=; b=fMZaPT+I2TZpm88gXy9FVcJiUK8Ej1NQF1Sbc2oFEeSLk9mXJoMOVp161SQflQFGIQeKft k3ipeXnF+iwMYLEie1Rv17Lz0o1c++QUsUuvFPgXoss+4LlT4K/R/Nl45h2bqYmvCrtmOU 300MvBz/oRXSpuZ5h5orFYujDV8jnKRdEFocbz9IOK2JoPaUeGq4rht+1OadIcy5geKUPT mUIaw3bgQ3sjw9XEGO7ASA855PpP/yGBA68e85C6lUFufw5HmbkovAK9NGfMKbeg7oS53P Lro6TWUz1leQ/jVKPFDwozh1DWJ3z6jwRteaxY1i0y8Hx/zZjubAO8k3evJyHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694800052; a=rsa-sha256; cv=none; b=jV7tl/SKAas+mJDA7OXXz6SiipTSBU5G9+yFrbPtk/mebINh3ethA0mh4j7q/DIZ99d8bb cF5QEIFg3ptqVUj96Cg0tIJZFsWhJGLdf3I9tmwArusHzgS31W+7JHkgdBkQmIXu7weAKX QlDpCFmzsPqUdG7XCsATxphJ8xFOzzryZdI8yMK3LISZ43na4L1T2NyeQQI1wS2kTJwDou VAp92yN/yzVOkXhywC/3dHkULyNRwta1WaqK2PHdKWFb64eVN2HzklWA8o7ymJVA1oI4Z6 aDc2kvHix5rY/6ls5viCJHTWvWDf/niduGvA7GI8TiSTNqh9C8wWLPE5gr17ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIsOdxzV5cTHWV+EhqZ09oR6+FVwC1wZuyIqvTt9YCY=; b=Z4kQqUST6ME8H45eZxK32+EB/yHcp9LUReWBYcFMD656gWuIqjxIPfOqAsAaZ3R9AWpdZL bD73OPCz7RMdQ2AcIBWQoH8V0gI8mgD0S/HEYJngRzfPS7vFIydJGVGJS9cHnbueRdaUNz CblCWizcu2uXv2PGHIhbjiH3CUwzN/5EShv0Fu/CYLswIAJbAIZmcYtpp3cm6aWhyBKQ8C +HImsGcAmDUZ/plQwd/oASFnE9zWPYbjOnK8d1M319VmCjvnL20X0+wBTfXimTrI8T5dMo mWeMespDLIj6zI03NfXJs7dBQXrUd/opEgxsVx0bDBZq48NKU64AyotPwntAow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnM8h5SRGzZ1B; Fri, 15 Sep 2023 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHlWB8056943; Fri, 15 Sep 2023 17:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHlWdd056940; Fri, 15 Sep 2023 17:47:32 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:47:32 GMT Message-Id: <202309151747.38FHlWdd056940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c4e047ab6eb1 - stable/14 - sctp: improve shutting down the read side of a socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4e047ab6eb15d27f95f46ccf12d55c46d30debd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e047ab6eb15d27f95f46ccf12d55c46d30debd commit c4e047ab6eb15d27f95f46ccf12d55c46d30debd Author: Michael Tuexen AuthorDate: 2023-09-12 23:33:54 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:45:42 +0000 sctp: improve shutting down the read side of a socket When shutdown(..., SHUT_RD) or shutdown(..., SHUT_RDWR) is called, really clean up the read queue and issue an ungraceful shutdown if user messages are affected. Reported by: syzbot+d4e1d30d578891245f59@syzkaller.appspotmail.com --- sys/netinet/sctp_usrreq.c | 90 ++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 52b4faf48574..02bb87578528 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -777,52 +777,76 @@ sctp_disconnect(struct socket *so) int sctp_flush(struct socket *so, int how) { - /* - * We will just clear out the values and let subsequent close clear - * out the data, if any. Note if the user did a shutdown(SHUT_RD) - * they will not be able to read the data, the socket will block - * that from happening. - */ + struct epoch_tracker et; + struct sctp_tcb *stcb; + struct sctp_queued_to_read *control, *ncontrol; struct sctp_inpcb *inp; + struct mbuf *m, *op_err; + bool need_to_abort = false; + /* + * For 1-to-1 style sockets, flush the read queue and trigger an + * ungraceful shutdown of the association, if and only if user + * messages are lost. Loosing notifications does not need to be + * signalled to the peer. + */ + if (how == PRU_FLUSH_WR) { + /* This function is only relevant for the read directions. */ + return (0); + } inp = (struct sctp_inpcb *)so->so_pcb; if (inp == NULL) { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); return (EINVAL); } - SCTP_INP_RLOCK(inp); - /* For the 1 to many model this does nothing */ + SCTP_INP_WLOCK(inp); if (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) { - SCTP_INP_RUNLOCK(inp); + /* For 1-to-many style sockets this function does nothing. */ + SCTP_INP_WUNLOCK(inp); return (0); } - SCTP_INP_RUNLOCK(inp); - if ((how == PRU_FLUSH_RD) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SCTP_INP_WLOCK(inp); - SCTP_INP_READ_LOCK(inp); - inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; - SCTP_INP_READ_UNLOCK(inp); + stcb = LIST_FIRST(&inp->sctp_asoc_list); + if (stcb == NULL) { SCTP_INP_WUNLOCK(inp); - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SCTP_SB_CLEAR(so->so_rcv); - SOCK_UNLOCK(so); + return (ENOTCONN); } - if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SOCK_UNLOCK(so); + SCTP_TCB_LOCK(stcb); + SCTP_INP_READ_LOCK(inp); + inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; + SOCK_LOCK(so); + TAILQ_FOREACH_SAFE(control, &inp->read_queue, next, ncontrol) { + if ((control->spec_flags & M_NOTIFICATION) == 0) { + need_to_abort = true; + } + TAILQ_REMOVE(&inp->read_queue, control, next); + control->on_read_q = 0; + for (m = control->data; m; m = SCTP_BUF_NEXT(m)) { + sctp_sbfree(control, control->stcb, &so->so_rcv, m); + } + if (control->on_strm_q == 0) { + sctp_free_remote_addr(control->whoFrom); + if (control->data) { + sctp_m_freem(control->data); + control->data = NULL; + } + sctp_free_a_readq(stcb, control); + } else { + stcb->asoc.size_on_all_streams += control->length; + } } + SOCK_UNLOCK(so); + SCTP_INP_READ_UNLOCK(inp); + if (need_to_abort) { + inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; + SCTP_INP_WUNLOCK(inp); + op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); + NET_EPOCH_ENTER(et); + sctp_abort_an_association(inp, stcb, op_err, false, SCTP_SO_LOCKED); + NET_EPOCH_EXIT(et); + return (ECONNABORTED); + } + SCTP_TCB_UNLOCK(stcb); + SCTP_INP_WUNLOCK(inp); return (0); } From nobody Fri Sep 15 17:49:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnMCN58Kqz4tSYg; Fri, 15 Sep 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnMCN4dQbz3Kq4; Fri, 15 Sep 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+X9Rs2JF0+T7t4FgIhxc/n2BxXqDHgHbyqxheIvgRoA=; b=tsAfmOjz9Tt+k+iTdOpKL+GpCcgsNcPiKLEHtby+VxHoGa2puimlwJzgmjPhqItzPZbsYz BXQk+Y1QpxL/GmB9ss5ujSgD5Z2AEyY1EC5PdwvxP6MK0pee4HSZL7LppPSEefJ5Ox0r9+ 9+7hJSLxESoGHOS7DAC3IqR0HifBkrS5BdoNQjo6aFRcBjXLfR/TgBiafyCOnBJEQlo+aC n+IXIWqnpJpXoU8bSFg2jNXijIM1LRyjSTItB2XneiuaM5OlPcJy4j3TUNCwYa4HiW3H/7 Gf6Ivvfovx4sf36XvsV74+mupGEbIyXSYS3JmG/h28P7D+VOjdrwAIVpXivd7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694800192; a=rsa-sha256; cv=none; b=MsiWtpHxYfN55YooQd3qNWQGvlDXebBNyCU78RciqEXFElIrYbDOf1H0+rfDSJOzHkvPd7 KAxXyIvAW+BXyi7Nx29T+ia9jDq4wsbq3HNx5Pq12aTtfTF7FOI3RZz9t6Q1LJZBzub/oX HfSQBffoEUkI6iv9uccK8jI3BiYANo+BARCaO9pvHbDYaZ5v10344yoSnNPI4WYobAZqc5 jcxHHabIyqX8uMAr7pSFDPglrShcyxChz/rwiMI1s/skhzOQylpoxlaQ9OuUZv5YSXXsey 9dgVn0Wc8ImFSVCkp0guu2Vqxvj8BsnvV58DwEUDSwJV6u0mlfnehYuJLAIa0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+X9Rs2JF0+T7t4FgIhxc/n2BxXqDHgHbyqxheIvgRoA=; b=CvS4IM95tZ+ss7n1FvHAWJN7V94qyQbw0ORuUuZ3aqfnJMUxdzXHMCt6bwmaBqCDACgCip aqipIrMAo5u/ROH9F1kR9S1oI5HQKu7h9YRXgxpJZA/odebFhjsXrfgJFf1/T7ZDm11uus A4uYaffYyWRRaYg2N0lpROysiXz2m97RFXbovq4nYy7HBK1Tp+wprzy8yWyViLQ8tZYP/m 8DQ6Atft+++EdkJMbUAk3Hia8HjrozQ20uDJDJTWjSPExXHKfZ7tMgMrfTq9xbaQLGu+nw cu2xdhoL+YOnAgqJMapRHRJQMx0hdgNRReFF0ls/2OqPr//Au8GuVmOorknLXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnMCN3gs7zYXT; Fri, 15 Sep 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FHnqov057418; Fri, 15 Sep 2023 17:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHnqsZ057415; Fri, 15 Sep 2023 17:49:52 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:49:52 GMT Message-Id: <202309151749.38FHnqsZ057415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7b21cccf9c69 - stable/14 - sctp: further improve shutting down the read side of a socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 commit 7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 Author: Michael Tuexen AuthorDate: 2023-09-13 11:02:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:48:02 +0000 sctp: further improve shutting down the read side of a socket Deal with the case that the association is already gone. Reported by: syzbot+e256d42e9b390564530a@syzkaller.appspotmail.com --- sys/netinet/sctp_usrreq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 02bb87578528..29d63f989e79 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -806,11 +806,9 @@ sctp_flush(struct socket *so, int how) return (0); } stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb == NULL) { - SCTP_INP_WUNLOCK(inp); - return (ENOTCONN); + if (stcb != NULL) { + SCTP_TCB_LOCK(stcb); } - SCTP_TCB_LOCK(stcb); SCTP_INP_READ_LOCK(inp); inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; SOCK_LOCK(so); @@ -836,7 +834,7 @@ sctp_flush(struct socket *so, int how) } SOCK_UNLOCK(so); SCTP_INP_READ_UNLOCK(inp); - if (need_to_abort) { + if (need_to_abort && (stcb != NULL)) { inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; SCTP_INP_WUNLOCK(inp); op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); @@ -845,7 +843,9 @@ sctp_flush(struct socket *so, int how) NET_EPOCH_EXIT(et); return (ECONNABORTED); } - SCTP_TCB_UNLOCK(stcb); + if (stcb != NULL) { + SCTP_TCB_UNLOCK(stcb); + } SCTP_INP_WUNLOCK(inp); return (0); } From nobody Fri Sep 15 19:40:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnPgb48Zcz4sj97; Fri, 15 Sep 2023 19:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnPgb3jVJz3clk; Fri, 15 Sep 2023 19:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694806859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcxyQ687zSf9/WFyWsZKpCBK1EvATAI7AHK8E+2usqs=; b=oHKfMnw9oyyF3CqYm/L8N5H2ANa/bIVkZHsoa1djxMCwsx8FO4TTdkJjPmBrfEmFnGBwru 643htK1c5PM9MGPRnc8/lKVLH58ne2U/vH7sK1O+eZEVa8WPYnLIoN5VoHP6yBtCFm/6/e 8+Tbfk1vVnNAlNrFCIXpE2D22upJx6D73f1myMihrGpoAW6iY732HA7plAG6kJCwyzr5zM TXaoTlXyxAIlwd9z0Q4/SfH6IchJT/SqBohNBgaLWMmNUywzzMoykStIicaaiq4iVfKybm LQS3Uyyb6piGlFvSPTJP7zMEp3ddxDH9rZzv800X88SuRL/dKKXc9RpWCwePrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694806859; a=rsa-sha256; cv=none; b=FmESgEgOmwFf+Yfz6Re6UiqxRRKJrKVd1r3whXROBV3hpsOh0QNmEOAPb3cRX9nCkqksyZ UqVMitGEYo7RStudx72vOGHFcqbd7jf/Joz5VEZu/jCpSRfIY12IRzViueJdg5rRHr1osG PA4kWdTw0gsOyUXSJPeEGhQ3M8NzZ/wxRlGqv/OWUsqogSCgpeDGp5azcvKpzIFD99SpS+ supgUyD06hd8aaToldcamn9iAXIb9SKhMBWwbeWsiBJlH/LAUkANCo0O6GSO2AmrvAiM/s zOFFWtY5QI3YpCbJU/ZmYZk09ZdoQlqnf3TdL9eUTfS0a0nodTf2bdU1pxqYBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694806859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcxyQ687zSf9/WFyWsZKpCBK1EvATAI7AHK8E+2usqs=; b=km7JmI9ah7K7z/7zvSYBFvz9cX6LXVeNUTg3O5eUX6Ku0/JFy7wi5YvoGf9WtiAZKTQcTG VsXrmSY7TVG2IoYYjCDS01Hh/+BBEEuQp4WLNEN0VhetAcfJIEnzGxby4dhf3jHx3WNUPT +85640UY68NTf5sIJcJ1ty4HCVh6Y0LmhZiYvTYC/w17ofxdog6f4tlx9yMF9Rwkjx3Zsr KH90gRlBDoUhhLAqpvDkT9AUok+xb0XDFtJEWarwG/RcyTtNRofy1qEjWCFvqZSm4Ri3gt CbP02gyhEm3J1Ni5TeDSdibjvrURwz1UO6Z6TfJ3yT0e0JKv7Wrah1A5DUXKOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnPgb2mhkzcYk; Fri, 15 Sep 2023 19:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FJexJN048498; Fri, 15 Sep 2023 19:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FJexCc048494; Fri, 15 Sep 2023 19:40:59 GMT (envelope-from git) Date: Fri, 15 Sep 2023 19:40:59 GMT Message-Id: <202309151940.38FJexCc048494@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: 72d97e1dd9cc - main - rtld: output rtld errors into the dbg channel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72d97e1dd9cc72a2acb96e35e56db6f3f51bca7d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72d97e1dd9cc72a2acb96e35e56db6f3f51bca7d commit 72d97e1dd9cc72a2acb96e35e56db6f3f51bca7d Author: Konstantin Belousov AuthorDate: 2023-09-15 19:26:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-15 19:40:41 +0000 rtld: output rtld errors into the dbg channel Sponsored by: The FreeBSD Foundation MFC after: 1 week --- libexec/rtld-elf/rtld.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index aa7e6020a085..f8c4c18b5d5e 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1073,6 +1073,7 @@ _rtld_error(const char *fmt, ...) fmt, ap); va_end(ap); *lockinfo.dlerror_seen() = 0; + dbg("rtld_error: %s", lockinfo.dlerror_loc()); LD_UTRACE(UTRACE_RTLD_ERROR, NULL, NULL, 0, 0, lockinfo.dlerror_loc()); } From nobody Fri Sep 15 21:36:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnSFH6cz7z4tDnT; Fri, 15 Sep 2023 21:36: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 4RnSFH67Rhz4TKK; Fri, 15 Sep 2023 21:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694813811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgUJ4C5OVB7RcvH16yC77Hxh6fndiej8PFG0XTcLrok=; b=XP0QuaVZIMWdeJ8rX3ub/rgU2JYGCvyjdM0Y2Kp07P3ex0QcpknY6FH2YeFswozXjjism1 0yXqYD/gKCsmcpszKTuhG4ElyckP8lrCVoRHD6sXdnyvI/XMCTIsUYXaI7C89T6nZF4TXB 3g5IkWOqTkmXkJPDb8sx4abBobMxxzpioQyOPYwsENCPotW/GKCz9ndNLARzlBoDi9WJt6 u5K1fnetIFF8ZW52aypvWjuXtoVjC+gxjkNrW5dw7QF4ky55h9iq6khK+rGRTJeD555IWC 2CaxvdVeE0bAV3QnhbM2VHufWygpONFNLZW9tF1o6IvK+pTmiBlf8ttHkJbjBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694813811; a=rsa-sha256; cv=none; b=NTzHuN+FRDjhZRY57qF12zRIU1IjC//XrO3O1JZg4GSf9yk/qXPuRTJUwquqnvQL2KD51j i6B2TLVtXLzK6ya5ocsinVlv+Iach4+uL2bdNwHkt1/olOlusUOewO6TNOs/ofSPzjS4W6 mn7k93g0XKRxoOGqgjx039jWoLQXFZq+8mlwwakpTTaH/yaprJ+1/3QLvBPMMdGMl930Ws NLPdpDsTWkQ6rihr7lwNgnWd/uXz8KudrFdV7eko7z0wSZ1wpjmUZPdQD1wtZphdGo/fl4 hRff6ScA5eMmiRS7pzWbewD2/GPmcJtpDau1dpIquZQ7wL7hhx7NYVzsFaS3NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694813811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgUJ4C5OVB7RcvH16yC77Hxh6fndiej8PFG0XTcLrok=; b=Wo2Rv8rhw5lC4wqMv8HsAfPiYmoTVB4CL2EC55gUjxbHEW13IPW2XPpo3Q80/a5G3yK8Ce 0LwyqfeO+UhqFHDgqnP10Bp/W0BLLDzEI42yI4jy5gQ+vknETqNxuKe8Tv2S6cMwli1GB3 556UvG8Nk2tn3ejyoulLclug46vSq8Vq+1WJlu9jcFZvqh7WqQnAz4YlKVYD8vW/MOysWX hTouVcx+obcNsfd7HioLxeU9aI6CBoldTmcO0PNrrr3lRKfQwEIq7a76Of/VytM5eTM4je iWzVvVSE1m4Uw4VoGNeMiGLHyegsN3a42VqCNbIhvvvCMyJ2Xr/sELmdj2Zl7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnSFH54ggzgLS; Fri, 15 Sep 2023 21:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FLapUi038045; Fri, 15 Sep 2023 21:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FLap9X038042; Fri, 15 Sep 2023 21:36:51 GMT (envelope-from git) Date: Fri, 15 Sep 2023 21:36:51 GMT Message-Id: <202309152136.38FLap9X038042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7e0a7ef95fac - main - tcpdump: Initialize tzcode early. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e0a7ef95fac1183854cab662bd9afa4647422d6 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7e0a7ef95fac1183854cab662bd9afa4647422d6 commit 7e0a7ef95fac1183854cab662bd9afa4647422d6 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-15 21:36:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-15 21:36:41 +0000 tcpdump: Initialize tzcode early. An explicit tzset() call is usually not needed as it happens implicitly the first time we call localtime() or mktime(), but in some cases (sandboxing, chroot) this may be too late. PR: 273807 MFC after: 3 days Reviewed by: jrm Differential Revision: https://reviews.freebsd.org/D41880 --- contrib/tcpdump/tcpdump.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index 52209fedb999..8cfcb04fc093 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -1564,6 +1564,8 @@ main(int argc, char **argv) if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0) error("%s", ebuf); + tzset(); + while ( (op = getopt_long(argc, argv, SHORTOPTS, longopts, NULL)) != -1) switch (op) { From nobody Sat Sep 16 00:40:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnXK35rbPz4t3Mb; Sat, 16 Sep 2023 00:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnXK359w6z3Skt; Sat, 16 Sep 2023 00:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwK1TBUarfv6zUWRx5mhttXRFn7wJltixv8wwWxRDrQ=; b=Hq6yERqAwKKiDfjKSYG1hSg1lK9cRP5zLPi1LM2hbkKWA+VXZVk3YTlw/ieLROzXWzkjS6 iVCVgWjQfIgnUi/5z5kWr3dkfNO8ohyx5LsVNJv0G4pLnvi6ajrZbHso6BUk/HMHm9/1NG +QVC1DEnMHMwADrKJUKDzHSs/BQwzmcFupoho3EfCKynNPem41+xuo7LbTuC1aiUlZcX3I A6/K5fUtVq+I44JF/36nrAVu2tR8sU5KY4OmPATk3W+P60aL9ute95FOQHrsU/5ol2lq4v 1vOdtk+OhgQfRbMijcw3dwcvS3HeDJE0ONpQeM/K08hbCvb87pWy+PIHxHpKig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694824823; a=rsa-sha256; cv=none; b=gVhqBiL4tv34lSPLlkJoktDlXlDUb3WTt8dhqi89SFrkMxTIsf7eT+yMrWvWyFbTgHWks5 4OgkmHBCaB7J8cyiJ0GE1KoFpLlIig0DYhJx+ZJ5H3mJ7f94kDfDcZuz9x9tjEKbP30mtd IwaM9vsd9eN0G/ZRMeNqbxdMMfkl15OH3+X9F766ybfXnAy5WZLIlsAF9/egq2+U6r2wew WCZE7MGeuRrxshqtcCWEsf+5LjXUmEX7r26U/QDkAG408RyzrAaKONTw9XLrKXXuwgXOQi ZAMIUvXBXUVP++lnZ1cWH63soOJlOFVlEQ7ECYI2cE5IXzUpCVPEyazHpmp6FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwK1TBUarfv6zUWRx5mhttXRFn7wJltixv8wwWxRDrQ=; b=LwTqlY0tY4vqfPnjdpXOTJTvpqjVSzPBeOC26Kbiv05z4W6NMTm1BCM82HGTgM9rhe157z LqDyHxQxMBu5O6DGg+i27wZNws31LWb2xNj1EqlfXftEVbKWrxe3Rtwl1lvGMqrAC7UbIB qz/VfKy2GkldUuXqBOZ1ycXq/mzmlcT0mZM3IqlKTb8teH+9WAoA31l7BNRiHgLvhSV8hk PgSQu38YEZAdu1PG1NJKzU24JUfMYW+gshFh2kc72S5XaDJnrMtffOvIWbrd4Emors4ZWw 3vLhb3iVGYgfpwDvAlfaN0mvDLdLokVuGAI2wcY+PscyzAYdIWZTlv3WxPdYEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnXK34F5gzlhJ; Sat, 16 Sep 2023 00:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G0eNd9045516; Sat, 16 Sep 2023 00:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G0eN28045513; Sat, 16 Sep 2023 00:40:23 GMT (envelope-from git) Date: Sat, 16 Sep 2023 00:40:23 GMT Message-Id: <202309160040.38G0eN28045513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c3376a666e46 - stable/14 - shmfd: hide direct rangelock(9) use under a wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3376a666e468393fea2ddb7c5898c1d22443a8c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3376a666e468393fea2ddb7c5898c1d22443a8c commit c3376a666e468393fea2ddb7c5898c1d22443a8c Author: Konstantin Belousov AuthorDate: 2023-08-18 12:38:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-15 19:41:39 +0000 shmfd: hide direct rangelock(9) use under a wrapper (cherry picked from commit 6df6facf44f952f64753bee00831fd93f16c99a9) --- sys/kern/uipc_shm.c | 69 +++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1975f0d60f89..a8e2502808a0 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -182,6 +182,15 @@ SYSCTL_INT(_vm_largepages, OID_AUTO, reclaim_tries, CTLFLAG_RWTUN, &largepage_reclaim_tries, 0, "Number of contig reclaims before giving up for default alloc policy"); +#define shm_rangelock_unlock(shmfd, cookie) \ + rangelock_unlock(&(shmfd)->shm_rl, (cookie), &(shmfd)->shm_mtx) +#define shm_rangelock_rlock(shmfd, start, end) \ + rangelock_rlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_tryrlock(shmfd, start, end) \ + rangelock_tryrlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_wlock(shmfd, start, end) \ + rangelock_wlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) + static int uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio) { @@ -456,10 +465,10 @@ shm_read(struct file *fp, struct uio *uio, struct ucred *active_cred, return (error); #endif foffset_lock_uio(fp, uio, flags); - rl_cookie = rangelock_rlock(&shmfd->shm_rl, uio->uio_offset, - uio->uio_offset + uio->uio_resid, &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, uio->uio_offset, + uio->uio_offset + uio->uio_resid); error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -497,13 +506,10 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, } else { size = uio->uio_offset + uio->uio_resid; } - if ((flags & FOF_OFFSET) == 0) { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); - } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, uio->uio_offset, - size, &shmfd->shm_mtx); - } + if ((flags & FOF_OFFSET) == 0) + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); + else + rl_cookie = shm_rangelock_wlock(shmfd, uio->uio_offset, size); if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { error = EPERM; } else { @@ -516,7 +522,7 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -571,22 +577,20 @@ shm_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, conf->alloc_policy != SHM_LARGEPAGE_ALLOC_HARD) return (EINVAL); - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); shmfd->shm_lp_psind = conf->psind; shmfd->shm_lp_alloc_policy = conf->alloc_policy; shmfd->shm_object->un_pager.phys.data_val = conf->psind; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); case FIOGSHMLPGCNF: if (!shm_largepage(shmfd)) return (ENOTTY); conf = data; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, OFF_MAX); conf->psind = shmfd->shm_lp_psind; conf->alloc_policy = shmfd->shm_lp_alloc_policy; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); default: return (ENOTTY); @@ -917,10 +921,9 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) void *rl_cookie; int error; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); error = shm_dotruncate_cookie(shmfd, length, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1258,8 +1261,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, error = ENOENT; } } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* * kern_shm_open() likely shouldn't ever error out on @@ -1331,8 +1333,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, shmfd->shm_seals |= initial_seals; shm_hold(shmfd); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, - &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); } sx_xunlock(&shm_dict_lock); @@ -1648,8 +1649,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, shmfd = fp->f_data; maxprot = VM_PROT_NONE; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, objsize, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, objsize); /* FREAD should always be set. */ if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_EXECUTE | VM_PROT_READ; @@ -1723,7 +1723,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, vm_object_deallocate(shmfd->shm_object); } out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1941,8 +1941,7 @@ shm_add_seals(struct file *fp, int seals) error = 0; shmfd = fp->f_data; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* Even already-set seals should result in EPERM. */ if ((shmfd->shm_seals & F_SEAL_SEAL) != 0) { @@ -1973,7 +1972,7 @@ shm_add_seals(struct file *fp, int seals) } shmfd->shm_seals |= nseals; out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2067,8 +2066,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, off = *offset; len = *length; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, off, off + len, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, off, off + len); switch (cmd) { case SPACECTL_DEALLOC: if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { @@ -2082,7 +2080,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, default: __assert_unreachable(); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2109,11 +2107,10 @@ shm_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) * the shmfd is not necessarily a concern. If other mechanisms are * added to grow a shmfd, this may need to be re-evaluated. */ - rl_cookie = rangelock_wlock(&shmfd->shm_rl, offset, size, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, offset, size); if (size > shmfd->shm_size) error = shm_dotruncate_cookie(shmfd, size, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); /* Translate to posix_fallocate(2) return value as needed. */ if (error == ENOMEM) error = ENOSPC; From nobody Sat Sep 16 00:41:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnXKv4WF8z4t3dq; Sat, 16 Sep 2023 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnXKv44Gyz3Spt; Sat, 16 Sep 2023 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvEZDdZ8iqO1OAIGKbIAYa4dMkloywHjb+0B1WvZ3g4=; b=GauLFcld/XCTb+Rvdnzasy8g4qfV5owr7a5tFuq43HdrWHWTqVwlLLB8qEQUzkpRHoJ2m1 V6PMvC86rHhqvZHHzgLNe31pjehLCrX+vrSwg4cmrsDbiaKLNVXKgCTq8gJGR7S3Sr++KT /U2PB6viMUmhiRYUWCRFeWY0IqPpv6Xx0eFhqE4MJSC57Qc85p0m+apE34jTHOj1rZG6Vq 5B/t/uuFYM7TMMAkhFuR72Xe4758xWbgA+e44aMTF0Ha9ZBaLDPcpVox1MkiSZrYenqYKw HVNhTzIUAZ04Wze7bo+iYycnnBdboa33nkeQflU0dHu+ywQfaY1Im8+Z1SjHoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694824867; a=rsa-sha256; cv=none; b=h+rJHzb+F7m33ggIm1qgNZHnMqNkobPSOr1zgc4FQGQS0K/fxBgqQ9ldoRi81jFomEp0uM E7JwYwkU8P9L4+Pdqo6HmOR63+4pIM1giKwfNfieyG8SrSJwc4Zm2CyP9fvHey7knOEth8 In94xokRiZhKqcl2gxyjFmyV9HUND5vTDwPysNMXKWiTrWaQ7ZPMGgJGpJkki/Q4pm3XHi VWMmDTp0zUfPUCEcznLleqxUwv1ocAXuF6gepoouN/3QUFL+IEYgPSw4RqTlJ2xfkRONhD Eum51YkmfVMe/CJjvNJKz1ZkBIFhV5jNEAY6xqZb/PboPjUnqyaFMO1LLewXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fvEZDdZ8iqO1OAIGKbIAYa4dMkloywHjb+0B1WvZ3g4=; b=OfuOpvUQ+U2loXFG2nwWteMRuKjbWVQvMDg2gpRZbw/5/5EQ7DZz9xIzHszZoV2lGPHzOe UchQslTCrlggafzSLhq6MWw8QLuV6yu8qfwEt3/NqExj9P4P21ugagixt3hPdAUtjxmCee ypm55yhL7wJ+8CbV04vaLAsUcsf6raJ0mWNN0vBiqZm1WxTF0uvfkMn2rBDkxI4WOnuUJs lwNHfZqTbLTadKcZAeVCxCXZpCgigqhBsGpNwGRsfaQEQVsdTxNiuXVVZWYF2waKlfoyvc UQgwCyWeLFkmbSHolgYYlNuWkOO23wVKL5Gfrp1oK0fiCpSyVkZwzTKxGII2Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnXKv38Mvzlm3; Sat, 16 Sep 2023 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G0f7Cs047565; Sat, 16 Sep 2023 00:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G0f75I047562; Sat, 16 Sep 2023 00:41:07 GMT (envelope-from git) Date: Sat, 16 Sep 2023 00:41:07 GMT Message-Id: <202309160041.38G0f75I047562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1da381c2bea7 - stable/13 - shmfd: hide direct rangelock(9) use under a wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1da381c2bea76992a510a48c7a6673a9c64d9c15 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1da381c2bea76992a510a48c7a6673a9c64d9c15 commit 1da381c2bea76992a510a48c7a6673a9c64d9c15 Author: Konstantin Belousov AuthorDate: 2023-08-18 12:38:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-16 00:40:48 +0000 shmfd: hide direct rangelock(9) use under a wrapper (cherry picked from commit 6df6facf44f952f64753bee00831fd93f16c99a9) --- sys/kern/uipc_shm.c | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index f2d883c9c8b7..def8c35025c1 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -178,6 +178,15 @@ SYSCTL_INT(_vm_largepages, OID_AUTO, reclaim_tries, CTLFLAG_RWTUN, &largepage_reclaim_tries, 0, "Number of contig reclaims before giving up for default alloc policy"); +#define shm_rangelock_unlock(shmfd, cookie) \ + rangelock_unlock(&(shmfd)->shm_rl, (cookie), &(shmfd)->shm_mtx) +#define shm_rangelock_rlock(shmfd, start, end) \ + rangelock_rlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_tryrlock(shmfd, start, end) \ + rangelock_tryrlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_wlock(shmfd, start, end) \ + rangelock_wlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) + static int uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio) { @@ -452,10 +461,10 @@ shm_read(struct file *fp, struct uio *uio, struct ucred *active_cred, return (error); #endif foffset_lock_uio(fp, uio, flags); - rl_cookie = rangelock_rlock(&shmfd->shm_rl, uio->uio_offset, - uio->uio_offset + uio->uio_resid, &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, uio->uio_offset, + uio->uio_offset + uio->uio_resid); error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -493,13 +502,10 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, } else { size = uio->uio_offset + uio->uio_resid; } - if ((flags & FOF_OFFSET) == 0) { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); - } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, uio->uio_offset, - size, &shmfd->shm_mtx); - } + if ((flags & FOF_OFFSET) == 0) + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); + else + rl_cookie = shm_rangelock_wlock(shmfd, uio->uio_offset, size); if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { error = EPERM; } else { @@ -512,7 +518,7 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -567,22 +573,20 @@ shm_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, conf->alloc_policy != SHM_LARGEPAGE_ALLOC_HARD) return (EINVAL); - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); shmfd->shm_lp_psind = conf->psind; shmfd->shm_lp_alloc_policy = conf->alloc_policy; shmfd->shm_object->un_pager.phys.data_val = conf->psind; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); case FIOGSHMLPGCNF: if (!shm_largepage(shmfd)) return (ENOTTY); conf = data; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, OFF_MAX); conf->psind = shmfd->shm_lp_psind; conf->alloc_policy = shmfd->shm_lp_alloc_policy; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); default: return (ENOTTY); @@ -899,10 +903,9 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) void *rl_cookie; int error; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); error = shm_dotruncate_cookie(shmfd, length, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1240,8 +1243,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, error = ENOENT; } } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* * kern_shm_open() likely shouldn't ever error out on @@ -1313,8 +1315,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, shmfd->shm_seals |= initial_seals; shm_hold(shmfd); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, - &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); } sx_xunlock(&shm_dict_lock); @@ -1636,8 +1637,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, shmfd = fp->f_data; maxprot = VM_PROT_NONE; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, objsize, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, objsize); /* FREAD should always be set. */ if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_EXECUTE | VM_PROT_READ; @@ -1711,7 +1711,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, vm_object_deallocate(shmfd->shm_object); } out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1929,8 +1929,7 @@ shm_add_seals(struct file *fp, int seals) error = 0; shmfd = fp->f_data; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* Even already-set seals should result in EPERM. */ if ((shmfd->shm_seals & F_SEAL_SEAL) != 0) { @@ -1961,7 +1960,7 @@ shm_add_seals(struct file *fp, int seals) } shmfd->shm_seals |= nseals; out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1997,11 +1996,10 @@ shm_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) * the shmfd is not necessarily a concern. If other mechanisms are * added to grow a shmfd, this may need to be re-evaluated. */ - rl_cookie = rangelock_wlock(&shmfd->shm_rl, offset, size, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, offset, size); if (size > shmfd->shm_size) error = shm_dotruncate_cookie(shmfd, size, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); /* Translate to posix_fallocate(2) return value as needed. */ if (error == ENOMEM) error = ENOSPC; From nobody Sat Sep 16 04:23:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RndGY2w5cz4smBD; Sat, 16 Sep 2023 04:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RndGY0RZNz4bgV; Sat, 16 Sep 2023 04:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694838213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8th/LDc9pWq9zDnwk97wjBli/u+49Au75i0yCgrUSA=; b=mcncSohkY4RxD1vSD4ah46hyuXI9abLJjRCmpgUXaATNv20UXXBPvhMjCRWSZA3X6Q3yJ+ f9dy4kDRw/zOeCFFb1vDwEYCXIYvqCuwhtMNjDzFFtPcGlW51e9mZIn+Kr+C0zGZlD4BDx egjXjfGoDAgHtsIHEFMfgS47fIQdMQfTV8qXdTXScG+OnoxnmuTHpmqtbHOZepJvyhIIA8 oBoSHGF/a0UwExYVSSVwmgYSDk2mhnGNGP0Z/CcAIdmI93Pj3szNfjlfc1e7OZSL/xwE+4 ECxVO3eipO1mernjarsmWpE/zNE5i1wt+ihuw8CXgKDwqrQU9DsLg6+WCrD0Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694838213; a=rsa-sha256; cv=none; b=m2sDc3qoOegViJwP45spl30Bt1TaNKVePU7M3772gfO9+WFqi8ZiAtZPIsRhTBpkHIkY6H 0To40peYlW1YGzcaBwlZVDkOSVCrL2oiQ420laae0uCjq8Px2hmoKgLa/13SrT+F28Qwrn Y/PopVijXMU5PjQpN3X3yumIztx7sHXcilWIDN3os3JKuyh1UhgsHJBaIimLUdgx1cgh85 K2/k6NHX8ed/VBJugilO1eP6mn6wbIhrTand8Flg2g/8YCL6oqblCcjNuLRizIf3ic1+yj SgHmq8iRt0M+kZIbRvmALvB3F+u4xOLkEon9pW/H1o1U/frloPcsCo93g3py2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694838213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8th/LDc9pWq9zDnwk97wjBli/u+49Au75i0yCgrUSA=; b=IcMOFkRmNcmMz9V+rkK/583D7h8bWgAKCAFds7/ZjUg8lTMludD0whH4xzCqEpaFHbOnTG YGbmcvu8JR/p434BSY/v1T2gJgVABtZsRoiS2dcWnL9cP6TnmFkGvWiTqlv8aRgwqh6WWJ DuOPNP+VZVuH566w4J2tLTGkZNKIrqGjJEDQLW6Cjo7/RzVuY3tZWKZou9f+JIrziLtoV4 mWTV8034AXZv8v4QMw09qtdMzKpCDfMZDTCx6+hr2UC69Bk/obpSMNnA7Ps+kPhNfCOFvf gt4j1XQb+30Vkr1qa2nOXSL+Uppld7bl48cdwnNf6CmOSgDcj49irFE/t1MiCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RndGX6HwBzsfF; Sat, 16 Sep 2023 04:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G4NWSA019461; Sat, 16 Sep 2023 04:23:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G4NW9A019458; Sat, 16 Sep 2023 04:23:32 GMT (envelope-from git) Date: Sat, 16 Sep 2023 04:23:32 GMT Message-Id: <202309160423.38G4NW9A019458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 953b93cf24d8 - main - lib/libc/amd64/string/memcmp.S: harden against phony buffer lengths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 953b93cf24d8871c62416c9bcfca935f1f1853b6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=953b93cf24d8871c62416c9bcfca935f1f1853b6 commit 953b93cf24d8871c62416c9bcfca935f1f1853b6 Author: Robert Clausecker AuthorDate: 2023-09-14 05:19:01 +0000 Commit: Robert Clausecker CommitDate: 2023-09-16 04:20:32 +0000 lib/libc/amd64/string/memcmp.S: harden against phony buffer lengths When memcmp(a, b, len) (or equally, bcmp) is called with a phony length such that a + len < a, the code would malfunction and not compare the two buffers correctly. While such arguments are illegal (buffers do not wrap around the end of the address space), it is neverthless conceivable that people try things like memcmp(a, b, SIZE_MAX) to compare a and b until the first mismatch, in the knowledge that such a mismatch exists, expecting memcmp() to stop comparing somewhere around the mismatch. While memcmp() is usually written to confirm to this assumption, no version of ISO/IEC 9899 guarantees this behaviour (in contrast to memchr() for which it is). Neverthless it appears sensible to at least not grossly misbehave on phony lengths. This change hardens memcmp() against this case by comparing at least until the end of the address space if a + len overflows a 64 bit integer. Sponsored by: The FreeBSD Foundation Approved by: mjg (blanket, via IRC) See also: b2618b651b28fd29e62a4e285f5be09ea30a85d4 MFC after: 1 week --- lib/libc/amd64/string/memcmp.S | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S index d192229677b3..dc8bcff73cb9 100644 --- a/lib/libc/amd64/string/memcmp.S +++ b/lib/libc/amd64/string/memcmp.S @@ -328,13 +328,28 @@ ARCHENTRY(memcmp, baseline) movdqu 16(%rsi, %rdi, 1), %xmm1 pcmpeqb 16(%rdi), %xmm1 # compare second half of this iteration add %rcx, %rdx # pointer to last byte in buffer - pcmpeqb %xmm2, %xmm0 + jc .Loverflow # did this overflow? +0: pcmpeqb %xmm2, %xmm0 pmovmskb %xmm0, %eax xor $0xffff, %eax # any mismatch? jne .Lmismatch_head add $64, %rdi # advance to next iteration jmp 1f # and get going with the loop + /* + * If we got here, a buffer length was passed to memcmp(a, b, len) + * such that a + len < a. While this sort of usage is illegal, + * it is plausible that a caller tries to do something like + * memcmp(a, b, SIZE_MAX) if a and b are known to differ, intending + * for memcmp() to stop comparing at the first mismatch. This + * behaviour is not guaranteed by any version of ISO/IEC 9899, + * but usually works out in practice. Let's try to make this + * case work by comparing until the end of the address space. + */ +.Loverflow: + mov $-1, %rdx # compare until the end of memory + jmp 0b + /* process buffer 32 bytes at a time */ ALIGN_TEXT 0: movdqu -32(%rsi, %rdi, 1), %xmm0 From nobody Sat Sep 16 07:40:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnjds4HZRz4tdMg; Sat, 16 Sep 2023 07:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnjds3sJfz4Fd0; Sat, 16 Sep 2023 07:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My3q3mWQlr6xS0aHDHBjlu36cYDjbTuhhtKSs0nUs88=; b=NFnvM0wur9vSdLAbi5/jDptAb9mqBuIEzLbu/hDXilIOwlN1bgOxwEhM5BoQKC9bJC9Ire JlGDCOYH+icTPS5bkkJCNQkBMIqiplX/VXorbXxmORJnMyYraaTj15bno84dL+YUbgipje N59X2Kqy4H3uqibZxLge/+DUSVUTwf8Et3BR+p09qfulkn0IqKYVa6PDZ9lB101ME4yUwV dDRwu1H1f0VkFaDvmNXiN64m9mNMqltmX5oy9RRfqBh75wLLS30TjI5HjF+ZUDC6bXyLrT sc8dUdbixRorMah/r/MY8Lp0Mjj+a+h8y58JVX/rZt+Rw5LMIpAdXXHgGwldYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694850033; a=rsa-sha256; cv=none; b=BhY1LfKwHc9E7+TkYIju2RSyQKoYq7Aw2PViOhljicOuHmo3yZIIlFA3OM4IYT9JFyQ51i cHnYi+Zzup4R9mFo8bWwuLrBQZrCqj65VwCEgx2QnjdxSokyciGuBIZbuv9R7g4MavSJZT ZHpoY8IY8uTCrGIMRO67oTDyM1tWqlu+wgPT1AD+z4QFoPAyL7xclFgYN6faNZuQWsY15E ZRtK2liKmn3JO/Q2HXyolGY+pQLZfSwhCvWyXiV/l5VTq7gcuLujNsZNpiIMagaIuQR9LJ vHlpatEHNTFfBfIMRfoQpcuwpaqdAlf/Prir2uwl7esnmM0t7F5Psk4zUmaikQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My3q3mWQlr6xS0aHDHBjlu36cYDjbTuhhtKSs0nUs88=; b=HLkEFUtPmBSdm3ngcgmuDkwav+/X6tt1gKx2URhIah7OUEk8hrf8Ur/shbVsblsvRaHBTV ZbEsomAILZss0sPHMBARNvpCb0LWjCwMfgSTiZDAgRyvWzA+nBMRVjI1hwG9oav5S99L/n 0tGp4jYXYwIXXeU8fbQIcxvDtGNtXgjPmz+zEkYrglViEulZErZqMzfsVnVD7eWouz/Rsz nI2NxAG2MeCJshK7InrQb1DHNXX4HV8pH5r4Ly81d6gaqlnDWeMo57BZgxwrxIJ7rDXdS6 yOvqyrYLgTs3OH6GFefLemlfkuTktUSLmt5eO7VGGBnVG/eMbFx8g6FaA2CZJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnjds2qBDzxXB; Sat, 16 Sep 2023 07:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G7eXWZ042863; Sat, 16 Sep 2023 07:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G7eXrU042860; Sat, 16 Sep 2023 07:40:33 GMT (envelope-from git) Date: Sat, 16 Sep 2023 07:40:33 GMT Message-Id: <202309160740.38G7eXrU042860@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: 2a689cadf092 - main - vfs: retire kern.minvnodes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a689cadf092a3319d7619c3f4aa242011c20c8e Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2a689cadf092a3319d7619c3f4aa242011c20c8e commit 2a689cadf092a3319d7619c3f4aa242011c20c8e Author: Mateusz Guzik AuthorDate: 2023-09-16 07:33:36 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 07:33:36 +0000 vfs: retire kern.minvnodes It was marked as legacy in 2005. --- sys/kern/vfs_subr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 823b8005aa4d..f4cccf2b4e1f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -385,8 +385,6 @@ SYSCTL_PROC(_vfs, OID_AUTO, wantfreevnodes, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_wantfreevnodes, "LU", "Target for minimum number of \"free\" vnodes"); -SYSCTL_ULONG(_kern, OID_AUTO, minvnodes, CTLFLAG_RW, - &wantfreevnodes, 0, "Old name for vfs.wantfreevnodes (legacy)"); static int vnlru_nowhere; SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW | CTLFLAG_STATS, &vnlru_nowhere, 0, "Number of times the vnlru process ran without success"); From nobody Sat Sep 16 07:40:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnjdt5HGvz4td8D; Sat, 16 Sep 2023 07:40: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 4Rnjdt4kN2z4FrD; Sat, 16 Sep 2023 07:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKNruRthCfL/doOk4OGslX8NxxFJ81iq8KvtDqXc28A=; b=hdEEQ6tjHMMIlfD3BJihI/VeeFeiVABDffjX8I5Gj7K5RiG5lypA/ZPVbQlA4pmEjetyjj UdtlC0/Q7TrzlU0anjP/ackxEd92t5FA6YWg73E5gE0LcYR5yxKgopIr9+yPTkWy3+fOso RG8Bmp7hI0e5rfAftg7o2tpYA5qFEf/HdrC4QRc9GrXI54ogKhjPXNEr8bFrPrginC5Y3g FdUqaDlYV0R1iCIkfQ5pzGe1jVU3YeVU/2HelaiVYGvohCYMaFuLBVg1qi11tr0rpTbaQw tAHx8cWNdkLr9IGszvkscih46J9n1Nj6Xd7e0f7KJ8WsmEf6JJ2eIEeEqAFSqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694850034; a=rsa-sha256; cv=none; b=pvUowZcx45cMtlSJv6NGyoYTAKpUTSOt0Maop5OsSq2Tn2H5MZgs6MGp6rieW4E59O0CCg uxBRWYqXWgSdrpBTyiPmd2bqwy5C2NOEYFUSHOJytPJ7mcw+lpZs8uR7fHdVvMUAd+pqfF lnKT3a7OQRxpaepOeM11B4ey77LPi9IsNUwAJJqI37Eo9i30PQBiySn0SYBWKAZlCAsrFB scdlwbpDtraB/IK21mr3byY6jnzv2bt/LKKVOSlrt1DJAA5qidcC7MBP2NMyo7M5klQDfU zmGXleNGaYtE7gHVEMzivSH7+4x2kEvoBHr0ED5u3i0hm7xWVxd1dw0iM7RxZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKNruRthCfL/doOk4OGslX8NxxFJ81iq8KvtDqXc28A=; b=NY6GETrtEJQvbZrMg+LbfaArAbBjjFdMsrx6Biue9fSC15dXKQuAnRhQs1Af0adzUhCwnZ PIwKSsHVEaGE0iinc5Ljr6eEw3au8kqcMMS6SjldFnRcAbkPWv4+5a8YBuOj92fWtXSj9U 7xOcUtTOoWxmdPp29giZA4YluUFFAak8+GzOu8jPQP82aeZ/amq06q8YCpz7ZK5NQaNwMe XbkRCXeWexCFeo0VksI6ZcOmnIck2/8NdeO08fRatHzsgGCbAMI40ge5QSWvnmT/Um9xDF ESDOoQMm/KeBnb+WbBoH6XoIbumDRK10IB4ibQt83Y99wMb4vEGDYAdmqgz7yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnjdt3qnFzxtj; Sat, 16 Sep 2023 07:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G7eYUk042911; Sat, 16 Sep 2023 07:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G7eYCP042908; Sat, 16 Sep 2023 07:40:34 GMT (envelope-from git) Date: Sat, 16 Sep 2023 07:40:34 GMT Message-Id: <202309160740.38G7eYCP042908@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: d3e647891243 - main - vfs: group vnode-related sysctls under vfs.vnode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3e6478912431309aad36211b6c39b0d741312dc Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d3e6478912431309aad36211b6c39b0d741312dc commit d3e6478912431309aad36211b6c39b0d741312dc Author: Mateusz Guzik AuthorDate: 2023-09-15 21:08:38 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 07:39:42 +0000 vfs: group vnode-related sysctls under vfs.vnode Instead of having things scattered through vfs, debug and kern trees. Old names remain for compatibility. Sample output of "sysctl vfs.vnode": vfs.vnode.vnlru.failed_runs: 0 vfs.vnode.vnlru.recycles_free: 0 vfs.vnode.vnlru.recycles: 0 vfs.vnode.stats.alloc_sleeps: 0 vfs.vnode.stats.free: 1310 vfs.vnode.stats.skipped_requeues: 0 vfs.vnode.stats.created: 1686 vfs.vnode.stats.count: 1641 vfs.vnode.param.wantfree: 2097152 vfs.vnode.param.limit: 8388608 --- sys/kern/vfs_subr.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f4cccf2b4e1f..a8477e4b691e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -126,6 +126,15 @@ static int v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, daddr_t startlbn, daddr_t endlbn); static void vnlru_recalc(void); +static SYSCTL_NODE(_vfs, OID_AUTO, vnode, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "vnode configuration and statistics"); +static SYSCTL_NODE(_vfs_vnode, OID_AUTO, param, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "vnode configuration"); +static SYSCTL_NODE(_vfs_vnode, OID_AUTO, stats, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "vnode statistics"); +static SYSCTL_NODE(_vfs_vnode, OID_AUTO, vnlru, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "vnode recycling"); + /* * Number of vnodes in existence. Increased whenever getnewvnode() * allocates a new vnode, decreased in vdropl() for VIRF_DOOMED vnode. @@ -133,10 +142,14 @@ static void vnlru_recalc(void); static u_long __exclusive_cache_line numvnodes; SYSCTL_ULONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, + "Number of vnodes in existence (legacy)"); +SYSCTL_ULONG(_vfs_vnode_stats, OID_AUTO, count, CTLFLAG_RD, &numvnodes, 0, "Number of vnodes in existence"); static counter_u64_t vnodes_created; SYSCTL_COUNTER_U64(_vfs, OID_AUTO, vnodes_created, CTLFLAG_RD, &vnodes_created, + "Number of vnodes created by getnewvnode (legacy)"); +SYSCTL_COUNTER_U64(_vfs_vnode_stats, OID_AUTO, created, CTLFLAG_RD, &vnodes_created, "Number of vnodes created by getnewvnode"); /* @@ -188,14 +201,18 @@ static long freevnodes_old; static counter_u64_t recycles_count; SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count, + "Number of vnodes recycled to meet vnode cache targets (legacy)"); +SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count, "Number of vnodes recycled to meet vnode cache targets"); static counter_u64_t recycles_free_count; SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, + "Number of free vnodes recycled to meet vnode cache targets (legacy)"); +SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, "Number of free vnodes recycled to meet vnode cache targets"); static counter_u64_t vnode_skipped_requeues; -SYSCTL_COUNTER_U64(_vfs, OID_AUTO, vnode_skipped_requeues, CTLFLAG_RD, &vnode_skipped_requeues, +SYSCTL_COUNTER_U64(_vfs_vnode_stats, OID_AUTO, skipped_requeues, CTLFLAG_RD, &vnode_skipped_requeues, "Number of times LRU requeue was skipped due to lock contention"); static u_long deferred_inact; @@ -345,6 +362,9 @@ sysctl_maxvnodes(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_kern, KERN_MAXVNODES, maxvnodes, + CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_maxvnodes, + "LU", "Target for maximum number of vnodes (legacy)"); +SYSCTL_PROC(_vfs_vnode_param, OID_AUTO, limit, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_maxvnodes, "LU", "Target for maximum number of vnodes"); @@ -358,6 +378,9 @@ sysctl_freevnodes(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_vfs, OID_AUTO, freevnodes, + CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_freevnodes, + "LU", "Number of \"free\" vnodes (legacy)"); +SYSCTL_PROC(_vfs_vnode_stats, OID_AUTO, free, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_freevnodes, "LU", "Number of \"free\" vnodes"); @@ -382,11 +405,14 @@ sysctl_wantfreevnodes(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_vfs, OID_AUTO, wantfreevnodes, + CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_wantfreevnodes, + "LU", "Target for minimum number of \"free\" vnodes (legacy)"); +SYSCTL_PROC(_vfs_vnode_param, OID_AUTO, wantfree, CTLTYPE_ULONG | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_wantfreevnodes, "LU", "Target for minimum number of \"free\" vnodes"); static int vnlru_nowhere; -SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW | CTLFLAG_STATS, +SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, failed_runs, CTLFLAG_RD | CTLFLAG_STATS, &vnlru_nowhere, 0, "Number of times the vnlru process ran without success"); static int @@ -1755,7 +1781,7 @@ vtryrecycle(struct vnode *vp) static u_long vn_alloc_cyclecount; static u_long vn_alloc_sleeps; -SYSCTL_ULONG(_vfs, OID_AUTO, vnode_alloc_sleeps, CTLFLAG_RD, &vn_alloc_sleeps, 0, +SYSCTL_ULONG(_vfs_vnode_stats, OID_AUTO, alloc_sleeps, CTLFLAG_RD, &vn_alloc_sleeps, 0, "Number of times vnode allocation blocked waiting on vnlru"); static struct vnode * __noinline From nobody Sat Sep 16 07:52:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnjvM5Dthz4thCp; Sat, 16 Sep 2023 07:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnjvM4nW0z4JjF; Sat, 16 Sep 2023 07:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WHPyqOUvF3T3dId8iLBxVuEEJh674eBdL7VyeGltEo=; b=Ix+cMxCY0j/YNNdX+oo/c/Kzes/4xouQtNab0MTZmYVc/WIA0VmEtbk2B0ofOkYGZZvFjP r+8KGCiae7hNEIanD1mmzAv9M/0P60M8cChzaM46b1/p06iafLWqVurlBooiV1UY7W6NTn 6QSJQVUvHQLjslT3d8/64SStDExLUqK6rqFJRN8mDxS1mMATE3vfblM/s7M5jyPWdv8Pf+ DLwnkRbFeviiIVUC94wQHpATgO66SWVsBZqrqX7oEXLZHJaF2tLfBFOvxO6Dz1VukAA4Wp N+8tziOYn3Av++z8wRmXTd5bx5l4BxZvHxL1s2Fvgu5wZHqJ9JD/K+zloqicEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694850735; a=rsa-sha256; cv=none; b=Y3TLIITnH73RJfmvmnAsqG6jIzThykvTUf7azN93tj9hn4lKaiwiOMz6P0LuvI8KjC9NgV +ftNETd7Z1WIjkEYX6dqgiZyMeLH0b8Vmq+p0+LcnibCpSbQ5yRbWnoFDe+8X4/b5MtAi+ Jfld+409sTqhlpqceswZ4GRhIgGXN5DgMBt0Zz+EgffVywej90enDfivMvMCg1n3OFsWKw iquXYgZlcbJ2vme+DIEFAuKlA883Fp2sDknJMoe3upBMoYAtBK7y5wCSYZMfJO3RVMLbQv nlcBvt+AFxe2QjeHvyMVk4/nOFvepurBQeUSEX30qQGmKc7+RNEE81Po4t+LJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694850735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WHPyqOUvF3T3dId8iLBxVuEEJh674eBdL7VyeGltEo=; b=i59mkb/uDIAu7ceFd8WKsdqg/uLmgTGU3Jb6TOAvI8fW1EZK+WxEI1IXpXjtQ0AsCIq2KQ +xJNHqOVEVhXwZpXgtqtTD3GcWWkj+o84fSIsCbt0JDXonRAk4/LKh9LL0seluiNiJSF8F Rf+XT64YG4M/x1P+bMWY56/ZTR/Ek8NXfTrzetK9HpvQSihHObFvSGHw130a9tLyNDQKAX WD9iCR5IO0u65p0F12fdWBHAj19H9uir6NnA4pJsJNVl/w2HCw1NSblFWu8ZFqXw+eK1ls 09XrDitJo0uIEhrs8ZBForcNzUWJCyJbBGuHZOEz9ktSbgJGjSIgR8h4Aa+SIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnjvM3s4czyZ4; Sat, 16 Sep 2023 07:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G7qF96065745; Sat, 16 Sep 2023 07:52:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G7qFSG065742; Sat, 16 Sep 2023 07:52:15 GMT (envelope-from git) Date: Sat, 16 Sep 2023 07:52:15 GMT Message-Id: <202309160752.38G7qFSG065742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cadbf320b352 - main - ObsoleteFiles: cleanup old libclang_rt files for powerpc64le List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cadbf320b352b3691cdfa90ad8ba818efca4ea68 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cadbf320b352b3691cdfa90ad8ba818efca4ea68 commit cadbf320b352b3691cdfa90ad8ba818efca4ea68 Author: Dimitry Andric AuthorDate: 2023-09-16 07:47:19 +0000 Commit: Dimitry Andric CommitDate: 2023-09-16 07:47:19 +0000 ObsoleteFiles: cleanup old libclang_rt files for powerpc64le PR: 273776 MFC after: 3 days --- ObsoleteFiles.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 15e3b000de3c..10bf398e721a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -390,11 +390,14 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.so +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a @@ -406,10 +409,12 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a @@ -430,9 +435,11 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a @@ -441,6 +448,8 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64lele.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a @@ -451,6 +460,7 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a @@ -458,19 +468,23 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a @@ -478,6 +492,7 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a @@ -485,6 +500,7 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a From nobody Sat Sep 16 08:20:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnkXH6vr6z4sZc6; Sat, 16 Sep 2023 08:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnkXH6Qpgz4MqW; Sat, 16 Sep 2023 08:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694852447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2v8RuG+Ne/rWskxq2qfUkNaZ/hFIa8iKHhD4SCnaAqo=; b=XsBtVyECUigfbCH2rYbirYIt0BXmCi8mQNOQFjH+rPgZNKHrQ3pSyZAKUCv5Hndvr58L52 nE9xlKXFpJyRQDlZRTDl4lixTsbYog0CVjniGMKMiwDWtaGoO6KMf4TCjDREKQ54rgjM93 yVUDZNPsl7t495gijg9bqfOVZ9LO5ZWd/s4fz35ukmxUkCikqO6UJXGJKsMIDseI3ueVZT PspiK1R/Z5XLIphJz5u18oSfERbhAb6bRJyQRsBCq3uvSlI+h58DOhLGfo4q36RpaPBdb3 wRZpOiRSQexyRI4GGsty63GOmGguA2PtaoamS2oN6GUnUhaMqmJZthf3ASlLaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694852447; a=rsa-sha256; cv=none; b=GtEX/jOS+ma1QVu0ACRfzrV6i2NioWxO1BPw17nVerR3KI2c8FCRzneHPvt/5NA7QaTK4o w4D/3NP4BGaaGoGjjsDFTNuD1ibTHgexDfvJY2KG2w5DnuyKq0ZFYLxA+qLPAmrV80bLeO 1zTj7LCZS3l8lgI8WjOBxFxVKhBlUTuJAd9FGQqVBK2rChh2kpoLDxs/q8E0A5T0x0Fzcr wo8UHVwSpOV11gXffQ1/lm8KGH/94VyUBGi0CXyRBL+msd87MrCEFg+PfPS0w13jdU10Cc snxc0Vv9dqJZV5BMOEtG1EzpHK//VcbC9S2Ev1l7oUQh2vTGcuLmid0rwNiB0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694852447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2v8RuG+Ne/rWskxq2qfUkNaZ/hFIa8iKHhD4SCnaAqo=; b=emVbUIsRv99FPkn6/IBxzyznznja8MufoWosfpwfsn3MMaFvA0dcSPtOT5scSxkQfzyixr Y7/U6VvIex8zsVlzC4dxeMtg9fACEfuep4fHO7N+YUWSdysUTtrShf7R1BPEE+W6TvevNR HsAU5HJ7SaAmp83Q41D6fP9OPy16Pvh4gYQ21nZXORHwTthWq6LDkHKwdeLfjoVO5lFxag yBoCpOcrybIFkihMYvRhMCXMty73XDZTU13+9xiU+SC1lLUOMmGq5AkB+4kEinqHEPmBCt Ftd6C4weuSXGZvTkiGv5tNG69/uhCVODS4Pn//aTx6kp8BmT3F4Tjl1eozrGXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnkXH5VK3z1005; Sat, 16 Sep 2023 08:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G8KlYp009965; Sat, 16 Sep 2023 08:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G8Kl4b009962; Sat, 16 Sep 2023 08:20:47 GMT (envelope-from git) Date: Sat, 16 Sep 2023 08:20:47 GMT Message-Id: <202309160820.38G8Kl4b009962@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: 509d843a982b - main - vfs: s/u_long vstir/bool vstir/ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 509d843a982b39a531a558c65794ffffcdf93ae8 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=509d843a982b39a531a558c65794ffffcdf93ae8 commit 509d843a982b39a531a558c65794ffffcdf93ae8 Author: Mateusz Guzik AuthorDate: 2023-09-16 08:19:24 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 08:19:24 +0000 vfs: s/u_long vstir/bool vstir/ --- sys/kern/vfs_subr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a8477e4b691e..9d5b1b7e472e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -325,7 +325,7 @@ u_long desiredvnodes; static u_long gapvnodes; /* gap between wanted and desired */ static u_long vhiwat; /* enough extras after expansion */ static u_long vlowat; /* minimal extras before expansion */ -static u_long vstir; /* nonzero to stir non-free vnodes */ +static bool vstir; /* nonzero to stir non-free vnodes */ static volatile int vsmalltrigger = 8; /* pref to keep if > this many pages */ static u_long vnlru_read_freevnodes(void); @@ -1627,7 +1627,7 @@ vnlru_proc(void) */ if (vstir && force == 0) { force = 1; - vstir = 0; + vstir = false; } if (force == 0 && !vnlru_under(rnumvnodes, vlowat)) { vnlruproc_sig = 0; @@ -1799,7 +1799,7 @@ vn_alloc_hard(struct mount *mp) rfreevnodes = vnlru_read_freevnodes(); if (vn_alloc_cyclecount++ >= rfreevnodes) { vn_alloc_cyclecount = 0; - vstir = 1; + vstir = true; } /* * Grow the vnode cache if it will not be above its target max From nobody Sat Sep 16 09:27:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnm0y2CsBz4ssJw; Sat, 16 Sep 2023 09:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnm0y1nbdz4X0Z; Sat, 16 Sep 2023 09:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhW/+A/vbpMx9ynwEsWblHpkH0A1bO/TRvAxw+suAyM=; b=eJ2My8oxC927Lwc9lbQ02+1l2bEdoiMQ/sC+PVWLGM1juMV/hm+dCWFoEeMdrR9JTk/hWI fLMoKUHeOXMvRBX7esRVS4+9Kj6v1UQipuoYpPgDYlr2L2DFVp14S51Zwl46gH+MsUShDC QXYwtSSpPRz19HwhbxDSQkTfmSlOnUxgB4mm1n8ubJFdV3z9AAQ0QgcEXDEDHJM1iGJBdh VEiI4PzHNCxOfFDbY1crqXP/5xouQvSWT4mqQCAkjHEEzUyuRdfpuXqcoPao/q9gVphauW LnRPn6tiWqscuXu8t2xrufBJ6A1qv/9jg8VdicXBqz1QjiAd2r08ms1DF+kFRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694856434; a=rsa-sha256; cv=none; b=td50uSYJzxrkGtzn1EEeVed1738Yy3zfJSi3CBJWYVKsc1jPEp9EXhvaPvs8VmBvzzuT7o k51OFNdn1LbqNq6mR6U914k/Pw0qzkdKuUpp6wKoGZtEd0Hkaa79pj7vweXnVuovBlrShA S0irf6s2FAzUd5H0l2GUTlbjKGZP6YeqBNGffdJQ1+PuWRdX6MwoPhP8/i6VtoHtpHq+Q+ 3YEPM8S0Y1CkbT68HIVDA+clq3Fy4NCYFTDxiy/8KCaQjBT7CaGrUVQjT+D/zG9BgDETJo mEG+6JrAm45/xrGPFxUvZvfTmSLIf/HWOb/ZOwMwHkT7LicczKO7QIj4QkNgBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhW/+A/vbpMx9ynwEsWblHpkH0A1bO/TRvAxw+suAyM=; b=atmPjO6TSBy8/BmnM7wWXvSjVpB5cZNxMU8dCAAlX3Il6ZNwy3QFg1Xl5e7ov7ZT/TVQTs 3NV2vZVgJ5hjFUXdjF4/Tj83NTlOLMq7ERhD3ME9meHAFe8VRtsdqTUgRmk317iGAUY4dw M5dvqzQaamrWedp9IAfjg6isIsNMePqAaryw9NKR/5gXXiv3zrNklQU7Z6UixOk5DbYMyF ej0LquHHrKrHkPZFZfNLyi55Lqua7pDW6zo/UWRZkg7pOE7zPT2r7OwTIZNVflne8EIRyv /7hT5OOkbuisRprlyexu5kHfXqOoJJ8zcLhaAV9t5SV+JuNk/L2M5lOkh23k0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnm0y0sFfz11YP; Sat, 16 Sep 2023 09:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G9RDIj016623; Sat, 16 Sep 2023 09:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G9RDsn016620; Sat, 16 Sep 2023 09:27:13 GMT (envelope-from git) Date: Sat, 16 Sep 2023 09:27:13 GMT Message-Id: <202309160927.38G9RDsn016620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f44102411e1b - main - sockets: re-check socket state after call to pr_rcvd() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f44102411e1b16363e91a074c9c403069c550e4d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f44102411e1b16363e91a074c9c403069c550e4d commit f44102411e1b16363e91a074c9c403069c550e4d Author: Greg Becker AuthorDate: 2023-09-09 23:38:24 +0000 Commit: Mark Johnston CommitDate: 2023-09-15 16:59:46 +0000 sockets: re-check socket state after call to pr_rcvd() Socket state may have changed after dropping the receive buffer lock in order to call pr_rcvd(). If the buffer is empty, re-check the state after reaquiring the lock and skip calling sbwait() if the socket is in error or the peer has closed. PR: 212716 Reviewed by: markj, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41783 --- sys/kern/uipc_socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ffd5e06c34b7..3c7e5c4cb4bb 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2429,6 +2429,10 @@ dontblock: VNET_SO_ASSERT(so); pr->pr_rcvd(so, flags); SOCKBUF_LOCK(&so->so_rcv); + if (__predict_false(so->so_rcv.sb_mb == NULL && + (so->so_error || so->so_rerror || + so->so_rcv.sb_state & SBS_CANTRCVMORE))) + break; } SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); From nobody Sat Sep 16 09:27:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnm0z3vxRz4ssVN; Sat, 16 Sep 2023 09:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnm0z359zz4X7D; Sat, 16 Sep 2023 09:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RouldnTevdQ1Gdw8+8jR718wPlBmngiM2A0nqe+RbhE=; b=UdvV3LGPfLnAtx/twfGBt6dL+r4Fzt7MsCml+Bjc2V27kywOMWnCgG/7py1p2iVm1rJkv2 eHTdCoC79WfzEoVfRcYXR/E6v5GaOEotXUZYjzkqsRht3H7Hsv/LUBgSuQYGRXF2Ek+RFr 96tPaDIqa7L9nfF/ACG2rW3IbARdKeO27tRmhGuOEQuyCD2wzN4srcOLyGJG/vhranQrmZ mdQXXMchSrlgHDcdQ1qetmSQO0eHo5qD54RPyq5S6Jb3X9iUywGzv/M/u4p0WITy0R4/DD VxJCa7GfoyDDYii9gOOgeYwgqR1FblP0jtyELhIffWskAAO4dZRPopeWJHqVQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694856435; a=rsa-sha256; cv=none; b=BQAc/dc5z8dUdpE+aFJxoWaZdKyWJmhPRJTD3+N1T/Ap9mTxue973tMt4YQLAQvfOIHpQx q4a2Uxibn0uChNhCdZAJnlpbc8MDABG1ZFipOZd3j3PVHwfqzQ0Y/0uvXtHPDwt8uks/TF IEEb/W93qj7Qwrm7tBBtrvR/GFanKFkXGxcmdTzjfqEs7oPr8fuH2rZIUKkEdcVZs/uhiI KToiEA59epBc8iUVhxARs7f7l6dzFzSPYcPxnUriiTZ/E24KEnrGGKrwC0poqpSxqUB8GP zwMYDUtLpntTzpVKwOEDyIIXTPe7sI+uf7HG0PlLRnC4mfi9OFt/Byz34ITrNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RouldnTevdQ1Gdw8+8jR718wPlBmngiM2A0nqe+RbhE=; b=Sf1B3eOe96KH/FBYDV/nieKWMpYC6DnsWLqlH+gQX6uU32wTKeNmWhuYleUo5X5WkkX06d NzqFEaRFXise9tGShdL+FQvbZkddLTiOoEcn78RF7R4nZ98isTbvoyQ7dfmgyNwAmWhGr2 mRkYjLtGAtsfDE/z8osHm/ZOKK65eRUx2Cd9qSuRJl7OLDNL9cNwek85D/wSCvSY65/ZLh Q+XyYs78IvB5u0FcNwMVjiUhqKQD2VG0b4PPB6BeiIUMCKMXCcvJdoB5BrSgOro1tpR2hx llq3rxuz74mQXsv5lJpke6+GjBVHEuPUvBlnyWe3ZZ8bbFaKMZ2otoExKAAJCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnm0z1nMmz11HD; Sat, 16 Sep 2023 09:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G9RF8U016674; Sat, 16 Sep 2023 09:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G9RF8N016671; Sat, 16 Sep 2023 09:27:15 GMT (envelope-from git) Date: Sat, 16 Sep 2023 09:27:15 GMT Message-Id: <202309160927.38G9RF8N016671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 38426b32e106 - main - socket tests: Add a regression test for MSG_WAITALL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38426b32e106cf251520259b29779372eda7a5f8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=38426b32e106cf251520259b29779372eda7a5f8 commit 38426b32e106cf251520259b29779372eda7a5f8 Author: Mark Johnston AuthorDate: 2023-08-31 17:29:29 +0000 Commit: Mark Johnston CommitDate: 2023-09-15 16:59:46 +0000 socket tests: Add a regression test for MSG_WAITALL PR: 212716 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- tests/sys/kern/Makefile | 2 + tests/sys/kern/socket_msg_waitall.c | 181 ++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index d46223d8ff09..f2fe9e7008d9 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_C+= sigaltstack ATF_TESTS_C+= sigwait ATF_TESTS_C+= socket_accf ATF_TESTS_C+= socket_msg_trunc +ATF_TESTS_C+= socket_msg_waitall TEST_METADATA.sigwait+= is_exclusive="true" .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH:Mpowerpc*} == "" ATF_TESTS_C+= subr_physmem_test @@ -71,6 +72,7 @@ LIBADD.unix_seqpacket_test+= pthread LIBADD.kcov+= pthread CFLAGS.ktls_test+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD.ktls_test+= crypto util +LIBADD.socket_msg_waitall+= pthread LIBADD.sendfile_helper+= pthread LIBADD.fdgrowtable_test+= util pthread kvm procstat LIBADD.sigwait+= rt diff --git a/tests/sys/kern/socket_msg_waitall.c b/tests/sys/kern/socket_msg_waitall.c new file mode 100644 index 000000000000..e9018b47eec1 --- /dev/null +++ b/tests/sys/kern/socket_msg_waitall.c @@ -0,0 +1,181 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Mark Johnston under sponsorship from + * the FreeBSD Foundation. + */ + +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include + +struct close_test_params { + struct sockaddr_storage sa; + size_t msglen; + int count; + int af, type, proto; +}; + +static void * +close_test_client(void *arg) +{ + struct close_test_params *p = arg; + char *buf; + size_t buflen; + + buflen = p->msglen + 1; + buf = malloc(buflen); + ATF_REQUIRE(buf != NULL); + + while (p->count-- > 0) { + ssize_t n; + int error, s; + + s = socket(p->af, p->type, p->proto); + ATF_REQUIRE_MSG(s >= 0, "socket: %s", strerror(errno)); + + error = connect(s, (struct sockaddr *)&p->sa, p->sa.ss_len); + ATF_REQUIRE_MSG(error == 0, "connect: %s", strerror(errno)); + + n = recv(s, buf, buflen, MSG_WAITALL); + ATF_REQUIRE_MSG(n == (ssize_t)p->msglen, + "recv: %s", strerror(errno)); + + ATF_REQUIRE(close(s) == 0); + } + + return (NULL); +} + +static void +close_test(struct sockaddr *sa, unsigned int count, int af, int type, int proto) +{ + struct close_test_params p; + const char *msg; + pthread_t t; + size_t msglen; + int error, s; + + s = socket(af, type, proto); + ATF_REQUIRE_MSG(s >= 0, "socket %s", strerror(errno)); + + ATF_REQUIRE_MSG(bind(s, sa, sa->sa_len) == 0, + "bind: %s", strerror(errno)); + ATF_REQUIRE_MSG(listen(s, 1) == 0, + "listen: %s", strerror(errno)); + ATF_REQUIRE_MSG(getsockname(s, sa, &(socklen_t){ sa->sa_len }) == 0, + "getsockname: %s", strerror(errno)); + + msg = "hello bonjour"; + msglen = strlen(msg) + 1; + p = (struct close_test_params){ + .count = count, + .msglen = msglen, + .af = af, + .type = type, + .proto = proto, + }; + memcpy(&p.sa, sa, sa->sa_len); + error = pthread_create(&t, NULL, close_test_client, &p); + ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); + + while (count-- > 0) { + ssize_t n; + int cs; + + cs = accept(s, NULL, NULL); + ATF_REQUIRE_MSG(cs >= 0, "accept: %s", strerror(errno)); + + n = send(cs, msg, msglen, 0); + ATF_REQUIRE_MSG(n == (ssize_t)msglen, + "send: %s", strerror(errno)); + + ATF_REQUIRE(close(cs) == 0); + } + + ATF_REQUIRE(close(s) == 0); + ATF_REQUIRE(pthread_join(t, NULL) == 0); +} + +/* + * Make sure that closing a connection kicks a MSG_WAITALL recv() out of the + * syscall. See bugzilla PR 212716. + */ +ATF_TC(close_tcp); +ATF_TC_HEAD(close_tcp, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_tcp, tc) +{ + struct sockaddr_in sin; + + sin = (struct sockaddr_in){ + .sin_len = sizeof(sin), + .sin_family = AF_INET, + .sin_addr = { htonl(INADDR_LOOPBACK) }, + .sin_port = htons(0), + }; + close_test((struct sockaddr *)&sin, 1000, AF_INET, SOCK_STREAM, + IPPROTO_TCP); +} + +/* A variant of the above test for UNIX domain stream sockets. */ +ATF_TC(close_unix_stream); +ATF_TC_HEAD(close_unix_stream, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_unix_stream, tc) +{ + struct sockaddr_un sun; + + sun = (struct sockaddr_un){ + .sun_len = sizeof(sun), + .sun_family = AF_UNIX, + .sun_path = "socket_msg_waitall_unix", + }; + close_test((struct sockaddr *)&sun, 1000, AF_UNIX, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(unlink(sun.sun_path) == 0, + "unlink: %s", strerror(errno)); +} + +/* A variant of the above test for UNIX domain seqpacket sockets. */ +ATF_TC(close_unix_seqpacket); +ATF_TC_HEAD(close_unix_seqpacket, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_unix_seqpacket, tc) +{ + struct sockaddr_un sun; + + sun = (struct sockaddr_un){ + .sun_len = sizeof(sun), + .sun_family = AF_UNIX, + .sun_path = "socket_msg_waitall_unix", + }; + close_test((struct sockaddr *)&sun, 1000, AF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE_MSG(unlink(sun.sun_path) == 0, + "unlink: %s", strerror(errno)); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, close_tcp); + ATF_TP_ADD_TC(tp, close_unix_stream); + ATF_TP_ADD_TC(tp, close_unix_seqpacket); + + return (atf_no_error()); +} From nobody Sat Sep 16 09:33:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnm7z2Wwcz4sv0Z; Sat, 16 Sep 2023 09:33: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 4Rnm7z1hJLz4Z3K; Sat, 16 Sep 2023 09:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPG9v0F6Ua6bFjX97BrCGhcDN6564MqfuHzv3weIJEQ=; b=jl/Dyyf3eq1BR4WqMAUPaNqj2GSCz/u/DyMRe6hnRsLmESfEFA8uta7PmP6CATF/qQcGck GjmW0BTOutHryevZOPqiVbuDqLAWSoPKcJ1vpcmy9P7HvaMxHscYnKY9blfluy0TDUTyRh SeI+YS7jzYmnBUdkQd14aocJ2wBelpXCzNEJZimdeYQNyDBL8DeLJ8kFPJEmNjv2T9A4mh lwf0urqelcSupt8bcPkmsWDvwimqxOOgbaUfcfsfaqdwwPdZcIZ2BCp0uoQ1gqrVHLKmWm opX30oPQte6I/trxFXwkhSq0MxhYVZFOQ8AYnq+NhO9olQbil1o/D54tPmj8IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694856799; a=rsa-sha256; cv=none; b=NcR2WIOoRlc5/bDyJJ1y/yZKk67bu6+7BY+U+fcbly5JweMcRYy4w/9jWofx1j7qxCfM7V Z1optq2770zK/Xi1CDpmBUT1XD5FgDRlLDPUUvlvz7QftuILe8+hZHTqscF7o+lemX/B0p bjDr/B1Cv/KReNXkSFdgNXt9IETqzm/whyehhX/ZY4VMiHixJFy8duNFeA86ZcRkGErfc+ yk6CwqaxwXwMi1aizAT2QWdohY5wcHhRPd9824ptXRm0vS02GtYcIMI2oXZqaDtWJfQwvi MsmiI7plvac/kCRS75yK0rDtIItM6KeD1gAZW6R2qyLhDvLasSJZgeFvqBiM6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694856799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPG9v0F6Ua6bFjX97BrCGhcDN6564MqfuHzv3weIJEQ=; b=vd3zNz8EdFmo+Kx/rWgRqxEq9gEwxUo2xoJdZV01rYNOYvEa+ASEtmtzml3pWhQpVZQ2Uw dU8M6Co7ygmZXV4DZdUCA9krMQnsiS+JO0aCxy+NHFpu4cgMge5aKfmpRFev0NQFxATgwL D5oK2S7zc393a8IKd6tWmFqAKLLtn8em+dxyXYkgjDQY3rKLyor++rQ/eRleNjBOXWWdBw fU6oHY/ys30c9wnOm4Ujbxp2evqLEoaSTP0ylCrhwVW7q/XRP2jQvAs+tioGi9yeWfxEon v8rpCzz4L2tvtxczKO4BPW10qUE87xWZzwAFkambVUzvnnxl1XE0aPIyRbrY2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnm7z0lHLz11Zh; Sat, 16 Sep 2023 09:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38G9XJa8033414; Sat, 16 Sep 2023 09:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G9XJTS033411; Sat, 16 Sep 2023 09:33:19 GMT (envelope-from git) Date: Sat, 16 Sep 2023 09:33:19 GMT Message-Id: <202309160933.38G9XJTS033411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d643925a79ca - main - unix tests: Use the right type for sendmsg(2) return values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d643925a79caab5c6de62b066e374935b60bcaf1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d643925a79caab5c6de62b066e374935b60bcaf1 commit d643925a79caab5c6de62b066e374935b60bcaf1 Author: Mark Johnston AuthorDate: 2023-09-15 08:59:08 +0000 Commit: Mark Johnston CommitDate: 2023-09-15 17:04:15 +0000 unix tests: Use the right type for sendmsg(2) return values MFC after: 1 week --- tests/sys/kern/unix_passfd_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 94f0c420029a..d8c0efe5b9ea 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -182,13 +182,13 @@ sendfd_payload(int sockfd, int send_fd, void *payload, size_t paylen) static void sendfd(int sockfd, int send_fd) { - size_t len; + ssize_t len; char ch; ch = 0; len = sendfd_payload(sockfd, send_fd, &ch, sizeof(ch)); ATF_REQUIRE_MSG(len == sizeof(ch), - "sendmsg: %zu bytes sent; expected %zu; %s", len, sizeof(ch), + "sendmsg: %zd bytes sent; expected %zu; %s", len, sizeof(ch), strerror(errno)); } @@ -532,10 +532,10 @@ ATF_TC_BODY(send_overflow, tc) len = sendfd_payload(fd[0], putfd, buf, sendspace); #if TEST_PROTO == SOCK_STREAM ATF_REQUIRE_MSG(len == -1 && errno == EAGAIN, - "sendmsg: %zu bytes sent, errno %d", len, errno); + "sendmsg: %zd bytes sent, errno %d", len, errno); #elif TEST_PROTO == SOCK_DGRAM ATF_REQUIRE_MSG(len == -1 && errno == ENOBUFS, - "sendmsg: %zu bytes sent, errno %d", len, errno); + "sendmsg: %zd bytes sent, errno %d", len, errno); #endif close(putfd); ATF_REQUIRE(nfiles == openfiles()); @@ -655,14 +655,14 @@ ATF_TC_BODY(rights_creds_payload, tc) #if TEST_PROTO == SOCK_STREAM ATF_REQUIRE_MSG(len != -1 , "sendmsg failed: %s", strerror(errno)); ATF_REQUIRE_MSG((size_t)len < sendspace, - "sendmsg: %zu bytes sent", len); + "sendmsg: %zd bytes sent", len); recvfd_payload(fd[1], &getfd, buf, len, CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + CMSG_SPACE(sizeof(int)), 0); #endif #if TEST_PROTO == SOCK_DGRAM ATF_REQUIRE_MSG(len != -1 , "sendmsg failed: %s", strerror(errno)); ATF_REQUIRE_MSG((size_t)len == sendspace, - "sendmsg: %zu bytes sent", len); + "sendmsg: %zd bytes sent", len); recvfd_payload(fd[1], &getfd, buf, len, CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) + CMSG_SPACE(sizeof(int)), 0); #endif From nobody Sat Sep 16 14:20:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RntW56m4Dz4t8nr; Sat, 16 Sep 2023 14:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RntW56Jxwz4PPl; Sat, 16 Sep 2023 14:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694874017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ydENEVRKFXXfb7xGkMRlQ0T5MG20VKyt7T2Cn41+PY=; b=Kf6IaXzVBYhx4rLEzTyEocuJzRECYiro5l9aB3V8nwsM1Hs59oXB8W1kmNc1d+4j8f5FzJ cTObbsiZAeSWILppuZS08RNZ4KrTRhr7RB9jA1n3FhTb4rnRquT0m7qfoSeggqyA2G42pr qmNtoelPFYcHYHJxNCFEHdtqc6MCsAjgxMLnx4Httt6tFNqcEJMAjhbMTzjZZJwQ8/wIPJ TTY5H1r4Qetmop7mhlgsz1/WszlcjMyh9muF+lbuqyMTT/Nzq3C7bJK0fJKeLfKrRwvNXL P/fqQ50wRFzUbOXH4wGXNg0iwujJI7BYMgK5SP1yEgNGYTyyQKO75MhC5UOmDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694874017; a=rsa-sha256; cv=none; b=INTS7p2HW8fiO5Ch5Y43YfDHC20MBeK/nhyZ3VCqvIYdV7nUQ4YfYd9p+4+xmgNlRDD0AV EiqJSOPkDSihqPY/G2PP5+rdDy6JEaOCrucluL8nOyIRGJ4nl+v0Awn2OrkWXOyz+AOVNV zKzex9DDyVAo1ao6EktIcwwW/uyu3eJ/WwEMCAbnn6MBospDywRlgqqtv9EvC7YkK8+o5+ UEoeEw07uG2iYErP54nBbncrtaQDZ7mHsajtRr3qgDzdyadLM4IyW8R6ERL6dPnqO4l1qt U557+8LlzKOAgJlNE7SVCi8RbtnW9LzXxwt11dp8eMm41JdYbxV2z30Lr3HfIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694874017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ydENEVRKFXXfb7xGkMRlQ0T5MG20VKyt7T2Cn41+PY=; b=TJUjaVq31iHi7DIU7QOdQxygtcjG/XDhw3hOke8aiZhMcLrUgyH0VBXJ3GO3MI7CVwqd+a lxZ3t36kOgXGblIF/II89PHFHClCxe2mx3em+wOopW87PvTshMgSnZk52g6Yl02Z2/h4ia OH7aQqTa1jI9Hvyd64w9YR8aLROyqU5LSLMzpX60Z/+bCtVdXmp/feVqw+jZiHeLMTe0Xf wkt1ZDaHzeAyBzV4ORMi37kOEUFcMyqCIBiGm/GT81TT6CCSNdERlazFi6MtLNEfDepihZ ddid4DgwmSl6aflAS1SYcyr2LMmlGSbu+8osChIR3PD3SHx1kEJTzmKz+9ByCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RntW55NcVz18mm; Sat, 16 Sep 2023 14:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GEKHca008294; Sat, 16 Sep 2023 14:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GEKHrZ008283; Sat, 16 Sep 2023 14:20:17 GMT (envelope-from git) Date: Sat, 16 Sep 2023 14:20:17 GMT Message-Id: <202309161420.38GEKHrZ008283@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: 49874af3eca6 - main - zfs: retire z_nr_znodes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49874af3eca6fbbeb3967c737baa3478d6a4e967 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=49874af3eca6fbbeb3967c737baa3478d6a4e967 commit 49874af3eca6fbbeb3967c737baa3478d6a4e967 Author: Mateusz Guzik AuthorDate: 2023-09-16 14:18:05 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 14:18:05 +0000 zfs: retire z_nr_znodes It is not needed and is going away soon(tm), facilitating other changes. See https://github.com/openzfs/zfs/pull/15274 --- sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 8 +++----- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h index 5948e44daab1..56a0ac96ac19 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h @@ -93,7 +93,6 @@ struct zfsvfs { zfs_teardown_lock_t z_teardown_lock; zfs_teardown_inactive_lock_t z_teardown_inactive_lock; list_t z_all_znodes; /* all vnodes in the fs */ - uint64_t z_nr_znodes; /* number of znodes in the fs */ kmutex_t z_znodes_lock; /* lock for z_all_znodes */ struct zfsctl_root *z_ctldir; /* .zfs directory pointer */ boolean_t z_show_ctldir; /* expose .zfs in the root dir */ diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 49b97ae8f590..8969fd6a54bd 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -1158,7 +1158,6 @@ zfsvfs_free(zfsvfs_t *zfsvfs) mutex_destroy(&zfsvfs->z_znodes_lock); mutex_destroy(&zfsvfs->z_lock); - ASSERT3U(zfsvfs->z_nr_znodes, ==, 0); list_destroy(&zfsvfs->z_all_znodes); ZFS_TEARDOWN_DESTROY(zfsvfs); ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs); @@ -1562,12 +1561,11 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting) * may add the parents of dir-based xattrs to the taskq * so we want to wait for these. * - * We can safely read z_nr_znodes without locking because the - * VFS has already blocked operations which add to the - * z_all_znodes list and thus increment z_nr_znodes. + * We can safely check z_all_znodes for being empty because the + * VFS has already blocked operations which add to it. */ int round = 0; - while (zfsvfs->z_nr_znodes > 0) { + while (!list_is_empty(&zfsvfs->z_all_znodes)) { taskq_wait_outstanding(dsl_pool_zrele_taskq( dmu_objset_pool(zfsvfs->z_os)), 0); if (++round > 1 && !unmounting) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c index c4f2b722ef4e..0d4c94555c6b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c @@ -537,7 +537,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz, mutex_enter(&zfsvfs->z_znodes_lock); list_insert_tail(&zfsvfs->z_all_znodes, zp); - zfsvfs->z_nr_znodes++; zp->z_zfsvfs = zfsvfs; mutex_exit(&zfsvfs->z_znodes_lock); @@ -1286,7 +1285,6 @@ zfs_znode_free(znode_t *zp) mutex_enter(&zfsvfs->z_znodes_lock); POINTER_INVALIDATE(&zp->z_zfsvfs); list_remove(&zfsvfs->z_all_znodes, zp); - zfsvfs->z_nr_znodes--; mutex_exit(&zfsvfs->z_znodes_lock); #if __FreeBSD_version >= 1300139 From nobody Sat Sep 16 15:46:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnwQD30dBz4tWb0; Sat, 16 Sep 2023 15:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnwQD2b4vz4f1g; Sat, 16 Sep 2023 15:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=et+dp4QYwSUodkOxULifDxu51r1JczPFm5QBSpEX3mY=; b=rQ33aHqCBKrTy6t68pKc4MXUUJ/UFr6JIrc3cUYAvXuUyOgVFmi9cIkLyTRX4Js3/OOz/e a2kpsmi3ZrgoAf0knjMKMHtgQ2NE9voPs4e4ELbEprGeMiMciSafB06c4js5v+yp5M+fGQ umFzIZkvUcKTCxgEOY5ODp7v+NQsGJwb0JmwD/0uROWSOBXQuKZt3z//Oidp+obGl2jQ6O 2tLhGujuNAYvV6/bk7a4b/3BRJykPXhKLtqc104x00ZEolvvHN24gNDdIg0P+YfR5SZQt9 NCmliacpUO7ReH2pNcl7rVMkOcm2hrayDy315nEsEtQX+rK5d8t9U1cq2/S1Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694879172; a=rsa-sha256; cv=none; b=a7kKqTKQ2XKgjdkrKvw8VRfHhQR5itZ47UALmVZUI9wxC0btmZgD/ddZGEEaddC6aL57tO ULEIgTqyDRUsYrSZGNu0x4vOjBbjPfJG2L6DLMSfkgIvdXrq9ypY/FhpnmPqUfcBP2XF+h vAttcEeo/9Hm/dgdkaVe/O7SOZxBWWqhKiTmM8ioTg19swcz3Dt8ypwmTLXn6pfmZ91X1V Ddif0MVJ/Sc7ggzZaxzUX1uJ5qO5/nnq9wolpwZ4cE/QpNhpzuZ/U+z7mT4DymFHvHnaD1 lZbgrbCYm6jGW2GGEC6BNX2Kv5Paq+Hk+VoaWUoL/Hwjrqh2m7OCYqXWVTw3Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=et+dp4QYwSUodkOxULifDxu51r1JczPFm5QBSpEX3mY=; b=IaXarMTiHNGnIGwXEnWhkaFhEKaak3gt6kHDlACUJv0vPd4lnxtVgGn+LqPGINsI8DJtwt NpfyakSSv8/aXM9Gzp1xD96VdA1lrFkvP2aa083AsXY4Xum0dMcjREBydszRQbrXnXYXzq R2bI6jspfIvYLBxmHXPhfKWnLzpx8lUndB+7zcz33hI6j2vnIASidJOsCzExnFj/rmZkvb FAvP4QVYYX0isauzV2oEPdIvl3UyXDCvtjLXYQoMv4v/BQx+VVBqgR4p32OKZUf7BhdZfT Hm5NfShWRlGjOC82y9YMM7pflpBBD1O2zCXwcds8+SdWanCEdk98TwPB6N08hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnwQD1d1wz1B88; Sat, 16 Sep 2023 15:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GFkCbx048573; Sat, 16 Sep 2023 15:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GFkCWj048570; Sat, 16 Sep 2023 15:46:12 GMT (envelope-from git) Date: Sat, 16 Sep 2023 15:46:12 GMT Message-Id: <202309161546.38GFkCWj048570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d3a9d605a896 - main - Add WITHOUT_MANSPLITPKG description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3a9d605a8963b7833936fd9679b734871facab4 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a9d605a8963b7833936fd9679b734871facab4 commit d3a9d605a8963b7833936fd9679b734871facab4 Author: Ed Maste AuthorDate: 2023-09-16 15:28:28 +0000 Commit: Ed Maste CommitDate: 2023-09-16 15:40:41 +0000 Add WITHOUT_MANSPLITPKG description Fixes: 74da9c39c346 ("pkgbase: Split out manpages by default") Sponsored by: The FreeBSD Foundation --- tools/build/options/WITHOUT_MANSPLITPKG | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/options/WITHOUT_MANSPLITPKG b/tools/build/options/WITHOUT_MANSPLITPKG new file mode 100644 index 000000000000..a9913308d411 --- /dev/null +++ b/tools/build/options/WITHOUT_MANSPLITPKG @@ -0,0 +1 @@ +Do not split man pages into their own packages during make package. From nobody Sat Sep 16 15:54:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnwbx5sv6z4tYL1; Sat, 16 Sep 2023 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnwbx5KsPz4gq2; Sat, 16 Sep 2023 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnzTvxriQ9fsiYoSPj1oEyiZh4iYiYF0nhTIYQitzEM=; b=ZWp92y2LCaj/j62N4H2e8TN1KtgW5mC9fibqn+zsXKxfaAoZoqtWtPT7VAZW0z+XIgeTzN jNiFwu/IrSvaJSoz+nExqOS2erxvVtNgpcybu3HcpsZ0gn1swf1cRrxQm1fmo9KxI+h+ju CZFLBg/H0TVv1h/QFGH8rnXY76Gq3ePVloqWvjeWvsYT2oVavoYlIo1VImpKWoUwTvaz4p cPLamP/CzKFPpAo5OUcPzALHcHPbtqM59PPNnrgGjeHJxrThVoTVOtC1o9eO8zdgGPYUKj zryq/eTP01Dp+R44oI8MZSOmSjJLzIiV1IzxerSxR4w0ZP7hHhS994MVhhoE9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694879677; a=rsa-sha256; cv=none; b=OVpo8C28mWAuExouecDQecRCfa0G6snoxzewlFKxSE3d3uRxfDuw4gAM1Q+81Z3abakvEj dkMBDpYv/NEpLiklsG0XamDvfrOpYU+e9CIJDvJJMl+uOor79f6s9LGrnMFbYO1lbIxa5A cmNOMoHh4X/zccLCujtN1GRwYSp8M9Vx9IhB/QHvHgBAgTAK4pjztgUEqvYSWDEddDYAuy +6E5T9koxDWYxEKV7397gCzxoAx1NR19k0CIsArKYwGrzz7dEo/k9EkXavVEta5vhkXgUb pWfEgPeqXI4hXsB9ujW52bUeQ8GcrBsOnANf3wZlklFoSVMKuKu7g/E5+F7SnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnzTvxriQ9fsiYoSPj1oEyiZh4iYiYF0nhTIYQitzEM=; b=hWqFb5Vi9ygLIiR6/enByDdXafV6zpZ4+KFElcPLbdolQlL47H+Ma+pD0aqs4SWQA+OxCL zSak6ULc7Uwk6rWNAPZV6NAQmiObWbuCv1KLnLPVPZ82FVtQRSMoeoAyHHCMOMF32spz4V FKQFm1N24u3qbU78Hrsljl93qlP+S30kjxwfG7dMPA9J1PoQYkpEKHWVOcgzSUCHXRXvxS AnPOR6MAbq8qwU/3mv/jyjJ01F2rUUkMNnOzgC//a1YiIQTaAmir0gAqOGN1palFVAxaw0 cpPuWPUC3YgCB6lM9paO7/o9AS5iZceby49Dq7AXCfRaCPPHzQkTwSgVmXzH5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnwbx4NyWz1C81; Sat, 16 Sep 2023 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GFsbkb064476; Sat, 16 Sep 2023 15:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GFsbP9064474; Sat, 16 Sep 2023 15:54:37 GMT (envelope-from git) Date: Sat, 16 Sep 2023 15:54:37 GMT Message-Id: <202309161554.38GFsbP9064474@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: ef89b78bb1f6 - main - vfs: stabilize freevnodes_old List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef89b78bb1f60484cc743fa590d623ad896ca8e9 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ef89b78bb1f60484cc743fa590d623ad896ca8e9 commit ef89b78bb1f60484cc743fa590d623ad896ca8e9 Author: Mateusz Guzik AuthorDate: 2023-09-16 15:41:12 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 15:54:09 +0000 vfs: stabilize freevnodes_old In face of parallel callers. --- sys/kern/vfs_subr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9d5b1b7e472e..11cdea5a7dc1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1528,21 +1528,22 @@ vfs_freevnodes_dec(void) static u_long vnlru_read_freevnodes(void) { - long slop, rfreevnodes; + long slop, rfreevnodes, rfreevnodes_old; int cpu; rfreevnodes = atomic_load_long(&freevnodes); + rfreevnodes_old = atomic_load_long(&freevnodes_old); - if (rfreevnodes > freevnodes_old) - slop = rfreevnodes - freevnodes_old; + if (rfreevnodes > rfreevnodes_old) + slop = rfreevnodes - rfreevnodes_old; else - slop = freevnodes_old - rfreevnodes; + slop = rfreevnodes_old - rfreevnodes; if (slop < VNLRU_FREEVNODES_SLOP) return (rfreevnodes >= 0 ? rfreevnodes : 0); - freevnodes_old = rfreevnodes; CPU_FOREACH(cpu) { - freevnodes_old += cpuid_to_pcpu[cpu]->pc_vfs_freevnodes; + rfreevnodes += cpuid_to_pcpu[cpu]->pc_vfs_freevnodes; } + atomic_store_long(&freevnodes_old, rfreevnodes); return (freevnodes_old >= 0 ? freevnodes_old : 0); } From nobody Sat Sep 16 15:55:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnwcy5DqFz4tYck; Sat, 16 Sep 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnwcy4p7Yz4hdH; Sat, 16 Sep 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=baICKY+foJtt6fyNZdgvbxO+8ENdjZrweWS86xekGQw=; b=nqjrV9G3GaUs+2KXKSW9Ms1tCyan/nhLFjmmcp/Pj/I7T0hj7WUiWjiymO56EYkGzZFvRc bUiRmQPS/gnGcPUTJQf2E9H4UgbJFupwDJ64f4IkFusO1DPzGCEnUK8dFdRud7k0wr6XxT pgvqDDNISHzHW0H8A2jv23EkfB5VSoXfgBtbM0chC6DlyU6Tb0VXylgTgOXuhsgMcdOt1P PbRYMfY2HwdnrBenQeqNpHXtjgJGaY0qH09TddD6ewlYnETwDvPK/dgLuNenXJijhq2B7P n8InmHcBRIOaUSPqUKOGGhVABzEFtDsWXpgPtdAp66+WtVzV7VkrqvrFWSc0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694879730; a=rsa-sha256; cv=none; b=oUTv63+LS7RUDXugX9JoaaJ0h9kT8Emm6Z9cSiY7q8g1mF6BscBBJ5AZWW2hOZ05BlDNN6 9YcxQzm+7VseR98TBoH5ykQ9iDbw8myXJeFFOh3AGWOucsXU72PjAqcHbAiSWESmBNaAX1 0k6y85tnjvA1AYC38AnztKOjYqZA5vCOtz38xKFJttUN/thy4/o+oRxatZCBmLD+8olvm6 XNOga4hGrFLeD3nkdbK1Gal2Poh0P7ROsxTOumBcGv29Ee0kPk2cutk8JW1+D8H4bRXJPQ IpfhrkYHb2mzkx2YbduKkWdi/Nq0Uy3SvsaRI9JjlDfaJWCC+SZ8DK3efm8+vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=baICKY+foJtt6fyNZdgvbxO+8ENdjZrweWS86xekGQw=; b=sWLurqGAcvQqYpuSl3EgFzNxwiwfA6h6eRUX/UCMB3bkvyZN+yaSpwB/VNdkT2jtixhjs/ isBptZOMx/nbHu9XggBkfkQnRA3qnZ4Aglf0l5lOAAf7tRYKkdsxJUjn9ptf7IQJHehdN/ yAw2QN6WHMee5s/s1LA7LLfOfBtBDGHIOgR0emlXXugnAdBRcSxN832j/wgcURZdg6KicB bBSHPxT/wSX65qsOrFfpxIk/mriCKUdCtqD77YI7qXt/lIzuYhoLAgCFi6iSdJyg227a6+ m2LOcZ0eCYj8V30MVPYkom2qC2siMjKfpZdunkuxnXxcGqbQjKvOsHSdny/+0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnwcy3Dy2z1BsT; Sat, 16 Sep 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GFtUdQ064789; Sat, 16 Sep 2023 15:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GFtUXj064786; Sat, 16 Sep 2023 15:55:30 GMT (envelope-from git) Date: Sat, 16 Sep 2023 15:55:30 GMT Message-Id: <202309161555.38GFtUXj064786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1a18383a52bc - main - libcrypto: link engines and the legacy provider to libcrypto List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a18383a52bc373e316d224cef1298debf6f7e25 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a18383a52bc373e316d224cef1298debf6f7e25 commit 1a18383a52bc373e316d224cef1298debf6f7e25 Author: Pierre Pronchery AuthorDate: 2023-09-15 15:14:16 +0000 Commit: Ed Maste CommitDate: 2023-09-16 15:55:12 +0000 libcrypto: link engines and the legacy provider to libcrypto OpenSSL's legacy provider module and engines need to link to libcrypto.so, as it provides some of the actual implementations of legacy routines. This is a little tricky due to build order issues. Introduce a small hack (LIBCRYPTO_WITHOUT_SUBDIRS) that builds libcrypto.so in its usual early phase without any OpenSSL provider modules or engines. This is intended to restore the test suite; a future change should remove the hack and replace it with a better approach. PR: 254853, 273528 Discussed with: Folks at EuroBSDCon in Coimbra Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 2 +- secure/lib/libcrypto/Makefile | 2 ++ secure/lib/libcrypto/engines/Makefile.inc | 2 ++ secure/lib/libcrypto/modules/legacy/Makefile | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7c6981f0f890..7776b40a9801 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2980,7 +2980,7 @@ libraries: .MAKE .PHONY ${_+_}cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ + ${MAKE} -f Makefile.inc1 _prebuild_libs -DLIBCRYPTO_WITHOUT_SUBDIRS; \ ${MAKE} -f Makefile.inc1 _generic_libs # diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 585e89861815..d8ae91bb3272 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,6 +1,8 @@ SHLIBDIR?= /lib +.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) SUBDIR= engines modules +.endif .include .include diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc index 39b728ff722f..13d5f4849cbc 100644 --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -16,6 +16,8 @@ CFLAGS+= -DB_ENDIAN .endif CFLAGS+= -DNDEBUG +LIBADD= crypto + .PATH: ${LCRYPTO_SRC}/engines WARNS?= 0 diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index 913c0c41f5eb..a285d0b1148b 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -1,5 +1,6 @@ SHLIB_NAME?= legacy.so +LIBADD= crypto SRCS+= legacyprov.c prov_running.c From nobody Sat Sep 16 17:20:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnyWd0gnfz4sgqN; Sat, 16 Sep 2023 17:21:01 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) (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 4RnyWc5y0Yz3LSM; Sat, 16 Sep 2023 17:21:00 +0000 (UTC) (envelope-from mavbsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-d815a5eee40so2880776276.2; Sat, 16 Sep 2023 10:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694884858; x=1695489658; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=36fzDa8Oade/qs0EQ3rhlYFTK2CVQ/xjFY+kR0cxtLg=; b=DWJ4aZJYMdaREgLUe4P/hk644WeTYqxs5OmSxEZCP1pF8TjuuQIfMwEH6ATMvcMGVL CKsESgeKrT0qWx2FqK8RTo0Tnz35huNvu1yFun1e5HYQlO6qGN0ggAcSJXtK+YZ4TElX esQ88jGVdgCymFjwAfiNitl3uTY26s2iGdAhchHYIW4xRBP0v4WR0Cg6iwwInaMi1gOJ YY4AaqlEFET+qm1zuFfGvzX4ATWwdFAZd5OquXPBJJk/e1nxNvr9OBuoZ4KzozLa6Bc/ ZKKkYh/WE1nraG8r5WYmu3wrobPNMe93E8XjtCW8TjyGrg5FuduQGZAlEfF2rZbGBPvV /5Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694884858; x=1695489658; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=36fzDa8Oade/qs0EQ3rhlYFTK2CVQ/xjFY+kR0cxtLg=; b=B8GkvyRIep+waIZEhCg+Pxt9G30+g3/ojgiJjfr/qo9Ph98FcmLl51nKfX5avpyjzp TEnk/pnyEieLBSSVadz6Ihsb8xPSTwQBmlCmv/WvzwCQhxtoHe4A9v3eak/Q6d+Al06F 15/Y1nnMiIIr9FWuPnICvunSp0edVl6oRyp6cV3IJn8bqgK+9acByCWyOicyfd0JM3B0 e/5xRMOXalvZkqoZFQulMMH4oUEheel+u1N8jtGxNtBgzOc+rkWqQfpL6PBtLVmX8IRC Rh+2j8ecj47A7q9RS2LyIAelTfP88WhwO5kjjIVduxMW4qUeE/dvYOC0DazjfibToqtl /Jog== X-Gm-Message-State: AOJu0Ywmy5LU0lknk+HvvblLHkqqKkQ+arvNDJnoGxAIJXkQ9Jc5t7cA YbMoGlkZX9wulGTBoeEhjIQJ+X87zX4/Xg== X-Google-Smtp-Source: AGHT+IFmpUGllcvSnPISPKSbIMa0jqOMdkIJIFZW+jIdDXKH9I1IVB1CMUr07q1Soq8lTU00NoKLhA== X-Received: by 2002:a25:ae66:0:b0:d48:1936:14d0 with SMTP id g38-20020a25ae66000000b00d48193614d0mr4650726ybe.53.1694884858524; Sat, 16 Sep 2023 10:20:58 -0700 (PDT) Received: from [10.230.45.5] ([38.32.73.2]) by smtp.gmail.com with ESMTPSA id f144-20020a25cf96000000b00d7465a90f0csm1375774ybg.22.2023.09.16.10.20.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 16 Sep 2023 10:20:58 -0700 (PDT) Message-ID: <329fd392-f737-7fb0-55ef-f40a83698658@gmail.com> Date: Sat, 16 Sep 2023 13:20:13 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: git: 49874af3eca6 - main - zfs: retire z_nr_znodes Content-Language: en-US To: Mateusz Guzik , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202309161420.38GEKHrZ008283@gitrepo.freebsd.org> From: Alexander Motin In-Reply-To: <202309161420.38GEKHrZ008283@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4RnyWc5y0Yz3LSM On 16.09.2023 10:20, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=49874af3eca6fbbeb3967c737baa3478d6a4e967 > > commit 49874af3eca6fbbeb3967c737baa3478d6a4e967 > Author: Mateusz Guzik > AuthorDate: 2023-09-16 14:18:05 +0000 > Commit: Mateusz Guzik > CommitDate: 2023-09-16 14:18:05 +0000 > > zfs: retire z_nr_znodes > > It is not needed and is going away soon(tm), facilitating other changes. > > See https://github.com/openzfs/zfs/pull/15274 And still for some reason you've committed only half of the upstream PR. > --- > sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 1 - > sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 8 +++----- > sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 2 -- > 3 files changed, 3 insertions(+), 8 deletions(-) Thanks for working on this any way. -- Alexander Motin From nobody Sat Sep 16 17:28:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnygr5LyTz4sjYx; Sat, 16 Sep 2023 17:28: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 4Rnygr4gZtz3MxY; Sat, 16 Sep 2023 17:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694885288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWPRmjOKZ5Gcpgfcs5Z2JVzH61/uQfcSWkaamvuwMVg=; b=C3xSWCmkCb9aI4U9CXNInUjNRvOAHZPpeI3mKLbLwYFK9lTrh6bjMXodrh5elLkcFGcwKo jLxF5Kn5oDyKG/fsTaToGL8cuvhiIAYNT0mo+m+2uJ7A46TrYXFniqGWCiCOT2vcSClbl3 w/GEHuADHEVG6B26GL1zkSYuaQ5Lljc2YYfV3oDsXHPYWcMGpgTZkhxm8+NamrgYQ1chgV njqV/sVEu/EhFvhrTFRHLAx2DkFTxRJmrb/a1GiBUfW1JhZuI2BrxzY6xqOFrlKWUuAjuh 6LnAfjVW3xUxTEgbefs/Y3oi79VOIAKRp1pc51sllmEM/DHQ6jrzUw3isKHjCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694885288; a=rsa-sha256; cv=none; b=tYVMsWCUzv2WFMJ6KpIa23Arvnj9kjIXIsoidpqdLeCYFmU9Sla5UryPWBkkE58eadABeE CzsYZTF2IdcVIVFr931qr/mfkjcsO/4u1tXXYGs/lY7wsr1sCrdAaGwgDJWKjIrdUGXbqb FormhsFYWaCn8TdahBOSgH243B/1GFF/bl4Q8CET0BByBUzTCWv7MTAB2AFzcl7RXKiD4S inNJ6Xzhs9Yi6djVB8hV6zx/itoxBsticLy2h/EwJgIZJMNHpeD1MUZp6/xQFwqJufRPqN Sn73CaTHal8jntllNqBC/Y/c87SU2RtL/RgI46wmBR4Nb1DRxyTxAft1khzz5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694885288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWPRmjOKZ5Gcpgfcs5Z2JVzH61/uQfcSWkaamvuwMVg=; b=eBC4siaqnMpzPCcIfQJeH6e9PU6o0jhv+a8NaV5t2mVQNOvGuCw0/foGfynk7z07VItste klvT5vD0ltKFcl/4Fv74+8QGBrjengjCl0v0cpQXFyl9Zwzq0ACWnDAYZpiVfI12jDEimK FxEmBwVWpw8HMyg1Q7s+FBi9LAJofDYt7rSOJRkz7sYy+FrPu49+I/kXsDz2M1f5YEll4W esCXMq2w1k3qqWFT2DgUSC4Fx+OpsIv8gxnW52V2N2RAzxxcu8dXs943N918HEP9BbV6XC HVApzmIJuUX5yjICYuA5RRrPbqj3xYv2ivbU5mHAbRAEhjPnwbvvq71mSc5uFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnygr3m2Yzl6; Sat, 16 Sep 2023 17:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GHS8mK014524; Sat, 16 Sep 2023 17:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GHS8vK014521; Sat, 16 Sep 2023 17:28:08 GMT (envelope-from git) Date: Sat, 16 Sep 2023 17:28:08 GMT Message-Id: <202309161728.38GHS8vK014521@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: 9080190b970c - main - vfs: count how many times vnlru got woken up due to vnode shortage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9080190b970c7026695571f90b95fdcf7056ec67 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9080190b970c7026695571f90b95fdcf7056ec67 commit 9080190b970c7026695571f90b95fdcf7056ec67 Author: Mateusz Guzik AuthorDate: 2023-09-16 17:26:39 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-16 17:26:39 +0000 vfs: count how many times vnlru got woken up due to vnode shortage --- sys/kern/vfs_subr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 11cdea5a7dc1..0251525a50c7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1477,6 +1477,10 @@ vnlru_recalc(void) */ static struct proc *vnlruproc; static int vnlruproc_sig; +static u_long vnlruproc_kicks; + +SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, kicks, CTLFLAG_RD, &vnlruproc_kicks, 0, + "Number of times vnlru got woken up due to vnode shortage"); /* * The main freevnodes counter is only updated when a counter local to CPU @@ -1571,6 +1575,7 @@ vnlru_kick_locked(void) mtx_assert(&vnode_list_mtx, MA_OWNED); if (vnlruproc_sig == 0) { vnlruproc_sig = 1; + vnlruproc_kicks++; wakeup(vnlruproc); } }