From nobody Sun Jul 30 00:29: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 4RD2M33ymcz4dNgD; Sun, 30 Jul 2023 00:29: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 4RD2M33B0Mz464G; Sun, 30 Jul 2023 00:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690676991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wjUkZRVQaYlb/vbjKIuHJwC0nJonE6iPuUe0Rv06FYc=; b=hASzo3ASYcpi4mxV32ITN1xEhR3Eg/4j2wlE6Ro42N+1eOMzXiKDXSiORjyHneEk5U2eQA c+x7EejQcwbIbL4FWI7VfICx3PBjvGatAqYoj9l9suT7yUKrpNCQ0XHqHD58IHb9WxlWVv i4LR0eABF0nQB0tTUpkg6kMiNIjqD1U6GujA+K6NnosdhPUQu8kylmw1zJCOsq+YmAzyzu SWkZ6SRF5MmC93xCFJDPV3APoKv6LwwwteoLDfB3AFjjbHto/hPs3JdNZamC3jT1XVWn6A DF1LuFcEOW7+GE9KoqO7EFAOxJ4KfmDCcJZ3GK8x9PI/O0D2plygrbfETh+GMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690676991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wjUkZRVQaYlb/vbjKIuHJwC0nJonE6iPuUe0Rv06FYc=; b=MMPJwnZb46FC74x6x1lvs0EHDh/6R8F5zXGTJwKlya1IilDtQFDOOljLjw0D3ZNWiMWgxi lGDbNVd93sbCRPHu/k+SG1nEupZR3eeDHp9xbceMd2Oxuc+Ru99MoWZwAWrH3siWz7n9EI xeFWOMgnP6tyNupktWE/yo7MUMx3peHVK3RXFu6GhAtQJvcsuv+XD6gW2PUmx3sejnOvf9 kN22TI6fE7JrNK9HdvrViPDEIXI2A2gDZdMfzqR3bXXk+oqYM+TlpEsaWMDYskx0qlrPEt uqbruyua+IMhL7CydFk9nsZQtT3j9suSEVT7fMiDfgiLEINE9E6kGY68Qxv4QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690676991; a=rsa-sha256; cv=none; b=OigqaxLzO13bSCJMlHI1I/aQ8olNUKguLa0ofnHIWb6RO+uIzgl9EiRSos10aanfjVNu+0 VVUWO5pMrBJ6ycvucFMILZ7DDr+SYRwxr0SXUP2/f4Nqo9piTANjkCzRqnAupPCZlq8wvF Ay5uqZtu9KEGPg72ci8EavuuYDP9i4G+sW5xNkQq/twD6vGyY60wGovMs08UlQ1PP+2J0W 019j+90WnOq2PdK60ErzpJx6VaMfyJkd1Fys4JmGt+pHgZUkL0ZzutwejMWW8oMgQozgJg Gxvx2idV9LKjhflzPX0SrJYMkkkD9jBF6XzI9OCTIg94hD1B6tuBRI5o+RlZcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RD2M31yhtztH4; Sun, 30 Jul 2023 00:29: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 36U0Tpdp069401; Sun, 30 Jul 2023 00:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36U0Tp09069400; Sun, 30 Jul 2023 00:29:51 GMT (envelope-from git) Date: Sun, 30 Jul 2023 00:29:51 GMT Message-Id: <202307300029.36U0Tp09069400@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: 05e7db731d56 - stable/13 - rtld: fix dlopen() for an object that is already mapped but not yet initialized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 05e7db731d564b276f126465e90f22534dbfd61d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=05e7db731d564b276f126465e90f22534dbfd61d commit 05e7db731d564b276f126465e90f22534dbfd61d Author: Konstantin Belousov AuthorDate: 2023-07-14 13:38:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-30 00:29:09 +0000 rtld: fix dlopen() for an object that is already mapped but not yet initialized (cherry picked from commit 1005d3d05362de368b1ea7aeb8eb20cee993e122) --- libexec/rtld-elf/rtld.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index db53fbeb7d08..d6697711eece 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3758,7 +3758,6 @@ static Obj_Entry * dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, int mode, RtldLockState *lockstate) { - Obj_Entry *old_obj_tail; Obj_Entry *obj; Objlist initlist; RtldLockState mlockstate; @@ -3775,7 +3774,6 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, } GDB_STATE(RT_ADD,NULL); - old_obj_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); obj = NULL; if (name == NULL && fd == -1) { obj = obj_main; @@ -3788,9 +3786,9 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, obj->dl_refcount++; if (mode & RTLD_GLOBAL && objlist_find(&list_global, obj) == NULL) objlist_push_tail(&list_global, obj); - if (globallist_next(old_obj_tail) != NULL) { - /* We loaded something new. */ - assert(globallist_next(old_obj_tail) == obj); + + if (!obj->init_done) { + /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) obj->symbolic = true; result = 0; From nobody Sun Jul 30 06:27: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 4RDBJW5Tfyz4pydQ; Sun, 30 Jul 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 4RDBJF5Fgfz3NPW; Sun, 30 Jul 2023 06:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690698478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SrmNcLqS/WJtUZaiLwQal6GnE4m8npNKYQoefw0dTU=; b=rCK4fY7r/FooVMnz+hyBeRq9LSBRcn4Yl7OZ1xvkU6xbACKVrWWlFQh1O0iD6MvKnWaoBH jRge4xKUTQV9axDowxvssojnqNDsN3cQpbwd5PNdy7Kn+I/ywPtFqiirA3rmoffGDWjvDW CW/8df+c1il/qOiRLFB1p+Q4lOYBbybBJYEzAq9EKPzyhoMUiXo3OCvT6YqtKwi2MINwol K2RDu96NT4lDh0KQzfvD3ZH0qEHOUX94VNdtlUnRFmRRZKAx3LcCPasIp7Z7At+vsOlzgP hJrn2qWgrtXCHNat8THsFTERONkY8cNB80BYoTydA9QXNCGJrvvB3Foo8iMa6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690698478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SrmNcLqS/WJtUZaiLwQal6GnE4m8npNKYQoefw0dTU=; b=Aaimb61bQIKwbMx1CkfgMCtS43PP7mjgIw5LY/z1IQu4Xve1JjLHDiI1R2S9YY0egEXa7r ZmwN+ZSsVoo3i69cJtCIJvkIMMJA3Wi2YAnzrWIM6twVpTCyXICf49ukJ7X5tOQUBuRT+4 t9xzhEPhqe+/25/m+cPnPbXSKmBXk0miOgo8oQ4WI1b53EW4nZ4hy2rGqYhuJEotXuZABU +x6xbGLQLlj9t4uGGenqV1aX1+iq1X9eaIg+BzkU6foiL6rSlJK8GXGBcp214QAg1Bt9RQ 7emYGSciOu7KcCXtIO9ZUAO65nICbZxU4WgVK4P0E5+3r6ewZV8peGTv4MwNgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690698478; a=rsa-sha256; cv=none; b=AAggam/Tr5n+HdNGHK1sXW+p1tOsgVRQHLpU8y6CEEs7RopfkRHKESRku+7ntQr2susNne WdpSDEl377Khol/5bPRbi/gjsjrw2adgUFi2goYe2X6Vzmi/2xeunozEvFyyq+mjlLjL8T k+uU2EH7XXVKmRXrx0sKoKu3+lMJj9YJh4zq4Vh87Q7QNHeoDDnKRRdXYoujvj/jDx94N+ WD9wpn/KrEJ/1yIZrdQIh+RXc1nkfXxvPj+zAq1TeJO4c5OBD07nOks+8ni9nhItrRFBTT 4OpfJ8GdLxXtvOBwguWT1giMfcD8e14DBNSCZXH6Kcb0OfPZ1rM9j5ubUl9SOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDBHy4dN7z13yl; Sun, 30 Jul 2023 06:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36U6Re96064141; Sun, 30 Jul 2023 06:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36U6ReV9064140; Sun, 30 Jul 2023 06:27:40 GMT (envelope-from git) Date: Sun, 30 Jul 2023 06:27:40 GMT Message-Id: <202307300627.36U6ReV9064140@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: 38f5cb1bfbe1 - main - radix_tree: redefine the clev field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 38f5cb1bfbe11bad92ba0266251ff3b0b8fcda73 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=38f5cb1bfbe11bad92ba0266251ff3b0b8fcda73 commit 38f5cb1bfbe11bad92ba0266251ff3b0b8fcda73 Author: Doug Moore AuthorDate: 2023-07-30 06:20:07 +0000 Commit: Doug Moore CommitDate: 2023-07-30 06:20:07 +0000 radix_tree: redefine the clev field The clev field in the node struct is almost always multiplied by WIDTH; occasionally, it is incremented and then multiplied by WIDTH. Instructions can be saved by storing it always multiplied by WIDTH. For the computation of slot(), this just eliminates a multiplication. For trimkey(), where the caller always adds one to clev before passing it as an argument, this change has the caller, not the caller, do that. Trimkey() handles it not by adding WIDTH to the input parameter, but by shifting COUNT, and not 1. That produces the same result, and it relieves keybarr of the need to test to avoid shifting by more than 63 bits, since level is always <= 63. This takes 3 instrutions and 14 bytes out of the basic lookup loop on amd64. Reviewed by: kib Tested by: pho (as part of a larger change) Differential Revision: https://reviews.freebsd.org/D41226 --- sys/kern/subr_pctrie.c | 76 +++++++++++++++++++----------------------------- sys/vm/vm_radix.c | 78 ++++++++++++++++++++------------------------------ 2 files changed, 60 insertions(+), 94 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 6d45d9762a78..c08e4b5910a5 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -83,17 +83,13 @@ _Static_assert(sizeof(pn_popmap_t) <= sizeof(int), #define PCTRIE_FLAGS (PCTRIE_ISLEAF) #define PCTRIE_PAD PCTRIE_FLAGS -/* Returns one unit associated with specified level. */ -#define PCTRIE_UNITLEVEL(lev) \ - ((uint64_t)1 << ((lev) * PCTRIE_WIDTH)) - struct pctrie_node; typedef SMR_POINTER(struct pctrie_node *) smr_pctnode_t; struct pctrie_node { uint64_t pn_owner; /* Owner of record. */ pn_popmap_t pn_popmap; /* Valid children. */ - uint8_t pn_clev; /* Current level. */ + uint8_t pn_clev; /* Level * WIDTH. */ smr_pctnode_t pn_child[PCTRIE_COUNT]; /* Child nodes. */ }; @@ -108,14 +104,14 @@ static __inline void pctrie_node_store(smr_pctnode_t *p, void *val, static __inline int pctrie_slot(uint64_t index, uint16_t level) { - return ((index >> (level * PCTRIE_WIDTH)) & PCTRIE_MASK); + return ((index >> level) & PCTRIE_MASK); } -/* Computes the key (index) with the low-order 'level' radix-digits zeroed. */ +/* Computes the key (index) with the low-order 'level' + 1 radix-digits zeroed. */ static __inline uint64_t pctrie_trimkey(uint64_t index, uint16_t level) { - return (index & -PCTRIE_UNITLEVEL(level)); + return (index & -((uint64_t)PCTRIE_COUNT << level)); } /* @@ -124,7 +120,7 @@ pctrie_trimkey(uint64_t index, uint16_t level) */ static struct pctrie_node * pctrie_node_get(struct pctrie *ptree, pctrie_alloc_t allocfn, uint64_t index, - uint16_t clevel) + uint64_t newind) { struct pctrie_node *node; @@ -142,8 +138,20 @@ pctrie_node_get(struct pctrie *ptree, pctrie_alloc_t allocfn, uint64_t index, PCTRIE_NULL, PCTRIE_UNSERIALIZED); node->pn_popmap = 0; } - node->pn_owner = pctrie_trimkey(index, clevel + 1); - node->pn_clev = clevel; + + /* + * 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(uint64_t), + "uint64 too wide"); + _Static_assert(sizeof(uint64_t) * NBBY <= + (1 << (sizeof(node->pn_clev) * NBBY)), "pn_clev too narrow"); + node->pn_clev = rounddown(flsll(index ^ newind) - 1, PCTRIE_WIDTH); + node->pn_owner = pctrie_trimkey(index, node->pn_clev); return (node); } @@ -259,37 +267,18 @@ pctrie_toval(struct pctrie_node *node) * Make 'child' a child of 'node'. */ static __inline void -pctrie_addnode(struct pctrie_node *node, uint64_t index, uint16_t clev, +pctrie_addnode(struct pctrie_node *node, uint64_t index, struct pctrie_node *child, enum pctrie_access access) { int slot; - slot = pctrie_slot(index, clev); + slot = pctrie_slot(index, node->pn_clev); pctrie_node_store(&node->pn_child[slot], child, access); node->pn_popmap ^= 1 << slot; KASSERT((node->pn_popmap & (1 << slot)) != 0, ("%s: bad popmap slot %d in node %p", __func__, slot, node)); } -/* - * Returns the level where two keys differ. - * It cannot accept 2 equal keys. - */ -static __inline uint16_t -pctrie_keydiff(uint64_t index1, uint64_t index2) -{ - - KASSERT(index1 != index2, ("%s: passing the same key value %jx", - __func__, (uintmax_t)index1)); - CTASSERT(sizeof(long long) >= sizeof(uint64_t)); - - /* - * From the highest-order bit where the indexes differ, - * compute the highest level in the trie where they differ. - */ - return ((flsll(index1 ^ index2) - 1) / PCTRIE_WIDTH); -} - /* * Returns TRUE if it can be determined that key does not belong to the * specified node. Otherwise, returns FALSE. @@ -297,12 +286,8 @@ pctrie_keydiff(uint64_t index1, uint64_t index2) static __inline bool pctrie_keybarr(struct pctrie_node *node, uint64_t idx) { - - if (node->pn_clev < PCTRIE_LIMIT) { - idx = pctrie_trimkey(idx, node->pn_clev + 1); - return (idx != node->pn_owner); - } - return (false); + idx = pctrie_trimkey(idx, node->pn_clev); + return (idx != node->pn_owner); } /* @@ -366,7 +351,6 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) struct pctrie_node *leaf, *node, *parent; smr_pctnode_t *parentp; int slot; - uint16_t clev; index = *val; leaf = pctrie_toleaf(val); @@ -383,8 +367,7 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) if (parent == NULL) ptree->pt_root = leaf; else - pctrie_addnode(parent, index, - parent->pn_clev, leaf, + pctrie_addnode(parent, index, leaf, PCTRIE_LOCKED); return (0); } @@ -411,13 +394,12 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) */ parentp = (parent != NULL) ? &parent->pn_child[slot]: (smr_pctnode_t *)&ptree->pt_root; - clev = pctrie_keydiff(newind, index); - parent = pctrie_node_get(ptree, allocfn, index, clev); + parent = pctrie_node_get(ptree, allocfn, index, newind); if (parent == NULL) return (ENOMEM); /* These writes are not yet visible due to ordering. */ - pctrie_addnode(parent, index, clev, leaf, PCTRIE_UNSERIALIZED); - pctrie_addnode(parent, newind, clev, node, PCTRIE_UNSERIALIZED); + pctrie_addnode(parent, index, leaf, PCTRIE_UNSERIALIZED); + pctrie_addnode(parent, newind, node, PCTRIE_UNSERIALIZED); /* Synchronize to make the above visible. */ pctrie_node_store(parentp, parent, PCTRIE_LOCKED); return (0); @@ -714,7 +696,7 @@ DB_SHOW_COMMAND(pctrienode, db_show_pctrienode) node = (struct pctrie_node *)addr; db_printf("node %p, owner %jx, children popmap %04x, level %u:\n", (void *)node, (uintmax_t)node->pn_owner, node->pn_popmap, - node->pn_clev); + node->pn_clev / PCTRIE_WIDTH); for (popmap = node->pn_popmap; popmap != 0; popmap ^= 1 << slot) { slot = ffs(popmap) - 1; tmp = pctrie_node_load(&node->pn_child[slot], NULL, @@ -722,7 +704,7 @@ DB_SHOW_COMMAND(pctrienode, db_show_pctrienode) db_printf("slot: %d, val: %p, value: %p, clev: %d\n", slot, (void *)tmp, pctrie_isleaf(tmp) ? pctrie_toval(tmp) : NULL, - node->pn_clev); + node->pn_clev / PCTRIE_WIDTH); } } #endif /* DDB */ diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 3c4ea9568108..f50f9e3605a1 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -107,10 +107,6 @@ _Static_assert(sizeof(rn_popmap_t) <= sizeof(int), #define VM_RADIX_FLAGS (VM_RADIX_ISLEAF) #define VM_RADIX_PAD VM_RADIX_FLAGS -/* Returns one unit associated with specified level. */ -#define VM_RADIX_UNITLEVEL(lev) \ - ((vm_pindex_t)1 << ((lev) * VM_RADIX_WIDTH)) - enum vm_radix_access { SMR, LOCKED, UNSERIALIZED }; struct vm_radix_node; @@ -119,7 +115,7 @@ 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; /* Current level. */ + uint8_t rn_clev; /* Level * WIDTH. */ smrnode_t rn_child[VM_RADIX_COUNT]; /* Child nodes. */ }; @@ -135,21 +131,22 @@ static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, static __inline int vm_radix_slot(vm_pindex_t index, uint16_t level) { - return ((index >> (level * VM_RADIX_WIDTH)) & VM_RADIX_MASK); + return ((index >> level) & VM_RADIX_MASK); } -/* Computes the key (index) with the low-order 'level' radix-digits zeroed. */ +/* Computes the key (index) with the low-order 'level' + 1 radix-digits + * zeroed. */ static __inline vm_pindex_t vm_radix_trimkey(vm_pindex_t index, uint16_t level) { - return (index & -VM_RADIX_UNITLEVEL(level)); + return (index & -((vm_pindex_t)VM_RADIX_COUNT << level)); } /* * Allocate a radix node. */ static struct vm_radix_node * -vm_radix_node_get(vm_pindex_t index, uint16_t clevel) +vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) { struct vm_radix_node *rnode; @@ -167,8 +164,20 @@ vm_radix_node_get(vm_pindex_t index, uint16_t clevel) VM_RADIX_NULL, UNSERIALIZED); rnode->rn_popmap = 0; } - rnode->rn_owner = vm_radix_trimkey(index, clevel + 1); - rnode->rn_clev = clevel; + + /* + * 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_trimkey(index, rnode->rn_clev); return (rnode); } @@ -284,37 +293,18 @@ vm_radix_topage(struct vm_radix_node *rnode) * Make 'child' a child of 'rnode'. */ static __inline void -vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, uint16_t clev, +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(index, clev); + slot = vm_radix_slot(index, rnode->rn_clev); 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)); } -/* - * Returns the level where two keys differ. - * It cannot accept 2 equal keys. - */ -static __inline uint16_t -vm_radix_keydiff(vm_pindex_t index1, vm_pindex_t index2) -{ - - KASSERT(index1 != index2, ("%s: passing the same key value %jx", - __func__, (uintmax_t)index1)); - CTASSERT(sizeof(long long) >= sizeof(vm_pindex_t)); - - /* - * From the highest-order bit where the indexes differ, - * compute the highest level in the trie where they differ. - */ - return ((flsll(index1 ^ index2) - 1) / VM_RADIX_WIDTH); -} - /* * Returns TRUE if it can be determined that key does not belong to the * specified rnode. Otherwise, returns FALSE. @@ -322,12 +312,8 @@ vm_radix_keydiff(vm_pindex_t index1, vm_pindex_t index2) static __inline bool vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) { - - if (rnode->rn_clev < VM_RADIX_LIMIT) { - idx = vm_radix_trimkey(idx, rnode->rn_clev + 1); - return (idx != rnode->rn_owner); - } - return (false); + idx = vm_radix_trimkey(idx, rnode->rn_clev); + return (idx != rnode->rn_owner); } /* @@ -420,7 +406,6 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) struct vm_radix_node *leaf, *parent, *rnode; smrnode_t *parentp; int slot; - uint16_t clev; index = page->pindex; leaf = vm_radix_toleaf(page); @@ -437,8 +422,8 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) if (parent == NULL) rtree->rt_root = leaf; else - vm_radix_addnode(parent, index, - parent->rn_clev, leaf, LOCKED); + vm_radix_addnode(parent, index, leaf, + LOCKED); return (0); } newind = vm_radix_topage(rnode)->pindex; @@ -463,13 +448,12 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) */ parentp = (parent != NULL) ? &parent->rn_child[slot]: (smrnode_t *)&rtree->rt_root; - clev = vm_radix_keydiff(newind, index); - parent = vm_radix_node_get(index, clev); + 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, clev, leaf, UNSERIALIZED); - vm_radix_addnode(parent, newind, clev, rnode, UNSERIALIZED); + 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); @@ -808,14 +792,14 @@ DB_SHOW_COMMAND(radixnode, db_show_radixnode) 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); + 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); + rnode->rn_clev / VM_RADIX_WIDTH); } } #endif /* DDB */ From nobody Sun Jul 30 10:30: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 4RDHhf6Cygz4q8Yq; Sun, 30 Jul 2023 10:30:49 +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 4RDHhR1NzJz3wWZ; Sun, 30 Jul 2023 10:30:46 +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 36UAUbcN016978; Sun, 30 Jul 2023 13:30:37 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 36UAUbjj016977; Sun, 30 Jul 2023 13:30:37 +0300 (MSK) (envelope-from dchagin) Date: Sun, 30 Jul 2023 13:30:37 +0300 From: Dmitry Chagin To: Alan Cox Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 50d663b14b31 - main - vm: Fix vm_map_find_min() Message-ID: References: <202307260525.36Q5PbRm027006@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: <202307260525.36Q5PbRm027006@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4RDHhR1NzJz3wWZ X-Spamd-Bar: - On Wed, Jul 26, 2023 at 05:25:37AM +0000, Alan Cox wrote: > The branch main has been updated by alc: > > URL: https://cgit.FreeBSD.org/src/commit/?id=50d663b14b310d6020b4b6cc92d4fae985f086f2 > > commit 50d663b14b310d6020b4b6cc92d4fae985f086f2 > Author: Alan Cox > AuthorDate: 2023-07-25 07:24:19 +0000 > Commit: Alan Cox > CommitDate: 2023-07-26 05:24:50 +0000 > > vm: Fix vm_map_find_min() > > Fix the handling of address hints that are less than min_addr by > vm_map_find_min(). > Thank you for fixing that, however it still fails under Linuxulator. #include #include #include #include #include #include #include #include int main(int argc, char** argv) { struct stat sb; void *s32; int f, r; f = open(argv[0], O_RDONLY); assert(f > 0); r = fstat(f, &sb); assert(r == 0); s32 = mmap(NULL, sb.st_size, PROT_READ, MAP_32BIT|MAP_PRIVATE, f, 0); assert(s32 != MAP_FAILED); assert((uintptr_t)s32 < 0x80000000); close(f); munmap(s32, sb.st_size); return (0); } > Reported by: dchagin > Reviewed by: kib > Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" > Differential Revision: https://reviews.freebsd.org/D41159 > --- > sys/vm/vm_map.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c > index 444e09986d4e..eb607d519247 100644 > --- a/sys/vm/vm_map.c > +++ b/sys/vm/vm_map.c > @@ -2255,10 +2255,10 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, > int rv; > > hint = *addr; > - if (hint == 0) > + if (hint == 0) { > cow |= MAP_NO_HINT; > - if (hint < min_addr) > *addr = hint = min_addr; > + } > for (;;) { > rv = vm_map_find(map, object, offset, addr, length, max_addr, > find_space, prot, max, cow); From nobody Sun Jul 30 10:58:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RDJLR6vV9z4q9Ct; Sun, 30 Jul 2023 11:00:15 +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 4RDJHz2WkVz40bc; Sun, 30 Jul 2023 10:58:06 +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 36UAw5Uu017121; Sun, 30 Jul 2023 13:58:05 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 36UAw5GG017120; Sun, 30 Jul 2023 13:58:05 +0300 (MSK) (envelope-from dchagin) Date: Sun, 30 Jul 2023 13:58:05 +0300 From: Dmitry Chagin To: Alan Cox Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 50d663b14b31 - main - vm: Fix vm_map_find_min() Message-ID: References: <202307260525.36Q5PbRm027006@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: X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4RDJHz2WkVz40bc X-Spamd-Bar: - On Sun, Jul 30, 2023 at 01:30:37PM +0300, Dmitry Chagin wrote: > On Wed, Jul 26, 2023 at 05:25:37AM +0000, Alan Cox wrote: > > The branch main has been updated by alc: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=50d663b14b310d6020b4b6cc92d4fae985f086f2 > > > > commit 50d663b14b310d6020b4b6cc92d4fae985f086f2 > > Author: Alan Cox > > AuthorDate: 2023-07-25 07:24:19 +0000 > > Commit: Alan Cox > > CommitDate: 2023-07-26 05:24:50 +0000 > > > > vm: Fix vm_map_find_min() > > > > Fix the handling of address hints that are less than min_addr by > > vm_map_find_min(). > > > Thank you for fixing that, however it still fails under Linuxulator. > > > #include > #include > > #include > #include > #include > #include > #include > #include > > int > main(int argc, char** argv) > { > struct stat sb; > void *s32; > int f, r; > > f = open(argv[0], O_RDONLY); > assert(f > 0); > > r = fstat(f, &sb); > assert(r == 0); > > s32 = mmap(NULL, sb.st_size, PROT_READ, > MAP_32BIT|MAP_PRIVATE, f, 0); > assert(s32 != MAP_FAILED); > assert((uintptr_t)s32 < 0x80000000); > > close(f); > munmap(s32, sb.st_size); > return (0); > } > hmm, it also fails natively with disable aslr > > > > Reported by: dchagin > > Reviewed by: kib > > Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" > > Differential Revision: https://reviews.freebsd.org/D41159 > > --- > > sys/vm/vm_map.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c > > index 444e09986d4e..eb607d519247 100644 > > --- a/sys/vm/vm_map.c > > +++ b/sys/vm/vm_map.c > > @@ -2255,10 +2255,10 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, > > int rv; > > > > hint = *addr; > > - if (hint == 0) > > + if (hint == 0) { > > cow |= MAP_NO_HINT; > > - if (hint < min_addr) > > *addr = hint = min_addr; > > + } > > for (;;) { > > rv = vm_map_find(map, object, offset, addr, length, max_addr, > > find_space, prot, max, cow); From nobody Sun Jul 30 15: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 4RDQjv1dG8z4p9Nd; Sun, 30 Jul 2023 15:47: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 4RDQjg3S9Rz4Kfc; Sun, 30 Jul 2023 15:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjJ6nKOe1I8y1DeSFwb3ddzdb7TtdyoTIdc4/Ft3ApU=; b=AV6pnWObMtWegxQ3uEJOFmLfgUftlLbN0kmZ+3eEP/FbVVncUPeLO+cz0SGBkgtAwBIRe1 mS30Gork4G6HatNkEYMcVujjfk+E1D/UYsxKQF5nFOZpFATLWCHex0cDqhX9BEyHQzcQUB X3MLaq1PPPLFKoHgAeoUupaFuZQuF7nVQtU1lgKXtD6yjaYnDLhxKaNt1eDWKGDAiJGu2i htxIPRlsR9T9omZ90r8GVVJeoszZNOZi8E9Y/hGjBHhXFeutt+4S5/k/sby3OEy4L3vwjZ 4pn19ASAzg7JXRtT7isQ8Q0SAAOP7+HDhieK4NJg8QB+E5XsWPJ1t7kfFbJZZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjJ6nKOe1I8y1DeSFwb3ddzdb7TtdyoTIdc4/Ft3ApU=; b=aSykVwm1gq875NV86gGQTSiOEqvCqtoZ77chi4ZLXbq+1+RtrW5wM8yD47q2axuBztPCL+ +mSjV10bG8NhKgbyau9jXHz1eiPsiA6rB2TJyItzy7hMq4FlLipo/fuKQBlU9lqOlhyZO/ zl/l8PmowJ4XEDF/Jhmw2qIfbf05q97W7AEE2ZpDmdm3bHBazWmwv5Dh4m3e362Awhog1/ rPmQBHHGpF9+oqOLmdbv17uin3MiFAuQfhG70s0Yt2vZ1Xv0MuYMsqiKH1m1/PfOe0RE/O bIsQEfDf20Cp/8I8iQ3j3Nuyq0BnxsErtOGJQ9O38d/PAWJFO5hh3Z+RhHKb5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690732039; a=rsa-sha256; cv=none; b=NOf7QBQ4imRnwCueQ+GVQUNogYTiq7rMi0p35FljVXSxBA6I27C5WZdw+8Hd7FVG8IDRFn C94hqHfhdzpGus+d1cOzWLwSa0joWNSocl4GPJCPHYZjnuAZINGqh7zi/bf4S2ZQ1g/jqZ sGIyVwPY83QEMPmj7nmuJnhg2WeV2oGJstth3wgENdBm7fyUJZIDTllsdHdT+kWkNluQP4 w4Bs4v5Lnman47dVwJTI4LajzpzpJLsD2cBNcdDlj4CxoDAMfWXc62YzuNHI956Akvkf0J cEY7JiRTNhDpzsCIkhkojlMHRALdZT3Y70I9lEzEOxgfU8C8iDpgqYp1O8LQGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDQjg0X3HzKjd; Sun, 30 Jul 2023 15:47: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 36UFlH57089124; Sun, 30 Jul 2023 15: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 36UFlHLk089123; Sun, 30 Jul 2023 15:47:17 GMT (envelope-from git) Date: Sun, 30 Jul 2023 15:47:17 GMT Message-Id: <202307301547.36UFlHLk089123@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: 5ad29bc8d4d4 - main - amd64: Fix TLB invalidation routines in !SMP 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ad29bc8d4d436660954f6db507909965369fc32 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ad29bc8d4d436660954f6db507909965369fc32 commit 5ad29bc8d4d436660954f6db507909965369fc32 Author: Mark Johnston AuthorDate: 2023-07-30 15:12:35 +0000 Commit: Mark Johnston CommitDate: 2023-07-30 15:12:35 +0000 amd64: Fix TLB invalidation routines in !SMP kernels amd64 is special in that its implementation of zpcpu_offset_cpu() is not the identity transformation, even in !SMP kernels. Because the pm_pcidp array of amd64's struct pmap is allocated from a pcpu UMA zone, this means that accessing pm_pcidp directly, as is done in !SMP implementations of pmap_invalidate_*, does not work. Specifically, I see occasional unexplicable crashes in userspace when PCIDs are enabled. Apply a minimal patch to fix the problem. While it would also make sense to provide separate implementations of zpcpu_* for !SMP kernels, fixing it this way makes the SMP and !SMP implementations of pmap_invalidate_* more similar. Reviewed by: alc, kib MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41230 --- sys/amd64/amd64/pmap.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index c1968fc11844..5bc40bd00a32 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -3489,6 +3489,7 @@ void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { struct invpcid_descr d; + struct pmap_pcid *pcidp; uint64_t kcr3, ucr3; uint32_t pcid; @@ -3504,7 +3505,7 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va) if (pmap == PCPU_GET(curpmap) && pmap_pcid_enabled && pmap->pm_ucr3 != PMAP_NO_CR3) { critical_enter(); - pcid = pmap->pm_pcidp->pm_pcid; + pcid = pmap_get_pcid(pmap); if (invpcid_works) { d.pcid = pcid | PMAP_PCID_USER_PT; d.pad = 0; @@ -3518,16 +3519,20 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va) } critical_exit(); } - } else if (pmap_pcid_enabled) - pmap->pm_pcidp->pm_gen = 0; + } else if (pmap_pcid_enabled) { + pcidp = zpcpu_get(pmap->pm_pcidp); + pcidp->pm_gen = 0; + } } void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { struct invpcid_descr d; + struct pmap_pcid *pcidp; vm_offset_t addr; uint64_t kcr3, ucr3; + uint32_t pcid; if (pmap->pm_type == PT_RVI || pmap->pm_type == PT_EPT) { pmap->pm_eptgen++; @@ -3542,24 +3547,24 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) if (pmap == PCPU_GET(curpmap) && pmap_pcid_enabled && pmap->pm_ucr3 != PMAP_NO_CR3) { critical_enter(); + pcid = pmap_get_pcid(pmap); if (invpcid_works) { - d.pcid = pmap->pm_pcidp->pm_pcid | - PMAP_PCID_USER_PT; + d.pcid = pcid | PMAP_PCID_USER_PT; d.pad = 0; d.addr = sva; for (; d.addr < eva; d.addr += PAGE_SIZE) invpcid(&d, INVPCID_ADDR); } else { - kcr3 = pmap->pm_cr3 | pmap->pm_pcidp-> - pm_pcid | CR3_PCID_SAVE; - ucr3 = pmap->pm_ucr3 | pmap->pm_pcidp-> - pm_pcid | PMAP_PCID_USER_PT | CR3_PCID_SAVE; + kcr3 = pmap->pm_cr3 | pcid | CR3_PCID_SAVE; + ucr3 = pmap->pm_ucr3 | pcid | + PMAP_PCID_USER_PT | CR3_PCID_SAVE; pmap_pti_pcid_invlrng(ucr3, kcr3, sva, eva); } critical_exit(); } } else if (pmap_pcid_enabled) { - pmap->pm_pcidp->pm_gen = 0; + pcidp = zpcpu_get(pmap->pm_pcidp); + pcidp->pm_gen = 0; } } @@ -3567,7 +3572,9 @@ void pmap_invalidate_all(pmap_t pmap) { struct invpcid_descr d; + struct pmap_pcid *pcidp; uint64_t kcr3, ucr3; + uint32_t pcid; if (pmap->pm_type == PT_RVI || pmap->pm_type == PT_EPT) { pmap->pm_eptgen++; @@ -3586,8 +3593,9 @@ pmap_invalidate_all(pmap_t pmap) } else if (pmap == PCPU_GET(curpmap)) { if (pmap_pcid_enabled) { critical_enter(); + pcid = pmap_get_pcid(pmap); if (invpcid_works) { - d.pcid = pmap->pm_pcidp->pm_pcid; + d.pcid = pcid; d.pad = 0; d.addr = 0; invpcid(&d, INVPCID_CTX); @@ -3596,10 +3604,10 @@ pmap_invalidate_all(pmap_t pmap) invpcid(&d, INVPCID_CTX); } } else { - kcr3 = pmap->pm_cr3 | pmap->pm_pcidp->pm_pcid; + kcr3 = pmap->pm_cr3 | pcid; if (pmap->pm_ucr3 != PMAP_NO_CR3) { - ucr3 = pmap->pm_ucr3 | pmap->pm_pcidp-> - pm_pcid | PMAP_PCID_USER_PT; + ucr3 = pmap->pm_ucr3 | pcid | + PMAP_PCID_USER_PT; pmap_pti_pcid_invalidate(ucr3, kcr3); } else load_cr3(kcr3); @@ -3609,7 +3617,8 @@ pmap_invalidate_all(pmap_t pmap) invltlb(); } } else if (pmap_pcid_enabled) { - pmap->pm_pcidp->pm_gen = 0; + pcidp = zpcpu_get(pmap->pm_pcidp); + pcidp->pm_gen = 0; } } @@ -3623,12 +3632,15 @@ pmap_invalidate_cache(void) static void pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde) { + struct pmap_pcid *pcidp; pmap_update_pde_store(pmap, pde, newpde); if (pmap == kernel_pmap || pmap == PCPU_GET(curpmap)) pmap_update_pde_invalidate(pmap, va, newpde); - else - pmap->pm_pcidp->pm_gen = 0; + else { + pcidp = zpcpu_get(pmap->pm_pcidp); + pcidp->pm_gen = 0; + } } #endif /* !SMP */ From nobody Sun Jul 30 17:35: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 4RDT6R4KxGz4pFyp; Sun, 30 Jul 2023 17:35:11 +0000 (UTC) (envelope-from alc@rice.edu) Received: from mx0b-0010f301.pphosted.com (mx0b-0010f301.pphosted.com [148.163.153.244]) (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 4RDT640Myvz3DGM; Sun, 30 Jul 2023 17:35:07 +0000 (UTC) (envelope-from alc@rice.edu) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0102859.ppops.net [127.0.0.1]) by mx0b-0010f301.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 36UHU1Fr020751; Sun, 30 Jul 2023 12:35:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rice.edu; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s=ricemail; bh=bqc/bjdJ2hVo5qu/Q0nxbfLmVoLk5tFmkOzvnrDhGbM=; b=WHZNS521nte8 jnIQ3BHa5TB+GDkROi9rlOOdtD8DjU8JuDRlHacXy/dFqFiBoBlViwyAuv7RRe/a NSvX2t4MoivnKwNtAwBDbxPQ/9t0m18+aGf2yw1YSX0189yFzxUE6GLBuHB/2lmn RqmJGVkebJQN8KuR2Q855kJuF0Mst4gmCCnD2A7OtXlX/BThKkGYnIM/WAJqvlnd u+rG50Oi/O2LM4YvJyHZefav+EKC7jAU1Lq1dlIuBT+SIAqPdZors3Lk3uyQLJDt 7BdtZS5B6EEz9rHu0I5dqFDwM/OU7tAf2ayoAlzfs82thvmpFBKMkS8bbPD17Oy+ LyFq95CCaQ== Received: from mh3.mail.rice.edu (mh3.mail.rice.edu [128.42.199.10]) by mx0b-0010f301.pphosted.com (PPS) with ESMTPS id 3s5hacrd3q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 30 Jul 2023 12:35:04 -0500 (CDT) Received-X: from mh3.mail.rice.edu (localhost [127.0.0.1]) by mh3.mail.rice.edu (Postfix) with ESMTP id A19EA604084; Sun, 30 Jul 2023 12:35:03 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mh3.mail.rice.edu (Postfix) with ESMTP id A02496037D9; Sun, 30 Jul 2023 12:35:03 -0500 (CDT) X-Virus-Scanned: by amavis-2.12.1 at mh3.mail.rice.edu, auth channel Received: from mh3.mail.rice.edu ([127.0.0.1]) by localhost (mh3.mail.rice.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id QKheXE1uBzcN; Sun, 30 Jul 2023 12:35:03 -0500 (CDT) Received: from [108.254.203.201] (108-254-203-201.lightspeed.hstntx.sbcglobal.net [108.254.203.201]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: alc) by mh3.mail.rice.edu (Postfix) with ESMTPSA id E8617209EA5; Sun, 30 Jul 2023 12:35:02 -0500 (CDT) Message-ID: Date: Sun, 30 Jul 2023 12:35:02 -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.11.0 Subject: Re: git: 50d663b14b31 - main - vm: Fix vm_map_find_min() Content-Language: en-US To: Dmitry Chagin , Alan Cox Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202307260525.36Q5PbRm027006@gitrepo.freebsd.org> From: Alan Cox In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-27_10,2023-07-26_01,2023-05-22_02 X-Rspamd-Queue-Id: 4RDT640Myvz3DGM X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:148.163.152.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated I see.  That change fixed the case where the address hint is non-zero, e.g., 0x100000, but not zero. On 7/30/23 05:58, Dmitry Chagin wrote: > On Sun, Jul 30, 2023 at 01:30:37PM +0300, Dmitry Chagin wrote: >> On Wed, Jul 26, 2023 at 05:25:37AM +0000, Alan Cox wrote: >>> The branch main has been updated by alc: >>> >>> URL: https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=50d663b14b310d6020b4b6cc92d4fae985f086f2__;!!BuQPrrmRaQ!mJGmkdRJ06TT6ocFnVe7lPS7hSNIIhrCQH9IKMbB6XZVJuiUc2_wPJ55o1zzD6AhClmQwgQKHvKnW4rs75yVrtax$ >>> >>> commit 50d663b14b310d6020b4b6cc92d4fae985f086f2 >>> Author: Alan Cox >>> AuthorDate: 2023-07-25 07:24:19 +0000 >>> Commit: Alan Cox >>> CommitDate: 2023-07-26 05:24:50 +0000 >>> >>> vm: Fix vm_map_find_min() >>> >>> Fix the handling of address hints that are less than min_addr by >>> vm_map_find_min(). >>> >> Thank you for fixing that, however it still fails under Linuxulator. >> >> >> #include >> #include >> >> #include >> #include >> #include >> #include >> #include >> #include >> >> int >> main(int argc, char** argv) >> { >> struct stat sb; >> void *s32; >> int f, r; >> >> f = open(argv[0], O_RDONLY); >> assert(f > 0); >> >> r = fstat(f, &sb); >> assert(r == 0); >> >> s32 = mmap(NULL, sb.st_size, PROT_READ, >> MAP_32BIT|MAP_PRIVATE, f, 0); >> assert(s32 != MAP_FAILED); >> assert((uintptr_t)s32 < 0x80000000); >> >> close(f); >> munmap(s32, sb.st_size); >> return (0); >> } >> > hmm, it also fails natively with disable aslr > > >> >>> Reported by: dchagin >>> Reviewed by: kib >>> Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" >>> Differential Revision: https://urldefense.com/v3/__https://reviews.freebsd.org/D41159__;!!BuQPrrmRaQ!mJGmkdRJ06TT6ocFnVe7lPS7hSNIIhrCQH9IKMbB6XZVJuiUc2_wPJ55o1zzD6AhClmQwgQKHvKnW4rs70ygLqzX$ >>> --- >>> sys/vm/vm_map.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c >>> index 444e09986d4e..eb607d519247 100644 >>> --- a/sys/vm/vm_map.c >>> +++ b/sys/vm/vm_map.c >>> @@ -2255,10 +2255,10 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, >>> int rv; >>> >>> hint = *addr; >>> - if (hint == 0) >>> + if (hint == 0) { >>> cow |= MAP_NO_HINT; >>> - if (hint < min_addr) >>> *addr = hint = min_addr; >>> + } >>> for (;;) { >>> rv = vm_map_find(map, object, offset, addr, length, max_addr, >>> find_space, prot, max, cow); From nobody Sun Jul 30 20: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 4RDXnb3wKzz4pQ2s; Sun, 30 Jul 2023 20:21: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 4RDXnZ20Xvz3lrc; Sun, 30 Jul 2023 20: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=1690748466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9x16U0V7DBwWUeEVrms4iUIBjd0tdIyrxrgYzFW8oM=; b=jtDZP5+W8CWxZh+D85ps4w0ltHHbwfXfY0shdcswQ89jEMzAAkEcPtLrFMZ8TDF5xdhh8F UER7h2ZiCdoO1dm44ZHDCq46bUyLq2/Xd5zeXu4Rb9uhLz4Qabg5GtBj0ByUKU3XCcyvMY Jv1scqfoGgFEascdrRKNzP9nxiCF88An5RLYFQ8QNsM5Q+L22RpQM2X86kC4iwmvyanoeA mFmMtU6db08KxIwOkXiTJREON9IGD2hfYNMA0cUKWuT12yDANwdNwOp28enhtyKuakxEPo z60n/uHnXI7xy5oacIhsJJkQC6cPQHk0HL9FLpSwN8OpHyC38i22QZ/BfnULXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690748466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9x16U0V7DBwWUeEVrms4iUIBjd0tdIyrxrgYzFW8oM=; b=n0WIYNn/I91ib55KTk+sxfpWOZaXDbCK8NblEYy06uuMWEbMrvM6Xyu4rRux2yfAe6hkYb oKcWoLNhicmc3Flglb+hekUzdeayOdFsdIwIxDDrIX2Jh9+pmftji5ydnTUJVNbBDAnUJ7 45AIjZ3FJ8h8L1TxviDAFwtyhJ49Nb7aY4L+bzW8LRcVQEs254/OzSswF3/Tzzhj57lOHm Plz5T0g8nQzHVqTUhYqO9REVBnkOqt5T/qR7JJm1X46tHOj5TyfXWcYQm2TL96DQl1BXZE dZLYeVtxNmqlWZwLS1M06eHs+Te4zhdBlfSDSV4scPtLm96OQjvmkjZkmooG4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690748466; a=rsa-sha256; cv=none; b=BWl8mZHjzDWGVuxkq50EmLB1JDB/JCMWSqFIBzuQwsZpoeMJcoQZ22ZfSlH2rcJ8WRWvcd /15+lTQ7ML/YrcYDyFE76I9earupKBBkZIlxDVFjaynsWimj6g/mPnnYiUx5NEDo3WDWt1 cOdSANCIH+qro9p5rw2XbZlOcXhplD2Rhd8+Z6sgEriHBhAwA8TwiND2tGdqjKJLdLkHdx A911ZAcV6WCzfRD1Z6lU6mjXKJtMpzjA8FDO1Dbp0gVF4vkmqEZRcMFOdiBbIfhdNPiep2 6aJLZg+Qpn557cYwEFwThD+L6zefQJ/EASOf362MtiuqAovq7fU3i3y9Zb2G5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDXnY4dHPzSP9; Sun, 30 Jul 2023 20: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 36UKL5RG048771; Sun, 30 Jul 2023 20: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 36UKL54O048770; Sun, 30 Jul 2023 20:21:05 GMT (envelope-from git) Date: Sun, 30 Jul 2023 20:21:05 GMT Message-Id: <202307302021.36UKL54O048770@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: ac0572e66067 - main - radix_tree: compute slot from keybarr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ac0572e6606746aa0e9f39fb6439f9a20a455743 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=ac0572e6606746aa0e9f39fb6439f9a20a455743 commit ac0572e6606746aa0e9f39fb6439f9a20a455743 Author: Doug Moore AuthorDate: 2023-07-30 20:12:06 +0000 Commit: Doug Moore CommitDate: 2023-07-30 20:12:06 +0000 radix_tree: compute slot from keybarr The computation of keybarr(), the function that determines when a search has failed at a non-leaf node, can be done in a way that computes the 'slot' value when keybarr() fails, which is exactly when slot() would next be invoked. Computing things this way saves space in search loops. This reduces the amd64 coding of the search loop in vm_radix_lookup from 40 bytes to 28 bytes. Reviewed by: alc Tested by: pho (as part of a larger change) Differential Revision: https://reviews.freebsd.org/D41235 --- sys/kern/subr_pctrie.c | 57 +++++++++++++++++++++------------------------- sys/vm/vm_radix.c | 61 +++++++++++++++++++++----------------------------- 2 files changed, 51 insertions(+), 67 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index c08e4b5910a5..c0e100173adc 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -99,19 +99,26 @@ static __inline void pctrie_node_store(smr_pctnode_t *p, void *val, enum pctrie_access access); /* - * Return the position in the array for a given level. + * Map index to an array position for the children of node, */ static __inline int -pctrie_slot(uint64_t index, uint16_t level) +pctrie_slot(struct pctrie_node *node, uint64_t index) { - return ((index >> level) & PCTRIE_MASK); + return ((index >> node->pn_clev) & PCTRIE_MASK); } -/* Computes the key (index) with the low-order 'level' + 1 radix-digits zeroed. */ -static __inline uint64_t -pctrie_trimkey(uint64_t index, uint16_t level) +/* + * Returns true if index does not belong to the specified node. Otherwise, + * sets slot value, and returns false. + */ +static __inline bool +pctrie_keybarr(struct pctrie_node *node, uint64_t index, int *slot) { - return (index & -((uint64_t)PCTRIE_COUNT << level)); + index = (index - node->pn_owner) >> node->pn_clev; + if (index >= PCTRIE_COUNT) + return (true); + *slot = index; + return (false); } /* @@ -151,7 +158,8 @@ pctrie_node_get(struct pctrie *ptree, pctrie_alloc_t allocfn, uint64_t index, _Static_assert(sizeof(uint64_t) * NBBY <= (1 << (sizeof(node->pn_clev) * NBBY)), "pn_clev too narrow"); node->pn_clev = rounddown(flsll(index ^ newind) - 1, PCTRIE_WIDTH); - node->pn_owner = pctrie_trimkey(index, node->pn_clev); + node->pn_owner = PCTRIE_COUNT; + node->pn_owner = index & -(node->pn_owner << node->pn_clev); return (node); } @@ -272,24 +280,13 @@ pctrie_addnode(struct pctrie_node *node, uint64_t index, { int slot; - slot = pctrie_slot(index, node->pn_clev); + slot = pctrie_slot(node, index); pctrie_node_store(&node->pn_child[slot], child, access); node->pn_popmap ^= 1 << slot; KASSERT((node->pn_popmap & (1 << slot)) != 0, ("%s: bad popmap slot %d in node %p", __func__, slot, node)); } -/* - * Returns TRUE if it can be determined that key does not belong to the - * specified node. Otherwise, returns FALSE. - */ -static __inline bool -pctrie_keybarr(struct pctrie_node *node, uint64_t idx) -{ - idx = pctrie_trimkey(idx, node->pn_clev); - return (idx != node->pn_owner); -} - /* * Internal helper for pctrie_reclaim_allnodes(). * This function is recursive. @@ -377,11 +374,10 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) __func__, (uintmax_t)index); break; } - if (pctrie_keybarr(node, index)) { + if (pctrie_keybarr(node, index, &slot)) { newind = node->pn_owner; break; } - slot = pctrie_slot(index, node->pn_clev); parent = node; node = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED); @@ -424,9 +420,8 @@ _pctrie_lookup(struct pctrie *ptree, uint64_t index, smr_t smr, return (m); break; } - if (pctrie_keybarr(node, index)) + if (pctrie_keybarr(node, index, &slot)) break; - slot = pctrie_slot(index, node->pn_clev); node = pctrie_node_load(&node->pn_child[slot], smr, access); } return (NULL); @@ -494,7 +489,7 @@ pctrie_lookup_ge(struct pctrie *ptree, uint64_t index) return (m); break; } - if (pctrie_keybarr(node, index)) { + if (pctrie_keybarr(node, index, &slot)) { /* * If all values in this subtree are > index, then the * least value in this subtree is the answer. @@ -503,7 +498,6 @@ pctrie_lookup_ge(struct pctrie *ptree, uint64_t index) succ = node; break; } - slot = pctrie_slot(index, node->pn_clev); /* * Just in case the next search step leads to a subtree of all @@ -528,7 +522,7 @@ pctrie_lookup_ge(struct pctrie *ptree, uint64_t index) * Take a step to the next bigger sibling of the node chosen * last time. In that subtree, all values > index. */ - slot = pctrie_slot(index, succ->pn_clev) + 1; + slot = pctrie_slot(succ, index) + 1; KASSERT((succ->pn_popmap >> slot) != 0, ("%s: no popmap siblings past slot %d in node %p", __func__, slot, succ)); @@ -574,12 +568,11 @@ pctrie_lookup_le(struct pctrie *ptree, uint64_t index) return (m); break; } - if (pctrie_keybarr(node, index)) { + if (pctrie_keybarr(node, index, &slot)) { if (node->pn_owner < index) pred = node; break; } - slot = pctrie_slot(index, node->pn_clev); if ((node->pn_popmap & ((1 << slot) - 1)) != 0) pred = node; node = pctrie_node_load(&node->pn_child[slot], NULL, @@ -588,7 +581,7 @@ pctrie_lookup_le(struct pctrie *ptree, uint64_t index) if (pred == NULL) return (NULL); if (pred != node) { - slot = pctrie_slot(index, pred->pn_clev); + slot = pctrie_slot(pred, index); KASSERT((pred->pn_popmap & ((1 << slot) - 1)) != 0, ("%s: no popmap siblings before slot %d in node %p", __func__, slot, pred)); @@ -624,7 +617,7 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) break; parent = node; node = child; - slot = pctrie_slot(index, node->pn_clev); + slot = pctrie_slot(node, index); child = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED); } @@ -649,7 +642,7 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) if (parent == NULL) pctrie_root_store(ptree, child, PCTRIE_LOCKED); else { - slot = pctrie_slot(index, parent->pn_clev); + slot = pctrie_slot(parent, index); KASSERT(node == pctrie_node_load(&parent->pn_child[slot], NULL, PCTRIE_LOCKED), ("%s: invalid child value", __func__)); diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index f50f9e3605a1..c678bfe1baa7 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -126,20 +126,26 @@ static void vm_radix_node_store(smrnode_t *p, struct vm_radix_node *v, enum vm_radix_access access); /* - * Return the position in the array for a given level. + * Map index to an array position for the children of rnode, */ static __inline int -vm_radix_slot(vm_pindex_t index, uint16_t level) +vm_radix_slot(struct vm_radix_node *rnode, vm_pindex_t index) { - return ((index >> level) & VM_RADIX_MASK); + return ((index >> rnode->rn_clev) & VM_RADIX_MASK); } -/* Computes the key (index) with the low-order 'level' + 1 radix-digits - * zeroed. */ -static __inline vm_pindex_t -vm_radix_trimkey(vm_pindex_t index, uint16_t level) +/* + * 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) { - return (index & -((vm_pindex_t)VM_RADIX_COUNT << level)); + index = (index - rnode->rn_owner) >> rnode->rn_clev; + if (index >= VM_RADIX_COUNT) + return (true); + *slot = index; + return (false); } /* @@ -177,7 +183,8 @@ vm_radix_node_get(vm_pindex_t index, vm_pindex_t newind) _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_trimkey(index, rnode->rn_clev); + rnode->rn_owner = VM_RADIX_COUNT; + rnode->rn_owner = index & -(rnode->rn_owner << rnode->rn_clev); return (rnode); } @@ -298,24 +305,13 @@ vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, { int slot; - slot = vm_radix_slot(index, rnode->rn_clev); + 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)); } -/* - * Returns TRUE if it can be determined that key does not belong to the - * specified rnode. Otherwise, returns FALSE. - */ -static __inline bool -vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) -{ - idx = vm_radix_trimkey(idx, rnode->rn_clev); - return (idx != rnode->rn_owner); -} - /* * Internal helper for vm_radix_reclaim_allnodes(). * This function is recursive. @@ -432,11 +428,10 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) __func__, (uintmax_t)index); break; } - if (vm_radix_keybarr(rnode, index)) { + if (vm_radix_keybarr(rnode, index, &slot)) { newind = rnode->rn_owner; break; } - slot = vm_radix_slot(index, rnode->rn_clev); parent = rnode; rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); } @@ -479,9 +474,8 @@ _vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index, return (m); break; } - if (vm_radix_keybarr(rnode, index)) + if (vm_radix_keybarr(rnode, index, &slot)) break; - slot = vm_radix_slot(index, rnode->rn_clev); rnode = vm_radix_node_load(&rnode->rn_child[slot], access); } return (NULL); @@ -551,7 +545,7 @@ vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) return (m); break; } - if (vm_radix_keybarr(rnode, index)) { + 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 @@ -561,7 +555,6 @@ vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) succ = rnode; break; } - slot = vm_radix_slot(index, rnode->rn_clev); /* * Just in case the next search step leads to a subtree of all @@ -585,7 +578,7 @@ vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index) * 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(index, succ->rn_clev) + 1; + 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)); @@ -630,12 +623,11 @@ vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) return (m); break; } - if (vm_radix_keybarr(rnode, index)) { + if (vm_radix_keybarr(rnode, index, &slot)) { if (rnode->rn_owner < index) pred = rnode; break; } - slot = vm_radix_slot(index, rnode->rn_clev); if ((rnode->rn_popmap & ((1 << slot) - 1)) != 0) pred = rnode; rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); @@ -643,7 +635,7 @@ vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index) if (pred == NULL) return (NULL); if (pred != rnode) { - slot = vm_radix_slot(index, pred->rn_clev); + 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)); @@ -677,7 +669,7 @@ vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) break; parent = rnode; rnode = child; - slot = vm_radix_slot(index, rnode->rn_clev); + 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) @@ -700,7 +692,7 @@ vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) if (parent == NULL) vm_radix_root_store(rtree, child, LOCKED); else { - slot = vm_radix_slot(index, parent->rn_clev); + slot = vm_radix_slot(parent, index); KASSERT(rnode == vm_radix_node_load(&parent->rn_child[slot], LOCKED), ("%s: invalid child value", __func__)); @@ -762,9 +754,8 @@ vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) } break; } - if (vm_radix_keybarr(rnode, index)) + if (vm_radix_keybarr(rnode, index, &slot)) break; - slot = vm_radix_slot(index, rnode->rn_clev); parent = rnode; rnode = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); } From nobody Sun Jul 30 22:50: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 4RDc6J5lS1z4pYHv; Sun, 30 Jul 2023 22:50:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (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 4RDc6B3r1Rz3wtX; Sun, 30 Jul 2023 22:50:42 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=cPozs82V; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::112b as permitted sender) smtp.mailfrom=markjdb@gmail.com; dmarc=none Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-583f837054eso46223257b3.3; Sun, 30 Jul 2023 15:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690757440; x=1691362240; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=ZkrUp9DomS0MNBj4FcWKqpW9q5QyL2RgbdtbOcYwrz0=; b=cPozs82VdNWpTgCs+6WT9ps/UKaomooOWWIDR2SiJTfpu6OG2pAghJnQyQWzK9ajkF FQiJnM5FQDUeI3t9jjluHZl4GUVKxqpN8ACaSeO2gHAcN9Erf0fV+9RtpdCyI+YYDBso X1QMuTubp3Y12JBdiMDpLF0kwHaKSKaYctg/1JMZMkpbH2McZH/vAIU/Q8lw9XSpKj4V ogc7B9WGQ7c3HPaPX7KvkSf0s5HLZ2t3/PV1qdfNKV6A4xpFZw3QLZKlmtY7h4vVW+hl KO8O80qawD/Vyptlx/bNtyjlOyUbRWVkMjeTJmDhSkNXSyeXeUCXvIH6kbU17mpFT8ji vY3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690757440; x=1691362240; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZkrUp9DomS0MNBj4FcWKqpW9q5QyL2RgbdtbOcYwrz0=; b=NLum+1JAhHyBvjbXZIQlbLyDTr3OfBkNisT/DF4jTzbeJZgZTQYTcz3q1Gb0w1yKWe aKEgJ8k9GSJUmCuLC48E+SIfkMrzBK0FmwDz5urAjHoY7HFS99uvh8xg90I7xMPyyZ5X sh3yKD4qO+VSuKJUxNDCRdaUif7OGpQjMwPkj6FIkFzmWopysS7RV6N5/5xYN0eJoMR4 Eb+dra3JbJlIRDmHneqzat8ZRlVaINHaMw0X3TmfHvZwK2VK3REiYgtnGcX/ao4OQ2kW YPtaKhGLGuCx+QdoZzf/tevH2yGSNaLlZbJh7QAdvWxZQFyPw2eY600ftMlnRCXy7tvy dVsw== X-Gm-Message-State: ABy/qLZX/NUfthxav9TgJe3kOwRHb8mmOPKyyo0jOcb1zVK8zCAHJEfh NqVXo2hj/67oHQXCSa8i4KeaMIBrC90= X-Google-Smtp-Source: APBJJlExZaHvqhDIVhl27XeYHjcv9kQ5quhX9ReXxbqa7BLCyOJewM4KsqgxgOkKDUDDj12o+iHMSg== X-Received: by 2002:a81:5d56:0:b0:583:d9dd:38e1 with SMTP id r83-20020a815d56000000b00583d9dd38e1mr9498912ywb.18.1690757439763; Sun, 30 Jul 2023 15:50:39 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id a15-20020a05620a16cf00b0076c94030a2esm1795961qkn.114.2023.07.30.15.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jul 2023 15:50:38 -0700 (PDT) Date: Sun, 30 Jul 2023 18:50:36 -0400 From: Mark Johnston To: Jessica Clarke Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 65f28f63a73d - main - tools/build: Create toolchain symlinks for non-absolute compiler/linker Message-ID: References: <202307270412.36R4C2vh097664@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: <202307270412.36R4C2vh097664@gitrepo.freebsd.org> X-Spamd-Result: default: False [-2.64 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.995]; NEURAL_HAM_LONG(-0.98)[-0.983]; NEURAL_HAM_MEDIUM(-0.96)[-0.964]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::112b:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4RDc6B3r1Rz3wtX X-Spamd-Bar: -- On Thu, Jul 27, 2023 at 04:12:02AM +0000, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=65f28f63a73d3371d9d724a2018be6d1ada0d3e0 > > commit 65f28f63a73d3371d9d724a2018be6d1ada0d3e0 > Author: Jessica Clarke > AuthorDate: 2023-07-27 04:10:47 +0000 > Commit: Jessica Clarke > CommitDate: 2023-07-27 04:10:47 +0000 > > tools/build: Create toolchain symlinks for non-absolute compiler/linker > > If any of the toolchain variables are not absolute then we need to > create a symlink in WORLDTMP/legacy/bin in order to make them available > during a BUILD_WITH_STRICT_TMPPATH build. This commit appears to break a 13.0-RELEASE jail's ability to build world from the main branch. Specifically, while building clang during the cross tools stage, lib/Support/BLAKE3/blake3.c can't be compiled because immintrin.h isn't found. The host compiler is clang 11.0.1. Some experimentation shows that this version of clang, when invoked using the absolute path of the symlink in tmp/legacy/usr/bin created as of this commit, does not search /usr/lib/clang/11.0.1 for immintrin.h. It only looks in /usr/include. If I invoke clang using a relative path to the symlink, it finds immintrin.h. Newer versions of LLVM don't have this (buggy?) behaviour, they search their resource directory in either case. Is this a bug in the commit, or does this just mean that I need to upgrade my jail? I'm not sure what guarantees we provide with respect to origin versions of source upgrades. From nobody Mon Jul 31 02:28: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 4RDhxk40JYz4ph0W; Mon, 31 Jul 2023 02:28:41 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc30.google.com (mail-oo1-xc30.google.com [IPv6:2607:f8b0:4864:20::c30]) (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 4RDhxg4jTWz4T81; Mon, 31 Jul 2023 02:28:39 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=nW93qiMl; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2607:f8b0:4864:20::c30 as permitted sender) smtp.mailfrom=mjguzik@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oo1-xc30.google.com with SMTP id 006d021491bc7-56c74961e0cso1654263eaf.3; Sun, 30 Jul 2023 19:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690770518; x=1691375318; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=IZpMzCBvink2StQ0JZV+aJeR40m+hbM6FIIegopVNKA=; b=nW93qiMlOwnG+5C47F826GjsZvzeXGvXNV8uQeKqYgsPXWnCc2VoPfNUDSuXNX0LEX UNiRUfN9Ke52cCgHFbr+X2h3ke21o1X3ipfLHupZhnPK6Zw3anLaiiJS9M3nicilYf/h 9xWccuNci/8Y7n6DgPoGzjc9TKVL/SFIptV1eYIyaAj0fGz/rLGqCbN9zwF+dCU0GF4o 1K3ucmxyL5l3zQuBWw9YvQxbWMAxGfzdQ74qjjKnrue+FxeADZxWwiG2Hq9FztBNR8IS eGtULVoishkAhaxaROib9QncDXSsY5NwN4xwydEzX0vhQbgQ0jesuGCQje1b+b2enilm 0Y0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690770518; x=1691375318; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IZpMzCBvink2StQ0JZV+aJeR40m+hbM6FIIegopVNKA=; b=ghmeUZVLzdU6w7WclsjRstmUt/CwIiUHPXdW2URlda537ivlN7vMf7BoIkkz9BUfe8 rCvsUOCjyxnAhqBcz/x0EZiv0/wUu+ClO11hl0CXGCbzUt1e0Cf1F55e55f+3GEpy+CQ XApKkD1YtleIssje+QE653IvPeQ7kBlpwNj/ETpy5a3jBywODCSdFSMpUYxUfBf2m7ED qFmsG/5aNKXIz/tfxqDszdjmKZxVNXed1QkyC7zCTK2V7QI+vR6W4YpeVE1HZC0U68OF IgVxSU5EeO8ttSvsY/AYrhEgO6V/+4fSIC+5f5jh8eo0ZAl3N/e0/wqaNkwR8j3V2Tr/ EO3g== X-Gm-Message-State: ABy/qLbh/CChcCADU7kkr6/ikHa5bBWOCRSsjQHsebLP+CTmHLzFw8i6 GDjirA/uEaC8qaEiHcK8LQX1v9efjeBBCQR6g0Q= X-Google-Smtp-Source: APBJJlFVVowMWDWHGrK0yPcFWehuLGOILmtv3tQgsWGcfhzvvGHdLAYze4iWfJqPcdVzNgZYPmGF0p9gIC7MC1AO80M= X-Received: by 2002:a4a:8299:0:b0:565:cf26:5a10 with SMTP id e25-20020a4a8299000000b00565cf265a10mr6350350oog.0.1690770518199; Sun, 30 Jul 2023 19:28:38 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:614e:0:b0:4f0:1250:dd51 with HTTP; Sun, 30 Jul 2023 19:28:37 -0700 (PDT) In-Reply-To: References: <202307242203.36OM3IwQ009522@gitrepo.freebsd.org> From: Mateusz Guzik Date: Mon, 31 Jul 2023 04:28:37 +0200 Message-ID: Subject: Re: git: 5b353925ff61 - main - vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault() To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-3.45 / 15.00]; NEURAL_HAM_MEDIUM(-0.94)[-0.940]; NEURAL_HAM_SHORT(-0.93)[-0.927]; NEURAL_HAM_LONG(-0.58)[-0.583]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::c30:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+]; FREEMAIL_TO(0.00)[gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4RDhxg4jTWz4T81 X-Spamd-Bar: --- On 7/28/23, Konstantin Belousov wrote: > On Fri, Jul 28, 2023 at 02:17:51AM +0200, Mateusz Guzik wrote: >> On 7/25/23, Konstantin Belousov wrote: >> > The branch main has been updated by kib: >> > >> > URL: >> > https://cgit.FreeBSD.org/src/commit/?id=5b353925ff61b9ddb97bb453ba75278b578ed7d9 >> > >> > commit 5b353925ff61b9ddb97bb453ba75278b578ed7d9 >> > Author: Konstantin Belousov >> > AuthorDate: 2023-07-23 15:55:50 +0000 >> > Commit: Konstantin Belousov >> > CommitDate: 2023-07-24 22:02:59 +0000 >> > >> > vnode read(2)/write(2): acquire rangelock regardless of >> > do_vn_io_fault() >> > >> > To ensure atomicity of reads against parallel writes and truncates, >> > vnode lock was not enough at least since introduction of >> > vn_io_fault(). >> > That code only take rangelock when it was possible that vn_read() >> > and >> > vn_write() could drop the vnode lock. >> > >> > At least since the introduction of VOP_READ_PGCACHE() which >> > generally >> > does not lock the vnode at all, rangelocks become required even >> > for filesystems that do not need vn_io_fault() workaround. For >> > instance, tmpfs. >> > >> >> Is there a bug with pgcache reads disabled (as in when the vnode lock >> is held for reads?) >> >> Note this patch adds 2 lock trips which were previously not present, >> which has to slow things down single-threaded, but I did not bother >> measuring that part. >> >> As this adds to vnode-wide *lock* acquires this has to very negatively >> affect scalability. >> >> This time around I ran: ./readseek3_processes -t 10 (10 workers >> reading from *disjoint* offsets from the same vnode. this in principle >> can scale perfectly) >> >> I observed a 90% drop in performance: >> before: total:25723459 ops/s >> after: total:2455794 ops/s >> >> Going to an unpatched kernel and disabling pgcache reads instead: >> disabled: total:6522480 ops/s >> >> or about 2.6x of performance of the current kernel >> >> In other words I think the thing to do here is to revert the patch and >> instead flip pgcache reads to off by default until a better fix can be >> implemented. > > The rangelock purpose is to ensure atomicity of reads in presence of > writes. In other words, taking the rangelock there is architecturally > right. Also, it fixes issues with truncation that are not fixable with > the vnode lock on tmpfs vnodes anyway. > How come? I see vn_truncate xlocking the vnode across the entire thing. If all tmpfs reads slock and all writes xlock the vnode, everyone gets protection against truncation as is. > That said, disabling pgcache vop on tmpfs means that the regular read vop > is always used, which takes the vnode lock around reads. So I doubt that > the changed disposition would gain much in your test. > I pasted a benchmark number without pgcache and without the change, clearly showing that rangelock + pgcache loses big time to mere vnode locking. > The proper future fix would be to improve scalability of the rangelocks, > whose naive stop-gap implementation I did initially in time of current-7 > or -8 was not changed at all. > I agree rangelocks should be fixed. But in the meantime, the patch at hand seems to be too heavy handed to fix the issue (and disabling pgcache reads would do it just fine instead). > BTW, it seems that file offset locks are no longer needed, but I need to > recheck it. This should shave off four atomics on read and write path. > -- Mateusz Guzik From nobody Mon Jul 31 07:07: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 4RDq8J4HzHz4psql; Mon, 31 Jul 2023 07:07: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 4RDq7z2JNNz3KSL; Mon, 31 Jul 2023 07:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690787279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TFq8zBeg8xL6P0BoYanux9zAajYUj8GYoREfZWZ2Pwo=; b=sFDB/PyRwi0U41FKVVu4+sI0zIsPoOXiS23nk0uy8fUzKxtTJFdrAXYXFx5U2sq7dnSgy9 j1beWbutZ8FigLzDWU4Ks4bDjyEPN2CKYuwZmmeXz9DLAn+em+UrlXiyhuHeeqqha8jMsL 7i3fNLS0AMse+C5dxTSOD6hkP8/zELp0jFJQZ3+dzy9nXMt7Tid+6rwrd4oz05GqnlWKG+ zTQKanu2wTOdEJVjlo+6MWHVFpUdfVLKIY1pI3CI1pb1MpxuXmEDoR4RoPSV9bvzK6mRqa qb35i+d3a1RxvG8hKUYp8g2dU3yUV1bJzkVBClZQIvfGyR2EtQWE5T595o5OPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690787279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TFq8zBeg8xL6P0BoYanux9zAajYUj8GYoREfZWZ2Pwo=; b=VivcwoDsOZRI8cRxiE32ReiKZUUVnbRoNeqfzMk6eh5vZXjIlKzTGIM/yaNRAX38OVbsFS IOcXHnemKHgM+AP216E/w9ihaaSsXbZTX46C/AdjQTsXAnG/v1hrLiUTvb/eRPq1JFDueH 5Fumk2HgBJwT3JvPbkZGcJYt80wFvceBFqJRAj/5xCUzfYBHNrU7NjbD2Mg03bruMBzDlC Fiv9t8HPBLEJi0p95uxiLnyjjVVYCxXyh3OOOnxIsF/06lFm3anFR/IhEPnvNixz4zlcEs 20DIXGLswSq6DtnFiU6Smw48fldzpBE/n7l/vglhlV7UgBetVU0oi3i+wCQ38g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690787279; a=rsa-sha256; cv=none; b=Y1s198S14flhx+yOUH/jWGyHojSSpd8jMxfB2cA7GHO6Iwe9WNwJgps2jtXx8oMPaCsj6P E1Cp8+clf5QdpYg2HeCBCL7IqA68MfiZ746+EecGzuy96GcluJxZig25mpLYN3+TX87fqU o0H5IbVq6GM2CkU7X4cPyIhtTpMOkYYeFHsC6tbBVbBPgWEtwLeC/BXahWzNehRmePEyZo VUVeI9Fb1rjT/JKwpMeEVeAIcc3xl+sU0KUjUYnkf7KzdqAqUQX9Z2XfPRiR+GI9tXG8Dc WNVifTk8jbQ9vd3USqHiJBmxWClsgbZh2sBq+LKlIsQ8v9jmkvKvH5BCxEBSOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDq7y5Km4zmVN; Mon, 31 Jul 2023 07:07: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 36V77w4H014587; Mon, 31 Jul 2023 07:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36V77wCd014586; Mon, 31 Jul 2023 07:07:58 GMT (envelope-from git) Date: Mon, 31 Jul 2023 07:07:58 GMT Message-Id: <202307310707.36V77wCd014586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 896809e29675 - main - stress2: Added killpg(2) scenarios List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 896809e296752c54884bde3b04cce213938dfa26 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=896809e296752c54884bde3b04cce213938dfa26 commit 896809e296752c54884bde3b04cce213938dfa26 Author: Peter Holm AuthorDate: 2023-07-31 07:07:06 +0000 Commit: Peter Holm CommitDate: 2023-07-31 07:07:06 +0000 stress2: Added killpg(2) scenarios --- tools/test/stress2/misc/killpg2.sh | 197 +++++++++++++++++++++++++++++++++++++ tools/test/stress2/misc/killpg3.sh | 192 ++++++++++++++++++++++++++++++++++++ tools/test/stress2/misc/killpg4.sh | 114 +++++++++++++++++++++ 3 files changed, 503 insertions(+) diff --git a/tools/test/stress2/misc/killpg2.sh b/tools/test/stress2/misc/killpg2.sh new file mode 100755 index 000000000000..5e986f059637 --- /dev/null +++ b/tools/test/stress2/misc/killpg2.sh @@ -0,0 +1,197 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# killpg(2) version of reaper.sh. No problems seen. + +. ../default.cfg + +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +static volatile u_int *share; + +#define CONT 0 +#define GID 1 +#define SYNC 2 +#define MAXP 10000 + +static void +hand(int i __unused) { + _exit(0); +} + +static void +looper(void) +{ + struct sigaction sa; + time_t start; + struct passwd *pw; + pid_t pids[MAXP]; + int i, parallel; + + setproctitle("looper"); + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL) == -1) + err(1, "sigaction"); + + if ((pw = getpwnam("TUSER")) == NULL) + err(1, "no such user: TUSER"); + + if (setgroups(1, &pw->pw_gid) || + setegid(pw->pw_gid) || setgid(pw->pw_gid) || + seteuid(pw->pw_uid) || setuid(pw->pw_uid)) + err(1, "Can't drop privileges to \"TUSER\""); + endpwent(); + setpgrp(0, 0); + share[GID] = getpgrp(); + share[SYNC] = 1; + start = time(NULL); + while (time(NULL) - start < 120) { + parallel = arc4random() % MAXP + 1; + for (i = 0; i < parallel; i++) { + if ((pids[i] = fork()) == 0) { + sa.sa_handler = hand; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL) == -1) + err(1, "sigaction"); + setproctitle("child"); + for (;;) + pause(); + _exit(0); /* never reached */ + } + if (pids[i] == -1) + err(1, "fork()"); + } + for (i = 0; i < parallel; i++) { + if (waitpid(pids[i], NULL, 0) != pids[i]) + err(1, "waitpid(%d) in looper", pids[i]); + } + } + _exit(0); +} + +static void +killer(void) +{ + int e, gid; + + while (share[SYNC] == 0) + ; + gid = share[GID]; + while (share[CONT] == 1) { + usleep(arc4random() % 50000); + gid = share[GID]; + if (gid != 0) { + e = 0; + while (e == 0) { + if (killpg(gid, SIGUSR1) == -1) { + e = 1; + if (errno != ESRCH) + err(1, "pgkill(%d)", gid); + } + usleep(5000 + arc4random() % 5000); + } + } + } + _exit(0); +} + +int +main(void) +{ + size_t len; + time_t start; + int lpid, kpid, s1, s2; + + len = PAGE_SIZE; + if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + + start = time(NULL); + while (time(NULL) - start < 120) { + share[CONT] = 1; + share[GID] = 0; + share[SYNC] = 0; + if ((lpid = fork()) == 0) + looper(); + usleep(arc4random() % 100000); + if ((kpid = fork()) == 0) + killer(); + + if (waitpid(lpid, &s1, 0) != lpid) + err(1, "waitpid looper"); + usleep(arc4random() % 1000); + share[CONT] = 0; + waitpid(kpid, &s2, 0); + } + + return (0); +} +EOF +sed -i '' "s#TUSER#$testuser#" /tmp/$prog.c +cc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c || exit 1 +rm /tmp/$prog.c + +n=1 +start=`date +%s` +while true; do + /tmp/$prog + for i in `jot 50`; do + pgrep -q $prog || break + sleep .5 + done + if pgrep -q $prog; then + e=$((`date +%s` - start)) + echo "Failed in loop #$n after $e seconds." + pgrep "$prog|timeout" | xargs ps -jp + pkill $prog + rm -f /tmp/$prog + exit 1 + fi + [ $((`date +%s` - start)) -ge 600 ] && break + n=$((n + 1)) +done +rm /tmp/$prog +exit 0 diff --git a/tools/test/stress2/misc/killpg3.sh b/tools/test/stress2/misc/killpg3.sh new file mode 100755 index 000000000000..304b3e320f2f --- /dev/null +++ b/tools/test/stress2/misc/killpg3.sh @@ -0,0 +1,192 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# killpg(2) version of reaper.sh. No problems seen. + +. ../default.cfg + +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < +#include +#include + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static _Atomic(int) *share; + +#define GID 0 +#define PARALLEL 10 +#define RDY 1 +#define MAXP 7000 + +static void +hand(int i __unused) { + _exit(0); +} + +static void +innerloop(int parallel) +{ + pid_t pids[MAXP]; + struct sigaction sa; + int i; + + usleep(1000); + for (i = 0; i < parallel; i++) { + if ((pids[i] = fork()) == 0) { + sa.sa_handler = hand; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL) == -1) + err(1, "sigaction"); + atomic_fetch_add(&share[RDY], 1); + setproctitle("child"); + for (;;) + pause(); + _exit(0); /* never reached */ + } + if (pids[i] == -1) + err(1, "fork()"); + } + for (i = 0; i < parallel; i++) { + if (waitpid(pids[i], NULL, 0) != pids[i]) + err(1, "waitpid(%d) in looper", pids[i]); + } + _exit(0); +} + +static void +looper(void) +{ + struct sigaction sa; + struct passwd *pw; + pid_t pids[MAXP]; + int i, parallel; + + setproctitle("looper"); + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL) == -1) + err(1, "sigaction"); + + if ((pw = getpwnam("TUSER")) == NULL) + err(1, "no such user: TUSER"); + + if (setgroups(1, &pw->pw_gid) || + setegid(pw->pw_gid) || setgid(pw->pw_gid) || + seteuid(pw->pw_uid) || setuid(pw->pw_uid)) + err(1, "Can't drop privileges to \"TUSER\""); + endpwent(); + setpgrp(0, 0); + share[GID] = getpgrp(); + parallel = arc4random() % MAXP + 1; + parallel = parallel / PARALLEL * PARALLEL; + for (i = 0; i < PARALLEL; i++) { + if ((pids[i] = fork()) == 0) + innerloop(parallel / PARALLEL); + } + while (atomic_load(&share[RDY]) != parallel) + usleep(10000); + if (killpg(share[GID], SIGUSR1) == -1) + err(1, "pgkill(%d)", share[GID]); + for (i = 0; i < 4; i++) { + if (waitpid(pids[i], NULL, 0) != pids[i]) + err(1, "waitpid(%d) in looper", pids[i]); + } + _exit(0); +} + +int +main(void) +{ + size_t len; + time_t start; + int lpid, s1; + + len = PAGE_SIZE; + if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + + start = time(NULL); + while (time(NULL) - start < 120) { + share[GID] = 0; + share[RDY] = 0; + if ((lpid = fork()) == 0) + looper(); + if (waitpid(lpid, &s1, 0) != lpid) + err(1, "waitpid looper"); + } + + return (0); +} +EOF +sed -i '' "s#TUSER#$testuser#" /tmp/$prog.c +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c || exit 1 +rm /tmp/$prog.c + +export MAXSWAPPCT=70 +n=1 +start=`date +%s` +while true; do + ../testcases/swap/swap -t 2m -i 20 > /dev/null & + /tmp/$prog & pid=$! + st=`date +%s` + while kill -0 $pid > /dev/null 2>&1; do + e=$((`date +%s` - st)) + if [ $e -ge 120 ]; then + while pgrep -q swap; do pkill swap; done + fi + if [ $e -ge 600 ]; then + echo "Failed in loop #$n after $e seconds." + ps -jU$testuser | head -20 + kill $pid + pkill -U$testuser + wait + rm -f /tmp/$prog + exit 1 + fi + done + wait + [ $((`date +%s` - start)) -ge 300 ] && break + n=$((n + 1)) +done +rm /tmp/$prog +exit 0 diff --git a/tools/test/stress2/misc/killpg4.sh b/tools/test/stress2/misc/killpg4.sh new file mode 100755 index 000000000000..448a7f60dd4b --- /dev/null +++ b/tools/test/stress2/misc/killpg4.sh @@ -0,0 +1,114 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# Another killpg(2) test scenario. No problems seen. + +. ../default.cfg +export prog=$(basename "$0" .sh) +set -u + +cat > /tmp/$prog.c < +#include +#include +#include +#include +#define PARALLEL 2 + +int +test(void) +{ + pid_t pid; + time_t start; + + start = time(NULL); + while (time(NULL) - start < 300) { + if ((pid = fork()) == -1) + err(1, "fork()"); + if (pid == 0) { + if (arc4random() % 100 < 20) + usleep(arc4random() % 5000); + _exit(0); /* Not reached */ + } + if (waitpid(pid, NULL, 0) != pid) + err(1, "waitpid()"); + } + _exit(0); +} + +int +main(void) +{ + pid_t pids[PARALLEL]; + int i; + + for (i = 0; i < PARALLEL; i++) { + test(); + } + for (i = 0; i < PARALLEL; i++) { + if (waitpid(pids[i], NULL, 0) != pids[i]) + err(1, "waotpid() main"); + } + +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O2 /tmp/$prog.c || exit 1 + +export MAXSWAPPCT=80 +../testcases/swap/swap -t 2m -i 5 > /dev/null 2>&1 & +sleep .5 +start=`date +%s` +while [ $((`date +%s` - start)) -lt 120 ]; do + for i in `jot 200 100`; do + ( + sl=$prog.$i + sleep=/tmp/$sl + cp /tmp/$prog $sleep + su $testuser -c "$sleep & $sleep & $sleep &" & pid=$! + for j in `jot 10`; do + pgrep -q "$sl" && break + sleep .5 + done + pgrep -q "$sl" || { echo "No start"; exit 1; } + pgid=`pgrep "$sl" | xargs ps -jp | sed 1d | \ + tail -1 | awk '{print $4}'` + [ -z "$pgid" ] && { echo "Zero pgid:$pgid"; ps aj | \ + sed -n "1p;/$sl/p"; exit 1; } + sleep 1.`jot -r 1 2 9` + kill -- -$pgid || { echo "kill -$pgid failed"; exit 1; } + wait $pid + rm -f $sleep + ) & + done + while [ `ps -U$testuser | wc -l` -gt 1 ] ; do sleep 2; done +done +while pkill swap; do :; done +wait +rm /tmp/$prog /tmp/$prog.c +exit 0 From nobody Mon Jul 31 08:44: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 4RDsHs6Y18z4pwl9; Mon, 31 Jul 2023 08:44:56 +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 4RDsHl15kwz3hhF; Mon, 31 Jul 2023 08:44:50 +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 36V8ikYM005068; Mon, 31 Jul 2023 11:44:46 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 36V8ik8Q005067; Mon, 31 Jul 2023 11:44:46 +0300 (MSK) (envelope-from dchagin) Date: Mon, 31 Jul 2023 11:44:46 +0300 From: Dmitry Chagin To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c620788150d2 - main - sctp: keep sb_acc and sb_ccc in sync Message-ID: References: <202307282217.36SMHSJD073301@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: <202307282217.36SMHSJD073301@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4RDsHl15kwz3hhF X-Spamd-Bar: - On Fri, Jul 28, 2023 at 10:17:28PM +0000, Michael Tuexen wrote: > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c620788150d274c09a070ab486602c98407d73b0 > > commit c620788150d274c09a070ab486602c98407d73b0 > Author: Michael Tuexen > AuthorDate: 2023-07-28 13:16:23 +0000 > Commit: Michael Tuexen > CommitDate: 2023-07-28 13:16:23 +0000 > > sctp: keep sb_acc and sb_ccc in sync > > PR: 260116 > MFC after: 1 week > --- Hi, Michael, perhaps some of the recent fixes have broken these tests: https://ci.freebsd.org/view/all/job/FreeBSD-main-amd64-test/lastFailedBuild/console 02:04:05 sys/netpfil/pf/sctp:basic_v4 -> epair1a: Ethernet address: 02:b9:89:4e:84:0a 02:04:05 epair1b: Ethernet address: 02:b9:89:4e:84:0b 02:04:05 epair1a: link state changed to UP 02:04:05 epair1b: link state changed to UP 02:04:06 panic: Counter goes negative 02:04:06 cpuid = 1 02:04:06 time = 1690758247 02:04:06 KDB: stack backtrace: 02:04:06 db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00a0775480 02:04:06 vpanic() at vpanic+0x149/frame 0xfffffe00a07754d0 02:04:06 panic() at panic+0x43/frame 0xfffffe00a0775530 02:04:06 sctp_abort_notification() at sctp_abort_notification/frame 0xfffffe00a0775540 02:04:06 sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame 0xfffffe00a0775640 02:04:06 sctp_process_control() at sctp_process_control+0xf62/frame 0xfffffe00a0775990 02:04:06 sctp_common_input_processing() at sctp_common_input_processing+0x561/frame 0xfffffe00a0775b10 02:04:06 sctp_input_with_port() at sctp_input_with_port+0x1fa/frame 0xfffffe00a0775be0 02:04:06 sctp_input() at sctp_input+0x10/frame 0xfffffe00a0775bf0 02:04:06 ip_input() at ip_input+0x2ab/frame 0xfffffe00a0775c50 02:04:06 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe00a0775cb0 02:04:06 ether_demux() at ether_demux+0x17a/frame 0xfffffe00a0775ce0 02:04:06 ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe00a0775d30 02:04:06 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe00a0775d90 02:04:06 ether_input() at ether_input+0xd9/frame 0xfffffe00a0775df0 02:04:06 epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame 0xfffffe00a0775e40 02:04:06 taskqueue_run_locked() at taskqueue_run_locked+0xab/frame 0xfffffe00a0775ec0 02:04:06 taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame 0xfffffe00a0775ef0 02:04:06 fork_exit() at fork_exit+0x82/frame 0xfffffe00a0775f30 02:04:06 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe00a0775f30 02:04:06 --- trap 0xc, rip = 0xf04bf926c9a, rsp = 0xf04c04a4f48, rbp = 0xf04c04a4f60 --- > sys/netinet/sctp_os_bsd.h | 18 ++++++++++++------ > sys/netinet/sctp_output.c | 2 +- > sys/netinet/sctp_pcb.c | 2 +- > sys/netinet/sctp_var.h | 4 ++-- > sys/netinet/sctputil.c | 4 ++-- > sys/netinet/sctputil.h | 4 ++-- > 6 files changed, 20 insertions(+), 14 deletions(-) > > diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h > index 80c187b3c5ef..0d88377523c8 100644 > --- a/sys/netinet/sctp_os_bsd.h > +++ b/sys/netinet/sctp_os_bsd.h > @@ -372,11 +372,6 @@ typedef struct callout sctp_os_timer_t; > #define SCTP_CLEAR_SO_NBIO(so) ((so)->so_state &= ~SS_NBIO) > /* get the socket type */ > #define SCTP_SO_TYPE(so) ((so)->so_type) > -/* Use a macro for renaming sb_cc to sb_acc. > - * Initially sb_ccc was used, but this broke select() when used > - * with SCTP sockets. > - */ > -#define sb_cc sb_acc > /* reserve sb space for a socket */ > #define SCTP_SORESERVE(so, send, recv) soreserve(so, send, recv) > /* wakeup a socket */ > @@ -384,8 +379,19 @@ typedef struct callout sctp_os_timer_t; > /* number of bytes ready to read */ > #define SCTP_SBAVAIL(sb) sbavail(sb) > /* clear the socket buffer state */ > +#define SCTP_SB_INCR(sb, incr) \ > +{ \ > + atomic_add_int(&(sb)->sb_acc, incr); \ > + atomic_add_int(&(sb)->sb_ccc, incr); \ > +} > +#define SCTP_SB_DECR(sb, decr) \ > +{ \ > + SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_acc, decr); \ > + SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_ccc, decr); \ > +} > #define SCTP_SB_CLEAR(sb) \ > - (sb).sb_cc = 0; \ > + (sb).sb_acc = 0; \ > + (sb).sb_ccc = 0; \ > (sb).sb_mb = NULL; \ > (sb).sb_mbcnt = 0; > > diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c > index a146ad401b30..7e32cc662f38 100644 > --- a/sys/netinet/sctp_output.c > +++ b/sys/netinet/sctp_output.c > @@ -7290,7 +7290,7 @@ one_more_time: > if ((stcb->sctp_socket != NULL) && > ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || > (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { > - atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc, sp->length); > + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, sp->length); > } > if (sp->data) { > sctp_m_freem(sp->data); > diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c > index 9df2f82bdaa6..220d8b72667d 100644 > --- a/sys/netinet/sctp_pcb.c > +++ b/sys/netinet/sctp_pcb.c > @@ -3612,7 +3612,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) > TAILQ_REMOVE(&inp->read_queue, sq, next); > sctp_free_remote_addr(sq->whoFrom); > if (so) > - so->so_rcv.sb_cc -= sq->length; > + SCTP_SB_DECR(&so->so_rcv, sq->length); > if (sq->data) { > sctp_m_freem(sq->data); > sq->data = NULL; > diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h > index 8301ec38cf6e..ef01b0b6c3bd 100644 > --- a/sys/netinet/sctp_var.h > +++ b/sys/netinet/sctp_var.h > @@ -198,7 +198,7 @@ extern struct protosw sctp_seqpacket_protosw, sctp_stream_protosw; > } > > #define sctp_sbfree(ctl, stcb, sb, m) { \ > - SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_cc, SCTP_BUF_LEN((m))); \ > + SCTP_SB_DECR(sb, SCTP_BUF_LEN((m))); \ > SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_mbcnt, MSIZE); \ > if (((ctl)->do_not_ref_stcb == 0) && stcb) {\ > SCTP_SAVE_ATOMIC_DECREMENT(&(stcb)->asoc.sb_cc, SCTP_BUF_LEN((m))); \ > @@ -210,7 +210,7 @@ extern struct protosw sctp_seqpacket_protosw, sctp_stream_protosw; > } > > #define sctp_sballoc(stcb, sb, m) { \ > - atomic_add_int(&(sb)->sb_cc,SCTP_BUF_LEN((m))); \ > + SCTP_SB_INCR(sb, SCTP_BUF_LEN((m))); \ > atomic_add_int(&(sb)->sb_mbcnt, MSIZE); \ > if (stcb) { \ > atomic_add_int(&(stcb)->asoc.sb_cc, SCTP_BUF_LEN((m))); \ > diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c > index ef8d763efabf..a4d4e806c00e 100644 > --- a/sys/netinet/sctputil.c > +++ b/sys/netinet/sctputil.c > @@ -5044,7 +5044,7 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc, > if ((stcb->sctp_socket != NULL) && > (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) || > ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE)))) { > - SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, tp1->book_size); > + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, tp1->book_size); > } > } > > @@ -6121,7 +6121,7 @@ get_more_data: > if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_SB_LOGGING_ENABLE) { > sctp_sblog(&so->so_rcv, control->do_not_ref_stcb ? NULL : stcb, SCTP_LOG_SBFREE, (int)cp_len); > } > - SCTP_SAVE_ATOMIC_DECREMENT(&so->so_rcv.sb_cc, (int)cp_len); > + SCTP_SB_DECR(&so->so_rcv, (int)cp_len); > if ((control->do_not_ref_stcb == 0) && > stcb) { > atomic_subtract_int(&stcb->asoc.sb_cc, (int)cp_len); > diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h > index 60b5661c309c..d74780cdccf7 100644 > --- a/sys/netinet/sctputil.h > +++ b/sys/netinet/sctputil.h > @@ -253,7 +253,7 @@ do { \ > } \ > if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ > (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ > - SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, sp->length); \ > + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, sp->length); \ > } \ > } \ > } while (0) > @@ -264,7 +264,7 @@ do { \ > if ((stcb->sctp_socket != NULL) && \ > ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ > (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ > - atomic_add_int(&stcb->sctp_socket->so_snd.sb_cc,sz); \ > + SCTP_SB_INCR(&stcb->sctp_socket->so_snd, sz); \ > } \ > } while (0) > From nobody Mon Jul 31 09:35: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 4RDtQ70xCxz4q05q; Mon, 31 Jul 2023 09:35:18 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RDtPx5kGBz3lrD; Mon, 31 Jul 2023 09:35:17 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (ip4d15f6ca.dynamic.kabel-deutschland.de [77.21.246.202]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id 5A30F82389265; Mon, 31 Jul 2023 11:35:13 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: c620788150d2 - main - sctp: keep sb_acc and sb_ccc in sync From: tuexen@freebsd.org In-Reply-To: Date: Mon, 31 Jul 2023 11:35:12 +0200 Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307282217.36SMHSJD073301@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4RDtPx5kGBz3lrD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated > On 31. Jul 2023, at 10:44, Dmitry Chagin wrote: >=20 > On Fri, Jul 28, 2023 at 10:17:28PM +0000, Michael Tuexen wrote: >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc620788150d274c09a070ab486602c98= 407d73b0 >>=20 >> commit c620788150d274c09a070ab486602c98407d73b0 >> Author: Michael Tuexen >> AuthorDate: 2023-07-28 13:16:23 +0000 >> Commit: Michael Tuexen >> CommitDate: 2023-07-28 13:16:23 +0000 >>=20 >> sctp: keep sb_acc and sb_ccc in sync >>=20 >> PR: 260116 >> MFC after: 1 week >> --- >=20 > Hi, Michael, > perhaps some of the recent fixes have broken these tests: > = https://ci.freebsd.org/view/all/job/FreeBSD-main-amd64-test/lastFailedBuil= d/console Hi Dmitry, part of the change is that the macro is now checking for underflows. = This seems to trigger (Counter goes negative). I guess the patch is not breaking any = tests, but highlighting a problem. Will look into it. Best regards Michael >=20 > 02:04:05 sys/netpfil/pf/sctp:basic_v4 -> epair1a: Ethernet address: = 02:b9:89:4e:84:0a > 02:04:05 epair1b: Ethernet address: 02:b9:89:4e:84:0b > 02:04:05 epair1a: link state changed to UP > 02:04:05 epair1b: link state changed to UP > 02:04:06 panic: Counter goes negative > 02:04:06 cpuid =3D 1 > 02:04:06 time =3D 1690758247 > 02:04:06 KDB: stack backtrace: > 02:04:06 db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xfffffe00a0775480 > 02:04:06 vpanic() at vpanic+0x149/frame 0xfffffe00a07754d0 > 02:04:06 panic() at panic+0x43/frame 0xfffffe00a0775530 > 02:04:06 sctp_abort_notification() at sctp_abort_notification/frame = 0xfffffe00a0775540 > 02:04:06 sctp_express_handle_sack() at = sctp_express_handle_sack+0x647/frame 0xfffffe00a0775640 > 02:04:06 sctp_process_control() at sctp_process_control+0xf62/frame = 0xfffffe00a0775990 > 02:04:06 sctp_common_input_processing() at = sctp_common_input_processing+0x561/frame 0xfffffe00a0775b10 > 02:04:06 sctp_input_with_port() at sctp_input_with_port+0x1fa/frame = 0xfffffe00a0775be0 > 02:04:06 sctp_input() at sctp_input+0x10/frame 0xfffffe00a0775bf0 > 02:04:06 ip_input() at ip_input+0x2ab/frame 0xfffffe00a0775c50 > 02:04:06 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe00a0775cb0 > 02:04:06 ether_demux() at ether_demux+0x17a/frame 0xfffffe00a0775ce0 > 02:04:06 ether_nh_input() at ether_nh_input+0x39f/frame = 0xfffffe00a0775d30 > 02:04:06 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe00a0775d90 > 02:04:06 ether_input() at ether_input+0xd9/frame 0xfffffe00a0775df0 > 02:04:06 epair_tx_start_deferred() at = epair_tx_start_deferred+0xd7/frame 0xfffffe00a0775e40 > 02:04:06 taskqueue_run_locked() at taskqueue_run_locked+0xab/frame = 0xfffffe00a0775ec0 > 02:04:06 taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame = 0xfffffe00a0775ef0 > 02:04:06 fork_exit() at fork_exit+0x82/frame 0xfffffe00a0775f30 > 02:04:06 fork_trampoline() at fork_trampoline+0xe/frame = 0xfffffe00a0775f30 > 02:04:06 --- trap 0xc, rip =3D 0xf04bf926c9a, rsp =3D 0xf04c04a4f48, = rbp =3D 0xf04c04a4f60 --- >=20 >=20 >> sys/netinet/sctp_os_bsd.h | 18 ++++++++++++------ >> sys/netinet/sctp_output.c | 2 +- >> sys/netinet/sctp_pcb.c | 2 +- >> sys/netinet/sctp_var.h | 4 ++-- >> sys/netinet/sctputil.c | 4 ++-- >> sys/netinet/sctputil.h | 4 ++-- >> 6 files changed, 20 insertions(+), 14 deletions(-) >>=20 >> diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h >> index 80c187b3c5ef..0d88377523c8 100644 >> --- a/sys/netinet/sctp_os_bsd.h >> +++ b/sys/netinet/sctp_os_bsd.h >> @@ -372,11 +372,6 @@ typedef struct callout sctp_os_timer_t; >> #define SCTP_CLEAR_SO_NBIO(so) ((so)->so_state &=3D ~SS_NBIO) >> /* get the socket type */ >> #define SCTP_SO_TYPE(so) ((so)->so_type) >> -/* Use a macro for renaming sb_cc to sb_acc. >> - * Initially sb_ccc was used, but this broke select() when used >> - * with SCTP sockets. >> - */ >> -#define sb_cc sb_acc >> /* reserve sb space for a socket */ >> #define SCTP_SORESERVE(so, send, recv) soreserve(so, send, recv) >> /* wakeup a socket */ >> @@ -384,8 +379,19 @@ typedef struct callout sctp_os_timer_t; >> /* number of bytes ready to read */ >> #define SCTP_SBAVAIL(sb) sbavail(sb) >> /* clear the socket buffer state */ >> +#define SCTP_SB_INCR(sb, incr) \ >> +{ \ >> + atomic_add_int(&(sb)->sb_acc, incr); \ >> + atomic_add_int(&(sb)->sb_ccc, incr); \ >> +} >> +#define SCTP_SB_DECR(sb, decr) \ >> +{ \ >> + SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_acc, decr); \ >> + SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_ccc, decr); \ >> +} >> #define SCTP_SB_CLEAR(sb) \ >> - (sb).sb_cc =3D 0; \ >> + (sb).sb_acc =3D 0; \ >> + (sb).sb_ccc =3D 0; \ >> (sb).sb_mb =3D NULL; \ >> (sb).sb_mbcnt =3D 0; >>=20 >> diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c >> index a146ad401b30..7e32cc662f38 100644 >> --- a/sys/netinet/sctp_output.c >> +++ b/sys/netinet/sctp_output.c >> @@ -7290,7 +7290,7 @@ one_more_time: >> if ((stcb->sctp_socket !=3D NULL) && >> ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || >> (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { >> - atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc, sp->length); >> + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, sp->length); >> } >> if (sp->data) { >> sctp_m_freem(sp->data); >> diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c >> index 9df2f82bdaa6..220d8b72667d 100644 >> --- a/sys/netinet/sctp_pcb.c >> +++ b/sys/netinet/sctp_pcb.c >> @@ -3612,7 +3612,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int = immediate, int from) >> TAILQ_REMOVE(&inp->read_queue, sq, next); >> sctp_free_remote_addr(sq->whoFrom); >> if (so) >> - so->so_rcv.sb_cc -=3D sq->length; >> + SCTP_SB_DECR(&so->so_rcv, sq->length); >> if (sq->data) { >> sctp_m_freem(sq->data); >> sq->data =3D NULL; >> diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h >> index 8301ec38cf6e..ef01b0b6c3bd 100644 >> --- a/sys/netinet/sctp_var.h >> +++ b/sys/netinet/sctp_var.h >> @@ -198,7 +198,7 @@ extern struct protosw sctp_seqpacket_protosw, = sctp_stream_protosw; >> } >>=20 >> #define sctp_sbfree(ctl, stcb, sb, m) { \ >> - SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_cc, SCTP_BUF_LEN((m))); \ >> + SCTP_SB_DECR(sb, SCTP_BUF_LEN((m))); \ >> SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_mbcnt, MSIZE); \ >> if (((ctl)->do_not_ref_stcb =3D=3D 0) && stcb) {\ >> SCTP_SAVE_ATOMIC_DECREMENT(&(stcb)->asoc.sb_cc, SCTP_BUF_LEN((m))); \ >> @@ -210,7 +210,7 @@ extern struct protosw sctp_seqpacket_protosw, = sctp_stream_protosw; >> } >>=20 >> #define sctp_sballoc(stcb, sb, m) { \ >> - atomic_add_int(&(sb)->sb_cc,SCTP_BUF_LEN((m))); \ >> + SCTP_SB_INCR(sb, SCTP_BUF_LEN((m))); \ >> atomic_add_int(&(sb)->sb_mbcnt, MSIZE); \ >> if (stcb) { \ >> atomic_add_int(&(stcb)->asoc.sb_cc, SCTP_BUF_LEN((m))); \ >> diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c >> index ef8d763efabf..a4d4e806c00e 100644 >> --- a/sys/netinet/sctputil.c >> +++ b/sys/netinet/sctputil.c >> @@ -5044,7 +5044,7 @@ sctp_free_bufspace(struct sctp_tcb *stcb, = struct sctp_association *asoc, >> if ((stcb->sctp_socket !=3D NULL) && >> (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) || >> ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE)))) { >> - SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, = tp1->book_size); >> + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, tp1->book_size); >> } >> } >>=20 >> @@ -6121,7 +6121,7 @@ get_more_data: >> if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_SB_LOGGING_ENABLE) { >> sctp_sblog(&so->so_rcv, control->do_not_ref_stcb ? NULL : stcb, = SCTP_LOG_SBFREE, (int)cp_len); >> } >> - SCTP_SAVE_ATOMIC_DECREMENT(&so->so_rcv.sb_cc, (int)cp_len); >> + SCTP_SB_DECR(&so->so_rcv, (int)cp_len); >> if ((control->do_not_ref_stcb =3D=3D 0) && >> stcb) { >> atomic_subtract_int(&stcb->asoc.sb_cc, (int)cp_len); >> diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h >> index 60b5661c309c..d74780cdccf7 100644 >> --- a/sys/netinet/sctputil.h >> +++ b/sys/netinet/sctputil.h >> @@ -253,7 +253,7 @@ do { \ >> } \ >> if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & = SCTP_PCB_FLAGS_TCPTYPE) || \ >> (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ >> - SCTP_SAVE_ATOMIC_DECREMENT(&stcb->sctp_socket->so_snd.sb_cc, = sp->length); \ >> + SCTP_SB_DECR(&stcb->sctp_socket->so_snd, sp->length); \ >> } \ >> } \ >> } while (0) >> @@ -264,7 +264,7 @@ do { \ >> if ((stcb->sctp_socket !=3D NULL) && \ >> ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \ >> (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \ >> - atomic_add_int(&stcb->sctp_socket->so_snd.sb_cc,sz); \ >> + SCTP_SB_INCR(&stcb->sctp_socket->so_snd, sz); \ >> } \ >> } while (0) >>=20 From nobody Mon Jul 31 11:10: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 4RDwX551mKz4q2y0 for ; Mon, 31 Jul 2023 11:10: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 4RDwWz1v6Zz3rC0; Mon, 31 Jul 2023 11: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=1690801839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DbaHTSNEPx2aNjsRCoDzVeJ11upj0WQ8fpEd1HMkIdo=; b=uXroOYAtCz4oEZh7aNWgdHeNPzm5iEDO7pU+CR6E935kjghB1xoKXqSlxeWY2KP93reurQ MS3aECXOUPwoC6YirSX758FLPribDWRKYNod5U/0VoDC9rElpKUy44IsaO3APqJuvdpWwH vNyzX/1bDI5genARh3n3zQwDZY4IBRURYJCiyfEsKCg5V+jVJ2xueaLREMShacmIT7jb+Y M5Av2YE/FybguXpYg0LzgCxHQgjLGaSGll52GghF9AavFVKno9RWIHSsHrjGOMu65CmfzP nDXmwKen1OcIA2Izo3gKdSgeaGVRZVGSmzv2+ewGNzLA6hpds1T+XGiKU3XQCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690801839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DbaHTSNEPx2aNjsRCoDzVeJ11upj0WQ8fpEd1HMkIdo=; b=Jw3y+agXhUNXIHpo81y7jGqJIaPSOeFyeizO/W8xav3hrAdFW/96ryVJnAsM5kzS+x4eFn bt843Yh0l0dL6oDple1AvdV5lEKcM6K97EZu2Ap+X2/Lc3d4FI56MCuCgK3Hi+EUQQ/tce JVXHLPdXUMhBLQmA2zJlmzfoOXcYIzTBp4dgnxxNqg6l4UHahJtBW0A3fay/6Hp5uRXCHu r7pfFmWubXwfWxEysk4adlunklxrzoF8EDYCZQLNoULqrZ0AMJSHOK2gVXuQb+5eFtA4a9 MvpSsT2YDGeJjFPRQueL+8x3iY60C+809FY0sHmnHXvVIVsVxK7eACHCmTSEwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690801839; a=rsa-sha256; cv=none; b=MH0pAfdKenbSOa5wlg+07cIg9VJmwyy9S2gltH5ZQGiyW4p4TUptFOqjvMjS7+2u+CYrfz TLfkemJUV5JVC2ItwPgsb0jgmhQw9gukkt/1rEKkgm9rbN7d6dxNbfl3qyZIdKaIkokWNW hc3tJP419W+TgxmeJrdWkDzIfTVonNdxuSPwukHGI51IHnr95w/MD3LygyZAzdNo0OLyDW j4K0qFwT1TLEUO4vEXYZAP8MUjYq/C0SRHDRa6IJBWyRLprOcIucuAiY/2WK9aMLdSLGlS itydNP4PIqPsvxXeFMRETcgiCYWjZrxnKckVT6kXLm7KnY3ADfkgSRIIsiM7JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDwWz08BvztVD; Mon, 31 Jul 2023 11: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 36VBAckj021035; Mon, 31 Jul 2023 11:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VBAcev021034; Mon, 31 Jul 2023 11:10:38 GMT (envelope-from git) Date: Mon, 31 Jul 2023 11:10:38 GMT Message-Id: <202307311110.36VBAcev021034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 70968ea087e7..f8035ed8e513 - vendor/libarchive - 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/libarchive X-Git-Reftype: branch X-Git-Commit: f8035ed8e51381281e5718a81233fa41b5b9e1d0 X-Git-Oldrev: 70968ea087e76e4f6101a83ccf2fa0b0bf686229 X-Git-Newrev: f8035ed8e51381281e5718a81233fa41b5b9e1d0 Auto-Submitted: auto-generated The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=70968ea087e7..f8035ed8e513 f8035ed8e513 Update vendor/libarchive to libarchive/libarchive@27ca5119f From nobody Mon Jul 31 11:15: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 4RDwfF18kGz4q3J9; Mon, 31 Jul 2023 11:15: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 4RDwf71hxKz3rq1; Mon, 31 Jul 2023 11:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690802159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ECTDzqdjd3SGgRq5ZCMEmGaUgl94H6NMSwq3H/a5ro=; b=BBl9IfffwIOZOR5WdX1mNRTXj1MKVGRrrI4mgDKuZGFFl37YZvMb/67Q6klFHiP7SD3bbj 4gSnu89mQPG4oq3LGBEqDIcUvKywuNZjsTdtq8xzonK1Rg/TUUdNeUcgjeqZX3hZBzrx78 A1BfVZC+aKrlzZkWujtI/qHXaKt39wsUSm4Adi6ofDGTmDdUMh5H+vbp/KAcCR0uPbcwL1 ZYnWceiyvetWU1Ieb0NvyTvq/XjPnJbHlVmdhdfz9U7rCRe6G7OjbAb2up6W9JBSjZZ4R6 X5ILeIKOBku3uKz4y/XH85TujGy6f4uL/dlseVydkH7a29OF4g369Zu+g3Aqhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690802159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ECTDzqdjd3SGgRq5ZCMEmGaUgl94H6NMSwq3H/a5ro=; b=cHtHBpoQBeVsO8Bd1TXJNLbIkQ38+k+1Q2vzGdMnW9vbLULogDyBsE2SkCyLBICuYAbZrt 2ZR8Q9Ffgq/gCPFuKdJg62r5QxpqOXdGwtSBZcAMYsf3N7PSZIAIECwew/cwKOd7DXrFe0 ZMItPLn+XgwLPDjgEvSAm8kOUR8b5MMHC3BPj71tq2/7ud/kJ0l85AKNdR1RpcjyTJrc4d OLyLvF4Sdth15SCUHmuLm3K2yZh6IxHmSYwO1I8XyDgIGibYsqmxz+UFsZ36A+ILOZTQ6Z aCgTnYSIw0R0QfaKw20MCSWIuXbhuLLV9w8lekf74N5NOVW5mjCr3l3HXSxzUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690802159; a=rsa-sha256; cv=none; b=fJMJKDatwZJCTmMtZcpraOhq3ZApaxCaELX0QJKnCbz8rpdvQ09pT+ASPgIOGhwIJIftcO dMKjjtXjSsTTjWDIHkuFHHz4sujWRKMKLl/BPdb/Flx/r/7oCweOaqUub5kfENbgJdUJu0 BKQufkiFEFOSufOt9h/KEp/Y+rdAQWv4qrAiVNgT8kud4d7K95UzstyNt9W4NdkyI1FD0l JYURym2LxG7y3NtbPlnEyUcByH2io7F8mSN+bBcQEz361ZfZ0IdPPdyFlWXL/bl0FvZgbi fYOQRq9jLf0a0sThQUA+LtGV0YtQvhQzeD5bIvm3mYI1muhY8QwvbFwVMc5tdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDwf66YmdztTJ; Mon, 31 Jul 2023 11:15: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 36VBFwPj028367; Mon, 31 Jul 2023 11:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VBFwcj028359; Mon, 31 Jul 2023 11:15:58 GMT (envelope-from git) Date: Mon, 31 Jul 2023 11:15:58 GMT Message-Id: <202307311115.36VBFwcj028359@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: d91bfe0fb7fa - main - libarchive: merge 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/main X-Git-Reftype: branch X-Git-Commit: d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 commit d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 Merge: 896809e29675 f8035ed8e513 Author: Martin Matuska AuthorDate: 2023-07-31 11:13:30 +0000 Commit: Martin Matuska CommitDate: 2023-07-31 11:15:12 +0000 libarchive: merge from vendor branch Changes to not yet connected unzip only. MFC after: 1 week contrib/libarchive/cat/cmdline.c | 12 +- contrib/libarchive/unzip/bsdunzip.c | 66 +++++-- contrib/libarchive/unzip/bsdunzip.h | 63 +++++++ contrib/libarchive/unzip/cmdline.c | 250 +++++++++++++++++++++++++++ contrib/libarchive/unzip/test/test.h | 2 +- contrib/libarchive/unzip/test/test_version.c | 34 ++++ 6 files changed, 402 insertions(+), 25 deletions(-) diff --cc contrib/libarchive/unzip/bsdunzip.h index 000000000000,12b65cefb466..12b65cefb466 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/bsdunzip.h +++ b/contrib/libarchive/unzip/bsdunzip.h diff --cc contrib/libarchive/unzip/cmdline.c index 000000000000,95d4f99b8242..95d4f99b8242 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/cmdline.c +++ b/contrib/libarchive/unzip/cmdline.c diff --cc contrib/libarchive/unzip/test/test_version.c index 000000000000,efa797982d57..efa797982d57 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/test/test_version.c +++ b/contrib/libarchive/unzip/test/test_version.c From nobody Mon Jul 31 12:26: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 4RDyCz590zz4q5FP; Mon, 31 Jul 2023 12:26: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 4RDyCH1Gkcz3y14; Mon, 31 Jul 2023 12:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PnMuEWabpDFbKhZDwqfzrv7MV7Bpd4+4DE87qr3nLZQ=; b=i2c1+cNkh6axaDDE2MKYVbNHSLvK1WQ/HrvTaHthEa3A4xACcHXSfprl8h0f6+mieJ7Sia adZcw0nXxt0ne3iXdP5sf7nknWn7PBQeRHxF2caicK5/S4GVZcVMqETWzcSsFAGkMLxWlF 0DKTCbxSVfAAab38wPWqY8/fqJFLC7ihYkz802wgc60uWuk3no4hWDS2DQ/TMgdm04MS54 Z/IPZyxJh76nyDRlzfi1eRq5j9NNwIloFy1BlCBNoL2XuSxZja8ZveF8CBLjAW1Cbj+vJL CmTRTpissNEGbuNE+gAuRhylmkWWDWfQUaL4GWjbo1ESvAVAZ5bKPI/Djfbrpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PnMuEWabpDFbKhZDwqfzrv7MV7Bpd4+4DE87qr3nLZQ=; b=wpVRoLUMRCFkhxbb/fNThq77rXpE1ZYuINMVeIZjQKlbuhopZ/XTsgSLkrSOZzDmEpqZWz 3IJu2WSEyNTBrGmYlkAtlggyRTrdU0bhrjHKZvFMOrL+HugVsTcKOf4ina1W/K+KKr34bN q44YORRC4S8Ely6C16SqSR4RZzRV3MppTrrscXYhl3bkRGngPiZOXzSKhV8kAc3qiRWvOC VAgtHF5dqAgz/BnbPOhS8luqjuL8LK2C1aw2F7McxipWSkiMJ3u6t6HJxTrHeHI7vE3sR6 b6lHr4buPd4sMSlI0kawoDaL+ihpJ8sFpStkOcKKqOmpAX61DStg06E26Xq/Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690806379; a=rsa-sha256; cv=none; b=HXIhHu+ocfHWG4BJPrwEKIcEq/INGoz6EVVvHL9ilUmGelam0P3SdWt3X4psKWbma5z1iL gFx50GX0cqYt+XCBT3MJdsYbmWGVdctT9wRunyeHOh6JlvjApj+u2zrTBw7FLSZ9RMKjdo tozWE3zRy9yjQtUr6LP1WB6gJ9Jj1SY/Qo2s0jnz578f7WwCweKwgGLm/hbiebejhl8Is9 GzQrAQwqy/whJ9nAQTp4CsYj1UUlBWnPjZGnVA+UvSd/BeVYLdzgmDx9zX8RNFwDkVME25 ek4v0YdcHMQJgPQKD03naHNMlg3L+Otj/8Tsw+WBapy5M3GdsRK6nOQXonCv2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyCF6TWyzwHk; Mon, 31 Jul 2023 12:26: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 36VCQHjD043795; Mon, 31 Jul 2023 12:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCQHxC043794; Mon, 31 Jul 2023 12:26:17 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:26:17 GMT Message-Id: <202307311226.36VCQHxC043794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: eff0170df142 - stable/13 - ena: Fix driver unload crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eff0170df142f973d684e2180beca744a1a88e8c Auto-Submitted: auto-generated The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=eff0170df142f973d684e2180beca744a1a88e8c commit eff0170df142f973d684e2180beca744a1a88e8c Author: Arthur Kiyanovski AuthorDate: 2023-05-21 12:31:54 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:23:42 +0000 ena: Fix driver unload crash When ena_detach is called, we first call ether_ifdetach(), which destroys internal addresses of ifp. One such address is ifp->if_addr->ifa_addr. Then during ena_destroy_device(), if_link_state_change() is called, eventually trying to access ifp->if_addr->ifa_addr->sa_family. This causes an access to garbage memory and crashes the kernel. Ticket [1] was opened to the FreeBSD community to add null check in the code of if_link_state_change(). A fix was submitted in commit [2], however it was noted that it is our driver's responsibilty to not call if_link_state_change() after calling ether_ifdetach(). This commit makes sure if_link_state_change() is not called after ether_ifdetach(). [1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270813 [2]: https://reviews.freebsd.org/D39614 Fixes: 32f63fa7f975 ("Split ENA reset routine into restore and destroy stages") MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit c59a5fbd8a2ef68ed0842cbb1df4450edd654129) --- sys/dev/ena/ena.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index a974a20638b9..d787bb5f9493 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3292,7 +3292,8 @@ ena_destroy_device(struct ena_adapter *adapter, bool graceful) if (!ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter)) return; - if_link_state_change(ifp, LINK_STATE_DOWN); + if (!graceful) + if_link_state_change(ifp, LINK_STATE_DOWN); ENA_TIMER_DRAIN(adapter); From nobody Mon Jul 31 12:26: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 4RDyCz4Tvhz4q5f0; Mon, 31 Jul 2023 12:26: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 4RDyCF6X83z3xxb; Mon, 31 Jul 2023 12:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pF//ODRnA034Wu6LN2FzEwZdd1V+vmaW7jRSoyiX+h4=; b=ZyvFREG//ucbCpKmuo+IQAQmiOVpMQ+KDMWV+NXlWo2KKLJ3xlwef0wYtyfFN6OtFQzcQY 9HlI2UUD9wdA/RiHqz+SyepAJpjbb3LP2tE/0t1Rqu74XMpWpWAyQAVQjnXxiWvKcvObUE EOhUw51h2gWCmNdscXpaPpO2iVBelKlcD+hmgsbpLX+YMu+pXEe8eFZVczZzNdmhPAEIOS 9TLfCxYwEH7BmpzDsZXK26I21luateRrdfvS0jT9mtvJe7AC+cQatc6DVWnVwVr/E8Q1/7 Zhtr7g1cRipL+mMVeFaZrg++88XTw4qP2GIy6GC/1iwjSPL5UaW6RhNQouOfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pF//ODRnA034Wu6LN2FzEwZdd1V+vmaW7jRSoyiX+h4=; b=lEhSGjeb5eMrKjtuglGjluADd4FD1fU4PBjuaUj1q9BOkrjMWQblb8I+n3DndGnGXAywln dh+9VJFLvmavesNG/BO7C9+U7DxFjdO5vxw0nC58wN//6vInF7pWU/SZ1kluchCqTKjD55 A6dm1+DY+sk8MVf4s/v4wKzvryDR4JHHiRYsR2T0MM6YYSOJZTVPrTvEC6mAbdxrmBLa3y Vfl8Q0/kJwbCKoLfi2C2As+l0hn3n2z7fDbY1rKFYM5+lNdpWPlksaPF4tmxEzty8VO/sT F5RHaq+MSZ3LfiaH3vk/2wigMf+whYUrqbso8mRbhpof+IMvBbjTy0PnC/m9mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690806378; a=rsa-sha256; cv=none; b=iARU49PySBx6OA3Lqphr3A/y3lnLXyCNDkH7hKg3qHRjWO0fiqnHwjuYQadr7sTeAVP+xs LOQXvggFwDvY6P5DgjZCoXt1EUSKGoFkpDY4oHcYyETqlzhkB3IHPB7PU2N1fFysOyaISt 5qYFUdSOeCWWwX05m+ZZlSFeYwWySO0LWLqHNXeq0iTLGViGbqjrhsYOGo0W7PXJgw6XTa ZhCLa2H3lNfwZG1rXdBzJ4exROyOV4TJGiY3hGo4tAoYf7sJ0p8hWUVqvqt6uWD5oOOCpD 6CfKxGkTZ7+omlwMNDVriMOFDcrU6N5pUVFuq2MZmFJFPlHCtQAVMBoWwSNd5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyCD60wHzwJv; Mon, 31 Jul 2023 12:26: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 36VCQGtB043768; Mon, 31 Jul 2023 12:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCQGw9043767; Mon, 31 Jul 2023 12:26:16 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:26:16 GMT Message-Id: <202307311226.36VCQGw9043767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 8a6ba4eefb66 - stable/13 - ena: Initialize statistics before the interface is available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a6ba4eefb66159c092330576e9e50748b4db737 Auto-Submitted: auto-generated The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=8a6ba4eefb66159c092330576e9e50748b4db737 commit 8a6ba4eefb66159c092330576e9e50748b4db737 Author: Osama Abboud AuthorDate: 2023-01-18 13:19:07 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:23:34 +0000 ena: Initialize statistics before the interface is available In [1], the FBSD community exposed a bug in the fbsd/ena driver. Bug description: ---------------- Current function call order is as follows: 1. ena_attach() 1.1. ena_setup_ifnet() 1.1.1. Registration of ena_get_counter() 1.1.2. ether_ifattach(ifp, adapter->mac_addr); 1.2. Statistics allocation and initialization. At point 1.1.2, when ether_ifattach() returns, the interface is available, and stats can be read before they are allocated, leading to kernel panic. Also fixed a potential memory leak by freeing the stats since they were not freed in case the following calls failed. Fix: ---- This commit moves the statistics allocation and initialization to happen before ena_setup_ifnet() [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268934 Fixes: 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC") Fixes: 30217e2dff10 ("Rework counting of hardware statistics in ENA driver") MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit b9e80b5280b75f2c641d680245df44b8ff26a7b0) --- sys/dev/ena/ena.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 4dcbb709c586..a974a20638b9 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3480,6 +3480,15 @@ ena_reset_task(void *arg, int pending) ENA_LOCK_UNLOCK(); } +static void +ena_free_stats(struct ena_adapter *adapter) +{ + ena_free_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_free_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + +} /** * ena_attach - Device Initialization Routine * @pdev: device information struct @@ -3657,6 +3666,13 @@ ena_attach(device_t pdev) /* initialize rings basic information */ ena_init_io_rings(adapter); + /* Initialize statistics */ + ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_sysctl_add_nodes(adapter); + /* setup network interface */ rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx); if (unlikely(rc != 0)) { @@ -3678,13 +3694,6 @@ ena_attach(device_t pdev) taskqueue_start_threads(&adapter->metrics_tq, 1, PI_NET, "%s metricsq", device_get_nameunit(adapter->pdev)); - /* Initialize statistics */ - ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); - ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_sysctl_add_nodes(adapter); - #ifdef DEV_NETMAP rc = ena_netmap_attach(adapter); if (rc != 0) { @@ -3707,6 +3716,7 @@ err_detach: ether_ifdetach(adapter->ifp); #endif /* DEV_NETMAP */ err_msix_free: + ena_free_stats(adapter); ena_com_dev_reset(adapter->ena_dev, ENA_REGS_RESET_INIT_ERR); ena_free_mgmnt_irq(adapter); ena_disable_msix(adapter); @@ -3779,10 +3789,7 @@ ena_detach(device_t pdev) netmap_detach(adapter->ifp); #endif /* DEV_NETMAP */ - ena_free_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_free_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); + ena_free_stats(adapter); rc = ena_free_rx_dma_tag(adapter); if (unlikely(rc != 0)) From nobody Mon Jul 31 12:26: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 4RDyCz5hxcz4q5YP; Mon, 31 Jul 2023 12:26: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 4RDyCH3sTnz3yBH; Mon, 31 Jul 2023 12:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yHqF0CO69a3I8HUuEVfef36899d86pjSQTaFVlVoJk=; b=HpYGg47rapdRMkehWGuOO9bkf3Che7RPGSc8G27HHTj926IWfsuNjTNVBIS2lFdgoGTU0N 0na2TNx6uRODL1tptcsyzmYzfcgXwk8lUOR+faGPgXCcqYMgtwbnSTB3AHIxfQvFiuNIe6 Rh+Z6KB8ugRZL/S4N2TmpRx1jT4VnW529hhHNJoVOf+YaCjMu3mgkDS4ZLjVcEqkHxDRBt JsdMFMcLZk5QHb+CfFjyR69KkuoTS40hrA2qOCaES6kCKhHoIAZ0eg15YHBXLOIgOfggdK f8mC4bZ5oMpNjAuaumHxydJiu/TFY1Ztlzf594AtaDtNpXIuJj94r8RVdUvQXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690806379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yHqF0CO69a3I8HUuEVfef36899d86pjSQTaFVlVoJk=; b=Pss6cpdgqHD+4c/JtlcL165Im6LVv5lRR2npQaYEMStr+VxYGqDJLIegp0u3HK2/QcoQxO 3sqQRido28M5s7IRxNG7MPyGeKemiqMarBIJWs8d1lvpNUlK1fOTqlnEOBsNkqB6rdrwJv ccKlJAVOoGC2xo7fsnw5VzZxwinWmARDsp0zLLHpUOzgXsAo3ho94cUnV+2ttGEXzveTiI Tso6j8ga4I2mIQy7FZSiTk8E8ifSuYahu15VoxwzEZ3+Mu7FKbwsFBtWieWEDHJYayFcAl pb6qPwOFk33z1KUDdeTNJUYXZxxgMpuz2gxEPaidLmhkJ0m1ArPhfkPRahxG1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690806379; a=rsa-sha256; cv=none; b=ySM9x1uRw/fns7Echc6Z8pFY/xH7RPiOZgjKh93jLSgJaer+22Vrd09UhOPzuw8gULu5lY w3KgGRkp+wO7Ykvh3OZdw9QeLHH4OfpVMfxI/EPtcQMnbhqM7tzoOW6+GwpyDj7u75Aa4x KiIGlaL8lZWcwpabdMIevWgwJF+LxvKk5cW5lmeSHi5gM8+JhZLdvUBfH1XpF5KT/+JAV3 BeiGa/qNeqqzXekfJA3XBaKMnhMowSqb5a3Zn9ORTM0S42a/0S0T7hK9lUAuw1ZMlOR6pk KvQz7+yevagzoOBZ9VHR7aB4BWFFVYdUzO/CjW6FRCWFDaCL0oR31TpP5UogDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyCH08k7zwHl; Mon, 31 Jul 2023 12:26: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 36VCQIBf043817; Mon, 31 Jul 2023 12:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCQINj043816; Mon, 31 Jul 2023 12:26:18 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:26:18 GMT Message-Id: <202307311226.36VCQINj043816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: e99baa40d8cf - stable/13 - ena: Update driver version to v2.6.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: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e99baa40d8cf37f9251df92fc6aa843b1bd08106 Auto-Submitted: auto-generated The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=e99baa40d8cf37f9251df92fc6aa843b1bd08106 commit e99baa40d8cf37f9251df92fc6aa843b1bd08106 Author: Arthur Kiyanovski AuthorDate: 2023-05-28 08:42:05 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:23:49 +0000 ena: Update driver version to v2.6.3 Bug Fixes: * Initialize statistics before the interface is available * Fix driver unload crash Minor Changes: * Mechanically convert ena(4) to DrvAPI * Remove usage of IFF_KNOWSEPOCH MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit ac40021c935d77d86e68d28c6d33187ce9638ec6) --- sys/dev/ena/ena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index ff33f526ca01..67f5b196bdad 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -41,7 +41,7 @@ #define ENA_DRV_MODULE_VER_MAJOR 2 #define ENA_DRV_MODULE_VER_MINOR 6 -#define ENA_DRV_MODULE_VER_SUBMINOR 2 +#define ENA_DRV_MODULE_VER_SUBMINOR 3 #define ENA_DRV_MODULE_NAME "ena" From nobody Mon Jul 31 12:45: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 4RDydw4D84z4q693; Mon, 31 Jul 2023 12:45: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 4RDydn2rthz40ZL; Mon, 31 Jul 2023 12:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690807549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIURBHbrqGHAOBb/0Bb9Q1WLMmHM9N7n1PW3E1jE1cA=; b=gn1VFwJ78RwYoxAUBR5GbfS3EZe4QNNSswJ/A0Iokvt2nq5fMoUHfN2BDIri0oSBDc6AP4 qxayY13rbnBrJwcZl90upDj4ibe3YStw/KuW7WpJmEB73ly0JhwfXIDMChaemRxBLCIO11 nS8kjUkMkCh0IEJDrrT4jE2wXwzom51eKhenfnzNq+rVLs1Tc0K5jSlR/LIOz+fIuCiCD+ fWNojpUZgVSR494PubmmZa6DV1Iqgr7fTybtIVBuUZvcoleHWgh9TlfRvpp0cZq/lAan4i R9LojJyw9AmlZCg6OQrFYNQv8dBFbNy/oK6eiieMmiESwQzPxOSkCQsn6/Z/+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690807549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIURBHbrqGHAOBb/0Bb9Q1WLMmHM9N7n1PW3E1jE1cA=; b=ocbcP+K5P1oZj6rewNz10Qqb2dEUPTHW69H7TmCQihLsYcs2hlmoHEiPuv+IGuH67yocy5 1fUChqGf+w+ZSQe3T5GQ4aqUVhWo9kZhat3v0AQkB3MKkYJcM5pRQwA+8EVqn3pU7AlViw dAfDhGBxbpIYYPzBUFhPzJrMn9opgp5/v30Q+mMSkMjoW5TJADpp/6aghqfOpEGg+QdHaX Tvd65pGwsq/r/qT/17rjijMaKSWkPAa3Mw7G4kve9wIiFsF/vLICv0h286dJYkT+KBaWgK zk7qNbIyuRzxtSD7F85p4hsT0M2lE4WHXVnDvlXSRDNRozFGv/d58L/WcVKtJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690807549; a=rsa-sha256; cv=none; b=o9YUuOKhF+zHvQmUTbxwndRvOASNgN0DaCz/Ygu6dTnpw9/eMjsoZIGVqsPhjZSPv/v3qB YdyOhrIZ3ZB6GuZYkkRjRh1AZCB5BSrCaw+6hQdnN3uIUUVlfGtsxmy+iiUjsjYtxkkMKL 8/Kyg3kYNBw/b2F6T6HM1MoM02TufAa8+4mc5nlm8jxjNyzLXFC4iCIZVxjV1xBvWf0208 F4tq7lSVFh2Kcnm25ykrAD5SzrOWwS3CoMjcYmwB/mmlRmMNOyBI4EqmdOB43AGmtwOkHl vZblO6aG/Q0w1UWcJMGVsQPba8b5VQMu25ev34gxaObfTJ0tL5Ql53k3TwEm3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDydn1G38zwhB; Mon, 31 Jul 2023 12:45: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 36VCjnjK076592; Mon, 31 Jul 2023 12:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCjnaD076591; Mon, 31 Jul 2023 12:45:49 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:45:49 GMT Message-Id: <202307311245.36VCjnaD076591@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: 8763579a44e3 - stable/13 - netinet6 tests: test for loss of Solicited-node multicast groups List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 8763579a44e31713a6d1b0d9618eeab3eac9d868 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8763579a44e31713a6d1b0d9618eeab3eac9d868 commit 8763579a44e31713a6d1b0d9618eeab3eac9d868 Author: Kristof Provost AuthorDate: 2023-07-19 14:37:28 +0000 Commit: Kristof Provost CommitDate: 2023-07-31 12:43:14 +0000 netinet6 tests: test for loss of Solicited-node multicast groups The multicast code has an issue where it can lose the Solicited-node multicast group subscription if the same address is added twice. Test for this. PR: 233683 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41123 (cherry picked from commit b03012d0b600793d7501b4cc56757ec6150ec87f) --- tests/sys/netinet6/mld.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/sys/netinet6/mld.sh b/tests/sys/netinet6/mld.sh index 034d5945ae20..80b7117c3717 100755 --- a/tests/sys/netinet6/mld.sh +++ b/tests/sys/netinet6/mld.sh @@ -80,10 +80,50 @@ mldraw01_cleanup() { vnet_cleanup } +atf_test_case "pr233683" "cleanup" +pr233683_head() { + + atf_set descr 'Test for PR233683' + atf_set require.user root +} + +pr233683_body() { + j="mld:pr233683" + + vnet_init + + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + jexec ${j}a ifconfig ${epair}a inet6 2001:db8::1/64 up + sleep 5 + + jexec ${j}a ifconfig ${epair}a inet6 2001:db8::1/64 + + vnet_mkjail ${j}b ${epair}b + jexec ${j}b ifconfig ${epair}b inet6 2001:db8::2/64 up + + # Allow DAD to run + sleep 5 + + # Debug output. If the bug is present we'd expect to not see a + # membership for ff02::1:ff00:1 + jexec ${j}a ifmcstat -i ${epair}a + jexec ${j}a ifconfig ${epair}a + + atf_check -s exit:0 -o ignore \ + jexec ${j}b ping -6 -c 1 2001:db8::1 +} + +pr233683_cleanup() { + + vnet_cleanup +} atf_init_test_cases() { atf_add_test_case "mldraw01" + atf_add_test_case "pr233683" } # end From nobody Mon Jul 31 12:45: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 4RDydw3y3Kz4q6Fw; Mon, 31 Jul 2023 12:45: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 4RDydm4sRlz40jF; Mon, 31 Jul 2023 12:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690807549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sk8RDu7Q/8Rz0xVhTNsUjL+03BGdNB2PO/WB1B9XlDw=; b=WTWWEO0elIRW156gBI9s1GF/chsOoAzwfsMBenqxZf3UW9Zle2ZDWl1Q9Z0C3qiOSZNNZM X1xdGOCNWBNMAJbN/TnjEQw9NxsmZcV1iYKjnRvExcc2CqxJNDzdSRlGkIIU0OiQss2eF0 asFzu1e+/8IsH9wYD1xkfvLzY+a6gdAeTY8j/Po7za8+Cq5t2yg9ajqLOcR5qRpkxsb4bP mqByutcA2z8+UODVGn8edRj0csZ4rOJkxaa//dJg2NzSM9qoeh8p5w0CPk+v5GhSSkjCqd S0/4p8SRFeFY9rbG4+B/UUrYTaJm0VKCUMsH/JQ94nAaX6xnolKAj0kGqqs1fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690807549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sk8RDu7Q/8Rz0xVhTNsUjL+03BGdNB2PO/WB1B9XlDw=; b=cMF5aFVDb3o8rtmft+Jy6TtqxYzWosAdqA/B742Vo4ThdxowrJxQSY4ERtcld/9tDZvsFh 0DLgQVd2tlvsnXQonO2xBqrHZJwq5W/X2OL8OIWFPDzoYRvnz7QRt9YCz2ImvydOaWfA9y cDjtce3jnczMtJ2TkpOnLhJ2d3ThBZphihs99sXn0dwJociSMDAOnlFNrsgSYPCvuW1VDn ACIB1EhP0JFEfxssomzTXSCqSyC4AGtw4x35swY3dHqlQodqLg6vhNOk6qa6xQo3hFJTv+ 7UtQhH8KHlI03jepMENiy/YyofH4StQ6LjJc64GYKPBo+ooah8lJ2pFdIf4G9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690807549; a=rsa-sha256; cv=none; b=YGr3yP8s6gCgt4bzuvDrFeIr59pdeFhKxre5hBL5/WRdGlMHuAI+fnWL5GWtmce7HRZDPu BPA7GIGYD//YymCmCdYCP1h7HEB9gcCweo08QZMLs8TVNz/0ezYQBW3+ytuND7AJfF/Mi3 9C4K3LnFHRf6rbsEr3xt2zcM0e7m0vDfxMSbQg09upGKYaZZEVCryDFRROPcp42PlnnsuT PzjvrDJ8Sjn7bAgn0oFUz6KxMRms9YNK+2f0iQcQO1SnItB+by0yQj5sUCDOgwCchwUXXB 3alFyd5UJtwIx6hKQpqFdZa10i4WLYbnrF3TzfaLkRTI7Nv7jrqFlQRlNm0/YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDydm1l0Hzwh9; Mon, 31 Jul 2023 12:45: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 36VCjlQC076569; Mon, 31 Jul 2023 12:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCjldC076568; Mon, 31 Jul 2023 12:45:47 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:45:47 GMT Message-Id: <202307311245.36VCjldC076568@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: abab84cfac60 - stable/13 - mld: always commit state changes on leaving List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: abab84cfac60e7e5a78d43cc4b0cfdd49f361989 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=abab84cfac60e7e5a78d43cc4b0cfdd49f361989 commit abab84cfac60e7e5a78d43cc4b0cfdd49f361989 Author: Kristof Provost AuthorDate: 2023-07-20 07:41:45 +0000 Commit: Kristof Provost CommitDate: 2023-07-31 12:43:14 +0000 mld: always commit state changes on leaving Resolve a race condition where we'd lose the Solicited-node multicast group subscription if we assigned the same IPv6 address twice. PR: 233683 Reviewed by: ae MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41124 (cherry picked from commit 9c9a76dc6873427b14f6c84397dd60ea8e529d8d) --- sys/netinet6/mld6.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 1c984db70e93..fffd37738244 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -2162,13 +2162,10 @@ static void mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) { struct epoch_tracker et; - int syncstates; #ifdef KTR char ip6tbuf[INET6_ADDRSTRLEN]; #endif - syncstates = 1; - CTR4(KTR_MLD, "%s: final leave %s on ifp %p(%s)", __func__, ip6_sprintf(ip6tbuf, &inm->in6m_addr), inm->in6m_ifp, if_name(inm->in6m_ifp)); @@ -2232,7 +2229,6 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) inm->in6m_state = MLD_LEAVING_MEMBER; inm->in6m_sctimer = 1; V_state_change_timers_running6 = 1; - syncstates = 0; } break; } @@ -2244,15 +2240,13 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) break; } - if (syncstates) { - in6m_commit(inm); - CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__, - ip6_sprintf(ip6tbuf, &inm->in6m_addr), - if_name(inm->in6m_ifp)); - inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED; - CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s", - __func__, &inm->in6m_addr, if_name(inm->in6m_ifp)); - } + in6m_commit(inm); + CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__, + ip6_sprintf(ip6tbuf, &inm->in6m_addr), + if_name(inm->in6m_ifp)); + inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED; + CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s", + __func__, &inm->in6m_addr, if_name(inm->in6m_ifp)); } /* From nobody Mon Jul 31 12:56: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 4RDytJ2VXXz4q6XQ; Mon, 31 Jul 2023 12:56: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 4RDyt545C2z414S; Mon, 31 Jul 2023 12:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr1oihkSI/J7j0WOtIloIZZ8Us+nH8bvtJUhaeChi0=; b=JsJ845xKgcjpNRd7gkQHLkVC5T0umoEUAbpQGjAdwet3BaZ50A/ts5ri3kar7UqmRalHuK m38AGNVCCBAARR9G6OkjTmg4HWpIKB9Pmq8wExTUpYDpbUUXw+UdLlLeKeDaccV6SN03pH Q5ZB3IuzjG8VlWCiRjrDmfyniVyIoGsiBLoaVfmD6Q1pBGuKs5KkZJbYMypuICno07St66 J+bbUccvbyMsPYcUdj7MP5PtzerP8MFOC0Kp652yetaFc2ySHY1RqmuGRO+mpFYb/aamu0 FQWYrFMlY7GEcjEKAjc1aCi/l8jigLmTSa4PzpSywjwkiCwm4J4TEDoZUYgI4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr1oihkSI/J7j0WOtIloIZZ8Us+nH8bvtJUhaeChi0=; b=mUM9AqmsM2+k6SCOLZuIqcSwQJ9K6gn9WP/pAh4T2wlzKG80ylJpM7nf37Czs2S4XYoVKs yZe4GeapyU0IenthAnMsd/44aI+EFAOZSJP4YrvjYitzMBVfGWU9kpNsgTRYy5JIK0APPc 5IvjMYP1N0TIRc/N17/Ti3P22o1lF9BzyEXU6bgDKPOYxxYUhrspwIFAur4qKKERD3S2Fj uJ+flibMpyJGeAVHXDpwfZnqbj37SnptPPOYF4NI2Kqtp1DSqA0Ijo5Z8VEuySaYbTdidL jsg5tkANkw1sCVJyDubr1qc1ZXKPqPJE0o15cd2TMlarflnYauYBpWv3q7AWpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808189; a=rsa-sha256; cv=none; b=R5Y2pyiyaIhxpXPsGIl6xZrWZCYBFGoBhKmP2rAkhuOXJnh1tXCyLGEWOMjjAuSObWeKeX j3146YG1SYV/ItObyw3ZES1zPtlGRLhC9qHVWnjZLftCOVP0XolC2uuOz42LGXPJsmZXF0 syr4065xYikQ83+buztUpt/6GpoN72tUsSpENN76wW59wxSTMU4b3i6EdQnUQWMZfX9/E7 c4fjz/w83PT1/wcU2i3s1B19BKAb+vPwXrbziEBFAXVUgh2HsT5BRxCJYCL03T/byaWdNW xF+YIeJ3K7/OiiC4oRrCFNCiVpJuZByLNSvhk/8MQ1dePyRXpM7KWp5qoJ1a9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyt40VMMzwxd; Mon, 31 Jul 2023 12:56: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 36VCuRi7093349; Mon, 31 Jul 2023 12:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCuRn2093348; Mon, 31 Jul 2023 12:56:27 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:56:27 GMT Message-Id: <202307311256.36VCuRn2093348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: b390fe1d806a - stable/12 - ena: Fix driver unload crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b390fe1d806a56ee8c8b6d57c7d47ca288f20337 Auto-Submitted: auto-generated The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=b390fe1d806a56ee8c8b6d57c7d47ca288f20337 commit b390fe1d806a56ee8c8b6d57c7d47ca288f20337 Author: Arthur Kiyanovski AuthorDate: 2023-05-21 12:31:54 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:49:58 +0000 ena: Fix driver unload crash When ena_detach is called, we first call ether_ifdetach(), which destroys internal addresses of ifp. One such address is ifp->if_addr->ifa_addr. Then during ena_destroy_device(), if_link_state_change() is called, eventually trying to access ifp->if_addr->ifa_addr->sa_family. This causes an access to garbage memory and crashes the kernel. Ticket [1] was opened to the FreeBSD community to add null check in the code of if_link_state_change(). A fix was submitted in commit [2], however it was noted that it is our driver's responsibilty to not call if_link_state_change() after calling ether_ifdetach(). This commit makes sure if_link_state_change() is not called after ether_ifdetach(). [1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270813 [2]: https://reviews.freebsd.org/D39614 Fixes: 32f63fa7f975 ("Split ENA reset routine into restore and destroy stages") MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit c59a5fbd8a2ef68ed0842cbb1df4450edd654129) --- sys/dev/ena/ena.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index c8c12593fcd1..b157be9ada88 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3296,7 +3296,8 @@ ena_destroy_device(struct ena_adapter *adapter, bool graceful) if (!ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter)) return; - if_link_state_change(ifp, LINK_STATE_DOWN); + if (!graceful) + if_link_state_change(ifp, LINK_STATE_DOWN); ENA_TIMER_DRAIN(adapter); From nobody Mon Jul 31 12:56: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 4RDytJ42PLz4q6k1; Mon, 31 Jul 2023 12:56: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 4RDyt63C2yz40t2; Mon, 31 Jul 2023 12:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVkVkbDfuS5jhnIj2KxLkzZhreAaK7DUmb14UJKCiXE=; b=PEdSTNMW1IPaVn/QspLEtqKpZaDX9w6XYv5QzPOE/6DvtLCxitLCT1j7lMcwaPtJvYSXwd QB9nVFZcUxV8ndVBLb/qZP7800I1hfCL2P3HGaNar95BPD6or6RgKRGek4hQviKXRq5Ihz Q31vN2ylsILaWieYaGN4WZDmSTFaqxpZU0Np7kDwHngN/14/RzD8iRuZ24AemJa5Oq1yHn It+U6jG8EaML9D0xDf7ay49rSuaDAUP+O31MDyUY93ox5I5KYQi6ZCmxxU1cGKP32fy0in pQazslXBSYBw9c0zrY9tJp+K1z9AHmjsiZagIJmLCW/HkVIr/gOOKrSGlmTDQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVkVkbDfuS5jhnIj2KxLkzZhreAaK7DUmb14UJKCiXE=; b=unVWeEtR4Ug6puT2xRPrvv7+2pmm9CEuz4MBvOH4CYR2oBNDcdpSD46oCvwRwe+2GVTclK 8UXAAxwzrEBKJyhkm94i0DN4ZJ0ZbM0V50fcj8meTAggswIa6Q0gKiH7nDw2VB25Cd7Vut DeWLapLgSutQh4qt00O0vSa9OGsfqr1uVqIBTkBgL+5Wz4EDFJKSOJmv4RWaEKx/lA5v+5 VUw1Vp+Z/nLrlxU+I/HDk3/47NH2XtDEnguc6BHXA21ZtrIpWqbDlrUrS1/twAE+upV6C5 PBUsi/KR5/o7R4UP6Y+XwIZkciAdJMVNgK5uYwKKyejo5FWIOVmEELkT2KjEmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808190; a=rsa-sha256; cv=none; b=D78YnCVR+OEiBAO3J8YDOrFFfvdUNrDsfApQ3VFnK3jx6FQLH5SQfRGpOiH4dg1qPtWpwk kvUe3hfZCWFH8B9yBsTyWQoOvfH31dXJZb2MdqwTu0B7RA7UQJ27PdBOVssvyW5vJPubPK t/giDckxegx3sOPfMeov7GBrxCGzV+V9HHYVMF5/32FutZCnbyZRno2D1EAEno8dJzLUJe fFJABkWKM7UgX/Lbu5QF9d1Lo2cLeOoN2g3Msu82+xzGFLLfV/s74iPmzVty2KO2xYcjEu b9oXD8s0ceZrxSZU7cHKs7s4Llwcu/dBscijoq9VtrHsMitrdckF2BHxf9TbEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyt52Fkxzwt2; Mon, 31 Jul 2023 12:56: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 36VCuTtc093369; Mon, 31 Jul 2023 12:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCuT5J093368; Mon, 31 Jul 2023 12:56:29 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:56:29 GMT Message-Id: <202307311256.36VCuT5J093368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: a3927f6e3aba - stable/12 - ena: Update driver version to v2.6.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: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a3927f6e3aba804da6a4d4820cd47acf9538b2b4 Auto-Submitted: auto-generated The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=a3927f6e3aba804da6a4d4820cd47acf9538b2b4 commit a3927f6e3aba804da6a4d4820cd47acf9538b2b4 Author: Arthur Kiyanovski AuthorDate: 2023-05-28 08:42:05 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:50:09 +0000 ena: Update driver version to v2.6.3 Bug Fixes: * Initialize statistics before the interface is available * Fix driver unload crash Minor Changes: * Mechanically convert ena(4) to DrvAPI * Remove usage of IFF_KNOWSEPOCH MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit ac40021c935d77d86e68d28c6d33187ce9638ec6) --- sys/dev/ena/ena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 75fb00652460..3c8b08c3cb83 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -41,7 +41,7 @@ #define ENA_DRV_MODULE_VER_MAJOR 2 #define ENA_DRV_MODULE_VER_MINOR 6 -#define ENA_DRV_MODULE_VER_SUBMINOR 2 +#define ENA_DRV_MODULE_VER_SUBMINOR 3 #define ENA_DRV_MODULE_NAME "ena" From nobody Mon Jul 31 12:56: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 4RDytJ3rHGz4q6k0; Mon, 31 Jul 2023 12:56: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 4RDyt36XKxz40t1; Mon, 31 Jul 2023 12:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIxHoWnZ7mNLxumm2+/NetVfWmRSSRKIeQ8JlLUaNZg=; b=l8geFNa0NI3ZbjJ+GhQJMg4BGcgKeJvqm29QS3XxEr1uUMu7uV9+QK1KgKLutk2HmBZDTe e87CkmpoOTImMIZonEF71b77fhEwLlnQmvxlnB0p2BltWHA4Eq63i4gAPjTNYt2E8EbnwW sfICsDqOUcrFBv8GbyzrJhcjITGFyriCWS3MvoFpO+6ERbddt9X2ur7TA5YH9Vbo7yaq8M Xw3KK9k11UxLCSIyX66SYB/8zdyMSGS+XBxWFwuQa3bEb8BFeilEkH+ybc7qu/J5dGD/Jr 65pBa8gzrJgvPsUnZ/tVMmEvpi6/SyQ9lD/WvCXCBARuOsE2UWgwjc7ffkggiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIxHoWnZ7mNLxumm2+/NetVfWmRSSRKIeQ8JlLUaNZg=; b=foBM4uqYsoIW5DKCxDJuiUshSkEJnoNMrJR0aPUNT46hM9M9L76q1IOvx1kFFMHcGji+Qf oQBP7TZE6MNqmy7BlB3pZaeCb9vdvMswaGKmvOemABHF+ERIXqqrLkuY8pnpQhrwzmdnmm IB5WymN+b53LTLMM+45H/sXiJ2h3fZjGobpSVUO6LBRNT9IKgQ3VwLB2mUWq7VGHB9Vx2s /LJDGJVGEA/jikuacVT8za9L2a3eNwwTuhvtVriqh0o86f5S31wsRKccom2Unqc5FF1xTC pBAQbxEDH39BVWLsC+w+TPy5ajak873Gf8Q3fhHHPOSEIaDqkzToLnACK2iAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808188; a=rsa-sha256; cv=none; b=Zo3+AYSCeDvShsKEqgdfVGA1g5osdgcd+OlMLDYyZElgFJc2M5O2zAxc4mmpiIi0Fe3pQr Rp98Ib3ARPrRAoeqXu0Go7Hw5sdw+e7HbACEkLXAYZt3r7axbamqKbsvD7N6rclKSEIsHP I7B6KO/EStNfpxI2YUxrORUqG7BryzPvLrBgwRFezsOVmuomF7t05Pi8IIhr+GW400Vvzo 8XWGKbz20apUsVMQr43ZHzDTkvCUk8WACOdgiZD+Aybm5tmmp+5YFIHDKPuX+eVGT7/P5C 2AO37LZ8jTjZsMF/8YOysleYIX1UrvMHsQLjSX+BxzWU8mAlxbc1lkDj5Ts1Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyt314jgzx0y; Mon, 31 Jul 2023 12:56: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 36VCuQdl093330; Mon, 31 Jul 2023 12:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCuQIf093329; Mon, 31 Jul 2023 12:56:26 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:56:26 GMT Message-Id: <202307311256.36VCuQIf093329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 383cf7052a29 - stable/12 - ena: Initialize statistics before the interface is available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 383cf7052a29ab3f4d1bdffb888696546e4f0fe4 Auto-Submitted: auto-generated The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=383cf7052a29ab3f4d1bdffb888696546e4f0fe4 commit 383cf7052a29ab3f4d1bdffb888696546e4f0fe4 Author: Osama Abboud AuthorDate: 2023-01-18 13:19:07 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:49:47 +0000 ena: Initialize statistics before the interface is available In [1], the FBSD community exposed a bug in the fbsd/ena driver. Bug description: ---------------- Current function call order is as follows: 1. ena_attach() 1.1. ena_setup_ifnet() 1.1.1. Registration of ena_get_counter() 1.1.2. ether_ifattach(ifp, adapter->mac_addr); 1.2. Statistics allocation and initialization. At point 1.1.2, when ether_ifattach() returns, the interface is available, and stats can be read before they are allocated, leading to kernel panic. Also fixed a potential memory leak by freeing the stats since they were not freed in case the following calls failed. Fix: ---- This commit moves the statistics allocation and initialization to happen before ena_setup_ifnet() [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268934 Fixes: 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC") Fixes: 30217e2dff10 ("Rework counting of hardware statistics in ENA driver") MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit b9e80b5280b75f2c641d680245df44b8ff26a7b0) --- sys/dev/ena/ena.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 15c8d39d8fb5..c8c12593fcd1 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3484,6 +3484,15 @@ ena_reset_task(void *arg, int pending) ENA_LOCK_UNLOCK(); } +static void +ena_free_stats(struct ena_adapter *adapter) +{ + ena_free_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_free_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + +} /** * ena_attach - Device Initialization Routine * @pdev: device information struct @@ -3661,6 +3670,13 @@ ena_attach(device_t pdev) /* initialize rings basic information */ ena_init_io_rings(adapter); + /* Initialize statistics */ + ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_sysctl_add_nodes(adapter); + /* setup network interface */ rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx); if (unlikely(rc != 0)) { @@ -3682,13 +3698,6 @@ ena_attach(device_t pdev) taskqueue_start_threads(&adapter->metrics_tq, 1, PI_NET, "%s metricsq", device_get_nameunit(adapter->pdev)); - /* Initialize statistics */ - ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); - ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_sysctl_add_nodes(adapter); - #ifdef DEV_NETMAP rc = ena_netmap_attach(adapter); if (rc != 0) { @@ -3711,6 +3720,7 @@ err_detach: ether_ifdetach(adapter->ifp); #endif /* DEV_NETMAP */ err_msix_free: + ena_free_stats(adapter); ena_com_dev_reset(adapter->ena_dev, ENA_REGS_RESET_INIT_ERR); ena_free_mgmnt_irq(adapter); ena_disable_msix(adapter); @@ -3783,10 +3793,7 @@ ena_detach(device_t pdev) netmap_detach(adapter->ifp); #endif /* DEV_NETMAP */ - ena_free_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_free_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); + ena_free_stats(adapter); rc = ena_free_rx_dma_tag(adapter); if (unlikely(rc != 0)) From nobody Mon Jul 31 12:59: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 4RDyx844FRz4q6n3; Mon, 31 Jul 2023 12:59: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 4RDyx320cBz40tc; Mon, 31 Jul 2023 12:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWXwfkToo+UcuvREysqG+vWV+XJ2PaBhn9oaqpewl6A=; b=WZBEXEK4bGk1DBeMAz68qA99r9lAZ+LAcwu2HmthQ8lmPCIq9tTJXvpTrgN6EN7Q/cD6bz 6ZF4nlHiPcMkAgGJd/Esox1W3lzVMg9HBPBTruQ91i8vkSgB4+6ff/ZycDjrjDiAQ0qXYt BiKVLHXSWtN8d7ArUCjXSxerOLHkiCSr4uDfQAF9HtrHsCc52R6i2TzVtC5sms3wARFTOH ALblXrNHWKhJmSKjDnuDUZvH4bsQS1lPr3xEMYgzhaz2/QkcxY8s3E7/FfDzUhFebkelh2 NB9+ZxTPZZ2xmsQ2+5+hS1urRIgoUizqBmWL8xTmECFc3iCJFYNfTOri4AsT2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWXwfkToo+UcuvREysqG+vWV+XJ2PaBhn9oaqpewl6A=; b=JMWmn4meZY09I8tNSzg4qk9aCkI45E3y7mPylteWQF8h+Qcg77sgQSinGrYCrOzAiFor2u 9QzEW4rRZNgxYjwXQY5SPI5wMaFfnFvcwF+B3oJkYV2bfDoHVuUjIE7Swy4SLkFJ7+T2PQ 9uUVfQn45HOmgSduOwHVtaPfh9Ni40e27GF+GcbW242Gi4N9wzX01zwY4T/DZ3U+qB/xkL KlrdcgDhIU3TFIy9G27sRTeKQmdi46xULvTE9obKYRmKAlWiu8chQFcb3PzH264z62x3Fm lLBikWpPZrkXtu9vdR/NWkMoMpsCCoPQNQvpVZ2ZEkKk0sne90ZBSLoya7HvDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808343; a=rsa-sha256; cv=none; b=sbs38aISwnALbgIiUuxSKITndhLxcHCmLycwcPnjrbslYnGvx0t2jHJpTaxRImGFtWjRLi Bxy9FLL9WTL4qOOjZ5FhPfQl6iSasCQxVeDrQ+Qvb/JPNgNOwJa3t5J+JOJhSbRYxL3tDy NyZgKc6e7wuCy2M9waqHztnlAySNJs+EpsXNlKc8+vc3shm3hKsXr3mC3JmFgdaGJwXQml 81KVZtnfUHDspEyzfK/+oxRzVA+T3iBsR12PjDbN/2yg0N28DZ8EJGBi42Ej3caUaAFl2f fh3J0qCCxXe5rirx1OyLWx7eJG372/NOJYNslqPegxSEQBAjahTp4OrLxjnwtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyx30mnMzwdY; Mon, 31 Jul 2023 12:59: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 36VCx3K0093885; Mon, 31 Jul 2023 12:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCx3Eu093884; Mon, 31 Jul 2023 12:59:03 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:59:03 GMT Message-Id: <202307311259.36VCx3Eu093884@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: 193aeedc9b66 - stable/13 - arm64/disassem.c: add extended register instruction definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 193aeedc9b66d759148d51b97610ec4558569aae Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=193aeedc9b66d759148d51b97610ec4558569aae commit 193aeedc9b66d759148d51b97610ec4558569aae Author: Mykola Hohsadze AuthorDate: 2023-07-24 20:49:24 +0000 Commit: Mitchell Horne CommitDate: 2023-07-31 12:54:01 +0000 arm64/disassem.c: add extended register instruction definitions Add disassembly support for the following extended register instructions: add, adds, sub, subs, cmp, cmn. Reviewed by: mhorne MFC after: 1 week Pull Request: https://reviews.freebsd.org/D40967 (cherry picked from commit 4a07c778632bddb86a82f3e1fe144d889dae69c5) --- sys/arm64/arm64/disassem.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c index c1e38266a2e0..a86fef1d96a6 100644 --- a/sys/arm64/arm64/disassem.c +++ b/sys/arm64/arm64/disassem.c @@ -73,6 +73,11 @@ static const char *shift_2[] = { "lsl", "lsr", "asr", "ror" }; +static const char *extend_types[] = { + "uxtb", "uxth", "uxtw", "uxtx", + "sxtb", "sxth", "sxtw", "sxtx", +}; + /* * Structure representing single token (operand) inside instruction. * name - name of operand @@ -107,6 +112,12 @@ enum arm64_format_type { /* OP , #imm SF32/64 */ TYPE_03, + + /* + * OP , , {, { # } } + * OP , , {, { # } } + */ + TYPE_04, }; /* @@ -260,6 +271,18 @@ static struct arm64_insn arm64_i[] = { TYPE_01, OP_SHIFT_ROR }, /* eon shifted register */ { "eor", "SF(1)|1001010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", TYPE_01, OP_SHIFT_ROR }, /* eor shifted register */ + { "add", "SF(1)|0001011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|RD(5)", + TYPE_04, OP_RD_SP }, /* add extended register */ + { "cmn", "SF(1)|0101011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|11111", + TYPE_04, 0 }, /* cmn extended register */ + { "adds", "SF(1)|0101011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|RD(5)", + TYPE_04, 0 }, /* adds extended register */ + { "sub", "SF(1)|1001011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|RD(5)", + TYPE_04, OP_RD_SP }, /* sub extended register */ + { "cmp", "SF(1)|1101011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|11111", + TYPE_04, 0 }, /* cmp extended register */ + { "subs", "SF(1)|1101011001|RM(5)|OPTION(3)|IMM(3)|RN(5)|RD(5)", + TYPE_04, 0 }, /* subs extended register */ { NULL, NULL } }; @@ -408,6 +431,27 @@ arm64_disasm_read_token_sign_ext(struct arm64_insn *insn, u_int opcode, return (EINVAL); } +static const char * +arm64_disasm_reg_extend(int sf, int option, int rd, int rn, int amount) +{ + bool is_sp, lsl_preferred_uxtw, lsl_preferred_uxtx, lsl_preferred; + + is_sp = rd == 31 || rn == 31; + lsl_preferred_uxtw = sf == 0 && option == 2; + lsl_preferred_uxtx = sf == 1 && option == 3; + lsl_preferred = is_sp && (lsl_preferred_uxtw || lsl_preferred_uxtx); + + /* + * LSL may be omitted when is 0. + * In all other cases is required. + */ + if (lsl_preferred && amount == 0) + return (NULL); + if (lsl_preferred) + return ("lsl"); + return (extend_types[option]); +} + static const char * arm64_w_reg(int num, int wsp) { @@ -432,6 +476,18 @@ arm64_reg(int b64, int num, int sp) return (arm64_w_reg(num, sp)); } +/* + * Decodes OPTION(3) to get register or + * for extended register instruction. + */ +static const char * +arm64_disasm_reg_width(int option, int reg) +{ + if (option == 3 || option == 7) + return (arm64_x_reg(reg, 0)); + return (arm64_w_reg(reg, 0)); +} + vm_offset_t disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) { @@ -451,10 +507,13 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) /* Indicate if shift type ror is supported */ bool has_shift_ror; + const char *extend; + /* Initialize defaults, all are 0 except SF indicating 64bit access */ shift = rd = rm = rn = imm = idx = option = amount = scale = 0; sign_ext = 0; sf = 1; + extend = NULL; matchp = 0; insn = di->di_readword(loc); @@ -669,6 +728,37 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) di->di_printf("#%d", imm); break; + + case TYPE_04: + /* + * OP , , {, { # } } + * OP , , {, { # } } + */ + + arm64_disasm_read_token(i_ptr, insn, "RN", &rn); + arm64_disasm_read_token(i_ptr, insn, "RM", &rm); + arm64_disasm_read_token(i_ptr, insn, "OPTION", &option); + + rd_absent = arm64_disasm_read_token(i_ptr, insn, "RD", &rd); + extend = arm64_disasm_reg_extend(sf, option, rd, rn, imm); + + di->di_printf("%s\t", i_ptr->name); + + if (!rd_absent) + di->di_printf("%s, ", arm64_reg(sf, rd, rd_sp)); + + di->di_printf("%s, ", arm64_reg(sf, rn, 1)); + + if (sf != 0) + di->di_printf("%s", + arm64_disasm_reg_width(option, rm)); + else + di->di_printf("%s", arm64_w_reg(rm, 0)); + + if (extend != NULL) + di->di_printf(", %s #%d", extend, imm); + + break; default: goto undefined; } From nobody Mon Jul 31 12:59: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 4RDyx83CWTz4q6hS; Mon, 31 Jul 2023 12:59: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 4RDyx10NSCz40wx; Mon, 31 Jul 2023 12:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9TjZeSBLFgPISiQ0/tkp+7rvEqd6Dzpu+58cyNyQJCI=; b=oxia8ua0epXb5cXPDAlhzxkiIir3MjeS7gaEe6NRlCu+gRA0JURScfmubtue5Hjz2SE70P jD9bkBluhqGWBlZ3k7mGah5Bw0N+q7VXS/i40Mbnq3jYAwyNfUCI7tDlZOe0+2RsFIdK5k 5iJcigfEYfD/nmqMmYRSY7xOxNxusVQ4Y9ckBRuO/blsfsfKeyMxkW+LtSWsV5mZ7kkzMV bygMDpU6f1u+kEhU0TKlHwZ1y8csmIeGZcLETpAR7yMwPL6/F2YlcbL/hCtvR7BV/NZB4G 7HOQIOphWSUrwVJ0jGa215o7iAE0++tXAQdVp6wU/uy8EjxcKcUg8fFZbbHdHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9TjZeSBLFgPISiQ0/tkp+7rvEqd6Dzpu+58cyNyQJCI=; b=di9TCXR46I/mhLTjrN2SIjEwSp+35cVS0Wh17Neg18EEej3mX8v7pGEJ2ih52TYddl3G03 EBEsDSllC8IgRDt/LI+Z2yYgAlLpLTWLDMppVl8X3xl90g/KDRUcptJG4+Y/XyYx4Ed+Nv 29KD2Pi24IG5ObMJBzm2ccTK3sYA6H9/b3hRJ6JiFlfI870OGbzq7vA2J68wvKUGc/V/V/ dtD0jrrIXLWknFP+DB4pryezMieCz9hh6KZtM7xa2TBEqJLn8xiUysr68xBuVRoxG26ZnY 1iWyRkIVfdg5+dwkwpU+h1erpiG5ug3Zfr/cbLXRTOx1uqQA02qmQcYrszXwhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808341; a=rsa-sha256; cv=none; b=fy53sfbZidI+d+sET/fabki822Et5LHk1FITTAo5CcKEVnUn/d3Q40JKF5UABPjuiSE0Ju sjOcFgrqm9xImttS2JIjRSS3Gun35RTJ8YocvCFAbnTExLyG267sksXnVFndszZsny7Kmz kjDNlTY0FaE2NHR4ejgQxnMi51tSTNLXw7Cpj1OX4YOVmDxZ9sIUxKuuwJ5eBRAPmBHRyT gLMa+fByZ+nu3pFcivoJjmLdtqF52Wk+NNo4uoveFDgfAX68EqV1s+1CzLQGS9wlc3ATXP gJNWSLlebAndDAbaQO0wOJBs3Ngt6o0hDQZrESaKPDJcengE8zDpvmrRdxYTTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyx06L1Yzwxf; Mon, 31 Jul 2023 12:59: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 36VCx0Kr093840; Mon, 31 Jul 2023 12:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCx0bE093839; Mon, 31 Jul 2023 12:59:00 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:59:00 GMT Message-Id: <202307311259.36VCx0bE093839@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: e23f701a351a - stable/13 - sys_getrandom: fix a function reference in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e23f701a351ab57e6ea73586b458a1056f94c16c Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e23f701a351ab57e6ea73586b458a1056f94c16c commit e23f701a351ab57e6ea73586b458a1056f94c16c Author: Mitchell Horne AuthorDate: 2023-07-24 13:48:38 +0000 Commit: Mitchell Horne CommitDate: 2023-07-31 12:54:01 +0000 sys_getrandom: fix a function reference in a comment MFC after: 3 days Sponsored by: FreeBSD Foundation (cherry picked from commit a4e4ea738b738a355f5042b02ca9d8bbb78af236) --- sys/kern/sys_getrandom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_getrandom.c b/sys/kern/sys_getrandom.c index 929a3ebe21af..fe87c70488bc 100644 --- a/sys/kern/sys_getrandom.c +++ b/sys/kern/sys_getrandom.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #define GRND_VALIDFLAGS (GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE) /* - * random_read_uio(9) returns EWOULDBLOCK if a nonblocking request would block, + * read_random_uio(9) returns EWOULDBLOCK if a nonblocking request would block, * but the Linux API name is EAGAIN. On FreeBSD, they have the same numeric * value for now. */ From nobody Mon Jul 31 12:59: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 4RDyx83Y2Qz4q6YH; Mon, 31 Jul 2023 12:59: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 4RDyx212gFz40wy; Mon, 31 Jul 2023 12:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZhKMVCHTCa03UOtTf92l+ycg8Q2ygg7EB4ClropLPo=; b=VK70TQRyMW6spU8IZmtkJkwZh1G3bdM35/cf3aOPYSZiWLUtHbd1N5Odn/mtatjg50fUF3 vglz9lhJnzkIi1KXm421JVwUvsJiQwn338i4kqxDSid4X5Qi7NRSRKHetO1eTSI67r5oCr yvigX41Ijno2zF7ZvS8JGR26Va2JHG0AF2Jjrjm3dyskiE6OfUfZLKA+p8CUfk3ZtJx9c4 bq6uleQypbzTWahjnPAI4pmIcVvPxdLx/CFKa0D3jmgb1c+jYTI0zyqP2xDxDYPYJSFatk D5PxGgbo3Jw99rsGvYhL3baEjMxKfYH9ISx1G1WKYp1d9BGlmhObhtXJboTtoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZhKMVCHTCa03UOtTf92l+ycg8Q2ygg7EB4ClropLPo=; b=RcfKaiBVc7iYD3bLhL3l5l9pW7ycdMb0bMc1Ek+2PNiYcJnd4CmP6PVX9k6f3lsU1ltWvi yZSASMlfRNh243YowtWCXx+xzpTEd0hXUoLeQAhVbEw9o/OYyjHtpQ6YJbPIOYUO6+bzhr IKR4gadJa9sB868DdLzcoNNiU6iy+bIMVKkSp1Z083LkIli5ewvRFyF8aQZ6CHi2DBl33+ RlLBFU2uKHaUOTmYBKwBD/aoyskkkKmX80kbl5gD6TPBEEMifdRF/smbSY/AF/pi8Shfuu QBWUTmmsEfLqHIBs5r/V41SKctqIXpBGuRSHNv8lDr+HsBfVdjNOzEt6dfRk6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808342; a=rsa-sha256; cv=none; b=wmvJEbuBinDPqjQQuojIfB96aJ0EcjuYBkZhvZAj3cW8iMSAu/Iw9x29fkOSUiXGf1qTJ1 we8ylYi+BHERGhM3OrnC0+B57fEo/oShK2AxSFvNHVJ+GYIg7ZaOnuYWblO3qItsrWa4YV na71dqv2VZgh8eQFfx3phTD9sPjTe3ngV1wRJ4iyJe2VCRIvrdSPxcMz6sRm+Vk0m0vhdr NCw5Bz9WwW/s6XuD92khDXbFMbItK1+et7WZlSanNFFi6O5zkepceFaNchF2Vr5C2WbX7j w96HzhKbIoXIPznzS6X9sUzEXPNqg40jBwinG7J0FzQDn46hcGW8j3j288POhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyx16wy0zx12; Mon, 31 Jul 2023 12:59: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 36VCx1RT093860; Mon, 31 Jul 2023 12:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCx1HP093859; Mon, 31 Jul 2023 12:59:01 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:59:01 GMT Message-Id: <202307311259.36VCx1HP093859@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: c3c6cedc0ab4 - stable/13 - arm64/disassem.c: remove redundant OP_RN_SP for TYPE_02 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c3c6cedc0ab487d168789e21a0902b28aacec26a Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c6cedc0ab487d168789e21a0902b28aacec26a commit c3c6cedc0ab487d168789e21a0902b28aacec26a Author: Mykola Hohsadze AuthorDate: 2023-07-24 20:47:17 +0000 Commit: Mitchell Horne CommitDate: 2023-07-31 12:54:01 +0000 arm64/disassem.c: remove redundant OP_RN_SP for TYPE_02 Removed redundant OP_RN_SP for TYPE_02, since these addressing modes always use the SP register, never XZR. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40588 (cherry picked from commit e57b86266b80e1eed266a8287ae51c941c591b9d) --- sys/arm64/arm64/disassem.c | 78 +++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c index 5dc0bf5100ef..c1e38266a2e0 100644 --- a/sys/arm64/arm64/disassem.c +++ b/sys/arm64/arm64/disassem.c @@ -98,9 +98,10 @@ enum arm64_format_type { TYPE_01, /* - * OP , [, #]{!} SF32/64 - * OP , [], #{!} SF32/64 - * OP , , {, EXTEND AMOUNT } + * OP , [, #]! + * OP , [], # + * OP , [ {, # }] + * OP , [, {, EXTEND AMOUNT }] */ TYPE_02, @@ -159,69 +160,73 @@ static struct arm64_insn arm64_i[] = { { "adds", "SF(1)|0101011|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", TYPE_01, 0 }, /* adds shifted register */ { "ldr", "1|SF(1)|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* ldr immediate post/pre index */ + TYPE_02, OP_SIGN_EXT }, + /* ldr immediate post/pre index */ { "ldr", "1|SF(1)|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* ldr immediate unsigned */ + TYPE_02, 0 }, /* ldr immediate unsigned */ { "ldr", "1|SF(1)|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* ldr register */ + TYPE_02, 0 }, /* ldr register */ { "ldr", "0|SF(1)|011000|IMM(19)|RT(5)", TYPE_03, OP_SIGN_EXT | OP_LITERAL | OP_MULT_4 }, /* ldr literal */ { "ldrb", "00|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, + TYPE_02, OP_SIGN_EXT | OP_SF32 }, /* ldrb immediate post/pre index */ { "ldrb", "00|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrb immediate unsigned */ + TYPE_02, OP_SF32 }, /* ldrb immediate unsigned */ { "ldrb", "00|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrb register */ + TYPE_02, OP_SF32 }, /* ldrb register */ { "ldrh", "01|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", TYPE_02, - OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, /* ldrh immediate post/pre index */ + OP_SIGN_EXT | OP_SF32 }, + /* ldrh immediate post/pre index */ { "ldrh", "01|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrh immediate unsigned */ + TYPE_02, OP_SF32 }, /* ldrh immediate unsigned */ { "ldrh", "01|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrh register */ + TYPE_02, OP_SF32 }, /* ldrh register */ { "ldrsb", "001110001|SF(1)|0|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF_INV | OP_RN_SP }, + TYPE_02, OP_SIGN_EXT | OP_SF_INV }, /* ldrsb immediate post/pre index */ { "ldrsb", "001110011|SF(1)|IMM(12)|RN(5)|RT(5)",\ - TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsb immediate unsigned */ + TYPE_02, OP_SF_INV }, /* ldrsb immediate unsigned */ { "ldrsb", "001110001|SF(1)|1|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsb register */ + TYPE_02, OP_SF_INV }, /* ldrsb register */ { "ldrsh", "011110001|SF(1)|0|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF_INV | OP_RN_SP }, + TYPE_02, OP_SIGN_EXT | OP_SF_INV }, /* ldrsh immediate post/pre index */ { "ldrsh", "011110011|SF(1)|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsh immediate unsigned */ + TYPE_02, OP_SF_INV }, /* ldrsh immediate unsigned */ { "ldrsh", "011110001|SF(1)|1|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsh register */ + TYPE_02, OP_SF_INV }, /* ldrsh register */ { "ldrsw", "10111000100|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* ldrsw immediate post/pre index */ + TYPE_02, OP_SIGN_EXT }, + /* ldrsw immediate post/pre index */ { "ldrsw", "1011100110|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* ldrsw immediate unsigned */ + TYPE_02, 0 }, /* ldrsw immediate unsigned */ { "ldrsw", "10111000101|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* ldrsw register */ + TYPE_02, 0 }, /* ldrsw register */ { "ldrsw", "10011000|IMM(19)|RT(5)", TYPE_03, OP_SIGN_EXT | OP_LITERAL | OP_MULT_4 }, /* ldrsw literal */ { "str", "1|SF(1)|111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* str immediate post/pre index */ + TYPE_02, OP_SIGN_EXT }, + /* str immediate post/pre index */ { "str", "1|SF(1)|11100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* str immediate unsigned */ + TYPE_02, 0 }, /* str immediate unsigned */ { "str", "1|SF(1)|111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_RN_SP }, /* str register */ + TYPE_02, 0 }, /* str register */ { "strb", "00111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, + TYPE_02, OP_SIGN_EXT | OP_SF32 }, /* strb immediate post/pre index */ { "strb", "0011100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* strb immediate unsigned */ + TYPE_02, OP_SF32 }, /* strb immediate unsigned */ { "strb", "00111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, /* strb register */ + TYPE_02, OP_SF32 }, /* strb register */ { "strh", "01111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_SIGN_EXT | OP_RN_SP }, + TYPE_02, OP_SF32 | OP_SIGN_EXT }, /* strh immediate post/pre index */ { "strh", "0111100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, + TYPE_02, OP_SF32 }, /* strh immediate unsigned */ { "strh", "01111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_RN_SP }, + TYPE_02, OP_SF32 }, /* strh register */ { "neg", "SF(1)|1001011|SHIFT(2)|0|RM(5)|IMM(6)|11111|RD(5)", TYPE_01, 0 }, /* neg shifted register */ @@ -547,9 +552,10 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) break; case TYPE_02: /* - * OP , [, #]{!}] SF32/64 - * OP , [], #{!} SF32/64 - * OP , , {, EXTEND AMOUNT } + * OP , [, #]! + * OP , [], # + * OP , [ {, # }] + * OP , [, {, EXTEND AMOUNT }] */ /* Mandatory tokens */ @@ -596,12 +602,12 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) di->di_printf("%s\t%s, ", i_ptr->name, arm64_reg(sf, rt, rt_sp)); if (inside != 0) { - di->di_printf("[%s", arm64_reg(1, rn, rn_sp)); + di->di_printf("[%s", arm64_x_reg(rn, 1)); if (imm != 0) di->di_printf(", #%d", imm); di->di_printf("]"); } else { - di->di_printf("[%s]", arm64_reg(1, rn, rn_sp)); + di->di_printf("[%s]", arm64_x_reg(rn, 1)); if (imm != 0) di->di_printf(", #%d", imm); } @@ -610,7 +616,7 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) } else { /* Last bit of option field determines 32/64 bit offset */ di->di_printf("%s\t%s, [%s, %s", i_ptr->name, - arm64_reg(sf, rt, rt_sp), arm64_reg(1, rn, rn_sp), + arm64_reg(sf, rt, rt_sp), arm64_x_reg(rn, 1), arm64_reg(option & 1, rm, rm_sp)); if (scale == 0) From nobody Mon Jul 31 12:58: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 4RDyx83H4Mz4q6dt; Mon, 31 Jul 2023 12:59: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 4RDyx03Zpqz413J; Mon, 31 Jul 2023 12:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJgW0l03RePFd7eGtzZRSfPfdb+wdWoXscM2TO05KM4=; b=oJlKDMns5m8Wev7mH48iWKDjenKWmFVrKNc5AOpW9L3mWKoAsRnBlTlZUw1XdJIgTMatNr qBcbr4ZhCfIm092nSNpoDXeUtMwG6wqY5TwA9SdhceOAFUK0Qoe4JQwRLgytW2z0oXP+af Z7oOy/1rx+tFOa9LwcwfR2NE6erdvLdGDAoSq2DkXQIizXNIsI5CAOnZnj2UYY1IwTL9dG H2AzGHl94E4XC8hnIB2AtwskUid+SovbfEXvZrSxAhLo9u6wInsmUTSELeYhey7LhRGmLX 93w6dJS3ugrkiFApUnw+xt9JRWQEu4xTp3YDdP7QkrK2A7G3tdLQthNdObp7ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJgW0l03RePFd7eGtzZRSfPfdb+wdWoXscM2TO05KM4=; b=mBYu1Ke/VKAt/usqdf+AAe+XVhcW9OmAW8PfBptMHHjQR6JHAG5GDNM/PbMchPh+zd3JKY BBYDCKd2x/rwfTikqZrRbaRiUnOj1+PjGzWuuuy1yAZsm+O/pSvfGbOhg4EibbipLtJBgU UQ+c1zTvX59GSABDFc741I4ISCaCHijC6mGYNWftnbhSF2cgk4r1oR4CuLGppuxW/76W+Q E0kJs1GjdA2MAe7vEnU2yW29DZq34JTLcbgUj7GI5A5tiAtU8ocpz0kYPC5NkUSKUVlgYZ e7IFM9LdOQzwdNSCdiRxpAyBTg3z7Mv+acWvX5ed33x27imnd+7vczm4vYQYRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808340; a=rsa-sha256; cv=none; b=F+8LbwBUMqnnjmuTwZoMUcBHtkYy0z8z8BfUYtzveGz9u28Gf/s49npbNgWb0LJRAqbuMG MWtKAIIn7UnuRNqLfdEUQgPihB07IRWOxSCAmlFx5UmPlQLDgN2HRMN1aPIT/pClzzS5jE ngIoR/GuavFQLRPFM+26mYWcDWySF4jD81aohmUX1xdVWHuev10O0rAn6v3GWoeMHFnolx sCWEwataFlvoKnklHef+bS9XJrnGJE1t9mywQeA0ZWWBjqAiAf03jvwk/IILZHojdq2PSx 98/mVGME3N8SpRnwX9meVIm30+mrhLyv4PIDdB8R/ERzZo1Fcjbsm5SYkVNDuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDywz6Y82zwVY; Mon, 31 Jul 2023 12:58: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 36VCwx8M093813; Mon, 31 Jul 2023 12:58:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCwxO7093812; Mon, 31 Jul 2023 12:58:59 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:58:59 GMT Message-Id: <202307311258.36VCwxO7093812@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: a85b9d34ac8e - stable/13 - puc: fix man page reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a85b9d34ac8eac1c8735525df9855e747c26ea34 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a85b9d34ac8eac1c8735525df9855e747c26ea34 commit a85b9d34ac8eac1c8735525df9855e747c26ea34 Author: Mitchell Horne AuthorDate: 2023-07-24 12:52:19 +0000 Commit: Mitchell Horne CommitDate: 2023-07-31 12:54:01 +0000 puc: fix man page reference The reference to puc(9) is wrong; the page does not exist, and drivers belong to section 4. Change the reference to puc(4), which does exist. MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 09e5d91069d13000d1d93b0e6a26731926d500e1) --- sys/dev/puc/puc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index 4ef883fa2eb3..63ddff003873 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -74,7 +74,7 @@ const char puc_driver_name[] = "puc"; static MALLOC_DEFINE(M_PUC, "PUC", "PUC driver"); SYSCTL_NODE(_hw, OID_AUTO, puc, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "puc(9) driver configuration"); + "puc(4) driver configuration"); struct puc_bar * puc_get_bar(struct puc_softc *sc, int rid) From nobody Mon Jul 31 14:30: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 4RF0zH0SQqz4qBJ6; Mon, 31 Jul 2023 14:30: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 4RF0z701C5z47yB; Mon, 31 Jul 2023 14:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690813859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGsxYFa5D56zHdcUm33tAY8ARuFvEAuNyFZXEy13d2U=; b=ar9qf1sHuBUwU9WdaCT1lO2ZyU1rQqZ/A4yYJ11DVwa2SfJPRayRwFyePVXPhiUrC3Ph1s JvHjYq2fVnZ+a7BQV24aBWzkEj39ePtDLUzpqOvVbjhSUapQHFMLNw6iaz4PIiJ6PCPgc7 8uI09Burfp6oioaj9MB/3vDJY531+Qf50WV4UQQ0DnYtO5UPszPmNkTQgKaC6sLnKjl1eN Wy78HTNQkr81xLIdMvCdjer9oNrrMj98zT8KJaril4l82lqp9QuCEO+EjeomUkp4hgocBn zPTJU4wLVqgq6Btgn/PHvzBjFS50p6f/Oc96R9xbj9MGjxes5aV2a5/vCEYWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690813859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGsxYFa5D56zHdcUm33tAY8ARuFvEAuNyFZXEy13d2U=; b=Yjq1d4ITEciMW+evaQ7DMv6Zf9o2+VMJNrf1cj7wMnvsoVlipd/A+3+xaSYFP+uBsewUhl U0ikfMfsB4U/2nDslbq0mwdZirn0yP24sDD6W9ppO4b+t2QS5kciGFa2UPiQaC4LbSna6D eNkYMnDB0PupD0b1oJM5/dskgPuO1ofd5B4Ctys72N3uxCq9YS6M1fOcT03vKw3Ft42vXV htLBDWq98cnR2R0lHPe8+B488nsrrD5pLkPRc5qo+PVRzPXJQicyNx96JaV5h+0Ljx78WJ nXxKpNxRAIZsBeebe7isFRBpe51hDpmtwL8wu0Z0/Gc0mN4IXTjBOz0nYgpqbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690813859; a=rsa-sha256; cv=none; b=WEDbi5g1YhWAnl3FWkNBrJcLcTcPe+AU1YXZq6Gm/twK4B+TtFImAk0PokIIydRkGO1eZV aLWoJnMj5VeqFsY4RlBmyebBzDghs65ngARsR5/einAwl6ov9sCuweRKADQA4JEg5EYbAJ gyxqQBdJ4ibn5AMxc9ZL5DP3CTjNkdBTFIcB1qxvH0jXNcj2b0bmJyc4zLmXgn/Tc0+0az GGU5zgYRcrwPEL4v8oSaJFLzfWiXk4OSBE9g4axCBHnlfNvx+r/58n9J1k22ZxngSzJ/Bn /eXm1V46ZgWBqtg/OxtCreplHGnJov0BsqpZpfGd+MeMvE6tOvv+3f9UpTnPSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF0z65dYgz10DH; Mon, 31 Jul 2023 14:30: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 36VEUwat053122; Mon, 31 Jul 2023 14:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VEUwpK053121; Mon, 31 Jul 2023 14:30:58 GMT (envelope-from git) Date: Mon, 31 Jul 2023 14:30:58 GMT Message-Id: <202307311430.36VEUwpK053121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d101156ec69d - main - intelspi(4): Add missing driver mutex unlock in NO_SLEEP 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d101156ec69d4c51d626034419a48634d3827f23 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d101156ec69d4c51d626034419a48634d3827f23 commit d101156ec69d4c51d626034419a48634d3827f23 Author: Vladimir Kondratyev AuthorDate: 2023-07-31 14:30:24 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-07-31 14:30:24 +0000 intelspi(4): Add missing driver mutex unlock in NO_SLEEP mode Fixes: 1f40866feb21 ("intelspi: add PCI attachment (Lynx/Wildcat/Sunrise Point)") MFC after: 1 week --- sys/dev/intel/spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 497c2606a1c9..0ac7a3b5e9bb 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -317,8 +317,10 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) /* If the controller is in use wait until it is available. */ while (sc->sc_flags & INTELSPI_BUSY) { - if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) + if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) { + INTELSPI_UNLOCK(sc); return (EBUSY); + } err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); if (err == EINTR) { INTELSPI_UNLOCK(sc); From nobody Mon Jul 31 14:33: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 4RF12F078wz4qB5R; Mon, 31 Jul 2023 14:33: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 4RF1292Lnkz48jD; Mon, 31 Jul 2023 14:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690814017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ruNHfxHLNUm2Dm2nsPQjhVEYzDTgTDNLAwLfB/sEDI=; b=NMma0RmXnNMrINBT11dwNz4D+GXZBnjL9zo2nowJnd1hoiFNbXJJozmfAz7FIBfcu3EomR F5x5kCEGaGWZqUUJgt5zEgMe1H0g3c21nkzMzUpkVtDShCnjp4s0GyyTohH69z400k4qc3 HAPvUA3SBywOk6X8k5oQwt/CVL11bo5vENT79+lKqI0hHKnnOM0CUE3M2x1Lm/AzU9GtIT wM/bTjG39M0LkmdxvevLk8xHv0I/rkqNE1XlrU6o9wtSYHmlVI5HJxCWr6daeaYTQQYCNM KCa7Q243v2F/5J7l2nvjhmw42OBV2ExBaO+kJz5sEHivq0qXfcLlIsWhzGzWfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690814017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ruNHfxHLNUm2Dm2nsPQjhVEYzDTgTDNLAwLfB/sEDI=; b=L3GK4XSHC/uAgnZvi8qGeDMil3hBIgiE9rF5/V/eBfLEgqFeGp+/fxJPrynszjyP8gcuLp +IhRckhLy99HO07wTLDR5pfeLG3z6yPo+OE4yIZ1sbpmU7WAGpCNbt547svAw+OSdnf8y/ 2y+FVyrOKxb0epGWbFB7AYklWZJg+jmwBmEmyvD7zwl0E2HAIWO8vikSa0+iShD8EAj9C6 TwLw8ycXuuoqKzMS6EbJzjLZD0VLzlxn9TK+cAg6Jjc+EriIGBdmAvK3u8SL5UZxNp8mKT +hyEEFSGFiXLiLzXDKm5CRTTIThqqi3IKnMw1mWee726adrlV3w9GNTaynJx8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690814017; a=rsa-sha256; cv=none; b=lkmhbq5bbHf76JGSvVsqc0nyrMFifOgQXnqCdSKE2OgXwrLsBKBulk6QxLRPLd8qZqdckd Du+stXFSDBrBsobJDNXY9emW8+v32RT6kp4x3a5Qo0EEWcFln97/5wAxs1DkjGCRglNrDT 4pmZxQjmuwy3SmfUDZ79Ezg9tq4G5P9b2GJf1Ayl88EuNLJ87Z+8/3x1wRUvjpDVgUslOE DU+Mslrhfcs5UowZ60BQtr1UcMVjBaoIo31OKzbzB6LSj6J96JX7LTJc3WNMtLhbAQ7CDW anDHJmGLYvKyc05uRqh3GYyIHiGCQHhiMpM0NTekH1Fk0SL5TjpNJ0QADUMAPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF1290YV2z10Km; Mon, 31 Jul 2023 14:33: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 36VEXapa058822; Mon, 31 Jul 2023 14:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VEXa4f058821; Mon, 31 Jul 2023 14:33:36 GMT (envelope-from git) Date: Mon, 31 Jul 2023 14:33:36 GMT Message-Id: <202307311433.36VEXa4f058821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: fc14525044b6 - main - nvme(4): detect S3X NVMe controller in 2016-2017 MacBooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc14525044b651e9d2256c0e8aa8c74c900cc815 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=fc14525044b651e9d2256c0e8aa8c74c900cc815 commit fc14525044b651e9d2256c0e8aa8c74c900cc815 Author: Vladimir Kondratyev AuthorDate: 2023-07-31 14:33:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-07-31 14:33:14 +0000 nvme(4): detect S3X NVMe controller in 2016-2017 MacBooks Adds support for detection of the S3X NVMe controller found in the 13" MacBook Pro 2017 without Touch Bar (MacBook14,1) It is known to be used in following MacBooks: - Retina MacBook 2016 (MacBook9,1) - 13" MacBook Pro 2016 without Touch Bar (MacBook13,1) - 13" MacBook Pro 2016 with Touch Bar (MacBook13,2) --- sys/dev/nvme/nvme_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 5e7efa7f33bc..22188ccfacea 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -95,6 +95,7 @@ static struct _pcsid { 0xa821144d, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY }, { 0xa822144d, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY }, { 0x07f015ad, 0, 0, "VMware NVMe Controller" }, + { 0x2003106b, 0, 0, "Apple S3X NVMe Controller" }, { 0x00000000, 0, 0, NULL } }; From nobody Mon Jul 31 14: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 4RF1SL0n9tz4qBfQ; Mon, 31 Jul 2023 14:52: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 4RF1Pc4B45z4GK5; Mon, 31 Jul 2023 14: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=1690815028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sZ+nBVIAjhszGbbLnRCTcq7gi5zZ0GOugLZ8CshDes=; b=DD0CFL1MBGH/7aWj5CiomBZnvDjKxrEehmvalmZm2dPaDy22lwdcJczUemBrTlS6s6v4s7 HYV8gzvbKhPqHr3yv2Nnn5FOCbOl5kB2+W+pjq+nt83zqHjTdqllU+bnZqfjk60iL0S5VX 9wAbCKiF5qIddjTx+DTdDW5JW+R3gdr/AUDyZtKax+xDCNeeMFIuwzHLdD6Ps5y1wYaQnc OHfzsFBbWbRGrHfQVLWekPYTykQsZP9jqhxxeU1ZLePANsLq87iI8hnVGPT/4kn1dA6SXl xPt0/VuGHBa//cbkKNiTIWkb6Ln+7KPHQxCMiaB5QzhrwWkyHltr3jqFMnSKoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sZ+nBVIAjhszGbbLnRCTcq7gi5zZ0GOugLZ8CshDes=; b=fz0QzSVNkPKMcDsDtzUd5j1VhWL3BE5/fWMSgTNKkn2+LIpHzgfjPl7I5dodIXjhD3D3r4 zmgmoGzMBcVNpl3oNqmQycQB2/Ly4tIZ9OQXpHSFtQP0KITJDe2VVS73I+UPzZNoSCilml YOhpZwnPDX81Y7WYctbxIx8hbVAVfx2TUaivNXhyJCs/K+SjUCpC2uoYXGXhTK+3yIEdE1 Q2+Oce2vV5L3dIKgs6uauzpOLAFS2033IG6IoRJ56pTDc4C2tvrQOHcTyQ6TMycChNeWUe V7lhGliJjvG+bKYO2stI0xPJvYEd7+39L7sQuZ3wqJqjsmWE8tqEt6YPT2l1dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690815028; a=rsa-sha256; cv=none; b=RYGSLHa4ghjUQkokPsRBjra2w5rVrAlgfXYhkxGie17WDB8Jp83TMy+zcac7J2u1nVydzP CmqjxR5pYtlEwhgKKMAneHx+8DcyU7GxUdxWhG3dX+930XjuhHMswzQJCKaHFTnoziCFmU hLC5pZbMu2OiYlg5KgY5Y7wMvqMfw0/hPkV73IiOtjrkGhRaR2t40CHIvcCbTnWS6nnRB0 twrk+eNG8E8LYO1nHYKuiTFv4K9+0a62HVlaRoc8XrH8o55xbBAZFm8ORhCXbpfrotJxIX tEHLgVh1S9WAizvSw5qmn2I88GjoOLEbb6kbIaW1tgx86lvu/5j6KRnPV0+uFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF1Pb5hVwz10Qc; Mon, 31 Jul 2023 14: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 36VEoRZh085182; Mon, 31 Jul 2023 14: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 36VEoRVs085181; Mon, 31 Jul 2023 14:50:27 GMT (envelope-from git) Date: Mon, 31 Jul 2023 14:50:27 GMT Message-Id: <202307311450.36VEoRVs085181@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: 2682a1552724 - main - xargs tests: Disable the test added in commit eab91d008165 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2682a15527241278c9aa46c4907d3b07460b8ec0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2682a15527241278c9aa46c4907d3b07460b8ec0 commit 2682a15527241278c9aa46c4907d3b07460b8ec0 Author: Mark Johnston AuthorDate: 2023-07-31 14:44:32 +0000 Commit: Mark Johnston CommitDate: 2023-07-31 14:44:32 +0000 xargs tests: Disable the test added in commit eab91d008165 This test has been triggering OOM kills in CI runs since it triggers an allocation of 16GB. Temporarily disable the test until the problem is solved one way or another. --- usr.bin/xargs/tests/regress.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index f0f0bd4a3edd..f3f670fb0fd5 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,6 +1,6 @@ # $FreeBSD$ -echo 1..22 +echo 1..21 REGRESSION_START($1) @@ -13,7 +13,9 @@ REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in' REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in') -REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') +# This test may consume a large amount of memory, making it unsuited to CI +# environments. Disable it for now. +#REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort') REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in') From nobody Mon Jul 31 15:02: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 4RF1hg1m2fz4qC8y; Mon, 31 Jul 2023 15: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 4RF1gB0Sjvz4J7L; Mon, 31 Jul 2023 15:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRsSwpxgu1NpsJ4fEDByWKpJY6Unal1qsJPrnD1sJ+8=; b=U3moXd4nzc23Ec5lX2XGoEqWlWmpFsijIcPfRujDmkWg6TLzKnMUjqHBE4z+8pjrXnvzuf f8a7hX/vBguattU+gaFPeXlQjIWSxPuiwLHQA82Tsw8tITQfO6fYVl4e3jz/M68am6BulH 30+Xdo1sF3P0tx12HmKtVY2d6CC5SSNSYRg4pONAfyhYe0r3NMgVWbnLk1jnbP+aXRH49I s5JIu+evLfeZicwWQEdEVnnGwwAVU6ySzUB/fN+3Gn86Awmsa2CYq1SOUthQh312SrVxuW 5kJyhEqT9/3FXkFQ78kNyjlCJfwVHiCmQ7/R8JxDDIYrEAnzORq7nEhIaJPD+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRsSwpxgu1NpsJ4fEDByWKpJY6Unal1qsJPrnD1sJ+8=; b=DGbml9k3YmzCkhxLf5F/8HPbNGMBg87VZmOQDS2LHUhhihulV8CzEUhFRcHQgqrkz+o2GI NocZlOghYwyb4s5W9YRxRiL0CNZHBkXOXXsK5Y919Kzwo75b5DbmWlWMKTT2V0T/+SS8Xx eMQmYyYsTzANbs8vqx+2klp6Eu6d8Q7QnxEkqwyakKLwSxu7nLauX2tiM4ZLmr9l5CqTqD l7oA49o3PJ6CapM5ucNUOAnTxPzmAgmwrGEnnh+SkAMJeXNfpbIY0WSp/4i3Ue+xpt2jrJ XSUwcFeMx3C3lnTBSDqtdQBOCRapzcTI11ZBkCEe36PBvRg3gl1/jinKMISRuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690815734; a=rsa-sha256; cv=none; b=K5eyQsG11UTplTjzaxGN3lhFlS8XzSk8Wk2K77ZfPDiLNwb/FYBI5UY1Xn5v2NDQIvgsB4 ZbJwWQTiWXVNVv0yb8BhXb1vx4p8sLOjWIPK65DV3br9IKJ7ab8/8HZiJ/GJIscN9qAbLH cOpbDNKhBCSEg9K5ViW9ckoJu9axDmF/vyCr6gvuJ5FALx+/GWSYKWxeSV91FV+nHtg8cm BTjFz/Uyc0fqAsW8gxUCdXs4vIzxgr3mPyaNhIGrkAeAH7hXtGUIVfQS0z4TvvbAzRoXFD +WQ56iVasYO3vsG+62ryU4tMU+T7LuFl/63l1Y/OJDkdaFyIOKApWusntMX2ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF1g955nWz10xf; Mon, 31 Jul 2023 15:02: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 36VF2DgT007781; Mon, 31 Jul 2023 15:02:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VF2Dpa007768; Mon, 31 Jul 2023 15:02:13 GMT (envelope-from git) Date: Mon, 31 Jul 2023 15:02:13 GMT Message-Id: <202307311502.36VF2Dpa007768@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: a94158d255fe - main - dhclient tests: Serialize pcp tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a94158d255fe5ce46d7b98d2924d99273bcf27d9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a94158d255fe5ce46d7b98d2924d99273bcf27d9 commit a94158d255fe5ce46d7b98d2924d99273bcf27d9 Author: Mark Johnston AuthorDate: 2023-06-20 13:04:07 +0000 Commit: Mark Johnston CommitDate: 2023-07-31 15:01:43 +0000 dhclient tests: Serialize pcp tests --- sbin/dhclient/tests/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile index 790d3dbcccce..d366778f3bbc 100644 --- a/sbin/dhclient/tests/Makefile +++ b/sbin/dhclient/tests/Makefile @@ -4,6 +4,9 @@ ATF_TESTS_SH= pcp +# Tests assign a common IP address. +TEST_METADATA.pcp+= is_exclusive=true + PLAIN_TESTS_C= option-domain-search_test SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \ tables.c parse.c conflex.c tree.c fake.c \ From nobody Mon Jul 31 15:02: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 4RF1hy3VY4z4qByl; Mon, 31 Jul 2023 15:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF1gC1PK5z4JPL; Mon, 31 Jul 2023 15: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=1690815735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FK4xIJUlLz5qHtthXj/6Yj/0nvTGvLqqAcHpr5pm1Q=; b=Jwq8uWg/K5bfrvqkvmi+Zpqi3ci5x8nEMRq0aep2Nc1v6PZRjfqYU7rouAJ49Ph0eq+3xY miTjoQYgQ65m4D3JSN9Mt5pvSvrRie4mDkidM8vmGq+Bh2aF2PxxKNbCFq7WIRIo8urboh FbArmlZ+TVkbhrxGWsyVXoeRjkxJJe5jbs9rwDbS72dVxQ9pmZaDVpynE/OqT13g283PcW CO7gEs900//3VrwcCHYt2/A/yVCzXffYYXK59WmW41Y5KxMP05NLr0P2TKVwM3O3lxXJ5E X/+2s5juzjujvrwCs/vcRpNO3HATj9oOsRVHo3cPXarQI+EEe/N0INRSM0QCKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FK4xIJUlLz5qHtthXj/6Yj/0nvTGvLqqAcHpr5pm1Q=; b=QCbFWtZH0ZSoVbEXGc3NVVtp8mHWh6JNoxQ3emwQyhD787ivsaLxlD6x7yjGoC1he3po/t pL7xaqqUh7MBhiKVEAyqeVkx/5UyszasiRJVe538MHUgr4BRYWUpN/0ie77X0w9TUJAuw5 MEarKjCVNC+tpjVrX/oIzSLZksXNQ/w+g4egf7o+QUnfywyMCjlcl3fRRNOJ8DbKbLEXdH QFRU456uGMCrnqmdDDUMqcpGyTSoAMvJVZR0F29Bj+zvgCsTOKoegZ00ibqV3y8sox5vNR KQhFOfjivWKnq+WSAgoLLC/FAsPvVjOWnhpLpqa+HiuDXHNks4Lffz6etUY5nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690815735; a=rsa-sha256; cv=none; b=HBw1ZCPARP9I7PwfI4pef1lFAIBh7Mst9dLle/M/Yx1uTFbYZ7FR/slpJchmKiypT9W/uu Qf0v525Nkfv1HtagOjZT52HNAmXP3DoXXabW5OSWOQmfbzKs4hBPGZgpwUk+/T1hnDscd9 OxcpdvURmCJv0Je1iesL0XDxSa44BxPPpPkUuyFkfOwP5FtMkZikN6Gk+7ZJpx3z7RnVxe RPsa+EHZLqYTmXQLTKMo//oJZ9u1Dn8hN81nIQ6XSjpcn5uamQd9Hs0NMrnf+1wPrwvRPQ 6hgULecvhGv5LfuZhF+0siWz4feyokut14u6/+BCvpOosY391EXzUE4k4Q4aSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF1gB5lhtz10jr; Mon, 31 Jul 2023 15:02: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 36VF2Esn008263; Mon, 31 Jul 2023 15:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VF2EEu008262; Mon, 31 Jul 2023 15:02:14 GMT (envelope-from git) Date: Mon, 31 Jul 2023 15:02:14 GMT Message-Id: <202307311502.36VF2EEu008262@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: 9c3f6368b1bd - main - gmirror tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9c3f6368b1bdb576512a056e08d116f22da43931 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9c3f6368b1bdb576512a056e08d116f22da43931 commit 9c3f6368b1bdb576512a056e08d116f22da43931 Author: Mark Johnston AuthorDate: 2023-06-20 13:05:53 +0000 Commit: Mark Johnston CommitDate: 2023-07-31 15:01:49 +0000 gmirror tests: Serialize --- tests/sys/geom/class/mirror/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile index f719d7542964..61fa5526c02f 100644 --- a/tests/sys/geom/class/mirror/Makefile +++ b/tests/sys/geom/class/mirror/Makefile @@ -21,6 +21,9 @@ TAP_TESTS_SH+= 13_test ATF_TESTS_SH+= component_selection ATF_TESTS_SH+= sync_error +# Tests use a global gmirror fail point. +TEST_METADATA+= is_exclusive=true + ${PACKAGE}FILES+= conf.sh .for t in ${TAP_TESTS_SH} From nobody Mon Jul 31 15: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 4RF1j94KKZz4qC3D; Mon, 31 Jul 2023 15:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF1gD2TlKz4J7P; Mon, 31 Jul 2023 15:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm1fS0UKNPMQck0C0gY9KfJBE+wELTZC2YUCRVqzD9M=; b=RJFkCzGzbwEJ6nfCHJ1+sTwGUZCjGotl7PB8Gus0NJ57n19mi5iyWizGxkBAFSHpYFgd1/ uOflX/n64Fuf+ufDW4r7E103v3Hj2FzXaH8QJ3V2ZyvyKTnzWdE/SRsoJd6iAv6I8Sjal+ Bhhx3e9di2YBvXjUf5GLIe8jeagmqY3nTeASTHpuBt3+dTgcicH7yqPHmVexUcjkYdewL4 m3zmvekJOVV8Xgm97YXYZSfvF3C9waBHnkEtlEfbvcOV9T+WBbwxO9jR5K8Lw7C/iZyZs+ ZkJKfzgVZxCex382SRBbjdU+oe5HXz3k5+pAGMN7UJ3FqXlDGPT8y8tf4ZAAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690815736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm1fS0UKNPMQck0C0gY9KfJBE+wELTZC2YUCRVqzD9M=; b=mnTnGxYOPbY2wz2v1dP1D3PTs/mkXDSJmYOqpRg3fmyroYx+SJDC9oPmOAt2H8jk1QN7iF 6s/ykHDAc3CTQzfu9IMZS02TFeNOYJoVxioKI+prU7qrajosD64yk29jmrzL3bBx87KWGI cZbMqfASTjpMW51NULTyAQV4ulev0sqtWSMw0T4lpv4VTMi9m9DchsD4MjuFAoTqAewTAK BLr1ia7vsR9glt0SAJsfR8a5iT0jQRytEcjYLO8JM6TXL6VeKP/MKfIhASiDq+KFRpCCGa /Ml/elbzYtAGhdj+HUhpqAq+qPsoLVi+U4AOYEIBBLeKwGoesgpS+s35LEu6+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690815736; a=rsa-sha256; cv=none; b=Za0p90eHBSZEEdPkoK7TgU7ramIpjXtiuOC+ITYgUnNTsZS0ihrJ4zxfFnGZAEi7dTGdgg 1M5Glrn80HDT94bGhaPwpeyPZ1VgAkK+W513r87cMjELijPvTr/UppenwO2W/SQlrGsRXA 9FQnl64FNNh/+qtjKDIKux5tL3DrxVQzEniK4E8YMc050EAbTa119dqa2TC2uWetEycB7i RYT7z0FWIzUjm+Zgf1lZkGiRufelyE/lkOIlo52i0De/2juZgp26cI79Ujmgl/1zc0K9Hi h3HzzIZxZapFkv7B/toaT2gQoQnIXnqE8fOrj/GNTST70uxLpIIBJjRk+/yJRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF1gC67WGz10xg; Mon, 31 Jul 2023 15: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 36VF2FP4009036; Mon, 31 Jul 2023 15: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 36VF2F1k009023; Mon, 31 Jul 2023 15:02:15 GMT (envelope-from git) Date: Mon, 31 Jul 2023 15:02:15 GMT Message-Id: <202307311502.36VF2F1k009023@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: 15e564e40801 - main - ggate tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 15e564e408015a70a1bf2d73bc7047247b7db349 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=15e564e408015a70a1bf2d73bc7047247b7db349 commit 15e564e408015a70a1bf2d73bc7047247b7db349 Author: Mark Johnston AuthorDate: 2023-06-20 13:09:52 +0000 Commit: Mark Johnston CommitDate: 2023-07-31 15:01:53 +0000 ggate tests: Serialize --- tests/sys/geom/class/gate/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile index 417fa7dfd197..600cef0b6bca 100644 --- a/tests/sys/geom/class/gate/Makefile +++ b/tests/sys/geom/class/gate/Makefile @@ -6,4 +6,7 @@ TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} ATF_TESTS_SH+= ggate_test +# Tests listen on the same port. +TEST_METADATA.ggate_test+= is_exclusive=true + .include From nobody Mon Jul 31 15:22: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 4RF2726X5hz4qCnV; Mon, 31 Jul 2023 15:22: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 4RF26s4Zm4z4LXx; Mon, 31 Jul 2023 15:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690816965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMT382Yiq2rfM4i9stpYj6QTQJKItWx6zz/medWjGZ0=; b=F5HewzAcbHmQ14DzRc4m8Bz4SJTUZdvUAFBecY60wwKAJwz74jC1buCgJSq8FkVBYg3JF5 M0MqA4/iUOORIOY/XwuYDuILd94nd3PO1UqnJVOMiZy/M2MySxE7Qu068fMk2Jnkb6JYTI SHsniqKa4Ck27vCM8bHcspb0nxhPA2LQEhkJ1lOBJx9bqaY+Adgn+b9NC9e+vwKn2NXuIo 89l2d7SGSWtS+rKYXX+nH3JLietGoTqL0pKW02xgTkx1El73KfhJ+J9oIQ/Oq/PN0AomIV gZ+Atx8wHJe9SFIuCDg11D4FklhboJeu9xQaNEiWHEZPAPZU2sJi3ipgj9kc0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690816965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMT382Yiq2rfM4i9stpYj6QTQJKItWx6zz/medWjGZ0=; b=FVr/GadGqkzqStJyNj+VsjBjZDhBX2qaV3w5t4eeqT9PvJGp7NDR0J5uNgWWH5N5cYxjIK dpGz7B1UvMFkc570E6SG57Qzc3DuSRQgJWZdcsZEYmOllbNn04plU6RlT97BlE971lJLvY Bd4C/xY2PtL/4Qd++bg6hGqUR09L+5eGgOWPoPO2o6Ct1kWp0bDDdox3RQnMRfXztfqcSs fviFKrJvBkQeCzaWXAtk8RXJcpojewjusms+RrymnFCLPqSG1Huk83A2OVyIBr72r3EbCi TdMeMiOKzKf/Uy3sa5Y/Wh/DTSMac/XgE5nOYnryFXWWbOkvMnhYCgQ4tqG8ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690816966; a=rsa-sha256; cv=none; b=RRyZiCf0HqHpoEGVuxa9O95zWbiVwhyYegoPlhgjfaWD5qYAyfExPbVjO1h8T3QN7tlC0K UmMoAVP7YetOuKmTpqziZq1RNpHS0+xlQxE+aPWnhqGRj9E37+uhvsIkhlqH6loCjgTdAC ZgSo3h54/GHRE7oOP+mY515ExXRw4VV/lAQVPTqLTtZ5oUnWfVzHQxx8/icjM0BdPEosfh VNKi9j1LOX5e5fxbEhG1Gy9ZHwGn57jm7WERL+yc8kDxW/9Zw1AkgnNQdBZ5HSot9cD7l+ vJF9q2Ja8qjXgJGcWzITWu95hB+aTzil22DNWBy66ZPfxcPyn/czbrJauyfuwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF26r6QK0z11Kf; Mon, 31 Jul 2023 15:22: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 36VFMiTW042229; Mon, 31 Jul 2023 15:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VFMixg042228; Mon, 31 Jul 2023 15:22:44 GMT (envelope-from git) Date: Mon, 31 Jul 2023 15:22:44 GMT Message-Id: <202307311522.36VFMixg042228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: e1353dcb63bb - main - e1000: Fix lem(4)/em(4) TSO6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: e1353dcb63bbdb33be6a907ed6236c120518129e Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e1353dcb63bbdb33be6a907ed6236c120518129e commit e1353dcb63bbdb33be6a907ed6236c120518129e Author: Kevin Bowling AuthorDate: 2023-07-31 15:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-07-31 15:19:14 +0000 e1000: Fix lem(4)/em(4) TSO6 * Fix TSO6 by specializing IP checksum insertion and following Intel SDM values for IPv6. * Remove unnecessary 82544 IP-bit handling * Remove TSO6 from lem(4) capabilitities Reviewed by: erj (earlier version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41170 --- sys/dev/e1000/em_txrx.c | 40 ++++++++++++++++++++++++---------------- sys/dev/e1000/if_em.c | 9 ++++----- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 0e433f388ac5..b90ab21cd825 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -141,7 +141,6 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, if_softc_ctx_t scctx = sc->shared; struct em_tx_queue *que = &sc->tx_queues[pi->ipi_qsidx]; struct tx_ring *txr = &que->txr; - struct e1000_hw *hw = &sc->hw; struct e1000_context_desc *TXD; int cur, hdr_len; uint32_t cmd_type_len; @@ -151,27 +150,39 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, E1000_TXD_DTYP_D | /* Data descr type */ E1000_TXD_CMD_TSE); /* Do TSE on this packet */ - /* IP and/or TCP header checksum calculation and insertion. */ - *txd_upper = (E1000_TXD_POPTS_IXSM | E1000_TXD_POPTS_TXSM) << 8; - cur = pi->ipi_pidx; TXD = (struct e1000_context_desc *)&txr->tx_base[cur]; /* - * Start offset for header checksum calculation. - * End offset for header checksum calculation. - * Offset of place put the checksum. + * ipcss - Start offset for header checksum calculation. + * ipcse - End offset for header checksum calculation. + * ipcso - Offset of place to put the checksum. */ + switch(pi->ipi_etype) { + case ETHERTYPE_IP: + /* IP and/or TCP header checksum calculation and insertion. */ + *txd_upper = (E1000_TXD_POPTS_IXSM | E1000_TXD_POPTS_TXSM) << 8; + + TXD->lower_setup.ip_fields.ipcse = + htole16(pi->ipi_ehdrlen + pi->ipi_ip_hlen - 1); + break; + case ETHERTYPE_IPV6: + /* TCP header checksum calculation and insertion. */ + *txd_upper = E1000_TXD_POPTS_TXSM << 8; + + TXD->lower_setup.ip_fields.ipcse = htole16(0); + break; + default: + break; + } TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; - TXD->lower_setup.ip_fields.ipcse = - htole16(pi->ipi_ehdrlen + pi->ipi_ip_hlen - 1); TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + offsetof(struct ip, ip_sum); /* - * Start offset for payload checksum calculation. - * End offset for payload checksum calculation. - * Offset of place to put the checksum. + * tucss - Start offset for payload checksum calculation. + * tucse - End offset for payload checksum calculation. + * tucso - Offset of place to put the checksum. */ TXD->upper_setup.tcp_fields.tucss = pi->ipi_ehdrlen + pi->ipi_ip_hlen; TXD->upper_setup.tcp_fields.tucse = 0; @@ -188,16 +199,13 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, /* * "PCI/PCI-X SDM 4.0" page 45, and "PCIe GbE SDM 2.5" page 63 * - Set up basic TUCMDs - * - Enable IP bit on 82544 * - For others IP bit on indicates IPv4, while off indicates IPv6 */ cmd_type_len = sc->txd_cmd | E1000_TXD_CMD_DEXT | /* Extended descr */ E1000_TXD_CMD_TSE | /* TSE context */ E1000_TXD_CMD_TCP; /* Do TCP checksum */ - if (hw->mac.type == e1000_82544) - cmd_type_len |= E1000_TXD_CMD_IP; - else if (pi->ipi_etype == ETHERTYPE_IP) + if (pi->ipi_etype == ETHERTYPE_IP) cmd_type_len |= E1000_TXD_CMD_IP; TXD->cmd_and_length = htole32(cmd_type_len | (pi->ipi_len - hdr_len)); /* Total len */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1f6100cff293..40579b0a5a55 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -784,8 +784,7 @@ em_set_num_queues(if_ctx_t ctx) #define LEM_CAPS \ IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO| IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ - IFCAP_TSO6 + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 #define EM_CAPS \ IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ @@ -937,14 +936,14 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_segments_max = EM_MAX_SCATTER; scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; - scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; + scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; /* - * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} + * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} * by default as we don't have workarounds for all associated * silicon errata. TSO4 may work on > 82544 but its status * is unknown by the authors. Please report any success or failures. */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; From nobody Mon Jul 31 17:28: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 4RF4ys6Pc7z4pLpb; Mon, 31 Jul 2023 17:30: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 4RF4w41L8Mz3hkc; Mon, 31 Jul 2023 17:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690824516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7g47/aPMlbWDdKeck02eQLqoK75oFcBoxYfLkSM/woQ=; b=akjIYOE5a7tBb8VP66d2xH657tBn9Pmym6kU1q+q5dUtdQcLerBvYhH+wQSuwbSUivT+da waF4Xu2mK7MSNhRM7g7d/GBIxGwzB+rhT31WUCQazOuiEaoQ3Y+vV0ns7o5YD8nVkOXEVq pOlzzl47IqPDNvZvyoe6ia2A2ABFX16GGmT1+0uxaFIQ0wH49NI9LF/tTyu+Xe9U1qYEeA AsFbAw4Kiy+7O8qsF9GsMNTJLI0X6IF7N1DZCyaVg1WHkSztdpX/WuXSYBdG60lE76CBWR hpaNhJcH+e5mIsBRGzqtj1YX4kZ9+UbwR4m2cun467v60ddv+9t6AnXEPBmtCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690824516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7g47/aPMlbWDdKeck02eQLqoK75oFcBoxYfLkSM/woQ=; b=lQAW28amAuexH9cTVD/1zSMCbQ64e2I4ySvflLgS+PIAzKmHViCn+kIYQumIxXsnugH29E Vm4Mt2hUxOgM83OzaC8ekeTeiOBEp14rlKPk12ApOd1TDrPD/tgQS+Ry8lEhUhsq6SUxEn 1PJKz08p1F1+Wws0aczPSLmahdDhY090dzqHtwCLd/oh3wk6X7YVDtm2dinUNcFYtAjqpc o6ttMHvyNuMp7N75K40/DIrc1PduzmunpIondVAW/mHv+WwcY9gVxljN5Fs94xOqXRSBH2 AIJ6kH0nwa80IHoOPi2Y0ymf0NT07HznVzjvX2enetoZSszFsfdxhbW7Qgb+aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690824516; a=rsa-sha256; cv=none; b=UWCGwIGjb/OSkBAaSeIHB6SlpVVlVelxDp/vwdRu2OmLnrR5eQm8pLlWAE78RtDcfnXhj7 acyfeT7YGlGEVpe6bfYDoBp64DEtFMlzFgy/ng9K6ijvym6v/bqnBWkDU2CUgaAUII/CCo 3UkODS7tihUIrz0pBIA6Fn3S8Y53ka5pIm0QJsH+CTKYKT+2730EJRJfYP4p7Du15Srjdp dY/yiuz6/sKt3h9hXu8K+K+8kMq40Wlirp3/Fo6ViVih+DFvGrSKqvS1SOrZJ9CCFKI/mE 3xAhkDGjji1P1Q4YwOKrz217yay9s8+v4sTvs3XVCe6a9hKFdAPdz1aGZR7YpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF4w255Vqz140W; Mon, 31 Jul 2023 17:28: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 36VHSYVb058122; Mon, 31 Jul 2023 17:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VHSY2t058121; Mon, 31 Jul 2023 17:28:34 GMT (envelope-from git) Date: Mon, 31 Jul 2023 17:28:34 GMT Message-Id: <202307311728.36VHSY2t058121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 01718a2e94da - main - tools/build: Work around broken Clang FreeBSD resource dir logic pre-13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 01718a2e94dae03994448f40e0b57a3432f5272c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=01718a2e94dae03994448f40e0b57a3432f5272c commit 01718a2e94dae03994448f40e0b57a3432f5272c Author: Jessica Clarke AuthorDate: 2023-07-31 17:28:08 +0000 Commit: Jessica Clarke CommitDate: 2023-07-31 17:28:08 +0000 tools/build: Work around broken Clang FreeBSD resource dir logic pre-13 Prior to Clang 13 (e.g. in the Clang 11 present in 13.0-RELEASE), the resource directory logic for FreeBSD was broken and would not resolve symlinks, meaning symlinks would only work if in a directory next to the containing lib directory. Therefore we cannot even use a symlink for worldtmp, we have to make a wrapper script that execs the real binary via an absolute path. Reported by: markj Reviewed by: markj Fixes: 65f28f63a73d ("tools/build: Create toolchain symlinks for non-absolute compiler/linker") Differential Revision: https://reviews.freebsd.org/D41238 --- tools/build/Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index 46fd5c7d3159..fd7fd158f169 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -338,10 +338,21 @@ _host_tools_to_symlink:= ${_host_tools_to_symlink:Nsh} .endif # We also need to symlink any non-absolute toolchain commands. Clang finds its -# resource directory relative to itself, so CC/CXX/CPP must be symlinked, and -# we do the same for LD for consistency. There should be no concerns about -# installing over the current system since we don't use the toolchain during -# install. +# resource directory relative to itself, so CC/CXX/CPP cannot be copied, and +# there should be no concerns about installing over the current system since we +# don't use the toolchain during install, so that's not an issue. However, +# before Clang 13 there was no symlink detection for FreeBSD so that was broken +# in the same way as copying (https://reviews.llvm.org/D103346), thus create a +# wrapper script for each to work around this and behave like a symlink. +# Remove this hack and just use a symlink once Clang 13 can be assumed. +# For consistency, we use the same strategy for LD. +.include +.if ${.MAKE.OS} == "FreeBSD" && ${COMPILER_TYPE} == "clang" && \ + ${COMPILER_VERSION} < 130000 +_WRAP_HOST_TOOL= sh -c "printf '\#!/bin/sh\nexec \"\%s\" \"\$$@\"\n' \"\$$0\" > \"\$$1\" && chmod +x \"\$$1\"" +.else +_WRAP_HOST_TOOL= ${_LINK_HOST_TOOL} +.endif .for var in CC CXX CPP LD .for X in $${_empty_var_} X .if !empty(${X}${var}) && !${${X}${var}:M/*} && \ @@ -382,7 +393,7 @@ host-symlinks: echo "Cannot find host tool '${_tool}' in PATH ($$PATH)." >&2; false; \ fi; \ rm -f "${DESTDIR}/bin/${_tool}"; \ - ${_LINK_HOST_TOOL} "$${source_path}" "${DESTDIR}/bin/${_tool}" + ${_WRAP_HOST_TOOL} "$${source_path}" "${DESTDIR}/bin/${_tool}" .endfor # Create all the directories that are needed during the legacy, bootstrap-tools From nobody Mon Jul 31 18:28: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 4RF6FK5RJ6z4pNq0; Mon, 31 Jul 2023 18:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF6F46Zswz3sCR; Mon, 31 Jul 2023 18:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690828105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CElO4+0m0BkpF4H36V6n2zxZbqmz7oooMe79yMltz9k=; b=D7NC4k9eoTMwAlN/lbNUoGr3BFppaZqNHw6Em+CC+F3a9wZBTAezfOw4co0Ab9vanjtelS vVuDVfj5BtoBIrn7sBpmNGrhxhMPuOw2jENic6ls6bgTl1zHVULtytqkUth22RDy9yvRJx LAdM7KWdBoGO9IF2jSs7cpUH8A6YUho9f7Z7LEPmbWV2xxArv7sLE9PDy4cAzGy43LBzrx 5xYNzMmevEmnksoXban6AavLwpgyZ9yaWaaWacSllpcbvMS9B1ZOom/akY9bLa0I/00+Qp x8Zq0q0S9eWnhCXntzQ0XYOkKgPpoT78ua/LS4UaedHmAUuSNyHsS2s+UW6G0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690828105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CElO4+0m0BkpF4H36V6n2zxZbqmz7oooMe79yMltz9k=; b=Owg+38QRk9Hu6C0K3on2lBCWN+0rvf3UTWSLQLUFFAmy2VBI9yw2nJsC3Tbl14/8Bh6J97 WKaInlEVaAISGMIqkv13UbXtoLShfV7/ccSj86GyBs7BRM2xianeXuxNaaskp7FyIHVpLc Fp3vbqsSOAUD+KWq2ySLk0X4fCCOJClhrwSUkp79v30kPlUhYpwwhOCvZRd7lJpIuQd2vw J9w3MrVj6i+CbDf4Fh5BVwRts8PHFhhPXlQcaaJk+I6sFTqihfB3+oXtMs1dxEh6glimgw Do7o9IcZMz/toXhqSLlhlLSy/7W6KUnIAOiM0PgmZB6gbbMZI4pVHjw9l+oAeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690828105; a=rsa-sha256; cv=none; b=dA+De9txuNjj4GZD6zVGFmXpzoHa/HdUC2HH/sx3ivln6VlV0XiqB3bgrlXLTE/DhYbkyC yekDepk5MK2D1QtMFZ/YN8E7r901uJ1+xb2OuygIlxD64eKyrNSup7d/ZukKoVKQlbIHJK NM9BzFf6PXyG153JFBV0EGNQEHk8bWyxQrKhbztQafPtMtuV9LeNQcnPOO7msR89j0WXrc 0EbK0nkRJ4CN8qjFcYJjVhDWxfhh0URmAX1233B2HSkCiKnB3xRN849yrMHWGSb9wZDFhC 2wEIym089FT1uaI16/pneXpn38Tsin2v4oXxmzQPRzIQhZPcZ5QUJqDBUcvbpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF6F44H2Cz15g5; Mon, 31 Jul 2023 18:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VISOcS057948; Mon, 31 Jul 2023 18:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VISOZX057947; Mon, 31 Jul 2023 18:28:24 GMT (envelope-from git) Date: Mon, 31 Jul 2023 18:28:24 GMT Message-Id: <202307311828.36VISOZX057947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Reifenberger Subject: git: dd262a8273d7 - main - Delete i386 support since I dont have a i386 system to rescue and test. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd262a8273d78c3dd552706087826ff4db6a34d1 Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/src/commit/?id=dd262a8273d78c3dd552706087826ff4db6a34d1 commit dd262a8273d78c3dd552706087826ff4db6a34d1 Author: Michael Reifenberger AuthorDate: 2023-07-31 18:26:14 +0000 Commit: Michael Reifenberger CommitDate: 2023-07-31 18:26:14 +0000 Delete i386 support since I dont have a i386 system to rescue and test. --- tools/tools/nanobsd/rescue/R32 | 14 -------------- tools/tools/nanobsd/rescue/build.sh | 8 -------- tools/tools/nanobsd/rescue/merge.sh | 28 ---------------------------- tools/tools/nanobsd/rescue/rescue_i386.conf | 10 ---------- 4 files changed, 60 deletions(-) diff --git a/tools/tools/nanobsd/rescue/R32 b/tools/tools/nanobsd/rescue/R32 deleted file mode 100644 index 3c15ebee49e7..000000000000 --- a/tools/tools/nanobsd/rescue/R32 +++ /dev/null @@ -1,14 +0,0 @@ -# -# R32 -- Generic kernel configuration file with modifications for rescue. -# -# $FreeBSD$ - -include GENERIC - -ident R32 - -nooptions INVARIANTS -nooptions INVARIANT_SUPPORT -nooptions WITNESS -nooptions WITNESS_SKIPSPIN -nooptions MALLOC_DEBUG_MAXZONES diff --git a/tools/tools/nanobsd/rescue/build.sh b/tools/tools/nanobsd/rescue/build.sh index 7d2ed80cd265..0c7026c868f9 100755 --- a/tools/tools/nanobsd/rescue/build.sh +++ b/tools/tools/nanobsd/rescue/build.sh @@ -26,14 +26,6 @@ sh ../nanobsd.sh $* -c ${CFG} if [ \! -d /usr/obj/Rescue ]; then mkdir -p /usr/obj/Rescue fi -F32="/usr/obj/Rescue/rescue_${today}_x32" -D32="/usr/obj/nanobsd.rescue_i386" -if [ -f "${D32}/_.disk.full" ]; then - cp "${D32}/_.disk.full" "${F32}.img" -fi -if [ -f "${D32}/_.disk.iso" ]; then - cp "${D32}/_.disk.iso" "${F32}.iso" -fi F64="/usr/obj/Rescue/rescue_${today}_x64" D64="/usr/obj/nanobsd.rescue_amd64" diff --git a/tools/tools/nanobsd/rescue/merge.sh b/tools/tools/nanobsd/rescue/merge.sh deleted file mode 100755 index afb66371fe3c..000000000000 --- a/tools/tools/nanobsd/rescue/merge.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -today=`date '+%Y%m%d'` - -I32="/usr/obj/Rescue/rescue_${today}_x32.img" -I64="/usr/obj/Rescue/rescue_${today}_x64.img" -IAL="/usr/obj/Rescue/rescue_${today}_xal.img" -D64="/usr/obj/nanobsd.rescue_amd64" -MNT="/usr/obj/Rescue/_mnt" - -if [ \! -d "$MNT" ]; then - mkdir "$MNT" -fi - -dd if=${I32} of=${IAL} bs=128k -MD=`mdconfig -a -t vnode -f ${IAL}` - -dd if=${D64}/_.disk.image of=/dev/${MD}s2 bs=128k -tunefs -L rescues2a /dev/${MD}s2a -mount /dev/${MD}s2a ${MNT} - -sed -i "" -e 's/rescues1/rescues2/' ${MNT}/conf/base/etc/fstab -sed -i "" -e 's/rescues1/rescues2/' ${MNT}/etc/fstab - -umount ${MNT} - -mdconfig -d -u ${MD} diff --git a/tools/tools/nanobsd/rescue/rescue_i386.conf b/tools/tools/nanobsd/rescue/rescue_i386.conf deleted file mode 100644 index 97b51d49e21d..000000000000 --- a/tools/tools/nanobsd/rescue/rescue_i386.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# $FreeBSD$ -# -NANO_KERNEL=R32 -NANO_ARCH=i386 -TARGET_ARCH=i386; export TARGET_ARCH -#TARGET_CPUTYPE=i386; export TARGET_CPUTYPE -NANO_NAME=rescue_i386 - -. common From nobody Mon Jul 31 20:26: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 4RF8sP2h34z4pSsj; Mon, 31 Jul 2023 20:26: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 4RF8sB5CMsz4BsF; Mon, 31 Jul 2023 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqp1/shE7rZwVWjGFaP41SPmXAkydYyvisDhnRmGOgU=; b=BMicV7HoTBkj9eX/X6YWJwfy2zclK08sltaYl+5JsxJU63oGQsWXUgLW8u/Vy+XK5TaKC1 FpQJtJYvzDxmsYa3aXxkp9zr/W0NKSQupGsca46nUwb/3TDjMBQMSl3UHrb5EH6mo631g3 OWAkcVkOOtz9ieglEFqEHMePDLZolV3uH2O5fTk996o8vYYGRonS3+3r8Y9+LZi2okH8ur X9LvLOsSWwdc6hif3pmRJir2bdEQORird5QSlA2drJWrs5I1N91qw4fPqfsgNtwD395uke XK/1BMC9enaz+ExR7UMgdpf2maGKt9lygvtezI++zO1JFr9aXZ4hTLUmeep0MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqp1/shE7rZwVWjGFaP41SPmXAkydYyvisDhnRmGOgU=; b=p5aV8SdcrXbJRPTH89IeHVPjZHjE/KwQmu8UWUVeipAL5XntkBZ7NBV7vGXAzyDkAwm3Jj tnUSq4ZroStjm+jOQCNj2HqNIR+I+rYmrM4dGQK+0UkaZKXAFQfGYyV2m9Ti+EAilp8Xb3 Qtnw5JSqhmYkBvlsbclKo4G5mjFwePYDmd0UWVajR32ouoBLuZrV0wBDEV0mhN96O4QJgU m3kFINAVG8kR3j4CxFtMFt7Dy/LAhrMvcXQ6Vl8Arb30ohZJdlgitVJGA18a7p/ALM1Cmf opOpKuI9X77VH/oo7qQC+3op1RhoqbCDva2SZKESiIFtWKjauiyWyIfeqFrODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690835182; a=rsa-sha256; cv=none; b=hVXk8XyzmxG/KbCp5x6255Hv2J3EArwyoNvmvlC3nVCkQ9ZGHUJNUMCCLdzfvlYLGVRPX9 88tOCoXPkrHnk4yaH4fIVvo3+JtGheF8KZsttQaRHytQHlAikbkxurrMohNLqES/C7acJR 2mRdzDm+Qiy8LgXRlYs9nFY1ZSfTuxFeL36+k8kFbYHWhncRBMqgtF1af0RjOk4YAmZhX0 sJ08r7kVnfHv6JGR4Tped1V32SaPFiZTU+a/Pf1cApIga8gwV5THznLkF9Bj4RBkZhIo1m zaAdERuuAHQd93sy1djP23+i1MzD0JnMRxIBugUfQZG7rwMxL0m6Vt/I0sA/pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF8sB2s0cz18wd; Mon, 31 Jul 2023 20:26: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 36VKQMcq057948; Mon, 31 Jul 2023 20:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VKQMsp057946; Mon, 31 Jul 2023 20:26:22 GMT (envelope-from git) Date: Mon, 31 Jul 2023 20:26:22 GMT Message-Id: <202307312026.36VKQMsp057946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f561c2ec087e - main - memdesc: Add routines for copying data to/from memory descriptors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f561c2ec087e87dc997f6ebd351ccade3a90b7a8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f561c2ec087e87dc997f6ebd351ccade3a90b7a8 commit f561c2ec087e87dc997f6ebd351ccade3a90b7a8 Author: John Baldwin AuthorDate: 2023-07-31 20:24:44 +0000 Commit: John Baldwin CommitDate: 2023-07-31 20:24:44 +0000 memdesc: Add routines for copying data to/from memory descriptors These are modeled on the API used for m_copydata/m_copyback and the crypto buffer APIs. One day it might be nice to reduce the proliferation of these by adding cursors and using memdesc directly for crypto request buffers. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40615 --- sys/conf/files | 1 + sys/kern/subr_memdesc.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/memdesc.h | 10 ++ 3 files changed, 336 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 6774be310f84..ae83722eaca5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3879,6 +3879,7 @@ kern/subr_kobj.c standard kern/subr_lock.c standard kern/subr_log.c standard kern/subr_mchain.c optional libmchain +kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" diff --git a/sys/kern/subr_memdesc.c b/sys/kern/subr_memdesc.c new file mode 100644 index 000000000000..9ba9d7fe031b --- /dev/null +++ b/sys/kern/subr_memdesc.c @@ -0,0 +1,325 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Chelsio Communications, Inc. + * Written by: John Baldwin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void +phys_copyback(vm_paddr_t pa, int off, int size, const void *src) +{ + const char *cp; + u_int page_off; + int todo; + void *p; + + KASSERT(PMAP_HAS_DMAP, ("direct-map required")); + + cp = src; + pa += off; + page_off = pa & PAGE_MASK; + while (size > 0) { + todo = min(PAGE_SIZE - page_off, size); + p = (void *)PHYS_TO_DMAP(pa); + memcpy(p, cp, todo); + size -= todo; + cp += todo; + pa += todo; + page_off = 0; + } +} + +static void +vlist_copyback(struct bus_dma_segment *vlist, int sglist_cnt, int off, + int size, const void *src) +{ + const char *p; + int todo; + + while (vlist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= vlist->ds_len; + vlist++; + sglist_cnt--; + } + + p = src; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > vlist->ds_len - off) + todo = vlist->ds_len - off; + + memcpy((char *)(uintptr_t)vlist->ds_addr + off, p, todo); + off = 0; + vlist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +plist_copyback(struct bus_dma_segment *plist, int sglist_cnt, int off, + int size, const void *src) +{ + const char *p; + int todo; + + while (plist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= plist->ds_len; + plist++; + sglist_cnt--; + } + + p = src; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > plist->ds_len - off) + todo = plist->ds_len - off; + + phys_copyback(plist->ds_addr, off, todo, p); + off = 0; + plist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +vmpages_copyback(vm_page_t *m, int off, int size, const void *src) +{ + struct iovec iov[1]; + struct uio uio; + int error __diagused; + + iov[0].iov_base = __DECONST(void *, src); + iov[0].iov_len = size; + uio.uio_iov = iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = size; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_WRITE; + error = uiomove_fromphys(m, off, size, &uio); + KASSERT(error == 0 && uio.uio_resid == 0, ("copy failed")); +} + +void +memdesc_copyback(struct memdesc *mem, int off, int size, const void *src) +{ + KASSERT(off >= 0, ("%s: invalid offset %d", __func__, off)); + KASSERT(size >= 0, ("%s: invalid size %d", __func__, off)); + + switch (mem->md_type) { + case MEMDESC_VADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + memcpy((char *)mem->u.md_vaddr + off, src, size); + break; + case MEMDESC_PADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + phys_copyback(mem->u.md_paddr, off, size, src); + break; + case MEMDESC_VLIST: + vlist_copyback(mem->u.md_list, mem->md_nseg, off, size, src); + break; + case MEMDESC_PLIST: + plist_copyback(mem->u.md_list, mem->md_nseg, off, size, src); + break; + case MEMDESC_UIO: + panic("Use uiomove instead"); + break; + case MEMDESC_MBUF: + m_copyback(mem->u.md_mbuf, off, size, src); + break; + case MEMDESC_VMPAGES: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + vmpages_copyback(mem->u.md_ma, mem->md_offset + off, size, + src); + break; + default: + __assert_unreachable(); + } +} + +static void +phys_copydata(vm_paddr_t pa, int off, int size, void *dst) +{ + char *cp; + u_int page_off; + int todo; + const void *p; + + KASSERT(PMAP_HAS_DMAP, ("direct-map required")); + + cp = dst; + pa += off; + page_off = pa & PAGE_MASK; + while (size > 0) { + todo = min(PAGE_SIZE - page_off, size); + p = (const void *)PHYS_TO_DMAP(pa); + memcpy(cp, p, todo); + size -= todo; + cp += todo; + pa += todo; + page_off = 0; + } +} + +static void +vlist_copydata(struct bus_dma_segment *vlist, int sglist_cnt, int off, + int size, void *dst) +{ + char *p; + int todo; + + while (vlist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= vlist->ds_len; + vlist++; + sglist_cnt--; + } + + p = dst; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > vlist->ds_len - off) + todo = vlist->ds_len - off; + + memcpy(p, (char *)(uintptr_t)vlist->ds_addr + off, todo); + off = 0; + vlist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +plist_copydata(struct bus_dma_segment *plist, int sglist_cnt, int off, + int size, void *dst) +{ + char *p; + int todo; + + while (plist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= plist->ds_len; + plist++; + sglist_cnt--; + } + + p = dst; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > plist->ds_len - off) + todo = plist->ds_len - off; + + phys_copydata(plist->ds_addr, off, todo, p); + off = 0; + plist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +vmpages_copydata(vm_page_t *m, int off, int size, void *dst) +{ + struct iovec iov[1]; + struct uio uio; + int error __diagused; + + iov[0].iov_base = dst; + iov[0].iov_len = size; + uio.uio_iov = iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = size; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + error = uiomove_fromphys(m, off, size, &uio); + KASSERT(error == 0 && uio.uio_resid == 0, ("copy failed")); +} + +void +memdesc_copydata(struct memdesc *mem, int off, int size, void *dst) +{ + KASSERT(off >= 0, ("%s: invalid offset %d", __func__, off)); + KASSERT(size >= 0, ("%s: invalid size %d", __func__, off)); + + switch (mem->md_type) { + case MEMDESC_VADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + memcpy(dst, (const char *)mem->u.md_vaddr + off, size); + break; + case MEMDESC_PADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + phys_copydata(mem->u.md_paddr, off, size, dst); + break; + case MEMDESC_VLIST: + vlist_copydata(mem->u.md_list, mem->md_nseg, off, size, dst); + break; + case MEMDESC_PLIST: + plist_copydata(mem->u.md_list, mem->md_nseg, off, size, dst); + break; + case MEMDESC_UIO: + panic("Use uiomove instead"); + break; + case MEMDESC_MBUF: + m_copydata(mem->u.md_mbuf, off, size, dst); + break; + case MEMDESC_VMPAGES: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + vmpages_copydata(mem->u.md_ma, mem->md_offset + off, size, + dst); + break; + default: + __assert_unreachable(); + } +} diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index 9054e2674409..9bd806688e1c 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -155,4 +155,14 @@ memdesc_vmpages(struct vm_page **ma, size_t len, u_int ma_offset) struct memdesc memdesc_bio(struct bio *bio); struct memdesc memdesc_ccb(union ccb *ccb); +/* + * Similar to m_copyback/data, *_copyback copy data from the 'src' + * buffer into the memory descriptor's data buffer while *_copydata + * copy data from the memory descriptor's data buffer into the the + * 'dst' buffer. + */ +void memdesc_copyback(struct memdesc *mem, int off, int size, + const void *src); +void memdesc_copydata(struct memdesc *mem, int off, int size, void *dst); + #endif /* _SYS_MEMDESC_H_ */ From nobody Mon Jul 31 20: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 4RF8sP2h3lz4pShP; Mon, 31 Jul 2023 20:26: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 4RF8sB5CM3z4C90; Mon, 31 Jul 2023 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6Iwh5dhZO69cZXOXdBgxjANfX0Wf5IEZNfbVlNHDkI=; b=B+rPQsVdNcsNpBUoXIPxEuts/Ppw60PFLaqaou4mnMX9+u9JQDu2yC3oVKkTgICndSi4As g4bWiX4hOUtCFgcyKH9DBQp58jq2ho5Iml/9HXvwJC7KLxwQoXdUI7lz5HDLapsEBHa3nK 81/l+s4OfG9CQ8bjKSmsI0fVlUkOLY/qLWtFoBMaaqtVktJ98FSxOYP9CRx7d0Fb1/lUks 7pCKoc7janu8urmUcL8/nW86wLKHY4tFyoCGs6vxhZnFooscuQzQv3LRhIYO25T9yZaVK2 wWjRxiepatXc/NDY3k5KGUTbny1Vn8wqvIxva4TeF69uv4XsHCus6deh8wY1+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6Iwh5dhZO69cZXOXdBgxjANfX0Wf5IEZNfbVlNHDkI=; b=ih9b+Spp7L2dlEwjiGBk9ckoiFyhNQQ7DlPQFd5bYdXcHj/UOcgXes5Gj52pOGYnFdvjjU SUiZe96KR5nxYMLNOFtgqTiM52gOsvAPGJCdB91OnSVVTQjEUBxsaY/Li6abaVUcIdvWQe hK/k6ktm1p8S8c7pYSyeUEWxGUTT+2vhrY6TEWNC0l00h50Hmz1iEN4cO2wnbpJqpn/mYz Qyfrlm4JV1/6Sy/KfzcFcHSRsSoCX7en9uIbse4dSHw95NxnEwtNIk/+JRWbWlkVhKna/w z1zfBQJL4H8wk/bwQRiTexNgKpq22ltylXLhoCesxven7g2HxJCz9ZUd8Xg43Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690835182; a=rsa-sha256; cv=none; b=NQI8AOGxEaiEmWOLkuQEMlEkwOs6MS7oeISMh6m/IB9yvtjAN6Fif0qjRzdaXYI3NtMUL4 hKOVu+otxqBcnrhYU2chyP9qlqon3/Przm+jK5zaM0I1XzWdANJLhnt5G4iXtY1vKXHiqJ oRIbWFtgPU2Thxb3DOMI0CYvd7JMuPJxJrTE7OxN+TnV8ZdVzZUP0zAU57wv0+9/8Ye9Ix RHnOjltXVBWTAjjqdJ06DtJJfq2dWNa7CDwNPsyz9ZhHZG7E73bKKtIEx8jWw6wayXOMNx MwyiU3LGUC7bZpi3EjRxMHhO9p6E+hIVZEKW520y6JYb56oqYUFqdOIAj5EQ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF8sB2kpQz18pF; Mon, 31 Jul 2023 20:26: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 36VKQLae057928; Mon, 31 Jul 2023 20:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VKQLQV057927; Mon, 31 Jul 2023 20:26:21 GMT (envelope-from git) Date: Mon, 31 Jul 2023 20:26:21 GMT Message-Id: <202307312026.36VKQLQV057927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 56e9a0136f87 - main - gsb_crc32: Fix a warning when compiled in userland. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56e9a0136f87de0dd5d834289d40835700bc9e5b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=56e9a0136f87de0dd5d834289d40835700bc9e5b commit 56e9a0136f87de0dd5d834289d40835700bc9e5b Author: John Baldwin AuthorDate: 2023-07-31 20:24:18 +0000 Commit: John Baldwin CommitDate: 2023-07-31 20:24:18 +0000 gsb_crc32: Fix a warning when compiled in userland. crc32_tab[] is only exposed as a global in for the kernel, not for userland. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40614 --- sys/libkern/gsb_crc32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/libkern/gsb_crc32.c b/sys/libkern/gsb_crc32.c index 27b9a926888b..8b13d27b5c08 100644 --- a/sys/libkern/gsb_crc32.c +++ b/sys/libkern/gsb_crc32.c @@ -64,6 +64,9 @@ __FBSDID("$FreeBSD$"); #endif #endif /* _KERNEL */ +#ifndef _KERNEL +static +#endif const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, From nobody Mon Jul 31 22:56: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 4RFFmh6n5Cz4pbk8; Tue, 1 Aug 2023 00:07: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 4RFDBn2LZVz3PY7; Mon, 31 Jul 2023 22:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690844210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ft1CMto6tf/b+fKx+73ZXOEXzPE+fnWboZtdwi6JD5s=; b=fLZ2wb1qcl8Dhc9FLTQDhWDxX6BYHb0xaGC+wvkJJhfld2lyDSJ8xauOwvIRCxCy4KYavn F+WK2BiWef9QQCxm0OiWNifGVBzCQnoR+6sGVyZPfjpGqY5yrZ4QNJK+TD38+Hz0+RzYK+ D6k98wu6M3TJg+0ilnApm289JFEOEvZ1esYd5tEQuMvPNghQpyP9rVNc/RxQ4wzu42EdaV G/r0fA8518biEryc+Hip5nDo3g7iwUnVQVLU1sBwYdpNrRyvub0QX9WVQ5WLI3kpvCl+4i qhVIKt0lJEhlpsxwGdf3fXesS4YLjPclmdksL9fTh7beSsUaxhT8Hg0v1eRJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690844210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ft1CMto6tf/b+fKx+73ZXOEXzPE+fnWboZtdwi6JD5s=; b=l+shfkZJ2nvA3FfHQevs54CLZxD5IL7JeVgxjaaRrDJiFcNE6/A4Ftfc72ZsvIfXufsD4T Gr5h5RT6FBdmnWoIF2deeVoqAR4Sr120IDPjiy1emC5LO7xDsGhRO+PIF8z3xFl9TilBem CtoEHY/x6/iRE0e7rfkLBxX/LnCE6HLgC7k5HkLkvm1z+TukzNHoQtFt3b/wLMobzNq+0A lv2DebKVeGugG+FHY3NGLUliE3uGNWDbRkxyuj1ZCD1B16j9oHB2DkPiitML8No4dD0BA3 o+M4ePvKQqODTjJi+ezMCRcp9BQ5g+5vQPi9Zahlg/d75z8RR5qkmRkZXEpZEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690844210; a=rsa-sha256; cv=none; b=oB2n8LXqpQKHtaQE5MdejmRY2drYmh5Nkj8jAtOv2uQ/MqP+RvizG1CNyexsObA/09PYQk WtLjRO+8RbaIFaI/YDQsuB+M6IZM+o1D32y6rjXReo+o+wWESPwSuR5zy3CjhgHJ+oIOYk CeEgRqAckNo5VRnBZlpBLQVWuqYugp+fO7gspwuyooq5xo1Vqbx68eg8stB0RfTmQlrIEv AF/vMGu2WoFzOKBvOa+LShPG8X+C8ivjKdq8nUpTexIz7Arq7N/PS5qAVenoSA+uealuG0 4ICDmXRyoO1O83LpjorC+8f2reTHRWTKgIPPRqvXdaMUjbUBHtjXHWSeyKuzGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFDBl08YrzDjH; Mon, 31 Jul 2023 22:56: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 36VMujXZ006652; Mon, 31 Jul 2023 22:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VMujAC006651; Mon, 31 Jul 2023 22:56:45 GMT (envelope-from git) Date: Mon, 31 Jul 2023 22:56:45 GMT Message-Id: <202307312256.36VMujAC006651@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: fa3cf6cdc68c - main - cd9660: do not leak buffers in cd9660_rrip_loop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 commit fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 Author: Konstantin Belousov AuthorDate: 2023-07-31 22:55:13 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-31 22:55:13 +0000 cd9660: do not leak buffers in cd9660_rrip_loop() Reported by: Robert Morris PR: 272856 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/cd9660/cd9660_rrip.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 26a09f9be383..21b176a3f0f6 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -520,12 +520,18 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, } if (ana->fields && ana->iso_ce_len) { - if (ana->iso_ce_blk >= ana->imp->volume_space_size - || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size - || bread(ana->imp->im_devvp, - ana->iso_ce_blk << - (ana->imp->im_bshift - DEV_BSHIFT), - ana->imp->logical_block_size, NOCRED, &bp)) + if (ana->iso_ce_blk >= ana->imp->volume_space_size || + ana->iso_ce_off + ana->iso_ce_len > + ana->imp->logical_block_size) + break; + if (bp != NULL) { + brelse(bp); + bp = NULL; + } + if (bread(ana->imp->im_devvp, + ana->iso_ce_blk << + (ana->imp->im_bshift - DEV_BSHIFT), + ana->imp->logical_block_size, NOCRED, &bp) != 0) /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off); From nobody Tue Aug 1 02:04: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 4RFJMd0lf1z4pgtN; Tue, 1 Aug 2023 02:04: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 4RFJMX6sFhz44XV; Tue, 1 Aug 2023 02:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690855481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ENkDvyJA6wAoSt3WR1jatcHDJoMEjn/tTnp0B5qOA8=; b=wEV/GLqL1ZMcWl+yy2otEHJkE6Yi6YVQVbzr9jFp7P+Q2Mj6J3sYBVOtm/iv3kF5jR32kR HlmHl2h8uxc7MaAZAU7IEOvFTdjVthYiRpOd1aKK9IgTHceNMkin9bticAduP3VvFqoL/N dleMKr8klOplQGLktNMAJiQdra67ouPqj3MLT0kaBqBvogdj6L7Gc6BrOwilLzr8If4LUG uV8KVMrYBF8b9kPt8H4oBoCuCbuOA8HxySWLplXWUUdK5BerbxqqLHQ749ZL2nqS/jB0hD IFWLULt80hdjkyu8TmDv4JSu0f2cTS6nfsImOdNIZVDckQ6JdMYKcIMEvPZbow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690855481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ENkDvyJA6wAoSt3WR1jatcHDJoMEjn/tTnp0B5qOA8=; b=whaqC3RW0K4d6GFejvCbSY1fH0GvewMG77RaCqNhUMbW7uIuo/eapgQHeMmE/X3ixBkZ7y JM7bBrDl6MLQHDV15M4oJUqUFZ3EyhYLcuSHZfT+0w1efPuQTph35rrUgqZL2EzU02ZIIL mpfDmRUGw8Vm7FJJpESWQSkpOyoWg6iM35oa6F37MkbJUQui9XRbSWlA3NeR/hPB/Kirsm jbGfFb/dbsRhyM5kEDTAHJnycPSoD+165iA/LpV00LOtyUfiPyiFWP8tFhnLYtWp191+lF rnm9Y5lZ0YrgXXehau9s0k0HNbmMRcgIxcvZE/xc3OPGpdkI1PZAfhLZT5E/VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690855481; a=rsa-sha256; cv=none; b=L716C4sJktmAQDAcRmyBwpvBDtgfjXLzkOhSoEoJ9b7N+AOKaq10pgj3JFxG0Z35oBwgah OJ/ynGinSWh76FXnK4xmE0rRAhy2EyjJFei8wMMk0lNIPEC1rwK5hi7ktcmIAO6uT+mCJD uL/Yfq4g7Xxe8ycx3BxsPc0rykhDkNGTrl5TMcUVlgY1TWeXubH+1JwgC3AI+xlPvG5FE7 OKv0laFVAFovWuq5Q57A9AHqsMYP2buYw3EeuNpZZuCtcWgd5er83KhjqBKHw9wOEsXkeO elqb9F4kRiM3U9cYv2CdKwfAJ+oRzEbE10rr/g/HI3/BSUzRndfFouukuNSDEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFJMX4KzKzKQy; Tue, 1 Aug 2023 02:04: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 37124dRD023440; Tue, 1 Aug 2023 02:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37124dt1023439; Tue, 1 Aug 2023 02:04:39 GMT (envelope-from git) Date: Tue, 1 Aug 2023 02:04:39 GMT Message-Id: <202308010204.37124dt1023439@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: c2cbd7ffa71a - main - isa_common: find next bit faster List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c2cbd7ffa71a4009e4cc38c04c726ea562b11361 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c2cbd7ffa71a4009e4cc38c04c726ea562b11361 commit c2cbd7ffa71a4009e4cc38c04c726ea562b11361 Author: Doug Moore AuthorDate: 2023-08-01 02:02:56 +0000 Commit: Doug Moore CommitDate: 2023-08-01 02:02:56 +0000 isa_common: find next bit faster Since ffs is no longer implemented with a linear search, find_next_bit can work in constant time, with masking. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41251 --- sys/isa/isa_common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index ca7fd15442b2..994288886cea 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -275,12 +275,7 @@ find_first_bit(uint32_t mask) static int find_next_bit(uint32_t mask, int bit) { - bit++; - while (bit < 32 && !(mask & (1 << bit))) - bit++; - if (bit != 32) - return (bit); - return (-1); + return (find_first_bit(mask & (-2 << bit))); } /* From nobody Tue Aug 1 05:51: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 4RFPNp244yz4pqqG; Tue, 1 Aug 2023 05:51: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 4RFPNj57Fzz4NGx; Tue, 1 Aug 2023 05:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690869061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwoaXMwc7FsvEWVxq2ie9lzvZ0ZWcetPuGHhHsmlpaQ=; b=fdZShg9kjGxVFbIOddCjalqv7pOjAwFtcniG3FBN8gP0ZodS1lN4kBSd1f+kz0GipOfcDP yPR+Jj2pqXAKFDaYgVgOdsZjRnBpmBloudem1hEeeWH4KNBt+BPhSPWKRaDRmGzgvZedvN JrP7T1I6eojOz5j7I5L4Iq1krQI227b69Vwd3X5yhyVcbN945L0L3GQbpa+fPvaB6LQCEz Mo8iRVXPlfKpEVrPMBaqfRVbMyEG62zd3iNYEF3QN0MMUru9T2383OwIuwzkIoB7Xfk4u1 7IZw8fEMkWVBfkJtMo1M4PER4myVgY+FuNmC8RIHbIj9dQmasMnFPeFmw/hZug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690869061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwoaXMwc7FsvEWVxq2ie9lzvZ0ZWcetPuGHhHsmlpaQ=; b=i/DQym7o3aTwbiAEzCC7wpIRJXsxuTt3yyWgPtVeiL3v4bF3iNCRTSngAeT4GhzQuOPYq1 nf8XdxRXUmw5+kGlcC+Iowrz3OBA3ix58LQjHdn66CoVCcnaGO4nGXvJ+//nKldGeSrMPt zVutdr0JB2Dt2GcSSGyUais4nV5Qd8Qso29izXnVmhJDVL6cLEcXD7rXbI6OFvOptw54nf uSUhJoWpvv8mvIVh6/cwxQfZnFTH56CKoOOEVN31B8UWXWmRBNJzf3WMwsxEinTaVQe3TK EUfOj7dF3BCIK/poFY8r9KemVhXJD9zEjJKA1lk6NgJnTi70Iex+wG3jiaRRyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690869061; a=rsa-sha256; cv=none; b=op+AZSnuLQJxcbnrz2K7tYqeICQur0+HtEUo6OZzye0lziyjniMz0K/kx0IMdIkrRId15N lTjluCmQioPrCtEipchsBTRTJEw1lEigDXVOzdKA/ecATCQLHyk1msA1js3nmySLBEYIZR 5+lPZxLUjKFYKXw9QmtZpSGj+8+fqUgTFhx3a7k/xztbYV0p8AU+d0axqd4aSl7BSI3aDP 9VonwT8A+BeyfZfPRzZLdMIA3E5MnFfg/mhRyfKd+lpCnuYGUYjOsVlYsyj3SK3esUHqhF 1jKBcWw6vX6Elpuga/4w7qEqq0LMfymLBvb9ls/sZt2FzBnS/MKzoo5N8XcBxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFPNj3cz8zQnv; Tue, 1 Aug 2023 05:51: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 3715p1Lk001603; Tue, 1 Aug 2023 05:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3715p1sa001602; Tue, 1 Aug 2023 05:51:01 GMT (envelope-from git) Date: Tue, 1 Aug 2023 05:51:01 GMT Message-Id: <202308010551.3715p1sa001602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 135c2b71562f - main - sk(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 135c2b71562f6a6b8e918cc66d5468342c198d02 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=135c2b71562f6a6b8e918cc66d5468342c198d02 commit 135c2b71562f6a6b8e918cc66d5468342c198d02 Author: Gordon Bergling AuthorDate: 2023-08-01 05:50:45 +0000 Commit: Gordon Bergling CommitDate: 2023-08-01 05:50:45 +0000 sk(4): Fix a typo in a source code comment - s/nomral/normal/ MFC after: 3 days --- sys/dev/sk/if_sk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index ac0f552da7d1..39aec245c53f 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -2571,7 +2571,7 @@ skc_resume(device_t dev) * to get correct checksum value but couldn't get correct one. So TCP/UDP * checksum offload was disabled at the moment and only IP checksum offload * was enabled. - * As nomral IP header size is 20 bytes I can't expect it would give an + * As normal IP header size is 20 bytes I can't expect it would give an * increase in throughput. However it seems it doesn't hurt performance in * my testing. If there is a more detailed information for checksum secret * of the hardware in question please contact yongari@FreeBSD.org to add From nobody Tue Aug 1 13:56: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 4RFc9W08y0z4qCjZ; Tue, 1 Aug 2023 13:56: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 4RFc9J3sj8z43dL; Tue, 1 Aug 2023 13:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690898212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dULJ3LrMj9f0Wv6FzeZGehjhtLX8OlYEOxjx1Vg015U=; b=mTOlmXjXYjvacmOavS/fNhEO1lhn+4D9WxNv1gRb+18xGCQNC15Wz3wP9XyoJx5rSE8RUl m09SCK2CY8cm/NadlDb4IbEA1/birlMAQUWhAWR/pK8mRf2RX4LoON78EK8SO/zEQ23Klp U2RS3ajEDX+xMQxsfvhhEG9CQPF9z8Y0PLFbD53FNqf85Kg7sL9WkZcMPEXk1qZFhNncsN tb7jZOJwZj5bOPIvMvvGc+sJoR0MLjbvsAG2tqgA11AyID/K2cxfYOmdqfxURzi04X6Ya5 EflD/ljU1LJMuuBvcyIHNe6JopSEJOcp1P5vy44a7qVDrl4G6L/BUm/vFBrYDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690898212; a=rsa-sha256; cv=none; b=HgSczazGcTmZ9x7smZcYwwkClYFkSc5VolqjpBFjzx+EaR/MoojanAKOzGx1czgEOL61xz pO45ToyvpcnoMXDc6xi/4cZQwa0V04dBV/3KardzCCKTTbRf1oe+c+rJjig7N1sK2gzx/L u3SgeSt/Oz/lY044yx959FT8Llq0OZ1AgsFmAfAc+IZv1o6hHxxdVCrQ83tRQEL6aSLhOT +YvbrVT/nqd1TyWfC7yoFmIBieft04JKtWhoapRRjHope15SFmoUqwjxeurbTlTdlttsRU cPG5YWXHz2eu7s7Jqp+/+LyDjgb0wNHuSYIi0is9K/Bbd/afCdscXd0hsYLqtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690898212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dULJ3LrMj9f0Wv6FzeZGehjhtLX8OlYEOxjx1Vg015U=; b=Xw09Rooy5ntjotveD9lUkhSs7b+2MQXIIxY8CAUNH9YgcTADBaAts2yTGY6J3SmkFjEZqi c9PUYPpL9ZuyhffDqT+88Z6j/Fhj9qQcTWB0MRIutFG5YUHJBCnT30xJh4BgTsaWGyx6yd JP3MsSwjq6Qp65MGYapByuOX7ifcV4Fydxnm+mr9bT7aAn/ye1pq395ab5Eo4bikK4JfYp UNHXXYKMXUyVbmxlUbDYAx6hXinGEMPUyGYLRLryAHZo8GGlWRS/pZ6/2SP6DLP4eHI8jO Qa6tX2qGW8SylBJ+EUgdTT5qtegGK9efTDkYSCFj+TbOcxqHEfVtSM7S5JyvOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFc9J12clzg33; Tue, 1 Aug 2023 13:56: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 371DuqFj098221; Tue, 1 Aug 2023 13:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371DuqWR098220; Tue, 1 Aug 2023 13:56:52 GMT (envelope-from git) Date: Tue, 1 Aug 2023 13:56:52 GMT Message-Id: <202308011356.371DuqWR098220@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: cee03fcb5e79 - stable/13 - buf: Make the number of pbufs slightly more dynamic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cee03fcb5e7933e9b50df498ac81e66bba24eb81 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cee03fcb5e7933e9b50df498ac81e66bba24eb81 commit cee03fcb5e7933e9b50df498ac81e66bba24eb81 Author: Mark Johnston AuthorDate: 2023-05-30 19:11:32 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 13:56:16 +0000 buf: Make the number of pbufs slightly more dynamic Various subsystems pre-allocate a set of pbufs, allocated to implement I/O operations. pbuf allocations are transient, unlike most buf allocations. Most subsystems preallocate nswbuf or nswbuf/2 pbufs each. The preallocation ensures that pbuf allocation will succeed in low memory conditions, which might help avoid deadlocks. Currently we initialize nswbuf = min(nbuf / 4, 256). nbuf/4 > 256 on anything but the smallest systems. For example, nswbuf is 256 in a VM with 128MB of memory. In this configuration, a firecracker VM with one CPU preallocates over 900 pbufs. This consumes 2MB of RAM and adds several milliseconds to the kernel's (very small) boot time. Scale nswbuf by ncpu in the common case. I think this makes more sense than scaling by the amount of RAM, since pbuf allocations are transient and aren't used for caching. With the change, we get nswbuf=256 with 8 CPUs. With fewer than 8 CPUs we'll preallocate fewer pbufs than before, and with more we'll preallocate more. Event: BSDCan 2023 Reported by: cperciva Reviewed by: glebius, kib MFC after: 2 months Differential Revision: https://reviews.freebsd.org/D40216 (cherry picked from commit 4e78addbeff902aabaa87fdaafbd962f90720d69) --- sys/kern/vfs_bio.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index bbde345a1b89..91cd42317a10 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1157,7 +1157,12 @@ kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est) } if (nswbuf == 0) { - nswbuf = min(nbuf / 4, 256); + /* + * Pager buffers are allocated for short periods, so scale the + * number of reserved buffers based on the number of CPUs rather + * than amount of memory. + */ + nswbuf = min(nbuf / 4, 32 * mp_ncpus); if (nswbuf < NSWBUF_MIN) nswbuf = NSWBUF_MIN; } From nobody Tue Aug 1 13:56: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 4RFc9W07R5z4qCtC; Tue, 1 Aug 2023 13:56: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 4RFc9H2Wvgz43gS; Tue, 1 Aug 2023 13:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690898211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0XhlrQXf/xAFpd1ozIs8/JYmhzNh2MFgBrHkvAYcHM=; b=L5BaklZLaBwFrOwpo0VoZFztg4IlbshKc4BrWJpCXSa35Vh2d4CzD8WwvCbh45uvcJ6jsl A7KqUWiZETX+G4shLDkcEl9JYYCstAxCSRS2+aIK9Z0DjwGlehsFwZ6whwAbWK/veKdoIF gByoFhn2Ht3C6TEvrrYidEqqcvSwDm/729pCZMDibymyoAUFsOThhW8m+SB4uWTH6neWt7 C78tXho0XfLRLawpPPfJRVQ9VDJ1Zbcz0EmIgKiyfLK4AwZ32rsLr2CxcELHJhjbt6mwJj errfNo7havrjlZW48YYn6qo/gSe55MC4wXCTaXKeaK76pB5oSoNfc3TzB/pqWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690898211; a=rsa-sha256; cv=none; b=WZE2g0QD3Dm4GreTCpt4p5Xl2JBAfCVcwqSsklLVQGNIiCBn+4IovIDwGTZw91yCq8NK2H Np1jE9+HnhRTCpyrMjWRBwxWWFXyfXawrvULSL4vE0E97qO5jnV38DhN73yvvmqMO5rGkV V29gX49vLDLDLNVBUcYUkg3UVGS61Ndf+otAENVOJtvgnIWwaTa1nK3hlxxQVir7kzY6Cz MxUVJfcvGYK+HKz9rTuAqDIXpA2yHvCd4aPQKY+KZk2IkTiFFZFGzmYVHqUFU00oe1wEl3 XTKLTWtZtsBaVgBFIBK8DP1woPqDCEF74Mex4/d9HrioozAm81I1dmy8U+Uf2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690898211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0XhlrQXf/xAFpd1ozIs8/JYmhzNh2MFgBrHkvAYcHM=; b=bWQWtsFO3CfjhtjN+hEIV5EXbx3zQW6BbrxIHB/sYUT9XZNjf6jPONcPvIQ1ZFHHM0F+mr 17q05wB69RWrdogubn91wf/AvGSFxXMGOgULC+0S4TPmMxtVIDJTBP+xbmXfpLbLAQIIJL 0+muhCLfex6K5CXOI1JDkyZgkdwLa/7+lysgqwC91SWNFKcE4o1J5KFuDFvCNGyOHPI8zi XU7N6iHPSfVr+JlO187p44QZ4XbTp+UhS9WZkR18ycNvsDkxKUssE/uTicsHXu3F7QDXk2 ac4D6vxtmhSKFSlcx8q+8bgMZ/yVdJ4NMTRS7/yOQQ/snTo23mRaEE2/KuXk0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFc9H0YSLzg32; Tue, 1 Aug 2023 13:56: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 371DuovW098202; Tue, 1 Aug 2023 13:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371DuoGv098201; Tue, 1 Aug 2023 13:56:50 GMT (envelope-from git) Date: Tue, 1 Aug 2023 13:56:50 GMT Message-Id: <202308011356.371DuoGv098201@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: a53a2971ac3f - stable/13 - bhyve: Stop calling pci_lintr_request() in the NVMe device model List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a53a2971ac3fc1d0d7bea205ef13892f6b9fded4 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a53a2971ac3fc1d0d7bea205ef13892f6b9fded4 commit a53a2971ac3fc1d0d7bea205ef13892f6b9fded4 Author: Mark Johnston AuthorDate: 2023-06-28 20:06:21 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 13:56:16 +0000 bhyve: Stop calling pci_lintr_request() in the NVMe device model The device model effectively assumes that MSI-X is enabled (it never asserts the legacy interrupt), so any guest which relies on being able to use the legacy PCI interrupt will fail. The WIP arm64 port does not implement legacy PCI interrupts, but NVMe emulation is potentially useful there. Simply remove the call. Reviewed by: corvink, chuck, jhb Tested by: chuck MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40731 (cherry picked from commit 13013d266e7781022fde04509670d0ce5f2ac25f) --- usr.sbin/bhyve/pci_nvme.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 9f99a39de441..4ff5243262fa 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -3356,8 +3356,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_reset(sc); - pci_lintr_request(pi); - done: return (error); } From nobody Tue Aug 1 14:13: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 4RFcX214SGz4qDQy; Tue, 1 Aug 2023 14:13: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 4RFcX12gDMz44b7; Tue, 1 Aug 2023 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIxzX6bP728YZqy7fs9K7TJBQQlhGsI+9jOesUd5uZ0=; b=MxEGpyT2fXx8mas7AVvx7VG2a75ywST/yhW9I70tybHlpZ3bpK2R+ipJz0nzTjMpc6lzTs jtotzOK+Kk6YD0o9l8TcoJZ5p+iJ2AfRqZuG6zRVq6zhV1xYjWHK8dpeAVu2BLCiR8+RBd krSAPjvt9hmwch2so59hHX4+qS0OBVnfAdBF/BIQ7kaCj08zUVInNCng3Vf0VojGH/nxwp ij8QyPaZ1QniJalHHgKcCzeK0pNhpXY2l2fVdg4NHzX72m8f91oB1l45LMqto5DXj8XYxd UhWP1l+KwqG9VPARBHwdiYJKPJwGkReOoPInHMMsp+tBOYQrC4VhH1UdfejqVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690899185; a=rsa-sha256; cv=none; b=LsMW4Uu9L/HLuj3HaBQFZt+SfK55xxcD18vnU2jnlPBAnHv772Rb/AiyA6jzhe+fZL1Su1 BD9dILzRrfvjFVn8spTmPsWmok6uLHJG/DH2KqlMqlDVn/IWsRyE6bhNHhriHK4MfvKnYi P0HjH8rniigUthKZ9LIdQgUEuKIzQxK9Daqvmic4yUtoAtyu3nFChwmyD+S//JA4cYH7kE xdfxj3TQ30q14HgV+itw6vYdhpwYIobdc0iOeuQ2tlfEK5Wjt1XOJor3cbhqs+ZutFEYx5 UH1Ee8PHALf8sIR+ohuRy1cN3bWPIXZOYX94SW2KoYZjitLezHuuDwkivWT22Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIxzX6bP728YZqy7fs9K7TJBQQlhGsI+9jOesUd5uZ0=; b=nQPsiO8kPozrfOGn4QdkGsrqtFWmMyyly6y20vVKz+qcb96T7JT83JDoK49Lw6dhm/aJ4u pirBlnwXd1/he+LruA4ai1J29je4P08zkLEEkOTuJ+7CBhA13jLn7B1/KAdvRAHx5hV9Ut vhWPIzsf/exn4EHoQvYMTg0cylK6qrurRa9NKX5LQgu9hl8Gj+RE1xHJBrW8nlr5YXywFb FyChp1w3TB3jmiOrZCKMuq+fjdrFiqb3FbxFaQkvJ92o9r6uJiNcAQTGuY5Dzmipq08Xv9 4fl98Si+ju8xGB4EGs8p/CvjxB7r8rJNx9DBBA7Y3DfTnkjxf68B3ajq/yjnRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFcX118q9zgJn; Tue, 1 Aug 2023 14:13: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 371ED54P031923; Tue, 1 Aug 2023 14:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371ED5sd031922; Tue, 1 Aug 2023 14:13:05 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:13:05 GMT Message-Id: <202308011413.371ED5sd031922@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: 848ff9bc1b97 - main - libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 848ff9bc1b97b04a0b7328ec7079fb031fef452d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=848ff9bc1b97b04a0b7328ec7079fb031fef452d commit 848ff9bc1b97b04a0b7328ec7079fb031fef452d Author: Mark Johnston AuthorDate: 2023-08-01 14:11:23 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 14:11:42 +0000 libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR They were previously being defined by cddl/lib/Makefile.inc, and as of commit 4ae699122810 were being overridden by defaults in bsd.own.mk, which changed SHLIBDIR to /usr/lib. Reported by: Domagoj Stolfa Fixes: 4ae699122810 ("dtrace: Add WITH_DTRACE_ASAN") --- cddl/lib/libdtrace/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index a6a7b90d3d39..d6771aee37b6 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -7,6 +7,10 @@ PACKAGE= dtrace LIB= dtrace + +SHLIBDIR= /lib +SHLIB_MAJOR= 2 + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ From nobody Tue Aug 1 14:13: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 4RFcX20nYCz4qDLm; Tue, 1 Aug 2023 14:13: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 4RFcX038mRz44MN; Tue, 1 Aug 2023 14:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zvm3A3OjrJdU/Y/pvY/jV3xHE46DekjvS5jQwIxFfx0=; b=LnoV9DJxUY8eqCnjdxOa6WN15ugKBv7jhEgnQh+TKULApGDZ0Mpt1QoWuyFewskzcR3XDc Pp4tEXx7NLNLe9CsL9pUaMZeRoZzbRiD9AZIWFODm99qKxgvIgi0jayZ7YEiT1G4MFgVKa AE3Msl6distgvIGX6UW+ivkwZCUb6c0BdFFyaOO1XzeYE6ShK+Pn6YzuGQ5lKY0bDYTcbC eUnL3Mx9/MiPp6Ahosqp2Aa86MeFd0iSVTQmITSVKBfJbBUST/+1E/isg8W7WG8x3Lkald wJlrzsWOPJLYG7bDaakb48FyZ+53ph5Gl9fmtnlXjRQ4lGlCpZV6LCqWQ6oi2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690899184; a=rsa-sha256; cv=none; b=DsCrO0L4KhFbRSK5d0X6Id0xRTHdbEzFYSARrMeKbCLPwwdczxyMmgNCijzjutpJ8TTq3X 9DCgiwOB13jHDs0Y4fk01bRkHX9IKh8bZoeh6qZYR/QYpXAkuqEVmW964D0oefNMbXhrqs GUQutoqO8nnxt6Em2k8TJE58HDfywUVLxF116sj+SvYbEiP8i9QRcsULD3t4PRoDcyL70F OXh3qD2mGlyDl/QK1ddIqb+2IkpeUtgKmmIR6awlc7e624mqzjOonqmG1TSM2d/lz589B5 Uh1sV7unP6qUY7+TSXnDPO5s1gInILQDPOdOgqNh+E1q8MEWUOLFbFCc8FxvdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zvm3A3OjrJdU/Y/pvY/jV3xHE46DekjvS5jQwIxFfx0=; b=TNme+6Xn3CXNFeB25x6VipBx0JgA7BNLsFuvWFRlPDhB+KspfnHmjl7UwjXdnSt4boSTZ8 twiWf8Ozztq7RmeMdBjgfHElDfWQPDQ7swnruAONFnj52R5WpwPZPGSplYO0JPCCX9H0gA sBSN2xKJKwYHPo6PuZm1b3yjHXX/l6hkiQVneiwKy+rRvvIDsxPNG9Bn0CwXkcNF6i5gf5 xT2SdAvft4Lk6xtDS/q1ANrsxG8BsQnNrdv/0s4AES9nakMAY0ez//YC2tpN/j54VPzspp cpcy44fqmKy1meu5Q8l92d0sm/NCyUag8jXQVuicvSfaZf2JazedNB04feqLzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFcX01Lf0zgJm; Tue, 1 Aug 2023 14:13: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 371ED3ZW031898; Tue, 1 Aug 2023 14:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371ED3FT031897; Tue, 1 Aug 2023 14:13:03 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:13:03 GMT Message-Id: <202308011413.371ED3FT031897@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: d0e4e53ebd64 - main - vm_map: Add a macro to fetch a map entry's split boundary index List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d0e4e53ebd6499d420c19426586eeeafec157150 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e4e53ebd6499d420c19426586eeeafec157150 commit d0e4e53ebd6499d420c19426586eeeafec157150 Author: Mark Johnston AuthorDate: 2023-05-09 14:07:15 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 14:10:02 +0000 vm_map: Add a macro to fetch a map entry's split boundary index The resulting code is a bit more concise. No functional change intended. Reviewed by: alc, dougm, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41249 --- sys/vm/vm_fault.c | 3 +-- sys/vm/vm_map.c | 13 ++++--------- sys/vm/vm_map.h | 4 +++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 8b4b8ebb7375..458772d976fc 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -539,8 +539,7 @@ vm_fault_populate(struct faultstate *fs) MPASS(pager_last < fs->first_object->size); vm_fault_restore_map_lock(fs); - bdry_idx = (fs->entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(fs->entry); if (fs->map->timestamp != fs->map_generation) { if (bdry_idx == 0) { vm_fault_populate_cleanup(fs->first_object, pager_first, diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index eb607d519247..8ab38ae2a087 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2449,8 +2449,7 @@ vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t startaddr) KASSERT(entry->end > startaddr && entry->start < startaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((startaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -2523,8 +2522,7 @@ vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t endaddr) KASSERT(entry->start < endaddr && entry->end > endaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((endaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -3516,8 +3514,7 @@ vm_map_wire_locked(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags) saved_start = entry->start; saved_end = entry->end; last_timestamp = map->timestamp; - bidx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) - >> MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bidx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); incr = pagesizes[bidx]; vm_map_busy(map); vm_map_unlock(map); @@ -3715,9 +3712,7 @@ vm_map_sync( vm_map_unlock_read(map); return (KERN_INVALID_ARGUMENT); } - bdry_idx = (entry->eflags & - MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0 && ((start & (pagesizes[bdry_idx] - 1)) != 0 || (end & (pagesizes[bdry_idx] - 1)) != 0)) { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index c4ed36ce57ba..b974f52e51ed 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -154,8 +154,10 @@ struct vm_map_entry { #define MAP_ENTRY_HEADER 0x00080000 #define MAP_ENTRY_SPLIT_BOUNDARY_MASK 0x00300000 - #define MAP_ENTRY_SPLIT_BOUNDARY_SHIFT 20 +#define MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry) \ + (((entry)->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> \ + MAP_ENTRY_SPLIT_BOUNDARY_SHIFT) #ifdef _KERNEL static __inline u_char From nobody Tue Aug 1 14:30:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFcwr6Mfxz4qDlq; Tue, 1 Aug 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFcwY3FCjz44s8; Tue, 1 Aug 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690900253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MU0nFMWaKHukNuVbKY6LyRy6/J8+1ClURHKq5sBI/9Q=; b=BKQjnjds6RIruH8cEI6cw4TdE+b7EI2zzdXc8YtxBqvcqWMUs5kBHpnEA6e0SSxJ76DH9D bZq/nP4h+7CYwyC0JENGm/bmYCFc/F3gSaXr+UY+eGX4PF7cWY7+BddM+Y2ygxwv8ug0Dz EpFgXr08DbZ9F8gdR1dbZIwHpivGO+tDDyKgp7x1TMAhpu5tsjn/Sfe+y20D3bR+xs8f/C chjCOIPoAAeXuNiVKmBVZoTbob354/d+/i2PvuScIJQzhICm6izqUZHtyaA2LGe6nuW/Cj ia77ceFkyp7mShsO8qvLcqdw8FCZdpUF9TqmWAd6geDWmEMx6hePDVo2Ah1Ktg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690900253; a=rsa-sha256; cv=none; b=ybimhK6pM3USr/Ipd2jYgoprkhw6cYvnohn1W1PhUhcKdtYP4eU+1tRyN3TZKHkhMzucG4 r04uqxkjGxAofM/c0y3Qt2/TEQLJHtSlGj7vEhagftYxqSRn8A5WNZx4TCFVrC99NBZau4 2IaQgEc5hEqek2E3mY55+Io5ybVlZFNdwor0bcVz2QfJbBIUSpYR2LdUd3+F7MOqPYnUYE /Wm8dOHXkRdZvGjC+O/9nYtZxoEtJ2gpZK6oqiYZTaUoEmwAMj54BEiMSiI1mwR39eyh2v ZBiYOJx+26Qgve6cF8sqAQCaHe27ZQ9d63PLcMrfZKm9aE5pnkfHJp/kVrjOew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690900253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MU0nFMWaKHukNuVbKY6LyRy6/J8+1ClURHKq5sBI/9Q=; b=cMdKjstHXNZNJysnO5IBR3X4lbWm+DokaX+WBNMwinUeiheGTJN6ZSZuOZefrdY96D9Am6 kTjbe/PlhYUmZDVcFPPEw8UrPW6/B1xaMsK6LzEm8ut35CGniA9L029HX+ve5K0wyY5Vl+ t+FE2PclO31yuUaxpCfa+CHdI1BgBsewGaH/mOQ0sFnB3N2ymZl7tdJjhPS4FNUJT0LiQ5 98Wws+Q4rETVBlAcOGNNfClhBbu15VTbf3PFOIX3GRHCOddHlzpLMntqLwiX5ns2Qi+q5o 8lX2jUmxc5YDF0JwkrNXHn2xlgBDPIddicqlDZTSi+0Om93GAltlpWFzsVpXZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFcwY1YWWzh2Q; Tue, 1 Aug 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371EUrfk058637; Tue, 1 Aug 2023 14:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371EUr54058636; Tue, 1 Aug 2023 14:30:53 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:30:53 GMT Message-Id: <202308011430.371EUr54058636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 258c6d5e9b98 - main - filemon(4): Better error checking in code example List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 258c6d5e9b98122e45c23122cccafee6ce2958b9 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=258c6d5e9b98122e45c23122cccafee6ce2958b9 commit 258c6d5e9b98122e45c23122cccafee6ce2958b9 Author: Pau Amma AuthorDate: 2023-08-01 14:24:44 +0000 Commit: Mitchell Horne CommitDate: 2023-08-01 14:30:38 +0000 filemon(4): Better error checking in code example Discussed with: dim Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38367 --- share/man/man4/filemon.4 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 index 9fb2fe10a2ec..b7e7f30133be 100644 --- a/share/man/man4/filemon.4 +++ b/share/man/man4/filemon.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 1, 2022 +.Dd August 1, 2023 .Dt FILEMON 4 .Os .Sh NAME @@ -193,12 +193,13 @@ no log entry for the system call. #include #include #include +#include #include static void open_filemon(void) { - pid_t child; + pid_t child, wait_rv; int fm_fd, fm_log; if ((fm_fd = open("/dev/filemon", O_RDWR | O_CLOEXEC)) == -1) @@ -215,8 +216,14 @@ open_filemon(void) if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1) err(1, "Cannot set filemon PID"); /* Do something here. */ - } else { - wait(&child); + } else if (child == -1) + err(1, "Cannot fork child"); + else { + while ((wait_rv = wait(&child)) == -1 && + errno == EINTR) + ; + if (wait_rv == -1) + err(1, "cannot wait for child"); close(fm_fd); } } From nobody Tue Aug 1 14:55: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 4RFdTP6jVCz4qFmw for ; Tue, 1 Aug 2023 14:55: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 4RFdTH5krtz46RF; Tue, 1 Aug 2023 14:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690901747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhxSy+zDGFaqgggDKneBNLfgtTk10KOgyDw58O4XCyY=; b=d0opmcN6lo9D/5WqqsNtvO0SfgJ6opcavO0kxrggVnx+AxhhM8chtnwSx9ooR7B/6sUmM6 BGw4JjHGe7/kWpQLLxLYCpqLbvIF3CQO119IfnWGuvQRWPP5rZUGjMIgB2hi2ubuwps9SI wdOU9eko8PMPcQc7n35difAp+xaS/qlp7gDmugHhkfxyqZYne49Srgfror7gsELH5xwKWY dsmPcZzT+tyeZPM1qeTyMkYv2A+BOJeX39yA/Ex9jlwHE3NDQr9FyCudAJ7/0DMCPi67N8 UEmOm8qtP00HDGxP8cFfImDcMonu45Q2iN6O4r1PZLF9JC9zxwod6HfzDu11KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690901747; a=rsa-sha256; cv=none; b=CaZ5uk1W4mTHHX+VTkiCdShT8wssXJLy2Oq5xEIe8ZoZAUm9/XxZHHgtQW1t0LEYd6BZ+5 1KEs+MgeFUtSoE2WNxQsN8wC0MktpcFNYyC/KTrRGa59pxuBpAyTEe+TqIxwUZ9nXJh4ly 3FyFCk0OvE9vmJhtATKXoMfd5cPbuVxc61S2C4e9wQhJnJMIIy/3Qa12sNjqM+FTtYHo34 RqCq3nIMCfEzLedoCCqqeIK3Bfpy7mz+DIXmsOXG8up1YuRLFHDN3WnLqxS9WEsDBb2xN7 xNLMaT+oT7KZJIGaP7Swt8WE8OVsAU/wK8p4XVQDdWlXgGCjttcF8igtb4yMXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690901747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhxSy+zDGFaqgggDKneBNLfgtTk10KOgyDw58O4XCyY=; b=h4Vam55FIImKuf5IdGd3q+2Am4kfZzdf97psQ2Qh6eWDg/VHYpxauAjx40ipd4hX0j2po3 aTFYkrdE7P7DHHSpT8c/DUY1CiTge3M0mOl4HROyW9LZTx3ibSnF3BABxB2uXvWJTwOjoc z6stpGqmnYqDJL+v4oyZyML6hHjFIW33AGhV9qMgmXhd2XnUG09oMHzMHIHC44MBqNGyb0 A2OpQYr3y3qh7sWYnVsvOqGYmEq/9qUl6NCwjFv+GITpiNvNSm3uMeJNFO1QPD4flgw4mq 98PRdx6Wgm/T4yY5BAFSnTqpYVf3MS6U4jqLNAbgp0MHAL80AnZrQpTjGt1ZXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFdTH3zhPzhnP; Tue, 1 Aug 2023 14:55: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 371Etkn0097649; Tue, 1 Aug 2023 14:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371EtkKu097648; Tue, 1 Aug 2023 14:55:46 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:55:46 GMT Message-Id: <202308011455.371EtkKu097648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: aa0d5b5863b5 - Create tag vendor/openssl/1.1.1v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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.1v X-Git-Reftype: annotated tag X-Git-Commit: aa0d5b5863b5f0de3528a057c8597bed024fc1c9 Auto-Submitted: auto-generated The annotated tag vendor/openssl/1.1.1v has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/1.1.1v tag vendor/openssl/1.1.1v Tagger: Jung-uk Kim TaggerDate: 2023-08-01 14:51:23 +0000 Tag OpenSSL 1.1.1v commit cc0d356166e39da7f956c39f874e6dee67fd5d60 Author: Jung-uk Kim AuthorDate: 2023-08-01 14:48:37 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-01 14:48:37 +0000 Import OpenSSL 1.1.1v From nobody Tue Aug 1 14:55: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 4RFdTk2z0pz4pW5c for ; Tue, 1 Aug 2023 14:55: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 4RFdTH64Bdz46JB; Tue, 1 Aug 2023 14:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690901747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utu/hHHQd23HFBkzvF3JuM28mC9WTeTtimGWNd1msHU=; b=WYetaSVv/5//MQK/jA+fwLyDLoVUz6LA3JXFOcTBQYrM8HqQck95b7y3ODG+F0wIv0lbs+ aVN+14ob+L/9nRGCZV9lbsIcBZhLCBnP5BHzF2Nl25yWOXXQW2GgwPXxln5alG/20uguxg pDl2rbTrC+gE6zZ/vo7OgmmFyNcf0DIlVsFhJTdWIyUPmlSZEsaT+XGTirOjPQ3TyvFc/Y kUfXHs8sUgGBZpjXQbErNxIkwetNtrdjeps4BbmLqoG920SzxxJf9YyhhUAaTyaWvF2Wqk NQhFXfReb7l3nqef6o05z9Cq/zSAm4kIpvWHv9+5PjZrZi1si5tt0JXu39ibnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690901747; a=rsa-sha256; cv=none; b=O50unztJwP+Iz2GDCytPyHawwCmaE1S+jnAJDqT1jZ6a8UbQEnQ3e22D+e5qYXRSAIKhxL wPFItdn3EbvWO/nklB1E5pQMdnYMxQshWZuLN6rJeMr9b/DJvrfc9zgBDnRd/639eYicou nF6mKMM5ssAug5oDX+tE4lZayWv2YotmW8k1h390YCe8ON5MaL+07pE9XYVeZk5S6nwV6s ib3xKDau6Q0FNs0sGKSJKL0LDf3xz6rbz3/WIe7gamn3mmzKFiY0H/7UPjyAQ8i9njfNGb xGKDJuWeFmNDUlWnnipY/vmLFsG0dxHfntjTpz+ylvw1Fp21AXG0UilgQ5cF4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690901747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utu/hHHQd23HFBkzvF3JuM28mC9WTeTtimGWNd1msHU=; b=hFeMMvJOt3q5pkz11hwd8Vjg9hqT/J5g42QFjQvIzSvCNCN5M/BvINBWKvlN65RdCUeRGJ QnvM2JAqkJ5SeAJLcD1jxJUV6Bt9j8N4gaEdE9qBSCQq1BtJaF78WyGwaBXZOef1+RfqS9 ks7AHFPSBRKbgmV7bSsylaAgFzvjaIDXxG82fJZZVR2j7qOn6JbENUskqDpGqnjj0KMI9T IBkE0wIaVZifNrbmdR2SNTaKszNv/ZVDbF4heS3vmrHLfHHKHJk4Go1aY5DC7McPnMeVuv 49yU0faFAMQw3/CQU6j7fa982gGLIk+1UeHftzbt+IVAfQepSHrmMVhVOzV1+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 4RFdTH3zjCzhnQ; Tue, 1 Aug 2023 14:55: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 371Etkwd097630; Tue, 1 Aug 2023 14:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371EtkiG097629; Tue, 1 Aug 2023 14:55:46 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:55:46 GMT Message-Id: <202308011455.371EtkiG097629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 8ecb489345f0..cc0d356166e3 - 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: cc0d356166e39da7f956c39f874e6dee67fd5d60 X-Git-Oldrev: 8ecb489345f08012fdc92a202a40119891cac330 X-Git-Newrev: cc0d356166e39da7f956c39f874e6dee67fd5d60 Auto-Submitted: auto-generated The branch vendor/openssl-1.1.1 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/log/?id=8ecb489345f0..cc0d356166e3 cc0d356166e3 Import OpenSSL 1.1.1v From nobody Tue Aug 1 15:20: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 4RFf2510Zxz4pXJY; Tue, 1 Aug 2023 15:20: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 4RFf1z0KfLz48vf; Tue, 1 Aug 2023 15:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690903239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4f2csXDV6i45/09AWR/OkalPtZ8ypsdYlslAoEDjG4=; b=CmpbY+5bajqhO3Nv7oLtokWCfseSzNOwAEjSeEU2jbyUPNeGOfRvBy5tq6ud1o+KO4TxWU eK4oL+kp5XN3sTkBn+kkrSOzx4ZWN7xIj7yo9uZRIPEr96RagBKY7RnXmcJU7loJ/d6DGP fB0DnR+M5IBgZ6gFrJBN8X+bRhg3x/ePJehi0buoMHomJQPDnIxr1VvvBDcts68zoJuKU3 seVOvgcIVSOF7TK2hzn0t4c11+wg8PqCzianBFXxNHH1dRm5at92muJgd9GKUUp4/iv162 UHCa8UiPJCvT+n6YIM7pQ1nfkNRPBfj0CIE94avcZg7onILzyco5Jmo3ME8fjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690903239; a=rsa-sha256; cv=none; b=uEPMqzmTd/xwjF4p9YRoySweRBXa+pER7QS8htYPMQCZuSzZOFODzGxCQUrn1WJcq66+Hk Kq9q5A7yapyZb0ftegtiOD5cqYTf5ud7LmuLx3p+b4Wl0iO0nYZxrC+P/U82zPvAh4l+j+ UtGZ01PHpXo3f+ZYnBzWsVTnZOTgLre648DZgMoVitOSzpFwMDN31hVUlbGoHbp0jwYh6Z zkKxWMid4VRPe/X7r2cWGMvi7jKam2qiEjixI7FdBDT3ZVGKhfk4+oR1WUFs2D4peUmQkU uEkgkbRTyswXUE9BDNo8kjLEL4AD6yPUd5mvw5HnkzWlGcARgsAn6B3RAH8z+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=1690903239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4f2csXDV6i45/09AWR/OkalPtZ8ypsdYlslAoEDjG4=; b=WkP+eMauL/zV0vZ9HXuAaeULAww3b8A1iIbjYvD8t/gJWCaAVM9CL8u0i0tKV59J8/ViGC XC5tNv17ttxpxBBEKwPGCElhpnJgVYfV7v4V6PTUbQJ7FcML3nD1DU6xe0YutiNgId9rGA /3lmztZPAKddHse4q8B/IYrXmMlZsOw0iUKy7OXJ1HngvLT0dkHFrH3C9WcVFUA8nNTCX8 aQ+apGnq92PTbqtt7M0snxkNUzc+38ngQaBgZzolA3k43X6wwOyHYpwfEn32Qz0QHGjDDO EHoLu6sBeVn0jz+y19F6QWalfsuSXayfI49qYB6UKkzJdB+Qb/ILNMRpEhoKgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFf1y6MLdzjCB; Tue, 1 Aug 2023 15:20: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 371FKcwQ040839; Tue, 1 Aug 2023 15:20:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371FKc2m040838; Tue, 1 Aug 2023 15:20:38 GMT (envelope-from git) Date: Tue, 1 Aug 2023 15:20:38 GMT Message-Id: <202308011520.371FKc2m040838@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: 391e1f23b301 - main - src.conf.5: regen after armv6 demotion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 391e1f23b301780a850a451715e064d46ac35f15 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=391e1f23b301780a850a451715e064d46ac35f15 commit 391e1f23b301780a850a451715e064d46ac35f15 Author: Ed Maste AuthorDate: 2023-08-01 15:19:37 +0000 Commit: Ed Maste CommitDate: 2023-08-01 15:20:15 +0000 src.conf.5: regen after armv6 demotion Fixes: 98d03dca9ac8 ("universe: Demote armv6 to an extra architecture.") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 69f0cc5feff9..7eb920e70c5c 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd July 27, 2023 +.Dd August 1, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -454,7 +454,7 @@ Do not build .Xr cxgbetool 8 .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. +arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_CXGBETOOL Build .Xr cxgbetool 8 @@ -630,7 +630,7 @@ and .Xr efivar 8 . .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7 and arm64/aarch64. +amd64/amd64, arm/armv7 and arm64/aarch64. .It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP Do not build ELF Tool Chain tools (addr2line, nm, size, strings and strip) @@ -656,7 +656,7 @@ Build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. +arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_FILE Do not build .Xr file 1 @@ -722,7 +722,7 @@ Do not build HTML docs. Do not build or install HyperV utilities. .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. +arm/armv7, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_HYPERV Build or install HyperV utilities. .Pp @@ -882,7 +882,7 @@ On 64-bit platforms, do not build 32-bit library set and a runtime linker. .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. +arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_LIB32 On 64-bit platforms, build the 32-bit library set and a .Nm ld-elf32.so.1 @@ -896,7 +896,7 @@ Do not build LLVM's lld linker. Do not build the LLDB debugger. .Pp This is a default setting on -arm/armv6, arm/armv7 and riscv/riscv64. +arm/armv7 and riscv/riscv64. .It Va WITH_LLDB Build the LLDB debugger. .Pp @@ -1011,12 +1011,12 @@ powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpc64le. Build GELI bootloader support. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. +amd64/amd64, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITHOUT_LOADER_KBOOT Do not build kboot, a linuxboot environment loader .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. +arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_LOADER_KBOOT Build kboot, a linuxboot environment loader .Pp @@ -1031,12 +1031,12 @@ powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpc64le. Build LUA bindings for the boot loader. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. +amd64/amd64, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITHOUT_LOADER_OFW Disable building of openfirmware bootloader components. .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. +amd64/amd64, arm/armv7, arm64/aarch64, i386/i386 and riscv/riscv64. .It Va WITH_LOADER_OFW Build openfirmware bootloader components. .Pp @@ -1051,7 +1051,7 @@ amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64le and riscv/riscv64. Build ubldr. .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc and powerpc/powerpc64. +arm/armv7, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_LOADER_VERBOSE Build with extra verbose debugging in the loader. May explode already nearly too large loader over the limit. @@ -1247,7 +1247,7 @@ Do not build .Xr mlx5tool 8 .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. +arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_MLX5TOOL Build .Xr mlx5tool 8 @@ -1322,7 +1322,7 @@ and related programs. Do not build nvme related tools and kernel modules. .Pp This is a default setting on -arm/armv6, arm/armv7, powerpc/powerpc and riscv/riscv64. +arm/armv7, powerpc/powerpc and riscv/riscv64. .It Va WITH_NVME Build nvme related tools and kernel modules. .Pp @@ -1334,7 +1334,7 @@ Do not build the InfiniBand software stack, including kernel modules and userspace libraries. .Pp This is a default setting on -arm/armv6 and arm/armv7. +arm/armv7. When set, it enforces these options: .Pp .Bl -item -compact @@ -1358,7 +1358,7 @@ Enable building LDAP support for kerberos using an openldap client from ports. Do not build LLVM's OpenMP runtime. .Pp This is a default setting on -arm/armv6, arm/armv7 and powerpc/powerpc. +arm/armv7 and powerpc/powerpc. .It Va WITH_OPENMP Build LLVM's OpenMP runtime. .Pp @@ -1407,7 +1407,7 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc and riscv/riscv64. +arm/armv7, i386/i386, powerpc/powerpc and riscv/riscv64. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp @@ -1444,7 +1444,7 @@ Do not build dynamically linked binaries as Position-Independent Executable (PIE). .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386 and powerpc/powerpc. +arm/armv7, i386/i386 and powerpc/powerpc. .It Va WITH_PIE Build dynamically linked binaries as Position-Independent Executable (PIE). From nobody Tue Aug 1 16:49: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 4RFh0Q0YFSz4pcNV; Tue, 1 Aug 2023 16:49: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 4RFh0J4n2Gz4JFG; Tue, 1 Aug 2023 16:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690908560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5nZcpQtnT1ht2lqHXxQNSKIKFGtmErs60DGvXMOAocw=; b=ZNsivOjZoR867OSsW+MR7WshGFJR8MYJFYGzppKD//SU7o30EeC0/Fmslc5vaCQNiu9WTr b7GUt0vX+0cTyBudFy/0E5W0rRaAoMG9bBU+GGslXSPTgEbbYe3mdWxv3USH07BgmgYDMN RY8+ukgupsjoLgaus4VUfCP2NiEV7+P3PYESFh9cDsQgWHjtQxMVJguBCCNMqQzQ2IAAi3 ZE24VGdqmILQrCrxVaQU4qXMA1rabZpBButM4uX7KvAJCvFXbVQYqHUcfpWg32K3vbALzv rs5CDkKnjsP+Sm9rp9YL5auA++L3r3wcAUFC6uu6OrbJt0yTLdbfM/M4ms4Xtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690908560; a=rsa-sha256; cv=none; b=WMt1QS2IRrJkZPYlfuHI6QNhxmKtreCSNcBh1IoYCF2rwrLy6FxP9dB8qrLddXgNDdK/4C zhoxAdJE/8Zm5mde8EOK7/t/gix+2uPchogZkRs5pGV0zViCFyOlkoAeqlQk7vE1M3C3Wq ou2pRvrWiQprLWyRhqa59LxPmM1O/PjM40QXLK958SsE/B83typ5+tG7+sjM3PNxNJOgHj zrD6HZ1jlR3Ez5t/8xhcWRfxGxGQGpG2QJm1xq2lnTEcqOdi21PzzzDqHa8a9tE7nTNCx9 8a9oU+zdeZqbr6/uPDiCa6+Fo0RXIyg4cnHpi/qh4kHao8cUvyRwZehDZSImug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690908560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5nZcpQtnT1ht2lqHXxQNSKIKFGtmErs60DGvXMOAocw=; b=cNGdQCrTC5y8s+BSrOok4zBBWPXXOkDiwtoC9agFV967q0fT8anwomCgcYsTcJENLGvA6U cAuyllGp2wh73+0k6+Dv+Jhh7r2qauoMdhGKizuFolDF1dswExSYXFv/SHgl/1Enh6K3zD sKQGbnjHozqv9pDKKCrhv3/Ez+89lgtcgGvu+as0s4ZKnZ4+9Ihl2dC1CJVI/X9hOQrQnu zeSD1tY9YkYGHZOM4kuZ0dkuDD601d/vwpGixbDaDTikzbnNODyoxArbUndFmXdWf6/ia4 fDOGuDTXjO4llLgwER+Ckx0qDFTxjmhBIBtjdE4FATNWmAP+BL1MuJpM8/ne7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFh0J3mJyzl5p; Tue, 1 Aug 2023 16:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371GnK5T080351; Tue, 1 Aug 2023 16:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371GnKhi080350; Tue, 1 Aug 2023 16:49:20 GMT (envelope-from git) Date: Tue, 1 Aug 2023 16:49:20 GMT Message-Id: <202308011649.371GnKhi080350@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: ad5cea201d5d - stable/13 - OpenSSL: Regen manual pages for OpenSSL 1.1.1v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ad5cea201d5dc5417fbae5bb8cb797729641a2c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5cea201d5dc5417fbae5bb8cb797729641a2c8 commit ad5cea201d5dc5417fbae5bb8cb797729641a2c8 Author: Jung-uk Kim AuthorDate: 2023-08-01 16:48:23 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-01 16:48:23 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1v --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- secure/lib/libcrypto/man/man7/Ed25519.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/SM2.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/scrypt.7 | 2 +- secure/lib/libcrypto/man/man7/ssl.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/asn1parse.1 | 2 +- secure/usr.bin/openssl/man/ca.1 | 2 +- secure/usr.bin/openssl/man/ciphers.1 | 2 +- secure/usr.bin/openssl/man/cms.1 | 2 +- secure/usr.bin/openssl/man/crl.1 | 2 +- secure/usr.bin/openssl/man/crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/dgst.1 | 2 +- secure/usr.bin/openssl/man/dhparam.1 | 2 +- secure/usr.bin/openssl/man/dsa.1 | 2 +- secure/usr.bin/openssl/man/dsaparam.1 | 2 +- secure/usr.bin/openssl/man/ec.1 | 2 +- secure/usr.bin/openssl/man/ecparam.1 | 2 +- secure/usr.bin/openssl/man/enc.1 | 2 +- secure/usr.bin/openssl/man/engine.1 | 2 +- secure/usr.bin/openssl/man/errstr.1 | 2 +- secure/usr.bin/openssl/man/gendsa.1 | 2 +- secure/usr.bin/openssl/man/genpkey.1 | 2 +- secure/usr.bin/openssl/man/genrsa.1 | 2 +- secure/usr.bin/openssl/man/list.1 | 2 +- secure/usr.bin/openssl/man/nseq.1 | 2 +- secure/usr.bin/openssl/man/ocsp.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/passwd.1 | 2 +- secure/usr.bin/openssl/man/pkcs12.1 | 2 +- secure/usr.bin/openssl/man/pkcs7.1 | 2 +- secure/usr.bin/openssl/man/pkcs8.1 | 2 +- secure/usr.bin/openssl/man/pkey.1 | 2 +- secure/usr.bin/openssl/man/pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/prime.1 | 2 +- secure/usr.bin/openssl/man/rand.1 | 2 +- secure/usr.bin/openssl/man/req.1 | 2 +- secure/usr.bin/openssl/man/rsa.1 | 2 +- secure/usr.bin/openssl/man/rsautl.1 | 2 +- secure/usr.bin/openssl/man/s_client.1 | 2 +- secure/usr.bin/openssl/man/s_server.1 | 2 +- secure/usr.bin/openssl/man/s_time.1 | 2 +- secure/usr.bin/openssl/man/sess_id.1 | 2 +- secure/usr.bin/openssl/man/smime.1 | 2 +- secure/usr.bin/openssl/man/speed.1 | 2 +- secure/usr.bin/openssl/man/spkac.1 | 2 +- secure/usr.bin/openssl/man/srp.1 | 2 +- secure/usr.bin/openssl/man/storeutl.1 | 2 +- secure/usr.bin/openssl/man/ts.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- secure/usr.bin/openssl/man/verify.1 | 2 +- secure/usr.bin/openssl/man/version.1 | 2 +- secure/usr.bin/openssl/man/x509.1 | 2 +- 535 files changed, 536 insertions(+), 536 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 03e8fd2b118d..312f410f73da 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.1u -OPENSSL_DATE= 2023-05-30 +OPENSSL_VER= 1.1.1v +OPENSSL_DATE= 2023-08-01 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 a9e7033ea78b..385b65a1f57a 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "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 1c937e84532a..3e7cfc2223f7 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "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 fbee87f11652..056eb016fe06 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "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 587551817383..9ad6dae7622d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "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 4beeac1e8659..631ac1c07009 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "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 365e3ca2b137..157b2389eb33 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "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 2f92aad6878d..38d8efcd109b 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "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 9b6785e0fb0f..fa6d233333c6 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "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 12ac4d303b97..32f0f90b4422 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "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 f99049a86da1..6354f8053f24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "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 f3ffef140959..9d091a577ae0 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "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 5b40bc64dcaf..707354c38646 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "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 b96ac2792a04..94286577dceb 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "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 b108992b96e9..6979284edb61 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "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 f26c50053b87..1680ec8ddedd 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "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 ed925f3b92b0..d9ef260a9541 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "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 18be78af930a..ec4eda157305 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "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 7a9ce293565a..6a04ce5db063 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "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 ef32b8ab15ae..8e85ff854025 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "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 1715638ded6a..caecb053ed94 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "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 4a0d7066effa..775a375f5bf9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "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 3d178b1e6339..7778f5a4cf49 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "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 31e95b11c712..799e399146e9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_NULL 3" -.TH BIO_F_NULL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_NULL 3 "2023-08-01" "1.1.1v" "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_ssl.3 b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 index 8dabf1b4cda7..6764628281b6 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_SSL 3" -.TH BIO_F_SSL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_SSL 3 "2023-08-01" "1.1.1v" "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_find_type.3 b/secure/lib/libcrypto/man/man3/BIO_find_type.3 index bfd069a4727b..3a599024f9dc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_find_type.3 +++ b/secure/lib/libcrypto/man/man3/BIO_find_type.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_FIND_TYPE 3" -.TH BIO_FIND_TYPE 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_FIND_TYPE 3 "2023-08-01" "1.1.1v" "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_get_data.3 b/secure/lib/libcrypto/man/man3/BIO_get_data.3 index c5d571487d72..97480d58a53e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_data.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_data.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_DATA 3" -.TH BIO_GET_DATA 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_GET_DATA 3 "2023-08-01" "1.1.1v" "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_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 index 6af7a0480915..700f47303fcd 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_EX_NEW_INDEX 3" -.TH BIO_GET_EX_NEW_INDEX 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_GET_EX_NEW_INDEX 3 "2023-08-01" "1.1.1v" "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_meth_new.3 b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 index 81ef93926bf9..b336bd4828b2 100644 --- a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_METH_NEW 3" -.TH BIO_METH_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_METH_NEW 3 "2023-08-01" "1.1.1v" "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_new.3 b/secure/lib/libcrypto/man/man3/BIO_new.3 index d4cbf05176e0..3bfaca2f0327 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW 3" -.TH BIO_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_NEW 3 "2023-08-01" "1.1.1v" "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_new_CMS.3 b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 index 0dfc6cdd9fa0..ffa6b6995074 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW_CMS 3" -.TH BIO_NEW_CMS 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_NEW_CMS 3 "2023-08-01" "1.1.1v" "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_parse_hostserv.3 b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 index 75ff669669f7..6e2ab1308cab 100644 --- a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 +++ b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PARSE_HOSTSERV 3" -.TH BIO_PARSE_HOSTSERV 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_PARSE_HOSTSERV 3 "2023-08-01" "1.1.1v" "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_printf.3 b/secure/lib/libcrypto/man/man3/BIO_printf.3 index 2aa5541f86be..a218876b94ef 100644 --- a/secure/lib/libcrypto/man/man3/BIO_printf.3 +++ b/secure/lib/libcrypto/man/man3/BIO_printf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PRINTF 3" -.TH BIO_PRINTF 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_PRINTF 3 "2023-08-01" "1.1.1v" "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_push.3 b/secure/lib/libcrypto/man/man3/BIO_push.3 index c4d41b999494..dddc57e83a1c 100644 --- a/secure/lib/libcrypto/man/man3/BIO_push.3 +++ b/secure/lib/libcrypto/man/man3/BIO_push.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" *** 6519 LINES SKIPPED *** From nobody Tue Aug 1 16:49: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 4RFh0Q05lKz4pc2B; Tue, 1 Aug 2023 16:49: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 4RFh0H4LxPz4JSj; Tue, 1 Aug 2023 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690908559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N5y4RF5tBBLOK8BBLVjVakpUasXT5mHJIQmlci44UDo=; b=wQwfWJYGA4Z32PeBA4hTyR8y/a2DGLnmai+bwO3i8pmcIz7vRuse4TeOs98gkzHvRk397V M/l8FJpq6ZfGwbP3QOs6ys3dy4NrH6wtTU40e1nADM6qPDVR3tI5pCoSfw+rk5S82qru3K oKwPdxyrEw2QT7vK0BUDV2WE6qRtH9D+d0gumTd5Chv12io29y0GI3LlslgF0/N8KxafK4 8mK+/TRRKgtmSxusUwYkiJEo7XQgH6sm7x861omY+DX1ysPBWLQ2YgETl3CMgFlVsjsTwR FYjAVqBwCbDy2FDIbb0/g9yCs51ScYdCYuz34UivWh6jqPKOBiI+FJv6hrFIuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690908559; a=rsa-sha256; cv=none; b=ANXPVzcTXP3GQ3dhk9bsBrk7JVTNl0WVxufw4k4c3kw0SS6keYE7o8lUfKQ84NQnxG1rzo jQVzkvaWAB5SzQ8/2bcBZiBAVd5ctsd84PPHR5GiFzgYKDtWlnmRuKby5XheWucncnpWZt WhWNBYVW+q/A86W5I3esSNG3qeP6Yf+Y+JoZEGcGz8AR1sBMffsP49gNyfQGA4huD6hQlk Zp9fAKGpkUjKv+6zD8NU8niopftdDFX3clwTp3NvCQ75G1eahb4I2+AdCC+LyrsVbR/hXR qBDaQHpHCWxNTD3/b7eb4/hJB5xc/5kleFYGoMQdsfUtgYlXtZtQDvVJYjg/ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690908559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N5y4RF5tBBLOK8BBLVjVakpUasXT5mHJIQmlci44UDo=; b=Le8eqp/aYoZzZNDd6jTFP/IiBrZ4rqjveEJ0gLYYnMHn7Z3+R27TzsF+HpMy4ypym4Afoo vu7qnMIPrxQNmDp2/GF/gOm4jLYNrE+N3xbrGs6DnIyJgdn5z91mkG4bWDFv+2iEHL/eVU Y3Cv/eLrI6WWSn5xE9xcq8R9A6hJyYW81nqkek0hPcs/dKk7IWl6nOEfZGqwWtgsAvdVkq bt/qnTpO1V5Fbg07Ac0kwAoKbNYPYdrTmNVyiOTycOMGNRqWa32OHGYEQ1jbWiwGEbXo5c 7iIx5SqidFJ15YclmjYae6ycGqXvUANenDUSDdDdwVqSFwOJfLnyNIIC8U/AEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFh0H2nHrzl5n; Tue, 1 Aug 2023 16:49: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 371GnJbg080332; Tue, 1 Aug 2023 16:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371GnJGk080331; Tue, 1 Aug 2023 16:49:19 GMT (envelope-from git) Date: Tue, 1 Aug 2023 16:49:19 GMT Message-Id: <202308011649.371GnJGk080331@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: 53a7dcac66f0 - stable/13 - OpenSSL: Import OpenSSL 1.1.1v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 53a7dcac66f07bfc4b6da258e8a827aae44d6a74 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=53a7dcac66f07bfc4b6da258e8a827aae44d6a74 commit 53a7dcac66f07bfc4b6da258e8a827aae44d6a74 Author: Jung-uk Kim AuthorDate: 2023-08-01 14:48:37 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-01 16:16:57 +0000 OpenSSL: Import OpenSSL 1.1.1v (cherry picked from commit cc0d356166e39da7f956c39f874e6dee67fd5d60) --- crypto/openssl/CHANGES | 35 +++++++++++++++++++++++++++++++ crypto/openssl/NEWS | 5 +++++ crypto/openssl/README | 2 +- crypto/openssl/crypto/dh/dh_check.c | 20 +++++++++++++++--- crypto/openssl/crypto/dh/dh_err.c | 3 ++- crypto/openssl/crypto/err/openssl.txt | 3 ++- crypto/openssl/include/openssl/dh.h | 5 ++++- crypto/openssl/include/openssl/dherr.h | 3 ++- crypto/openssl/include/openssl/opensslv.h | 4 ++-- 9 files changed, 70 insertions(+), 10 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 500b0f653e6a..612aaf56f6e6 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,41 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] + + *) Fix excessive time spent checking DH q parameter value. + + The function DH_check() performs various checks on DH parameters. After + fixing CVE-2023-3446 it was discovered that a large q parameter value can + also trigger an overly long computation during some of these checks. + A correct q value, if present, cannot be larger than the modulus p + parameter, thus it is unnecessary to perform these checks if q is larger + than p. + + If DH_check() is called with such q parameter value, + DH_CHECK_INVALID_Q_VALUE return flag is set and the computationally + intensive checks are skipped. + + (CVE-2023-3817) + [Tomáš Mráz] + + *) Fix DH_check() excessive time with over sized modulus + + The function DH_check() performs various checks on DH parameters. One of + those checks confirms that the modulus ("p" parameter) is not too large. + Trying to use a very large modulus is slow and OpenSSL will not normally use + a modulus which is over 10,000 bits in length. + + However the DH_check() function checks numerous aspects of the key or + parameters that have been supplied. Some of those checks use the supplied + modulus value even if it has already been found to be too large. + + A new limit has been added to DH_check of 32,768 bits. Supplying a + key/parameters with a modulus over this size will simply cause DH_check() + to fail. + (CVE-2023-3446) + [Matt Caswell] + Changes between 1.1.1t and 1.1.1u [30 May 2023] *) Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index f5a2d5ad33f8..c71c02911db0 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.1u and OpenSSL 1.1.1v [1 Aug 2023] + + o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) + o Fix DH_check() excessive time with over sized modulus (CVE-2023-3446) + Major changes between OpenSSL 1.1.1t and OpenSSL 1.1.1u [30 May 2023] o Mitigate for very slow `OBJ_obj2txt()` performance with gigantic diff --git a/crypto/openssl/README b/crypto/openssl/README index b9bf50f4b1e5..dbe6bf756e94 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1u 30 May 2023 + OpenSSL 1.1.1v 1 Aug 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index 4ac169e75c23..ae1b03bc92d9 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -97,10 +97,17 @@ int DH_check_ex(const DH *dh) int DH_check(const DH *dh, int *ret) { - int ok = 0, r; + int ok = 0, r, q_good = 0; BN_CTX *ctx = NULL; BIGNUM *t1 = NULL, *t2 = NULL; + /* Don't do any checks at all with an excessively large modulus */ + if (BN_num_bits(dh->p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) { + DHerr(DH_F_DH_CHECK, DH_R_MODULUS_TOO_LARGE); + *ret = DH_CHECK_P_NOT_PRIME; + return 0; + } + if (!DH_check_params(dh, ret)) return 0; @@ -113,7 +120,14 @@ int DH_check(const DH *dh, int *ret) if (t2 == NULL) goto err; - if (dh->q) { + if (dh->q != NULL) { + if (BN_ucmp(dh->p, dh->q) > 0) + q_good = 1; + else + *ret |= DH_CHECK_INVALID_Q_VALUE; + } + + if (q_good) { if (BN_cmp(dh->g, BN_value_one()) <= 0) *ret |= DH_NOT_SUITABLE_GENERATOR; else if (BN_cmp(dh->g, dh->p) >= 0) diff --git a/crypto/openssl/crypto/dh/dh_err.c b/crypto/openssl/crypto/dh/dh_err.c index 7285587b4ade..92800d3fcc6b 100644 --- a/crypto/openssl/crypto/dh/dh_err.c +++ b/crypto/openssl/crypto/dh/dh_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -18,6 +18,7 @@ static const ERR_STRING_DATA DH_str_functs[] = { {ERR_PACK(ERR_LIB_DH, DH_F_DHPARAMS_PRINT_FP, 0), "DHparams_print_fp"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS, 0), "dh_builtin_genparams"}, + {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK, 0), "DH_check"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_EX, 0), "DH_check_ex"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_PARAMS_EX, 0), "DH_check_params_ex"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_PUB_KEY_EX, 0), "DH_check_pub_key_ex"}, diff --git a/crypto/openssl/crypto/err/openssl.txt b/crypto/openssl/crypto/err/openssl.txt index 8db8b00301aa..2af593afa19d 100644 --- a/crypto/openssl/crypto/err/openssl.txt +++ b/crypto/openssl/crypto/err/openssl.txt @@ -1,4 +1,4 @@ -# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1999-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 @@ -401,6 +401,7 @@ CT_F_SCT_SET_VERSION:104:SCT_set_version DH_F_COMPUTE_KEY:102:compute_key DH_F_DHPARAMS_PRINT_FP:101:DHparams_print_fp DH_F_DH_BUILTIN_GENPARAMS:106:dh_builtin_genparams +DH_F_DH_CHECK:126:DH_check DH_F_DH_CHECK_EX:121:DH_check_ex DH_F_DH_CHECK_PARAMS_EX:122:DH_check_params_ex DH_F_DH_CHECK_PUB_KEY_EX:123:DH_check_pub_key_ex diff --git a/crypto/openssl/include/openssl/dh.h b/crypto/openssl/include/openssl/dh.h index 3527540cdddb..6c6ff3636ae7 100644 --- a/crypto/openssl/include/openssl/dh.h +++ b/crypto/openssl/include/openssl/dh.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -29,6 +29,9 @@ extern "C" { # ifndef OPENSSL_DH_MAX_MODULUS_BITS # define OPENSSL_DH_MAX_MODULUS_BITS 10000 # endif +# ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS +# define OPENSSL_DH_CHECK_MAX_MODULUS_BITS 32768 +# endif # define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024 diff --git a/crypto/openssl/include/openssl/dherr.h b/crypto/openssl/include/openssl/dherr.h index 916b3bed0b59..528c81985633 100644 --- a/crypto/openssl/include/openssl/dherr.h +++ b/crypto/openssl/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -30,6 +30,7 @@ int ERR_load_DH_strings(void); # define DH_F_COMPUTE_KEY 102 # define DH_F_DHPARAMS_PRINT_FP 101 # define DH_F_DH_BUILTIN_GENPARAMS 106 +# define DH_F_DH_CHECK 126 # define DH_F_DH_CHECK_EX 121 # define DH_F_DH_CHECK_PARAMS_EX 122 # define DH_F_DH_CHECK_PUB_KEY_EX 123 diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 027de5fa9490..c1063dc589e4 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 0x1010115fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1u-freebsd 30 May 2023" +# define OPENSSL_VERSION_NUMBER 0x1010116fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) From nobody Tue Aug 1 17:03: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 4RFhJh5XlQz4pdGJ; Tue, 1 Aug 2023 17:03: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 4RFhJg6bZ2z4KKL; Tue, 1 Aug 2023 17:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690909412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAK19CWoUeVdeMa0GcF9qiuzV+XLCMNmcaE5dbmN/VI=; b=I2yLymxL8MMM4AId3AgI7BMOCGU0XRZFGPjFKp8LJv8e3pu6OdmV9R45rIcewWBDIK+Sii 0/IoVpKb/76HwxpiXbh6cJygDtzbBIa5YP+VXM9pglhLj4hEToXlCrFUPeKt0u0lRu8WBv SrJsks6gdKIgJI0XEWyYwNZmUn5NKKCXuusMfuK4qAlahyLT4xKrNGfk8vw8o4UNKV0MIz 4EoYYLEkuGzps0tPevXr7/oxdm7wYx1sCmrLZ2agGreLdssy89nsFaZ+a6jt6EnyDX8Kf6 TdkiBRF9vdA0xiFthIyu6qzc2zaIIVbf1zgnfCeSGUdKFLCTzhIHQL6o0Si6RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690909412; a=rsa-sha256; cv=none; b=XUw1V1Z7z8S8Z7avcAS0Y1QGHMhVOEy2fLmjUHKVVAAneN9ZSLWc6WR1cwBmh4hx3w4oI7 W0bbu/V+JjRZio9nFzFPIYJ2U3iqmhcY9SDWT1pWlYRRFoCRdPYJeSbAr18tAPlpPkZSIm SgcfHFj7FNLUVslMDMpR9SfHB3Fhz6h48qyLZiENjrHG7kl0wioC+3yftXaakG5nF5IvpM 2ptikTbrcO/Couf4wNhRXADGQ9LJtsA53Ozdi4F26y+E4lz2Y3h5GdQrce6tdk2bDfKtac eY/SNnqhKP2B5L4PZ8o/iRMgYKA1pVNGAQOkcOFqG3yVUJ4v/iMAQ7NkJ+2HCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690909412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAK19CWoUeVdeMa0GcF9qiuzV+XLCMNmcaE5dbmN/VI=; b=U2YasmwKZL9BuN7tJyOeZN4JBW3ANqQNPPRwTlcR9jWpeZ2l34TQ/pf/AdFFSlhdkUvONh f6AutqNxE60DKL8xb0ZQ1d9Rk0NZefavVdeawtcovr6E4cIJ2/2C8aDmeycA9cOU+Be/iR MG05aIvfZmBYJ77fEbnVJObBCAZH9Hkdw82tBktxyPrBVVv+WJX6L6hgBdcTSTmZvfUx55 NgdWD4RUUBWdvQ60pV3/rin8E7Sk/k668rH35hOaJoFwvcULSlUCpGY0LY6af6w8aEKfGo uxX4nWN/PD7jrCGJcuBJ3JldHTnb+5Yko2yL51He3K/+4sdofWruQ1ZJqABaIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhJg3ZxGzlZB; Tue, 1 Aug 2023 17:03: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 371H3VVQ012824; Tue, 1 Aug 2023 17:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371H3V7a012823; Tue, 1 Aug 2023 17:03:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:03:31 GMT Message-Id: <202308011703.371H3V7a012823@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: 5cdaac92e119 - main - dtrace: Revert the addition of WITH_DTRACE_ASAN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5cdaac92e119d41063d4f0155a78a4abe767f15e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaac92e119d41063d4f0155a78a4abe767f15e commit 5cdaac92e119d41063d4f0155a78a4abe767f15e Author: Mark Johnston AuthorDate: 2023-08-01 17:01:37 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 17:03:10 +0000 dtrace: Revert the addition of WITH_DTRACE_ASAN The follow-up fix triggers a lib32 build failure, revert everything until the problem is addressed. --- cddl/lib/libdtrace/Makefile | 11 ----------- cddl/usr.sbin/dtrace/Makefile | 5 ----- cddl/usr.sbin/lockstat/Makefile | 7 ------- cddl/usr.sbin/plockstat/Makefile | 7 ------- share/man/man5/src.conf.5 | 5 ----- share/mk/src.opts.mk | 1 - tools/build/options/WITH_DTRACE_ASAN | 4 ---- 7 files changed, 40 deletions(-) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index d6771aee37b6..23cc8d2db574 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,16 +1,10 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common PACKAGE= dtrace LIB= dtrace - -SHLIBDIR= /lib -SHLIB_MAJOR= 2 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -144,11 +138,6 @@ DSRCS+= regs_aarch64.d YFLAGS+=-d -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= ctf elf proc pthread rtld_db CLEANFILES= dt_errtags.c dt_names.c diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index fcc0668f1b1d..d8510e62fb29 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -30,11 +30,6 @@ CFLAGS+= -DHAVE_ISSETUGID #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= dtrace ctf elf proc spl .if ${MK_DTRACE_TESTS} != "no" diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index 72cedbdb20ed..a4bec42df367 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat PACKAGE= dtrace @@ -28,11 +26,6 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 41ef446c111b..22610870c846 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat PACKAGE= dtrace @@ -28,11 +26,6 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= dtrace proc .include diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 7eb920e70c5c..4554735207c8 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -594,11 +594,6 @@ When set, it enforces these options: .It .Va WITHOUT_CTF .El -.It Va WITH_DTRACE_ASAN -Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) -with address and undefined behavior sanitizers. -Requires that Clang be used as the base system compiler -and that the runtime support library is available. .It Va WITH_DTRACE_TESTS Build and install the DTrace test suite in .Pa /usr/tests/cddl/usr.sbin/dtrace . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index a799c1614fff..899d620fb0c1 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -201,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \ CLANG_FORMAT \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ - DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ diff --git a/tools/build/options/WITH_DTRACE_ASAN b/tools/build/options/WITH_DTRACE_ASAN deleted file mode 100644 index 4240aee4b89b..000000000000 --- a/tools/build/options/WITH_DTRACE_ASAN +++ /dev/null @@ -1,4 +0,0 @@ -Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) -with address and undefined behavior sanitizers. -Requires that Clang be used as the base system compiler -and that the runtime support library is available. From nobody Tue Aug 1 17:26: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 4RFhqV3dVSz4pf8Q; Tue, 1 Aug 2023 17:26: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 4RFhpq4NWfz4RZn; Tue, 1 Aug 2023 17:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cbMaQcenrY+MqM94/kG72bBiDHnx9wYlayFBqJhETk=; b=llllUvnd0sAC2tczUwuUiix65mAK3tdCyWoHs4J8HNYm7iSZs5TPPP5UAhF4c5zFJtlpvM emNoVqDovYiloCoRb3xzkF/QOAWbas2YbuAYSjLlX+4ov12zW733FXhpE9aly4o4mLzzgt SYl846vj2cfpD8Q/TVZ0EoDtz1EtZ8frHU8mKPeyiz0R8izHdclSs/FRCfnLILyyTb1qwZ yFiklrJTFcfjmxe0eAm0IfX3OIXQn2wCCQhL8laO4TVJN+sU8dU4YRLH4ymZvfBCsJMO0b uVZl9v1FgCcM7Jl0eoqAm1HcR8EwoN9wEBdqqKohkYQOsf9MOzzOx8PCuQngIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910772; a=rsa-sha256; cv=none; b=k9kDZJ+KqdfzO3FX/VqH96XoF7dCfJ8TCiO/p2pH1ICtcrNfczdMheDvIzPduoC2FgFaRv 3auLXH8qnTg5UpGlxgIPmNH0efMd2nDFxKNvkTjIlRbB+QLJDuZUeghDvSpw5LoKz6DRiA ee5XMpIURF8goj8s5MxBhW1ULMqOOo9Rlnb6HBaP9qE2BcO5urGt9IIoDEZpkigfDQoHR5 k2y3p92Q0yRm6A0vYPpeds2YjQv+NggtzaOTLXKbgfa670axTLc+lc3wltX56m+lMlMPX+ 6kbFpmY+b/yOwwh/lNa2/q2z6l2REjDD3ENCJK+o+HHq/vX7FcnOtIOtjana7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cbMaQcenrY+MqM94/kG72bBiDHnx9wYlayFBqJhETk=; b=MCCB3v1VhrLCICtN9j5UmuuoBmfehqw7B54ygqQ0vRASGWDnav5i/Qd7sVOm0SEmcCC7Jv uu0dAzXzrxt+Qy0hFtRyR2Ihw43Bt8r8hGaA5sMtnRoTYciBlEqHkYCoF5G3LXiQgyRblx X8VWtKRXyyUVwC3RZUfjwIK8pMD6dsMc71zNFbtGEf4W29ne231WB+2LBHb7jv7D+RJqWB bVMLu0UCABBICI7PzDQLxi+EZ1WnvP/TDkbL3es7IqFqXE64RsrsvB3E/zKjOb0ecSb4pU ZGhVmCRHKdIFYDAv+7+TrDtkVwaSDCMO0ufFwVWtrXldtFSAphSV9Saj3rWiGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhpq2frYzlss; Tue, 1 Aug 2023 17:26: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 371HQ96x046387; Tue, 1 Aug 2023 17:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HQ9m6046386; Tue, 1 Aug 2023 17:26:09 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:26:09 GMT Message-Id: <202308011726.371HQ9m6046386@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: 89c762c815da - main - inet.3: remove mention of VAX endianness List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 89c762c815dae64a39221956070af549b11ceb80 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=89c762c815dae64a39221956070af549b11ceb80 commit 89c762c815dae64a39221956070af549b11ceb80 Author: Ed Maste AuthorDate: 2023-08-01 17:20:12 +0000 Commit: Ed Maste CommitDate: 2023-08-01 17:23:42 +0000 inet.3: remove mention of VAX endianness Machine endianness is not very important in understanding the inet* functions; the endianness of the VAX is especially so. PR: 272728 Sponsored by: The FreeBSD Foundation --- lib/libc/net/inet.3 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3 index cb44394d0a0c..7a5d888a4951 100644 --- a/lib/libc/net/inet.3 +++ b/lib/libc/net/inet.3 @@ -191,17 +191,6 @@ a When four parts are specified, each is interpreted as a byte of data and assigned, from left to right, to the four bytes of an Internet address. -Note -that when an Internet address is viewed as a 32-bit -integer quantity on the -.Tn VAX -the bytes referred to -above appear as -.Dq Li d.c.b.a . -That is, -.Tn VAX -bytes are -ordered from right to left. .Pp When a three part address is specified, the last part is interpreted as a 16-bit quantity and placed From nobody Tue Aug 1 17:29: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 4RFhtS4J56z4pfBB; Tue, 1 Aug 2023 17:29: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 4RFhtF4jdMz4RlD; Tue, 1 Aug 2023 17:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3V//YNBWGuPYd5fdN3Sl1HTRuTdkH3C7WMYMV2E9bs=; b=ZvG5ISop6yMqs3/bsO0y5sO43EnI8B24FGOdjbhWT4yRkeX0gCEmAnHXGdotMeCI7vFLmB MN5enPGwd0rrCXcAfBsL+qhUKDL5mzibtHHdQ+1Mimf5vaZgiVakoklkLC6Lmw9+pmGyJk 3gZ9rln7HU8o5pvw/AHXCL2l5UI/wm5qE45kAQI/8L/Kesd7cn3tfBeTkz6hcA5v/nffoe in4U4qW0+WeehSCK2aOSwLupovcHkWRReBAcxhKdb5NNvQNgAlacTP0RXRWZ5odKkK0bnS CY9zMzxDFIH7IUUJYa1a06NcPDYkwaeYpES+n8GY1pgPsZXaCT3v3NFLhL8EWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910950; a=rsa-sha256; cv=none; b=k/sZyYRJ3sKlIDKmvdLWEbbbPPrTzSB2fw+79QQyEhsm2mYydrIuq3oaFVfE0FhpkgKzna n4ZFWHEo5gZyuruYiN8RiwRalTkHvCZzXB97v2ffxHAxctR6fdzAA+Xzw4jeNSbEEaY9nv Pv7gfb2HZKmmu4ylMy+o6XjsZx/64JpYgf+OloJCoBR6q2BgLLb5o1D9HdruRtG0ZIg/nF OYSJG8IYLPW/hBY+8jbirb34tFOrNBhN4FQ2HKUd8kHgDDuVR2Zd4ItJWk9dtsgynYIAx1 hreVNkJCtETRBGgKamKArJwIY1JJ9MYfILe2A0obIZvniU8iahJnHIkRa6keRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3V//YNBWGuPYd5fdN3Sl1HTRuTdkH3C7WMYMV2E9bs=; b=lxqEpj0DKUIspqGGGzYz8OFNG6SiExu3zOVSSvFWo2v/v2Ra1jxlmDiYSIvPC/niLi9xdK QWFq3LorN+oj1QeWQbB67GjEgKNJU4EpoLcnApxq4b/n+kG70kMQMmUgxXgwSlSOYXtH0E 2ogs1lEU7OIOsBbGowYuvrDpITrsYxA6J7D35ENJbFAcIa6KdPUFa+2OsxVhtX3OxlmnTW RBUeB7aJwN0PN+Q5W7sqx8sXhHWeEXvy6PlyJCqJGO1CR/PFQU28crTJaHHdftos55AGmn Tq4BPGQQ5W//abPWsj4GI1eBFSnS8ORwOdkRz+8zVakeBuA3+w3aw8t1q9qQag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhtF2VD8zm9D; Tue, 1 Aug 2023 17:29: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 371HT9JI046892; Tue, 1 Aug 2023 17:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HT9vL046891; Tue, 1 Aug 2023 17:29:09 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:29:09 GMT Message-Id: <202308011729.371HT9vL046891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 837f6ecd88ee - main - dtrace: remove illumos code from dt_proc.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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 837f6ecd88ee6c4285c088f4f0ddbf637889a130 Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=837f6ecd88ee6c4285c088f4f0ddbf637889a130 commit 837f6ecd88ee6c4285c088f4f0ddbf637889a130 Author: Eric van Gyzen AuthorDate: 2023-07-25 16:58:47 +0000 Commit: Eric van Gyzen CommitDate: 2023-08-01 17:28:50 +0000 dtrace: remove illumos code from dt_proc.c The illumos #ifdef's in this file make it harder to read and maintain. There is little change upstream, and increasing changes for FreeBSD. Remove the illumos code with `unifdef`. The only manual changes here are the #includes and #defines at the top, and removing blank lines. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41173 --- .../opensolaris/lib/libdtrace/common/dt_proc.c | 150 +-------------------- 1 file changed, 2 insertions(+), 148 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c index 02b63c0a788a..40b1f4108d1a 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c @@ -80,10 +80,8 @@ * up using this condition and will then call the client handler as necessary. */ +#include #include -#ifdef illumos -#include -#endif #include #include #include @@ -93,14 +91,10 @@ #include #include -#ifndef illumos -#include #include -#define SYS_forksys SYS_fork -#endif #define IS_SYS_EXEC(w) (w == SYS_execve) -#define IS_SYS_FORK(w) (w == SYS_vfork || w == SYS_forksys) +#define IS_SYS_FORK(w) (w == SYS_vfork || w == SYS_fork) static dt_bkpt_t * dt_proc_bpcreate(dt_proc_t *dpr, uintptr_t addr, dt_bkpt_f *func, void *data) @@ -147,38 +141,23 @@ dt_proc_bpdestroy(dt_proc_t *dpr, int delbkpts) static void dt_proc_bpmatch(dtrace_hdl_t *dtp, dt_proc_t *dpr) { -#ifdef illumos - const lwpstatus_t *psp = &Pstatus(dpr->dpr_proc)->pr_lwp; -#else unsigned long pc; -#endif dt_bkpt_t *dbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); -#ifndef illumos proc_regget(dpr->dpr_proc, REG_PC, &pc); proc_bkptregadj(&pc); -#endif for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = dt_list_next(dbp)) { -#ifdef illumos - if (psp->pr_reg[R_PC] == dbp->dbp_addr) - break; -#else if (pc == dbp->dbp_addr) break; -#endif } if (dbp == NULL) { dt_dprintf("pid %d: spurious breakpoint wakeup for %lx\n", -#ifdef illumos - (int)dpr->dpr_pid, (ulong_t)psp->pr_reg[R_PC]); -#else (int)dpr->dpr_pid, pc); -#endif return; } @@ -346,12 +325,8 @@ dt_proc_rdwatch(dt_proc_t *dpr, rd_event_e event, const char *evname) } (void) dt_proc_bpcreate(dpr, rdn.u.bptaddr, -#ifdef illumos - (dt_bkpt_f *)dt_proc_rdevent, (void *)evname); -#else /* XXX ugly */ (dt_bkpt_f *)dt_proc_rdevent, __DECONST(void *, evname)); -#endif } /* @@ -361,34 +336,18 @@ dt_proc_rdwatch(dt_proc_t *dpr, rd_event_e event, const char *evname) static void dt_proc_attach(dt_proc_t *dpr, int exec) { -#ifdef illumos - const pstatus_t *psp = Pstatus(dpr->dpr_proc); -#endif rd_err_e err; GElf_Sym sym; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); if (exec) { -#ifdef illumos - if (psp->pr_lwp.pr_errno != 0) - return; /* exec failed: nothing needs to be done */ -#endif dt_proc_bpdestroy(dpr, B_FALSE); -#ifdef illumos - Preset_maps(dpr->dpr_proc); -#endif } if ((dpr->dpr_rtld = Prd_agent(dpr->dpr_proc)) != NULL && (err = rd_event_enable(dpr->dpr_rtld, B_TRUE)) == RD_OK) { -#ifdef illumos - dt_proc_rdwatch(dpr, RD_PREINIT, "RD_PREINIT"); -#endif dt_proc_rdwatch(dpr, RD_POSTINIT, "RD_POSTINIT"); -#ifdef illumos - dt_proc_rdwatch(dpr, RD_DLACTIVITY, "RD_DLACTIVITY"); -#endif } else { dt_dprintf("pid %d: failed to enable rtld events: %s\n", (int)dpr->dpr_pid, dpr->dpr_rtld ? rd_errstr(err) : @@ -511,12 +470,6 @@ dt_proc_control(void *arg) dt_proc_hash_t *dph = dtp->dt_procs; struct ps_prochandle *P = dpr->dpr_proc; int pid = dpr->dpr_pid; - -#ifdef illumos - int pfd = Pctlfd(P); - - const long wstop = PCWSTOP; -#endif int notify = B_FALSE; /* @@ -534,44 +487,13 @@ dt_proc_control(void *arg) */ (void) pthread_mutex_lock(&dpr->dpr_lock); -#ifdef illumos - (void) Punsetflags(P, PR_ASYNC); /* require synchronous mode */ - (void) Psetflags(P, PR_BPTADJ); /* always adjust eip on x86 */ - (void) Punsetflags(P, PR_FORK); /* do not inherit on fork */ - - (void) Pfault(P, FLTBPT, B_TRUE); /* always trace breakpoints */ - (void) Pfault(P, FLTTRACE, B_TRUE); /* always trace single-step */ - - /* - * We must trace exit from exec() system calls so that if the exec is - * successful, we can reset our breakpoints and re-initialize libproc. - */ - (void) Psysexit(P, SYS_execve, B_TRUE); - - /* - * We must trace entry and exit for fork() system calls in order to - * disable our breakpoints temporarily during the fork. We do not set - * the PR_FORK flag, so if fork succeeds the child begins executing and - * does not inherit any other tracing behaviors or a control thread. - */ - (void) Psysentry(P, SYS_vfork, B_TRUE); - (void) Psysexit(P, SYS_vfork, B_TRUE); - (void) Psysentry(P, SYS_forksys, B_TRUE); - (void) Psysexit(P, SYS_forksys, B_TRUE); - - Psync(P); /* enable all /proc changes */ -#endif dt_proc_attach(dpr, B_FALSE); /* enable rtld breakpoints */ /* * If PR_KLC is set, we created the process; otherwise we grabbed it. * Check for an appropriate stop request and wait for dt_proc_continue. */ -#ifdef illumos - if (Pstatus(P)->pr_flags & PR_KLC) -#else if (proc_getflags(P) & PR_KLC) -#endif dt_proc_stop(dpr, DT_PROC_STOP_CREATE); else dt_proc_stop(dpr, DT_PROC_STOP_GRAB); @@ -595,33 +517,16 @@ dt_proc_control(void *arg) while (!dpr->dpr_quit) { const lwpstatus_t *psp; -#ifdef illumos - if (write(pfd, &wstop, sizeof (wstop)) == -1 && errno == EINTR) - continue; /* check dpr_quit and continue waiting */ -#else /* Wait for the process to report status. */ proc_wstatus(P); if (errno == EINTR) continue; /* check dpr_quit and continue waiting */ -#endif (void) pthread_mutex_lock(&dpr->dpr_lock); -#ifdef illumos -pwait_locked: - if (Pstopstatus(P, PCNULL, 0) == -1 && errno == EINTR) { - (void) pthread_mutex_unlock(&dpr->dpr_lock); - continue; /* check dpr_quit and continue waiting */ - } -#endif - switch (Pstate(P)) { case PS_STOP: -#ifdef illumos - psp = &Pstatus(P)->pr_lwp; -#else psp = proc_getlwpstatus(P); -#endif dt_dprintf("pid %d: proc stopped showing %d/%d\n", pid, psp->pr_why, psp->pr_what); @@ -666,11 +571,6 @@ pwait_locked: break; case PS_LOST: -#ifdef illumos - if (Preopen(P) == 0) - goto pwait_locked; -#endif - dt_dprintf("pid %d: proc lost: %s\n", pid, strerror(errno)); @@ -749,11 +649,7 @@ dt_proc_t * dt_proc_lookup(dtrace_hdl_t *dtp, struct ps_prochandle *P, int remove) { dt_proc_hash_t *dph = dtp->dt_procs; -#ifdef illumos - pid_t pid = Pstatus(P)->pr_pid; -#else pid_t pid = proc_getpid(P); -#endif dt_proc_t *dpr, **dpp = &dph->dph_hash[pid & (dph->dph_hashlen - 1)]; for (dpr = *dpp; dpr != NULL; dpr = dpr->dpr_hash) { @@ -787,18 +683,10 @@ dt_proc_destroy(dtrace_hdl_t *dtp, struct ps_prochandle *P) * an external debugger and we were waiting in dt_proc_waitrun(). * Leave the process in this condition using PRELEASE_HANG. */ -#ifdef illumos - if (!(Pstatus(dpr->dpr_proc)->pr_flags & (PR_KLC | PR_RLC))) { -#else if (!(proc_getflags(dpr->dpr_proc) & (PR_KLC | PR_RLC))) { -#endif dt_dprintf("abandoning pid %d\n", (int)dpr->dpr_pid); rflag = PRELEASE_HANG; -#ifdef illumos - } else if (Pstatus(dpr->dpr_proc)->pr_flags & PR_KLC) { -#else } else if (proc_getflags(dpr->dpr_proc) & PR_KLC) { -#endif dt_dprintf("killing pid %d\n", (int)dpr->dpr_pid); rflag = PRELEASE_KILL; /* apply kill-on-last-close */ } else { @@ -823,11 +711,7 @@ dt_proc_destroy(dtrace_hdl_t *dtp, struct ps_prochandle *P) */ (void) pthread_mutex_lock(&dpr->dpr_lock); dpr->dpr_quit = B_TRUE; -#ifdef illumos - (void) _lwp_kill(dpr->dpr_tid, SIGCANCEL); -#else pthread_kill(dpr->dpr_tid, SIGTHR); -#endif /* * If the process is currently idling in dt_proc_stop(), re- @@ -895,11 +779,7 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop) (void) sigfillset(&nset); (void) sigdelset(&nset, SIGABRT); /* unblocked for assert() */ -#ifdef illumos - (void) sigdelset(&nset, SIGCANCEL); /* see dt_proc_destroy() */ -#else (void) sigdelset(&nset, SIGUSR1); /* see dt_proc_destroy() */ -#endif data.dpcd_hdl = dtp; data.dpcd_proc = dpr; @@ -927,14 +807,8 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop) * small amount of useful information to help figure it out. */ if (dpr->dpr_done) { -#ifdef illumos - const psinfo_t *prp = Ppsinfo(dpr->dpr_proc); - int stat = prp ? prp->pr_wstat : 0; - int pid = dpr->dpr_pid; -#else int stat = proc_getwstat(dpr->dpr_proc); int pid = proc_getpid(dpr->dpr_proc); -#endif if (proc_state(dpr->dpr_proc) == PS_LOST) { (void) dt_proc_error(dpr->dpr_hdl, dpr, "failed to control pid %d: process exec'd " @@ -978,26 +852,14 @@ dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv, (void) pthread_mutex_init(&dpr->dpr_lock, NULL); (void) pthread_cond_init(&dpr->dpr_cv, NULL); -#ifdef illumos - dpr->dpr_proc = Pxcreate(file, argv, dtp->dt_proc_env, &err, NULL, 0); - if (dpr->dpr_proc == NULL) { - return (dt_proc_error(dtp, dpr, - "failed to execute %s: %s\n", file, Pcreate_error(err))); - } -#else if ((err = proc_create(file, argv, dtp->dt_proc_env, pcf, child_arg, &dpr->dpr_proc)) != 0) { return (dt_proc_error(dtp, dpr, "failed to execute %s: %s\n", file, Pcreate_error(err))); } -#endif dpr->dpr_hdl = dtp; -#ifdef illumos - dpr->dpr_pid = Pstatus(dpr->dpr_proc)->pr_pid; -#else dpr->dpr_pid = proc_getpid(dpr->dpr_proc); -#endif (void) Punsetflags(dpr->dpr_proc, PR_RLC); (void) Psetflags(dpr->dpr_proc, PR_KLC); @@ -1058,11 +920,7 @@ dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags, int nomonitor) (void) pthread_mutex_init(&dpr->dpr_lock, NULL); (void) pthread_cond_init(&dpr->dpr_cv, NULL); -#ifdef illumos - if ((dpr->dpr_proc = Pgrab(pid, flags, &err)) == NULL) { -#else if ((err = proc_attach(pid, flags, &dpr->dpr_proc)) != 0) { -#endif return (dt_proc_error(dtp, dpr, "failed to grab pid %d: %s\n", (int)pid, Pgrab_error(err))); } @@ -1237,11 +1095,7 @@ dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv, struct ps_prochandle *P = dt_proc_create(dtp, file, argv, pcf, child_arg); if (P != NULL && idp != NULL && idp->di_id == 0) { -#ifdef illumos - idp->di_id = Pstatus(P)->pr_pid; /* $target = created pid */ -#else idp->di_id = proc_getpid(P); /* $target = created pid */ -#endif } return (P); From nobody Tue Aug 1 17:29: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 4RFhth0H4Zz4pfS5; Tue, 1 Aug 2023 17:29: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 4RFhtG6dshz4RlJ; Tue, 1 Aug 2023 17:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFiq7HthptQeY02L9gmMBxAh7fYUBnxDtJZFiUB78Ts=; b=mqUkuB1ywKQaVgLvFscnm/CrfwD1KvNHEtH+Vvt0y4SrgJCfZiPtHQWiMRehNyWToebhPX d1EqCWUbpAQHohjyvMgWmJGx7WIyjQyOVyOLpR/SaD2J75L1sxUCBc67E2C6OF0VppPKUt YS16F+cAPCUnD81p+T5yfIgmWlQTFOhWlOrlh/Oo7B/jel71t4v7/PPwJMdrO/EhV3nhNH ow+ie6GzAm9yGHhldDQS/UBLRWrP4k4Zkxao8QV28iS8qWnld2w/cQY5KyJdOp7lqlnam8 QdSCbeTo+wGHJ/W7G33rrA4OYQ6B5YlvbKnDSXxEoGP8lvJfqf3ZWvS9Vm+raA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910951; a=rsa-sha256; cv=none; b=sSo1+1XwbgjkP0xhxxffkDDn4m0v+qgvqgWIXAD/QXFL8pUgGvjX9QoD+RYZmBimHVziUJ Z6RDVETey8azu45REfLClbYjgqFa363hM7+p6Sv1ZI1KS/6SRVGCPum50fNWQ9Cm1NiVsF wugjKX3CokpV701Rjea+5v1pbv+I2cpPgXfUS3rCX6Bbqzv2IY9Aw0pcpzmnAR24+lGtv8 1mt/dZl4Bzw0iImr+DcbakABpb+fXq8WmhvHFbX9ScP0gTVyp0hVegjulbx64Cjwpfmsfi 7ReypWZwziL8iONwpFwJUQ14mdSjFfOCzOziN5vsIhslJdXcR6TL/agir/bUxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFiq7HthptQeY02L9gmMBxAh7fYUBnxDtJZFiUB78Ts=; b=RyJAP8AHGBLZCVMWpBJW70bU8peMdj3DeryCmAdZIP7jQzY3ozz8ZnwWGXHqzzaAsl12tq gFIpi3OMtsT4BJ3HyEOzGYgSBzXHYOseDldG0vCHW/veg7mH5kpFl00wfjE4EfkzPEOiwi D+q1tWd+GPwAITJO2RN610o+3BeC7zfaxdAfbyVFarKXxVYm0REz/tCr19VDA3f7CuYDMg xvlD/lz7gZL1JDcjsBfKSULXMGeMG78kmMpmqGPNpzsl4Cft3VvOIpsmbu2sJFsdsumXas L9LhTnt6Q9dJI746KrbVB1M3PxAf3n4TWDo62wVeJf/Zu0IiHmDm1Jlm8wWLCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhtG1kxxzm9H; Tue, 1 Aug 2023 17:29: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 371HTAkg046911; Tue, 1 Aug 2023 17:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HTApA046910; Tue, 1 Aug 2023 17:29:10 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:29:10 GMT Message-Id: <202308011729.371HTApA046910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: bcbce2a29b89 - main - dtrace: do not overload libproc flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcbce2a29b892ac10291f652b271963e08d641a8 Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=bcbce2a29b892ac10291f652b271963e08d641a8 commit bcbce2a29b892ac10291f652b271963e08d641a8 Author: Eric van Gyzen AuthorDate: 2023-07-25 16:59:07 +0000 Commit: Eric van Gyzen CommitDate: 2023-08-01 17:28:50 +0000 dtrace: do not overload libproc flags dtrace stored its PR_RLC and PR_KLC flags in the proc_handle's flags, where they collided with PATTACH_FORCE and PATTACH_RDONLY, respectively. Thus, Psetflags(PR_KLC) effectively also set the PATTACH_RDONLY flag. Since the flags are private to dtrace (at least on FreeBSD), store them in dtrace's own dt_proc structure instead. On FreeBSD, either PR_RLC or PR_KLC was always set, so remove code that would handle the case where neither was set. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41121 --- cddl/compat/opensolaris/include/libproc.h | 3 -- .../opensolaris/lib/libdtrace/common/dt_proc.c | 36 +++++++++------------- .../opensolaris/lib/libdtrace/common/dt_proc.h | 6 ++++ cddl/lib/libdtrace/libproc_compat.h | 2 -- 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/cddl/compat/opensolaris/include/libproc.h b/cddl/compat/opensolaris/include/libproc.h index 428fa6cf53fe..92c6d6ab0323 100644 --- a/cddl/compat/opensolaris/include/libproc.h +++ b/cddl/compat/opensolaris/include/libproc.h @@ -35,9 +35,6 @@ #define ps_prochandle proc_handle #define Lmid_t int -#define PR_RLC 0x0001 -#define PR_KLC 0x0002 - #include_next #endif diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c index 40b1f4108d1a..958d6ca34e85 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c @@ -490,10 +490,11 @@ dt_proc_control(void *arg) dt_proc_attach(dpr, B_FALSE); /* enable rtld breakpoints */ /* - * If PR_KLC is set, we created the process; otherwise we grabbed it. - * Check for an appropriate stop request and wait for dt_proc_continue. + * If DT_CLOSE_KILL is set, we created the process; otherwise we + * grabbed it. Check for an appropriate stop request and wait for + * dt_proc_continue. */ - if (proc_getflags(P) & PR_KLC) + if (dpr->dpr_close == DT_CLOSE_KILL) dt_proc_stop(dpr, DT_PROC_STOP_CREATE); else dt_proc_stop(dpr, DT_PROC_STOP_GRAB); @@ -586,7 +587,7 @@ dt_proc_control(void *arg) } if (Pstate(P) != PS_UNDEAD) { - if (dpr->dpr_quit && (proc_getflags(P) & PR_KLC)) { + if (dpr->dpr_quit && dpr->dpr_close == DT_CLOSE_KILL) { /* * We're about to kill the child, so don't * bother resuming it. In some cases, such as @@ -678,20 +679,15 @@ dt_proc_destroy(dtrace_hdl_t *dtp, struct ps_prochandle *P) assert(dpr != NULL); - /* - * If neither PR_KLC nor PR_RLC is set, then the process is stopped by - * an external debugger and we were waiting in dt_proc_waitrun(). - * Leave the process in this condition using PRELEASE_HANG. - */ - if (!(proc_getflags(dpr->dpr_proc) & (PR_KLC | PR_RLC))) { - dt_dprintf("abandoning pid %d\n", (int)dpr->dpr_pid); - rflag = PRELEASE_HANG; - } else if (proc_getflags(dpr->dpr_proc) & PR_KLC) { + switch (dpr->dpr_close) { + case DT_CLOSE_KILL: dt_dprintf("killing pid %d\n", (int)dpr->dpr_pid); - rflag = PRELEASE_KILL; /* apply kill-on-last-close */ - } else { + rflag = PRELEASE_KILL; + break; + case DT_CLOSE_RUN: dt_dprintf("releasing pid %d\n", (int)dpr->dpr_pid); - rflag = 0; /* apply run-on-last-close */ + rflag = 0; + break; } if (dpr->dpr_tid) { @@ -860,9 +856,7 @@ dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv, dpr->dpr_hdl = dtp; dpr->dpr_pid = proc_getpid(dpr->dpr_proc); - - (void) Punsetflags(dpr->dpr_proc, PR_RLC); - (void) Psetflags(dpr->dpr_proc, PR_KLC); + dpr->dpr_close = DT_CLOSE_KILL; if (dt_proc_create_thread(dtp, dpr, dtp->dt_prcmode) != 0) return (NULL); /* dt_proc_error() has been called for us */ @@ -927,9 +921,7 @@ dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags, int nomonitor) dpr->dpr_hdl = dtp; dpr->dpr_pid = pid; - - (void) Punsetflags(dpr->dpr_proc, PR_KLC); - (void) Psetflags(dpr->dpr_proc, PR_RLC); + dpr->dpr_close = DT_CLOSE_RUN; /* * If we are attempting to grab the process without a monitor diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h index beae6f6d5cda..458e9902881f 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h @@ -40,6 +40,11 @@ extern "C" { #endif +enum dt_close_action { + DT_CLOSE_RUN, + DT_CLOSE_KILL, +}; + typedef struct dt_proc { dt_list_t dpr_list; /* prev/next pointers for lru chain */ struct dt_proc *dpr_hash; /* next pointer for pid hash chain */ @@ -60,6 +65,7 @@ typedef struct dt_proc { uint8_t dpr_rdonly; /* proc flag: opened read-only */ pthread_t dpr_tid; /* control thread (or zero if none) */ dt_list_t dpr_bps; /* list of dt_bkpt_t structures */ + enum dt_close_action dpr_close; /* do this to child when exiting */ } dt_proc_t; typedef struct dt_proc_notify { diff --git a/cddl/lib/libdtrace/libproc_compat.h b/cddl/lib/libdtrace/libproc_compat.h index 14f32506bb8f..d2a04d143e7e 100644 --- a/cddl/lib/libdtrace/libproc_compat.h +++ b/cddl/lib/libdtrace/libproc_compat.h @@ -58,10 +58,8 @@ #define Prd_agent proc_rdagent #define Prelease proc_detach #define Psetbkpt proc_bkptset -#define Psetflags proc_setflags #define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr -#define Punsetflags proc_clearflags #define Pupdate_maps proc_rdagent #define Pupdate_syms proc_updatesyms #define Pxecbkpt proc_bkptexec From nobody Tue Aug 1 17:29: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 4RFhtS4gg1z4pf64; Tue, 1 Aug 2023 17:29: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 4RFhtJ1nYtz4Rj6; Tue, 1 Aug 2023 17:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bDEQg5XyvECBzCBKmRp8CcB2Qxtk32rRkKajNpoqnvU=; b=fOCfMG5R2ENWPuZEFvhDFmcJ1pfwrqGycZnMdS63Bol5wmNg5pSKSkcVf8pOJitGP8KbCO bZVtd4s7SQUEfKq9jZPgXi61i+eTSgmlrjoMc8ZA14Z5nVHa331+9Wz6385Yo6hxc0CrLs L8y3/owo0+yDTQybJAdt8ipZ0MLoJHiwob2k08tBXCFfT+S9OPG7O/XlPdiatElT1AO0CJ 3avM+G5FulU2rDzaaInVc7AenYCvm4zuHOapXhNZjzlI04VWvMYSrrAQv6IxXXc3DfoG1a 0D5fwLEOJA4Yd4Vh27JAzX7669H8yb0BPJgUHrdBRmvvG/kEFu31DxO8dkQfMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910952; a=rsa-sha256; cv=none; b=xBhj8pEFXLlPF8EVV8l/u5PVgVxhNlMDVoIuV6c4YnjkHlUbigmTAFwW6BGIRAsbLf2nlF TDMZQnI7MqIXv9NUwbzJbjb147HvzD6iCav0reFU/znsWTT9YfLsMq23M42jW75SQN14VZ NHckNE/31NCFSHuCkrz+bhcHYEGR9bjQP0K55tjMgYJF568v1L6nkTvKn+LS+eqC33zSig V02CpcVN6a1PMJ9DlgpbK9OvPaO2EjsstFV+iBVc1g/9SO0HWK9SyT+4XaA8gDrmjBABce bbjE+jakzbdqRLJ2CUMgGwxHz+Tu0a/2OBi57d9iUKXjldlB3yqueCchwu2SWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bDEQg5XyvECBzCBKmRp8CcB2Qxtk32rRkKajNpoqnvU=; b=yUEccb/6XFXQqyg8xktn1jGrverOuTcNmfjVi1RSlJZm8SOxCpf+qMRLQwO/gSSNw33nAJ Ha//UqZQR1Ee2xccUG8+pZSndrH3mT2DNKbvCZDiMuF/pTGjdu0DnP295BosZnGSfU02G7 PbXvsZppzyXBt+7EY8xbmqZXQ6Rr/XgWuo6Znm9EnTtFGF2AHcTo1BL3+MueQ54l8f7YS8 Yxg0GIm0YKE6H2CdgRoet3ry6fY8W9FBVGpU76BvnctlzP5sVplTsspTXBlaN9hHv+dMgk qu+xRYpiLAVJeYdRFWjJ5J1d7x7JpfLKZF6PIL3e66pv8ZAZ+RdIU7xkIAVpvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhtH2KLPzmJx; Tue, 1 Aug 2023 17:29: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 371HTBJs046938; Tue, 1 Aug 2023 17:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HTBqJ046937; Tue, 1 Aug 2023 17:29:11 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:29:11 GMT Message-Id: <202308011729.371HTBqJ046937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: be1dd8e65bc6 - main - proc_detach: use ptrace(PT_KILL) to kill the tracee List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be1dd8e65bc607aae2e873ad80076a87869f6755 Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=be1dd8e65bc607aae2e873ad80076a87869f6755 commit be1dd8e65bc607aae2e873ad80076a87869f6755 Author: Eric van Gyzen AuthorDate: 2023-07-25 16:58:11 +0000 Commit: Eric van Gyzen CommitDate: 2023-08-01 17:28:50 +0000 proc_detach: use ptrace(PT_KILL) to kill the tracee When MFC'ing commit dad11f990e2 to stable/12, the child would dump core when dtrace exited. It was getting SIGTRAP, even though proc_detach sent a SIGKILL. I could not find the reason for this difference in behavior from main (and stable/13). The present change, however, works as expected, probably due the proc_wkilled special case in kern_ptrace. It also seems like a more obvious approach. While I'm here, fix two other issues in the previous code: It would SIGKILL a tracee even in read-only mode. It would SIGSTOP/SIGCONT the tracee if ptrace succeeded but errno happened to be EBUSY for some other reason. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41122 --- lib/libproc/proc_util.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c index 36d0de76e8fe..cd2c0dff3451 100644 --- a/lib/libproc/proc_util.c +++ b/lib/libproc/proc_util.c @@ -85,25 +85,21 @@ int proc_detach(struct proc_handle *phdl, int reason) { int status; + int request; pid_t pid; if (phdl == NULL) return (EINVAL); if (reason == PRELEASE_HANG) return (EINVAL); - if (reason == PRELEASE_KILL) { - kill(proc_getpid(phdl), SIGKILL); - goto free; - } if ((phdl->flags & PATTACH_RDONLY) != 0) goto free; + request = (reason == PRELEASE_KILL) ? PT_KILL : PT_DETACH; pid = proc_getpid(phdl); - if (ptrace(PT_DETACH, pid, 0, 0) != 0 && errno == ESRCH) - goto free; - if (errno == EBUSY) { + if (ptrace(request, pid, 0, 0) != 0 && errno == EBUSY) { kill(pid, SIGSTOP); waitpid(pid, &status, WUNTRACED); - ptrace(PT_DETACH, pid, 0, 0); + ptrace(request, pid, 0, 0); kill(pid, SIGCONT); } free: From nobody Tue Aug 1 17:29: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 4RFhth04tQz4pfQf; Tue, 1 Aug 2023 17:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFhtJ5Zv8z4Rwn; Tue, 1 Aug 2023 17:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oiv4RjRImAWpD3Mp7nYaSc8w5eYC+5Zt8LvJsG6NVo8=; b=msPWyaAa10OWMZNaw4I34jCK76YZ4cfyXRwn8/p5+eXOdzn6uUPE1C+cG4/51T3a0by0B0 6oND0krefDeKC6LNTfmRK8kev/ixBh5kdukhff/T4OSj8FFJ1PS0LjqCVlJO0RsbBiQjFZ 6Owv/lPEcbh+OnlsXsiVzNI8PgWZ8Su8P5iRO1cXy7q6MYV7jKVClGIb2Jjn2Fagkt3wQN qDvOD2owWIPTzRoGzf+HpKjaiG98RXSbP0yABDPxg+NE78tY/ep/Gmf1Lzy/3hNKlbTuW/ 8sPs/skXzkYygTJxrKiArRDPLYjh3ePff9EAf29Opw6WZgt5kYWx8AJAWhFpig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910952; a=rsa-sha256; cv=none; b=ctQQX7fRbIa5dDJl8J8AYhrn9MxkYrtcPB4Hx9GGXMkfB6pS2qazDYf8612IzEnr3RqyWR eUyy7z+sjrA/6dzbOczoe7Qn7ZkzSz2j8TnOXXXzO0JnygrfIOftl74XqEsz5fHCE4WHj6 K//rhlXZDczoPL5pC7pW8w57et0GTIfKHt/trEpSEXLWNJ3SFXfPga+M914XCekrp2Vjb8 q2j0xWwGmsv6vo4f23x5iXtKjPphXbNVHy7QAHPqO3oJuWaV0gXZ1mkhqScNy1NffC029z chdv5dgRSBQPTdVl/berhMiJtCi8+I5SToLEsUBOX8eTtgeeKhesFHVhVMgmdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oiv4RjRImAWpD3Mp7nYaSc8w5eYC+5Zt8LvJsG6NVo8=; b=OBXyY1krZDXfvdsk20wPMcbMUzn4w8eknjWSzTEo7f0H0NPLQJ7Qheknu5d5EDWJhHfVB2 /uYlsngFb2z1K5akpX/sxK0yzBXh64TW09WyM/P6T5/7//BNF5SXxxXe7QQQO6+NTErmMB 7hiq2juOyKW6mF+p4McvrDrwUyCzQRTUnArI9Fp6gKCyK30kW0kxEZPU6mh2GZrzUW+4hg sDZGuwQzMa6qKjzGCNIZV/AJX8ZCPa6eUuXxSJqZALFyCIsMerAGNi4tJaREHzprRC1I29 iUdmPEgmcvGu8UCEmLkFF1lKuAqZFCFhQuJxWmD3uk1TNLz0hZg7E4aVdK8WgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFhtJ3kzWzm73; Tue, 1 Aug 2023 17:29: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 371HTCJ8046962; Tue, 1 Aug 2023 17:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HTCYQ046961; Tue, 1 Aug 2023 17:29:12 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:29:12 GMT Message-Id: <202308011729.371HTCYQ046961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 1112883e19aa - main - dtrace: remove dead code for PR_REQUESTED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1112883e19aaef24082f8d24f9b3bc214046caad Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=1112883e19aaef24082f8d24f9b3bc214046caad commit 1112883e19aaef24082f8d24f9b3bc214046caad Author: Eric van Gyzen AuthorDate: 2023-07-27 22:06:33 +0000 Commit: Eric van Gyzen CommitDate: 2023-08-01 17:28:50 +0000 dtrace: remove dead code for PR_REQUESTED libproc's PR_REQUESTED is not implemented on FreeBSD. Remove dead code in dtrace that would handle it. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41225 --- .../opensolaris/lib/libdtrace/common/dt_proc.c | 95 ---------------------- lib/libproc/libproc.h | 2 +- 2 files changed, 1 insertion(+), 96 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c index 958d6ca34e85..b32dcea1f8ba 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c @@ -366,84 +366,6 @@ dt_proc_attach(dt_proc_t *dpr, int exec) } } -/* - * Wait for a stopped process to be set running again by some other debugger. - * This is typically not required by /proc-based debuggers, since the usual - * model is that one debugger controls one victim. But DTrace, as usual, has - * its own needs: the stop() action assumes that prun(1) or some other tool - * will be applied to resume the victim process. This could be solved by - * adding a PCWRUN directive to /proc, but that seems like overkill unless - * other debuggers end up needing this functionality, so we implement a cheap - * equivalent to PCWRUN using the set of existing kernel mechanisms. - * - * Our intent is really not just to wait for the victim to run, but rather to - * wait for it to run and then stop again for a reason other than the current - * PR_REQUESTED stop. Since PCWSTOP/Pstopstatus() can be applied repeatedly - * to a stopped process and will return the same result without affecting the - * victim, we can just perform these operations repeatedly until Pstate() - * changes, the representative LWP ID changes, or the stop timestamp advances. - * dt_proc_control() will then rediscover the new state and continue as usual. - * When the process is still stopped in the same exact state, we sleep for a - * brief interval before waiting again so as not to spin consuming CPU cycles. - */ -static void -dt_proc_waitrun(dt_proc_t *dpr) -{ - printf("%s:%s(%d): not implemented\n", __FUNCTION__, __FILE__, - __LINE__); -#ifdef DOODAD - struct ps_prochandle *P = dpr->dpr_proc; - const lwpstatus_t *psp = &Pstatus(P)->pr_lwp; - - int krflag = psp->pr_flags & (PR_KLC | PR_RLC); - timestruc_t tstamp = psp->pr_tstamp; - lwpid_t lwpid = psp->pr_lwpid; - - const long wstop = PCWSTOP; - int pfd = Pctlfd(P); - - assert(DT_MUTEX_HELD(&dpr->dpr_lock)); - assert(psp->pr_flags & PR_STOPPED); - assert(Pstate(P) == PS_STOP); - - /* - * While we are waiting for the victim to run, clear PR_KLC and PR_RLC - * so that if the libdtrace client is killed, the victim stays stopped. - * dt_proc_destroy() will also observe this and perform PRELEASE_HANG. - */ - (void) Punsetflags(P, krflag); - Psync(P); - - (void) pthread_mutex_unlock(&dpr->dpr_lock); - - while (!dpr->dpr_quit) { - if (write(pfd, &wstop, sizeof (wstop)) == -1 && errno == EINTR) - continue; /* check dpr_quit and continue waiting */ - - (void) pthread_mutex_lock(&dpr->dpr_lock); - (void) Pstopstatus(P, PCNULL, 0); - psp = &Pstatus(P)->pr_lwp; - - /* - * If we've reached a new state, found a new representative, or - * the stop timestamp has changed, restore PR_KLC/PR_RLC to its - * original setting and then return with dpr_lock held. - */ - if (Pstate(P) != PS_STOP || psp->pr_lwpid != lwpid || - bcmp(&psp->pr_tstamp, &tstamp, sizeof (tstamp)) != 0) { - (void) Psetflags(P, krflag); - Psync(P); - return; - } - - (void) pthread_mutex_unlock(&dpr->dpr_lock); - (void) poll(NULL, 0, MILLISEC / 2); - } - - (void) pthread_mutex_lock(&dpr->dpr_lock); -#endif -} - typedef struct dt_proc_control_data { dtrace_hdl_t *dpcd_hdl; /* DTrace handle */ dt_proc_t *dpcd_proc; /* proccess to control */ @@ -532,23 +454,6 @@ dt_proc_control(void *arg) dt_dprintf("pid %d: proc stopped showing %d/%d\n", pid, psp->pr_why, psp->pr_what); - /* - * If the process stops showing PR_REQUESTED, then the - * DTrace stop() action was applied to it or another - * debugging utility (e.g. pstop(1)) asked it to stop. - * In either case, the user's intention is for the - * process to remain stopped until another external - * mechanism (e.g. prun(1)) is applied. So instead of - * setting the process running ourself, we wait for - * someone else to do so. Once that happens, we return - * to our normal loop waiting for an event of interest. - */ - if (psp->pr_why == PR_REQUESTED) { - dt_proc_waitrun(dpr); - (void) pthread_mutex_unlock(&dpr->dpr_lock); - continue; - } - /* * If the process stops showing one of the events that * we are tracing, perform the appropriate response. diff --git a/lib/libproc/libproc.h b/lib/libproc/libproc.h index e9a2f3935d84..3d46396c6da8 100644 --- a/lib/libproc/libproc.h +++ b/lib/libproc/libproc.h @@ -111,7 +111,7 @@ typedef enum { typedef struct lwpstatus { int pr_why; -#define PR_REQUESTED 1 +#define PR_REQUESTED 1 /* not implemented */ #define PR_FAULTED 2 #define PR_SYSENTRY 3 #define PR_SYSEXIT 4 From nobody Tue Aug 1 18:29: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 4RFkDD23ZHz4phtv; Tue, 1 Aug 2023 18:29: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 4RFkDC2dcvz4W8T; Tue, 1 Aug 2023 18:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690914587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg46FWUTam+BYKi3cEo/XzRiSKrJMOwkbJ8c7o2+goM=; b=EwWBETa0EyjOqKyiEu9mOFEjYvjIlQTUYrEEk61WIv9U1Lins59IRzXyuYLngvmTGfjgUl U45Qx4741on1TCGct3quYX/wxiW2lajbVcVy0rzlZAy2mLl3/lxROB9atkLSW8UNj7nzEL iV1pjQX/+vxr7pU7utXBOdGuYGY2FF8qVLzh5St8VG1g0yNjTj0srlyhfhMttvWbSHw22x Ud08dw2stOzwchpzzzC3sDXtriDc2TdnJqZ++oX9Ty+RwJqEc9heq78UOKjSFXDA7CuV7g D3ZUN58g9vnpGD/sH7pXKit2dvs9ZqqRoLWmWvIfzTkGCh3R4JuiJCx6BFwjgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690914587; a=rsa-sha256; cv=none; b=NsqcmNdbPmOu9KEHZe3C8CRPiFXSWur4BXOCetvPCoeHqLhasQbzzpvy5wDmKDoBcjmXk7 V4Fo3ZTakK6xMjV2T2N8/+vuUbmYjPsIjy01+6kcPpwZLNXeAh2R/eEKa0ZhXj926XIhEP twxq5htYn+Otk0io3EY67NvPaPwQ8S28WjrkHlHkAmq5eCdteFKEnM/nLH/Qroa0G6afhU gIOD2U73fUolq71nyhz9ZW/6l9dr35GyELnQO4l+9LbzzAXIzBpezAj88ro7o/nu28Sfv/ 19LzAaMKcboBhdZyUeszW6Lm2Da8y0oDSD4Yw4RaCMKmvO3Q8TVR2VPV4WVbLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690914587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg46FWUTam+BYKi3cEo/XzRiSKrJMOwkbJ8c7o2+goM=; b=dbaPslf9M3d3+m7w6pNGMSVUk2GwqqN4DoeazjW0P4WwA5g6ejEJvOs+wOssBBQGAEdwbb TndSDsbW5415rJcRE9jgi3D6018mbHzcKNBAQ13cbwZy5uy4Re+muHppYw2va4o8rEtlfb 4t8qINa47a8APXFaPXvuGwINo6nunxVgNSOKWZOJpNwiZ4AxQO+B2PogziW4bIJgyOtjW7 H4LNyAto+REr4zRnU378FT1J350rVy7nIv7XVnHGWl8VgDA+t0kgi0p6DhwSkfmamW16JX vsGnMYBFPzZtJTvoRB/0kn+TsQN94e8OVViyaZmsYN/2Ed3s5lNsJF1WE+tjsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFkDB51PCznpb; Tue, 1 Aug 2023 18:29: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 371ITjfe046644; Tue, 1 Aug 2023 18:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371ITjfJ046643; Tue, 1 Aug 2023 18:29:45 GMT (envelope-from git) Date: Tue, 1 Aug 2023 18:29:45 GMT Message-Id: <202308011829.371ITjfJ046643@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: bc50720b3216 - stable/13 - tcp_lro: Fix for undefined behaviour. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bc50720b321667c71d77d3f0c692a59c77f955da Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc50720b321667c71d77d3f0c692a59c77f955da commit bc50720b321667c71d77d3f0c692a59c77f955da Author: Hans Petter Selasky AuthorDate: 2022-11-28 22:56:16 +0000 Commit: Ed Maste CommitDate: 2023-08-01 17:13:06 +0000 tcp_lro: Fix for undefined behaviour. Make sure the size of the raw[] array in the lro_address union is correctly set at compile time, so that static code analysis tools do not report undefined behaviour. PR: 265664 Sponsored by: NVIDIA Networking (cherry picked from commit e0d8add4af0be1d37ede9a16f46424dc08f0d95e) --- sys/netinet/tcp_lro.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index 2b0555027266..f3099d16bc1a 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -34,6 +34,8 @@ #define _TCP_LRO_H_ #include +#include + #include #ifndef TCP_LRO_ENTRIES @@ -65,8 +67,12 @@ struct inpcb; +/* Precompute the LRO_RAW_ADDRESS_MAX value: */ +#define LRO_RAW_ADDRESS_MAX \ + howmany(12 + 2 * sizeof(struct in6_addr), sizeof(u_long)) + union lro_address { - u_long raw[1]; + u_long raw[LRO_RAW_ADDRESS_MAX]; struct { uint8_t lro_type; /* internal */ #define LRO_TYPE_NONE 0 @@ -89,10 +95,10 @@ union lro_address { struct in6_addr v6; } d_addr; /* destination IPv4/IPv6 address */ }; -} __aligned(sizeof(u_long)); +}; -#define LRO_RAW_ADDRESS_MAX \ - (sizeof(union lro_address) / sizeof(u_long)) +_Static_assert(sizeof(union lro_address) == sizeof(u_long) * LRO_RAW_ADDRESS_MAX, + "The raw field in the lro_address union does not cover the whole structure."); /* Optimize address comparison by comparing one unsigned long at a time: */ From nobody Tue Aug 1 19:20: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 4RFlM35h98z4pljh; Tue, 1 Aug 2023 19:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFlLg6w6Lz4c30; Tue, 1 Aug 2023 19:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690917628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gxROONEn7VUDm66fq8nYNx9lHEI9AGB4Y0hJnDGRFv4=; b=BvfnmgjHnupQb16/N6maFNJljE/P1eBcUKxNl2aTHui1wQMt7WNaehrKa1UWkmKy4ExHJg MMMG4inXp12hYBIXIrzpNhBrNiXK1z6QhJdGbBUygQqCWcsI9QRQ455nXtwpjKB5dwpq5J m0SzSapM6yRlkqEwKxeh9iNpHlJJ7PAEQ8UVQxPh82n3399plbby1x/xxwCqhrQomI4J08 1sXyfYcBJZqr8thOOPScylAbgYdEEFUo5nxi3rKj/38PMo+Zn3AlIbmkpXF+lyyFeSC5++ rPOIfcvF1cyDaxoPDgGmt++XsiOFXE8Zwfu9K52OXO4K7CV5ohx/6WsqG5VnYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690917628; a=rsa-sha256; cv=none; b=hgZKq9mTQJ7u7OVmIplOvncucGPuF2ZEmJD0Kkn51aWA0wwPKcC2vl1aLK7NrofDaMGvtK Q634IXIxzKsvN9UidUnKNuEUQcfcd/p3+r1jTGjPnevWihnULgpkysmRWgdAhOlBOmFPrK B0Ns6zyFeYb3OTzjH7cJCmUxsuvha3mWXi4JLe0YZVH5Ns0Y51lStAdBkEVpUfmsv863Qb rkAJN3SeTXOr//Yw53l5y5gO/mqTfEjICVHAipL2/4dNvmdPmLP96yaW5dAmqg0ufdJ1Kx iymQpcD+kN5ex8qMUzMUff7PO026SRtilvAqoi1q2xL6quJ8fPc8CjUC4G1vlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690917628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gxROONEn7VUDm66fq8nYNx9lHEI9AGB4Y0hJnDGRFv4=; b=wExZbk0ftKilQhLWZPN9VGcJWFX3kmyPEis5/Ektr9oIDj4jTknXMLk3C2R7S5LE5bgNwz t5ga7d2k21rebtMAnp2zRjGM6NnL3UyT71zde+KulgAc1YocsoMmTeerWS2Iyn43YUPQt8 c7YSAmmCuX0oF5EmAsb+qAXUSF1rkOYcdr8G+LKVPmkkB1SEhS/PO1Vqk2Wj9yHsfnKWt0 YeBcsu3uOmovhpQO7PcsCsiqypDFG1VW8OG3I6Z+lmA//YT3EEyVkluKSeH8QtKsJW9Qv2 pTBHJfOH13MuMGNgb1r2ZNj8NDS9FPrE4cfazbTmlJTAaa7WvPWP+bRQ4rqSuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFlLd2b9Fzq2l; Tue, 1 Aug 2023 19:20: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 371JKPW9038657; Tue, 1 Aug 2023 19:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371JKPtb038656; Tue, 1 Aug 2023 19:20:25 GMT (envelope-from git) Date: Tue, 1 Aug 2023 19:20:25 GMT Message-Id: <202308011920.371JKPtb038656@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: 40693d64cbdd - stable/12 - OpenSSL: Regen manual pages for OpenSSL 1.1.1v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 40693d64cbdd4e6f677bcee7d2215f0c88c11c9c Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=40693d64cbdd4e6f677bcee7d2215f0c88c11c9c commit 40693d64cbdd4e6f677bcee7d2215f0c88c11c9c Author: Jung-uk Kim AuthorDate: 2023-08-01 19:18:47 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-01 19:18:47 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1v --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- secure/lib/libcrypto/man/man7/Ed25519.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/SM2.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/scrypt.7 | 2 +- secure/lib/libcrypto/man/man7/ssl.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/asn1parse.1 | 2 +- secure/usr.bin/openssl/man/ca.1 | 2 +- secure/usr.bin/openssl/man/ciphers.1 | 2 +- secure/usr.bin/openssl/man/cms.1 | 2 +- secure/usr.bin/openssl/man/crl.1 | 2 +- secure/usr.bin/openssl/man/crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/dgst.1 | 2 +- secure/usr.bin/openssl/man/dhparam.1 | 2 +- secure/usr.bin/openssl/man/dsa.1 | 2 +- secure/usr.bin/openssl/man/dsaparam.1 | 2 +- secure/usr.bin/openssl/man/ec.1 | 2 +- secure/usr.bin/openssl/man/ecparam.1 | 2 +- secure/usr.bin/openssl/man/enc.1 | 2 +- secure/usr.bin/openssl/man/engine.1 | 2 +- secure/usr.bin/openssl/man/errstr.1 | 2 +- secure/usr.bin/openssl/man/gendsa.1 | 2 +- secure/usr.bin/openssl/man/genpkey.1 | 2 +- secure/usr.bin/openssl/man/genrsa.1 | 2 +- secure/usr.bin/openssl/man/list.1 | 2 +- secure/usr.bin/openssl/man/nseq.1 | 2 +- secure/usr.bin/openssl/man/ocsp.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/passwd.1 | 2 +- secure/usr.bin/openssl/man/pkcs12.1 | 2 +- secure/usr.bin/openssl/man/pkcs7.1 | 2 +- secure/usr.bin/openssl/man/pkcs8.1 | 2 +- secure/usr.bin/openssl/man/pkey.1 | 2 +- secure/usr.bin/openssl/man/pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/prime.1 | 2 +- secure/usr.bin/openssl/man/rand.1 | 2 +- secure/usr.bin/openssl/man/req.1 | 2 +- secure/usr.bin/openssl/man/rsa.1 | 2 +- secure/usr.bin/openssl/man/rsautl.1 | 2 +- secure/usr.bin/openssl/man/s_client.1 | 2 +- secure/usr.bin/openssl/man/s_server.1 | 2 +- secure/usr.bin/openssl/man/s_time.1 | 2 +- secure/usr.bin/openssl/man/sess_id.1 | 2 +- secure/usr.bin/openssl/man/smime.1 | 2 +- secure/usr.bin/openssl/man/speed.1 | 2 +- secure/usr.bin/openssl/man/spkac.1 | 2 +- secure/usr.bin/openssl/man/srp.1 | 2 +- secure/usr.bin/openssl/man/storeutl.1 | 2 +- secure/usr.bin/openssl/man/ts.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- secure/usr.bin/openssl/man/verify.1 | 2 +- secure/usr.bin/openssl/man/version.1 | 2 +- secure/usr.bin/openssl/man/x509.1 | 2 +- 535 files changed, 536 insertions(+), 536 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 1ec6c3d2afa9..76d23befcea2 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.1u -OPENSSL_DATE= 2023-05-30 +OPENSSL_VER= 1.1.1v +OPENSSL_DATE= 2023-08-01 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 a9e7033ea78b..385b65a1f57a 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "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 1c937e84532a..3e7cfc2223f7 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "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 fbee87f11652..056eb016fe06 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "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 587551817383..9ad6dae7622d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "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 4beeac1e8659..631ac1c07009 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "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 365e3ca2b137..157b2389eb33 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "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 2f92aad6878d..38d8efcd109b 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "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 9b6785e0fb0f..fa6d233333c6 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "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 12ac4d303b97..32f0f90b4422 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "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 f99049a86da1..6354f8053f24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "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 f3ffef140959..9d091a577ae0 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "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 5b40bc64dcaf..707354c38646 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "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 b96ac2792a04..94286577dceb 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "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 b108992b96e9..6979284edb61 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "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 f26c50053b87..1680ec8ddedd 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "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 ed925f3b92b0..d9ef260a9541 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "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 18be78af930a..ec4eda157305 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "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 50f0f9b6aece..8e67876428d1 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "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 ef32b8ab15ae..8e85ff854025 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "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 1715638ded6a..caecb053ed94 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "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 4a0d7066effa..775a375f5bf9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "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 3d178b1e6339..7778f5a4cf49 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "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 31e95b11c712..799e399146e9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_NULL 3" -.TH BIO_F_NULL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_NULL 3 "2023-08-01" "1.1.1v" "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_ssl.3 b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 index 8dabf1b4cda7..6764628281b6 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_SSL 3" -.TH BIO_F_SSL 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_F_SSL 3 "2023-08-01" "1.1.1v" "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_find_type.3 b/secure/lib/libcrypto/man/man3/BIO_find_type.3 index bfd069a4727b..3a599024f9dc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_find_type.3 +++ b/secure/lib/libcrypto/man/man3/BIO_find_type.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_FIND_TYPE 3" -.TH BIO_FIND_TYPE 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_FIND_TYPE 3 "2023-08-01" "1.1.1v" "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_get_data.3 b/secure/lib/libcrypto/man/man3/BIO_get_data.3 index c5d571487d72..97480d58a53e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_data.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_data.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_DATA 3" -.TH BIO_GET_DATA 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_GET_DATA 3 "2023-08-01" "1.1.1v" "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_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 index 6af7a0480915..700f47303fcd 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_EX_NEW_INDEX 3" -.TH BIO_GET_EX_NEW_INDEX 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_GET_EX_NEW_INDEX 3 "2023-08-01" "1.1.1v" "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_meth_new.3 b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 index 81ef93926bf9..b336bd4828b2 100644 --- a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_METH_NEW 3" -.TH BIO_METH_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_METH_NEW 3 "2023-08-01" "1.1.1v" "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_new.3 b/secure/lib/libcrypto/man/man3/BIO_new.3 index d4cbf05176e0..3bfaca2f0327 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW 3" -.TH BIO_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_NEW 3 "2023-08-01" "1.1.1v" "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_new_CMS.3 b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 index 0dfc6cdd9fa0..ffa6b6995074 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW_CMS 3" -.TH BIO_NEW_CMS 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_NEW_CMS 3 "2023-08-01" "1.1.1v" "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_parse_hostserv.3 b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 index 75ff669669f7..6e2ab1308cab 100644 --- a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 +++ b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PARSE_HOSTSERV 3" -.TH BIO_PARSE_HOSTSERV 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_PARSE_HOSTSERV 3 "2023-08-01" "1.1.1v" "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_printf.3 b/secure/lib/libcrypto/man/man3/BIO_printf.3 index 2aa5541f86be..a218876b94ef 100644 --- a/secure/lib/libcrypto/man/man3/BIO_printf.3 +++ b/secure/lib/libcrypto/man/man3/BIO_printf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PRINTF 3" -.TH BIO_PRINTF 3 "2023-05-30" "1.1.1u" "OpenSSL" +.TH BIO_PRINTF 3 "2023-08-01" "1.1.1v" "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_push.3 b/secure/lib/libcrypto/man/man3/BIO_push.3 index c4d41b999494..dddc57e83a1c 100644 --- a/secure/lib/libcrypto/man/man3/BIO_push.3 +++ b/secure/lib/libcrypto/man/man3/BIO_push.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" *** 6519 LINES SKIPPED *** From nobody Tue Aug 1 19:20: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 4RFlM34vsRz4plm7; Tue, 1 Aug 2023 19:20: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 4RFlLc3RTsz4c9Q; Tue, 1 Aug 2023 19:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690917624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCII1jqN/Q6Eid/MSxSLsfTSpZUHprWJRTnuniyCzgM=; b=iMUbn/cnDFMt+ZYI5rW6gXWIja6QuxsHnKFbueI8EWnPsE+KaZ8SqbDigq68I9M/znxYnB 1yDVnvlZqL6pRr/AvidYTEeIu5+xPQmeQ0QC5vTSQeHg5d8iFsEHD32RVLho8kV6aM7/tT SpX/vvVPeBPm3rPEGhWXjhtT1k/PhXWWOBSvIGG0PHVkNeePLnPjFmobBwRjaCI/ynT60b RQfz0pdrTKitvWqA7P6Sw7UTpf+3f8tUXsCSWO3d95CIodaxCSoE6OrALlvlz3GGxq19cv k4krCK9E7pmVD8N8FWCadi4MREHicogHbXn+kKrilsBSzdmgxk/vFSouF9WYnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690917624; a=rsa-sha256; cv=none; b=WzrZFShN6ZtxnoPTqsc7hpYQzFY3x2PSQ/Nar0HOml2At2P3RLjo9shd9BQyL+PTAs+2/l XCEZ261AvtLoOehKetqA4+EepQbYn/O1E9ZJKU/t+ZWPnv2XGU+rAyJ/LhMQ7GoaPYggXJ zv7bviluTu1xLwi+lsCZi0EmL6OC/TjhAC4c8sTeCq1NmtTowaoPo5bFVCNDy5+mDc1f7T 2uCiAhqJaPWR5TQeCnOyAexKJpK6GwpujiKWweUyp0OgSVZvrk0IMEDG7G8pAcssS3e9dE Ipwkm6tTyL9jLdOmVZjRXAq6x1WRVwkiEHQX+3fs55jTDKUnBCGl2lJ9c+aCzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690917624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCII1jqN/Q6Eid/MSxSLsfTSpZUHprWJRTnuniyCzgM=; b=MqC4V00YhIj/1wVsgJntet0hbXkPiwS7FScY+hvPhZqqSVk8nNGL6FYIbzUOXGkSvbseMQ 4fYrxkjXPCEgSuGg38Fyk54AD7m9OJ3Y6v47w0KyNOldSWQngfPqNWVnwlADXOKTzd+2bt NftIztZUfsfz18WNwBK1lLE6zvMVkIZ7H6d52Z4ORj4yF+Pq7FWQtuNf8+09eN37sN5ckM HjfcXoeYS/VjesCXw7MQYcwNk/GvHKWUt9soEqAZEBuRvaTSq5ebsWbxdsUxmCbDdtnTGv mPEnbkmU4JOfkksrQXxWC453anx1f6jFkjwKMkk6eEF6iqsotcvDRh+/ZGrAXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFlLc0xF0zppf; Tue, 1 Aug 2023 19:20: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 371JKNdF038634; Tue, 1 Aug 2023 19:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371JKNIS038633; Tue, 1 Aug 2023 19:20:23 GMT (envelope-from git) Date: Tue, 1 Aug 2023 19:20:23 GMT Message-Id: <202308011920.371JKNIS038633@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: 1b34edce0aa1 - stable/12 - OpenSSL: Import OpenSSL 1.1.1v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1b34edce0aa1da318262b1b54eb6829c31d8ccfb Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=1b34edce0aa1da318262b1b54eb6829c31d8ccfb commit 1b34edce0aa1da318262b1b54eb6829c31d8ccfb Author: Jung-uk Kim AuthorDate: 2023-08-01 14:48:37 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-01 19:15:45 +0000 OpenSSL: Import OpenSSL 1.1.1v (cherry picked from commit cc0d356166e39da7f956c39f874e6dee67fd5d60) --- crypto/openssl/CHANGES | 35 +++++++++++++++++++++++++++++++ crypto/openssl/NEWS | 5 +++++ crypto/openssl/README | 2 +- crypto/openssl/crypto/dh/dh_check.c | 20 +++++++++++++++--- crypto/openssl/crypto/dh/dh_err.c | 3 ++- crypto/openssl/crypto/err/openssl.txt | 3 ++- crypto/openssl/include/openssl/dh.h | 5 ++++- crypto/openssl/include/openssl/dherr.h | 3 ++- crypto/openssl/include/openssl/opensslv.h | 4 ++-- 9 files changed, 70 insertions(+), 10 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 8945260c3eaf..52c2edf150e9 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,41 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] + + *) Fix excessive time spent checking DH q parameter value. + + The function DH_check() performs various checks on DH parameters. After + fixing CVE-2023-3446 it was discovered that a large q parameter value can + also trigger an overly long computation during some of these checks. + A correct q value, if present, cannot be larger than the modulus p + parameter, thus it is unnecessary to perform these checks if q is larger + than p. + + If DH_check() is called with such q parameter value, + DH_CHECK_INVALID_Q_VALUE return flag is set and the computationally + intensive checks are skipped. + + (CVE-2023-3817) + [Tomáš Mráz] + + *) Fix DH_check() excessive time with over sized modulus + + The function DH_check() performs various checks on DH parameters. One of + those checks confirms that the modulus ("p" parameter) is not too large. + Trying to use a very large modulus is slow and OpenSSL will not normally use + a modulus which is over 10,000 bits in length. + + However the DH_check() function checks numerous aspects of the key or + parameters that have been supplied. Some of those checks use the supplied + modulus value even if it has already been found to be too large. + + A new limit has been added to DH_check of 32,768 bits. Supplying a + key/parameters with a modulus over this size will simply cause DH_check() + to fail. + (CVE-2023-3446) + [Matt Caswell] + Changes between 1.1.1t and 1.1.1u [30 May 2023] *) Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index f5a2d5ad33f8..c71c02911db0 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.1u and OpenSSL 1.1.1v [1 Aug 2023] + + o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) + o Fix DH_check() excessive time with over sized modulus (CVE-2023-3446) + Major changes between OpenSSL 1.1.1t and OpenSSL 1.1.1u [30 May 2023] o Mitigate for very slow `OBJ_obj2txt()` performance with gigantic diff --git a/crypto/openssl/README b/crypto/openssl/README index b9bf50f4b1e5..dbe6bf756e94 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1u 30 May 2023 + OpenSSL 1.1.1v 1 Aug 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index 4ac169e75c23..ae1b03bc92d9 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -97,10 +97,17 @@ int DH_check_ex(const DH *dh) int DH_check(const DH *dh, int *ret) { - int ok = 0, r; + int ok = 0, r, q_good = 0; BN_CTX *ctx = NULL; BIGNUM *t1 = NULL, *t2 = NULL; + /* Don't do any checks at all with an excessively large modulus */ + if (BN_num_bits(dh->p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) { + DHerr(DH_F_DH_CHECK, DH_R_MODULUS_TOO_LARGE); + *ret = DH_CHECK_P_NOT_PRIME; + return 0; + } + if (!DH_check_params(dh, ret)) return 0; @@ -113,7 +120,14 @@ int DH_check(const DH *dh, int *ret) if (t2 == NULL) goto err; - if (dh->q) { + if (dh->q != NULL) { + if (BN_ucmp(dh->p, dh->q) > 0) + q_good = 1; + else + *ret |= DH_CHECK_INVALID_Q_VALUE; + } + + if (q_good) { if (BN_cmp(dh->g, BN_value_one()) <= 0) *ret |= DH_NOT_SUITABLE_GENERATOR; else if (BN_cmp(dh->g, dh->p) >= 0) diff --git a/crypto/openssl/crypto/dh/dh_err.c b/crypto/openssl/crypto/dh/dh_err.c index 7285587b4ade..92800d3fcc6b 100644 --- a/crypto/openssl/crypto/dh/dh_err.c +++ b/crypto/openssl/crypto/dh/dh_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -18,6 +18,7 @@ static const ERR_STRING_DATA DH_str_functs[] = { {ERR_PACK(ERR_LIB_DH, DH_F_DHPARAMS_PRINT_FP, 0), "DHparams_print_fp"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS, 0), "dh_builtin_genparams"}, + {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK, 0), "DH_check"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_EX, 0), "DH_check_ex"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_PARAMS_EX, 0), "DH_check_params_ex"}, {ERR_PACK(ERR_LIB_DH, DH_F_DH_CHECK_PUB_KEY_EX, 0), "DH_check_pub_key_ex"}, diff --git a/crypto/openssl/crypto/err/openssl.txt b/crypto/openssl/crypto/err/openssl.txt index 9f91a4a811e6..c0a3cd720ba7 100644 --- a/crypto/openssl/crypto/err/openssl.txt +++ b/crypto/openssl/crypto/err/openssl.txt @@ -1,4 +1,4 @@ -# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1999-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 @@ -401,6 +401,7 @@ CT_F_SCT_SET_VERSION:104:SCT_set_version DH_F_COMPUTE_KEY:102:compute_key DH_F_DHPARAMS_PRINT_FP:101:DHparams_print_fp DH_F_DH_BUILTIN_GENPARAMS:106:dh_builtin_genparams +DH_F_DH_CHECK:126:DH_check DH_F_DH_CHECK_EX:121:DH_check_ex DH_F_DH_CHECK_PARAMS_EX:122:DH_check_params_ex DH_F_DH_CHECK_PUB_KEY_EX:123:DH_check_pub_key_ex diff --git a/crypto/openssl/include/openssl/dh.h b/crypto/openssl/include/openssl/dh.h index 3527540cdddb..6c6ff3636ae7 100644 --- a/crypto/openssl/include/openssl/dh.h +++ b/crypto/openssl/include/openssl/dh.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -29,6 +29,9 @@ extern "C" { # ifndef OPENSSL_DH_MAX_MODULUS_BITS # define OPENSSL_DH_MAX_MODULUS_BITS 10000 # endif +# ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS +# define OPENSSL_DH_CHECK_MAX_MODULUS_BITS 32768 +# endif # define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024 diff --git a/crypto/openssl/include/openssl/dherr.h b/crypto/openssl/include/openssl/dherr.h index 916b3bed0b59..528c81985633 100644 --- a/crypto/openssl/include/openssl/dherr.h +++ b/crypto/openssl/include/openssl/dherr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -30,6 +30,7 @@ int ERR_load_DH_strings(void); # define DH_F_COMPUTE_KEY 102 # define DH_F_DHPARAMS_PRINT_FP 101 # define DH_F_DH_BUILTIN_GENPARAMS 106 +# define DH_F_DH_CHECK 126 # define DH_F_DH_CHECK_EX 121 # define DH_F_DH_CHECK_PARAMS_EX 122 # define DH_F_DH_CHECK_PUB_KEY_EX 123 diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 029d292e63e3..7a8ba63d9603 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 0x1010115fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1u-freebsd 30 May 2023" +# define OPENSSL_VERSION_NUMBER 0x1010116fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) From nobody Tue Aug 1 20:03: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 4RFmJV06kxz4pnvL; Tue, 1 Aug 2023 20:03: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 4RFmJN2n07z3GC1; Tue, 1 Aug 2023 20:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZlJtYqbtpmzYNIUjVhLSVcXk4OJPl/1KGhJpmYB7CO4=; b=uSONyW0SMheKddQZwrMLaB6KRLQ+be/x51UPhk/ybeJsFSLIeUH9v5eS2nG2oLSUEkeG4O NWsmJfVPAdieIFdUG9MQbVuZ+IJ8KfDKiA/Idwps7yOQfGHTpJ7uN9VODnbNlZ9jrSUBJU XSNZVg+wNJTV4YKPxHX2yZhbiutTaf46FnyeKRclIQP6kke5b4EFbQrd2vOl68w//Qt7JY Ss9VPoowPjjtZ6//EsmS/QiMiScUSxuddoRX4QsXiHj43NJxmc0U9YiaLRuRtJZtqI3W9w dDcNbiMkkWNGWeX6D5nCQB1Qv1aGyBGLO8kU4p03QY+7N1vXLp+V5Q9pKrWe/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920212; a=rsa-sha256; cv=none; b=Voa/lwars3421EwAH/Fj8GzgEVidh5VWRUUDpEa6sA1EMmhk1Q2Qa63y7PBm1rKeDbOYKs VOEoQlKboOxgm4WQXmloUwTBike1Q588Ze5j9s5QRIXvWSvP+9UTnP55GfeO4he2dECbR/ ltHcUGmlH0ZEDjP+lfAF+0tKxubJOZAIYYGBVU10F7kW0qJGW5AUhQLpjgTEmZL8lwvUtp qRWvluB/oFoPHmYttwD/qfCP86art7s/Te12gWrrsYvMhhG6UwPen8En1XxQTSzSMZRYVa Suc2S9H/1k6HXf8Y2JKasxMQ9+u2qs3UoKIrh+9YFoLoLig8+xRhWW8/BH13+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZlJtYqbtpmzYNIUjVhLSVcXk4OJPl/1KGhJpmYB7CO4=; b=As9bgK0MJi6ITfxEt34NmH/l3x4BaUOzMwKl2Qs2rmdx5lJV38XjCWUQdSLQlcy583KGJt 4504LpkQ3hkIB0N4ZGObpS9v1Wur9BcIUuj5PW6HiIJLY/lDxQ0r+DT1BRfDp6odCq1yis DBFboSz1njtaseNyq0Y0vs7VS7QcCn7ADDZuSfPMvyRgfctK2/OWv61iAsBJgyKppo3zsQ YitDWlFWXvLsLEcFYcb60NOKtH6XcSNxwg1avWb+E/NdkFtAkWvgQhrFPhHFWdodRozIQB 5Ckl2JFacCTJBfvo0hnEeNzId5bqJVCLzoJaQTqvQUHiVXiGziQSWTU7Lh8i/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 4RFmJN1Fv7zqvL; Tue, 1 Aug 2023 20:03: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 371K3VcQ012648; Tue, 1 Aug 2023 20:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K3VSo012647; Tue, 1 Aug 2023 20:03:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:03:31 GMT Message-Id: <202308012003.371K3VSo012647@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: bed3ae1d7863 - main - bhyve: Fully reset the fwctl state machine if the guest requests a reset. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bed3ae1d7863ac1e0b1e82ae7bf952937e921efe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bed3ae1d7863ac1e0b1e82ae7bf952937e921efe commit bed3ae1d7863ac1e0b1e82ae7bf952937e921efe Author: John Baldwin AuthorDate: 2023-06-29 18:27:12 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:45:41 +0000 bhyve: Fully reset the fwctl state machine if the guest requests a reset. If a guest tries to reset the fwctl device while a pending request was in flight, the fwctl state machine can be left in an incomplete state. Specifically, rinfo is not cleared. Normally the state machine for fwctl alternates between REQ (receiving request) and RESP (sending response) and ignores port writes while in RESP or port reads while in REQ. Once a guest completes the writes to the port to send a request, the state machine transitions to RESP and ignores future writes. However, if a guest writes a full request and then resets the fwctl device, the state would transition to REQ without draining the pending response or discarding the received request. Instead, additional port writes after the reset were treated as new payload bytes, but were appended to the previously-received request and could overflow the fget_str buffer. To fix, fully reset the fwctl state machine if the guest requests a reset. admbugs: 998 Approved by: so Reviewed by: markj Reported by: Omri Ben Bassat Security: FreeBSD-SA-23:07.bhyve Security: CVE-2023-3494 --- usr.sbin/bhyve/fwctl.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 5227c06f0da7..24fedfab8885 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -67,12 +67,11 @@ __FBSDID("$FreeBSD$"); * Back-end state-machine */ static enum state { - DORMANT, IDENT_WAIT, IDENT_SEND, REQ, RESP -} be_state = DORMANT; +} be_state; static uint8_t sig[] = { 'B', 'H', 'Y', 'V' }; static u_int ident_idx; @@ -200,6 +199,7 @@ static void fget_data(uint32_t data, uint32_t len __unused) { + assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str)); memcpy(&fget_str[fget_cnt], &data, sizeof(data)); fget_cnt += sizeof(uint32_t); } @@ -344,7 +344,8 @@ static int fwctl_request_data(uint32_t value) { - /* Make sure remaining size is >= 0 */ + /* Make sure remaining size is > 0 */ + assert(rinfo.req_size > 0); if (rinfo.req_size <= sizeof(uint32_t)) rinfo.req_size = 0; else @@ -441,6 +442,28 @@ fwctl_response(uint32_t *retval) return (0); } +static void +fwctl_reset(void) +{ + + switch (be_state) { + case RESP: + /* If a response was generated but not fully read, discard it. */ + fwctl_response_done(); + break; + case REQ: + /* Discard partially-received request. */ + memset(&rinfo, 0, sizeof(rinfo)); + break; + case IDENT_WAIT: + case IDENT_SEND: + break; + } + + be_state = IDENT_SEND; + ident_idx = 0; +} + /* * i/o port handling. @@ -468,18 +491,13 @@ fwctl_inb(void) static void fwctl_outw(uint16_t val) { - if (be_state == DORMANT) { - return; - } - if (val == 0) { /* * The guest wants to read the signature. It's possible that the * guest is unaware of the fwctl state at this moment. For that * reason, reset the state machine unconditionally. */ - be_state = IDENT_SEND; - ident_idx = 0; + fwctl_reset(); } } From nobody Tue Aug 1 20:03: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 4RFmJV0MPsz4pncJ; Tue, 1 Aug 2023 20:03: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 4RFmJP456Xz3GMw; Tue, 1 Aug 2023 20:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eBSdMj3ITUeKzKIIPtdap8h5nyrO91qimkEag0cldrg=; b=eaEC1GmXrbyzto12P+ettjLSCwFCQvOTZZEpY8gBu/rGKEbKohL/G3DcHKOo/rW9dnGXHL moqTVsE1l3rtGC5rCYY9+iMvhrJ2TiCmnnKU6ZS0EoO/UJyojpGU9sBnHrGqT9Bd4/0ZVX Egm4w42x42D4CBvEQNs+Qau68rtVzesl2+1E0NNd5tDLlaC36yU5HLxZMItcBm4+OCs+Pp Y0wLmV0Rj2OJLQtjDRflYiyHQ0mJ++jmncoHwshDNALDBwVtPRO+XPNQWSz5JA/P+VOpm1 bRIY/5HlQfe/UuD7ALxL6AFv7THm1C8njybm62fPmIfjV5wm03OfjvdunPL4MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920213; a=rsa-sha256; cv=none; b=gn5XV5HbRIxsnQw+uEnZ7yW/vpHqbnOPE75YrnKrdC/OE4kHSjGot1MyrtXd6jwzgF9Ugf OHlqfXzYoyn/xhvl5Syq7dvqbxRQRkilo7DGeFD2z/BRg3I0spExg/pODLZwNA+Ce0sZvF TUqdNiOSYQTeUKCpbsms3G3eOXuM1bV1Sxc6+Zss7nJ7Nuj/kKMwiit1wJnPzwhgLOlhgV PzTIr8PwwdIeHW49EbWV3Je0kd3P3kJb94kGYhfgnyV5m7vH3MGUxcnjmXCduT5dPunIVB 0nQNCRiGJPU9+nuEklTnYNN1vnVQaRWfl93ofe/Q1916l30YPFARBl/d2r610A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eBSdMj3ITUeKzKIIPtdap8h5nyrO91qimkEag0cldrg=; b=DLd4iTvkKNYfOdeaXgxlBlmlpQYhqDnjCemTzwD2Wvb7alfvxwXDAr1WKL4PsvP5Ppsp+b 8P4FRlkyP5eGzwsFM+0EDRvC4y+e1TOb2N1M68iNaNCaGDvG3suErT4YWoQ/oR0Bs+xLZv sAn8iLCjaO47hbHtT8IvTEYvt0sHeREGGDXU+/IZVeXS/tt+D+2vWGB7XD6SZRTBa/QYmn ZdwOyC1TNL+G71l5BzVfuqMPsM4gohS7Ztl54V12ILTQBk6aI0cRfwHHy/+IHuwN7WNPsn hU3b6NjouA4jn6jBji2JJI+YNC3SNtX0eZpn5ta2T0ehhWvMtdTg81l8C8rRVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmJP15DmzrJ4; Tue, 1 Aug 2023 20:03: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 371K3XYd012667; Tue, 1 Aug 2023 20:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K3XrR012666; Tue, 1 Aug 2023 20:03:33 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:03:33 GMT Message-Id: <202308012003.371K3XrR012666@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: ff3d1a3f9d71 - main - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ff3d1a3f9d71e706f320f51bae258e4e1a51b388 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3d1a3f9d71e706f320f51bae258e4e1a51b388 commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388 Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:45:41 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 5acdc1b20981..9837c6662888 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -861,6 +861,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:03:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFmJt2Hn1z4pnWN; Tue, 1 Aug 2023 20:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmJq2gb4z3G56; Tue, 1 Aug 2023 20:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTfwB1J7wezmenYJJrz2IPU2om1TQFXaZm9D5fdt5U8=; b=QO42P6s3C19clVdbgOWBGI7w0/m7CMa0XOdJsW0ksI7M9sCOXrnPHveBG81GGBXhX6f3fR 9Kbyevpw8ZHEHLcZ7lDxLfJXyheCquat0m08GrV3izx2D12mWeZqVQ8soDXOR8dRd3DRpj opRXJZBYQYks7Mh4vEEf7fqLog1Nvv/I9v+GZF2kIiWeo0jJXQ3DJ4rg3aVQJAxrQSWJMj Kx9GB2HhSyOpugSjQR2stTC99Ele4JM08PklPF22H4K0QHkOtdNrUM4XHkqNGxihTwYvwo F+D+EDeHVfKqNIUEAUcY7dsEii3RCrzxYJTB9pHJMAAQJoq7vwkENpz1sPTQAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920235; a=rsa-sha256; cv=none; b=E3RPjoEoMPjvJobSpedVMN5MSjmvoqoxFtValpd03fEl2id0vajr0laziayOGUJeG/T7Po eWNXT6KebIgtGRShe37pNoh5a3ZN6jtSLNvvpmOrAnHa7lsRfMWmGx8oQGimLWINVpRXYx uhIi4TOzYuK7YIpcFIKThzU2B/kE8eNx3VvkY+mLTjlDEj+AZYVB+DPWz9oESmBO476Apx fZSYzX5bd3D0qXbSWVEu8JEc1mPDHZ+6GdvtdhB4gYqsn7aZdNNBm352baYDf4XxULkVYT 7aWfFE5BICemXs3359ZmnQBE03ixh26Vno3AIZq7mawyuA/u9iIOkgWPEL0CNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTfwB1J7wezmenYJJrz2IPU2om1TQFXaZm9D5fdt5U8=; b=GqbISdNMDPUEfdA+gr9S839D0FX2LSDdZ/e9hXtz4VZJPpTKR2MCbkuiKKfIhoPkYBCoxu AfHLLXYW9HKkmrtYfZ07m5GtT7S434oa0VzAbfxPSoVALC7u7aRahmT2ASvdFhMqow5nZ2 TmzGrMjrktb2Fwsw96SJH4Vg61KCxA6d7POcnTrKM6SCV0f9//pbBY1WsuCggs442kI3nZ JRGEEATHb0BRCryKAbVn3PKmS0hbcKN/p/331LCSF7jzbTPngkKEsQXCzFhbttNOfvohVC WHSzBXQeYy4gtv3Xdjzxy5xx4sMxTF3wEsi/jK/3w6XZvRjf+H0s/0bdN+kKaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmJp6DGSzr1S; Tue, 1 Aug 2023 20:03: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 371K3s1R012806; Tue, 1 Aug 2023 20:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K3sxL012805; Tue, 1 Aug 2023 20:03:54 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:03:54 GMT Message-Id: <202308012003.371K3sxL012805@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: 9fe302d78109 - stable/13 - bhyve: Fully reset the fwctl state machine if the guest requests a reset. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fe302d78109b12867bd933bb68cd900c9940b7d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe302d78109b12867bd933bb68cd900c9940b7d commit 9fe302d78109b12867bd933bb68cd900c9940b7d Author: John Baldwin AuthorDate: 2023-06-29 18:27:12 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:53 +0000 bhyve: Fully reset the fwctl state machine if the guest requests a reset. If a guest tries to reset the fwctl device while a pending request was in flight, the fwctl state machine can be left in an incomplete state. Specifically, rinfo is not cleared. Normally the state machine for fwctl alternates between REQ (receiving request) and RESP (sending response) and ignores port writes while in RESP or port reads while in REQ. Once a guest completes the writes to the port to send a request, the state machine transitions to RESP and ignores future writes. However, if a guest writes a full request and then resets the fwctl device, the state would transition to REQ without draining the pending response or discarding the received request. Instead, additional port writes after the reset were treated as new payload bytes, but were appended to the previously-received request and could overflow the fget_str buffer. To fix, fully reset the fwctl state machine if the guest requests a reset. admbugs: 998 Approved by: so Reviewed by: markj Reported by: Omri Ben Bassat Security: FreeBSD-SA-23:07.bhyve Security: CVE-2023-3494 (cherry picked from commit bed3ae1d7863ac1e0b1e82ae7bf952937e921efe) --- usr.sbin/bhyve/fwctl.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 5227c06f0da7..24fedfab8885 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -67,12 +67,11 @@ __FBSDID("$FreeBSD$"); * Back-end state-machine */ static enum state { - DORMANT, IDENT_WAIT, IDENT_SEND, REQ, RESP -} be_state = DORMANT; +} be_state; static uint8_t sig[] = { 'B', 'H', 'Y', 'V' }; static u_int ident_idx; @@ -200,6 +199,7 @@ static void fget_data(uint32_t data, uint32_t len __unused) { + assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str)); memcpy(&fget_str[fget_cnt], &data, sizeof(data)); fget_cnt += sizeof(uint32_t); } @@ -344,7 +344,8 @@ static int fwctl_request_data(uint32_t value) { - /* Make sure remaining size is >= 0 */ + /* Make sure remaining size is > 0 */ + assert(rinfo.req_size > 0); if (rinfo.req_size <= sizeof(uint32_t)) rinfo.req_size = 0; else @@ -441,6 +442,28 @@ fwctl_response(uint32_t *retval) return (0); } +static void +fwctl_reset(void) +{ + + switch (be_state) { + case RESP: + /* If a response was generated but not fully read, discard it. */ + fwctl_response_done(); + break; + case REQ: + /* Discard partially-received request. */ + memset(&rinfo, 0, sizeof(rinfo)); + break; + case IDENT_WAIT: + case IDENT_SEND: + break; + } + + be_state = IDENT_SEND; + ident_idx = 0; +} + /* * i/o port handling. @@ -468,18 +491,13 @@ fwctl_inb(void) static void fwctl_outw(uint16_t val) { - if (be_state == DORMANT) { - return; - } - if (val == 0) { /* * The guest wants to read the signature. It's possible that the * guest is unaware of the fwctl state at this moment. For that * reason, reset the state machine unconditionally. */ - be_state = IDENT_SEND; - ident_idx = 0; + fwctl_reset(); } } From nobody Tue Aug 1 20:03: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 4RFmJt1BKjz4pnrB; Tue, 1 Aug 2023 20:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmJq73bcz3GYF; Tue, 1 Aug 2023 20:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZu3oGBb3goOR0OtpGoJxp+bKvA21+NrkaWi8XWWUCg=; b=j+VuS5rOzv5h52xGmNqvMMYnmrpCrICVJ9u2cRdwmg4nzaLB34MNidBVYi5CIw9HFic0ZL SnIyZEAkDGwZvnFQdFyZ6sC9N74f/O6YVTlrnBQJ9u4TtWPnLOk9ZMI0SVlUJc2ty2Gb4l 9AVkfOjsnH9qqzFSTVyM1dlHocf8JW64huAfzgSfQtuZ0AobTaFMIunQUY+0ZzESMWnL8L HO/Fi9BYe8V1vhGnjC2otCvqbnUZz/sec9z5eoQazYzXyayo5F1D46+fxWjr8OgepApvTz keHzi7OPPtthu2habBe9ESN+7WLra4Wb38NJaRi9K5rVkCM1unkjO0hsGLEhsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920236; a=rsa-sha256; cv=none; b=MX7YC4k/NKk60mfpSyMOFIT9s4pNtRi9DVF1HkOsT3yRbM9+BR/+YFRK0WkTEKSDlYdQhg a1isx86KPBxkq6jcaPQMYANj13Xv4S5DXNBw43NWncCnEKm6WGY1nP/zFEMWus/2xBZ7BB chvXrfLCz+Yf4eeQ5ZtA2cK8xihzi6ZX6uUdBmj1hxxoJEFw5DkeE4JdvGwPNgic/E+c/i 8hkJhCxowsfjrPvX3s7zAxvNCIpXrxrokGvc8GJO1g3qJbN4r8IaY6AKH9v1H83EAfUYIG DzQSnVjbGAQyLpO4ZInEXj/RNI+RnMQ5zKMRLtfWk2tK8YRosP/U04uomgv6LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZu3oGBb3goOR0OtpGoJxp+bKvA21+NrkaWi8XWWUCg=; b=ZyLsdm8k6PmPEcnfWlulRqRdVB1jfZgh23MQcvxt074hcjUBzTKfv++2J7Oc8bsHwt2JH7 CT1B7g/p0JnrqSXTsSYctZ0ondwY+8czK24g4CtfCfOW8KXppTQb3CzH5klEfYX2c74gob dY8fBPtuDJ2V8jfOZ+8LiEu92xK4tH/Ic/K4wsWq/iLOT1x9ysG/kMXm25ldZNPtNoukNy k0hGprdK+2tOd5Q2X36VNwUK/vQZtorZ+nk/8uP8aqBX4dGkjp0gUKUakV36KllVfqdIJ+ l7iLEYQWB9xJiOmrZwC4Klj7z/FjgOj2kMTkr5wybJ/k7tzvOf650jPRjBY+zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmJq66KhzqvM; Tue, 1 Aug 2023 20:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371K3t1f012825; Tue, 1 Aug 2023 20:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K3tcM012824; Tue, 1 Aug 2023 20:03:55 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:03:55 GMT Message-Id: <202308012003.371K3tcM012824@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: 9515f04fe3b1 - stable/13 - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9515f04fe3b12b9e6ef6c802b647dd4cbdba621b Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9515f04fe3b12b9e6ef6c802b647dd4cbdba621b commit 9515f04fe3b12b9e6ef6c802b647dd4cbdba621b Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:49:07 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index e0857d3af3e8..023470b20033 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -806,6 +806,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:04: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 4RFmKK6xxlz4pnkt; Tue, 1 Aug 2023 20:04: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 4RFmKK59skz3GWC; Tue, 1 Aug 2023 20:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTe8f6PdpMHkpbQ8WiSHeoaEI0MgqKnHVepS7MT7Q4M=; b=qDIlnzKyf/ooOyS+c9uc17QkOvfwy8DX0gku1UDY174V3jXLgXJLSOle2oNasLnXL1qpCj xPskr+Q4NAooB8KmMQf4rXYIrSHBmxae8Rcm4BiYta3WWSNXbZIevEMXTUnn0DzHF6YsXs zGbEHTTxVbQAJphZkrnsenZ2vFfkNyvajB62UEZigEK+Yk0uIolZCR4cpATBOerZdBApxv oBeqQWBVd1qxGXCCeX4e4ZVa4/E+/xLfGOgzdrcjfGkjFya/TANHQj3PFlC/sXGMykPdKb J0eMGBWsUPc2qOj1gUMKClKJHk9vVKbATKD5X7wpXfcPTMLhlbJxW66M1I+TMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920261; a=rsa-sha256; cv=none; b=MC31/Vjl6CeDQxXsREV9tAbl7wjUo4OBK4VwdvLQlBlGoyyP5Ux7rr7vP+u1yagkC/JBXK oEphjSXwNHaFW/+jEv7fzYw8Qt/GwwAUlLcnemFAYmMyS5ndR1dnih43KzlxLnqm4Hkywz 7/NOMjAU0KPZ1oWHqqEgEjeP1Udcl4lj4DQDE5tNeriBKNbwu2KNBzs9iKsCz6bAYuiezY t2LIOavJN8fGElqVnNR1zt1KAOW4wWYRGDUK7q9FZ27JKHLcGUQ64q5pp35cS3cWINNOEX cVduUJH+JiGFCgMT/df7ooel6sqvGLmcMom3vUOzfVZWEs0noXSCXGlrN10EYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTe8f6PdpMHkpbQ8WiSHeoaEI0MgqKnHVepS7MT7Q4M=; b=Fd4OujeANZzIl4jKDs3T/6orn0GhTJCxNrX71s0WMAS4X/CmqyaIwDTv7Osh6ey8Bv4qK8 6JElTDxhfE/ZVKxsKt6rYk6hB/cHfK66lU9ji2tGPo69/dxQGvScJ6pigUQ8qRmxhbmFqM Q17DcBuxlVbbLu6asKl3f69WCZxDULuteOgiP9RMnCqsNbUGlV9TeC2SMIZpJWrnqOR5sI Shl3ZU/4NA4+UKF6du/vQh43uZorkLLcZ7O7zIePa2JOsO7KIOhXHXq3E3FH8vR/gSU77p UKyOHJn3/1kitB+Rk87e/Nms0jYPVLVDe6qfaalQrUvt3RMIcokqBVUO+M6MGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKK3xDbzrMD; Tue, 1 Aug 2023 20:04: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 371K4Llq013106; Tue, 1 Aug 2023 20:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4LrK013105; Tue, 1 Aug 2023 20:04:21 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:21 GMT Message-Id: <202308012004.371K4LrK013105@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: 4341433a673f - releng/13.2 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 4341433a673fde3e1c1554b9daa15d4db71f6edb Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4341433a673fde3e1c1554b9daa15d4db71f6edb commit 4341433a673fde3e1c1554b9daa15d4db71f6edb Author: Mark Johnston AuthorDate: 2023-08-01 15:12:45 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:51:39 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 17 +++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index a19fcc6cf780..8cfa9ff88fd7 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,23 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230801: + 13.2-RELEASE-p2 FreeBSD-EN-23:08.vnet + FreeBSD-SA-23:06.ipv6 + FreeBSD-SA-23:07.bhyve + FreeBSD-SA-23:08.ssh + FreeBSD-SA-23:09.pam_krb5 + + VNET and DCPU modules panic on arm64 due to linker relaxation [EN-23:08.vnet] + + Remote denial of service in IPv6 fragment reassembly [SA-23:06.ipv6] + + bhyve privileged guest escape via fwctl [SA-23:07.bhyve] + + Potential remote code execution via ssh-agent forwarding [SA-23:08.ssh] + + Network authentication attack via pam_krb5 [SA-23:09.pam_krb5] + 20230621: 13.2-RELEASE-p1 FreeBSD-EN-23:06.loader FreeBSD-EN-23:07.mpr diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index e2d05fc79aeb..85d2cb24a37c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Aug 1 20:04: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 4RFmKK4rQ2z4pnrP; Tue, 1 Aug 2023 20:04: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 4RFmKJ4CXcz3GN8; Tue, 1 Aug 2023 20:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/9x9AGrWU57iSXJsnAokBi8Hxz7i7qPM3rcJuawnQI=; b=nOHBAcD2vimYkm3KZYfUGoJNgRx/wQKFrXJRlPZDWxE2fYsZbWi3tkvdCKIylwgWhWaNUT hmq/ASBTHHhGLZrQea42kPYsjSqRk/Yn6EwOahtkCWGk4Yw0R02ibDeIIe72cCiqnCaTpu 4dkqYuO4vDG8HxI0AxiXzcoT4K5JrYV0+2uETgfG8jwxrk2USYJRoPAlUb6KqF9LrGo4u1 8MYYyR9v3IOATGo3bds7AiEIu0IHs6nOAgxeX6A9pWz4m1uBuxK31FO6mhfgekrRLXV+K/ 3FBtqaYWi+toq4vg+B0L603FHMgWYBKlV85jOP6QwTlo5l1MFWHU+JPSMb7jDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920260; a=rsa-sha256; cv=none; b=Zn+wYNc0WQUs0+4Khf1Gdd5eTqTUvHHkoSABBYjEFFDA2mLs1l3pEeP/DphO0xmGXdCPQ6 kRZVHtXIbsxFl48kfHwY0knKHowcSFxMy0OmZ3U/bAHtr4M1V0LHe1C5dB2kGIPLi78s+S h2cBmmhInDx443GeeBaiG3RloowV/v9lHyfYOLdi7kL1ypehAgsV5qBJPfhZMHQFZJfakC iI9To08RZRdIRn+jy3nX6n5VDumTm1PMSUhDbj87MxFfa6U07YUbRNtz+HextdxLxR/pxN 2j5Tmt9NEOpRLAQSrJu7J1+07aSm9r1EL9WS1HeXHCwpxsTNfC5TmVN8gQ/i2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/9x9AGrWU57iSXJsnAokBi8Hxz7i7qPM3rcJuawnQI=; b=tRYAPLJ3skYGJJbo53VJUdtFNQgTBdLd7EnrIoBMcBTT98FR9P2sLwDp3BcdncYj03B0jV f6MZP1+kf9z//RhwKDhh0qbyCxBIS9j0PxG8dpLJJ+HCKKaNOOaKAIgYlcBFYHre1nLNuR 3clEvzeJU4qwSYlTQYiMq7AUvRCaI46RpcWxhfABp1Snv3v2/wasFF8NDrCJNS11/Rl3O9 +fdM1O6yuJ2KZuI7j00+F7/5qAMD6nvqSH9XTLfIW463U7MDF2BeBTFrkeCYEevmp8BWca odipEzfR4X9RZVrFM5i3dm/SgePNrsrXF7fKhnxxKYTZvPJjWCFIEE+bdpAt8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKJ3160zr1W; Tue, 1 Aug 2023 20:04: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 371K4Kn6013086; Tue, 1 Aug 2023 20:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4Kba013085; Tue, 1 Aug 2023 20:04:20 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:20 GMT Message-Id: <202308012004.371K4Kba013085@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: da38eaca4a22 - releng/13.2 - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.2 X-Git-Reftype: branch X-Git-Commit: da38eaca4a22bc8ab65df825c910adbf02536873 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da38eaca4a22bc8ab65df825c910adbf02536873 commit da38eaca4a22bc8ab65df825c910adbf02536873 Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:51:27 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) (cherry picked from commit 9515f04fe3b12b9e6ef6c802b647dd4cbdba621b) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index e0857d3af3e8..023470b20033 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -806,6 +806,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:04: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 4RFmKK44Wpz4pnjP; Tue, 1 Aug 2023 20:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmKG0KjDz3GP2; Tue, 1 Aug 2023 20:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOi7JfGdZlDKMYIuNuX8/yg7v3T/0DEGZhGVmK07t44=; b=udxAkq4ldQCh6We0f5xx9SMtOLnqUJF3/wJU2ovgffTIYubWFHGTec3gxVQqNCNjJ9udWP WPaTRV1W9iZz231PWkpUvjcQ1+Y96TdXydrWk3kGTXfZVZth1EDP3fWbiFlL6/WenXcYCJ cswy81cV4kBeaHVU8NQ6WVp7XDUTiISmEyGHJcJiruvyS7Ig67o3vzSHQypSYiicvVSERS DP7G5Vs4BgByCn4RudvndWfyolVjJvzP2/0MAFkCk7vNSplFt6x+slndY3DhAu/r7c0y8n VwMwpm+qWh2ygNvsVaA2png445XUOrhhYadtAVaKlbF8sELsEa1WHii7Gz9GeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920258; a=rsa-sha256; cv=none; b=qVGwrLJylZBtCHVEpG8ltKUfuTcG89tdUqLSFcIZ7AvzhuEjgW7XvP8Z+i1cqm+6i3QY5W m7N7TFEGMbQdSC9iLzKcfhVk6h0O2QFYyzjcEbD33QrfcDV5K7YbnmPF8W15wzwF5wxP4f N1lw8B4l6qf/ATj3MmqH4TFeCRj70E9SoU7q+Uvpo0rJVYR5Iq/qjrcI/zdCyHY3ApdSMv yVRmxvWgl6duyrD/an0/3lNWposv6+MVGUHwEXbsSGI7yGnDO+cFEV2vF4xzDYdL6sYXQo SZHKUm5j0AKs2Q1rpIcdk6wDFdk3v5BJDJtg+P2KFdT/FFKREseKfQLzgtKvLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOi7JfGdZlDKMYIuNuX8/yg7v3T/0DEGZhGVmK07t44=; b=YbSAVToLuI/Tj2XF1dNZzFVZPxyT1znp/nT2FkI7xRvanlSA5MuV4UEwB9JQ+fPqcXGkYl pG1g3hkf+r36LrcHEyA58uzI0zL1TOEjyfKbnpgFjIkNsCANnWWOp+VidoBawBpIWf9iB+ 02i+G1UQqlSzSPRP9CXNeBtz3QPaBsSfNiEyD36OR6McjvHBQcbUowD/RiLZxkeQv2iWzK GwYn/XoksRG/0b9LXmCIBzAGHtabUOTh9n18fJQgbRFw177TmkPd2Pzxos4Ar6uuim8Khl A7snY7zNgeWmVQzONzheKTwocvjqynYUC1ob3W8zg2jTc5lhnklon68lE7GYpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKF0jyNzrG3; Tue, 1 Aug 2023 20:04: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 371K4G5t013020; Tue, 1 Aug 2023 20:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4Gge013019; Tue, 1 Aug 2023 20:04:16 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:16 GMT Message-Id: <202308012004.371K4Gge013019@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: e3e6fc371322 - releng/13.2 - Work around VNET and DPCPU related panics on aarch64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.2 X-Git-Reftype: branch X-Git-Commit: e3e6fc3713229e5075473b9e0e9a66699e8a322b Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e6fc3713229e5075473b9e0e9a66699e8a322b commit e3e6fc3713229e5075473b9e0e9a66699e8a322b Author: Dimitry Andric AuthorDate: 2023-07-23 13:48:36 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:47 +0000 Work around VNET and DPCPU related panics on aarch64 lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, which breaks VNET and DPCPU when used in modules. Until VNET and DPCPU can be fixed to deal with these relaxed instructions, disable linker relaxation for now. PR: 264094 Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41156 (cherry picked from commit 80e4ac2964a11edef456a15b77e43aadeaf273a2) (cherry picked from commit f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76) Approved by: so Security: FreeBSD-EN-23:08.vnet --- sys/conf/kmod.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 2a2ab1d02277..b616be508ce4 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -168,6 +168,13 @@ CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer CFLAGS+= -fPIC .endif +.if ${MACHINE_CPUARCH} == "aarch64" +# https://bugs.freebsd.org/264094 +# lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, +# which breaks VNET. +LDFLAGS+= --no-relax +.endif + # Temporary workaround for PR 196407, which contains the fascinating details. # Don't allow clang to use fpu instructions or registers in kernel modules. .if ${MACHINE_CPUARCH} == arm From nobody Tue Aug 1 20:04: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 4RFmKK4TNtz4pnwj; Tue, 1 Aug 2023 20:04: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 4RFmKH45M1z3GCD; Tue, 1 Aug 2023 20:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K3aJPImusP6LljZ8ddbFiFjYNw8hc3guNAgMtUDyObk=; b=VXU8weg30fbhEhFOL9zPovrwM4NmM7u27oOZDL507tVnjB/9HJbQnPH2evpXeQ6mKGmUfM zle4Q7+bXOf00AKy2VX99cYUOfeHRXS4p/lUz6bu6UZUrmnSnRAfdyVUiBh8p8pPmlPun6 tW6/0ptp9Kbu8aBRpUdQM5qnZYPE/ipWA9Bb1A0d3OXHZWAN3h03pTkNLszFEWIxgG45EV Dtht5J7ZaGQpMEd/iy7QAjX2pwW5QAERfuUvNUsxffD8JaCG1VzdFqNiVBVVaerTZc8GgH EH7e9dqmo3hYpNro3fqUqPdLZxg9IIXCe8D/WKlS7rNKNfT7/Q34nM/tna5c5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920259; a=rsa-sha256; cv=none; b=eHwIVRS7WSOejTdEo5p5QwkctKJiXZgeqhN+60ugJtPxX5kmBIjC2c/GOUNrpExtQH/p2T TWkftCBdgfcMUQ1bYt5VyYYfEQ3EnMG/bfDS3AdSzfH342wm+SRZZ3Iw1N4Z4lhiHZQrUT iQyeR0/JUFIiPxVW4hussayisG6zF66DHzesFUrqLGioY3JFTCfl78HPDYW+A49d2xWVwR nU9sSfTa5/K0IH/K6Ff7BYtCmH/ytv88kx1uYrvLyTDU3muVx5tPBJROpC5lzogFvKPG6g kUctJklTpeMEfJsibkcRYPbBsMwmpDAmPFVdEMt+U+pBSdXuiURZp8cbfu8Qhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K3aJPImusP6LljZ8ddbFiFjYNw8hc3guNAgMtUDyObk=; b=tTlcxZ5QXVYBqmRsr2eoBz9keaolJIpqCtJ8wysqAJqkS5Lx7rR6gywOfKB+wJt1eY655/ QzBzBxZSY91fHQlW9rm1qSgj2845REF+kBW7EK4mAwgqCgck0xVDcs4+uqinkq1P2iJI2I NtoQCD7wUs2HQtRoyOj2xPvNdDxAnwJwpS0fM7ELjIfY7bZCVOgJ5pEPLBEY2leTcCirXz DVK4AkPQu8t9w34gDbz1+T82Hos64u5T8i+yzDbEP2cvlomSwEaEo+mzSD/pAuSvSzNPeR 55xFR3UFM4pzihY5VY8PczahEBb05wkLP2pLjVw+HKAA2fF5g5iNERhd4GMFKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKH24FDzrJ6; Tue, 1 Aug 2023 20:04: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 371K4JPi013060; Tue, 1 Aug 2023 20:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4J3T013059; Tue, 1 Aug 2023 20:04:19 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:19 GMT Message-Id: <202308012004.371K4J3T013059@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: 2bae613e0da3 - releng/13.2 - bhyve: Fully reset the fwctl state machine if the guest requests a reset. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.2 X-Git-Reftype: branch X-Git-Commit: 2bae613e0da39531422b20910366195373ffa794 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2bae613e0da39531422b20910366195373ffa794 commit 2bae613e0da39531422b20910366195373ffa794 Author: John Baldwin AuthorDate: 2023-06-29 18:27:12 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:47 +0000 bhyve: Fully reset the fwctl state machine if the guest requests a reset. If a guest tries to reset the fwctl device while a pending request was in flight, the fwctl state machine can be left in an incomplete state. Specifically, rinfo is not cleared. Normally the state machine for fwctl alternates between REQ (receiving request) and RESP (sending response) and ignores port writes while in RESP or port reads while in REQ. Once a guest completes the writes to the port to send a request, the state machine transitions to RESP and ignores future writes. However, if a guest writes a full request and then resets the fwctl device, the state would transition to REQ without draining the pending response or discarding the received request. Instead, additional port writes after the reset were treated as new payload bytes, but were appended to the previously-received request and could overflow the fget_str buffer. To fix, fully reset the fwctl state machine if the guest requests a reset. admbugs: 998 Approved by: so Reviewed by: markj Reported by: Omri Ben Bassat Security: FreeBSD-SA-23:07.bhyve Security: CVE-2023-3494 (cherry picked from commit bed3ae1d7863ac1e0b1e82ae7bf952937e921efe) (cherry picked from commit 9fe302d78109b12867bd933bb68cd900c9940b7d) --- usr.sbin/bhyve/fwctl.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 047a1050e7fd..1ed157fd9d48 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -67,12 +67,11 @@ __FBSDID("$FreeBSD$"); * Back-end state-machine */ static enum state { - DORMANT, IDENT_WAIT, IDENT_SEND, REQ, RESP -} be_state = DORMANT; +} be_state; static uint8_t sig[] = { 'B', 'H', 'Y', 'V' }; static u_int ident_idx; @@ -200,6 +199,7 @@ static void fget_data(uint32_t data, uint32_t len __unused) { + assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str)); memcpy(&fget_str[fget_cnt], &data, sizeof(data)); fget_cnt += sizeof(uint32_t); } @@ -344,7 +344,8 @@ static int fwctl_request_data(uint32_t value) { - /* Make sure remaining size is >= 0 */ + /* Make sure remaining size is > 0 */ + assert(rinfo.req_size > 0); if (rinfo.req_size <= sizeof(uint32_t)) rinfo.req_size = 0; else @@ -441,6 +442,28 @@ fwctl_response(uint32_t *retval) return (0); } +static void +fwctl_reset(void) +{ + + switch (be_state) { + case RESP: + /* If a response was generated but not fully read, discard it. */ + fwctl_response_done(); + break; + case REQ: + /* Discard partially-received request. */ + memset(&rinfo, 0, sizeof(rinfo)); + break; + case IDENT_WAIT: + case IDENT_SEND: + break; + } + + be_state = IDENT_SEND; + ident_idx = 0; +} + /* * i/o port handling. @@ -468,18 +491,13 @@ fwctl_inb(void) static void fwctl_outw(uint16_t val) { - if (be_state == DORMANT) { - return; - } - if (val == 0) { /* * The guest wants to read the signature. It's possible that the * guest is unaware of the fwctl state at this moment. For that * reason, reset the state machine unconditionally. */ - be_state = IDENT_SEND; - ident_idx = 0; + fwctl_reset(); } } From nobody Tue Aug 1 20:04: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 4RFmKK4TN4z4pncV; Tue, 1 Aug 2023 20:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmKG2nDsz3GC9; Tue, 1 Aug 2023 20:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BG+ZyUpmx2+6aXKigXdxiQJbj3j5z4H3Z7VtT6t5yPI=; b=PdJ2C53U9llSvSjNorKkh0Wyj0G1falKyjA5jrcCsW8riSl09n6VzPd+vABOVCW90ln8R1 V9SuEt5leZKtaeBdXCWAR/CBKvbv8Nay1CUhieD9TjmbH9QUxA5bQ38S8nf0e78tRTIYEG Cqv9qsQmE2D7xN0S71Fs3c0oPqTbHJkI3eqFRO0mSjE7WX3dX1ak9SqByVpBQqDXC5lgiL 9NFI1Y8/hW4U6AzcomT/drfPXROQf8OX3oiqc0fFPN2vewU/fbh2ilwRvSBw8GMnIg7cBd eMpbaRqRU0hASB7pvgl3IGf6Uc2nHFCEdFbCcSnlGeZUGUlrf3Pal9p1vW6KpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920258; a=rsa-sha256; cv=none; b=gOZFjV6wp1fPqrfDItsMxpdqaCZ1WHw8zbidE3VTLQ46NB9uFB+NkjnJZbOlyk2crvDfIf X8lFd8wRDPU/Ar8aw9TEZcQaNG2Yqg9Cn4RvRnOH0ullsnzppjQjhA9LXzN7lGVf+DmDPI jKtnODr1ceH1RX1jtBDcsGpgtiRbEJ5nbvXPBENpmEgp2ZQ2CCN+3Oec9yHl8l4uvrWBjn nWZL+TdGZ7lfSUK1hyPVQ4zEVZlUJp2yioCyqJ9vVcKOfS3MHmHC0zqZoaDVL0zMLATM6b hgOlGtYvJWSE7J5a8iFEzsPpsrgpQRXNaPnm+8JyhqNYMr2gjXNDwUKv3QUa2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BG+ZyUpmx2+6aXKigXdxiQJbj3j5z4H3Z7VtT6t5yPI=; b=dE0Y8h3Qkp7555PNWLQ2Fb+lMJR+sxFjFjYlARKxmoiwudkXsGkIUd6vkuI1wKEYu0Z/tY nLRac0hlv1Hl4qh1nsawcOr1Vglqh3CUdeoQJr/22XPbRePkojiX2WPeHl2SAOLAalloT1 IePmZCzUWJMBMv6G8BkmGpXhzHAmIVZL3fezm00NBJXecKzhnSdCXJBVj5ThbPBt7m9VkI +gwEpi+Hr1M5+lLMCLR4rS8oEvSZWaPzWU6cX67Ah/dSStShMs/Aonk8vW2repfwIvplrc H5ksbXNv9eWeAaDn02bE8hx0ZoN8qBDsEYf4uKSsZID+9e1JAJnThwUMQYPVCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKG16YTzrJ5; Tue, 1 Aug 2023 20:04: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 371K4ICk013041; Tue, 1 Aug 2023 20:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4IIS013040; Tue, 1 Aug 2023 20:04:18 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:18 GMT Message-Id: <202308012004.371K4IIS013040@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: 20bcfc33d3f2 - releng/13.2 - ssh: Update to OpenSSH 9.3p2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.2 X-Git-Reftype: branch X-Git-Commit: 20bcfc33d3f2549e121f34b3839e33e176a313fc Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20bcfc33d3f2549e121f34b3839e33e176a313fc commit 20bcfc33d3f2549e121f34b3839e33e176a313fc Author: Ed Maste AuthorDate: 2023-08-01 14:38:11 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:47 +0000 ssh: Update to OpenSSH 9.3p2 Approved by: so Security: FreeBSD-SA-23:08.ssh Security: CVE-2023-38408 --- crypto/openssh/ChangeLog | 1867 +--------------------------- crypto/openssh/README | 2 +- crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/ssh-agent.1 | 22 +- crypto/openssh/ssh-agent.c | 21 +- crypto/openssh/ssh-pkcs11.c | 6 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 4 +- 10 files changed, 82 insertions(+), 1848 deletions(-) diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog index f1d1b37d583c..40ca976a61b3 100644 --- a/crypto/openssh/ChangeLog +++ b/crypto/openssh/ChangeLog @@ -1,3 +1,36 @@ +commit 9795c4016ae35162072144df032c8b262433b462 +Author: Damien Miller +Date: Wed Jul 19 16:27:12 2023 +1000 + + OpenSSH 9.3p2 + +commit bde3635f3c9324bad132cf9ed917813d6abb599e +Author: Damien Miller +Date: Wed Jul 19 16:31:09 2023 +1000 + + update version in README + +commit f673f2f3e5f67099018fc281a6b5fb918142472e +Author: Damien Miller +Date: Wed Jul 19 16:31:00 2023 +1000 + + update RPM spec versions + +commit d7790cdce72a1b6982795baa2b4d6f0bdbb0100d +Author: Damien Miller +Date: Fri Jul 7 13:30:15 2023 +1000 + + disallow remote addition of FIDO/PKCS11 keys + + Depends on the local client performing the session-bind@openssh.com + operation, so non-OpenSSH local client may circumvent this. + +commit b23fe83f06ee7e721033769cfa03ae840476d280 +Author: Damien Miller +Date: Thu Jul 13 12:09:34 2023 +1000 + + terminate pkcs11 process for bad libraries + commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645 Author: Damien Miller Date: Thu Mar 16 08:28:19 2023 +1100 @@ -9402,1837 +9435,3 @@ Date: Mon Jul 19 05:08:54 2021 +0000 reliability on very heavily loaded hosts. OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533 - -commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8 -Author: Darren Tucker -Date: Mon Jul 19 13:47:51 2021 +1000 - - Add sshfp-connect.sh file missed in previous. - -commit b75a80fa8369864916d4c93a50576155cad4df03 -Author: dtucker@openbsd.org -Date: Mon Jul 19 03:13:28 2021 +0000 - - upstream: Ensure that all returned SSHFP records for the specified host - - name and hostkey type match instead of only one. While there, simplify the - code somewhat and add some debugging. Based on discussion in bz#3322, ok - djm@. - - OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4 - -commit 1cc1fd095393663cd72ddac927d82c6384c622ba -Author: dtucker@openbsd.org -Date: Mon Jul 19 02:21:50 2021 +0000 - - upstream: Id sync only, -portable already has this. - - Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes - build with OPENSSL=no. - - OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15 - -commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485 -Author: dtucker@openbsd.org -Date: Mon Jul 19 02:46:34 2021 +0000 - - upstream: Add test for host key verification via SSHFP records. This - - requires some external setup to operate so is disabled by default (see - comments in sshfp-connect.sh). - - OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9 - -commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd -Author: dtucker@openbsd.org -Date: Mon Jul 19 02:29:28 2021 +0000 - - upstream: Add ed25519 key and test SSHFP export of it. Only test - - RSA SSHFP export if we have RSA functionality compiled in. - - OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af - -commit 0075511e27e5394faa28edca02bfbf13b9a6693e -Author: dtucker@openbsd.org -Date: Mon Jul 19 00:16:26 2021 +0000 - - upstream: Group keygen tests together. - - OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c - -commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26 -Author: dtucker@openbsd.org -Date: Sun Jul 18 23:10:10 2021 +0000 - - upstream: Add test for ssh-keygen printing of SSHFP records. - - OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b - -commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812 -Author: djm@openbsd.org -Date: Sat Jul 17 00:38:11 2021 +0000 - - upstream: wrap some long lines - - OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d - -commit 43ec991a782791d0b3f42898cd789f99a07bfaa4 -Author: djm@openbsd.org -Date: Sat Jul 17 00:36:53 2021 +0000 - - upstream: fix sftp on ControlPersist connections, broken by recent - - SessionType change; spotted by sthen@ - - OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234 - -commit 073f45c236550f158c9a94003e4611c07dea5279 -Author: djm@openbsd.org -Date: Fri Jul 16 09:00:23 2021 +0000 - - upstream: Explicitly check for and start time-based rekeying in the - - client and server mainloops. - - Previously the rekey timeout could expire but rekeying would not start - until a packet was sent or received. This could cause us to spin in - select() on the rekey timeout if the connection was quiet. - - ok markus@ - - OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987 - -commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf -Author: jmc@openbsd.org -Date: Wed Jul 14 06:46:38 2021 +0000 - - upstream: reorder SessionType; ok djm - - OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c - -commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3 -Author: Darren Tucker -Date: Wed Jul 14 11:26:50 2021 +1000 - - Make whitespace consistent. - -commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723 -Author: Darren Tucker -Date: Wed Jul 14 11:26:12 2021 +1000 - - Add ARM64 Linux self-hosted runner. - -commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f -Author: djm@openbsd.org -Date: Tue Jul 13 23:48:36 2021 +0000 - - upstream: add a SessionType directive to ssh_config, allowing the - - configuration file to offer equivalent control to the -N (no session) and -s - (subsystem) command-line flags. - - Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks; - feedback and ok dtucker@ - - OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12 - -commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538 -Author: djm@openbsd.org -Date: Mon Jul 12 02:12:22 2021 +0000 - - upstream: fix some broken tests; clean up output - - OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566 - -commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e -Author: Darren Tucker -Date: Mon Jul 12 18:00:05 2021 +1000 - - Add configure-time detection for SSH_TIME_T_MAX. - - Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms - were time_t is a long long. The limit used is for the signed type, so if - some system has a 32bit unsigned time_t then the lower limit will still - be imposed and we would need to add some way to detect this. Anyone using - an unsigned 64bit can let us know when it starts being a problem. - -commit fd2d06ae4442820429d634c0a8bae11c8e40c174 -Author: dtucker@openbsd.org -Date: Mon Jul 12 06:22:57 2021 +0000 - - upstream: Make limit for time_t test unconditional in the - - format_absolute_time fix for bz#3329 that allows printing of timestamps past - INT_MAX. This was incorrectly included with the previous commit. Based on - discussion with djm@. - - OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e - -commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3 -Author: dtucker@openbsd.org -Date: Mon Jul 12 06:08:57 2021 +0000 - - upstream: Use existing format_absolute_time() function when - - printing cert validity instead of doing it inline. Part of bz#3329. - - OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c - -commit 99981d5f8bfa383791afea03f6bce8454e96e323 -Author: djm@openbsd.org -Date: Fri Jul 9 09:55:56 2021 +0000 - - upstream: silence redundant error message; reported by Fabian Stelzer - - OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2 - -commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804 -Author: John Ericson -Date: Sat Dec 26 11:40:49 2020 -0500 - - Re-indent krb5 section after pkg-config addition. - -commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb -Author: John Ericson -Date: Sat Dec 26 11:40:49 2020 -0500 - - Support finding Kerberos via pkg-config - - This makes cross compilation easier. - -commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4 -Author: Darren Tucker -Date: Fri Jul 9 14:34:06 2021 +1000 - - Update comments about EGD to include prngd. - -commit b5d23150b4e3368f4983fd169d432c07afeee45a -Author: dtucker@openbsd.org -Date: Mon Jul 5 01:21:07 2021 +0000 - - upstream: Fix a couple of whitespace things. Portable already has - - these so this removes two diffs between the two. - - OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56 - -commit 8f57be9f279b8e905f9883066aa633c7e67b31cf -Author: dtucker@openbsd.org -Date: Mon Jul 5 01:16:46 2021 +0000 - - upstream: Order includes as per style(9). Portable already has - - these so this removes a handful of diffs between the two. - - OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77 - -commit b75624f8733b3ed9e240f86cac5d4a39dae11848 -Author: dtucker@openbsd.org -Date: Mon Jul 5 00:50:25 2021 +0000 - - upstream: Remove comment referencing now-removed - - RhostsRSAAuthentication. ok djm@ - - OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9 - -commit b67eb12f013c5441bb4f0893a97533582ad4eb13 -Author: djm@openbsd.org -Date: Mon Jul 5 00:25:42 2021 +0000 - - upstream: allow spaces to appear in usernames for local to remote, - - and scp -3 remote to remote copies. with & ok dtucker bz#1164 - - OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd - -commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87 -Author: dtucker@openbsd.org -Date: Fri Jul 2 07:20:44 2021 +0000 - - upstream: Remove obsolete comments about SSHv1 auth methods. ok - - djm@ - - OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f - -commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003 -Author: Darren Tucker -Date: Sat Jul 3 23:00:19 2021 +1000 - - Remove reference to ChallengeResponse. - - challenge_response_authentication was removed from the struct, keeping - kbd_interactive_authentication. - -commit 321874416d610ad2158ce6112f094a4862c2e37f -Author: Darren Tucker -Date: Sat Jul 3 20:38:09 2021 +1000 - - Move signal.h up include order to match upstream. - -commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32 -Author: Darren Tucker -Date: Sat Jul 3 20:36:06 2021 +1000 - - Remove old OpenBSD version marker. - - Looks like an accidental leftover from a sync. - -commit 9d5e31f55d5f3899b72645bac41a932d298ad73b -Author: Darren Tucker -Date: Sat Jul 3 20:34:19 2021 +1000 - - Remove duplicate error on error path. - - There's an extra error() call on the listen error path, it looks like - its removal was missed during an upstream sync. - -commit 888c459925c7478ce22ff206c9ac1fb812a40caf -Author: Darren Tucker -Date: Sat Jul 3 20:32:46 2021 +1000 - - Remove some whitespace not in upstream. - - Reduces diff vs OpenBSD by a small amount. - -commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2 -Author: Darren Tucker -Date: Sat Jul 3 19:27:43 2021 +1000 - - Replace remaining references to ChallengeResponse. - - Portable had a few additional references to ChallengeResponse related to - UsePAM, replaces these with equivalent keyboard-interactive ones. - -commit 53237ac789183946dac6dcb8838bc3b6b9b43be1 -Author: Darren Tucker -Date: Sat Jul 3 19:23:28 2021 +1000 - - Sync remaining ChallengeResponse removal. - - These were omitted from commit 88868fd131. - -commit 2c9e4b319f7e98744b188b0f58859d431def343b -Author: Darren Tucker -Date: Sat Jul 3 19:17:31 2021 +1000 - - Disable rocky84 to figure out why agent test fails - -commit bfe19197a92b7916f64a121fbd3c179abf15e218 -Author: Darren Tucker -Date: Fri Jul 2 15:43:28 2021 +1000 - - Remove now-unused SSHv1 enums. - - sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options - and are no longer used. - -commit c73b02d92d72458a5312bd098f32ce88868fd131 -Author: dtucker@openbsd.org -Date: Fri Jul 2 05:11:20 2021 +0000 - - upstream: Remove references to ChallengeResponseAuthentication in - - favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the - latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but - not entirely equivalent. We retain the old name as deprecated alias so - config files continue to work and a reference in the man page for people - looking for it. - - Prompted by bz#3303 which pointed out the discrepancy between the two - when used with Match. Man page help & ok jmc@, with & ok djm@ - - OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e - -commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9 -Author: Darren Tucker -Date: Fri Jul 2 15:20:32 2021 +1000 - - Fix ifdefs around get_random_bytes_prngd. - - get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET - are defined, so adjust ifdef accordingly. - -commit 0767627cf66574484b9c0834500b42ea04fe528a -Author: Damien Miller -Date: Fri Jul 2 14:30:23 2021 +1000 - - wrap get_random_bytes_prngd() in ifdef - - avoid unused static function warning - -commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25 -Author: Darren Tucker -Date: Mon Jun 28 13:06:37 2021 +1000 - - Add rocky84 test target. - -commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b -Author: djm@openbsd.org -Date: Fri Jun 25 06:30:22 2021 +0000 - - upstream: fix decoding of X.509 subject name; from Leif Thuresson - - via bz3327 ok markus@ - - OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8 - -commit 2a5704ec142202d387fda2d6872fd4715ab81347 -Author: dtucker@openbsd.org -Date: Fri Jun 25 06:20:39 2021 +0000 - - upstream: Use better language to refer to the user. From l1ving - - via github PR#250, ok jmc@ - - OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf - -commit 4bdf7a04797a0ea1c431a9d54588417c29177d19 -Author: dtucker@openbsd.org -Date: Fri Jun 25 03:38:17 2021 +0000 - - upstream: Replace SIGCHLD/notify_pipe kludge with pselect. - - Previously sshd's SIGCHLD handler would wake up select() by writing a - byte to notify_pipe. We can remove this by blocking SIGCHLD, checking - for child terminations then passing the original signal mask through - to pselect. This ensures that the pselect will immediately wake up if - a child terminates between wait()ing on them and the pselect. - - In -portable, for platforms that do not have pselect the kludge is still - there but is hidden behind a pselect interface. - - Based on other changes for bz#2158, ok djm@ - - OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813 - -commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127 -Author: Darren Tucker -Date: Fri Jun 25 15:08:18 2021 +1000 - - Move closefrom() to before first malloc. - - When built against tcmalloc, tcmalloc allocates a descriptor for its - internal use, so calling closefrom() afterward causes the descriptor - number to be reused resulting in a corrupted connection. Moving the - closefrom a little earlier should resolve this. From kircherlike at - outlook.com via bz#3321, ok djm@ - -commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92 -Author: Darren Tucker -Date: Fri Jun 18 20:41:45 2021 +1000 - - Put second -lssh in link line for sftp-server. - - When building --without-openssl the recent port-prngd.c change adds - a dependency on atomicio, but since nothing else in sftp-server uses - it, the linker may not find it. Add a second -lssh similar to other - binaries. - -commit e409d7966785cfd9f5970e66a820685c42169717 -Author: Darren Tucker -Date: Fri Jun 18 18:34:08 2021 +1000 - - Try EGD/PRNGD if random device fails. - - When built --without-openssl, try EGD/PRGGD (if configured) as a last - resort before failing. - -commit e43a898043faa3a965dbaa1193cc60e0b479033d -Author: Darren Tucker -Date: Fri Jun 18 18:32:51 2021 +1000 - - Split EGD/PRNGD interface into its own file. - - This will allow us to use it when building --without-openssl. - -commit acb2887a769a1b1912cfd7067f3ce04fad240260 -Author: Darren Tucker -Date: Thu Jun 17 21:03:19 2021 +1000 - - Handle GIDs > 2^31 in getgrouplist. - - When compiled in 32bit mode, the getgrouplist implementation may fail - for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel - at tui.com. - -commit 31fac20c941126281b527605b73bff30a8f02edd -Author: dtucker@openbsd.org -Date: Thu Jun 10 09:46:28 2021 +0000 - - upstream: Use $SUDO when reading sshd's pidfile here too. - - OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409 - -commit a3a58acffc8cc527f8fc6729486d34e4c3d27643 -Author: dtucker@openbsd.org -Date: Thu Jun 10 09:43:51 2021 +0000 - - upstream: Use $SUDO when reading sshd's pidfile in case it was - - created with a very restrictive umask. This resyncs with -portable. - - OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d - -commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611 -Author: dtucker@openbsd.org -Date: Thu Jun 10 09:37:59 2021 +0000 - - upstream: Set umask when creating hostkeys to prevent excessive - - permissions warning. - - OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef - -commit 9d0892153c005cc65897e9372b01fa66fcbe2842 -Author: dtucker@openbsd.org -Date: Thu Jun 10 03:45:31 2021 +0000 - - upstream: Add regress test for SIGHUP restart - - while handling active and unauthenticated clients. Should catch anything - similar to the pselect bug just fixed in sshd.c. - - OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73 - -commit 73f6f191f44440ca3049b9d3c8e5401d10b55097 -Author: dtucker@openbsd.org -Date: Thu Jun 10 03:14:14 2021 +0000 - - upstream: Continue accept loop when pselect - - returns -1, eg if it was interrupted by a signal. This should prevent - the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has - an unauthenticated child and goes on to a blocking read on a notify_pipe. - feedback deraadt@, ok djm@ - - OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0 - -commit c785c0ae134a8e8b5c82b2193f64c632a98159e4 -Author: djm@openbsd.org -Date: Tue Jun 8 22:30:27 2021 +0000 - - upstream: test that UserKnownHostsFile correctly accepts multiple - - arguments; would have caught readconf.c r1.356 regression - - OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a - -commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e -Author: djm@openbsd.org -Date: Tue Jun 8 22:06:12 2021 +0000 - - upstream: fix regression in r1.356: for ssh_config options that - - accepted multiple string arguments, ssh was only recording the first. - Reported by Lucas via bugs@ - - OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d - -commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de -Author: djm@openbsd.org -Date: Tue Jun 8 07:40:12 2021 +0000 - - upstream: test argv_split() optional termination on comments - - OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c - -commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03 -Author: dtucker@openbsd.org -Date: Tue Jun 8 07:05:27 2021 +0000 - - upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice - - being overridden on the command line. - - OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8 - -commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2 -Author: djm@openbsd.org -Date: Tue Jun 8 06:52:43 2021 +0000 - - upstream: sprinkle some "# comment" at end of configuration lines - - to test comment handling - - OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7 - -commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411 -Author: djm@openbsd.org -Date: Tue Jun 8 06:51:47 2021 +0000 - - upstream: more descriptive failure message - - OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509 - -commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1 -Author: djm@openbsd.org -Date: Mon Jun 7 01:16:34 2021 +0000 - - upstream: test AuthenticationMethods inside a Match block as well - - as in the main config section - - OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7 - -commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db -Author: djm@openbsd.org -Date: Mon Jun 7 00:00:50 2021 +0000 - - upstream: prepare for stricter sshd_config parsing that will refuse - - a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent - arguments. Such lines are permitted but are nonsensical noops ATM - - OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650 - -commit a10f929d1ce80640129fc5b6bc1acd9bf689169e -Author: djm@openbsd.org -Date: Tue Jun 8 07:09:42 2021 +0000 - - upstream: switch sshd_config parsing to argv_split() - - similar to the previous commit, this switches sshd_config parsing to - the newer tokeniser. Config parsing will be a little stricter wrt - quote correctness and directives appearing without arguments. - - feedback and ok markus@ - - tested in snaps for the last five or so days - thanks Theo and those who - caught bugs - - OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e - -commit ea9e45c89a4822d74a9d97fef8480707d584da4d -Author: djm@openbsd.org -Date: Tue Jun 8 07:07:15 2021 +0000 - - upstream: Switch ssh_config parsing to use argv_split() - - This fixes a couple of problems with the previous tokeniser, - strdelim() - - 1. strdelim() is permissive wrt accepting '=' characters. This is - intended to allow it to tokenise "Option=value" but because it - cannot keep state, it will incorrectly split "Opt=val=val2". - 2. strdelim() has rudimentry handling of quoted strings, but it - is incomplete and inconsistent. E.g. it doesn't handle escaped - quotes inside a quoted string. - 3. It has no support for stopping on a (unquoted) comment. Because - of this readconf.c r1.343 added chopping of lines at '#', but - this caused a regression because these characters may legitimately - appear inside quoted strings. - - The new tokeniser is stricter is a number of cases, including #1 above - but previously it was also possible for some directives to appear - without arguments. AFAIK these were nonsensical in all cases, and the - new tokeniser refuses to accept them. - - The new code handles quotes much better, permitting quoted space as - well as escaped closing quotes. Finally, comment handling should be - fixed - the tokeniser will terminate only on unquoted # characters. - - feedback & ok markus@ - - tested in snaps for the last five or so days - thanks Theo and those who - caught bugs - - OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5 - -commit d786424986c04d1d375f231fda177c8408e05c3e -Author: dtucker@openbsd.org -Date: Tue Jun 8 07:02:46 2021 +0000 - - upstream: Check if IPQoS or TunnelDevice are already set before - - overriding. Prevents values in config files from overriding values supplied - on the command line. bz#3319, ok markus. - - OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74 - -commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457 -Author: djm@openbsd.org -Date: Tue Jun 8 06:54:40 2021 +0000 - - upstream: Allow argv_split() to optionally terminate tokenisation - - when it encounters an unquoted comment. - - Add some additional utility function for working with argument - vectors, since we'll be switching to using them to parse - ssh/sshd_config shortly. - - ok markus@ as part of a larger diff; tested in snaps - - OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac - -commit da9f9acaac5bab95dca642b48e0c8182b246ab69 -Author: Darren Tucker -Date: Mon Jun 7 19:19:23 2021 +1000 - - Save logs on failure for upstream test - -commit 76883c60161e5f3808787085a27a8c37f8cc4e08 -Author: Darren Tucker -Date: Mon Jun 7 14:36:32 2021 +1000 - - Add obsdsnap-i386 upstream test target. - -commit d45b9c63f947ec5ec314696e70281f6afddc0ac3 -Author: djm@openbsd.org -Date: Mon Jun 7 03:38:38 2021 +0000 - - upstream: fix debug message when finding a private key to match a - - certificate being attempted for user authentication. Previously it would - print the certificate's path, whereas it was supposed to be showing the - private key's path. Patch from Alex Sherwin via GHPR247 - - OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b - -commit 530739d42f6102668aecd699be0ce59815c1eceb -Author: djm@openbsd.org -Date: Sun Jun 6 11:34:16 2021 +0000 - - upstream: Match host certificates against host public keys, not private - - keys. Allows use of certificates with private keys held in a ssh-agent. - Reported by Miles Zhou in bz3524; ok dtucker@ - - OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a - -commit 4265215d7300901fd7097061c7517688ade82f8e -Author: djm@openbsd.org -Date: Sun Jun 6 03:40:39 2021 +0000 - - upstream: Client-side workaround for a bug in OpenSSH 7.4: this release - - allows RSA/SHA2 signatures for public key authentication but fails to - advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these - server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse - to offer valid keys. - - Reported by and based on patch from Gordon Messmer via bz3213, thanks - also for additional analysis by Jakub Jelen. ok dtucker - - OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7 - -commit bda270d7fb8522d43c21a79a4b02a052d7c64de8 -Author: djm@openbsd.org -Date: Sun Jun 6 03:17:02 2021 +0000 - - upstream: degrade gracefully if a sftp-server offers the - - limits@openssh.com extension but fails when the client tries to invoke it. - Reported by Hector Martin via bz3318 - - OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967 - -commit d345d5811afdc2d6923019b653cdd93c4cc95f76 -Author: djm@openbsd.org -Date: Sun Jun 6 03:15:39 2021 +0000 - - upstream: the limits@openssh.com extension was incorrectly marked - - as an operation that writes to the filesystem, which made it unavailable in - sftp-server read-only mode. Spotted by Hector Martin via bz3318 - - OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067 - -commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a -Author: naddy@openbsd.org -Date: Sat Jun 5 13:47:00 2021 +0000 - - upstream: PROTOCOL.certkeys: update reference from IETF draft to - - RFC - - Also fix some typos. - ok djm@ - - OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44 - -commit aa99b2d9a3e45b943196914e8d8bf086646fdb54 -Author: Darren Tucker -Date: Fri Jun 4 23:41:29 2021 +1000 - - Clear notify_pipe from readset if present. - - Prevents leaking an implementation detail to the caller. - -commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b -Author: Darren Tucker -Date: Fri Jun 4 23:24:25 2021 +1000 - - space->tabs. - -commit c8677065070ee34c05c7582a9c2f58d8642e552d -Author: Darren Tucker -Date: Fri Jun 4 18:39:48 2021 +1000 - - Add pselect implementation for platforms without. - - This is basically the existing notify_pipe kludge from serverloop.c - moved behind a pselect interface. It works by installing a signal - handler that writes to a pipe that the select is watching, then calls - the original handler. - - The select call in serverloop will become pselect soon, at which point the - kludge will be removed from thereand will only exist in the compat layer. - Original code by markus, help from djm. - -commit 7cd7f302d3a072748299f362f9e241d81fcecd26 -Author: Vincent Brillault -Date: Sun May 24 09:15:06 2020 +0200 - - auth_log: dont log partial successes as failures - - By design, 'partial' logins are successful logins, so initially with - authenticated set to 1, for which another authentication is required. As - a result, authenticated is always reset to 0 when partial is set to 1. - However, even if authenticated is 0, those are not failed login - attempts, similarly to attempts with authctxt->postponed set to 1. - -commit e7606919180661edc7f698e6a1b4ef2cfb363ebf -Author: djm@openbsd.org -Date: Fri Jun 4 06:19:07 2021 +0000 - - upstream: The RB_GENERATE_STATIC(3) macro expands to a series of - - function definitions and not a statement, so there should be no semicolon - following them. Patch from Michael Forney - - OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd - -commit c298c4da574ab92df2f051561aeb3e106b0ec954 -Author: djm@openbsd.org -Date: Fri Jun 4 05:59:18 2021 +0000 - - upstream: rework authorized_keys example section, removing irrelevant - - stuff, de-wrapping the example lines and better aligning the examples with - common usage and FAQs; ok jmc - - OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c - -commit d9cb35bbec5f623589d7c58fc094817b33030f35 -Author: djm@openbsd.org -Date: Fri Jun 4 05:10:03 2021 +0000 - - upstream: adjust SetEnv description to clarify $TERM handling - - OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22 - -commit 771f57a8626709f2ad207058efd68fbf30d31553 -Author: dtucker@openbsd.org -Date: Fri Jun 4 05:09:08 2021 +0000 - - upstream: Switch the listening select loop from select() to - - pselect() and mask signals while checking signal flags, umasking for pselect - and restoring afterwards. Also restore signals before sighup_restart so they - don't remain blocked after restart. - - This prevents a race where a SIGTERM or SIGHUP can arrive between - checking the flag and calling select (eg if sshd is processing a - new connection) resulting in sshd not shutting down until the next - time it receives a new connection. bz#2158, with & ok djm@ - - OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f - -commit f64f8c00d158acc1359b8a096835849b23aa2e86 -Author: djm@openbsd.org -Date: Fri Jun 4 05:02:40 2021 +0000 - - upstream: allow ssh_config SetEnv to override $TERM, which is otherwise - - handled specially by the protocol. Useful in ~/.ssh/config to set TERM to - something generic (e.g. "xterm" instead of "xterm-256color") for destinations - that lack terminfo entries. feedback and ok dtucker@ - - OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758 - -commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5 -Author: djm@openbsd.org -Date: Fri Jun 4 04:02:21 2021 +0000 - - upstream: correct extension name "no-presence-required" => - - "no-touch-required" - - document "verify-required" option - - OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5 - -commit ecc186e46e3e30f27539b4311366dfda502f0a08 -Author: Darren Tucker -Date: Wed Jun 2 13:54:11 2021 +1000 - - Retire fbsd7 test target. - - It's the slowest of the selfhosted targets (since it's 32bit but has - most of the crypto algos). We still have coverage for 32bit i386. - -commit 5de0867b822ec48b5eec9abde0f5f95d1d646546 -Author: Darren Tucker -Date: Wed Jun 2 11:21:40 2021 +1000 - - Check for $OPENSSL in md5 fallback too. - -commit 1db69d1b6542f8419c04cee7fd523a4a11004be2 -Author: Darren Tucker -Date: Wed Jun 2 11:17:54 2021 +1000 - - Add dfly60 target. - -commit a3f2dd955f1c19cad387a139f0e719af346ca6ef -Author: dtucker@openbsd.org -Date: Wed Jun 2 00:17:45 2021 +0000 - - upstream: Merge back shell portability changes - - bringing it back in sync with -portable. - - OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1 - -commit 9d482295c9f073e84d75af46b720a1c0f7ec2867 -Author: dtucker@openbsd.org -Date: Tue Jun 1 23:56:20 2021 +0000 - - upstream: Use a default value for $OPENSSL, - - allowing it to be overridden. Do the same in the PuTTY tests since it's - needed there and not exported by test-exec.sh. - - OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16 - -commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1 -Author: dtucker@openbsd.org -Date: Mon May 24 10:25:18 2021 +0000 - - upstream: Find openssl binary via environment variable. This - - allows overriding if necessary (eg in -portable where we're testing against a - specific version of OpenSSL). *** 1097 LINES SKIPPED *** From nobody Tue Aug 1 20:04: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 4RFmKK3Fq8z4pnrM; Tue, 1 Aug 2023 20:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFmKD35HSz3GN6; Tue, 1 Aug 2023 20:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOE8ZjG23orBrPD156orgESZh3eY1YW6tZPDYlqdmdE=; b=KWvrzDtezNowOrd84EhazoG24xta0xkM68hcvyPk2jn8UqM2livF/zEUlkrgVMYbgwHS48 /4ZQeepOsFTcVIvPBfLpgKPkyjP6ZhjjmjurGflib0FFYblM2Q+lwq1YZCn2N66du3P37d pQ5y/g/JpggDzT/NC6rIAfx9/j9NeGwJdR5qAKTQnmC3Rz+bhDzls/i83JWVMN931FIr+P 3rbyPUNoU0HHzq1Ww8u4o+d/piFZCaEcR08tDzbcytGaaw2IqPqd4UGyaDGubto90fXLre rfe6mKHfeLmrMbKprC3nGkBHl8lduP7D9j6Mqhtt617BgXv79ZdnPCJO86l/mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920256; a=rsa-sha256; cv=none; b=h+qRDUZvXSGKuECkneh2mtAuBO6Upa5r8VepTu0cw6WGeABQLuojNF7vLJvGfHdQ60+tEj zbYCQPsCGPgIJFRfgwOqlSq5O41uDlsrSlrAPLLs6lg51na6klcNHhFbfhbRBlfihZBE0h 6c0VMc/S75zRd/QYwo4hM3jzXrBSwvFrnzbuGDgN7L/xjTFSQVzvHmzLQcGeT0SvD51s79 cezDRoPY+S0Gt1RdDaklKryQvfvUXI7FZPzRs5hX2tdsR4eKqo3x8zQ6N128lu1Evf75LC W3K+MvtmMsI1xvuhMtfTOQRMC1aMwkyFIubYaWzuxpAlBgTWMbJ/e0lN3oJEZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOE8ZjG23orBrPD156orgESZh3eY1YW6tZPDYlqdmdE=; b=ig/oREnNofA4mbIPQEfcT3puS7fff9tL4TcLCbFawAmKfZjsYvqAAitMMvtYpRcXWXy6xT NLFSojPX4O6sAltwpvLa1YX0PLvPesGKD3pXIzV2WrfMP77ZHSIFNdt2IaFvLl6NA/H2GA tBb0006/EOKUoImGfI01MgTsaqgU2s/Q5vK3mcTaOiq1fGzzvlP/qxjysbb+t6b9NHtjxl yiSk/9CliXPTrjCt5r0mIfohWX70Z6/hz1Dy3nUyQ2QnPA8vThAvQoLOOHYNrGZTknyAU9 5dbeBg0yYZzqrFI45l3JdsmkurOR4TWqAYbSoIICMAxfR2hvFsimIswT8LXgiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKD0Zk8zr1V; Tue, 1 Aug 2023 20:04: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 371K4FIx012995; Tue, 1 Aug 2023 20:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4F4v012994; Tue, 1 Aug 2023 20:04:15 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:15 GMT Message-Id: <202308012004.371K4F4v012994@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: 9b45d8eddfac - releng/13.2 - pam_krb5: Add missing patch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.2 X-Git-Reftype: branch X-Git-Commit: 9b45d8eddfac906d9f78a84a9954f74c222a4ee2 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b45d8eddfac906d9f78a84a9954f74c222a4ee2 commit 9b45d8eddfac906d9f78a84a9954f74c222a4ee2 Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:30 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit d295e418ae7e60d87af6576ecdfad41a98d7442c) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock); From nobody Tue Aug 1 20:04: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 4RFmKs26P3z4pnrd; Tue, 1 Aug 2023 20:04: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 4RFmKd2P3tz3GNT; Tue, 1 Aug 2023 20:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fUQ1YDVCqI0d/nIke9/XDB6XugnwjBr6Zz0IzKfVq0=; b=WBeV7cYB72EQz4kzuuFj2hYfQBXOhvtrj/ZoSsfGHxW+HxVF0ZIh4ppp4wO1bxUfMaeztR aDeW2exzY2JI/xMRsx4vJd+US7DavJO1rcg5bP1zvX0spvNhWWpxfiQi3yPF3lCZZuhdlC SB5yaLg/axIrghWtr4MftjWDsiU05Y6wGnbi+MW056erErWr7t2ffa2vLU1QzFcs8yRJ80 5vIgiS3NGAKnM6RNxBecl3jzAOT0zNPBVKd+HS0dDeYwf1k5eh/DOUeNO+kJzG0C8rXnPo KM09wFKeSfma/LfXeyOWz3Xm2qOeFNKek3gu8FbfIQleNM6PRVJQOLzUWHnlvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920277; a=rsa-sha256; cv=none; b=sw0dV8XOPr4wJc7sATn00H1a7Yi04EL1C6+44PGr4EN1ckj/D83G8/aqtr/6GE2ZqgfPEv 0mJIXg0HNWnj/YwLpuHLGOVWu5/03iiS3HwuKwTNi4kgXz41dWMRQcHgKrn3lFDHVN5yRG +6jMnb/4BR9w/SNQIcxwG5thJj6CljqalzSAwQkS94YLfOKBOZrj2tBuwf4mKVV/Cczq5R VtQfcoynNCvNYYqXHFiRBStGeJdEUjm+ptv7d6SvQncZqgZUiOGrXIvRk76Kj3Vgg92Bce PeNUanB5N5tGdh9qBRkTIicng40jIwZnfS7Vc9bPL4iAvO/gQ4fCYVo3zUrp7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fUQ1YDVCqI0d/nIke9/XDB6XugnwjBr6Zz0IzKfVq0=; b=owWlt7pfNkHcZEFWu41MQ16jzx3LhBwJehMhL5z6b4a4AQRqmouRPBV3rSopAaocRigGKJ eX65w3fuihOo0xalApcxHjpoYhne+kKi1BKnDEFTg/Zyf/37NPhBt+1NX2dUsQu8soSlNR MrINZq3w6IVXl027lLvnHikrp8uqJokRVstiAA1EaTf1G1f+dNxLYCFgvxPn7r+1/Iqp6J bQO9k6orxrc3ZhU+Ef/1696+Q6RTxdx3jYDiIu1YUjNrEdaBCvfrFDeK1vcd1B9dK+wZ2r 6kTgwyWLLwm4/k47ap8unB0fPyL1FKHT6D5uyvUmLSMrZE3R08pb5791bSfKsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKd0XGzzrD0; Tue, 1 Aug 2023 20:04: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 371K4akJ013444; Tue, 1 Aug 2023 20:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4a58013443; Tue, 1 Aug 2023 20:04:36 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:36 GMT Message-Id: <202308012004.371K4a58013443@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: 87702e38a4b4 - releng/13.1 - bhyve: Fully reset the fwctl state machine if the guest requests a reset. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.1 X-Git-Reftype: branch X-Git-Commit: 87702e38a4b4fe990b06f39b5cf267fb564c367e Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87702e38a4b4fe990b06f39b5cf267fb564c367e commit 87702e38a4b4fe990b06f39b5cf267fb564c367e Author: John Baldwin AuthorDate: 2023-06-29 18:27:12 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:26 +0000 bhyve: Fully reset the fwctl state machine if the guest requests a reset. If a guest tries to reset the fwctl device while a pending request was in flight, the fwctl state machine can be left in an incomplete state. Specifically, rinfo is not cleared. Normally the state machine for fwctl alternates between REQ (receiving request) and RESP (sending response) and ignores port writes while in RESP or port reads while in REQ. Once a guest completes the writes to the port to send a request, the state machine transitions to RESP and ignores future writes. However, if a guest writes a full request and then resets the fwctl device, the state would transition to REQ without draining the pending response or discarding the received request. Instead, additional port writes after the reset were treated as new payload bytes, but were appended to the previously-received request and could overflow the fget_str buffer. To fix, fully reset the fwctl state machine if the guest requests a reset. admbugs: 998 Approved by: so Reviewed by: markj Reported by: Omri Ben Bassat Security: FreeBSD-SA-23:07.bhyve Security: CVE-2023-3494 (cherry picked from commit bed3ae1d7863ac1e0b1e82ae7bf952937e921efe) (cherry picked from commit 9fe302d78109b12867bd933bb68cd900c9940b7d) --- usr.sbin/bhyve/fwctl.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 7c27d7e92532..d1ceed0e2daf 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -66,13 +66,12 @@ __FBSDID("$FreeBSD$"); /* * Back-end state-machine */ -enum state { - DORMANT, +static enum state { IDENT_WAIT, IDENT_SEND, REQ, RESP -} be_state = DORMANT; +} be_state; static uint8_t sig[] = { 'B', 'H', 'Y', 'V' }; static u_int ident_idx; @@ -203,7 +202,8 @@ static void fget_data(uint32_t data, uint32_t len) { - *((uint32_t *) &fget_str[fget_cnt]) = data; + assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str)); + memcpy(&fget_str[fget_cnt], &data, sizeof(data)); fget_cnt += sizeof(uint32_t); } @@ -347,7 +347,8 @@ static int fwctl_request_data(uint32_t value) { - /* Make sure remaining size is >= 0 */ + /* Make sure remaining size is > 0 */ + assert(rinfo.req_size > 0); if (rinfo.req_size <= sizeof(uint32_t)) rinfo.req_size = 0; else @@ -445,6 +446,28 @@ fwctl_response(uint32_t *retval) return (0); } +static void +fwctl_reset(void) +{ + + switch (be_state) { + case RESP: + /* If a response was generated but not fully read, discard it. */ + fwctl_response_done(); + break; + case REQ: + /* Discard partially-received request. */ + memset(&rinfo, 0, sizeof(rinfo)); + break; + case IDENT_WAIT: + case IDENT_SEND: + break; + } + + be_state = IDENT_SEND; + ident_idx = 0; +} + /* * i/o port handling. @@ -472,18 +495,13 @@ fwctl_inb(void) static void fwctl_outw(uint16_t val) { - if (be_state == DORMANT) { - return; - } - if (val == 0) { /* * The guest wants to read the signature. It's possible that the * guest is unaware of the fwctl state at this moment. For that * reason, reset the state machine unconditionally. */ - be_state = IDENT_SEND; - ident_idx = 0; + fwctl_reset(); } } From nobody Tue Aug 1 20:04: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 4RFmKs2Hznz4pncj; Tue, 1 Aug 2023 20:04: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 4RFmKc2P7Kz3G5W; Tue, 1 Aug 2023 20:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5omF4P8byMvFooHm8J/yzjiEmy2OyiAPm+5JZN0ENn8=; b=KmwWE4WGJ3LtueG4C9QOsYTLdQ6AgTyQqTGy9NaRrSOah38uDdC679sLztlG90IxziT5gd WoK9D6RfJdhHLsB1uFpO58KdbSJkbff9ldhnNfP/7JXGaNr3A+CqjHt6rKGd8GnDJNQsp+ yswc0u+2JHZR3O0i7wyemSvpcXGv9oCezE+UpBlVGAOpbepjorcQqztFtfqgUfcy9fZNgw VQhcS5UsV8U5VAXUGvue9FO5jsuOsNC56K8DLIFL/ydN4dx1z1y3DrhadhKj6xg4mPln+M O5akPA6JcW6/W6sGxtFxERe/vX2wtVQ8g9swwGpCEJ/HjBcNPdHCJ77jZ39f+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920276; a=rsa-sha256; cv=none; b=mDiuVmdgz0UXdG8Sbne0257bzE0UcLJF22nDbz0C0XTaOviJpzE9rnqQQ1Ch0KKlLrntSm qISLjT8e8UyLqIegKkneakgul5/ScipcCVOURWBXj1Vmri+JpoitAlPI9wlhjDAggxHP2g tGc/SS0eKAVEiKDvL7tnLIhdBptKdu35ByeUdduzTlJg+LxFMvT6AJizT4ud6CFkaWn6Zv wQif/UMSVDZgY6Cv1QZujfT9lljDcFzpqerUk6b0fQL7gocfQ6hzFX0gFCsrdwIISp1i3M hKGZzE94iMAn6TR204bt1BMPepmNObl4COGrQh6sjANZpjgAalFGBrGeDAlB9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5omF4P8byMvFooHm8J/yzjiEmy2OyiAPm+5JZN0ENn8=; b=Vhpu8t+2gN/ofD23IESs+PgG1YOtSI9dZ+RwraXcniXYDkE6unYfIxP0c06Lr4ZAftcv2C niG+qgAPmV0DKx7ksMOcfl/6/zrkHThe0pu3GFj7SO7xrhwbh119uACJgKtgiKlP8P0k5X qTVZdi3d6o/uD2rJWR7j160204FgyPgXU8RD/QU8ZLMLPPORgQ3zvDpEHZtDgq7srSuhDP gDIRlKHM++2204u0CRz3u+qsi7jBJ5aoB02gxeCRECidSAfoppZmhjMXFJQ70xxXc+pnyq FZ93MEB2VPMtXIq/HUdCQRGMgrVLhJ77bSqWygNRT/XDeysqtqeWWdW9BAr1KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKb6j4GzrJ7; Tue, 1 Aug 2023 20:04: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 371K4Zgq013321; Tue, 1 Aug 2023 20:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4ZDi013320; Tue, 1 Aug 2023 20:04:35 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:35 GMT Message-Id: <202308012004.371K4ZDi013320@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: 3d3a1cbfd7a2 - releng/13.1 - ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.1 X-Git-Reftype: branch X-Git-Commit: 3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 commit 3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 Author: Ed Maste AuthorDate: 2023-08-01 14:40:02 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:26 +0000 ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 Approved by: so Security: FreeBSD-SA-23:08.ssh Security: CVE-2023-38408 --- crypto/openssh/ssh-pkcs11.c | 6 ++---- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crypto/openssh/ssh-pkcs11.c b/crypto/openssh/ssh-pkcs11.c index 37a6b1b5bcae..84fb11f5a7d6 100644 --- a/crypto/openssh/ssh-pkcs11.c +++ b/crypto/openssh/ssh-pkcs11.c @@ -1536,10 +1536,8 @@ pkcs11_register_provider(char *provider_id, char *pin, error("dlopen %s failed: %s", provider_id, dlerror()); goto fail; } - if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) { - error("dlsym(C_GetFunctionList) failed: %s", dlerror()); - goto fail; - } + if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) + fatal("dlsym(C_GetFunctionList) failed: %s", dlerror()); p = xcalloc(1, sizeof(*p)); p->name = xstrdup(provider_id); p->handle = handle; diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index eb9bdcc437fb..5b61d395f302 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20211221 +#VersionAddendum FreeBSD-20230719 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 527f3d4bb46e..2646a7186929 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1805,7 +1805,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Qq FreeBSD-20211221 . +.Qq FreeBSD-20230719 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index ddbdbf778fe0..320e7f4d2a4d 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -6,7 +6,7 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20211221" +#define SSH_VERSION_FREEBSD "FreeBSD-20230719" #ifdef WITH_OPENSSL #define OPENSSL_VERSION_STRING OpenSSL_version(OPENSSL_VERSION) From nobody Tue Aug 1 20:04: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 4RFmKt0MTkz4pncn; Tue, 1 Aug 2023 20:04: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 4RFmKf2NvLz3GfD; Tue, 1 Aug 2023 20:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYpP6NcQEHoF1eTqrfdRGUf9sXEWdHYZjVCeOTN7/kQ=; b=jNbKPhEm6GiPRVpESKJ2a3U+vrxwmBRDpLGKwQOB/WnPdZqFp0AOoEkLTSM5cRkmjiIx/Z SpQdPOKosMnWDoxTJ/Zkdnv5LhOfTVAh3x5D85YS8yAR7gMucKkmcHhf5KVqEJbf5V8aYK ytuWG/uNCDw3f9toNn9bgqkuF3TluZrjGivyMHcBudp2yUV9JOb6+7BsNOa9V8wfdf7iDJ UilZ9/kJ5Xt6U3vs9cpYAmUq6T1UNiGKjCvybi+s5G1cJMkfKhbmZFeu390/O+NsVz7aLs 9ePdKT6lbiFaFNrFNATKyEdY0gCx5an6b49IpqP4v8F8j5MoTRqSgNHPTBn7JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920278; a=rsa-sha256; cv=none; b=qa5MUPToWwV9eS592A5VbB8EFT0tvlB5iH7rogM1ge+XykC+CefDWyxqQQULWB9muYG8gx 7I3iAOxXvPq4gzxXfmJTFTlP9lW8MxDEQB/kaoCnDb7Ag5FBnUBmdHYfAKkqbVCYWasCGd chT5dkiEx5758l3gZyOeQNxaCxUd55gCCmyoB1hvt903guSlU95OBfiyxisFxa+zTEdp/d Iyd0Y2TTB9SH7Ryy5Jlz9ZGT550Dvukg1W2afwiptpYNPjxQpjAogwelSF5AFB3daY8+pT w67y4OGmoHy493vadMtoM+EIVIDtMU0XKaiH78xDRBnCxl5RuuJ98awmOuMp1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYpP6NcQEHoF1eTqrfdRGUf9sXEWdHYZjVCeOTN7/kQ=; b=FpXCH9xNJgdA9tZnG3aGnUzTSxLUo6D91AXTjaP2OY4a7ecnD9b88LgdySJ5jMDl1jnPL3 w4UqTwb9CDMrmUFWcVCa2LSiD+5QCFdx4DxVqVbEwKEJziaDLGOZETxXIq/xAxAE3S4fVd mBPInfSlcrkyqYO5UHSo9C1QRjS6/5e5YcDC/AmLitB0dn4PeDlsfl3kpayTx6lucX0UNS yaf3DApIc4okpj7PVHG0CHpWahlCc09T5c5yGXkrOjsO1UJDNr6MlOd1SAZj1aTFfwFXzO z49ctlYNcfZeiesItHQ9wWXS4epyW60/QlreihkeV3+uJJIbGVnlajAXNSQgGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKf1C7bzqvN; Tue, 1 Aug 2023 20:04: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 371K4cwt013485; Tue, 1 Aug 2023 20:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4cs5013484; Tue, 1 Aug 2023 20:04:38 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:38 GMT Message-Id: <202308012004.371K4cs5013484@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: 4e548c72914a - releng/13.1 - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.1 X-Git-Reftype: branch X-Git-Commit: 4e548c72914a4eb63c16556484ab95628d70adcd Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e548c72914a4eb63c16556484ab95628d70adcd commit 4e548c72914a4eb63c16556484ab95628d70adcd Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:49:52 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) (cherry picked from commit 9515f04fe3b12b9e6ef6c802b647dd4cbdba621b) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index e0857d3af3e8..023470b20033 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -806,6 +806,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:04: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 4RFmKs39hpz4pnvp; Tue, 1 Aug 2023 20:04: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 4RFmKc1yB7z3GWK; Tue, 1 Aug 2023 20:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJ1GWon4RzfyMMoFMS4sENDUSnXjpsYiWm5a7BbSIH0=; b=VZIbJLnWMiLNnbhAInFUjE3GL29qQdGUxPaY9wWiiwcFfK+7eTdK1CC1hFZuLvxH+7tcGi 9VgXgadUl9eiI6hmuo/ldVN2uU5Te7Xtl0/m11QQadDu19X9XC8bYPmLEG7kjuMvj3VoSC TtRptGeLl14dunvzs1xooUscECNf9HG8a9eVnW74gIRg6Qbv7ZOmFjai0CHizikmRAkuTm XU05PSV/HwtY4Vdga//qI/pfjb5VdURmG9twgnnjRXkU6oknyyQesr+AFZIIyWfbM1IoO4 SVRbh8i5r7X9walL6RNL6bK3oCq1TSETkY+6mwG6hoP4JiHHtceax9/fStanhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920276; a=rsa-sha256; cv=none; b=X8enNzCOOm+Q7BOmTNA+2hFd6198H0vPWc8eIiMdcGNagN1i8UUarjDJyQ26eAkfeTbTt6 v24/uPGJ/so+nOFy7KBD8YHpg99fVS2F9qkUrT3fxxCciSQqsBE28LujRGeWKoL7Yrd5xn x5cgSrNvok1ZJtudC85Ljws5Jg+h80tMs6ynclN5AUldQik/Z9khoxqVwLRcqHo0ywHKM6 5bDywLyiadnYo+GBzmW6Hh1RPR4fdXGnBq2TFPm7Io8/BPgLQVi1lOYA+HDUXT5sO2rqaM fqaCFG+Pw7lrk8bH+LumUXI/EAGUq3v+DeTmhSHPokvxr/4Mk1rtbm9C5C2qCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJ1GWon4RzfyMMoFMS4sENDUSnXjpsYiWm5a7BbSIH0=; b=F0POPw3Lcpkgf/gW/Rdfoda/Fz6wbFy7ZUM6Kxa20NK7v3yquwtxl5268WUsxBRHaZxGwb rrKbmwhyOV7LimB83ajWStplj+NNOK0ONLyK/+mj0GHu0h9zmfLJJYSLOl3qqnTlbDmpNQ 9d0Fgazlg2PNJkVkZb1L/k6+iBLCQftiLHopBnRqGqGe0SdafMI/MDDia9lvGaVK5DKXKJ je1peFwKj5raRvMfRtOjtaqHGXPGW6Hm804ZLQPRN1zYDz/t3bWJmnSvdFaZ3nsDXoBnNN av08rgaQm/hPZcR30GUDlcrCY3Sk0UorW7jgWEAEU2Yk2ouUrZMPk2UvdsNqVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKb26NLzrMG; Tue, 1 Aug 2023 20:04: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 371K4YIx013279; Tue, 1 Aug 2023 20:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4YaW013278; Tue, 1 Aug 2023 20:04:34 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:34 GMT Message-Id: <202308012004.371K4YaW013278@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: 140f65a20533 - releng/13.1 - pam_krb5: Add missing patch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13.1 X-Git-Reftype: branch X-Git-Commit: 140f65a205334682c4868708fcabfaaf237b5b3f Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=140f65a205334682c4868708fcabfaaf237b5b3f commit 140f65a205334682c4868708fcabfaaf237b5b3f Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:09 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit d295e418ae7e60d87af6576ecdfad41a98d7442c) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock); From nobody Tue Aug 1 20:04: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 4RFmKt0MT6z4pnl6; Tue, 1 Aug 2023 20:04: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 4RFmKg2vGLz3GYw; Tue, 1 Aug 2023 20:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPj+EDkp0FWbUHzQvsSmj6br8/B3huLWz8mkp2Q1oPw=; b=KQ3XDO5Wx0jnzOZcu+jls2+o63iVqZz8M1hHFaEGN6gmXEAM2d6Ax4fymy2wUeN5Be87os URgKGTVYm/2MMoWbLE6Rs9WBG2ReLqEh/2Knzf6NrG49JjBJHO4Ej5asVBLbj2Z4Z20+Ka CnUaRcq+WnPS08aAI5lqJY2MWlQ73o9zs2pIx8F6JiBjiRBfwiYBn7PqQpkKdjteie/gMb 2J08GON4DVJ7n8b7gJVhdHw2G8TrgZ2Oz4eTuoaczwC4vGeb9MNmASr+uJHtc7D8wZsSYH HEoB6mJsLoHHPQoa96U0yGyza2C5B2fFCNj+nAQZQ5E8zi/UNV7C9qyCJDakgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920279; a=rsa-sha256; cv=none; b=uus+U5jW/h1o4ufD7u4IfVF56NJBs6Wj8Dn8uq9L4fUngtlwzZlqsDoKpgYyvsXiL18WZ8 A+Vnlp0BCYrXNfVpo9ZdlHfG2nONjbiiZVqkSvUMBb38PLVoEIWukvJWOgYdLwmPYp8HdF Tlw3TCxTaKVOvVa8fU5ezAW4NMBKB1xo1bHhZplUeRdzcEgm8gnHt+KsMJHjXh5ERQ5Oty 7bL0TlMvmO8LUnYRt+jiRDb6mDEqCUSwJ/miLgfA0p4KsJ8z9ySIr7Tqv/2VwLq4DYv5QU AiRyGceNSZw6cUr0JuR6lK46S7SEpPTa/jaaMnDluuTFE3qfsORB/S+z3VDrOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPj+EDkp0FWbUHzQvsSmj6br8/B3huLWz8mkp2Q1oPw=; b=d2ouuFe251ERq1CGjHcHjmHaoUiQNT+KjlLDdPQvdFTTQLzDcm3nnk+1ekZHnDuSDFi8M5 1+xIfUqr5czkWsWtgnUbt7XJtqXpGpxYgqWSnfSeyLNqUhWiGJuwNVRZjx2N60wLRhdIDp g33OYnY/s8CIx9qVsHopsv8vlv7zVg2jQsj/gAfFrb3mvgs6Bs4iFBfNb5N7BcVu04o+Rs HtvUXWOh+cZ7zaxBbU4VOb1v0jZJ98NWojSU6W+Q5wC93UUuWs2ESc0G0HxP18t/+4g3Rx yIFziCjvqds7319h43UIkTTYiCeRGoP6/egl4x7rTioHrqRUiySI3jQlS9RLyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmKg1tvLzr1X; Tue, 1 Aug 2023 20:04: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 371K4dVV013523; Tue, 1 Aug 2023 20:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4dVo013522; Tue, 1 Aug 2023 20:04:39 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:39 GMT Message-Id: <202308012004.371K4dVo013522@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: 39b281c29965 - releng/13.1 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 39b281c2996526288c0f2ae94abe6b164bcd5954 Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=39b281c2996526288c0f2ae94abe6b164bcd5954 commit 39b281c2996526288c0f2ae94abe6b164bcd5954 Author: Mark Johnston AuthorDate: 2023-08-01 15:16:09 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:12 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 14 ++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 48ee282da9d6..a773a6f7de33 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,20 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230801: + 13.1-RELEASE-p9 FreeBSD-SA-23:06.ipv6 + FreeBSD-SA-23:07.bhyve + FreeBSD-SA-23:08.ssh + FreeBSD-SA-23:09.pam_krb5 + + Remote denial of service in IPv6 fragment reassembly [SA-23:06.ipv6] + + bhyve privileged guest escape via fwctl [SA-23:07.bhyve] + + Potential remote code execution via ssh-agent forwarding [SA-23:08.ssh] + + Network authentication attack via pam_krb5 [SA-23:09.pam_krb5] + 20230621: 13.1-RELEASE-p8 FreeBSD-EN-23:05.tzdata FreeBSD-EN-23:06.loader diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index bf8af719c539..405b06a19948 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.1" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Aug 1 20:05: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 4RFmLX25fRz4pnpH; Tue, 1 Aug 2023 20:05: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 4RFmLX12ymz3G64; Tue, 1 Aug 2023 20:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=apDQTXwQTJzfgIgJH3Ed9ZCYXkT+nQS23Bmcrpxap/s=; b=IcmEUkWXkJMeJyu4MArBGyvDGvGSI1jLr0nhYrlDG0U7GEFB6wG2Ck6TBldCcZQhpy9lDF j2GyxHB+at0YA1TepXVFoCFx88VM2m83j9D0pjeLXihLeg4rWrZA/mpEsoJcpVXug0gpDu s3xTY8vFQ4baHzKF+MlLRaVXVULWYZPNJALoeNoGgzeGgbSegRBbdM5UH9Bbbq+Ck1PZ5/ gMMMP2PP4KSbCBg1WFmPZj/FcQ5ABhQ7z2mFBhJP4DytVbJ0BIhTiC0jIVdqvlZJkqXFma S7GOW1yJ4ovIOJoJ2umiLG13pnhXA3PGKaFTQyEjbRNdQoJ7ZFAK5kI+oL6lcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920324; a=rsa-sha256; cv=none; b=oS7aoM17kVya96EOrRLB1nC9Ipm8LX3d6NejBIdOfaFWOhqe3ligk07GFb+YvN99NTH1ry EHV4U5jPKEvSnqKmuIckZH6E0x2Z8qst7TKdMI1el+r4nck6C6T1/UOEVxoovg6ovIJ9kH awC8Vg8mOeRmUYzN/ciCuhPp6DcPPZMMXynSrftXdk26zmVE1YT1rKcx36mfntk9bXBEV0 L4GI5I7YoWMsr4NY5jErgYT0t60E/dKWF1pT6Gof6OzqnWhYOZFs8JlqDAKSbn5CbZ/PwA ou91ZT6gBe97EsVI3x5aZVl+WzvaQ4iosidlVEEjX5nWwjmYDzaOyqkhSw9GTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=apDQTXwQTJzfgIgJH3Ed9ZCYXkT+nQS23Bmcrpxap/s=; b=bkpRsKzdys++6DdA0MLCQm7xerYvlnhDXuOiNmXEfCZOSxQkusl0iSuDnY4QqecklhThV2 S/lMtFM9+CW3XJixoHwkzro+N1PYHfj232cegCxADALTV6IxyBVXm0WakhCnfAwEVAJ6H9 W68jEv1bNlJENfwqRC8uBzW0n6OnOuE8l26KHZEs6sOzEJsobMlvCh/tCBOHiwQCiRHNij 5bW7S6p92TVecMrm2BVRrye8Jav+mfUz0lTIVOISB+1jZFPLNaa+aKGGLbXWVq663C6OwK m4Q5yDEjYCk+NfmeakUOjZl7yEVzfbfWHxoefyK/Rn61n7UXQChHZ6zsaQo/CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmLW6bqRzrG6; Tue, 1 Aug 2023 20:05: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 371K5N7n013825; Tue, 1 Aug 2023 20:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K5NJT013824; Tue, 1 Aug 2023 20:05:23 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:05:23 GMT Message-Id: <202308012005.371K5NJT013824@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: 234ef73f5a33 - stable/12 - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 234ef73f5a33959ab082e1013dcc4f82864cb10c Auto-Submitted: auto-generated The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=234ef73f5a33959ab082e1013dcc4f82864cb10c commit 234ef73f5a33959ab082e1013dcc4f82864cb10c Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 20:05:08 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index fe9fde6bcb25..c6d42a9eaf49 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -816,6 +816,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:06: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 4RFmMl275cz4pp2w; Tue, 1 Aug 2023 20:06: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 4RFmMh1rfZz3Gp3; Tue, 1 Aug 2023 20:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLgX2l+1G11Fl5EOSabsceQO1WoE/AH/pZ3OjaIsGOg=; b=nWtdz1NPNm4ZF9ZlKIJwzwgEavSwctE27A5N7xHZm1TggmZRDv/yFA7yJiTuImHsbe81e6 dF7fWdwxh4TqmsKLaCscJpcXDD6j+/PO/vklfYisLyNEYXPP0pr2v4++0MDlDHGM7Ao81x aJvuWny+QLVyK0qm/xouSc9DtaqQCiGwb0XFXsomQ62xH9D2ZB71wGTXrwmIYeaoQhu1Am 8uo82q826zUZc0pebYXyrT9fJDIpBKRgbQGpVEGdM7jz0yIekQZ3uuRIcwhECRnUwG7lm2 7c3wMk6J1Dm2FYNO+4fqw4L6ZzMelMdmomoUAHV1NpE4+MTHUZC38OZW52KZkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920384; a=rsa-sha256; cv=none; b=JW/CQyy+eBL5hRn1lZ7AEDgeV1L+XJsOga10t6J4hN7nRJaj5hoik81LMrmlXGWg+9H7OO 3CeabDQIkw/JngH6rH5MfqfMgdFgmJg7LG4Spfb2DA7x+37q9owKYcM69op5M47WcMgM7R IecTmbyoG2eHe3i/Olg2Cg9cxHh6S3D2D1j3ruz3iZkHhPsTZxtvM+9eIva303ajl6Yh1o Wkb9NlQH2UgeqRZRbnMySuqouTIcaNrGHT78nJXK19VRoEK6JJwg9tBGeJuiUXxkgNlZWB rjEijjfmfRoOvJ59VtYce2klCXVTFY8mGTA5pGfcENsSRpfnpg9K/7qgeZKiDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLgX2l+1G11Fl5EOSabsceQO1WoE/AH/pZ3OjaIsGOg=; b=p1G5vSXcbMPmpKl6wcwCIF00a5kWoevCsmERj+J69laQftlAEBP0dEyU4HHVN2qwm6D109 D//0RV9WBVF9NcKHHh8+h3HXltgfgWXQGmhhO7LKSYHPfXoR4d4xrj5FBB0MtT8sqRSh4p Lzw8dpQrOSEO1ZXK/1v3ug4gNqOQz/54cxXF1QfcZNNREJe/Y9CPjR/uPLouYwVoI1YyJF SdkcJjKKvyJZQqwe2PV5ohtEU6jsGRjLJjkegrvHOqhEnDnWAku0arydewYCmRMlcr6GNb Yu1jbv3+BLW7kPjliGTh2vdU4SA5izJrBDYZO2OAYWZSa1Epgm8Uy+u9vkWVhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmMh0l5czrD6; Tue, 1 Aug 2023 20:06: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 371K6OwT014067; Tue, 1 Aug 2023 20:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6Ogb014066; Tue, 1 Aug 2023 20:06:24 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:24 GMT Message-Id: <202308012006.371K6Ogb014066@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: abe05d13d575 - releng/12.4 - pam_krb5: Add missing patch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12.4 X-Git-Reftype: branch X-Git-Commit: abe05d13d575f0299653067614169460d33aab13 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=abe05d13d575f0299653067614169460d33aab13 commit abe05d13d575f0299653067614169460d33aab13 Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:46:53 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock); From nobody Tue Aug 1 20:06: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 4RFmMl5cptz4pp2x; Tue, 1 Aug 2023 20:06: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 4RFmMl47HNz3Ggh; Tue, 1 Aug 2023 20:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ida8/YSxcPDEzyJ1lm3sa/sYZiuY8nVF43itirrudY=; b=unaR+rT74vI8w/vtF3GWCuVmUc6DcCCINLCWxtsWzdcB9/nNzCmRqupxTCjkKwI+mb1SD7 Mw+ybq0viq+xlB5h4YEFx8l3v7RGksN9x9DyeMPUWVrPSJ9mK4nCtWEjcqmtaHjKSLHc9K vfV4aoOeI6UgCaRejZ2ugBR2Tgnp6WcQJBE/0yrfiCYRhPu8QQdvLdjB4hK4jUoTGEkg0x joHtz1wlyo3g8Vaogzjlu91JKgukNGRvdx3YrH1D4Yude4Om9g+1Ttt4ZCxUg+kRoiUf9f l88DfLUplZFLM2YEZnrJdNjrviUpXfLQdt3gGKnfpFQspr+KR2wmGV109mI0vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920387; a=rsa-sha256; cv=none; b=Jy1UWhQ6tVuUKKuT4jnXofL1ZFb6kNp8KoBrSw+MgtP3egf46TYLbTdAiBTjEILOJ2+3kC 2xNuSMJ9we2DX+Dfm6vAgQQkWhlYQCnC2oxFpbfrjJ42KYlqnw9CbMMgGfwzpBAeNZ790E xqAzDzBZ6xb5daRHoshf9J4UiuC/oLRAev/eYdHHhnEA5g95Ye8zzvElNxskF+QdSq+SNZ QGJtqNBSGJeqKh5OZcHrfSIGKDxeQdqS8i01OKvYP7AO4abqYOyqoi1+YqWU0gkHm+GY0g WI4R7R3kx1uudFBJkkOE9T1ilKZQj+5WGXA+VcxyVQ4x7RTtPdg8HfzMNb7YGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ida8/YSxcPDEzyJ1lm3sa/sYZiuY8nVF43itirrudY=; b=wmgnLz4Cc49fkaM7CxE88KvxRSLXbVgXzZbb0T5kFaGMV+mJ8NiPp6YP5kkD2PAjg95HeJ Y1bwLU70Ix3e5Bvybo+H7ICzambHZTEYr6eBfGaL7XobVgWQ25Nq1y4SMD0azGZ4RdFHUm V0efZQSuzwFzwQyMGJy4TuJs/sZOWYcUWQumYsW0T/lJe62El5bqsY4kvH+ACMNs9PgYzs LPxOIRD28PiU1P2/BBxU624TQlHHt0O8sdhyt+I8RGRrzpl5uoo8ha7p/L6FoMrO0PzfRm SXJC7hKIZG+2akAbyJF4Q9Q9PT402EJiz2fHZOrmYOLWdlRSVEzrZDu+WGzEKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmMl2LJpzrD7; Tue, 1 Aug 2023 20:06: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 371K6RPd014133; Tue, 1 Aug 2023 20:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6RDZ014132; Tue, 1 Aug 2023 20:06:27 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:27 GMT Message-Id: <202308012006.371K6RDZ014132@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: 595be1fc5798 - releng/12.4 - Add UPDATING entries and bump version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 595be1fc5798d15cc4f6783516138b2bdd9490b2 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=595be1fc5798d15cc4f6783516138b2bdd9490b2 commit 595be1fc5798d15cc4f6783516138b2bdd9490b2 Author: Mark Johnston AuthorDate: 2023-08-01 15:15:41 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 20:05:58 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 11 +++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 819f3692b232..e12d21e253ca 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,17 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20230801: + 12.4-RELEASE-p4 FreeBSD-SA-23:06.ipv6 + FreeBSD-SA-23:08.ssh + FreeBSD-SA-23:09.pam_krb5 + + Remote denial of service in IPv6 fragment reassembly [SA-23:06.ipv6] + + Potential remote code execution via ssh-agent forwarding [SA-23:08.ssh] + + Network authentication attack via pam_krb5 [SA-23:09.pam_krb5] + 20230621: 12.4-RELEASE-p3 FreeBSD-EN-23:05.tzdata FreeBSD-EN-23:07.mpr diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6216e480dc51..cd51b45135d3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Aug 1 20:06: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 4RFmMl1Jqgz4pnm3; Tue, 1 Aug 2023 20:06: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 4RFmMj37y1z3Gp4; Tue, 1 Aug 2023 20:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8Y0w8D8ByyjTDxYmDWiTkn6I8HupM6JD1xXoP7LC9c=; b=CCGa8onUQU1V4wEX3a/l513zAtOdfyol7fX/SMnPSHzoCWwIAdYWzClt6A13BUQOQ2oBn+ /5AZ9O1JCaUx4uVEa2so2XcWh46dRR7I0Bj19d2Ox1nhzcYWO0yvKqZhmmOJ9c+vhJrvSJ V25KFBFrq934aoxxfwyyWhrd7OYgvhl2S41FYGb59nvfIuLEDxCQkF+6QmhATkUhP9R+pC HGetd8CqTmVnIwgE3kK/6lW1uQkJne/ltoGREmjij5uDuUfroAC7apEo/16N/Tt6ZsRVqh deIOIXxcRVHJt6NBdypYjG2QnQhwWSjEeOhDBTnlKum0I5kd478t3rUjxgDNVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920385; a=rsa-sha256; cv=none; b=FlwbGup6KFf8Fskt49zKo7i0823yui9u/fFuqCvt56DoVyJpVEiYRuw+vgXoc7IXgv/EmN Pr8I2OiYMDpbFt3xJ4wXKIj9HKRaIn1QDxM5clGmwcMSiuFa0T3WhU/xsPLwcE2P57DV1Z qK6ubzuvx5FSgytS8hghxKFh69CbhwLu+Rp/5lPnpsHA1D0KVskilsmEoAg0mqMrD3nSPC 6rzzeZsgDeTt1pbV1+5kNZklmYbdiZkXbSyWZI0TI1n9IK0wLlpo8z5ufzV+SpxYSDKFgt jYxHkwWMJRfcHDdZ6JEWHvyMrorBer/j1IPz8rQQYiLY/uk4n8TOBikR2YyF3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8Y0w8D8ByyjTDxYmDWiTkn6I8HupM6JD1xXoP7LC9c=; b=aeCX4/1bOhy/bRBf/lbgAHpW8oxMAheg4DopRSlkiIxtyXFCODUZW3nYP/LKRUH2nKVcbR Ad4E+Qi5LcFd7ktvCFfYwFRmW37dfLS51dfqmP2RW1EF51n3VxemmEACczF87ps4PxvLrH 56bjzL87V92aQpEZyvAHgpWhO/jYCXCYkKwJ85MoMIEAf0CJYciSJlzoFnsbbcAQcL8C3h le6Lq6abdj0cRed44N2anOTk5M40twkv+sVC8FkHu7uxKHBOu+h0Siz1rPOXESCC7KejBY EEn468i+6Z6HJy+LDnhFIZVE7/JUygJ9r9DmgMRUyE9xf0LfwYVjXr6DoyxRhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmMj1TzjzrMN; Tue, 1 Aug 2023 20:06: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 371K6PMI014092; Tue, 1 Aug 2023 20:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6PSH014091; Tue, 1 Aug 2023 20:06:25 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:25 GMT Message-Id: <202308012006.371K6PSH014091@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: 4286578bb1d4 - releng/12.4 - ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12.4 X-Git-Reftype: branch X-Git-Commit: 4286578bb1d432301ba7de49855d5c53289da5f4 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4286578bb1d432301ba7de49855d5c53289da5f4 commit 4286578bb1d432301ba7de49855d5c53289da5f4 Author: Ed Maste AuthorDate: 2023-08-01 14:40:42 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:47:00 +0000 ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 Approved by: so Security: FreeBSD-SA-23:08.ssh Security: CVE-2023-38408 --- crypto/openssh/ssh-agent.1 | 45 ++++++++++++++++++++++++++++++++++++++++++-- crypto/openssh/ssh-agent.c | 29 +++++++++++++++++++++++----- crypto/openssh/ssh-pkcs11.c | 6 ++---- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 6 files changed, 72 insertions(+), 14 deletions(-) diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1 index 8844b2eb45e8..a0ea506bdc93 100644 --- a/crypto/openssh/ssh-agent.1 +++ b/crypto/openssh/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.73 2022/03/31 17:27:27 naddy Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.75 2022/10/07 06:00:58 jmc Exp $ .\" $FreeBSD$ .\" .\" Author: Tatu Ylonen @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: October 7 2022 $ .Dt SSH-AGENT 1 .Os .Sh NAME @@ -47,11 +47,13 @@ .Op Fl \&Ddx .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash +.Op Fl O Ar option .Op Fl P Ar allowed_providers .Op Fl t Ar life .Nm ssh-agent .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash +.Op Fl O Ar option .Op Fl P Ar allowed_providers .Op Fl t Ar life .Ar command Op Ar arg ... @@ -103,6 +105,45 @@ The default is Kill the current agent (given by the .Ev SSH_AGENT_PID environment variable). +.It Fl O Ar option +Specify an option when starting +.Nm . +Currently two options are supported: +.Cm allow-remote-pkcs11 +and +.Cm no-restrict-websafe . +.Pp +The +.Cm allow-remote-pkcs11 +option allows clients of a forwarded +.Nm +to load PKCS#11 or FIDO provider libraries. +By default only local clients may perform this operation. +Note that signalling that a +.Nm +client remote is performed by +.Xr ssh 1 , +and use of other tools to forward access to the agent socket may circumvent +this restriction. +.Pp +The +.Cm no-restrict-websafe , +instructs +.Nm +to permit signatures using FIDO keys that might be web authentication +requests. +By default, +.Nm +refuses signature requests for FIDO keys where the key application string +does not start with +.Dq ssh: +and when the data to be signed does not appear to be a +.Xr ssh 1 +user authentication request or a +.Xr ssh-keygen 1 +signature. +The default behaviour prevents forwarded access to a FIDO key from also +implicitly forwarding the ability to authenticate to websites. .It Fl P Ar allowed_providers Specify a pattern-list of acceptable paths for PKCS#11 provider and FIDO authenticator middleware shared libraries that may be used with the diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c index 2c2c7a639907..0e218390a21c 100644 --- a/crypto/openssh/ssh-agent.c +++ b/crypto/openssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.292 2022/09/17 10:11:29 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.293 2022/10/07 06:00:58 jmc Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -172,6 +172,12 @@ char socket_dir[PATH_MAX]; /* Pattern-list of allowed PKCS#11/Security key paths */ static char *allowed_providers; +/* + * Allows PKCS11 providers or SK keys that use non-internal providers to + * be added over a remote connection (identified by session-bind@openssh.com). + */ +static int remote_add_provider; + /* locking */ #define LOCK_SIZE 32 #define LOCK_SALT_SIZE 16 @@ -1249,6 +1255,12 @@ process_add_identity(SocketEntry *e) if (strcasecmp(sk_provider, "internal") == 0) { debug_f("internal provider"); } else { + if (e->nsession_ids != 0 && !remote_add_provider) { + verbose("failed add of SK provider \"%.100s\": " + "remote addition of providers is disabled", + sk_provider); + goto out; + } if (realpath(sk_provider, canonical_provider) == NULL) { verbose("failed provider \"%.100s\": " "realpath: %s", sk_provider, @@ -1412,6 +1424,11 @@ process_add_smartcard_key(SocketEntry *e) error_f("failed to parse constraints"); goto send; } + if (e->nsession_ids != 0 && !remote_add_provider) { + verbose("failed PKCS#11 add of \"%.100s\": remote addition of " + "providers is disabled", provider); + goto send; + } if (realpath(provider, canonical_provider) == NULL) { verbose("failed PKCS#11 add of \"%.100s\": realpath: %s", provider, strerror(errno)); @@ -2015,9 +2032,9 @@ usage(void) { fprintf(stderr, "usage: ssh-agent [-c | -s] [-Ddx] [-a bind_address] [-E fingerprint_hash]\n" - " [-P allowed_providers] [-t life]\n" - " ssh-agent [-a bind_address] [-E fingerprint_hash] [-P allowed_providers]\n" - " [-t life] command [arg ...]\n" + " [-O option] [-P allowed_providers] [-t life]\n" + " ssh-agent [-a bind_address] [-E fingerprint_hash] [-O option]\n" + " [-P allowed_providers] [-t life] command [arg ...]\n" " ssh-agent [-c | -s] -k\n"); exit(1); } @@ -2077,7 +2094,9 @@ main(int ac, char **av) break; case 'O': if (strcmp(optarg, "no-restrict-websafe") == 0) - restrict_websafe = 0; + restrict_websafe = 0; + else if (strcmp(optarg, "allow-remote-pkcs11") == 0) + remote_add_provider = 1; else fatal("Unknown -O option"); break; diff --git a/crypto/openssh/ssh-pkcs11.c b/crypto/openssh/ssh-pkcs11.c index b2e2b32a5078..9e48c134e411 100644 --- a/crypto/openssh/ssh-pkcs11.c +++ b/crypto/openssh/ssh-pkcs11.c @@ -1537,10 +1537,8 @@ pkcs11_register_provider(char *provider_id, char *pin, error("dlopen %s failed: %s", provider_id, dlerror()); goto fail; } - if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) { - error("dlsym(C_GetFunctionList) failed: %s", dlerror()); - goto fail; - } + if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) + fatal("dlsym(C_GetFunctionList) failed: %s", dlerror()); p = xcalloc(1, sizeof(*p)); p->name = xstrdup(provider_id); p->handle = handle; diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 33c6e9a3b130..14a58ef4ddbb 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -106,7 +106,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20221019 +#VersionAddendum FreeBSD-20230719 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 34dc3648ed26..dd8623d9b4dd 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1822,7 +1822,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Qq FreeBSD-20221019 . +.Qq FreeBSD-20230719 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 30539ed442ca..3f7069aba20f 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -6,4 +6,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20221019" +#define SSH_VERSION_FREEBSD "FreeBSD-20230719" From nobody Tue Aug 1 20:06: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 4RFmMl3Bm1z4pnpj; Tue, 1 Aug 2023 20:06: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 4RFmMk5FWvz3Gm4; Tue, 1 Aug 2023 20:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Waf+I+28o+oPnsNb9fHwK6Z+sdHWZV/Psdkl97a0Lx0=; b=Ch/zCXRX3ScYytlQTOneCan8MctYGjZHMyq7UGjen7Mgy+OchGjZ/xD+OEbAZv27jmwqTI uY8Wujykjt8nFAZw1VhzHRK30rgZOv5E1Rc9uuxrxTr9U3rtB0kVhNnz7CrkBMNmrP+2Um ndrNByC5Ixv+cr3Vi1wUjE9ew7zEv4ILqCuMwexuuypPW9+CvQPZwxqLk7qhlc32kRiWpC E11KTY+YROneRHs3ie5EZ+kXHEniLTz+AjOjEBxpEDffIc4qbNdurdtIOpYCMP/V9IrbbO YNSmpM0J+WePR/7jOl6cW8/bqO3buxutg5JpA0B9fzc5ssZa7wNXL2fXsDDHCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920386; a=rsa-sha256; cv=none; b=t/D1QQ7AxWoLlOi77+28hH06abggeVzn2CFSPGr0x7tXAPL55BFICj/WZvrM7N8SAAc3Na 812soi9n96kX3faru4XP616T4zhZiuBmWEIENbtQc76q26xhGibYJMLXwZuzKUBgPlNwGb 8AuPio2VHz9mXNUVdbeL0UuEIQmY9bhSWOGOFxqiWjmnle9TewOesy8yomd7visYM4A91f Q0jCgGflTFFLpZV3YJcDmMYtw5d0kDPNa3gAHWAbfFkM4GYW38I+xQkff1X//haobRXhn6 W4wFKoAea08hWvwCO7l7NkcGK5iqhCiy3Sb1HtxO4QwbwMZDP8l1sftnYn/6yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Waf+I+28o+oPnsNb9fHwK6Z+sdHWZV/Psdkl97a0Lx0=; b=fPxrNwIaXNgzVFIG5QS+iSPGLmiiUwd0Sqx4JWbtaQayVFyzgAUztSh03nJ+1DC/FrlzRL a2HTC5h7KBAple+9hxEpC+HYq9EpcFpxjhuvwmmdrLBFxt2oslWP27c8D9T1u2/Onwb/jO Rcq/MSW57rATUSrb5CxBH9452IPjcDgCA0IJoVq1brM5yoyMczgJUpN5/ugmyF//WxJvLo vqFrLotfd9+u90vVkQLqwYoPfYV4aZ47NEDPLjjfQAj32IkQH30uez8GD2FL/yO1usXRsx yo+EtSTHXCWGWzvL1CYuA7zjWOPoSk92r18Y6FWDH81CQhJcndT6smrzl43VOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmMk1s6hzrP1; Tue, 1 Aug 2023 20:06: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 371K6QPo014114; Tue, 1 Aug 2023 20:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6Qvw014113; Tue, 1 Aug 2023 20:06:26 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:26 GMT Message-Id: <202308012006.371K6Qvw014113@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: 2f6b510ea2a3 - releng/12.4 - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12.4 X-Git-Reftype: branch X-Git-Commit: 2f6b510ea2a3a81dbf929892fe552386ed1c2262 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6b510ea2a3a81dbf929892fe552386ed1c2262 commit 2f6b510ea2a3a81dbf929892fe552386ed1c2262 Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 20:05:42 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) (cherry picked from commit 234ef73f5a33959ab082e1013dcc4f82864cb10c) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index fe9fde6bcb25..c6d42a9eaf49 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -816,6 +816,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE) From nobody Tue Aug 1 20:17: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 4RFmcQ5FVpz4ppRd; Tue, 1 Aug 2023 20: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 4RFmcP6rgsz3HDB; Tue, 1 Aug 2023 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnfQzh4EfLmonD1Lr9k4qPOzq2AMRp2XDtf7dq5UJ7Y=; b=PmJYdXKJJVXLUikpV9iA+eSAj3J9LT51ZdJwXPGjqby5UXu5O2sGLA+z+bkid9YPyqbuqX 2EJ0XyduKsQcm079PjGQDdFF0YOKWbBMB6jJlZlkO7ALPbP7SA5TGatWf/5uG1+fEuz5dz D1WFIX3knUTaqT2RnyG8gYZntrUTNbY2O9wvQgP2m4D5Za7hfuyHx4ondkCUa9B/bckTu8 1/jhK+tBrvnKAH4XxBNWSmuKRRvabto2Ut8OuPIE430Xz33wtRaNRb0CH2fr+KHEk+COVG BHsYXLpmd2ezLdtP8IQiIY6Vt2SiQwdcRwNGwjFq5bOzLDooIaRkoZD58Nmbhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690921046; a=rsa-sha256; cv=none; b=LUtXJCX+GpaDfvjkmGpyPLJW/JL79VwS+eKrzABXrzh2g8DHrHG3/C5spDp9SDmuQEseiY y5fT2OQ62V10nqC4jv6TPmFLh1H/5Fj/ca/3CK8gHpXA8NAQvtvqluzxyl0dzkGYp9qru3 vpKJf4CQvavfmzPqg0eVk82Kn/ZKV3Y+2GjIUdv2JPdOyhw9wzcOzuN8QxBNoxW+dfWwz1 tERd2xNPJmhGkGN19uD9/yUw5I6TShGPCJPsVdy1SjfoxAPEwluu5u02M1cKZOlKwq5fhK DmJxl/tOQHzyztG5AFEx24EFK8hjqf2gy23HQ8+IFTXBpbV4IYPb4Rwc8L8/1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnfQzh4EfLmonD1Lr9k4qPOzq2AMRp2XDtf7dq5UJ7Y=; b=csuM4XMUqzaEhlfCNlobtcYBS3fHRs+0UbH4bk0yA/9x6W3rR7FxS28U7/Xjn3NINsGi5m Zn/xZr2C4TwUDeQl6kQKCWk2eh0ZnYnM5UcCcbBGQBdb6k++BgpBjRC05uB4VNjp405bL+ jntjLifYr4EVGJtYwmywg486PcbvJe9LXr5e7bCi9Knou5y0GF7qeeGHZ7N7CD0jdZIHwA 7H3Yy7cZqvhozL4Z65KkGTaOWlQYmpa+7xdfrwFbzqzQLgVYqcFPtHL+y6gU7C6GHBzKQ6 k9qbsUziMmf4BBA7dkfvogG7mbGNKVZ6p1dp7Yg4nv9lW44NgIV1tp2z6s4tTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmcP3FzdzrXY; Tue, 1 Aug 2023 20:17: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 371KHOCP030731; Tue, 1 Aug 2023 20:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371KHOEO030730; Tue, 1 Aug 2023 20:17:24 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:17:24 GMT Message-Id: <202308012017.371KHOEO030730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 344b5bf82528 - main - Support background fsck_ffs(8) on filesystems using journaled soft updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 344b5bf82528575ada304f0df356d2f045772328 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=344b5bf82528575ada304f0df356d2f045772328 commit 344b5bf82528575ada304f0df356d2f045772328 Author: Kirk McKusick AuthorDate: 2023-08-01 20:16:11 +0000 Commit: Kirk McKusick CommitDate: 2023-08-01 20:17:02 +0000 Support background fsck_ffs(8) on filesystems using journaled soft updates An earlier addition of code to fsck_ffs(8) allowed it to support snapshots when running with journalled soft updates. Further functionality has now been added to fsck_ffs(8) to allow it to use snapshots to run in background on live filesystems running with journaled soft updates. This commit enables the use of this functionality. Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation MFC-after: 2 weeks --- sbin/fsck_ffs/main.c | 19 +++++++++++-------- sbin/fsck_ffs/suj.c | 25 +++++++++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 0acf7e709180..bfe2901c4053 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -274,9 +274,16 @@ checkfilesys(char *filesys) if (bkgrdcheck) { if (sbreadfailed) exit(3); /* Cannot read superblock */ - /* Earlier background failed or journaled */ - if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ)) - exit(4); + if ((sblock.fs_flags & FS_NEEDSFSCK) == FS_NEEDSFSCK) + exit(4); /* Earlier background failed */ + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + maxino = sblock.fs_ncg * sblock.fs_ipg; + maxfsblock = sblock.fs_size; + bufinit(); + preen = 1; + if (suj_check(filesys) == 0) + exit(4); /* Journal good, run it now */ + } if ((sblock.fs_flags & FS_DOSOFTDEP) == 0) exit(5); /* Not running soft updates */ size = MIBSIZE; @@ -350,7 +357,7 @@ checkfilesys(char *filesys) /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if (bkgrdflag == 0 && (sblock.fs_flags & FS_SUJ) == FS_SUJ) { if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { sujrecovery = 1; @@ -619,10 +626,6 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) pwarn("FULL FSCK NEEDED, CANNOT RUN IN BACKGROUND\n"); return (0); } - if ((sblock.fs_flags & FS_SUJ) != 0) { - pwarn("JOURNALED FILESYSTEM, CANNOT RUN IN BACKGROUND\n"); - return (0); - } if (skipclean && ckclean && (sblock.fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK)) == 0) { /* diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index e55e3fb1c782..b78123b59678 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2135,7 +2135,9 @@ suj_verifyino(union dinode *dp) } if (DIP(dp, di_modrev) != fs->fs_mtime) { - printf("Journal timestamp does not match fs mount time\n"); + if (!bkgrdcheck || debug) + printf("Journal timestamp does not match " + "fs mount time\n"); return (-1); } @@ -2436,7 +2438,9 @@ suj_check(const char *filesys) sujino = idesc.id_parent; irelse(&ip); } else { - printf("Journal inode removed. Use tunefs to re-create.\n"); + if (!bkgrdcheck || debug) + printf("Journal inode removed. " + "Use tunefs to re-create.\n"); sblock.fs_flags &= ~FS_SUJ; sblock.fs_sujfree = 0; irelse(&ip); @@ -2447,7 +2451,8 @@ suj_check(const char *filesys) */ ginode(sujino, &ip); jip = ip.i_dp; - printf("** SU+J Recovering %s\n", filesys); + if (!bkgrdcheck || debug) + printf("** SU+J Recovering %s\n", filesys); if (suj_verifyino(jip) != 0 || (!preen && !reply("USE JOURNAL"))) { irelse(&ip); return (-1); @@ -2456,15 +2461,23 @@ suj_check(const char *filesys) * Build a list of journal blocks in jblocks before parsing the * available journal blocks in with suj_read(). */ - printf("** Reading %jd byte journal from inode %ju.\n", - DIP(jip, di_size), (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("** Reading %jd byte journal from inode %ju.\n", + DIP(jip, di_size), (uintmax_t)sujino); suj_jblocks = jblocks_create(); blocks = ino_visit(jip, sujino, suj_add_block, 0); if (blocks != numfrags(fs, DIP(jip, di_size))) { - printf("Sparse journal inode %ju.\n", (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("Sparse journal inode %ju.\n", + (uintmax_t)sujino); irelse(&ip); return (-1); } + /* If journal is valid then do journal check rather than background */ + if (bkgrdcheck) { + irelse(&ip); + return (0); + } irelse(&ip); suj_read(); jblocks_destroy(suj_jblocks); From nobody Tue Aug 1 20:24: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 4RFmmW2srhz4pplH; Tue, 1 Aug 2023 20:24: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 4RFmmC4cRrz3HqD; Tue, 1 Aug 2023 20:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqiKXMZQu6bz47cp6w6pCU93GBAojxd/m1KJIrmhXNw=; b=r7uQFL+w38hXJWW1TmspfVYQVSXYk2XM2zrO50kGFplXNZlPuDOBuv2lJnHaeXkWgeM2J9 Xy/BhoesSnhsj/m1zPAocxFux0+5udNp0qTV+7kPJ2EfTJw9G5rQXk2nsN8FXZ2kzd8zJF SS0Z3jkWRsjRQXVe1nzUTFgFIpS3lEE/8nWm5zkEWgCHKXRVaAacFjItXZfw5FBmkmxyX8 G6Id6mPiejAzUDGWnyS8s2hAetZBhSGIn2y7ZIV1jimlS5vPTOw2zD3M8kw4wpBJ5bFLok mIfF5gDv7oCswoc1IVaKHDTZAkv0kutE0X02kDAsdQclxAPwVEqmsEAmf0dpUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690921451; a=rsa-sha256; cv=none; b=u+t5YzsUyrmqSWVI3mlwwfb5EIpPDIU6k/qpigXtbjF/EXx5r1GqoGvz1dGDPB4UskD1Qq XIEb1RBcWdOQ9wLOkrSGzSfgW1pc2oK0QIHQlOFyCnlOLhW4tJ7w6j8YPvYEjYaw5ovtkH gMrfYj0d1h2gLjWq/FJjnurfkhvx/s6JI2xMI+LYIEhpTuzQhrniz2Gvd75DBuRBA1x7Ht mNSo1dxxMQwTJg6jkt6Pma0gFZKdLmhL1tukcXiv+Qh+4TdoW8CiYTwQT6cyJ0tpJXL6jE jodLvinBt3PunypTIvWw4kFNBfdHCUFkENCYQc8U5Ya9aZTyIvScva1MTIM/Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690921451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqiKXMZQu6bz47cp6w6pCU93GBAojxd/m1KJIrmhXNw=; b=yi+rK63zb/88jRo6sstjAMLsGOvbCM7OlaAGckM4MJWEX8IqALxQRG/XXmfnSTLK28r4K6 LsM7ZVgB/J5wIrlNdTKk2fXXn4hR0O3ZUKXXNMU+F7c0vdlsLpsIjdEl+I5+NOzrs1E8zf DSyO+VRPH3i7ZjgXo4aKkKfQmanlSJ4JpabqEMMCJooIdXYSgppdeJAskhKh/9SlBa8p8d Nywj3FYDL+2Y/7uwcJ0uPrKKirkpts4ISzfKw13qXGN9aEWeOc0sI+m/da1sZI1I5NEtPZ dSARkKEg+hpAe4R99CVouH9YLr4xa5GBWAxgWp8NQ/+2LJUpllgDLVnRy/sAcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFmmB6hcfzrp3; Tue, 1 Aug 2023 20:24: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 371KOAOS046217; Tue, 1 Aug 2023 20:24:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371KOAHb046216; Tue, 1 Aug 2023 20:24:10 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:24:10 GMT Message-Id: <202308012024.371KOAHb046216@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: 5a7e48dddfb5 - main - tests: Add MAP_32BIT flag test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5a7e48dddfb5a668ded4742b79e6f6f88b647e6a commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a Author: Dmitry Chagin AuthorDate: 2023-08-01 20:23:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-01 20:23:15 +0000 tests: Add MAP_32BIT flag test Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D41236 MFC after: 1 month --- tests/sys/vm/Makefile | 8 ++++++ tests/sys/vm/mmap_map_32bit_helper.c | 51 ++++++++++++++++++++++++++++++++++++ tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index 8ef8a45e5f39..9aac49bc5320 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -9,4 +9,12 @@ ATF_TESTS_C+= mlock_test \ page_fault_signal \ shared_shadow_inval_test +.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ + (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") + # MAP_32BIT is only available on 64-bit platforms +BINDIR= ${TESTSDIR} +ATF_TESTS_SH+= mmap_map_32bit_test +PROGS+= mmap_map_32bit_helper +.endif + .include diff --git a/tests/sys/vm/mmap_map_32bit_helper.c b/tests/sys/vm/mmap_map_32bit_helper.c new file mode 100644 index 000000000000..47d4b2c53c20 --- /dev/null +++ b/tests/sys/vm/mmap_map_32bit_helper.c @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include + +_Static_assert(sizeof(vm_offset_t) >= 8, "Test is not intended for ILP32"); +#define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) + +int +main(void) +{ + size_t pagesize; + void *s32; + int fd; + + if ((pagesize = getpagesize()) <= 0) + err(1, "getpagesize"); + + fd = open("/dev/zero", O_RDONLY); + if (fd <= 0) + err(1, "open failed"); + + s32 = mmap(NULL, pagesize, PROT_READ, MAP_32BIT | MAP_PRIVATE, fd, 0); + if (s32 == MAP_FAILED) + err(1, "mmap MAP_32BIT | MAP_PRIVATE failed"); + if (((vm_offset_t)s32 + pagesize) > MAP_32BIT_MAX_ADDR) + errx(1, "mmap invalid result %p", s32); + + close(fd); + if (munmap(s32, pagesize) != 0) + err(1, "munmap failed"); + + s32 = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, + MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + if (s32 == MAP_FAILED) + err(1, "mmap MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE failed"); + if (((vm_offset_t)s32 + pagesize) > MAP_32BIT_MAX_ADDR) + errx(1, "mmap invalid result %p", s32); + + if (munmap(s32, pagesize) != 0) + err(1, "munmap failed"); + exit(0); +} diff --git a/tests/sys/vm/mmap_map_32bit_test.sh b/tests/sys/vm/mmap_map_32bit_test.sh new file mode 100644 index 000000000000..2df53e78f1b7 --- /dev/null +++ b/tests/sys/vm/mmap_map_32bit_test.sh @@ -0,0 +1,37 @@ +# +# Copyright (c) 2022 Dmitry Chagin +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Simple test of MAP_32BIT flag w/wo ASLR + +map_32bit_w_aslr_head() +{ + atf_set descr "MAP_32BIT with ASLR" + atf_set require.progs proccontrol +} + +map_32bit_w_aslr_body() +{ + atf_check -s exit:0 -x proccontrol -m aslr -s enable \ + $(atf_get_srcdir)/mmap_map_32bit_helper +} + +map_32bit_wo_aslr_head() +{ + atf_set descr "MAP_32BIT without ASLR" + atf_set require.progs proccontrol +} + +map_32bit_wo_aslr_body() +{ + atf_check -s exit:0 -x proccontrol -m aslr -s disable \ + $(atf_get_srcdir)/mmap_map_32bit_helper +} + + +atf_init_test_cases() +{ + atf_add_test_case map_32bit_w_aslr + atf_add_test_case map_32bit_wo_aslr +} From nobody Tue Aug 1 20:29:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFmtt6hGYz4ppdL for ; Tue, 1 Aug 2023 20:29:49 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 4RFmtf5R6Hz3Hl2 for ; Tue, 1 Aug 2023 20:29:46 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fbd33a57b6so66589155e9.2 for ; Tue, 01 Aug 2023 13:29:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690921784; x=1691526584; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fh1+2KAfstOR7YJZHlKrHc2YpFcA/ign+qQLpzMgdCg=; b=i9zm0ibyx8JDq9DoZs1w5T8NF/RTntKEs+n+yMlIPq/emNABQPtPrXTNaXDJLCMzrT vjUxM2jjtZ8YHoX3UgKVTWFpmKAt5MwF9uv2K5hldSsgoyUoWOevkU8z8fALo/F4+U3q WtMjsvCCNE3o0oVApBMw2UwZl8UEKfcU8iIq+vS8o7aAd7yEDgH28vptFX2ZfmycpZLz t0nTg9Ieo6Ece5qp2SF9pVaNyhufxc3qGgBXGRLQuCA5qEasedWeghkMHv29jau8BmIf OrsmYCtuzyh7kC7K+wdJHdCi8lH3d2dxz8ua6WmBsRwcqMiQt9ys0sBnjLicOPoukRg0 7YxA== X-Gm-Message-State: ABy/qLbllOdb/VE5mdxbd5A06dsKTijwqipMq8v+6wsNDOzC40EBML+M EVugtWN5vIYTbkoNScI4qiO4zQLAS4RIOZi85CbeKA== X-Google-Smtp-Source: APBJJlHBuSPFNe0lV+Jrgt5ED+TDLY7Mi5OO53pl7Dkh40aa/ObjN68d0yUH/hmq+M2d2BtfTG10rQ== X-Received: by 2002:a1c:7c0e:0:b0:3fe:2b69:fc6c with SMTP id x14-20020a1c7c0e000000b003fe2b69fc6cmr1856399wmc.39.1690921784403; Tue, 01 Aug 2023 13:29:44 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id o8-20020a05600c378800b003fe23b10fdfsm4993896wmr.36.2023.08.01.13.29.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 13:29:43 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 5a7e48dddfb5 - main - tests: Add MAP_32BIT flag test From: Jessica Clarke In-Reply-To: <202308012024.371KOAHb046216@gitrepo.freebsd.org> Date: Tue, 1 Aug 2023 21:29:32 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7A066A1D-9AFA-485F-AEAE-DD88C9537A44@freebsd.org> References: <202308012024.371KOAHb046216@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RFmtf5R6Hz3Hl2 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 1 Aug 2023, at 21:24, Dmitry Chagin wrote: >=20 > The branch main has been updated by dchagin: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5a7e48dddfb5a668ded4742b79e6f6f8= 8b647e6a >=20 > commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > Author: Dmitry Chagin > AuthorDate: 2023-08-01 20:23:15 +0000 > Commit: Dmitry Chagin > CommitDate: 2023-08-01 20:23:15 +0000 >=20 > tests: Add MAP_32BIT flag test >=20 > Reviewed by: kib, markj > Differential Revision: https://reviews.freebsd.org/D41236 > MFC after: 1 month > --- > tests/sys/vm/Makefile | 8 ++++++ > tests/sys/vm/mmap_map_32bit_helper.c | 51 = ++++++++++++++++++++++++++++++++++++ > tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ > 3 files changed, 96 insertions(+) >=20 > diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile > index 8ef8a45e5f39..9aac49bc5320 100644 > --- a/tests/sys/vm/Makefile > +++ b/tests/sys/vm/Makefile > @@ -9,4 +9,12 @@ ATF_TESTS_C+=3D mlock_test \ > page_fault_signal \ > shared_shadow_inval_test >=20 > +.if ${MACHINE_ARCH} !=3D "i386" && ${MACHINE} !=3D "arm" && \ > + (${MACHINE} !=3D "powerpc" || ${MACHINE_ARCH} !=3D "powerpc") > + # MAP_32BIT is only available on 64-bit platforms So use ${MACHINE_ABI:Mlong64} after including src.opts.mk? Jess From nobody Tue Aug 1 20:54: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 4RFnRb52Mnz4pqh7; Tue, 1 Aug 2023 20:54: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 4RFnRQ5n31z3KnJ; Tue, 1 Aug 2023 20:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdS7aiTt7pbEKzZs51M5vBtKyDDwJGgxC1Ah0NXTdkc=; b=w3DOMQYVwH8QkLd6t9zMqCXcbMBOC5GiapTzDRrrPOVSUzgQ/XM3jiUBLdB7GhvctiF10l D7RThYVDt7h7gzZCfNtamQdVF2kI5JjpWjzXXpfeRI7X+9/jMOnYtxoEsLqaJ8fb9p1Nwi SGL/aogcI4KUKPLhQQS/kcLw3bKQSqlEdDDhaE85b7cYrq9ItKIDWd/vQr9p6eXASL4MmF QafSGMZ1JqRaAA1nqtyx/do/e6efrBDMXWbiPJYGPQGsyn+QX4c8klEVVpzlI4RGCsavg6 YVy22f4NklubJtjkFJJp4tgoRTcbj6QuFwMw7n2H21uNJsjxo8IIXTKYxlZc6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690923282; a=rsa-sha256; cv=none; b=u+FHwdr4xnWa5KQApjfFo78LtUP3W0lM2LqwfDnnjGCh14DNg/iFULp+wZ0gVBD47HlUgI geu7iVd2CngiEoaykj96yyxLSQj3hvFFWt7AOkkuKJ7eJLFcyIqNxw6eCyCvf9T6tBPid1 hSOqKbtz4yRyXktZJAihl1I3E+fjw9nJPDviYWNsp1nA9U536oKTuZslNq7+Q94LI3a1yI efBB4+Ke/1Npyzlbv08i8e9jFLEa6BgYazGqaNE2GVzbc3CGfA5/WjEFPg2ep5+bLYsDQs Tnn0Agct2PkJo1vZH+KaKTvQp37shx61dxRnASa0Rd/mrHXusDRnH/E2e8J3mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdS7aiTt7pbEKzZs51M5vBtKyDDwJGgxC1Ah0NXTdkc=; b=qMC4JlwS3aOtWY2zyj2soTP6/7jUkXej+WwjpEGKMsa1YHeppOyTRktlIj8MrXKoBP3lFy mWNud3Jp9/wQdcUtvTf1Szy3LAjcILOTg1MWQrJV0s315y8oBMGA9aUlThNn+/ZtgVJkuN l+4gIhtLrelohdjj76NrK2Kt+X7yy3A1nIlzhqVJjIOIJwN3nF9WHMavpSJ7gWFWgFSphB zxb2D2vfvGCTjlWJjeE9DP/ATeAgfwe8Fa4Ola0y3gAcvlQACyGQF/jmmooI/kt8PdAQ/d Cl6Q9rVnFAQapDVtlEqKsRl4SMjqARxUdSJXA9faAc3WUT78qahJLzaLYGvcbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnRQ3mDXzsQl; Tue, 1 Aug 2023 20:54: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 371KsfWS095556; Tue, 1 Aug 2023 20:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371Ksf59095555; Tue, 1 Aug 2023 20:54:41 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:54:41 GMT Message-Id: <202308012054.371Ksf59095555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cf0a543f1f93 - main - cam: Log more error codes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf0a543f1f93f95a1c452d710c67ba42a752a2b1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0a543f1f93f95a1c452d710c67ba42a752a2b1 commit cf0a543f1f93f95a1c452d710c67ba42a752a2b1 Author: Warner Losh AuthorDate: 2023-08-01 20:51:10 +0000 Commit: Warner Losh CommitDate: 2023-08-01 20:51:54 +0000 cam: Log more error codes Log CAM_DEV_NOT_THERE status CCBs because they get dropped if a drive disappears and these requests timeout or are cancelled. It's useful to know the outstanding commands for failure analysis. Log CAM_NVME_STATUS_ERROR status CCBs to bring in NVMe errors (this will be more important in future commits that expand the information logged). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D41168 --- sys/cam/cam_periph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 1ae994402211..c4c91a395894 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1909,6 +1909,8 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, case CAM_SCSI_STATUS_ERROR: case CAM_ATA_STATUS_ERROR: case CAM_SMP_STATUS_ERROR: + case CAM_DEV_NOT_THERE: + case CAM_NVME_STATUS_ERROR: devctl_err++; break; default: From nobody Tue Aug 1 21:02: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 4RFnc72Gh3z4prLh; Tue, 1 Aug 2023 21:02: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 4RFnc163PSz3Lcp; Tue, 1 Aug 2023 21:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A512sQ4CAZism0X1FfvR6QQahZUEOO655Vb42uRt+8Q=; b=HN2lM6f6Y+7EhoBAmClfpuPC4z1LSR0R3SrWhZWdEoxdJrwt48YONNyL/toXe6LHvET28W F05uA6O5TxM/b+Oi34znpfyCK7qLPFNrbFHvNHxgNIqQw9NgRNecDzpfNs5ks72YvmBN/6 rxpHHC0XckmlfE8SyecvUMAn1mBd/kA/8I28FBZ+A6v8NnDHMTxKnZmQIEu16+AP3YHdmi +t0uFrTeDeCIT40/OnDaZ6wArICLnvX4yimBgHJIgp1fA0mZxR2BVw2x1vtDuyIiOKrFeN 5Gl38xJJx/RtqgsisHIu6nrJhbrlW8nzy5vv16MKXKvRTHg3xEHFsiQtDxNKeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690923729; a=rsa-sha256; cv=none; b=b45wCnIXPJuBp88ocpcxbmtxCeDD/J7Yps1n9X9cDgAjpEuvVqxQRPHeTs/DP1B6MprX5K qDn2mR2OOJB69JfNnA4mOMRBzMT7RnsXDs32QHjSzZWf+YKCNqNJkEGRZP56ju+7spiY7+ pZ7nopxjZceCPl0tQNIWkwJ5yGTr1pbuWOBW8bsh9825FgzOBWKJFE3YnVKaywTBVS/ay8 KpTtubjb8b7MEmEuwd60cAKeLTQ7Rwv+Hlxou8w1U2UV/A0ufZKqdA9enOaCD5K1oSglNt SZtx5FfT0Kg7kXdLT85RwCzbi4UvKaR2SrysgzM7NM9M5vCc8faumAxDFXpuLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A512sQ4CAZism0X1FfvR6QQahZUEOO655Vb42uRt+8Q=; b=UmLYFOLHGJdP7neTOyhRsl9tSuhviA+jtMpVF4fz65NVX0fo/Xusbvj925dpIcagtreSsE cgBcRqsDzr72yL9NKm7p2+jdca7VifTEcxRGHyTxCqQVdlQwVzdj4UzAlxiAUHV/SNCYVG nEmI0/tQMMGasImLX3yDXqvSlwQt0QyUBlZsHY3VfSjCA1hoAz7w2oU4BDDsaeRygATCBd JJezPGVrgI/ZSRvwKRNV5zQH44fj7sDbfchIjw2AaaPsJFE/PSqtCBwvF53t+K/7gHHcFi wO/dh1X9uRlIM3XDVrCcsVtvYAmzTZDZf2kZBXTjTN5fPB2Q4aT+tDLHr//nVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnc14nHgzsvf; Tue, 1 Aug 2023 21:02: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 371L29V6012848; Tue, 1 Aug 2023 21:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L291M012847; Tue, 1 Aug 2023 21:02:09 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:02:09 GMT Message-Id: <202308012102.371L291M012847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 21ef3591b611 - main - build.7: Document several toolchain make variables. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21ef3591b6119f6972896e6c00cbf9ffb759646e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21ef3591b6119f6972896e6c00cbf9ffb759646e commit 21ef3591b6119f6972896e6c00cbf9ffb759646e Author: John Baldwin AuthorDate: 2023-08-01 21:01:58 +0000 Commit: John Baldwin CommitDate: 2023-08-01 21:01:58 +0000 build.7: Document several toolchain make variables. Document CROSS_TOOLCHAIN, UNIVERSE_TOOLCHAIN, and USE_GCC_TOOLCHAINS. Differential Revision: https://reviews.freebsd.org/D40778 --- share/man/man7/build.7 | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index a2fb5ea77149..c1ea4e56ccaf 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 10, 2021 +.Dd August 1, 2023 .Dt BUILD 7 .Os .Sh NAME @@ -509,7 +509,23 @@ Additionally, builds in are influenced by the following .Xr make 1 variables: -.Bl -tag -width ".Va SUBDIR_OVERRIDE" +.Bl -tag -width ".Va LOCAL_MODULES_DIR" +.It Va CROSS_TOOLCHAIN +Requests use of an external toolchain to build either the world or kernel. +This value of this variable can either be the full path to a file, +or the base name of a file in +.Pa ${LOCALBASE}/share/toolchains . +The file should be a make file which sets variables to request an external +toolchain such as +.Va XCC . +.Pp +External toolchains are available in ports for both LLVM and GCC/binutils. +For external toolchains available in ports, +.Va CROSS_TOOLCHAIN +should be set to the name of the package. +LLVM toolchain packages use the name llvm. +GCC toolchains provide separate packages for each architecture and use the +name ${MACHINE_ARCH}-gcc. .It Va KERNCONF Overrides which kernel to build and install for the various kernel make targets. @@ -713,7 +729,7 @@ using the .Fl D option of .Xr make 1 : -.Bl -tag -width ".Va -DNO_KERNELCONFIG" +.Bl -tag -width ".Va LOADER_DEFAULT_INTERP" .It Va LOADER_DEFAULT_INTERP Defines what interpreter the default loader program will have. Valid values include @@ -783,6 +799,10 @@ If set, the libraries phase will be skipped. If set, no object directories will be created. This should only be used if object directories were created in a previous build and no new directories are connected. +.It Va UNIVERSE_TOOLCHAIN +Requests use of the toolchain built as part of the +.Cm universe +target as an external toolchain. .It Va WORLDFAST If set, the build target .Cm buildworld @@ -812,7 +832,7 @@ Builds using the and related targets are influenced by the following .Xr make 1 variables: -.Bl -tag -width ".Va MAKE_JUST_KERNELS" +.Bl -tag -width ".Va USE_GCC_TOOLCHAINS" .It Va JFLAG Pass the value of this variable to each .Xr make 1 @@ -834,6 +854,10 @@ target for each supported architecture instead of the default action of building a world and one or more kernels. This variable implies .Va WITHOUT_KERNELS . +.It Va USE_GCC_TOOLCHAINS +Use external GCC toolchains to build the requested targets. +If the required toolchain package for a supported architecture is not installed, +the build for that architecture is skipped. .It Va TARGETS Only build the listed targets instead of each supported architecture. .It Va EXTRA_TARGETS From nobody Tue Aug 1 21: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 4RFnc72S0dz4pqqZ; Tue, 1 Aug 2023 21: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 4RFnc05KMTz3LBV; Tue, 1 Aug 2023 21: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=1690923728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVkHiB0A9zVCHEk9A31XwkHf6Du49htytvuRyIoTgwc=; b=D+byyO126ozHvC8OtnexgbFg7Vt3mGfN4OR1hk0KwCYQqUzmY30d9YJDnxs4fMyj1XHbpF fYBC97Qd4CIo13vlGDR71X/0n8/ljmhM1LuZbVYG4lUQ/XvMRPMBFSV5HGAXuZ9whU3mfP xmupPBGYzs94mBtqNdjwS1059wrKLxtJ53xiT0OyFkcoN9Jsfk3MM2gDBvIAobobSGh2mT 7R/sv9+fQuxQuzNRt0Tl+7T5onOIiqcF0gAkOm41JISwxHI7gVCTb44ZCKCTfpzY6uJKYw LnfbddnUVOgZpU5bJoztXqvPV24sIiM+sh75G+PT1+RE6IaVQBqhAZz4p/zj9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690923728; a=rsa-sha256; cv=none; b=sMDv2QhQ+yWDLZwt6cAjJW7/E+wAmFJ4uPp7KV39/urKSSr5w+FRgKbnAaZStoK16JXmEY h8S7HYhVQY7LYQsT0B8/Uycd3LpDTaUHKxystpjyU6VqmSQBSM6ELur2aU22PGmJBi9vz0 /W9Bd+yGlJ2csUHvwwGg8N/SkzR9N4hSUdnyg4Hv0bBbFFPP6JN3ga9LisqvIGsQ/BKF7T wg1yNt44U3h9ween5TCc5IP7lAzcOt1IN0UrG4XhFihn2zKiJJD0yFw2XDr8Wkr2wFHrnz 3DVl3X2ldMZr72l2qnDPJRQO8URN0CU/lH9hVtUJe1SvfAp/B8kBKEe+oDAOFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVkHiB0A9zVCHEk9A31XwkHf6Du49htytvuRyIoTgwc=; b=C9T/Ed8yWAdlvpZVS/VeCex2p61gd4uP9HI5Uz40PRrCa7ZPiZekSt3r17sUna8zSlUO7P zXllyJByd51L47loEXF4qU7nR3nCTuxXIQtkBlfa2ChMpjlcjhgBY09yZQEzvMTpIqRwEh abJBzPjO75BLqYntCyxQe67pABVOWaPikCeSwXr/JoIngfud1R/rr9TnHwsDNYjg0Ph360 iC4HZYBAJNBSHtrKv2DaPmtPwif3W0EvLrtzZKWzRKuHQxBPzELRHUiPKhEWKLnMQGeS9D DMzabJOa0rbtwfAKpiFXWP0AtfGGJqLWVREvLhucyeUCPPYFTSxF5uSYiR6KdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnc03tH4zsjd; Tue, 1 Aug 2023 21: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 371L28Y4012828; Tue, 1 Aug 2023 21: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 371L28MT012827; Tue, 1 Aug 2023 21:02:08 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:02:08 GMT Message-Id: <202308012102.371L28MT012827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1c02497648bd - main - Makefile.inc1: Enable requesting the universe toolchain. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c02497648bdf61a43dd271f6f9171a037046d8e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1c02497648bdf61a43dd271f6f9171a037046d8e commit 1c02497648bdf61a43dd271f6f9171a037046d8e Author: John Baldwin AuthorDate: 2023-08-01 21:01:57 +0000 Commit: John Baldwin CommitDate: 2023-08-01 21:01:57 +0000 Makefile.inc1: Enable requesting the universe toolchain. make universe builds a cross toolchain under HOST_OBJTMP/tmp via the universe-toolchain target. However, doing a plain 'make buildworld' after a universe/tinderbox run (e.g. to reproduce a failure and test the fix for it), will try to build a new cross toolchain under OBJTMP/tmp which can be tedious. This commit adds a make variable (UNIVERSE_TOOLCHAIN) which can be used similar to CROSS_TOOLCHAIN to request an external toolchain. If this variable is set (value doesn't matter), the the universe toolchain is used as an external toolchain. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40777 --- Makefile.inc1 | 8 ++++++++ Makefile.libcompat | 1 + 2 files changed, 9 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2e965b603d78..c102348baa6f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -73,6 +73,12 @@ TIME_ENV ?= time env .error CROSS_TOOLCHAIN ${CROSS_TOOLCHAIN} not found .endif CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" +.elif defined(UNIVERSE_TOOLCHAIN) +UNIVERSE_TOOLCHAIN_PATH?=${HOST_OBJTOP}/tmp/usr/bin +XCC?="${UNIVERSE_TOOLCHAIN_PATH}/cc" +XCXX?="${UNIVERSE_TOOLCHAIN_PATH}/c++" +XCPP?="${UNIVERSE_TOOLCHAIN_PATH}/cpp" +XLD?="${UNIVERSE_TOOLCHAIN_PATH}/ld" .endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -718,6 +724,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ BSARGS= DESTDIR= \ OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ @@ -789,6 +796,7 @@ KTMAKE= ${TIME_ENV} \ DESTDIR= \ OBJTOP='${WORLDTMP}/obj-kernel-tools' \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ -DNO_CPU_CFLAGS \ diff --git a/Makefile.libcompat b/Makefile.libcompat index f9fe28e1082b..da9c326756aa 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -37,6 +37,7 @@ LIB${_LIBCOMPAT}WMAKE+= ${TIME_ENV} ${LIB${_LIBCOMPAT}WMAKEENV} ${MAKE} \ ${LIB${_LIBCOMPAT}WMAKEFLAGS} \ OBJTOP=${LIB${_LIBCOMPAT}_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ MK_INCLUDES=no \ MK_MAN=no MK_HTML=no From nobody Tue Aug 1 21:06: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 4RFnjT2FyLz4prQD; Tue, 1 Aug 2023 21:06: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 4RFnjP1Wkqz3LX8; Tue, 1 Aug 2023 21:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRft9Zv8FP8/i6IAyau7xqHeFbcmqpZchPT08eYpz+0=; b=CN5Map25d8iqjzNyFh1r36OQOuE6J95zaDBEo1daTkSDCtMdw06nenZZEMpISXHBQH9Ps5 Dqq6pRmlRGSz9/cO3fsbfesXHmM/X6bc4Vqw/00v/bC75QiULnWGFAZ4A5e6AXatNmny4b rVb6PTylGdgIgRC0k2HLqhT8bk4rVVpO9f1EJvCNUOgpph9FX1nwDsyT8dG9zOBUpV7mQ/ hdihielvWgSuKKxuUGfaCWs2z+WtBp2XEUREQkhCFEWe5XggFYfzE2JA0jc3RSwXUCKPxJ ix0WbVHB6saCEsIkPyuAq1eXVw0wEvw+GMGzXWDyVr1kFTvISrviJSlH0kgJNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924009; a=rsa-sha256; cv=none; b=qPDQDE18jvETmq488FzkZmOHRe2ylC/AGipUfu+EK52oJe424DHrj7b/vFm/FKPlx2fC1G Dc0fFzReftbA3zjPwaKFDQ2Pq1NFOqO7ch1js/wTZUjJYTmm0AroekTHyX6KjuHoP0rWd1 PdV/qme4V200QrJIW0XUaB+iZ6UKe0Jt0qWeGcHiC1hLmRAAJtCxsLAAGIptKaPlo03Kmk ajRYeOp8ZOyuFybSZhHaUyMhfugQCc29fCuRq0MseWe5HQEDbzkdgWmNsVT4W7zxCXf/5T 5se3pXxYNYFkN43+fDje+jjjmk+Y4+zdzkq5J+Nc40hoSql39bPOqhwJcuo1LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRft9Zv8FP8/i6IAyau7xqHeFbcmqpZchPT08eYpz+0=; b=f04eZP8OdUfQaCsfJxLJqNfmjq4o5Y7y2JuyXNJaU4aWV8MyNxcDU5jS9IyEWJWW9e6Aoe pxiRahRaUPLOBwbozVWbwNjmLMTYdHuCJvtohOnfa53EaYroVrY5egfNcj/JOOeaSTKrRH dqASDaSkw2hsZaTclgYqZrrEFdLbDMU7gdsr+v/1X2Zz34d1OwOLrqrCOaB8d02nuK+xOk kAMpykfCjp3ay8b2OuXIcvEHp1GWw1flAVmcQx1WdH4zqOnjmthBfEq8RFznpTCfKV2Q9h ErgjLqD/octBNpuOHRtYJoD/7/myjPgBvgmYCjsUi1YAGoxab8xp7bnHZtqnJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjP0KpGzsgp; Tue, 1 Aug 2023 21:06: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 371L6m9i013869; Tue, 1 Aug 2023 21:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6mtQ013868; Tue, 1 Aug 2023 21:06:48 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:48 GMT Message-Id: <202308012106.371L6mtQ013868@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: 18912b83861f - stable/13 - riscv: Add pass(4) to GENERIC kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18912b83861fd0c70ed4709fd5d1173b71ae87b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=18912b83861fd0c70ed4709fd5d1173b71ae87b9 commit 18912b83861fd0c70ed4709fd5d1173b71ae87b9 Author: Jessica Clarke AuthorDate: 2023-05-03 04:14:57 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 riscv: Add pass(4) to GENERIC kernel Whilst we don't have ahci(4) currently, we do have umass(4), and need pass(4) for smartctl(8) to be able to talk to such devices. Reported by: David Gilbert MFC after: 1 week (cherry picked from commit f78cc42f10cbfb5811276bc6827732ca32eb5485) --- sys/riscv/conf/GENERIC | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 5d58db775507..8cd6f78a8ef1 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -104,6 +104,9 @@ device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_mmio # VirtIO MMIO bus +# ATA/SCSI peripherals +device pass # Passthrough device (direct ATA/SCSI access) + # NVM Express (NVMe) support device nvme # base NVMe driver options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver From nobody Tue Aug 1 21:06: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 4RFnjb0b8rz4prWb; Tue, 1 Aug 2023 21:06: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 4RFnjV6kzXz3LvV; Tue, 1 Aug 2023 21:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srRm5G0pK8vNuyLp5Su+eJw8O9gqVtLli+aaO8lmQew=; b=Fg3Fuzm2yLjlsoiHdDvmcJpvSMMlmo+Y3ynt3GGqUbTy4MuW+1cXJc4/yq6zfCaVQS1w89 uaRJNa2JQKWy0zKqXZ+eZ0Ft8qftBHo4qk2uikZOdcCoHrZVHZ9vBP7eKvyFQI68fZE8V8 tZGy369bkawd+5ttsV5h4u+L8KJoCOs2NFNLxCMdT+KOpB06orUau5UnLymBgERVY3pKI9 I/WSCa4TE7X+codYT43BMBdGCnzXd9bb4mrYzQ6IEOUZY/HkUQsi8+Pnw1wkRIYX3Sq5ik //mrTj8c2EkxUC7vDKH+/btf1NzjQjT/K9DaNobvt0BQoX4CRs4CkXsEtNmazg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924015; a=rsa-sha256; cv=none; b=X0Gq0GogWDpy9mXvkeCY6fudREUMpq3VATj4US9en/ATrsOc2jgcdQaIFiGBFW1NofuyLT 8y9zPZ1vNgVEyuBq6dV9Sd+WPFgCQSwIJAecQGFOpTw+8J9H82+kGWwE6uS4NLyo/JJCV8 i4HaCJYskvunhxqC3+ibmgENcUUowAyZ1a8B9Q0uQPs63rE9dadJ+9/LShcKUXrpqjwgSe SMoN5qA3fn6jmWCq6gaDlzG3CfPkzEavOJLYC5I4VEoSRNGJH6sSCP2l0RrX34uefAsewK HT8FSkwtuag5CVa8Lu7uHwS1xK0LPolE30iHK/FHUH67e3ePZjDR6FwGu/si1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srRm5G0pK8vNuyLp5Su+eJw8O9gqVtLli+aaO8lmQew=; b=l/a5pGaBhaGdykgQJCkedaipDyrt+bgZJvVSoLw+hls6vp/dxKcgyiFak0+2NswJHDclhj o+CWMCkKOTaeX7zYQUK6ZnIxDdqaEWMq4uHkwpEH3R6ur1KPMn/O5hFHBJq4NJsaCzVBod RUG0O8ArnB5fmXGSWu5eOp28MObdAU0pXxukLHQL+ewefGlK5fReqUIM3QpzXJhbMvqRWG xzmI9PLP/SNpgzcXoKR3gasELw25YDoS0rGwOoTjDQ6h0S4pKOD8vru1q7THiBLyunChS3 B0l6umNGRNpXTUNgREOCxl2Ryc9UH83dElYpAKWlKnkuclXHwLmpFnZVxEiBXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjV5KQszsgr; Tue, 1 Aug 2023 21:06: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 371L6s1F013968; Tue, 1 Aug 2023 21:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6sYN013967; Tue, 1 Aug 2023 21:06:54 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:54 GMT Message-Id: <202308012106.371L6sYN013967@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: 4948a2403ee3 - stable/13 - bsd.linker.mk: Handle Xcode 15 linker identification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4948a2403ee31876f37cadef96a135cd11e1b7a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4948a2403ee31876f37cadef96a135cd11e1b7a1 commit 4948a2403ee31876f37cadef96a135cd11e1b7a1 Author: Jessica Clarke AuthorDate: 2023-07-24 00:34:17 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 bsd.linker.mk: Handle Xcode 15 linker identification The upcoming Xcode 15 introduces a new linker (called ld-prime or ld-new in some documentation) to replace the classic ld64, which we need to handle. Previously, the linker would identify itself as: @(#)PROGRAM:ld PROJECT:ld64- Now, there are two cases. When the classic ld64 is in use, it identifies itself as: @(#)PROGRAM:ld-classic PROJECT:ld64- When the new linker is in use, it identifies itself as: @(#)PROGRAM:ld PROJECT:dyld- Thus, tweak the detection to allow a -classic suffix in the PROGRAM string and to allow a dyld- prefix instead of an ld64- prefix on the version number in the PROJECT string. MFC after: 1 week (cherry picked from commit c4177f5b41d45f3c83a0ef329a50e4ae05da3878) --- share/mk/bsd.linker.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index 7209d7f173ae..bcbdc0c1131d 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -79,10 +79,10 @@ ${X_}LINKER_FREEBSD_VERSION:= ${_ld_version:[4]:C/.*-([^-]*)\)/\1/} .else ${X_}LINKER_FREEBSD_VERSION= 0 .endif -.elif ${_ld_version:[1]} == "@(\#)PROGRAM:ld" +.elif ${_ld_version:[1]:S/-classic$//} == "@(\#)PROGRAM:ld" # bootstrap linker on MacOS ${X_}LINKER_TYPE= mac -_v= ${_ld_version:[2]:S/PROJECT:ld64-//} +_v= ${_ld_version:[2]:S/PROJECT:(ld64|dyld)-//} # Convert version 409.12 to 409.12.0 so that the echo + awk below works .if empty(_v:M[1-9]*.[0-9]*.[0-9]*) && !empty(_v:M[1-9]*.[0-9]*) _v:=${_v}.0 From nobody Tue Aug 1 21:06: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 4RFnjR2Y09z4prf3; Tue, 1 Aug 2023 21:06: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 4RFnjH5d7zz3Lfl; Tue, 1 Aug 2023 21:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zKS0GAYHY7f9PuTOXQ/ZwS2iXGKMd2f5f9TacuSj/Xo=; b=p2TTUJkzLJ6iy0NYjP4lk9ByuAvy2k4kIqMsASgOiOY/XxC9R0RXQ95x0wDDBENLjLjeoV 5RTsu+Y5Rwn2LArUlLCbB7qSnHUsMiIo1q7tDwdxJ18sEPIHN2hf2lm/BI02frGCbrCF1F UKsMlnX0FOhanN1QR4IFV6VjwbWyrtyZJz39BFpml69yCSRQENRxzrn/Ug0kuhY+Qj65NL fJ1LGUJkfTjve3MvUdvLbnL/smlqa0EB4WtEyGuj5VWKbh6/iw+1ffAUtph6yCLRa798y+ PsWdb2fAe6LvK/8/WA5Cfyhsnqk+FpncphN46EA7GJuNDqpy/2TEbW1oc75SbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924003; a=rsa-sha256; cv=none; b=JmLZfe2XCGtXkltH2M1fghS72Rpg3tVxwZiz9lUjnDKgq/sAayeucwWYXuHE/nakax/dL0 jn7MxXCOVen55O8lT4QtabZ3uA2fvIVMxjOrY8nBu6/gKbdir6DHZUeii0sY/KrTh0PD90 a8KESrKTz3JEK/u746KD4xoKsDDQ0QZ6FH47ucGyOPayLUfY3vbdd0cxNXAjIyzlJMCqf6 uQp6OXRrGzdNY7H7EjIgRX4EB3oHu3/mL+l+/0O84WzSvdaLT8WLhOznQsA/dtq7MbQHdR cBW054UrEtCQmSIAYsvwiiE1IejUKmkcHZA5mi3Kul+zpOzW3mxQxYZo63yxxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zKS0GAYHY7f9PuTOXQ/ZwS2iXGKMd2f5f9TacuSj/Xo=; b=v5hJvwo4ZLhdpBISSktGUGq6aBM69sa161URj+6nu09a2jzjQkUR8WHOYTP87tX65qYPxR YJf8eZRXKEDpaBVyfRys6T4Bdb7N6Xy70mbnAveWb74anAYjs6LtWbNP/hid5fgf+W1oGv d3tnkO/EraAef4wmCNpO650VWc8AOsk+uhtCERV/yJtoTVrnAZwsbVATmtKXImG/uPAkL9 FN+pvaorfnAgA80O+VXtbD/A4FVJjwPo5MXyBmzqoHbT/XMaCebyJq4yVC7osz/QEH4kHc heeGp2dvhWrG3K13THNNmLc9PegoUyO7BNGXFfRqzPqqDLad5LyfXnP/65rrhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjH2qgTzsRR; Tue, 1 Aug 2023 21:06: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 371L6hJY013760; Tue, 1 Aug 2023 21:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6hs7013759; Tue, 1 Aug 2023 21:06:43 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:43 GMT Message-Id: <202308012106.371L6hs7013759@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: 2999e5315171 - stable/13 - release: Set loader_menu_multi_user_prompt to "Installer" for installer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2999e531517147d5bbe817d3945a6f1f51ff753f Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2999e531517147d5bbe817d3945a6f1f51ff753f commit 2999e531517147d5bbe817d3945a6f1f51ff753f Author: Jessica Clarke AuthorDate: 2022-09-02 19:30:50 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:52 +0000 release: Set loader_menu_multi_user_prompt to "Installer" for installer This makes it more obvious that the media being booted is an installer rather than an installed system, which is otherwise hard to distinguish. It also provides a more user-friendly, and more accurate, prompt. Reviewed by: gjb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36419 (cherry picked from commit 2a90c47af158625b3e28390801639c21d6d0ed2a) --- release/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile b/release/Makefile index 1288f750441a..33616a1e0ad6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -170,6 +170,7 @@ disc1: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} @@ -193,6 +194,7 @@ bootonly: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc dvd: packagesystem @@ -213,6 +215,7 @@ dvd: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} From nobody Tue Aug 1 21:06: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 4RFnjT0cthz4prlD; Tue, 1 Aug 2023 21:06: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 4RFnjR3Y6bz3Lhp; Tue, 1 Aug 2023 21:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5nN7+gKR44KWa7zXZ6Mpm9RMgBUczQwIblAjrNkpyRQ=; b=G7svrM/83/MOoNwk7ytfyKelk+FguYckVxX/34xgHDVdCGmLRmCAweSMRZH5Zf3LftdVLI QSEGsfXjj8uN7mOeF3kdSXtCP1jJHTb+ZVpKegz8dvYwS9Q8U4PnwnyRLDwlYewTe9JkKy yNchXVFEdHuVUnalqHH3B8Dj6m0B6+8tG4IkJEbqw19kJG4UDSjEAJHbqDK6mHRN8G9Dfg ULcS+pPA6hEVNbITIUyD+5clX40Z39VcSclrEWDARDiNLanfE8f8InlQjSKsPM+1FmLWYI ucP4BZVUPIGxrePI+b90iMyN5wWDTJuN2Q0YynTp0kBL64uR4vGU4uKmUxHgWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924011; a=rsa-sha256; cv=none; b=FNmr2LhRRtnE+8iNZT98UdZwSIH1C/Q369lB6i3kX046hXmEBimREpx9l4zXmt+V5TgCBy yjv+ohGNoJ+FItUQEp2PKpC8omZVBG6yfaMF/xRw2jViPzE8Vn9vajqb53dMN+RANzjRfZ McGGOHzOZJh01hrS8rolUnRHpoLcDrW6m1Y13BJT8FLKEbBsAR4Ncv5gStRJJOzRakpkDS ONyShkw2uC0zrFk73g3jVGCRBhpMSNgt9X0SGnnm0dJsyfsP4lbqxpVwhC7rWdsV9mF0Gd L09g3GqYyS/cq4KwjtS4KAl03FNyY37lHBJrxfOPfRN96+MR3CKYEWcsT9wL4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5nN7+gKR44KWa7zXZ6Mpm9RMgBUczQwIblAjrNkpyRQ=; b=BLLwOOo8eJ2HhTD6foPHS0JMYYpzvJhmFd3cnCXifQTr7Ef78xGd4JPg3T31S1RIiFoGgx 0J6JUJQqgJBZ6ogc5WrAaadGAsuCUaO5N3ZlvhLP+yQ8SRYkY+nwW80ruxzeTyzdx8XlRO oIhO8pPiVpE1cAl+HOePC/xKQlDOJb6gPPGJCsNUTCS0AKBcchcjXAVtT0c6Ob2zXNcWeA Sa2i3xkVtvKjtqGiL9enLqfKnE/ygpOC4cIOW5arFooIrr/mw7FzokkuD3o58pGFm3sMQR 7fVf9fRstvImGGEKYtvs63iKy8mXWeqQFZze45oNDa8h70MqAUC+9Ef8YHf1Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjR2NZpzssg; Tue, 1 Aug 2023 21:06: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 371L6pnX013908; Tue, 1 Aug 2023 21:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6pkm013907; Tue, 1 Aug 2023 21:06:51 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:51 GMT Message-Id: <202308012106.371L6pkm013907@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: e8a46057d1b9 - stable/13 - resizewin: Stop printing bogus NUL to TTY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad commit e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad Author: Jessica Clarke AuthorDate: 2023-06-14 22:58:36 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 resizewin: Stop printing bogus NUL to TTY A char array has an implicit NUL terminating it, which sizeof will include, so we need to subtract 1 here. Printing a NUL can cause issues for things like CI environments that aren't expecting it, especially with recent Jenkins being stricter about not putting NUL in XML files. Fixes: 3d222369acbe ("Add a small tool, resizewin(1), to query terminal for window size") MFC after: 1 week (cherry picked from commit 456c1199d3b3ee477463c6469940c0370de2b2ea) --- usr.bin/resizewin/resizewin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c index b6df862b8a49..e53364cf1254 100644 --- a/usr.bin/resizewin/resizewin.c +++ b/usr.bin/resizewin/resizewin.c @@ -101,7 +101,7 @@ main(int argc, char **argv) if (tcsetattr(fd, TCSAFLUSH, &new) == -1) exit(1); - if (write(fd, query, sizeof(query)) != sizeof(query)) { + if (write(fd, query, sizeof(query) - 1) != sizeof(query) - 1) { error = 1; goto out; } From nobody Tue Aug 1 21:06: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 4RFnjT0Bl1z4prf6; Tue, 1 Aug 2023 21:06: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 4RFnjQ2tpHz3LlC; Tue, 1 Aug 2023 21:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5S/c9yBJ79ZmdPBsedr2YTR/ZFdhBibKSi1/QSD3qk=; b=pLzIQnuNzfSWUtBjqPd6aghRkIauncnyDQ4IqtP5k74TloWMDsfeMg9o8jWEU1exPfHYlL dYKFXma44RlSlSpGtzlMj5ylUh06SpiDONNxsQudBF0kD/IHlM9iEuRT1Yxs7ubHnsu2Iv NanorQVobaNCGx3IPgP6uFg82NG18dCzrEmq2uvZ/ktEYdi6ihtrBi1APGnOpKDHDLu6if ToZnXL9l/2zreA5JMDJc/KcEoL9iUn2XukDWWBcrVZA1I08R/X3iaprIFlLXJjOAcfluSW B1rtgdWet/rX52yauaebWBKo8x+jhWb224HzilGWqqT8Goc+1g7626gDK11HOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924010; a=rsa-sha256; cv=none; b=WGr6Iep4JPjlTpP8PE6fo+dyXcF4BKcQkoQtVKK8e4+NJ/9GYNIbJh+FGioRo9JEavN68H yXBcGcbQWtM7eblC/e8jgj75XwytyzwvvQcahXgAVlqtheZMsJPL0kiggxc0f/HqxsJTRy I+/4nbA1Q8240ygvP6P2qRtGJKgyJhm2c7iN+gkysBTyD2W/B2E6KwXkz6KS2utSHsiBq7 +5pouUabGcg4AL7it3IuPf+doQj0c73nrmhG5JCY+RuSpPhtlOzRmu1iaLioFqemK4mAuA NhTw+hMO2iV3BrHID6pq8LbstYiYZPw+aHNQobfyXT8+tgWLHHztrQyy/zRDyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5S/c9yBJ79ZmdPBsedr2YTR/ZFdhBibKSi1/QSD3qk=; b=FteO4Q7JhQwpEZXk+DszIgbkZmtfQEn//NZkdIjG/f5ebMmD71mI2l2EerEYDGWl9bny6C lt6FUy9Z4UG2lXk+trey3DXhTi9Rmn1/r99yNUM2DS5+L7H1svnIiwQvgP+wrT/yPj2N/e 2pZ/qehPRnpzpYoJdb+pBDjKusXzIm0GgI5EFlKzx2ha3R0kgc42Kuk2DeopUYGch9rsIt LHMKrKe6Qeo/gr1OmkreZqepsBS0tdGqFKPmK8ec2nJFUJQJXm4u3Fjq/rFVxKMauNRbF6 ZTxLCEOETJKkFDO6HQ0UuefOuw7lqyVYOh1k/kR6VF61u7hSH1NNDdEfY90eBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjQ1Lhwzsq5; Tue, 1 Aug 2023 21:06: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 371L6oFe013889; Tue, 1 Aug 2023 21:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6o9B013888; Tue, 1 Aug 2023 21:06:50 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:50 GMT Message-Id: <202308012106.371L6o9B013888@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: 051f41ddb517 - stable/13 - libpmc: Handle PMCALLOCATE log with PMC code on PMU event system List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 051f41ddb517a9d3f6872678ccc3d0b6c0fffca1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=051f41ddb517a9d3f6872678ccc3d0b6c0fffca1 commit 051f41ddb517a9d3f6872678ccc3d0b6c0fffca1 Author: Jessica Clarke AuthorDate: 2023-06-07 14:21:18 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 libpmc: Handle PMCALLOCATE log with PMC code on PMU event system On an arm64 system that reports as a Cortex A72 r0p3, running pmcstat -P CPU_CYCLES command works, but pmcstat -P cpu-cycles command does not. This is because the former uses the PMU event from the JSON source, resulting in pl_event in the log event being a small index (here, 5) into the generated events table, whilst the latter does not match any of the JSON events and falls back on PMC's own tables, mapping it to the PMC event 0x14111, i.e. PMC_EV_ARMV8_EVENT_11H. Then, when libpmc gets the PMCALLOCATE event, it tries to use the event as an index into the JSON-derived table, but doing so only makes sense for the former, whilst for the latter it will go way out of bounds and either read junk (which may trigger the != NULL assertion) or segfault. As far as I can tell we don't have anything lying around to tell us which of the two cases we're in, but we can exploit the fact that the first 0x1000 PMC event codes are reserved, and that none of our PMU events tables reach that number of entries yet. PR: 268857 Reviewed by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D39592 (cherry picked from commit 21f7397a61f7bff61a1221cc6340cd980a922540) --- lib/libpmc/libpmc.c | 9 ++++++++- lib/libpmc/pmclog.c | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index dae3b4fb2d67..10a0aec03cc7 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -1014,8 +1015,14 @@ 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) + 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); goto found; + } /* Otherwise, reset any changes */ pmc_config.pm_ev = 0; diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index babcdc3c8d0d..b219ed53fe3f 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -356,12 +356,27 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ32(le,ev->pl_u.pl_a.pl_flags); PMCLOG_READ32(le,noop); PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate); - ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ps->ps_cpuid, ev->pl_u.pl_a.pl_event); - if (ev->pl_u.pl_a.pl_evname != NULL) - break; - else if ((ev->pl_u.pl_a.pl_evname = - _pmc_name_of_event(ev->pl_u.pl_a.pl_event, ps->ps_arch)) - == NULL) { + + /* + * 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. + */ + if (ev->pl_u.pl_a.pl_event < PMC_EVENT_FIRST) + ev->pl_u.pl_a.pl_evname = + pmc_pmu_event_get_by_idx(ps->ps_cpuid, + ev->pl_u.pl_a.pl_event); + else if (ev->pl_u.pl_a.pl_event <= PMC_EVENT_LAST) + ev->pl_u.pl_a.pl_evname = + _pmc_name_of_event(ev->pl_u.pl_a.pl_event, + ps->ps_arch); + else + ev->pl_u.pl_a.pl_evname = NULL; + if (ev->pl_u.pl_a.pl_evname == NULL) { printf("unknown event\n"); goto error; } From nobody Tue Aug 1 21:06: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 4RFnjS0z2Sz4prMc; Tue, 1 Aug 2023 21:06: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 4RFnjJ5WwHz3Lhb; Tue, 1 Aug 2023 21:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+boT9jZQ1NMaCm9hyMz1RwDSy81fX7oIVMomm7/UUf4=; b=lVmo0iklPo9ULxhMevTviknPOzxg/py6UY2P6LBBzLFvxh8jhWdgGvcnvoOdjY5/iWt+mW GeYXK2jGbL6cAU6r/K7M/mAY3Ab5LezG3yth9Iqn4o5eV12lKVaXeJEXN0uHletvtvPXIZ vhFfjrnnFa2PHfrhX8BFxeYbEh8ZFouj24Wo10Rq5dm4gdvMpruPGVS1wBu60hte+wW1ox K4YkqDW8nY6uHYuH5EqXLAO8ODcNA9lxfpgkq9LECREub5WKdeMqyRoDQDClTqbgDJ6aZH Oykm7QsCDUgoStENaFTfxq3wbGs5xe72hMy51LQ0I3zfg2DKynB/gaELpAk3eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924004; a=rsa-sha256; cv=none; b=GrZUl4ELZa9AMNrHpqUXepuX2ppigLpRplsTUFrnok/ruJQ+k/N6MCqudzEal7vEmEnyJI meRoobpB3wIqhqTb7wNDQGB6pFNolATVmQuxS9LfNebE6pe3ASRLjv9ipnaUW96xTiyYY4 f+Rs1MHdpckCnWUqrnsRm9D34qkzR7cn14ZgAKyeL42jfofx4eLPq4BWH+8EqfjwS6DYol ePb3GMFw+4cR1dpmK98MoPrdx0ujwGE56+wQZVYrWtQ+/3Q+GycP9FX+7Sw/ipHl+tjTK2 Rpt3bZO2Ib26IUrJGg+iVvOZvKgUj9h85irKr+g1VagUG3tELHkku4Meky4RqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+boT9jZQ1NMaCm9hyMz1RwDSy81fX7oIVMomm7/UUf4=; b=QHOJBKLbhOZ8i0jnkouukVaEs6loZ7JBq4TowVOBxHU4QKuq1Dn78jA1jWLn55xCkTxHxb vRCPq2yZ19nRCq77qndcOr0Cmn3dBSR6NrbNuwH9lMW1GB4/HlijYXSuEuWtqcSpNVUS0h cr+FtU6h7KajuqkuiW4lgsOSf3IDL1jfi0Q+maX3uSMFn0KV+afuGY4j8cxOyyP9k+INYA 6gZTydk3x8uFdeMWNLkcmWVqatrFhphjnaTmHiwvamWAIhX5DKxvgIzKKB0V123teNmZJ9 44HNcYDG/4LV0WzlQUwvzfir2G8NEPfs99ZMlZUQFrRsdx5x5O5XjovLKBPceA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjJ3cxmzssd; Tue, 1 Aug 2023 21:06: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 371L6i0D013781; Tue, 1 Aug 2023 21:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6iRO013780; Tue, 1 Aug 2023 21:06:44 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:44 GMT Message-Id: <202308012106.371L6iRO013780@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: e2764afab3fa - stable/13 - da9063_iic: Add new driver for the Dialog Semiconductor DA9063 PMIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e2764afab3fac411e899f90dfcc805a780d30036 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e2764afab3fac411e899f90dfcc805a780d30036 commit e2764afab3fac411e899f90dfcc805a780d30036 Author: Jessica Clarke AuthorDate: 2022-09-13 16:46:09 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:52 +0000 da9063_iic: Add new driver for the Dialog Semiconductor DA9063 PMIC This is an MFD with regulators, an RTC and a watchdog, among other things. This adds the necessary infrastructure for specific children to be added. Note that the PMIC can also be attached via SPI, not just I2C, and so the interface is abstracted. No SPI implementation is added, however. This is the PMIC on SiFive's HiFive Unmatched. Reviewed by: manu, mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36199 (cherry picked from commit 80466455adcab3952f7b1727c6332832540a8d14) --- sys/conf/files | 2 + sys/dev/dialog/da9063/da9063_if.m | 52 ++ sys/dev/dialog/da9063/da9063_iic.c | 261 ++++++++ sys/dev/dialog/da9063/da9063reg.h | 1209 ++++++++++++++++++++++++++++++++++++ 4 files changed, 1524 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 74f331f1509e..dbdb37d22d98 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1610,6 +1610,8 @@ dev/dc/pnphy.c optional dc pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom dev/dcons/dcons_os.c optional dcons +dev/dialog/da9063/da9063_if.m optional da9063_pmic +dev/dialog/da9063/da9063_iic.c optional da9063_pmic iicbus fdt dev/dme/if_dme.c optional dme dev/drm2/drm_agpsupport.c optional drm2 dev/drm2/drm_auth.c optional drm2 diff --git a/sys/dev/dialog/da9063/da9063_if.m b/sys/dev/dialog/da9063/da9063_if.m new file mode 100644 index 000000000000..a6f5bb917dc2 --- /dev/null +++ b/sys/dev/dialog/da9063/da9063_if.m @@ -0,0 +1,52 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2022 Jessica Clarke +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# +# The Dialog Semiconductor DA9063 PMIC is a multi-function device that can be +# connected using both I2C and SPI. This provides a bus-independent interface +# to the underlying protocol-specific driver for the child devices. +# +INTERFACE da9063; + +METHOD int read { + device_t dev; + uint16_t addr; + uint8_t *val; +}; + +METHOD int write { + device_t dev; + uint16_t addr; + uint8_t val; +}; + +METHOD int modify { + device_t dev; + uint16_t addr; + uint8_t clear_mask; + uint8_t set_mask; +}; diff --git a/sys/dev/dialog/da9063/da9063_iic.c b/sys/dev/dialog/da9063/da9063_iic.c new file mode 100644 index 000000000000..f07633bcfe5b --- /dev/null +++ b/sys/dev/dialog/da9063/da9063_iic.c @@ -0,0 +1,261 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Jessica Clarke + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* Dialog Semiconductor DA9063 PMIC, 2-WIRE */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "da9063_if.h" + +#define DA9063_IIC_PAGE_SHIFT 8 +#define DA9063_IIC_PAGE_SIZE (1 << DA9063_IIC_PAGE_SHIFT) +#define DA9063_IIC_PAGE(_a) ((_a) >> DA9063_IIC_PAGE_SHIFT) +#define DA9063_IIC_PAGE_OFF(_a) ((_a) & (DA9063_IIC_PAGE_SIZE - 1)) +#define DA9063_IIC_ADDR(_p, _o) (((_p) << DA9063_IIC_PAGE_SHIFT) | (_o)) + +/* + * For 2-WIRE (I2C) operation pages are 256 registers but PAGE_CON is in units + * of 128 registers with the LSB ignored so scale the page when writing to it. + */ +#define DA9063_IIC_PAGE_CON_REG_PAGE_SHIFT 1 + +struct da9063_iic_softc { + struct simplebus_softc simplebus_sc; + device_t dev; + struct mtx mtx; + uint8_t page; +}; + +#define DA9063_IIC_LOCK(sc) mtx_lock(&(sc)->mtx) +#define DA9063_IIC_UNLOCK(sc) mtx_unlock(&(sc)->mtx) +#define DA9063_IIC_ASSERT_LOCKED(sc) mtx_assert(&(sc)->mtx, MA_OWNED); +#define DA9063_IIC_ASSERT_UNLOCKED(sc) mtx_assert(&(sc)->mtx, MA_NOTOWNED); + +static struct ofw_compat_data compat_data[] = { + { "dlg,da9063", 1 }, + { NULL, 0 } +}; + +static int +da9063_iic_select_page(struct da9063_iic_softc *sc, uint16_t page) +{ + uint8_t reg; + int error; + + DA9063_IIC_ASSERT_LOCKED(sc); + + if (page == sc->page) + return (0); + + error = iicdev_readfrom(sc->dev, DA9063_PAGE_CON, ®, 1, IIC_WAIT); + if (error != 0) + return (iic2errno(error)); + + reg &= ~(DA9063_PAGE_CON_REG_PAGE_MASK << + DA9063_PAGE_CON_REG_PAGE_SHIFT); + reg |= (page << DA9063_IIC_PAGE_CON_REG_PAGE_SHIFT) << + DA9063_PAGE_CON_REG_PAGE_SHIFT; + + error = iicdev_writeto(sc->dev, DA9063_PAGE_CON, ®, 1, IIC_WAIT); + if (error != 0) + return (iic2errno(error)); + + sc->page = page; + + return (0); +} + +static int +da9063_iic_read(device_t dev, uint16_t addr, uint8_t *val) +{ + struct da9063_iic_softc *sc; + int error; + + sc = device_get_softc(dev); + + DA9063_IIC_LOCK(sc); + + error = da9063_iic_select_page(sc, DA9063_IIC_PAGE(addr)); + if (error != 0) + goto error; + + error = iicdev_readfrom(dev, DA9063_IIC_PAGE_OFF(addr), val, 1, + IIC_WAIT); + if (error != 0) + error = iic2errno(error); + +error: + DA9063_IIC_UNLOCK(sc); + + return (error); +} + +static int +da9063_iic_write(device_t dev, uint16_t addr, uint8_t val) +{ + struct da9063_iic_softc *sc; + int error; + + sc = device_get_softc(dev); + + DA9063_IIC_LOCK(sc); + + error = da9063_iic_select_page(sc, DA9063_IIC_PAGE(addr)); + if (error != 0) + goto error; + + error = iicdev_writeto(dev, DA9063_IIC_PAGE_OFF(addr), &val, 1, + IIC_WAIT); + if (error != 0) + error = iic2errno(error); + +error: + DA9063_IIC_UNLOCK(sc); + + return (error); +} + +static int +da9063_iic_modify(device_t dev, uint16_t addr, uint8_t clear_mask, + uint8_t set_mask) +{ + struct da9063_iic_softc *sc; + uint8_t reg; + int error; + + sc = device_get_softc(dev); + + DA9063_IIC_LOCK(sc); + + error = da9063_iic_select_page(sc, DA9063_IIC_PAGE(addr)); + if (error != 0) + goto error; + + error = iicdev_readfrom(dev, DA9063_IIC_PAGE_OFF(addr), ®, 1, + IIC_WAIT); + if (error != 0) { + error = iic2errno(error); + goto error; + } + + reg &= ~clear_mask; + reg |= set_mask; + + error = iicdev_writeto(dev, DA9063_IIC_PAGE_OFF(addr), ®, 1, + IIC_WAIT); + if (error != 0) + error = iic2errno(error); + +error: + DA9063_IIC_UNLOCK(sc); + + return (error); +} + +static int +da9063_iic_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "Dialog DA9063 PMIC"); + + return (BUS_PROBE_DEFAULT); +} + +static int +da9063_iic_attach(device_t dev) +{ + struct da9063_iic_softc *sc; + uint8_t reg; + int error; + + sc = device_get_softc(dev); + + sc->dev = dev; + + error = iicdev_readfrom(dev, DA9063_PAGE_CON, ®, 1, IIC_WAIT); + if (error != 0) + return (iic2errno(error)); + + sc->page = ((reg >> DA9063_PAGE_CON_REG_PAGE_SHIFT) & + DA9063_PAGE_CON_REG_PAGE_MASK) >> DA9063_IIC_PAGE_CON_REG_PAGE_SHIFT; + mtx_init(&sc->mtx, device_get_nameunit(sc->dev), NULL, MTX_DEF); + + sc->simplebus_sc.flags |= SB_FLAG_NO_RANGES; + + return (simplebus_attach(dev)); +} + +static int +da9063_iic_detach(device_t dev) +{ + struct da9063_iic_softc *sc; + int error; + + sc = device_get_softc(dev); + + error = simplebus_detach(dev); + if (error != 0) + return (error); + + mtx_destroy(&sc->mtx); + + return (0); +} + +static device_method_t da9063_iic_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, da9063_iic_probe), + DEVMETHOD(device_attach, da9063_iic_attach), + DEVMETHOD(device_detach, da9063_iic_detach), + + /* DA9063 interface */ + DEVMETHOD(da9063_read, da9063_iic_read), + DEVMETHOD(da9063_write, da9063_iic_write), + DEVMETHOD(da9063_modify, da9063_iic_modify), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(da9063_pmic, da9063_iic_driver, da9063_iic_methods, + sizeof(struct da9063_iic_softc), simplebus_driver); + +DRIVER_MODULE(da9063_iic, iicbus, da9063_iic_driver, NULL, NULL); diff --git a/sys/dev/dialog/da9063/da9063reg.h b/sys/dev/dialog/da9063/da9063reg.h new file mode 100644 index 000000000000..b9de664290f4 --- /dev/null +++ b/sys/dev/dialog/da9063/da9063reg.h @@ -0,0 +1,1209 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Jessica Clarke + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _DA9063_REG_H_ +#define _DA9063_REG_H_ + +/* + * Reference: DA9063 System PMIC for Mobile and Automotive Applications + * datasheet (https://www.renesas.com/us/en/document/dst/da9063-datasheet), + * revision 2.4. + */ + +/* Page 0 */ + +#define DA9063_PAGE_CON 0x00 +#define DA9063_PAGE_CON_REG_PAGE_SHIFT 0 +#define DA9063_PAGE_CON_REG_PAGE_MASK 0x07 +#define DA9063_PAGE_CON_WRITE_MODE 0x40 +#define DA9063_PAGE_CON_REVERT 0x80 + +/* System Control and Event Registers (SYSMON) */ + +#define DA9063_STATUS_A 0x01 +#define DA9063_STATUS_A_NONKEY 0x01 +#define DA9063_STATUS_A_WAKE 0x02 +#define DA9063_STATUS_A_DVC_BUSY 0x04 +#define DA9063_STATUS_A_COMP1V2 0x08 +#define DA9063_STATUS_B 0x02 +#define DA9063_STATUS_B_GPI0 0x01 +#define DA9063_STATUS_B_GPI1 0x02 +#define DA9063_STATUS_B_GPI2 0x04 +#define DA9063_STATUS_B_GPI3 0x08 +#define DA9063_STATUS_B_GPI4 0x10 +#define DA9063_STATUS_B_GPI5 0x20 +#define DA9063_STATUS_B_GPI6 0x40 +#define DA9063_STATUS_B_GPI7 0x80 +#define DA9063_STATUS_C 0x03 +#define DA9063_STATUS_C_GPI8 0x01 +#define DA9063_STATUS_C_GPI9 0x02 +#define DA9063_STATUS_C_GPI10 0x04 +#define DA9063_STATUS_C_GPI11 0x08 +#define DA9063_STATUS_C_GPI12 0x10 +#define DA9063_STATUS_C_GPI13 0x20 +#define DA9063_STATUS_C_GPI14 0x40 +#define DA9063_STATUS_C_GPI15 0x80 +#define DA9063_STATUS_D 0x04 +#define DA9063_STATUS_D_LDO3_LIM 0x08 +#define DA9063_STATUS_D_LDO4_LIM 0x10 +#define DA9063_STATUS_D_LDO7_LIM 0x20 +#define DA9063_STATUS_D_LDO8_LIM 0x40 +#define DA9063_STATUS_D_LDO11_LIM 0x80 +#define DA9063_FAULT_LOG 0x05 +#define DA9063_FAULT_LOG_TWD_ERROR 0x01 +#define DA9063_FAULT_LOG_POR 0x02 +#define DA9063_FAULT_LOG_VDD_FAULT 0x04 +#define DA9063_FAULT_LOG_VDD_START 0x08 +#define DA9063_FAULT_LOG_TEMP_CRIT 0x10 +#define DA9063_FAULT_LOG_KEY_RESET 0x20 +#define DA9063_FAULT_LOG_NSHUTDOWN 0x40 +#define DA9063_FAULT_LOG_WAIT_SHUT 0x80 +#define DA9063_EVENT_A 0x06 +#define DA9063_EVENT_A_E_NONKEY 0x01 +#define DA9063_EVENT_A_E_ALARM 0x02 +#define DA9063_EVENT_A_E_TICK 0x04 +#define DA9063_EVENT_A_E_ADC_RDY 0x08 +#define DA9063_EVENT_A_E_SEQ_RDY 0x10 +#define DA9063_EVENT_A_EVENTS_B 0x20 +#define DA9063_EVENT_A_EVENTS_C 0x40 +#define DA9063_EVENT_A_EVENTS_D 0x80 +#define DA9063_EVENT_B 0x07 +#define DA9063_EVENT_B_E_WAKE 0x01 +#define DA9063_EVENT_B_E_TEMP 0x02 +#define DA9063_EVENT_B_E_COMP_1V2 0x04 +#define DA9063_EVENT_B_E_LDO_LIM 0x08 +#define DA9063_EVENT_B_E_REG_UVOV 0x10 +#define DA9063_EVENT_B_E_DVC_RDY 0x20 +#define DA9063_EVENT_B_E_VDD_MON 0x40 +#define DA9063_EVENT_B_E_VDD_WARN 0x80 +#define DA9063_EVENT_C 0x08 +#define DA9063_EVENT_C_E_GPI0 0x01 +#define DA9063_EVENT_C_E_GPI1 0x02 +#define DA9063_EVENT_C_E_GPI2 0x04 +#define DA9063_EVENT_C_E_GPI3 0x08 +#define DA9063_EVENT_C_E_GPI4 0x10 +#define DA9063_EVENT_C_E_GPI5 0x20 +#define DA9063_EVENT_C_E_GPI6 0x40 +#define DA9063_EVENT_C_E_GPI7 0x80 +#define DA9063_EVENT_D 0x09 +#define DA9063_EVENT_D_E_GPI8 0x01 +#define DA9063_EVENT_D_E_GPI9 0x02 +#define DA9063_EVENT_D_E_GPI10 0x04 +#define DA9063_EVENT_D_E_GPI11 0x08 +#define DA9063_EVENT_D_E_GPI12 0x10 +#define DA9063_EVENT_D_E_GPI13 0x20 +#define DA9063_EVENT_D_E_GPI14 0x40 +#define DA9063_EVENT_D_E_GPI15 0x80 +#define DA9063_IRQ_MASK_A 0x0a +#define DA9063_IRQ_MASK_A_M_NONKEY 0x01 +#define DA9063_IRQ_MASK_A_M_ALARM 0x02 +#define DA9063_IRQ_MASK_A_M_TICK 0x04 +#define DA9063_IRQ_MASK_A_M_ADC_RDY 0x08 +#define DA9063_IRQ_MASK_A_M_SEQ_RDY 0x10 +#define DA9063_IRQ_MASK_B 0x0b +#define DA9063_IRQ_MASK_B_M_WAKE 0x01 +#define DA9063_IRQ_MASK_B_M_TEMP 0x02 +#define DA9063_IRQ_MASK_B_M_COMP_1V2 0x04 +#define DA9063_IRQ_MASK_B_M_LDO_LIM 0x08 +#define DA9063_IRQ_MASK_B_M_REG_UVOV 0x10 +#define DA9063_IRQ_MASK_B_M_DVC_RDY 0x20 +#define DA9063_IRQ_MASK_B_M_VDD_MON 0x40 +#define DA9063_IRQ_MASK_B_M_VDD_WARN 0x80 +#define DA9063_IRQ_MASK_C 0x0c +#define DA9063_IRQ_MASK_C_M_GPI0 0x01 +#define DA9063_IRQ_MASK_C_M_GPI1 0x02 +#define DA9063_IRQ_MASK_C_M_GPI2 0x04 +#define DA9063_IRQ_MASK_C_M_GPI3 0x08 +#define DA9063_IRQ_MASK_C_M_GPI4 0x10 +#define DA9063_IRQ_MASK_C_M_GPI5 0x20 +#define DA9063_IRQ_MASK_C_M_GPI6 0x40 +#define DA9063_IRQ_MASK_C_M_GPI7 0x80 +#define DA9063_IRQ_MASK_D 0x0d +#define DA9063_IRQ_MASK_D_M_GPI8 0x01 +#define DA9063_IRQ_MASK_D_M_GPI9 0x02 +#define DA9063_IRQ_MASK_D_M_GPI10 0x04 +#define DA9063_IRQ_MASK_D_M_GPI11 0x08 +#define DA9063_IRQ_MASK_D_M_GPI12 0x10 +#define DA9063_IRQ_MASK_D_M_GPI13 0x20 +#define DA9063_IRQ_MASK_D_M_GPI14 0x40 +#define DA9063_IRQ_MASK_D_M_GPI15 0x80 +#define DA9063_CONTROL_A 0x0e +#define DA9063_CONTROL_A_SYSTEM_EN 0x01 +#define DA9063_CONTROL_A_POWER_EN 0x02 +#define DA9063_CONTROL_A_POWER1_EN 0x04 +#define DA9063_CONTROL_A_STANDBY 0x08 +#define DA9063_CONTROL_A_M_SYSTEM_EN 0x10 +#define DA9063_CONTROL_A_M_POWER_EN 0x20 +#define DA9063_CONTROL_A_M_POWER1_EN 0x40 +#define DA9063_CONTROL_A_CP_EN 0x80 +#define DA9063_CONTROL_B 0x0f +#define DA9063_CONTROL_B_CHG_SEL 0x01 +#define DA9063_CONTROL_B_WATCHDOG_DIS 0x02 +#define DA9063_CONTROL_B_RESET_GLINKING 0x04 +#define DA9063_CONTROL_B_NRES_MODE 0x08 +#define DA9063_CONTROL_B_NONKEY_LOCK 0x10 +#define DA9063_CONTROL_B_BUCK_SLOWSTART 0x80 +#define DA9063_CONTROL_C 0x10 +#define DA9063_CONTROL_C_DEBOUNCING_SHIFT 0 +#define DA9063_CONTROL_C_DEBOUNCING_MASK 0x07 +#define DA9063_CONTROL_C_AUTO_BOOT 0x08 +#define DA9063_CONTROL_C_OTPREAD_EN 0x10 +#define DA9063_CONTROL_C_SLEW_RATE_SHIFT 5 +#define DA9063_CONTROL_C_SLEW_RATE_MASK 0x03 +#define DA9063_CONTROL_C_DEF_SUPPLY 0x80 +#define DA9063_CONTROL_D 0x11 +#define DA9063_CONTROL_D_TWDSCALE_SHIFT 0 +#define DA9063_CONTROL_D_TWDSCALE_MASK 0x07 +#define DA9063_CONTROL_D_BLINK_FRQ_SHIFT 3 +#define DA9063_CONTROL_D_BLINK_FRQ_MASK 0x07 +#define DA9063_CONTROL_D_BLINK_DUR_SHIFT 2 +#define DA9063_CONTROL_D_BLINK_DUR_MASK 0x03 +#define DA9063_CONTROL_E 0x12 +#define DA9063_CONTROL_E_RTC_MODE_PD 0x01 +#define DA9063_CONTROL_E_RTC_MODE_SD 0x02 +#define DA9063_CONTROL_E_RTC_EN 0x04 +#define DA9063_CONTROL_E_ECO_MODE 0x08 +#define DA9063_CONTROL_E_PM_FB1_PIN 0x10 +#define DA9063_CONTROL_E_PM_FB2_PIN 0x20 +#define DA9063_CONTROL_E_PM_FB3_PIN 0x40 +#define DA9063_CONTROL_E_V_LOCK 0x80 +#define DA9063_CONTROL_F 0x13 +#define DA9063_CONTROL_F_WATCHDOG 0x01 +#define DA9063_CONTROL_F_SHUTDOWN 0x02 +#define DA9063_CONTROL_F_WAKE_UP 0x04 +#define DA9063_PD_DIS 0x14 +#define DA9063_PD_DIS_GPI_DIS 0x01 +#define DA9063_PD_DIS_GPADC_PAUSE 0x02 +#define DA9063_PD_DIS_PMIF_DIS 0x04 +#define DA9063_PD_DIS_HS2IF_DIS 0x08 +#define DA9063_PD_DIS_BBAT_DIS 0x20 +#define DA9063_PD_DIS_OUT32K_PAUSE 0x40 +#define DA9063_PD_DIS_PMCONT_DIS 0x80 + +/* GPIO Control Registers (GPIO) */ + +#define DA9063_GPIO0_1 0x15 +#define DA9063_GPIO0_1_GPIO0_PIN_SHIFT 0 +#define DA9063_GPIO0_1_GPIO0_PIN_MASK 0x03 +#define DA9063_GPIO0_1_GPIO0_TYPE 0x04 +#define DA9063_GPIO0_1_GPIO0_WEN 0x08 +#define DA9063_GPIO0_1_GPIO1_PIN_SHIFT 4 +#define DA9063_GPIO0_1_GPIO1_PIN_MASK 0x03 +#define DA9063_GPIO0_1_GPIO1_TYPE 0x40 +#define DA9063_GPIO0_1_GPIO1_WEN 0x80 +#define DA9063_GPIO2_3 0x16 +#define DA9063_GPIO2_3_GPIO2_PIN_SHIFT 0 +#define DA9063_GPIO2_3_GPIO2_PIN_MASK 0x03 +#define DA9063_GPIO2_3_GPIO2_TYPE 0x04 +#define DA9063_GPIO2_3_GPIO2_WEN 0x08 +#define DA9063_GPIO2_3_GPIO3_PIN_SHIFT 4 +#define DA9063_GPIO2_3_GPIO3_PIN_MASK 0x03 +#define DA9063_GPIO2_3_GPIO3_TYPE 0x40 +#define DA9063_GPIO2_3_GPIO3_WEN 0x80 +#define DA9063_GPIO4_5 0x17 +#define DA9063_GPIO4_5_GPIO4_PIN_SHIFT 0 +#define DA9063_GPIO4_5_GPIO4_PIN_MASK 0x03 +#define DA9063_GPIO4_5_GPIO4_TYPE 0x04 +#define DA9063_GPIO4_5_GPIO4_WEN 0x08 +#define DA9063_GPIO4_5_GPIO5_PIN_SHIFT 4 +#define DA9063_GPIO4_5_GPIO5_PIN_MASK 0x03 +#define DA9063_GPIO4_5_GPIO5_TYPE 0x04 +#define DA9063_GPIO4_5_GPIO5_WEN 0x08 +#define DA9063_GPIO6_7 0x18 +#define DA9063_GPIO6_7_GPIO6_PIN_SHIFT 0 +#define DA9063_GPIO6_7_GPIO6_PIN_MASK 0x03 +#define DA9063_GPIO6_7_GPIO6_TYPE 0x04 +#define DA9063_GPIO6_7_GPIO6_WEN 0x08 +#define DA9063_GPIO6_7_GPIO7_PIN_SHIFT 4 +#define DA9063_GPIO6_7_GPIO7_PIN_MASK 0x03 +#define DA9063_GPIO6_7_GPIO7_TYPE 0x04 +#define DA9063_GPIO6_7_GPIO7_WEN 0x08 +#define DA9063_GPIO8_9 0x19 +#define DA9063_GPIO8_9_GPIO8_PIN_SHIFT 0 +#define DA9063_GPIO8_9_GPIO8_PIN_MASK 0x03 +#define DA9063_GPIO8_9_GPIO8_TYPE 0x04 +#define DA9063_GPIO8_9_GPIO8_WEN 0x08 +#define DA9063_GPIO8_9_GPIO9_PIN_SHIFT 4 +#define DA9063_GPIO8_9_GPIO9_PIN_MASK 0x03 +#define DA9063_GPIO8_9_GPIO9_TYPE 0x04 +#define DA9063_GPIO8_9_GPIO9_WEN 0x08 +#define DA9063_GPIO10_11 0x1a +#define DA9063_GPIO10_11_GPIO10_PIN_SHIFT 0 +#define DA9063_GPIO10_11_GPIO10_PIN_MASK 0x03 +#define DA9063_GPIO10_11_GPIO10_TYPE 0x04 +#define DA9063_GPIO10_11_GPIO10_WEN 0x08 +#define DA9063_GPIO10_11_GPIO11_PIN_SHIFT 4 +#define DA9063_GPIO10_11_GPIO11_PIN_MASK 0x03 +#define DA9063_GPIO10_11_GPIO11_TYPE 0x04 +#define DA9063_GPIO10_11_GPIO11_WEN 0x08 +#define DA9063_GPIO12_13 0x1b +#define DA9063_GPIO12_13_GPIO12_PIN_SHIFT 0 +#define DA9063_GPIO12_13_GPIO12_PIN_MASK 0x03 +#define DA9063_GPIO12_13_GPIO12_TYPE 0x04 +#define DA9063_GPIO12_13_GPIO12_WEN 0x08 +#define DA9063_GPIO12_13_GPIO13_PIN_SHIFT 4 +#define DA9063_GPIO12_13_GPIO13_PIN_MASK 0x03 +#define DA9063_GPIO12_13_GPIO13_TYPE 0x04 +#define DA9063_GPIO12_13_GPIO13_WEN 0x08 +#define DA9063_GPIO14_15 0x1c +#define DA9063_GPIO14_15_GPIO14_PIN_SHIFT 0 +#define DA9063_GPIO14_15_GPIO14_PIN_MASK 0x03 +#define DA9063_GPIO14_15_GPIO14_TYPE 0x04 +#define DA9063_GPIO14_15_GPIO14_WEN 0x08 +#define DA9063_GPIO14_15_GPIO15_PIN_SHIFT 4 +#define DA9063_GPIO14_15_GPIO15_PIN_MASK 0x03 +#define DA9063_GPIO14_15_GPIO15_TYPE 0x04 +#define DA9063_GPIO14_15_GPIO15_WEN 0x08 +#define DA9063_GPIO_MODE0_7 0x1d +#define DA9063_GPIO_MODE0_7_GPIO0_MASK 0x01 +#define DA9063_GPIO_MODE0_7_GPIO1_MASK 0x02 +#define DA9063_GPIO_MODE0_7_GPIO2_MASK 0x04 +#define DA9063_GPIO_MODE0_7_GPIO3_MASK 0x08 +#define DA9063_GPIO_MODE0_7_GPIO4_MASK 0x10 +#define DA9063_GPIO_MODE0_7_GPIO5_MASK 0x20 +#define DA9063_GPIO_MODE0_7_GPIO6_MASK 0x40 +#define DA9063_GPIO_MODE0_7_GPIO7_MASK 0x80 +#define DA9063_GPIO_MODE8_15 0x1e +#define DA9063_GPIO_MODE8_15_GPIO8_MASK 0x01 +#define DA9063_GPIO_MODE8_15_GPIO9_MASK 0x02 +#define DA9063_GPIO_MODE8_15_GPIO10_MASK 0x04 +#define DA9063_GPIO_MODE8_15_GPIO11_MASK 0x08 +#define DA9063_GPIO_MODE8_15_GPIO12_MASK 0x10 +#define DA9063_GPIO_MODE8_15_GPIO13_MASK 0x20 +#define DA9063_GPIO_MODE8_15_GPIO14_MASK 0x40 +#define DA9063_GPIO_MODE8_15_GPIO15_MASK 0x80 +#define DA9063_SWITCH_CONT 0x1f +#define DA9063_SWITCH_CONT_CORE_SW_GPI_SHIFT 0 +#define DA9063_SWITCH_CONT_CORE_SW_GPI_MASK 0x03 +#define DA9063_SWITCH_CONT_PERI_SW_GPI_SHIFT 2 +#define DA9063_SWITCH_CONT_PERI_SW_GPI_MASK 0x03 +#define DA9063_SWITCH_CONT_SWITCH_SR_SHIFT 4 +#define DA9063_SWITCH_CONT_SWITCH_SR_MASK 0x03 +#define DA9063_SWITCH_CONT_CORE_SW_INT 0x40 +#define DA9063_SWITCH_CONT_CP_EN_MODE 0x80 + +/* Regulator Control Registers (REG) */ + +#define DA9063_BCORE2_CONT 0x20 +#define DA9063_BCORE2_CONT_BCORE2_EN 0x01 +#define DA9063_BCORE2_CONT_BCORE2_GPI_SHIFT 1 +#define DA9063_BCORE2_CONT_BCORE2_GPI_MASK 0x03 +#define DA9063_BCORE2_CONT_BCORE2_CONF 0x08 +#define DA9063_BCORE2_CONT_VBCORE2_GPI_SHIFT 5 +#define DA9063_BCORE2_CONT_VBCORE2_GPI_MASK 0x03 +#define DA9063_BCORE1_CONT 0x21 +#define DA9063_BCORE1_CONT_BCORE1_EN 0x01 +#define DA9063_BCORE1_CONT_BCORE1_GPI_SHIFT 1 +#define DA9063_BCORE1_CONT_BCORE1_GPI_MASK 0x03 +#define DA9063_BCORE1_CONT_BCORE1_CONF 0x08 +#define DA9063_BCORE1_CONT_CORE_SW_EN 0x10 +#define DA9063_BCORE1_CONT_VBCORE1_GPI_SHIFT 5 +#define DA9063_BCORE1_CONT_VBCORE1_GPI_MASK 0x03 +#define DA9063_BCORE1_CONT_CORE_SW_CONF 0x80 +#define DA9063_BPRO_CONT 0x22 +#define DA9063_BPRO_CONT_BPRO_EN 0x01 +#define DA9063_BPRO_CONT_BPRO_GPI_SHIFT 1 +#define DA9063_BPRO_CONT_BPRO_GPI_MASK 0x03 +#define DA9063_BPRO_CONT_BPRO_CONF 0x08 +#define DA9063_BPRO_CONT_VBPRO_GPI_SHIFT 5 +#define DA9063_BPRO_CONT_VBPRO_GPI_MASK 0x03 +#define DA9063_BMEM_CONT 0x23 +#define DA9063_BMEM_CONT_BMEM_EN 0x01 +#define DA9063_BMEM_CONT_BMEM_GPI_SHIFT 1 +#define DA9063_BMEM_CONT_BMEM_GPI_MASK 0x03 +#define DA9063_BMEM_CONT_BMEM_CONF 0x08 +#define DA9063_BMEM_CONT_VBMEM_GPI_SHIFT 5 +#define DA9063_BMEM_CONT_VBMEM_GPI_MASK 0x03 +#define DA9063_BIO_CONT 0x24 +#define DA9063_BIO_CONT_BIO_EN 0x01 +#define DA9063_BIO_CONT_BIO_GPI_SHIFT 1 +#define DA9063_BIO_CONT_BIO_GPI_MASK 0x03 +#define DA9063_BIO_CONT_BIO_CONF 0x08 +#define DA9063_BIO_CONT_VBIO_GPI_SHIFT 5 +#define DA9063_BIO_CONT_VBIO_GPI_MASK 0x03 +#define DA9063_BPERI_CONT 0x25 +#define DA9063_BPERI_CONT_BPERI_EN 0x01 +#define DA9063_BPERI_CONT_BPERI_GPI_SHIFT 1 +#define DA9063_BPERI_CONT_BPERI_GPI_MASK 0x03 +#define DA9063_BPERI_CONT_BPERI_CONF 0x08 +#define DA9063_BPERI_CONT_PERI_SW_EN 0x10 +#define DA9063_BPERI_CONT_VBPERI_GPI_SHIFT 5 +#define DA9063_BPERI_CONT_VBPERI_GPI_MASK 0x03 +#define DA9063_BPERI_CONT_PERI_SW_CONF 0x80 +#define DA9063_LDO1_CONT 0x26 +#define DA9063_LDO1_CONT_LDO1_EN 0x01 +#define DA9063_LDO1_CONT_LDO1_GPI_SHIFT 1 +#define DA9063_LDO1_CONT_LDO1_GPI_MASK 0x03 +#define DA9063_LDO1_CONT_LDO1_PD_DIS 0x08 +#define DA9063_LDO1_CONT_VLDO1_GPI_SHIFT 5 +#define DA9063_LDO1_CONT_VLDO1_GPI_MASK 0x03 +#define DA9063_LDO1_CONT_VLDO1_CONF 0x80 +#define DA9063_LDO2_CONT 0x27 +#define DA9063_LDO2_CONT_LDO2_EN 0x01 +#define DA9063_LDO2_CONT_LDO2_GPI_SHIFT 1 +#define DA9063_LDO2_CONT_LDO2_GPI_MASK 0x03 +#define DA9063_LDO2_CONT_LDO2_PD_DIS 0x08 +#define DA9063_LDO2_CONT_VLDO2_GPI_SHIFT 5 +#define DA9063_LDO2_CONT_VLDO2_GPI_MASK 0x03 +#define DA9063_LDO2_CONT_VLDO2_CONF 0x80 +#define DA9063_LDO3_CONT 0x28 +#define DA9063_LDO3_CONT_LDO3_EN 0x01 +#define DA9063_LDO3_CONT_LDO3_GPI_SHIFT 1 +#define DA9063_LDO3_CONT_LDO3_GPI_MASK 0x03 +#define DA9063_LDO3_CONT_LDO3_PD_DIS 0x08 +#define DA9063_LDO3_CONT_VLDO3_GPI_SHIFT 5 +#define DA9063_LDO3_CONT_VLDO3_GPI_MASK 0x03 +#define DA9063_LDO3_CONT_VLDO3_CONF 0x80 +#define DA9063_LDO4_CONT 0x29 +#define DA9063_LDO4_CONT_LDO4_EN 0x01 +#define DA9063_LDO4_CONT_LDO4_GPI_SHIFT 1 +#define DA9063_LDO4_CONT_LDO4_GPI_MASK 0x03 +#define DA9063_LDO4_CONT_LDO4_PD_DIS 0x08 +#define DA9063_LDO4_CONT_VLDO4_SEL 0x10 +#define DA9063_LDO4_CONT_VLDO4_GPI_SHIFT 5 +#define DA9063_LDO4_CONT_VLDO4_GPI_MASK 0x03 +#define DA9063_LDO4_CONT_VLDO4_CONF 0x80 +#define DA9063_LDO5_CONT 0x2a +#define DA9063_LDO5_CONT_LDO5_EN 0x01 +#define DA9063_LDO5_CONT_LDO5_GPI_SHIFT 1 +#define DA9063_LDO5_CONT_LDO5_GPI_MASK 0x03 +#define DA9063_LDO5_CONT_LDO5_PD_DIS 0x08 +#define DA9063_LDO5_CONT_VLDO5_SEL 0x10 +#define DA9063_LDO5_CONT_VLDO5_GPI_SHIFT 5 +#define DA9063_LDO5_CONT_VLDO5_GPI_MASK 0x03 +#define DA9063_LDO5_CONT_VLDO5_CONF 0x80 +#define DA9063_LDO6_CONT 0x2b +#define DA9063_LDO6_CONT_LDO6_EN 0x01 +#define DA9063_LDO6_CONT_LDO6_GPI_SHIFT 1 +#define DA9063_LDO6_CONT_LDO6_GPI_MASK 0x03 +#define DA9063_LDO6_CONT_LDO6_PD_DIS 0x08 +#define DA9063_LDO6_CONT_VLDO6_SEL 0x10 +#define DA9063_LDO6_CONT_VLDO6_GPI_SHIFT 5 +#define DA9063_LDO6_CONT_VLDO6_GPI_MASK 0x03 +#define DA9063_LDO6_CONT_VLDO6_CONF 0x80 +#define DA9063_LDO7_CONT 0x2c +#define DA9063_LDO7_CONT_LDO7_EN 0x01 +#define DA9063_LDO7_CONT_LDO7_GPI_SHIFT 1 +#define DA9063_LDO7_CONT_LDO7_GPI_MASK 0x03 +#define DA9063_LDO7_CONT_LDO7_PD_DIS 0x08 +#define DA9063_LDO7_CONT_VLDO7_SEL 0x10 +#define DA9063_LDO7_CONT_VLDO7_GPI_SHIFT 5 +#define DA9063_LDO7_CONT_VLDO7_GPI_MASK 0x03 +#define DA9063_LDO7_CONT_VLDO7_CONF 0x80 +#define DA9063_LDO8_CONT 0x2d +#define DA9063_LDO8_CONT_LDO8_EN 0x01 +#define DA9063_LDO8_CONT_LDO8_GPI_SHIFT 1 +#define DA9063_LDO8_CONT_LDO8_GPI_MASK 0x03 +#define DA9063_LDO8_CONT_LDO8_PD_DIS 0x08 +#define DA9063_LDO8_CONT_VLDO8_SEL 0x10 +#define DA9063_LDO8_CONT_VLDO8_GPI_SHIFT 5 +#define DA9063_LDO8_CONT_VLDO8_GPI_MASK 0x03 +#define DA9063_LDO8_CONT_VLDO8_CONF 0x80 +#define DA9063_LDO9_CONT 0x2e +#define DA9063_LDO9_CONT_LDO9_EN 0x01 +#define DA9063_LDO9_CONT_LDO9_GPI_SHIFT 1 +#define DA9063_LDO9_CONT_LDO9_GPI_MASK 0x03 +#define DA9063_LDO9_CONT_LDO9_PD_DIS 0x08 +#define DA9063_LDO9_CONT_VLDO9_SEL 0x10 +#define DA9063_LDO9_CONT_VLDO9_GPI_SHIFT 5 +#define DA9063_LDO9_CONT_VLDO9_GPI_MASK 0x03 +#define DA9063_LDO9_CONT_VLDO9_CONF 0x80 +#define DA9063_LDO10_CONT 0x2f +#define DA9063_LDO10_CONT_LDO10_EN 0x01 +#define DA9063_LDO10_CONT_LDO10_GPI_SHIFT 1 +#define DA9063_LDO10_CONT_LDO10_GPI_MASK 0x03 +#define DA9063_LDO10_CONT_LDO10_PD_DIS 0x08 +#define DA9063_LDO10_CONT_VLDO10_SEL 0x10 +#define DA9063_LDO10_CONT_VLDO10_GPI_SHIFT 5 +#define DA9063_LDO10_CONT_VLDO10_GPI_MASK 0x03 +#define DA9063_LDO10_CONT_VLDO10_CONF 0x80 +#define DA9063_LDO11_CONT 0x30 +#define DA9063_LDO11_CONT_LDO11_EN 0x01 +#define DA9063_LDO11_CONT_LDO11_GPI_SHIFT 1 +#define DA9063_LDO11_CONT_LDO11_GPI_MASK 0x03 +#define DA9063_LDO11_CONT_LDO11_PD_DIS 0x08 +#define DA9063_LDO11_CONT_VLDO11_SEL 0x10 +#define DA9063_LDO11_CONT_VLDO11_GPI_SHIFT 5 +#define DA9063_LDO11_CONT_VLDO11_GPI_MASK 0x03 +#define DA9063_LDO11_CONT_VLDO11_CONF 0x80 +#define DA9063_VIB 0x31 +#define DA9063_VIB_VIB_SET_SHIFT 0 +#define DA9063_VIB_VIB_SET_MASK 0x3f +#define DA9063_DVC_1 0x32 +#define DA9063_DVC_1_VBCORE1_SEL 0x01 +#define DA9063_DVC_1_VBCORE2_SEL 0x02 +#define DA9063_DVC_1_VBPRO_SEL 0x04 +#define DA9063_DVC_1_VBMEM_SEL 0x08 +#define DA9063_DVC_1_VBPERI_SEL 0x10 +#define DA9063_DVC_1_VLDO1_SEL 0x20 +#define DA9063_DVC_1_VLDO2_SEL 0x40 +#define DA9063_DVC_1_VLDO3_SEL 0x80 +#define DA9063_DVC_2 0x33 +#define DA9063_DVC_2_VBIO_SEL 0x01 +#define DA9063_DVC_2_VLDO4_SEL 0x80 + +/* GP-ADC Control Registers (GPADC) */ + +#define DA9063_ADC_MAN 0x34 +#define DA9063_ADC_MAN_ADC_MUX_SHIFT 0 +#define DA9063_ADC_MAN_ADC_MUX_MASK 0x0f +#define DA9063_ADC_MAN_ADC_MAN 0x10 +#define DA9063_ADC_MAN_ADC_MODE 0x20 +#define DA9063_ADC_CONT 0x35 +#define DA9063_ADC_CONT_AUTO_VSYS_EN 0x01 +#define DA9063_ADC_CONT_AUTO_AD1_EN 0x02 +#define DA9063_ADC_CONT_AUTO_AD2_EN 0x04 +#define DA9063_ADC_CONT_AUTO_AD3_EN 0x08 +#define DA9063_ADC_CONT_AD1_ISRC_EN 0x10 +#define DA9063_ADC_CONT_AD2_ISRC_EN 0x20 +#define DA9063_ADC_CONT_AD3_ISRC_EN 0x40 +#define DA9063_ADC_CONT_COMP1V2_EN 0x80 +#define DA9063_VSYS_MON 0x36 +#define DA9063_VSYS_MON_VSYS_MON_SHIFT 0 +#define DA9063_VSYS_MON_VSYS_MON_MASK 0xff +#define DA9063_ADC_RES_L 0x37 +#define DA9063_ADC_RES_L_ADC_RES_LSB_SHIFT 6 +#define DA9063_ADC_RES_L_ACD_RES_LSB_MASK 0x03 +#define DA9063_ADC_RES_H 0x38 +#define DA9063_ADC_RES_H_ADC_RES_H_SHIFT 0 +#define DA9063_ADC_RES_H_ADC_RES_H_MASK 0xff +#define DA9063_VSYS_RES 0x39 +#define DA9063_VSYS_RES_VSYS_RES_SHIFT 0 +#define DA9063_VSYS_RES_VSYS_RES_MASK 0xff +#define DA9063_ADCIN1_RES 0x3a +#define DA9063_ADCIN1_RES_ADCIN1_RES_SHIFT 0 +#define DA9063_ADCIN1_RES_ADCIN1_RES_MASK 0xff +#define DA9063_ADCIN2_RES 0x3b +#define DA9063_ADCIN2_RES_ADCIN2_RES_SHIFT 0 +#define DA9063_ADCIN2_RES_ADCIN2_RES_MASK 0xff +#define DA9063_ADCIN3_RES 0x3c +#define DA9063_ADCIN3_RES_ADCIN3_RES_SHIFT 0 +#define DA9063_ADCIN3_RES_ADCIN3_RES_MASK 0xff +#define DA9063_MON_A8_RES 0x3d +#define DA9063_MON_A8_RES_MON_A8_RES_SHIFT 0 +#define DA9063_MON_A8_RES_MON_A8_RES_MASK 0xff +#define DA9063_MON_A9_RES 0x3e +#define DA9063_MON_A9_RES_MON_A9_RES_SHIFT 0 +#define DA9063_MON_A9_RES_MON_A9_RES_MASK 0xff +#define DA9063_MON_A10_RES 0x3f +#define DA9063_MON_A10_RES_MON_A10_RES_SHIFT 0 +#define DA9063_MON_A10_RES_MON_A10_RES_MASK 0xff + +/* RTC Calendar and Alarm Registers (RTC) */ + +#define DA9063_COUNT_S 0x40 +#define DA9063_COUNT_S_COUNT_SEC_SHIFT 0 +#define DA9063_COUNT_S_COUNT_SEC_MASK 0x3f +#define DA9063_COUNT_S_RTC_READ 0x80 +#define DA9063_COUNT_MI 0x41 +#define DA9063_COUNT_MI_COUNT_MIN_SHIFT 0 +#define DA9063_COUNT_MI_COUNT_MIN_MASK 0x3f +#define DA9063_COUNT_H 0x42 +#define DA9063_COUNT_H_COUNT_HOUR_SHIFT 0 +#define DA9063_COUNT_H_COUNT_HOUR_MASK 0x1f +#define DA9063_COUNT_D 0x43 +#define DA9063_COUNT_D_COUNT_DAY_SHIFT 0 +#define DA9063_COUNT_D_COUNT_DAY_MASK 0x1f +#define DA9063_COUNT_MO 0x44 +#define DA9063_COUNT_MO_COUNT_MONTH_SHIFT 0 +#define DA9063_COUNT_MO_COUNT_MONTH_MASK 0x0f +#define DA9063_COUNT_Y 0x45 +#define DA9063_COUNT_Y_COUNT_YEAR_SHIFT 0 +#define DA9063_COUNT_Y_COUNT_YEAR_MASK 0x3f +#define DA9063_COUNT_Y_MONITOR 0x40 +#define DA9063_ALARM_S 0x46 +#define DA9063_ALARM_S_ALARM_SEC_SHIFT 0 +#define DA9063_ALARM_S_ALARM_SEC_MASK 0x3f +#define DA9063_ALARM_S_ALARM_TYPE_SHIFT 6 +#define DA9063_ALARM_S_ALARM_TYPE_MASK 0x03 +#define DA9063_ALARM_MI 0x47 +#define DA9063_ALARM_MI_ALARM_MIN_SHIFT 0 +#define DA9063_ALARM_MI_ALARM_MIN_MASK 0x3f +#define DA9063_ALARM_H 0x48 +#define DA9063_ALARM_H_ALARM_HOUR_SHIFT 0 +#define DA9063_ALARM_H_ALARM_HOUR_MASK 0x1f +#define DA9063_ALARM_D 0x49 +#define DA9063_ALARM_D_ALARM_DAY_SHIFT 0 +#define DA9063_ALARM_D_ALARM_DAY_MASK 0x1f +#define DA9063_ALARM_MO 0x4a +#define DA9063_ALARM_MO_ALARM_MONTH_SHIFT 0 +#define DA9063_ALARM_MO_ALARM_MONTH_MASK 0x0f +#define DA9063_ALARM_MO_TICK_TYPE 0x10 +#define DA9063_ALARM_MO_TICK_WAKE 0x20 +#define DA9063_ALARM_Y 0x4b +#define DA9063_ALARM_Y_ALARM_YEAR_SHIFT 0 +#define DA9063_ALARM_Y_ALARM_YEAR_MASK 0x3f +#define DA9063_ALARM_Y_ALARM_ON 0x40 +#define DA9063_ALARM_Y_TICK_ON 0x80 + +/* System Control and Event Registers (SYSMON) */ + +#define DA9063_SECOND_A 0x4c +#define DA9063_SECOND_A_SECONDS_A_SHIFT 0 +#define DA9063_SECOND_A_SECONDS_A_MASK 0xff +#define DA9063_SECOND_B 0x4d +#define DA9063_SECOND_B_SECONDS_B_SHIFT 0 +#define DA9063_SECOND_B_SECONDS_B_MASK 0xff +#define DA9063_SECOND_C 0x4e +#define DA9063_SECOND_C_SECONDS_C_SHIFT 0 +#define DA9063_SECOND_C_SECONDS_C_MASK 0xff +#define DA9063_SECOND_D 0x4f +#define DA9063_SECOND_D_SECONDS_D_SHIFT 0 +#define DA9063_SECOND_D_SECONDS_D_MASK 0xff + +/* Page 1 */ + +/* 0x80 is PAGE_CON */ + +/* Sequencer Control Registers (SEQ) */ + +#define DA9063_SEQ 0x81 +#define DA9063_SEQ_SEQ_POINTER_SHIFT 0 +#define DA9063_SEQ_SEQ_POINTER_MASK 0x0f +#define DA9063_SEQ_NXT_SEQ_START_SHIFT 4 +#define DA9063_SEQ_NXT_SEQ_START_MASK 0x0f +#define DA9063_SEQ_TIMER 0x82 +#define DA9063_SEQ_TIMER_SEQ_TIME_SHIFT 0 +#define DA9063_SEQ_TIMER_SEQ_TIME_MASK 0x0f +#define DA9063_SEQ_TIMER_SEQ_DUMM_SHIFT 4 +#define DA9063_SEQ_TIMER_SEQ_DUMM_MASK 0x0f +#define DA9063_ID_2_1 0x83 +#define DA9063_ID_2_1_LDO1_STEP_SHIFT 0 +#define DA9063_ID_2_1_LDO1_STEP_MASK 0x0f +#define DA9063_ID_2_1_LDO2_STEP_SHIFT 4 +#define DA9063_ID_2_1_LDO2_STEP_MASK 0x0f +#define DA9063_ID_4_3 0x84 +#define DA9063_ID_4_3_LDO3_STEP_SHIFT 0 +#define DA9063_ID_4_3_LDO3_STEP_MASK 0x0f +#define DA9063_ID_4_3_LDO4_STEP_SHIFT 4 +#define DA9063_ID_4_3_LDO4_STEP_MASK 0x0f +#define DA9063_ID_6_5 0x85 +#define DA9063_ID_6_5_LDO5_STEP_SHIFT 0 +#define DA9063_ID_6_5_LDO5_STEP_MASK 0x0f +#define DA9063_ID_6_5_LDO6_STEP_SHIFT 4 +#define DA9063_ID_6_5_LDO6_STEP_MASK 0x0f +#define DA9063_ID_8_7 0x86 +#define DA9063_ID_8_7_LDO7_STEP_SHIFT 0 *** 599 LINES SKIPPED *** From nobody Tue Aug 1 21:06: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 4RFnjT1sgKz4prby; Tue, 1 Aug 2023 21:06: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 4RFnjS6GZmz3LnY; Tue, 1 Aug 2023 21:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZRx8g5eES0jN+pKh0tuHlb4tkw8PfiqkSRWE/C+CGo=; b=I1WbqIZ9QzrbKY/ZwLCVmLHBgJaUX1uPX4fsOP/9jNh9uTLnQwFRl2N+5ebQScGQQEYMkM waOCDwgGc43/wdO8SNGhJdgCNPRAtKZaF//lThC1O2N3iylNSIvffV5sLdsHHvbq891l8s AB1GGgepC0lvYTrLRTqI2sPLEHFlYTVBFhPgC0miq5nYhq6s2GJOFPe69nz80L0Aj+nqzt Qex68VJG0HC2ThOAW2f/LQ/IneqPV+2YO6rO39cgQye+PsADaXhtSeMoS5zEQItFiQxTPg KbCozAXwE0QtMHb9VBsg/QGTZbqDr+pehG0ssYKcsR1BJjOPgoXhTlIFZw3oLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924013; a=rsa-sha256; cv=none; b=CQIAIeVigklHEFQKIticI94LOYAuQRMrDTEat2dBsHtIafK6lLbMHOf+omHXKhGcs2BwXY 4iwHietWOeIE6W9IY2ORP8Yy8v7otKyb56xGi4T2Ziv+KXKZaTckvQpEaPPRMy1vKJeTN4 DfMIcPzfJPDKi0LTp/gO8CPofKIj2M4pJ0NxE+/6TCE6+Hvs2eFrku1jVe/+6TFbQJFw2h g/oKu7a+ywF0K5zzBw2ltR6csvdIdtVjU0X9r0z+LF4BSB5HPaYSxcIx7RKeZ/uUg3s/we LPaycf2ubmynsIHLRWPX5NdWIORtmDyA5cL4Nqvqv+N2JrL5ZXkQlKZlzNhgyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZRx8g5eES0jN+pKh0tuHlb4tkw8PfiqkSRWE/C+CGo=; b=mj3KiZUOH+kI9B2NcZwyjGrrSCGkAYQg5UBRwqjb2bAxiVd01JtvHR+RBCNhkGAo0PHPvH sJ6Mwz/fS2fgieCJHTAxPedM5A9BX4kNroXD8CgzJcOQ8zbDIx7MIrxg8v3flNvkrLifrb 94B1tbDcDPpPbjiXdQMABrM3/sEFbd6vt7KDLJCMlJGjA3ZCNIvdI1YUzrTOYyfyN+Nydb 3LwRmos9SIfGBmeegjsR7RH+C8TFx1ivTH4FvPrNdAP7/ECX1GtXX2fcVobFAVf13o+1oX weG5LL8lC9x8pNU0tJQod1+IESSThVDMVShoZCw4mPrmELqKAbPMwQFObRwSJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjS3SGNzssh; Tue, 1 Aug 2023 21:06: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 371L6q8D013927; Tue, 1 Aug 2023 21:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6qdl013926; Tue, 1 Aug 2023 21:06:52 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:52 GMT Message-Id: <202308012106.371L6qdl013926@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: 211021cac4c1 - stable/13 - getlocalbase.3: Fix AUTHORS formatting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 211021cac4c19aae1b19914c93be52d816254cf6 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=211021cac4c19aae1b19914c93be52d816254cf6 commit 211021cac4c19aae1b19914c93be52d816254cf6 Author: Jessica Clarke AuthorDate: 2023-07-11 17:50:32 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 getlocalbase.3: Fix AUTHORS formatting MFC after: 1 week (cherry picked from commit bfc47586acee94ade461f2210c700abca93647af) --- lib/libutil/getlocalbase.3 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libutil/getlocalbase.3 b/lib/libutil/getlocalbase.3 index 504b39b0235b..e7be3f1809ef 100644 --- a/lib/libutil/getlocalbase.3 +++ b/lib/libutil/getlocalbase.3 @@ -115,6 +115,9 @@ The library function first appeared in .Fx 13.0 . .Sh AUTHORS +.An -nosplit This manual page was written by -.An Scott Long Aq Mt scottl@FreeBSD.org and Stefan Eßer Aq Mt se@FreeBSD.org . +.An Scott Long Aq Mt scottl@FreeBSD.org +and +.An Stefan Eßer Aq Mt se@FreeBSD.org . From nobody Tue Aug 1 21:06: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 4RFnjR3XXXz4prMb; Tue, 1 Aug 2023 21:06: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 4RFnjF6G73z3Lwv; Tue, 1 Aug 2023 21:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGRhHKYDhaCjMZ5k0XwbCByr3fYPhheANOYcq+i/kf4=; b=cepKhTk7GouMnfwfMj2H0hmQsU0ZluY+e9f9qYEgZqRtNYO8PeaYpjiXsJ/zDb9/W8Sgwk zBRFTj5uUhrou7CRj177ncsAU6JTz8obfFJd3lnzANvPQYDHody8e2CCF9R66pNbm5qTDD st8mpUZkdI9rIFQzQKpC/WSq1NU9hYbqe85MmLiERx/aSQO9EJ2h3i1gRquCxTFj/4ZFwt ARfl7l49kKfFrOGKFbYLi3aLBwQ5CapeZFb9bf5vp3FvSHUezMMoT3C4okypQUos5DDwTb S8l49cnxQZ1NacfW7zyvUaxxbym+8eZgKSn0vwlC7ranAJ4GXY4PacEpAAUJNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924002; a=rsa-sha256; cv=none; b=m0Cvs65nyYr+ylO29/iEtvqsuNWNiuHnFBrogC7iO9mDZ/XjnImRMPgiz9+6D+A2NcGIDK 5cI+Ob3hGUeABfZsBeFnh/uNQp5E4SIT4z2SYsy44DAvhIU1nXghbr7IpWNhrSy7IGTUc1 MxlJWl0cy9kGpqEls+5YnFNQmbwgWkBpFwBObNTGhdIDHw91USYchyL8lB5iIBzQbYB6CG jpiW8RXioTeB/h9ECO53Hpzpm4NngJixzswYaba57UXgVr5iFvaW+2p0N3mweZjd5n6cMw k8y9Dujv9eadTuEtVgjtCfhwxFkyY37DNA487Au3hM2pCqH3zhZJb5LmMWlRcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGRhHKYDhaCjMZ5k0XwbCByr3fYPhheANOYcq+i/kf4=; b=cqb0RbsQUuAmyIyuoAhuqjf9Wq1X/pRUX2D2RZRRvZdbH0WiWCmyf7wFQLmKhYPrHiw1Hl 6RERMR7kEcsXfw6Xtpxip2cLDRDOUgNgMXOZW9Cg8x81fzHH/HmMIjcXA8FaAlGU3KdPEP xCzw9LVbF0931FqCOJM+V7OQoEQA1CXRip7gsuNF868OhVWk5v05XFkhf++5K/UG+8Tv/L djruGxqq1v6M6GUP2V8eEkfwdf+oi+aPlgJ1eUY8FIwkbU79pmXXEaGps4x2fEnQ/vKABk ofShZsESIQ9f84qBBb8g5Uck1sUGlmlAviTysGx6pR4rLQ77ojKgdhPDzrYYmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjF3Fm1zsjq; Tue, 1 Aug 2023 21:06: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 371L6fDr013718; Tue, 1 Aug 2023 21:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6fMv013717; Tue, 1 Aug 2023 21:06:41 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:41 GMT Message-Id: <202308012106.371L6fMv013717@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: 5f4efa6c9a0e - stable/13 - certctl: Introduce a new -d option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5f4efa6c9a0e02bcc50a5cbff52868ceb5958fe7 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4efa6c9a0e02bcc50a5cbff52868ceb5958fe7 commit 5f4efa6c9a0e02bcc50a5cbff52868ceb5958fe7 Author: Jessica Clarke AuthorDate: 2022-07-14 00:23:42 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:50 +0000 certctl: Introduce a new -d option This will be used by Makefile.inc1 to fix -DNO_ROOT distributeworld, which needs to split out DESTDIR from DISTBASE so the METALOG file includes the base/ prefix. Reviewed by: kevans Obtained from: CheriBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35808 (cherry picked from commit 232cf6be4bc493412f1c8b80a4cdc00fe53075c6) --- usr.sbin/certctl/certctl.8 | 19 ++++++++++++------- usr.sbin/certctl/certctl.sh | 14 ++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 4387745462f9..6eff3b910bbe 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 7, 2021 +.Dd July 13, 2022 .Dt CERTCTL 8 .Os .Sh NAME @@ -60,6 +60,8 @@ Flags: .Bl -tag -width 4n .It Fl D Ar destdir Specify the DESTDIR (overriding values from the environment). +.It Fl d Ar distbase +Specify the DISTBASE (overriding values from the environment). .It Fl M Ar metalog Specify the path of the METALOG file (default: $DESTDIR/METALOG). .It Fl n @@ -96,24 +98,27 @@ Remove the specified file from the blacklist. .Bl -tag -width BLACKLISTDESTDIR .It Ev DESTDIR Alternate destination directory to operate on. +.It Ev DISTBASE +Additional path component to include when operating on certificate directories. .It Ev TRUSTPATH List of paths to search for trusted certificates. Default: -.Pa /usr/share/certs/trusted -.Pa /usr/local/share/certs /usr/local/etc/ssl/certs +.Pa /usr/share/certs/trusted +.Pa /usr/local/share/certs +.Pa /usr/local/etc/ssl/certs .It Ev BLACKLISTPATH List of paths to search for blacklisted certificates. Default: -.Pa /usr/share/certs/blacklisted -.Pa /usr/local/etc/ssl/blacklisted +.Pa /usr/share/certs/blacklisted +.Pa /usr/local/etc/ssl/blacklisted .It Ev CERTDESTDIR Destination directory for symbolic links to trusted certificates. Default: -.Pa /etc/ssl/certs +.Pa /etc/ssl/certs .It Ev BLACKLISTDESTDIR Destination directory for symbolic links to blacklisted certificates. Default: -.Pa /etc/ssl/blacklisted +.Pa /etc/ssl/blacklisted .It Ev EXTENSIONS List of file extensions to read as certificate files. Default: *.pem *.crt *.cer *.crl *.0 diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index fb966df95c55..1324ca00d6f3 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -30,6 +30,7 @@ ############################################################ CONFIGURATION : ${DESTDIR:=} +: ${DISTBASE:=} : ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$"} : ${VERBOSE:=0} @@ -254,7 +255,7 @@ usage() echo " List trusted certificates" echo " $SCRIPTNAME [-v] blacklisted" echo " List blacklisted certificates" - echo " $SCRIPTNAME [-nUv] [-D ] [-M ] rehash" + echo " $SCRIPTNAME [-nUv] [-D ] [-d ] [-M ] rehash" echo " Generate hash links for all certificates" echo " $SCRIPTNAME [-nv] blacklist " echo " Add to the list of blacklisted certificates" @@ -265,9 +266,10 @@ usage() ############################################################ MAIN -while getopts D:M:nUv flag; do +while getopts D:d:M:nUv flag; do case "$flag" in D) DESTDIR=${OPTARG} ;; + d) DISTBASE=${OPTARG} ;; M) METALOG=${OPTARG} ;; n) NOOP=1 ;; U) UNPRIV=1 ;; @@ -280,10 +282,10 @@ shift $(( $OPTIND - 1 )) INSTALLFLAGS= [ $UNPRIV -eq 1 ] && INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}" : ${LOCALBASE:=$(sysctl -n user.localbase)} -: ${TRUSTPATH:=${DESTDIR}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs} -: ${BLACKLISTPATH:=${DESTDIR}/usr/share/certs/blacklisted:${DESTDIR}${LOCALBASE}/etc/ssl/blacklisted} -: ${CERTDESTDIR:=${DESTDIR}/etc/ssl/certs} -: ${BLACKLISTDESTDIR:=${DESTDIR}/etc/ssl/blacklisted} +: ${TRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs} +: ${BLACKLISTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/blacklisted:${DESTDIR}${LOCALBASE}/etc/ssl/blacklisted} +: ${CERTDESTDIR:=${DESTDIR}${DISTBASE}/etc/ssl/certs} +: ${BLACKLISTDESTDIR:=${DESTDIR}${DISTBASE}/etc/ssl/blacklisted} [ $# -gt 0 ] || usage case "$1" in From nobody Tue Aug 1 21:06: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 4RFnjS6z98z4prf4; Tue, 1 Aug 2023 21:06: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 4RFnjN0cB7z3Lx3; Tue, 1 Aug 2023 21:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOJk5x5z6uxNKkoMg9p3nBCH3/qzxW1DczShp+ldcro=; b=aUfWtthdI1eRm2xI8tb1UYadFseQYI7glQosNQqAF3hAs4Cls30DH0UU7Gt6KbXdOdczdi 2tNk59zPx2KPais8nVwWwj/nzKVf5cesJcVtYGYbLCBVsWpMxOpWwHagHKO44TC+mbhCIg MaYsdXF4wmRtYG+LZlfbw32vS7idanq3hYBn/nOEZXK8cPMUWjlZLOgYviyt3TM7LT42R+ of/GzHI+828kxEFa6ctKYi/sNKY7/VI3Enz2AaPQfAPOnfrVfj62feHCJZk6Ny637u2h0o nMmvfdi6ZL02BDtLcP+Q+h7YUla1nTTJhycXLUGQu9mxX6doyO7yNpS5poXaFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924008; a=rsa-sha256; cv=none; b=StOgNBDNlxhJ1x3UNIIItsmJhHAVD36JH1Xw2d437AUzzv4s3Ydpg+jQJNi03VF0cs6aEN 6GbzTbYvP9M8+Kl4Uqg1Q5dsLX9uuu6rYdjV6qKALWCknbkS9U97T4RisNEd9w4f0/Ht6I HInaJkCKFEL/G6G9KqwnW39j8tqM+AcjPOHpKLAqJO0S9ITNA8O4plEtMwbTBfslgE3ny9 8D+y7nt8S29HxprNLO+YKQ9VIicgQg2KYQxSNKfMf32IwOu/pSVioKL/kWTo0lMhAbCWvI jmL4jqiYK60vrflJmTNVBibsngXFoZU4jZuJDN8A0LNVDQCzZOk8XqaHJmPWjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOJk5x5z6uxNKkoMg9p3nBCH3/qzxW1DczShp+ldcro=; b=Gf0cYGwF9KjQa1ZjDcnA4Xy1bEwExTREkj+HVAz8KHmXnRpsMkKUqeekaeiJrQpu7HRkYh j96r0gwxzaueW7wZ5pMbzDZ6KaDBweObOc5XlukTfgBuhVfHLvM707f5qWrFx2HUPqDqbC U3tlVxk0dOICuG23LDxRlb+dNlLdTMAlEAhMnfxIQcNt6N4eyUK7QFMQU5SVE6BHC5enKq sk3g5acAB20IpYwdI64n/G/VrKRl2DE0YF1vbbBXsFfRvVXPqmildNBSX+dbc/cTEF7YW6 ofI3AdxogukW7iNxA9R7jh9eYrZOomaYxqvBPwC3O8IOd1KWcGHF5sbVbqjWkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjM6bNpzsgn; Tue, 1 Aug 2023 21:06: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 371L6ltp013848; Tue, 1 Aug 2023 21:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6lfX013847; Tue, 1 Aug 2023 21:06:47 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:47 GMT Message-Id: <202308012106.371L6lfX013847@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: e7f1ba7f6726 - stable/13 - Makefile.inc1: Support building with macOS Ventura's AMFI Launch Constraints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e7f1ba7f6726049b264a4b1f7b838ab85a4cc265 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f1ba7f6726049b264a4b1f7b838ab85a4cc265 commit e7f1ba7f6726049b264a4b1f7b838ab85a4cc265 Author: Jessica Clarke AuthorDate: 2023-03-03 02:15:30 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 Makefile.inc1: Support building with macOS Ventura's AMFI Launch Constraints As of macOS Ventura, Apple-signed binaries cannot be run if copied away from their system location. This security feature doesn't really make sense for boring things like sh(1), more so for applications with special entitlements, but it's universally present, and results in the following error: >>> Install check world bmake[2]: "/Users/Jess/cheri/freebsd/Makefile.inc1" line 572: warning: "MAKEFLAGS= CPUTYPE=dummy /Users/Jess/cheri/build/freebsd-riscv64-build/bmake-install/bin/bmake -f /dev/null -m /Users/Jess/cheri/freebsd/share/mk MK_AUTO_OBJ=no -V CPUTYPE" exited on a signal bmake[2]: "/Users/Jess/cheri/freebsd/Makefile.inc1" line 575: CPUTYPE global should be set with ?=. As with host-symlinks, we don't actually need to copy the files on macOS, since we're not updating the current machine, so copy its approach and just symlink them instead. MFC after: 1 week (cherry picked from commit dda4d97289f17aa8b2bbfd8d63a746b3a7836fd5) --- Makefile.inc1 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3f858b182238..118eb2115223 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -640,6 +640,18 @@ MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp MKTEMP=mktemp .endif INSTALLTMP!= ${MKTEMP} -d -u -t install + +.if ${.MAKE.OS} == "FreeBSD" +# When building on FreeBSD we always copy the host tools instead of linking +# into INSTALLTMP to avoid issues with incompatible libraries (see r364030). +# Note: we could create links if we don't intend to update the current machine. +INSTALLTMP_COPY_HOST_TOOL=cp +.else +# However, this is not necessary on Linux/macOS. Additionally, copying the host +# tools to another directory with cp results in AMFI Launch Constraint +# Violations on macOS Ventura as part of its System Integrity Protection. +INSTALLTMP_COPY_HOST_TOOL=ln -s +.endif .endif .if make(stagekernel) || make(distributekernel) @@ -1394,7 +1406,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY fi; \ done); \ fi; \ - cp $$libs $$progs ${INSTALLTMP} + ${INSTALLTMP_COPY_HOST_TOOL} $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale .if defined(NO_ROOT) -mkdir -p ${METALOG:H} From nobody Tue Aug 1 21:06: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 4RFnjb0L8Cz4prZD; Tue, 1 Aug 2023 21:06: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 4RFnjT5m6Kz3Lnd; Tue, 1 Aug 2023 21:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbeeIFkn7LCva5Ckb5gru6QuCCcd3XowrYCXK9KIvr0=; b=QlzWXWsAdjurbuVwN2/4y26R8zwnTL0zhAshf4tJ8xpM1L9D52vYnoea+bytT7w31FfSr8 r6l+8YeFl3/IbAssx30f6T/pq3m4HGOV7Unv4Y+Ke7GxgJydsNcffBeCKTUHOhOy6oiELX HujKPZFPa1wd2T6jBtpFF5pY6EYJ9wE4gE9QaBXMOPcF+gXl9mZtSeURfzVjuVyJL5H+OP 5zPpHTnc8IONUxzaxnEKF8OrrXsP9ZrZO3ORa2W/dUoB8EMbEnpwcTgyAFzhBWFGOwEDor AEav5pA1O3WK5YuDzd098XKNmsvf4qtIt1qVpZFXgYLQc+ReAYg/7ssn70Agnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924013; a=rsa-sha256; cv=none; b=J5yQkLQEKtUZdHHbx5mXK/AZ7tbDiwMRbzZzT16MU/mYdUZFNLH+w1Mk5KWYqvOdSShsRh Kls5I5aruWzrlWPRLhl1wJGbZa+sO5NiczKvIWOPNJJ9cVDUMexBn0SziItz7rEYhLL+3Z Y1zhjoAVSVOA8/GlVwrwwUmtFjYKkUjdg65h/pt755Di5MWddXZgUmIuBGx6bBxRe/6ZmU 1o9dJtby5v9M+W7tsdPOWpNfNatPe5vB0as44GY2wqfy4DnRvHl3yGBZtAo+p5oh3jp6iZ MPuWHOFsoJIlAX/FfsUrBsBUtfxnBx2+l4n8V7+bC0YrmGfn4+0FUomBWt1/kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbeeIFkn7LCva5Ckb5gru6QuCCcd3XowrYCXK9KIvr0=; b=rMfJqOaq8vKRiaDrXdonEI/h+iU+Szm9Zyq5xHtH50Di6tzZVjLC/B9xJXQ3b58BoBa+n0 nVJmQqT++2jVE1gEjfxuvgUwHhxKzxya7uxknrf+O9Fl/odQzKw5eQ0Wrda5X7XcYU2DDs bnp1DnRfNfkHPFdFQyC2jCj+pbYyzvV0dOH6oelVaNUXnLiGL+kF66G8H8UB5spucx9SOh oo5ISsyAmcGnu1MXEgiINW1Y7GGkdyT+jZf5W9NynszdOFUHK0vcj/hBCzPHCam5dsIFHl IM4L2tLrjMezOKCwi6G49KecLQYlp42HTcNbBE71iGTx/Oc/bxqOGcZMRSaHow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjT4Qt1zsgq; Tue, 1 Aug 2023 21:06: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 371L6rNp013948; Tue, 1 Aug 2023 21:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6rka013946; Tue, 1 Aug 2023 21:06:53 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:53 GMT Message-Id: <202308012106.371L6rka013946@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: a93799b55d2d - stable/13 - kmod.mk: Use portable printf '%s' over non-portable echo -n List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a93799b55d2d2feb552c4b2af9318bacb13d8104 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a93799b55d2d2feb552c4b2af9318bacb13d8104 commit a93799b55d2d2feb552c4b2af9318bacb13d8104 Author: Jessica Clarke AuthorDate: 2023-07-11 20:30:06 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 kmod.mk: Use portable printf '%s' over non-portable echo -n Whilst /bin/echo on macOS and Linux implement -n, as do the builtin echos in bash and zsh, the builtin echo in dash does not, causing the first line of the output to be -n foo rather than just foo, and there to be an extra newline in the output and thus blank line, both of which result in "Symbol ... is not present in *.kld" warnings appearing in the build output (once for -n foo and once for the empty string for each module where EXPORT_SYMS is a list of symbols). MFC after: 1 week (cherry picked from commit d1e44bc94494448de196948d698b637b6e1df4bf) --- sys/conf/kmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 4a0d828f0159..777bd91a313b 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -275,7 +275,7 @@ ${FULLPROG}: ${OBJS} .if ${EXPORT_SYMS} == NO :> export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) - echo -n "${EXPORT_SYMS:@s@$s${.newline}@}" > export_syms + printf '%s' "${EXPORT_SYMS:@s@$s${.newline}@}" > export_syms .else grep -v '^#' < ${EXPORT_SYMS} > export_syms .endif From nobody Tue Aug 1 21:06: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 4RFnjR2wBwz4prWV; Tue, 1 Aug 2023 21:06: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 4RFnjH5d4Mz3LnH; Tue, 1 Aug 2023 21:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbY+HtYWSvkmNc56VgW154RZZzp0WeCI6rj0ll1nPC8=; b=LyGrl/hRhnY47R8bQMYEN29QQ5sex2qHuqhHQsCugWzBczjAq3K+DD/t4NaLp/w9mXJ8kS 3EEMuNeg/hk3GeawqyU4NTO/xTQ0y3YUclSYHZJJNYPtH97dFawYmdgmxomARkDYlKIAjX KVfj6NNONtKARoIqTqZxTd5tUjcT7CLQ5JL6fekfwkxDi4tCx6QTfMnbV2hAtkqmV+mVjr O/T02kLP+Lf+9bcTeTL5gh5gVLTiw1Zv9pvy/X36mBXYaTd9dHFhetqmdvNvwUA/suEzDu O2e7h2hrg2jRPZKU5kPP6qXXnkNU9AXmwg1FWMt0u4ClFLiSOHO7NHF+Eil1ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924003; a=rsa-sha256; cv=none; b=ZCtwEJthqNfBdt6kwZ3mux+8vPhGi2/uzeUbHCJwuZM/UIIXDX6S1tIwiUUZqMf9Zf9siB 9x7PDiXr9VuRgb5v1t5ceqBPH3W2G2BDlICPQ7jEQq+sJTlxnJnIIAAjM8WLqZe5s2kof8 cGnHtJA0aY2QmgnIsJJA3al9jq5aAQpGfv+L9VGshwsT2FzKRdHeC1FSX/M48jGVYCgt0Q M994l2duxPtQYH0y9XZ8s30xJmARiNlfVAQqBJmUIwbVJS6qw07OJskhyQOdLyRJ8/bgMu x1yY5zqzDX30XgXMI/k7PJXtARLpIS0hKcRvvcurtGeiVmZtxmVfzsfI3gSq/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=1690924003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbY+HtYWSvkmNc56VgW154RZZzp0WeCI6rj0ll1nPC8=; b=jT6Xv5xdC9hUpZfn+xRPkdsoe4DtDV6s4ZlMFzWxE+IbCqkD82vA/6pf4uka5T7Aekg8RB kvnm2Am1EYga0XvnZu+Z4AXKwAVClu4nq4nQft19a0DTr2XGsQiqYTHGkun1nLdENpL32u pUyqQp0l8wFNVSULFzrp15LyI+2AIoIH87tPWQBNPRFL8KT8um95p5bM8Hyx67DLGpkaaP dqH1unfynEuOaakpsGOqs37/UR/tEaquInbcsnQ6XzK6xbs7BiAuIQvPG/tFltKBQmFHPC pXt6Gy1Rc5+kht7EEpRX/CDYddwNgI7d56Av7crvGV9JFU1LrEkve7GmFG5lTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjG23jLzsRQ; Tue, 1 Aug 2023 21:06: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 371L6g1o013741; Tue, 1 Aug 2023 21:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6g2X013740; Tue, 1 Aug 2023 21:06:42 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:42 GMT Message-Id: <202308012106.371L6g2X013740@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: f20cf1e5dcbb - stable/13 - Makefile.inc1: Fix -DNO_ROOT distributeworld certctl usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f20cf1e5dcbbc458846376451baae282f29b0c41 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f20cf1e5dcbbc458846376451baae282f29b0c41 commit f20cf1e5dcbbc458846376451baae282f29b0c41 Author: Jessica Clarke AuthorDate: 2022-07-14 00:25:50 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:52 +0000 Makefile.inc1: Fix -DNO_ROOT distributeworld certctl usage Currently for distributeworld we pass DESTDIR to certctl.sh as an environment variable, which sets the default value in the script. However, for -DNO_ROOT builds, CERTCTLFLAGS has METALOG_INSTALLFLAGS which includes -D ${DESTDIR}, overriding the custom DESTDIR pointing at the base dist directory. Moreover, in order to ensure that the METALOG includes the base/ prefix for all the files, we need to have certctl call install with -D set to DESTDIR/DISTDIR without the /base suffix but also ensure the files get installed to DESTDIR/DISTDIR/base. Fix these by passing the custom DESTDIR to certctl via -D rather than in the environment and to pass the /base suffix in the distributeworld case via the newly-added -d option. We also need to run certctl rehash before we generate the .meta files from the METALOG, not after, otherwise they won't include the METALOG additions, so move the certctl rehash call. Finally, add a missing semicolon that results in no message being printed in the missing openssl case. By not including the semicolon, else echo "..." is treated as extra arguments to certctl, which is lax in its argument parsing and ignores additional arguments, and the semicolon and fi after the intended echo terminate the if statement as normal so there's no syntax error at the shell level. This is harmless as we weren't trying to do anything other than echo anyway, all that happens is the echo doesn't actually get run. Reported by: markj (missing semicolon) Reviewed by: brooks, kevans Obtained from: CheriBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35809 (cherry picked from commit 7e45839aca7157a73b0309e8cf4cb811d2cb5512) --- Makefile.inc1 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1328b7177a71..3f858b182238 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -956,10 +956,12 @@ IMAKE_INSTALL= INSTALL="${INSTALL_CMD} ${INSTALLFLAGS}" IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif .if make(distributeworld) -CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR}/base +CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR} +CERTCTLFLAGS+= -d /base .else CERTCTLDESTDIR= ${DESTDIR} .endif +CERTCTLFLAGS+= -D "${CERTCTLDESTDIR}" DESTDIR_MTREEFLAGS= -deU # When creating worldtmp we don't need to set the directories as owned by root @@ -1450,6 +1452,14 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endif # make(distributeworld) ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} +.if !make(packageworld) && ${MK_CAROOT} != "no" + @if which openssl>/dev/null; then \ + PATH=${TMPPATH}:${PATH} \ + sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \ + else \ + echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ + fi +.endif .if make(distributeworld) .for dist in ${EXTRA_DISTRIBUTIONS} find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete @@ -1477,14 +1487,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endfor .endif .endif # make(distributeworld) -.if !make(packageworld) && ${MK_CAROOT} != "no" - @if which openssl>/dev/null; then \ - DESTDIR=${CERTCTLDESTDIR} PATH=${TMPPATH}:${PATH} \ - sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash \ - else \ - echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ - fi -.endif packageworld: .PHONY .for dist in base ${EXTRA_DISTRIBUTIONS} From nobody Tue Aug 1 21:06: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 4RFnjT0csrz4prWX; Tue, 1 Aug 2023 21:06: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 4RFnjL6yHxz3Lfr; Tue, 1 Aug 2023 21:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWajJ8F4kPaE4YU4QJYpzYTK/Vf6DabJdHwHaJzO5eU=; b=v15LiyDRQ64jQTdPm1QFaRnOuQtF6L56gteE+Dsrvk0vQWdBzF9kUD/foesEc0WitCe7NH 4xmT7NhXcia3R5zNxk/XrvFyFkxcaLzcFfrpBTkEB0NLzVFkY7VC31FiqVDIy2mOGm0qEn gbiJ2OS8BRxTpIt1CQGD8sL6PpZ6V5rGckZkxdIgsPKf5IT9bVKxgNkO1a+6VVSP9mHRKx UF2zBXlRlJB+TV1aLdkFewaTTeOtdBGpW+Y1vTPi4VPyZDqo4j1brwLxmSWtJirydECAnX +tXdDmGVa06p/n9/hSCOmCsqpjsefruRQC2iotSIf2eG2WCJav6Gc1lgYU1how== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924007; a=rsa-sha256; cv=none; b=ZhzoDONv08MKxIq7Y6SZ/eId3AT1SRim1Wof4Zo5DRT0u7aBOagdSerz2lnTmjJptO8N8e rwM6crNNvfINuBLTmIvu+zlRxxlEj2FFcKr0HY4Mv6eZoPKgzRAy5LEy0SuEwRgghWGPK+ KS1wKXrVz8kusOGQODFY6SxsxLJQwPUwrPyOT0aFVBufsCDCf3+38v+ppaZkHgM060hASf 4ptMPr4viUq3KaE96TgwItHNxdTfRermWv0PESiM5k6iuDYQBPaFSXdLWYlgWvUZDdMubS 04N5RjgQyJL7k3JAqdhGX88qTS2mgGFoV8ridbcxXBTdsQF9wsCcPANxHVLj8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWajJ8F4kPaE4YU4QJYpzYTK/Vf6DabJdHwHaJzO5eU=; b=o1Z5s7ZLxxfU0vGBPg/dCTXeSP6cQFfRjWeys+1SnCH4Hm5WjfZDzaAYHl5rEZanaSqrvC 7MNEE/2ZR1k8HH95LzuD/CERt/eDBa8QxRcBBExqi7eivoHaubP7WSkNhywMxIn+ezWvp1 x6/j8fttwyi9LZfdF98M+f4Z+MocEial/sOtoQprhg34Alnv/I8L9WCOEwtG/JefOfPBvd VmEXiRQE/Y24geRY90lfDq8fpvJEdZ79zsP61eeN+fm9otS8oLmqKOsUNvhm55OUi1fE4K HxIRiRlqRKCDFF6FEJg+77LCYBOAFAwIKTl2aOIKvKL3lNSs46/Y1ghZoVcJuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjL5Xbczssf; Tue, 1 Aug 2023 21:06: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 371L6kIT013826; Tue, 1 Aug 2023 21:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6kEW013825; Tue, 1 Aug 2023 21:06:46 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:46 GMT Message-Id: <202308012106.371L6kEW013825@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: 2bf3e27a5785 - stable/13 - riscv: Add da9063_pmic and da9063_rtc to GENERIC and NOTES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2bf3e27a578513d37a9e1274759e2e7af9a7102a Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2bf3e27a578513d37a9e1274759e2e7af9a7102a commit 2bf3e27a578513d37a9e1274759e2e7af9a7102a Author: Jessica Clarke AuthorDate: 2022-09-13 16:46:28 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 riscv: Add da9063_pmic and da9063_rtc to GENERIC and NOTES This is the PMIC on SiFive's HiFive Unmatched; add it and the RTC child device driver so we have a working RTC. Reviewed by: mhorne, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36201 (cherry picked from commit 100f79569dbcee9a7c66f8fe543fa04e8bfb04bd) --- sys/riscv/conf/GENERIC | 4 ++++ sys/riscv/conf/NOTES | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 9c97e40f1db2..5d58db775507 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -142,6 +142,7 @@ device vt device kbdmux # RTC +device da9063_rtc # Dialog Semiconductor DA9063 RTC device goldfish_rtc # QEMU RTC # Ethernet drivers @@ -160,6 +161,9 @@ device gpio device spibus device spigen +# Power management controllers +device da9063_pmic # Dialog Semiconductor DA9063 PMIC + # Uncomment for memory disk # options MD_ROOT # options MD_ROOT_SIZE=32768 # 32MB ram disk diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES index 01ae4c672ec6..b42df93c7493 100644 --- a/sys/riscv/conf/NOTES +++ b/sys/riscv/conf/NOTES @@ -58,6 +58,7 @@ device uart_lowrisc # lowRISC UART driver device uart_ns8250 # ns8250-type UART driver # RTC +device da9063_rtc # Dialog Semiconductor DA9063 RTC device goldfish_rtc # QEMU RTC # Ethernet drivers @@ -70,6 +71,9 @@ device axidma # Xilinx AXI DMA Controller # SPI device xilinx_spi # Xilinx AXI Quad-SPI Controller +# Power management controllers +device da9063_pmic # Dialog Semiconductor DA9063 PMIC + # SiFive device drivers device fe310aon device fu740_pci_dw From nobody Tue Aug 1 21:06: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 4RFnjb0rBxz4prQH; Tue, 1 Aug 2023 21:06: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 4RFnjX0J0Yz3LlM; Tue, 1 Aug 2023 21:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bqpdw8vLR+e4UmX67jV67Vk6tWHx9f9dvJm8PXGh6DA=; b=pH5QVLVZ4AWiLfPrbECwyL2yoqVC8edHmpDStw9/24KekfSGSXgCCRy3JXUEi5ueC5juO5 1Sg/9QXxwuXI7Ak82mk/KwIyl6VuJT5ct6Kfd2VnkTrVYk7egK4SJrSRp+I5R8sBp3GyM0 3I+VDyD3K0jKm1KPR47eTfjHrnNtWKMonl8e5mQadv9MzMoeDLTD7YX/v9jLIBOxR51KfW NRCIEQfWfOq23OPS8uUH7Yw6gUru/w0nrANFueODb5fi6oett27rUCzMirxZgPKJoU8YVS M7v/Wk6VttegU/G94K85Tf9OL0Tucu8zPZMLbVNaBVWtUb+Zhx2e1P5m+V81sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924016; a=rsa-sha256; cv=none; b=weiAE0nw53EawFXIGbdhIv288x68huhk8kOnDBvyqkcqdpopTXEpLt6WjwLY6TtASZiVEV 6t7DguktVS5913S0DBzbT24s5GCVGE46tfYzHLH8Smj5LXMzs4VVrh1R6xfG/VOWjLYrNE ZM31XsHEowpxlKUqmbulsBpyRbrHPj7TD5QOYk0nTwgvWivdE+c8dUSDRrGikMWd0Al+6R p7I1vG1y4Z/dXz8Pnvh7Cv/Sl5yQMaMYwQEYlcA83dnjQl9kWaPH1jnmj9dZ8cgIvb6jf8 ErfYHj2hVC+jLCgTSgkIj7fnjWVhfkvIXvQcEIueYZCtoWpYoxM57hd43nGsFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bqpdw8vLR+e4UmX67jV67Vk6tWHx9f9dvJm8PXGh6DA=; b=vS31ssmYm350pys8elDEyJjEZWdoUUbsY5DQw4vK70gcFL9WIuzHuceMeDbe/l878jBPkW Lz+cEcIX8bF4CIwt9x+pkYrsakj4GYxFgcywnA4E6iL3s5yZiCczUpVBkf2mV2LN00rvxJ S8avDEOq3f2tHVraIpk1fZPUbFPYliL1/Zluu+nRqcnTZGU5pXBJqNMm6o/zuRfbKbJ6Vd IGMdsN1FWZGqblozxjlAB1LRYQvZWiufJzrlBQd+eLUOxzpDxuDyU891ng+w/MifM0TpBC 1ophKM44r7ORRg5SiNQLFFk5ClD24MbW8IO1P7JB7o2KugF0T/fo6e7sq5AygA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjW6FWZzsq6; Tue, 1 Aug 2023 21:06: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 371L6tXr013989; Tue, 1 Aug 2023 21:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6tRt013988; Tue, 1 Aug 2023 21:06:55 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:55 GMT Message-Id: <202308012106.371L6tRt013988@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: 2c6eebc109a0 - stable/13 - bsd.linker.mk: Use :C not :S for regex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2c6eebc109a061803c883596a3b1da8fc4c0c866 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6eebc109a061803c883596a3b1da8fc4c0c866 commit 2c6eebc109a061803c883596a3b1da8fc4c0c866 Author: Jessica Clarke AuthorDate: 2023-07-24 00:50:55 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 bsd.linker.mk: Use :C not :S for regex Whilst ^ and $ are supported with C, those are special cases, and general regex syntax like groups and alternations are not. Use the correct modifier so we get a version number out that's not 0 (which is what happens when it can't be parsed by the later code). Fixes: c4177f5b41d4 ("bsd.linker.mk: Handle Xcode 15 linker identification") MFC after: 1 week (cherry picked from commit 7f9318a022ef0e5104fd429dc2d9ac37b9916353) --- share/mk/bsd.linker.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index bcbdc0c1131d..bbee6f31959d 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -82,7 +82,7 @@ ${X_}LINKER_FREEBSD_VERSION= 0 .elif ${_ld_version:[1]:S/-classic$//} == "@(\#)PROGRAM:ld" # bootstrap linker on MacOS ${X_}LINKER_TYPE= mac -_v= ${_ld_version:[2]:S/PROJECT:(ld64|dyld)-//} +_v= ${_ld_version:[2]:C/PROJECT:(ld64|dyld)-//} # Convert version 409.12 to 409.12.0 so that the echo + awk below works .if empty(_v:M[1-9]*.[0-9]*.[0-9]*) && !empty(_v:M[1-9]*.[0-9]*) _v:=${_v}.0 From nobody Tue Aug 1 21:06: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 4RFnjS1C4Kz4prQ9; Tue, 1 Aug 2023 21:06: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 4RFnjK5fbdz3LX4; Tue, 1 Aug 2023 21:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ABXy2+n/vfisz4mRAvz7aY9Ijy9ppOPdYv/R3S7FGs=; b=MDMeuJW+Pm/+bkXfd968BpTghbKtPd34ZIHHkWHsHJBco6ReB+5IpaYwuooDhhL3G2dZMF EbEV16CBVwfSvDwmfBnM4DvWiuXh9A25yDkwgRNd5nVgCaRh2zTbRSihFnbzEVrShGbrL1 h9P1r1791YNbLGYNmsgJKqvRB7xMUcpKg0rxj1IQju74xoeyo5MtdD9QQt5qAV8WkFw+1S RA9YTRjQ32EH1k63ruqsqkM60mCXJetvFOiGwY3/oThTq8ro5PG4AET/iH0dw57PAlqYBq /e3ha5bYai4gN+DHz3a/ILHZMxRxOVjmarAm1YVlrgvWOkF9ieKeMBdjSs8wYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924005; a=rsa-sha256; cv=none; b=Z7dnWDBcNR1EBlpcMCB1TxUWAg3CjYyQhQUWMPZDb8A3izPvbPtyD9diYz3AwFxAdAQqud eH+bntilAUplQ1Fmv139vLykoq7viA3aZALkf0dFO3PDEPBgo0Ur7k4AHbiXfzLVgN+WwG M4y4t891Qb3GMwGb9lrZ0i9ke0CG9/Au/P9oU5TQ+53nIa1UgwsuYMMlRx/72uvmUcKR2i la+Vjoa16makYtKbAg2LWg4ArKHv6y0cCwTkcFBw3ANkRlokO40Ufnu3VwT2vVTE8Nbv8f WGpC+ixhT3GKP2xHmsLb+Y+gxVf+rZXui1MygxEdQpP0KizXIzBKCoJ6h5cPoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ABXy2+n/vfisz4mRAvz7aY9Ijy9ppOPdYv/R3S7FGs=; b=Jr+tENKyAvJeYUaLYEQMRXpCCEENeNj8mp8YJbtdlootVoDOyEd4UKmLdEKsokPEXA7M2F 0UXz5Xo3L4jzYBhO9PHO5yE+fDHTTM1+689iV3e5ZWIonu3QFZFU6+nxAGhzSJQSOes5w+ B0sgETwn08H5WrPBEiL2kZ7+HkbLi4SX2CDee5+A3/7M+17vFJ+Yc//y4RlqVkvXaueeua NiJYWuZDgM6E6FBg8/JLgRXYKQUsn0+vrOBOBV232NCUVpP3QzPWL8GttY/AULY6FOpXfR JTCjs1JvG4UAEqWzO7hnCWF8M8rYcFfDxismgWe1099IO6fv9a/Hhw92OGwC3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFnjK4bpLzsjr; Tue, 1 Aug 2023 21:06: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 371L6jcD013807; Tue, 1 Aug 2023 21:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6jd0013806; Tue, 1 Aug 2023 21:06:45 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:45 GMT Message-Id: <202308012106.371L6jd0013806@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: c31ecc099dcd - stable/13 - da9063_rtc: Add new driver for the Dialog Semiconductor DA9063 RTC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c31ecc099dcdb2a8bef233efdac8c0b6b70bcfd8 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c31ecc099dcdb2a8bef233efdac8c0b6b70bcfd8 commit c31ecc099dcdb2a8bef233efdac8c0b6b70bcfd8 Author: Jessica Clarke AuthorDate: 2022-09-13 16:46:21 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:52 +0000 da9063_rtc: Add new driver for the Dialog Semiconductor DA9063 RTC This is a simple RTC present in the PMIC, supporting 1s precision. This is the PMIC on SiFive's HiFive Unmatched. Reviewed by: mhorne, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36200 (cherry picked from commit 129028c79c6c287c3c028714e3e7993299357b6c) --- sys/conf/files | 1 + sys/dev/dialog/da9063/da9063_rtc.c | 293 +++++++++++++++++++++++++++++++++++++ 2 files changed, 294 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index dbdb37d22d98..5c94b3928ccf 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1612,6 +1612,7 @@ dev/dcons/dcons_crom.c optional dcons_crom dev/dcons/dcons_os.c optional dcons dev/dialog/da9063/da9063_if.m optional da9063_pmic dev/dialog/da9063/da9063_iic.c optional da9063_pmic iicbus fdt +dev/dialog/da9063/da9063_rtc.c optional da9063_rtc fdt dev/dme/if_dme.c optional dme dev/drm2/drm_agpsupport.c optional drm2 dev/drm2/drm_auth.c optional drm2 diff --git a/sys/dev/dialog/da9063/da9063_rtc.c b/sys/dev/dialog/da9063/da9063_rtc.c new file mode 100644 index 000000000000..1e6272b405db --- /dev/null +++ b/sys/dev/dialog/da9063/da9063_rtc.c @@ -0,0 +1,293 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Jessica Clarke + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* Dialog Semiconductor DA9063 RTC */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "clock_if.h" +#include "da9063_if.h" + +#define DA9063_RTC_BASE_YEAR 2000 + +struct da9063_rtc_softc { + device_t dev; + device_t parent; + struct mtx mtx; +}; + +#define DA9063_RTC_LOCK(sc) mtx_lock(&(sc)->mtx) +#define DA9063_RTC_UNLOCK(sc) mtx_unlock(&(sc)->mtx) +#define DA9063_RTC_ASSERT_LOCKED(sc) mtx_assert(&(sc)->mtx, MA_OWNED); +#define DA9063_RTC_ASSERT_UNLOCKED(sc) mtx_assert(&(sc)->mtx, MA_NOTOWNED); + +static struct ofw_compat_data compat_data[] = { + { "dlg,da9063-rtc", 1 }, + { NULL, 0 } +}; + +static int +da9063_rtc_read_ct(struct da9063_rtc_softc *sc, struct clocktime *ct) +{ + uint8_t sec, min, hour, day, mon, year; + int error; + + DA9063_RTC_ASSERT_LOCKED(sc) + + error = DA9063_READ(sc->parent, DA9063_COUNT_S, &sec); + if (error != 0) + return (error); + if ((sec & DA9063_COUNT_S_RTC_READ) == 0) + return (EAGAIN); + + error = DA9063_READ(sc->parent, DA9063_COUNT_MI, &min); + if (error != 0) + return (error); + + error = DA9063_READ(sc->parent, DA9063_COUNT_H, &hour); + if (error != 0) + return (error); + + error = DA9063_READ(sc->parent, DA9063_COUNT_D, &day); + if (error != 0) + return (error); + + error = DA9063_READ(sc->parent, DA9063_COUNT_MO, &mon); + if (error != 0) + return (error); + + error = DA9063_READ(sc->parent, DA9063_COUNT_Y, &year); + if (error != 0) + return (error); + + ct->nsec = 0; + ct->dow = -1; + ct->sec = sec & DA9063_COUNT_S_COUNT_SEC_MASK; + ct->min = min & DA9063_COUNT_MI_COUNT_MIN_MASK; + ct->hour = hour & DA9063_COUNT_H_COUNT_HOUR_MASK; + ct->day = day & DA9063_COUNT_D_COUNT_DAY_MASK; + ct->mon = mon & DA9063_COUNT_MO_COUNT_MONTH_MASK; + ct->year = (year & DA9063_COUNT_Y_COUNT_YEAR_MASK) + + DA9063_RTC_BASE_YEAR; + + return (0); +} + +static int +da9063_rtc_write_ct(struct da9063_rtc_softc *sc, struct clocktime *ct) +{ + int error; + + DA9063_RTC_ASSERT_LOCKED(sc) + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_S, ct->sec); + if (error != 0) + return (error); + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_MI, ct->min); + if (error != 0) + return (error); + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_H, ct->hour); + if (error != 0) + return (error); + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_D, ct->day); + if (error != 0) + return (error); + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_MO, ct->mon); + if (error != 0) + return (error); + + error = DA9063_WRITE(sc->parent, DA9063_COUNT_Y, + (ct->year - DA9063_RTC_BASE_YEAR) & + DA9063_COUNT_Y_COUNT_YEAR_MASK); + if (error != 0) + return (error); + + return (0); +} + +static int +da9063_rtc_gettime(device_t dev, struct timespec *ts) +{ + struct da9063_rtc_softc *sc; + struct clocktime ct, oldct; + int error; + + sc = device_get_softc(dev); + + DA9063_RTC_LOCK(sc); + + error = da9063_rtc_read_ct(sc, &ct); + if (error != 0) + goto error; + + /* + * Reading seconds only latches the other registers for "approx 0.5s", + * which should almost always be sufficient but is not guaranteed to + * be, so re-read to get a consistent set of values. + */ + do { + oldct = ct; + error = da9063_rtc_read_ct(sc, &ct); + if (error != 0) + goto error; + } while (ct.min != oldct.min || ct.hour != oldct.hour || + ct.day != oldct.day || ct.mon != oldct.mon || + ct.year != oldct.year); + + DA9063_RTC_UNLOCK(sc); + + error = clock_ct_to_ts(&ct, ts); + if (error != 0) + return (error); + + return (0); + +error: + DA9063_RTC_UNLOCK(sc); + return (error); +} + +static int +da9063_rtc_settime(device_t dev, struct timespec *ts) +{ + struct da9063_rtc_softc *sc; + struct clocktime ct; + int error; + + sc = device_get_softc(dev); + + /* + * We request a timespec with no resolution-adjustment. That also + * disables utc adjustment, so apply that ourselves. + */ + ts->tv_sec -= utc_offset(); + clock_ts_to_ct(ts, &ct); + + DA9063_RTC_LOCK(sc); + error = da9063_rtc_write_ct(sc, &ct); + DA9063_RTC_UNLOCK(sc); + + return (error); +} + +static int +da9063_rtc_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "Dialog DA9063 RTC"); + + return (BUS_PROBE_DEFAULT); +} + +static int +da9063_rtc_attach(device_t dev) +{ + struct da9063_rtc_softc *sc; + int error; + + sc = device_get_softc(dev); + + sc->dev = dev; + sc->parent = device_get_parent(dev); + + /* Power on RTC and 32 kHz oscillator */ + error = DA9063_MODIFY(sc->parent, DA9063_CONTROL_E, 0, + DA9063_CONTROL_E_RTC_EN); + if (error != 0) + return (error); + + /* Connect 32 kHz oscillator */ + error = DA9063_MODIFY(sc->parent, DA9063_EN_32K, 0, + DA9063_EN_32K_CRYSTAL); + if (error != 0) + return (error); + + /* Disable alarms */ + error = DA9063_MODIFY(sc->parent, DA9063_ALARM_Y, + DA9063_ALARM_Y_ALARM_ON | DA9063_ALARM_Y_TICK_ON, 0); + if (error != 0) + return (error); + + mtx_init(&sc->mtx, device_get_nameunit(sc->dev), NULL, MTX_DEF); + + /* + * Register as a system realtime clock with 1 second resolution. + */ + clock_register_flags(dev, 1000000, CLOCKF_SETTIME_NO_ADJ); + clock_schedule(dev, 1); + + return (0); +} + +static int +da9063_rtc_detach(device_t dev) +{ + struct da9063_rtc_softc *sc; + + sc = device_get_softc(dev); + + clock_unregister(dev); + mtx_destroy(&sc->mtx); + + return (0); +} + +static device_method_t da9063_rtc_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, da9063_rtc_probe), + DEVMETHOD(device_attach, da9063_rtc_attach), + DEVMETHOD(device_detach, da9063_rtc_detach), + + /* Clock interface */ + DEVMETHOD(clock_gettime, da9063_rtc_gettime), + DEVMETHOD(clock_settime, da9063_rtc_settime), + + DEVMETHOD_END, +}; + +DEFINE_CLASS_0(da9063_rtc, da9063_rtc_driver, da9063_rtc_methods, + sizeof(struct da9063_rtc_softc)); + +DRIVER_MODULE(da9063_rtc, da9063_pmic, da9063_rtc_driver, NULL, NULL); From nobody Tue Aug 1 21:21: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 4RFp2W6SFtz4psQm; Tue, 1 Aug 2023 21:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFp2C355Xz3MrV; Tue, 1 Aug 2023 21:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwdCRHf7e7yMiX5EWfHeTszXxlOicrr3fb5keuNYEQE=; b=jSK84UD4/RIYzCLZ9TT6v2Qq5iu72LHu+XP6ikZN+TXntwXk8RRVXG1zF2JNFj/MaXQtMn j+JkBFzo7WJ2JrIA8KKOrcZIUjlTCd5glr4fp4EbYP/S97H9Y+lEKbYRPUeMaIIc0UUVzw GTOhnHWCbfPuxXbHAIezbJVVzu8KDh/8zcQkBrKEbMA6XHtethTZyj7IAL3paqCp4yDmUs yjnDkMiDoDn/kZB5lui8kxHcTtLdMJ00h7XhpJ9UQs0IAygWQDJVe89y1J6htAy3mrvgvg DsyR/JXnmbBls+U+UitaFUHy3vLtP8ZMdojYeg+OuYUjh491FafWQe1Nz2xrfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924883; a=rsa-sha256; cv=none; b=g6Ycqz9LwXkvHYLHi5Ab1QWTH1R+8InMRrwp9bTTimIA4yBPtAymibIDPpAzLK1oN57CQZ KPvLXK0N5jjaS3SgII2W1py2s/oa1jKHW9xO807a3h71xfpw03d/uG+ITEgN7PnhbUDvjQ dj/nB5plrMuVYtXjvXooXMqxD8umgh7e9RPBL9QVkU8skdhxQLu1sKtvfDY+NYrdiS4l8A BPrLz2xX5kqRTnj+edeQihZdgSEJP2m2bRL3fXjkcbIKJl/ku6sfnTYzRxhgE/WGn2xrPu U2gDeOyo518KInnjxU2jrF/WDxWrlCuPRYm+RfqpWyI7OxGSOG1wrpzpSw1Oxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwdCRHf7e7yMiX5EWfHeTszXxlOicrr3fb5keuNYEQE=; b=V8RqP4pdq3EUKl5bbk5/JNZauu7ij0u/NYg0NzSqXB7r+YOON9TJ15YNv08fDXTWr2EufU dcVk4/E/ZB3FUGZHDQ7A5NLKCdw3lpedrJDvmHgNxDVlk1wXOVqe8MX02H0DUpaM5cr3UP 9A0iFEWhpsT8NASt+TDLqX5GxJ5EvtRzhts+9TLDRk2e2taB2xYzp9MwNMme0lHL5TgXiy /b3wXWLuL7JdyrM71KqsAFRAefWxdAj+MaQUx+OcX1CXkzq0WbZU/JY2mcXdpqJpO4jy0M +gZsb9Ba9lwb/8ln9l5AwdIqz2LkA0atlfo44M06T59H/l9HteKBaAPIqc7d6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFp2C25Dzzt8y; Tue, 1 Aug 2023 21:21: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 371LLNkI040718; Tue, 1 Aug 2023 21:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371LLNlr040717; Tue, 1 Aug 2023 21:21:23 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:21:23 GMT Message-Id: <202308012121.371LLNlr040717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Daniel Engberg Subject: git: 323a94afb623 - main - amdsmn(4), amdtemp(4): add support for Zen 4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 323a94afb6236bcec3a07721566aec6f2ea2b209 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/src/commit/?id=323a94afb6236bcec3a07721566aec6f2ea2b209 commit 323a94afb6236bcec3a07721566aec6f2ea2b209 Author: Akio Morita AuthorDate: 2023-08-01 20:32:12 +0000 Commit: Daniel Engberg CommitDate: 2023-08-01 21:21:17 +0000 amdsmn(4), amdtemp(4): add support for Zen 4 Zen 4 support, tested on Ryzen 9 7900 Reviewed by: imp (previous version), mhorne Approved by: mhorne Obtained from: http://jyurai.ddo.jp/~amorita/diary/?date=20221102#p01 Differential Revision: https://reviews.freebsd.org/D41049 --- sys/dev/amdsmn/amdsmn.c | 7 +++++++ sys/dev/amdtemp/amdtemp.c | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index d2d6f0392cd5..9aa4b5902d01 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ #define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 +#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 struct pciid; struct amdsmn_softc { @@ -104,6 +105,12 @@ static const struct pciid { .amdsmn_addr_reg = F17H_SMN_ADDR_REG, .amdsmn_data_reg = F17H_SMN_DATA_REG, }, + { + .amdsmn_vendorid = CPU_VENDOR_AMD, + .amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_ROOT, + .amdsmn_addr_reg = F17H_SMN_ADDR_REG, + .amdsmn_data_reg = F17H_SMN_DATA_REG, + }, }; /* diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index fa58a3a4fc83..e17003bd6927 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -84,6 +84,7 @@ struct amdtemp_softc { #define AMDTEMP_FLAG_CT_10BIT 0x02 /* CurTmp is 10-bit wide. */ #define AMDTEMP_FLAG_ALT_OFFSET 0x04 /* CurTmp starts at -28C. */ int32_t sc_offset; + int32_t sc_temp_base; int32_t (*sc_gettemp)(device_t, amdsensor_t); struct sysctl_oid *sc_sysctl_cpu[MAXCPU]; struct intr_config_hook sc_ich; @@ -111,6 +112,7 @@ struct amdtemp_softc { #define DEVICEID_AMD_HOSTB17H_M10H_ROOT 0x15d0 #define DEVICEID_AMD_HOSTB17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ #define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630 +#define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8 static const struct amdtemp_product { uint16_t amdtemp_vendorid; @@ -135,6 +137,7 @@ static const struct amdtemp_product { { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M10H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M30H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false }, }; /* @@ -180,6 +183,8 @@ static const struct amdtemp_product { #define AMDTEMP_17H_CCD_TMP_BASE 0x59954 #define AMDTEMP_17H_CCD_TMP_VALID (1u << 11) +#define AMDTEMP_ZEN4_CCD_TMP_BASE 0x59b08 + /* * AMD temperature range adjustment, in deciKelvins (i.e., 49.0 Celsius). */ @@ -519,6 +524,8 @@ amdtemp_attach(device_t dev) dev, CORE0_SENSOR0, amdtemp_sysctl, "IK", "Core 0 / Sensor 0 temperature"); + sc->sc_temp_base = AMDTEMP_17H_CCD_TMP_BASE; + if (family == 0x17) amdtemp_probe_ccd_sensors17h(dev, model); else if (family == 0x19) @@ -780,7 +787,7 @@ amdtemp_gettemp17h(device_t dev, amdsensor_t sensor) return (amdtemp_decode_fam17h_tctl(sc->sc_offset, val)); case CCD_BASE ... CCD_MAX: /* Tccd */ - error = amdsmn_read(sc->sc_smn, AMDTEMP_17H_CCD_TMP_BASE + + error = amdsmn_read(sc->sc_smn, sc->sc_temp_base + (((int)sensor - CCD_BASE) * sizeof(val)), &val); KASSERT(error == 0, ("amdsmn_read2")); KASSERT((val & AMDTEMP_17H_CCD_TMP_VALID) != 0, @@ -801,7 +808,7 @@ amdtemp_probe_ccd_sensors(device_t dev, uint32_t maxreg) sc = device_get_softc(dev); for (i = 0; i < maxreg; i++) { - error = amdsmn_read(sc->sc_smn, AMDTEMP_17H_CCD_TMP_BASE + + error = amdsmn_read(sc->sc_smn, sc->sc_temp_base + (i * sizeof(val)), &val); if (error != 0) continue; @@ -846,6 +853,7 @@ amdtemp_probe_ccd_sensors17h(device_t dev, uint32_t model) static void amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) { + struct amdtemp_softc *sc = device_get_softc(dev); uint32_t maxreg; switch (model) { @@ -854,6 +862,11 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) maxreg = 8; _Static_assert((int)NUM_CCDS >= 8, ""); break; + case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */ + sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE; + maxreg = 8; + _Static_assert((int)NUM_CCDS >= 8, ""); + break; default: device_printf(dev, "Unrecognized Family 19h Model: %02xh\n", model); From nobody Tue Aug 1 21:57: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 4RFprQ0bPxz4pvFB; Tue, 1 Aug 2023 21:57:51 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFprG0DQJz3Qpv; Tue, 1 Aug 2023 21:57:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 371LvaeL069588 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 2 Aug 2023 00:57:39 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 371LvaeL069588 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 371Lva4b069587; Wed, 2 Aug 2023 00:57:36 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 2 Aug 2023 00:57:36 +0300 From: Konstantin Belousov To: Jessica Clarke Cc: Dmitry Chagin , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5a7e48dddfb5 - main - tests: Add MAP_32BIT flag test Message-ID: References: <202308012024.371KOAHb046216@gitrepo.freebsd.org> <7A066A1D-9AFA-485F-AEAE-DD88C9537A44@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: <7A066A1D-9AFA-485F-AEAE-DD88C9537A44@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RFprG0DQJz3Qpv X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Tue, Aug 01, 2023 at 09:29:32PM +0100, Jessica Clarke wrote: > On 1 Aug 2023, at 21:24, Dmitry Chagin wrote: > > > > The branch main has been updated by dchagin: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > > > commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > Author: Dmitry Chagin > > AuthorDate: 2023-08-01 20:23:15 +0000 > > Commit: Dmitry Chagin > > CommitDate: 2023-08-01 20:23:15 +0000 > > > > tests: Add MAP_32BIT flag test > > > > Reviewed by: kib, markj > > Differential Revision: https://reviews.freebsd.org/D41236 > > MFC after: 1 month > > --- > > tests/sys/vm/Makefile | 8 ++++++ > > tests/sys/vm/mmap_map_32bit_helper.c | 51 ++++++++++++++++++++++++++++++++++++ > > tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ > > 3 files changed, 96 insertions(+) > > > > diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile > > index 8ef8a45e5f39..9aac49bc5320 100644 > > --- a/tests/sys/vm/Makefile > > +++ b/tests/sys/vm/Makefile > > @@ -9,4 +9,12 @@ ATF_TESTS_C+= mlock_test \ > > page_fault_signal \ > > shared_shadow_inval_test > > > > +.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ > > + (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") > > + # MAP_32BIT is only available on 64-bit platforms > > So use ${MACHINE_ABI:Mlong64} after including src.opts.mk? May be we should enable the MAP_32BIT flag on 32bit arches, instead? It requests allocation below 2G, which is half of VA on i386, or 2/3 on arm. Interestingly, it should work already from compat32. From nobody Tue Aug 1 22:26: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 4RFqT16VG9z4pwvF; Tue, 1 Aug 2023 22:26: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 4RFqSx47bmz3hXX; Tue, 1 Aug 2023 22:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xV6k8lOnpo1BQXFTjchysbb3ib1YY+XNyJ8UJGYBRY=; b=e6YLq+qRsgfyZhMB3c57lrXz80azgqj+1+kKfeolcKaaCz4xS8gXMnyYaz3lK4jfZEUiUm //V0Ydyhj26QhcN4HOVRz+D4aqKB0tRcrbM1WAme6NIANXmbI0JtEj5DfVYr+UjG2HP/wO Ex5H6ysYy00+MHFQQceus3XXGNZQ2EToFxj7EUbXhvNTwSID7O6a3IJmnkguG+4r8j7inL T+cC1wQwLElkRAa2deoofNME4eEANDZg4tiA+wHsLLbQhm69vwbsEdpUh3m3wnV2NEwTuv qjIUw6YcAfxnRUD1e7eKvifhvc/eaYfkLh8ai5PVvGWKJBSE3d42FF301+Q+rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928769; a=rsa-sha256; cv=none; b=KyE6qqgDHUnNWluUnU8U7if9CKuzqxh41b/VLNeUErnAKjFJDJeqnavYdo/3srVBqQLAOZ taMsf7GfeMEVpUJA0UJAVhWuJpKXWMdtWBgaPcfntm94GztpXmMVaDvoO4Kz0X7L+QgSzJ iqtDvMWErpHJyZn7uY027vNit4+eQFvpK3FSVd7E9V20Cx3hhsY6/2ayW8ocgS97QkTQch ykxacfOjcuZXFPIZyl1moi5vYTG8nOi5eB6NX52uWQKS9gxeo7sFoYkYpBgNVv1A+5qgZ8 5IJsMuQBoIz9HRAreLNBPvPzy+/xTTiH4rWORj/EbBVUK6tpdeL50NXEoZPHtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xV6k8lOnpo1BQXFTjchysbb3ib1YY+XNyJ8UJGYBRY=; b=Fr320p7lNl1SVmC3zbKmcHm+U5OnX/noVlZ9BXA23DRLezRpDcuiyav7+zzUwGx5QGKGv+ IoaDktIfbRBlQGhGGpmst6ha5ayg1LJC3up3yBnt5YjrCjT5CJp8U/3XsTTQW9afdWJaXC eT232HR0f0+OJrGgSkBtjG7Z9/Q3LYyqFQSkRo2LgxLXLk345zF/jL8XIZeViy/xvxTC9v nV7GDo5bN3ESwarEBeWnP0PW3QnFI2IdNfZ1f9TQ+MxDtespeY1aT/z9NygyJ25aysETT5 HgbNHT56ZosWdIUJBXZskr2nZ5xlyOLAu9NRLBa+2Cg+87ABcwbIB3YeGbcc2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSx07PwzvSl; Tue, 1 Aug 2023 22:26: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 371MQ8jf045585; Tue, 1 Aug 2023 22:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQ8oa045584; Tue, 1 Aug 2023 22:26:08 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:08 GMT Message-Id: <202308012226.371MQ8oa045584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 32734eb14c5c - main - mmc_xpt: Remove dubious end of mmc_print_ident List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32734eb14c5cc3aa4ad576ba746830c73fb8eb54 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=32734eb14c5cc3aa4ad576ba746830c73fb8eb54 commit 32734eb14c5cc3aa4ad576ba746830c73fb8eb54 Author: John Baldwin AuthorDate: 2023-08-01 22:20:53 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:20:53 +0000 mmc_xpt: Remove dubious end of mmc_print_ident The end of this function finishes the passed in sbuf, calls printf manually on the contents, and then clears it. The caller then tries to print the resulting sbuf. This works currently but will not work for future callers that pass in an external sbuf to be appended to. Reviewed by: mav Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41260 --- sys/cam/mmc/mmc_xpt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 30b1b7f867e7..8fee7b4cad58 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -466,10 +466,6 @@ mmc_print_ident(struct mmc_params *ident_data, struct sbuf *sb) sbuf_printf(sb, "Number of functions: %u\n", ident_data->sdio_func_count); } - - sbuf_finish(sb); - printf("%s", sbuf_data(sb)); - sbuf_clear(sb); } static void From nobody Tue Aug 1 22:26: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 4RFqT14rYfz4pwqp; Tue, 1 Aug 2023 22:26: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 4RFqSw0Qvjz3hrw; Tue, 1 Aug 2023 22:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vy1mzvYzQ9BAV2HDD54hDTrWw2zinA/J5G/73yNLbEA=; b=VkJcnKCoG3nje5RvuXkN9oXBosjxiBq8+S/2yoa4xETdgtrq9iBlURphw835mDg2vJe656 I4unZL4fJ0pUBZp/3RgPFC3BUq8MoFu7K1IfieUx0IfrvGSqWw9LBHNHsyFMDx4qKEgnWO RqyI7zuhxTIqgEoTPHpFo0mARoEeF34JDjvTP6gAPcM1HoJeHWsY46AAAetSWvXT3cSO8w N4tJ1uS+Uk60f3s6SgXaAjrbLz7INR/lYiJ22/VHoQtkeDjuQ80E5+r6mH1nYNWcL/hVQG sZ7Ll3bMuV6R3mrtKRVB9l+Xhb+1U2UAp0Db+ZudEIv3pJ6fMEbdHO7O6PZmsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928768; a=rsa-sha256; cv=none; b=GOnMvd6cLuZ37ZN9+7+3gsqDp1AJSF6ITf9C9ZxWuy1kshZNyHDQrJI5vyedyLktSqzTdF ZPbDaxjMWzJy3DQKUIDPcUy4QfVS+kUNMyE9X/j0UINxqY4tSnE1qtlDsQAl0wcpj/3gmC eUjdnhEI39W0Flhtc/zkYmjqhmuV+5Dhiy6+YOkeb0lEmV44ybeCAQ4YKsCEtSuhvto6vp JO9CEY9ax8Xulo1YMDF+kl+4tpZLp7cJtFUHbIhMAZ5h4u7BZrlxmH24YkNJlUomSBEQNN pNbVg7ysvxSrlXXFjO6x36E4aQvcUExYvK55i/EiL6SXbnMuiMVXCv3uf0e3nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vy1mzvYzQ9BAV2HDD54hDTrWw2zinA/J5G/73yNLbEA=; b=vx4RSylIJ/dG9Kq7ADkM8NEg20i1ztGrEJ4Qh5NfAeTRuBPscSYsxUi8Gr32tDq/GPp8M7 TTyf0ar6vPh254oQAm/MMg+FUne9Nek7J0B8oJte6sPUQ2SrZEisxssXm2VzS2a0eIdXxN sjGunmIHFgn3z0NPLnVrI+4nrZy138mCjt2nsMQVTcTV0Qjh7H264aET+CF154zfMokduo ltCweXYRzSfsP+2gVoo8yfAJMPJ7SHqttkl2Eeos/dMBVK1it/vcJFollXP4clYU/u2uYw L8Lmnxpc83QdzMXufDF3WCqmPmG3/bC8uphr5Yx4qQR5JexXfxMYI3FQ/M+YOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSv4t98zvd6; Tue, 1 Aug 2023 22:26: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 371MQ616045540; Tue, 1 Aug 2023 22:26:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQ6wP045539; Tue, 1 Aug 2023 22:26:06 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:06 GMT Message-Id: <202308012226.371MQ6wP045539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0be27bde5f67 - main - cam/nvme: Remove spurious newline during periph detach announcement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0be27bde5f673fc89643ea460b9cb94fc3316dd1 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0be27bde5f673fc89643ea460b9cb94fc3316dd1 commit 0be27bde5f673fc89643ea460b9cb94fc3316dd1 Author: John Baldwin AuthorDate: 2023-08-01 22:19:50 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:19:50 +0000 cam/nvme: Remove spurious newline during periph detach announcement Other protocol denounce routines use a "short" variant of announce that does not include a trailing newline. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41176 --- sys/cam/nvme/nvme_all.c | 9 ++++++++- sys/cam/nvme/nvme_all.h | 2 ++ sys/cam/nvme/nvme_xpt.c | 7 ++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index 0ab37b861ca2..5350dbd1bcdb 100644 --- a/sys/cam/nvme/nvme_all.c +++ b/sys/cam/nvme/nvme_all.c @@ -89,7 +89,14 @@ void nvme_print_ident(const struct nvme_controller_data *cdata, const struct nvme_namespace_data *data, struct sbuf *sb) { + nvme_print_ident_short(cdata, data, sb); + sbuf_printf(sb, "\n"); +} +void +nvme_print_ident_short(const struct nvme_controller_data *cdata, + const struct nvme_namespace_data *data, struct sbuf *sb) +{ sbuf_printf(sb, "<"); cam_strvis_sbuf(sb, cdata->mn, sizeof(cdata->mn), CAM_STRVIS_FLAG_NONASCII_SPC); @@ -99,7 +106,7 @@ nvme_print_ident(const struct nvme_controller_data *cdata, sbuf_printf(sb, " "); cam_strvis_sbuf(sb, cdata->sn, sizeof(cdata->sn), CAM_STRVIS_FLAG_NONASCII_SPC); - sbuf_printf(sb, ">\n"); + sbuf_printf(sb, ">"); } /* XXX need to do nvme admin opcodes too, but those aren't used yet by nda */ diff --git a/sys/cam/nvme/nvme_all.h b/sys/cam/nvme/nvme_all.h index ef932fd8efc3..9bdbeb219a90 100644 --- a/sys/cam/nvme/nvme_all.h +++ b/sys/cam/nvme/nvme_all.h @@ -42,6 +42,8 @@ int nvme_identify_match(caddr_t identbuffer, caddr_t table_entry); struct sbuf; void nvme_print_ident(const struct nvme_controller_data *, const struct nvme_namespace_data *, struct sbuf *); +void nvme_print_ident_short(const struct nvme_controller_data *, + const struct nvme_namespace_data *, struct sbuf *); const char *nvme_op_string(const struct nvme_command *, int admin); const char *nvme_cmd_string(const struct nvme_command *, char *, size_t); void nvme_cmd_sbuf(const struct nvme_command *, struct sbuf *sb); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 3222ec1e9dc3..0662f476536c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -838,8 +838,13 @@ nvme_proto_announce(struct cam_ed *device) static void nvme_proto_denounce(struct cam_ed *device) { + struct sbuf sb; + char buffer[120]; - nvme_proto_announce(device); + sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); + nvme_print_ident_short(device->nvme_cdata, device->nvme_data, &sb); + sbuf_finish(&sb); + sbuf_putbuf(&sb); } static void From nobody Tue Aug 1 22:26: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 4RFqTQ1RCpz4pwpK; Tue, 1 Aug 2023 22:26: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 4RFqT03gVXz3hXZ; Tue, 1 Aug 2023 22:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cIbZCzaUw73bM4H0ibcXhtJiGLnI/0Cx1ixeaRhV8f0=; b=RkrYBpHx/7FdtvMudhsjq5LEo2Y/bjrSnB6Q68mNfHB3Vo6o+7SR76306LThxTGlzu95oL jwUdEcJG/+UK9li2NrwM3Awlrj9V16TEn1iOWyO66sYgDpFVZfqDs0Q1tEl10wbxrH53Ex 2QmTDokmRsAf+Vcf6DlY/ByEVXu8I4kPWpCSjifaAcYrp1WI72ZTXpnRXebduztwvkMBCu xyQ5VcrRErc2HR2L/mw9p+ten7ww3RaXKJ5Znlrd+bJFj6xu4Q5GRSwcHMCgFbz6ylUYHW 5l0cCd9eaSSRzePD9dBavzxQm/EPNuVK2opiKGmJTYfkprxNT+eoydWNXbgc5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928772; a=rsa-sha256; cv=none; b=JQep92uNUhMPu/cOHUsfeVx9+rxSrjIoGALJe6PvbhuYNU/QmdB2qBj6Dk3FgaiRabXHiI NpPVJVf8oEa4NLwQ1wTJM+wVh95cOhkBBU3bWJG/rwjPeq8fZw/LhyAkggvSbmY5wVNZLe LMGmimcqSCuUy4KAJX1kkkJDe8Xz8poXAi/74b07EsNFK49PKAB72t1zQkaJevSTwTwsaL mUq+4By2xeOCGRXPURtTvuJ5KdOHHs2HETEfkyKlJDElFwg1PT22KrRkk/0qFp4b5LQWNm dLOYpFHVRgfBYA232EngJ271DlI/jiSv694/Lq0GGtp/23RTQ4eMKdXZ7pl8Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cIbZCzaUw73bM4H0ibcXhtJiGLnI/0Cx1ixeaRhV8f0=; b=COWwSgQeG58nuUicwiITq/Z96uYJmd2GXJXJ97KEAGBqNbDN+LFZcohaXgWWilG951amSZ 8byauB6lXgPpAJ/pc+CRnBIvW41J6eKn6Vt/3gp3aoagNXTPhQEt8POAFmvJLkkODm2/ir C7/UdPan3h1PO9jX2iOkfvtCXWkrzJD+fCVIJ+1t4nNFlTMNwMeozYPQhfr+UIftBEE6Ia Qx6JBLj++614Wy8znkaSXxGwWQT4tbI5GrMLHzcNXQgnVTSy8EBgDgCgkNwDNwsEDcSQLr O8YZSPtszJD5s4f1WGbB+yus0kZv+aJwQs8pWn7VGv6ij7gxnUO0MJqZtXKfsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqT02TgNzvd9; Tue, 1 Aug 2023 22:26: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 371MQCOn045647; Tue, 1 Aug 2023 22:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQC5D045646; Tue, 1 Aug 2023 22:26:12 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:12 GMT Message-Id: <202308012226.371MQC5D045646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0a57cdd971b2 - main - cam_xpt: Reimplement xpt_*nounce_periph in terms of the _sbuf versions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a57cdd971b24292c48e3a0be08ba5ebf0b54a31 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0a57cdd971b24292c48e3a0be08ba5ebf0b54a31 commit 0a57cdd971b24292c48e3a0be08ba5ebf0b54a31 Author: John Baldwin AuthorDate: 2023-08-01 22:24:36 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:24:36 +0000 cam_xpt: Reimplement xpt_*nounce_periph in terms of the _sbuf versions Use an sbuf that drains to printf to avoid duplicating code in the two versions of each function. Reviewed by: mav Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41263 --- sys/cam/cam_xpt.c | 68 ++++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index e7248cf76d19..6ff8a61457fa 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1045,43 +1045,13 @@ xpt_remove_periph(struct cam_periph *periph) void xpt_announce_periph(struct cam_periph *periph, char *announce_string) { - struct cam_path *path = periph->path; - struct xpt_proto *proto; - - cam_periph_assert(periph, MA_OWNED); - periph->flags |= CAM_PERIPH_ANNOUNCED; + char buf[128]; + struct sbuf sb; - printf("%s%d at %s%d bus %d scbus%d target %d lun %jx\n", - periph->periph_name, periph->unit_number, - path->bus->sim->sim_name, - path->bus->sim->unit_number, - path->bus->sim->bus_id, - path->bus->path_id, - path->target->target_id, - (uintmax_t)path->device->lun_id); - printf("%s%d: ", periph->periph_name, periph->unit_number); - proto = xpt_proto_find(path->device->protocol); - if (proto) - proto->ops->announce(path->device); - else - printf("Unknown protocol device %d\n", path->device->protocol); - if (path->device->serial_num_len > 0) { - /* Don't wrap the screen - print only the first 60 chars */ - printf("%s%d: Serial Number %.60s\n", periph->periph_name, - periph->unit_number, path->device->serial_num); - } - /* Announce transport details. */ - path->bus->xport->ops->announce(periph); - /* Announce command queueing. */ - if (path->device->inq_flags & SID_CmdQue - || path->device->flags & CAM_DEV_TAG_AFTER_COUNT) { - printf("%s%d: Command Queueing enabled\n", - periph->periph_name, periph->unit_number); - } - /* Announce caller's details if they've passed in. */ - if (announce_string != NULL) - printf("%s%d: %s\n", periph->periph_name, - periph->unit_number, announce_string); + (void)sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); + sbuf_set_drain(&sb, sbuf_printf_drain, NULL); + xpt_announce_periph_sbuf(periph, &sb, announce_string); + (void)sbuf_finish(&sb); } void @@ -1151,27 +1121,13 @@ xpt_announce_quirks_sbuf(struct cam_periph *periph, struct sbuf *sb, void xpt_denounce_periph(struct cam_periph *periph) { - struct cam_path *path = periph->path; - struct xpt_proto *proto; + char buf[128]; + struct sbuf sb; - cam_periph_assert(periph, MA_OWNED); - printf("%s%d at %s%d bus %d scbus%d target %d lun %jx\n", - periph->periph_name, periph->unit_number, - path->bus->sim->sim_name, - path->bus->sim->unit_number, - path->bus->sim->bus_id, - path->bus->path_id, - path->target->target_id, - (uintmax_t)path->device->lun_id); - printf("%s%d: ", periph->periph_name, periph->unit_number); - proto = xpt_proto_find(path->device->protocol); - if (proto) - proto->ops->denounce(path->device); - else - printf("Unknown protocol device %d", path->device->protocol); - if (path->device->serial_num_len > 0) - printf(" s/n %.60s", path->device->serial_num); - printf(" detached\n"); + (void)sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); + sbuf_set_drain(&sb, sbuf_printf_drain, NULL); + xpt_denounce_periph_sbuf(periph, &sb); + (void)sbuf_finish(&sb); } void From nobody Tue Aug 1 22:26: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 4RFqTQ4HRFz4pwYb; Tue, 1 Aug 2023 22:26: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 4RFqT14MmTz3hZK; Tue, 1 Aug 2023 22:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/U2Ne4hC5L1/O806r8nYi+VEtaCkRajTgGxKG53cJc=; b=aHMRdM2WgAWqrIFgfMbt+RS3U8bBO0mlYX7C/XKN+bcmCBm5/2l7NTmjpYFD+nCaSiCZkY zWQWfYFx3lZSW2JwwKQPutHOpJe4pWB0qmd7Obi9KZsdqx5lm/kd3wLo1Q6JLR1XIEJJ/S xiBS5CMla5sUKFMcM7bzIYN59mLtQTtq0RD62c+VPyxKBBlgLKCcV4LWwwHOqWRVw3P1IU plLnGXfd0KJUoRnSs3ihficA461mfS+NpO8klshO/cmc1dZdZ92Xy5Ht/9m+J/clPoPRp5 i8+cDlUcWFW+xOreBQk1X1WUJKs9q6vGciyG76jrVuxePDXcHkFue4vsmsDvAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928773; a=rsa-sha256; cv=none; b=w/mfCzGL79HYKwyG71XCJhTOmhgljauhNFfnf7TmPhlCqfMvrJK858SokqtPIyhz96ak55 nx4D97WngZFB8dKc7987TMxtSebxMTi5HVvRuuZQcxubYnxZcb5Rq2wdD0WIShuDyEVvHg oi2C+O0AywQI/DE1oG1MIG61aZfHVZLIofzobVNO+7YPn5fWQHlo2xBxxdmlLxRKbSeQ4U 4bg7vJHRGI4PF2/7WcweVUwQTCsE+4dt6gq+BRur3cXle35nfI8QQBnZGFmE8HVE6y9ABS nT7Aoi9oPT8j/w20JCO5YEZkz5twp0uBOXX/nlvpk3XWDdspsUIIlb1NOwO8Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/U2Ne4hC5L1/O806r8nYi+VEtaCkRajTgGxKG53cJc=; b=bFlJxns0tghAbdPeC1wzg2NdJQtTqluIApHkZ4aVBfIM7Z1t1HDRwCCtJAdTB2ouQicVY7 cChPdC/eA14coALUF0wHodXTojB5RF7FTHLZ/ENdtYdsgfD2Z6+x6v3bab/zwiEStrr4E3 LilKVtueaQOnMJ+WfVUktHyVh+FooPr0p/p4qzrnE4c4oUMQjr1EAGm9cltlOZ6MQEQv5R MFd+XIse5TPRkheu95XEG2xTu1hYFZHuyThR/tyzEV9eVQ6JEshiisaLZHeIY87qZJ6c21 g9OadtEaUWSeWX2hADK+KV0Xe02LJqX5WfKUfgOaBIp+qno894wsqdp0yb8s9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqT13F3lzvkt; Tue, 1 Aug 2023 22:26: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 371MQDO2045668; Tue, 1 Aug 2023 22:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQDVJ045667; Tue, 1 Aug 2023 22:26:13 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:13 GMT Message-Id: <202308012226.371MQDVJ045667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b2c44f1fc1c6 - main - cam: Remove non-sbuf announce/denounce proto and xport ops List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c44f1fc1c68dfb8a0a1f14f035241f6b96f30f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c44f1fc1c68dfb8a0a1f14f035241f6b96f30f commit b2c44f1fc1c68dfb8a0a1f14f035241f6b96f30f Author: John Baldwin AuthorDate: 2023-08-01 22:25:38 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:25:38 +0000 cam: Remove non-sbuf announce/denounce proto and xport ops Reviewed by: mav, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41264 --- sys/cam/ata/ata_xpt.c | 89 ---------------------------------------------- sys/cam/cam_xpt_internal.h | 3 -- sys/cam/mmc/mmc_xpt.c | 48 ------------------------- sys/cam/nvme/nvme_xpt.c | 42 ---------------------- sys/cam/scsi/scsi_xpt.c | 75 -------------------------------------- 5 files changed, 257 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 2b2fec06a06a..55aa5e346daa 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -188,16 +188,11 @@ static void ata_dev_async(uint32_t async_code, struct cam_ed *device, void *async_arg); static void ata_action(union ccb *start_ccb); -static void ata_announce_periph(struct cam_periph *periph); static void ata_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb); -static void ata_proto_announce(struct cam_ed *device); static void ata_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); -static void ata_proto_denounce(struct cam_ed *device); static void ata_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static void ata_proto_debug_out(union ccb *ccb); -static void semb_proto_announce(struct cam_ed *device); static void semb_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); -static void semb_proto_denounce(struct cam_ed *device); static void semb_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static int ata_dma = 1; @@ -210,7 +205,6 @@ static struct xpt_xport_ops ata_xport_ops = { .alloc_device = ata_alloc_device, .action = ata_action, .async = ata_dev_async, - .announce = ata_announce_periph, .announce_sbuf = ata_announce_periph_sbuf, }; #define ATA_XPT_XPORT(x, X) \ @@ -227,9 +221,7 @@ ATA_XPT_XPORT(sata, SATA); #undef ATA_XPORT_XPORT static struct xpt_proto_ops ata_proto_ops_ata = { - .announce = ata_proto_announce, .announce_sbuf = ata_proto_announce_sbuf, - .denounce = ata_proto_denounce, .denounce_sbuf = ata_proto_denounce_sbuf, .debug_out = ata_proto_debug_out, }; @@ -240,9 +232,7 @@ static struct xpt_proto ata_proto_ata = { }; static struct xpt_proto_ops ata_proto_ops_satapm = { - .announce = ata_proto_announce, .announce_sbuf = ata_proto_announce_sbuf, - .denounce = ata_proto_denounce, .denounce_sbuf = ata_proto_denounce_sbuf, .debug_out = ata_proto_debug_out, }; @@ -253,9 +243,7 @@ static struct xpt_proto ata_proto_satapm = { }; static struct xpt_proto_ops ata_proto_ops_semb = { - .announce = semb_proto_announce, .announce_sbuf = semb_proto_announce_sbuf, - .denounce = semb_proto_denounce, .denounce_sbuf = semb_proto_denounce_sbuf, .debug_out = ata_proto_debug_out, }; @@ -2133,59 +2121,6 @@ _ata_announce_periph(struct cam_periph *periph, struct ccb_trans_settings *cts, } } -static void -ata_announce_periph(struct cam_periph *periph) -{ - struct ccb_trans_settings cts; - u_int speed, mb; - - bzero(&cts, sizeof(cts)); - _ata_announce_periph(periph, &cts, &speed); - if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) - return; - - mb = speed / 1000; - if (mb > 0) - printf("%s%d: %d.%03dMB/s transfers", - periph->periph_name, periph->unit_number, - mb, speed % 1000); - else - printf("%s%d: %dKB/s transfers", periph->periph_name, - periph->unit_number, speed); - /* Report additional information about connection */ - if (cts.transport == XPORT_ATA) { - struct ccb_trans_settings_pata *pata = - &cts.xport_specific.ata; - - printf(" ("); - if (pata->valid & CTS_ATA_VALID_MODE) - printf("%s, ", ata_mode2string(pata->mode)); - if ((pata->valid & CTS_ATA_VALID_ATAPI) && pata->atapi != 0) - printf("ATAPI %dbytes, ", pata->atapi); - if (pata->valid & CTS_ATA_VALID_BYTECOUNT) - printf("PIO %dbytes", pata->bytecount); - printf(")"); - } - if (cts.transport == XPORT_SATA) { - struct ccb_trans_settings_sata *sata = - &cts.xport_specific.sata; - - printf(" ("); - if (sata->valid & CTS_SATA_VALID_REVISION) - printf("SATA %d.x, ", sata->revision); - else - printf("SATA, "); - if (sata->valid & CTS_SATA_VALID_MODE) - printf("%s, ", ata_mode2string(sata->mode)); - if ((sata->valid & CTS_ATA_VALID_ATAPI) && sata->atapi != 0) - printf("ATAPI %dbytes, ", sata->atapi); - if (sata->valid & CTS_SATA_VALID_BYTECOUNT) - printf("PIO %dbytes", sata->bytecount); - printf(")"); - } - printf("\n"); -} - static void ata_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) { @@ -2245,18 +2180,6 @@ ata_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) ata_print_ident_sbuf(&device->ident_data, sb); } -static void -ata_proto_announce(struct cam_ed *device) -{ - ata_print_ident(&device->ident_data); -} - -static void -ata_proto_denounce(struct cam_ed *device) -{ - ata_print_ident_short(&device->ident_data); -} - static void ata_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) { @@ -2269,18 +2192,6 @@ semb_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) semb_print_ident_sbuf((struct sep_identify_data *)&device->ident_data, sb); } -static void -semb_proto_announce(struct cam_ed *device) -{ - semb_print_ident((struct sep_identify_data *)&device->ident_data); -} - -static void -semb_proto_denounce(struct cam_ed *device) -{ - semb_print_ident_short((struct sep_identify_data *)&device->ident_data); -} - static void semb_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) { diff --git a/sys/cam/cam_xpt_internal.h b/sys/cam/cam_xpt_internal.h index f30ef2aa81b5..0e8302cb74ed 100644 --- a/sys/cam/cam_xpt_internal.h +++ b/sys/cam/cam_xpt_internal.h @@ -56,7 +56,6 @@ struct xpt_xport_ops { xpt_release_device_func reldev; xpt_action_func action; xpt_dev_async_func async; - xpt_announce_periph_func announce; xpt_announce_periph_sbuf_func announce_sbuf; }; @@ -75,9 +74,7 @@ typedef void (*xpt_proto_announce_sbuf_func)(struct cam_ed *, struct sbuf *); typedef void (*xpt_proto_debug_out_func)(union ccb *); struct xpt_proto_ops { - xpt_proto_announce_func announce; xpt_proto_announce_sbuf_func announce_sbuf; - xpt_proto_announce_func denounce; xpt_proto_announce_sbuf_func denounce_sbuf; xpt_proto_debug_out_func debug_out; }; diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 0930717b0a2a..406b91df2e35 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -73,7 +73,6 @@ static void mmc_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target, struct cam_ed *device, void *async_arg); static void mmc_action(union ccb *start_ccb); static void mmc_dev_advinfo(union ccb *start_ccb); -static void mmc_announce_periph(struct cam_periph *periph); static void mmc_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb); static void mmc_scan_lun(struct cam_periph *periph, @@ -85,9 +84,7 @@ static void mmcprobe_start(struct cam_periph *periph, union ccb *start_ccb); static void mmcprobe_cleanup(struct cam_periph *periph); static void mmcprobe_done(struct cam_periph *periph, union ccb *done_ccb); -static void mmc_proto_announce(struct cam_ed *device); static void mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); -static void mmc_proto_denounce(struct cam_ed *device); static void mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static void mmc_proto_debug_out(union ccb *ccb); @@ -151,7 +148,6 @@ static struct xpt_xport_ops mmc_xport_ops = { .alloc_device = mmc_alloc_device, .action = mmc_action, .async = mmc_dev_async, - .announce = mmc_announce_periph, .announce_sbuf = mmc_announce_periph_sbuf, }; @@ -166,9 +162,7 @@ static struct xpt_xport_ops mmc_xport_ops = { MMC_XPT_XPORT(mmc, MMCSD); static struct xpt_proto_ops mmc_proto_ops = { - .announce = mmc_proto_announce, .announce_sbuf = mmc_proto_announce_sbuf, - .denounce = mmc_proto_denounce, .denounce_sbuf = mmc_proto_denounce_sbuf, .debug_out = mmc_proto_debug_out, }; @@ -383,29 +377,6 @@ mmc_dev_advinfo(union ccb *start_ccb) start_ccb->ccb_h.status = CAM_REQ_CMP; } -static void -mmc_announce_periph(struct cam_periph *periph) -{ - struct ccb_pathinq cpi; - struct ccb_trans_settings cts; - struct cam_path *path = periph->path; - - cam_periph_assert(periph, MA_OWNED); - - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph")); - - memset(&cts, 0, sizeof(cts)); - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); - cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; - cts.type = CTS_TYPE_CURRENT_SETTINGS; - xpt_action((union ccb*)&cts); - if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) - return; - xpt_path_inq(&cpi, periph->path); - CAM_DEBUG(path, CAM_DEBUG_INFO, - ("XPT info: CLK %04d, ...\n", cts.proto_specific.mmc.ios.clock)); -} - static void mmc_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) { @@ -498,31 +469,12 @@ mmc_print_ident(struct mmc_params *ident_data, struct sbuf *sb) } } -static void -mmc_proto_announce(struct cam_ed *device) -{ - struct sbuf sb; - char buffer[256]; - - sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); - mmc_print_ident(&device->mmc_ident_data, &sb); - sbuf_finish(&sb); - sbuf_putbuf(&sb); -} - static void mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) { mmc_print_ident(&device->mmc_ident_data, sb); } -static void -mmc_proto_denounce(struct cam_ed *device) -{ - - mmc_proto_announce(device); -} - static void mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) { diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index d2968d1019d1..ad0718bfcf3b 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -156,13 +156,10 @@ static void nvme_dev_async(uint32_t async_code, struct cam_ed *device, void *async_arg); static void nvme_action(union ccb *start_ccb); -static void nvme_announce_periph(struct cam_periph *periph); static void nvme_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb); -static void nvme_proto_announce(struct cam_ed *device); static void nvme_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); -static void nvme_proto_denounce(struct cam_ed *device); static void nvme_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static void nvme_proto_debug_out(union ccb *ccb); @@ -171,7 +168,6 @@ static struct xpt_xport_ops nvme_xport_ops = { .alloc_device = nvme_alloc_device, .action = nvme_action, .async = nvme_dev_async, - .announce = nvme_announce_periph, .announce_sbuf = nvme_announce_periph_sbuf, }; #define NVME_XPT_XPORT(x, X) \ @@ -187,9 +183,7 @@ NVME_XPT_XPORT(nvme, NVME); #undef NVME_XPT_XPORT static struct xpt_proto_ops nvme_proto_ops = { - .announce = nvme_proto_announce, .announce_sbuf = nvme_proto_announce_sbuf, - .denounce = nvme_proto_denounce, .denounce_sbuf = nvme_proto_denounce_sbuf, .debug_out = nvme_proto_debug_out, }; @@ -827,48 +821,12 @@ nvme_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) sbuf_printf(sb, "\n"); } -static void -nvme_announce_periph(struct cam_periph *periph) -{ - struct sbuf sb; - char buffer[120]; - - sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); - nvme_announce_periph_sbuf(periph, &sb); - sbuf_finish(&sb); - sbuf_putbuf(&sb); -} - -static void -nvme_proto_announce(struct cam_ed *device) -{ - struct sbuf sb; - char buffer[120]; - - sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); - nvme_print_ident(device->nvme_cdata, device->nvme_data, &sb); - sbuf_finish(&sb); - sbuf_putbuf(&sb); -} - static void nvme_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) { nvme_print_ident(device->nvme_cdata, device->nvme_data, sb); } -static void -nvme_proto_denounce(struct cam_ed *device) -{ - struct sbuf sb; - char buffer[120]; - - sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); - nvme_print_ident_short(device->nvme_cdata, device->nvme_data, &sb); - sbuf_finish(&sb); - sbuf_putbuf(&sb); -} - static void nvme_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) { diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 619841720bb3..734668995299 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -593,12 +593,9 @@ static void scsi_dev_async(uint32_t async_code, struct cam_ed *device, void *async_arg); static void scsi_action(union ccb *start_ccb); -static void scsi_announce_periph(struct cam_periph *periph); static void scsi_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb); -static void scsi_proto_announce(struct cam_ed *device); static void scsi_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); -static void scsi_proto_denounce(struct cam_ed *device); static void scsi_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static void scsi_proto_debug_out(union ccb *ccb); @@ -608,7 +605,6 @@ static struct xpt_xport_ops scsi_xport_ops = { .alloc_device = scsi_alloc_device, .action = scsi_action, .async = scsi_dev_async, - .announce = scsi_announce_periph, .announce_sbuf = scsi_announce_periph_sbuf, }; #define SCSI_XPT_XPORT(x, X) \ @@ -630,9 +626,7 @@ SCSI_XPT_XPORT(ppb, PPB); #undef SCSI_XPORT_XPORT static struct xpt_proto_ops scsi_proto_ops = { - .announce = scsi_proto_announce, .announce_sbuf = scsi_proto_announce_sbuf, - .denounce = scsi_proto_denounce, .denounce_sbuf = scsi_proto_denounce_sbuf, .debug_out = scsi_proto_debug_out, }; @@ -3150,87 +3144,18 @@ scsi_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) sbuf_printf(sb, "\n"); } -static void -scsi_announce_periph(struct cam_periph *periph) -{ - struct ccb_trans_settings cts; - u_int speed, freq, mb; - - memset(&cts, 0, sizeof(cts)); - _scsi_announce_periph(periph, &speed, &freq, &cts); - if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP) - return; - - mb = speed / 1000; - if (mb > 0) - printf("%s%d: %d.%03dMB/s transfers", - periph->periph_name, periph->unit_number, - mb, speed % 1000); - else - printf("%s%d: %dKB/s transfers", periph->periph_name, - periph->unit_number, speed); - /* Report additional information about SPI connections */ - if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SPI) { - struct ccb_trans_settings_spi *spi; - - spi = &cts.xport_specific.spi; - if (freq != 0) { - printf(" (%d.%03dMHz%s, offset %d", freq / 1000, - freq % 1000, - (spi->ppr_options & MSG_EXT_PPR_DT_REQ) != 0 - ? " DT" : "", - spi->sync_offset); - } - if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0 - && spi->bus_width > 0) { - if (freq != 0) { - printf(", "); - } else { - printf(" ("); - } - printf("%dbit)", 8 * (0x01 << spi->bus_width)); - } else if (freq != 0) { - printf(")"); - } - } - if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) { - struct ccb_trans_settings_fc *fc; - - fc = &cts.xport_specific.fc; - if (fc->valid & CTS_FC_VALID_WWNN) - printf(" WWNN 0x%llx", (long long) fc->wwnn); - if (fc->valid & CTS_FC_VALID_WWPN) - printf(" WWPN 0x%llx", (long long) fc->wwpn); - if (fc->valid & CTS_FC_VALID_PORT) - printf(" PortID 0x%x", fc->port); - } - printf("\n"); -} - static void scsi_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) { scsi_print_inquiry_sbuf(sb, &device->inq_data); } -static void -scsi_proto_announce(struct cam_ed *device) -{ - scsi_print_inquiry(&device->inq_data); -} - static void scsi_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) { scsi_print_inquiry_short_sbuf(sb, &device->inq_data); } -static void -scsi_proto_denounce(struct cam_ed *device) -{ - scsi_print_inquiry_short(&device->inq_data); -} - static void scsi_proto_debug_out(union ccb *ccb) { From nobody Tue Aug 1 22:26: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 4RFqT16czVz4pwW7; Tue, 1 Aug 2023 22:26: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 4RFqSw1LXQz3hrx; Tue, 1 Aug 2023 22:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU2P6pW/G5Fbi2k2rwSpAGyTWpDjvj3PL2A/5YUSkwg=; b=opD4t0tC6CR73KWOxiU5kP7TaDoB0Vn486bN4mV0mXn5KmY9J1sZuBljJ/BX3DE/kwja+V OhGHE0Qb6Rn7LmuamlCBjCUrCptQsc29r6QWrnENxlOf7mL1L90MyGNNfQ1WB9XjLkLU0t hUA7UG8MrPlr+EDKUSk2GcFXgCV6hRODBbwsdeCtk7p56e08encHS5n4sSCakKxupbOaAl 1V2ZPodMEpUcH28rnQ3hYpTO29yktXjLG/w7jaiOY/q89R6e/B9v1+djavE3fv1z4z66qd Xy+GO7Na3/4wF7OyznE3GwjLN8ulUxMLGSGzjhwKuogxaVUaki7vldPagOluDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928768; a=rsa-sha256; cv=none; b=puxrGxdA3O3xlzSOoIbuw9wx63EtN/G0u1azfrHryf6qseh5Hxs3fTDXOkH/KUunaqo02C Dx3qgxT0Ai7RmYQgSgrsvUQzOwiOmphgw23BJpp3aq/hz7SRPp8WNmM7/MS0adS05m3jaN S7NKY54buT340q78Bxa6oFMUi3PxnNU/kDShvC1Px3l1hdkDvToFPjkPitC5u+B/rVYF41 ZNXdGhEkgTjZuZwTPb4kJ3JOqsGS1BTVYGDCnuK+h2O4UVVR45kjbbTO7PMWhOf6Ys4J3/ V+9r6BqQS9WSTnPE5Ls6aje79jObjjVCQK9M96ALfc0qpxyG+WeuufAgIfxmEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU2P6pW/G5Fbi2k2rwSpAGyTWpDjvj3PL2A/5YUSkwg=; b=DyCIbU1Qpr0+oYKqshp4uzNxSL0RzOJ+t3HQKraj7HbwIRWFpUrK4doJS3KsJqrk0bfxFt IPIaANH39PZkIHn2juZTdBA6QBAG1zvqQtpaEcA73BXud5LnpIt1WG4MYXPNx/ycWwmZC6 J9CNNJsqzH5vRs6XV++oJjkkLTB9QTNADFePjBaFggGv8zBhM87kbmyQswUqS1ipXOyd3P B4xwGb/VFYWYK0HPkqwUI5VwQW9PSY+cdVJpq1Mgm4ED0mrdeKUZXn1jmY0731UueIOUbL bg4LFhxbOHfFpEqsqY4ILVCW7wgW3wacQqW3iO01Ze8Gh9pYbJWQXx05E/cH8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSv6VgrzvSk; Tue, 1 Aug 2023 22:26: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 371MQ7FM045565; Tue, 1 Aug 2023 22:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQ7Rh045564; Tue, 1 Aug 2023 22:26:07 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:07 GMT Message-Id: <202308012226.371MQ7Rh045564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 76b2e3907ced - main - cam xpt_*nounce_periph*: Various fixes for periphs without a protocol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76b2e3907cede6456897d2f950911d45ae627d8b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=76b2e3907cede6456897d2f950911d45ae627d8b commit 76b2e3907cede6456897d2f950911d45ae627d8b Author: John Baldwin AuthorDate: 2023-08-01 22:20:25 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:20:25 +0000 cam xpt_*nounce_periph*: Various fixes for periphs without a protocol If the periph doesn't have a valid protocol, these routines emit fallback messages. However, the fallback messages duplicated the periph name and unit number, and in the case of *denounce* included a spurious newline. Reviewed by: mav, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41177 --- sys/cam/cam_xpt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index b85da5f30a3b..61d24c120841 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1067,9 +1067,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string) if (proto) proto->ops->announce(path->device); else - printf("%s%d: Unknown protocol device %d\n", - periph->periph_name, periph->unit_number, - path->device->protocol); + printf("Unknown protocol device %d\n", path->device->protocol); if (path->device->serial_num_len > 0) { /* Don't wrap the screen - print only the first 60 chars */ printf("%s%d: Serial Number %.60s\n", periph->periph_name, @@ -1124,8 +1122,7 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb, if (proto) proto->ops->announce_sbuf(path->device, sb); else - sbuf_printf(sb, "%s%d: Unknown protocol device %d\n", - periph->periph_name, periph->unit_number, + sbuf_printf(sb, "Unknown protocol device %d\n", path->device->protocol); if (path->device->serial_num_len > 0) { /* Don't wrap the screen - print only the first 60 chars */ @@ -1191,9 +1188,7 @@ xpt_denounce_periph(struct cam_periph *periph) if (proto) proto->ops->denounce(path->device); else - printf("%s%d: Unknown protocol device %d\n", - periph->periph_name, periph->unit_number, - path->device->protocol); + printf("Unknown protocol device %d", path->device->protocol); if (path->device->serial_num_len > 0) printf(" s/n %.60s", path->device->serial_num); printf(" detached\n"); @@ -1231,8 +1226,7 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) if (proto) proto->ops->denounce_sbuf(path->device, sb); else - sbuf_printf(sb, "%s%d: Unknown protocol device %d\n", - periph->periph_name, periph->unit_number, + sbuf_printf(sb, "Unknown protocol device %d", path->device->protocol); if (path->device->serial_num_len > 0) sbuf_printf(sb, " s/n %.60s", path->device->serial_num); From nobody Tue Aug 1 22:26: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 4RFqTQ1Tdhz4pwpL; Tue, 1 Aug 2023 22:26: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 4RFqSz2Szcz3hXY; Tue, 1 Aug 2023 22:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uglN0a4of9G9dUJOkv9w86BWxwd5ZSV75DYnon97YuQ=; b=o7mvuMn7uZARhTCXqzkslfrftAirGUPf1A0+n+0KG7UijQgF1VEcpZS2wbREtZ4ciPa0Vf ykERS70IiDFrlRnfRFKps4UzV/oDO7xQUPMwfRyKJjfr2Uhc20+E5Cj20lNbw3nDqqFeTm ccwOk4Pj5ml5BlUSacbXJBMKCTEEFfcNVpId+Plg3Emo272kUVIPBUQ+WJzG9d+oWQS3s7 ZZZtzB2dohxKOjLn5vHBPlwH5c7UJbgS7ezJlh75cw0l344nK01/hUuqeA48Y/GO1woDmD XUEuZ+wgNDA7SIegmJ5LrtKY2SD+WuPkoycD3Bl417fJdJDzYIQDtsZHRr1s/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928771; a=rsa-sha256; cv=none; b=Fy0UVuLflev/1UasY5NO0/O9W3K/aW3K0yG5SgilcijAbaIAC7f0CNrD452erZpzw7HWOU y+xi7ZVt0ohiV1oMW7F3mNue5GYEMKhU4TXlupvEYevWPiBAGswiGUHXw+hFnLBY2nI/gm PN6EOuOkTNu6qsUu76xhJnvn4yDW/mHL+KDyGt6KN+WobD2faHu//vxSA902kqy7euBaE6 zLBKf/F4Dh4c1rEIGn1L958g1LXyiPqJWlImJ6gtAfIH3iuU+RkgYBTCGAT0XDY+GfwLsZ iGn2TC6P8B2/Q4dTHi3gZM1nnf6Y9d79c12KAnE7Rgo3pAuXEd6a/ZnXjo3Tbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uglN0a4of9G9dUJOkv9w86BWxwd5ZSV75DYnon97YuQ=; b=gbS4SaJEN5rk/G0Wp08WtV0WeQ0GJdCY1IG9CpXcjzP658xsMIOyRbTCWF3Y0HNP1iTwMI DFOOyr8gDUZ9PwoLLnEceDerNcnTY4ZwB9ymq1QazquNncK0q+/FooQysCwWJDB5psxkEC se84hpuIuOjTIbHE8W+LB542KqSF22gRe6Qm9pdqOfIfeIi2YNAayyKzwudvrUu+6IxHgi f6Vw/z3P0tX4QYrCJk1AGmxfQKyarGRjbR3+K93XQFLGW2bB1sEUFoAXcndEnZU59j7fU2 GTyDq/CJN6fNsP7WHnb6Lo9vp2vVcDGaWnOfOu1OH5AeaJgtwUiDWK+SJIYzIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSz1HjZzvd8; Tue, 1 Aug 2023 22:26: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 371MQBKC045628; Tue, 1 Aug 2023 22:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQBu6045627; Tue, 1 Aug 2023 22:26:11 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:11 GMT Message-Id: <202308012226.371MQBu6045627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b82711764cd9 - main - cam_xpt: Remove fallbacks for non-sbuf protocol methods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b82711764cd90e008335dc59280f64820a32cc95 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b82711764cd90e008335dc59280f64820a32cc95 commit b82711764cd90e008335dc59280f64820a32cc95 Author: John Baldwin AuthorDate: 2023-08-01 22:24:10 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:24:10 +0000 cam_xpt: Remove fallbacks for non-sbuf protocol methods This includes removing the kern.cam.announce_nosbuf sysctl. Reviewed by: mav, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41262 --- sys/cam/cam_xpt.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 61d24c120841..e7248cf76d19 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -110,7 +110,6 @@ struct xpt_softc { TAILQ_HEAD(, ccb_hdr) ccb_scanq; int buses_to_config; int buses_config_done; - int announce_nosbuf; /* * Registered buses @@ -168,8 +167,6 @@ SYSCTL_INT(_kern_cam, OID_AUTO, boot_delay, CTLFLAG_RDTUN, &xsoftc.boot_delay, 0, "Bus registration wait time"); SYSCTL_UINT(_kern_cam, OID_AUTO, xpt_generation, CTLFLAG_RD, &xsoftc.xpt_generation, 0, "CAM peripheral generation count"); -SYSCTL_INT(_kern_cam, OID_AUTO, announce_nosbuf, CTLFLAG_RWTUN, - &xsoftc.announce_nosbuf, 0, "Don't use sbuf for announcements"); struct cam_doneq { struct mtx_padalign cam_doneq_mtx; @@ -1097,18 +1094,6 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb, cam_periph_assert(periph, MA_OWNED); periph->flags |= CAM_PERIPH_ANNOUNCED; - /* Fall back to the non-sbuf method if necessary */ - if (xsoftc.announce_nosbuf != 0) { - xpt_announce_periph(periph, announce_string); - return; - } - proto = xpt_proto_find(path->device->protocol); - if (((proto != NULL) && (proto->ops->announce_sbuf == NULL)) || - (path->bus->xport->ops->announce_sbuf == NULL)) { - xpt_announce_periph(periph, announce_string); - return; - } - sbuf_printf(sb, "%s%d at %s%d bus %d scbus%d target %d lun %jx\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1118,7 +1103,7 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb, path->target->target_id, (uintmax_t)path->device->lun_id); sbuf_printf(sb, "%s%d: ", periph->periph_name, periph->unit_number); - + proto = xpt_proto_find(path->device->protocol); if (proto) proto->ops->announce_sbuf(path->device, sb); else @@ -1157,11 +1142,6 @@ void xpt_announce_quirks_sbuf(struct cam_periph *periph, struct sbuf *sb, int quirks, char *bit_string) { - if (xsoftc.announce_nosbuf != 0) { - xpt_announce_quirks(periph, quirks, bit_string); - return; - } - if (quirks != 0) { sbuf_printf(sb, "%s%d: quirks=0x%b\n", periph->periph_name, periph->unit_number, quirks, bit_string); @@ -1202,17 +1182,6 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) cam_periph_assert(periph, MA_OWNED); - /* Fall back to the non-sbuf method if necessary */ - if (xsoftc.announce_nosbuf != 0) { - xpt_denounce_periph(periph); - return; - } - proto = xpt_proto_find(path->device->protocol); - if ((proto != NULL) && (proto->ops->denounce_sbuf == NULL)) { - xpt_denounce_periph(periph); - return; - } - sbuf_printf(sb, "%s%d at %s%d bus %d scbus%d target %d lun %jx\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1222,7 +1191,7 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) path->target->target_id, (uintmax_t)path->device->lun_id); sbuf_printf(sb, "%s%d: ", periph->periph_name, periph->unit_number); - + proto = xpt_proto_find(path->device->protocol); if (proto) proto->ops->denounce_sbuf(path->device, sb); else From nobody Tue Aug 1 22:26: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 4RFqTQ0sm8z4pwk6; Tue, 1 Aug 2023 22:26: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 4RFqSy2HFHz3hlq; Tue, 1 Aug 2023 22:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLPTplebUJJuL+4W5XJUjkiRIXoYQ/3gbTpemUuRd8M=; b=VuGjFohkPfMH2fm7SxO3CdR3aGhDLYIiwKM0gvtvRdh7NCvwpaA+55HsQlK/aQwMFWdLti NrlHVX5JAf6syebHb3NkecXGlmuGvmmI31MG49/YE6XX9gq/AcSzOPEKIZ9oieh1OO8uuK 9VJzsQI8HaMG8F1tHpr8owBLCNby8yaHtAKMbY/q+Li9716NsGn8PJ5Fmv2oHIluyolyrH /cLDo4Q+DrNCzt7R6UvZEdrHSIbTLV3q3G8++lJu2k8CaQ5ssETXlEluKm8NJgVzV1bGd7 zzKD6O4T9rvrtZDLUp3XLladTzY43mV31nQl2hcPzJa2bXeXL2udSJTVmpoG8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928770; a=rsa-sha256; cv=none; b=cZajWQVWo+1Hn5KwugLJShryNLKBCQMlnuKeekHBMNRKxVQs1zUVgZU6odoIBOg/U6it/a hhea9qWIoHoYvRtpF1n8O8PG0kiL+aK2U53l/CJ+aSPX2Q2W+iPA+1otT22GbW9RR4Ns7W EoCuET7LOLlx7AdqGDUja+DxTFDJ9et5wYzt/fv0TuVprEK3K71pWLvo8KDhp0Il/Qnijm MJxb7F1Wz47eaRvPw7zamJGnKqnejhy/W6aZEqpGHKm75byq/13a6PeI9l0v+InPZNUVwr H5sBPdhMRjy96rCUcxNHUlzJtkI7ITTGhc0zqNz9fYPd5Z8HdBo8x1aJQoHt4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLPTplebUJJuL+4W5XJUjkiRIXoYQ/3gbTpemUuRd8M=; b=aUX2TWKvAnHPiWUBt25UfoY1uYANQDrQK0sUdKev/bVhscvAYi0vz0W4K26leBr8Nc3ZnV Hi1yXSe4oRsXNldd6ZQ6mTytN6s28WLPx4d67ycbZdPfhQzRc7ssXRohASQ6vUDLa39/d0 r83yo2HTjLs0aHGXkBkcdnnYPd2SCXCiSUD+A5AsBexBX+Sjzz1LOY1oWzzxqZQgxzbmuJ 6Xkz6HbjmNMy5/eaqwcmDgnNfS7rZ2zKgPU16vI5r6ow/WtUE8LjG2t7uW/aK+UWVkhiiB VgSgePIVX4QmZfatt1je4QpCZAkcye31kApUeOs8s9TAZ48okroSCAssB8hOug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSy18rbzvd7; Tue, 1 Aug 2023 22:26: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 371MQAA9045604; Tue, 1 Aug 2023 22:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQAKg045603; Tue, 1 Aug 2023 22:26:10 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:10 GMT Message-Id: <202308012226.371MQAKg045603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7eb538974c49 - main - cam mmc_xpt/nvme_xpt: Add _sbuf variants of {an,de}nounce xport and proto ops List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb538974c49857a590c79c91f1e4f1c107b5f7d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb538974c49857a590c79c91f1e4f1c107b5f7d commit 7eb538974c49857a590c79c91f1e4f1c107b5f7d Author: John Baldwin AuthorDate: 2023-08-01 22:23:25 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:23:25 +0000 cam mmc_xpt/nvme_xpt: Add _sbuf variants of {an,de}nounce xport and proto ops Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41261 --- sys/cam/mmc/mmc_xpt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ sys/cam/nvme/nvme_xpt.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 8fee7b4cad58..0930717b0a2a 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -74,6 +74,8 @@ static void mmc_dev_async(uint32_t async_code, struct cam_eb *bus, static void mmc_action(union ccb *start_ccb); static void mmc_dev_advinfo(union ccb *start_ccb); static void mmc_announce_periph(struct cam_periph *periph); +static void mmc_announce_periph_sbuf(struct cam_periph *periph, + struct sbuf *sb); static void mmc_scan_lun(struct cam_periph *periph, struct cam_path *path, cam_flags flags, union ccb *ccb); @@ -84,7 +86,9 @@ static void mmcprobe_cleanup(struct cam_periph *periph); static void mmcprobe_done(struct cam_periph *periph, union ccb *done_ccb); static void mmc_proto_announce(struct cam_ed *device); +static void mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb); static void mmc_proto_denounce(struct cam_ed *device); +static void mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb); static void mmc_proto_debug_out(union ccb *ccb); typedef enum { @@ -148,6 +152,7 @@ static struct xpt_xport_ops mmc_xport_ops = { .action = mmc_action, .async = mmc_dev_async, .announce = mmc_announce_periph, + .announce_sbuf = mmc_announce_periph_sbuf, }; #define MMC_XPT_XPORT(x, X) \ @@ -162,7 +167,9 @@ MMC_XPT_XPORT(mmc, MMCSD); static struct xpt_proto_ops mmc_proto_ops = { .announce = mmc_proto_announce, + .announce_sbuf = mmc_proto_announce_sbuf, .denounce = mmc_proto_denounce, + .denounce_sbuf = mmc_proto_denounce_sbuf, .debug_out = mmc_proto_debug_out, }; @@ -399,6 +406,29 @@ mmc_announce_periph(struct cam_periph *periph) ("XPT info: CLK %04d, ...\n", cts.proto_specific.mmc.ios.clock)); } +static void +mmc_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) +{ + struct ccb_pathinq cpi; + struct ccb_trans_settings cts; + struct cam_path *path = periph->path; + + cam_periph_assert(periph, MA_OWNED); + + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph")); + + memset(&cts, 0, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb*)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) + return; + xpt_path_inq(&cpi, periph->path); + CAM_DEBUG(path, CAM_DEBUG_INFO, + ("XPT info: CLK %04d, ...\n", cts.proto_specific.mmc.ios.clock)); +} + void mmccam_start_discovery(struct cam_sim *sim) { @@ -480,6 +510,12 @@ mmc_proto_announce(struct cam_ed *device) sbuf_putbuf(&sb); } +static void +mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) +{ + mmc_print_ident(&device->mmc_ident_data, sb); +} + static void mmc_proto_denounce(struct cam_ed *device) { @@ -487,6 +523,12 @@ mmc_proto_denounce(struct cam_ed *device) mmc_proto_announce(device); } +static void +mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) +{ + mmc_proto_announce_sbuf(device, sb); +} + static void mmc_proto_debug_out(union ccb *ccb) { diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 0662f476536c..d2968d1019d1 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -157,8 +157,14 @@ static void nvme_dev_async(uint32_t async_code, void *async_arg); static void nvme_action(union ccb *start_ccb); static void nvme_announce_periph(struct cam_periph *periph); +static void nvme_announce_periph_sbuf(struct cam_periph *periph, + struct sbuf *sb); static void nvme_proto_announce(struct cam_ed *device); +static void nvme_proto_announce_sbuf(struct cam_ed *device, + struct sbuf *sb); static void nvme_proto_denounce(struct cam_ed *device); +static void nvme_proto_denounce_sbuf(struct cam_ed *device, + struct sbuf *sb); static void nvme_proto_debug_out(union ccb *ccb); static struct xpt_xport_ops nvme_xport_ops = { @@ -166,6 +172,7 @@ static struct xpt_xport_ops nvme_xport_ops = { .action = nvme_action, .async = nvme_dev_async, .announce = nvme_announce_periph, + .announce_sbuf = nvme_announce_periph_sbuf, }; #define NVME_XPT_XPORT(x, X) \ static struct xpt_xport nvme_xport_ ## x = { \ @@ -181,7 +188,9 @@ NVME_XPT_XPORT(nvme, NVME); static struct xpt_proto_ops nvme_proto_ops = { .announce = nvme_proto_announce, + .announce_sbuf = nvme_proto_announce_sbuf, .denounce = nvme_proto_denounce, + .denounce_sbuf = nvme_proto_denounce_sbuf, .debug_out = nvme_proto_debug_out, }; static struct xpt_proto nvme_proto = { @@ -783,14 +792,12 @@ nvme_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target, } static void -nvme_announce_periph(struct cam_periph *periph) +nvme_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) { struct ccb_pathinq cpi; struct ccb_trans_settings cts; struct cam_path *path = periph->path; struct ccb_trans_settings_nvme *nvmex; - struct sbuf sb; - char buffer[120]; cam_periph_assert(periph, MA_OWNED); @@ -805,20 +812,29 @@ nvme_announce_periph(struct cam_periph *periph) /* Ask the SIM for its base transfer speed */ xpt_path_inq(&cpi, periph->path); - sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); - sbuf_printf(&sb, "%s%d: nvme version %d.%d", + sbuf_printf(sb, "%s%d: nvme version %d.%d", periph->periph_name, periph->unit_number, NVME_MAJOR(cts.protocol_version), NVME_MINOR(cts.protocol_version)); if (cts.transport == XPORT_NVME) { nvmex = &cts.proto_specific.nvme; if (nvmex->valid & CTS_NVME_VALID_LINK) - sbuf_printf(&sb, + sbuf_printf(sb, " x%d (max x%d) lanes PCIe Gen%d (max Gen%d) link", nvmex->lanes, nvmex->max_lanes, nvmex->speed, nvmex->max_speed); } - sbuf_printf(&sb, "\n"); + sbuf_printf(sb, "\n"); +} + +static void +nvme_announce_periph(struct cam_periph *periph) +{ + struct sbuf sb; + char buffer[120]; + + sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN); + nvme_announce_periph_sbuf(periph, &sb); sbuf_finish(&sb); sbuf_putbuf(&sb); } @@ -835,6 +851,12 @@ nvme_proto_announce(struct cam_ed *device) sbuf_putbuf(&sb); } +static void +nvme_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb) +{ + nvme_print_ident(device->nvme_cdata, device->nvme_data, sb); +} + static void nvme_proto_denounce(struct cam_ed *device) { @@ -847,6 +869,12 @@ nvme_proto_denounce(struct cam_ed *device) sbuf_putbuf(&sb); } +static void +nvme_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb) +{ + nvme_print_ident_short(device->nvme_cdata, device->nvme_data, sb); +} + static void nvme_proto_debug_out(union ccb *ccb) { From nobody Tue Aug 1 22:39: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 4RFqmm6ryHz4pxT2; Tue, 1 Aug 2023 22:39:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFqmZ30KCz3jPD; Tue, 1 Aug 2023 22:39:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690929582; h=from:from:reply-to:subject: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=lhO0/TInffEeaPU6eAJUgRV/b9o2M7YwrG/E/arE5EQ=; b=CK6H2EHEIGqGqgd6feit064EVnOAcbwgCyEAqKAisynWaSl9pa8l/NbKKEJjfxGYSU0adG 14HZm9/kTmyzGclIVisY64L0FUAXJOYC1BjUik6RN9ObcHCkbTKhqPXalAFA/xsleNZ19F YLcYlZxyi2wbn6491SiCCggVvYqYOUOVf40p4I6FsHqctZmmxhcQeDZIP+rNGknenX5kds H1g0/cwSkVVDg2sU6lw6PpNYxzxaspmvkPVM/L09CpIPzDdqltBkju0txDRn1KMdlSeg43 tDtUJuJt8vSbqXciV9nZNqptj05cw4xcLKw+4ux70Sv918FeZKVOsuK76je5Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690929582; a=rsa-sha256; cv=none; b=GZIhjGwFbhEi4qowHEj/qBava+RCv+ttBhjBcC+VMBBC/FsWYnefkpaCsoOcZpmjQiOzIt mvnGoKXkZ076PXqpRra2RH2a9+skkAG89E0fs3ii7RkoO7tbgsAohQ+Aewfy96YZqY7RAR qTkTn5ZuC7+Dyy0T3BMdPZVKKkt84ghYSETCoEMH4NzH+aVyu1LBRUcSRjXqoOg0qUMLS1 FMblUKAaebkjP64HaByZwkd+8dPdcxS8HjYlp+yaq/rBaCEbzqZ+P/Eiy24BaIsJp01/rF /Q3au9RBcbqxPUHcoWVxX6+umpadLrfuc8YaMcGrqIrM8Y1Ra2fh61ThJuidNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690929582; h=from:from:reply-to:subject: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=lhO0/TInffEeaPU6eAJUgRV/b9o2M7YwrG/E/arE5EQ=; b=Ov4pTvau0+Ult/Hsl8jQvUt4tOurgPFr0Ks/QFiqnLBxHVac28qU+AejqaCRrNsScxhW8P JL/jZEJ4NkKHfDNKP1Kl0h8FBFIPiV7YA7aQqsZnxLVieWlCLx0Aukatlro7ysSWB218OO ZCOZcjtjP79vulEcqdYK85IDPAzZIW5nQSB9fHaR/ww6Z53Cfwh1qdu6arlVIUtqfZZ537 phmv59gFFfP6YuvxwvchgKU4MIIUtWstHhQRc61NedGvuRuKvxKLerwTRphjttJMuwNAK/ 2vEUD5BA9uGWkthe6Z45M47l7ZzshLgkfBe0EtVNxA/rKsKLssa/juEkdmTFJA== Received: from [IPV6:2601:648:8680:16b0:b0ff:f16f:f461:fc58] (unknown [IPv6:2601:648:8680:16b0:b0ff:f16f:f461:fc58]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RFqmY2DmtzyBD; Tue, 1 Aug 2023 22:39:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <3b8ad00b-0075-889e-2842-73f09426926b@FreeBSD.org> Date: Tue, 1 Aug 2023 15:39:38 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: c65679143f82 - main - arm64: Decode the ID_AA64MMFR3_EL1 register Content-Language: en-US To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307281208.36SC85hG062153@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202307281208.36SC85hG062153@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 7/28/23 5:08 AM, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c65679143f82e28b3aa078f16311350c31a33776 > > commit c65679143f82e28b3aa078f16311350c31a33776 > Author: Andrew Turner > AuthorDate: 2023-07-06 13:28:23 +0000 > Commit: Andrew Turner > CommitDate: 2023-07-28 11:53:02 +0000 > > arm64: Decode the ID_AA64MMFR3_EL1 register > > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D40893 This (and some following commits) broke the aarch64 build jobs on GitHub. I wonder if these registers are unknown by clang versions older than LLVM16 or LLVM15? The cross-build jobs use clang 12/13/14. The errors: bmake[2]: "/home/runner/work/freebsd-src/build/home/runner/work/freebsd-src/freebsd-src/arm64.aarch64/sys/GENERIC/Makefile" line 47: warning: "Compiler is too old to support PERTHREAD_SSP" /home/runner/work/freebsd-src/freebsd-src/sys/arm64/arm64/identcpu.c:2707:23: error: expected readable system register desc->id_aa64mmfr3 = READ_SPECIALREG(id_aa64mmfr3_el1); ^ ./machine/armreg.h:74:19: note: expanded from macro 'READ_SPECIALREG' __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (_val)); \ ^ :1:10: note: instantiated into assembly here mrs x9, id_aa64mmfr3_el1 ^ /home/runner/work/freebsd-src/freebsd-src/sys/arm64/arm64/identcpu.c:2708:23: error: expected readable system register desc->id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); ^ ./machine/armreg.h:74:19: note: expanded from macro 'READ_SPECIALREG' __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (_val)); \ ^ :1:10: note: instantiated into assembly here mrs x9, id_aa64mmfr4_el1 ^ /home/runner/work/freebsd-src/freebsd-src/sys/arm64/arm64/identcpu.c:2711:22: error: expected readable system register desc->id_aa64pfr2 = READ_SPECIALREG(id_aa64pfr2_el1); ^ ./machine/armreg.h:74:19: note: expanded from macro 'READ_SPECIALREG' __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (_val)); \ ^ :1:10: note: instantiated into assembly here mrs x9, id_aa64pfr2_el1 ^ 3 errors generated. --- identcpu.o --- *** [identcpu.o] Error code 1 bmake[2]: stopped in /home/runner/work/freebsd-src/build/home/runner/work/freebsd-src/freebsd-src/arm64.aarch64/sys/GENERIC 1 error -- John Baldwin From nobody Tue Aug 1 22:48: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 4RFqyk4wShz4pxqj for ; Tue, 1 Aug 2023 22:48:27 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFqyc30qTz3jTP for ; Tue, 1 Aug 2023 22:48:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fbc12181b6so66869245e9.2 for ; Tue, 01 Aug 2023 15:48:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690930102; x=1691534902; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O87qDr4BOHaUCvs6tiN31l9JVtOjW9QsXANUttWZm58=; b=AkIG32e6Rv7i6t1htxWzGUpU58VPFAZqg3tk0Ea/Vj8oo3SgfzsH1Btv5zbOsJJORd gzi76TJvIWwtQSnO2Nk889gvtsgAfV0bUzVfPOMPzkJ+Ona1LDDg3dqUsxLyiOiWuk8X aVPKoL2X97EDEp3ak5cJckQGi9PAwdL2ME/ztOXuCeh+FGBLnl/Z9HHVbcrkG69rOqk7 Nkz1Jq5AcE6klpuWwWuC1jGSdyymH3gSAG3VG2/NHJo8aqtNNsGyAVRKxsiUkbYanJWO V+k/IIUinIqOQhqqnvdjAuTCmo+347MgY7zyFzUBx6ZAMa7mSO9yRGph27Tb54ZkhTv7 2w+g== X-Gm-Message-State: ABy/qLbddrMmhAmTZGfsDXo4fEAruzxVZjwhrwuPqpV0O3h1OcSZxx48 0D5NxizaJmy1nI6iz6rAThkJJA== X-Google-Smtp-Source: APBJJlGRtv3ta1uwy8uqcbgdoobqvi36PoGfxGFgfUZ566gU/MEhr7WZ4BTvHx3j6kKzt1VdqMQOug== X-Received: by 2002:a7b:cbd4:0:b0:3fe:1232:93fa with SMTP id n20-20020a7bcbd4000000b003fe123293famr3710944wmi.22.1690930102399; Tue, 01 Aug 2023 15:48:22 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id s4-20020a05600c044400b003fe24681b10sm104320wmb.28.2023.08.01.15.48.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 15:48:22 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: c65679143f82 - main - arm64: Decode the ID_AA64MMFR3_EL1 register From: Jessica Clarke In-Reply-To: <202307281208.36SC85hG062153@gitrepo.freebsd.org> Date: Tue, 1 Aug 2023 23:48:11 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307281208.36SC85hG062153@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3731.600.7) X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.49:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.49:from] X-Rspamd-Queue-Id: 4RFqyc30qTz3jTP X-Spamd-Bar: -- On 28 Jul 2023, at 13:08, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc65679143f82e28b3aa078f16311350c= 31a33776 >=20 > commit c65679143f82e28b3aa078f16311350c31a33776 > Author: Andrew Turner > AuthorDate: 2023-07-06 13:28:23 +0000 > Commit: Andrew Turner > CommitDate: 2023-07-28 11:53:02 +0000 >=20 > arm64: Decode the ID_AA64MMFR3_EL1 register >=20 > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D40893 > --- > sys/arm64/arm64/identcpu.c | 39 = +++++++++++++++++++++++++++++++++++++++ > sys/arm64/include/armreg.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 67 insertions(+) >=20 > diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c > index 7117e48ee061..047bb07dc337 100644 > --- a/sys/arm64/arm64/identcpu.c > +++ b/sys/arm64/arm64/identcpu.c > @@ -139,6 +139,7 @@ struct cpu_desc { > uint64_t id_aa64mmfr0; > uint64_t id_aa64mmfr1; > uint64_t id_aa64mmfr2; > + uint64_t id_aa64mmfr3; > uint64_t id_aa64pfr0; > uint64_t id_aa64pfr1; > uint64_t id_aa64zfr0; > @@ -1265,6 +1266,37 @@ static const struct mrs_field = id_aa64mmfr2_fields[] =3D { > }; >=20 >=20 > +/* ID_AA64MMFR2_EL1 */ You have a copy/paste error here. Jess From nobody Tue Aug 1 22:48: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 4RFqzX5scFz4pxxS for ; Tue, 1 Aug 2023 22:49:09 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFqzR73d3z3jck for ; Tue, 1 Aug 2023 22:49:07 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3fe1e1142caso29848685e9.0 for ; Tue, 01 Aug 2023 15:49:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690930146; x=1691534946; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DcRZHV797KlToontmaS9zzp/zgQzwYOBdKgwyh83oS8=; b=E0lqlTkUoiXV9hFbCI5GQaNRaBOY3F25YYQMJzAOFqTardC6MXiJRpKgImUg03pJAR LXFDZHBUiGDAd9wHUK2luo4nqpEgSJYZ/7PUJxsoMXBKh5XdXyuQrOvbH2GZhQwjn33J Ek1fc57VtXTgoRnqNwtE+/5x6njFrPq5A8qQ0kMmKR2I3LH2go7+KDJJxLj1PEaKycE3 8oanL35LnIhPMdg2HUHZCXaDxwMSrvakcCVtvZq7q8mJVH0R9L/1ZhzkZA+M+eY0jAh7 j4YDXFe3Y+lyWMfzJWkqLqSU1ylg2c4mOYl9zov1hcgIMCNi1eB8C+pqDhgcKtb7xnQ6 GlOQ== X-Gm-Message-State: ABy/qLZ+yGqF/LJUPxux3WAKoGdcuaI4twiOCsDtnE2Ul4aI6bVrfSqb Q30yUrnuL2LTdm1X9DvnPVdoQg== X-Google-Smtp-Source: APBJJlFnHf31B7GeOspasGpJzj5ZWgP68CfBPGx8jjFbIpg4Flw9H6D94dXHneKSclwXNnJy67HEQA== X-Received: by 2002:a1c:f211:0:b0:3f4:d18f:b2fb with SMTP id s17-20020a1cf211000000b003f4d18fb2fbmr3533622wmc.8.1690930146231; Tue, 01 Aug 2023 15:49:06 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id s4-20020a05600c044400b003fe24681b10sm104320wmb.28.2023.08.01.15.49.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2023 15:49:05 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: c65679143f82 - main - arm64: Decode the ID_AA64MMFR3_EL1 register From: Jessica Clarke In-Reply-To: <3b8ad00b-0075-889e-2842-73f09426926b@FreeBSD.org> Date: Tue, 1 Aug 2023 23:48:55 +0100 Cc: Andrew Turner , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307281208.36SC85hG062153@gitrepo.freebsd.org> <3b8ad00b-0075-889e-2842-73f09426926b@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RFqzR73d3z3jck X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 1 Aug 2023, at 23:39, John Baldwin wrote: >=20 > On 7/28/23 5:08 AM, Andrew Turner wrote: >> The branch main has been updated by andrew: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc65679143f82e28b3aa078f16311350c= 31a33776 >> commit c65679143f82e28b3aa078f16311350c31a33776 >> Author: Andrew Turner >> AuthorDate: 2023-07-06 13:28:23 +0000 >> Commit: Andrew Turner >> CommitDate: 2023-07-28 11:53:02 +0000 >> arm64: Decode the ID_AA64MMFR3_EL1 register >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D40893 >=20 > This (and some following commits) broke the aarch64 build jobs on = GitHub. > I wonder if these registers are unknown by clang versions older than = LLVM16 > or LLVM15? The cross-build jobs use clang 12/13/14. 16 for these: = https://github.com/llvm/llvm-project/commit/2050e7ebe18cc4cf906d9b54d17ee8= 85cd868327 Jess From nobody Tue Aug 1 23:15: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 4RFrZL0CV7z4q0F3; Tue, 1 Aug 2023 23:15: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 4RFrZ94dmwz3lRy; Tue, 1 Aug 2023 23:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690931745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b56zOBRX6ygkYAYAglgauIyyHymFEN6sHpBWhBP6Dg0=; b=xaiDzHmO2HT5zb5QoruUGFBK1xHSibW+glf4kulxEWnazXN+LcLxcFnLjCprWve30QT28W NVgGm6z8kMorxcbTC7iK82PPeqleaoQEy0+8XCIl20Oi23h9eFnoZpJtTpteJHvlWVR76N +XCxrRXt00O40CQGsPy2YQhAU7A6X3mGjwsu1hbQQ043Efx2toZN7BFibqNuY9k8bR5ERZ bnZ2t+NbqdacruwLWXW52zihm7NNlO5m/huxzM4yostii3LphMDmlpDxyETnVx6sGq1VpU VAJ82anUF/7/XLPiNGwZeW76KV9Z9Egp+cWc5wergys4+R3WIFcpoiC5sna8AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690931745; a=rsa-sha256; cv=none; b=fOa26wNSUg3u8wH3GLjc3WQ7mRzGCSmRMpAEpESGDQQwgU0Ms3ndaxioOaIzwN3dNjtwXC JrEadXJMZ586Aw2M6/mCuVE3FzUYoRfAPDnSqnbk77TOtEmZvLGu48kJs6ltnl1dwYttO/ yTtJW5h+kn8dl0Ei8pRQZXyCJZrjCHawtSFz8cgTa3WZjMPNgKrV7d7OcMAJRNtRVJXsiE kF/rMneZLmmAKchJ5L+mgh7rphe+YOlKy3gSUK/5UIJkYpapUuC+3ZltbGlMezE9NvvYXU JZkCshBqxSXFgdsjfC32uGdXxzCX4m3XJqFenBPojs1N07gsnR3dx1G4NvJDzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690931745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b56zOBRX6ygkYAYAglgauIyyHymFEN6sHpBWhBP6Dg0=; b=cvwn2HacGKRL8bN3m5gu56eGvc3pWYJT5Qx1k1XqeEabD39N68m8grgnFPabw94hDsa6T+ Dfe71AW34jSBc4laKC1FO73TXHDQfogfVWugftCobBV7KT72y7KbVkKCJ5wlMph6fcwqkh FjKerV2pIDvkL3tAOEXl2QOnaplxFxvS9c25BBQpu1xtBMs3aU5BzmmXqrGm7bi6CUVXPr gAlXwe85tzyu2LzB8xNUNNOXDUK6K1VBI30OhrfxaWT67PEOWILcd/4BuL+wRtjjS5Z3Cu Lvmd1jmia6t8/GSnif0x0qI/zvXQmYtMvXOeJOQeqve9+8/sjI76yCCZDqFUww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFrZ85DTwzwRS; Tue, 1 Aug 2023 23:15: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 371NFifi029022; Tue, 1 Aug 2023 23:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371NFiTV029021; Tue, 1 Aug 2023 23:15:44 GMT (envelope-from git) Date: Tue, 1 Aug 2023 23:15:44 GMT Message-Id: <202308012315.371NFiTV029021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 83453b46e8c2 - main - mmc_xpt: Update function name in debug trace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83453b46e8c2cec2d22a7eef029020d353be6007 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=83453b46e8c2cec2d22a7eef029020d353be6007 commit 83453b46e8c2cec2d22a7eef029020d353be6007 Author: John Baldwin AuthorDate: 2023-08-01 23:14:58 +0000 Commit: John Baldwin CommitDate: 2023-08-01 23:14:58 +0000 mmc_xpt: Update function name in debug trace Reported by: mav Fixes: 7eb538974c49 cam mmc_xpt/nvme_xpt: Add _sbuf variants of {an,de}nounce xport and proto ops --- sys/cam/mmc/mmc_xpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 406b91df2e35..fec4981a7734 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -386,7 +386,7 @@ mmc_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) cam_periph_assert(periph, MA_OWNED); - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph")); + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph_sbuf")); memset(&cts, 0, sizeof(cts)); xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); From nobody Tue Aug 1 23:46: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 4RFsFW18J2z4q1Vy; Tue, 1 Aug 2023 23:46:21 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFsFR04GFz3mhR; Tue, 1 Aug 2023 23:46:18 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6B0623200583; Tue, 1 Aug 2023 19:46:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 01 Aug 2023 19:46:17 -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=fm3; t= 1690933576; x=1691019976; bh=s4bqXjZlX/CGH+CjEW1j4JwKn0A4LpD/5Qa ApqXWE0U=; b=soenB0fYHQhUCMZ5jD9alrfMMVf5vs/uXhX8c6dsN4VXoHhRNz4 074Z5DCXJ2jtBezSZ3lmDpwwXA0QHoICZI7M51AZLlEldTW7DS+aiMbGFQ8+txzq PObrYHvWud8E6qdqcurPEblTrcEvkyhQvrR9icoNi43TTSQuI/nOvXVRMIGDLOjY xNkxTsCi/xYkl2wtLYnBLeRvN28bMvxkIlBvkpIKHSzj5v7UDJMxUkcJLRvh/U9e pFpVoF3cZP6MD1SzixmWwAoBaKK70jqjIZ6Av2UaeNI++c2E0q3TcBDS7Oew9C8Z y3thBbAECdz46aL5gvKt/WyBKicSoiXzrqg== 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=fm3; t=1690933576; x= 1691019976; bh=s4bqXjZlX/CGH+CjEW1j4JwKn0A4LpD/5QaApqXWE0U=; b=Q vCOV1Oes0nruC7PQY557w633wbQRtj/TFbgR2jT0wkm8vYZqIHQDCIzWZfiBnIbF lINsdCajz0YAuuCjUq2EkmZM84EU5mZ8Xg6PoVlOOS0l96RuykQGBeHETHV2XqtK ydx797t9S6Ykp05gkFWHnYineTqGVJARMN2RYSQlBjke3yRPuUv6VvdMV1DhEJnu crP/ySkk0D6Rm4LbAL32QQLUn1/JLKp9CIlq8Ar1fUzCa8gQPJRjvQf6YCHHyUDv zzheBubNlxY/SM7/UKmjN60x9poWw2p699ccVu9LRw7cSiUZqh9KG08tSiZDsF5f mYGpxxSWQTI5wWHfEaBgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrjeejgddvhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpegjuhhrihcu oeihuhhrihesrggvthgvrhhnrdhorhhgqeenucggtffrrghtthgvrhhnpefhgeehjeeivd fgfeettdehvdeihfevffffudfgleeuhefhlefggfefjeefudehhfenucffohhmrghinhep fhhrvggvsghsugdrohhrghdpohhpthhsrdhmkhenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpeihuhhrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Aug 2023 19:46:15 -0400 (EDT) Message-ID: Date: Wed, 2 Aug 2023 01:46:13 +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: 5cdaac92e119 - main - dtrace: Revert the addition of WITH_DTRACE_ASAN Content-Language: en-US To: Mark Johnston , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308011703.371H3V7a012823@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202308011703.371H3V7a012823@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4RFsFR04GFz3mhR 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:29838, ipnet:64.147.123.0/24, country:US] Mark Johnston wrote: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaac92e119d41063d4f0155a78a4abe767f15e > > commit 5cdaac92e119d41063d4f0155a78a4abe767f15e > Author: Mark Johnston > AuthorDate: 2023-08-01 17:01:37 +0000 > Commit: Mark Johnston > CommitDate: 2023-08-01 17:03:10 +0000 > > dtrace: Revert the addition of WITH_DTRACE_ASAN > > The follow-up fix triggers a lib32 build failure, revert everything > until the problem is addressed. > --- > cddl/lib/libdtrace/Makefile | 11 ----------- > cddl/usr.sbin/dtrace/Makefile | 5 ----- > cddl/usr.sbin/lockstat/Makefile | 7 ------- > cddl/usr.sbin/plockstat/Makefile | 7 ------- > share/man/man5/src.conf.5 | 5 ----- > share/mk/src.opts.mk | 1 - > tools/build/options/WITH_DTRACE_ASAN | 4 ---- > 7 files changed, 40 deletions(-) I wonder if we should add the ObsoleteFiles entry removing that unfortunate /usr/lib/libdtrace.so.5? From nobody Wed Aug 2 00:37: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 4RFtNJ2Btzz4q2mq; Wed, 2 Aug 2023 00:37: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 4RFtNC4sk6z3pvF; Wed, 2 Aug 2023 00:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=92FHI1KgO9EWMHvygldrtZmMg5vl8nRWaLA9NdmRd5M=; b=jUorMAYC/UCRtASv3op5w4AtRVBbjcrPhUVOd27LEpUFUs+uFT4GB2HN2XZpoQO4XnkqA6 FxbTbdGDsB7OdRze1NTBn3j6xc5P8xDOzauAj2oxZPRf7921UmZeYZVjKQMM8YKowlB+we ljw9yrYC42hLPdSVNblAvfmUarhBd49LsLEbqQn4r9JQClofp2mpaY/88ZSsFEozypr4+1 qzx5/V7/gxA43A64/1sj57pdSCRcwuedxvj2fDD5bfO5U1ke8S+qOv5qKdSJ9kf4eXmeuo DT1utE5x505u5qZWnX6e6kPQj5WuWUw8mB0CoJF/624Dr9IUQAdkVG0b+0Pv1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936635; a=rsa-sha256; cv=none; b=ooRfmp11xZUt7B4dNChqPivwT/CSq33xt4xrlWbqo541GKPUgIcnIeGZBBYqMZVmLOr64l LaXxIM5BR610kGojwigs/Em4tHHIc38a2Cp8GVTzS03VRuU7bgisklmBlrN/i1+gZKMaKO 46TRcGBX9cGRG/hqwXk4XZQ6QZ4UNojcB4UAJ5L0Mw/VmLv3868TYO4mSaHrT+mCgb2YMN Pcm35qkw5JioQKnfX09VH7XDvICe3FDz6dJg/rrmbqzvcTtmqF01kX1UhT9BTdl+6uQlu7 5L6hdE0erWlrYWnuxvnItGt1eoLHhIuX1l+NvduVt2bXzbyaKd83rgmz0TgAmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=92FHI1KgO9EWMHvygldrtZmMg5vl8nRWaLA9NdmRd5M=; b=Vc6v4GdP5T7LJc6FbtDKYd/dTLH6H8XFrfAKexdjtE7Sl1dLILZ1MrFU1smbjhnQteQVJn v5FHLHkTWdnzdvUYlDXkialDUHtG/iBtpY0/RlybxsACcOhJQPTRr7I9ijgWY1OgnOIuI4 CwWA1a2L8SapVpPciuzFpXG588eCJQ21HMYNkVh3Kgj6C6xdrQdbqSFvpJcu0/xMWt+HRq PhIhnK5N4+7iQa5PagOKuqAmKsalMesFSRF/FQCiARggoFkPhrr4uHGcSWq9t0PhbNy7MU QD+ARo2Xe4ax8BTBJtEhyTNH682D0wv8ZrYMpp8xa3+30SKNihFHU/kZU21nVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFtNC1c21zybK; Wed, 2 Aug 2023 00:37: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 3720bFvv060581; Wed, 2 Aug 2023 00:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bFaD060580; Wed, 2 Aug 2023 00:37:15 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:15 GMT Message-Id: <202308020037.3720bFaD060580@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: b619a7f161df - stable/13 - rtld: remove dup __crt_malloc prototypes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b619a7f161dfdaf9775fd52b6e3c9569f9155c54 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b619a7f161dfdaf9775fd52b6e3c9569f9155c54 commit b619a7f161dfdaf9775fd52b6e3c9569f9155c54 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:37:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:39 +0000 rtld: remove dup __crt_malloc prototypes (cherry picked from commit cf6dbdd135072fc2b74e0a10c22474b0282ca122) --- libexec/rtld-elf/rtld.h | 5 ----- libexec/rtld-elf/rtld_malloc.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index ca43b289566f..adf5202b444b 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -425,9 +425,4 @@ void ifunc_init(Elf_Auxinfo[__min_size(AT_COUNT)]); void init_pltgot(Obj_Entry *); void allocate_initial_tls(Obj_Entry *); -void *__crt_calloc(size_t num, size_t size); -void __crt_free(void *cp); -void *__crt_malloc(size_t nbytes); -void *__crt_realloc(void *cp, size_t nbytes); - #endif /* } */ diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 0eec68f35402..6660610b11ce 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -56,6 +56,7 @@ static char *rcsid = "$FreeBSD$"; #include "rtld.h" #include "rtld_printf.h" #include "rtld_paths.h" +#include "rtld_malloc.h" /* * Pre-allocate mmap'ed pages From nobody Wed Aug 2 00:37: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 4RFtNJ2mtSz4q3Cj; Wed, 2 Aug 2023 00:37: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 4RFtND403Vz3pp4; Wed, 2 Aug 2023 00:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RTHpGkjkDu+IqFURzdjzKqZ8uXn7t33SK0mKelRPJU=; b=juUuTd0q1l3G+DtF7csqP5wxsGDO/PDaOHU+PJ2/yZnDIstBEHL1TbNkKKMOCyCsnVPmR8 Gmm7tzKAFzJhnC7g6wXTM2ZhOETjAcUDDoT/+1T7ChkZWvjlRLpLBjGjamVWzfJhVskj55 ZurkkB5duoWEABfrfgrmHvYVfFv5wx23mknEkYwQtazFaAWzf7KyzOkoMTFpppi+gJquNu lyAzuLIk+9WlnIXCm1gX9bmWGbPBOjBMI/tU8bhOuUxoz1T3sSnC+l9GiJQkfAjwaFEy1V Mdb3RQifX5hfZXzhdeU9rxv3hRJ1Ny8Mym8S30p39w/2NhLawM6tX7OObhjfSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936636; a=rsa-sha256; cv=none; b=dLSGjz80nTZtryPDGICbW5nOWWirrjWAjXS1Oaacpdiy1jZO4mN6ozMSOzdCN36+Wd/FrV 5Pqwf2L34DNwPFq5dMMrP0NYGd165xrseoJx9bzW1+naXpCMwWuQlD7hboo4zudeUkS4K3 hO/80rRR9fFN3+Tpf5b3tOTTNbVkQoKcXtyA2g89kj287mJ47ujHWiBgg294ENk/otaoNR l23HjUP8927zOsEbZJB+1nzhabHefAV1k3XzN2by9Gn6JtVYmy4YuoOZPSOaGy0lmWT4Wl LgbyhTVBqVlMninZlcb57bloY8ya9iGZVdyaRf2iwyeluBVOmCsyr7G0mQBglA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RTHpGkjkDu+IqFURzdjzKqZ8uXn7t33SK0mKelRPJU=; b=VH/cfiMkdT2bx1rF1JdFku/aDqn/gRZUSi7MeCP199kogoKvsmTxcH1YPosfw7ON2XEPCj AeNx43/7uoL0fob9bo2dRYpA3JQ3oBfq9MoS2/kSPK7giOPk6omP/cWMpt2aDeNRMHJ/hK JXUcs6Ax3TWR3JGbmVz62DpVr/RRMtV8STZIBAUOTcv0zfEr8sh/qkBoKiGe35bp4KII+7 cyEro3of+MNqjkwV0a/GFB1g23fzkoIOGs6o9WXH5BBEznXwSJdra4hfxmgJDe/BCfMlbE UnzAXgCGgP+WR0RHqoM1sdm29A4wj0mIpVjQtjLuv/rwyfZQi0gmLky9yAJuyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFtND2kLczydn; Wed, 2 Aug 2023 00:37: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 3720bGTh060600; Wed, 2 Aug 2023 00:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bGBx060599; Wed, 2 Aug 2023 00:37:16 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:16 GMT Message-Id: <202308020037.3720bGBx060599@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: 04085d4b69dc - stable/13 - rtld_malloc: only include internal rtld headers when building for rtld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 04085d4b69dc556c42ada27b0ec448ddc896f09a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04085d4b69dc556c42ada27b0ec448ddc896f09a commit 04085d4b69dc556c42ada27b0ec448ddc896f09a Author: Konstantin Belousov AuthorDate: 2023-07-22 04:39:20 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:39 +0000 rtld_malloc: only include internal rtld headers when building for rtld (cherry picked from commit bc7e86106d428c7da328ad7fc9d4cb5f7f303e0e) --- libexec/rtld-elf/rtld_malloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6660610b11ce..45d3f743e348 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -53,9 +53,11 @@ static char *rcsid = "$FreeBSD$"; #include #include #include +#ifdef IN_RTLD #include "rtld.h" #include "rtld_printf.h" #include "rtld_paths.h" +#endif #include "rtld_malloc.h" /* From nobody Wed Aug 2 00:37: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 4RFtNJ2Wqwz4q2kH; Wed, 2 Aug 2023 00:37: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 4RFtNF4wjdz3pcf; Wed, 2 Aug 2023 00:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpbXQvpebPedfNjyGxTca0ewI7WxlehpvZkP8+DuAig=; b=iwpkKwDRHxBXH9Pv/HlMyi/Yz6UDX1nRr6k5K0xUzDMgscnYgyrUfVilhhJARq1Ah02vF/ Kbjd77ZkRQf8GAyQ5eBbuGWQt+jCu4/FiLi4w/oCjwjp8FsPjlANfUXAySof+IDClWx2Qv dCoePXJL5AKyT/clytmR4KfiH3VTyCFrnXQXhYO8BNRyAu1x2n6qbONj3rCZIeeb1C2wmF cuJaQRlnkfeEBd+fLMJu6Hrn4Z86lggYMYU0tgtGdqNNBWt0wNJnoojD5HTao6WxaHVLGx P4Y3AnqhHJ+fuCP9mDWK3cxmhKssGcZ+UqNhgP+Fxc0un0tqSbXzEIuB9MBm2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936637; a=rsa-sha256; cv=none; b=VBfAbq4eVeOpLYoQQeTfazVyuxYQU3NWYLXrSrPcw7Mtz6uBJh/t3vjCx+ELG9phg6QxIJ hHHgikutS9YT253tkUhpt94QffXoayGdo+nNIWSGFDPINh/v8NAoYZiU24FYoBKaWdXXx+ hLsS75smg5VOIJpqstv9dupbTlGJqjIWHqNABkT8/6XxRcbJCd1cn8vDhQJMvXQbZ2RpJu 19Lx8magjam1ON6Hb/kSCfYoyLnQJc1LbLjzfithQplUWUYkqOXZtTbPBePsf7V/cH/KG7 VwusVmO7LESCrEoCY51fsoiKLqfEcBr2Z0X07KsHVlkP0IWwC1pvyBYeOBoXFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpbXQvpebPedfNjyGxTca0ewI7WxlehpvZkP8+DuAig=; b=tx3p6EI6GYX72RWE4xcl8tpTHKfKlI56cSCHz+uYwhLRfBa8M4jmbpGRkMT8by+HZQt3te ezr9KKVpC38NHdsHmvht0Xnh5W+tFAyWCSlLPxpltFV6Q4rxaNWy6/s0FX+l6TKD6YWWrn FDdJpV5Hcm+XyemADLDO2BDVwGoDJsrqX8h0a1n7X7mYDP1c1+9x1NS3kxS5qydYIvK1G9 EQbcdVfkQh8oPdMZmo/fYxLydQqy3iIC+xInwDJIUN/thhbWIDXXhTdXBY/Fah/i06O50P F2OfSDf+LBezOqIJiHn3cDxs+2+TFBWP50PE4iq7mbz0TEGq6WRzBcwp2g1JWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFtNF3cwNzydp; Wed, 2 Aug 2023 00:37: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 3720bHej060619; Wed, 2 Aug 2023 00:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bHJ2060618; Wed, 2 Aug 2023 00:37:17 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:17 GMT Message-Id: <202308020037.3720bHJ2060618@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: 4c22848d1a7e - stable/13 - rtld_malloc: add cp2op() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb commit 4c22848d1a7e3fc996adc0cb71e35d7be8b26ffb Author: Konstantin Belousov AuthorDate: 2023-07-22 04:24:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:40 +0000 rtld_malloc: add cp2op() helper (cherry picked from commit 86c7368f2bcefeb257f7dc40e4296261b295a674) --- libexec/rtld-elf/rtld_malloc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 45d3f743e348..3437f638d339 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -106,6 +106,12 @@ static int pagesz; /* page size */ * increasing order. */ +static union overhead * +cp2op(void *cp) +{ + return ((union overhead *)((caddr_t)cp - sizeof(union overhead))); +} + void * __crt_malloc(size_t nbytes) { @@ -209,7 +215,7 @@ __crt_free(void *cp) if (cp == NULL) return; - op = (union overhead *)((caddr_t)cp - sizeof (union overhead)); + op = cp2op(cp); if (op->ov_magic != MAGIC) return; /* sanity */ size = op->ov_index; @@ -227,7 +233,7 @@ __crt_realloc(void *cp, size_t nbytes) if (cp == NULL) return (__crt_malloc(nbytes)); - op = (union overhead *)((caddr_t)cp - sizeof (union overhead)); + op = cp2op(cp); if (op->ov_magic != MAGIC) return (NULL); /* Double-free or bad argument */ i = op->ov_index; From nobody Wed Aug 2 00:37: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 4RFtNJ25pfz4q2mp; Wed, 2 Aug 2023 00:37: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 4RFtNB60Rfz3q0P; Wed, 2 Aug 2023 00:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPv/wBfd6mGsCumtqbtr5zN0PITG0rbpnTSbujhtpQ0=; b=RSqI7oYOEuQfLsyykv2YXEOyHyIfjAOPNTT2M+v4K3bOQUu3mPDlzXvzIM2UTlNYpKxMBf iN7Z+i8PYYe/oxXDbGktA9tLTsdmD6zW/XS72qWHB8ukonNNHH0bPmCw+hmLrD8XrLRmyg Bmm928/mplxFrFP/WKCoCveMUIYPSF9W6bQJQ/nnvrkmbIEwBQ58RRr0N0EOw/LO0XWRR3 G32Y41A1mhE2jbz9W9M0LKikAI57VeGRAF/9Ng3Yg8x40MlNjLN4mHHTRqjO6Tnx3R8B4W WRsFqHYeKLlCiOKahZLVPDFKYe0JR+2xKIYdKqwliuWmActHwUOu3N0laL5YKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936634; a=rsa-sha256; cv=none; b=JlCG7Ux71fDTHY44Spn26AXBpoYOO4/JgU/NByK7Usn70uXUJSDmj8eoTK/VPfgvEDh7em mTNn9gOLrh0A1+Uf+//QzWlXGIUfya8Voyhut8cZdOTn1ZajdTgBMw/i0e4lfVhkP+AB0f 4r13xj5TP/3mL2Hvimw7BWDgOwo2Q2Pwqb7d7KvbImXJCYlK+tRxfu4XgyhPH9IkvEn/BA POLUp+XTZu5ZroMUvqmWMMB3EUEQUkRrC5OM12OLcv6A9XPfZhZGARy0fPUHPGcPC0a3ux fmggTtTcLpUJl6cRiots25bRuV3NzcqvEUzR1Nh73Zd0c6Bp0xNqGYaAKg97mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPv/wBfd6mGsCumtqbtr5zN0PITG0rbpnTSbujhtpQ0=; b=miLwKyr0NI11IKd+ehJipYCdc0uPkYqgT3h45QNYbcMygCkOnc7gWSwny6SRoCOzOvWv6K ++SAlTmK2lV4Mj0TsN9Y230I02AWm3ALZ8F8YtV+OVHNE+Jm9kOF6gTUxTIEHMaWGAyu24 XU6CWwEL7MiMx4TVTKNr4UP7BtSj0nD1gi9pHd4Zf2tjdjB4nYke47ML4pD7pCkCcCgUnT 2VY+LX0Clh5fGmIesHJvxLx9MeKw3EhAlT97W+ojKcBH+38tJNc7o/zEkZHPxXjwzpGpLL d1PZofF3+I0rreBBAe/jKNFNVioi11CszuUBStFKVWuFS2LAGEBd/pepbrYH9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFtNB1XGczynn; Wed, 2 Aug 2023 00:37: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 3720bEfr060562; Wed, 2 Aug 2023 00:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bEhH060561; Wed, 2 Aug 2023 00:37:14 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:14 GMT Message-Id: <202308020037.3720bEhH060561@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: 9c6201717124 - stable/13 - rtld_malloc: remove outdated comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9c6201717124d1d3dc125b7ea392bdd25894b9f4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6201717124d1d3dc125b7ea392bdd25894b9f4 commit 9c6201717124d1d3dc125b7ea392bdd25894b9f4 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:13:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:39 +0000 rtld_malloc: remove outdated comments (cherry picked from commit a24726a6f3b43473093267e2b4e81d186817dc7d) --- libexec/rtld-elf/rtld_malloc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index d08254b67d9f..0eec68f35402 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -68,10 +68,6 @@ static caddr_t pagepool_start, pagepool_end; * contains a pointer to the next free block, and the bottom two bits must * be zero. When in use, the first byte is set to MAGIC, and the second * byte is the size index. The remaining bytes are for alignment. - * If range checking is enabled then a second word holds the size of the - * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC). - * The order of elements is critical: ov_magic must overlay the low order - * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern. */ union overhead { union overhead *ov_next; /* when free */ From nobody Wed Aug 2 02:07: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 4RFwNG4g8Yz4q6qH; Wed, 2 Aug 2023 02:07: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 4RFwNG3BbLz3vZt; Wed, 2 Aug 2023 02:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690942046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UpDGn0PIA2ZrLImg7KpFNU7f4KJzfTZWBKSYU+ZU0A=; b=y0utPpGsRzDlh+gBtGvLs0Kcy4QQGQgXOqXR5Z6zCqJZGK7sZohGtw2/w3fTTPOojWqajj lCQCqlmTIlT3B64WAmHpLeCfjwBxt7FoMFd68eoOQVIpKTEbEDmYzI2uSsVKC6/RpEks1R yYz2wMlWYqWfD5CAj/bhKPLY6wIKIFyIBsZSEG2bd8K+QqVrtJmUEZPZRw4/5BliIi+go1 UmXcrdfwpzdsxVzcJbrl8WNYEWIoQIp6IjFzdu+fbJGgTKcD+nQ691RFgL5+8IUujVUJ/C JCU7po4G1PE6Ub26yBZ3g6RfrW2myMHBhuIMUgpYriFV1Ktg51C1IBUy4DVWQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690942046; a=rsa-sha256; cv=none; b=AN6nWO99tPlKcOqQV0EiKB/ww1zoczFIrFbpKLPDolaZntFxg/SGsi4w4eXe8XfQRvSMmD jNjKnX2InmahwV19b5YLEsZoS2NMTAua5Q8WZn1CJm3J85AID2IO/OJIIskjjhCePUFq4s 83+jt74bbcaL61+uXk10DblK7Rnt4ZvDfFRzIm0W1ZhfyXMJJ+nm7Y3d+7TqqJcFsMuZPP VkHUZaoUnm7Ko6JIyGX1VpptzhwVolsl4jyyiYzbGKj5j3bAHYIG+Z6PECV+N8t57i6Ik9 GpQQdY2AZui8YXS4RsoPhfKACRqfwtM46YL8YqCW2RM+LHfhjzIBSjfSyu+Ihg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690942046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UpDGn0PIA2ZrLImg7KpFNU7f4KJzfTZWBKSYU+ZU0A=; b=mWdjzkxHlijws7v8ccbQor1bZveaik3/5XbNfX05U2MRr1vqN99D51nPDso9zGqUaj6yl1 A+I0gg1K0O3IvQd2kVj8KkUeNJ9eRj4G4tQsmaeR2frauxL9Sl9xi6yIy2x/wZLlvlCpDW h64S/dDMwbxUuAuPtDMxe0hQeKC2Fia494dhvr8T81s5AUvw1We4ZA7OOnNiI4fzBjTG00 SwSy45WVPf3DCVc+uru/1UYbnqOyVBLmnjk+yROBlZy6coKxd25KmqLGoEFO5qBpuZ+oVO aA1LgdnbJGCWQAEJJl1jdMlvAyGvGfyUP41cOVHuk2QEUmaxsgmbfCIxi7tMYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFwNF6pNHz11sn; Wed, 2 Aug 2023 02:07: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 37227O9T009824; Wed, 2 Aug 2023 02:07:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37227OFQ009823; Wed, 2 Aug 2023 02:07:24 GMT (envelope-from git) Date: Wed, 2 Aug 2023 02:07:24 GMT Message-Id: <202308020207.37227OFQ009823@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: 77f6be448408 - main - retire SHARED_TOOLCHAIN knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 77f6be448408eda1a31b1c98576e6c6bebf6ea6e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=77f6be448408eda1a31b1c98576e6c6bebf6ea6e commit 77f6be448408eda1a31b1c98576e6c6bebf6ea6e Author: Ed Maste AuthorDate: 2023-08-01 12:48:02 +0000 Commit: Ed Maste CommitDate: 2023-08-02 00:13:22 +0000 retire SHARED_TOOLCHAIN knob Toolchain components were historically statically linked. They became normal dynamically linked executables in commit 6ab18ea64d19. There is no need to keep a special case build option for the toolchain; users who want statically linked toolchain (or any other) components can use the existing NO_SHARED knob. Reviewed by: dim, sjg Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41266 --- share/man/man5/src.conf.5 | 6 ------ share/mk/local.sys.dirdeps.mk | 3 --- share/mk/src.opts.mk | 1 - tools/build/options/WITHOUT_SHARED_TOOLCHAIN | 6 ------ tools/build/options/WITH_SHARED_TOOLCHAIN | 6 ------ usr.bin/ar/Makefile | 3 --- usr.bin/bmake/Makefile.inc | 4 ---- usr.bin/clang/clang/Makefile | 5 ----- usr.bin/clang/lld/Makefile | 4 ---- 9 files changed, 38 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 4554735207c8..3eeb3440e986 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1532,12 +1532,6 @@ as a set-user-ID root program. Do not build the .Bx 4.4 legacy docs. -.It Va WITHOUT_SHARED_TOOLCHAIN -Build the toolchain binaries as statically linked executables. -The set includes -.Xr cc 1 , -.Xr make 1 -and necessary utilities like assembler, linker and library archive manager. .It Va WITH_SORT_THREADS Enable threads in .Xr sort 1 . diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk index 00030cb247bb..f06b4a33f1f7 100644 --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -64,9 +64,6 @@ WITH_META_STATS= t .endif # toolchains can be a pain - especially bootstrappping them -.if ${MACHINE} == "host" -MK_SHARED_TOOLCHAIN= no -.endif TOOLCHAIN_VARS= AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJCOPY RANLIB \ STRINGS SIZE LLVM_TBLGEN _toolchain_bin_CLANG_TBLGEN= /usr/bin/clang-tblgen diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 899d620fb0c1..bed2b718654d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -168,7 +168,6 @@ __DEFAULT_YES_OPTIONS = \ SENDMAIL \ SERVICESDB \ SETUID_LOGIN \ - SHARED_TOOLCHAIN \ SHAREDOCS \ SOURCELESS \ SOURCELESS_HOST \ diff --git a/tools/build/options/WITHOUT_SHARED_TOOLCHAIN b/tools/build/options/WITHOUT_SHARED_TOOLCHAIN deleted file mode 100644 index 86e309028c21..000000000000 --- a/tools/build/options/WITHOUT_SHARED_TOOLCHAIN +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Build the toolchain binaries as statically linked executables. -The set includes -.Xr cc 1 , -.Xr make 1 -and necessary utilities like assembler, linker and library archive manager. diff --git a/tools/build/options/WITH_SHARED_TOOLCHAIN b/tools/build/options/WITH_SHARED_TOOLCHAIN deleted file mode 100644 index 12956c3ff933..000000000000 --- a/tools/build/options/WITH_SHARED_TOOLCHAIN +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Build the toolchain binaries as dynamically linked executables. -The set includes -.Xr cc 1 , -.Xr make 1 -and necessary utilities like assembler, linker and library archive manager. diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 7a6601a7d043..17b78191794a 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -11,9 +11,6 @@ NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+=-I. -I${.CURDIR} -.if ${MK_SHARED_TOOLCHAIN} == "no" -NO_SHARED?= yes -.endif LINKS= ${BINDIR}/ar ${BINDIR}/ranlib MLINKS= ar.1 ranlib.1 diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 22799321f69e..e6ffa4d6f756 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -18,10 +18,6 @@ MLINKS= ${MAN} b${MAN} .endif .endif -.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" -NO_SHARED?= YES -.endif - # hack to not add tests to tests subdir since this is included from # there and to avoid renaming things that require changes to generated # files. diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 4b1e3735939a..97e6e1fb6996 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -12,11 +12,6 @@ SRCS+= driver.cpp CFLAGS.driver.cpp+= -Dclang_main=main -.if ${MK_SHARED_TOOLCHAIN} == "no" -NO_SHARED?= yes - -.endif - LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ ${BINDIR}/clang ${BINDIR}/clang-cpp MLINKS= clang.1 clang++.1 \ diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index fb10ca7176d1..94adfceaf728 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -16,10 +16,6 @@ SYMLINKS= ${PROG_CXX} ${BINDIR}/ld MLINKS= ld.lld.1 ld.1 .endif -.if ${MK_SHARED_TOOLCHAIN} == "no" -NO_SHARED?= yes -.endif - .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${LLD_SRCS}/ELF From nobody Wed Aug 2 03:14: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 4RFxtR3Hfzz4q98T; Wed, 2 Aug 2023 03:14: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 4RFxsf39RBz42KV; Wed, 2 Aug 2023 03:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690946070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=irDB5M4ha0iPYfUJY9cSX+8Levak7c4/7R1h8MmGcnY=; b=kRjD1/fhJaMOXtx11D7YHEwNHnmhdQB1pKoIQYZMq+xy/jKDW2mwXLEBfrSWS2NFSthbBz TUuuhjgU4p9iWSWaaJIB9lW/yIpOLXKM8oO26dUNyqMk5dqMGejBLLzNtludTJ7StV2O3Q N7a0NhILCm7QFplOX/FafKIeHqmRByZMm3UHVzgUc4fT9wSVCkrU3yv2JuAwb31T8BfI9B 4haC+ceC401S8eaMxOTXsHK5WOAimXgH56An2zd970SsC9mGWZL0AX8Gby8EOMb7do4ZA1 dKLi+0JGfJRw7fMZGbc/kOayD4vGucMlMbCzfkxdYhhAjxubz+69enjKBtTqTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690946070; a=rsa-sha256; cv=none; b=T7lJpvneF4U3nyvoY82BS9xScSMLw36vEmJAXKQHGqnZRqsfLzsALHBDBCVnpQoKLPJW3S BW4aRMpcjBlp2EvBTW9W8Z/G9PlDl9vRQOxow49MGi+XFiET2l49iQYn/Bydq0i6ZjRK0S V0l9cl8eeSBbHrp83Z6pVpsSIoUN1E+mE3gbMAgp0DP7DyweWwzuWiuDQk4iOQOFwnkY2U H1pN01SqrHJUOarMWG08kwr8sGiV5YkoZcB5s3sOyyCkzNVTI7LBfuptlfWXvW66+G6XtS KL5JHp+84BfHjoqbE9BvMxINZ9bL1Q0E3w0CFFaD7YTC8XKda0w/oOYYOl6EUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690946070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=irDB5M4ha0iPYfUJY9cSX+8Levak7c4/7R1h8MmGcnY=; b=QK4q8HMBlW5PRYZ1PoqrU/KXNug3TxqYMFXiURh0tPKHXPJqNtnPFxXhUsm7055eaY4e0X 2sOKGhaRBmiR4XVAzOmvzF1EdG35QsTAyBMfGChTnMH0Lk8OtnqqhwxFy1823BsETzQ8Vw lY/lGoffB2YKIgGHOp+BCRZoGT2XDvCk1QQ8cy035NusJZFc7uBD6L9JiDsyI7WZzqU1c1 tYFuO3WAHlyQJ8K88PP3huswgYswaOkayCteKD/uTC52nRq8QgFuGyj6y8UduAt35NS0VS 5X2h9k8HjH/UbHFjwc5xSALHeu/YJ3XjpUm+rHKNG2aVbCd/X+7ENFm++MgR3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFxsd6fv6z13R9; Wed, 2 Aug 2023 03:14: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 3723ETV9027831; Wed, 2 Aug 2023 03:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3723ETgj027830; Wed, 2 Aug 2023 03:14:29 GMT (envelope-from git) Date: Wed, 2 Aug 2023 03:14:29 GMT Message-Id: <202308020314.3723ETgj027830@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: 1a7fcf6d51eb - main - vm_phys_enqueue_contig: handle npages==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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c Author: Doug Moore AuthorDate: 2023-08-02 03:12:00 +0000 Commit: Doug Moore CommitDate: 2023-08-02 03:12:00 +0000 vm_phys_enqueue_contig: handle npages==0 By letting vm_phys_enqueue_contig handle the case when npages == 0, the callers can stop checking it, and the compiler can stop zero-checking with every call to ffs(). Letting vm_phys_enqueue_contig call vm_phys_enqueue_contig for part of its work also saves a few bytes. The amd64 object code shrinks by 80 bytes. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41154 --- sys/vm/vm_phys.c | 74 +++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 28f12231e01c..b2084bdef4e1 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, "Too many physsegs."); +_Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), + "vm_paddr_t too big for ffsll, flsll."); #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; @@ -690,18 +692,16 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, * * The physical page m's buddy must not be free. */ -static void +static vm_page_t vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) { - u_int n; int order; - KASSERT(npages > 0, ("vm_phys_enq_range: npages is 0")); KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & ((PAGE_SIZE << (fls(npages) - 1)) - 1)) == 0, ("vm_phys_enq_range: page %p and npages %u are misaligned", m, npages)); - do { + while (npages > 0) { KASSERT(m->order == VM_NFREEORDER, ("vm_phys_enq_range: page %p has unexpected order %d", m, m->order)); @@ -709,10 +709,10 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) KASSERT(order < VM_NFREEORDER, ("vm_phys_enq_range: order %d is out of range", order)); vm_freelist_add(fl, m, order, tail); - n = 1 << order; - m += n; - npages -= n; - } while (npages > 0); + m += 1 << order; + npages -= 1 << order; + } + return (m); } /* @@ -744,7 +744,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) { struct vm_freelist *alt, *fl; vm_page_t m; - int avail, end, flind, freelist, i, need, oind, pind; + int avail, end, flind, freelist, i, oind, pind; KASSERT(domain >= 0 && domain < vm_ndomains, ("vm_phys_alloc_npages: domain %d is out of range", domain)); @@ -762,20 +762,18 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) for (oind = 0; oind < VM_NFREEORDER; oind++) { while ((m = TAILQ_FIRST(&fl[oind].pl)) != NULL) { vm_freelist_rem(fl, m, oind); - avail = 1 << oind; - need = imin(npages - i, avail); - for (end = i + need; i < end;) + avail = i + (1 << oind); + end = imin(npages, avail); + while (i < end) ma[i++] = m++; - if (need < avail) { + if (i == npages) { /* - * Return excess pages to fl. Its - * order [0, oind) queues are empty. + * Return excess pages to fl. Its order + * [0, oind) queues are empty. */ - vm_phys_enq_range(m, avail - need, fl, - 1); - return (npages); - } else if (i == npages) + vm_phys_enq_range(m, avail - i, fl, 1); return (npages); + } } } for (oind = VM_NFREEORDER - 1; oind >= 0; oind--) { @@ -785,21 +783,20 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) NULL) { vm_freelist_rem(alt, m, oind); vm_phys_set_pool(pool, m, oind); - avail = 1 << oind; - need = imin(npages - i, avail); - for (end = i + need; i < end;) + avail = i + (1 << oind); + end = imin(npages, avail); + while (i < end) ma[i++] = m++; - if (need < avail) { + if (i == npages) { /* * Return excess pages to fl. * Its order [0, oind) queues * are empty. */ - vm_phys_enq_range(m, avail - - need, fl, 1); - return (npages); - } else if (i == npages) + vm_phys_enq_range(m, avail - i, + fl, 1); return (npages); + } } } } @@ -1146,7 +1143,7 @@ max_order(vm_page_t m) * because the size of a physical address exceeds the size of * a long. */ - return (min(ffsl(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, + return (min(ffsll(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, VM_NFREEORDER - 1)); } @@ -1162,6 +1159,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) struct vm_freelist *fl; struct vm_phys_seg *seg; vm_page_t m_end; + vm_paddr_t diff, lo; int order; /* @@ -1173,15 +1171,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) fl = (*seg->free_queues)[m->pool]; m_end = m + npages; /* Free blocks of increasing size. */ - while ((order = max_order(m)) < VM_NFREEORDER - 1 && - m + (1 << order) <= m_end) { - KASSERT(seg == &vm_phys_segs[m->segind], - ("%s: page range [%p,%p) spans multiple segments", - __func__, m_end - npages, m)); - vm_freelist_add(fl, m, order, 1); - m += 1 << order; + lo = VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT; + if (m < m_end && + (diff = lo ^ (lo + npages - 1)) != 0) { + order = min(flsll(diff) - 1, VM_NFREEORDER - 1); + m = vm_phys_enq_range(m, roundup2(-lo, 1 << order), fl, 1); } + /* Free blocks of maximum size. */ + order = VM_NFREEORDER - 1; while (m + (1 << order) <= m_end) { KASSERT(seg == &vm_phys_segs[m->segind], ("%s: page range [%p,%p) spans multiple segments", @@ -1560,10 +1558,8 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); } /* Return excess pages to the free lists. */ - if (&m_run[npages] < m) { - fl = (*queues)[VM_FREEPOOL_DEFAULT]; - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); - } + fl = (*queues)[VM_FREEPOOL_DEFAULT]; + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); return (m_run); } From nobody Wed Aug 2 07:10: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 4RG35b3gXxz4qKgb; Wed, 2 Aug 2023 07:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG35Y2c5Pz4Lb8; Wed, 2 Aug 2023 07:10:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mDm4gWXsqxGVRs+Sb8opbBdTmLrhzj6LjOA1suG5iJQ=; b=d7KCY0tQOXABC8cS3enkhrV4fjdX3KvZ6FV3F9wLeQ+2uHcgZGrwP59RrKe2akZuKKPaoX wyscTbZ9+5uZPNMhBglkMJWf/tWPA4M6+Nw8KHNU0zsAZRMLzusbyzHJ2x1D82/GKdVJ8D F2cLZeSXCKhYfTUF8JTrSrmr+2ew9lVvFXD0s333UnK/opvNzHvHL+eXoiv0xD1Fd/gmPp a4nX/Fq9xUgHm2fjZUyDb/H6OARz6KEgZUSr2UKVgjqpodxmUAOD/x6751vnIiPF+TRFob lRzsnKLj8Gw9NeY24cfs8PlcCx//tOAtLSj0yuaGUhj9dq3QeEfElxY8+O+1gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690960209; a=rsa-sha256; cv=none; b=GE9FfCNLLuBIuKhskw8yp6R3fwEP1jyF7wDWs6dsR4ab3MLIztSicMJUmrpwgR5w0qMyGK ivETKMWB4eqbrtoX9uSVlN5aY04yV4495GPASSMVnwumVWIhrtYf4zYDLT+kbfGruklwJA pYbiq520/+FS8lwUQYvFMAMy5DuPa8R9fxMCgCanUsJyrCBxvzCBmKe2ct08x644H1zxrN 6xWJLNQ4SusJbJwOBjyEWtNK29aR253xqks/FoH8bmEV3lkjlWYlKFybDy36vuPKS24HPg PUBTu4BbQRgHMJ2+lFWpyWmsFN1W+EU7bqZXr5cqpwPhfguJ+1YH2Lksb1cnRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mDm4gWXsqxGVRs+Sb8opbBdTmLrhzj6LjOA1suG5iJQ=; b=pkAxeuYvGFLyYtl9ncm1fobNbnDoypFqO6emEIpzN9fB52+BUPPTkG/z/caZQk9Dgb0xx2 qtjGb7afSB+eZVrY+41demkWvU/GlFXSIzO5uM9hXp1o2T1ACiMNR3lvCIEfKQMQJvlaa5 TV/bjcN2B8V/6Lo590zaEvFsINnMQXGqyX8pyEKv7EM9QB3pvKV3SQv0cYroQkyDGRwO80 ovaLb3ONyx62iY5xuaMEVUu7jnKO9DQLggT72HHzKQvZTq5SYKtkWdcmPX/T9r8tutQkDP TepMt7ikaLp3JQkgMmB6wfTPPSFF/cKY7ne+4Embts/bGrzaWQj1GkZpfAmWsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG35Y08Z4z1936; Wed, 2 Aug 2023 07:10: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 3727A8Jt012438; Wed, 2 Aug 2023 07:10:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3727A89J012432; Wed, 2 Aug 2023 07:10:08 GMT (envelope-from git) Date: Wed, 2 Aug 2023 07:10:08 GMT Message-Id: <202308020710.3727A89J012432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 734c9698d9ae - main - et(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 734c9698d9ae83206a47daa40031a4de3bce9c28 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=734c9698d9ae83206a47daa40031a4de3bce9c28 commit 734c9698d9ae83206a47daa40031a4de3bce9c28 Author: Gordon Bergling AuthorDate: 2023-08-02 07:09:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 07:09:56 +0000 et(4): Fix a typo in a source code comment - s/diabled/disabled/ MFC after: 3 days --- sys/dev/et/if_et.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index 9cce5a3ae883..174cf6ed8b1a 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -1993,7 +1993,7 @@ et_init_txmac(struct et_softc *sc) */ CSR_WRITE_4(sc, ET_TXMAC_FLOWCTRL, 0 << ET_TXMAC_FLOWCTRL_CFPT_SHIFT); - /* Enable TX MAC but leave FC(?) diabled */ + /* Enable TX MAC but leave FC(?) disabled */ CSR_WRITE_4(sc, ET_TXMAC_CTRL, ET_TXMAC_CTRL_ENABLE | ET_TXMAC_CTRL_FC_DISABLE); } From nobody Wed Aug 2 07:14:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RG3BJ4QWTz4qMSP; Wed, 2 Aug 2023 07:14: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 4RG3BG3tt6z4Lnc; Wed, 2 Aug 2023 07:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cm/zhNM+s+pCNspfrAj9FWsIW/QFKB1Qgi6dXzRNFt4=; b=W+LUVx/sz1KbojPPUpg4lSlwdHoSGR0gIEYErph/b76YUrjju+pIhzbb3PUPmqixpMVX7S Z+ZALzfB/F7QDfM9Mk3bDKTPOhuRb08+IQxxL6xJgDktnCC3SLlTv1cbrtowUtXnzZDI7S OdrnRDAMNXz+oKKV77q1Y+M1bfCiihk0YgF1srGRS5tyCenP11nUFMkf3rqW390JaWr+jI 6UcB2bf1UH8Zzi2qLGTSbjRa27xoxzzAEZohKvtCXMWhgMgQE6RMrl7q5OUv07PRfF+ueG 2fmxoEe/RtVQzn/2U8RGkULUSKHfjz2DSSeHztx3Wnt+OtUyb+fq4A38v3NUAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690960454; a=rsa-sha256; cv=none; b=ZObvpSij+bop+wLNlZZEXoxRCTfOs2WC5Z8IySRt6LhdNPmRjhp8VsygYU8zUngJee1XQU Frwjw/3u0cOwUzaFoapMZZcPLFZyaEBEqTPCIHtdZhvIr56GHIOa+aEgVpmUFPD5Dc2/JY SkJS7FumseZkvIesJwmydn+9TZHuDL9jawOO5cHCsXbdiaazyktr4wk72EwZSo7C7Pwq7i 1t0PooqwlbVFwIp0mv6WDHs8/5mh4OZ260pD159j5xk1QVhC6zdgDPWluPXlIQaSRht3Q4 QWC6XV/BmJt+HBjjV5bk0i175mU8pH/hq/zwvxwS0bgJ0yZ1ziniME1axCL2hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cm/zhNM+s+pCNspfrAj9FWsIW/QFKB1Qgi6dXzRNFt4=; b=nc9K8C2Az7q0aMPjCu2D4vjCFjz4kDMKvlENS1YojiAIFft1f8wgSkOLwcrwv9OrgRGxYJ KrhejrbpYKzlpI37xOvdmIPaCPGdX7dZo8Y2WPBI0/ZiJqx9Ail1eGsNJ/WOIGH9/o+Ozr fWSEIn/vooYtEIGMMt8AIoLC77H+ZWpcL+20g9kFV5cAidPlUynMVNW6yEXQXx5DWhDNFt CX+4Fupdhj9OIGm9Ldk8z8m3fqNlMmZW/K+5r8wJP0Fcn2AL/bfa9wVbUbX+6sA6AwUlTn CB5cbbhgCCmJMSaoR6YGklPwpycn0+N8WZPdZazIdI3+ro6dsEb9COLpPTYzBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG3BG19h4z1984; Wed, 2 Aug 2023 07:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3727EEBU024749; Wed, 2 Aug 2023 07:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3727EESh024748; Wed, 2 Aug 2023 07:14:14 GMT (envelope-from git) Date: Wed, 2 Aug 2023 07:14:14 GMT Message-Id: <202308020714.3727EESh024748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 7eb8fbfb0421 - main - psm(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb8fbfb0421d38ec83a73f9b8ea13e7c52d3314 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb8fbfb0421d38ec83a73f9b8ea13e7c52d3314 commit 7eb8fbfb0421d38ec83a73f9b8ea13e7c52d3314 Author: Gordon Bergling AuthorDate: 2023-08-02 07:14:04 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 07:14:04 +0000 psm(4): Fix a typo in a source code comment - s/diable/disable/ MFC after: 3 days --- sys/dev/atkbdc/psm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index a308cc81cd3a..9e89f01cbfc2 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -5441,7 +5441,7 @@ enable_kmouse(struct psm_softc *sc, enum probearg arg) if ((status[1] == PSMD_RES_LOW) || (status[2] == rate[i - 1])) return (FALSE); - /* the device appears be enabled by this sequence, diable it for now */ + /* the device appears be enabled by this sequence, disable it for now */ disable_aux_dev(kbdc); empty_aux_buffer(kbdc, 5); From nobody Wed Aug 2 07:20: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 4RG3Kc3ZpQz4qNDJ; Wed, 2 Aug 2023 07:20: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 4RG3KS0vb6z4M4r; Wed, 2 Aug 2023 07:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jd2rEJ2TT8/pROpjD4gAoGUgary5X1MoT+Vnu4kP6eA=; b=nRmKfV0N3iBiAL412Hx0vYEEYxWqkzNR4ZWK6v7q29olV6kvGoutSCvPC10Xl6X/0daLmf wwnqQJIDQtTL/MZwLnvOPxatfK3P3/ufR552Hm6GRtrtrt/9sYdXp5Z1EveAoeeSbINNxJ 5J5BjBKbHVyDiLc9zTT9bqpvKz34Opg0j4cbiWVAkM0OaZJ7LdKWYb1bIu9XoDHnBY4xBR rmHy4JVKEAXnecmEIydLsao/e0epmpQSTtX9+y8wBs8zcE1WTvZ3w2ArhWVRlM7y4fPU3X G73UvhP4rRncQ00EwShRrD2sCB/U4r5myCsODKFwGUsiBuRu2b7gwnIfzf7TOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690960828; a=rsa-sha256; cv=none; b=SUCoPLAP0KF+Oxmyz1zhCy9q9tc1urRRVqJ2ebckWuKk5b+9fbFv3UNpz+47XIHvJJXos+ B0yQwCgq6bvIdWVSc+XsT7lOnzks6kaCJvZFBBM11sibxnQY9r9N41zqQsPtjXEc3c6T+w XFeV5AjyQcmP2EKFRNm7oAF6sPqy63b6Tk7xWL5O7I6r4n+UDys/quVA7H+4lhsnuGPoCE bRY3d2S4d8E5HTPI4bxXwJkDXTZ9pMTYl6vspdnFG32nbn4JTTSOCEIrW/0MzET5BsHq7S 6tmRtN843TIdv9EYqBL2NjHM+PEldOi1EWbuwayrV8PBi7sSWuk+7j8Wx+Zkjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690960828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jd2rEJ2TT8/pROpjD4gAoGUgary5X1MoT+Vnu4kP6eA=; b=UiGuhpiS2qWDNDFupQXS6tf2Gvu4SM4gwSwBcxt0qIs88zGviHwc5sygRliXGr+FHAbXvI VwlvhlqUIfHTPAir1CaxQyZCH6xv8ka7L+DgKIilnyzbNuF5R7cYRw7rL7GQSDzma4yv4h Yik8IveSz/xoC0MSUZAR3TH3e7aC0t+oAJTEB0fF7WXf6RqJ7ktEzMONFobks1pzwANsJp 73leE9VBmyt/JHcys83R9B8z6Ey+sVv/BNZfVDocTNDGgjd+topqyK5qPUtMFvx8lxdcqi iwdTq77h1QrWYSFy1+2589+sOGvKqUIdUDHrjt1xGeegM7ju25KkdtdzHvxt5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG3KR5J84z193r; Wed, 2 Aug 2023 07:20: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 3727KPNT034075; Wed, 2 Aug 2023 07:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3727KPkO034074; Wed, 2 Aug 2023 07:20:25 GMT (envelope-from git) Date: Wed, 2 Aug 2023 07:20:25 GMT Message-Id: <202308020720.3727KPkO034074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3514686b344d - main - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3514686b344da607515decb500018d25aadacd33 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3514686b344da607515decb500018d25aadacd33 commit 3514686b344da607515decb500018d25aadacd33 Author: Gordon Bergling AuthorDate: 2023-08-02 07:20:17 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 07:20:17 +0000 aic7xxx: Fix two typos in source code comments - s/reslection/reselection/ MFC after: 3 days --- sys/dev/aic7xxx/aic79xx.c | 2 +- sys/dev/aic7xxx/aic7xxx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 6f93c6c6e578..e720e89e89f1 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -9442,7 +9442,7 @@ bus_reset: /* * The sequencer will never re-reference the * in-core SCB. To make sure we are notified - * during reslection, set the MK_MESSAGE flag in + * during reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ ahd_outb(ahd, SCB_CONTROL, diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index d37f70ca011f..29bef06a3fa1 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7182,7 +7182,7 @@ bus_reset: * In the non-paging case, the sequencer will * never re-reference the in-core SCB. * To make sure we are notified during - * reslection, set the MK_MESSAGE flag in + * reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ if ((ahc->flags & AHC_PAGESCBS) == 0) { From nobody Wed Aug 2 07:33: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 4RG3cp29pKz4qNsk; Wed, 2 Aug 2023 07:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG3cm6CZWz4NGq; Wed, 2 Aug 2023 07:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690961624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=btNFCF5hzbzk8cjiDTuPBCQUKlFRkzJvOn4oU4ztDZI=; b=Ka5xQ7lNPX6suIQXW+IhrX+Ij5dEXa1R/uUbEaZwTiNII9kanERwESbgsbVw4JgfIAXhet 5mibYTbylopLfTYtKHs/a5QgtlwZ4uH92fTmlV4OWf7xKe+koIj3BUO1a4NeSWVU46cQx0 rUj63+IUuY9dLwexIpWSwGGIrZwHCb6zmHiUbEplGeXUo/zXDLJjsTIDJiNiHHznvI9DLe Wp5SqRzPrudeGRUXYpqHQRDw5KieVAN+4XbUx+XmLNJ0Wytk5waDDBJrGaZrhl7M22EZfn 70wFptwYgD2KPshVVTugEmJ3yCYXhqHx3JdUS4gHfG2agoTFhh8SoAdpriMKDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690961624; a=rsa-sha256; cv=none; b=JmndEqBxuz49gOP73dZFy2q4iRHa3onxQw54SEEEZLMxD+6Yh1ADKZKnKaWr2Hy5wRUsec PUBYWUm+BQ0JBtmiazhnIsG+IjhDyVd+KknwlVhyKQdLGycJeH0GIJ0XlCJvJXpxQetQAk MKStcN+CxdWhzKW54dUaKAA1VDGKxsRVuUJAzlKEaghO31xb1MaXly2OE28g8XOYj2K5fp usoXcEbgBQGnBOQBIuPiRhKvXMsgPDWFE6YaIv9uESjo9dfY7UxAWpxVMrrZsAwaxB5yQT hmQQovvQ1PGZRsDH5yavOS0FxVnBLZOFeKgi2mrFV03vszWdM9bmeCxnt4iTSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690961624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=btNFCF5hzbzk8cjiDTuPBCQUKlFRkzJvOn4oU4ztDZI=; b=di+YnERf3WRJheD4ypMtnt/yBKtDJvgLUzrv4GC3hMJwHruc9Azgc+oLkYNagZEraI+ntP afPd5gTuuFocBFcmcH/Nn9uQYXCJAzbaGLlo1bz/2tsR5i2Ktv0FObR+025teIS4/a+s2u rHIy1QAjWdzM7nNCYEb1bNDfz8aDJoelMW1iLszpw0gbGoNfc3/0lQilmNDz1a/V8lfyJC 8K+LjVHqTH6aUWGOiIhMRvXOi3TyguTSgsn8wkdFhOstng+IkCdUnXDfEjMdIy+yyk53wT hE/BA6/1ThBKNt+r0pXBEV4HsJJwp0Bao0ecvS1vd2ojdRkU25244tJMA2Fkqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG3cm43Vxz19mg; Wed, 2 Aug 2023 07:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3727XiSG057087; Wed, 2 Aug 2023 07:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3727XiuZ057086; Wed, 2 Aug 2023 07:33:44 GMT (envelope-from git) Date: Wed, 2 Aug 2023 07:33:44 GMT Message-Id: <202308020733.3727XiuZ057086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b73763fc10d8 - main - vnic: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b73763fc10d8000ec5c5682abccf6c8489eee8e3 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b73763fc10d8000ec5c5682abccf6c8489eee8e3 commit b73763fc10d8000ec5c5682abccf6c8489eee8e3 Author: Gordon Bergling AuthorDate: 2023-08-02 07:33:35 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 07:33:35 +0000 vnic: Fix a typo in a source code comment - s/Enabele/Enable/ MFC after: 3 days --- sys/dev/vnic/thunder_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/thunder_mdio.c b/sys/dev/vnic/thunder_mdio.c index 3e9a8f74e673..63ab7691bf9e 100644 --- a/sys/dev/vnic/thunder_mdio.c +++ b/sys/dev/vnic/thunder_mdio.c @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); #define SMI_CLK_MODE (1UL << 24) #define SMI_EN 0x20 -#define SMI_EN_EN (1UL << 0) /* Enabele interface */ +#define SMI_EN_EN (1UL << 0) /* Enable interface */ #define SMI_DRV_CTL 0x28 From nobody Wed Aug 2 07:41: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 4RG3p049YYz4qPCC; Wed, 2 Aug 2023 07:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG3nt6zPlz4PV5; Wed, 2 Aug 2023 07:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690962099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4i0mjhyyI1CPS3qqNDEiKsAOBACczmz3wQfFPKx214=; b=s1XUOUq5YFoOYB/LgJ5vYDMOEIv22+H0UH2dOBsEh2ljG42adxE3tqA8oCxUV12iNCpVmn Uzu38GUtRixRRzMeg+w26WQFCQy3+WIt44aKCnwG+nuqQMuTZjrTvLFQK8FrKt4q1tMzVp KhtpF8TLt3xoMEK07vMXjEvpfr2pYIbp+23Ypwcvz+KR14kimDesGJ5P+qCCBtyHO4zjoo xGsnwN8nC5aK9upbEFHuU8jpZXlBvTK72aFMN1o3UQwe8rK0uVZWWVOozXO4tdrnDdXMD6 AcAAMEReANI3DJ/WpaqH4NAkFmXU7/1iYUDgtT90g9GIaNKqowlOdRtO9Q68nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690962099; a=rsa-sha256; cv=none; b=ysz7D+FdpzbtMewCF4vanWI78/2pVCkGSUjcDbC0O4CvyaKosRLMQlBQ1CDDvnMXtxZ50V yGVDppru9KCX9WzM2neD+nZTonpa3LcnxWhNxNkH6WKOU4cXtEczFfmxucEVEHx4oxxzHU Z7HPcVGgeVwQUZrnjXNIsVZswVhKD1rol64jkhgdz+jVJyapyE3SzSNJ9aok1c974MPVVb +i9YoK5mzu09Vttj/B1vJdIilzTbGKJkPsKUNTYw6eyMT1neXfOen8Ck2yUV6xc82B+zUK jCIwZni3iqP22Lr9q+aTdofps/9jZPf7K75LgnYmnWhLfvDBAKWy8EMGpPESSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690962099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4i0mjhyyI1CPS3qqNDEiKsAOBACczmz3wQfFPKx214=; b=lwCU5sGn7KRc7nhN1AY6cItLLOWGTa0l0hWUkLBLby4C63ArM84rkt2JyvqKEbpz23dfdS fS+FzMxOEUE6lZ+DSk7ddrd8hP/LRLLd6R2mmEamfb8n3CZYMSUb9u4qUyZ4YWiX+CMJ0Z IQWNE8AExgS3nRsKW7qaHfrGOBVC1LLkzxPdMvu0qs6UxwQ15mGzJsRvPiqKX53ycOcz2E mTf4Lgo002PIEcBq91fvDWo5TyfjCgJVbzjGf4TYz0qymRYspjii1LXqH9GiU5vwD1YKNp mONfAs3guUjkbOGP68HND4hvE3cXX04HQij2zoW8Gk1mFMAK6eTDSXF1Ozy6pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG3nt60DBz19qv; Wed, 2 Aug 2023 07:41: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 3727fciw070850; Wed, 2 Aug 2023 07:41:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3727fc0P070849; Wed, 2 Aug 2023 07:41:38 GMT (envelope-from git) Date: Wed, 2 Aug 2023 07:41:38 GMT Message-Id: <202308020741.3727fc0P070849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: cfd05de19467 - main - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfd05de1946799c6353b07da5d351027d8471203 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd05de1946799c6353b07da5d351027d8471203 commit cfd05de1946799c6353b07da5d351027d8471203 Author: Gordon Bergling AuthorDate: 2023-08-02 07:41:29 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 07:41:29 +0000 netpfil: Fix a typo in a source code comment - s/interprted/interpreted/ MFC after: 3 days --- sys/netpfil/ipfilter/netinet/ip_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 2e6913db8f88..67023d6de634 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -1255,7 +1255,7 @@ ipf_state_matchisps(ipstate_t *is1, ipstate_t *is2) case IPPROTO_TCP : case IPPROTO_UDP : case IPPROTO_GRE : - /* greinfo_t can be also interprted as port pair */ + /* greinfo_t can be also interpreted as port pair */ rv = ipf_state_matchports(&is1->is_ps.is_us, &is2->is_ps.is_us); break; From nobody Wed Aug 2 08:15: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 4RG4YM6VQPz4qQRH; Wed, 2 Aug 2023 08:15:51 +0000 (UTC) (envelope-from chagin.dmitry@gmail.com) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG4YL2z8Fz3JG5; Wed, 2 Aug 2023 08:15:50 +0000 (UTC) (envelope-from chagin.dmitry@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-d2b8437d825so4134115276.3; Wed, 02 Aug 2023 01:15:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690964148; x=1691568948; 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=BAmSERIaWdepIB2rLzYsE8xLptTw9RXL8nITv9VuDv8=; b=OgQWUB+siocrIrzAxX5FFZJm5dYVJo6CcKp4kCA9FdgC8aReIJ4TXj53vbuJgCYBY7 tWcW2XhB+Jrq29QYz0lB+yybNM8WDGcjgIAcgghUChMz5e1yyQOKpyou16FVWaMAYwr2 0bod4bZURGq8g7nAEMQ5+OFcD9S/Yun4iBJKDKYH7HmiZdnRqrDRUguDaaA/85z7XASd N9WXZMOT5OBBCUY6zJjIQE4UUbjLCy+OpC+AxiOsQtUn+XVsGxZKXveLVk4g8TZqR+GR 6iSvs3SkY6wV+Hmu9qawWOZmgKXXJTrlgTjzFTgCDzjU1bcRMM/krwBd55tUTK8zOyix /Zzw== X-Gm-Message-State: ABy/qLZq2D+ztD5P3xohTCg1E9HcgWdaQ7r1qhabzOVpUHpl3IjxirF8 D9Zaa4U6sxQJOHXxK64JWckA0j6PcS4+v7NYeKnzCnj/ X-Google-Smtp-Source: APBJJlHpXJWj2y4OqIhC4jqyxH5tbkwXHBHE1BqHSVIxsg2crpHniCUUI7S8XtikxaPQ/Xe8BM+/eVvRX2fXF1ft64U= X-Received: by 2002:a25:118a:0:b0:d1c:be0e:b9dd with SMTP id 132-20020a25118a000000b00d1cbe0eb9ddmr13418502ybr.28.1690964148573; Wed, 02 Aug 2023 01:15:48 -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: <202308020314.3723ETgj027830@gitrepo.freebsd.org> In-Reply-To: <202308020314.3723ETgj027830@gitrepo.freebsd.org> From: Dmitry Chagin Date: Wed, 2 Aug 2023 11:15:37 +0300 Message-ID: Subject: Re: git: 1a7fcf6d51eb - main - vm_phys_enqueue_contig: handle npages==0 To: Doug Moore Cc: dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Content-Type: multipart/alternative; boundary="000000000000675be50601ec45f2" X-Rspamd-Queue-Id: 4RG4YL2z8Fz3JG5 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)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] --000000000000675be50601ec45f2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, With this change, I got a panic: vm_phys_enq_range: page 0xfffffe0000000000 and pages 0 are misaligned =D0=A1=D1=80, 2 =D0=B0=D0=B2=D0=B3. 2023 =D0=B3. =D0=B2 06:22, Doug Moore <= dougm@freebsd.org>: > The branch main has been updated by dougm: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D1a7fcf6d51eb67ee3e05fdbb806f7e6= 8f9f53c9c > > commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c > Author: Doug Moore > AuthorDate: 2023-08-02 03:12:00 +0000 > Commit: Doug Moore > CommitDate: 2023-08-02 03:12:00 +0000 > > vm_phys_enqueue_contig: handle npages=3D=3D0 > > By letting vm_phys_enqueue_contig handle the case when npages =3D=3D = 0, > the callers can stop checking it, and the compiler can stop > zero-checking with every call to ffs(). Letting vm_phys_enqueue_conti= g > call vm_phys_enqueue_contig for part of its work also saves a few > bytes. > > The amd64 object code shrinks by 80 bytes. > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D41154 > --- > sys/vm/vm_phys.c | 74 > +++++++++++++++++++++++++++----------------------------- > 1 file changed, 35 insertions(+), 39 deletions(-) > > diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c > index 28f12231e01c..b2084bdef4e1 100644 > --- a/sys/vm/vm_phys.c > +++ b/sys/vm/vm_phys.c > @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); > > _Static_assert(sizeof(long) * NBBY >=3D VM_PHYSSEG_MAX, > "Too many physsegs."); > +_Static_assert(sizeof(long long) >=3D sizeof(vm_paddr_t), > + "vm_paddr_t too big for ffsll, flsll."); > > #ifdef NUMA > struct mem_affinity __read_mostly *mem_affinity; > @@ -690,18 +692,16 @@ vm_phys_split_pages(vm_page_t m, int oind, struct > vm_freelist *fl, int order, > * > * The physical page m's buddy must not be free. > */ > -static void > +static vm_page_t > vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int > tail) > { > - u_int n; > int order; > > - KASSERT(npages > 0, ("vm_phys_enq_range: npages is 0")); > KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & > ((PAGE_SIZE << (fls(npages) - 1)) - 1)) =3D=3D 0, > ("vm_phys_enq_range: page %p and npages %u are misaligned", > m, npages)); > - do { > + while (npages > 0) { > KASSERT(m->order =3D=3D VM_NFREEORDER, > ("vm_phys_enq_range: page %p has unexpected order %d"= , > m, m->order)); > @@ -709,10 +709,10 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct > vm_freelist *fl, int tail) > KASSERT(order < VM_NFREEORDER, > ("vm_phys_enq_range: order %d is out of range", > order)); > vm_freelist_add(fl, m, order, tail); > - n =3D 1 << order; > - m +=3D n; > - npages -=3D n; > - } while (npages > 0); > + m +=3D 1 << order; > + npages -=3D 1 << order; > + } > + return (m); > } > > /* > @@ -744,7 +744,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages= , > vm_page_t ma[]) > { > struct vm_freelist *alt, *fl; > vm_page_t m; > - int avail, end, flind, freelist, i, need, oind, pind; > + int avail, end, flind, freelist, i, oind, pind; > > KASSERT(domain >=3D 0 && domain < vm_ndomains, > ("vm_phys_alloc_npages: domain %d is out of range", domain)); > @@ -762,20 +762,18 @@ vm_phys_alloc_npages(int domain, int pool, int > npages, vm_page_t ma[]) > for (oind =3D 0; oind < VM_NFREEORDER; oind++) { > while ((m =3D TAILQ_FIRST(&fl[oind].pl)) !=3D NUL= L) { > vm_freelist_rem(fl, m, oind); > - avail =3D 1 << oind; > - need =3D imin(npages - i, avail); > - for (end =3D i + need; i < end;) > + avail =3D i + (1 << oind); > + end =3D imin(npages, avail); > + while (i < end) > ma[i++] =3D m++; > - if (need < avail) { > + if (i =3D=3D npages) { > /* > - * Return excess pages to fl. It= s > - * order [0, oind) queues are > empty. > + * Return excess pages to fl. It= s > order > + * [0, oind) queues are empty. > */ > - vm_phys_enq_range(m, avail - need= , > fl, > - 1); > - return (npages); > - } else if (i =3D=3D npages) > + vm_phys_enq_range(m, avail - i, > fl, 1); > return (npages); > + } > } > } > for (oind =3D VM_NFREEORDER - 1; oind >=3D 0; oind--) { > @@ -785,21 +783,20 @@ vm_phys_alloc_npages(int domain, int pool, int > npages, vm_page_t ma[]) > NULL) { > vm_freelist_rem(alt, m, oind); > vm_phys_set_pool(pool, m, oind); > - avail =3D 1 << oind; > - need =3D imin(npages - i, avail); > - for (end =3D i + need; i < end;) > + avail =3D i + (1 << oind); > + end =3D imin(npages, avail); > + while (i < end) > ma[i++] =3D m++; > - if (need < avail) { > + if (i =3D=3D npages) { > /* > * Return excess pages to > fl. > * Its order [0, oind) > queues > * are empty. > */ > - vm_phys_enq_range(m, avai= l > - > - need, fl, 1); > - return (npages); > - } else if (i =3D=3D npages) > + vm_phys_enq_range(m, avai= l > - i, > + fl, 1); > return (npages); > + } > } > } > } > @@ -1146,7 +1143,7 @@ max_order(vm_page_t m) > * because the size of a physical address exceeds the size of > * a long. > */ > - return (min(ffsl(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, > + return (min(ffsll(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, > VM_NFREEORDER - 1)); > } > > @@ -1162,6 +1159,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) > struct vm_freelist *fl; > struct vm_phys_seg *seg; > vm_page_t m_end; > + vm_paddr_t diff, lo; > int order; > > /* > @@ -1173,15 +1171,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages= ) > fl =3D (*seg->free_queues)[m->pool]; > m_end =3D m + npages; > /* Free blocks of increasing size. */ > - while ((order =3D max_order(m)) < VM_NFREEORDER - 1 && > - m + (1 << order) <=3D m_end) { > - KASSERT(seg =3D=3D &vm_phys_segs[m->segind], > - ("%s: page range [%p,%p) spans multiple segments", > - __func__, m_end - npages, m)); > - vm_freelist_add(fl, m, order, 1); > - m +=3D 1 << order; > + lo =3D VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT; > + if (m < m_end && > + (diff =3D lo ^ (lo + npages - 1)) !=3D 0) { > + order =3D min(flsll(diff) - 1, VM_NFREEORDER - 1); > + m =3D vm_phys_enq_range(m, roundup2(-lo, 1 << order), fl,= 1); > } > + > /* Free blocks of maximum size. */ > + order =3D VM_NFREEORDER - 1; > while (m + (1 << order) <=3D m_end) { > KASSERT(seg =3D=3D &vm_phys_segs[m->segind], > ("%s: page range [%p,%p) spans multiple segments", > @@ -1560,10 +1558,8 @@ vm_phys_alloc_contig(int domain, u_long npages, > vm_paddr_t low, vm_paddr_t high, > vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); > } > /* Return excess pages to the free lists. */ > - if (&m_run[npages] < m) { > - fl =3D (*queues)[VM_FREEPOOL_DEFAULT]; > - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, > 0); > - } > + fl =3D (*queues)[VM_FREEPOOL_DEFAULT]; > + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); > return (m_run); > } > > --000000000000675be50601ec45f2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: base64 PGRpdj48YnI+PC9kaXY+PGRpdiBkaXI9ImF1dG8iPkhpLDwvZGl2PjxkaXYgZGlyPSJhdXRvIj48 YnI+PC9kaXY+PGRpdiBkaXI9ImF1dG8iPjxkaXYgZGlyPSJhdXRvIj5XaXRoIHRoaXMgY2hhbmdl LCBJIGdvdCBhIHBhbmljOjwvZGl2PjxkaXYgZGlyPSJhdXRvIj52bV9waHlzX2VucV9yYW5nZTog cGFnZSAweGZmZmZmZTAwMDAwMDAwMDAgYW5kIHBhZ2VzIDAgYXJlIG1pc2FsaWduZWQ8L2Rpdj48 L2Rpdj48ZGl2IGRpcj0iYXV0byI+PGJyPjxkaXYgY2xhc3M9ImdtYWlsX3F1b3RlIiBkaXI9ImF1 dG8iPjxkaXYgZGlyPSJsdHIiIGNsYXNzPSJnbWFpbF9hdHRyIj7QodGALCAyINCw0LLQsy4gMjAy M8Kg0LMuINCyIDA2OjIyLCBEb3VnIE1vb3JlICZsdDs8YSBocmVmPSJtYWlsdG86ZG91Z21AZnJl ZWJzZC5vcmciPmRvdWdtQGZyZWVic2Qub3JnPC9hPiZndDs6PGJyPjwvZGl2PjxibG9ja3F1b3Rl IGNsYXNzPSJnbWFpbF9xdW90ZSIgc3R5bGU9Im1hcmdpbjowIDAgMCAuOGV4O2JvcmRlci1sZWZ0 OjFweCAjY2NjIHNvbGlkO3BhZGRpbmctbGVmdDoxZXgiPlRoZSBicmFuY2ggbWFpbiBoYXMgYmVl biB1cGRhdGVkIGJ5IGRvdWdtOjxicj4NCjxicj4NClVSTDogPGEgaHJlZj0iaHR0cHM6Ly9jZ2l0 LkZyZWVCU0Qub3JnL3NyYy9jb21taXQvP2lkPTFhN2ZjZjZkNTFlYjY3ZWUzZTA1ZmRiYjgwNmY3 ZTY4ZjlmNTNjOWMiIHJlbD0ibm9yZWZlcnJlciIgdGFyZ2V0PSJfYmxhbmsiPmh0dHBzOi8vY2dp dC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD0xYTdmY2Y2ZDUxZWI2N2VlM2UwNWZkYmI4MDZm N2U2OGY5ZjUzYzljPC9hPjxicj4NCjxicj4NCmNvbW1pdCAxYTdmY2Y2ZDUxZWI2N2VlM2UwNWZk YmI4MDZmN2U2OGY5ZjUzYzljPGJyPg0KQXV0aG9yOsKgIMKgIMKgRG91ZyBNb29yZSAmbHQ7ZG91 Z21ARnJlZUJTRC5vcmcmZ3Q7PGJyPg0KQXV0aG9yRGF0ZTogMjAyMy0wOC0wMiAwMzoxMjowMCAr MDAwMDxicj4NCkNvbW1pdDrCoCDCoCDCoERvdWcgTW9vcmUgJmx0O2RvdWdtQEZyZWVCU0Qub3Jn Jmd0Ozxicj4NCkNvbW1pdERhdGU6IDIwMjMtMDgtMDIgMDM6MTI6MDAgKzAwMDA8YnI+DQo8YnI+ DQrCoCDCoCB2bV9waHlzX2VucXVldWVfY29udGlnOiBoYW5kbGUgbnBhZ2VzPT0wPGJyPg0KPGJy Pg0KwqAgwqAgQnkgbGV0dGluZyB2bV9waHlzX2VucXVldWVfY29udGlnIGhhbmRsZSB0aGUgY2Fz ZSB3aGVuIG5wYWdlcyA9PSAwLDxicj4NCsKgIMKgIHRoZSBjYWxsZXJzIGNhbiBzdG9wIGNoZWNr aW5nIGl0LCBhbmQgdGhlIGNvbXBpbGVyIGNhbiBzdG9wPGJyPg0KwqAgwqAgemVyby1jaGVja2lu ZyB3aXRoIGV2ZXJ5IGNhbGwgdG8gZmZzKCkuIExldHRpbmcgdm1fcGh5c19lbnF1ZXVlX2NvbnRp Zzxicj4NCsKgIMKgIGNhbGwgdm1fcGh5c19lbnF1ZXVlX2NvbnRpZyBmb3IgcGFydCBvZiBpdHMg d29yayBhbHNvIHNhdmVzIGEgZmV3PGJyPg0KwqAgwqAgYnl0ZXMuPGJyPg0KPGJyPg0KwqAgwqAg VGhlIGFtZDY0IG9iamVjdCBjb2RlIHNocmlua3MgYnkgODAgYnl0ZXMuPGJyPg0KPGJyPg0KwqAg wqAgUmV2aWV3ZWQgYnk6wqAgwqAga2liPGJyPg0KwqAgwqAgRGlmZmVyZW50aWFsIFJldmlzaW9u OsKgIDxhIGhyZWY9Imh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9ENDExNTQiIHJlbD0ibm9y ZWZlcnJlciIgdGFyZ2V0PSJfYmxhbmsiPmh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9ENDEx NTQ8L2E+PGJyPg0KLS0tPGJyPg0KwqBzeXMvdm0vdm1fcGh5cy5jIHwgNzQgKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS08YnI+DQrCoDEgZmls ZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSk8YnI+DQo8YnI+DQpk aWZmIC0tZ2l0IGEvc3lzL3ZtL3ZtX3BoeXMuYyBiL3N5cy92bS92bV9waHlzLmM8YnI+DQppbmRl eCAyOGYxMjIzMWUwMWMuLmIyMDg0YmRlZjRlMSAxMDA2NDQ8YnI+DQotLS0gYS9zeXMvdm0vdm1f cGh5cy5jPGJyPg0KKysrIGIvc3lzL3ZtL3ZtX3BoeXMuYzxicj4NCkBAIC03Miw2ICs3Miw4IEBA IF9fRkJTRElEKCZxdW90OyRGcmVlQlNEJCZxdW90Oyk7PGJyPg0KPGJyPg0KwqBfU3RhdGljX2Fz c2VydChzaXplb2YobG9uZykgKiBOQkJZICZndDs9IFZNX1BIWVNTRUdfTUFYLDxicj4NCsKgIMKg IMKgJnF1b3Q7VG9vIG1hbnkgcGh5c3NlZ3MuJnF1b3Q7KTs8YnI+DQorX1N0YXRpY19hc3NlcnQo c2l6ZW9mKGxvbmcgbG9uZykgJmd0Oz0gc2l6ZW9mKHZtX3BhZGRyX3QpLDxicj4NCivCoCDCoCAm cXVvdDt2bV9wYWRkcl90IHRvbyBiaWcgZm9yIGZmc2xsLCBmbHNsbC4mcXVvdDspOzxicj4NCjxi cj4NCsKgI2lmZGVmIE5VTUE8YnI+DQrCoHN0cnVjdCBtZW1fYWZmaW5pdHkgX19yZWFkX21vc3Rs eSAqbWVtX2FmZmluaXR5Ozxicj4NCkBAIC02OTAsMTggKzY5MiwxNiBAQCB2bV9waHlzX3NwbGl0 X3BhZ2VzKHZtX3BhZ2VfdCBtLCBpbnQgb2luZCwgc3RydWN0IHZtX2ZyZWVsaXN0ICpmbCwgaW50 IG9yZGVyLDxicj4NCsKgICo8YnI+DQrCoCAqIFRoZSBwaHlzaWNhbCBwYWdlIG0mIzM5O3MgYnVk ZHkgbXVzdCBub3QgYmUgZnJlZS48YnI+DQrCoCAqLzxicj4NCi1zdGF0aWMgdm9pZDxicj4NCitz dGF0aWMgdm1fcGFnZV90PGJyPg0KwqB2bV9waHlzX2VucV9yYW5nZSh2bV9wYWdlX3QgbSwgdV9p bnQgbnBhZ2VzLCBzdHJ1Y3Qgdm1fZnJlZWxpc3QgKmZsLCBpbnQgdGFpbCk8YnI+DQrCoHs8YnI+ DQotwqAgwqAgwqAgwqB1X2ludCBuOzxicj4NCsKgIMKgIMKgIMKgIGludCBvcmRlcjs8YnI+DQo8 YnI+DQotwqAgwqAgwqAgwqBLQVNTRVJUKG5wYWdlcyAmZ3Q7IDAsICgmcXVvdDt2bV9waHlzX2Vu cV9yYW5nZTogbnBhZ2VzIGlzIDAmcXVvdDspKTs8YnI+DQrCoCDCoCDCoCDCoCBLQVNTRVJUKCgo Vk1fUEFHRV9UT19QSFlTKG0pICsgbnBhZ2VzICogUEFHRV9TSVpFKSAmYW1wOzxicj4NCsKgIMKg IMKgIMKgIMKgIMKgICgoUEFHRV9TSVpFICZsdDsmbHQ7IChmbHMobnBhZ2VzKSAtIDEpKSAtIDEp KSA9PSAwLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKgICgmcXVvdDt2bV9waHlzX2VucV9yYW5nZTog cGFnZSAlcCBhbmQgbnBhZ2VzICV1IGFyZSBtaXNhbGlnbmVkJnF1b3Q7LDxicj4NCsKgIMKgIMKg IMKgIMKgIMKgIG0sIG5wYWdlcykpOzxicj4NCi3CoCDCoCDCoCDCoGRvIHs8YnI+DQorwqAgwqAg wqAgwqB3aGlsZSAobnBhZ2VzICZndDsgMCkgezxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IEtBU1NFUlQobS0mZ3Q7b3JkZXIgPT0gVk1fTkZSRUVPUkRFUiw8YnI+DQrCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCAoJnF1b3Q7dm1fcGh5c19lbnFfcmFuZ2U6IHBhZ2UgJXAgaGFzIHVu ZXhwZWN0ZWQgb3JkZXIgJWQmcXVvdDssPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgbSwgbS0mZ3Q7b3JkZXIpKTs8YnI+DQpAQCAtNzA5LDEwICs3MDksMTAgQEAgdm1fcGh5c19l bnFfcmFuZ2Uodm1fcGFnZV90IG0sIHVfaW50IG5wYWdlcywgc3RydWN0IHZtX2ZyZWVsaXN0ICpm bCwgaW50IHRhaWwpPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgS0FTU0VSVChvcmRlciAm bHQ7IFZNX05GUkVFT1JERVIsPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKCZx dW90O3ZtX3BoeXNfZW5xX3JhbmdlOiBvcmRlciAlZCBpcyBvdXQgb2YgcmFuZ2UmcXVvdDssIG9y ZGVyKSk7PGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgdm1fZnJlZWxpc3RfYWRkKGZsLCBt LCBvcmRlciwgdGFpbCk7PGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgbiA9IDEgJmx0OyZs dDsgb3JkZXI7PGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgbSArPSBuOzxicj4NCi3CoCDC oCDCoCDCoCDCoCDCoCDCoCDCoG5wYWdlcyAtPSBuOzxicj4NCi3CoCDCoCDCoCDCoH0gd2hpbGUg KG5wYWdlcyAmZ3Q7IDApOzxicj4NCivCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG0gKz0gMSAmbHQ7 Jmx0OyBvcmRlcjs8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBucGFnZXMgLT0gMSAmbHQ7 Jmx0OyBvcmRlcjs8YnI+DQorwqAgwqAgwqAgwqB9PGJyPg0KK8KgIMKgIMKgIMKgcmV0dXJuICht KTs8YnI+DQrCoH08YnI+DQo8YnI+DQrCoC8qPGJyPg0KQEAgLTc0NCw3ICs3NDQsNyBAQCB2bV9w aHlzX2FsbG9jX25wYWdlcyhpbnQgZG9tYWluLCBpbnQgcG9vbCwgaW50IG5wYWdlcywgdm1fcGFn ZV90IG1hW10pPGJyPg0KwqB7PGJyPg0KwqAgwqAgwqAgwqAgc3RydWN0IHZtX2ZyZWVsaXN0ICph bHQsICpmbDs8YnI+DQrCoCDCoCDCoCDCoCB2bV9wYWdlX3QgbTs8YnI+DQotwqAgwqAgwqAgwqBp bnQgYXZhaWwsIGVuZCwgZmxpbmQsIGZyZWVsaXN0LCBpLCBuZWVkLCBvaW5kLCBwaW5kOzxicj4N CivCoCDCoCDCoCDCoGludCBhdmFpbCwgZW5kLCBmbGluZCwgZnJlZWxpc3QsIGksIG9pbmQsIHBp bmQ7PGJyPg0KPGJyPg0KwqAgwqAgwqAgwqAgS0FTU0VSVChkb21haW4gJmd0Oz0gMCAmYW1wOyZh bXA7IGRvbWFpbiAmbHQ7IHZtX25kb21haW5zLDxicj4NCsKgIMKgIMKgIMKgIMKgIMKgICgmcXVv dDt2bV9waHlzX2FsbG9jX25wYWdlczogZG9tYWluICVkIGlzIG91dCBvZiByYW5nZSZxdW90Oywg ZG9tYWluKSk7PGJyPg0KQEAgLTc2MiwyMCArNzYyLDE4IEBAIHZtX3BoeXNfYWxsb2NfbnBhZ2Vz KGludCBkb21haW4sIGludCBwb29sLCBpbnQgbnBhZ2VzLCB2bV9wYWdlX3QgbWFbXSk8YnI+DQrC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBmb3IgKG9pbmQgPSAwOyBvaW5kICZsdDsgVk1fTkZSRUVP UkRFUjsgb2luZCsrKSB7PGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg d2hpbGUgKChtID0gVEFJTFFfRklSU1QoJmFtcDtmbFtvaW5kXS5wbCkpICE9IE5VTEwpIHs8YnI+ DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB2bV9mcmVl bGlzdF9yZW0oZmwsIG0sIG9pbmQpOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoGF2YWlsID0gMSAmbHQ7Jmx0OyBvaW5kOzxicj4NCi3CoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG5lZWQgPSBpbWluKG5wYWdl cyAtIGksIGF2YWlsKTs8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqBmb3IgKGVuZCA9IGkgKyBuZWVkOyBpICZsdDsgZW5kOyk8YnI+DQorwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBhdmFpbCA9IGkgKyAoMSAm bHQ7Jmx0OyBvaW5kKTs8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqBlbmQgPSBpbWluKG5wYWdlcywgYXZhaWwpOzxicj4NCivCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHdoaWxlIChpICZsdDsgZW5kKTxicj4N CsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIG1hW2krK10gPSBtKys7PGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgaWYgKG5lZWQgJmx0OyBhdmFpbCkgezxicj4NCivCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGlmIChpID09IG5wYWdlcykgezxicj4N CsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIC8qPGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgICogUmV0dXJuIGV4Y2VzcyBwYWdlcyB0byBmbC7CoCBJdHM8YnI+DQot wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgKiBvcmRlciBbMCwgb2luZCkgcXVldWVzIGFyZSBlbXB0eS48YnI+DQorwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKiBSZXR1cm4g ZXhjZXNzIHBhZ2VzIHRvIGZsLsKgIEl0cyBvcmRlcjxicj4NCivCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAqIFswLCBvaW5kKSBxdWV1 ZXMgYXJlIGVtcHR5Ljxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgKi88YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB2bV9waHlzX2VucV9yYW5nZShtLCBh dmFpbCAtIG5lZWQsIGZsLDxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoDEpOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHJldHVybiAobnBhZ2Vz KTs8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB9 IGVsc2UgaWYgKGkgPT0gbnBhZ2VzKTxicj4NCivCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHZtX3BoeXNfZW5xX3JhbmdlKG0sIGF2YWls IC0gaSwgZmwsIDEpOzxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHJldHVybiAobnBhZ2VzKTs8YnI+DQorwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB9PGJyPg0KwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgfTxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH08YnI+ DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBmb3IgKG9pbmQgPSBWTV9ORlJFRU9SREVSIC0gMTsg b2luZCAmZ3Q7PSAwOyBvaW5kLS0pIHs8YnI+DQpAQCAtNzg1LDIxICs3ODMsMjAgQEAgdm1fcGh5 c19hbGxvY19ucGFnZXMoaW50IGRvbWFpbiwgaW50IHBvb2wsIGludCBucGFnZXMsIHZtX3BhZ2Vf dCBtYVtdKTxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIE5VTEwpIHs8YnI+DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB2bV9mcmVlbGlzdF9yZW0oYWx0LCBtLCBvaW5kKTs8 YnI+DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCB2bV9waHlzX3NldF9wb29sKHBvb2wsIG0sIG9pbmQpOzxicj4NCi3CoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGF2YWlsID0g MSAmbHQ7Jmx0OyBvaW5kOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG5lZWQgPSBpbWluKG5wYWdlcyAtIGksIGF2YWlsKTs8 YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqBmb3IgKGVuZCA9IGkgKyBuZWVkOyBpICZsdDsgZW5kOyk8YnI+DQorwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBhdmFpbCA9 IGkgKyAoMSAmbHQ7Jmx0OyBvaW5kKTs8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBlbmQgPSBpbWluKG5wYWdlcywgYXZhaWwp Ozxicj4NCivCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoHdoaWxlIChpICZsdDsgZW5kKTxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG1hW2krK10g PSBtKys7PGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgaWYgKG5lZWQgJmx0OyBhdmFpbCkgezxicj4NCivCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGlmIChpID09IG5w YWdlcykgezxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC8qPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAqIFJl dHVybiBleGNlc3MgcGFnZXMgdG8gZmwuPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAqIEl0cyBvcmRl ciBbMCwgb2luZCkgcXVldWVzPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAqIGFyZSBlbXB0eS48YnI+ DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCovPGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgdm1fcGh5c19lbnFfcmFu Z2UobSwgYXZhaWwgLTxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoG5lZWQsIGZsLCAxKTs8YnI+ DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqByZXR1cm4gKG5wYWdlcyk7PGJyPg0KLcKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfSBlbHNlIGlmIChpID09 IG5wYWdlcyk8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB2bV9waHlzX2VucV9yYW5nZShtLCBhdmFpbCAt IGksPGJyPg0KK8KgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgZmwsIDEpOzxicj4NCsKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IHJldHVybiAobnBhZ2VzKTs8YnI+DQorwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB9PGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfTxicj4NCsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIH08YnI+DQrCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB9PGJyPg0KQEAgLTExNDYs NyArMTE0Myw3IEBAIG1heF9vcmRlcih2bV9wYWdlX3QgbSk8YnI+DQrCoCDCoCDCoCDCoCDCoCog YmVjYXVzZSB0aGUgc2l6ZSBvZiBhIHBoeXNpY2FsIGFkZHJlc3MgZXhjZWVkcyB0aGUgc2l6ZSBv Zjxicj4NCsKgIMKgIMKgIMKgIMKgKiBhIGxvbmcuPGJyPg0KwqAgwqAgwqAgwqAgwqAqLzxicj4N Ci3CoCDCoCDCoCDCoHJldHVybiAobWluKGZmc2woVk1fUEFHRV9UT19QSFlTKG0pICZndDsmZ3Q7 IFBBR0VfU0hJRlQpIC0gMSw8YnI+DQorwqAgwqAgwqAgwqByZXR1cm4gKG1pbihmZnNsbChWTV9Q QUdFX1RPX1BIWVMobSkgJmd0OyZndDsgUEFHRV9TSElGVCkgLSAxLDxicj4NCsKgIMKgIMKgIMKg IMKgIMKgIFZNX05GUkVFT1JERVIgLSAxKSk7PGJyPg0KwqB9PGJyPg0KPGJyPg0KQEAgLTExNjIs NiArMTE1OSw3IEBAIHZtX3BoeXNfZW5xdWV1ZV9jb250aWcodm1fcGFnZV90IG0sIHVfbG9uZyBu cGFnZXMpPGJyPg0KwqAgwqAgwqAgwqAgc3RydWN0IHZtX2ZyZWVsaXN0ICpmbDs8YnI+DQrCoCDC oCDCoCDCoCBzdHJ1Y3Qgdm1fcGh5c19zZWcgKnNlZzs8YnI+DQrCoCDCoCDCoCDCoCB2bV9wYWdl X3QgbV9lbmQ7PGJyPg0KK8KgIMKgIMKgIMKgdm1fcGFkZHJfdCBkaWZmLCBsbzs8YnI+DQrCoCDC oCDCoCDCoCBpbnQgb3JkZXI7PGJyPg0KPGJyPg0KwqAgwqAgwqAgwqAgLyo8YnI+DQpAQCAtMTE3 MywxNSArMTE3MSwxNSBAQCB2bV9waHlzX2VucXVldWVfY29udGlnKHZtX3BhZ2VfdCBtLCB1X2xv bmcgbnBhZ2VzKTxicj4NCsKgIMKgIMKgIMKgIGZsID0gKCpzZWctJmd0O2ZyZWVfcXVldWVzKVtt LSZndDtwb29sXTs8YnI+DQrCoCDCoCDCoCDCoCBtX2VuZCA9IG0gKyBucGFnZXM7PGJyPg0KwqAg wqAgwqAgwqAgLyogRnJlZSBibG9ja3Mgb2YgaW5jcmVhc2luZyBzaXplLiAqLzxicj4NCi3CoCDC oCDCoCDCoHdoaWxlICgob3JkZXIgPSBtYXhfb3JkZXIobSkpICZsdDsgVk1fTkZSRUVPUkRFUiAt IDEgJmFtcDsmYW1wOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoG0gKyAoMSAmbHQ7Jmx0OyBvcmRl cikgJmx0Oz0gbV9lbmQpIHs8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBLQVNTRVJUKHNl ZyA9PSAmYW1wO3ZtX3BoeXNfc2Vnc1ttLSZndDtzZWdpbmRdLDxicj4NCi3CoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCgmcXVvdDslczogcGFnZSByYW5nZSBbJXAsJXApIHNwYW5zIG11bHRp cGxlIHNlZ21lbnRzJnF1b3Q7LDxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoF9f ZnVuY19fLCBtX2VuZCAtIG5wYWdlcywgbSkpOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDCoCDCoCDC oHZtX2ZyZWVsaXN0X2FkZChmbCwgbSwgb3JkZXIsIDEpOzxicj4NCi3CoCDCoCDCoCDCoCDCoCDC oCDCoCDCoG0gKz0gMSAmbHQ7Jmx0OyBvcmRlcjs8YnI+DQorwqAgwqAgwqAgwqBsbyA9IFZNX1BB R0VfVE9fUEhZUyhtKSAmZ3Q7Jmd0OyBQQUdFX1NISUZUOzxicj4NCivCoCDCoCDCoCDCoGlmICht ICZsdDsgbV9lbmQgJmFtcDsmYW1wOzxicj4NCivCoCDCoCDCoCDCoCDCoCDCoChkaWZmID0gbG8g XiAobG8gKyBucGFnZXMgLSAxKSkgIT0gMCkgezxicj4NCivCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oG9yZGVyID0gbWluKGZsc2xsKGRpZmYpIC0gMSwgVk1fTkZSRUVPUkRFUiAtIDEpOzxicj4NCivC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoG0gPSB2bV9waHlzX2VucV9yYW5nZShtLCByb3VuZHVwMigt bG8sIDEgJmx0OyZsdDsgb3JkZXIpLCBmbCwgMSk7PGJyPg0KwqAgwqAgwqAgwqAgfTxicj4NCis8 YnI+DQrCoCDCoCDCoCDCoCAvKiBGcmVlIGJsb2NrcyBvZiBtYXhpbXVtIHNpemUuICovPGJyPg0K K8KgIMKgIMKgIMKgb3JkZXIgPSBWTV9ORlJFRU9SREVSIC0gMTs8YnI+DQrCoCDCoCDCoCDCoCB3 aGlsZSAobSArICgxICZsdDsmbHQ7IG9yZGVyKSAmbHQ7PSBtX2VuZCkgezxicj4NCsKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIEtBU1NFUlQoc2VnID09ICZhbXA7dm1fcGh5c19zZWdzW20tJmd0O3Nl Z2luZF0sPGJyPg0KwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKCZxdW90OyVzOiBwYWdl IHJhbmdlIFslcCwlcCkgc3BhbnMgbXVsdGlwbGUgc2VnbWVudHMmcXVvdDssPGJyPg0KQEAgLTE1 NjAsMTAgKzE1NTgsOCBAQCB2bV9waHlzX2FsbG9jX2NvbnRpZyhpbnQgZG9tYWluLCB1X2xvbmcg bnBhZ2VzLCB2bV9wYWRkcl90IGxvdywgdm1fcGFkZHJfdCBoaWdoLDxicj4NCsKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHZtX3BoeXNfc2V0X3Bvb2woVk1fRlJFRVBPT0xfREVG QVVMVCwgbSwgb2luZCk7PGJyPg0KwqAgwqAgwqAgwqAgfTxicj4NCsKgIMKgIMKgIMKgIC8qIFJl dHVybiBleGNlc3MgcGFnZXMgdG8gdGhlIGZyZWUgbGlzdHMuICovPGJyPg0KLcKgIMKgIMKgIMKg aWYgKCZhbXA7bV9ydW5bbnBhZ2VzXSAmbHQ7IG0pIHs8YnI+DQotwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqBmbCA9ICgqcXVldWVzKVtWTV9GUkVFUE9PTF9ERUZBVUxUXTs8YnI+DQotwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqB2bV9waHlzX2VucV9yYW5nZSgmYW1wO21fcnVuW25wYWdlc10sIG0gLSAm YW1wO21fcnVuW25wYWdlc10sIGZsLCAwKTs8YnI+DQotwqAgwqAgwqAgwqB9PGJyPg0KK8KgIMKg IMKgIMKgZmwgPSAoKnF1ZXVlcylbVk1fRlJFRVBPT0xfREVGQVVMVF07PGJyPg0KK8KgIMKgIMKg IMKgdm1fcGh5c19lbnFfcmFuZ2UoJmFtcDttX3J1bltucGFnZXNdLCBtIC0gJmFtcDttX3J1bltu cGFnZXNdLCBmbCwgMCk7PGJyPg0KwqAgwqAgwqAgwqAgcmV0dXJuIChtX3J1bik7PGJyPg0KwqB9 PGJyPg0KPGJyPg0KPC9ibG9ja3F1b3RlPjwvZGl2PjwvZGl2Pg0K --000000000000675be50601ec45f2-- From nobody Wed Aug 2 09:04: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 4RG5pl4bmpz4qRyt; Wed, 2 Aug 2023 09:12: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 4RG5dc44yvz3rkF; Wed, 2 Aug 2023 09:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690967076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ctL+FxbJ1DcVn8LRgLwsAQ1Be+G1thkAsHe9R7WGfwc=; b=qJrLTvV7z0qKz2whF9hvPPb7f8YQ5rCsVq8YfinpuFHlhg8Tt4Qq0AnU4PXBzrQUwWdxig QaAIvciJxnxsfeMcWtge56qAR3whhZKI4B+KAD3glJVFjmPxbr76PAh3BjDqg0vOPzw3Bl pGn9mGCyPG4+C8oaDjpkc/mwSoOYg8TmHUF608uWMzG1S0T35h7JqfvdybuFtdJEJgrXzo FpnMGcRQXZt/CnRSaC9Y16+H7dVsMasxVJBppTGOYBBeV26defR+RQwoX8/LU2hUE/8Yvb TLqCksZLxxPhEQgp6JUoPAFoD4x8gVPsDMP3H8htaWUuyQRiBoCDOMHRjJNQhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690967076; a=rsa-sha256; cv=none; b=gfhRqWqSjOFHMmJOWmduxCmwMYLQ/uwLa8OtTXMUCUIC30gYNdvp180umtkewGKxlxuiIH 8YeEAFgAgiNzvm4XQbwP2lG2N14/2e/JXIlfSc2MccV3y6usnKgrg/dnghzffXuYFW/dDs ENrWJSJ1iiF6H3uQUJJnhRQjlpBJcy1cM8DW94KCATo1P12PvXb9+1JP1zrvtYDfvf45d/ wdm/3iwhX0BtktIt1gZhx2HTX2/2fpl5Rw6RvOPayC6EvT2BbAQp4lhOgy3eiQ2t2UulTJ bxCadHYAphm9UFR2xB0fxgTODiW78JntRXn9awAl+lpuRPgh0qdDH8+RwE0y7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690967076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ctL+FxbJ1DcVn8LRgLwsAQ1Be+G1thkAsHe9R7WGfwc=; b=C3Ki033zZJEe1QuPzPzthoBK0bumoHqqZq4tg+4dpYlyz6S+Rmqocy6nFzcNOiWN0/sQ9h +Ys73qnLxVaE4cBI99j11kyaetpNAjTcFeCzDVw+uxIGEBdAb4Ykwku9Z2h2e5td97XH/p NpWko8PZdA3VauvgAS7Xr7Y5GpE5iy4iJkEEMPPxLFR258eCfIEinkEQLusnuGK3v+v3sm z27Cb2kE/ieqnCA9mXtekmhdUdAMNVYZCZhpimuiReDz7hGdlsmbQUY71R36O/JEJuScX8 zWezOaNsrWhh357CyNgIvn33J3YTZt/ZdyIPlnix0ox0J+F3AIZznQEi9bBakQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG5dc1Xg0zDh8; Wed, 2 Aug 2023 09:04: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 37294X6p007931; Wed, 2 Aug 2023 09:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37294XP3007930; Wed, 2 Aug 2023 09:04:33 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:04:33 GMT Message-Id: <202308020904.37294XP3007930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a924b48579c7 - main - usb(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a924b48579c7a0c794431fbd3f540ce56c4cd662 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a924b48579c7a0c794431fbd3f540ce56c4cd662 commit a924b48579c7a0c794431fbd3f540ce56c4cd662 Author: Gordon Bergling AuthorDate: 2023-08-02 09:04:24 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:04:24 +0000 usb(4): Fix a typo in a source code comment - s/determin/determine/ MFC after: 3 days --- sys/dev/usb/video/udl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c index da0b7a201a5e..5d4c3f87e5ec 100644 --- a/sys/dev/usb/video/udl.c +++ b/sys/dev/usb/video/udl.c @@ -786,7 +786,7 @@ udl_select_chip(struct udl_softc *sc, struct usb_attach_arg *uaa) /* * WS Tech DVI is DL120 or DL160. All deviced uses the * same revision (0.04) so iSerialNumber must be used - * to determin which chip it is. + * to determine which chip it is. */ if (strlen(pserial) > 7) { From nobody Wed Aug 2 09:27: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 4RG6JZ0Hljz4qSjZ; Wed, 2 Aug 2023 09:34: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 4RG68D4nkLz3xwZ; Wed, 2 Aug 2023 09:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ax1m7H8Tc9lbIerZapjaUJ2FtEND2vds520CaYlgtPQ=; b=YIBGiWBseKjqfgPXhr1WB9Ea36lzoRkeNOk1VnYHpOWc76bXa+9sBpKGFb1y35E4tANaRR pkC3NkDnul1D1qs+wVUzIiI6+LTb7Pbdbys9i8ss2j68BXhwTEsI70obSezm0Yn3PXpPft v8AZlX2luSpMur4wGcxBW+ROtXY7RfSQO089wnq1eFuP4HtAHwzRjcKQESselkqoYEGCSs Ouk43X8w2QTr2al82PeLEHbn0LXwm8sKIHMPNjZA2rCe/sFKr4oRMkJCPjPIV8uXN/ExpU CPTRZwAQ2zlxBht0iOOI24FVO5fNdT3arCteXkVLB2FVufQd3l/am36SEs/LPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690968461; a=rsa-sha256; cv=none; b=OMaAcgKGqLA1nIHg/GeDJDpa+iMCpA5ZTzAg193jl41VLB4MFjPYJTox2UlEl7W5PUb2RF OpX8dKhs09EW0foYt9QTkZmaSR5El1GhoJtyNI/DiH74nh5vGw27VLuwdWys/dJdfn2a+r VLUKrqtVdGfn0zM+CFGB6/PqUfT6hVIyrGdeOGRGb/DgalIDkXwdP2eqL3I15wPJIPU/AM 8PhP1qAd6nYjhNBU7ImVNhb0k7IbytHe4mZwve398ZvIWolRixi51rKRJ7pruM00baT2Zt 76tI+EAnOmsjtTXDWTsykimKQaEP/Yjmkr5FQRYQGmahpTQvCPHO3v7pw3wdWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ax1m7H8Tc9lbIerZapjaUJ2FtEND2vds520CaYlgtPQ=; b=l+5T8TBuYH8pVQPc0rzFHADb36wxGv0PK8jsfHhkxlD9oD5plcFz5Blykv8D4T56imLius B0tEDeZDWD1AsCnGTLF+aX7F4kzw76vT7yAq21rxWsCg3Qo0peDV1lKO+nAsw8o0qYoxUV mpja7uFxmtHHCQc7MhrI1nxj408/UXoAsInnZXKvKJAvtbqpnu1hTH5848g5H6ZwBocHyD 5XzmgkzR98+pBW98AL6uKrQMegL+aEOPl7IkraMbnHXmL1njiZYkutdh4sniLSSOxwaLYf JwQeVxHNxCk5wgN/qIuj9gfMCVCfUldarOCpyWHA4KDpmdpJsYg+GHM/9rGESw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG68C5DHhzDrp; Wed, 2 Aug 2023 09:27: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 3729RdM3040778; Wed, 2 Aug 2023 09:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729RdvU040777; Wed, 2 Aug 2023 09:27:39 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:27:39 GMT Message-Id: <202308020927.3729RdvU040777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 11892bc710a7 - main - nfsserver: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11892bc710a741a03735b164dc089d40d7d80374 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=11892bc710a741a03735b164dc089d40d7d80374 commit 11892bc710a741a03735b164dc089d40d7d80374 Author: Gordon Bergling AuthorDate: 2023-08-02 09:27:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:27:30 +0000 nfsserver: Fix a typo in a source code comment - s/restared/restarted/ MFC after: 3 days --- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 57bc4a6e5940..ff228554f191 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4642,7 +4642,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, * client somehow does an RPC without a * SequenceID Op that causes a callback just * after the nfsd threads have been terminated - * and restared we could conceivably get here + * and restarted we could conceivably get here * without a backchannel xprt. */ printf("nfsrv_docallback: no xprt\n"); From nobody Wed Aug 2 08:52: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 4RG6N55XGjz4qSnC; Wed, 2 Aug 2023 09:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG5MC1jwjz3m4n; Wed, 2 Aug 2023 08:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690966327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JFoO62h8epZgdXV0FcJv8/8twsUmgB/ESY7/MbRHFw=; b=GUSsLJZgLH6xChjwpD89aBFQpDCEorFMqjmzHMASwmq8qHVnWc35vUBCb+NFIJTY9PdDZC G32do3TBmE2W4BlTsDhSH2ns0kv9qtlenYeqDrBLq5cfgEsihrUxKHqC9cuTPT+yOoQN8J nnJse0cYKdYNoJX8+Drda6ZbIFkPdJekSC1YWuydX+JxhLYnfwf8bevZ/HL+7BfuvK5YLP pufTh4q9n8RXPM9MlcGUYPdqzErjFWw3TXA4xvolIkd6DhFKVfaGZNU2Oh+IaUrgx3XVzj k+2xMXYVstiuGCQquGD5kk25LicPatmLfl0eKh8XDtBAzSM+Dk48uBqxbl+OnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690966327; a=rsa-sha256; cv=none; b=Lln/+wahGjQ+CD4TpeT0YvCM6HoOR/OiTiL+PpAjUud/M8WRBFmidBjybpqZIcSkHt+aVZ bexh/ktaY8GRSzI5GjoN3xLX8FEriOp/dTrG3XN5VYcj2BBeqobiT0eBs+CNM2P69eOW1Z joWOQCOkWycTGtDiYHtpOcttBgS21dBVKAS8HmCPf7SKsS1YJ3KJRsqVtKwDaEcfJjHcsF 41AppBJNJR0eQwBdCaXlwSVkn4QwR8rN9k9VYkla4Bh16Sx/mcLO1QRYjUaXXraGd+z6LR J5kwZGeTUJVE4Ll5ayA/Gf/16jlJAeWJbbwgqMAXy5V7y9QW+ck2LJ9xASNKHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690966327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JFoO62h8epZgdXV0FcJv8/8twsUmgB/ESY7/MbRHFw=; b=QiJU/D46f3dHL8lPFuWXb2AWsH69Mdjg/o2o3cPnRtPVE2QK82eK/S99fu7sSWuNySMCjs gwj+vyQdjmzIMqi8funt51d2+Doo+lzsQj/41ctm8Swb61CXVMU8kMXx5bRRK21LPW0XxS bqpblCVoLmx5VqOnwb5YyHdAfulik/dR1TBlcRo5iURGe0L/XlbAg8wGaptxcEXnCKhTO+ znoYpQ3bv/sb3C46rjCeodEPnVM0BIWGgwBruLSdx9I1UNgm1o7hmXR0n9iM5/HWN2NpI9 TM7Y+UgCj9xR58sj72ClYrfzRtezhIdlRLyMu7W5j9RReeHjPhfVFyWqFUUhNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG5MC0Bnlz1Cdf; Wed, 2 Aug 2023 08:52: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 3728q6bY088183; Wed, 2 Aug 2023 08:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3728q6SZ088182; Wed, 2 Aug 2023 08:52:06 GMT (envelope-from git) Date: Wed, 2 Aug 2023 08:52:06 GMT Message-Id: <202308020852.3728q6SZ088182@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: 67365116239d - main - arm64: enable kern.conftxt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 67365116239d14bef225e7c5c63757ed805d48a0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=67365116239d14bef225e7c5c63757ed805d48a0 commit 67365116239d14bef225e7c5c63757ed805d48a0 Author: Kristof Provost AuthorDate: 2023-08-01 15:22:52 +0000 Commit: Kristof Provost CommitDate: 2023-08-02 08:51:44 +0000 arm64: enable kern.conftxt Match other platforms, include the kernel config in the build. Reviewed by: emaste Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41284 --- sys/arm64/conf/std.arm64 | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 6480ca6530e4..c8d407e8df8a 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -61,6 +61,7 @@ options MAC # TrustedBSD MAC Framework options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data +options INCLUDE_CONFIG_FILE # Include this file in kernel options VFP # Floating-point support options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default From nobody Wed Aug 2 09:23: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 4RG6T56xRpz4qT5B; Wed, 2 Aug 2023 09:42:14 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mx-out-01.fh-muenster.de (mx-out-01.fh-muenster.de [185.149.214.63]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mx.fh-muenster.de", Issuer "GEANT OV RSA CA 4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RG64R0gYBz3wyW; Wed, 2 Aug 2023 09:24:23 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Authentication-Results: mx1.freebsd.org; none Received: from mail-director-01.fh-muenster.de (mail-director-01.fh-muenster.de [185.149.215.227]) by mx-out-01.fh-muenster.de (Postfix) with ESMTPS id 5DE1720746; Wed, 2 Aug 2023 11:23:50 +0200 (CEST) Received: from smtpclient.apple (ip4d15f6ca.dynamic.kabel-deutschland.de [77.21.246.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tuexen) by mail-director-01.fh-muenster.de (Postfix) with ESMTPSA id B4AB51A004B; Wed, 2 Aug 2023 11:23:49 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_EE90BED6-27D5-418F-BB28-2CEC87741BBE"; protocol="application/pkcs7-signature"; micalg=sha-256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: 1a7fcf6d51eb - main - vm_phys_enqueue_contig: handle npages==0 From: tuexen@fh-muenster.de In-Reply-To: Date: Wed, 2 Aug 2023 11:23:48 +0200 Cc: Doug Moore , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202308020314.3723ETgj027830@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3731.700.6) X-Rspamd-Queue-Id: 4RG64R0gYBz3wyW 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:680, ipnet:185.149.212.0/22, country:DE] --Apple-Mail=_EE90BED6-27D5-418F-BB28-2CEC87741BBE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 2. Aug 2023, at 10:15, Dmitry Chagin wrote: >=20 >=20 > Hi, >=20 > With this change, I got a panic: > vm_phys_enq_range: page 0xfffffe0000000000 and pages 0 are misaligned My arm64 system also panics: panic: vm_phys_enq_range: page 0xffffa000796a7000 and npages 4294443008 = are misaligned Best regards Michael >=20 > =D0=A1=D1=80, 2 =D0=B0=D0=B2=D0=B3. 2023 =D0=B3. =D0=B2 06:22, Doug = Moore : > The branch main has been updated by dougm: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1a7fcf6d51eb67ee3e05fdbb806f7e68= f9f53c9c >=20 > commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c > Author: Doug Moore > AuthorDate: 2023-08-02 03:12:00 +0000 > Commit: Doug Moore > CommitDate: 2023-08-02 03:12:00 +0000 >=20 > vm_phys_enqueue_contig: handle npages=3D=3D0 >=20 > By letting vm_phys_enqueue_contig handle the case when npages =3D=3D= 0, > the callers can stop checking it, and the compiler can stop > zero-checking with every call to ffs(). Letting = vm_phys_enqueue_contig > call vm_phys_enqueue_contig for part of its work also saves a few > bytes. >=20 > The amd64 object code shrinks by 80 bytes. >=20 > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D41154 > --- > sys/vm/vm_phys.c | 74 = +++++++++++++++++++++++++++----------------------------- > 1 file changed, 35 insertions(+), 39 deletions(-) >=20 > diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c > index 28f12231e01c..b2084bdef4e1 100644 > --- a/sys/vm/vm_phys.c > +++ b/sys/vm/vm_phys.c > @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); >=20 > _Static_assert(sizeof(long) * NBBY >=3D VM_PHYSSEG_MAX, > "Too many physsegs."); > +_Static_assert(sizeof(long long) >=3D sizeof(vm_paddr_t), > + "vm_paddr_t too big for ffsll, flsll."); >=20 > #ifdef NUMA > struct mem_affinity __read_mostly *mem_affinity; > @@ -690,18 +692,16 @@ vm_phys_split_pages(vm_page_t m, int oind, = struct vm_freelist *fl, int order, > * > * The physical page m's buddy must not be free. > */ > -static void > +static vm_page_t > vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, = int tail) > { > - u_int n; > int order; >=20 > - KASSERT(npages > 0, ("vm_phys_enq_range: npages is 0")); > KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & > ((PAGE_SIZE << (fls(npages) - 1)) - 1)) =3D=3D 0, > ("vm_phys_enq_range: page %p and npages %u are = misaligned", > m, npages)); > - do { > + while (npages > 0) { > KASSERT(m->order =3D=3D VM_NFREEORDER, > ("vm_phys_enq_range: page %p has unexpected order = %d", > m, m->order)); > @@ -709,10 +709,10 @@ vm_phys_enq_range(vm_page_t m, u_int npages, = struct vm_freelist *fl, int tail) > KASSERT(order < VM_NFREEORDER, > ("vm_phys_enq_range: order %d is out of range", = order)); > vm_freelist_add(fl, m, order, tail); > - n =3D 1 << order; > - m +=3D n; > - npages -=3D n; > - } while (npages > 0); > + m +=3D 1 << order; > + npages -=3D 1 << order; > + } > + return (m); > } >=20 > /* > @@ -744,7 +744,7 @@ vm_phys_alloc_npages(int domain, int pool, int = npages, vm_page_t ma[]) > { > struct vm_freelist *alt, *fl; > vm_page_t m; > - int avail, end, flind, freelist, i, need, oind, pind; > + int avail, end, flind, freelist, i, oind, pind; >=20 > KASSERT(domain >=3D 0 && domain < vm_ndomains, > ("vm_phys_alloc_npages: domain %d is out of range", = domain)); > @@ -762,20 +762,18 @@ vm_phys_alloc_npages(int domain, int pool, int = npages, vm_page_t ma[]) > for (oind =3D 0; oind < VM_NFREEORDER; oind++) { > while ((m =3D TAILQ_FIRST(&fl[oind].pl)) !=3D = NULL) { > vm_freelist_rem(fl, m, oind); > - avail =3D 1 << oind; > - need =3D imin(npages - i, avail); > - for (end =3D i + need; i < end;) > + avail =3D i + (1 << oind); > + end =3D imin(npages, avail); > + while (i < end) > ma[i++] =3D m++; > - if (need < avail) { > + if (i =3D=3D npages) { > /* > - * Return excess pages to fl. = Its > - * order [0, oind) queues are = empty. > + * Return excess pages to fl. = Its order > + * [0, oind) queues are empty. > */ > - vm_phys_enq_range(m, avail - = need, fl, > - 1); > - return (npages); > - } else if (i =3D=3D npages) > + vm_phys_enq_range(m, avail - = i, fl, 1); > return (npages); > + } > } > } > for (oind =3D VM_NFREEORDER - 1; oind >=3D 0; oind--) = { > @@ -785,21 +783,20 @@ vm_phys_alloc_npages(int domain, int pool, int = npages, vm_page_t ma[]) > NULL) { > vm_freelist_rem(alt, m, oind); > vm_phys_set_pool(pool, m, = oind); > - avail =3D 1 << oind; > - need =3D imin(npages - i, = avail); > - for (end =3D i + need; i < = end;) > + avail =3D i + (1 << oind); > + end =3D imin(npages, avail); > + while (i < end) > ma[i++] =3D m++; > - if (need < avail) { > + if (i =3D=3D npages) { > /* > * Return excess pages = to fl. > * Its order [0, oind) = queues > * are empty. > */ > - vm_phys_enq_range(m, = avail - > - need, fl, 1); > - return (npages); > - } else if (i =3D=3D npages) > + vm_phys_enq_range(m, = avail - i, > + fl, 1); > return (npages); > + } > } > } > } > @@ -1146,7 +1143,7 @@ max_order(vm_page_t m) > * because the size of a physical address exceeds the size of > * a long. > */ > - return (min(ffsl(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, > + return (min(ffsll(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, > VM_NFREEORDER - 1)); > } >=20 > @@ -1162,6 +1159,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long = npages) > struct vm_freelist *fl; > struct vm_phys_seg *seg; > vm_page_t m_end; > + vm_paddr_t diff, lo; > int order; >=20 > /* > @@ -1173,15 +1171,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long = npages) > fl =3D (*seg->free_queues)[m->pool]; > m_end =3D m + npages; > /* Free blocks of increasing size. */ > - while ((order =3D max_order(m)) < VM_NFREEORDER - 1 && > - m + (1 << order) <=3D m_end) { > - KASSERT(seg =3D=3D &vm_phys_segs[m->segind], > - ("%s: page range [%p,%p) spans multiple segments", > - __func__, m_end - npages, m)); > - vm_freelist_add(fl, m, order, 1); > - m +=3D 1 << order; > + lo =3D VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT; > + if (m < m_end && > + (diff =3D lo ^ (lo + npages - 1)) !=3D 0) { > + order =3D min(flsll(diff) - 1, VM_NFREEORDER - 1); > + m =3D vm_phys_enq_range(m, roundup2(-lo, 1 << order), = fl, 1); > } > + > /* Free blocks of maximum size. */ > + order =3D VM_NFREEORDER - 1; > while (m + (1 << order) <=3D m_end) { > KASSERT(seg =3D=3D &vm_phys_segs[m->segind], > ("%s: page range [%p,%p) spans multiple segments", > @@ -1560,10 +1558,8 @@ vm_phys_alloc_contig(int domain, u_long npages, = vm_paddr_t low, vm_paddr_t high, > vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, = oind); > } > /* Return excess pages to the free lists. */ > - if (&m_run[npages] < m) { > - fl =3D (*queues)[VM_FREEPOOL_DEFAULT]; > - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], = fl, 0); > - } > + fl =3D (*queues)[VM_FREEPOOL_DEFAULT]; > + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); > return (m_run); > } >=20 --Apple-Mail=_EE90BED6-27D5-418F-BB28-2CEC87741BBE Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEfMw ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIHKTCCBhGgAwIBAgIMJrRClNKRzetB0jc/MA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIyMDUzMDEzMjIxNVoXDTI1 MDUyOTEzMjIxNVowgcQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIDBNOb3JkcmhlaW4tV2VzdGZhbGVu MREwDwYDVQQHDAhNdWVuc3RlcjEUMBIGA1UECgwLRkggTXVlbnN0ZXIxMjAwBgNVBAsMKUZhY2hi ZXJlaWNoIEVsZWt0cm90ZWNobmlrIHVuZCBJbmZvcm1hdGlrMQ8wDQYDVQQEDAZUdWV4ZW4xEDAO BgNVBCoMB01pY2hhZWwxFzAVBgNVBAMMDk1pY2hhZWwgVHVleGVuMIICIjANBgkqhkiG9w0BAQEF AAOCAg8AMIICCgKCAgEA2QZ7Uheto325SEnX2BTxBvYnz7u/BVmzxKlogaR4K0MA8ZcfNIdQkiJU efjL6imq21BSFsr/tXcODFZmPrvx9aIxjntCxmEFr7qFaw3e3mUIxJyj5n6BxjzZ/hyJte8LBDbj zj+e8WPUzXmYbSxtrh9kgw8NMx3+bo3Hslic+PkKEGx9JJp2I2TEs88xD0rHC2Ljwcfk6bS9jC+/ BAuY/TsbJoq+8d64DYSLGiIYbvMMuxM2C8BlpHLIOLx2FaH+uMqdH2dLVvCacZJ9YzHvvZY8O2nQ OBFCG1UMpX5YLHN8g/t02a+IBt+oe97JMdJ/kZsPjolI98dcRdzz0hTXZql2xvp6zlocm9iGTRcv dCSxy+0x4CIZD1EkVX9zCPGpzdTXnrU+zvnz14Uq3Wbfl3GiVgK0Avr1enfZepruAxAy7KGIm2zi /qY3XSkN8fvWJmYnomOjCRjaPtqS/azmnyeodsxlVhqQKbES65u/PbOXjOlhiYAvemS0IbK4iR76 3iSmkpwSNpJt6BCtFJN+w3Y8tztCP66KPPC1Fri1oj27KPaf04J66MkSjlQdpI7POS6lDyN7X2Hw tgZKRVA94h/JvZp4ld7mTzXTEW2tdO5azPILsL9xOYjSS5VIyUFF4MoxSbfZtXWaZFsMC1fXDNNL uRDrISotdwADuU75Fe0CAwEAAaOCAk4wggJKMD4GA1UdIAQ3MDUwDwYNKwYBBAGBrSGCLAEBBDAQ Bg4rBgEEAYGtIYIsAQEECjAQBg4rBgEEAYGtIYIsAgEECjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQE AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFDbROYIxDr3fvlX tkXqx7T8lihxMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MCAGA1UdEQQZMBeBFXR1 ZXhlbkBmaC1tdWVuc3Rlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu ZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9j ZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYB BQUHAQEEgc4wgcswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2 ZXIvT0NTUDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRm bi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF AAOCAQEALubmL854icQMxKxOxQK+deXTjC6CLYnUDwB8MvnDC+BSeh3tUHT37fSgsK1ShNUSNJX0 YF0VYLfZ6+lPyaFYLArVrAIHqvDiVURaulB9NA+3gck/VSuRz4ILYBy61XbcGQQ8Wx+g6TcqsjsF oOhqEBycj5QuITj+EFmX8nvfo0dJtVa2OPDk1N9beLfQBcLhspJ/nv0pKhpNWv5YETG26YqYfsC7 FA/ZNGvRcoOPkjkDhBTtG+qq9DDD75XtGEBZhYXbnG15tn4/UV07B+UyK4/cqQSA+My5FML3YsQw EYrV9klVD/mLMOdZV5+95xt7O8IdYeHrBapVlhANH5bFazGCBJ0wggSZAgEBMIGeMIGNMQswCQYD VQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBG b3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVy ZWluIEdsb2JhbCBJc3N1aW5nIENBAgwmtEKU0pHN60HSNz8wDQYJYIZIAWUDBAIBBQCgggHPMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIzMDgwMjA5MjM0OFowLwYJ KoZIhvcNAQkEMSIEIFlkHAkZLMsB2d+dzsLrCYsUa+QYF/Y5gs3fnbkYZN4UMIGvBgkrBgEEAYI3 EAQxgaEwgZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZvZXJkZXJ1bmcg ZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsMB0RGTi1QS0kx JTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3rQdI3PzCBsQYL KoZIhvcNAQkQAgsxgaGggZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZv ZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsM B0RGTi1QS0kxJTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3r QdI3PzANBgkqhkiG9w0BAQsFAASCAgCRgRprCsXMKlRBhGE+lU4gEnNUBfWGXERJQn15DC/gRg+8 9cJNZ5MGMKtRzX8P8Abc9coA/tnhn8jjDk4Q9lyqkQqKz9ZeilkGTLyEYcQxqi+3todHgyB9CSbD 2zoipGT4DurqStepOkuRkKqCk3uXDiTWWDLnf2AfU65hQugKHoZdeN+xFYcgazX8Ytdun8el6T9F OWcN1z52WAY0HjPYO+pkJ9JJtLNz8SKViwdk5OSTYKNO4k75BPySRrLr/hnT439e/eLNOpDIzPYX NDWmcfqWrcmHpijfrkwdurslEhsHZiu8tW4l4nzdT0GqAnDFruxq2RmOdxWZAY4SMfjmjhK6WDpx qcwKg7O0pBpHgwAApdV36lmbsIq5PEGgnO/7oNbbPclHdor/G/eJFAVgHoY/Cjsgi+E7t1lKb7tn EmofQtbxWuRVHRcCZ0umztbYGZ4/MNS56Sfujp0L7uP8E1wpevLEUBVThxXyFufgVMo8pvnWtXW+ oWthg8foyDxdp5G+VbpLPKQE10PJ61jycoFo5u+15WHrfpbO8YJmf0xtnah125AMyx6zW9+ojfXf HR6+ryAbpLXkJUQCCWVIig4pJO791B8nERZcZzF9UcdvrWvfQMojVoiut0Xvt/YXc+RGjuvWhD11 Ysa//EZCS7mq6NPl/eTfMoBuhoV0ggAAAAAAAA== --Apple-Mail=_EE90BED6-27D5-418F-BB28-2CEC87741BBE-- From nobody Wed Aug 2 09:36: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 4RG6Y04nFfz4qStw; Wed, 2 Aug 2023 09:45: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 4RG6Ks49NJz41Hs; Wed, 2 Aug 2023 09:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y5/7xKqPvWyXKbMmFSCXt44zPYkY7U2ojCRAqkQakU=; b=VOXCZyFO5AS9bC/MifcWvpXYcTRYJGE/B9YV5v1zgTZQkxpLGVsrNgSt1BwgfxtJBW2KS6 NndGPWtVcL33TbyOFG+GyS6tljWbPfZliC4bASzJ9qQ0b09dyc4ZVwDwwH3jbZsII9BnMy bbD9bRWW/4kG17s0GlAPDyWtOmy/12+teuEP0WYaKYlvuYIeL57aYKlF1WiKKoKimusUmL 1A7id9pkV8tWx/G/9ASp56/W2bKzaHXEqN6BF6wiPsunIlCaKiIFnoFojzm4hQnle/FdJn PebB+pbIFoyYSjben9zWphoF69GXGmcGpDTAge3eTHM3MWl8Xt1rTBrZsVz1Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690968962; a=rsa-sha256; cv=none; b=taSChbZ2116FjbAHVepLPEcfKdX8WoPHMwGrqnSmK8wcAqXPlnPIc7dy1mKE4a8dNZb74o V8HI0xClu3Xz0pTXrOfwZy3g3s18wid9IFdA7kV/VpGL0j6MHjFUHn+sB4A+rtMcUmQvEa q4UafZajwSeoncQuGDsMDXrTmkoVYxAy5ibAVo2gxNKw8HS8mZDXehtQBGDIC8W4gcyA+K IJBgW0RfQu3ltcu0FK1OjxwfezMboRArg2+UmE1F0KEHJRNaqcQFhIWlW1ZC6odZoWYpiL jjSKWC0xZiEoKClzro3Hu7g5ULPqRT4VNEv9U+ngp6HVKM8XEB6VXU1Yqb2qWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y5/7xKqPvWyXKbMmFSCXt44zPYkY7U2ojCRAqkQakU=; b=m6Gdun8b0jeJ98PWVNNI6Sk3i86AD8fZvViDHJEuTNwCbKyJ7u8T1ziJ17PJZE9Txqt3bY WCo0voHWDgLvTjFwfRc8yRpQo5j77doO8WC+nujpzCVR5I2uSftbJiXq4sIoVkBrmpFv8f fkVcUT8Eg9skVsoemhdvq27US42OLCULfO87Sep3YnBFEq+utYLgmVVqqMWbHr7cEa/zOC P9RnsjUzZLdrcwQyPpKpHkwukbjSptZW6Vl7WZ0wh0714pFjrWxxUKRYVJJXYk3G/JcbLH D5wj7CYng5ejMTk3w4T/LwDigYFKY4i9tGzPMJCPyZMVQzHs7/4sOkG5XZ6/Rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG6Ks0gb4zF9G; Wed, 2 Aug 2023 09:36: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 3729a03O056938; Wed, 2 Aug 2023 09:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729a0sm056936; Wed, 2 Aug 2023 09:36:00 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:36:00 GMT Message-Id: <202308020936.3729a0sm056936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 34db0134a6fd - main - kboot: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34db0134a6fdcfc637a81eb09c2e63c3cb225068 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=34db0134a6fdcfc637a81eb09c2e63c3cb225068 commit 34db0134a6fdcfc637a81eb09c2e63c3cb225068 Author: Gordon Bergling AuthorDate: 2023-08-02 09:35:50 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:35:50 +0000 kboot: Fix a typo in a source code comment - s/descriptoin/description/ MFC after: 3 days --- stand/kboot/seg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/kboot/seg.c b/stand/kboot/seg.c index 4da53e2bc75d..558cac501224 100644 --- a/stand/kboot/seg.c +++ b/stand/kboot/seg.c @@ -227,7 +227,7 @@ parse_line(const char *line, uint64_t *startp, uint64_t *endp) uint64_t start, end; /* - * Each line is a range followed by a descriptoin of the form: + * Each line is a range followed by a description of the form: * * Bail if we have any parsing errors. */ From nobody Wed Aug 2 09:49: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 4RG7B01LvLz4qTw9; Wed, 2 Aug 2023 10:14: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 4RG6d04TyZz430G; Wed, 2 Aug 2023 09:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGQn75m90A995m45CG6m4pdJi9qd25qJarfepFSYq2k=; b=TGJVMFxUbjRliTRHy8yOuX7F1lk7m78bED9KiIgNr3vK4eAjz4sbmBWpC1q+ToNrqHrB75 ex8ANt4cD/4TmF9tGw9VuNspqhEmpM33Bg5xyTY1nRGCMcUgekcF+CQ+5ufvr+5x5vmFds PGbFxPHhvJmTIgPo33sEqfUj79F2p0i3eEjSuYqCTxZ4odijXQlk99lFtuBh1XJxpZvLui Co1mzp3uATeftHt2MtIfTfxTiyTrmQOO8HbtB2Et3J99dE1gpSckyVjGEnZmcrWnUzvDRX UqnyHrw7LQa2bDoRlohNSpCPf+FxOx7LEnMj83zmGzZ+2+2ZYwlbxzYmVDrG5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690969748; a=rsa-sha256; cv=none; b=sGA0+8SwCPFq37BDrjuwoc+zY1fNm7v5Rerp3kUm1ESZ/ofZY0f/oR3mD+DecBHDfaZQ8u kGYsbrlT08lSzD+SZ+AEHGNp9S9h6iDtMslmK6X869vxWtF3BcoB4FZqiSQOVXjWepTVlB /+jsTZvJsamNm8bE56PxhxV87S2MXORryMGW+/4bvzbf5BRhoDN0lWfdu/bBRoLFs3CntC pKruRcmwiO0I+UKOGXKc0HtY7KgcmIDzD+K7IuI9kxoFsgp7Q5gjeq76GPp48OlesweP4T aK01pRMZZY9Z8sGZPxsaH3YQC97uHD52mULlrupThKWftqTFuIZ+KXRpCz5j8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGQn75m90A995m45CG6m4pdJi9qd25qJarfepFSYq2k=; b=ykhFyME/Tr9ehknQLgyo9zD6jQP9SXbzKKoA9ZchXHlYU1lQErSQKB6TAJA9f6VOuVFKl9 MpUSlumEgqe4zC+f/hJW3p+QSbl83teu7u447zXiPPXa12R27xoeiKdSHTqo0EWL+0CzG0 RC1Ror97CcQKByHBKYPK+c+O622PDDBMZUkJflYGo6pI6w/5BA/y4xVE/FIQuAmmqf6PZN 1gCqjuroZna4d021jgG0huk9gJeaIhQhYJHF6S15g8/mj8/k/PJMV3tQWz7eW5QbTGGl35 wYGGmc682yonQCMEU2GnmzsDG3yeVMH6uRI6h5UPtsHNThBOSLQEfITOubasTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG6d004WNzFPL; Wed, 2 Aug 2023 09:49: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 3729n7Bp074567; Wed, 2 Aug 2023 09:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729n7pr074566; Wed, 2 Aug 2023 09:49:07 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:49:07 GMT Message-Id: <202308020949.3729n7pr074566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d3367c35cb12 - main - isp(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3367c35cb12d4acde62ffbb72740801352cd3fc Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d3367c35cb12d4acde62ffbb72740801352cd3fc commit d3367c35cb12d4acde62ffbb72740801352cd3fc Author: Gordon Bergling AuthorDate: 2023-08-02 09:48:46 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:48:46 +0000 isp(4): Fix a typo in a source code comment - s/Constatns/Constants/ Obtained from: NetBSD MFC after: 3 days --- sys/dev/isp/isp_target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h index 1650c4f4dd54..8c09a54cb04c 100644 --- a/sys/dev/isp/isp_target.h +++ b/sys/dev/isp/isp_target.h @@ -71,7 +71,7 @@ typedef struct isp_notify { } isp_notify_t; /* - * Special Constatns + * Special Constants */ #define INI_ANY ((uint64_t) -1) #define VALID_INI(ini) (ini != INI_NONE && ini != INI_ANY) From nobody Wed Aug 2 09:33: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 4RG7N10Tt9z4qV3D; Wed, 2 Aug 2023 10:22: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 4RG6HL5W3Wz40h5; Wed, 2 Aug 2023 09:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzu6IhKTcvpMh4CnhEKwZLZJIp6EhLwTGs74D+m1kQI=; b=AjsBsEEGt5We9aBIYNfAbELYiGKLIMpgQt1z6pkzf71GqFBiVmQsJCpRCQwtzucsUOcHRU jKwtyoKK3uUcqssmFEQZHeDLnH6axNvQXzJeUDYSiiIumE83qUDDn/3kIQ73Fwo5C+rcb5 tKT2ZZHF3VUvj6U3SJaQ8nhA+y60uO7hLEozSmHhBQjBxHXdC234zHpTNKzVyvUej80ctr pX81aEJVGGkQITtexnFXc8MpKw4XU2wpRAr2i0Lr2Ouyp/2khKTc1vQ4ezpzXNz7eE0Zq9 BLd99kLDA3g9pe4OKDv2TBt34ZHAuP+WE8aJEyfTI8iLRMfG/UcvLyBDYez9jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690968831; a=rsa-sha256; cv=none; b=G6TR6JQgbMx1Ih1C8PTRO7AXXDlisRScvHtNbS9LcQxbkE1+ePREOz2WOZYqSr3HmvSAim 2sP1gpcaLfJNWp1eQqTKnVvwIfsz9BdCoEc96HvzMDRP8LgoXOjASk9oHgUEERJV2ewN3z Vdq5ZZCDjmlggKtTKkvzyD2cg0qdncF1VuBoqroDmiyC7iODkt8xe1M11XRXqzUAgJndgQ MOutBin2UFUSgepsfPLlau9mT1VaUaNN4wnXWmX86ECoUhYWQoQ9u21hYU+9XqGvbPRPK9 1VjpWY/rdXGxMVi2v3kYl3KxF9vOq3gocxe3IjPz+tneAg6KJNXYd15vYHvZrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690968831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzu6IhKTcvpMh4CnhEKwZLZJIp6EhLwTGs74D+m1kQI=; b=a6FmNhK1xoo6fT3NpuIdkRsiwSDlZ3/dNyT65digMDF8x/2H0a1zC38/x499/6EBQKWvJS AWraMPVSFjnDSyJtM2YZ0Ezu1r9cNOsB6lp64sw5G0zJKJ0gHVjV0W/FgRNoaVmR0osL7p N/ieAaelbAnVeHyOXb5eG3O/kHEFtKaIi3okxsqPpX4e4SQ/yrd05M2E/5Htx/1S7cDQo3 px7M663XbHStqymyjjEAT5h2f6UIDibrFNvZoFfL8yPHpsHgZhnqIOZ//IuBiMbb3BryqX ZToYITQf+i39i75/+y0xEsRS4iFuhi4nR8V0yW7FmsEVi0tFf76pA7ncLhOrPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG6HL2138zDxJ; Wed, 2 Aug 2023 09:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3729XoXt056544; Wed, 2 Aug 2023 09:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729XolR056543; Wed, 2 Aug 2023 09:33:50 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:33:50 GMT Message-Id: <202308020933.3729XolR056543@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: b7370efade86 - main - Revert "vm_phys_enqueue_contig: handle npages==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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7370efade8667b7025c27470163601255ac21f4 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b7370efade8667b7025c27470163601255ac21f4 commit b7370efade8667b7025c27470163601255ac21f4 Author: Doug Moore AuthorDate: 2023-08-02 09:32:08 +0000 Commit: Doug Moore CommitDate: 2023-08-02 09:33:40 +0000 Revert "vm_phys_enqueue_contig: handle npages==0" This reverts commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c. Peter Holm reported a problem, so I'm reverting now and looking for the problem later. --- sys/vm/vm_phys.c | 74 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index b2084bdef4e1..28f12231e01c 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$"); _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, "Too many physsegs."); -_Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), - "vm_paddr_t too big for ffsll, flsll."); #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; @@ -692,16 +690,18 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, * * The physical page m's buddy must not be free. */ -static vm_page_t +static void vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) { + u_int n; int order; + KASSERT(npages > 0, ("vm_phys_enq_range: npages is 0")); KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & ((PAGE_SIZE << (fls(npages) - 1)) - 1)) == 0, ("vm_phys_enq_range: page %p and npages %u are misaligned", m, npages)); - while (npages > 0) { + do { KASSERT(m->order == VM_NFREEORDER, ("vm_phys_enq_range: page %p has unexpected order %d", m, m->order)); @@ -709,10 +709,10 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) KASSERT(order < VM_NFREEORDER, ("vm_phys_enq_range: order %d is out of range", order)); vm_freelist_add(fl, m, order, tail); - m += 1 << order; - npages -= 1 << order; - } - return (m); + n = 1 << order; + m += n; + npages -= n; + } while (npages > 0); } /* @@ -744,7 +744,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) { struct vm_freelist *alt, *fl; vm_page_t m; - int avail, end, flind, freelist, i, oind, pind; + int avail, end, flind, freelist, i, need, oind, pind; KASSERT(domain >= 0 && domain < vm_ndomains, ("vm_phys_alloc_npages: domain %d is out of range", domain)); @@ -762,18 +762,20 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) for (oind = 0; oind < VM_NFREEORDER; oind++) { while ((m = TAILQ_FIRST(&fl[oind].pl)) != NULL) { vm_freelist_rem(fl, m, oind); - avail = i + (1 << oind); - end = imin(npages, avail); - while (i < end) + avail = 1 << oind; + need = imin(npages - i, avail); + for (end = i + need; i < end;) ma[i++] = m++; - if (i == npages) { + if (need < avail) { /* - * Return excess pages to fl. Its order - * [0, oind) queues are empty. + * Return excess pages to fl. Its + * order [0, oind) queues are empty. */ - vm_phys_enq_range(m, avail - i, fl, 1); + vm_phys_enq_range(m, avail - need, fl, + 1); + return (npages); + } else if (i == npages) return (npages); - } } } for (oind = VM_NFREEORDER - 1; oind >= 0; oind--) { @@ -783,20 +785,21 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) NULL) { vm_freelist_rem(alt, m, oind); vm_phys_set_pool(pool, m, oind); - avail = i + (1 << oind); - end = imin(npages, avail); - while (i < end) + avail = 1 << oind; + need = imin(npages - i, avail); + for (end = i + need; i < end;) ma[i++] = m++; - if (i == npages) { + if (need < avail) { /* * Return excess pages to fl. * Its order [0, oind) queues * are empty. */ - vm_phys_enq_range(m, avail - i, - fl, 1); + vm_phys_enq_range(m, avail - + need, fl, 1); + return (npages); + } else if (i == npages) return (npages); - } } } } @@ -1143,7 +1146,7 @@ max_order(vm_page_t m) * because the size of a physical address exceeds the size of * a long. */ - return (min(ffsll(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, + return (min(ffsl(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, VM_NFREEORDER - 1)); } @@ -1159,7 +1162,6 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) struct vm_freelist *fl; struct vm_phys_seg *seg; vm_page_t m_end; - vm_paddr_t diff, lo; int order; /* @@ -1171,15 +1173,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) fl = (*seg->free_queues)[m->pool]; m_end = m + npages; /* Free blocks of increasing size. */ - lo = VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT; - if (m < m_end && - (diff = lo ^ (lo + npages - 1)) != 0) { - order = min(flsll(diff) - 1, VM_NFREEORDER - 1); - m = vm_phys_enq_range(m, roundup2(-lo, 1 << order), fl, 1); + while ((order = max_order(m)) < VM_NFREEORDER - 1 && + m + (1 << order) <= m_end) { + KASSERT(seg == &vm_phys_segs[m->segind], + ("%s: page range [%p,%p) spans multiple segments", + __func__, m_end - npages, m)); + vm_freelist_add(fl, m, order, 1); + m += 1 << order; } - /* Free blocks of maximum size. */ - order = VM_NFREEORDER - 1; while (m + (1 << order) <= m_end) { KASSERT(seg == &vm_phys_segs[m->segind], ("%s: page range [%p,%p) spans multiple segments", @@ -1558,8 +1560,10 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); } /* Return excess pages to the free lists. */ - fl = (*queues)[VM_FREEPOOL_DEFAULT]; - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); + if (&m_run[npages] < m) { + fl = (*queues)[VM_FREEPOOL_DEFAULT]; + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); + } return (m_run); } From nobody Wed Aug 2 09:47: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 4RG7V96nxxz4qTy1; Wed, 2 Aug 2023 10:28:13 +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 4RG6Zj6D6sz42n4; Wed, 2 Aug 2023 09:47:09 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iTsOADh88cgTa2AwqThcK+2xo8djfUnWgoNN5WdHVL8=; b=TCmoPeam3SEPFC7ljEVSaT1qJ0dOG41tvUTqa+HNKHfY+spLGC/EETJWffPR5+4oTrEeCn c1k3/8eexkrf+gqGC3Hp2wgto6tv1nse/JLeask8Z3ExRrxwMcS36bNnklMlUCt7p9+uIN Kl+D2Gu7rrPXLBpqYsdN+A3u/av4kPOhDErT+r+YlUM31RZFoi0BtzF843j0cjVuU9ywI3 9GqrYZPh7Gzo75wF/lbpZ0wpyobfGVy91oBSM571tq7WLJaSaWfsojZvaWYuJHEy3oPV6g UbrVe8+hu8Vk9ur9IUQ64KrhPN6A8t2jTHMzQ3F8be42E5uRX4xMptFcPUqFHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690969630; a=rsa-sha256; cv=none; b=OBMzRn8wzLQG9LGKjuMLGLpVXv3zPpoQpa02uIIvnSQr7oPeFJLkcdFNtSkHN5ZouSlfqG Qqag7tvjiVl3DJ1PaS7wRNyF3GS1PMw/dqI8iQGipkCoqJV3X8Wt9uitRvBaLPGfMlygDx wJup1e8ECE13OJweg9l0oQr7mcbpd3PukOihD5syM2wHbqdb7/uwLekW3L2DU+Y0AFwGxn p+nL7U8oKAsj6p0Q8bJQFn0gsx54DmpnfUbAbaY5gLO+KwOW/w5VZwKCLw5Ko4IteyAS2c 8Yj2cFU1kBTPxs5GjtfH0QqIdLAY1mm6JyXd1ImYk0zcwyuBF8im1lvEGcACxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iTsOADh88cgTa2AwqThcK+2xo8djfUnWgoNN5WdHVL8=; b=A31ZayPIqyGvjNZ7SHJcelxGkjzs8tZc7jVv6yxdXnqqYodp9wx3D76xYkGYBPAFbXjMYA DY7ZL2GFw8mC0OJHT6yolaPEB90D0m35ZfT5zl1ioZZZP8Rm1IrEsjtw8Jfrqu4eYc985h Enm5NjC7rvC+zCsw8qrEHrjNrWccar8ZFqfqAAuAwMstij5gIqNF/0pF9KbmqgUsRfvIWR Pv/zrX3yR/4rXkPXBjNmgQhLou8jwpa+rff2KKSV0M4ilRmsxtudTs34hQWBwrDkfqKCxu 2l0Od1nzQFXZb1+ty3aplxm+furJlpaVoN9xP9UgATbgNVkhpOJr4Cb5Qwdx8A== 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 4RG6Zg690Tz19x1; Wed, 2 Aug 2023 09:47:06 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 48A064D561; Wed, 2 Aug 2023 11:47:04 +0200 (CEST) From: Kristof Provost To: Doug Moore Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1a7fcf6d51eb - main - vm_phys_enqueue_contig: handle npages==0 Date: Wed, 02 Aug 2023 11:47:03 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <5A7123CD-C471-4DAA-8CFA-20BC3E9B1A64@FreeBSD.org> In-Reply-To: References: <202308020314.3723ETgj027830@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 2 Aug 2023, at 11:36, Kristof Provost wrote: > On 2 Aug 2023, at 5:14, Doug Moore wrote: >> The branch main has been updated by dougm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D1a7fcf6d51eb67ee3e05fdb= b806f7e68f9f53c9c >> >> commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c >> Author: Doug Moore >> AuthorDate: 2023-08-02 03:12:00 +0000 >> Commit: Doug Moore >> CommitDate: 2023-08-02 03:12:00 +0000 >> >> vm_phys_enqueue_contig: handle npages=3D=3D0 >> >> By letting vm_phys_enqueue_contig handle the case when npages =3D=3D= 0, >> the callers can stop checking it, and the compiler can stop >> zero-checking with every call to ffs(). Letting vm_phys_enqueue_co= ntig >> call vm_phys_enqueue_contig for part of its work also saves a few >> bytes. >> >> The amd64 object code shrinks by 80 bytes. >> >> Reviewed by: kib >> Differential Revision: https://reviews.freebsd.org/D41154 > > I suspect this commit caused my machine to fail to boot: > > WARNING: WITNESS option enabled, expect reduced performance.c data=3D= 0x180 data=3D0x > panic: vm_phys_enq_range: page 0xfffffe0000006180 and npages 429496= 7040 are misaligned > cpuid =3D 0onfigured modules... > time =3D 1rnel/if_bnxt.ko size 0x3efe8 at 0x1f50000 > KDB: stack backtrace:ize 0x6f2698 at 0x1f8f000 > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffff= fff82c03e20 > vpanic() at vpanic+0x149/frame 0xffffffff82c03e70 > panic() at panic+0x43/frame 0xffffffff82c03ed00 > vm_phys_enq_range() at vm_phys_enq_range+0x11d/frame 0xffffffff82c0= 3ee0 > vm_phys_enqueue_contig() at vm_phys_enqueue_contig+0xdd/frame 0xfff= fffff82c03f20 > vm_page_startup() at vm_page_startup+0xf3d/frame 0xffffffff82c03f90= > vm_mem_init() at vm_mem_init+0x1a/frame 0xffffffff82c03fa0 > mi_startup() at mi_startup+0x1f1/frame 0xffffffff82c03ff0 > btext() at btext+0x23 > KDB: enter: panic > > This is sufficiently early in boot that I don=E2=80=99t get a core dump= , so I hope the backtrace helps you. > > I=E2=80=99ll back out the commit locally and confirm. > And confirmed. With this commit reverted the machine boots again. Best regards, Kristof From nobody Wed Aug 2 09:15: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 4RG7j14pshz4qVN0; Wed, 2 Aug 2023 10:37: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 4RG5sg0XxNz3vwG; Wed, 2 Aug 2023 09:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690967703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGtTnBX9ShjhOKrlppM/f4W71Rb4PYrKNzNGLTzCg6g=; b=SSIL48gbs1DJRxT0DkvHjcgreMmO54YgicRP1QZa8dFSY1UgR/NVVFxabLe8OlWU0x5r9/ XMPnEIZ1AEcJDLM2yaAaGgh24/UJ3UjC1YR19hMeS3o+pq6cWqdIUa4MTQws3lMp5ZtBCN I8Fr+iUbyEb9gXVB4H1YAIwJf4D4KW92M4a1UZvvf8/kIjOpRjWsS5kR53x9fa+25a/Lj0 ANfxmE3rDCg2PQrDMH6s/E4VYsT2xyKdKzQpV32FeKZDBbpXEU7AGd8C+9RJtyqibPv63V Dg+L5OlZUpjF9j3/Wo2Ehp1Qb+hfpzV4lcR1U5fFpMXtDHf7+g9OnnDg0DXsPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690967703; a=rsa-sha256; cv=none; b=RJ1OgPMUDlapNuV3EYlKdTr3XplqR9F0YUsWXv/8sdqeg4nHXYUr0LTPtTJ34gVmWowdmJ 7WoCjKCVdrD9seSwGl7QbYaz0sE89/PcVziMdZAGsgU1gxYp6wK5r25eONpUNwDFeufP6p /3gjtoYGJj6eHOOZz1EveuM9Iuie/zfq2fRYL78gHJf67cwKIb2I12c5IYyDVZRDhkOnas Xh/rPHE+0SKu2AohGeYtXAMcGqd4Tw7vz7EpPmlCOIN5wR8BwVZ8o4d1CAH+/YaImY1qAA R5pKqaJaIzSRiiQgHIQyc0WFXmDozHmsdQawpxo6W7pIWjy6kITqRdqEiVuDZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690967703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGtTnBX9ShjhOKrlppM/f4W71Rb4PYrKNzNGLTzCg6g=; b=nBB8HQqJ3ZJHjBFEecCeIK1tb+sGmaVW4DQtLCXxLBqrAUhszh9WZZWc30Z3QEPtaQbHd1 uAGpS6YmE6vnbh3NI8mMrizqMf3QHs0mbf5Su9XJ+bzeY1J446mOj6XEZb5eBkWKuo0eSJ deIqPge8duBJSh6/NzBaPOkAJ53swBq5XphLBO+YQDkDD78uIUvC9ZFAM+oR4Fz+tYhYB9 HIGBRMjPk5lqBYlC22x9wWMxbn+2y5mJRGU3GlzBpXmsl14hT6XsIpyg83ADdU2tQwpcu+ hdA8gW5xFDaje1TtiPSyw8dOnHQ0eT98ca7o0xY0x8cxiSDBGq6uU0KJmSLuEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG5sd4lbPz1CtS; Wed, 2 Aug 2023 09:15: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 3729F1Z8024259; Wed, 2 Aug 2023 09:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729F1eE024258; Wed, 2 Aug 2023 09:15:01 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:15:01 GMT Message-Id: <202308020915.3729F1eE024258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 586eda6b2446 - main - cam(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586eda6b244632d28d740e417133227b14324e3d Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=586eda6b244632d28d740e417133227b14324e3d commit 586eda6b244632d28d740e417133227b14324e3d Author: Gordon Bergling AuthorDate: 2023-08-02 09:14:53 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:14:53 +0000 cam(4): Fix a typo in a source code comment - s/uppper/upper/ MFC after: 3 days --- sys/cam/cam_iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index b351453b2460..215e9781f472 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -1636,7 +1636,7 @@ cam_iosched_queue_work(struct cam_iosched_softc *isc, struct bio *bp) { /* - * A BIO_SPEEDUP from the uppper layers means that they have a block + * A BIO_SPEEDUP from the upper layers means that they have a block * shortage. At the present, this is only sent when we're trying to * allocate blocks, but have a shortage before giving up. bio_length is * the size of their shortage. We will complete just enough BIO_DELETEs From nobody Wed Aug 2 09:52: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 4RG7jN6zrHz4qVBY; Wed, 2 Aug 2023 10:37: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 4RG6hR2JxXz43nf; Wed, 2 Aug 2023 09:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=InzpH1NmlCxljWLnEuJ+/DwC/bAiByZI4mbiDMRxtV8=; b=agrfdVvEJR3h8fwdzXPAiE8OaPUlhBmQRI08ImPpz/azn1GVEwjZIexUDzeFObIThexo1W PUnSQw9S82Yny8IaobIbmaos28HSqACKktmzswec2Me3YIbGEHgQfrcMRkWXkV2aExxCw9 WqOHPoO1kAc1shYPZYYh54Qh2fbzrsbHptjUmPZ4JpxNMeyKgeRLTbYBPRJ4eAjdKsy5Qa rBLTELHhpYPQlyqwsY5cI+wBRUpUsgMQimxdTkbw17vNrCTmE1LRIiq7QcCISFM34CJHhS Gc9hu4G6tiHM0KJz4C6+4mBqOkSmPD3CkcpSs2uMUWrMZu9KYFCX5E/gnJShzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690969927; a=rsa-sha256; cv=none; b=WCTZ5qNGnc7V80z7gUbHgys3w/nIVokyX/AU6Lp6ZktLxFwThgvrydnifYVUQ/+13NWZF4 3vairu19UucdyMn0FjuMd9c7GngS8AjYQ6x7Hc2ZbYhpr8gCfbpfwFdT0YKpc97M0SjOti gKXZE3M4zLHc81FsvNkugb1+gRpUWxUpasB6U5qNxMFny6cI+EOcHHaQE8RLb1b9yaeAXo dvuQG4gvNg0KmIiV9IdKY9BymfWJ8YJ/K3QYf/zOFhZGYWpgIEZCOHLfruFDy/6qP75r+s 2zfKQmJxYwaDD9UkjB/EJmg+07mJh2ePoGA2FdvtgEfQ3epf6aqDBIsKbclWjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=InzpH1NmlCxljWLnEuJ+/DwC/bAiByZI4mbiDMRxtV8=; b=eMusdEtKPRMBGaQ8bkkQMmCe7TjlLb7FndHsdPg/3oNb+q1GavtQKQTpwSB99s8fUpTmyl aS5jioes7BaGslUMZEuEG8kSu8aY8WGeLIToELp1xbE4dXwqqeUoUp+rT4vKSOF/VRtkUY 8RiakMHm7YYotLjDmLiUgWa8YIsRpSKV4RT+gfuzFdalF2Bei1xlPC9Uk1/sSuD58V6sI1 KQfShycjQmT4G6BNj10uEyS7xkLecW9Idaq/gQi3A6k84G7sb8C5Ar9O/16MWMC6q6hzyI 7EI9NYOVMPazQZQPQDT1nH2wH2UAWHJvCdh8hiBXOKkWr4dr5DAu4tuSNtta7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG6hQ1wF6zFWp; Wed, 2 Aug 2023 09:52: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 3729q6ca088692; Wed, 2 Aug 2023 09:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3729q6cv088691; Wed, 2 Aug 2023 09:52:06 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:52:06 GMT Message-Id: <202308020952.3729q6cv088691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 2f0e0bd50633 - main - elf(3): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f0e0bd50633eafdfda503ec388151911e7383af Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2f0e0bd50633eafdfda503ec388151911e7383af commit 2f0e0bd50633eafdfda503ec388151911e7383af Author: Gordon Bergling AuthorDate: 2023-08-02 09:51:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:51:56 +0000 elf(3): Fix a typo in a source code comment - s/speciaal/special/ MFC after: 3 days --- sys/sys/elf_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 45f0e61c33cc..1ed762e4209c 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1161,7 +1161,7 @@ typedef struct { #define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */ #define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */ #define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */ -#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ +#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB special */ #define R_IA_64_SUB 0x85 /* immediate64 A - S */ #define R_IA_64_LTOFF22X 0x86 /* immediate22 special */ #define R_IA_64_LDXMOV 0x87 /* immediate22 special */ From nobody Wed Aug 2 09:36: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 4RG7jr1M6fz4qVN2; Wed, 2 Aug 2023 10:38:09 +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 4RG6Ly3KHmz41h4; Wed, 2 Aug 2023 09:36:57 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7bAf8yy25riDDvmEH8ZWIRli49jXArbPTrukOX6ir8Q=; b=INxrfxQWA9WGoC5us0Y4HerMEDvCF/Tn+kNcLCP0Hn4eo5kgIpUOhuo88kbcoQBdN44d0/ WNoeQBJIeSVTQows5rAbcKuKrc4wirHet8QEUNz5rJu1rL3AAoC4bxhTo2JS4phpw32GLz WwMnuhpuPH1A/qa+jPPoCxvyPXh2+26zI0OJ8R+E57tP1o0fZQSX5Nbmzc8Q+FU5mbKIGR gOmcHchGgoD4xIuwPro8IC5gVLcdcYeR9M9ONdzD33xEk6BoYIdMY036nGldoJ38qhQ9fm vGHbg9PKvSTs4/oEUEPPKHWK4MNmFomaR5JUdSt9mP1+0oyAslBsixTCm+rtIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690969018; a=rsa-sha256; cv=none; b=r5UsUOXolzcCwvMIz7UZe7l9RJpBWFnqEML9De1lhe2GaFLMVk23pYA7NxDuV658lyuDkI +L14dO9qUnZDnw+/unCT+7yRoZTrQZ+OThkt9gjVjPko0kGeax0z32cz2NP3yVACHyVc8z SVU4ikLl7KkISTs6sbPsI/xCDfH6P/l/M6qk7iyMXwf66Tnl7xNWduNQDj2c+TBbSae3S/ VrGXrwg53AblLNOltudwFgvI0zR6tN2Yfg1ZLgqxErnTcOyaFQyQQdnY7WHE3ZQA+nSI7e cWy4+8vEYzPOEWI3AFtn3q7GXu0i4gMI9k3qWZxEOVWhALFbyP8My2dxoMuTCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690969018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7bAf8yy25riDDvmEH8ZWIRli49jXArbPTrukOX6ir8Q=; b=NbNrLEHpWoYCO86Dd822IYpVYk8+KoWlf+rg00YVifzAWDu2PIFYxO/SZyEuuLyKHSMtbR zCBhIfni6dO3TIodM3x3h6Z2BoVJ9osaBGJGnu+R8Vrs8pCnA3YjXZq+hjuFiZdydTmG2U 7bXJufP72yvwFjNprJ3ywnPwRfX8xlCLBbtPnJX5v0Dpq1pmo6f8j6pL5PQk7+/T+aYphJ 3Uy/bBMIx/HImN9t/O+N072TnDvh9y/OsdLHAMk9l09Evj/f0b70VcyU3lj5XQ/UZZf/xS R3Qp2p34XIdc1oEC9bYPHSK1mPVxfc+4FBHcfCt1fwNcaZkEMPAWge2J/zQXvA== 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 4RG6Lw4PP5z19gH; Wed, 2 Aug 2023 09:36:56 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id DDB144D36B; Wed, 2 Aug 2023 11:36:51 +0200 (CEST) From: Kristof Provost To: Doug Moore Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1a7fcf6d51eb - main - vm_phys_enqueue_contig: handle npages==0 Date: Wed, 02 Aug 2023 11:36:50 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <202308020314.3723ETgj027830@gitrepo.freebsd.org> References: <202308020314.3723ETgj027830@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_3CFB4513-DD12-42D8-BD35-4A61295ECD51_=" --=_MailMate_3CFB4513-DD12-42D8-BD35-4A61295ECD51_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 2 Aug 2023, at 5:14, Doug Moore wrote: > The branch main has been updated by dougm: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D1a7fcf6d51eb67ee3e05fdbb806f7= e68f9f53c9c > > commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c > Author: Doug Moore > AuthorDate: 2023-08-02 03:12:00 +0000 > Commit: Doug Moore > CommitDate: 2023-08-02 03:12:00 +0000 > > vm_phys_enqueue_contig: handle npages=3D=3D0 > > By letting vm_phys_enqueue_contig handle the case when npages =3D=3D= = > 0, > the callers can stop checking it, and the compiler can stop > zero-checking with every call to ffs(). Letting = > vm_phys_enqueue_contig > call vm_phys_enqueue_contig for part of its work also saves a few > bytes. > > The amd64 object code shrinks by 80 bytes. > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D41154 I suspect this commit caused my machine to fail to boot: WARNING: WITNESS option enabled, expect reduced performance.c = data=3D0x180 data=3D0x panic: vm_phys_enq_range: page 0xfffffe0000006180 and npages 4294967040 = are misaligned cpuid =3D 0onfigured modules... time =3D 1rnel/if_bnxt.ko size 0x3efe8 at 0x1f50000 KDB: stack backtrace:ize 0x6f2698 at 0x1f8f000 db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xffffffff82c03e20 vpanic() at vpanic+0x149/frame 0xffffffff82c03e70 panic() at panic+0x43/frame 0xffffffff82c03ed00 vm_phys_enq_range() at vm_phys_enq_range+0x11d/frame 0xffffffff82c03ee0 vm_phys_enqueue_contig() at vm_phys_enqueue_contig+0xdd/frame = 0xffffffff82c03f20 vm_page_startup() at vm_page_startup+0xf3d/frame 0xffffffff82c03f90 vm_mem_init() at vm_mem_init+0x1a/frame 0xffffffff82c03fa0 mi_startup() at mi_startup+0x1f1/frame 0xffffffff82c03ff0 btext() at btext+0x23 KDB: enter: panic This is sufficiently early in boot that I don=E2=80=99t get a core dump, = so I = hope the backtrace helps you. I=E2=80=99ll back out the commit locally and confirm. Best regards, Kristof --=_MailMate_3CFB4513-DD12-42D8-BD35-4A61295ECD51_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 2 Aug 2023, at 5:14, Doug Moore wrote:

The branch main has been updated by= dougm:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c

commit 1a7fcf6d51eb67ee3e05fdbb806f7e68f9f53c9c
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2023-08-02 03:12:00 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2023-08-02 03:12:00 +0000

vm_phys_enqueue_contig: handle npages=3D=3D0

By letting vm_phys_enqueue_contig handle the case whe= n npages =3D=3D 0,
the callers can stop checking it, and the compiler can stop
zero-checking with every call to ffs(). Letting vm_phys_enqueue_conti= g
call vm_phys_enqueue_contig for part of its work also saves a few
bytes.

The amd64 object code shrinks by 80 bytes.

Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D41154

I suspect this commit caused my machine to fail to boot:<= /p> 

WA=
RNING: WITNESS option enabled, expect reduced performance.c data=3D0x180 =
data=3D0x
panic: vm_phys_enq_range: page 0xfffffe0000006180 and npages 4294967040 a=
re misaligned
cpuid =3D 0onfigured modules...
time =3D 1rnel/if_bnxt.ko size 0x3efe8 at 0x1f50000
KDB: stack backtrace:ize 0x6f2698 at 0x1f8f000
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff82c=
03e20
vpanic() at vpanic+0x149/frame 0xffffffff82c03e70
panic() at panic+0x43/frame 0xffffffff82c03ed00
vm_phys_enq_range() at vm_phys_enq_range+0x11d/frame 0xffffffff82c03ee0
vm_phys_enqueue_contig() at vm_phys_enqueue_contig+0xdd/frame 0xffffffff8=
2c03f20
vm_page_startup() at vm_page_startup+0xf3d/frame 0xffffffff82c03f90
vm_mem_init() at vm_mem_init+0x1a/frame 0xffffffff82c03fa0
mi_startup() at mi_startup+0x1f1/frame 0xffffffff82c03ff0
btext() at btext+0x23
KDB: enter: panic

This is sufficiently early in boot that I don=E2=80=99t g= et a core dump, so I hope the backtrace helps you.

I=E2=80=99ll back out the commit locally and confirm.

=

Best regards,
Kristof

--=_MailMate_3CFB4513-DD12-42D8-BD35-4A61295ECD51_=-- From nobody Wed Aug 2 09: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 4RG86X0rnYz4qVvm; Wed, 2 Aug 2023 10:55: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 4RG6mY5Pplz44S7; Wed, 2 Aug 2023 09: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=1690970142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8wBW0GAuYLHR6KDRL3AN0dHfRUlFFMnLmGExXU8YNP4=; b=OpLjMpD5vYtUen0JVnxoqg9Hmc/7wC1zs9jBRib9N2Ygakd/WOiMtVD+ycN1JcFExMopT9 eySBy3g/rW7v0mp4r154m/cy/yHMgO6FksswpQsnBEU8GPnz8tWmU4OeshRSysnhNIxrYx rbOcIJkbSZS+FLztnJU7QtEpCXhZnJWjSC5IbN8xmZOOT5zURfvEIGpGiI+Giv3RBqq7TV w0UJFnRi+R1dwex3fRfBKKkFMkAsVLz89Ae0UfW/LGCCQ/43pSS5+00R6xt9PV5TbPyzUu 94n5BoALIs2SsXCbqSKGxdIWIVGcDzZiTsj6k6FQtJ44AE21Sdxu3eeTqS/jkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690970142; a=rsa-sha256; cv=none; b=yXRIfC+AmzP2nx1kskj3RiHHa3rXEaOpI1Cp3qbFYPm0Yt+V83/ExfXcHvSMv8S+G4Aqce DMx5p77we1fdksMhVlfVBUA7ZyxUDYo48HT0B36WIUS2kdSA+7A4l+ldAWm+4Uk5rVtoFp AdjzoeeSvqgJSFuQf6o7ll6Vo0XgBnzjweK9ekbDF5NZirvElfC4DqbB+xEzjl8zTcWLzu LYtiW8dDwrhnhxQgX/kjD/SjOpFqatJBuVHBJo7ojUO2+p7t4qounjxfDKM0FN9v6N3An0 0q+gUnE2/kA2X0zU4kiYyDJu0kcWUWRFl/nmXS5d5ch6pLaGUXtW0U/zRfxNxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690970142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8wBW0GAuYLHR6KDRL3AN0dHfRUlFFMnLmGExXU8YNP4=; b=r30Q52TND9O4t0BO4WbxKWJxrxsoMHS2GsjCjBrCsLydHBYIJdOsOXQU7rqzTVyCa4COqj Vrshm44GnKXoVxVOZlAYD1PBQiSTrbARUO1u7xD7WyQb71goZEuiHSm0DtOYv6XZjm6B2O WuDBJV5CAcaUD31XOOBWiJKcz6DVaCguKgx9EEpQ+fdh/EfXOXnh2NcolrhRcYtbg2t+Qu 2D3SlaQ9Y6beqGzuLvIRrECDn5dwsGbb4A6f+vdXzcaVP3qz71V4IoJn8K8qUxyw0IWV3P mWOJtD+dKmp4aGCpNrdKJht3EkfNalDMABlcQFUj7YxoJ3doJds/gEuVakYQYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RG6mW4mCdzFcY; Wed, 2 Aug 2023 09: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 3729tdFN090141; Wed, 2 Aug 2023 09: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 3729tdga090140; Wed, 2 Aug 2023 09:55:39 GMT (envelope-from git) Date: Wed, 2 Aug 2023 09:55:39 GMT Message-Id: <202308020955.3729tdga090140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 29eab3e4e0c9 - main - linux(4): Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29eab3e4e0c9a6e954b0ee858e3d4c2a9f283ea4 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=29eab3e4e0c9a6e954b0ee858e3d4c2a9f283ea4 commit 29eab3e4e0c9a6e954b0ee858e3d4c2a9f283ea4 Author: Gordon Bergling AuthorDate: 2023-08-02 09:55:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-02 09:55:30 +0000 linux(4): Fix two typos in source code comments - s/decriptors/descriptors/ MFC after: 3 days --- sys/amd64/linux32/linux32_machdep.c | 2 +- sys/i386/linux/linux_machdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index bcbf51082c64..29b3b99bc483 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -603,7 +603,7 @@ linux_set_thread_area(struct thread *td, /* * Semantics of Linux version: every thread in the system has array * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. - * This syscall loads one of the selected TLS decriptors with a value + * This syscall loads one of the selected TLS descriptors with a value * and also loads GDT descriptors 6, 7 and 8 with the content of * the per-thread descriptors. * diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 92b37646d28d..08124202c90a 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -519,7 +519,7 @@ linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args /* * Semantics of Linux version: every thread in the system has array of * 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This - * syscall loads one of the selected tls decriptors with a value and + * syscall loads one of the selected tls descriptors with a value and * also loads GDT descriptors 6, 7 and 8 with the content of the * per-thread descriptors. * From nobody Wed Aug 2 13:15: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 4RGCHP6Wf9z4qbD4; Wed, 2 Aug 2023 13:18: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 4RGCCQ0GLbz3jCB; Wed, 2 Aug 2023 13:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXZ4iARTntSaqu0hOLNvCFmA1EZOm+hv7d8OTMoSkvY=; b=YhCkHlREYqGDIbr3YFoeUmEMtWzINXO5MYRuHfSQAtIQ/1MIZwU1CdhcrzVP1m23GXh3Rj DMX7ct3uVqN+L/6zzeEEBCpOJgPdSSO4HHtraxpRSvZQLgohEytMs55wjMgHyOLe/mwdhL GFSa9vqD7+HV8tgGGrA9hzkzx8iEt19Hq3OKhfRAslqWZHfzMK+kVi2mvVy0Fo0Q2093y+ iV/6XMB1LwLgFqFiMUIzUQKtWjyGPk+gRvazQbE2i8FTxgCMKDzPeEc8OuWA5fVHcI6nF9 AJOLwDePIdLEOxFKs5HOnQ0m8OTUpugCN+2cTWbQ7QUwXRbQDNev78GyXA1S6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690982146; a=rsa-sha256; cv=none; b=yasqS4PEjcHtj67fD+5GD5BNlEcBfA+L/s+pKPeu9K8Tuj+3d7aScBhjL0cBxIz55Gd62l RBWnZnJcavqwX27XzURkHiBltDyhqLEkei2uJZkuRaiZKKepkprQ5jyh/g37/rBX+TUqnc W1FM5bvzNyqHI++Qke/c0VogkjeUlrYWP/lAFmj1HR12ZrW1ZICp0iu2vpKOkRmGntYU0H 6ZweRg3TbHlUP552wUZswKDyy03qZHqZdAdnpKc8bvH9tyIiuE2GU9DvQcSJ26ozBcYQg0 iIhuuHQmkS/65BtW0oGnaBOSzT0oCVmKymGdBG0ZP2Jhnzc7FAOAbOnnnceFuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXZ4iARTntSaqu0hOLNvCFmA1EZOm+hv7d8OTMoSkvY=; b=d+oqAV0ap2PAa5Yv85JiaPtXqMxl4VYjtHHJs3+RgzN6PS3eIRc4gkK4tuDuJaXWXj6+AQ CjAncVqDikJFtMA9wP/v9y6hXbu6McL2KeIcDYPJTJdwXi6f0F4vXXbTTbLpiHN1XZJbL/ Ktjuhqm/vsHz3JYN1D/Kq1/kBjKjgaC9kq+qTjYw1asf2FZoV1O7xyjmvASQU0HAoYS4gs AAdfFVjRBSpDWiIf7GcUbeDdoXc7DJKHMdpOwXZrjnnN5z/5HugT8gQBU0ezHZgrdb32o6 rEakOz/13dBEUFs4K31hCQ2gNF1e268a4FM65JXUwvacM5ip8wJfXvMyeiqRew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGCCP4wmKzLMq; Wed, 2 Aug 2023 13:15: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 372DFhrR021597; Wed, 2 Aug 2023 13:15:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DFhNs021596; Wed, 2 Aug 2023 13:15:43 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:15:43 GMT Message-Id: <202308021315.372DFhNs021596@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: bd16c274c382 - main - kdb: Permit a NULL thread credential in kdb_backend_permitted() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd16c274c3826926108f0539b5043c5a811cad43 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bd16c274c3826926108f0539b5043c5a811cad43 commit bd16c274c3826926108f0539b5043c5a811cad43 Author: Mark Johnston AuthorDate: 2023-08-01 21:58:42 +0000 Commit: Mark Johnston CommitDate: 2023-08-02 13:15:08 +0000 kdb: Permit a NULL thread credential in kdb_backend_permitted() Early during boot, thread0 runs with td->td_ucred == NULL. This is fixed up in proc0_init() at SI_SUB_INTRINSIC. If a panic occurs before then, rather than dereference a NULL pointer, simply allow the thread to enter KDB. Reported by: stevek Reviewed by: mhorne, stevek MFC after: 1 week Fixes: cab1056105e3 ("kdb: Modify securelevel policy") Differential Revision: https://reviews.freebsd.org/D41280 --- sys/kern/subr_kdb.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 2f419b4d8ad5..dda21d53b6a5 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -503,11 +503,19 @@ kdb_dbbe_select(const char *name) } static bool -kdb_backend_permitted(struct kdb_dbbe *be, struct ucred *cred) +kdb_backend_permitted(struct kdb_dbbe *be, struct thread *td) { + struct ucred *cred; int error; - error = securelevel_gt(cred, kdb_enter_securelevel); + cred = td->td_ucred; + if (cred == NULL) { + KASSERT(td == &thread0 && cold, + ("%s: missing cred for %p", __func__, td)); + error = 0; + } else { + error = securelevel_gt(cred, kdb_enter_securelevel); + } #ifdef MAC /* * Give MAC a chance to weigh in on the policy: if the securelevel is @@ -776,7 +784,7 @@ kdb_trap(int type, int code, struct trapframe *tf) cngrab(); for (;;) { - if (!kdb_backend_permitted(be, curthread->td_ucred)) { + if (!kdb_backend_permitted(be, curthread)) { /* Unhandled breakpoint traps are fatal. */ handled = 1; break; From nobody Wed Aug 2 13:15: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 4RGCVZ0GyXz4qbHF; Wed, 2 Aug 2023 13:28: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 4RGCCP6df2z3j8f; Wed, 2 Aug 2023 13:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrhaKXhNlaGQEf6eGRMyaarJkfJbVxAYJPXDQIQ8mJk=; b=Bc8V9RV9MWtrvwlGF7cpWuZiVRTfKNDC5kZhBcypV+3b4U93ApuoO13LnEMSIsMIggqxQt SuRt4PckkkssLXhIDBjdwka4cfq8hafIfUsSpE9tqBLnyxy4XxliFCj2Jhdpbbz7cTtRxG RrkALy6iamPrhFGqDo7ZIefR+JxegO2TYXg/Iv15xzeuylLtICnzFs6l6akJBbCBPVWD6T Nv5dxblKp5/dQutR9195Uy3V+UE5J1CmAIHkybWPqmkyaUKTdWC4qEQ6fOWmImv1WZAXAA m8368e7Ijh64yH0kugOPBgKUFALv7j28IWatQnTz0mMwWhcvz8nv5rlORal18A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690982146; a=rsa-sha256; cv=none; b=RG8/TCi//FsL1AA6bQd54bwf8MZ1jrcUS6clnH/tWy+19Dzxhm3LHuWqNvQN01M9DKCzbv amA3+reivxlI5/tn0/XwxmPVe8+zGCCuRbCxap4KnE71pQ+6xVVk5InyPCgm9/Pwz0voif zy0mqfhAevu5re08vk1ZgjMIuKqF5SDWGw7DwW8Kp4EPC7Ual0dRcrpXDYi2HOohVlkAeS fEtgnCw0AIItZgA80jgsSKi2enaj0VNyudbGE7vbbn0fF0sYx0nQ2qZLpNtxYmAcT05Cpn RY9PAA1wcyurTfS7qqh5oxKcyun2yUyTcBPndL7kZRnzUBBmv/vgseSe/b1vWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrhaKXhNlaGQEf6eGRMyaarJkfJbVxAYJPXDQIQ8mJk=; b=m3WA5tdb9GbLRtl/8MzCXYuix+vjuRJgigCOIGIxnqppMcozSUavHoOMyfYdD1G5CS43rj agtIPGLG44ZbWA816ge2KCcoFOfdv1sEnhKelKLW6Qkaki2JmfADzDWm1rbuJ0uPpd4F3E YzcL1SaM/BGBFrRQ/onVF+zZpxQMrkKF9CLik34NRigHedlKM6X63GK4m4nDV6hQKYQ4fo aVZ8xQaxmO17LbvG5cf5WW8jEx0J2uNYzOYqjM24oUxPryYxKA8KvdSq2MGV/eB5e6LeeP jauZqkqDRqsTrLdstqAlvxXDi5AKD4//n6m+jf0eVhO0ZCB+SkKlur/8NyaVdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGCCP4wmyzLQH; Wed, 2 Aug 2023 13:15: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 372DFing021616; Wed, 2 Aug 2023 13:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DFig3021615; Wed, 2 Aug 2023 13:15:44 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:15:44 GMT Message-Id: <202308021315.372DFig3021615@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: 6de02228409f - main - dtrace: Add WITH_DTRACE_ASAN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6de02228409fd2b7ca1d7e3b8d9043a105093cdd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6de02228409fd2b7ca1d7e3b8d9043a105093cdd commit 6de02228409fd2b7ca1d7e3b8d9043a105093cdd Author: Domagoj Stolfa AuthorDate: 2023-08-02 00:10:46 +0000 Commit: Mark Johnston CommitDate: 2023-08-02 13:15:08 +0000 dtrace: Add WITH_DTRACE_ASAN See commit 4ae6991228105eb34989c870194ae7b0a1e23be4. This version of the commit avoids inadvertently changing SHLIBDIR for libdtrace.so. --- cddl/lib/libdtrace/Makefile | 10 ++++++++++ cddl/usr.sbin/dtrace/Makefile | 5 +++++ cddl/usr.sbin/lockstat/Makefile | 7 +++++++ cddl/usr.sbin/plockstat/Makefile | 7 +++++++ share/man/man5/src.conf.5 | 5 +++++ share/mk/src.opts.mk | 1 + tools/build/options/WITH_DTRACE_ASAN | 4 ++++ 7 files changed, 39 insertions(+) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 23cc8d2db574..da31618f581e 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,10 +1,15 @@ # $FreeBSD$ +SHLIBDIR?= /lib + +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common PACKAGE= dtrace LIB= dtrace + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -138,6 +143,11 @@ DSRCS+= regs_aarch64.d YFLAGS+=-d +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= ctf elf proc pthread rtld_db CLEANFILES= dt_errtags.c dt_names.c diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index d8510e62fb29..fcc0668f1b1d 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -30,6 +30,11 @@ CFLAGS+= -DHAVE_ISSETUGID #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= dtrace ctf elf proc spl .if ${MK_DTRACE_TESTS} != "no" diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index a4bec42df367..72cedbdb20ed 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat PACKAGE= dtrace @@ -26,6 +28,11 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 22610870c846..41ef446c111b 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat PACKAGE= dtrace @@ -26,6 +28,11 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= dtrace proc .include diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 3eeb3440e986..15c80af095e6 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -594,6 +594,11 @@ When set, it enforces these options: .It .Va WITHOUT_CTF .El +.It Va WITH_DTRACE_ASAN +Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) +with address and undefined behavior sanitizers. +Requires that Clang be used as the base system compiler +and that the runtime support library is available. .It Va WITH_DTRACE_TESTS Build and install the DTrace test suite in .Pa /usr/tests/cddl/usr.sbin/dtrace . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index bed2b718654d..155ce97e88c4 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -200,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_FORMAT \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ + DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ diff --git a/tools/build/options/WITH_DTRACE_ASAN b/tools/build/options/WITH_DTRACE_ASAN new file mode 100644 index 000000000000..4240aee4b89b --- /dev/null +++ b/tools/build/options/WITH_DTRACE_ASAN @@ -0,0 +1,4 @@ +Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) +with address and undefined behavior sanitizers. +Requires that Clang be used as the base system compiler +and that the runtime support library is available. From nobody Wed Aug 2 13:29: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 4RGCXF5KGTz4qbd4; Wed, 2 Aug 2023 13: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 4RGCWj5NY2z3jtH; Wed, 2 Aug 2023 13:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPCPR1uJuOqOQWwQfEHe5UK9qeV9BWIPcL3uwS0CyW8=; b=DDWlG4+rKFHLnsQoH7WU4OQUitPPfNs+MH+knCCEyeG2WMGt7bo2ng3Zgj7zh+R1R7Es1w VkhCiXyCuf9kM8QoN3vaa8l5atDLa/Kt90H096nBsM8pivfPLfNEo4cThitvAklEbut4cE 6krRxlsXonXcZnFFoGfhPeAZDE17vk3C+xbVKdnWwBQThNk4bHGIT2BNm4UqSzjTtYcDbW jhiaHVax2/8g/fVZx/TLfX1WPO4PtZl1rZEDI1xwm1T4SdyPF+8W4uE1AuTFIg4KwZ8tVC MdcyEHjl0l5EwMweMSZMqbsgRt1+zkgSy2ZX3m2qFjdaNTvGC3SOuHxlOqAy2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690982993; a=rsa-sha256; cv=none; b=MV/lkYOr8diWy0tPdO8Zrcus2cheJDsDQNmHQ1w+4RlEqIec7q3+1jGJURDl9l0/IgWdZp 2ZyepOzPwVb1j08i2hWTV7ePHeqQZXx18KfLs3XBnlm/jXKeDufVWjRgYHKBWzBpnH69w2 ZMuQXpGlkaumWf86mV1TWqIl1a0Ymv+hMQ+mrculGPRfgoBDIeugKp4w7tx/XituJIbZww 2+N7V5pdIQNGCeh0zdi+cgRm9YBPpBc/JiJ8r5us2im3Qb8lVx2x+vocYxcwXrCA3VqAqK XxE2rWiyUIqWAe6Tl0J83LnO2a2/rL5FEJi6PBCA9hV8GEHbIZdRr9DeOW/G+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=1690982993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPCPR1uJuOqOQWwQfEHe5UK9qeV9BWIPcL3uwS0CyW8=; b=TTBwNhPSpoalfftyhcdad5m5m6Gt+F1oQq/ZY5FAg66hI/9mPfswGp5/I5Sfb99aH23gx/ oM9xX5w69ZBjL9iqVHrfcg6NQ8xWswzQYebXnAhB/phrzb0kY9EIU3vAX5SELBaWGCB5uy De70MYML4aZ0gsSafYAbpTCVq6K8lwMnhfOUlAjg3srDSbDw0d6n4UVF0D6j5nuFjw2Ifa cSODDrYwN5Ccyr2jobsdU8+qWd6mzLBRNh9cSMWeSttI1+1BY+ZkYvVAb3nlZciOyeHgzW KWeqVwg02U9KG6PIsdzO0oEWWelbqrSFFbZyBm7L0V8t3r08v+lvn5V05K8L6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGCWj2FYCzLS8; Wed, 2 Aug 2023 13:29: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 372DTohw038059; Wed, 2 Aug 2023 13:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DTot5038058; Wed, 2 Aug 2023 13:29:50 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:29:50 GMT Message-Id: <202308021329.372DTot5038058@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: 5fd1da4d8501 - main - ObsoleteFiles.inc: Add an entry for libdtrace.so.2 in /usr/lib List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5fd1da4d8501a30ae3848c19f24205d4ee1e43f6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd1da4d8501a30ae3848c19f24205d4ee1e43f6 commit 5fd1da4d8501a30ae3848c19f24205d4ee1e43f6 Author: Mark Johnston AuthorDate: 2023-08-02 13:24:06 +0000 Commit: Mark Johnston CommitDate: 2023-08-02 13:24:06 +0000 ObsoleteFiles.inc: Add an entry for libdtrace.so.2 in /usr/lib There was a window between commits 4ae699122810 ("dtrace: Add WITH_DTRACE_ASAN") and 848ff9bc1b97 ("libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR") where libdtrace.so.2 was being installed to /usr/lib instead of /lib. --- ObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 295d718932e9..6e93c9381c52 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230802: Remove a copy of libdtrace.so installed to the wrong path +OLD_FILES+=usr/lib/libdtrace.so.2 + # 20230726: Removal of support for the VTOC8 partitioning scheme OLD_FILES+=usr/include/sys/disk/vtoc.h OLD_FILES+=usr/include/sys/vtoc.h From nobody Wed Aug 2 13:30: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 4RGCXF69Xfz4qbPR; Wed, 2 Aug 2023 13:30:14 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGCX529fpz3jyl; Wed, 2 Aug 2023 13:30:13 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-40fd276621aso14402451cf.2; Wed, 02 Aug 2023 06:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690983012; x=1691587812; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=reDbQ6z83RutWKaDY4a90USg23otLyxDM0pDp5uOHAw=; b=HKPUiGnY5ehIpSwmbt93BdKW45D2jUS2nNBiIrs3yE8kC5OReBtkXK9gNmnhdE4Z7X hNdMGhKCI4bUHUoVLT/toKGLl2w6hTRMtHVdj2adFe64SWMq3uRWSBCUi/l4yUSUFg/i JMzJ79oVXb8xnXBAmUMc4PjtxJ/Cxj+UjaAQ9XYcRYY29gXK6yloXN17wy93taQSsO+p ahnwTXmD6nxGCzCHOA6doGJE6u0h+kkBSM5mMBlDWajapxmWsceca1LotoDDgNMdwXAM cZ8WDFlgoHc6DDcQT+KajewofCret9wMI2uQqEjZ9lzWHxh4XWc+BFrGPDVvGy5kSHEv qZPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690983012; x=1691587812; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=reDbQ6z83RutWKaDY4a90USg23otLyxDM0pDp5uOHAw=; b=hAQJy8P8tyxuAkGKbDyo3JmU63zQY+lfW1FKm7XBiKhoEC9z9kzrRabe6dtfddN2CL z3JX8Vl6PJOlPpFOkLDf9fc+iBhec1L64n0kkvxxARgjP00bxKkIBoPYdnCLHlVj0lkB hTIOOwCoPQsDj04CPIZggbZZfTkpxwou9ZXThSQ0JIySqYUkFHiNygxmFbaqCio8Etaw 1S6DobvI/XumcLDkYwpm7vU8okg3cnLDBY7m02158DUXnKla+AYOyFKGteXJwifZHkw2 ueusCIhEewLIKEU8E7BSH7nPcZgenPZuy4Q5CW3pZZPU/v58sxL4TtokUPvdJ3bnQEYG 3gKw== X-Gm-Message-State: ABy/qLZS+EAdiWB7TmJs7LTZLT/RGMPMBRv+X8T3kJAIRkg3Dz7AqzWx ORgwPHxQGFHJeBs47nf4CzUmsucHb8w= X-Google-Smtp-Source: APBJJlFgzaqNl2msBIG/c9kpP/4/R1HvDO3ZltkgFpV43ICLPY0wiMjaWRkyRCXG9oler9WvtRcvHQ== X-Received: by 2002:a05:620a:809:b0:76c:99a0:46 with SMTP id s9-20020a05620a080900b0076c99a00046mr13184477qks.43.1690983011770; Wed, 02 Aug 2023 06:30:11 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id w21-20020a05620a149500b00767e62bcf0csm5027185qkj.65.2023.08.02.06.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 06:30:11 -0700 (PDT) Date: Wed, 2 Aug 2023 09:30:08 -0400 From: Mark Johnston To: Yuri Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5cdaac92e119 - main - dtrace: Revert the addition of WITH_DTRACE_ASAN Message-ID: References: <202308011703.371H3V7a012823@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: X-Rspamd-Queue-Id: 4RGCX529fpz3jyl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Wed, Aug 02, 2023 at 01:46:13AM +0200, Yuri wrote: > Mark Johnston wrote: > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaac92e119d41063d4f0155a78a4abe767f15e > > > > commit 5cdaac92e119d41063d4f0155a78a4abe767f15e > > Author: Mark Johnston > > AuthorDate: 2023-08-01 17:01:37 +0000 > > Commit: Mark Johnston > > CommitDate: 2023-08-01 17:03:10 +0000 > > > > dtrace: Revert the addition of WITH_DTRACE_ASAN > > > > The follow-up fix triggers a lib32 build failure, revert everything > > until the problem is addressed. > > --- > > cddl/lib/libdtrace/Makefile | 11 ----------- > > cddl/usr.sbin/dtrace/Makefile | 5 ----- > > cddl/usr.sbin/lockstat/Makefile | 7 ------- > > cddl/usr.sbin/plockstat/Makefile | 7 ------- > > share/man/man5/src.conf.5 | 5 ----- > > share/mk/src.opts.mk | 1 - > > tools/build/options/WITH_DTRACE_ASAN | 4 ---- > > 7 files changed, 40 deletions(-) > > I wonder if we should add the ObsoleteFiles entry removing that > unfortunate /usr/lib/libdtrace.so.5? Presumably you meant /usr/lib/libdtrace.so.2? I added an entry to ObsoleteFiles.inc. From nobody Wed Aug 2 13: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 4RGCvM6hRYz4qc7M; Wed, 2 Aug 2023 13:46: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 4RGCsW1bmcz3mwk; Wed, 2 Aug 2023 13:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iG7lTRyT1/j+sTZD1DAYapcPUk6tJjWPW0ZdeS9DTeI=; b=glLROU3VvsHDYckAd/ZdOJxfPZBwGRPvkopJzl4uH3tP/I5OA3FJrCFN+A+k80wHIcOngx ICWs0PBXsnNg8sr0EF3x+3iLSRoJrM8Wz5OIQAnPQGKKHasVlq9fD6NFKR9AvpDxyUfpH9 ZNLXXUaEI+9EGOqSWMVHwJllyBJL7lXWu5/eV7Hs+38YL8BnGmsqVQq6rUgweyonXCyXmH WnoZ5qe1IPDgLGSM4kGRHuv8Yv5E9wW9ND35rfnXwx6d2NMjskZFK8MsHXpj5bYwFy5kyx fsdazE441F9eNeE2MrWOx6CekgkaSTj7Gs9XQKILmzXviAUAxJBGpu/whlPI3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690983919; a=rsa-sha256; cv=none; b=Jdv2XT314k+IDabB8MtKV0JBtvUPMl9vRXUem/y1d1LYaY1e66tvWwf1+C/UZ8U47MjNgU g9Xq0Ux4xY6pyzFvZU+WnNVSsBC3SIZ8PzKWoI2EZxh0lS08gp0QuaRlWLUD+AhWeIRQNo oSkeBDeH1FqpemjJrqDEs5B2vxIWsuVJUPH03Z35S6wo9AvRIo1wftunYmphekjrLWlKCV YDNiUI9ypr4o2fFTDvP5auyPyG9NbMqX/edHCsU4pqHm7STNH1kkVpSG8aSYcJX9b4vKc5 2Io+HkTh31PGAuTWSK36UC2gF8/AZdYUFP58Uwd1BlvanowWfqvFHs7V9wCmRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iG7lTRyT1/j+sTZD1DAYapcPUk6tJjWPW0ZdeS9DTeI=; b=WoX3bcUIoDL92RoUqNr9YKMmD0Gk8OFctGSP8CijTxEQcMv6gvRhiUpLDN9GkUslJzXo5h 9R9uP/56G4lcS9KTTZDgOLInatjJp0pPE0gzQK2E3DC55cIaXandjidra/Mlps0MaqkvSG oUI02TxkeBAQSauqeqkaXRemRRKeMTiL+aSC1ptUuPT6DyZX/YlTS5Krat9hG1YQMhW7aF nSXTegYgRXslY3Y5ITpY2SiaTh2IfyoNJyLoPFQErMHUHWpLUANymCrQSXnHM7E3YguvCr BRCx1noF8uyATw+ENKXKyGLJnIHAxCrk6VVmO8w6MruCAHtmvU3rULRsXIUUMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGCsV3Wn9zLxB; Wed, 2 Aug 2023 13:45: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 372DjHo6071091; Wed, 2 Aug 2023 13: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 372DjHEr071086; Wed, 2 Aug 2023 13:45:17 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:45:17 GMT Message-Id: <202308021345.372DjHEr071086@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: 734518564f9d - stable/12 - libpfct: ensure the initial allocation is large enough List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 734518564f9dcfa180dc24d337958a6f8ea94198 Auto-Submitted: auto-generated The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=734518564f9dcfa180dc24d337958a6f8ea94198 commit 734518564f9dcfa180dc24d337958a6f8ea94198 Author: Kristof Provost AuthorDate: 2023-07-26 08:30:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-02 08:41:51 +0000 libpfct: ensure the initial allocation is large enough Ensure that we allocate enough memory for the packed nvlist, no matter what size hint was provided. MFC after: 1 week Reported by: R. Christian McDonald Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6422599e74db4bb8b47cead46760d96601d8396a) --- lib/libpfctl/libpfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 99ca563548c9..a095cdd1e54b 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -68,6 +68,8 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) int ret; data = nvlist_pack(*nvl, &nvlen); + if (nvlen > size) + size = nvlen; retry: nv.data = malloc(size); From nobody Wed Aug 2 13:45:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RGCvM6w4wz4qc7N; Wed, 2 Aug 2023 13:46: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 4RGCsd6MXrz3mcl; Wed, 2 Aug 2023 13:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAi7Ko4j40sNAkXDSL5jN6qnG/+tKye75ive2I97YY0=; b=NUWAG4UYjN9DO3CvJ5QfuSgLyRIeLEOv8j3OT+dhr/SDLhRZ6aiXU25u8viEv4puQ20yLV jcSTs3W3xUL6CSHio/dOz05Ctj7mYIzV+WsTAQHppHyQZy+9khjAPtDIBK6OOWUr934b73 XmX/lD0kfUDp00gdeamFTnOorpAG7544b1C8u2Vd2qcl+6nL1SqwrPWrdqvf4kAMXCV+tT ReVPowQe4FrIH4JDQzHA922lWDLH2NmdB7FyZxZl1ZYCJ7Hk7JC13uM2GCIfPwAqkalcNk M8Uzs8loHZWaqIRl8ZVQt6BmJcI1WKr0N5vAwAoPCnCipqOoD2HHmtuZiDyfDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690983925; a=rsa-sha256; cv=none; b=hs0h13UHzWZctrXszeHylGVjJ7GwfOgQBizwRx6uVdP8UvsNQrKh/cBcaCw9ySJXUKGmxF n8HNjYWhEcm6sjXXxN2DWzCAm5hKnwN1zW1eztnlRzoajeSsWcs3uQHZRtrh50plsCQlnu yyaNStf3Y8TrCb6G5Ln3vA3Ld5jvc2ONlWHH3kgtxlJnhF1adZhqsgNzMmeSfftL5+zaNU AnUP9+WHWcomQs9Q2wciPwwpJJVG+vlE3/tKcxcRB3qk4NjQ2Ob/WeNLkgnbAobjMtsKfj nvt8aWi9/4h8lqZAPD28nIjBYSjw7pckp3OathXW0U+F8leH7CdKAVMInTWTOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAi7Ko4j40sNAkXDSL5jN6qnG/+tKye75ive2I97YY0=; b=e7E6EatHAk1Db/LehUou2xwon9MOOLTmiWPJL4B1PyapaCeyfnxQMi0x/DMeeq0HIDPzmp UhPf9TXy+UfzR4hggMweI26jyg9yxrDKY8+hlq+eZcO54gS0Z/KNh3mQJZtgViLg3QPygO 7PqVNeSA2y+5Tm0fxgau3MH7RpmZTO+ggevw5aHFECsy/x565gEVn3jTC1zhDq9Yx+2I1c cgoa4bnO7dnVfkkDUV5ncvnssXLGoACJc2Ho3z1pRqutXyr8PYqCohsXvTnqiF2EOSE37+ c0hR4GTWVGjb6z762DXEoJnDTOvD6z5eD77jNq8euvK4zNz6o7UADg2BhbvUqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGCsc191GzM1m; Wed, 2 Aug 2023 13:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372DjNju071285; Wed, 2 Aug 2023 13:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DjNQx071284; Wed, 2 Aug 2023 13:45:23 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:45:23 GMT Message-Id: <202308021345.372DjNQx071284@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: fec383bb5385 - stable/13 - libpfct: ensure the initial allocation is large enough List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: fec383bb53859a9fd0862513fd04dc2a710537b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fec383bb53859a9fd0862513fd04dc2a710537b5 commit fec383bb53859a9fd0862513fd04dc2a710537b5 Author: Kristof Provost AuthorDate: 2023-07-26 08:30:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-02 08:41:55 +0000 libpfct: ensure the initial allocation is large enough Ensure that we allocate enough memory for the packed nvlist, no matter what size hint was provided. MFC after: 1 week Reported by: R. Christian McDonald Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6422599e74db4bb8b47cead46760d96601d8396a) --- lib/libpfctl/libpfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 99ca563548c9..a095cdd1e54b 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -68,6 +68,8 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) int ret; data = nvlist_pack(*nvl, &nvlen); + if (nvlen > size) + size = nvlen; retry: nv.data = malloc(size); From nobody Wed Aug 2 14:22: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 4RGDl057SLz4qcnj; Wed, 2 Aug 2023 14:24: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 4RGDhQ4xtXz3tX3; Wed, 2 Aug 2023 14:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690986151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay4zAfNq8jPu+fTGRQD5WdU3DcAMgCmP9Nkd/d7pvsE=; b=M6rWGFW9O51UxFgUUQvqFSfdgMKVb/qzQcAXyb9Q3fPa9SmgNF3ioodOpPqCD6mbxGYT+v zlH8Qv9mhjCsymyJJuG6lyGJXO3yx6Q/R0j+TjaJM2v3Ixg/rGG2ZKFfEpnQcL+T3QHhwq 9dCMbU9P2965YWHquSRWAu6W/uiixVdtrTdB/wydXlUMN2jWkv73A7D0ig2VDRPh44K2NN eotdz4WIL5gXOzEmyjUsB0ny7sdWfSSKsU6/IsJymEtIY9x0m8KKhE/UHbe5OYXUHyfuqI T+C/1DC4KkK9ntUDBoIe51AXSKsPSuk34RXZ7LKwpdnHGAbriGNxcb7hatW9+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690986151; a=rsa-sha256; cv=none; b=nvCCQCn1+RyjbC+L/FjMiv8k87CEtqOI8PO6EJrZdIcnqvkwDOC2sKWYJolMN7WP6BVdDW MVL2JLa6Jf0d52uSJVwW8bKzHrmJXSdfWIVLRmmXJzM0CSOun68MP7Jr527U2sp9A216MO KCynKL2bqI+YbDw8CXA6dy+2WXWOhR/9GGwJA/Kvsc7Ae9nlgdnkfnR39CfBFctmnozTbM +B6L61/CXSITNus3e5m9TypyN9Zr6cx3crpwbYi1gA38rHbHwGMPwTbQ/tsgVIxX+YoOho r9IKOHwvRi2Z7XhFU+E+++oHa9nOM7+x/kHEm3hKRbfxLDq7kybWFH0qAFAjlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690986151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay4zAfNq8jPu+fTGRQD5WdU3DcAMgCmP9Nkd/d7pvsE=; b=LkMG3AKtSpjVS5Tk8wFLjrSFi6ptG8JSc2S4stcupzTaOuqhd8cIRJW0No+89nCNsaeMCL 2MDsFnpL+In4RfCdoZYYcDBjexx412GKITgmm9HKm7Rd6DRDQ3olJUNiTObaUoJ1AkAwTS Uu6r98HLdOYzOEJq6Njg0NCTtPn24aABZV3HYddCWkYGKLYv51EsF5AaXphtoh0USgM9XM Q4QhegF5MRtfX7T3FBnhw3QhmNHGHO4A1gSP8KsmIahB1F2ZH3rrZftR/AoyVBsJUu/gM7 ZHKy2nC9erypn9x1dx2d8qPilNM8jZEUtbmnT4ptX7z0U7ma0JYLKi5boSp3cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGDhP142CzMbY; Wed, 2 Aug 2023 14:22: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 372EMTAr037522; Wed, 2 Aug 2023 14:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372EMTpp037521; Wed, 2 Aug 2023 14:22:29 GMT (envelope-from git) Date: Wed, 2 Aug 2023 14:22:29 GMT Message-Id: <202308021422.372EMTpp037521@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: a93cbba2deed - main - ssh: comment deprecated option handling for retired local patches List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a93cbba2deed209a30da1ecffa637bf5c61b7641 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a93cbba2deed209a30da1ecffa637bf5c61b7641 commit a93cbba2deed209a30da1ecffa637bf5c61b7641 Author: Ed Maste AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste CommitDate: 2023-08-02 14:21:34 +0000 ssh: comment deprecated option handling for retired local patches Older versions of FreeBSD included the HPN patch set and provided client-side VersionAddendum. Both of these changes have been retired but we've retained the option parsing for backwards compatibility to avoid breaking upgrades. Add comment references to the relevant commits. Sponsored by: The FreeBSD Foundation --- crypto/openssh/readconf.c | 2 ++ crypto/openssh/servconf.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 2cbbe8d48522..616a6e8b9bd4 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -323,12 +323,14 @@ static struct { { "requiredrsasize", oRequiredRSASize }, { "enableescapecommandline", oEnableEscapeCommandline }, + /* HPN patch - retired in 60c59fad8806 */ { "hpndisabled", oDeprecated }, { "hpnbuffersize", oDeprecated }, { "tcprcvbufpoll", oDeprecated }, { "tcprcvbuf", oDeprecated }, { "noneenabled", oUnsupported }, { "noneswitch", oUnsupported }, + /* Client VersionAddendum - retired in bffe60ead024 */ { "versionaddendum", oDeprecated }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 53c3ee05b9cf..de45475dbc33 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -707,10 +707,13 @@ static struct { { "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL }, { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ + + /* HPN patch - retired in 60c59fad8806 */ { "noneenabled", sUnsupported, SSHCFG_ALL }, { "hpndisabled", sDeprecated, SSHCFG_ALL }, { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, + { NULL, sBadOption, 0 } }; From nobody Wed Aug 2 14:48: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 4RGFGK3gtmz4qf34; Wed, 2 Aug 2023 14:48: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 4RGFGB4gS4z3xjZ; Wed, 2 Aug 2023 14:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690987698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zm2ansvPfzwC7kD217Zr4mBqyE5crbanj0WZRGrTlNg=; b=Q27gVaKdsbNeUqoymwAX0aJ0TyGfiU10ahmzDNiffliQ46MCncidrGNHyeUUX75FipOckk unHx42XjDrUbwV2VbPPTQnBiAcg2FMwlgu/J4D5MbSORQcCfiXRIYHPotPMu1cnjD+wFm6 eXdCbolsCaFGPhW2AacL9ZvJxIbvLHi2o8b/ywwsLHebs3AhkqrzlbVQEpK0B0ooyC0hRB HC2w61/db4LqM688ERlvr9YoRkRf2ZOm74rMMrjEHad9poAGR8xithRuUnf9Wma08eWXgI NQFmddZGqcJB/eZF2npV/tCy7ojGueZ7BPhJXf9bjTOlCIGfzsZ629nUHQZvMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690987698; a=rsa-sha256; cv=none; b=XGO0bQ4dexCNH3gECe4R0m/cW4SmrQUsmLSxWAqIDB02CiNVuFkpPiz24rb6lVgrtbPHbC kSp4eAL0dUPSkeStWVaLUSODLSwsfr6+2oMM2g2XhJ6RT9+QqCgAt5cn3/MpIBW9vdatHS fOZOX24r8XfNI9jnTehBfvCo8K11wElIxTr5MuPVBuePm9E+CEUfLxo9WOSohDX+JL/gp4 SFwCi5lDqWBDZM5DijQEM95d9em5nr3pISo9u3dpboi05QjHQoIhukhh1edDGpY/DCk9b4 fJoiA7qlYNoA94YClJQxcGpovD2ckhJW41mDzxm3v5j1ebZxte3LIrsGmtVAVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690987698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zm2ansvPfzwC7kD217Zr4mBqyE5crbanj0WZRGrTlNg=; b=W9C0nX0fyRFfRAZncvJUtaS4cK91MirZYIbbUce12mYK9e2dKdXztdCFwpLl+K2aiYoDlN 9nA5zSdzjWSkR8VC7b1O5TyqUrXBNPr65u7SXAQSdxEiUV+X0MF+YrCCiN/n3TC5qSrbP6 MNm2YDzp05sJ1yY5hmKZ9lOv89xk22B5CZu9jqrOMQU36QD8LMcI/fk9yFQeNeolp0kPJw vusVsm5YMd8AzVnjXuSjq9KylrJ4sUoH4AIGTXE5XYysIp28W1eUesradw7BMlDRAuBlEk KFwjC6vXlKAtr23z8EUZVE41f2PYiNRx98zFkla3UVLgR0tWX9SkGQ/GtII4Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGFGB1CqdzNlL; Wed, 2 Aug 2023 14:48: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 372EmHht071088; Wed, 2 Aug 2023 14:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372EmHZa071087; Wed, 2 Aug 2023 14:48:17 GMT (envelope-from git) Date: Wed, 2 Aug 2023 14:48:17 GMT Message-Id: <202308021448.372EmHZa071087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 0c783a37d5d5 - main - mii: Add the Broadcom BCM54616S ID to the list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c783a37d5d52af8cd706eb462e73801e77c6b35 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=0c783a37d5d52af8cd706eb462e73801e77c6b35 commit 0c783a37d5d52af8cd706eb462e73801e77c6b35 Author: Justin Hibbits AuthorDate: 2023-08-02 14:05:21 +0000 Commit: Justin Hibbits CommitDate: 2023-08-02 14:47:40 +0000 mii: Add the Broadcom BCM54616S ID to the list Obtained from: Juniper Networks, Inc. Sponsored by: Juniper Networks, Inc. --- sys/dev/mii/brgphy.c | 1 + sys/dev/mii/miidevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 74f1dbbfe5b7..4bd028041971 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -151,6 +151,7 @@ static const struct mii_phydesc brgphys[] = { #ifdef notyet /* better handled by ukphy(4) until WARs are implemented */ MII_PHY_DESC(BROADCOM2, BCM5785), #endif + MII_PHY_DESC(BROADCOM3, BCM54616S), MII_PHY_DESC(BROADCOM3, BCM54618SE), MII_PHY_DESC(BROADCOM3, BCM5717C), MII_PHY_DESC(BROADCOM3, BCM5719C), diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index c6e1226687bb..6e2f83263e4f 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -193,6 +193,7 @@ model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY model BROADCOM2 BCM5709S 0x003f BCM5709S/5720S 1000/2500baseSX PHY model BROADCOM3 BCM54618SE 0x000d BCM54618SE 10/100/1000BASE-T PHY +model BROADCOM3 BCM54616S 0x0011 BCM54616S 10/100/1000BASE-T PHY model BROADCOM3 BCM57780 0x0019 BCM57780 1000BASE-T media interface model BROADCOM3 BCM5717C 0x0020 BCM5717C 1000BASE-T media interface model BROADCOM3 BCM5719C 0x0022 BCM5719C 1000BASE-T media interface From nobody Wed Aug 2 16:21: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 4RGHKn63Wmz4qhVF; Wed, 2 Aug 2023 16:21: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 4RGHKS2SxYz4DY0; Wed, 2 Aug 2023 16:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690993276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbshhz28rnYPHKCchoSA6GXG3bpvPlpWzbh5V4eKuNI=; b=wlf3eAtdBkFHKyuLXkEv62agvE1hhsto0rBOktej/LyekAmzjFbqG0+mMpinLVT3EOj8Xw CZraaYGsxqorIElgeGhob3vdnTkg2sbq+giXiCsoK5a/IaTzrShq/r4A96IpypOPRgtsje FUbOZBB+VPTgU6o7KIW9ZzgooZFuA8oDiwS7OivSHYixSNXVDy19mHRxzZMxYiz5E62uX2 9qfWeSSS0od9KhXu1KGZfvnTr9YDxBvCGvriore5IG4Jatb7ASgSGTTNpNyEiXOCTH+YfB KBIiOMN19cFVQSzfgd84GceYqoguwx1mCBxbTR13URRl5gzYKvOOo4UYv7BD2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690993276; a=rsa-sha256; cv=none; b=Jfl3u8FMIrirucw89fLtoLZ6FRy+4EIsLrLTxnVPSwnwPEK1eUjW8z83A42viy1+oVAz3+ 7Wnd+CBTLjJKQ84DdW1Hn44mFkpipIdUmAntUgQqPF5pW+48X1iJntHcfkFSFc6PqG1lYL H83I8vjeEG39t+CeSN3y6vQ8IrTpXgEqhRMHZoT6jWXaYMJMoM4c21lHiSmwV2d8Dv/2jf /MZafVP2UBkQ3udoFrLNPmt2PQM8dR1ZFqOYKiWQSSiIHvelG38YKHafH5/rHORRa/KXo9 irOHA5Tnx1iaMhaw9CRtiHN3qEC9vvbtv3ja5gVcw6vPlXb3WXCLfTYcS2/r0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690993276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbshhz28rnYPHKCchoSA6GXG3bpvPlpWzbh5V4eKuNI=; b=FAS7aLms6c7TqvNWQnimiRG8cQ3M1pJ2oXgzpJq6PKlSH+ixZwoWWwiZZuC8JzlHdr5MUi lBc/M+khxgv4qP07zJS6aejTo2c2Hl6KTi4JVniQgopmFUvbgPlNqutXJdfyn6Kt6nPFvB o/7alJxW+rdTihynb6YFa7AU1WsnVkGe6X93WBb/TrAKFGvZWsMmuaOJf+RUt8RNbUrnBl UHHpAsyLBOkdwhDWrTh1DWREcm+EqA6YXbVfZf3tluy2NDJ33KvNgkL+FeLnrJbRs2bFyJ +bDqMHgd94f1JTuugHjJuGwZ9YsKWyjY7XHqb9jes/kurEf7NClcUgBT3mFycw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGHKS0xmhzQtP; Wed, 2 Aug 2023 16:21: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 372GLGxe034442; Wed, 2 Aug 2023 16:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372GLGpp034441; Wed, 2 Aug 2023 16:21:16 GMT (envelope-from git) Date: Wed, 2 Aug 2023 16:21:16 GMT Message-Id: <202308021621.372GLGpp034441@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: b9da47180fd6 - stable/13 - netstat -i: compute most field widths dynamically List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b9da47180fd6efd77489339b6559eeeb09c7b96c Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=b9da47180fd6efd77489339b6559eeeb09c7b96c commit b9da47180fd6efd77489339b6559eeeb09c7b96c Author: Mike Karels AuthorDate: 2023-07-26 15:56:52 +0000 Commit: Mike Karels CommitDate: 2023-08-02 16:17:31 +0000 netstat -i: compute most field widths dynamically The network and address fields were sometimes truncated for netstat -i without -W, and often much too wide for netstat -i with the -W option. Fields such as normal packet counts often overflowed. As a result, columns didn't line up, and large white spaces made it harder to follow a line across the display. Change the code to compute the required field sizes for network, address, and various packet counts. Hoist the code to format network and address into a subroutine that can be called twice, once to measure the required field widths, and once to emit the values. Use separate field widths for input and output packets, byte counts, and error and drop counters. These are left at defaults (the preceding values) with the -h option, in which case the fields have a limited total width. An extra space is included between the Network and Address, which otherwise seemed too close. Change the mention of -W with -i in the man page to say that most field widths are computed dynamically in this case. Reviewed by: sjg, glebius Differential Revision: https://reviews.freebsd.org/D41160 (cherry picked from commit 372e3d561d82aba7a66fcd4ecb49a4d0a9f69345) --- usr.bin/netstat/if.c | 217 ++++++++++++++++++++++++++++++---------------- usr.bin/netstat/netstat.1 | 3 + 2 files changed, 143 insertions(+), 77 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 5ba4f3afc67b..e08a0462d56d 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -265,6 +265,99 @@ next_ifma(struct ifmaddrs *ifma, const char *name, const sa_family_t family) return (ifma); } +enum process_op { MEASURE, EMIT }; + +static void +process_ifa_addr(enum process_op op, struct ifaddrs *ifa, int *max_net_len, + int *max_addr_len, bool *network, bool *link) +{ + int net_len, addr_len; + const char *nn, *rn; + + if (op == EMIT) { + net_len = *max_net_len; + addr_len = *max_addr_len; + } + + switch (ifa->ifa_addr->sa_family) { + case AF_UNSPEC: + if (op == MEASURE) { + net_len = strlen("none"); + addr_len = strlen("none"); + } else { + xo_emit("{:network/%-*.*s} ", net_len, net_len, + "none"); + xo_emit("{:address/%-*.*s} ", addr_len, addr_len, + "none"); + } + break; + case AF_INET: +#ifdef INET6 + case AF_INET6: +#endif /* INET6 */ + nn = netname(ifa->ifa_addr, ifa->ifa_netmask); + rn = routename(ifa->ifa_addr, numeric_addr); + if (op == MEASURE) { + net_len = strlen(nn); + addr_len = strlen(rn); + } else { + xo_emit("{t:network/%-*s} ", net_len, nn); + xo_emit("{t:address/%-*s} ", addr_len, rn); + } + + if (network != NULL) + *network = true; + break; + case AF_LINK: + { + struct sockaddr_dl *sdl; + char linknum[sizeof("")]; + + sdl = (struct sockaddr_dl *)ifa->ifa_addr; + snprintf(linknum, sizeof(linknum), "", sdl->sdl_index); + if (op == MEASURE) { + net_len = strlen(linknum); + if (sdl->sdl_nlen == 0 && + sdl->sdl_alen == 0 && + sdl->sdl_slen == 0) + addr_len = 1; + else + addr_len = strlen(routename(ifa->ifa_addr, 1)); + } else { + xo_emit("{t:network/%-*.*s} ", net_len, net_len, + linknum); + if (sdl->sdl_nlen == 0 && + sdl->sdl_alen == 0 && + sdl->sdl_slen == 0) + xo_emit("{P:/%*s} ", addr_len, ""); + else + xo_emit("{t:address/%-*.*s} ", addr_len, + addr_len, routename(ifa->ifa_addr, 1)); + } + if (link != NULL) + *link = true; + break; + } + } + + if (op == MEASURE) { + if (net_len > *max_net_len) + *max_net_len = net_len; + if (addr_len > *max_addr_len) + *max_addr_len = addr_len; + } +} + +static int +max_num_len(int max_len, u_long num) +{ + int len = 2; /* include space */ + + for (; num > 10; len++) + num /= 10; + return (MAX(max_len, len)); +} + /* * Print a description of the network interfaces. */ @@ -274,7 +367,8 @@ intpr(void (*pfunc)(char *), int af) struct ifaddrs *ifap, *ifa; struct ifmaddrs *ifmap, *ifma; u_int ifn_len_max = 5, ifn_len; - u_int has_ipv6 = 0, net_len = 13, addr_len = 17; + u_int net_len = strlen("Network "), addr_len = strlen("Address "); + u_int npkt_len = 8, nbyte_len = 10, nerr_len = 5; if (interval) return sidewaysintpr(); @@ -294,39 +388,51 @@ intpr(void (*pfunc)(char *), int af) if ((ifa->ifa_flags & IFF_UP) == 0) ++ifn_len; ifn_len_max = MAX(ifn_len_max, ifn_len); - if (ifa->ifa_addr->sa_family == AF_INET6) - has_ipv6 = 1; - } - if (Wflag) { - if (has_ipv6) { - net_len = 24; - addr_len = 39; - } else - net_len = 18; + process_ifa_addr(MEASURE, ifa, &net_len, &addr_len, + NULL, NULL); + +#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s) + if (!hflag) { + npkt_len = max_num_len(npkt_len, IFA_STAT(ipackets)); + npkt_len = max_num_len(npkt_len, IFA_STAT(opackets)); + nerr_len = max_num_len(nerr_len, IFA_STAT(ierrors)); + nerr_len = max_num_len(nerr_len, IFA_STAT(iqdrops)); + nerr_len = max_num_len(nerr_len, IFA_STAT(collisions)); + if (dflag) + nerr_len = max_num_len(nerr_len, + IFA_STAT(oqdrops)); + if (bflag) { + nbyte_len = max_num_len(nbyte_len, + IFA_STAT(ibytes)); + nbyte_len = max_num_len(nbyte_len, + IFA_STAT(obytes)); + } + } } xo_open_list("interface"); if (!pfunc) { xo_emit("{T:/%-*.*s}", ifn_len_max, ifn_len_max, "Name"); - xo_emit(" {T:/%5.5s} {T:/%-*.*s} {T:/%-*.*s} {T:/%8.8s} " - "{T:/%5.5s} {T:/%5.5s}", + xo_emit(" {T:/%5.5s} {T:/%-*.*s} {T:/%-*.*s} {T:/%*.*s} " + "{T:/%*.*s} {T:/%*.*s}", "Mtu", net_len, net_len, "Network", addr_len, addr_len, - "Address", "Ipkts", "Ierrs", "Idrop"); + "Address", npkt_len, npkt_len, "Ipkts", + nerr_len, nerr_len, "Ierrs", nerr_len, nerr_len, "Idrop"); if (bflag) - xo_emit(" {T:/%10.10s}","Ibytes"); - xo_emit(" {T:/%8.8s} {T:/%5.5s}", "Opkts", "Oerrs"); + xo_emit(" {T:/%*.*s}", nbyte_len, nbyte_len, "Ibytes"); + xo_emit(" {T:/%*.*s} {T:/%*.*s}", npkt_len, npkt_len, "Opkts", + nerr_len, nerr_len, "Oerrs"); if (bflag) - xo_emit(" {T:/%10.10s}","Obytes"); - xo_emit(" {T:/%5s}", "Coll"); + xo_emit(" {T:/%*.*s}", nbyte_len, nbyte_len, "Obytes"); + xo_emit(" {T:/%*s}", nerr_len, "Coll"); if (dflag) - xo_emit(" {T:/%5.5s}", "Drop"); + xo_emit(" {T:/%*.*s}", nerr_len, nerr_len, "Drop"); xo_emit("\n"); } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { bool network = false, link = false; char *name, *xname, buf[IFNAMSIZ+1]; - const char *nn, *rn; if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0) continue; @@ -367,72 +473,29 @@ intpr(void (*pfunc)(char *), int af) show_stat("lu", 6, "mtu", IFA_MTU(ifa), IFA_MTU(ifa), 0); #undef IFA_MTU - switch (ifa->ifa_addr->sa_family) { - case AF_UNSPEC: - xo_emit("{:network/%-*.*s} ", net_len, net_len, - "none"); - xo_emit("{:address/%-*.*s} ", addr_len, addr_len, - "none"); - break; - case AF_INET: -#ifdef INET6 - case AF_INET6: -#endif /* INET6 */ - nn = netname(ifa->ifa_addr, ifa->ifa_netmask); - rn = routename(ifa->ifa_addr, numeric_addr); - if (Wflag) { - xo_emit("{t:network/%-*s} ", net_len, nn); - xo_emit("{t:address/%-*s} ", addr_len, rn); - } else { - xo_emit("{d:network/%-*.*s}{et:network} ", - net_len, net_len, nn, nn); - xo_emit("{d:address/%-*.*s}{et:address} ", - addr_len, addr_len, rn, rn); - } - - network = true; - break; - case AF_LINK: - { - struct sockaddr_dl *sdl; - char linknum[sizeof("")]; - - sdl = (struct sockaddr_dl *)ifa->ifa_addr; - snprintf(linknum, sizeof(linknum), "", sdl->sdl_index); - xo_emit("{t:network/%-*.*s} ", net_len, net_len, - linknum); - if (sdl->sdl_nlen == 0 && - sdl->sdl_alen == 0 && - sdl->sdl_slen == 0) - xo_emit("{P:/%*s} ", addr_len, ""); - else - xo_emit("{t:address/%-*.*s} ", addr_len, - addr_len, routename(ifa->ifa_addr, 1)); - link = true; - break; - } - } + process_ifa_addr(EMIT, ifa, &net_len, &addr_len, + &network, &link); -#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s) - show_stat("lu", 8, "received-packets", IFA_STAT(ipackets), - link|network, 1); - show_stat("lu", 5, "received-errors", IFA_STAT(ierrors), + show_stat("lu", npkt_len, "received-packets", + IFA_STAT(ipackets), link|network, 1); + show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors), link, 1); - show_stat("lu", 5, "dropped-packets", IFA_STAT(iqdrops), + show_stat("lu", nerr_len, "dropped-packets", IFA_STAT(iqdrops), link, 1); if (bflag) - show_stat("lu", 10, "received-bytes", IFA_STAT(ibytes), - link|network, 0); - show_stat("lu", 8, "sent-packets", IFA_STAT(opackets), + show_stat("lu", nbyte_len, "received-bytes", + IFA_STAT(ibytes), link|network, 0); + show_stat("lu", npkt_len, "sent-packets", IFA_STAT(opackets), link|network, 1); - show_stat("lu", 5, "send-errors", IFA_STAT(oerrors), link, 1); + show_stat("lu", nerr_len, "send-errors", IFA_STAT(oerrors), + link, 1); if (bflag) - show_stat("lu", 10, "sent-bytes", IFA_STAT(obytes), - link|network, 0); - show_stat("NRSlu", 5, "collisions", IFA_STAT(collisions), + show_stat("lu", nbyte_len, "sent-bytes", + IFA_STAT(obytes), link|network, 0); + show_stat("NRSlu", nerr_len, "collisions", IFA_STAT(collisions), link, 1); if (dflag) - show_stat("LSlu", 5, "dropped-packets", + show_stat("LSlu", nerr_len, "dropped-packets", IFA_STAT(oqdrops), link, 1); xo_emit("\n"); diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index d2c6d2509f88..d342ec375658 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -317,6 +317,9 @@ See Avoid truncating addresses even if this causes some fields to overflow. See .Sx GENERAL OPTIONS . +However, in most cases field widths are determined automatically with the +.Fl i +option, and this option has little effect. .It Fl f Ar protocol_family Filter by .Ar protocol_family . From nobody Wed Aug 2 20:48:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RGPFQ1c9MzZmRV; Wed, 2 Aug 2023 20:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGPFK2j7Qz3HnB; Wed, 2 Aug 2023 20:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691009285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqPtXOAgdfF/CmOzNhEpBjswqW33dL0SAk0Xef2SvoA=; b=dlDoQX+fzuSI2sc2XMi6pIRSKNyTLJtqAdVGrzmGd+BUiji1WYK54dcxVYrbTEx762s+3d fMYS71dIx8NEd1dJnL1iP9Kot8twC9hGGEFNMubC0aUA35oORx7EeoNpg9G6g/R5DTYD4m MmCVgu8K9vciMccvl+CK0NCfzKBVhjEw9uIDNC3vt1iewPrYNpfEXgI3sWLdNo1CnqdDRI /RVpHF7jqpq/j5WpuEErIFPX1HmziGQhIdBB9ClNAnhLBQ9sGrHL3eBfWpgE5f+mDvbceP HQPb1+t+zfg9stFhrJFo0sNVEDzbJ7AftetsFN9YzudfK0KSBuzhTWZZD42Saw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691009285; a=rsa-sha256; cv=none; b=NhwrSh3Xv5XeC43tVCDRHTPLWaX/kgkWa6wPrarJmpFYhx6HGJLkol31Pj2M9q2oSy0T97 Q0R8HX0ptPQR4dCO7IxTAMxf5/4eHGdYPn6nnJN2s52q+4tagCC6avpqdhx9pGrU3RFHPX Uq7509Wt1eiUvklF60FMfyF40pbl83FmkxLODNlZMmms/LoY5dlFQ8SSsbthqoN89O4X/9 D4U9J7Ocr2msNpsYfVbP0uygJ6pT49BUCrfBccCvCJMdhOxVBd0RKFCONsOod17bTRQGoW Q2c2NXdL9xgF9rW8AdjhVkWgq3N+GHETXGW6+Vj/5tRgGIRZ+6FMETHrmwlfdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691009285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqPtXOAgdfF/CmOzNhEpBjswqW33dL0SAk0Xef2SvoA=; b=sZZuXE57CrFnhnB2UX26S2IDllGidyz3qyr/GMA6ODiCnwjt5AdRjqmwj9lIMKnbTRtYTi HSlY6bP4rxR++pTGGSZhuykdEQChgzcN3M6CjuwwBMhT4NoT52lw/IdQLqtObkFPjWKejq pPTeUe6CClwnXq4SiOJK76ID437U5nkWK4zzm7i2lcYyhwXZSnM0day03BeAAaRH49sLKQ qZc/1Y5sDoLPKpfstMa38N1/+PZ2oCUPfOdbJrTL+eVugVeKXNqTnG4uJ6GtXYESeOCnI1 bUAAxRd10681RCQVKRQM04ZPzEVzL2GlR5Zhh8mQM6VhrUtR5k1UYhnKp3uM1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGPFJ3GP9zYLP; Wed, 2 Aug 2023 20:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372Km0EM067045; Wed, 2 Aug 2023 20:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372Km0sp067044; Wed, 2 Aug 2023 20:48:00 GMT (envelope-from git) Date: Wed, 2 Aug 2023 20:48:00 GMT Message-Id: <202308022048.372Km0sp067044@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: 8a5c836b51ce - main - man: fix `man -K` search List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8a5c836b51ce29fb22e0692c03fbc1e405c6522f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8a5c836b51ce29fb22e0692c03fbc1e405c6522f commit 8a5c836b51ce29fb22e0692c03fbc1e405c6522f Author: Ed Maste AuthorDate: 2023-08-01 18:00:48 +0000 Commit: Ed Maste CommitDate: 2023-08-02 20:46:57 +0000 man: fix `man -K` search Quote re arg to grep in case it has spaces, and quote [:blank:] tr arg to avoid the shell interpreting []. PR: 272729 Reviewed by: Mina Galić Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41282 --- usr.bin/man/man.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 4fd6f886e87f..c95b47e2ee62 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -1000,11 +1000,11 @@ do_full_search() { gflags="${gflags} --label" set +f - for mpath in $(echo "${MANPATH}" | tr : [:blank:]); do - for section in $(echo "${MANSECT}" | tr : [:blank:]); do + for mpath in $(echo "${MANPATH}" | tr : '[:blank:]'); do + for section in $(echo "${MANSECT}" | tr : '[:blank:]'); do for manfile in ${mpath}/man${section}/*.${section}*; do mandoc "${manfile}" 2>/dev/null | - grep -E ${gflags} "${manfile}" -e ${re} + grep -E ${gflags} "${manfile}" -e "${re}" done done done From nobody Thu Aug 3 01: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 4RGW4M199Vz4dF0G for ; Thu, 3 Aug 2023 01: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 4RGW4J1Thsz425x; Thu, 3 Aug 2023 01:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691025040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Z/fqSvzTlJf3oPik4CmuxPIxE91+Sa+y5SmEaUTO5U=; b=g7j4Ak62CvQWx6/f8m1hrLXW7wsE9sIBesFP4YoSzwiXabgPfcnjC9rpnCxRc+0+J3Pd86 sg3JrHMBwRSdd1by61P+cbP7Tq4CvAIKJWnr/CUffzO+dBhk96egPUurmUIua6qP+0qnMN NUcAEFLIHMesaz7ha3q/GWcDaJ98bxQiZn5ww7MFZOUxcsQNurphGzheO5Fl+TTxLbmU2P +6tkZjiZSEzfok+1nBgCsts0GKlqmqCbXWApfrOEnwD9MFEJhNQTyiwz5E1lUAJ0ztlOA9 cMsNJU6JyAv8OffhANm5jCQWy0oTKbbvZTOWYfR+/uClqPGE6D2abMDgHPi0/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691025040; a=rsa-sha256; cv=none; b=gjk+Ja26kehDLh9ggTRv8QP9ViQptP5sakjorKtv7jQBQcbjb51Kaq/JorAPus1d39QHyo cBd4Ws7RbcSMJ+OIfw8YKrd/18uHjH+o018E95sT2el6uVZLcYBkk2FhOCGb7c2G5mWwVK 3aoxX48J2P0aCPYkh/eVzy8tkoxgUYlhH8S9HgL/XNm+Hsyvxa4AAfpkv5tnzDwi0ZizYG N2IsiW6ff5106i/b/C7HOj9SFPgiriuJBp1Ibw7yHxhtAjEba0v+VDECpvBcQoTC+Q+FF2 7jXl39BPCW7AR+IlK9W2QvCXbn22FxH3UvChoT5UK/KRaWqqx4TIj7AUL2VMig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691025040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Z/fqSvzTlJf3oPik4CmuxPIxE91+Sa+y5SmEaUTO5U=; b=f/fX174EsWYsRkVdZ8x/k7rcnU8ai8FTBEFmLANuvb5soMdXoUyGInIjRUauRo/zVY/gbt Cp8e4u/2OHcgiFJcEhjrNHM5x5eJJ3Q7mOinl8x26IclWvbk0DES6aCbc9upgSmzz5Ssaj PsGpykxrJnqfhAVDwD676isscZsKh4o+wBO0K5WqFLqFS6rTQxJ7CEjB6oUkwMxDlneUOg zJH2TbyA+j6gHYnktWBtqjdN7CDkFPytKb6wKO2nOSOOZzYjDpaVMRgTIirJmgIXKVsgVM 9pxLt7xkob9MCUnRBxt3ufcH6X1Y1JncSlGdU4mz8ZzwR6991lrwQWpg1MTuCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGW4H6wP2zhCC; Thu, 3 Aug 2023 01: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 3731AdGH007892; Thu, 3 Aug 2023 01: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 3731Adl2007891; Thu, 3 Aug 2023 01:10:39 GMT (envelope-from git) Date: Thu, 3 Aug 2023 01:10:39 GMT Message-Id: <202308030110.3731Adl2007891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: b84c4564effd..cf2fc1b0f5ce - vendor/openssl-3.0 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openssl-3.0 X-Git-Reftype: branch X-Git-Commit: cf2fc1b0f5ce501f5a29d307294e5637e0f5aba6 X-Git-Oldrev: b84c4564effd02dfdc047dd6cbeaf910bbb1a888 X-Git-Newrev: cf2fc1b0f5ce501f5a29d307294e5637e0f5aba6 Auto-Submitted: auto-generated The branch vendor/openssl-3.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/log/?id=b84c4564effd..cf2fc1b0f5ce cf2fc1b0f5ce openssl: Vendor import of OpenSSL-3.0.9 From nobody Thu Aug 3 02: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 4RGXfs4ks9z4dJPc for ; Thu, 3 Aug 2023 02: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 4RGXfW47C7z47B3; Thu, 3 Aug 2023 02: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=1691029315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmlxblNSzYf3e50CIHnPO/P12pFj5CDb27GHaQdRfp0=; b=IATUL5acE67vdpEExWnxQWtlolewGwDjCP9aUyORjW58YiN3iRKQuEO6RGXimMtf9JCpGO vYl5nbOdQMO0yj95TQbcygqz4XOmxvml8iyt2zkZY5Z3qQM2OtpIxbXti8z/KEoNCQ/xPJ cSt80TMzBaqY3VVrunoLGGFEOKgGFGLAbFv8P2UZ0ko8tOjllPpEvdlTYV6TSFbn/HI2Uw HRctiof71/oY5toAyHtNDHAo4eDloTh7bWHU4fIlzEEW2vPZyQol+nzgUm3p8REIwUa3WP rBinFU1RFWQveqZdrE8NxeP5nnQ5Qs2LA4JBbvtq6WVPr/+4ZcyTmVjOhIrFVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691029315; a=rsa-sha256; cv=none; b=ck+gMfEkzQgCrH0kvqgCo4irWu5P+edZ9c4Iwj94lCA6DDTTN85KbHwLGQZJhUegNmsbVv pTJl0sSXF/kzVs8dd5ZAyqSGTukNc90FSKJfbqaIvFxUmdfIJtj6Q3S1kInL6UATBaaTpW O0/322rGNkX7aSKczz3/reTBRZq7czv5znFS+NKnnyoW5m2NLFPT1WY2UvjuC6E4GbDB54 TtkcG1F4XhyK1hBGCJ3dh3W1ki8RrvbnE3BDiRJBRQ9gL3iFoFQcgZduecsoPmM3YYLgm1 GBSDtT9BLu/7nwjPO/TQkYjPi18+HXAzb0YAbY0++hnWcFvstMyF7bTBQIpu4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691029315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmlxblNSzYf3e50CIHnPO/P12pFj5CDb27GHaQdRfp0=; b=ZZhu2GXciiLWdHOU9qoDwYmGqtvIZPYtKLndeVCSkNfbyA1uCEdV/mUfe5SkV1tEKrYXVx 6WaQY42kmzDqimyU+wu4dbXLQ0m8Zi+wQzXj+RjKza48GOQAxPMJpdq0VH+RJtnuEHUamX fMr3kqqFMNpQlxbnPROJmpoeNS06S1WPacRbmgHrRByyJ8gDCAQOsyBHua+xw/arZPet/d 0Sp+cYYWOaWINmEtcgC2VXhiO172NyWt23Bk59lKqVKra1XxVR/51Zbdfv6MYwgAJklRGY f2kr0sPDK3m+FwwenvtHDSwOcV50PsFK1n2UBMuyFqH8poZvKamJoYGWnnZmmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGXfW22zVzjqH; Thu, 3 Aug 2023 02: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 3732LtCX025913; Thu, 3 Aug 2023 02: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 3732LtHm025912; Thu, 3 Aug 2023 02:21:55 GMT (envelope-from git) Date: Thu, 3 Aug 2023 02:21:55 GMT Message-Id: <202308030221.3732LtHm025912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 64e128af918f - Create tag vendor/openssl/3.0.10 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/tags/vendor/openssl/3.0.10 X-Git-Reftype: annotated tag X-Git-Commit: 64e128af918fef438715fa6b3bda38f3a86ab0f0 Auto-Submitted: auto-generated The annotated tag vendor/openssl/3.0.10 has been created by emaste: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/3.0.10 tag vendor/openssl/3.0.10 Tagger: Ed Maste TaggerDate: 2023-08-03 02:20:28 +0000 Vendor import of OpenSSL 3.0.10 commit cf2fc1b0f5ce501f5a29d307294e5637e0f5aba6 Author: Pierre Pronchery AuthorDate: 2023-08-02 16:26:43 +0000 Commit: Ed Maste CommitDate: 2023-08-03 01:09:39 +0000 openssl: Vendor import of OpenSSL-3.0.9 Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.10.tar.gz Test Plan: ``` $ git status On branch vendor/openssl-3.0 Your branch is up to date with 'origin/vendor/openssl-3.0'. nothing to commit, working tree clean $ (cd ..; fetch https://www.openssl.org/source/openssl-${OSSLVER}.tar.gz https://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.10.tar.gz 14 MB 15 MBps 01s openssl-3.0.10.tar.gz.asc 833 B 11 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.10 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/khorben/.gnupg/pubring.kbx -------------------------------- pub rsa4096 2011-03-01 [SCA] DC34EE5DB2417BCC151E5100E5F8F8212F77A498 uid [ unknown] Willem Toorop sub rsa4096 2011-03-01 [E] pub rsa4096 2014-10-04 [SC] [expires: 2024-01-30] EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5 uid [ unknown] OpenSSL security team uid [ unknown] OpenSSL OMC uid [ unknown] OpenSSL Security sub rsa4096 2014-10-04 [E] [expires: 2024-01-30] $ gpg --verify ../openssl-${OSSLVER}.tar.gz.asc ../openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Aug 1 15:47:28 2023 CEST gpg: using RSA key EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5 gpg: Good signature from "OpenSSL security team " [unknown] gpg: aka "OpenSSL OMC " [unknown] gpg: aka "OpenSSL Security " [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5 $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . [...] $ diff -arq ../openssl-${OSSLVER} . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 Your branch is up to date with 'origin/vendor/openssl-3.0'. nothing to commit, working tree clean ``` Subscribers: imp Differential Revision: https://reviews.freebsd.org/D41293 From nobody Thu Aug 3 05:09: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 4RGcN9424mz4ny94; Thu, 3 Aug 2023 05:09: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 4RGcN90scPz3tTR; Thu, 3 Aug 2023 05:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691039385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwblRsfmaLd4EQdOTy7yy5QDZ2+Pstlun1Tthgxwm78=; b=K7R+iBqgDF1QjSMGJKUsg4JvXEt2KNH460ievgYRMWxROi7LNNPRtXH4N3NRnBt7UUhN4Z D/njCVhMz29aDheBtLVSzu2q97LDWpj/g07jm7kXZNcuo2xKuJqDJY9Ny730M6aOqJLgSR AKjoZzz3Aivw+XVI3I/EU2a7+sp23pbBODWbYErpvL4Zd5Pty7Tl4TNG7QI94xMKt+tyKO 7IC326l4ErrED9jsS0H8rr1PgfPw26Y7fFj+7J9vVbJpW8raBpqI3K3rkH+phI8wGFZ1ZL +uCXhg76DKaI41S4DIDMpCCuqfup0r2i+j3dwsPr2EG4lrdv4zrhwLBTfQ7DWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691039385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwblRsfmaLd4EQdOTy7yy5QDZ2+Pstlun1Tthgxwm78=; b=hcAp57dEndhoXEU6QpYfnPeGayKBiaiRlRvnHpXR7q/GTsuHlnEInyC9py+X2AQ3VpPYNr UA+q2L/npS+ljgzQr/YLQLzIIWTkPYcMKISnCpQcF5Pz+oTWeMiGfaGJTw8qLUJkTMw/9K qQHoWw8SsDVHmku7XYfudjnoT3C+pmxLTGfX7cLyo6lL2m1Am+FrlVgMTuRl68F6bnRQOw DGYjOExPpK5gs/OAGXEo/wj0WRL5w9RKyAGl/oXgOcWjo8Q9Emu2xOA551LrLOI5S0wW5o /WGOxmmxtsSS9wHzez8zP7ZhYw5G991WmAauu3XvuYTYjdo6K6M/UsCPMuGGxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691039385; a=rsa-sha256; cv=none; b=jLNSa52738h0DKN7B961S3ppQHfuL7M5vcwrD3tPAjM6FZsPSAb1iQSZ3dgYFAaPexkgH7 CRQG8gpS0uUXLkKuhiJvK2CJGk5bnBZDBSz5c7Khgry+c3zHYuBabgnD/j95cLhmS/yeLE XLewMD3WK+SM8kVwplE3JndSsoZMm5hoXMpeNb9ceRmpAI0X1UWwk/A7TAdbujxj9j+Bdu N/h2sTUspva8PlYT0DZOnbL1YwtYOZr9/hIbSD83yrkJkXNyXdyPKCohFd8GBbJMvl7PeZ gyUekaiGpF1PySFRTb1ISy1/G/VwZ31unKEZ4gUIZaFX8/CIfY/6KUmKjbV86g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGcN8747DzGs8; Thu, 3 Aug 2023 05:09: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 37359iEm096603; Thu, 3 Aug 2023 05:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37359iCP096602; Thu, 3 Aug 2023 05:09:44 GMT (envelope-from git) Date: Thu, 3 Aug 2023 05:09:44 GMT Message-Id: <202308030509.37359iCP096602@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: c66a499e037e - main - Cleanup debugging code in libm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c66a499e037efd268a744e487e7d0c45a4944a9b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c66a499e037efd268a744e487e7d0c45a4944a9b commit c66a499e037efd268a744e487e7d0c45a4944a9b Author: Steve Kargl AuthorDate: 2023-07-31 22:32:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 04:27:58 +0000 Cleanup debugging code in libm David Das (das@) committed Bruce Evan's (bde's) WIP code for expl() and logl() in git revision 25a4d6bfda29119. That code included instrumentation that allowed bde to generate pari scripts used in testing/debugging. This patch removes that instrumentation as it is unlikely that others will ever use it. * math/libm/msun/src/math_private.h: . Remove bde's macros for the generation of pari scripts. * math/libm/msun/ld128/s_expl.c: * math/libm/msun/ld128/s_logl.c: * math/libm/msun/ld80/s_expl.c: * math/libm/msun/ld80/s_logl.c: . Remove bde's DOPRINT_START macro. . Change RETURNP to RETURNF. . Change RETURN2P to RETURNF. Adjust arguments as needed. . Change RETURNPI to RETURNI. . Change RETURN2PI to RETURNI. Adjust arguments as needed. PR: 272765 MFC after: 1 week --- lib/msun/ld128/s_expl.c | 28 +++++------ lib/msun/ld128/s_logl.c | 24 ++++----- lib/msun/ld80/s_expl.c | 28 +++++------ lib/msun/ld80/s_logl.c | 26 +++++----- lib/msun/src/math_private.h | 115 ++------------------------------------------ 5 files changed, 49 insertions(+), 172 deletions(-) diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c index 5fc43802b950..0274a8f302db 100644 --- a/lib/msun/ld128/s_expl.c +++ b/lib/msun/ld128/s_expl.c @@ -65,8 +65,6 @@ expl(long double x) int k; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -74,15 +72,15 @@ expl(long double x) if (ix >= BIAS + 13) { /* |x| >= 8192 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf or -NaN */ - RETURNP(-1 / x); - RETURNP(x + x); /* x is +Inf or +NaN */ + RETURNF(-1 / x); + RETURNF(x + x); /* x is +Inf or +NaN */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); if (x < u_threshold) - RETURNP(tiny * tiny); + RETURNF(tiny * tiny); } else if (ix < BIAS - 114) { /* |x| < 0x1p-114 */ - RETURN2P(1, x); /* 1 with inexact iff x != 0 */ + RETURNF(1 + x); /* 1 with inexact iff x != 0 */ } ENTERI(); @@ -210,8 +208,6 @@ expm1l(long double x) int k, n, n2; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -219,11 +215,11 @@ expm1l(long double x) if (ix >= BIAS + 7) { /* |x| >= 128 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf or -NaN */ - RETURNP(-1 / x - 1); - RETURNP(x + x); /* x is +Inf or +NaN */ + RETURNF(-1 / x - 1); + RETURNF(x + x); /* x is +Inf or +NaN */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); /* * expm1l() never underflows, but it must avoid * unrepresentable large negative exponents. We used a @@ -232,7 +228,7 @@ expm1l(long double x) * in the same way as large ones here. */ if (hx & 0x8000) /* x <= -128 */ - RETURN2P(tiny, -1); /* good for x < -114ln2 - eps */ + RETURNF(tiny - 1); /* good for x < -114ln2 - eps */ } ENTERI(); @@ -244,7 +240,7 @@ expm1l(long double x) if (x < T3) { if (ix < BIAS - 113) { /* |x| < 0x1p-113 */ /* x (rounded) with inexact if x != 0: */ - RETURNPI(x == 0 ? x : + RETURNI(x == 0 ? x : (0x1p200 * x + fabsl(x)) * 0x1p-200); } q = x * x2 * C3 + x2 * x2 * (C4 + x * (C5 + x * (C6 + @@ -265,9 +261,9 @@ expm1l(long double x) hx2_hi = x_hi * x_hi / 2; hx2_lo = x_lo * (x + x_hi) / 2; if (ix >= BIAS - 7) - RETURN2PI(hx2_hi + x_hi, hx2_lo + x_lo + q); + RETURNI((hx2_hi + x_hi) + (hx2_lo + x_lo + q)); else - RETURN2PI(x, hx2_lo + q + hx2_hi); + RETURNI(x + (hx2_lo + q + hx2_hi)); } /* Reduce x to (k*ln2 + endpoint[n2] + r1 + r2). */ diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c index 40a22c0f1a8c..bc538840a760 100644 --- a/lib/msun/ld128/s_logl.c +++ b/lib/msun/ld128/s_logl.c @@ -573,24 +573,23 @@ log1pl(long double x) int i, k; int16_t ax, hx; - DOPRINT_START(&x); EXTRACT_LDBL128_WORDS(hx, lx, llx, x); if (hx < 0x3fff) { /* x < 1, or x neg NaN */ ax = hx & 0x7fff; if (ax >= 0x3fff) { /* x <= -1, or x neg NaN */ if (ax == 0x3fff && (lx | llx) == 0) - RETURNP(-1 / zero); /* log1p(-1) = -Inf */ + RETURNF(-1 / zero); /* log1p(-1) = -Inf */ /* log1p(x < 1, or x NaN) = qNaN: */ - RETURNP((x - x) / (x - x)); + RETURNF((x - x) / (x - x)); } if (ax <= 0x3f8d) { /* |x| < 2**-113 */ if ((int)x == 0) - RETURNP(x); /* x with inexact if x != 0 */ + RETURNF(x); /* x with inexact if x != 0 */ } f_hi = 1; f_lo = x; } else if (hx >= 0x7fff) { /* x +Inf or non-neg NaN */ - RETURNP(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ + RETURNF(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ } else if (hx < 0x40e1) { /* 1 <= x < 2**226 */ f_hi = x; f_lo = 1; @@ -669,7 +668,7 @@ log1pl(long double x) #endif _3sumF(val_hi, val_lo, F_hi(i) + dk * ln2_hi); - RETURN2PI(val_hi, val_lo); + RETURNI(val_hi + val_lo); } #ifdef STRUCT_RETURN @@ -680,7 +679,6 @@ logl(long double x) struct ld r; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); RETURNSPI(&r); } @@ -708,15 +706,13 @@ log10l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln10_hi * hi, - invln10_lo_plus_hi * lo + invln10_lo * hi); + RETURNI(invln10_hi * hi + (invln10_lo_plus_hi * lo + invln10_lo * hi)); } long double @@ -726,15 +722,13 @@ log2l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln2_hi * hi, - invln2_lo_plus_hi * lo + invln2_lo * hi); + RETURNI(invln2_hi * hi + (invln2_lo_plus_hi * lo + invln2_lo * hi)); } #endif /* STRUCT_RETURN */ diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c index 0571377a3f8d..a41de4d6d1d8 100644 --- a/lib/msun/ld80/s_expl.c +++ b/lib/msun/ld80/s_expl.c @@ -77,8 +77,6 @@ expl(long double x) int k; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -86,15 +84,15 @@ expl(long double x) if (ix >= BIAS + 13) { /* |x| >= 8192 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf, -NaN or unsupported */ - RETURNP(-1 / x); - RETURNP(x + x); /* x is +Inf, +NaN or unsupported */ + RETURNF(-1 / x); + RETURNF(x + x); /* x is +Inf, +NaN or unsupported */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); if (x < u_threshold) - RETURNP(tiny * tiny); + RETURNF(tiny * tiny); } else if (ix < BIAS - 75) { /* |x| < 0x1p-75 (includes pseudos) */ - RETURN2P(1, x); /* 1 with inexact iff x != 0 */ + RETURNF(1 + x); /* 1 with inexact iff x != 0 */ } ENTERI(); @@ -168,8 +166,6 @@ expm1l(long double x) int k, n, n2; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -177,11 +173,11 @@ expm1l(long double x) if (ix >= BIAS + 6) { /* |x| >= 64 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf, -NaN or unsupported */ - RETURNP(-1 / x - 1); - RETURNP(x + x); /* x is +Inf, +NaN or unsupported */ + RETURNF(-1 / x - 1); + RETURNF(x + x); /* x is +Inf, +NaN or unsupported */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); /* * expm1l() never underflows, but it must avoid * unrepresentable large negative exponents. We used a @@ -190,7 +186,7 @@ expm1l(long double x) * in the same way as large ones here. */ if (hx & 0x8000) /* x <= -64 */ - RETURN2P(tiny, -1); /* good for x < -65ln2 - eps */ + RETURNF(tiny - 1); /* good for x < -65ln2 - eps */ } ENTERI(); @@ -198,7 +194,7 @@ expm1l(long double x) if (T1 < x && x < T2) { if (ix < BIAS - 74) { /* |x| < 0x1p-74 (includes pseudos) */ /* x (rounded) with inexact if x != 0: */ - RETURNPI(x == 0 ? x : + RETURNI(x == 0 ? x : (0x1p100 * x + fabsl(x)) * 0x1p-100); } @@ -219,9 +215,9 @@ expm1l(long double x) hx2_hi = x_hi * x_hi / 2; hx2_lo = x_lo * (x + x_hi) / 2; if (ix >= BIAS - 7) - RETURN2PI(hx2_hi + x_hi, hx2_lo + x_lo + q); + RETURNI((hx2_hi + x_hi) + (hx2_lo + x_lo + q)); else - RETURN2PI(x, hx2_lo + q + hx2_hi); + RETURNI(x + (hx2_lo + q + hx2_hi)); } /* Reduce x to (k*ln2 + endpoint[n2] + r1 + r2). */ diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c index dac5bfb9e25e..abe778249549 100644 --- a/lib/msun/ld80/s_logl.c +++ b/lib/msun/ld80/s_logl.c @@ -560,24 +560,23 @@ log1pl(long double x) int i, k; int16_t ax, hx; - DOPRINT_START(&x); EXTRACT_LDBL80_WORDS(hx, lx, x); if (hx < 0x3fff) { /* x < 1, or x neg NaN */ ax = hx & 0x7fff; if (ax >= 0x3fff) { /* x <= -1, or x neg NaN */ if (ax == 0x3fff && lx == 0x8000000000000000ULL) - RETURNP(-1 / zero); /* log1p(-1) = -Inf */ + RETURNF(-1 / zero); /* log1p(-1) = -Inf */ /* log1p(x < 1, or x [pseudo-]NaN) = qNaN: */ - RETURNP((x - x) / (x - x)); + RETURNF((x - x) / (x - x)); } if (ax <= 0x3fbe) { /* |x| < 2**-64 */ if ((int)x == 0) - RETURNP(x); /* x with inexact if x != 0 */ + RETURNF(x); /* x with inexact if x != 0 */ } f_hi = 1; f_lo = x; } else if (hx >= 0x7fff) { /* x +Inf or non-neg NaN */ - RETURNP(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ + RETURNF(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ /* log1p(pseudo-Inf) = qNaN */ /* log1p(pseudo-NaN) = qNaN */ /* log1p(unnormal) = qNaN */ @@ -658,7 +657,7 @@ log1pl(long double x) #endif _3sumF(val_hi, val_lo, F_hi(i) + dk * ln2_hi); - RETURN2PI(val_hi, val_lo); + RETURNI(val_hi + val_lo); } #ifdef STRUCT_RETURN @@ -669,7 +668,6 @@ logl(long double x) struct ld r; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); RETURNSPI(&r); } @@ -690,15 +688,14 @@ log10l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln10_hi * hi, - invln10_lo_plus_hi * lo + invln10_lo * hi); + RETURNI(invln10_hi * hi + + (invln10_lo_plus_hi * lo + invln10_lo * hi)); } long double @@ -708,15 +705,14 @@ log2l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln2_hi * hi, - invln2_lo_plus_hi * lo + invln2_lo * hi); + RETURNI(invln2_hi * hi + + (invln2_lo_plus_hi * lo + invln2_lo * hi)); } #endif /* STRUCT_RETURN */ diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index ec2da21f955c..a853ad4f9b4c 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -698,127 +698,22 @@ irintl(long double x) #endif #endif -/* Write a pari script to test things externally. */ -#ifdef DOPRINT -#include - -#ifndef DOPRINT_SWIZZLE -#define DOPRINT_SWIZZLE 0 -#endif - -#ifdef DOPRINT_LD80 - -#define DOPRINT_START(xp) do { \ - uint64_t __lx; \ - uint16_t __hx; \ - \ - /* Hack to give more-problematic args. */ \ - EXTRACT_LDBL80_WORDS(__hx, __lx, *xp); \ - __lx ^= DOPRINT_SWIZZLE; \ - INSERT_LDBL80_WORDS(*xp, __hx, __lx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#elif defined(DOPRINT_D64) - -#define DOPRINT_START(xp) do { \ - uint32_t __hx, __lx; \ - \ - EXTRACT_WORDS(__hx, __lx, *xp); \ - __lx ^= DOPRINT_SWIZZLE; \ - INSERT_WORDS(*xp, __hx, __lx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#elif defined(DOPRINT_F32) - -#define DOPRINT_START(xp) do { \ - uint32_t __hx; \ - \ - GET_FLOAT_WORD(__hx, *xp); \ - __hx ^= DOPRINT_SWIZZLE; \ - SET_FLOAT_WORD(*xp, __hx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#else /* !DOPRINT_LD80 && !DOPRINT_D64 (LD128 only) */ - -#ifndef DOPRINT_SWIZZLE_HIGH -#define DOPRINT_SWIZZLE_HIGH 0 -#endif - -#define DOPRINT_START(xp) do { \ - uint64_t __lx, __llx; \ - uint16_t __hx; \ - \ - EXTRACT_LDBL128_WORDS(__hx, __lx, __llx, *xp); \ - __llx ^= DOPRINT_SWIZZLE; \ - __lx ^= DOPRINT_SWIZZLE_HIGH; \ - INSERT_LDBL128_WORDS(*xp, __hx, __lx, __llx); \ - printf("x = %.36Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.36Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.36Lg; z = %.36Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#endif /* DOPRINT_LD80 */ - -#else /* !DOPRINT */ -#define DOPRINT_START(xp) -#define DOPRINT_END1(v) -#define DOPRINT_END2(hi, lo) -#endif /* DOPRINT */ - -#define RETURNP(x) do { \ - DOPRINT_END1(x); \ - RETURNF(x); \ -} while (0) -#define RETURNPI(x) do { \ - DOPRINT_END1(x); \ - RETURNI(x); \ -} while (0) -#define RETURN2P(x, y) do { \ - DOPRINT_END2((x), (y)); \ - RETURNF((x) + (y)); \ -} while (0) -#define RETURN2PI(x, y) do { \ - DOPRINT_END2((x), (y)); \ - RETURNI((x) + (y)); \ -} while (0) #ifdef STRUCT_RETURN #define RETURNSP(rp) do { \ if (!(rp)->lo_set) \ - RETURNP((rp)->hi); \ - RETURN2P((rp)->hi, (rp)->lo); \ + RETURNF((rp)->hi); \ + RETURNF((rp)->hi + (rp)->lo); \ } while (0) #define RETURNSPI(rp) do { \ if (!(rp)->lo_set) \ - RETURNPI((rp)->hi); \ - RETURN2PI((rp)->hi, (rp)->lo); \ + RETURNI((rp)->hi); \ + RETURNI((rp)->hi + (rp)->lo); \ } while (0) #endif + #define SUM2P(x, y) ({ \ const __typeof (x) __x = (x); \ const __typeof (y) __y = (y); \ - \ - DOPRINT_END2(__x, __y); \ __x + __y; \ }) From nobody Thu Aug 3 05:09: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 4RGcNB37xPz4nyYL; Thu, 3 Aug 2023 05:09: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 4RGcNB1ZJgz3tbc; Thu, 3 Aug 2023 05:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691039386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxi+nYsTsNLFomGA42iTIqppBJBeSStRfyAOn/12fcg=; b=a6L+aQfZ4EgJySnx1juYUHZWdGUfpxHjNE3fAgV1JDtPkr8Xq+FdDW91XizjBgF5+dhVWL 18juoosEJRF3xCOF2xbnoYEh4ZWjZ3VMUWvfoVslsjpd71S/NlDBjBRIp+eRNRpPBEGkNL U60RC0ShtTDfOB74vRxw7UqRqNRObHaPvd5B5Xkv5dwkhcl86zZlnolrOGCCXgbOg97pV7 UA+NFhz4nKRVgtt+qoL5MRP/rZxm2z0bdMbcrbG97HDTLaLdraJu5pA2FGR0HVOJHoEHyY PAZWyshsr7F0Vf+6sQvbJAgxKJosFQDHFnLWT9boxlA1WVJ+CV/d0K9XS2Qffw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691039386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxi+nYsTsNLFomGA42iTIqppBJBeSStRfyAOn/12fcg=; b=v8zNKHEGngNLkPfJiFoGV4q2gta7zEVR4vtUJqMXI4CbH/alqr3HAUFJMfWV20+Ubi1h8h zoKFOmLAinPl4BWC154npayz/0ve8zgHz0aHo0tFVJGk3XDOLlhlDUSOcPUxFVVwmnX9PY pFUfsJaIrBpeSsIlBot4sDmwMG6dwYBnKd7oAUMatIPA4kGKfv7YyewGu6JxUG/qSohakr xUrfWQxyhEzqv8SiBS/Vj0ceXZ7wvRVtvdYPK9tP+tdbf1RuoSDLup1gi6mrGFA2OASDoz 9sWZ8BpZsr5/W3tuvs/AJC1fRJGazh9Jw+lEuRce+3xMMz+UVLG1EdSBUiem3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691039386; a=rsa-sha256; cv=none; b=ZI/Qmp64kb1DfbZjchEywvtSCGAzfzTLDaqTfIAYwHZ9vuBn6ZAfGHVnE5fqDgv02mN7Fd 2aHGkakpDkQacQHOJG/Wmpl2J1soMzZkHk1ne4S/6ax8YjGN2Yyi90z64KeInMwxXQdYa0 dtqk0FDtkpqiqmh02s1disgPyz9/Yskam6zfTClO1Dztt+kvF/O1qVGUV8pzFGaK9WUH9B XZjYOKMtwsVVF/I53DzV1ovbke0QCL18QzCogqfl5Z0Gh0XLOOCgPIRaekDn/C0Dz5iOso p0VTm7qiSU7k7s94b+2yxIi9bNR0NiWZbnbVpO/J3bZtUHG8hPfudJaeUPBQBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGcNB0dS5zH6B; Thu, 3 Aug 2023 05:09: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 37359kIQ096622; Thu, 3 Aug 2023 05:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37359kCI096621; Thu, 3 Aug 2023 05:09:46 GMT (envelope-from git) Date: Thu, 3 Aug 2023 05:09:46 GMT Message-Id: <202308030509.37359kCI096621@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: 2d3b0a687b91 - main - Fixes for bugs in sinpi/cospi/tanpi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2d3b0a687b910c84606e4bc36176945ad5c60406 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d3b0a687b910c84606e4bc36176945ad5c60406 commit 2d3b0a687b910c84606e4bc36176945ad5c60406 Author: Steve Kargl AuthorDate: 2023-07-31 22:34:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 04:27:58 +0000 Fixes for bugs in sinpi/cospi/tanpi patch to fix half-cycle trigonometric functions Paul Zimmermann, a MPFR developer, contacted me about large errors in the half-cycle trigonometric functions. I've have investigated these issues and developed the attached patch. The float, double, and ld80 (long double) changes have been tested. Caveat emptor: The ld128 changes have not been compiled. The ld128 changes have not been tested. I do not have access to a system that uses ld128 floating point. Here is an itemized list of changes: * lib/msun/src/math_private.h: . Add fast floor macros to compute the integer part of |x| for 0 <= |x| 01xp(N-1), where N is the precision of the type of x. These macros are used in the half-cycle trigonometric functions (e.g., sinpi(x)). . The FFLOOR80 macros is used with the Intel 80-bit extended double functions. This macors corrects an off-by-one error, which led to enormous error for |x| > 0x1p32. * lib/msun/src/s_cospif.c: * lib/msun/src/s_cospi.c: * lib/msun/ld80/s_cospil.c: . Update Copyright years. . Use FFLOOR*() macro to get integer part of |x|. . Correct handle the range 0x1p(N-1) <= |x| < 0x1pN. Here, one needs to determine if the integral value of |x| is even or odd to choose +1 or -1. If |x| >= 0x1pN, always return +1. * lib/msun/src/s_sinpif.c: * lib/msun/src/s_sinpi.c: * lib/msun/ld80/s_sinpil.c: . Update Copyright years. . Use FFLOOR*() macro to get integer part of |x|. * lib/msun/src/s_tanpif.c: * lib/msun/src/s_tanpi.c: * lib/msun/ld80/s_tanpil.c: . Update Copyright years. . For +-0.5, return +-inf. Previously, tanpi[fl]() returned an NaN. . Use FFLOOR*() to get integer part of |x|. Need to determine if the integer part is even or odd. This is used to set +-0 for |x| integral and +-inf for (n+1/2). . For 0x1p(N-1) <= |x| < 0x1pN need to determine if x is an even or odd integer to select +0 or -0. For |x| >= 0x1pN, it is always an even integer, select 0. . Note, tanpi[fl](x) is an odd function, so one needs to consider tanpi[fl](-|x|) = - tanpi[fl](|x|). * lib/msun/ld128/s_cospil.c: * lib/msun/ld128/s_sinpil.c: * lib/msun/ld128/s_tanpil.c: . Update Copyright years. . These routines use an FFLOOR128 macros, which likely should be replaced by a bit twiddling algorithm. . The same considerations above are applied to 0x1p112 <= |x| < 0x1p113, and |x| >= 0x1p113 cases. . Note, even and odd determination used fmodl(x,2.), which is likely slow. PR: 272742 MFC after: 1 week --- lib/msun/ld128/s_cospil.c | 50 ++++++++++++++++++++---------------------- lib/msun/ld128/s_sinpil.c | 38 ++++++++++++-------------------- lib/msun/ld128/s_tanpil.c | 39 ++++++++++++++++----------------- lib/msun/ld80/s_cospil.c | 22 ++++++------------- lib/msun/ld80/s_sinpil.c | 16 +++----------- lib/msun/ld80/s_tanpil.c | 34 ++++++++++++----------------- lib/msun/src/math_private.h | 53 +++++++++++++++++++++++++++++++++++++++++++++ lib/msun/src/s_cospi.c | 20 +++++------------ lib/msun/src/s_cospif.c | 16 ++++++-------- lib/msun/src/s_sinpi.c | 13 ++--------- lib/msun/src/s_sinpif.c | 10 +++------ lib/msun/src/s_tanpi.c | 41 +++++++++++++++++------------------ lib/msun/src/s_tanpif.c | 24 ++++++++++---------- 13 files changed, 183 insertions(+), 193 deletions(-) diff --git a/lib/msun/ld128/s_cospil.c b/lib/msun/ld128/s_cospil.c index 71acc4485f7b..b21f879c3e84 100644 --- a/lib/msun/ld128/s_cospil.c +++ b/lib/msun/ld128/s_cospil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_cospi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -46,8 +47,7 @@ volatile static const double vzero = 0; long double cospil(long double x) { - long double ax, c, xf; - uint32_t ix; + long double ai, ar, ax, c; ax = fabsl(x); @@ -72,41 +72,37 @@ cospil(long double x) } if (ax < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); - if (ax < 0.5) { - if (ax < 0.25) - c = ax == 0 ? 1 : __kernel_cospil(ax); + if (ar < 0.5) { + if (ar < 0.25) + c = ar == 0 ? 1 : __kernel_cospil(ar); else - c = __kernel_sinpil(0.5 - ax); + c = __kernel_sinpil(0.5 - ar); } else { - if (ax < 0.75) { - if (ax == 0.5) + if (ar < 0.75) { + if (ar == 0.5) return (0); - c = -__kernel_sinpil(ax - 0.5); + c = -__kernel_sinpil(ar - 0.5); } else - c = -__kernel_cospil(1 - ax); + c = -__kernel_cospil(1 - ar); } - - if (xf > 0x1p64) - xf -= 0x1p64; - if (xf > 0x1p32) - xf -= 0x1p32; - ix = (uint32_t)xf; - return (ix & 1 ? -c : c); + return (fmodl(ai, 2.L) == 0 ? c : -c); } if (isinf(x) || isnan(x)) return (vzero / vzero); /* - * |x| >= 0x1p112 is always an even integer, so return 1. + * For |x| >= 0x1p113, it is always an even integer, so return 1. */ - return (1); + if (ax >= 0x1p113) + return (1); + /* + * For 0x1p112 <= |x| < 0x1p113 need to determine if x is an even + * or odd integer to return 1 or -1. + */ + + return (fmodl(ax, 2.L) == 0 ? 1 : -1); } diff --git a/lib/msun/ld128/s_sinpil.c b/lib/msun/ld128/s_sinpil.c index cdfa2bcac3ef..c8c205449557 100644 --- a/lib/msun/ld128/s_sinpil.c +++ b/lib/msun/ld128/s_sinpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_sinpi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -46,8 +47,7 @@ volatile static const double vzero = 0; long double sinpil(long double x) { - long double ax, hi, lo, s, xf, xhi, xlo; - uint32_t ix; + long double ai, ar, ax, hi, lo, s, xhi, xlo; ax = fabsl(x); @@ -78,35 +78,25 @@ sinpil(long double x) } if (ax < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); - if (ax == 0) { + if (ar == 0) { s = 0; } else { - if (ax < 0.5) { - if (ax <= 0.25) - s = __kernel_sinpil(ax); + if (ar < 0.5) { + if (ar <= 0.25) + s = __kernel_sinpil(ar); else - s = __kernel_cospil(0.5 - ax); + s = __kernel_cospil(0.5 - ar); } else { - if (ax < 0.75) - s = __kernel_cospil(ax - 0.5); + if (ar < 0.75) + s = __kernel_cospil(ar - 0.5); else - s = __kernel_sinpil(1 - ax); + s = __kernel_sinpil(1 - ar); } - if (xf > 0x1p64) - xf -= 0x1p64; - if (xf > 0x1p32) - xf -= 0x1p32; - ix = (uint32_t)xf; - if (ix & 1) s = -s; + s = fmodl(ai, 2.L) == 0 ? s : -s; } return (x < 0 ? -s : s); } diff --git a/lib/msun/ld128/s_tanpil.c b/lib/msun/ld128/s_tanpil.c index 90f4aea5c629..2d253bb9f478 100644 --- a/lib/msun/ld128/s_tanpil.c +++ b/lib/msun/ld128/s_tanpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_tanpi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -69,8 +70,8 @@ volatile static const double vzero = 0; long double tanpil(long double x) { - long double ax, hi, lo, xf, t; - uint32_t ix; + long double ai, ar, ax, hi, lo, t; + double odd; ax = fabsl(x); @@ -88,27 +89,22 @@ tanpil(long double x) } t = __kernel_tanpil(ax); } else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = -__kernel_tanpil(1 - ax); return (x < 0 ? -t : t); } - if (ix < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } - - if (ax < 0.5) - t = ax == 0 ? 0 : __kernel_tanpil(ax); - else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + if (ax < 0x1p112) { + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); + odd = fmodl(ai, 2.L) == 0 ? 1 : -1; + if (ar < 0.5) + t = ar == 0 ? copysign(0., odd) : __kernel_tanpil(ar); + else if (ar == 0.5) + t = odd / vzero; else - t = -__kernel_tanpil(1 - ax); + t = -__kernel_tanpil(1 - ar); return (x < 0 ? -t : t); } @@ -117,7 +113,10 @@ tanpil(long double x) return (vzero / vzero); /* - * |x| >= 0x1p112 is always an integer, so return +-0. + * For 0x1p112 <= |x| < 0x1p113 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p113, it is always an even integer, so t = 0. */ - return (copysignl(0, x)); + t = fmodl(ax,2.L) == 0 ? 0 : copysign(0., -1.); + return (copysignl(t, x)); } diff --git a/lib/msun/ld80/s_cospil.c b/lib/msun/ld80/s_cospil.c index 199479e9eaf9..69620d2f2f33 100644 --- a/lib/msun/ld80/s_cospil.c +++ b/lib/msun/ld80/s_cospil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -80,18 +80,8 @@ cospil(long double x) RETURNI(c); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); @@ -123,7 +113,9 @@ cospil(long double x) RETURNI(vzero / vzero); /* - * |x| >= 0x1p63 is always an even integer, so return 1. + * For 0x1p63 <= |x| < 0x1p64 need to determine if x is an even + * or odd integer to return t = +1 or -1. + * For |x| >= 0x1p64, it is always an even integer, so t = 1. */ - RETURNI(1); + RETURNI(ix >= 0x403f ? 1 : ((lx & 1) ? -1 : 1)); } diff --git a/lib/msun/ld80/s_sinpil.c b/lib/msun/ld80/s_sinpil.c index 4cefa92352e1..7d9008f9e18f 100644 --- a/lib/msun/ld80/s_sinpil.c +++ b/lib/msun/ld80/s_sinpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,18 +88,8 @@ sinpil(long double x) RETURNI((hx & 0x8000) ? -s : s); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); diff --git a/lib/msun/ld80/s_tanpil.c b/lib/msun/ld80/s_tanpil.c index 02451e562025..2d640413af6c 100644 --- a/lib/msun/ld80/s_tanpil.c +++ b/lib/msun/ld80/s_tanpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ volatile static const double vzero = 0; long double tanpil(long double x) { - long double ax, hi, lo, t; + long double ax, hi, lo, odd, t; uint64_t lx, m; uint32_t j0; uint16_t hx, ix; @@ -98,31 +98,22 @@ tanpil(long double x) } t = __kernel_tanpil(ax); } else if (ax == 0.5) - RETURNI((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = -__kernel_tanpil(1 - ax); RETURNI((hx & 0x8000) ? -t : t); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ + odd = (uint64_t)x & 1 ? -1 : 1; ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); if (ix < 0x3ffe) /* |x| < 0.5 */ - t = ax == 0 ? 0 : __kernel_tanpil(ax); - else if (ax == 0.5) - RETURNI((ax - ax) / (ax - ax)); + t = ix == 0 ? copysignl(0, odd) : __kernel_tanpil(ax); + else if (ax == 0.5L) + t = odd / vzero; else t = -__kernel_tanpil(1 - ax); RETURNI((hx & 0x8000) ? -t : t); @@ -133,7 +124,10 @@ tanpil(long double x) RETURNI(vzero / vzero); /* - * |x| >= 0x1p63 is always an integer, so return +-0. + * For 0x1p63 <= |x| < 0x1p64 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p64, it is always an even integer, so t = 0. */ - RETURNI(copysignl(0, x)); + t = ix >= 0x403f ? 0 : (copysignl(0, (lx & 1) ? -1 : 1)); + RETURNI((hx & 0x8000) ? -t : t); } diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index a853ad4f9b4c..63aa3f603a5e 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -688,6 +688,59 @@ irintl(long double x) } #endif +/* + * The following are fast floor macros for 0 <= |x| < 0x1p(N-1), where + * N is the precision of the type of x. These macros are used in the + * half-cycle trignometric functions (e.g., sinpi(x)). + */ +#define FFLOORF(x, j0, ix) do { \ + (j0) = (((ix) >> 23) & 0xff) - 0x7f; \ + (ix) &= ~(0x007fffff >> (j0)); \ + SET_FLOAT_WORD((x), (ix)); \ +} while (0) + +#define FFLOOR(x, j0, ix, lx) do { \ + (j0) = (((ix) >> 20) & 0x7ff) - 0x3ff; \ + if ((j0) < 20) { \ + (ix) &= ~(0x000fffff >> (j0)); \ + (lx) = 0; \ + } else { \ + (lx) &= ~((uint32_t)0xffffffff >> ((j0) - 20)); \ + } \ + INSERT_WORDS((x), (ix), (lx)); \ +} while (0) + +#define FFLOORL80(x, j0, ix, lx) do { \ + j0 = ix - 0x3fff + 1; \ + if ((j0) < 32) { \ + (lx) = ((lx) >> 32) << 32; \ + (lx) &= ~((((lx) << 32)-1) >> (j0)); \ + } else { \ + uint64_t _m; \ + _m = (uint64_t)-1 >> (j0); \ + if ((lx) & _m) (lx) &= ~_m; \ + } \ + INSERT_LDBL80_WORDS((x), (ix), (lx)); \ +} while (0) + +#define FFLOORL128(x, ai, ar) do { \ + union IEEEl2bits u; \ + uint64_t m; \ + int e; \ + u.e = (x); \ + e = u.bits.exp - 16383; \ + if (e < 48) { \ + m = ((1llu << 49) - 1) >> (e + 1); \ + u.bits.manh &= ~m; \ + u.bits.manl = 0; \ + } else { \ + m = (uint64_t)-1 >> (e - 48); \ + u.bits.manl &= ~m; \ + } \ + (ai) = u.e; \ + (ar) = (x) - (ai); \ +} while (0) + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_cospi.c b/lib/msun/src/s_cospi.c index 2e2f92733a86..f97570dc8792 100644 --- a/lib/msun/src/s_cospi.c +++ b/lib/msun/src/s_cospi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,20 +104,10 @@ cospi(double x) } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~((uint32_t)0xffffffff >> (j0 - 20)); - } - INSERT_WORDS(x, ix, lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_WORDS(ix, lx, ax); - if (ix < 0x3fe00000) { /* |x| < 0.5 */ if (ix < 0x3fd00000) /* |x| < 0.25 */ c = ix == 0 ? 1 : __kernel_cospi(ax); @@ -143,9 +133,11 @@ cospi(double x) return (vzero / vzero); /* - * |x| >= 0x1p52 is always an even integer, so return 1. + * For 0x1p52 <= |x| < 0x1p53 need to determine if x is an even + * or odd integer to return +1 or -1. + * For |x| >= 0x1p53, it is always an even integer, so return 1. */ - return (1); + return (ix < 0x43400000 ? ((lx & 1) ? -1 : 1) : 1); } #if LDBL_MANT_DIG == 53 diff --git a/lib/msun/src/s_cospif.c b/lib/msun/src/s_cospif.c index 4dd881395baf..44d19f165025 100644 --- a/lib/msun/src/s_cospif.c +++ b/lib/msun/src/s_cospif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,12 +71,8 @@ cospif(float x) return (c); } - if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ + FFLOORF(x, j0, ix); /* Integer part of ax. */ ax -= x; GET_FLOAT_WORD(ix, ax); @@ -103,7 +99,9 @@ cospif(float x) return (vzero / vzero); /* - * |x| >= 0x1p23 is always an even integer, so return 1. + * For 0x1p23 <= |x| < 0x1p24 need to determine if x is an even + * or odd integer to return +1 or -1. + * For |x| >= 0x1p24, it is always an even integer, so return 1. */ - return (1); + return (ix < 0x4b800000 ? ((ix & 1) ? -1 : 1) : 1); } diff --git a/lib/msun/src/s_sinpi.c b/lib/msun/src/s_sinpi.c index bc3759e567a3..8b388de863c3 100644 --- a/lib/msun/src/s_sinpi.c +++ b/lib/msun/src/s_sinpi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -118,16 +118,7 @@ sinpi(double x) } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~((uint32_t)0xffffffff >> (j0 - 20)); - } - INSERT_WORDS(x, ix, lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_WORDS(ix, lx, ax); diff --git a/lib/msun/src/s_sinpif.c b/lib/msun/src/s_sinpif.c index c9f76f8a2358..21082dee7d9c 100644 --- a/lib/msun/src/s_sinpif.c +++ b/lib/msun/src/s_sinpif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,12 +81,8 @@ sinpif(float x) return ((hx & 0x80000000) ? -s : s); } - if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ + FFLOORF(x, j0, ix); /* Integer part of ax. */ ax -= x; GET_FLOAT_WORD(ix, ax); diff --git a/lib/msun/src/s_tanpi.c b/lib/msun/src/s_tanpi.c index f911d56156b3..cd00adbcb86e 100644 --- a/lib/msun/src/s_tanpi.c +++ b/lib/msun/src/s_tanpi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,11 +56,15 @@ * 5. Special cases: * * tanpi(+-0) = +-0 - * tanpi(+-n) = +-0, for positive integers n. + * tanpi(n) = +0 for positive even and negative odd integer n. + * tanpi(n) = -0 for positive odd and negative even integer n. * tanpi(+-n+1/4) = +-1, for positive integers n. - * tanpi(+-n+1/2) = NaN, for positive integers n. - * tanpi(+-inf) = NaN. Raises the "invalid" floating-point exception. - * tanpi(nan) = NaN. Raises the "invalid" floating-point exception. + * tanpi(n+1/2) = +inf and raises the FE_DIVBYZERO exception for + * even integers n. + * tanpi(n+1/2) = -inf and raises the FE_DIVBYZERO exception for + * odd integers n. + * tanpi(+-inf) = NaN and raises the FE_INVALID exception. + * tanpi(nan) = NaN and raises the FE_INVALID exception. */ #include @@ -106,7 +110,7 @@ volatile static const double vzero = 0; double tanpi(double x) { - double ax, hi, lo, t; + double ax, hi, lo, odd, t; uint32_t hx, ix, j0, lx; EXTRACT_WORDS(hx, lx, x); @@ -132,30 +136,22 @@ tanpi(double x) } t = __kernel_tanpi(ax); } else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = - __kernel_tanpi(1 - ax); return ((hx & 0x80000000) ? -t : t); } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~(((uint32_t)(0xffffffff)) >> (j0 - 20)); - } - INSERT_WORDS(x,ix,lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ + odd = (uint64_t)x & 1 ? -1 : 1; ax -= x; EXTRACT_WORDS(ix, lx, ax); if (ix < 0x3fe00000) /* |x| < 0.5 */ - t = ax == 0 ? 0 : __kernel_tanpi(ax); + t = ix == 0 ? copysign(0, odd) : __kernel_tanpi(ax); else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = odd / vzero; else t = - __kernel_tanpi(1 - ax); @@ -167,9 +163,12 @@ tanpi(double x) return (vzero / vzero); /* - * |x| >= 0x1p52 is always an integer, so return +-0. + * For 0x1p52 <= |x| < 0x1p53 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p54, it is always an even integer, so t = 0. */ - return (copysign(0, x)); + t = ix >= 0x43400000 ? 0 : (copysign(0, (lx & 1) ? -1 : 1)); + return ((hx & 0x80000000) ? -t : t); } #if LDBL_MANT_DIG == 53 diff --git a/lib/msun/src/s_tanpif.c b/lib/msun/src/s_tanpif.c index 6d4b627d1cf9..12dd8f838976 100644 --- a/lib/msun/src/s_tanpif.c +++ b/lib/msun/src/s_tanpif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,7 +58,7 @@ volatile static const float vzero = 0; float tanpif(float x) { - float ax, hi, lo, t; + float ax, hi, lo, odd, t; uint32_t hx, ix, j0; GET_FLOAT_WORD(hx, x); @@ -79,25 +79,22 @@ tanpif(float x) } t = __kernel_tanpif(ax); } else if (ix == 0x3f000000) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = - __kernel_tanpif(1 - ax); return ((hx & 0x80000000) ? -t : t); } if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + FFLOORF(x, j0, ix); /* Integer part of ax. */ + odd = (uint32_t)x & 1 ? -1 : 1; ax -= x; GET_FLOAT_WORD(ix, ax); if (ix < 0x3f000000) /* |x| < 0.5 */ - t = ix == 0 ? 0 : __kernel_tanpif(ax); + t = ix == 0 ? copysignf(0, odd) : __kernel_tanpif(ax); else if (ix == 0x3f000000) - return ((ax - ax) / (ax - ax)); + t = odd / vzero; else t = - __kernel_tanpif(1 - ax); return ((hx & 0x80000000) ? -t : t); @@ -108,7 +105,10 @@ tanpif(float x) return (vzero / vzero); /* - * |x| >= 0x1p23 is always an integer, so return +-0. + * For 0x1p23 <= |x| < 0x1p24 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p24, it is always an even integer, so t = 0. */ - return (copysignf(0, x)); + t = ix >= 0x4b800000 ? 0 : (copysignf(0, (ix & 1) ? -1 : 1)); + return ((hx & 0x80000000) ? -t : t); } From nobody Thu Aug 3 05:53: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 4RGdL92LSpz4n5b8; Thu, 3 Aug 2023 05:53: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 4RGdL91TnDz4GYX; Thu, 3 Aug 2023 05:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691041985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaxKydkxFpJ93P7mgJsYp34BV1GdY+l6YqoazrQjMd4=; b=dHy08n4qCRKERoLSA+a0z+frgv/5JSsHWMf18T7kdkef6HO/KEOdEij8UPcHyyKxpXFVLD i37POq/F+wg40QQT8psY2LbaqXTV6EBe446tAwZx/TmBc0WV2z14ZNwrVZ9llgnURU2hN1 asD1X3Vlt4hbmuele601i7Hk8HxUhwJtUcMdJnLjJhRImBX43hWXXYej1J2mQO4HvAtxhU 610I5M/ANL01KXIRAbUzEzBNywuvyJe6TilKZ3aUaPVVUr0vYrF1fCmTJGTjqLl/AKKw3U Cnbt+NXW7O44pCWP7yW3mqv8H2acA6pi50tA/fguVYkk84UPVkH3mstJsVc1nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691041985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaxKydkxFpJ93P7mgJsYp34BV1GdY+l6YqoazrQjMd4=; b=xUN/x7SM8WmuGv2frgzIA+UYioosWzqgdE+WdzHLkkk9iZ70k9lGisSvwGlmPQsAFBLJ9Z KcoTuDnZ2A3GNgq6EF8EoYAVgzkMZCbTL6Pdu6kklZUiVy64vlINVPHsITg1F5iC4mKrMA ZbiDYHAIfeHe3wsVJjBGS+xIgr1iZ84qcs0ItGBaRPdZgksLs7ZW1gU9HVqeaVZaDk0CCs x1X07/q8NAgWcJ+a99vYi1BG1jVM90tXMb8vLNUpz1yqFxg4SH5ECyP4xQ/M+m+vLCL20b ZEcCwIPx5XhsFizWjWNthlh3WiTde+9lZ+7CcvlhckfC7J73Bg1yfZjLRKQSIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691041985; a=rsa-sha256; cv=none; b=hsHDLa+GmozjvRwGxbSyjkMk0in0HuwSDNW6YdaJORq8DE/MuyCrRAonyiIA1OhngGi9Rr QwfdCPZusTcDkxEycKYtHNTTJkiX28RyVRRl8nzy/EBYlSPke95Z/AdrG9tCSyg/m7m19r vTOGyrpNuZoIjEqzPycPuEPUrfx4F+2YIb9faIUTEZPwftmrFagSgf3VG44ZHMJCMTMRsp Om/r5VJmU16oy1MO7nEvIKqnbG5b2yTJBdRCBawf+y4p+LW+fum+BNMh/JrdD8NGCIeXeT ioqLHFQ43E1592iLEJsa9fymqK8JAs6bKfXnswSDYbxhQdYt/hmBskx08vcvoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGdL90bfczJ3m; Thu, 3 Aug 2023 05:53: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 3735r4FY077409; Thu, 3 Aug 2023 05:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3735r44L077408; Thu, 3 Aug 2023 05:53:04 GMT (envelope-from git) Date: Thu, 3 Aug 2023 05:53:04 GMT Message-Id: <202308030553.3735r44L077408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 2ddf24f8f525 - main - e1000: Automask TSO on lem(4)/em(4) 10/100 Ethernet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 2ddf24f8f52559b08da700ab044c33d0a9ed5601 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2ddf24f8f52559b08da700ab044c33d0a9ed5601 commit 2ddf24f8f52559b08da700ab044c33d0a9ed5601 Author: Kevin Bowling AuthorDate: 2023-08-03 05:47:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 05:52:55 +0000 e1000: Automask TSO on lem(4)/em(4) 10/100 Ethernet This feature masks TSO capability when a link comes up at 10 or 100mbit due to errata on the chips. This behavior matches previous versions of FreeBSD as well as NetBSD and Linux. A tunable, hw.em.unsupported_tso may be set if the admin desires to disabling automasking and configure TSO settings manually. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41170 --- sys/dev/e1000/if_em.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- sys/dev/e1000/if_em.h | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 40579b0a5a55..1da0579cdce9 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -330,6 +330,7 @@ static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int em_get_rs(SYSCTL_HANDLER_ARGS); static void em_print_debug_info(struct e1000_softc *); static int em_is_valid_ether_addr(u8 *); +static bool em_automask_tso(if_ctx_t); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); static void em_add_int_delay_sysctl(struct e1000_softc *, const char *, const char *, struct em_int_delay_info *, int, int); @@ -533,6 +534,10 @@ static int em_smart_pwr_down = false; SYSCTL_INT(_hw_em, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &em_smart_pwr_down, 0, "Set to true to leave smart power down enabled on newer adapters"); +static bool em_unsupported_tso = false; +SYSCTL_BOOL(_hw_em, OID_AUTO, unsupported_tso, CTLFLAG_RDTUN, + &em_unsupported_tso, 0, "Allow unsupported em(4) TSO configurations"); + /* Controls whether promiscuous also shows bad packets */ static int em_debug_sbp = false; SYSCTL_INT(_hw_em, OID_AUTO, sbp, CTLFLAG_RDTUN, &em_debug_sbp, 0, @@ -937,6 +942,8 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; + if (em_unsupported_tso) + scctx->isc_capabilities |= IFCAP_TSO6; /* * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} * by default as we don't have workarounds for all associated @@ -1079,6 +1086,9 @@ em_if_attach_pre(if_ctx_t ctx) goto err_late; } + /* Clear the IFCAP_TSO auto mask */ + sc->tso_automasked = 0; + /* Check SOL/IDER usage */ if (e1000_check_reset_block(hw)) device_printf(dev, "PHY reset is blocked" @@ -1817,6 +1827,7 @@ em_if_update_admin_status(if_ctx_t ctx) struct e1000_hw *hw = &sc->hw; device_t dev = iflib_get_dev(ctx); u32 link_check, thstat, ctrl; + bool automasked = false; link_check = thstat = ctrl = 0; /* Get the cached link value or read phy for real */ @@ -1894,8 +1905,14 @@ em_if_update_admin_status(if_ctx_t ctx) sc->flags |= IGB_MEDIA_RESET; em_reset(ctx); } - iflib_link_state_change(ctx, LINK_STATE_UP, - IF_Mbps(sc->link_speed)); + /* Only do TSO on gigabit Ethernet for older chips due to errata */ + if (hw->mac.type < igb_mac_min) + automasked = em_automask_tso(ctx); + + /* Automasking resets the interface, so don't mark it up yet */ + if (!automasked) + iflib_link_state_change(ctx, LINK_STATE_UP, + IF_Mbps(sc->link_speed)); } else if (!link_check && (sc->link_active == 1)) { sc->link_speed = 0; sc->link_duplex = 0; @@ -3876,6 +3893,35 @@ em_is_valid_ether_addr(u8 *addr) return (true); } +static bool +em_automask_tso(if_ctx_t ctx) +{ + struct e1000_softc *sc = iflib_get_softc(ctx); + if_softc_ctx_t scctx = iflib_get_softc_ctx(ctx); + if_t ifp = iflib_get_ifp(ctx); + + if (!em_unsupported_tso && sc->link_speed && + sc->link_speed != SPEED_1000 && scctx->isc_capenable & IFCAP_TSO) { + device_printf(sc->dev, "Disabling TSO for 10/100 Ethernet.\n"); + sc->tso_automasked = scctx->isc_capenable & IFCAP_TSO; + scctx->isc_capenable &= ~IFCAP_TSO; + if_setcapenablebit(ifp, 0, IFCAP_TSO); + /* iflib_init_locked handles ifnet hwassistbits */ + iflib_request_reset(ctx); + return true; + } else if (sc->link_speed == SPEED_1000 && sc->tso_automasked) { + device_printf(sc->dev, "Re-enabling TSO for GbE.\n"); + scctx->isc_capenable |= sc->tso_automasked; + if_setcapenablebit(ifp, sc->tso_automasked, 0); + sc->tso_automasked = 0; + /* iflib_init_locked handles ifnet hwassistbits */ + iflib_request_reset(ctx); + return true; + } + + return false; +} + /* ** Parse the interface capabilities with regard ** to both system management and wake-on-lan for diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 8c5abf5b48cb..d3c3bc0da097 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -509,6 +509,7 @@ struct e1000_softc { u32 smartspeed; u32 dmac; int link_mask; + int tso_automasked; u64 que_mask; From nobody Thu Aug 3 06:01: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 4RGdWm5NTmz4nG2b; Thu, 3 Aug 2023 06:01: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 4RGdWm4WrGz4Ktc; Thu, 3 Aug 2023 06:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691042484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jF1hq0+CrqtwXw7Iyl1Ue3shpTr/Knfxr1M4dRvimto=; b=QZBwBvQzRxIixz9OLg29xZaURk7aLA8n/rqbzo10jxZQc8RTrUbX79w+wDcmjAtLHSxvna jGBQp50tA6bV+klT0kQvPODh+tQBJIaVokveQuli7MXXoAWbeSggx1djNTHsB92hDxs2KP X2GNvyIM/o6dvL+RdD2EwjRNqYqsBIlFIKKZZ6W4wm2dVtD8VJuLihdSOq8pezo34p8YFl Q1vtGzJ8ufXIx7+dhj96n08NZJ17Bpsh0tQOXVkJ9FOvCo1G4Oj/eKQsIR+kQc49u0bXuN fxhMjxoxuQpVT8RBzJt/5HiXHYA/nK0KQRp7Rr0D3t0E0M6FfSDdbEjO33n8uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691042484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jF1hq0+CrqtwXw7Iyl1Ue3shpTr/Knfxr1M4dRvimto=; b=XuD8MldGOI1rkdgy7BNTx63eGEi3Tu82SAy8U6nmdmJ/MwXOHedOde0dEAQUOJ1JLuT1tT JZLbHCtgrGV+5HT447jx6eywtIc75kNumvS9A66XY3rfjOZe82mPnkXCm/yuJaXRZ0kfAs EjD62gvSYnRHYGgegtGQuN2cK63aoOju2P8PO1+FUePWQ4rqRZsrrlKT76G+uAOTPXAtTz S/N7dQVE1Jbg2ZuSsi7jJ12OItQP07+kyX3sKwYUFiLk0RlyWerdBtaLRAQYB5g/fHAU7T 2rUL1m4yXqbEFHTjVCXN5IkJA6z3s0x32MsDmBVEIWtWQhXUbDF0eEXkP+BDuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691042484; a=rsa-sha256; cv=none; b=fQeZ2NrrGuop3KwbMoaavA3HT77hUsJFIswJmQO8w8PHpLRk6Ifg3J55oD5k6T7R87jrul 6m9v42bV0fH+isnnSPU4PXF0IK7H6dq/BNeaZ5SGThs3qdsqcoixApCaBotEwJq1gSx4Km J9d3IpFjneD4wRLO8iyJBehTh4DlIAeQgBaxG09ZE+wBVU/mVVVLqhPz16UDIwlNU8ArE8 wyi6GmoRvg3VWVzYUEYSr1jTW9vVfUZMWbhwwXd4+eFLxSqt/LM2MzDnDhdc2p+y0Jnf/O qKFd1pTvsf8qMkKRzP3eoSxQyhVWERbJY5+ekocgjsR3rC1Q7jaCKsm6thfDWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGdWm3db7zJfn; Thu, 3 Aug 2023 06:01: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 37361OHa093234; Thu, 3 Aug 2023 06:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37361Op9093233; Thu, 3 Aug 2023 06:01:24 GMT (envelope-from git) Date: Thu, 3 Aug 2023 06:01:24 GMT Message-Id: <202308030601.37361Op9093233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: a93409fc3cd7 - main - ixgbe: Warn once for unsupported SFPs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: a93409fc3cd7b4d4aeb35d7ef27f84c1ae13a42d Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a93409fc3cd7b4d4aeb35d7ef27f84c1ae13a42d commit a93409fc3cd7b4d4aeb35d7ef27f84c1ae13a42d Author: Kevin Bowling AuthorDate: 2023-08-03 05:59:37 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 06:00:58 +0000 ixgbe: Warn once for unsupported SFPs The driver belabors the point about unsupported SFPs, printing multiple times on link up. Limit it to once. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39785 --- sys/dev/ixgbe/ixgbe_phy.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index eef1d40448d3..1ab4f057f810 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1302,6 +1302,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) u8 cable_tech = 0; u8 cable_spec = 0; u16 enforce_sfp = 0; + static bool warned_once = false; DEBUGFUNC("ixgbe_identify_sfp_module_generic"); @@ -1536,13 +1537,16 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) status = IXGBE_SUCCESS; } else { if (hw->allow_unsupported_sfp == true) { - EWARN(hw, - "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " - "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " - "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + if (!warned_once) + EWARN(hw, + "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " + "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " + "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + warned_once = true; status = IXGBE_SUCCESS; } else { - DEBUGOUT("SFP+ module not supported\n"); + DEBUGOUT + ("SFP+ module not supported\n"); hw->phy.type = ixgbe_phy_sfp_unsupported; status = IXGBE_ERR_SFP_NOT_SUPPORTED; @@ -1647,6 +1651,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) u8 cable_length = 0; u8 device_tech = 0; bool active_cable = false; + static bool warned_once = false; DEBUGFUNC("ixgbe_identify_qsfp_module_generic"); @@ -1792,10 +1797,12 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) status = IXGBE_SUCCESS; } else { if (hw->allow_unsupported_sfp == true) { - EWARN(hw, - "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " - "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " - "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + if (!warned_once) + EWARN(hw, + "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " + "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " + "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + warned_once = true; status = IXGBE_SUCCESS; } else { DEBUGOUT("QSFP module not supported\n"); From nobody Thu Aug 3 07:43: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 4RGgnJ5wQMz4mNLn for ; Thu, 3 Aug 2023 07:43: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 4RGgnJ4Hzgz3J8r; Thu, 3 Aug 2023 07:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9LorPNhNn/Nx5QAfWFLfCqLKL+SRq6wEzFk8FPl9w0=; b=Y11fKLs4kZHqwPrrggGCPfig4/ny60r8rpSu6m7dHqDQQtGldyKBD1TEWwwCuQuCkMJwNu /SuCyjFT3gVLrWtwdM0gXSTVEr55QTxIxIMiDuZ1wxLVpNx/kXNqZ/vDcwTJlmKhnhzy5w ZjzlFNRDuPhgXuIypAhsGXOps4UJkC7VzjSz3J4sF6CcBDSMrFFxwQHAYxZquTBLnfofq6 GAEcv0PQCgs+2s4EPjvuqAXiRs8assJ4pnDGKFSuuwPFZ1dNwnnkgnbuIsOPFvPl25CP+L qW3Zg3s6Lg0JPwkpb56j5KYRXuJioEQkj+7mxdl40fO2hxY0OyWHKdrQOmnnCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691048596; a=rsa-sha256; cv=none; b=c3TJ4yxkWOloBtl62/xCz/8nM5qtzcxRBPMENS5Ka4pz9b95P0yjMGQw/gk9n3fPFfn//N Xoa8qdu2eHG0SLKQ0sAKejVB+n0XCsjiIKC3mS7BaoYu0ZrHfqM6OlK8OQSikbXfrejBRy JCz1C1KVBSQiQqOtwQw+2K/yEjRBlevRQ0kOqSZaUjlgHjSDHK5CUwH3XnUUii5QxlvUbr vBlnseQOOUxCc+ZdRNgy7FthHEcoc+XwrGxAyhXpcUSlqo2pfF6Q80AFy7nWlK9U2yMR+Z a0xOgRvykLnyqEcGBxqtAaI9+nUTgGrOJVqt25yvq7+ZDhCVi7mnY0lmJShrXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9LorPNhNn/Nx5QAfWFLfCqLKL+SRq6wEzFk8FPl9w0=; b=I047g5w/kLFNavV/NNPP7KG0zuAJ27A6Le0LG1/24KEEudiQ4hh2rkUHM5iJ6J35TA4/J0 uXKl91Mj+pvITd5xLZGraoD1YxDTJN8OBhu3dhyK2xJIp6sm6yHpvwlpwb+jJrGPRbxX59 NLylgQj/fSN2v5Xa1CR2QjTl+Xv5hJ1cWLDoSArHtTIUm9c91QS+40/OPGuLlE5yxpFiQx W28VkZw20PD1gCOBfNRqPUqH2cqOcAUDKmMaDAZRP/rKi+AFGm9aGu6Ht3t+j7fcNnAqaV DxE+W/6r3hJfIi+Dfl+Fxboi7AjobPwwE1i6Bt/zIKcYVEPIUsPpVAGCFjMQ8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGgnJ340RzWyF; Thu, 3 Aug 2023 07:43: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 3737hGX0060833; Thu, 3 Aug 2023 07:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3737hGP9060832; Thu, 3 Aug 2023 07:43:16 GMT (envelope-from git) Date: Thu, 3 Aug 2023 07:43:16 GMT Message-Id: <202308030743.3737hGP9060832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: cc99946e6114 - Create tag vendor/xz/5.4.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/xz/5.4.4 X-Git-Reftype: annotated tag X-Git-Commit: cc99946e61143ae4b6f1ea53ea77db17f17ac7df Auto-Submitted: auto-generated The annotated tag vendor/xz/5.4.4 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/xz/5.4.4 tag vendor/xz/5.4.4 Tagger: Xin LI TaggerDate: 2023-08-03 07:42:52 +0000 Tag xz 5.4.4. commit 42df52d1569483d9669f39caca7d0d875992c7d9 Author: Xin LI AuthorDate: 2023-08-03 07:42:42 +0000 Commit: Xin LI CommitDate: 2023-08-03 07:42:42 +0000 Vendor import of xz 5.4.4 (trimmed) From nobody Thu Aug 3 07:43: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 4RGgnJ5zL4z4mNLp for ; Thu, 3 Aug 2023 07:43: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 4RGgnJ3qVTz3JCD; Thu, 3 Aug 2023 07:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6o/0O51MzFiJcWxH7GUmqE2RvB3aUNiC7pLaYXEnzPM=; b=JmOFM81BXO/xjoKFq0ElZJvXsZOH49gG1LEv9/qLakNEVwRM4N7FmbPs+v8tWe3+KQ4UkM E/VjuS++8ivnvoklcHm+iR5e24NRL3aCqMU6XY4zZ55uf05kbVEUx+B8n9IESKBKCx3045 0JV90NbFlSpXqIMMyLtPo9yezWwPj/aSu9cd0oPhg1XuwEQvDIUrxWtoXxUnmdsmHE/qjP 2m+CdS8qae0kTOWHneFfHkHg4mPvu1EBWjQpBgT/uKaMsHOyCKAdhkoUkA0HJEHrxqnxOp LrTJA5zh1EMCsVVAUnfjMn8VXyhxi5PiAWx5XQQmNm1cC1lFrsa+/UVEwyaciA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691048596; a=rsa-sha256; cv=none; b=Ndrzih7zCoEs2gRmByUphtRJCWEpz7k9e716TIWcGzzneYfDTTTH+JX0L7cXWbYwhR993Q MZTs0guyF6/LnB/adJ+4LvXaUF8L7Oy8JYl9mpF62BmXpBS94NU7cfg4l1XTWnavokSMKA O4hTmNxDNLnIGa7+gYxTWAGMbydXfo9VXqPvFMGQqMV5eUVeZeL/3og03N7PdGuyCfSGlR y/m3mW1SD9AUg0XU0V0XrXH2qy3+cNbEWkMf7BfggXO4eFPKaby2PTQUnDZtb44veeDneW oWSxSjg0IIqQHWFjh2d4rXwbH6Ame0MDOhceDGKP3cgARd7w9QmBzmJYfQfXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6o/0O51MzFiJcWxH7GUmqE2RvB3aUNiC7pLaYXEnzPM=; b=yZF0kYrFxnbIyx97NoOf8ny13K8vJrm8Lz4ROto6SiW+aVzn86pPzSYDAQASR5Uc7zJv67 xJFwDSqYJLttbFasDgTNhlrPDLJ2kDiHp4CHAaRQ6VnoP0mTNax1p/3eizg2lbThVuf1g2 SrutqKTdQGGY4zXvWZ2ADTYNQXrVZ92RcLcn942wVBo+h+gIkqLzw73YFtteCT9V/ZM45a wtQhpKHgrMCEryv7Uk+QzQX3pGEP+vYtlI1clCk5GNOnXQrW1Dg0bOvbbiL+GwvrM4zzRv tMbg58dw5jlptGF8AjqLXTEzzrxWNaH+Ksk9oVsGF+waGwffzFJ003b6lldN/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 4RGgnJ2blLzWWr; Thu, 3 Aug 2023 07:43: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 3737hGmw060814; Thu, 3 Aug 2023 07:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3737hG57060813; Thu, 3 Aug 2023 07:43:16 GMT (envelope-from git) Date: Thu, 3 Aug 2023 07:43:16 GMT Message-Id: <202308030743.3737hG57060813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: ca6c9caa17b3..42df52d15694 - vendor/xz - 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/xz X-Git-Reftype: branch X-Git-Commit: 42df52d1569483d9669f39caca7d0d875992c7d9 X-Git-Oldrev: ca6c9caa17b31bc7ee00b78c93df425131320fd1 X-Git-Newrev: 42df52d1569483d9669f39caca7d0d875992c7d9 Auto-Submitted: auto-generated The branch vendor/xz has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=ca6c9caa17b3..42df52d15694 42df52d15694 Vendor import of xz 5.4.4 (trimmed) From nobody Thu Aug 3 07:52:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RGh0W0spWz4mPDn; Thu, 3 Aug 2023 07:52: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 4RGh0V6jD3z3KlJ; Thu, 3 Aug 2023 07:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691049178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEgOg8/YRBa8rMhUcklCjHZ3m1EQkpQa6KqUyjO1PNc=; b=paR3/JBSzD4gXt8gNGQG1YDEY20G3uklOQjxW9cg0nk4aIr+hYBxhzcCGujHSkhZHAeGp+ H8Fj2de6XAX5ICbKqj3ur71O6KA0vdWCPJ3dvIAy2RQUuR5n/Zk8tI725+0dtVSfJyExFn kvKvkgm7On8drSrPz8dzCdpsxaG9uaBAGa6vRuDzhdAEGXomtv/PGvynRSUDbEA86Vq4FL 68Med9/iW5HzD2gagSH+wQWaII4/jU/PbPsZGxW2QB82vbGfvEEoJCN8jxne1ZqCECvfi1 +10VQlu47tzykx6c3LC8D2Tuk7IAzJKiGrQ6iFFSzJplNlEnNjUM24A7v16SWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691049178; a=rsa-sha256; cv=none; b=DwisbjeTO4wMJM4u3TQjCj4wOAZ8Go58KINIfyjQsuZseNMnDxiEJSNnkkpPHGA9NV0dDZ zB+wc1lWEMnooWxqQkVV1JuXRFZaQ56JiZB1cx62OJ8hBCi8SqTKvozm+t8Dn0oXpeUl4w v9jK38+Ids4cIjd4YQVe29ozFnZwj9dEwBI6hjWZD7DcUJw8cpY7Z12S5EFeB5lX6uv49y 5UgjQdbFBmACx5dC4fWd7a85UKgtgk9TjwHDkEdhXMp5Fuwd8NMd/3A1Kxi0Hk8VsxFQ/l aLibuV+tlLI2vgc376jiTkzxOqILn+oD3lRkdcQj+6qAqmogaTpPv/WLryhMUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691049178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEgOg8/YRBa8rMhUcklCjHZ3m1EQkpQa6KqUyjO1PNc=; b=Z/0YYqGf6jDyUMguqLVFvWxfhjqGPWin6GChc+fHA0qYl3AaIShv9cxWhQ/2cGj5Ae1c2M UB/dUbKxCcQ+YQXv03bj1+Cid7rSRhogPB98f8zzwXymgJEPt4M3ItnZsnfWE10LPOXrL0 Xz5pqNvq76Zwa1v9YEFxh+h6ZHtbosMF9PCo56XUZJMPYp8Hvx3YkeGS13jvT9osipyKDA DZq1sf4uEL3VWqjoEycIm+BbT8UrA8VGjb1ccgU1cTrC7Qsq141ONunobmOB/SFUCIXcEh LeiKJGY0uxTUXRcnFJsRp/2PzUNjrRzMpiTlntZnfsKhTNhNX4p5KK3CWsozJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGh0V5nzszX9s; Thu, 3 Aug 2023 07:52: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 3737qweF078120; Thu, 3 Aug 2023 07:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3737qup4078110; Thu, 3 Aug 2023 07:52:56 GMT (envelope-from git) Date: Thu, 3 Aug 2023 07:52:56 GMT Message-Id: <202308030752.3737qup4078110@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: 1f3ced26d494 - main - MFV: xz 5.4.4. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f3ced26d4946ff2e24472432a275efb9ba1f2ca Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=1f3ced26d4946ff2e24472432a275efb9ba1f2ca commit 1f3ced26d4946ff2e24472432a275efb9ba1f2ca Merge: a93409fc3cd7 42df52d15694 Author: Xin LI AuthorDate: 2023-08-03 07:52:36 +0000 Commit: Xin LI CommitDate: 2023-08-03 07:52:36 +0000 MFV: xz 5.4.4. MFC-after: 2 weeks contrib/xz/ChangeLog | 704 +++++++++++++++++++++ contrib/xz/README | 4 + contrib/xz/THANKS | 3 + contrib/xz/src/common/mythread.h | 2 +- contrib/xz/src/liblzma/api/lzma/container.h | 9 +- contrib/xz/src/liblzma/api/lzma/filter.h | 4 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 4 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- .../xz/src/liblzma/common/block_buffer_encoder.c | 2 +- contrib/xz/src/liblzma/common/common.h | 2 +- contrib/xz/src/liblzma/common/file_info.c | 2 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 2 +- contrib/xz/src/liblzma/common/memcmplen.h | 10 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 8 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 2 +- contrib/xz/src/liblzma/common/string_conversion.c | 10 +- contrib/xz/src/liblzma/lz/lz_encoder.h | 2 +- contrib/xz/src/liblzma/lzma/lzma_encoder.c | 4 +- contrib/xz/src/xz/args.c | 5 +- contrib/xz/src/xz/coder.c | 8 +- contrib/xz/src/xz/file_io.c | 8 +- contrib/xz/src/xz/hardware.c | 4 +- contrib/xz/src/xz/list.c | 11 +- contrib/xz/src/xz/message.c | 2 +- contrib/xz/src/xz/xz.1 | 9 +- lib/liblzma/config.h | 6 +- 26 files changed, 774 insertions(+), 55 deletions(-) diff --cc lib/liblzma/config.h index e0ff56d43a56,000000000000..c3fa947ec5fb mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,618 -1,0 +1,618 @@@ +/* 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 */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if Capsicum is available. */ +#define HAVE_CAPSICUM 1 +#endif + +/* Define to 1 if the system has the type `CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + +/* Define to 1 if you have the `CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* 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 */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if `CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the `futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* 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 if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + +/* Define to 1 if you have the `pledge' function. */ +/* #undef HAVE_PLEDGE */ + +/* Define to 1 if you have the `posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + +/* Define to 1 if `program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + +/* Define to 1 if you have the `pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the `SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + +/* Define to 1 if the system has the type `SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SHA256_H 1 + +/* Define to 1 if you have the `SHA256_Init' function. */ +#define HAVE_SHA256_INIT 1 + +/* Define to 1 if the system has the type `SHA2_CTX'. */ +/* #undef HAVE_SHA2_CTX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHA2_H */ + +/* Define to 1 if optimizing for size. */ +/* #undef HAVE_SMALL */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_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 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 `st_atimensec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ + +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + +/* Define to 1 if `st_uatime' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_UATIME */ + +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for + symbol versioning. Define to 2 to if these are wanted only if also PIC is + defined (allows building both shared and static liblzma at the same time + with Libtool if neither --with-pic nor --without-pic is used). This define + must be used together with liblzma_linux.map. */ +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BYTEORDER_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CAPSICUM_H 1 +#endif + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* 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. */ +#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 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 _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See + configure.ac for details. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_USABLE_CLMUL 1 +#endif + +/* Define to 1 if you have the `utime' function. */ +/* #undef HAVE_UTIME */ + +/* Define to 1 if you have the `utimes' function. */ +/* #undef HAVE_UTIMES */ + +/* 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 + +/* Define to 1 if you have the `wcwidth' function. */ +#define HAVE_WCWIDTH 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the `_futime' function. */ +/* #undef HAVE__FUTIME */ + +/* Define to 1 if _mm_movemask_epi8 is available. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE__MM_MOVEMASK_EPI8 1 +#endif + +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. + */ +#define HAVE___BUILTIN_ASSUME_ALIGNED 1 + +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported. + */ +#define HAVE___BUILTIN_BSWAPXX 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 when using POSIX threads (pthreads). */ +#define MYTHREAD_POSIX 1 + +/* Define to 1 when using Windows Vista compatible threads. This uses features + that are not available on Windows XP. */ +/* #undef MYTHREAD_VISTA */ + +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This + avoids use of features that were added in Windows Vista. */ +/* #undef MYTHREAD_WIN95 */ + +/* Define to 1 to disable debugging code. */ +#define NDEBUG 1 + +/* Name of package */ +#define PACKAGE "xz" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "xz@tukaani.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "XZ Utils" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "XZ Utils 5.4.3" ++#define PACKAGE_STRING "XZ Utils 5.4.4" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xz" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://tukaani.org/xz/" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.4.3" ++#define PACKAGE_VERSION "5.4.4" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the number of available CPU cores can be detected with + cpuset(2). */ +#define TUKLIB_CPUCORES_CPUSET 1 + +/* Define to 1 if the number of available CPU cores can be detected with + pstat_getdynamic(). */ +/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ + +/* Define to 1 if the number of available CPU cores can be detected with + sched_getaffinity() */ +/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ +/* #undef TUKLIB_CPUCORES_SYSCONF */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysctl(). */ +/* #undef TUKLIB_CPUCORES_SYSCTL */ + +/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit, + and 64-bit integers. */ +/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ +/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ + +/* Define to 1 if the amount of physical memory can be detected with + _system_configuration.physmem. */ +/* #undef TUKLIB_PHYSMEM_AIX */ + +/* Define to 1 if the amount of physical memory can be detected with + getinvent_r(). */ +/* #undef TUKLIB_PHYSMEM_GETINVENT_R */ + +/* Define to 1 if the amount of physical memory can be detected with + getsysinfo(). */ +/* #undef TUKLIB_PHYSMEM_GETSYSINFO */ + +/* Define to 1 if the amount of physical memory can be detected with + pstat_getstatic(). */ +/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ + +/* Define to 1 if the amount of physical memory can be detected with + sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ +#define TUKLIB_PHYSMEM_SYSCONF 1 + +/* Define to 1 if the amount of physical memory can be detected with sysctl(). + */ +/* #undef TUKLIB_PHYSMEM_SYSCTL */ + +/* Define to 1 if the amount of physical memory can be detected with Linux + sysinfo(). */ +/* #undef TUKLIB_PHYSMEM_SYSINFO */ + +/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x = + 123; which violates strict aliasing rules and thus is undefined behavior + and might result in broken code. */ +/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.4.3" ++#define VERSION "5.4.4" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__FreeBSD__) +#include +#if defined(__NO_STRICT_ALIGNMENT) +#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#endif +#include +#if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ From nobody Thu Aug 3 11:14: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 4RGmSV5PFMzZZSj; Thu, 3 Aug 2023 11:14: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 4RGmSV3Nxtz3Slr; Thu, 3 Aug 2023 11:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691061242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isJSpmSgrG+5PQH3D3aSNREt3gAZOeOf6KUcJezQ978=; b=XjLbqn8MaQ1n71ENKxVNRBcdwTDnI2jhn++9xV+DL5pfLNlBjRQdCRc3pvlA6YGHnwFwJ0 Rw0424/hgjQtRUTiQ4WXpeI4NDFzy4OwOfwQCwqn4UC5WATA2dl8XPSm1T+Ght+Kfra5+q 3bdIECphskocIbXqUDyFLuigSnq5tcK+qxZ+AE0T4A3/C3iD0+26ZBcBS0WY11YKzwCyu+ w3sh6GYUFFlgHhk+pN7MgAo8HP6vPlcITmJrvlWwUGdhzaDELR73hRGH2WT7H9LZ8OcS0Z +bf0K3zS6MtJXY2rjlPY1epTibmsB1QSwbBgK/OP31kNdwE31YPq0un1aH5viA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691061242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isJSpmSgrG+5PQH3D3aSNREt3gAZOeOf6KUcJezQ978=; b=kecEOtBiLfZAuP06MlhkK/a47zH/B+MFj3jGm156wZbldOBhuSLlzzGDfKO7YGwVX4TU7u IJqGdHljSN02545Bdv5NtdjVbUHwbUgwjfxuWhwu9JY/3YWqybCbBm0eXjJebMdVn7JEDy XVGt/UuPDKiO2BgSuVvLPWPgunyFs05Mu37kmLX13YtudzwfPUyxnr2hjY6mmn17ZAGNui Fm8twTE7ZI60lEyXwDYt0n4MUUJG52z4l74dBLfqezBwk8AfK7yR7Vqxqz03WpVJmSBfJJ q17HS5p6/bGTc0oS5rqIytlSfBHamIft3xv5svO4D9H4RgsfJ5+pDGORkr+U9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691061242; a=rsa-sha256; cv=none; b=H5wJJPBjJ7ICtVb0C+E3pwEf/JdqsnDtw+LgGAnfbZJXiMiF0UiIzOlpfzhHxkxRZBifvn dLO573abpADN87k5YrxRmpAJ27dS33YxMxGczSByphFQN8yJbbygfbVt0RhwpC4E0C7znh /wfoTsB29mbApDWUxxCZRYFeylCscO5r88rENHdUoS7ZW7D0KmG60Z0pACjAYSmZaoKgUC Ww833rSPIxnRVB05S7AjbO/dvTwDyQ1yezg1XdIsds34gVx/BrtP5htAMeI1DqXEhgjQQ9 pvAqqIx60vke2xd0EZFzfOK5tR6/s7NBymvzuZMBv/R9ALnyiFQv28j4jW1GMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGmSV2TKfz3t7; Thu, 3 Aug 2023 11:14: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 373BE2Ar009571; Thu, 3 Aug 2023 11:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373BE2O1009570; Thu, 3 Aug 2023 11:14:02 GMT (envelope-from git) Date: Thu, 3 Aug 2023 11:14:02 GMT Message-Id: <202308031114.373BE2O1009570@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: abe10d21b4ed - main - nvmecontrol: fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abe10d21b4edf23ddc52f85a95ecd4cb62e5f1be Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=abe10d21b4edf23ddc52f85a95ecd4cb62e5f1be commit abe10d21b4edf23ddc52f85a95ecd4cb62e5f1be Author: Andrius V AuthorDate: 2023-08-03 10:14:19 +0000 Commit: Kristof Provost CommitDate: 2023-08-03 10:14:19 +0000 nvmecontrol: fix typos PR: 261911 Reviewed by: kp --- sbin/nvmecontrol/logpage.c | 2 +- sbin/nvmecontrol/modules/wdc/wdc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index f5c7af8c535c..ae5bcc3a5aa6 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -811,7 +811,7 @@ logpage(const struct cmd *f, int argc, char *argv[]) NVME_CTRLR_DATA_LPA_NS_SMART_MASK; /* - * The log page attribtues indicate whether or not the controller + * The log page attributes indicate whether or not the controller * supports the SMART/Health information log page on a per * namespace basis. */ diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index 1cae15a1e54c..8936a74bab9a 100644 --- a/sbin/nvmecontrol/modules/wdc/wdc.c +++ b/sbin/nvmecontrol/modules/wdc/wdc.c @@ -591,7 +591,7 @@ print_hgst_info_background_scan(void *buf, uint16_t subtype __unused, uint8_t re return; } if (code != 0) { - printf("Expceted code 0, found code %#x\n", code); + printf("Expected code 0, found code %#x\n", code); return; } pom = le32dec(walker); From nobody Thu Aug 3 11:50: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 4RGnH93CXMz2thfJ; Thu, 3 Aug 2023 11:51:01 +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 4RGnH84f96z3WGm; Thu, 3 Aug 2023 11:51:00 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 373BoviM000874; Thu, 3 Aug 2023 14:50:57 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 373BovQb000873; Thu, 3 Aug 2023 14:50:57 +0300 (MSK) (envelope-from dchagin) Date: Thu, 3 Aug 2023 14:50:57 +0300 From: Dmitry Chagin To: Konstantin Belousov Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5a7e48dddfb5 - main - tests: Add MAP_32BIT flag test Message-ID: References: <202308012024.371KOAHb046216@gitrepo.freebsd.org> <7A066A1D-9AFA-485F-AEAE-DD88C9537A44@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: X-Rspamd-Queue-Id: 4RGnH84f96z3WGm 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:61400, ipnet:195.93.173.0/24, country:RU] On Wed, Aug 02, 2023 at 12:57:36AM +0300, Konstantin Belousov wrote: > On Tue, Aug 01, 2023 at 09:29:32PM +0100, Jessica Clarke wrote: > > On 1 Aug 2023, at 21:24, Dmitry Chagin wrote: > > > > > > The branch main has been updated by dchagin: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > > > > > commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > > Author: Dmitry Chagin > > > AuthorDate: 2023-08-01 20:23:15 +0000 > > > Commit: Dmitry Chagin > > > CommitDate: 2023-08-01 20:23:15 +0000 > > > > > > tests: Add MAP_32BIT flag test > > > > > > Reviewed by: kib, markj > > > Differential Revision: https://reviews.freebsd.org/D41236 > > > MFC after: 1 month > > > --- > > > tests/sys/vm/Makefile | 8 ++++++ > > > tests/sys/vm/mmap_map_32bit_helper.c | 51 ++++++++++++++++++++++++++++++++++++ > > > tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ > > > 3 files changed, 96 insertions(+) > > > > > > diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile > > > index 8ef8a45e5f39..9aac49bc5320 100644 > > > --- a/tests/sys/vm/Makefile > > > +++ b/tests/sys/vm/Makefile > > > @@ -9,4 +9,12 @@ ATF_TESTS_C+= mlock_test \ > > > page_fault_signal \ > > > shared_shadow_inval_test > > > > > > +.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ > > > + (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") > > > + # MAP_32BIT is only available on 64-bit platforms > > > > So use ${MACHINE_ABI:Mlong64} after including src.opts.mk? > > May be we should enable the MAP_32BIT flag on 32bit arches, instead? > It requests allocation below 2G, which is half of VA on i386, or 2/3 > on arm. Interestingly, it should work already from compat32. It's disturbing that no none has requested this, I can do that From nobody Thu Aug 3 12:51: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 4RGpcb2Q9Jz2tnNY; Thu, 3 Aug 2023 12:51: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 4RGpcb0fpJz3Znl; Thu, 3 Aug 2023 12:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691067071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lEnMi20Od8bwbvrUgR/2JkNOGOkZBPmekfiCqe83bgg=; b=ALhkYJJjBCZtotgxU1pZACOFqKR+vPEWIxMg2ILb4Lk/I8Ki/IMwpQXCsCp1f1tc9lNrJ5 oH/iHIVG8jNjqSjmD+9qXe+JttMnapljYw7GQbBPS6d8w40Z0775z9DJS8BiD+IlYcL76L qPtu8c+nD2hWtGFDvajoa6W5DX3AAmgGswWYon5DAtq09zEiDqKBx4G8hMsriEzX+zlg2y Udo2/F+iNz+3uOERf4jJ9QIZamkdINafpjkpeRHuUucUos5xQ+xdM8wDGmjtDN3a8/Vlat 0DK1TUMaBZfvpyT4blUJUc/zjUUZZUVmb/yoTX8g38hPtd6cM5/vTQptzQMcGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691067071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lEnMi20Od8bwbvrUgR/2JkNOGOkZBPmekfiCqe83bgg=; b=FQg7bHe7Yk1dexXywxIyehsUL3HxEUmKB60PLrDxZhDhe14UESnmI+OzUNq9Z0bTQKjL4l RRm5yVpyXX/y3EWnRm0/dRWkVOJ9HDP9c4u4tIIAEQHW6eVk5Ph0OFeYNX1oIM+BVu9Jpj SlllBWpdpW7GivQwNIWFTn0zHGIhWHOktVY/FC/yMKblQRWveIwNkXv+NA+2Zk/jKVbfXf kctK4lel4CacFrNRqTmI+qBBZkK0zbJPqTmBdBrrz2kyBbAXoUpuRqwkHSejTA+XyfRJkh 1MaLBtf/Q/XGqZpt5AVYixYQRjCRHK7HxjX0fr5HOlIm53Q7naRZCFZyudIxgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691067071; a=rsa-sha256; cv=none; b=V2n3dKIAtifKa0B+DcnvNnR1Ab407wuP7piPwpFNVTFyWHELAfpZxbPoF3w0q/0MkZpzdv oKszPoYDOp5dcqrMHnUUCiMbubg2J/+SFNtSProfDmwgGO323Qtg6PpcoQsjJ4+Ie1t/tM keHyBLyRJ10zO69N4/U7jQoD40gP0RgiE+ChplYYvxkegaVdmQ16NBnP1xuLTbLmrNASGt HIfeJQdWmr6hCs/3o/yquHIwuEeFFYJs0+/Odl3Xo4iupVFq9mCZeTb+KAazRQOsqL8jYh GeJypwLrhVkPlilYxWnGtgbBM2e1aET0CZnSrSfRnRrasK1t69PVIta/oMfSuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGpcZ505bz6X7; Thu, 3 Aug 2023 12:51: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 373CpAkO067050; Thu, 3 Aug 2023 12:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373CpATv067049; Thu, 3 Aug 2023 12:51:10 GMT (envelope-from git) Date: Thu, 3 Aug 2023 12:51:10 GMT Message-Id: <202308031251.373CpATv067049@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: 193f782e525e - stable/12 - netstat -i: compute most field widths dynamically List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 193f782e525ed56939c97852f07244b587ab529d Auto-Submitted: auto-generated The branch stable/12 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=193f782e525ed56939c97852f07244b587ab529d commit 193f782e525ed56939c97852f07244b587ab529d Author: Mike Karels AuthorDate: 2023-07-26 15:56:52 +0000 Commit: Mike Karels CommitDate: 2023-08-03 12:50:15 +0000 netstat -i: compute most field widths dynamically The network and address fields were sometimes truncated for netstat -i without -W, and often much too wide for netstat -i with the -W option. Fields such as normal packet counts often overflowed. As a result, columns didn't line up, and large white spaces made it harder to follow a line across the display. Change the code to compute the required field sizes for network, address, and various packet counts. Hoist the code to format network and address into a subroutine that can be called twice, once to measure the required field widths, and once to emit the values. Use separate field widths for input and output packets, byte counts, and error and drop counters. These are left at defaults (the preceding values) with the -h option, in which case the fields have a limited total width. An extra space is included between the Network and Address, which otherwise seemed too close. Change the mention of -W with -i in the man page to say that most field widths are computed dynamically in this case. Reviewed by: sjg, glebius Differential Revision: https://reviews.freebsd.org/D41160 (cherry picked from commit 372e3d561d82aba7a66fcd4ecb49a4d0a9f69345) --- usr.bin/netstat/if.c | 217 ++++++++++++++++++++++++++++++---------------- usr.bin/netstat/netstat.1 | 3 + 2 files changed, 143 insertions(+), 77 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 5ba4f3afc67b..e08a0462d56d 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -265,6 +265,99 @@ next_ifma(struct ifmaddrs *ifma, const char *name, const sa_family_t family) return (ifma); } +enum process_op { MEASURE, EMIT }; + +static void +process_ifa_addr(enum process_op op, struct ifaddrs *ifa, int *max_net_len, + int *max_addr_len, bool *network, bool *link) +{ + int net_len, addr_len; + const char *nn, *rn; + + if (op == EMIT) { + net_len = *max_net_len; + addr_len = *max_addr_len; + } + + switch (ifa->ifa_addr->sa_family) { + case AF_UNSPEC: + if (op == MEASURE) { + net_len = strlen("none"); + addr_len = strlen("none"); + } else { + xo_emit("{:network/%-*.*s} ", net_len, net_len, + "none"); + xo_emit("{:address/%-*.*s} ", addr_len, addr_len, + "none"); + } + break; + case AF_INET: +#ifdef INET6 + case AF_INET6: +#endif /* INET6 */ + nn = netname(ifa->ifa_addr, ifa->ifa_netmask); + rn = routename(ifa->ifa_addr, numeric_addr); + if (op == MEASURE) { + net_len = strlen(nn); + addr_len = strlen(rn); + } else { + xo_emit("{t:network/%-*s} ", net_len, nn); + xo_emit("{t:address/%-*s} ", addr_len, rn); + } + + if (network != NULL) + *network = true; + break; + case AF_LINK: + { + struct sockaddr_dl *sdl; + char linknum[sizeof("")]; + + sdl = (struct sockaddr_dl *)ifa->ifa_addr; + snprintf(linknum, sizeof(linknum), "", sdl->sdl_index); + if (op == MEASURE) { + net_len = strlen(linknum); + if (sdl->sdl_nlen == 0 && + sdl->sdl_alen == 0 && + sdl->sdl_slen == 0) + addr_len = 1; + else + addr_len = strlen(routename(ifa->ifa_addr, 1)); + } else { + xo_emit("{t:network/%-*.*s} ", net_len, net_len, + linknum); + if (sdl->sdl_nlen == 0 && + sdl->sdl_alen == 0 && + sdl->sdl_slen == 0) + xo_emit("{P:/%*s} ", addr_len, ""); + else + xo_emit("{t:address/%-*.*s} ", addr_len, + addr_len, routename(ifa->ifa_addr, 1)); + } + if (link != NULL) + *link = true; + break; + } + } + + if (op == MEASURE) { + if (net_len > *max_net_len) + *max_net_len = net_len; + if (addr_len > *max_addr_len) + *max_addr_len = addr_len; + } +} + +static int +max_num_len(int max_len, u_long num) +{ + int len = 2; /* include space */ + + for (; num > 10; len++) + num /= 10; + return (MAX(max_len, len)); +} + /* * Print a description of the network interfaces. */ @@ -274,7 +367,8 @@ intpr(void (*pfunc)(char *), int af) struct ifaddrs *ifap, *ifa; struct ifmaddrs *ifmap, *ifma; u_int ifn_len_max = 5, ifn_len; - u_int has_ipv6 = 0, net_len = 13, addr_len = 17; + u_int net_len = strlen("Network "), addr_len = strlen("Address "); + u_int npkt_len = 8, nbyte_len = 10, nerr_len = 5; if (interval) return sidewaysintpr(); @@ -294,39 +388,51 @@ intpr(void (*pfunc)(char *), int af) if ((ifa->ifa_flags & IFF_UP) == 0) ++ifn_len; ifn_len_max = MAX(ifn_len_max, ifn_len); - if (ifa->ifa_addr->sa_family == AF_INET6) - has_ipv6 = 1; - } - if (Wflag) { - if (has_ipv6) { - net_len = 24; - addr_len = 39; - } else - net_len = 18; + process_ifa_addr(MEASURE, ifa, &net_len, &addr_len, + NULL, NULL); + +#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s) + if (!hflag) { + npkt_len = max_num_len(npkt_len, IFA_STAT(ipackets)); + npkt_len = max_num_len(npkt_len, IFA_STAT(opackets)); + nerr_len = max_num_len(nerr_len, IFA_STAT(ierrors)); + nerr_len = max_num_len(nerr_len, IFA_STAT(iqdrops)); + nerr_len = max_num_len(nerr_len, IFA_STAT(collisions)); + if (dflag) + nerr_len = max_num_len(nerr_len, + IFA_STAT(oqdrops)); + if (bflag) { + nbyte_len = max_num_len(nbyte_len, + IFA_STAT(ibytes)); + nbyte_len = max_num_len(nbyte_len, + IFA_STAT(obytes)); + } + } } xo_open_list("interface"); if (!pfunc) { xo_emit("{T:/%-*.*s}", ifn_len_max, ifn_len_max, "Name"); - xo_emit(" {T:/%5.5s} {T:/%-*.*s} {T:/%-*.*s} {T:/%8.8s} " - "{T:/%5.5s} {T:/%5.5s}", + xo_emit(" {T:/%5.5s} {T:/%-*.*s} {T:/%-*.*s} {T:/%*.*s} " + "{T:/%*.*s} {T:/%*.*s}", "Mtu", net_len, net_len, "Network", addr_len, addr_len, - "Address", "Ipkts", "Ierrs", "Idrop"); + "Address", npkt_len, npkt_len, "Ipkts", + nerr_len, nerr_len, "Ierrs", nerr_len, nerr_len, "Idrop"); if (bflag) - xo_emit(" {T:/%10.10s}","Ibytes"); - xo_emit(" {T:/%8.8s} {T:/%5.5s}", "Opkts", "Oerrs"); + xo_emit(" {T:/%*.*s}", nbyte_len, nbyte_len, "Ibytes"); + xo_emit(" {T:/%*.*s} {T:/%*.*s}", npkt_len, npkt_len, "Opkts", + nerr_len, nerr_len, "Oerrs"); if (bflag) - xo_emit(" {T:/%10.10s}","Obytes"); - xo_emit(" {T:/%5s}", "Coll"); + xo_emit(" {T:/%*.*s}", nbyte_len, nbyte_len, "Obytes"); + xo_emit(" {T:/%*s}", nerr_len, "Coll"); if (dflag) - xo_emit(" {T:/%5.5s}", "Drop"); + xo_emit(" {T:/%*.*s}", nerr_len, nerr_len, "Drop"); xo_emit("\n"); } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { bool network = false, link = false; char *name, *xname, buf[IFNAMSIZ+1]; - const char *nn, *rn; if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0) continue; @@ -367,72 +473,29 @@ intpr(void (*pfunc)(char *), int af) show_stat("lu", 6, "mtu", IFA_MTU(ifa), IFA_MTU(ifa), 0); #undef IFA_MTU - switch (ifa->ifa_addr->sa_family) { - case AF_UNSPEC: - xo_emit("{:network/%-*.*s} ", net_len, net_len, - "none"); - xo_emit("{:address/%-*.*s} ", addr_len, addr_len, - "none"); - break; - case AF_INET: -#ifdef INET6 - case AF_INET6: -#endif /* INET6 */ - nn = netname(ifa->ifa_addr, ifa->ifa_netmask); - rn = routename(ifa->ifa_addr, numeric_addr); - if (Wflag) { - xo_emit("{t:network/%-*s} ", net_len, nn); - xo_emit("{t:address/%-*s} ", addr_len, rn); - } else { - xo_emit("{d:network/%-*.*s}{et:network} ", - net_len, net_len, nn, nn); - xo_emit("{d:address/%-*.*s}{et:address} ", - addr_len, addr_len, rn, rn); - } - - network = true; - break; - case AF_LINK: - { - struct sockaddr_dl *sdl; - char linknum[sizeof("")]; - - sdl = (struct sockaddr_dl *)ifa->ifa_addr; - snprintf(linknum, sizeof(linknum), "", sdl->sdl_index); - xo_emit("{t:network/%-*.*s} ", net_len, net_len, - linknum); - if (sdl->sdl_nlen == 0 && - sdl->sdl_alen == 0 && - sdl->sdl_slen == 0) - xo_emit("{P:/%*s} ", addr_len, ""); - else - xo_emit("{t:address/%-*.*s} ", addr_len, - addr_len, routename(ifa->ifa_addr, 1)); - link = true; - break; - } - } + process_ifa_addr(EMIT, ifa, &net_len, &addr_len, + &network, &link); -#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s) - show_stat("lu", 8, "received-packets", IFA_STAT(ipackets), - link|network, 1); - show_stat("lu", 5, "received-errors", IFA_STAT(ierrors), + show_stat("lu", npkt_len, "received-packets", + IFA_STAT(ipackets), link|network, 1); + show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors), link, 1); - show_stat("lu", 5, "dropped-packets", IFA_STAT(iqdrops), + show_stat("lu", nerr_len, "dropped-packets", IFA_STAT(iqdrops), link, 1); if (bflag) - show_stat("lu", 10, "received-bytes", IFA_STAT(ibytes), - link|network, 0); - show_stat("lu", 8, "sent-packets", IFA_STAT(opackets), + show_stat("lu", nbyte_len, "received-bytes", + IFA_STAT(ibytes), link|network, 0); + show_stat("lu", npkt_len, "sent-packets", IFA_STAT(opackets), link|network, 1); - show_stat("lu", 5, "send-errors", IFA_STAT(oerrors), link, 1); + show_stat("lu", nerr_len, "send-errors", IFA_STAT(oerrors), + link, 1); if (bflag) - show_stat("lu", 10, "sent-bytes", IFA_STAT(obytes), - link|network, 0); - show_stat("NRSlu", 5, "collisions", IFA_STAT(collisions), + show_stat("lu", nbyte_len, "sent-bytes", + IFA_STAT(obytes), link|network, 0); + show_stat("NRSlu", nerr_len, "collisions", IFA_STAT(collisions), link, 1); if (dflag) - show_stat("LSlu", 5, "dropped-packets", + show_stat("LSlu", nerr_len, "dropped-packets", IFA_STAT(oqdrops), link, 1); xo_emit("\n"); diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index a675afa17f61..6c76a653d96c 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -317,6 +317,9 @@ See Avoid truncating addresses even if this causes some fields to overflow. See .Sx GENERAL OPTIONS . +However, in most cases field widths are determined automatically with the +.Fl i +option, and this option has little effect. .It Fl f Ar protocol_family Filter by .Ar protocol_family . From nobody Thu Aug 3 14:08: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 4RGrKP2qbnz2ttyd; Thu, 3 Aug 2023 14:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGrKP20Yyz4Dwv; Thu, 3 Aug 2023 14:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HFC6mrEGHW6yc5WQjK+2Xn5dpTYkh3Z4ASgmB4MNAU=; b=j7KDIjsWVQqWi/3daH8JCoYGP1f6EVQctSCqRe6Sy4r0IzxFqJB9mwPWGPnqPHRgX16OZE zHioXOOsgpjfRRDbpkMRp5UMR46kMXtAsoHdt+rWKV5huFPPTzmT0THojpGVqfk9DCIWpg OgCOFOdOI+SwFzHHSt8rAYxSxVsp7Wa+zqh2V9nb3G/7o6WI14O+Ou64PMpX26jVW2lRV6 hIgh8jQKPmFQkRN4CTTd3Lt5KjPKEqoEuQoOuoYYePtQchZp43UMa6cdsRYkRNA68ZAykw OBMZxvTJwb0hFSQPyAnv4tUBqcpxCkQ6RVUtjMJS4pm8GD5/pifm/0ElSSEvZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HFC6mrEGHW6yc5WQjK+2Xn5dpTYkh3Z4ASgmB4MNAU=; b=De7w0dZSugY8dnwSCj9tcV/eoopuP5wUo8RpizlK1iNo4t9NpODDuqBhzkz1DxNAnFwy/g 3+JScNKkulMf0Z5xNnSs26AefJRxrrdirT2R17KtEsq/kK+yrNerhPSPGs/Bf7Ivbd+jPQ zDgugBVCIYMcptZhuPgLGrJhex5GHOu+m4VrxmmTXzdLkLYIrnkHJGy/JEs/4JRTCRXZhD YzR6CeuYKUQ2KfIRMmMOqHILY+dDBn0UxqwZjNiYGsvSLNebPbdakyxJK1v32prAllBmzv x3mE52QAQe1UjHZXBoTL6BYdGqaicb6mb3wqSp4a4GtWXhILLASLt5KGfuMQvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691071689; a=rsa-sha256; cv=none; b=UjAgInt44V0T551I987m4rLNWYT5bx9O1Tl9iQfqx4lh0+zv1+jE5Jvw9eRPvzLYyM81hM QGTkw/BCXGQDwib+N7QKj8MWJ0sHRu2GfsX3PMZq7X/AXebD+lmVvzRpqKmAmO7o7oT+zC Yy4Dm9cFctrffrPYqWBiT6j8WZIwc7dJuADJxNaQpj/nyJsuXZ5g3XOPXJDUyv64aIeJEa FRx+wVFA7nnORrzCBy9CJKyasZuAqgUievozc2sXTFjFl3JdaNDWTuOR1HXtwyLzBXxO6B sIPYyyR7xi/szzU1sB0ersKoYq2ZZOEVtBaCzfflmYuvPVY2wLj1+50Vrn/Ikg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrKP15xgz8VF; Thu, 3 Aug 2023 14:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373E89wW091467; Thu, 3 Aug 2023 14:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373E89SA091466; Thu, 3 Aug 2023 14:08:09 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:08:09 GMT Message-Id: <202308031408.373E89SA091466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d441ec1c2189 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d441ec1c218991421d08ac4661878ed5c182cd64 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d441ec1c218991421d08ac4661878ed5c182cd64 commit d441ec1c218991421d08ac4661878ed5c182cd64 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:11 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:07:31 +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 --- 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 ab373e22b185..2758f44f0911 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1118,7 +1118,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 Thu Aug 3 14:08: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 4RGrKQ51N4z2ttwh; Thu, 3 Aug 2023 14:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGrKQ2cFzz4FJw; Thu, 3 Aug 2023 14:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YWNTF+DIhGiLi3cnldUFbR/qQNqJW6XxCHFEDrjnf+A=; b=SZ8Rc6jMk6uRYB+68DgsS6x2jgeifo6SH/NklkHQ+/LVfa7CCWjl5fV6I0Qal8lw8keqKY deKbhM5TeEE8AySG/CJ97Ebp8397hvscRXfuYewqVfKnZYDD9HmewvLPR+UjNCRdHMrk+l D7rXMDuxu6li8EmRljouKH/XaPnd94mVLKW3AoaLQrqr/GV6RI4hmFmFXM1407fPiZEh5l ScmZYVP3Nst3OuuGUeUR6gU6o76zUmgCTJoWF2Coiuf0rJvWK2utIqNjFyN7tEsw1xjliK to7mGAduI3Q+3BbVzF5+HSy7UWQWQHmpHS0EI7V9c6MO3OPXIsDBDjAuJK+XQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YWNTF+DIhGiLi3cnldUFbR/qQNqJW6XxCHFEDrjnf+A=; b=nV6aovK9s2DCphlIbeHOdWDPgZS9MCkpUZfwG/Jk8e/l9yQt+Pgs2xGY4SpUWGN/0zcoBl 6DMojE5aUfuLFMN9kVqeWNfh+c3UKZhlBfUUlJK2ZDd11zUms1T4XyaDmmUVSGCzzI199v px+3YLf/ULAnYaiUQ0dHz8uvAAyhnccxc5Ud7uN69x77562Kwje30AL2rgzxrtgb1Vo5lM Y2HYk1e3KAQvQHLpD42iZaNp+Bz/Jp1wZNX3gKvYTymWN+dvrbW2bkWzfl1ElY3gwEcVY6 cR2Mx+T0SoCuEUe5JvFkkIQo7IC+iPXHLQ9O3vjrKikJ4xjzaNJXhjW5I7WA/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691071690; a=rsa-sha256; cv=none; b=VHPaVhkgHGB+qtiYJsfeN7k4wMTtFTdHxa+CsmoiruW36EXqBpg92LEmMesKXtuswY9kPY 9QgNBWr8gga1fGrrOL8oEfDIwBVz/lc/2D08ii5OPI9ogMzB2d5sYHg8I4h/VdqCx7svaq Y+UJqmFtrka9IEculrAeF99AauI9EXOdmtuoE3cT4TZGMh2+9EeKHVdwpLPIdtI6PoHYPz y3HccjaHlPfW1yzEiuJT1+Muf7Ur6CQduLLKG5W96L97MDHDbzBXboFT/36q6FLbv4jF74 qs/hqrG8xl3RgZ82DWUqR4Fi7L03btszp7K3fUy14aPz2tG5s9VblsLvgqMCFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrKQ1VBwz8QX; Thu, 3 Aug 2023 14:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373E8A9c091487; Thu, 3 Aug 2023 14:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373E8AZS091486; Thu, 3 Aug 2023 14:08:10 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:08:10 GMT Message-Id: <202308031408.373E8AZS091486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 84f9f2c5cf78 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 84f9f2c5cf7841fffc03ccb1833814892ae15132 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=84f9f2c5cf7841fffc03ccb1833814892ae15132 commit 84f9f2c5cf7841fffc03ccb1833814892ae15132 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:15 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:07:41 +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 --- share/man/man9/intro.9 | 594 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 504 insertions(+), 90 deletions(-) diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9 index 83956c0bbccf..458ee0ab4697 100644 --- a/share/man/man9/intro.9 +++ b/share/man/man9/intro.9 @@ -1,105 +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 .\" -.\" $FreeBSD$ +.\" This manual page was written by Mitchell Horne under +.\" sponsorship from the FreeBSD Foundation. .\" -.Dd December 13, 1995 +.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 -And the name of the procedure should start with the prefix -.Li DDB_ -to clearly identify the procedure as a debugger routine. +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 +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 Thu Aug 3 14:08: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 4RGrKR5L4nz2ttbR; Thu, 3 Aug 2023 14:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGrKR3XQ3z4F0n; Thu, 3 Aug 2023 14:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qlz8zHX/zKZJ7tCwweiL1Tm18mj6HhlJuFcWY64JdsA=; b=RKW5yGEi/623jkJ+j4lYfngK/lWtzN1WXlJ0zzQhF+zqp8ArYmptOtuusPAvv+Se+EZIcU or9tgwyEtHaM/9XLyRBf8V7W4lOfim8qxHj0mijEjSjgFEdhjiHQUTCqhPdjeDALn0MILk ns31ejYf5UNVHM0BbCopbwnuK0OH1b57Pb9Hs4qYI5xRdQYZMpZrKpR2LpztaYnTXjzxSU +YvdoZNvD/x5s6+UNSb0XiJ4Lku5SpgXe/JaIwoBTfjYIwGWPNrIBR5k3+L6PV+1x2qW/q 2OG0Hu9Z00YvdWSRdt1qNVaBkSb0B/2DPHaWPRQuaHjYRh7W8dxREpj54rvk9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691071691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qlz8zHX/zKZJ7tCwweiL1Tm18mj6HhlJuFcWY64JdsA=; b=DY2rfTvdUfoQ7NSP9D0a6ktdkWyiZ6CUVAd/YAM8hhv3PYDRNs4eTyPO6l9YbHSkrWSCGW aWZYUB9Sbc+IDd0P3YPJDfe/pYASpSccYpIZOfoEKQV75oqk40Yt0DXHbVQ1u9g8OGc24B xQ/AZGY0Qt+lMpLZWrWfXTfpIYAGSYLciTv8De3hb3/X5At0ZuHhKC+ECfiBp6I9S7kDuv PKx+75Zbh+aFzm+BvrtrIFiGHZUk3OJbGz0eneay/s8TbYAMUNp8AmbAg1t7Ikx8WibWl2 oA8Q9zocUT2VAuHJKLjcNHNbB+0tBi03iqij0UjLy2SvZ4oSBoRMHFeqqpmxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691071691; a=rsa-sha256; cv=none; b=sQLvpIjk9vk/TVyJKD8S4e6b9ddlOCHUycWA4qb1uVAWd5TnOUY78uzQl8bRQHXOG+lkXU kK+ORDyVKPc2WG4JRvz85PgctZvsdtMenUAk3Q4IFth3WrXCMkpIi1StQy05pDeWmVFvAu 5vkl2gvSNDYjFJuc1r3U7JLJzyDqCp9p2ADD9/C3e4+v3o1L+VSG6skjE8b0QfZc0bogYH XXuBNhSL3S/aZyN8ovVDpDaW0HfHHk570WX8B36Twbzplp9uLWMhGOGMdE92LS8smcV2vg Y4FP4Q7jJ/YkPBZn6Mr5YnUPqkAZu2zCTHdDaqLInOjjwP/i4q/7iGDgv/JzhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrKR2fCXz7tT; Thu, 3 Aug 2023 14:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373E8Bc5091506; Thu, 3 Aug 2023 14:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373E8B0R091505; Thu, 3 Aug 2023 14:08:11 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:08:11 GMT Message-Id: <202308031408.373E8B0R091505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 32e47f62724e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 32e47f62724e6cce2df0bc69d6ceba2d058d3585 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=32e47f62724e6cce2df0bc69d6ceba2d058d3585 commit 32e47f62724e6cce2df0bc69d6ceba2d058d3585 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:17 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:07:41 +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 --- sys/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/README.md b/sys/README.md index 77db5026eff3..10c9f183f7e1 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 Thu Aug 3 14:13: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 4RGrRP4fp2z2tvlK; Thu, 3 Aug 2023 14:13: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 4RGrRP4CHzz4Gk2; Thu, 3 Aug 2023 14:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gr+MalKw32rRtQ/pWQAkWAj6BG/tLJmyVNJgBJQ1gPc=; b=v1STJHhyYdGICOeBHlUJ4M8eXjDi5Xr7A85fIzeE77Xa2uhEUzPW5co+29ktqvqQcxJXe6 2a79B2B0Dw+kp+4HCyC6AOEqLIsWvRoEnpXXKWVrHy+OAeAmvL/htT90epUDZhVTS1YPsl dhkkrYazW92Y9631RhbuBkOrpOHykk+GbdjirJ8Hpca6A/wr4ZmHxW8JQOHKH+MiKgVqT+ sjUJ4CK+3N79iShxD5huS78IxdUiDkZGuU/NASpjGgeQzh7l3rXwGls/mQw8svLB98PnqZ a+C9t6awQvqpVwXqzr3KOynW7qFdcoqKzNzN1OWYgaPas0KfapL8sZ1ngA8e7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gr+MalKw32rRtQ/pWQAkWAj6BG/tLJmyVNJgBJQ1gPc=; b=OQHY/sq7EUm8JFo19KIpMzAh4t/66xNQzjW1IwKhL+Hol/C3r6z/vQQ9duE72MmrRmywX5 vsXtX95atJxjNI99knCx7teotaXlaGyEskG0kGdekOLm+ZovzcL4Ck/f4sphP9tE+xCqPb cT0M8blYmckMYeANnUkXu+rfGbS+2o7nzIh9KbMOtWEtwwZ6TvQ8CYklPIkMIpylGDckim Ki1RM46/RsQ5jjtQjQ3054A4wLmvc19/19VEBhfkND45uCe4/QHyI3nJ61S1CyyHmBS+98 rmKUpEZMmSLxD1cMyGSs/GkR8PFbsr96Dw+xjzWxVgDM8S0toMLVB7P2l3WRXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691072001; a=rsa-sha256; cv=none; b=hNwKSVpRDyN3QPnP5WcQvHaiZ58CrqicMxAFMZnt9f7KEmdoRHAJTTCl6y+52O2BMmdDa4 VMnSPxsVYS9PW5Szp248Pfme13ewdrkTkI24jeLyuskkfD+rKwibU1Ig754c/7aBW7pfog IfWkd/kvVgYPUZD075eqFlol9DflGvrTgEozWfHH2T2ry0U/MyCq0qWMkrv/gx6IKTJ335 A5uynLDhqmy2SIaarvl5IeC4yh1ODAqVXepaQBiTVxETMH3Kc7ZChHAxsI4rTgkbvF6eye 547mFv0pyCLS4R6mnpmILSMDqMvlYU2wyrQ4DrMO4a+Q9P8PKpgGvkkjy/mVpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrRP3GyTz8By; Thu, 3 Aug 2023 14:13: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 373EDLE9007577; Thu, 3 Aug 2023 14:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373EDLRJ007576; Thu, 3 Aug 2023 14:13:21 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:13:21 GMT Message-Id: <202308031413.373EDLRJ007576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8bdceaecabd9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8bdceaecabd91ce5ed23646d91cef878681e19d6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8bdceaecabd91ce5ed23646d91cef878681e19d6 commit 8bdceaecabd91ce5ed23646d91cef878681e19d6 Author: Mitchell Horne AuthorDate: 2023-08-03 14:09:48 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:13:03 +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 --- 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 bbd3edf84ea0..90a35456feb7 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -450,7 +450,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); @@ -491,10 +491,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); } @@ -605,5 +611,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 Thu Aug 3 14:13: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 4RGrRQ62B9z2tvhl; Thu, 3 Aug 2023 14:13: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 4RGrRQ5S9Gz4HBm; Thu, 3 Aug 2023 14:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hc3u8geD4EIWSi2pySFKM0lu8B7oUCnSbwbizsXBGPA=; b=K9aYZcoYpx96y3WK5SBPboeqG/7cv1MkmEsteHw8NKn/KAGtU0257f8aitklWSRSxEeLhc yeFiea+8bj+7712mXZtQFyBMEycmwthNz32iqymm24gWPNwGmA5SOT3cLI34RJzBqMsr7I IDucnA+qtS6gjMvufqsT8MCDMp4vq2iS/2oPf3Xd4Y5FqOQald28oGMPF0IuMzrhNpndTS bwnAM21kZ7r2tS62h78yOS+wHKg9eENoOMEeNnjMes6c6KlP1l5hVKmObRHu+ESN4tttBZ atElux/uu2LsNAo5lNhq/lOQFsFYkrrb03leOv4I82uLcK5YZpJmJ34xYkrfaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hc3u8geD4EIWSi2pySFKM0lu8B7oUCnSbwbizsXBGPA=; b=QovEs3ZiYcIVxG4uSBvteiTuwip9+ze/p1UOVq91B6OUuMppLN4mCv6vKfirkm1DeF7ufh rW4WSSRqlNWqDJYcC4PzbJB6r74s1LZSSmidgKOtGaa08UhOqe21UMaBkofHKzMtuh+Wzl LCnL9EV5Q6kclYO5dEYWUotQVSBHMSsMiC6sIHqcWn8ZKD/T3riImbAOkBk+LmEvzFcgiD lu1vyZP9bCmavsp6AQ4tRR+L5pxtwuuym65V9zPA0yNPOaug+rVOBf6SsoavoV6bQOyQ+y m9EJ+qxua5yp0keULZb+UtWjXgV6P/6xrekTmj3YeB0Yi7x2/kFthS6kFzC5rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691072002; a=rsa-sha256; cv=none; b=KDODMKstxycwzJYKJUSkWLSnIxtMx+A5LLPljbEGEYK9ec4tDSC6v+5QTPlucbQoymiecq vdGPT2/E3pQ7uYC8zltbfTQF1JnyE5227BIklgHenv8qYjPaDPhkW6yxoKswuP231NXNNe qXMDetErqYqXUEokZWYaRmV9ZzHSGeVGGrrpMUDP+uN28NG9R1OcRWlPVp72VaIInBbUJ3 CPf6I7Q+TS2wJXV/cY31Bq2/DSsKxhiBiPQAYDmLrXXvHouYFibNpBJDiqM330gAirosW4 KmcOKonT3K8wiYd5bjOTXUFSpOGSPWEPLo98B+K8rvvs0xsvqGkK22Z9nQpSjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrRQ4RbCz8hr; Thu, 3 Aug 2023 14:13: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 373EDMIf007596; Thu, 3 Aug 2023 14:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373EDMZQ007595; Thu, 3 Aug 2023 14:13:22 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:13:22 GMT Message-Id: <202308031413.373EDMZQ007595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9c0a2d522f3a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9c0a2d522f3a18fc795a7dd6266d2be2aff4b084 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0a2d522f3a18fc795a7dd6266d2be2aff4b084 commit 9c0a2d522f3a18fc795a7dd6266d2be2aff4b084 Author: Mitchell Horne AuthorDate: 2023-08-03 14:10:26 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:13:10 +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 --- 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 89cb27457bd2..6275e0f98c8b 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -414,7 +414,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); @@ -450,6 +450,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); @@ -459,6 +461,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; } @@ -529,5 +535,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 Thu Aug 3 14:21: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 4RGrdD3TKkz2twSC; Thu, 3 Aug 2023 14:21: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 4RGrdD32BYz4LWj; Thu, 3 Aug 2023 14:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0gOLdNUrFiXGi/SVRpxrsxWOd6BQIcxd6Spga8FIYQ=; b=wTXB37NzctkukZrDld6ORcgJyc+lejZJwi4tYKQaJYa9Vjk64gtRsNxX3yddzqaG9ER1Zr vhzp6pd8Z9Hq1SYlQrwHNejyY3pDU+cg5VUYB8TbBcgup9/ckKBTSZnGZsoyq3bSSDz7GA NIQoriCT0g0PK3BaIptK5cjsNXTKux7dzCyH9L2uVSZk63po0BJPGxNQod8nBuSdlJsT1N HWmHNNp8MGbh5dsl2lJPQVKqTrGbbtaEai19rbv8hfUhtzto/lgPxt3e4b6Um9gPIo7GES XTlpGrjIgjouo4QWQmcsHRx9MaBBsw/D2QFWVdLAquKRiRRnfie6PEiT9WSmmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0gOLdNUrFiXGi/SVRpxrsxWOd6BQIcxd6Spga8FIYQ=; b=rGlMOkH5WxwML3JGtk6SVyrZhcaQVtBvdHS2ZH69K5adTOnEOxWPv+7y2Ifn7/tU+nff63 1b2ajLx5/iABrZfNNvJg+/nq4glJ0TpfjdtooB1bOzldbcFXu4OeVRapjroewZw9mO3nIZ IRQZy9TQJfujHD4bKyDemFlbO758Vq8HCMd5j4z7QVYKjco5363fDYfyKZf65qetbgJURe /Vcq+2Ep6Ca5oUruhyn4leJ/toWJE3D4m9L+u3KZQn9XCYL2lsuW/KVVk1AMUGfMO68hx/ IYAfeS5DKjSsLOpkGFhIXoKT26alW3k4idky4DhdJlzlv85CSnJloG+yeHQm3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691072512; a=rsa-sha256; cv=none; b=sNRtG/wUdEBLePet3PX/emc3e2/0YO9mmw2+7kF+xyrR38j7TcUTHKOx+gNbzMawHaUVUp xjpYT2OquOpPEXmzyYa0njzSilw8lpKZlOezkTUfv8idee2Czy/7PqV4CXhfvSM3t7v/cY RCiR/3VfDZW6N/ocs7NkX0fPFxDHG2ZdUr9r1x1bgN0gNUYakZS5CESqSfWYl9c65RqIOR 8rcizNSzddQ1kkflG8RUO863CWM4eKs1so1kwn2b3DTlRRmyUDkssgUesPUGPLfdhOyd3S t9sIbC9OAnw1M4F7emFISZjeW3A8IX1Dw+foB8SNcdjZegT8+1Fiezqv0rQSsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGrdD25Q8z90j; Thu, 3 Aug 2023 14:21: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 373ELqaB022333; Thu, 3 Aug 2023 14:21:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373ELqS8022332; Thu, 3 Aug 2023 14:21:52 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:21:52 GMT Message-Id: <202308031421.373ELqS8022332@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: c9b06fa52776 - main - vm_phys_enqueue_contig: handle npages==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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9b06fa52776fbf555b9397a8d28a54c957108ec Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b06fa52776fbf555b9397a8d28a54c957108ec commit c9b06fa52776fbf555b9397a8d28a54c957108ec Author: Doug Moore AuthorDate: 2023-08-03 14:19:48 +0000 Commit: Doug Moore CommitDate: 2023-08-03 14:19:48 +0000 vm_phys_enqueue_contig: handle npages==0 By letting vm_phys_enqueue_contig handle the case when npages == 0, the callers can stop checking it, and the compiler can stop zero-checking with every call to ffs(). Letting vm_phys_enqueue_contig call vm_phys_enqueue_contig for part of its work also saves a few bytes. The amd64 object code shrinks by 128 bytes. Reviewed by: kib (previous version) Tested by: pho Differential Revision: https://reviews.freebsd.org/D41154 --- sys/vm/vm_phys.c | 76 +++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 28f12231e01c..ed358d7cd4a9 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, "Too many physsegs."); +_Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), + "vm_paddr_t too big for ffsll, flsll."); #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; @@ -690,18 +692,16 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, * * The physical page m's buddy must not be free. */ -static void +static vm_page_t vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) { - u_int n; int order; - KASSERT(npages > 0, ("vm_phys_enq_range: npages is 0")); KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & - ((PAGE_SIZE << (fls(npages) - 1)) - 1)) == 0, + ((PAGE_SIZE << fls(npages / 2)) - 1)) == 0, ("vm_phys_enq_range: page %p and npages %u are misaligned", m, npages)); - do { + while (npages > 0) { KASSERT(m->order == VM_NFREEORDER, ("vm_phys_enq_range: page %p has unexpected order %d", m, m->order)); @@ -709,10 +709,10 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) KASSERT(order < VM_NFREEORDER, ("vm_phys_enq_range: order %d is out of range", order)); vm_freelist_add(fl, m, order, tail); - n = 1 << order; - m += n; - npages -= n; - } while (npages > 0); + m += 1 << order; + npages -= 1 << order; + } + return (m); } /* @@ -744,7 +744,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) { struct vm_freelist *alt, *fl; vm_page_t m; - int avail, end, flind, freelist, i, need, oind, pind; + int avail, end, flind, freelist, i, oind, pind; KASSERT(domain >= 0 && domain < vm_ndomains, ("vm_phys_alloc_npages: domain %d is out of range", domain)); @@ -762,20 +762,18 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) for (oind = 0; oind < VM_NFREEORDER; oind++) { while ((m = TAILQ_FIRST(&fl[oind].pl)) != NULL) { vm_freelist_rem(fl, m, oind); - avail = 1 << oind; - need = imin(npages - i, avail); - for (end = i + need; i < end;) + avail = i + (1 << oind); + end = imin(npages, avail); + while (i < end) ma[i++] = m++; - if (need < avail) { + if (i == npages) { /* - * Return excess pages to fl. Its - * order [0, oind) queues are empty. + * Return excess pages to fl. Its order + * [0, oind) queues are empty. */ - vm_phys_enq_range(m, avail - need, fl, - 1); - return (npages); - } else if (i == npages) + vm_phys_enq_range(m, avail - i, fl, 1); return (npages); + } } } for (oind = VM_NFREEORDER - 1; oind >= 0; oind--) { @@ -785,21 +783,20 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) NULL) { vm_freelist_rem(alt, m, oind); vm_phys_set_pool(pool, m, oind); - avail = 1 << oind; - need = imin(npages - i, avail); - for (end = i + need; i < end;) + avail = i + (1 << oind); + end = imin(npages, avail); + while (i < end) ma[i++] = m++; - if (need < avail) { + if (i == npages) { /* * Return excess pages to fl. * Its order [0, oind) queues * are empty. */ - vm_phys_enq_range(m, avail - - need, fl, 1); - return (npages); - } else if (i == npages) + vm_phys_enq_range(m, avail - i, + fl, 1); return (npages); + } } } } @@ -1146,7 +1143,7 @@ max_order(vm_page_t m) * because the size of a physical address exceeds the size of * a long. */ - return (min(ffsl(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, + return (min(ffsll(VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT) - 1, VM_NFREEORDER - 1)); } @@ -1162,6 +1159,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) struct vm_freelist *fl; struct vm_phys_seg *seg; vm_page_t m_end; + vm_paddr_t diff, lo; int order; /* @@ -1173,15 +1171,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) fl = (*seg->free_queues)[m->pool]; m_end = m + npages; /* Free blocks of increasing size. */ - while ((order = max_order(m)) < VM_NFREEORDER - 1 && - m + (1 << order) <= m_end) { - KASSERT(seg == &vm_phys_segs[m->segind], - ("%s: page range [%p,%p) spans multiple segments", - __func__, m_end - npages, m)); - vm_freelist_add(fl, m, order, 1); - m += 1 << order; + lo = VM_PAGE_TO_PHYS(m) >> PAGE_SHIFT; + if (m < m_end && + (diff = lo ^ (lo + npages - 1)) != 0) { + order = min(flsll(diff) - 1, VM_NFREEORDER - 1); + m = vm_phys_enq_range(m, roundup2(lo, 1 << order) - lo, fl, 1); } + /* Free blocks of maximum size. */ + order = VM_NFREEORDER - 1; while (m + (1 << order) <= m_end) { KASSERT(seg == &vm_phys_segs[m->segind], ("%s: page range [%p,%p) spans multiple segments", @@ -1560,10 +1558,8 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); } /* Return excess pages to the free lists. */ - if (&m_run[npages] < m) { - fl = (*queues)[VM_FREEPOOL_DEFAULT]; - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); - } + fl = (*queues)[VM_FREEPOOL_DEFAULT]; + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); return (m_run); } From nobody Thu Aug 3 16:11: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 4RGv4F0Drnz3cNq0; Thu, 3 Aug 2023 16:11: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 4RGv4D6fLWz4WNK; Thu, 3 Aug 2023 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+giGBKHb3n2UUjpo/5NTc84tV8L1S+qes2SwONp2+38=; b=IYAMqBV7y5Dl1h/r27JU24SCxtWnV8kZyJnMbAT0BVI6jCx44hi8umRkYgalhMhOZIOrHN RyG3wH0dOeDfc6zQ3YlDrfxiJXLu9shRV0HqGwwUDTr8tZe2+6LN/ku9cFIe1ZZROGu1MH jg5CG/5txDzUe4u/a1RtynvRVaJ+EM3sNPYGbMUcx3XRQEF3Fc9DJU2lxhfbI+qaCTFH9m qigW0uHhBYJQu+gG/3miGTTQtaMlbLJOSp2h0IVxsQaLXK9Hv49RMfsmpQyuuMRyvUoZuu +bGApskWN8UVMiDFWbKobHKt2IFBqApAtMBMFb7q3SJo3p/NCeXR5lso9S04Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+giGBKHb3n2UUjpo/5NTc84tV8L1S+qes2SwONp2+38=; b=C/xq3YXms+8FpmutoF7zquLBATh8XMQ5SjbnuVf03xfDSv/734SoGFY1WRd0J+OL8MJEfm qEsbqRWV1wPFsYWJizhqH8+9hT2lsRp5o+z79nDD9H6sa7phCemB2FGkj1IvQV+W2ylVQ8 g4TDGhz5h3wtyAJ72lpm9KybuPfWhgVmmBrso5rUQ8xMniariUFHwk61Kn/i4en8NSDq/q Z2L6d9MX72CqEO1UBMZHqWY1xGLTXRTR8bsqahW15HO/211tZilYc3URBsRFwYThTH/FTB qGK2592lktqw4e4C7ddcrvrdlM/b3pOSO64JzniJWLORjtJaJOZyPXisPAOZIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079116; a=rsa-sha256; cv=none; b=w/Iwu1eAnCdOKN1gXwKMeCOsGAO2DUnnhRqj1jCtfCUbIpzLJhyVkcZIZQ4fzvJ5Zj5hmd Phmuju3Ay3wpviWRkTmvBzTHHC1Tq1zJ7bUIUGkFfOgCx4xfDA3OMNrvPZ+ROingwjy1Tg RLBgdB9AEQYGGToeloj4pLItEGIglSygqhJrnDmVTsdqWjFDaIGPtv2UdRUw24gMUiQ9Gs GUoyky0qZh+zPvFu1QQLHwIhloOSOHgJa3gXBQF8c87rDYWHOREZNWW4xYPH0XqkbUI59S I0cTUGOe1o4dKxGMN6vrCMktkDw7LwD4kmz2cXS2nVULMZY+72a8rvwtfrQ78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4D5jPnzCXr; Thu, 3 Aug 2023 16:11: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 373GBubw005962; Thu, 3 Aug 2023 16:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GBuVJ005961; Thu, 3 Aug 2023 16:11:56 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:11:56 GMT Message-Id: <202308031611.373GBuVJ005961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1e55a130620e - main - spibus(4): Skip bus_generic_detach() on device detach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e55a130620e5bef3570c4e1d326412c614fba84 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1e55a130620e5bef3570c4e1d326412c614fba84 commit 1e55a130620e5bef3570c4e1d326412c614fba84 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:49 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:49 +0000 spibus(4): Skip bus_generic_detach() on device detach device_delete_children() detaches all children too. MFC after: 1 month Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41240 --- sys/dev/spibus/spibus.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 40ebb916a649..b9b3e8d28b83 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -70,13 +70,7 @@ spibus_attach(device_t dev) static int spibus_detach(device_t dev) { - int err; - - if ((err = bus_generic_detach(dev)) != 0) - return (err); - device_delete_children(dev); - - return (0); + return (device_delete_children(dev)); } static int From nobody Thu Aug 3 16:11: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 4RGv4G1Rdjz3cPDn; Thu, 3 Aug 2023 16:11: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 4RGv4G0YRrz4VqF; Thu, 3 Aug 2023 16:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+b4SlnBZwO3RMkcaCX5g8h+Sn+1wDvjyW/uG1kN05k=; b=DiyQu7h02m87AQb7ilETvaGn4J3g7btI1H1SJ3velrxSHtT9qfCCLUvy9nsxyPDW41az+M vKlVtZ/VtXJn7DMluLHKMI8FM+m6KI6UAnsj54ZnMDKcF19dQUEXWUuzXc4gDT7X2kfpDK wjNP97WI8WRJ9L2O/Fq0GVai30eibc+tmJ++9/SefVGHBit62Qw2tkvREecJDJYi+2M7NB JdcolJiOxv5FX+uWg+v3J+nlBUALYVlCC0SrXGaZCc8xSkiDcaPlL4kplJCLI3MIsDoBd3 VIFs/wbDu9yJkNF7T09LzRcR7q+o4ztf3NRVaNHSsqFtadElwXOoywqMq5oVdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+b4SlnBZwO3RMkcaCX5g8h+Sn+1wDvjyW/uG1kN05k=; b=Mls6S4IinHic4yi904ZvR7RASiUg9LlpdHxpbqz9Il7v/C+84w8uyLNpQNFct8kupSlEhf GH6bApyQ2Lcxrn5k8/v001caGxuRqRkTpL74UV0uKZa394r+iJrNBPYTp2FB6YWKLV3HqF fMuIJ6tqW6KJgtqPugMHfXYy46+fzy+E2txLu25nHzcN30XOhFRj3IsmpiLrAoozNCi0z0 pOiet/gRofyPDkl9cmrhaV+/kKjJxSXwQJ+eGzPx9NxoMANxhe19DBlEfF9RMjKdJukZZL 18lf9CpnIKgi8FxCE3a3+MZEtDsSyVPxnMQ2gzqelUJkfgI+LSmACr9dvb3Abw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079118; a=rsa-sha256; cv=none; b=Y/KFEreXQg1VDdGWgH5ujT11uIURg3hV0PfF56864a24dcazyoTyONglJ6BkKj43ABoiJ/ rzgJvpJUNs7KmbblxD56TAXEcIFREiscNB7Y2bFGQtLtkuVZaxEn+ky883b8PoGioLczeB aABJhYi14m5l4Khrk1WIIGLFzPby4IvgLQEv8wFb6JaBdrRbVocng6p+OaJCn6gFSODNNL wT+MW3iv7g/6obcoxHcr4VgvFvNLdi8hrNT7slMgpTcXSbTx6hf+3osKsgCvXsy3SUAZJz YUbO8dJSbSk4G8j2rJTNJhejiRyCKNRLgeJLrLGG6+PA5GQGbDYEcvxUZp7afg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4F6mBrzCJx; Thu, 3 Aug 2023 16:11: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 373GBvdn005981; Thu, 3 Aug 2023 16:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GBvYa005980; Thu, 3 Aug 2023 16:11:57 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:11:57 GMT Message-Id: <202308031611.373GBvYa005980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 16ab2c318d93 - main - intelspi: don't leak spibus on detach. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16ab2c318d93e7730c4cdaaca9c47e2f58c601c7 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=16ab2c318d93e7730c4cdaaca9c47e2f58c601c7 commit 16ab2c318d93e7730c4cdaaca9c47e2f58c601c7 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:49 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:49 +0000 intelspi: don't leak spibus on detach. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41241 --- sys/dev/intel/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 0ac7a3b5e9bb..c2308c20f8cd 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -508,7 +508,7 @@ intelspi_detach(device_t dev) bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid, sc->sc_irq_res); - return (bus_generic_detach(dev)); + return (device_delete_children(dev)); } int From nobody Thu Aug 3 16:11: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 4RGv4H1pkwz3cNmw; Thu, 3 Aug 2023 16:11: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 4RGv4H1LlPz4WMh; Thu, 3 Aug 2023 16:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vg2SK37/QZXBCY6ujxfGnhdgcHLmkumIVziwSGTAXdM=; b=vZu5UrvtoXd9Cbf636PtRi+R+PgroRY+g6OsVjos+8ZN3fgDuksReVwbroaGkUts6mNEEv 2wcBCT1/sKj04kGNBztrhaiK2DeoSbD5FUbNTXSn4l4x80zv6pM+2YC0K85LE4hfIebnIk o2y04uvm9J1NBtBEo08TORBoHSskClyywKJnzqzk87uqWJYleoEjCJBWysY+dN6LT8gKh5 JbrzrrD1bXQZY0As5X0A10wwHE8+W0huc80AHZoVgDf39vUOgmpw0pIkI0JwY9UzsMmdKF r8KtJQayqykqJgY/CJvvsCKXXnYGiMHeQfhT/hCGW9ssezxZWKlT0G/oQ+QJdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vg2SK37/QZXBCY6ujxfGnhdgcHLmkumIVziwSGTAXdM=; b=AaHakKB0j1gyZ6Zh272KuLKHmrTp8Pyok4EhNEi5b9XB7tjsx6oW/3uovWy25b2Tc3S635 1IdhJxcGyY+Y66b5Boft2K9NEkp+cAY47EMRCZmvKd6Zt8qiOBs0N3O28gJxD2/I1pB4g2 FNIIjhrIxF3mbG2yhsL1bxcPCd52GlW0ldMZD+YEjlp0lS9JI6xEGcYhmqUBj5GhT4Mk+f NUjsHJfPP22DIcmn4y/afbvulbsFBAOCJ+vesjegdeyNNF4VRRX9JEynZnWh6EVlv8hlh6 SYUqEZMvnEkO7HJfhwExlSFV2b5gzqJp0SI+VTCxCUe/5fAtQOaDDmluNip4Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079119; a=rsa-sha256; cv=none; b=EUvtA/Dp90EaSCUnx2ExQKIURp4ljDGmoB2MEhCsCCymhYn/ebKVtIjitfpCRznLjVo5Xh OPO17oOjRIazMOH0Q+zcsFGyJ0kgpkSBJeYFWnb0EGfsHnqSvtdSxtSolENK4owkQpRQgm gFYvsRtn1SOMjjeUnLgRxa/a8k/2FaeDVYHC+Vk+0uEiScErBDzHG2BGXzlUqYwk53ou8z zdfU4gMJyArK4ixIiakyIV+PhMq+HT2JM4OMVvmYt058UIF829tWaiDkhTSTr7cWZfqARj /og4VE1NNoQDU5dAIoSXP+l0YI/UF3XuhruXQTe4hkuiVyE4BDygdCg6vx0O/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4H0RV8zCJy; Thu, 3 Aug 2023 16:11: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 373GBwB7006000; Thu, 3 Aug 2023 16:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GBw27005999; Thu, 3 Aug 2023 16:11:58 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:11:58 GMT Message-Id: <202308031611.373GBw27005999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 2a04c3a47b74 - main - intelspi: Add generic resource methods to bus interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a04c3a47b74aa1114787fe24bbddf180ac57a5a Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=2a04c3a47b74aa1114787fe24bbddf180ac57a5a commit 2a04c3a47b74aa1114787fe24bbddf180ac57a5a Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 intelspi: Add generic resource methods to bus interface That allows intelspi grandchildren to allocate IRQs MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41242 --- sys/dev/intel/spi_acpi.c | 9 +++++++++ sys/dev/intel/spi_pci.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/sys/dev/intel/spi_acpi.c b/sys/dev/intel/spi_acpi.c index 015694f4a008..4c22d7a351c4 100644 --- a/sys/dev/intel/spi_acpi.c +++ b/sys/dev/intel/spi_acpi.c @@ -93,6 +93,15 @@ static device_method_t intelspi_acpi_methods[] = { DEVMETHOD(device_suspend, intelspi_suspend), DEVMETHOD(device_resume, intelspi_resume), + /* Bus interface */ + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), + /* SPI interface */ DEVMETHOD(spibus_transfer, intelspi_transfer), diff --git a/sys/dev/intel/spi_pci.c b/sys/dev/intel/spi_pci.c index c55b5a12228e..cb2b8bd82bfb 100644 --- a/sys/dev/intel/spi_pci.c +++ b/sys/dev/intel/spi_pci.c @@ -119,6 +119,15 @@ static device_method_t intelspi_pci_methods[] = { DEVMETHOD(device_suspend, intelspi_suspend), DEVMETHOD(device_resume, intelspi_resume), + /* Bus interface */ + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), + /* SPI interface */ DEVMETHOD(spibus_transfer, intelspi_transfer), From nobody Thu Aug 3 16:12: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 4RGv4J34jxz3cNvR; Thu, 3 Aug 2023 16:12: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 4RGv4J2Fb5z4WQG; Thu, 3 Aug 2023 16:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bej3tlRmE+7nXnSiKE8PkXYirRqz2ZXcsLdn+nDf1b4=; b=NDEMKwzxZm+Wbl6dwyow6+FsO9ipjkvKO5LnNyppG+EVh1gIfANaEr3ulmfkW9t0jKD8jP GsVkrO+jj4vk1RXnn1AXXuOnxmMhqC17b26tTkMcSDOCRs5JVq2/LdSfmI2f5jdYzDPFyQ jEBqH6fPKFCrBqAeqHxB/XrxxjDxHzMmVRXDRyHuchgw9aYK7V/S63B6hIwua49fYUAOqS GBfW+TQ64DahHCg/dshrkEBGOQVTnQMsBUka+episH6jSyB/P2ZSc2GCHtwe+7HX2C20QH GjHtJzmgdgskz2qzHuTvbjbumpAJPBOr6MeDzY0QGuxq528Rwq1z9S70iI4MJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bej3tlRmE+7nXnSiKE8PkXYirRqz2ZXcsLdn+nDf1b4=; b=YuMg5dJj91HAOdk+wyfK/W3wTJwKxyucKqawn44sg46WvdOscLQ0BeIux17L3HgXDbtpJC MQ7LWDNmJzrh2NnkQQW43qawsC6CoRSAUpWlGjQQO3ZxclKmuflntmQJN3piXExzcdjafp kPAtyPDLoaRNDZVSpgr4mEkIsV+bImXt+g7CCTWFDvtFeXXW11jUDPeLmRWC5hRX7tM6Ef BFSTnI0UpdAF3CO1VF21qHFObz3cxQz1wTG3ByyYoWMZwZ2zdbPaCdzWsbPqPxLBGFeNzg 5LxcqpooNFl+YSacTx0IoU2LHLw5zffdksvJorv3OHHkDcvRH0Dl25UM4BQvsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079120; a=rsa-sha256; cv=none; b=JKcX/U9jR7J0gkKdl89gSCdegl8T3C4hKQK0GOS2eSxsraBHOMODW5XcqGx6nMDZVLBRlO d4MJqyq0+HAiKa2ien+3BnksbaCQTSDib9KiIumZ9eu0YYlouNl8U8Cr3WOlAsSVPEDsUo njQE4FrU9PhsgB2g5d3DGblArQ1pMzbFFK0uTKqwEVHtBpbd9UfZzEpiFgwnP05JJugMA3 8OvcopReQEsTe3cuVz05ZFSQMjJ3x7Ajo9fo48NgAgup2MqU4wUuoqw6lwMJBgZYijk2Ej 33QECZ9atS7IMj3BghrUqoPTNWpX6O8Z6ZVNomBY9Vrd06FZzAKmJE3sm0j5Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4J1FpkzCBR; Thu, 3 Aug 2023 16:12: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 373GC0YB006032; Thu, 3 Aug 2023 16:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC003006031; Thu, 3 Aug 2023 16:12:00 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:00 GMT Message-Id: <202308031612.373GC003006031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c6889cbf664e - main - spibus(4): Allow IRQ resource to be released List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6889cbf664ecddf7fdce7c6d3c90a282c1b5d98 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c6889cbf664ecddf7fdce7c6d3c90a282c1b5d98 commit c6889cbf664ecddf7fdce7c6d3c90a282c1b5d98 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 spibus(4): Allow IRQ resource to be released IRQ Resource is allocated on spibus(4). We must release it here too rather than propagate request down the tree. Fixes: 4dd8db62e9d3 ("Add IRQ resource to SPIBUS") MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41243 --- sys/dev/spibus/spibus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index b9b3e8d28b83..af4b1402cee4 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -247,11 +247,11 @@ static device_method_t spibus_methods[] = { /* Bus interface */ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource_list, spibus_get_resource_list), From nobody Thu Aug 3 16:12: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 4RGv4K3BRmz3cNqD; Thu, 3 Aug 2023 16:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGv4K2fhqz4WYp; Thu, 3 Aug 2023 16:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pTxIZwAww5wrlY0aWLDv6fRobPkzHPKNhEdzTH7BIQ=; b=tLGMb5Wr20bb2HsQYv0zsEJ+21in4I9XDM0dr73jYySAjRhweBjcY02DHLrHxw2s2rWnjm ZGsbG7SAjFcVUkiCQ5IMpPojfDN5Mi83w8Ql9eQHiz5IY2VWmv16m+llO4qgfCXx++ANn3 zIqj2HW94kAZyBoLoB6WHx65cE0rDozZuV2qtYg9Rs+JHc5gGQovNY/9hjBOTcR9uRMd7G CDMy89NinspD2wNikdEo8AT6vHcUZdl2NguXhsuOVqIFmIMJvd4gkLyxJ9hDZJUNDdKgJV HZsiTCfvmqo3Gju7OderESs6tLNoqHiUrwxfmZ4gENjw/2JpiL38Hqydib6SlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7pTxIZwAww5wrlY0aWLDv6fRobPkzHPKNhEdzTH7BIQ=; b=OsmG8f5Vl/cpbY0LNJNLKMCZoxhp4Nxq1NnqE95tHPhOmcdtd4eAKhIjsos+ZXg56EQj/k Kj2zHGXG+Ah01I2Ppl30H3mKVdDDtXP0wkC8NTdfgMyFi9c7ys6xuGV9lNmhtG9mvXlLNf Whq/p8VADfO8K0P0/6eoFbDAZ58yfI5msWdsVsR/wniUwSiGa5fJbrqwLsrC6v4Gk5GjpT fkBuGdzAw+6RyEz4bi8ngstL8KUbr/SipsHKS6Lu+zoaLodRCUkNNlXiJS/nnmZEPx+GcJ 1NfkTmUHZwYb/QSqzOGvyr1s4+5pHpJv5Q0HOAfl5cOo1drnrFwPyKZH0a60pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079121; a=rsa-sha256; cv=none; b=UIfse6ETHxo0K/U59dMreSCsslSduaK6b4ksQleUOdXzbROt4MDiz3QOr2sbicR8XyO/eA NowuH2qRJ1xG7FzyiOnGRN7rVmzwnd2BIT2YJOrbN675CB5B2DdmOvcLKv1HO/7zCIOzly zSqjVBK5b2wkaJZZxbrX4P6B+P0h+zF1VPwgA60I31bbhUJfjnGJYrqVUwMmYavVj4oQEB bUCuWAC2XCXvgMxYZZBOpVXao8IvXG7RiXMLdADf307yPF19BZ4GB60jL2HPWVLFttTenz GrV1h+UXNzuOEKOyiuqCKlk3Z9Pm5+WZUQZdDnJ21m5FVplDPrIjQ/CwdHcS7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4K1m7PzCK2; Thu, 3 Aug 2023 16:12: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 373GC17g006054; Thu, 3 Aug 2023 16:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC1VB006053; Thu, 3 Aug 2023 16:12:01 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:01 GMT Message-Id: <202308031612.373GC1VB006053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f56dbe7ad92f - main - intelspi: Move ACPI/PCI ids table out of header 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f56dbe7ad92f97394690dca21f105d3a44fb7701 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f56dbe7ad92f97394690dca21f105d3a44fb7701 commit f56dbe7ad92f97394690dca21f105d3a44fb7701 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 intelspi: Move ACPI/PCI ids table out of header file. There is no reason to store it multiple times. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41244 --- sys/dev/intel/spi.c | 23 +++++++++++++++++++++++ sys/dev/intel/spi.h | 30 +----------------------------- sys/dev/intel/spi_acpi.c | 7 ++++--- sys/dev/intel/spi_pci.c | 27 ++++++++++++++------------- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index c2308c20f8cd..42caed0c1c02 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -109,6 +109,29 @@ #define SPI_CS_CTRL_HW_MODE (1 << 0) #define SPI_CS_CTRL_CS_HIGH (1 << 1) +/* Same order as intelspi_vers */ +static const struct intelspi_info { + uint32_t reg_lpss_base; + uint32_t reg_cs_ctrl; +} intelspi_infos[] = { + [SPI_BAYTRAIL] = { + .reg_lpss_base = 0x400, + .reg_cs_ctrl = 0x18, + }, + [SPI_BRASWELL] = { + .reg_lpss_base = 0x400, + .reg_cs_ctrl = 0x18, + }, + [SPI_LYNXPOINT] = { + .reg_lpss_base = 0x800, + .reg_cs_ctrl = 0x18, + }, + [SPI_SUNRISEPOINT] = { + .reg_lpss_base = 0x200, + .reg_cs_ctrl = 0x24, + }, +}; + static void intelspi_intr(void *); static int diff --git a/sys/dev/intel/spi.h b/sys/dev/intel/spi.h index 31b708572630..bd79ec1e812a 100644 --- a/sys/dev/intel/spi.h +++ b/sys/dev/intel/spi.h @@ -41,38 +41,10 @@ enum intelspi_vers { SPI_SUNRISEPOINT, }; -/* Same order as intelspi_vers */ -static const struct intelspi_info { - const char *desc; - uint32_t reg_lpss_base; - uint32_t reg_cs_ctrl; -} intelspi_infos[] = { - [SPI_BAYTRAIL] = { - .desc = "Intel Bay Trail SPI Controller", - .reg_lpss_base = 0x400, - .reg_cs_ctrl = 0x18, - }, - [SPI_BRASWELL] = { - .desc = "Intel Braswell SPI Controller", - .reg_lpss_base = 0x400, - .reg_cs_ctrl = 0x18, - }, - [SPI_LYNXPOINT] = { - .desc = "Intel Lynx Point / Wildcat Point SPI Controller", - .reg_lpss_base = 0x800, - .reg_cs_ctrl = 0x18, - }, - [SPI_SUNRISEPOINT] = { - .desc = "Intel Sunrise Point SPI Controller", - .reg_lpss_base = 0x200, - .reg_cs_ctrl = 0x24, - }, -}; - struct intelspi_softc { ACPI_HANDLE sc_handle; device_t sc_dev; - enum intelspi_vers sc_vers; + enum intelspi_vers sc_vers; struct mtx sc_mtx; int sc_mem_rid; struct resource *sc_mem_res; diff --git a/sys/dev/intel/spi_acpi.c b/sys/dev/intel/spi_acpi.c index 4c22d7a351c4..033eb047cb29 100644 --- a/sys/dev/intel/spi_acpi.c +++ b/sys/dev/intel/spi_acpi.c @@ -42,9 +42,10 @@ static const struct intelspi_acpi_device { const char *hid; enum intelspi_vers vers; + const char *desc; } intelspi_acpi_devices[] = { - { "80860F0E", SPI_BAYTRAIL }, - { "8086228E", SPI_BRASWELL }, + { "80860F0E", SPI_BAYTRAIL, "Intel Bay Trail SPI Controller" }, + { "8086228E", SPI_BRASWELL, "Intel Braswell SPI Controller" }, }; static char *intelspi_ids[] = { "80860F0E", "8086228E", NULL }; @@ -66,7 +67,7 @@ intelspi_acpi_probe(device_t dev) if (strcmp(intelspi_acpi_devices[i].hid, hid) == 0) { sc->sc_vers = intelspi_acpi_devices[i].vers; sc->sc_handle = acpi_get_handle(dev); - device_set_desc(dev, intelspi_infos[sc->sc_vers].desc); + device_set_desc(dev, intelspi_acpi_devices[i].desc); return (BUS_PROBE_DEFAULT); } } diff --git a/sys/dev/intel/spi_pci.c b/sys/dev/intel/spi_pci.c index cb2b8bd82bfb..c2c118ca1eae 100644 --- a/sys/dev/intel/spi_pci.c +++ b/sys/dev/intel/spi_pci.c @@ -45,19 +45,20 @@ static struct intelspi_pci_device { uint32_t devid; enum intelspi_vers vers; + const char *desc; } intelspi_pci_devices[] = { - { 0x9c658086, SPI_LYNXPOINT }, - { 0x9c668086, SPI_LYNXPOINT }, - { 0x9ce58086, SPI_LYNXPOINT }, - { 0x9ce68086, SPI_LYNXPOINT }, - { 0x9d298086, SPI_SUNRISEPOINT }, - { 0x9d2a8086, SPI_SUNRISEPOINT }, - { 0xa1298086, SPI_SUNRISEPOINT }, - { 0xa12a8086, SPI_SUNRISEPOINT }, - { 0xa2a98086, SPI_SUNRISEPOINT }, - { 0xa2aa8086, SPI_SUNRISEPOINT }, - { 0xa3a98086, SPI_SUNRISEPOINT }, - { 0xa3aa8086, SPI_SUNRISEPOINT }, + { 0x9c658086, SPI_LYNXPOINT, "Intel Lynx Point-LP SPI Controller-0" }, + { 0x9c668086, SPI_LYNXPOINT, "Intel Lynx Point-LP SPI Controller-1" }, + { 0x9ce58086, SPI_LYNXPOINT, "Intel Wildcat Point SPI Controller-0" }, + { 0x9ce68086, SPI_LYNXPOINT, "Intel Wildcat Point SPI Controller-1" }, + { 0x9d298086, SPI_SUNRISEPOINT, "Intel Sunrise Point-LP SPI Controller-0" }, + { 0x9d2a8086, SPI_SUNRISEPOINT, "Intel Sunrise Point-LP SPI Controller-1" }, + { 0xa1298086, SPI_SUNRISEPOINT, "Intel Sunrise Point-H SPI Controller-0" }, + { 0xa12a8086, SPI_SUNRISEPOINT, "Intel Sunrise Point-H SPI Controller-1" }, + { 0xa2a98086, SPI_SUNRISEPOINT, "Intel Kaby Lake-H SPI Controller-0" }, + { 0xa2aa8086, SPI_SUNRISEPOINT, "Intel Kaby Lake-H SPI Controller-1" }, + { 0xa3a98086, SPI_SUNRISEPOINT, "Intel Comet Lake-V SPI Controller-0" }, + { 0xa3aa8086, SPI_SUNRISEPOINT, "Intel Comet Lake-V SPI Controller-1" }, }; static int @@ -73,7 +74,7 @@ intelspi_pci_probe(device_t dev) /* The PCI device is listed in ACPI too. * Not that we use the handle for anything... */ sc->sc_handle = acpi_get_handle(dev); - device_set_desc(dev, intelspi_infos[sc->sc_vers].desc); + device_set_desc(dev, intelspi_pci_devices[i].desc); return (BUS_PROBE_DEFAULT); } } From nobody Thu Aug 3 16:12: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 4RGv4L69RXz3cPF3; Thu, 3 Aug 2023 16:12: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 4RGv4L3hFxz4WwC; Thu, 3 Aug 2023 16:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2dFZFONzUNnP3hF2Vq/JjfPtCptilKJULB3wLB1O8A=; b=vr/0OSaphK5/zuUmy5DG9Pd7JhEos5ephHXUOsnm92yJ71ueUv53efl0UDu75Y0oh3aJNa cjjC7HVUbU6OfMvfpSTZ7zOU03wxTn6it1zQXKCgbf4GIhjcP9Wmg3JRPnoD7iv1irBNMZ Zso/IPgsbUMFPwNpyIqv9wG5UDWyFVuA5x8jQ+mid4L+sezCeazcDh4IQlFkRn8psgC6Ej zOhUSDlXIxLgLUlm20biZlsKzPWBN9XiGW2KGjPQikA7zofnsu6MrmEj15a+DEecr+daf8 Ifg3gDoZd0g0SW7mY9lvOxbNTOhEk0aAJvWYOPzo6gUibmo/upzGIl0QjGn8xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2dFZFONzUNnP3hF2Vq/JjfPtCptilKJULB3wLB1O8A=; b=Xl/BfQoZqeG2l3I08GTpfmvgAfnvR9EbXaKG2VlxhH27TcCmnrn1wJmwP3SllQ00nHmAVC Oy0da+WIG/EUc1cjp2/zDQqr4sjgo2Xtk6PUaPjs9hfhrLkKmLn0PoovTwF+pixH/Bi4iY QS9afaXtSkArLz+ZXbDqyacCKexZLnkddUn1n/tfJ5ZkPPDXmTpoVnv5BhG2296AiWJph0 ts6PMsBqyeyV5D/OWMVaj/J6LtJBq8j0RLXjfcJqzYx2NOV0/mFCiBjQpdHXA8W6cskZZF JQM9h/a4gx/P0MrrLju0UyqHjHpsWAgC6rih3hfMnykt59ivsES5jSPUwYbcJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079122; a=rsa-sha256; cv=none; b=jJkgJoZC9J5UIcnmbSz8hjFORDZJG/xc4ywpb67wQdTnYIlU83HxNjwF+qwItf7cRoNARo 5OdCkg3x0mD2qOk2H85c97EQ3c9pXNfn2VPxyubGieOuTfUop3wLB/2CPZpCDUKb0ZWWyT 4Tcf2C9jMX1Pqc1HxHjmfIFFWttl4TmvF1Pn/rMKt5LT6IbifAK0bAPLBC8wPRwABKkvyo 45LeqRAaup+WA0NmiEDTdiVmwU/QoZX8n1EnuZ45gHsc7wR514tGv3ffidL4ijj8QXNWVc sbG9g32wmktFN6qpvl9cMQSjajiSX5+d+MIkFlQO74tR+QOaTcrhIGEYt0PzMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4L2hCqzCBS; Thu, 3 Aug 2023 16:12: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 373GC2ID006075; Thu, 3 Aug 2023 16:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC2Uu006074; Thu, 3 Aug 2023 16:12:02 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:02 GMT Message-Id: <202308031612.373GC2Uu006074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b109946d7564 - main - intelspi: Release LPSS reset on Sunrise Point controllers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b109946d7564afde6f3d3b3a78f428c8da14e17c Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b109946d7564afde6f3d3b3a78f428c8da14e17c commit b109946d7564afde6f3d3b3a78f428c8da14e17c Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 intelspi: Release LPSS reset on Sunrise Point controllers. MacBookPro 14.1 SPI controller requires that to start functioning. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41245 --- sys/dev/intel/spi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 42caed0c1c02..6dd063511e26 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -109,6 +109,10 @@ #define SPI_CS_CTRL_HW_MODE (1 << 0) #define SPI_CS_CTRL_CS_HIGH (1 << 1) +#define INTELSPI_RESETS 0x204 +#define INTELSPI_RESET_HOST (1 << 0) | (1 << 1) +#define INTELSPI_RESET_DMA (1 << 2) + /* Same order as intelspi_vers */ static const struct intelspi_info { uint32_t reg_lpss_base; @@ -477,6 +481,11 @@ intelspi_attach(device_t dev) goto error; } + /* Release LPSS reset */ + if (sc->sc_vers == SPI_SUNRISEPOINT) + INTELSPI_WRITE(sc, INTELSPI_RESETS, + (INTELSPI_RESET_HOST | INTELSPI_RESET_DMA)); + sc->sc_irq_res = bus_alloc_resource_any(sc->sc_dev, SYS_RES_IRQ, &sc->sc_irq_rid, RF_ACTIVE | RF_SHAREABLE); if (sc->sc_irq_res == NULL) { From nobody Thu Aug 3 16: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 4RGv4M5pCfz3cNkf; Thu, 3 Aug 2023 16: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 4RGv4M40xmz4WwZ; Thu, 3 Aug 2023 16: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=1691079123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiYB2Tv4+bv1PVf6955cUM6n9jXODsScZI8TdBRULhE=; b=qSKkmSuB/ujMZGBNn/Vj0xqn+H73vxq7jZtCAgUBdnyfY8HV7dG23m4ZWvlIHvLC0Mwhfi 0eMLe1LTXMujzVTtReU+AODg+SlyN9N7BZ9WmtLqrZQefp7uc3Hl4uxI5AOoDwmo9DyJPL ZEAE3jbLwA7MGI+7Fdcehl91uS/2EfRvOJdUOEh+Ac4qlcmJhEsKd0JsgGqQ5+XH/DgAeg 4BI+CfINaodLgArIc75m3LM+j6LLc0i13rtKBoUa1J9caoXYSfq3pCVxp1yBP0ctt2iPYs Pk3tsfUYFsptyteKqEVVBnjyap7FZG/1FxA8m1L5ySZ2CGYnd0e2IOOtc9zfSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiYB2Tv4+bv1PVf6955cUM6n9jXODsScZI8TdBRULhE=; b=AeUzs9wjsWR41MCq0NMDyUBddHNxEyELdNPSaueNiKmPDQ3BrWSV3Vhe6PfoY9jNP0m6L2 VjCJguZ0BfaZhbRneysEysJbdFCfw+3DNiuYFjZLuCnV9cBxRBz30n/roRqjCjXuWOr5q3 ad7EzQGlcp3YzPuXIlRu2JXQO3kWKRm2A9TGzNS57ew2Ft7DW2DCNkV77YNDf1AwJVO4OC D6fQBILG2giu0yv8uva7njsrQl/yT8WSPtz5Az2ZD4r4jpO+YdWSLq+qHoFNthSg+yFuB0 fH5yFB3hb8PdCXZXTv8dbJvCpxV30cjLPLlTON4Oojvl5R+q9Z9B3A6t3880fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079123; a=rsa-sha256; cv=none; b=n+tmiPvdpdRA2PsUSJpsrp3BRN+0rXoXiohO6MSpOVkcE+GvAYfmaVLCa0JtU4okYrDc3J bEOYucbhEppu8PKO8kl4DEm1p8747PgKFUiqlSMaUjek9+WewrVsdSKSsPL/oXXsKep40x zwD/J0J/uqt10qbynoK+keR0M3EuxYjeiuOdr+Y5aGduowopkkWVKCnA+VfwYekYL5W8Pp eHYsv2URDAAZwVCeRWEWAEngOg2uuJ4bx2XUzReS52MJOhsLQ3YUaP/KdsIXnM3Prwf3YT CzFbmmhuCNishc5Rg80BSdUCAo00DeZzaqMo7Xw1BREkC9d4op6Mq3a/ok+nwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4M35dXzC2S; Thu, 3 Aug 2023 16: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 373GC3dP006107; Thu, 3 Aug 2023 16: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 373GC3Io006106; Thu, 3 Aug 2023 16:12:03 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:03 GMT Message-Id: <202308031612.373GC3Io006106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 4b1712817e56 - main - hid: Add child device parameter to HID methods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b1712817e56840acc5e9fd59028ef79007ff579 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=4b1712817e56840acc5e9fd59028ef79007ff579 commit 4b1712817e56840acc5e9fd59028ef79007ff579 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 hid: Add child device parameter to HID methods Some devices like Apple HID-over-SPI may contain more than one report descriptors necessitating creation of multiple hidbus children. Add indentificator of child devices to distinct them. No functional changes intended. Differential Revision: https://reviews.freebsd.org/D41246 --- sys/dev/hid/hid.c | 19 ++++++----- sys/dev/hid/hid_if.m | 13 ++++++++ sys/dev/hid/hidbus.c | 78 +++++++++++++++++++++++++++++++++++-------- sys/dev/hyperv/input/hv_hid.c | 13 ++++---- sys/dev/iicbus/iichid.c | 37 +++++++++++--------- sys/dev/usb/input/usbhid.c | 37 +++++++++++--------- 6 files changed, 136 insertions(+), 61 deletions(-) diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c index cd7fb6bf8778..7fa6e34be22a 100644 --- a/sys/dev/hid/hid.c +++ b/sys/dev/hid/hid.c @@ -1031,52 +1031,53 @@ hid_quirk_unload(void *arg) int hid_get_rdesc(device_t dev, void *data, hid_size_t len) { - return (HID_GET_RDESC(device_get_parent(dev), data, len)); + return (HID_GET_RDESC(device_get_parent(dev), dev, data, len)); } int hid_read(device_t dev, void *data, hid_size_t maxlen, hid_size_t *actlen) { - return (HID_READ(device_get_parent(dev), data, maxlen, actlen)); + return (HID_READ(device_get_parent(dev), dev, data, maxlen, actlen)); } int hid_write(device_t dev, const void *data, hid_size_t len) { - return (HID_WRITE(device_get_parent(dev), data, len)); + return (HID_WRITE(device_get_parent(dev), dev, data, len)); } int hid_get_report(device_t dev, void *data, hid_size_t maxlen, hid_size_t *actlen, uint8_t type, uint8_t id) { - return (HID_GET_REPORT(device_get_parent(dev), data, maxlen, actlen, - type, id)); + return (HID_GET_REPORT(device_get_parent(dev), dev, data, maxlen, + actlen, type, id)); } int hid_set_report(device_t dev, const void *data, hid_size_t len, uint8_t type, uint8_t id) { - return (HID_SET_REPORT(device_get_parent(dev), data, len, type, id)); + return (HID_SET_REPORT(device_get_parent(dev), dev, data, len, type, + id)); } int hid_set_idle(device_t dev, uint16_t duration, uint8_t id) { - return (HID_SET_IDLE(device_get_parent(dev), duration, id)); + return (HID_SET_IDLE(device_get_parent(dev), dev, duration, id)); } int hid_set_protocol(device_t dev, uint16_t protocol) { - return (HID_SET_PROTOCOL(device_get_parent(dev), protocol)); + return (HID_SET_PROTOCOL(device_get_parent(dev), dev, protocol)); } int hid_ioctl(device_t dev, unsigned long cmd, uintptr_t data) { - return (HID_IOCTL(device_get_parent(dev), cmd, data)); + return (HID_IOCTL(device_get_parent(dev), dev, cmd, data)); } MODULE_VERSION(hid, 1); diff --git a/sys/dev/hid/hid_if.m b/sys/dev/hid/hid_if.m index 38a053b8744e..9050620ccea6 100644 --- a/sys/dev/hid/hid_if.m +++ b/sys/dev/hid/hid_if.m @@ -49,6 +49,7 @@ INTERFACE hid; # METHOD void intr_setup { device_t dev; + device_t child; hid_intr_t intr; void *context; struct hid_rdesc_info *rdesc; @@ -59,6 +60,7 @@ METHOD void intr_setup { # METHOD void intr_unsetup { device_t dev; + device_t child; }; # @@ -66,6 +68,7 @@ METHOD void intr_unsetup { # METHOD int intr_start { device_t dev; + device_t child; }; # @@ -73,6 +76,7 @@ METHOD int intr_start { # METHOD int intr_stop { device_t dev; + device_t child; }; # @@ -82,6 +86,7 @@ METHOD int intr_stop { # METHOD void intr_poll { device_t dev; + device_t child; }; # HID interface @@ -91,6 +96,7 @@ METHOD void intr_poll { # METHOD int get_rdesc { device_t dev; + device_t child; void *data; hid_size_t len; }; @@ -102,6 +108,7 @@ METHOD int get_rdesc { # METHOD int read { device_t dev; + device_t child; void *data; hid_size_t maxlen; hid_size_t *actlen; @@ -113,6 +120,7 @@ METHOD int read { # METHOD int write { device_t dev; + device_t child; const void *data; hid_size_t len; }; @@ -127,6 +135,7 @@ METHOD int write { # METHOD int get_report { device_t dev; + device_t child; void *data; hid_size_t maxlen; hid_size_t *actlen; @@ -142,6 +151,7 @@ METHOD int get_report { # METHOD int set_report { device_t dev; + device_t child; const void *data; hid_size_t len; uint8_t type; @@ -153,6 +163,7 @@ METHOD int set_report { # METHOD int set_idle { device_t dev; + device_t child; uint16_t duration; uint8_t id; }; @@ -162,6 +173,7 @@ METHOD int set_idle { # METHOD int set_protocol { device_t dev; + device_t child; uint16_t protocol; }; @@ -171,6 +183,7 @@ METHOD int set_protocol { # METHOD int ioctl { device_t dev; + device_t child; unsigned long cmd; uintptr_t data; }; diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index 6ecc7455cc5d..fe6c4df060a3 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -257,7 +257,8 @@ hidbus_attach_children(device_t dev) struct hidbus_softc *sc = device_get_softc(dev); int error; - HID_INTR_SETUP(device_get_parent(dev), hidbus_intr, sc, &sc->rdesc); + HID_INTR_SETUP(device_get_parent(dev), dev, hidbus_intr, sc, + &sc->rdesc); error = hidbus_enumerate_children(dev, sc->rdesc.data, sc->rdesc.len); if (error != 0) @@ -327,7 +328,7 @@ hidbus_detach_children(device_t dev) free(children, M_TEMP); } - HID_INTR_UNSETUP(device_get_parent(bus)); + HID_INTR_UNSETUP(device_get_parent(bus), bus); return (error); } @@ -479,7 +480,7 @@ hidbus_write_ivar(device_t bus, device_t child, int which, uintptr_t value) tlc->flags = value; if ((value & HIDBUS_FLAG_CAN_POLL) != 0) HID_INTR_SETUP( - device_get_parent(bus), NULL, NULL, NULL); + device_get_parent(bus), bus, NULL, NULL, NULL); break; case HIDBUS_IVAR_DRIVER_INFO: tlc->driver_info = value; @@ -623,7 +624,7 @@ hidbus_intr_start(device_t child) mtx_unlock(tlc->mtx); } } - error = refcnted ? 0 : HID_INTR_START(device_get_parent(bus)); + error = refcnted ? 0 : HID_INTR_START(device_get_parent(bus), bus); sx_unlock(&sc->sx); return (error); @@ -650,7 +651,7 @@ hidbus_intr_stop(device_t child) } refcnted |= (tlc->refcnt != 0); } - error = refcnted ? 0 : HID_INTR_STOP(device_get_parent(bus)); + error = refcnted ? 0 : HID_INTR_STOP(device_get_parent(bus), bus); sx_unlock(&sc->sx); return (error); @@ -661,7 +662,7 @@ hidbus_intr_poll(device_t child) { device_t bus = device_get_parent(child); - HID_INTR_POLL(device_get_parent(bus)); + HID_INTR_POLL(device_get_parent(bus), bus); } struct hid_rdesc_info * @@ -761,7 +762,22 @@ hid_set_report_descr(device_t dev, const void *data, hid_size_t len) } static int -hidbus_write(device_t dev, const void *data, hid_size_t len) +hidbus_get_rdesc(device_t dev, device_t child __unused, void *data, + hid_size_t len) +{ + return (hid_get_rdesc(dev, data, len)); +} + +static int +hidbus_read(device_t dev, device_t child __unused, void *data, + hid_size_t maxlen, hid_size_t *actlen) +{ + return (hid_read(dev, data, maxlen, actlen)); +} + +static int +hidbus_write(device_t dev, device_t child __unused, const void *data, + hid_size_t len) { struct hidbus_softc *sc; uint8_t id; @@ -780,6 +796,40 @@ hidbus_write(device_t dev, const void *data, hid_size_t len) return (hid_write(dev, data, len)); } +static int +hidbus_get_report(device_t dev, device_t child __unused, void *data, + hid_size_t maxlen, hid_size_t *actlen, uint8_t type, uint8_t id) +{ + return (hid_get_report(dev, data, maxlen, actlen, type, id)); +} + +static int +hidbus_set_report(device_t dev, device_t child __unused, const void *data, + hid_size_t len, uint8_t type, uint8_t id) +{ + return (hid_set_report(dev, data, len, type, id)); +} + +static int +hidbus_set_idle(device_t dev, device_t child __unused, uint16_t duration, + uint8_t id) +{ + return (hid_set_idle(dev, duration, id)); +} + +static int +hidbus_set_protocol(device_t dev, device_t child __unused, uint16_t protocol) +{ + return (hid_set_protocol(dev, protocol)); +} + +static int +hidbus_ioctl(device_t dev, device_t child __unused, unsigned long cmd, + uintptr_t data) +{ + return (hid_ioctl(dev, cmd, data)); +} + /*------------------------------------------------------------------------* * hidbus_lookup_id * @@ -904,14 +954,14 @@ static device_method_t hidbus_methods[] = { DEVMETHOD(bus_child_location, hidbus_child_location), /* hid interface */ - DEVMETHOD(hid_get_rdesc, hid_get_rdesc), - DEVMETHOD(hid_read, hid_read), + DEVMETHOD(hid_get_rdesc, hidbus_get_rdesc), + DEVMETHOD(hid_read, hidbus_read), DEVMETHOD(hid_write, hidbus_write), - DEVMETHOD(hid_get_report, hid_get_report), - DEVMETHOD(hid_set_report, hid_set_report), - DEVMETHOD(hid_set_idle, hid_set_idle), - DEVMETHOD(hid_set_protocol, hid_set_protocol), - DEVMETHOD(hid_ioctl, hid_ioctl), + DEVMETHOD(hid_get_report, hidbus_get_report), + DEVMETHOD(hid_set_report, hidbus_set_report), + DEVMETHOD(hid_set_idle, hidbus_set_idle), + DEVMETHOD(hid_set_protocol, hidbus_set_protocol), + DEVMETHOD(hid_ioctl, hidbus_ioctl), DEVMETHOD_END }; diff --git a/sys/dev/hyperv/input/hv_hid.c b/sys/dev/hyperv/input/hv_hid.c index d576b292e12e..b8fc9605bf67 100644 --- a/sys/dev/hyperv/input/hv_hid.c +++ b/sys/dev/hyperv/input/hv_hid.c @@ -473,8 +473,8 @@ hv_hid_detach(device_t dev) } static void -hv_hid_intr_setup(device_t dev, hid_intr_t intr, void *ctx, - struct hid_rdesc_info *rdesc) +hv_hid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, + void *ctx, struct hid_rdesc_info *rdesc) { hv_hid_sc *sc; @@ -489,7 +489,7 @@ hv_hid_intr_setup(device_t dev, hid_intr_t intr, void *ctx, } static void -hv_hid_intr_unsetup(device_t dev) +hv_hid_intr_unsetup(device_t dev, device_t child __unused) { hv_hid_sc *sc; @@ -500,7 +500,7 @@ hv_hid_intr_unsetup(device_t dev) } static int -hv_hid_intr_start(device_t dev) +hv_hid_intr_start(device_t dev, device_t child __unused) { hv_hid_sc *sc; @@ -512,7 +512,7 @@ hv_hid_intr_start(device_t dev) } static int -hv_hid_intr_stop(device_t dev) +hv_hid_intr_stop(device_t dev, device_t child __unused) { hv_hid_sc *sc; @@ -524,7 +524,8 @@ hv_hid_intr_stop(device_t dev) } static int -hv_hid_get_rdesc(device_t dev, void *buf, hid_size_t len) +hv_hid_get_rdesc(device_t dev, device_t child __unused, void *buf, + hid_size_t len) { hv_hid_sc *sc; diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 3e481ccd4417..a5da6df5eba3 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -791,8 +791,8 @@ iichid_sysctl_sampling_rate_handler(SYSCTL_HANDLER_ARGS) #endif /* IICHID_SAMPLING */ static void -iichid_intr_setup(device_t dev, hid_intr_t intr, void *context, - struct hid_rdesc_info *rdesc) +iichid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, + void *context, struct hid_rdesc_info *rdesc) { struct iichid_softc *sc; @@ -820,7 +820,7 @@ iichid_intr_setup(device_t dev, hid_intr_t intr, void *context, } static void -iichid_intr_unsetup(device_t dev) +iichid_intr_unsetup(device_t dev, device_t child __unused) { struct iichid_softc *sc; @@ -832,7 +832,7 @@ iichid_intr_unsetup(device_t dev) } static int -iichid_intr_start(device_t dev) +iichid_intr_start(device_t dev, device_t child __unused) { struct iichid_softc *sc; @@ -844,7 +844,7 @@ iichid_intr_start(device_t dev) } static int -iichid_intr_stop(device_t dev) +iichid_intr_stop(device_t dev, device_t child __unused) { struct iichid_softc *sc; @@ -862,7 +862,7 @@ iichid_intr_stop(device_t dev) } static void -iichid_intr_poll(device_t dev) +iichid_intr_poll(device_t dev, device_t child __unused) { struct iichid_softc *sc; iichid_size_t actual; @@ -878,7 +878,8 @@ iichid_intr_poll(device_t dev) * HID interface */ static int -iichid_get_rdesc(device_t dev, void *buf, hid_size_t len) +iichid_get_rdesc(device_t dev, device_t child __unused, void *buf, + hid_size_t len) { struct iichid_softc *sc; int error; @@ -892,7 +893,8 @@ iichid_get_rdesc(device_t dev, void *buf, hid_size_t len) } static int -iichid_read(device_t dev, void *buf, hid_size_t maxlen, hid_size_t *actlen) +iichid_read(device_t dev, device_t child __unused, void *buf, + hid_size_t maxlen, hid_size_t *actlen) { struct iichid_softc *sc; device_t parent; @@ -911,7 +913,8 @@ iichid_read(device_t dev, void *buf, hid_size_t maxlen, hid_size_t *actlen) } static int -iichid_write(device_t dev, const void *buf, hid_size_t len) +iichid_write(device_t dev, device_t child __unused, const void *buf, + hid_size_t len) { struct iichid_softc *sc; @@ -922,8 +925,8 @@ iichid_write(device_t dev, const void *buf, hid_size_t len) } static int -iichid_get_report(device_t dev, void *buf, hid_size_t maxlen, - hid_size_t *actlen, uint8_t type, uint8_t id) +iichid_get_report(device_t dev, device_t child __unused, void *buf, + hid_size_t maxlen, hid_size_t *actlen, uint8_t type, uint8_t id) { struct iichid_softc *sc; @@ -935,8 +938,8 @@ iichid_get_report(device_t dev, void *buf, hid_size_t maxlen, } static int -iichid_set_report(device_t dev, const void *buf, hid_size_t len, uint8_t type, - uint8_t id) +iichid_set_report(device_t dev, device_t child __unused, const void *buf, + hid_size_t len, uint8_t type, uint8_t id) { struct iichid_softc *sc; @@ -947,19 +950,21 @@ iichid_set_report(device_t dev, const void *buf, hid_size_t len, uint8_t type, } static int -iichid_set_idle(device_t dev, uint16_t duration, uint8_t id) +iichid_set_idle(device_t dev, device_t child __unused, + uint16_t duration, uint8_t id) { return (ENOTSUP); } static int -iichid_set_protocol(device_t dev, uint16_t protocol) +iichid_set_protocol(device_t dev, device_t child __unused, uint16_t protocol) { return (ENOTSUP); } static int -iichid_ioctl(device_t dev, unsigned long cmd, uintptr_t data) +iichid_ioctl(device_t dev, device_t child __unused, unsigned long cmd, + uintptr_t data) { int error; diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index 95be0b647da9..a88d2cfac1c2 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.c @@ -333,8 +333,8 @@ usbhid_xfer_check_len(struct usbhid_softc* sc, int xfer_idx, hid_size_t len) } static void -usbhid_intr_setup(device_t dev, hid_intr_t intr, void *context, - struct hid_rdesc_info *rdesc) +usbhid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, + void *context, struct hid_rdesc_info *rdesc) { struct usbhid_softc* sc = device_get_softc(dev); uint16_t n; @@ -406,7 +406,7 @@ usbhid_intr_setup(device_t dev, hid_intr_t intr, void *context, } static void -usbhid_intr_unsetup(device_t dev) +usbhid_intr_unsetup(device_t dev, device_t child __unused) { struct usbhid_softc* sc = device_get_softc(dev); @@ -419,7 +419,7 @@ usbhid_intr_unsetup(device_t dev) } static int -usbhid_intr_start(device_t dev) +usbhid_intr_start(device_t dev, device_t child __unused) { struct usbhid_softc* sc = device_get_softc(dev); @@ -450,7 +450,7 @@ usbhid_intr_start(device_t dev) } static int -usbhid_intr_stop(device_t dev) +usbhid_intr_stop(device_t dev, device_t child __unused) { struct usbhid_softc* sc = device_get_softc(dev); @@ -463,7 +463,7 @@ usbhid_intr_stop(device_t dev) } static void -usbhid_intr_poll(device_t dev) +usbhid_intr_poll(device_t dev, device_t child __unused) { struct usbhid_softc* sc = device_get_softc(dev); @@ -538,7 +538,8 @@ usbhid_sync_xfer(struct usbhid_softc* sc, int xfer_idx, } static int -usbhid_get_rdesc(device_t dev, void *buf, hid_size_t len) +usbhid_get_rdesc(device_t dev, device_t child __unused, void *buf, + hid_size_t len) { struct usbhid_softc* sc = device_get_softc(dev); int error; @@ -553,8 +554,8 @@ usbhid_get_rdesc(device_t dev, void *buf, hid_size_t len) } static int -usbhid_get_report(device_t dev, void *buf, hid_size_t maxlen, - hid_size_t *actlen, uint8_t type, uint8_t id) +usbhid_get_report(device_t dev, device_t child __unused, void *buf, + hid_size_t maxlen, hid_size_t *actlen, uint8_t type, uint8_t id) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -579,8 +580,8 @@ usbhid_get_report(device_t dev, void *buf, hid_size_t maxlen, } static int -usbhid_set_report(device_t dev, const void *buf, hid_size_t len, uint8_t type, - uint8_t id) +usbhid_set_report(device_t dev, device_t child __unused, const void *buf, + hid_size_t len, uint8_t type, uint8_t id) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -602,7 +603,8 @@ usbhid_set_report(device_t dev, const void *buf, hid_size_t len, uint8_t type, } static int -usbhid_read(device_t dev, void *buf, hid_size_t maxlen, hid_size_t *actlen) +usbhid_read(device_t dev, device_t child __unused, void *buf, + hid_size_t maxlen, hid_size_t *actlen) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -621,7 +623,8 @@ usbhid_read(device_t dev, void *buf, hid_size_t maxlen, hid_size_t *actlen) } static int -usbhid_write(device_t dev, const void *buf, hid_size_t len) +usbhid_write(device_t dev, device_t child __unused, const void *buf, + hid_size_t len) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -637,7 +640,8 @@ usbhid_write(device_t dev, const void *buf, hid_size_t len) } static int -usbhid_set_idle(device_t dev, uint16_t duration, uint8_t id) +usbhid_set_idle(device_t dev, device_t child __unused, uint16_t duration, + uint8_t id) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -659,7 +663,7 @@ usbhid_set_idle(device_t dev, uint16_t duration, uint8_t id) } static int -usbhid_set_protocol(device_t dev, uint16_t protocol) +usbhid_set_protocol(device_t dev, device_t child __unused, uint16_t protocol) { struct usbhid_softc* sc = device_get_softc(dev); union usbhid_device_request req; @@ -680,7 +684,8 @@ usbhid_set_protocol(device_t dev, uint16_t protocol) } static int -usbhid_ioctl(device_t dev, unsigned long cmd, uintptr_t data) +usbhid_ioctl(device_t dev, device_t child __unused, unsigned long cmd, + uintptr_t data) { struct usbhid_softc* sc = device_get_softc(dev); struct usb_ctl_request *ucr; From nobody Thu Aug 3 16: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 4RGv4P0Qlhz3cNvd; Thu, 3 Aug 2023 16:12: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 4RGv4N4khWz4Www; Thu, 3 Aug 2023 16: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=1691079124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpx8EDvbGvsuFtfo3vrYx+xBQyYolaFY3VlRuA3Quew=; b=OzwpK1eNJoIbvvUNc3QRx6L2YbBiHgAyfqB/AQIgL+S5kNfPBJgzk4PDRm/t+t/2lhTRbT bTpV0Z5YkrMRy5S8/PsJhvOo68K122E2+JJL/nDWF+Qc6ic4vnLeJ3qSqX3CcEMNo7FWXG RyH6JbSAyjdZFEVvpU/eu+xr1AyBqRoQjWsnnsjeREkZJKJtJ6YiMOLjk2x5jjliI8UTRK j80AiotHsfxV00l+57ThqfQ9SHIK9lNFBFi/okF49VmrlhqKVegKYAW0lyYxh3xFPMZ+op gVc/fhdFyBsgLsJxoH/20mXjcBlV5neZEc55/V7okkFdntCyHGKM8tV1gNDb5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpx8EDvbGvsuFtfo3vrYx+xBQyYolaFY3VlRuA3Quew=; b=YRWDFCYRRv1eO+H7G1Id0ZYKJDoGkFVOlGWzMoxKAn1cKwWZHgWUxnVVcEFAXwXyqJYMs1 cTevr8ZMpsAPpwGBUHhN/Fyo3UiSD9euinxJaTL9X4A7yB70N9Ik075qhdLyJr5VRfHpUo G7UwtjIerp6WsyJI2/FG5mxfEdjSe5+rraOdMzxcrtBYbQ6QwUcKMYHaqROcXWWO/Amzid JtR9Hzeq/KDe/lB4819uEvASSKM+707xO5VRQQUnFYEJvRf9/iZDhVWPm+OqRFAK8NXGJm CX9XIlbICb0MD6N7B5zuO4D/0EmA8Itp4/scOJ8k69oZff7uTJfRh5lBSqM3ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079124; a=rsa-sha256; cv=none; b=T4U299pmD/cOxPXlnQbbvfjRQxATKUq4pyjrruKhsDftxZ72+zhbPeuZXtm8jtRwzAfLro NvOUMyYcwlOZH8q0JCyHLaOVMOvA7rXG+oTwPHN6sjg/eFHMn5i4mDPEl5mgzz3+teCPlf KbPqjzg7ob7OtzjFqpwNemW4/rAnCliBwQMuAx5GM70HIiiqgAMfsTGbMs7m1i2mJ0zx5j 6J3ssMj3YrVtxP32mYIj1jY10oyn0/iAAnvvi/mzi2ppHOC+kQ1i3Trv9TsWWvI8ItvWuC nN9GKwGY4avfDcBsw248zzTrVTdjGlzw+ljgfed3AeiqPMg/kH8gDglSQ86xsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4N3qsdzC2T; Thu, 3 Aug 2023 16: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 373GC4s0006126; Thu, 3 Aug 2023 16: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 373GC4Os006125; Thu, 3 Aug 2023 16:12:04 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:04 GMT Message-Id: <202308031612.373GC4Os006125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 4151ac9f1292 - main - hidbus(4): Use generic hid methods to start and stop interrupts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4151ac9f1292b524ae3eeb6f6c9561913bbe444c Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=4151ac9f1292b524ae3eeb6f6c9561913bbe444c commit 4151ac9f1292b524ae3eeb6f6c9561913bbe444c Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 hidbus(4): Use generic hid methods to start and stop interrupts --- sys/dev/hid/bcm5974.c | 4 ++-- sys/dev/hid/hid.c | 18 ++++++++++++++++++ sys/dev/hid/hid.h | 3 +++ sys/dev/hid/hidbus.c | 27 ++++++++++++++------------- sys/dev/hid/hidbus.h | 3 --- sys/dev/hid/hidmap.c | 4 ++-- sys/dev/hid/hidraw.c | 4 ++-- sys/dev/hid/hkbd.c | 6 +++--- sys/dev/hid/hmt.c | 4 ++-- sys/dev/hid/ietp.c | 8 ++++---- 10 files changed, 50 insertions(+), 31 deletions(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index fdfc29e6b678..9a927aaffc5b 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -837,7 +837,7 @@ bcm5974_ev_open(struct evdev_dev *evdev) return (err); } - return (hidbus_intr_start(sc->sc_dev)); + return (hid_intr_start(sc->sc_dev)); } static int @@ -846,7 +846,7 @@ bcm5974_ev_close(struct evdev_dev *evdev) struct bcm5974_softc *sc = evdev_get_softc(evdev); int err; - err = hidbus_intr_stop(sc->sc_dev); + err = hid_intr_stop(sc->sc_dev); if (err != 0) return (err); diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c index 7fa6e34be22a..6ed72dbe5a00 100644 --- a/sys/dev/hid/hid.c +++ b/sys/dev/hid/hid.c @@ -1028,6 +1028,24 @@ hid_quirk_unload(void *arg) pause("WAIT", hz); } +int +hid_intr_start(device_t dev) +{ + return (HID_INTR_START(device_get_parent(dev), dev)); +} + +int +hid_intr_stop(device_t dev) +{ + return (HID_INTR_STOP(device_get_parent(dev), dev)); +} + +void +hid_intr_poll(device_t dev) +{ + HID_INTR_POLL(device_get_parent(dev), dev); +} + int hid_get_rdesc(device_t dev, void *data, hid_size_t len) { diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h index 5af470df61d1..a267207e49db 100644 --- a/sys/dev/hid/hid.h +++ b/sys/dev/hid/hid.h @@ -333,6 +333,9 @@ int hid_add_dynamic_quirk(struct hid_device_info *dev_info, uint16_t quirk); void hid_quirk_unload(void *arg); +int hid_intr_start(device_t); +int hid_intr_stop(device_t); +void hid_intr_poll(device_t); int hid_get_rdesc(device_t, void *, hid_size_t); int hid_read(device_t, void *, hid_size_t, hid_size_t *); int hid_write(device_t, const void *, hid_size_t); diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index fe6c4df060a3..6dd8ff9b8e6f 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -604,10 +604,10 @@ hidbus_set_intr(device_t child, hid_intr_t *handler, void *context) tlc->intr_ctx = context; } -int -hidbus_intr_start(device_t child) +static int +hidbus_intr_start(device_t bus, device_t child) { - device_t bus = device_get_parent(child); + MPASS(bus = device_get_parent(child)); struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc; @@ -624,16 +624,16 @@ hidbus_intr_start(device_t child) mtx_unlock(tlc->mtx); } } - error = refcnted ? 0 : HID_INTR_START(device_get_parent(bus), bus); + error = refcnted ? 0 : hid_intr_start(bus); sx_unlock(&sc->sx); return (error); } -int -hidbus_intr_stop(device_t child) +static int +hidbus_intr_stop(device_t bus, device_t child) { - device_t bus = device_get_parent(child); + MPASS(bus = device_get_parent(child)); struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc; @@ -651,18 +651,16 @@ hidbus_intr_stop(device_t child) } refcnted |= (tlc->refcnt != 0); } - error = refcnted ? 0 : HID_INTR_STOP(device_get_parent(bus), bus); + error = refcnted ? 0 : hid_intr_stop(bus); sx_unlock(&sc->sx); return (error); } -void -hidbus_intr_poll(device_t child) +static void +hidbus_intr_poll(device_t bus, device_t child __unused) { - device_t bus = device_get_parent(child); - - HID_INTR_POLL(device_get_parent(bus), bus); + hid_intr_poll(bus); } struct hid_rdesc_info * @@ -954,6 +952,9 @@ static device_method_t hidbus_methods[] = { DEVMETHOD(bus_child_location, hidbus_child_location), /* hid interface */ + DEVMETHOD(hid_intr_start, hidbus_intr_start), + DEVMETHOD(hid_intr_stop, hidbus_intr_stop), + DEVMETHOD(hid_intr_poll, hidbus_intr_poll), DEVMETHOD(hid_get_rdesc, hidbus_get_rdesc), DEVMETHOD(hid_read, hidbus_read), DEVMETHOD(hid_write, hidbus_write), diff --git a/sys/dev/hid/hidbus.h b/sys/dev/hid/hidbus.h index b2744add8658..3de4a6291511 100644 --- a/sys/dev/hid/hidbus.h +++ b/sys/dev/hid/hidbus.h @@ -160,9 +160,6 @@ struct hid_rdesc_info *hidbus_get_rdesc_info(device_t); int hidbus_lookup_driver_info(device_t, const struct hid_device_id *, int); void hidbus_set_intr(device_t, hid_intr_t*, void *); -int hidbus_intr_start(device_t); -int hidbus_intr_stop(device_t); -void hidbus_intr_poll(device_t); void hidbus_set_desc(device_t, const char *); device_t hidbus_find_child(device_t, int32_t); diff --git a/sys/dev/hid/hidmap.c b/sys/dev/hid/hidmap.c index 8951f14a2361..b97558ad33ef 100644 --- a/sys/dev/hid/hidmap.c +++ b/sys/dev/hid/hidmap.c @@ -118,13 +118,13 @@ _hidmap_set_debug_var(struct hidmap *hm, int *debug_var) static int hidmap_ev_close(struct evdev_dev *evdev) { - return (hidbus_intr_stop(evdev_get_softc(evdev))); + return (hid_intr_stop(evdev_get_softc(evdev))); } static int hidmap_ev_open(struct evdev_dev *evdev) { - return (hidbus_intr_start(evdev_get_softc(evdev))); + return (hid_intr_start(evdev_get_softc(evdev))); } void diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index dd20aba3e588..c18d039286ee 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -379,7 +379,7 @@ hidraw_open(struct cdev *dev, int flag, int mode, struct thread *td) sc->sc_head = sc->sc_tail = 0; sc->sc_fflags = flag; - hidbus_intr_start(sc->sc_dev); + hid_intr_start(sc->sc_dev); return (0); } @@ -392,7 +392,7 @@ hidraw_dtor(void *data) DPRINTF("sc=%p\n", sc); /* Disable interrupts. */ - hidbus_intr_stop(sc->sc_dev); + hid_intr_stop(sc->sc_dev); sc->sc_tail = sc->sc_head = 0; sc->sc_async = 0; diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index 922256a8f23b..b0aa5be11a1e 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -435,7 +435,7 @@ hkbd_do_poll(struct hkbd_softc *sc, uint8_t wait) } while (sc->sc_inputhead == sc->sc_inputtail) { - hidbus_intr_poll(sc->sc_dev); + hid_intr_poll(sc->sc_dev); /* Delay-optimised support for repetition of keys */ if (hkbd_any_key_pressed(sc)) { @@ -1004,7 +1004,7 @@ hkbd_attach(device_t dev) } /* start the keyboard */ - hidbus_intr_start(dev); + hid_intr_start(dev); return (0); /* success */ @@ -1035,7 +1035,7 @@ hkbd_detach(device_t dev) /* kill any stuck keys */ if (sc->sc_flags & HKBD_FLAG_ATTACHED) { /* stop receiving events from the USB keyboard */ - hidbus_intr_stop(dev); + hid_intr_stop(dev); /* release all leftover keys, if any */ memset(&sc->sc_ndata, 0, bitstr_size(HKBD_NKEYCODE)); diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c index cb9de6f24f88..b190772e2498 100644 --- a/sys/dev/hid/hmt.c +++ b/sys/dev/hid/hmt.c @@ -252,13 +252,13 @@ static const struct hid_device_id hmt_devs[] = { static int hmt_ev_close(struct evdev_dev *evdev) { - return (hidbus_intr_stop(evdev_get_softc(evdev))); + return (hid_intr_stop(evdev_get_softc(evdev))); } static int hmt_ev_open(struct evdev_dev *evdev) { - return (hidbus_intr_start(evdev_get_softc(evdev))); + return (hid_intr_start(evdev_get_softc(evdev))); } static int diff --git a/sys/dev/hid/ietp.c b/sys/dev/hid/ietp.c index cdc5491b2c6d..1eaf95f17364 100644 --- a/sys/dev/hid/ietp.c +++ b/sys/dev/hid/ietp.c @@ -220,13 +220,13 @@ static const struct evdev_methods ietp_evdev_methods = { static int ietp_ev_open(struct evdev_dev *evdev) { - return (hidbus_intr_start(evdev_get_softc(evdev))); + return (hid_intr_start(evdev_get_softc(evdev))); } static int ietp_ev_close(struct evdev_dev *evdev) { - return (hidbus_intr_stop(evdev_get_softc(evdev))); + return (hid_intr_stop(evdev_get_softc(evdev))); } static int @@ -595,7 +595,7 @@ ietp_iic_set_absolute_mode(device_t dev, bool enable) } } - if (require_wakeup && hidbus_intr_start(dev) != 0) { + if (require_wakeup && hid_intr_start(dev) != 0) { device_printf(dev, "failed writing poweron command\n"); return (EIO); } @@ -606,7 +606,7 @@ ietp_iic_set_absolute_mode(device_t dev, bool enable) error = EIO; } - if (require_wakeup && hidbus_intr_stop(dev) != 0) { + if (require_wakeup && hid_intr_stop(dev) != 0) { device_printf(dev, "failed writing poweroff command\n"); error = EIO; } From nobody Thu Aug 3 16:12: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 4RGv4P69TMz3cP1Q; Thu, 3 Aug 2023 16:12: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 4RGv4P5KMTz4WtQ; Thu, 3 Aug 2023 16:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay3RDEO14dloUAsZm8H+fXCsRuujVOEglAr3tcFRkIQ=; b=RN3hceIXSSx1p2ze7R7Gpc7KHCr/PN/TxJzm/K96kqZbmf17KuMGrIkTt6dWRLzrbtZnD8 SDEtGrg6QgcnQcTOUEWFblcYlnkbyIF/JZmqgCRz1khU+a8qUqOY4iCWjFw7QFXxxjXlxQ 4pKy6BFMzAKHEWVwiWQYUwfvMMOZTOqJIBixyhtdxxkjX294MjIK+P7PSQx+Ww6I4y7wi7 NQKP23psJGZR8lF6fDu/zU80NYOaWL69kLZ0ZGcdk+QExPylQdKrAvhk7BGR+a3IRNSBwa DhvO/5kIW2cV6G8k6fYP0SuOC/4Z0+PtpqW293savB6gdXFyx3As8q65mxFmlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay3RDEO14dloUAsZm8H+fXCsRuujVOEglAr3tcFRkIQ=; b=bLuA3APjs5vJU5qUax3BQlDv6H94VZU+qhaO4C7JRmck/G4oG4keH1ap1M/vMKPU3STkWc 1EY/tc8o26ejRN4QWG6gSrmzHEgV1v/LrxExT8wONH4204PHeIsEJ/mCWog+37PxpegQ6Y TBK3Zm6T9vhL8RvH+N0B6PrWJwcA+NkF6XvH8QlLNAYRrh5a2tS8UWbL50/qyZywt1BzES uDyw63HbCzwT3mDl0LpvgJbsbR+J8Wa/hese4AudnuaVOAI1Q2G1sFwjYtge85a7EARxSJ Gj8NlXLIyK8QjkfMSyCVpBMnND8FjZb7PDKQMAbfOGZdfQEx54Row9dDPL2MWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079125; a=rsa-sha256; cv=none; b=nGPH8CfyVBM/GsHh5pDrMuubORPjAHUWauvpcN4enJdwYAjneok8xKIVHaHhOlMJqB4FtT a0tLyWu+a+Yxm5RXjg3V1yznTB1VtekrAErrz8zpDQqjoSjFuNeAMNEMh3ZO8dJOuOlIWB SLhpdzPvXszCbKkqgluTiJqPFEX4wee9lCTTujAEcdTcbN58E/YrPr/uLwz5k+NtziE01B ZX23Ng79lcI4cyZ4RBC9RRckGNCjIORPyJi/6yGJpM4Q/4UDyDXOEizq3aXmy4i186qW8n KhXWWDZdvhYTbEn9A3pXew9k5ZxQyO6e8t+eCNsVs9aEGmfVMALSMtp2dyrwdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4P4QnlzCS1; Thu, 3 Aug 2023 16:12: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 373GC52b006148; Thu, 3 Aug 2023 16:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC5pK006147; Thu, 3 Aug 2023 16:12:05 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:05 GMT Message-Id: <202308031612.373GC5pK006147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5adcec04b5ab - main - intelspi: Add support for ddb/kdb -compatible polled 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5adcec04b5abd4971f1678d6ee1369cc9ecaa90d Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5adcec04b5abd4971f1678d6ee1369cc9ecaa90d commit 5adcec04b5abd4971f1678d6ee1369cc9ecaa90d Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 intelspi: Add support for ddb/kdb -compatible polled mode Required for Apple and Microsoft -compatible HID-over-SPI drivers. Most logic was already implemented in commit 3c0867343819 "spibus: extend API: add cs_delay ivar, KEEP_CS and NO_SLEEP flags". It dissallowed driver sleeps in the interrupt context. This commit extends this feature to handle ddb/kdb context with following: - Skip driver locking if SPI functions were called from kdb/ddb. - Reinitialize controller if kdb/ddb initiated SPI transfer has interrupted another already running one. Does not work very reliable yet. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41247 --- sys/dev/intel/spi.c | 57 ++++++++++++++++++++++++++++++++++++++--------------- sys/dev/intel/spi.h | 2 +- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 6dd063511e26..3bcbd8fbd4f4 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -46,14 +47,27 @@ /** * Macros for driver mutex locking */ -#define INTELSPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define INTELSPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define INTELSPI_IN_POLLING_MODE() (SCHEDULER_STOPPED() || kdb_active) +#define INTELSPI_LOCK(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_lock(&(_sc)->sc_mtx); \ +} while (0) +#define INTELSPI_UNLOCK(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_unlock(&(_sc)->sc_mtx); \ +} while (0) #define INTELSPI_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit((_sc)->sc_dev), \ "intelspi", MTX_DEF) #define INTELSPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) -#define INTELSPI_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) -#define INTELSPI_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_NOTOWNED) +#define INTELSPI_ASSERT_LOCKED(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_assert(&(_sc)->sc_mtx, MA_OWNED); \ +} while (0) +#define INTELSPI_ASSERT_UNLOCKED(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_assert(&(_sc)->sc_mtx, MA_NOTOWNED);\ +} while (0) #define INTELSPI_WRITE(_sc, _off, _val) \ bus_write_4((_sc)->sc_mem_res, (_off), (_val)) @@ -342,17 +356,26 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) INTELSPI_LOCK(sc); - /* If the controller is in use wait until it is available. */ - while (sc->sc_flags & INTELSPI_BUSY) { - if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) { - INTELSPI_UNLOCK(sc); - return (EBUSY); - } - err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); - if (err == EINTR) { - INTELSPI_UNLOCK(sc); - return (err); + if (!INTELSPI_IN_POLLING_MODE()) { + /* If the controller is in use wait until it is available. */ + while (sc->sc_flags & INTELSPI_BUSY) { + if ((cmd->flags & SPI_FLAG_NO_SLEEP) != 0) { + INTELSPI_UNLOCK(sc); + return (EBUSY); + } + err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); + if (err == EINTR) { + INTELSPI_UNLOCK(sc); + return (err); + } } + } else { + /* + * Now we are in the middle of other transfer. Try to reset + * controller state to get predictable context. + */ + if ((sc->sc_flags & INTELSPI_BUSY) != 0) + intelspi_init(sc); } /* Now we have control over SPI controller. */ @@ -411,7 +434,8 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) DELAY(cs_delay); /* Transfer as much as possible to FIFOs */ - if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) { + if ((cmd->flags & SPI_FLAG_NO_SLEEP) != 0 || + INTELSPI_IN_POLLING_MODE() || cold) { /* We cannot wait with mtx_sleep if we're called from e.g. an ithread */ poll_limit = 2000; while (!intelspi_transact(sc) && poll_limit-- > 0) @@ -449,7 +473,8 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) /* Release the controller and wakeup the next thread waiting for it. */ sc->sc_flags = 0; - wakeup_one(dev); + if (!INTELSPI_IN_POLLING_MODE()) + wakeup_one(dev); INTELSPI_UNLOCK(sc); /* diff --git a/sys/dev/intel/spi.h b/sys/dev/intel/spi.h index bd79ec1e812a..fa145f8f73d7 100644 --- a/sys/dev/intel/spi.h +++ b/sys/dev/intel/spi.h @@ -54,7 +54,7 @@ struct intelspi_softc { struct spi_command *sc_cmd; uint32_t sc_len; uint32_t sc_read; - uint32_t sc_flags; + volatile uint32_t sc_flags; uint32_t sc_written; uint32_t sc_clock; uint32_t sc_mode; From nobody Thu Aug 3 16:12: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 4RGv4Q6k9xz3cNvl; Thu, 3 Aug 2023 16:12: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 4RGv4Q6GBbz4X4r; Thu, 3 Aug 2023 16:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJiy8PP4LkCOKNHFShtFByZJpIOw/uWCkPgnEMJsqNc=; b=OSNQM26AE7VCHuWie/qja6wQol7xr053+krSPormDl1pSa1UHLp9o/tP/mMRFGtBKIkypC ysxviWdviNLWA9CaQea9zMnOHjgtdP72bI6dl+xka+/DPCQWWQkCo5upc5g/irZTZMZUc8 3CXk2aqh1kt74fcMnmTL3W1pBrq6tAXlCIZtkIZBCFW/CghX8Xv2mwyTjKX2vXEosGLe0x b2RARBCv02MMAAVmRSCj8whNAakscYo3U4i7d35AtClvyU8A4GaLR9P2fJ7mxMfu21+W6T SwlKtliVsqPtcGr+Tl2Mq0x/UFs975YdLlVRtKz/FubKicLmFkgJ7jwCquOKfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJiy8PP4LkCOKNHFShtFByZJpIOw/uWCkPgnEMJsqNc=; b=XQTEa4N1p8eaFbLlBB30Da3O+pDkYFMcqgr7Qq1a4m4SAXB/oOXVTs/OQ5VsBVrJpkO7IW itNe2NbLDU9IHJ9oG/YCMsKnP7fnM/JYDTgiXuK5O+JVTVO88v3WE2TAFy9L2FsMW62tHM pgAiLxcQvd1hk6TWH9eB2Ro5rztNBYwWe1CQI7x+LxspyUk6ZQNaXK286fkp7vaO3qwK0Q TOsoFUp4WpdyCqXouqg9PDRbu3tFdajQrI422Rq6Oq+8kaaZ2GzpTZRyOvg1ed0oCsZ0Qu VL9GS8DyuOF787uxAFZsA+y6+lWv057X+d7isDirg15k9cxWItVTzbyEnuqKVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079126; a=rsa-sha256; cv=none; b=He2UNUrrcgYt91qjIJ3kdpl7H1s0Skf+3uIbNykGwNeHYOxV5VerFS7TXO9ca7QPqf3d9g A+RsOUn13uqcBz/iwzFMPtxybfoXbUGUhQrBdG+7PdBEFutesi4Bf4GW06xwKmCgseFkoK kqSvXWN71oiRlJ1dEuRgLCuvJKdh+BN9oyA5jCHxgJeCcZ/pkTaLCGNJq3xKJqqifaT6gh 3sJ8i7vpw2z22956Ge6GeG77fnO+DnF3WaklSZh0oXWUUNdhS9KroDrfysrOCqIGFxU6v6 LdmbI7EUYGT7eCc3CawCFuXEO0S88rfQri7q6Wvt7IXQTwxdYrvNxx8qvLjs/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4Q5B4TzC2V; Thu, 3 Aug 2023 16:12: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 373GC6n3006173; Thu, 3 Aug 2023 16:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC6u2006172; Thu, 3 Aug 2023 16:12:06 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:06 GMT Message-Id: <202308031612.373GC6u2006172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7d380b986a18 - main - spibus(4): Add support for ACPI-based children enumeration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d380b986a1808164846cfd9afb5ae3f99921fcf Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7d380b986a1808164846cfd9afb5ae3f99921fcf commit 7d380b986a1808164846cfd9afb5ae3f99921fcf Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 spibus(4): Add support for ACPI-based children enumeration When spibus is attached as child of Intel SPI controller it scans all ACPI nodes for "SPI Serial Bus Connection Resource Descriptor" described in section 19.6.126 of ACPI specs. If such a descriptor is found, SPI child is added to spibus, it's SPI chip select, mode, clock, IRQ resource and ACPI handle are added to ivars. Existing ACPI bus-hosted child is deleted afterwards. Apple ACPI SPI extensions are supported. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41248 --- sys/conf/files | 1 + sys/dev/spibus/acpi_spibus.c | 580 ++++++++++++++++++++++++++++++++++++++++ sys/dev/spibus/spibus.c | 26 +- sys/dev/spibus/spibusvar.h | 10 +- sys/modules/spi/spibus/Makefile | 5 + 5 files changed, 612 insertions(+), 10 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index ae83722eaca5..1ec165537128 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3143,6 +3143,7 @@ dev/sound/midi/mpu_if.m optional sound dev/sound/midi/mpufoi_if.m optional sound dev/sound/midi/sequencer.c optional sound dev/sound/midi/synth_if.m optional sound +dev/spibus/acpi_spibus.c optional acpi spibus dev/spibus/ofw_spibus.c optional fdt spibus dev/spibus/spibus.c optional spibus \ dependency "spibus_if.h" diff --git a/sys/dev/spibus/acpi_spibus.c b/sys/dev/spibus/acpi_spibus.c new file mode 100644 index 000000000000..c7b897937eea --- /dev/null +++ b/sys/dev/spibus/acpi_spibus.c @@ -0,0 +1,580 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Vladimir Kondratyev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include + +/* + * Make a copy of ACPI_RESOURCE_SPI_SERIALBUS type and replace "pointer to ACPI + * object name string" field with pointer to ACPI object itself. + * This saves us extra strdup()/free() pair on acpi_spibus_get_acpi_res call. + */ +typedef ACPI_RESOURCE_SPI_SERIALBUS ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS; +#define ResourceSource_Handle ResourceSource.StringPtr + +/* Hooks for the ACPI CA debugging infrastructure. */ +#define _COMPONENT ACPI_BUS +ACPI_MODULE_NAME("SPI") + +#if defined (__amd64__) || defined (__i386__) +static bool is_apple; +#endif + +struct acpi_spibus_ivar { + struct spibus_ivar super_ivar; + ACPI_HANDLE handle; +}; + +static inline bool +acpi_resource_is_spi_serialbus(ACPI_RESOURCE *res) +{ + return (res->Type == ACPI_RESOURCE_TYPE_SERIAL_BUS && + res->Data.CommonSerialBus.Type == ACPI_RESOURCE_SERIAL_TYPE_SPI); +} + +static ACPI_STATUS +acpi_spibus_get_acpi_res_cb(ACPI_RESOURCE *res, void *context) +{ + ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS *sb = context; + ACPI_STATUS status; + ACPI_HANDLE handle; + + if (acpi_resource_is_spi_serialbus(res)) { + status = AcpiGetHandle(ACPI_ROOT_OBJECT, + res->Data.SpiSerialBus.ResourceSource.StringPtr, &handle); + if (ACPI_FAILURE(status)) + return (status); + memcpy(sb, &res->Data.SpiSerialBus, + sizeof(ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS)); + /* + * replace "pointer to ACPI object name string" field + * with pointer to ACPI object itself. + */ + sb->ResourceSource_Handle = handle; + return (AE_CTRL_TERMINATE); + } else if (res->Type == ACPI_RESOURCE_TYPE_END_TAG) + return (AE_NOT_FOUND); + + return (AE_OK); +} + +static void +acpi_spibus_dump_res(device_t dev, ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS *sb) +{ + device_printf(dev, "found ACPI child\n"); + printf(" DeviceSelection: 0x%04hx\n", sb->DeviceSelection); + printf(" ConnectionSpeed: %uHz\n", sb->ConnectionSpeed); + printf(" WireMode: %s\n", + sb->WireMode == ACPI_SPI_4WIRE_MODE ? + "FourWireMode" : "ThreeWireMode"); + printf(" DevicePolarity: %s\n", + sb->DevicePolarity == ACPI_SPI_ACTIVE_LOW ? + "PolarityLow" : "PolarityHigh"); + printf(" DataBitLength: %uBit\n", sb->DataBitLength); + printf(" ClockPhase: %s\n", + sb->ClockPhase == ACPI_SPI_FIRST_PHASE ? + "ClockPhaseFirst" : "ClockPhaseSecond"); + printf(" ClockPolarity: %s\n", + sb->ClockPolarity == ACPI_SPI_START_LOW ? + "ClockPolarityLow" : "ClockPolarityHigh"); + printf(" SlaveMode: %s\n", + sb->SlaveMode == ACPI_CONTROLLER_INITIATED ? + "ControllerInitiated" : "DeviceInitiated"); + printf(" ConnectionSharing: %s\n", sb->ConnectionSharing == 0 ? + "Exclusive" : "Shared"); +} + +static int +acpi_spibus_get_acpi_res(device_t spibus, ACPI_HANDLE dev, + struct spibus_ivar *res) +{ + ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS sb; + + /* + * Read "SPI Serial Bus Connection Resource Descriptor" + * described in p.19.6.126 of ACPI specification. + */ + bzero(&sb, sizeof(ACPI_SPIBUS_RESOURCE_SPI_SERIALBUS)); + if (ACPI_FAILURE(AcpiWalkResources(dev, "_CRS", + acpi_spibus_get_acpi_res_cb, &sb))) + return (ENXIO); + if (sb.ResourceSource_Handle != + acpi_get_handle(device_get_parent(spibus))) + return (ENXIO); + if (bootverbose) + acpi_spibus_dump_res(spibus, &sb); + /* + * The Windows Baytrail and Braswell SPI host controller + * drivers uses 1 as the first (and only) value for ACPI + * DeviceSelection. + */ + if (sb.DeviceSelection != 0 && + (acpi_MatchHid(sb.ResourceSource_Handle, "80860F0E") || + acpi_MatchHid(sb.ResourceSource_Handle, "8086228E"))) + res->cs = sb.DeviceSelection - 1; + else + res->cs = sb.DeviceSelection; + res->mode = + (sb.ClockPhase != ACPI_SPI_FIRST_PHASE ? SPIBUS_MODE_CPHA : 0) | + (sb.ClockPolarity != ACPI_SPI_START_LOW ? SPIBUS_MODE_CPOL : 0); + res->clock = sb.ConnectionSpeed; + + return (0); +} + +#if defined (__amd64__) || defined (__i386__) +static int +acpi_spibus_get_apple_res(device_t spibus, ACPI_HANDLE dev, + struct spibus_ivar *ivar) +{ + /* a0b5b7c6-1318-441c-b0c9-fe695eaf949b */ + static const uint8_t apple_guid[ACPI_UUID_LENGTH] = { + 0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44, + 0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B, + }; + ACPI_BUFFER buf; + ACPI_OBJECT *pkg, *comp; + ACPI_HANDLE parent; + char *k; + uint64_t val; + + /* Apple does not use _CRS but nested devices for SPI slaves */ + if (ACPI_FAILURE(AcpiGetParent(dev, &parent))) + return (ENXIO); + if (parent != acpi_get_handle(device_get_parent(spibus))) + return (ENXIO); + if (ACPI_FAILURE(acpi_EvaluateDSMTyped(dev, apple_guid, + 1, 1, NULL, &buf, ACPI_TYPE_PACKAGE))) + return (ENXIO); + + pkg = ((ACPI_OBJECT *)buf.Pointer); + if (pkg->Package.Count % 2 != 0) { + device_printf(spibus, "_DSM length %d not even\n", + pkg->Package.Count); + AcpiOsFree(pkg); + return (ENXIO); + } + + if (bootverbose) + device_printf(spibus, "found ACPI child\n"); + + for (comp = pkg->Package.Elements; + comp < pkg->Package.Elements + pkg->Package.Count; + comp += 2) { + + if (comp[0].Type != ACPI_TYPE_STRING || + comp[1].Type != ACPI_TYPE_BUFFER) { + device_printf(spibus, "expected string+buffer, " + "got %d+%d\n", comp[0].Type, comp[1].Type); + continue; + } + k = comp[0].String.Pointer; + val = comp[1].Buffer.Length >= 8 ? + *(uint64_t *)comp[1].Buffer.Pointer : 0; + + if (bootverbose) + printf(" %s: %zu\n", k, (intmax_t)val); + + if (strcmp(k, "spiSclkPeriod") == 0) { + if (val != 0) + ivar->clock = 1000000000 / val; + } else if (strcmp(k, "spiSPO") == 0) { + if (val != 0) + ivar->mode |= SPIBUS_MODE_CPOL; + } else if (strcmp(k, "spiSPH") == 0) { + if (val != 0) + ivar->mode |= SPIBUS_MODE_CPHA; + } else if (strcmp(k, "spiCSDelay") == 0) { + ivar->cs_delay = val; + } + } + + AcpiOsFree(pkg); + + return (0); +} +#endif + +static int +acpi_spibus_delete_acpi_child(ACPI_HANDLE handle) +{ + device_t acpi_child, acpi0; + + /* Delete existing child of acpi bus */ + acpi_child = acpi_get_device(handle); + if (acpi_child != NULL) { + acpi0 = devclass_get_device(devclass_find("acpi"), 0); + if (device_get_parent(acpi_child) != acpi0) + return (ENXIO); + + if (device_is_attached(acpi_child)) + return (ENXIO); + + if (device_delete_child(acpi0, acpi_child) != 0) + return (ENXIO); + } + + return (0); +} + +static device_t +acpi_spibus_add_child(device_t dev, u_int order, const char *name, int unit) +{ + return (spibus_add_child_common( + dev, order, name, unit, sizeof(struct acpi_spibus_ivar))); +} + +static ACPI_STATUS +acpi_spibus_enumerate_child(ACPI_HANDLE handle, UINT32 level, + void *context, void **result) +{ + device_t spibus, child; + struct spibus_ivar res; + ACPI_STATUS status; + UINT32 sta; + bool found = false; + + spibus = context; + + /* + * If no _STA method or if it failed, then assume that + * the device is present. + */ + if (!ACPI_FAILURE(acpi_GetInteger(handle, "_STA", &sta)) && + !ACPI_DEVICE_PRESENT(sta)) + return (AE_OK); + + if (!acpi_has_hid(handle)) + return (AE_OK); + + bzero(&res, sizeof(res)); + if (acpi_spibus_get_acpi_res(spibus, handle, &res) == 0) + found = true; +#if defined (__amd64__) || defined (__i386__) + if (!found && is_apple && + acpi_spibus_get_apple_res(spibus, handle, &res) == 0) + found = true; +#endif + if (!found || res.clock == 0) + return (AE_OK); + + /* Delete existing child of acpi bus */ + if (acpi_spibus_delete_acpi_child(handle) != 0) + return (AE_OK); + + child = BUS_ADD_CHILD(spibus, 0, NULL, -1); + if (child == NULL) { + device_printf(spibus, "add child failed\n"); + return (AE_OK); + } + + spibus_set_cs(child, res.cs); + spibus_set_mode(child, res.mode); + spibus_set_clock(child, res.clock); + spibus_set_cs_delay(child, res.cs_delay); + acpi_set_handle(child, handle); + acpi_parse_resources(child, handle, &acpi_res_parse_set, NULL); + + /* + * Update ACPI-CA to use the IIC enumerated device_t for this handle. + */ + status = AcpiAttachData(handle, acpi_fake_objhandler, child); + if (ACPI_FAILURE(status)) + printf("WARNING: Unable to attach object data to %s - %s\n", + acpi_name(handle), AcpiFormatException(status)); + + return (AE_OK); +} + +static ACPI_STATUS +acpi_spibus_enumerate_children(device_t dev) +{ + return (AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, + ACPI_UINT32_MAX, acpi_spibus_enumerate_child, NULL, dev, NULL)); +} + +static void +acpi_spibus_set_power_children(device_t dev, int state, bool all_children) +{ + device_t *devlist; + int i, numdevs; + + if (device_get_children(dev, &devlist, &numdevs) != 0) + return; + + for (i = 0; i < numdevs; i++) + if (all_children || device_is_attached(devlist[i]) != 0) + acpi_set_powerstate(devlist[i], state); + + free(devlist, M_TEMP); +} + +static int +acpi_spibus_probe(device_t dev) +{ + ACPI_HANDLE handle; + device_t controller; + + if (acpi_disabled("spibus")) + return (ENXIO); + + controller = device_get_parent(dev); + if (controller == NULL) + return (ENXIO); + + handle = acpi_get_handle(controller); + if (handle == NULL) + return (ENXIO); + + device_set_desc(dev, "SPI bus (ACPI-hinted)"); + return (BUS_PROBE_DEFAULT + 1); +} + +static int +acpi_spibus_attach(device_t dev) +{ + +#if defined (__amd64__) || defined (__i386__) + char *vendor = kern_getenv("smbios.bios.vendor"); + if (vendor != NULL && + (strcmp(vendor, "Apple Inc.") == 0 || + strcmp(vendor, "Apple Computer, Inc.") == 0)) + is_apple = true; +#endif + + if (ACPI_FAILURE(acpi_spibus_enumerate_children(dev))) + device_printf(dev, "children enumeration failed\n"); + + acpi_spibus_set_power_children(dev, ACPI_STATE_D0, true); + return (spibus_attach(dev)); +} + +static int +acpi_spibus_detach(device_t dev) +{ + acpi_spibus_set_power_children(dev, ACPI_STATE_D3, false); + + return (spibus_detach(dev)); +} + +static int +acpi_spibus_suspend(device_t dev) +{ + acpi_spibus_set_power_children(dev, ACPI_STATE_D3, false); + + return (bus_generic_suspend(dev)); +} + +static int +acpi_spibus_resume(device_t dev) +{ + acpi_spibus_set_power_children(dev, ACPI_STATE_D0, false); + + return (bus_generic_resume(dev)); +} + +#ifndef INTRNG +/* Mostly copy of acpi_alloc_resource() */ +static struct resource * +acpi_spibus_alloc_resource(device_t dev, device_t child, int type, int *rid, + rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) +{ + ACPI_RESOURCE ares; + struct resource_list *rl; + struct resource *res; + + if (device_get_parent(child) != dev) + return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, + type, rid, start, end, count, flags)); + + rl = BUS_GET_RESOURCE_LIST(dev, child); + if (rl == NULL) + return (NULL); + + res = resource_list_alloc(rl, dev, child, type, rid, + start, end, count, flags); + if (res != NULL && type == SYS_RES_IRQ && + ACPI_SUCCESS(acpi_lookup_irq_resource(child, *rid, res, &ares))) + acpi_config_intr(child, &ares); + + return (res); +} +#endif + +/* + * If this device is an ACPI child but no one claimed it, attempt + * to power it off. We'll power it back up when a driver is added. + */ +static void +acpi_spibus_probe_nomatch(device_t bus, device_t child) +{ + spibus_probe_nomatch(bus, child); + acpi_set_powerstate(child, ACPI_STATE_D3); +} + +/* + * If a new driver has a chance to probe a child, first power it up. + */ +static void +acpi_spibus_driver_added(device_t dev, driver_t *driver) +{ + device_t child, *devlist; + int i, numdevs; + + DEVICE_IDENTIFY(driver, dev); + if (device_get_children(dev, &devlist, &numdevs) != 0) + return; + + for (i = 0; i < numdevs; i++) { + child = devlist[i]; + if (device_get_state(child) == DS_NOTPRESENT) { + acpi_set_powerstate(child, ACPI_STATE_D0); + if (device_probe_and_attach(child) != 0) + acpi_set_powerstate(child, ACPI_STATE_D3); + } + } + free(devlist, M_TEMP); +} + +static void +acpi_spibus_child_deleted(device_t bus, device_t child) +{ + struct acpi_spibus_ivar *devi = device_get_ivars(child); + + if (acpi_get_device(devi->handle) == child) + AcpiDetachData(devi->handle, acpi_fake_objhandler); +} + +static int +acpi_spibus_read_ivar(device_t bus, device_t child, int which, uintptr_t *res) +{ + struct acpi_spibus_ivar *devi = device_get_ivars(child); + + switch (which) { + case ACPI_IVAR_HANDLE: + *res = (uintptr_t)devi->handle; + break; + default: + return (spibus_read_ivar(bus, child, which, res)); + } + + return (0); +} + +static int +acpi_spibus_write_ivar(device_t bus, device_t child, int which, uintptr_t val) +{ + struct acpi_spibus_ivar *devi = device_get_ivars(child); + + switch (which) { + case ACPI_IVAR_HANDLE: + if (devi->handle != NULL) + return (EINVAL); + devi->handle = (ACPI_HANDLE)val; + break; + default: + return (spibus_write_ivar(bus, child, which, val)); + } + + return (0); +} + +/* Location hint for devctl(8). Concatenate IIC and ACPI hints. */ +static int +acpi_spibus_child_location(device_t bus, device_t child, struct sbuf *sb) +{ + struct acpi_spibus_ivar *devi = device_get_ivars(child); + int error; + + /* read SPI location hint string into the buffer. */ + error = spibus_child_location(bus, child, sb); + if (error != 0) + return (error); + + /* Place ACPI string right after IIC one's terminating NUL. */ + if (devi->handle != NULL) + sbuf_printf(sb, " handle=%s", acpi_name(devi->handle)); + + return (0); +} + +/* PnP information for devctl(8). */ +static int +acpi_spibus_child_pnpinfo(device_t bus, device_t child, struct sbuf *sb) +{ + struct acpi_spibus_ivar *devi = device_get_ivars(child); + + return ( + devi->handle == NULL ? ENOTSUP : acpi_pnpinfo(devi->handle, sb)); +} + +static device_method_t acpi_spibus_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, acpi_spibus_probe), + DEVMETHOD(device_attach, acpi_spibus_attach), + DEVMETHOD(device_detach, acpi_spibus_detach), + DEVMETHOD(device_suspend, acpi_spibus_suspend), + DEVMETHOD(device_resume, acpi_spibus_resume), + + /* Bus interface */ +#ifndef INTRNG + DEVMETHOD(bus_alloc_resource, acpi_spibus_alloc_resource), +#endif + DEVMETHOD(bus_add_child, acpi_spibus_add_child), + DEVMETHOD(bus_probe_nomatch, acpi_spibus_probe_nomatch), + DEVMETHOD(bus_driver_added, acpi_spibus_driver_added), + DEVMETHOD(bus_child_deleted, acpi_spibus_child_deleted), + DEVMETHOD(bus_read_ivar, acpi_spibus_read_ivar), + DEVMETHOD(bus_write_ivar, acpi_spibus_write_ivar), + DEVMETHOD(bus_child_location, acpi_spibus_child_location), + DEVMETHOD(bus_child_pnpinfo, acpi_spibus_child_pnpinfo), + DEVMETHOD(bus_get_device_path, acpi_get_acpi_device_path), + + DEVMETHOD_END, +}; + +DEFINE_CLASS_1(spibus, acpi_spibus_driver, acpi_spibus_methods, + sizeof(struct spibus_softc), spibus_driver); +DRIVER_MODULE(acpi_spibus, spi, acpi_spibus_driver, NULL, NULL); +MODULE_VERSION(acpi_spibus, 1); +MODULE_DEPEND(acpi_spibus, acpi, 1, 1, 1); diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index af4b1402cee4..96c4cd7283e9 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -53,7 +53,7 @@ spibus_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static int +int spibus_attach(device_t dev) { struct spibus_softc *sc = SPIBUS_SOFTC(dev); @@ -67,7 +67,7 @@ spibus_attach(device_t dev) * Since this is not a self-enumerating bus, and since we always add * children in attach, we have to always delete children here. */ -static int +int spibus_detach(device_t dev) { return (device_delete_children(dev)); @@ -102,7 +102,7 @@ spibus_print_child(device_t dev, device_t child) return (retval); } -static void +void spibus_probe_nomatch(device_t bus, device_t child) { struct spibus_ivar *devi = SPIBUS_IVAR(child); @@ -112,7 +112,7 @@ spibus_probe_nomatch(device_t bus, device_t child) return; } -static int +int spibus_child_location(device_t bus, device_t child, struct sbuf *sb) { struct spibus_ivar *devi = SPIBUS_IVAR(child); @@ -123,7 +123,7 @@ spibus_child_location(device_t bus, device_t child, struct sbuf *sb) return (0); } -static int +int spibus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) { struct spibus_ivar *devi = SPIBUS_IVAR(child); @@ -147,7 +147,7 @@ spibus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) return (0); } -static int +int spibus_write_ivar(device_t bus, device_t child, int which, uintptr_t value) { struct spibus_ivar *devi = SPIBUS_IVAR(child); @@ -181,8 +181,9 @@ spibus_write_ivar(device_t bus, device_t child, int which, uintptr_t value) return (0); } -static device_t -spibus_add_child(device_t dev, u_int order, const char *name, int unit) +device_t +spibus_add_child_common(device_t dev, u_int order, const char *name, int unit, + size_t ivars_size) { device_t child; struct spibus_ivar *devi; @@ -190,7 +191,7 @@ spibus_add_child(device_t dev, u_int order, const char *name, int unit) child = device_add_child_ordered(dev, order, name, unit); if (child == NULL) return (child); - devi = malloc(sizeof(struct spibus_ivar), M_DEVBUF, M_NOWAIT | M_ZERO); + devi = malloc(ivars_size, M_DEVBUF, M_NOWAIT | M_ZERO); if (devi == NULL) { device_delete_child(dev, child); return (0); @@ -200,6 +201,13 @@ spibus_add_child(device_t dev, u_int order, const char *name, int unit) return (child); } +static device_t +spibus_add_child(device_t dev, u_int order, const char *name, int unit) +{ + return (spibus_add_child_common( + dev, order, name, unit, sizeof(struct spibus_ivar))); +} + static void spibus_hinted_child(device_t bus, const char *dname, int dunit) { diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index db94d30831e6..8c5c122750db 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -73,7 +73,15 @@ spibus_set_ ## A(device_t dev, T t) \ SPIBUS_ACCESSOR(cs, CS, uint32_t) SPIBUS_ACCESSOR(mode, MODE, uint32_t) SPIBUS_ACCESSOR(clock, CLOCK, uint32_t) -SPIBUS_ACCESSOR(cs_delay, CS_DELAY, uint32_t) +SPIBUS_ACCESSOR(cs_delay, CS_DELAY, uint32_t) extern driver_t spibus_driver; extern driver_t ofw_spibus_driver; + +int spibus_attach(device_t); +int spibus_detach(device_t); +device_t spibus_add_child_common(device_t, u_int, const char *, int, size_t); +void spibus_probe_nomatch(device_t, device_t); +int spibus_child_location(device_t, device_t, struct sbuf *); +int spibus_read_ivar(device_t, device_t, int, uintptr_t *); +int spibus_write_ivar(device_t, device_t, int, uintptr_t); diff --git a/sys/modules/spi/spibus/Makefile b/sys/modules/spi/spibus/Makefile index 01386d39e118..7ba80d50e0ff 100644 --- a/sys/modules/spi/spibus/Makefile +++ b/sys/modules/spi/spibus/Makefile @@ -9,6 +9,11 @@ SRCS= spibus.c SRCS+= ofw_spibus.c ofw_bus_if.h .endif +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" +SRCS+= acpi_spibus.c opt_acpi.h acpi_if.h +.endif + # Generated files... SRCS+= \ bus_if.h \ From nobody Thu Aug 3 16:12: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 4RGv4S230Hz3cP1Z; Thu, 3 Aug 2023 16:12: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 4RGv4S04Tnz4X58; Thu, 3 Aug 2023 16:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jX7MZOiUTfXmVUggKYTy1veVbul4Sx1GBEj/mtUSWiA=; b=KuTNngDaebAnzx8Irg8CisaC5XPcPbm2pX68j9QDFn4j2CWxLS9bVTim6eJjag1BYqqzSQ Gw5GjgnmzwNLtjUsZwEnUHdGz/2bxYZ/Ptq+OQh+Q2Gu7wF+7MaMyq4p/aOGmO7qPmiNDH ynVPUXDKyz7IU97bPOLVns3f6i5MobPUVCzjWTLo4ReWU0R3OZ/Xog5gocKJRvk9A3diDT TESFb9/ctItqMnadNa+ov1TFkGSvSrBesSQxJbmm/Tgiu+9AFcWkj4TzEg+GjOsJL5/WMt E7RjblqBdCKU/0YRGAEl/cEXL/mKuRbN6/kOoPx0+750q7vkexZg+UbCkaiZdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jX7MZOiUTfXmVUggKYTy1veVbul4Sx1GBEj/mtUSWiA=; b=t/Yc94BY1R3+rN4tnd9H6BPT/NABBNQnWSU9rQhWLxmuI9pIMJs7TrhRpPKVf06zGqPmS1 bVm5Ywwq+SUZpcd3tqXCM1eJGfkk87a7GXCDlhNjEWBBD3rZnTSQOXZhFKnLoOKZqJlOok LZexWBMlzMpXYiUchCYLNeywxYV8i+fAgNZj0fUUFqAPUY/K3xnkqZsK5pcq16KxEN6Djl m1nOGk4GiEZ9izeK95HSGZ6YXbsZ2rVxa1ryc3GIQ7E1vkQZfISAc7VOWTshkK0KpC8B00 nodquBttwPYUxgajOGsB/Y1kSGCZ8CSq+CdiDAkhR3pgztSxHYHuV8UdHxhyGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079128; a=rsa-sha256; cv=none; b=qi4HCBwaU/9/ntKf/olh77huAwCCKMeG1Aq9oDA90TCaJeODNnFiwIK1FGl8umAG3njtpj irlLcprzzC8YosLwpjVHl2Ez2kxD6Y/w/Qsf5SCNalaxAjxwVFgn8flkTfaSrOYOiFlKEW ukstNIfzR06NxMTRXDOb2I/R1RoWmY0Fzz3wFuzMQt5EXorYshZmsS9jCrW3qtyfeEvFY6 6vp2SXbkMosbEpJHHR04yT4/nD0E3oeOQFnDWVsocFiBNcTtHpLzEPHCQeM9XObKY01WEi C1qIKRThPOUfkpPAE2QdFO53NLPOJHMAWmpQqDg3E1TtjdzaAzB2AjKCOFhOzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGv4R6G8BzCBT; Thu, 3 Aug 2023 16:12: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 373GC7Hv006193; Thu, 3 Aug 2023 16:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC7Qf006192; Thu, 3 Aug 2023 16:12:07 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:07 GMT Message-Id: <202308031612.373GC7Qf006192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: ed77b896706b - main - Bump __FreeBSD_version to 1400094 for HID KPI 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed77b896706b4b4b2a19b74968ef95cc1b0062e6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ed77b896706b4b4b2a19b74968ef95cc1b0062e6 commit ed77b896706b4b4b2a19b74968ef95cc1b0062e6 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:51 +0000 Bump __FreeBSD_version to 1400094 for HID KPI changes --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 137bd80c77cb..d068780d8007 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400093 +#define __FreeBSD_version 1400094 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Aug 3 18: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 4RGxnm0Dkbz4TmDW; Thu, 3 Aug 2023 18: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 4RGxnl6pfdz4pM9; Thu, 3 Aug 2023 18:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691086476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxsRhNX46E2/AEUWOmknrJfzhvYM/Om9r1nCwmUo/3Q=; b=PGxfXvjstiuttRdF4LTzT308wf+j0t/p6XgRNgHtJuU1Sx76spaW7VyyEHDYRgmJlxWPF1 EEF0Ty8t4P9UNBzhE4L8otKJ1RV8R1cf4D05Fhs4cWQEoha2tAFN9KA9k0mlItqROrEamP 4ruF4ZCfgqvby1NMNENvS1RUfaG5nNp/sDCs64gmOqrbwlik7H09lHGeDwf1z6YsnCuMqw 4u9sZu+3qWLY22A7fRSg83mf5O1LdiF8I8langKG+Z1KQiaAp34IdPr7BVc95GOBwW7sZ5 ZCvVLaLnS0KrCi3HyJWnlxJh/koumwRww1fnOkwqSfk5/aLehlxWkFMg+q9W4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691086476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxsRhNX46E2/AEUWOmknrJfzhvYM/Om9r1nCwmUo/3Q=; b=kV07C/fX6tPuTDtT3ZrI6J07vMqUEmzcY0+MAoigarvGA3dR9JHInPEZWwzs1qj2C1iBKj M8w9D7lNCOYq5WktTo0g0M2MXhqfUgT+Zhzk0ItofuTBp4qqCzXqlZyi6rbv++2XdPa+vl bczVwIph0Anj5I9dWQ3kZsFSHkV+HxXZhGkmyDALl/db535eH/brge9MjrzB72S2Sh6LJ4 0f3rGByUJHUlqISlZDgPpX+BY3wP7JgOWFb5A/ly7cKfLH2JttRRqee4c5AP3HI93GfGtQ JrH9+Kaz27ilKD0744ScJTacaCEU71Q5V2m/nw6xkFVL2/oVRijjE2qWxiUzFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691086476; a=rsa-sha256; cv=none; b=B7/I16fotfz0UGTe479P7y+T3+5nL4OIAIFQv6oKinX54+jD7m/Jell7btMjChRijJorko Tho4JnEBpYTjtx89d4OwYTK7m2sAwYIIQH9sVcbfOlp+wK9As8Ic3bFOoLDcGiBvyiqWXL WvVYUGHXZaWivlZLY8R9XZbTdavRSxwnNKuA+dvOMfrza4DOYNomNalPHhGBYpM0UvzhUG Cc7Lub/pjj2xHFVrCvUgiYEF48kaYwQtw67Bjf++IbQelpFO+VU2AytjiClSTgTNrKu6t0 UZkNT61qeDiNE8VTvwuUn8rnNX3cFIuybEnaKyFSgJxLVlxDtCm0FDXmL5W6qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGxnl5X54zVf8; Thu, 3 Aug 2023 18:14: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 373IEZRW005173; Thu, 3 Aug 2023 18: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 373IEZpr005172; Thu, 3 Aug 2023 18:14:35 GMT (envelope-from git) Date: Thu, 3 Aug 2023 18:14:35 GMT Message-Id: <202308031814.373IEZpr005172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f12952eaeeba - main - arm64: Comment out some ID registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f12952eaeeba706725d888a46ff24baa2ac420d7 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f12952eaeeba706725d888a46ff24baa2ac420d7 commit f12952eaeeba706725d888a46ff24baa2ac420d7 Author: Andrew Turner AuthorDate: 2023-08-03 18:02:25 +0000 Commit: Andrew Turner CommitDate: 2023-08-03 18:13:17 +0000 arm64: Comment out some ID registers Older toolchains don't support reading these registers. Until a fix is added comment them out. Reported by: jhb Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 2347d27c69e1..4beb34b04381 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -139,11 +139,15 @@ struct cpu_desc { uint64_t id_aa64mmfr0; uint64_t id_aa64mmfr1; uint64_t id_aa64mmfr2; +#ifdef NOTYET uint64_t id_aa64mmfr3; uint64_t id_aa64mmfr4; +#endif uint64_t id_aa64pfr0; uint64_t id_aa64pfr1; +#ifdef NOTYET uint64_t id_aa64pfr2; +#endif uint64_t id_aa64zfr0; uint64_t ctr; #ifdef COMPAT_FREEBSD32 @@ -1268,6 +1272,7 @@ static const struct mrs_field id_aa64mmfr2_fields[] = { }; +#ifdef NOTYET /* ID_AA64MMFR2_EL1 */ static const struct mrs_field_value id_aa64mmfr3_spec_fpacc[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR3, Spec_FPACC, NONE, IMPL), @@ -1303,6 +1308,7 @@ static const struct mrs_field id_aa64mmfr3_fields[] = { static const struct mrs_field id_aa64mmfr4_fields[] = { MRS_FIELD_END, }; +#endif /* ID_AA64PFR0_EL1 */ @@ -1543,10 +1549,12 @@ static const struct mrs_field id_aa64pfr1_fields[] = { }; +#ifdef NOTYET /* ID_AA64PFR2_EL1 */ static const struct mrs_field id_aa64pfr2_fields[] = { MRS_FIELD_END, }; +#endif /* ID_AA64ZFR0_EL1 */ @@ -1846,12 +1854,16 @@ static const struct mrs_user_reg user_regs[] = { USER_REG(ID_AA64MMFR0_EL1, id_aa64mmfr0), USER_REG(ID_AA64MMFR1_EL1, id_aa64mmfr1), USER_REG(ID_AA64MMFR2_EL1, id_aa64mmfr2), +#ifdef NOTYET USER_REG(ID_AA64MMFR3_EL1, id_aa64mmfr3), USER_REG(ID_AA64MMFR4_EL1, id_aa64mmfr4), +#endif USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0), USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1), +#ifdef NOTYET USER_REG(ID_AA64PFR2_EL1, id_aa64pfr2), +#endif USER_REG(ID_AA64ZFR0_EL1, id_aa64zfr0), @@ -2560,10 +2572,12 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Processor Features 1", desc->id_aa64pfr1, id_aa64pfr1_fields); +#ifdef NOTYET /* AArch64 Processor Feature Register 2 */ if (SHOULD_PRINT_REG(id_aa64pfr2)) print_id_register(sb, "Processor Features 2", desc->id_aa64pfr2, id_aa64pfr2_fields); +#endif /* AArch64 Memory Model Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64mmfr0)) @@ -2580,6 +2594,7 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Memory Model Features 2", desc->id_aa64mmfr2, id_aa64mmfr2_fields); +#ifdef NOTYET /* AArch64 Memory Model Feature Register 3 */ if (SHOULD_PRINT_REG(id_aa64mmfr3)) print_id_register(sb, "Memory Model Features 3", @@ -2589,6 +2604,7 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, if (SHOULD_PRINT_REG(id_aa64mmfr4)) print_id_register(sb, "Memory Model Features 4", desc->id_aa64mmfr4, id_aa64mmfr4_fields); +#endif /* AArch64 Debug Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64dfr0)) @@ -2704,11 +2720,15 @@ identify_cpu(u_int cpu) desc->id_aa64mmfr0 = READ_SPECIALREG(id_aa64mmfr0_el1); desc->id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); desc->id_aa64mmfr2 = READ_SPECIALREG(id_aa64mmfr2_el1); +#ifdef NOTYET desc->id_aa64mmfr3 = READ_SPECIALREG(id_aa64mmfr3_el1); desc->id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); +#endif desc->id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); desc->id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1); +#ifdef NOTYET desc->id_aa64pfr2 = READ_SPECIALREG(id_aa64pfr2_el1); +#endif /* * ID_AA64ZFR0_EL1 is only valid when at least one of: From nobody Thu Aug 3 19:50: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 4RGzw33khTz4TtF0; Thu, 3 Aug 2023 19:50: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 4RGzw336V5z3Bns; Thu, 3 Aug 2023 19:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ej1uY4cuXa+i2AA39svobvD1b6cEbhO8p/LiLjKFYfE=; b=PAEgJfIqlv5QAdvCQ4gKnUFN/nWMsNG72E8CaRaJNOywxrNev4GhdhIsH6ZKF6KXBA7ymF 3Wc2kuVf+cB/cUmGGtUvDXWPuO+sZuwk7L1Zdc/pdbL7Hw9SXhGJcrFRzVrH4ooyisfZ/w wTtFTEDUsE4NIUs15J3tovXGV5Ms+uU0XqaTNSihfJ8+6IWQm2S5luOtaTTe/mD7k8Sius i0dIJttXZ/rS047WfxY1Cv+WJDGdP+qGN+YIcxlhvfWN4bpdB2e+gmm9QkG+nq1KsRMlIR 3xV9Tor4SjcSglSNasanV7oJdkyIPsLoWQFeLFaCPldJ3VZ3gdY0xRVNONgxNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ej1uY4cuXa+i2AA39svobvD1b6cEbhO8p/LiLjKFYfE=; b=hKs+GJK9EdeEou9eRY3xY+b9ZQRoC2cY1E3Y9KV9N9Cjw+8mjwGCY9naOxfk+vh030OV7R YQWTureuHAqDNpSStj9XsU8mRlqJbqKaLFq4avHMwo8fumtrIcm8Nsd93XHWTsdzunqixP ITIjUPfx68C0/JU5Sj+oLyHTQC/spNCIUVoGjA6ar59HnHcAHSJm8n0TBL6E4nnlhzMuB7 8N42Y97CXc9FUvd0hdGMIZs+psj9RSzR4oLL+1xoCYDfeVtQhTOiQbub9VyzOft20ZWqSp X7BwQojk5vYXcjbp/kjKZCx/9t6cnkNbdJ3rb61ZjGRHH5RlAuJf0UZ1U490cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691092211; a=rsa-sha256; cv=none; b=LV5nwAr3lTxYrNww99hLfY/zuWHGPZdO6dPRwcExkeKHQOKnCEu7CHbWpBWf09GWOw2a1J Xzl7rhv7evYufoWI9mg/owevjJI79Auxanjwu6lxYxS4/4nCnMFstkGmw4rkn7UaXMf995 Z9Nc9DKwwgNxh+WiFz72TWNxxDhSMGktcWCGOyYcEkulJa4AvCVj/zLsWNJbFd2CL9dzcM FlyYDr4PfQDfM7UlDvn5W6d4VAcssDYeFEnTiF6Iq4beDOkLn96Zk9vXIMzLH68o2BHhhI g7ievAeRbHlSJJqTnre1t1qninzJSf6uEi5+Rljvc3nu/MA4OB8cHIITI0HSlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGzw32BhvzYw5; Thu, 3 Aug 2023 19:50: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 373JoBFB058791; Thu, 3 Aug 2023 19:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373JoBpb058788; Thu, 3 Aug 2023 19:50:11 GMT (envelope-from git) Date: Thu, 3 Aug 2023 19:50:11 GMT Message-Id: <202308031950.373JoBpb058788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 7bcdbacf8437 - main - em(4): add link to lem(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bcdbacf8437ea710f2e7526f225ffa36e504d29 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7bcdbacf8437ea710f2e7526f225ffa36e504d29 commit 7bcdbacf8437ea710f2e7526f225ffa36e504d29 Author: Kevin Bowling AuthorDate: 2023-08-03 19:49:12 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 19:49:12 +0000 em(4): add link to lem(4) --- share/man/man4/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 6abe9375e606..047f3b1aeba7 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -662,7 +662,9 @@ MLINKS+=disc.4 if_disc.4 MLINKS+=edsc.4 if_edsc.4 MLINKS+=em.4 if_em.4 \ em.4 igb.4 \ - em.4 if_igb.4 + em.4 if_igb.4 \ + em.4 lem.4 \ + em.4 if_lem.4 MLINKS+=enc.4 if_enc.4 MLINKS+=epair.4 if_epair.4 MLINKS+=et.4 if_et.4 From nobody Thu Aug 3 19:50: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 4RGzw44Nf7z4TtK0; Thu, 3 Aug 2023 19:50: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 4RGzw43vzqz3C1w; Thu, 3 Aug 2023 19:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkooKx3YSVmC7/+u/HfZ1xuPu4fBqG54ZSOOmnIXAgs=; b=FE75bz7Kt3Z2eljZEGHNPeYI8sGySn2h6gANyRB+8jn7jx+Wyweb5qRmnK0S6xbRXSspO7 x/6GZF4GEuqWRZaepiLzJuAyfe1Dk7LF3V26KpLuQjpNpss/pI1Hr1fbVKUZ2KypHAptEM 5tEBZMZQKbKp6Mdv0UJE+I9b7LzCtoU+7+SpPt0usBFCif4S0r10f5koaYpzWBJWm7/aOV cIvjsaxt3sLXN9yBWmZSfEpnfXxGqD92mGC5zH2cwWtZXIuBFBkhptKHr54cOMxkqhBiAu rZa4HmsFhJyq88p99RfUHUcM6XYaSC+cWXjtlU5Hww1sCyAZIYge6TyUL+ms/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkooKx3YSVmC7/+u/HfZ1xuPu4fBqG54ZSOOmnIXAgs=; b=PUI+avWxMWcowxigMFwpM0U4FXXgMM367S/uJ3pgzZJItEBkMIp7w5MFcuaWJCw52RPQt+ OZc1LYB03xp7uEC3XQxE3pzTT/SrymVHD/DEPNOLh3bM8J54yOppiGzywrgdCF6m7d+dLy opRsJXF3pjb2rxufCMYIxDID0mZt7uWyqMNFZMjl0Pu15fyiymtPVSfXdonUI2PJ+sFzfC 5AtXnkY1eFizJ7KCyodTr2e5vB6AXK2lLY/Ok+wz9FDq9h7HlLFFtlKO1P8PNwTpw/Aa88 VjIU5qKY9X3ebPXN4fAPUzceehnZkFm3Y8PRGSVqeIrjU+3p7mHOw8HQXaEGKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691092212; a=rsa-sha256; cv=none; b=ADAdsHRyyzx3FBySvVxIT1o2afr/Zx+PYNt8YjWtUA+6YFj4axR2CQP0hJpA6mCNR+Q+Ib g3FcIP+ZnnVnn8/Q38uXyYcukkGZx12FvZvHqyVfw9PIcCgv7WnK1la8++O3hPCy/wc9+Q nXYGYq2dV2bL119ueEmMhy7e2W/wC/YSW2+lLk+QUu628SfbJE/TgvuhnyZ3ltogGxau4c EJjhTzDToa9WZYhXhTMqYxmaSgXtaWAL54RfLNcNdwhiNpu4fSvTS4bQ/kQyGpeASgUJG5 uPleJpAUmol2z9fHSkGzx8apUO3Y+pQy+zNT4+NDaWXiX4DdZVwqkleRJIX/iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGzw42wSgzZ1S; Thu, 3 Aug 2023 19:50: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 373JoCds059401; Thu, 3 Aug 2023 19:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373JoCka059398; Thu, 3 Aug 2023 19:50:12 GMT (envelope-from git) Date: Thu, 3 Aug 2023 19:50:12 GMT Message-Id: <202308031950.373JoCka059398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 42ce724d8021 - main - em(4): Update and expand on hardware support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ce724d8021132b5ebcf8cc944f14e19c1c439f Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=42ce724d8021132b5ebcf8cc944f14e19c1c439f commit 42ce724d8021132b5ebcf8cc944f14e19c1c439f Author: Kevin Bowling AuthorDate: 2023-08-03 19:49:42 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 19:49:42 +0000 em(4): Update and expand on hardware support --- share/man/man4/em.4 | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index c4395a89699b..f81703f1a727 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 8, 2023 +.Dd August 3, 2023 .Dt EM 4 .Os .Sh NAME @@ -55,21 +55,36 @@ if_em_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for PCI Gigabit Ethernet adapters based on +driver provides support for PCI/PCI-X Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, -82546EB, 82546GB, 82547, 82571, 81572, 82573, and 82574 Ethernet +82546EB, 82546GB, 82547 controller chips. +.Pp +The +.Nm +driver provides support for PCI Express Gigabit Ethernet adapters +based on the Intel 82571, 81572, 82573, 82574, and 82583 Ethernet controller chips. .Pp The .Nm -driver also provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82575, 82576, 82580, i21x and i35x. +driver provides support for Gigabit Ethernet adapters connected to I/O +Controller Hub (ICH), Platform Controller Hub (PCH) and Connectivity +Integrated (CNVi) including Intel 80003ES2LAN, 82562, 82566, 82567, +82577, 82578, 82579, i217, i218, and i219. +.Pp +The +.Nm +driver provides support for PCI Express Gigabit Ethernet adapters +based on the Intel 82575, 82576, 82580, i210, i211, and i35x. These +appear as +.Cm igb +interfaces to maintain compatibility with existing infrastructure. .Pp The driver supports Transmit/Receive checksum offload and Jumbo Frames on all but 82542-based adapters. .Pp Furthermore it supports TCP segmentation offload (TSO) on all adapters but -those based on the 82543, 82544 and 82547 controller chips. +those based on the 82542, 82543, 82544 and 82547 controller chips. The identification LEDs of the adapters supported by the .Nm driver can be controlled via the @@ -307,7 +322,8 @@ The device driver first appeared in .Fx 4.4 . .Nm -was merged with the igb device driver and converted to the iflib framework in +was merged with the lem and igb device driver and converted to the iflib +framework in .Fx 12.0 . .Sh AUTHORS .An -nosplit From nobody Thu Aug 3 19:51: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 4RGzxX24VSz4TtSM; Thu, 3 Aug 2023 19:51: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 4RGzxW5gGnz3ClH; Thu, 3 Aug 2023 19:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KkrEex0t54ity/5mnyATNCufFaTTtpbHu9gCUDdS550=; b=Uzo/srhryP9YvzWICE7nS/xGEgutoWeZmM6lhJsGenPSheRd510LtF3QQ+z7003h5G8Bm3 xCaXm1ujO30mOTlhBHl6FWhvQdgAs/CA2uBo5Rfx7NbuS8OXR8V00CyM9eFbcdcyH/CePq s1ASvgkcsyXjSENDgKRfmgdiNurbRfjjw7sAHfROeyTyTNA770aWGRJyYCefOjA/0XyaxE lhhiQ5r0ZpRWKm4FFESR2LU4NUpGcAYzgSxpKZVzS3UausD24NqXbeyUsLxJ0INe1+u5q7 QRWcSp1VjK7Y4sU6p9NHmqlfv9dmx1zmfFbXTeuyEEV6G1Y3RJD4oDteDNUOlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KkrEex0t54ity/5mnyATNCufFaTTtpbHu9gCUDdS550=; b=wkf3nxnQSYnHE5e5M2Or8t2jPpdo7QCLIISJRl8dj/Vp33tg5H6Qw6szU7vM1IRfyiyr8V H16sVLzR3zw00TgJ9Xos4mWTpDqnNduyDqIioyMvwABQukXWkywv2/Sp2olQOMmJj1cU+y +bTU6MFFo5P7RSEvScR5EPUh8EMLqf8N2By5NJ8llyj9aLnxkySTrEeU9uFPjeVEbw3gsS AWZexSRNfheG8oaojZvHvttHSlwmVRILoWy3j9FFr9llWDtdqEHQEPQNBvZtBXpSso0rGP VCCTjtwshY8d8FPSH1hIUaklTXYOpErqIDNvYZvBf8PlfKHEOwaT/ZJEVaQ/UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691092287; a=rsa-sha256; cv=none; b=niEkd1cqPFeu1wKgX60DVGOF0eC4vyI3Vg+kiGs7MZ0JXtcu/YP5voC/CypC1syDHFOPY9 fGvp3CZszJFPf+32r+7aQJAA5x/aglQsFYJJI/yC/Qt1ta34ipThAkx184rMiRZYEGXO7n ccE7Sya8QrFueEmFbPHqSsolFVOpy9PE127tUMdibbJbtz1w6MAV4hiNdzYgnYvbkDde63 /3WEp6gl3h/FV/ELv3xY3R5LCkn/NpzyA9UV2TdY1R1svmCDfNPoy5P8EfY2rZdRS5ij6c nAm6FN2knUjQvQ70mERnHBWDPufueh+AOmmYrlFo7IzkPlbS4vKlbRpZ5CbyHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGzxW4jr9zZBG; Thu, 3 Aug 2023 19:51: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 373JpRjd063729; Thu, 3 Aug 2023 19:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373JpRAP063728; Thu, 3 Aug 2023 19:51:27 GMT (envelope-from git) Date: Thu, 3 Aug 2023 19:51:27 GMT Message-Id: <202308031951.373JpRAP063728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 56b9145cd00f - main - em(4): correct a 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56b9145cd00f183e8526015030e2c2d75abcc12f Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=56b9145cd00f183e8526015030e2c2d75abcc12f commit 56b9145cd00f183e8526015030e2c2d75abcc12f Author: Kevin Bowling AuthorDate: 2023-08-03 19:51:12 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 19:51:12 +0000 em(4): correct a typo --- share/man/man4/em.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index f81703f1a727..ebf04b4d8941 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -62,7 +62,7 @@ the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, The .Nm driver provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82571, 81572, 82573, 82574, and 82583 Ethernet +based on the Intel 82571, 82572, 82573, 82574, and 82583 Ethernet controller chips. .Pp The From nobody Thu Aug 3 19:52: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 4RGzyr1vhcz4TtYg; Thu, 3 Aug 2023 19:52: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 4RGzyr1Qpzz3D4q; Thu, 3 Aug 2023 19:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2qIUEv9NSWFJjnWc03nUrUghT/kchA4dQOgNOzzZKs=; b=Rr7q2p/dcUuBBnIr5W4AZThmckVq5jXHokIvU3SjpxOTgUUrlNL3M8UiL0Xlwjc4OLu38w ILXB89gP2NqHRhReGWAtaIab/B8DfxEhlc8js36wdYj9xar1p4bgIjL8fDlwalwAXuGYhY pgMWtWBFcK/bnSKiOvoA3utvO3O24R7OBjd6le2uAfJu20vlgstoesT/FUj06GHmamQD2k dpexvydNm25lAk4989pZVl0rzTY5/DsTN/vwxlmivS/Yku2niQy9c7kGHyaTPKb8cwvL09 bnCkkLMX6rSO+OrwdVwy2xQWZ6cxAGwC/5VaDUeUWVX1s50lf6C62xZkVGPKLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691092356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2qIUEv9NSWFJjnWc03nUrUghT/kchA4dQOgNOzzZKs=; b=Fe6WGNlx8BgcG294uQioqQ4yuvb5hA0L9RW8VoS9+VjvWtF8uvkYwTDHEUntNiWENMCyKu zgPMClbEOnA9uI5752SlOcAasGjkkVEiObsF8PHQ7XiHee/8g25HWnAkJoOn/57H9LGvDB CjpJPaOIoLaqvj8TAGeP7kIPaUARlhZK90RSV5kbJdsXrJ69a6wKff85am9cs7uXhk7k6N 38ga5guVUq7IqlZ7a/v42PoJemHbI4xaFkJkNqnpV3NWEFQLx1+KreN1RqbIJ3dZiIu32T hlkLlp2VFUrIvgLx2D59gdawrVvUm/zsh1Gsf5G+6KsIvnmPSynaRvrPENX72w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691092356; a=rsa-sha256; cv=none; b=ZC8yISmgHzHOZhB+wotb+pi8G04MEV3nDHHfLcpwuGfHO1bL/sETSKiKLpDiI5sRf38Wmt l1kpwELPG798zTEVoWmz5eUXCTrU3nWP93AXNcQ/WkF2UaD7m8a0RuvqBP5dOt4uFa9rPa W4l8GMbmtT+zwqW84opOD5i2hkFdCPC3qKjFf5D+jT0QlSHoO8c/h8dKngzB9nKWFErhEt RmqdNTpkoQvuzYiAV38/+iJ/zBDNdnj909wP2Fd/Q6oBK2LZ7ctIJsOJmV5YSky2vLfb+p vgXOQCvTtQYvxas+F1e6kqJykg/wVr+BspVuO7W8R8SKLSm3qy7m7jC9bbNBJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGzyr0Tj6zZBT; Thu, 3 Aug 2023 19:52: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 373Jqadm070173; Thu, 3 Aug 2023 19:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373JqZEd070172; Thu, 3 Aug 2023 19:52:35 GMT (envelope-from git) Date: Thu, 3 Aug 2023 19:52:35 GMT Message-Id: <202308031952.373JqZEd070172@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: 99843eb89954 - main - Clean up libm use of the __ieee754_ prefix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 99843eb89954dac76afe7cf18d962eddfe7a7987 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=99843eb89954dac76afe7cf18d962eddfe7a7987 commit 99843eb89954dac76afe7cf18d962eddfe7a7987 Author: Steve Kargl AuthorDate: 2023-08-03 19:51:17 +0000 Commit: Dimitry Andric CommitDate: 2023-08-03 19:51:53 +0000 Clean up libm use of the __ieee754_ prefix This removes the __ieee754_ prefix from a number of the math functions. msun/src/math_private.h contains the statement that /* * ieee style elementary functions * * We rename functions here to improve other sources' diffability * against fdlibm. */ #define __ieee754_sqrt sqrt ... Here, fdlibm refers to https://netlib.org/fdlibm. It is seen from https://netlib.org/fdlibm/readme that this prefix was used to differentiate between different standards: Wrapper functions will twist the result of the ieee754 function to comply to the standard specified by the value of _LIB_VERSION if _LIB_VERSION = _IEEE_, return the ieee754 result; if _LIB_VERSION = _SVID_, return SVID result; if _LIB_VERSION = _XOPEN_, return XOPEN result; if _LIB_VERSION = _POSIX_, return POSIX/ANSI result. (These are macros, see fdlibm.h for their definition.) AFAICT, FreeBSD has never supported these wrappers. In addition, as C99, principally the long double, functions were added to libm, this convention was not maintained. Given that only 148 of 324 files under lib/msun contain a "Copyright (C) 1993 by Sun Microsystems" statement, the removal of the __ieee754_ prefix provides consistency across all source files. The last time someone compared lib/msun to fdlibm appears to be commit 3f70824172feb82ea3dcdb3866b54fe0eb7cd890 Author: David Schultz Date: Fri Feb 4 18:26:06 2005 +0000 Reduce diffs against vendor source (Sun fdlibm 5.3). The most recent fdlibm RCS string that appears in a Sun Microsystem copyrighted file is date "95/01/18". With Oracle Corporation's acquisition of Sun Microsystems in 2009, it is unlikely that fdlibm will ever be updated. A search for fdlibm at https://opensource.oracle.com/ yields no hits. Finally, OpenBSD removed the use of this prefix over 21 years ago. pSee revision 1.6 of OpenBSD's math_private.h. Note: this does not drop the __ieee754_ prefix from the trigonometric argument reduction functions, e.g., __ieee754_rem_pio2. These functions are internal to the libm and exported through Symbol.map; and thus, reserved for the implementation. PR: 272783 MFC after: 1 week --- lib/msun/src/e_acos.c | 4 +-- lib/msun/src/e_acosf.c | 2 +- lib/msun/src/e_acosh.c | 8 +++--- lib/msun/src/e_acoshf.c | 8 +++--- lib/msun/src/e_asin.c | 4 +-- lib/msun/src/e_asinf.c | 2 +- lib/msun/src/e_atan2.c | 4 +-- lib/msun/src/e_atan2f.c | 2 +- lib/msun/src/e_atanh.c | 4 +-- lib/msun/src/e_atanhf.c | 2 +- lib/msun/src/e_cosh.c | 8 +++--- lib/msun/src/e_coshf.c | 6 ++--- lib/msun/src/e_exp.c | 4 +-- lib/msun/src/e_expf.c | 2 +- lib/msun/src/e_fmod.c | 4 +-- lib/msun/src/e_fmodf.c | 4 +-- lib/msun/src/e_gamma.c | 8 +++--- lib/msun/src/e_gamma_r.c | 8 +++--- lib/msun/src/e_gammaf.c | 8 +++--- lib/msun/src/e_gammaf_r.c | 8 +++--- lib/msun/src/e_hypot.c | 4 +-- lib/msun/src/e_hypotf.c | 6 ++--- lib/msun/src/e_j0.c | 10 +++---- lib/msun/src/e_j0f.c | 8 +++--- lib/msun/src/e_j1.c | 8 +++--- lib/msun/src/e_j1f.c | 6 ++--- lib/msun/src/e_jn.c | 28 ++++++++++---------- lib/msun/src/e_jnf.c | 26 +++++++++--------- lib/msun/src/e_lgamma.c | 8 +++--- lib/msun/src/e_lgamma_r.c | 16 ++++++------ lib/msun/src/e_lgammaf.c | 8 +++--- lib/msun/src/e_lgammaf_r.c | 14 +++++----- lib/msun/src/e_log.c | 4 +-- lib/msun/src/e_log10.c | 2 +- lib/msun/src/e_log10f.c | 2 +- lib/msun/src/e_log2.c | 2 +- lib/msun/src/e_log2f.c | 2 +- lib/msun/src/e_logf.c | 2 +- lib/msun/src/e_pow.c | 4 +-- lib/msun/src/e_powf.c | 4 +-- lib/msun/src/e_remainder.c | 6 ++--- lib/msun/src/e_remainderf.c | 4 +-- lib/msun/src/e_scalb.c | 6 ++--- lib/msun/src/e_scalbf.c | 4 +-- lib/msun/src/e_sinh.c | 6 ++--- lib/msun/src/e_sinhf.c | 4 +-- lib/msun/src/e_sqrt.c | 6 ++--- lib/msun/src/e_sqrtf.c | 4 +-- lib/msun/src/math_private.h | 61 ------------------------------------------- lib/msun/src/s_asinh.c | 6 ++--- lib/msun/src/s_asinhf.c | 6 ++--- lib/msun/src/s_erf.c | 4 +-- lib/msun/src/s_significand.c | 2 +- lib/msun/src/s_significandf.c | 2 +- 54 files changed, 162 insertions(+), 223 deletions(-) diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c index 1f6dca5bb5cb..6623355baa7c 100644 --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acos(x) +/* acos(x) * Method : * acos(x) = pi/2 - asin(x) * acos(-x) = pi/2 + asin(x) @@ -62,7 +62,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_acos(double x) +acos(double x) { double z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c index c9f62cc40f5c..64f1c5afb182 100644 --- a/lib/msun/src/e_acosf.c +++ b/lib/msun/src/e_acosf.c @@ -32,7 +32,7 @@ pS2 = -8.6563630030e-03, qS1 = -7.0662963390e-01; float -__ieee754_acosf(float x) +acosf(float x) { float z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c index 358c8bd6a636..7947995820d0 100644 --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acosh(x) +/* acosh(x) * Method : * Based on * acosh(x) = log [ x + sqrt(x*x-1) ] @@ -39,7 +39,7 @@ one = 1.0, ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ double -__ieee754_acosh(double x) +acosh(double x) { double t; int32_t hx; @@ -51,12 +51,12 @@ __ieee754_acosh(double x) if(hx >=0x7ff00000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ + return log(x)+ln2; /* acosh(huge)=log(2x) */ } else if(((hx-0x3ff00000)|lx)==0) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); + return log(2.0*x-one/(x+sqrt(t-one))); } else { /* 1=0x7f800000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_logf(x)+ln2; /* acosh(huge)=log(2x) */ + return logf(x)+ln2; /* acosh(huge)=log(2x) */ } else if (hx==0x3f800000) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_logf((float)2.0*x-one/(x+__ieee754_sqrtf(t-one))); + return logf((float)2.0*x-one/(x+sqrtf(t-one))); } else { /* 1 __FBSDID("$FreeBSD$"); -/* __ieee754_asin(x) +/* asin(x) * Method : * Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ... * we approximate asin(x) on [0,0.5] by @@ -68,7 +68,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_asin(double x) +asin(double x) { double t=0.0,w,p,q,c,r,s; int32_t hx,ix; diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c index deaabb6a326e..db4b9b6034f7 100644 --- a/lib/msun/src/e_asinf.c +++ b/lib/msun/src/e_asinf.c @@ -32,7 +32,7 @@ static const double pio2 = 1.570796326794896558e+00; float -__ieee754_asinf(float x) +asinf(float x) { double s; float t,w,p,q; diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c index 231a1611ee12..0b2e72102edb 100644 --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atan2(y,x) +/* atan2(y,x) * Method : * 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x). * 2. Reduce x to positive by (if x and y are unexceptional): @@ -58,7 +58,7 @@ static volatile double pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ double -__ieee754_atan2(double y, double x) +atan2(double y, double x) { double z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c index 346d76746c05..4ea001df974a 100644 --- a/lib/msun/src/e_atan2f.c +++ b/lib/msun/src/e_atan2f.c @@ -30,7 +30,7 @@ static volatile float pi_lo = -8.7422776573e-08; /* 0xb3bbbd2e */ float -__ieee754_atan2f(float y, float x) +atan2f(float y, float x) { float z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c index 422ff2698067..41f3bcaca26d 100644 --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atanh(x) +/* atanh(x) * Method : * 1.Reduced x to positive by atanh(-x) = -atanh(x) * 2.For x>=0.5 @@ -42,7 +42,7 @@ static const double one = 1.0, huge = 1e300; static const double zero = 0.0; double -__ieee754_atanh(double x) +atanh(double x) { double t; int32_t hx,ix; diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c index 4bd6a8f9b9c6..46643beb5ab0 100644 --- a/lib/msun/src/e_atanhf.c +++ b/lib/msun/src/e_atanhf.c @@ -24,7 +24,7 @@ static const float one = 1.0, huge = 1e30; static const float zero = 0.0; float -__ieee754_atanhf(float x) +atanhf(float x) { float t; int32_t hx,ix; diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c index 246b5fbec860..071663eb4e15 100644 --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_cosh(x) +/* cosh(x) * Method : * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2 * 1. Replace x by |x| (cosh(x) = cosh(-x)). @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, half=0.5, huge = 1.0e300; double -__ieee754_cosh(double x) +cosh(double x) { double t,w; int32_t ix; @@ -65,12 +65,12 @@ __ieee754_cosh(double x) /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */ if (ix < 0x40360000) { - t = __ieee754_exp(fabs(x)); + t = exp(fabs(x)); return half*t+half/t; } /* |x| in [22, log(maxdouble)] return half*exp(|x|) */ - if (ix < 0x40862E42) return half*__ieee754_exp(fabs(x)); + if (ix < 0x40862E42) return half*exp(fabs(x)); /* |x| in [log(maxdouble), overflowthresold] */ if (ix<=0x408633CE) diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c index 95a0d6ee68ba..1673315d7b31 100644 --- a/lib/msun/src/e_coshf.c +++ b/lib/msun/src/e_coshf.c @@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, half=0.5, huge = 1.0e30; float -__ieee754_coshf(float x) +coshf(float x) { float t,w; int32_t ix; @@ -43,12 +43,12 @@ __ieee754_coshf(float x) /* |x| in [0.5*ln2,9], return (exp(|x|)+1/exp(|x|))/2; */ if (ix < 0x41100000) { - t = __ieee754_expf(fabsf(x)); + t = expf(fabsf(x)); return half*t+half/t; } /* |x| in [9, log(maxfloat)] return half*exp(|x|) */ - if (ix < 0x42b17217) return half*__ieee754_expf(fabsf(x)); + if (ix < 0x42b17217) return half*expf(fabsf(x)); /* |x| in [log(maxfloat), overflowthresold] */ if (ix<=0x42b2d4fc) diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c index dd04d8e839d5..59da39217391 100644 --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_exp(x) +/* exp(x) * Returns the exponential of x. * * Method @@ -102,7 +102,7 @@ huge = 1.0e+300, twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ double -__ieee754_exp(double x) /* default IEEE double exp */ +exp(double x) /* default IEEE double exp */ { double y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c index 4903d55c5ab3..620d341be274 100644 --- a/lib/msun/src/e_expf.c +++ b/lib/msun/src/e_expf.c @@ -43,7 +43,7 @@ huge = 1.0e+30, twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ float -__ieee754_expf(float x) +expf(float x) { float y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index 3a28dc4ff1f3..6d5f5332cb85 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmod(x,y) + * fmod(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, Zero[] = {0.0, -0.0,}; double -__ieee754_fmod(double x, double y) +fmod(double x, double y) { int32_t n,hx,hy,hz,ix,iy,sx,i; u_int32_t lx,ly,lz; diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 1b6bf36f9cba..3cef9213c1e5 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -17,7 +17,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmodf(x,y) + * fmodf(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, Zero[] = {0.0, -0.0,}; float -__ieee754_fmodf(float x, float y) +fmodf(float x, float y) { int32_t n,hx,hy,hz,ix,iy,sx,i; diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c index 28fb5ccba6d6..a13f3e22c08b 100644 --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -15,10 +15,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma(x) +/* gamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gamma_r + * Method: call gamma_r */ #include "math.h" @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; double -__ieee754_gamma(double x) +gamma(double x) { - return __ieee754_gamma_r(x,&signgam); + return gamma_r(x,&signgam); } diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c index 2c423dce8558..2d996cabca20 100644 --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -15,18 +15,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma_r(x, signgamp) +/* gamma_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgamma_r + * Method: See lgamma_r */ #include "math.h" #include "math_private.h" double -__ieee754_gamma_r(double x, int *signgamp) +gamma_r(double x, int *signgamp) { - return __ieee754_lgamma_r(x,signgamp); + return lgamma_r(x,signgamp); } diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c index c1b1668df975..563c1482282d 100644 --- a/lib/msun/src/e_gammaf.c +++ b/lib/msun/src/e_gammaf.c @@ -16,10 +16,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf(x) +/* gammaf(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gammaf_r + * Method: call gammaf_r */ #include "math.h" @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; float -__ieee754_gammaf(float x) +gammaf(float x) { - return __ieee754_gammaf_r(x,&signgam); + return gammaf_r(x,&signgam); } diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c index 9d7831b5501b..d7fc2db1e96c 100644 --- a/lib/msun/src/e_gammaf_r.c +++ b/lib/msun/src/e_gammaf_r.c @@ -16,18 +16,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf_r(x, signgamp) +/* gammaf_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgammaf_r + * Method: See lgammaf_r */ #include "math.h" #include "math_private.h" float -__ieee754_gammaf_r(float x, int *signgamp) +gammaf_r(float x, int *signgamp) { - return __ieee754_lgammaf_r(x,signgamp); + return lgammaf_r(x,signgamp); } diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c index 7c455bb6652f..8e3f9317b3a6 100644 --- a/lib/msun/src/e_hypot.c +++ b/lib/msun/src/e_hypot.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_hypot(x,y) +/* hypot(x,y) * * Method : * If (assume round-to-nearest) z=x*x+y*y @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" double -__ieee754_hypot(double x, double y) +hypot(double x, double y) { double a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c index 00610268fafb..a3b8c866697b 100644 --- a/lib/msun/src/e_hypotf.c +++ b/lib/msun/src/e_hypotf.c @@ -20,7 +20,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" float -__ieee754_hypotf(float x, float y) +hypotf(float x, float y) { float a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; @@ -67,14 +67,14 @@ __ieee754_hypotf(float x, float y) if (w>b) { SET_FLOAT_WORD(t1,ha&0xfffff000); t2 = a-t1; - w = __ieee754_sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); + w = sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); } else { a = a+a; SET_FLOAT_WORD(y1,hb&0xfffff000); y2 = b - y1; SET_FLOAT_WORD(t1,(ha+0x00800000)&0xfffff000); t2 = a - t1; - w = __ieee754_sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); + w = sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); } if(k!=0) { SET_FLOAT_WORD(t1,(127+k)<<23); diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c index 5d862b6f834d..c43ab6996b4a 100644 --- a/lib/msun/src/e_j0.c +++ b/lib/msun/src/e_j0.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j0(x), __ieee754_y0(x) +/* j0(x), y0(x) * Bessel function of the first and second kinds of order zero. * Method -- j0(x): * 1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ... @@ -83,7 +83,7 @@ S04 = 1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */ static const double zero = 0, qrtr = 0.25; double -__ieee754_j0(double x) +j0(double x) { double z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -143,7 +143,7 @@ v03 = 2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */ v04 = 4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */ double -__ieee754_y0(double x) +y0(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -192,12 +192,12 @@ __ieee754_y0(double x) return z; } if(ix<=0x3e400000) { /* x < 2**-27 */ - return(u00 + tpi*__ieee754_log(x)); + return(u00 + tpi*log(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0(x)*__ieee754_log(x))); + return(u/v + tpi*(j0(x)*log(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c index 1c5ef4da1b49..290be04fc900 100644 --- a/lib/msun/src/e_j0f.c +++ b/lib/msun/src/e_j0f.c @@ -45,7 +45,7 @@ S04 = 1.1661400734e-09; /* 0x30a045e8 */ static const float zero = 0, qrtr = 0.25; float -__ieee754_j0f(float x) +j0f(float x) { float z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -105,7 +105,7 @@ v03 = 2.5915085189e-07, /* 0x348b216c */ v04 = 4.4111031494e-10; /* 0x2ff280c2 */ float -__ieee754_y0f(float x) +y0f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -147,12 +147,12 @@ __ieee754_y0f(float x) return z; } if(ix<=0x39000000) { /* x < 2**-13 */ - return(u00 + tpi*__ieee754_logf(x)); + return(u00 + tpi*logf(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0f(x)*__ieee754_logf(x))); + return(u/v + tpi*(j0f(x)*logf(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c index fb4462738368..ee3f6fcc69d4 100644 --- a/lib/msun/src/e_j1.c +++ b/lib/msun/src/e_j1.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j1(x), __ieee754_y1(x) +/* j1(x), y1(x) * Bessel function of the first and second kinds of order zero. * Method -- j1(x): * 1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ... @@ -84,7 +84,7 @@ s05 = 1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */ static const double zero = 0.0; double -__ieee754_j1(double x) +j1(double x) { double z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -140,7 +140,7 @@ static const double V0[5] = { }; double -__ieee754_y1(double x) +y1(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -190,7 +190,7 @@ __ieee754_y1(double x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1(x)*__ieee754_log(x)-one/x)); + return(x*(u/v) + tpi*(j1(x)*log(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c index c6c45c107afa..e1f4498b71af 100644 --- a/lib/msun/src/e_j1f.c +++ b/lib/msun/src/e_j1f.c @@ -46,7 +46,7 @@ s05 = 1.2354227016e-11; /* 0x2d59567e */ static const float zero = 0.0; float -__ieee754_j1f(float x) +j1f(float x) { float z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -102,7 +102,7 @@ static const float V0[5] = { }; float -__ieee754_y1f(float x) +y1f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -145,7 +145,7 @@ __ieee754_y1f(float x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1f(x)*__ieee754_logf(x)-one/x)); + return(x*(u/v) + tpi*(j1f(x)*logf(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c index 5aaebd400065..6b876ce69554 100644 --- a/lib/msun/src/e_jn.c +++ b/lib/msun/src/e_jn.c @@ -14,7 +14,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_jn(n, x), __ieee754_yn(n, x) + * jn(n, x), yn(n, x) * floating point Bessel's function of the 1st and 2nd kind * of order n * @@ -51,7 +51,7 @@ one = 1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */ static const double zero = 0.00000000000000000000e+00; double -__ieee754_jn(int n, double x) +jn(int n, double x) { int32_t i,hx,ix,lx, sgn; double a, b, c, s, temp, di; @@ -69,8 +69,8 @@ __ieee754_jn(int n, double x) x = -x; hx ^= 0x80000000; } - if(n==0) return(__ieee754_j0(x)); - if(n==1) return(__ieee754_j1(x)); + if(n==0) return(j0(x)); + if(n==1) return(j1(x)); sgn = (n&1)&(hx>>31); /* even n -- 0, odd n -- sign(x) */ x = fabs(x); if((ix|lx)==0||ix>=0x7ff00000) /* if x is 0 or inf */ @@ -100,8 +100,8 @@ __ieee754_jn(int n, double x) } b = invsqrtpi*temp/sqrt(x); } else { - a = __ieee754_j0(x); - b = __ieee754_j1(x); + a = j0(x); + b = j1(x); for(i=1;i0;i--){ temp = b; @@ -201,8 +201,8 @@ __ieee754_jn(int n, double x) } } } - z = __ieee754_j0(x); - w = __ieee754_j1(x); + z = j0(x); + w = j1(x); if (fabs(z) >= fabs(w)) b = (t*z/b); else @@ -213,7 +213,7 @@ __ieee754_jn(int n, double x) } double -__ieee754_yn(int n, double x) +yn(int n, double x) { int32_t i,hx,ix,lx; int32_t sign; @@ -232,8 +232,8 @@ __ieee754_yn(int n, double x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0(x)); - if(n==1) return(sign*__ieee754_y1(x)); + if(n==0) return(y0(x)); + if(n==1) return(sign*y1(x)); if(ix==0x7ff00000) return zero; if(ix>=0x52D00000) { /* x > 2**302 */ /* (x >> n**2) @@ -259,8 +259,8 @@ __ieee754_yn(int n, double x) b = invsqrtpi*temp/sqrt(x); } else { u_int32_t high; - a = __ieee754_y0(x); - b = __ieee754_y1(x); + a = y0(x); + b = y1(x); /* quit if b is -inf */ GET_HIGH_WORD(high,b); for(i=1;i>31); /* even n -- 0, odd n -- sign(x) */ x = fabsf(x); if(ix==0||ix>=0x7f800000) /* if x is 0 or inf */ b = zero; else if((float)n<=x) { /* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */ - a = __ieee754_j0f(x); - b = __ieee754_j1f(x); + a = j0f(x); + b = j1f(x); for(i=1;i0;i--){ temp = b; @@ -158,8 +158,8 @@ __ieee754_jnf(int n, float x) } } } - z = __ieee754_j0f(x); - w = __ieee754_j1f(x); + z = j0f(x); + w = j1f(x); if (fabsf(z) >= fabsf(w)) b = (t*z/b); else @@ -170,7 +170,7 @@ __ieee754_jnf(int n, float x) } float -__ieee754_ynf(int n, float x) +ynf(int n, float x) { int32_t i,hx,ix,ib; int32_t sign; @@ -186,12 +186,12 @@ __ieee754_ynf(int n, float x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0f(x)); - if(n==1) return(sign*__ieee754_y1f(x)); + if(n==0) return(y0f(x)); + if(n==1) return(sign*y1f(x)); if(ix==0x7f800000) return zero; - a = __ieee754_y0f(x); - b = __ieee754_y1f(x); + a = y0f(x); + b = y1f(x); /* quit if b is -inf */ GET_FLOAT_WORD(ib,b); for(i=1;i __FBSDID("$FreeBSD$"); -/* __ieee754_lgamma(x) +/* lgamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_lgamma_r + * Method: call lgamma_r */ #include @@ -29,9 +29,9 @@ __FBSDID("$FreeBSD$"); extern int signgam; double *** 656 LINES SKIPPED *** From nobody Thu Aug 3 20:12: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 4RH0Pg5sn8z4Tvr4; Thu, 3 Aug 2023 20:12: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 4RH0Pg5QcJz3FlY; Thu, 3 Aug 2023 20:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691093543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QCAfsCCGf5e4u8XKNw9pLI2/uoSmZBzRufwpLNAR1fU=; b=y42YyxZ9qPDw0mRpZpw/oWYPE82q1jWQkCPApsD0GRu00NgVklAhLVaEnyREApdOQe/SqM lKiLKOdmWAoM41HVa4uoNqshLzxE+DQQ+5v5hz/4uXpgsNSPmGE7yxZK1O+SGfu6UW4FPs AY4T2BmxBhP2kCXlJseQQNsdf+aIvHGGzO9DB+wZllNER7AQp0nv9Uw2ltJzKgpykk+2RZ 9tg+m0gRF71ptqiRDcKjrw2vGPLt+GNHBCHyLlTNizXmDZvWXt3chQYpPcoxYQtCSTbYcG lGk+m5D46zsUlMPd/zSfuwLaeRJ8cUxh9gDjDrcRhkJplGjohzxvvSMzvctNCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691093543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QCAfsCCGf5e4u8XKNw9pLI2/uoSmZBzRufwpLNAR1fU=; b=h/ELEAN0opBvesCpw074zL035NfINUIi6LDnCcRdYppw9FonDITVeTDsIVImMgl1ZkHt11 M67ftG7O3FS6wXyAIM2AXokvBkCVqWwAkbWrPGGivmgXXhYQBEt54mX0RYbRycojzkh2I9 M3i2C7sNAxApPb3XnPSUqUC4+G9w5oVZjDKjcn+1UsK1pHQCAHV0e+ifZwemUXVl66UNmE H3Akg3yg5PZpIGy7eIsP8BqNPFM9rLQi1wsW6dvMuwKO4TEOgO8ToTZa9xXVv/9UqzPBWI Pky4SIkxxQvp0vBMLlFqmduxwkajC8o8XBYoGFYBe3fY0h2tnAqrQtVxaEKt5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691093543; a=rsa-sha256; cv=none; b=wi/IklaSEH7+bgZ966/r91Ioo23smdwZ68USgXaolVr7heYL6F86+BRYZ2FhrxjKhwTI7K zyBHTAb+qm7BD7JFq+t4ii26E0lufkCN/ESzCwHx8JrcnPS4Y8Mo2Buu/mSCSXJ9zwk58C PYblcHjaXmFLxOKCy9msbWpikxweACPbd1xuWzRqIdwccFj2ua9WQ45zzWuhw9/+zr+nV1 v7RAbcyLFQJwAwm5Uw2g9XvlaRmc0jgjiJsRSL3yI5N4dj5KAxfVBQcvSweU3AcAYRpYDy Rg5CkRWvtZp1PjVXtSmLXKg7yHh5t6S8zQnYhUhkUEsP8MreN8MZWbFdfDouLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH0Pg4TLbzZhq; Thu, 3 Aug 2023 20:12: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 373KCNvm002781; Thu, 3 Aug 2023 20:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373KCN3D002780; Thu, 3 Aug 2023 20:12:23 GMT (envelope-from git) Date: Thu, 3 Aug 2023 20:12:23 GMT Message-Id: <202308032012.373KCN3D002780@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: 78a7882cb1c1 - stable/13 - em(4): add link to lem(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78a7882cb1c1dd4d970a82c88f5095f94c097f3f Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=78a7882cb1c1dd4d970a82c88f5095f94c097f3f commit 78a7882cb1c1dd4d970a82c88f5095f94c097f3f Author: Kevin Bowling AuthorDate: 2023-08-03 19:49:12 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 20:10:20 +0000 em(4): add link to lem(4) (cherry picked from commit 7bcdbacf8437ea710f2e7526f225ffa36e504d29) --- share/man/man4/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index a8064d12fc0d..ae3d35d7f6fa 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -680,7 +680,9 @@ MLINKS+=disc.4 if_disc.4 MLINKS+=edsc.4 if_edsc.4 MLINKS+=em.4 if_em.4 \ em.4 igb.4 \ - em.4 if_igb.4 + em.4 if_igb.4 \ + em.4 lem.4 \ + em.4 if_lem.4 MLINKS+=enc.4 if_enc.4 MLINKS+=epair.4 if_epair.4 MLINKS+=et.4 if_et.4 From nobody Thu Aug 3 20:12: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 4RH0Ph71Xlz4Tvpc; Thu, 3 Aug 2023 20:12: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 4RH0Ph6Ghyz3G9V; Thu, 3 Aug 2023 20:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691093544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPIXKXE0ZKQ4JFISNw+yTjzLN8JKtoCOvURynFO3wTY=; b=DWuM3MhEY5LPzAEJ/swYb1oxTUR2BLT7y+omyxAQnG18nlI6HQgw5rPIfWRwAZnHwJ45Jy R6jeI6bqIf+bkNVe4Q3proZq3KxSn74uUN1garOqfQcNzpT0U7VSd5acjNEiAHsWGEAzGi VezaIagX71NJCXHwkD5zzLwUy3nTAjC6yC/B9XS2PbnwDthgPz4Ho58e9Lykxk8Uq8wE6I A4lfDFUNsUk+GITUJWL3alo3vGmXLTjzS54+YHZKwiMAgZeSravtFaAJ/9H7DMa4IPuIdO CszgpqwaAaN2CT1msWYVQwoxka0McdVT5ND4LoGuZgMNVccSX78E9ZhJMXvZgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691093544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPIXKXE0ZKQ4JFISNw+yTjzLN8JKtoCOvURynFO3wTY=; b=S/WZWPXu6p/gdMbJ8G1iaQYf1SPoX054vDxu5jAdC4IqN6kD475JXQ9tNEmNQBWmGqSU8G ycho95iXM7dnH3YwXxDzx9aPBUwg2UkQbr6QbtYi0I6FiBBmrDYCkcdtQK3oNs6jFpOfdk 8TUACw41lMBOb6Js/lTJbElJYYhIzEbGVtCsdzCetf/Uzh7x8K9qYwehKzQOq+kbj3P253 Zwx77O6u+A4pfPA2Fs1ploc3HEdIv5OSZamFxDYpYg1dI4RURASKaniptkhhGzWf4B329P d/9YHGM4ITfb2JXIfPCg/BYhLWwFT2ylbwlsrQl8gyvZCYg9vYN0n69DXspv3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691093544; a=rsa-sha256; cv=none; b=FabnQuyjE5C69oPm3s9kb+H+v+vv+0G5FrNK3W3CSCurNdpRQZH4iqjvv28sjbPzAWoHxu s1YKz6QXHF1VWm7FbleFSfRqZTOKmVy20t0Hs44qQ+fvDN6HtzagS0DfGRCfrZmyvAXoZS 0wSqGi30W/HMxcZxyO7FpcNd4CXFFWKPQE7tJkPlXmP6sKNltxodXs1ke0iB6Yd8c51AIm fVrqo81ELPDikHbaND0VBSk44yKyX+s0Zqjt/U1RgLDhPa/nE0RV4pnWQHaxWMlWFMLgsM ZtAdu875yoa78e4GflAdFsZwsHxGOJfhTPLJFhqpRZCg4ALNt0bCwnTwDNdtMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH0Ph5NBxzZrf; Thu, 3 Aug 2023 20:12: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 373KCOLs002801; Thu, 3 Aug 2023 20:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373KCOHV002800; Thu, 3 Aug 2023 20:12:24 GMT (envelope-from git) Date: Thu, 3 Aug 2023 20:12:24 GMT Message-Id: <202308032012.373KCOHV002800@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: a4a78efcd62a - stable/13 - em(4): Update and expand on hardware support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4a78efcd62a52dbd8022c71fee40a628d4110b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a4a78efcd62a52dbd8022c71fee40a628d4110b5 commit a4a78efcd62a52dbd8022c71fee40a628d4110b5 Author: Kevin Bowling AuthorDate: 2023-08-03 19:49:42 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 20:11:53 +0000 em(4): Update and expand on hardware support (cherry picked from commit 42ce724d8021132b5ebcf8cc944f14e19c1c439f) --- share/man/man4/em.4 | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index a1fa22c2d0d3..e687af7a7f6f 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 30, 2019 +.Dd August 3, 2023 .Dt EM 4 .Os .Sh NAME @@ -55,21 +55,36 @@ if_em_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for PCI Gigabit Ethernet adapters based on +driver provides support for PCI/PCI-X Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, -82546EB, 82546GB, 82547, 82571, 81572, 82573, and 82574 Ethernet +82546EB, 82546GB, 82547 controller chips. +.Pp +The +.Nm +driver provides support for PCI Express Gigabit Ethernet adapters +based on the Intel 82571, 82572, 82573, 82574, and 82583 Ethernet controller chips. .Pp The .Nm -driver also provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82575, 82576, 82580, i21x and i35x. +driver provides support for Gigabit Ethernet adapters connected to I/O +Controller Hub (ICH), Platform Controller Hub (PCH) and Connectivity +Integrated (CNVi) including Intel 80003ES2LAN, 82562, 82566, 82567, +82577, 82578, 82579, i217, i218, and i219. +.Pp +The +.Nm +driver provides support for PCI Express Gigabit Ethernet adapters +based on the Intel 82575, 82576, 82580, i210, i211, and i35x. These +appear as +.Cm igb +interfaces to maintain compatibility with existing infrastructure. .Pp The driver supports Transmit/Receive checksum offload and Jumbo Frames on all but 82542-based adapters. .Pp Furthermore it supports TCP segmentation offload (TSO) on all adapters but -those based on the 82543, 82544 and 82547 controller chips. +those based on the 82542, 82543, 82544 and 82547 controller chips. The identification LEDs of the adapters supported by the .Nm driver can be controlled via the @@ -313,7 +328,8 @@ The device driver first appeared in .Fx 4.4 . .Nm -was merged with the igb device driver and converted to the iflib framework in +was merged with the lem and igb device driver and converted to the iflib +framework in .Fx 12.0 . .Sh AUTHORS .An -nosplit From nobody Thu Aug 3 20:28: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 4RH0lv5RXfz4Tx1X; Thu, 3 Aug 2023 20:28: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 4RH0lv4wxZz3HCV; Thu, 3 Aug 2023 20:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691094491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1j6d5/8S5P9uk0p7j+cPnOTq/AbsDKuLI5rGiPkuCs=; b=sLQ/fDeHd3l7pfKmakVUdZYFHHxfJsQQgOGOGtRC5Zo0rlm2rfC8UsqKflhnOJiQzk/sia Gu9v7ns9kXsoQDmBHIsvM2xoo1vISlTewwv/N81EbP7hI2H1Zgk0RKPPegBZBUQH11zWKY rhxV8goZtV7rmhjSpLbnxQybFfyWPh4G5z3NAmHvQkoYuV2XVwVX7BS9IuvdiPzvfBHj9+ xOla/MA2iWRV4Bx+p3youUzaGULrSjAOAe5HwrcaITjH9tT21Zme59XI2dOCZwMubVQbrI zPIXjdfcgbI9JYoPjfq69XDAa51FoIbGDCMD/y8OmCt2JNE0m+iu7ClttCjycQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691094491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1j6d5/8S5P9uk0p7j+cPnOTq/AbsDKuLI5rGiPkuCs=; b=C7mSDducTM0DNgqODeSjfLNshcOAFun6rsV/Dls42KnPprSg2mTPb2SZbWjp4M9jtnZ+3u 18E4f0u3V/8d6XG3KC4bxVL6FTj+wq/ycOO7hxs34wZS1KWgUJKneiVvcYH3CPYSDLgrnx /nP6ub6nkqnGkUpPwd6aPRgVuB9Vil+MYH3IVY6ZrWa8LROpzgJ6PvFIg2BV2MY+zZfk8p 3h84h3ZG55W8mFI0TLxwN3I2hrJ1BlE3+WfVKChk0HUu0eRsERGfe0+mDDWNHVYavJ+aoj IHJNvXKutc/q7tpX0/rXdRAWscWZ/QCshmppkMUQqGz0wa6b7ADpcNtaZID9AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691094491; a=rsa-sha256; cv=none; b=c5Yw5uewKF22PfTAP4VSFma9q3hxUqbEjsqoMZHGqiPGGyhS8qHP+U1lcpOHar+mrfVS80 RVXAitgHIfohgea0y/aYtuL5G35pjE+ZKG1Dj83d1Rcce7LMweOasq2zOduh33Gs3VKNdq iuZzQLdRYI0sauHz1g4qSkeaKLLJgoXFgl+CbihrB05/cQM6nsC9yfGNHIHBZoMqabPSnZ EfhhBnUccodtmCWnCmoF+dmIU/FYJNed1XkpKHx9eFP9bGaghVY7h2ODMJ5pnW0ZtHrGj5 dxYKjR/xSJyRKV/N0/pcM24fIvggHiP+XD01xKMw6WS9lu+bk/JRBv6ApJeutQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH0lv41kNzZk5; Thu, 3 Aug 2023 20:28: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 373KSBKT020965; Thu, 3 Aug 2023 20:28:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373KSBHa020964; Thu, 3 Aug 2023 20:28:11 GMT (envelope-from git) Date: Thu, 3 Aug 2023 20:28:11 GMT Message-Id: <202308032028.373KSBHa020964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 1b01772f0185 - main - em(4): remove reference to CNVi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 1b01772f0185bb6476ec76d1d66c26373cebc391 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1b01772f0185bb6476ec76d1d66c26373cebc391 commit 1b01772f0185bb6476ec76d1d66c26373cebc391 Author: Kevin Bowling AuthorDate: 2023-08-03 20:26:28 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 20:26:28 +0000 em(4): remove reference to CNVi I misread the newer PCH datasheet, these are still refered to as PCH. --- share/man/man4/em.4 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index ebf04b4d8941..0948acf66951 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -57,7 +57,7 @@ The .Nm driver provides support for PCI/PCI-X Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, -82546EB, 82546GB, 82547 controller chips. +82546EB, 82546GB, and 82547 controller chips. .Pp The .Nm @@ -68,9 +68,8 @@ controller chips. The .Nm driver provides support for Gigabit Ethernet adapters connected to I/O -Controller Hub (ICH), Platform Controller Hub (PCH) and Connectivity -Integrated (CNVi) including Intel 80003ES2LAN, 82562, 82566, 82567, -82577, 82578, 82579, i217, i218, and i219. +Controller Hub (ICH) and Platform Controller Hub (PCH) including Intel +80003ES2LAN, 82562, 82566, 82567, 82577, 82578, 82579, i217, i218, and i219. .Pp The .Nm From nobody Thu Aug 3 20:28: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 4RH0mn1wJTz4Twgs; Thu, 3 Aug 2023 20:28: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 4RH0mn16Rmz3Hbw; Thu, 3 Aug 2023 20:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691094537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ3NNkDrom2GB7EImVuG/6SlN25fVGXewkaYlgDTN88=; b=tovXy3Iu4XVGAYROKcPJkYxRBdVGO7d7JKXfgcNBZ55HwIHgNVJ649NqDA6T0D1as/r6zZ 2K5IV6/lNMSD3Z8kRDV25JXCvHgZ4nvYMb4zSxXTgxN9zJDM6ZM/KAox79BV3zTBE87z70 ztK/gIFLWoJTrV7DRcL4IagTHYwR/CbAQlZDq7it3NH3j4XWJ6lFgG97RhdRcaT0ugLT4r PvNbCF5iCripwxK7gWMsfge0347Jz49HKnQNYDJ2zuAzquN/70Yg3ZA28Te3VULYlS3Pgt j2/cM4umFJ2vL6Mhzxf3CQYuRjgUJM79VY0wTrmvlETOVLrAJB+1Khq7Y9gb0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691094537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ3NNkDrom2GB7EImVuG/6SlN25fVGXewkaYlgDTN88=; b=UglzXKNOfnJOXIcqS7Qy5mwrFdPR9EMYiIAiRxK6h9Augc2XqTZ5fyOhgweh6mav4KmpeF mOefYi4NVErsyk+jwuepwHRvB9Y9YQqRAHByZiMm0TZf7m4HXpBY3R++JD9Dpx/Ll1m5AQ O4GqAZg+rxdcL0kGcbHqQBolfYCbo4/Mz++YRSgvJfhx+uGaj0Y9Yt6ryDppUZ68FtNdu+ UjJFKRKdiLRtAhH0anNHc3+wfj3O2BJPklKXNtu2flX/uafFGQNnx/Wyp1Dp78QwfAx7Wg V+aoJKa3RyA+bUVpwvwo5SZjSz2gG9BIDy/dXokZANKXneou7VKAaWDokhyqcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691094537; a=rsa-sha256; cv=none; b=I+iqP8LHyjT3whvfqNvbL2EotuFy8fgIRKA4MN1ZkmPk9ZjLbRKYh1g94SCl3gKEbe9X3U LEAFNYzO97nPzXBz9mJn1rD5ro1YwrkXxryembzkRgllzfOoWEziyGCjL24i8imoXaEdZY +X3rHkVNehb0sSDg6nCtAz+4lrP+I91b/m4Nkfv/guWf9oiS4yUlIVmoKksCeVplAAHSn4 mcb9xb8dVFZZ+YjFZy/kq6xKGByU2s+T5Jn4INN+VbWVBBJvG4MZNTi13rzbHBG8cchCcq O4YmS7y0aqKyWv5WrNO5/l3hhwSr1b/devVTFi62wPqsZbnGBO5x86lATPDv3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH0mn09jczZdK; Thu, 3 Aug 2023 20:28: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 373KSuGg021170; Thu, 3 Aug 2023 20:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373KSusL021169; Thu, 3 Aug 2023 20:28:56 GMT (envelope-from git) Date: Thu, 3 Aug 2023 20:28:56 GMT Message-Id: <202308032028.373KSusL021169@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: e8a5d94a09e9 - stable/13 - em(4): remove reference to CNVi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e8a5d94a09e9e76e37e1c7f4bd284286dcbf4b91 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a5d94a09e9e76e37e1c7f4bd284286dcbf4b91 commit e8a5d94a09e9e76e37e1c7f4bd284286dcbf4b91 Author: Kevin Bowling AuthorDate: 2023-08-03 20:26:28 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 20:28:49 +0000 em(4): remove reference to CNVi I misread the newer PCH datasheet, these are still refered to as PCH. (cherry picked from commit 1b01772f0185bb6476ec76d1d66c26373cebc391) --- share/man/man4/em.4 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index e687af7a7f6f..6b9b42c125f5 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -57,7 +57,7 @@ The .Nm driver provides support for PCI/PCI-X Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, -82546EB, 82546GB, 82547 controller chips. +82546EB, 82546GB, and 82547 controller chips. .Pp The .Nm @@ -68,9 +68,8 @@ controller chips. The .Nm driver provides support for Gigabit Ethernet adapters connected to I/O -Controller Hub (ICH), Platform Controller Hub (PCH) and Connectivity -Integrated (CNVi) including Intel 80003ES2LAN, 82562, 82566, 82567, -82577, 82578, 82579, i217, i218, and i219. +Controller Hub (ICH) and Platform Controller Hub (PCH) including Intel +80003ES2LAN, 82562, 82566, 82567, 82577, 82578, 82579, i217, i218, and i219. .Pp The .Nm From nobody Thu Aug 3 20:38:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RH0zF1Vyxz4Txf2; Thu, 3 Aug 2023 20:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH0zD6BYCz3JWZ; Thu, 3 Aug 2023 20:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691095080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BC2tl8ndtZ2q8G1+Ynt7ROKgeVyqGUkVdECtgcSJD2E=; b=PwuTzxXBupVVA4KAHX6/r/HTZHqjPbaB/+H7rQEPp/PtGxQ0IwPIr5Cp+QR/uck82SxcNm LR4HIq5aLbeL9OpJV8DJ5FO2OTdbyeW9YNFAIMflVfyjpUUxwyLEvZy5lQcrs75Ft7qM8b Ffug3+cegPJhjowt3I+AFb9elEquVRnkqWvConnBTirh6YV/4+N+PliwcPmHjVhM7+Nhic +PnkYm5py4U3yOli1l15XZOjf1bFVmO1A8+vVNkpNbf8NjFomplwZLSCecv/ZRjAFNCkI9 +EpdDic3RDscDFmhm9DjNVdSureU80Hgne1UxL6Wm9+I73pm8LzXWVXRIaeiFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691095080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BC2tl8ndtZ2q8G1+Ynt7ROKgeVyqGUkVdECtgcSJD2E=; b=F9ElEx73cXkEnvUwJ9ZdzEkqbCNcYfddGzkKObTPBM656/9etrJ39qlICXWC/wcGnow1Y1 dZETL68OIDteNvbCE0RL1PC/RWI8Xerjo7PwLjnXvAbKgCD8MoAVNkNy13ZIjayVxrF8Sh oWMxdaNTNhidWJFKIkoPrDjD5R+/xjcasUuSuvDyoZ+rYgTtAW+f/82GP4Xyc4PhF/1uhX w8aNYHQWV5uDlkTVDgkpOlMZYuuQ8sG7yTw/kPNhJKCfK1aV6gYHlylTk3FsWi5dT/0Q0g mmGrLqKK37TQEzqb8WznwM5wHB1pWLHRDrfC9vOJmAJPMWB88KIr8VQXsE3xLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691095080; a=rsa-sha256; cv=none; b=mKLtmZ+P005kNDzNWZmXg/k2Y/VimO02UisDDfLFsdo7+mnb9raaRpWy6BlpAVkxubAvT6 QuqSm0Ng11vvmTYyJ76mXrVyTOt07tQUQbru19L/UurJFO0g7opmt2C7vPCQrtjb65iGTH hAppFLCtjtYvdMykjRAoSHUceCAbFT+KrdMwS6A4Z0pOjWAs9btGxWKVF8nvOBhOpMVTSl cgh4hv/32qSX3ByDhAhcogfFk+iFprVJssxEpTnSGNVocuC1lTNW3hBPwh5uTj5UomtLcK 5hBts8JPfwmVVCSAiAldARlT3cCotL8n2taE/eZ8QGhICylwETMypiEdkE9Wow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH0zD5HhMzbNK; Thu, 3 Aug 2023 20:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373Kc0Yp038201; Thu, 3 Aug 2023 20:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373Kc09w038200; Thu, 3 Aug 2023 20:38:00 GMT (envelope-from git) Date: Thu, 3 Aug 2023 20:38:00 GMT Message-Id: <202308032038.373Kc09w038200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 61a8231d152c - main - ixv: Separate VFTA table for each interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 61a8231d152c38ac96b697ea3ca8ff220f3aa536 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=61a8231d152c38ac96b697ea3ca8ff220f3aa536 commit 61a8231d152c38ac96b697ea3ca8ff220f3aa536 Author: Yuichiro Naito AuthorDate: 2023-08-03 20:36:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 20:36:21 +0000 ixv: Separate VFTA table for each interface The vlan setting is independent for each interface. Use VFTA table in 'struct ixgbe_softc' that is already defined. This pull request fixes following bug scenario. create ixv0.10 create ixv1.10 destroy ixv1.10 create ixv0.11 ixv0.10 no longer receives vlan 10 packets. In this case, destroying ixv1.10 affects to ixv0. MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/774 --- sys/dev/ixgbe/if_ixv.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index cf5c8f92c450..e4da1f32cd0e 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -197,12 +197,6 @@ TUNABLE_INT("hw.ixv.flow_control", &ixv_flow_control); static int ixv_header_split = false; TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split); -/* - * Shadow VFTA table, this is needed because - * the real filter table gets cleared during - * a soft reset and we need to repopulate it. - */ -static u32 ixv_shadow_vfta[IXGBE_VFTA_SIZE]; extern struct if_txrx ixgbe_txrx; static struct if_shared_ctx ixv_sctx_init = { @@ -1541,9 +1535,9 @@ ixv_setup_vlan_support(if_ctx_t ctx) * we need to repopulate it now. */ for (int i = 0; i < IXGBE_VFTA_SIZE; i++) { - if (ixv_shadow_vfta[i] == 0) + if (sc->shadow_vfta[i] == 0) continue; - vfta = ixv_shadow_vfta[i]; + vfta = sc->shadow_vfta[i]; /* * Reconstruct the vlan id's * based on the bits set in each @@ -1579,7 +1573,7 @@ ixv_if_register_vlan(if_ctx_t ctx, u16 vtag) index = (vtag >> 5) & 0x7F; bit = vtag & 0x1F; - ixv_shadow_vfta[index] |= (1 << bit); + sc->shadow_vfta[index] |= (1 << bit); ++sc->num_vlans; } /* ixv_if_register_vlan */ @@ -1597,7 +1591,7 @@ ixv_if_unregister_vlan(if_ctx_t ctx, u16 vtag) index = (vtag >> 5) & 0x7F; bit = vtag & 0x1F; - ixv_shadow_vfta[index] &= ~(1 << bit); + sc->shadow_vfta[index] &= ~(1 << bit); --sc->num_vlans; } /* ixv_if_unregister_vlan */ From nobody Thu Aug 3 20:58:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RH1RN1lfJz4TyTC; Thu, 3 Aug 2023 20:58:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH1RM2rVgz3Lf5; Thu, 3 Aug 2023 20:58:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 373Kwl3g030181 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 3 Aug 2023 23:58:50 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 373Kwl3g030181 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 373Kwle9030180; Thu, 3 Aug 2023 23:58:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 3 Aug 2023 23:58:47 +0300 From: Konstantin Belousov To: Dmitry Chagin Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5a7e48dddfb5 - main - tests: Add MAP_32BIT flag test Message-ID: References: <202308012024.371KOAHb046216@gitrepo.freebsd.org> <7A066A1D-9AFA-485F-AEAE-DD88C9537A44@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: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RH1RM2rVgz3Lf5 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Thu, Aug 03, 2023 at 02:50:57PM +0300, Dmitry Chagin wrote: > On Wed, Aug 02, 2023 at 12:57:36AM +0300, Konstantin Belousov wrote: > > On Tue, Aug 01, 2023 at 09:29:32PM +0100, Jessica Clarke wrote: > > > On 1 Aug 2023, at 21:24, Dmitry Chagin wrote: > > > > > > > > The branch main has been updated by dchagin: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > > > > > > > commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a > > > > Author: Dmitry Chagin > > > > AuthorDate: 2023-08-01 20:23:15 +0000 > > > > Commit: Dmitry Chagin > > > > CommitDate: 2023-08-01 20:23:15 +0000 > > > > > > > > tests: Add MAP_32BIT flag test > > > > > > > > Reviewed by: kib, markj > > > > Differential Revision: https://reviews.freebsd.org/D41236 > > > > MFC after: 1 month > > > > --- > > > > tests/sys/vm/Makefile | 8 ++++++ > > > > tests/sys/vm/mmap_map_32bit_helper.c | 51 ++++++++++++++++++++++++++++++++++++ > > > > tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ > > > > 3 files changed, 96 insertions(+) > > > > > > > > diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile > > > > index 8ef8a45e5f39..9aac49bc5320 100644 > > > > --- a/tests/sys/vm/Makefile > > > > +++ b/tests/sys/vm/Makefile > > > > @@ -9,4 +9,12 @@ ATF_TESTS_C+= mlock_test \ > > > > page_fault_signal \ > > > > shared_shadow_inval_test > > > > > > > > +.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ > > > > + (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") > > > > + # MAP_32BIT is only available on 64-bit platforms > > > > > > So use ${MACHINE_ABI:Mlong64} after including src.opts.mk? > > > > May be we should enable the MAP_32BIT flag on 32bit arches, instead? > > It requests allocation below 2G, which is half of VA on i386, or 2/3 > > on arm. Interestingly, it should work already from compat32. > > It's disturbing that no none has requested this, I can do that Please do. The largest part of the work is to recheck the man page and tests. From nobody Thu Aug 3 21:02: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 4RH1Wk6JwLz4V0Wj; Thu, 3 Aug 2023 21:02: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 4RH1Wk5RgVz3M6X; Thu, 3 Aug 2023 21:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691096562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//i2k8hxaGu2Tgl1dROQSGAMhsBBBful+u8vMM7IiG8=; b=NmBzWxDE8uSNOl+cB2/rCu9bpY7M5e1zezbKhp+P2aMPWP2X40IANHzKOnXdfqxtJEfbek xcr4Di6CJG0CAuSrQuGwtwGNqbeidYshHHW5+KTyKg0XVTgqU+var0lTdDwSWEJ9bKypix peYzmVAcq0sm1shrEThT7koOYu9+/sSWhlnrgyR6eMuRSJFxZ+Za43jcWKKUEq0Itp/Z51 0c9w5Z0iu2X+zC16EeRU4kYXy3zOW9UtK1f++Zl9KqY9TBvGwVlg8kC/PYCp1Ty2tQBX3X ZAMJTBQRsWBH4xawy0ghCJLk1OMQXCGQMETxt1DsWA6b8WksDcLNNOSMIGjzGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691096562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//i2k8hxaGu2Tgl1dROQSGAMhsBBBful+u8vMM7IiG8=; b=r1XsbXytHS1EdcsdQSe8gDHv08ro3cETuVEHn4sxLKic1M2vLsbhf3fl1m58ITjxSeBaS3 8OUCdxm2d+tXWx/WAhL6wJ4AvCj1/oH+TZgZ343MInROx6QLpamHLTrA3IGrkvrvx54AQz 874m3e3da4doATgRcKtRCHj0QL0XMd80m7jlLVIW6blsa69yCg4r43yDB2Wc+F9FYgHOPn VS0dTh43aSgMNuJusNh+g6Cjxk1bgsFs0uayLKC814xOWl00x9sB4bNd7zDbALjmdCLZ+d AcDShCyw8MS3/sDlEz2+OtuJ2eiYXzbo7wGpfHSK8dIh+i7liE5OToL8A3aCiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691096562; a=rsa-sha256; cv=none; b=xmZKcmquEeFALySIHu0v/9LBuWJ++PQAPsSypXo9Z4AacIOQJHU4bQ2EYeABLC/bv2Kkla ma1Ibb6ShU1DhCoVIfVnKbYr1goYcNPtysMFNrmmjddi94alAwsADFPwPXC/zxMxfMWcR/ vlX+VFwo341Qio6ULPvPhOoB4q7/CC64KnaHKCS6W/mGYS/L2z6u2mLiPOQ2mnCiQh9Cpr 854SjufXLDDYw4CrR9e1T5Ed29UQ2oGw/gWuPUoA0eMjQglKdMmTyJMxbCvHs0Pd9QKWLt 8c4niKx9WtLCoks6gpzUeHaPf1571tPjooI3BCRyeaM0W1ntPjsyFZ1OniaaTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH1Wk4WwPzbyV; Thu, 3 Aug 2023 21:02: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 373L2gbB087732; Thu, 3 Aug 2023 21:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373L2gaS087731; Thu, 3 Aug 2023 21:02:42 GMT (envelope-from git) Date: Thu, 3 Aug 2023 21:02:42 GMT Message-Id: <202308032102.373L2gaS087731@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: 2bb16c635249 - main - x86: retire use of intr_bind List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2bb16c6352494bf7aba92be700908ddf01e0c08b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb16c6352494bf7aba92be700908ddf01e0c08b commit 2bb16c6352494bf7aba92be700908ddf01e0c08b Author: Elliott Mitchell AuthorDate: 2022-10-07 03:23:34 +0000 Commit: Ed Maste CommitDate: 2023-08-03 21:01:18 +0000 x86: retire use of intr_bind `intr_bind(u_int vector, u_char cpu);` looked suspicious since everywhere else "cpu" is a u_int and >256 processors isn't unreasonable now. Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D36901 --- sys/x86/x86/nexus.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index 332b1527efbd..b57bda82453c 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -615,7 +615,12 @@ nexus_resume_intr(device_t dev, device_t child, struct resource *irq) static int nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu) { - return (intr_bind(rman_get_start(irq), cpu)); + struct intsrc *isrc; + + isrc = intr_lookup_source(rman_get_start(irq)); + if (isrc == NULL) + return (EINVAL); + return (intr_event_bind(isrc->is_event, cpu)); } #endif From nobody Thu Aug 3 21:02: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 4RH1Wm1Rx8z4V0gB; Thu, 3 Aug 2023 21:02: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 4RH1Wl6N1Gz3ML2; Thu, 3 Aug 2023 21:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691096563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVC1vLWqP1ETS3MGmg8wYSX7rjiSbqhbmalQqgUk1ts=; b=unLsZCmQBlQ0/RL+aeid9sEL3ZOokpxox+pbDWtcGYSy3RyFGwVefytB0915w5YSWKL7KT NNFTDiayw8fNjaKlIMV3SkVoy0ZM3tbxF2Pjt9a1CFH8MUAvBkZJz31B+4C5wxVA17IBsX mlcPKxrtBRxHXa/8nh15JUrA9ynvn+M8sKrpnrNQVCYT0fuPF6buCedSatOx4JjVJrYD3o mPVYWwcxhtN6OGIjgvekNGukg8PnaAdoEls/AOqz3twIRyGEbUydzHs5NsdC0vdqRGXR4q XLzbbmMtUaAL8CY07FoX5nZLXRLimZ9BU2yIzCi3fRUlaaQKplJB07W06vWGRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691096563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVC1vLWqP1ETS3MGmg8wYSX7rjiSbqhbmalQqgUk1ts=; b=TAReZp2L+ScrYHDwMT/62Q1HROAk0p0H6Tvm0WNIlvaZLgJX4BKFkWJZxFf3ncVOBSsUbh 5fIB7SgbowW3JCurryqdF51IzwBFPjEhMMKLKVQroVJP+u7jrzrDE+nWYeY0BHWX5XVr1m 9U0h+WaEfK+kpVO6t9k4Mbczpr3KnPXtQtY3j84XpTI3x2AC7harToZ3b6r5R2wu/j4seg QTT3izujUFfN47Tlrk1K2tRZxmPmwKpq+zqlq2Dt5L4ZVWMXH23f99bTBamhFJ4jfqlqtD DGsF2hTgY5eA1Lz5QXRlmv3sloDCI7gX/P9p5McJtWcQrchk2/G4KuE2mXKlIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691096563; a=rsa-sha256; cv=none; b=A8Q4qUmPZqCT2X0ZXpZsA4VSWSwn4v78EjGuetENiKWwAw1DyKLcFGGK/FxJT49k7LdT6O UuArc+5leS6ifBAatY+I5ZP9+68fmtP0/4iRWDZiYZuIJL6WLk+mZ9S10dkIUcvYvu2MEG xJ//8gYeX8YNvaZe/CowlGK92ZdiEpdvVY5UHhT8Lgd0JNx7rpgYGG0p4rcI7wF31DNGAi KKJ0Zn1rvGCNLuYFj5shTB9ivv+IOoRPtX/ijkSWIYunJ8Nz3X9Y4XUb/Yh5rAFaac+t1K 7xFVDvUurZRp4k7GWlDoUz9S24njDXuqqHXE37PURK/J/oTS9f1BJ2sbt/Qchg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH1Wl5QgFzbxm; Thu, 3 Aug 2023 21:02: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 373L2hUW087753; Thu, 3 Aug 2023 21:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373L2h14087752; Thu, 3 Aug 2023 21:02:43 GMT (envelope-from git) Date: Thu, 3 Aug 2023 21:02:43 GMT Message-Id: <202308032102.373L2h14087752@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: eee6537665ae - main - x86: remove intr_bind List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: eee6537665ae9830e831d7473dedd6b2cc81c2ea Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eee6537665ae9830e831d7473dedd6b2cc81c2ea commit eee6537665ae9830e831d7473dedd6b2cc81c2ea Author: Elliott Mitchell AuthorDate: 2022-10-07 03:23:34 +0000 Commit: Ed Maste CommitDate: 2023-08-03 21:01:56 +0000 x86: remove intr_bind `intr_bind(u_int vector, u_char cpu);` looked suspicious since everywhere else "cpu" is a u_int and >256 processors isn't unreasonable now. `intr_bind()` is not used anywhere in FreeBSD (now, after commit bf42f3738087). Time to remove. Relnotes: Yes Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D36901 --- sys/x86/include/intr_machdep.h | 3 --- sys/x86/x86/intr_machdep.c | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h index 933552c7dd7e..69d626d9874b 100644 --- a/sys/x86/include/intr_machdep.h +++ b/sys/x86/include/intr_machdep.h @@ -143,9 +143,6 @@ void intr_add_cpu(u_int cpu); int intr_add_handler(const char *name, int vector, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, int domain); -#ifdef SMP -int intr_bind(u_int vector, u_char cpu); -#endif int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); int intr_describe(u_int vector, void *ih, const char *descr); diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 6413d8aadd73..524258ef7dc8 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -630,18 +630,6 @@ intr_next_cpu(int domain) return (apic_id); } -/* Attempt to bind the specified IRQ to the specified CPU. */ -int -intr_bind(u_int vector, u_char cpu) -{ - struct intsrc *isrc; - - isrc = intr_lookup_source(vector); - if (isrc == NULL) - return (EINVAL); - return (intr_event_bind(isrc->is_event, cpu)); -} - /* * Add a CPU to our mask of valid CPUs that can be destinations of * interrupts. From nobody Thu Aug 3 21:06: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 4RH1bz6mZ8z4V0pD; Thu, 3 Aug 2023 21:06:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH1bz1Khkz3N98; Thu, 3 Aug 2023 21:06:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b9f48b6796so21244051fa.3; Thu, 03 Aug 2023 14:06:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691096780; x=1691701580; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rsKMKyjs7ILgfIkw+jPVYdwA14SoAs7wR8l2E6WzlLs=; b=TCDW3QMjiufq4nETlQ6Ksh+RNJN1igTGdHxE1FKmAHsCGEK27iqBLH+JGC2Fo8Fibx 72pmXYC/OIuYGLyzEB8HJOH1IkKUt1OCiEDx/3eNnVABtS0Pbf58GNLfik9k0/4gIq/k x75XBI60FsQvc6oN+48JxNhp2lqGJq9+HlQ5XSwDMR92tF1VJawl7b4yFHUmQhhD7vGv 39rr7GqjMbwVyFOmbFWYCfxVn/mfHo0J/oI4Oq3eQ0plwAnDUDgizPoKezu7+yJd1iAb vLylZyxfqkB40B1JXlWbpWrK0xSK/8Iy2JOHZ1ldPP1OIChNul4CeXMhKo44pFgw9mvJ KdZA== X-Gm-Message-State: ABy/qLa0m9ZR7uLkjgDe62MNY1eEagXWI8N3aCnItxubz7UxNXQ1DVr8 XN4bvMovpnlTFFglGq6bIEMXmsjYhoRF3Fbl2P9gTe7TVMuo7Q== X-Google-Smtp-Source: APBJJlFZCFzC9I3VzRMptGlN21Dc5aARaYmvcM5YOgCKf2vLS7Zk2G6vgHmvHsiaqWZcAG/TikibhnOiZcI4+x/caYc= X-Received: by 2002:a2e:88d1:0:b0:2b6:df6b:84c0 with SMTP id a17-20020a2e88d1000000b002b6df6b84c0mr7973096ljk.25.1691096780313; Thu, 03 Aug 2023 14:06:20 -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: <202308032102.373L2h14087752@gitrepo.freebsd.org> In-Reply-To: <202308032102.373L2h14087752@gitrepo.freebsd.org> From: Ed Maste Date: Thu, 3 Aug 2023 17:06:08 -0400 Message-ID: Subject: Re: git: eee6537665ae - main - x86: remove intr_bind To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [0.83 / 15.00]; NEURAL_SPAM_SHORT(0.83)[0.833]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.179:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.179:from]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4RH1bz1Khkz3N98 On Thu, 3 Aug 2023 at 17:02, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=eee6537665ae9830e831d7473dedd6b2cc81c2ea > > commit eee6537665ae9830e831d7473dedd6b2cc81c2ea > Author: Elliott Mitchell > AuthorDate: 2022-10-07 03:23:34 +0000 > Commit: Ed Maste > CommitDate: 2023-08-03 21:01:56 +0000 > > x86: remove intr_bind > > `intr_bind(u_int vector, u_char cpu);` looked suspicious since > everywhere else "cpu" is a u_int and >256 processors isn't unreasonable > now. `intr_bind()` is not used anywhere in FreeBSD (now, after commit > bf42f3738087). Time to remove. Sigh, this changed after a rebase. The associated commit should be 2bb16c6352494bf7aba92be700908d. From nobody Thu Aug 3 21:10: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 4RH1hp3QjQz4V0sS; Thu, 3 Aug 2023 21:10: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 4RH1hp3Bnzz3NWM; Thu, 3 Aug 2023 21:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691097034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=McjKLJF4V8ep4gV5Re+Wlox+/aXA3t1m2fswAvfEXlU=; b=Lb/7VxGA1ghECoUztqWhVv8VTvvJEKp0I+p7g5/ZzphGHBlbAwDlrlqMQR9Q8SqIW9yt33 5Q52B6Zu1+yU3uNjPhmBMRwwE+WlUelhW2ujjSIZQ6Hn4q3wDhGv4oRsizoIubsn4zM6Ov ACx0dyKD9DcSVmf4VtKaaHpsCvK2jokHaIOLCJwWQrihQ8+kc8+trRjBE/IEB+PmpgaIqT 1eNJbN79D/nhZLNn4ldSeztjaB1dxiAlODBM5kBIBBNnAW3oHEzr3P0a8WO39wRb7BjuX4 41BN43aBkMzK6MR2jbuRI9CiduDDVjUV6RXZkCD0ehQ6fxp9C55m6xpQTSybgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691097034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=McjKLJF4V8ep4gV5Re+Wlox+/aXA3t1m2fswAvfEXlU=; b=MY0vRgP39T0Ybc7OeJ+h5Ea9qjcKbvqJ6TmTLGCr7Vd7vdeHl38n3uI4Xg90fd56bGA2d1 binv3N5wnt5EUSjHEOVQK25oocWu+O1E3mUcd4emm0HkZlUEG2Y1zcEVZqkbkBym7skxGx Amr0fMx3zUiIGVA9Qtqbs+yUSoNzRR+CKMfun+AHhU5YGNztrgQI3zQf7AT+YOWd1WdPoZ 12AU+UpgnBn+f4mDVFS2ml/7g/F2PTDbzaiMFPGg54xLKPnucw6jnT+yOABFc7e93R9665 c2bFRklqnIkyvyzVOrBwrdIXmmdRGg2JIYwIm4Ldmcm8K2lpCNRSflYQQNs78g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691097034; a=rsa-sha256; cv=none; b=Wx3tOOkDLNcgB4M91YVblyOs2DM3euJ/DROUCYEW411sL+fS/R7vFx2iSJl14kXDm+5XrK DUqBZ48AHATXqPqMoclIU9k7OJtdFf/tvvq1QVyz9ZsNg0Fgp5JQcn/P+yzXV6kOkjHK6U ik/7jUv/MitXLljIk3n1X+qSmgj75UgRRY+0ONDD5l+OoXEqXYLAWLXYufDEacD1w4CnxT MunMk/G+WP4mBn9IirTGQNs5R18Gd5uEJNsVBNJPp59Jdcg7zgYae39yX2dSE24mjcBOlw stwPqZbpOA+ciF5jzFoReHoPEkgC6c/kg74S6IV8f03QlQe4w1suugKH7Z8/7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH1hp1kBqzbkm; Thu, 3 Aug 2023 21:10: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 373LAYE9097499; Thu, 3 Aug 2023 21:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373LAYqC097498; Thu, 3 Aug 2023 21:10:34 GMT (envelope-from git) Date: Thu, 3 Aug 2023 21:10:34 GMT Message-Id: <202308032110.373LAYqC097498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 7ff9ae90f0bd - main - iflib(9): Remove support for cloning pseudo interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ff9ae90f0bd133f56930858bb478a309da3982b Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=7ff9ae90f0bd133f56930858bb478a309da3982b commit 7ff9ae90f0bd133f56930858bb478a309da3982b Author: Marius Strobl AuthorDate: 2023-08-03 20:23:42 +0000 Commit: Marius Strobl CommitDate: 2023-08-03 21:10:18 +0000 iflib(9): Remove support for cloning pseudo interfaces This code was used by the first incarnation of wg(4) and is dead ever since f187d6dfbf633665ba6740fe22742aec60ce02a2 has removed the latter again. Moreover, this code matched iflib(4) like a square peg fits in a round hole, was incomplete and despite some hacks still tailored to VPC and wg(4) but not generic. In effect, this reverts the following: 09f6ff4f1a47c3009dc16fdc609a44f2341bc7ac (w/ its "ancillary changes") 9aeca21324f481f57f2ecb7009f461f4f51b62b3 1f93e931d9f0c688f43f98ef777e04636a325526 0f9544d03e89d180f94a7a84b110ec7d2b6c625a 0dd691b41276ce13d25ffb1443af27f85038aa3f Reviewed by: erj, kbowling Differential Revision: --- ObsoleteFiles.inc | 3 + sys/compat/linux/linux_netlink.c | 1 - sys/conf/files | 1 - sys/modules/iflib/Makefile | 1 - sys/net/if.h | 2 +- sys/net/if_clone.c | 28 +--- sys/net/if_clone.h | 8 +- sys/net/ifdi_if.m | 125 ++-------------- sys/net/iflib.c | 297 +++----------------------------------- sys/net/iflib.h | 53 ++----- sys/net/iflib_clone.c | 303 --------------------------------------- sys/net/iflib_private.h | 70 --------- 12 files changed, 46 insertions(+), 846 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6e93c9381c52..67bdb1f3d8e0 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230803: Removal of support for cloning pseudo interfaces from iflib(9) +OLD_FILES+=usr/include/net/iflib_private.h + # 20230802: Remove a copy of libdtrace.so installed to the wrong path OLD_FILES+=usr/lib/libdtrace.so.2 diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index dc3c40aa2dc6..e793885c30c2 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -325,7 +325,6 @@ rtnl_if_flags_to_linux(unsigned int if_flags) case IFF_STICKYARP: case IFF_DYING: case IFF_RENAMING: - case IFF_NOGROUP: /* No Linux analogue */ break; case IFF_MULTICAST: diff --git a/sys/conf/files b/sys/conf/files index 1ec165537128..8838137f6989 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4147,7 +4147,6 @@ net/if_vlan.c optional vlan net/if_vxlan.c optional vxlan inet | vxlan inet6 net/ifdi_if.m optional ether pci iflib net/iflib.c optional ether pci iflib -net/iflib_clone.c optional ether pci iflib net/mp_ring.c optional ether iflib net/mppcc.c optional netgraph_mppc_compression net/mppcd.c optional netgraph_mppc_compression diff --git a/sys/modules/iflib/Makefile b/sys/modules/iflib/Makefile index f598db2743dd..2c010ac951db 100644 --- a/sys/modules/iflib/Makefile +++ b/sys/modules/iflib/Makefile @@ -5,7 +5,6 @@ KMOD= iflib SRCS= \ iflib.c \ - iflib_clone.c \ mp_ring.c SRCS+= ifdi_if.c SRCS+= device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h diff --git a/sys/net/if.h b/sys/net/if.h index bd2787516f01..2b05c14f8920 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -163,7 +163,7 @@ struct if_data { #define IFF_STICKYARP 0x100000 /* (n) sticky ARP */ #define IFF_DYING 0x200000 /* (n) interface is winding down */ #define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ -#define IFF_NOGROUP 0x800000 /* (n) interface is not part of any groups */ +#define IFF_SPARE 0x800000 #define IFF_NETLINK_1 0x1000000 /* (n) used by netlink */ /* diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 3dd577850f82..15327084e025 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -308,8 +308,7 @@ void ifc_link_ifp(struct if_clone *ifc, struct ifnet *ifp) { - if ((ifc->ifc_flags & IFC_NOGROUP) == 0) - if_addgroup(ifp, ifc->ifc_name); + if_addgroup(ifp, ifc->ifc_name); IF_CLONE_LOCK(ifc); IFC_IFLIST_INSERT(ifc, ifp); @@ -336,7 +335,7 @@ ifc_unlink_ifp(struct if_clone *ifc, struct ifnet *ifp) } IF_CLONE_UNLOCK(ifc); - if (ifcifp != NULL && (ifc->ifc_flags & IFC_F_NOGROUP) == 0) + if (ifcifp != NULL) if_delgroup(ifp, ifc->ifc_name); return (ifcifp != NULL); @@ -536,7 +535,7 @@ ifc_attach_cloner(const char *name, struct if_clone_addreq *req) ifc->ifc_match = req->match_f != NULL ? req->match_f : ifc_simple_match; ifc->ifc_create = req->create_f; ifc->ifc_destroy = req->destroy_f; - ifc->ifc_flags = (req->flags & (IFC_F_AUTOUNIT | IFC_F_NOGROUP)); + ifc->ifc_flags = (req->flags & IFC_F_AUTOUNIT); if (req->version == 2) { struct if_clone_addreq_v2 *req2 = (struct if_clone_addreq_v2 *)req; @@ -782,8 +781,7 @@ if_clone_restoregroup(struct ifnet *ifp) } CURVNET_RESTORE(); LIST_FOREACH(ifc, &V_if_cloners, ifc_list) - if (strcmp(ifc->ifc_name, ifc_name) == 0 && - ((ifc->ifc_flags & IFC_NOGROUP) == 0)) + if (strcmp(ifc->ifc_name, ifc_name) == 0) break; IF_CLONERS_UNLOCK(); @@ -957,21 +955,3 @@ ifc_copyin(const struct ifc_data *ifd, void *target, size_t len) } else return (copyin(ifd->params, target, len)); } - -const char * -ifc_name(struct if_clone *ifc) -{ - return (ifc->ifc_name); -} - -void -ifc_flags_set(struct if_clone *ifc, int flags) -{ - ifc->ifc_flags = flags; -} - -int -ifc_flags_get(struct if_clone *ifc) -{ - return (ifc->ifc_flags); -} diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h index 8b52c375addb..5d5b8a5141a4 100644 --- a/sys/net/if_clone.h +++ b/sys/net/if_clone.h @@ -99,15 +99,12 @@ struct if_clone_addreq_v2 { ifc_dump_nl_f *dump_nl_f; }; - -#define IFC_F_NOGROUP 0x01 /* Creation flag: don't add unit group */ +#define IFC_F_SPARE 0x01 #define IFC_F_AUTOUNIT 0x02 /* Creation flag: automatically select unit */ #define IFC_F_SYSSPACE 0x04 /* Cloner callback: params pointer is in kernel memory */ #define IFC_F_FORCE 0x08 /* Deletion flag: force interface deletion */ #define IFC_F_CREATE 0x10 /* Creation flag: indicate creation request */ -#define IFC_NOGROUP IFC_F_NOGROUP - struct if_clone *ifc_attach_cloner(const char *name, struct if_clone_addreq *req); void ifc_detach_cloner(struct if_clone *ifc); int ifc_create_ifp(const char *name, struct ifc_data *ifd, struct ifnet **ifpp); @@ -143,9 +140,6 @@ void if_clone_detach(struct if_clone *); int ifc_name2unit(const char *name, int *unit); int ifc_alloc_unit(struct if_clone *, int *); void ifc_free_unit(struct if_clone *, int); -const char *ifc_name(struct if_clone *); -void ifc_flags_set(struct if_clone *, int flags); -int ifc_flags_get(struct if_clone *); /* Interface clone event. */ typedef void (*if_clone_event_handler_t)(void *, struct if_clone *); diff --git a/sys/net/ifdi_if.m b/sys/net/ifdi_if.m index 3a17f24fdf91..f07a79624e86 100644 --- a/sys/net/ifdi_if.m +++ b/sys/net/ifdi_if.m @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2018, Matthew Macy (mmacy@mattmacy.io) +# Copyright (c) 2014, Matthew Macy (mmacy@mattmacy.io) # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -39,10 +39,7 @@ #include #include #include -#include -#include #include -#include INTERFACE ifdi; @@ -53,18 +50,6 @@ CODE { { } - static int - null_knlist_add(if_ctx_t _ctx __unused, struct knote *_kn) - { - return (0); - } - - static int - null_knote_event(if_ctx_t _ctx __unused, struct knote *_kn, int _hint) - { - return (0); - } - static void null_timer_op(if_ctx_t _ctx __unused, uint16_t _qsidx __unused) { @@ -76,12 +61,6 @@ CODE { return (0); } - static int - null_int_int_op(if_ctx_t _ctx __unused, int arg0 __unused) - { - return (ENOTSUP); - } - static int null_queue_intr_enable(if_ctx_t _ctx __unused, uint16_t _qid __unused) { @@ -134,43 +113,6 @@ CODE { return (ENOTSUP); } - static void - null_media_status(if_ctx_t ctx __unused, struct ifmediareq *ifmr) - { - ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE; - ifmr->ifm_active = IFM_ETHER | IFM_25G_ACC | IFM_FDX; - } - - static int - null_cloneattach(if_ctx_t ctx __unused, struct if_clone *ifc __unused, - const char *name __unused, caddr_t params __unused) - { - return (0); - } - - static void - null_rx_clset(if_ctx_t _ctx __unused, uint16_t _flid __unused, - uint16_t _qid __unused, caddr_t *_sdcl __unused) - { - } - static void - null_object_info_get(if_ctx_t ctx __unused, void *data __unused, int size __unused) - { - } - static int - default_mac_set(if_ctx_t ctx, const uint8_t *mac) - { - struct ifnet *ifp = iflib_get_ifp(ctx); - struct sockaddr_dl *sdl; - - if (ifp && ifp->if_addr) { - sdl = (struct sockaddr_dl *)ifp->if_addr->ifa_addr; - MPASS(sdl->sdl_type == IFT_ETHER); - memcpy(LLADDR(sdl), mac, ETHER_ADDR_LEN); - } - return (0); - } - static bool null_needs_restart(if_ctx_t _ctx __unused, enum iflib_restart_event _event __unused) { @@ -178,58 +120,25 @@ CODE { } }; -# -# kevent interfaces -# - -METHOD int knlist_add { - if_ctx_t _ctx; - struct knote *_kn; -} DEFAULT null_knlist_add; - -METHOD int knote_event { - if_ctx_t _ctx; - struct knote *_kn; - int hint; -} DEFAULT null_knote_event; - - -# -# query -# - -METHOD int object_info_get { - if_ctx_t _ctx; - void *data; - int size; -} DEFAULT null_object_info_get; - # # bus interfaces # METHOD int attach_pre { if_ctx_t _ctx; -} DEFAULT null_int_op; +}; METHOD int attach_post { if_ctx_t _ctx; -} DEFAULT null_int_op; +}; METHOD int reinit_pre { if_ctx_t _ctx; -} DEFAULT null_int_op; +}; METHOD int reinit_post { if_ctx_t _ctx; -} DEFAULT null_int_op; - -METHOD int cloneattach { - if_ctx_t _ctx; - struct if_clone *_ifc; - const char *_name; - caddr_t params; -} DEFAULT null_cloneattach; +}; METHOD int detach { if_ctx_t _ctx; @@ -270,14 +179,7 @@ METHOD int rx_queues_alloc { METHOD void queues_free { if_ctx_t _ctx; -} DEFAULT null_void_op; - -METHOD void rx_clset { - if_ctx_t _ctx; - uint16_t _fl; - uint16_t _qsetid; - caddr_t *_sdcl; -} DEFAULT null_rx_clset; +}; # # interface reset / stop @@ -298,7 +200,7 @@ METHOD void stop { METHOD int msix_intr_assign { if_ctx_t _sctx; int msix; -} DEFAULT null_int_int_op; +}; METHOD void intr_enable { if_ctx_t _ctx; @@ -338,10 +240,6 @@ METHOD int mtu_set { if_ctx_t _ctx; uint32_t _mtu; }; -METHOD int mac_set { - if_ctx_t _ctx; - const uint8_t *_mac; -} DEFAULT default_mac_set; METHOD void media_set{ if_ctx_t _ctx; @@ -394,11 +292,11 @@ METHOD void update_admin_status { METHOD void media_status { if_ctx_t _ctx; struct ifmediareq *_ifm; -} DEFAULT null_media_status; +}; METHOD int media_change { if_ctx_t _ctx; -} DEFAULT null_int_op; +}; METHOD uint64_t get_counter { if_ctx_t _ctx; @@ -439,11 +337,6 @@ METHOD void watchdog_reset { if_ctx_t _ctx; } DEFAULT null_void_op; -METHOD void watchdog_reset_queue { - if_ctx_t _ctx; - uint16_t _q; -} DEFAULT null_timer_op; - METHOD void led_func { if_ctx_t _ctx; int _onoff; diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 4dd6349f6be1..9e6964d73764 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -87,7 +87,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include "ifdi_if.h" @@ -127,7 +126,7 @@ __FBSDID("$FreeBSD$"); * * */ -MALLOC_DEFINE(M_IFLIB, "iflib", "ifnet library"); +static MALLOC_DEFINE(M_IFLIB, "iflib", "ifnet library"); #define IFLIB_RXEOF_MORE (1U << 0) #define IFLIB_RXEOF_EMPTY (2U << 0) @@ -245,12 +244,6 @@ iflib_get_media(if_ctx_t ctx) return (ctx->ifc_mediap); } -uint32_t -iflib_get_flags(if_ctx_t ctx) -{ - return (ctx->ifc_flags); -} - void iflib_set_mac(if_ctx_t ctx, uint8_t mac[ETHER_ADDR_LEN]) { @@ -310,6 +303,21 @@ typedef struct iflib_sw_tx_desc_array { #define IFLIB_RESTART_BUDGET 8 +#define IFC_LEGACY 0x001 +#define IFC_QFLUSH 0x002 +#define IFC_MULTISEG 0x004 +#define IFC_SPARE1 0x008 +#define IFC_SC_ALLOCATED 0x010 +#define IFC_INIT_DONE 0x020 +#define IFC_PREFETCH 0x040 +#define IFC_DO_RESET 0x080 +#define IFC_DO_WATCHDOG 0x100 +#define IFC_SPARE0 0x200 +#define IFC_SPARE2 0x400 +#define IFC_IN_DETACH 0x800 + +#define IFC_NETMAP_TX_IRQ 0x80000000 + #define CSUM_OFFLOAD (CSUM_IP_TSO|CSUM_IP6_TSO|CSUM_IP| \ CSUM_IP_UDP|CSUM_IP_TCP|CSUM_IP_SCTP| \ CSUM_IP6_UDP|CSUM_IP6_TCP|CSUM_IP6_SCTP) @@ -495,16 +503,6 @@ pkt_info_zero(if_pkt_info_t pi) #endif } -static device_method_t iflib_pseudo_methods[] = { - DEVMETHOD(device_attach, noop_attach), - DEVMETHOD(device_detach, iflib_pseudo_detach), - DEVMETHOD_END -}; - -driver_t iflib_pseudodriver = { - "iflib_pseudo", iflib_pseudo_methods, sizeof(struct iflib_ctx), -}; - static inline void rxd_info_zero(if_rxd_info_t ri) { @@ -544,14 +542,6 @@ rxd_info_zero(if_rxd_info_t ri) #define CALLOUT_LOCK(txq) mtx_lock(&txq->ift_mtx) #define CALLOUT_UNLOCK(txq) mtx_unlock(&txq->ift_mtx) -void -iflib_set_detach(if_ctx_t ctx) -{ - STATE_LOCK(ctx); - ctx->ifc_flags |= IFC_IN_DETACH; - STATE_UNLOCK(ctx); -} - /* Our boot-time initialization hook */ static int iflib_module_event_handler(module_t, int, void *); @@ -718,6 +708,7 @@ static void iflib_add_device_sysctl_pre(if_ctx_t ctx); static void iflib_add_device_sysctl_post(if_ctx_t ctx); static void iflib_ifmp_purge(iflib_txq_t txq); static void _iflib_pre_assert(if_softc_ctx_t scctx); +static void iflib_stop(if_ctx_t ctx); static void iflib_if_init_locked(if_ctx_t ctx); static void iflib_free_intr_mem(if_ctx_t ctx); #ifndef __NO_STRICT_ALIGNMENT @@ -5447,237 +5438,6 @@ fail_ctx_free: return (err); } -int -iflib_pseudo_register(device_t dev, if_shared_ctx_t sctx, if_ctx_t *ctxp, - struct iflib_cloneattach_ctx *clctx) -{ - int num_txd, num_rxd; - int err; - if_ctx_t ctx; - if_t ifp; - if_softc_ctx_t scctx; - int i; - void *sc; - - ctx = malloc(sizeof(*ctx), M_IFLIB, M_WAITOK|M_ZERO); - sc = malloc(sctx->isc_driver->size, M_IFLIB, M_WAITOK|M_ZERO); - ctx->ifc_flags |= IFC_SC_ALLOCATED; - if (sctx->isc_flags & (IFLIB_PSEUDO|IFLIB_VIRTUAL)) - ctx->ifc_flags |= IFC_PSEUDO; - - ctx->ifc_sctx = sctx; - ctx->ifc_softc = sc; - ctx->ifc_dev = dev; - - if ((err = iflib_register(ctx)) != 0) { - device_printf(dev, "%s: iflib_register failed %d\n", __func__, err); - goto fail_ctx_free; - } - iflib_add_device_sysctl_pre(ctx); - - scctx = &ctx->ifc_softc_ctx; - ifp = ctx->ifc_ifp; - - iflib_reset_qvalues(ctx); - CTX_LOCK(ctx); - if ((err = IFDI_ATTACH_PRE(ctx)) != 0) { - device_printf(dev, "IFDI_ATTACH_PRE failed %d\n", err); - goto fail_unlock; - } - if (sctx->isc_flags & IFLIB_GEN_MAC) - ether_gen_addr(ifp, &ctx->ifc_mac); - if ((err = IFDI_CLONEATTACH(ctx, clctx->cc_ifc, clctx->cc_name, - clctx->cc_params)) != 0) { - device_printf(dev, "IFDI_CLONEATTACH failed %d\n", err); - goto fail_unlock; - } -#ifdef INVARIANTS - if (scctx->isc_capabilities & IFCAP_TXCSUM) - MPASS(scctx->isc_tx_csum_flags); -#endif - - if_setcapabilities(ifp, scctx->isc_capabilities | IFCAP_HWSTATS | IFCAP_LINKSTATE); - if_setcapenable(ifp, scctx->isc_capenable | IFCAP_HWSTATS | IFCAP_LINKSTATE); - - if_setflagbits(ifp, IFF_NOGROUP, 0); - if (sctx->isc_flags & IFLIB_PSEUDO) { - ifmedia_add(ctx->ifc_mediap, IFM_ETHER | IFM_AUTO, 0, NULL); - ifmedia_set(ctx->ifc_mediap, IFM_ETHER | IFM_AUTO); - if (sctx->isc_flags & IFLIB_PSEUDO_ETHER) { - ether_ifattach(ctx->ifc_ifp, ctx->ifc_mac.octet); - } else { - if_attach(ctx->ifc_ifp); - bpfattach(ctx->ifc_ifp, DLT_NULL, sizeof(u_int32_t)); - } - - if ((err = IFDI_ATTACH_POST(ctx)) != 0) { - device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err); - goto fail_detach; - } - *ctxp = ctx; - - /* - * Tell the upper layer(s) if IFCAP_VLAN_MTU is supported. - * This must appear after the call to ether_ifattach() because - * ether_ifattach() sets if_hdrlen to the default value. - */ - if (if_getcapabilities(ifp) & IFCAP_VLAN_MTU) - if_setifheaderlen(ifp, - sizeof(struct ether_vlan_header)); - - if_setgetcounterfn(ctx->ifc_ifp, iflib_if_get_counter); - iflib_add_device_sysctl_post(ctx); - ctx->ifc_flags |= IFC_INIT_DONE; - CTX_UNLOCK(ctx); - return (0); - } - ifmedia_add(ctx->ifc_mediap, IFM_ETHER | IFM_1000_T | IFM_FDX, 0, NULL); - ifmedia_add(ctx->ifc_mediap, IFM_ETHER | IFM_AUTO, 0, NULL); - ifmedia_set(ctx->ifc_mediap, IFM_ETHER | IFM_AUTO); - - _iflib_pre_assert(scctx); - ctx->ifc_txrx = *scctx->isc_txrx; - - if (scctx->isc_ntxqsets == 0 || (scctx->isc_ntxqsets_max && scctx->isc_ntxqsets_max < scctx->isc_ntxqsets)) - scctx->isc_ntxqsets = scctx->isc_ntxqsets_max; - if (scctx->isc_nrxqsets == 0 || (scctx->isc_nrxqsets_max && scctx->isc_nrxqsets_max < scctx->isc_nrxqsets)) - scctx->isc_nrxqsets = scctx->isc_nrxqsets_max; - - num_txd = iflib_num_tx_descs(ctx); - num_rxd = iflib_num_rx_descs(ctx); - - /* XXX change for per-queue sizes */ - device_printf(dev, "Using %d TX descriptors and %d RX descriptors\n", - num_txd, num_rxd); - - if (scctx->isc_tx_nsegments > num_txd / MAX_SINGLE_PACKET_FRACTION) - scctx->isc_tx_nsegments = max(1, num_txd / - MAX_SINGLE_PACKET_FRACTION); - if (scctx->isc_tx_tso_segments_max > num_txd / - MAX_SINGLE_PACKET_FRACTION) - scctx->isc_tx_tso_segments_max = max(1, - num_txd / MAX_SINGLE_PACKET_FRACTION); - - /* TSO parameters - dig these out of the data sheet - simply correspond to tag setup */ - if (if_getcapabilities(ifp) & IFCAP_TSO) { - /* - * The stack can't handle a TSO size larger than IP_MAXPACKET, - * but some MACs do. - */ - if_sethwtsomax(ifp, min(scctx->isc_tx_tso_size_max, - IP_MAXPACKET)); - /* - * Take maximum number of m_pullup(9)'s in iflib_parse_header() - * into account. In the worst case, each of these calls will - * add another mbuf and, thus, the requirement for another DMA - * segment. So for best performance, it doesn't make sense to - * advertize a maximum of TSO segments that typically will - * require defragmentation in iflib_encap(). - */ - if_sethwtsomaxsegcount(ifp, scctx->isc_tx_tso_segments_max - 3); - if_sethwtsomaxsegsize(ifp, scctx->isc_tx_tso_segsize_max); - } - if (scctx->isc_rss_table_size == 0) - scctx->isc_rss_table_size = 64; - scctx->isc_rss_table_mask = scctx->isc_rss_table_size-1; - - GROUPTASK_INIT(&ctx->ifc_admin_task, 0, _task_fn_admin, ctx); - /* XXX format name */ - taskqgroup_attach(qgroup_if_config_tqg, &ctx->ifc_admin_task, ctx, - NULL, NULL, "admin"); - - /* XXX --- can support > 1 -- but keep it simple for now */ - scctx->isc_intr = IFLIB_INTR_LEGACY; - - /* Get memory for the station queues */ - if ((err = iflib_queues_alloc(ctx))) { - device_printf(dev, "Unable to allocate queue memory\n"); - goto fail_iflib_detach; - } - - if ((err = iflib_qset_structures_setup(ctx))) { - device_printf(dev, "qset structure setup failed %d\n", err); - goto fail_queues; - } - - /* - * XXX What if anything do we want to do about interrupts? - */ - ether_ifattach(ctx->ifc_ifp, ctx->ifc_mac.octet); - if ((err = IFDI_ATTACH_POST(ctx)) != 0) { - device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err); - goto fail_detach; - } - - /* - * Tell the upper layer(s) if IFCAP_VLAN_MTU is supported. - * This must appear after the call to ether_ifattach() because - * ether_ifattach() sets if_hdrlen to the default value. - */ - if (if_getcapabilities(ifp) & IFCAP_VLAN_MTU) - if_setifheaderlen(ifp, sizeof(struct ether_vlan_header)); - - /* XXX handle more than one queue */ - for (i = 0; i < scctx->isc_nrxqsets; i++) - IFDI_RX_CLSET(ctx, 0, i, ctx->ifc_rxqs[i].ifr_fl[0].ifl_sds.ifsd_cl); - - *ctxp = ctx; - - if_setgetcounterfn(ctx->ifc_ifp, iflib_if_get_counter); - iflib_add_device_sysctl_post(ctx); - ctx->ifc_flags |= IFC_INIT_DONE; - CTX_UNLOCK(ctx); - - return (0); -fail_detach: - ether_ifdetach(ctx->ifc_ifp); -fail_queues: - iflib_tqg_detach(ctx); - iflib_tx_structures_free(ctx); - iflib_rx_structures_free(ctx); -fail_iflib_detach: - IFDI_DETACH(ctx); - IFDI_QUEUES_FREE(ctx); -fail_unlock: - CTX_UNLOCK(ctx); - iflib_deregister(ctx); -fail_ctx_free: - free(ctx->ifc_softc, M_IFLIB); - free(ctx, M_IFLIB); - return (err); -} - -int -iflib_pseudo_deregister(if_ctx_t ctx) -{ - if_t ifp = ctx->ifc_ifp; - if_shared_ctx_t sctx = ctx->ifc_sctx; - - /* Unregister VLAN event handlers early */ - iflib_unregister_vlan_handlers(ctx); - - if ((sctx->isc_flags & IFLIB_PSEUDO) && - (sctx->isc_flags & IFLIB_PSEUDO_ETHER) == 0) { - bpfdetach(ifp); - if_detach(ifp); - } else { - ether_ifdetach(ifp); - } - - iflib_tqg_detach(ctx); - iflib_tx_structures_free(ctx); - iflib_rx_structures_free(ctx); - IFDI_DETACH(ctx); - IFDI_QUEUES_FREE(ctx); - - iflib_deregister(ctx); - - if (ctx->ifc_flags & IFC_SC_ALLOCATED) - free(ctx->ifc_softc, M_IFLIB); - free(ctx, M_IFLIB); - return (0); -} - int iflib_device_attach(device_t dev) { @@ -5977,22 +5737,12 @@ iflib_register(if_ctx_t ctx) driver_t *driver = sctx->isc_driver; device_t dev = ctx->ifc_dev; if_t ifp; - u_char type; - int iflags; - if ((sctx->isc_flags & IFLIB_PSEUDO) == 0) - _iflib_assert(sctx); + _iflib_assert(sctx); CTX_LOCK_INIT(ctx); STATE_LOCK_INIT(ctx, device_get_nameunit(ctx->ifc_dev)); - if (sctx->isc_flags & IFLIB_PSEUDO) { - if (sctx->isc_flags & IFLIB_PSEUDO_ETHER) - type = IFT_ETHER; - else - type = IFT_PPP; - } else - type = IFT_ETHER; - ifp = ctx->ifc_ifp = if_alloc(type); + ifp = ctx->ifc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { device_printf(dev, "can not allocate ifnet structure\n"); return (ENOMEM); @@ -6017,14 +5767,7 @@ iflib_register(if_ctx_t ctx) if_settransmitfn(ifp, iflib_if_transmit); #endif if_setqflushfn(ifp, iflib_if_qflush); - iflags = IFF_MULTICAST; - - if ((sctx->isc_flags & IFLIB_PSEUDO) && - (sctx->isc_flags & IFLIB_PSEUDO_ETHER) == 0) - iflags |= IFF_POINTOPOINT; - else - iflags |= IFF_BROADCAST | IFF_SIMPLEX; - if_setflags(ifp, iflags); + if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); ctx->ifc_vlan_attach_event = EVENTHANDLER_REGISTER(vlan_config, iflib_vlan_register, ctx, EVENTHANDLER_PRI_FIRST); diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 9f60085ce4d6..21630297981f 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -36,8 +36,6 @@ #include #include -struct if_clone; - /* * The value type for indexing, limits max descriptors * to 65535 can be conditionally redefined to uint32_t @@ -52,8 +50,6 @@ struct if_shared_ctx; typedef const struct if_shared_ctx *if_shared_ctx_t; struct if_int_delay_info; typedef struct if_int_delay_info *if_int_delay_info_t; -struct if_pseudo; -typedef struct if_pseudo *if_pseudo_t; /* * File organization: @@ -280,7 +276,6 @@ struct if_shared_ctx { int __spare0__; int isc_tx_reclaim_thresh; int isc_flags; - const char *isc_name; }; typedef struct iflib_dma_info { @@ -354,35 +349,13 @@ typedef enum { * Driver needs frames padded to some minimum length */ #define IFLIB_NEED_ETHER_PAD 0x100 -/* - * Packets can be freed immediately after encap - */ -#define IFLIB_TXD_ENCAP_PIO 0x00200 -/* - * Use RX completion handler - */ -#define IFLIB_RX_COMPLETION 0x00400 -/* - * Skip refilling cluster free lists - */ -#define IFLIB_SKIP_CLREFILL 0x00800 -/* - * Don't reset on hang - */ -#define IFLIB_NO_HANG_RESET 0x01000 -/* - * Don't need/want most of the niceties of - * queue management - */ -#define IFLIB_PSEUDO 0x02000 -/* - * No DMA support needed / wanted - */ -#define IFLIB_VIRTUAL 0x04000 -/* - * autogenerate a MAC address - */ -#define IFLIB_GEN_MAC 0x08000 +#define IFLIB_SPARE7 0x200 +#define IFLIB_SPARE6 0x400 +#define IFLIB_SPARE5 0x800 +#define IFLIB_SPARE4 0x1000 +#define IFLIB_SPARE3 0x2000 +#define IFLIB_SPARE2 0x4000 +#define IFLIB_SPARE1 0x8000 /* * Interface needs admin task to ignore interface up/down status */ @@ -396,11 +369,7 @@ typedef enum { * interrupts instead of doing combined RX/TX processing. */ #define IFLIB_SINGLE_IRQ_RX_ONLY 0x40000 -/* - * Don't need/want most of the niceties of - * emulating ethernet - */ -#define IFLIB_PSEUDO_ETHER 0x80000 +#define IFLIB_SPARE0 0x80000 /* * Interface has an admin completion queue */ @@ -520,10 +489,4 @@ void iflib_led_create(if_ctx_t ctx); void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); -/* - * Pseudo device support - */ -if_pseudo_t iflib_clone_register(if_shared_ctx_t); -void iflib_clone_deregister(if_pseudo_t); - #endif /* __IFLIB_H_ */ diff --git a/sys/net/iflib_clone.c b/sys/net/iflib_clone.c deleted file mode 100644 index 32ec0119d33b..000000000000 --- a/sys/net/iflib_clone.c +++ /dev/null @@ -1,303 +0,0 @@ -/*- - * Copyright (c) 2014-2018, Matthew Macy - * Copyright (C) 2017-2018 Joyent Inc. - * 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. Neither the name of Matthew Macy nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include "opt_inet.h" -#include "opt_inet6.h" -#include "opt_acpi.h" -#include "opt_sched.h" - -#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 -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include "ifdi_if.h" - -int -noop_attach(device_t dev) -{ - return (0); -} - -int -iflib_pseudo_detach(device_t dev) -{ - if_ctx_t ctx; - - ctx = device_get_softc(dev); - if ((iflib_get_flags(ctx) & (IFC_INIT_DONE | IFC_IN_DETACH)) == - IFC_INIT_DONE) *** 291 LINES SKIPPED *** From nobody Thu Aug 3 21:46: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 4RH2Tv12frz4V3pt; Thu, 3 Aug 2023 21:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH2Tv0Clwz3YBP; Thu, 3 Aug 2023 21:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691099171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68ZO0oImg7vwCGJfksOjjSIJUlDyjIe9hA20NgINqRc=; b=OVljv0nFOtWDnUDzdch6OgztwpP83mwAVuWXS+Aza2EH+tVINYKl/ojGf+Uur9kQ0Evdib LiiGja6LNMJ0f+5WhcyVD7N+9rkkTF3+RoITVS3fxtK16mTqSo6QDWZEV3qEQuUnMaduaf mQ6O9jtl1j4MsMCLOjNfQMQihGPl8dCa8jhs8+MdV09T0nuYAwIgo34mvf2UvBmLYD+j15 oIlh/Y4yO9qhhEWLTxryGNLp73FhWaSciB80XuO//qR51ZclCyoaHnALcv9P5keXG8+DTY V6fYrk4GirSW9/00wO9CvBxtjbkK4iCjD0OOSghhSVKf7+dY87eyQjfrtPWfBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691099171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68ZO0oImg7vwCGJfksOjjSIJUlDyjIe9hA20NgINqRc=; b=GBQayO251csN2p9PFxmS6ObryexICqllnBvhSr84beczLj/3c5cfUkxCJbse37n9TRBshB y/eeFjM9Wn0Qq+alx2+ItOuV0IqjH6iFzlaPkc/QBYdkP1FSeyRgwrvvD6H4png1pDLMAk VtQpKYXOqUo0KBAnNi1HSBlXwOZAlHDUht6o/b6PNfgzIML0iDCz+XNlSSiI7X+dRhboSB h/ZLbOm7mj2NadghSBcLKBSAKp2XqdL5etLE9IvPZ047UuBalrEH53fC6SWbkdS6rvZCKt CWRcVPufZpSlrvwVpMybql7VLDhjV0fHTVFYQDD4QPCdY3+A3nxrGrv2uShu9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691099171; a=rsa-sha256; cv=none; b=NzhtcdbFlVpgT9z4LTEXIwQ3W1T334/CGeTAlBQr01UabhY+zMpZRx0rRQS7dYWX04hOQk f5RrM8lz8YaqAvM9yohWZsfVHCtYEQHFScIhabQMIil+WCth/wiBMRD1R642IsBxHwRqpU j1KTScFkt8Q3PwBqTPATl2rlWzACTeAkoD6JIp0IgwQch91gIan2bo+s9U/LI/5w8M8vUL hOjVlq79qL2qMYp3hUU6+IsUPByxEsyvNGrt30W737r4xuw7C5EzgNbd5Eo9XbZrGAvwkd BzVBWQ63oc6vYUusOPKGY81z//RpCWFGEk+Rz9IkRjUJk/41YqLsNx7NrQfgQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH2Tt6MBjzd6C; Thu, 3 Aug 2023 21:46: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 373LkA5T054896; Thu, 3 Aug 2023 21:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373LkA7i054895; Thu, 3 Aug 2023 21:46:10 GMT (envelope-from git) Date: Thu, 3 Aug 2023 21:46:10 GMT Message-Id: <202308032146.373LkA7i054895@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: 9051987e40c5 - main - amd64: Bump MAXCPU to 1024 (from 256) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9051987e40c5a1f2396c5ceecff119fb4da28160 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9051987e40c5a1f2396c5ceecff119fb4da28160 commit 9051987e40c5a1f2396c5ceecff119fb4da28160 Author: Ed Maste AuthorDate: 2022-09-30 12:14:22 +0000 Commit: Ed Maste CommitDate: 2023-08-03 21:41:26 +0000 amd64: Bump MAXCPU to 1024 (from 256) Hardware with more than 256 CPU cores is currently available and will become increasingly common over FreeBSD 14's lifetime. Increase MAXCPU in the amd64 GENERIC kernel configuration to 1024. Earlier commits increased some related limits. These prerequisite commits include at least: - d7ed40243769 Increase MAX_APIC_ID safeguard to 0x800 - d1639e43c589 cpuset: increase userland maximum size to 1024 Global and allocated arrays sized by MAXCPU result in excessive bloat on systems with lower core counts. In addition, some code used u_char (8 bits) to hold a CPU index, which is not valid if MAXCPU is greater than 256. A number of recent commits addressed these sorts of issues, including at least: - 133935d26f20 pf: atomically increment state ids - 74ac712f72cf vmm: Dynamically allocate a couple of per-CPU state save areas - 78cfa762ebf2 callout: Move per-CPU callout state into the dpcpu region - 42f722e721cd amd64: store pcids pmap data in pcpu zone - 9801e7c275f6 smp_topo: dynamically allocate group array - 9fb6718d1b18 smp: Dynamically allocate the stoppcbs array - 2bb16c635249 x86: retire use of intr_bind There are some additional allocations still to be converted and more scalability work is required to make effective use of very high core count systems, but this change allows us to boot on these systems and provides a Kernel Binary Interface (KBI) for the FreeBSD 14 release that supports these configurations. Special thanks to AMD for providing hardware to test these changes. PR: 269572 Reviewed by: des Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36838 --- UPDATING | 4 ++++ sys/amd64/include/param.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 8e1b3e8555ba..5889c0ac9903 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.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".) +20230803: + MAXCPU has been increased to 1024 in the amd64 GENERIC kernel config. + Out-of-tree kernel modules will need to be rebuilt. + 20230724: CAM has been mechanically updated s/u_int(64|32|16|8)_t/uint\1_t/g to move to the standard uintXX_t types from the old, traditional diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index a76be23bbe91..c7e5a5c7fc42 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -65,7 +65,7 @@ #ifdef SMP #ifndef MAXCPU -#define MAXCPU 256 +#define MAXCPU 1024 #endif #else #define MAXCPU 1 From nobody Thu Aug 3 22:36: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 4RH3bT4b0Jz4V7TS; Thu, 3 Aug 2023 22:36: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 4RH3bT46RWz3dPT; Thu, 3 Aug 2023 22:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691102165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boV0jpb89AK+3nzernSYTHJO+aEfcDeQKM8b068znOo=; b=fgFUV6XZX9HCh6jyB/ExKsZi90eWunDu9R8qM6CRVZ2/f7mFVa9bYv3uj+KOvG3tr6LQq0 /H7OSfXLE9xyaVbGppKOb+Wu6lg9BLIyg8Jb6543/ZbcKfx7ocENC5BR9caL2fW+qIo6GO ETgdm7ZNrFpbThamQesJiqAc2nltyKO2OBxwqh5UAn3OF2zKikgjYY57i+cKt6sexdd+kZ WvUGFjxCKvYBvlQU9M0V+dHM2XrOfNswsSY44nlry42Kisq682SI/O4Nfy1lGIR8iOkLZO W/hcZU0LKPJhLteC+9DsAXzJbeQq0yRqoEjH+waaFjzxknD5+Hj4sjecc4Tb2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691102165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boV0jpb89AK+3nzernSYTHJO+aEfcDeQKM8b068znOo=; b=iYspPJsxAAJdGHfoRlDjYeDVAkpur1H7p1kgDK2S5apmATqcWSaJUIHwq8RsdFD6on2UjP EKXyLKo2LPegBEUOrEem2MouTYoZu+WmSizie3HIAwVruGhcZlN6mSZtScFDCDLo+IqLRh hRCFY0fbC5ca4pBMEpAZIEQHNk/Kp6hIeiPO0K0tL4NdaudUUZKaWlsBy5/aWDNHGUwooW I9eqfcOXvIMT0WNfNnTFP3zgkSv8K7yRLJwzTXQ+V8Y1RBFhhKhLK1sFt7v5Xrcc2nkLT1 F0w7tCex2rv2H7YhTT3/TyRqtNVgZQ1KtLOCql/8DVvEojDSllwY4FBfa63/Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691102165; a=rsa-sha256; cv=none; b=njXFFn9SHKfkdIVKWwcjJtb5we5Z/iarA0T3m5fjHM6mJDZTJ34A0M0+aV/IHgjJ7Nxu4/ UhLFiyFAcWCLvFMgAUYfBX4NE0mA/I83uAnkWQuY4DhGdpar31ZZKV0emhxCDZFdewwQxb hXAVMKR9Puk0tNIDw1HLuMY0x7fwZdJlBJbcOGO3gtJ3OyuAJfV0hp1ttadjpN47TJaE0A QsZDi0uDfF8q43w/hpVXvibC5jLxHXh7gU3k84YwkR8iv0r1UJzkAG9Wllo/RdGn1K6ErW f6AmbpaTiUuH3C2nQERRHX1xvvaDHkLX+YRsW060FEanQNbbokTJ6m+jKgNhiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH3bT2nX1zf1g; Thu, 3 Aug 2023 22:36: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 373Ma5RS038273; Thu, 3 Aug 2023 22:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373Ma5EM038272; Thu, 3 Aug 2023 22:36:05 GMT (envelope-from git) Date: Thu, 3 Aug 2023 22:36:05 GMT Message-Id: <202308032236.373Ma5EM038272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: f1b5488f7bba - main - e1000: Enable TSO for lem(4) and em(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1b5488f7bba7f25a57750f87cbcbccbd5b9d16b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b5488f7bba7f25a57750f87cbcbccbd5b9d16b commit f1b5488f7bba7f25a57750f87cbcbccbd5b9d16b Author: Kevin Bowling AuthorDate: 2023-08-03 20:49:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-03 22:35:28 +0000 e1000: Enable TSO for lem(4) and em(4) Most em(4) devices now enjoy TSO and TSO6, matching NetBSD and Linux defaults. A prior commit automasks TSO on 10/100 Ethernet due to errata and other bugs for IPv6 were fixed recently allowing this. Mike Karels identified a performance anomaly on Intel 82574L devices. These are multiqueue enabled on FreeBSD since the conversion to iflib. I am investigating whether this can be fixed, in the mean time MSI-X with checksum offloads remain default. i219 SPT devices have an errata that downclocks the DMA engine, which results in TSO not being able to acheive line rate. Therefore, it is disabled on: * Intel(R) I219-LM and I219-V SPT * Intel(R) I219-LM and I219-V SPT-H (2) * Intel(R) I219-LM and I219-V LBG (3) * Intel(R) I219-LM and I219-V SPT (4) * Intel(R) I219-LM and I219-V SPT (5) Many lem(4) devices enjoy TSO, exceptions being 82542, 82543, 82547. TSO6 may be possible for some chipsets but I am still working through my testing matrix and that is hidden behind hw.em.unsupported_tso. If you encounter issues, you may disable TSO with for example: ifconfig em0 -tso -tso6. I ask to be informed of any deviations from normal operation requiring this. Thanks to cc@ for access to emulab.net. On a sample I219 system it saves about 16% CPU on IPv4 and 19% on IPv6. iperf3 -Vc reported numbers: total% user% system% IPv4 TSO 21.3 7 14.4 21.4 6 15.4 21.5 6 15.5 IPv4 no TSO 36.8 5.4 31.4 38.5 5.1 33.5 38.2 5.7 32.6 IPv4 no TSO no TXCSUM 45.1 5.8 39.3 46 6.3 39.7 46.2 5.9 40.4 IPv6 TSO6 21.7 5.4 16.3 21.6 5.1 16.5 21.9 5.6 16.3 IPv6 no TSO6 41.2 5.2 36 41 5.1 36 40.8 5.2 35.7 IPv6 no TSO6 no TXCSUM6 49 5.9 43.1 48.8 4.9 43.9 49 5.6 43.4 Tested by: cc (lem(4)), karels (82574L) MFC after: 3 months Relnotes: yes Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41170 --- sys/dev/e1000/if_em.c | 66 +++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1da0579cdce9..fefd1e3f411c 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -903,25 +903,19 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; - /* - * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} - * by default as we don't have workarounds for all associated - * silicon errata. E. g., with several MACs such as 82573E, - * TSO only works at Gigabit speed and otherwise can cause the - * hardware to hang (which also would be next to impossible to - * work around given that already queued TSO-using descriptors - * would need to be flushed and vlan(4) reconfigured at runtime - * in case of a link speed change). Moreover, MACs like 82579 - * still can hang at Gigabit even with all publicly documented - * TSO workarounds implemented. Generally, the penality of - * these workarounds is rather high and may involve copying - * mbuf data around so advantages of TSO lapse. Still, TSO may - * work for a few MACs of this class - at least when sticking - * with Gigabit - in which case users may enable TSO manually. - */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + + /* Disable TSO on 82574L due to performance loss being investigated */ + if (hw->mac.type == e1000_82574) + scctx->isc_capenable &= ~IFCAP_TSO; + /* + * Disable TSO on SPT due to errata that downclocks DMA performance + * i218-i219 Specification Update 1.5.4.5 + */ + if (hw->mac.type == e1000_pch_spt) + scctx->isc_capenable &= ~IFCAP_TSO; + /* * We support MSI-X with 82574 only, but indicate to iflib(4) * that it shall give MSI at least a try with other devices. @@ -944,24 +938,38 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; if (em_unsupported_tso) scctx->isc_capabilities |= IFCAP_TSO6; - /* - * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} - * by default as we don't have workarounds for all associated - * silicon errata. TSO4 may work on > 82544 but its status - * is unknown by the authors. Please report any success or failures. - */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + /* 82541ER doesn't do HW tagging */ + if (hw->device_id == E1000_DEV_ID_82541ER || + hw->device_id == E1000_DEV_ID_82541ER_LOM) { + scctx->isc_capabilities &= ~IFCAP_VLAN_HWTAGGING; + scctx->isc_capenable = scctx->isc_capabilities; + } + /* This is the first e1000 chip and it does not do offloads */ + if (hw->mac.type == e1000_82542) { + scctx->isc_capabilities &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | + IFCAP_HWCSUM_IPV6 | IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWFILTER | IFCAP_TSO | IFCAP_VLAN_HWTSO); + scctx->isc_capenable = scctx->isc_capabilities; + } + /* These can't do TSO for various reasons */ + if (hw->mac.type < e1000_82544 || hw->mac.type == e1000_82547 || + hw->mac.type == e1000_82547_rev_2) { + scctx->isc_capabilities &= ~(IFCAP_TSO | IFCAP_VLAN_HWTSO); + scctx->isc_capenable = scctx->isc_capabilities; + } + /* XXXKB: No IPv6 before this? */ + if (hw->mac.type < e1000_82545){ + scctx->isc_capabilities &= ~IFCAP_HWCSUM_IPV6; + scctx->isc_capenable = scctx->isc_capabilities; + } /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ - if (hw->mac.type == e1000_82542 || hw->mac.type == e1000_82547 || - hw->mac.type == e1000_82547_rev_2) + if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) scctx->isc_capenable &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | IFCAP_HWCSUM_IPV6); - /* 82541ER doesn't do HW tagging */ - if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) - scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING; + /* INTx only */ scctx->isc_msix_bar = 0; } From nobody Thu Aug 3 22:55: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 4RH42G0BD1z4V9Gj; Thu, 3 Aug 2023 22:55: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 4RH42F6gpSz3gXM; Thu, 3 Aug 2023 22:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xw5au0iCs8fkBJKLl2TrZmqNh+J52CDU7A458yZ9ugg=; b=BrU/q0OFzQpJX0N35yhSz6Onw5bKXAEvUefoB4VBG0UVFyicLyYEmZaThiYk+t1/rDUA7Z RXnMhlco5U4L4rX0nJk9QycFcYDvC2Biv865soFKZch+JPmVBQOch/F1E6O6aDb9QDrXj2 77bEP75Ugd6B/B4bEQpLi+KWO0a5742566/lugRqVq5dX+dzykvOtRJWk4OKN0mvPgEVmE L6fJcg5PBArIviHjICRi/TldNaPhfeHlyN8aqX/Ev+TPuLq4R1KYB+tf4utXEPNtx2428s RE58q5oK6p6sSZmifgQezvL+cuRIr1rNEVP7JVRzfm/m7RR0Lk6ZM09EcVWnOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xw5au0iCs8fkBJKLl2TrZmqNh+J52CDU7A458yZ9ugg=; b=GqovicpfWVMfN0Mrqo0BQrVwPag4Z6d/iav+wsNYiAdwceD99yH3khdcQ5M//SLP3GAt12 OmrnKen7xjeZ5PMI+CaLMwpbtr7kf73QpaoLPst2vak8GuJ+QIZKDsLwmIAsum5ttpmyAB NckhqFQ0qTg82LMzMBXpx9+PnDCn8dzcG7C2tYPzEzjtQfj6k4pxWsEdR9AfQe0Ej0nqHu SC3ygJYnhsZ796r9saCGbz87HIfLvF0LIomnvv1eWgr3HVYsqcY9psRwMG/iFp7Krr6qAk dmxpXKMczBFbMXBAWKOUq6rm22HEEIxrxmdkvXSfcj6qQVHgefyt2en16EvF5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691103349; a=rsa-sha256; cv=none; b=Mr2E8aaJz2b+e/72h8NweuAW6/pIeoiNQQ/sTLSxq4bhTtD4WOKs8raNznaTPas8oROLMm GoQnsK185fL1tNe0ZZmMRNk/YknmaPVmwynv3IHxq38rGjBBqf2slxL/WqeltlPPhX+J5I JCcQdH6B0y2n/zCnTR8TaCwzoTLVHD1mCiBp/3nxcYUrl2CdU4x70CFsE/fo1TfrjHDWy4 fsVwnFdIO5xo1UIvm1Ma3glbgDh1KC6MypiDM7+c04XAuQJFojiaXfD+DHmUnn4weaaZRP rzb7Sd0jIUcw0HmhpRK+HYkg28cZMhvblFmgyyyBJJLzE1I2fJc1fhbskauENA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH42F5kTTzfmW; Thu, 3 Aug 2023 22:55: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 373Mtn7R072012; Thu, 3 Aug 2023 22:55:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373MtnOY072011; Thu, 3 Aug 2023 22:55:49 GMT (envelope-from git) Date: Thu, 3 Aug 2023 22:55:49 GMT Message-Id: <202308032255.373MtnOY072011@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: ad2fac552c3f - main - lib/libc/amd64: add archlevel-based simd dispatch framework List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ad2fac552c3fcb577feb3055fa083f2d256c06ed Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2fac552c3fcb577feb3055fa083f2d256c06ed commit ad2fac552c3fcb577feb3055fa083f2d256c06ed Author: Robert Clausecker AuthorDate: 2023-08-03 22:47:31 +0000 Commit: Robert Clausecker CommitDate: 2023-08-03 22:53:43 +0000 lib/libc/amd64: add archlevel-based simd dispatch framework Add a framework for selecting from one of multiple implementations of a function based on amd64 architecture level (cf. amd64 SysV ABI supplement). Sponsored by: The FreeBSD Foundation Approved by: kib Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D40693 --- lib/libc/amd64/amd64_archlevel.h | 90 ++++++++++++ lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/amd64_archlevel.c | 241 ++++++++++++++++++++++++++++++++ 3 files changed, 332 insertions(+) diff --git a/lib/libc/amd64/amd64_archlevel.h b/lib/libc/amd64/amd64_archlevel.h new file mode 100644 index 000000000000..047beb9855d1 --- /dev/null +++ b/lib/libc/amd64/amd64_archlevel.h @@ -0,0 +1,90 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +/* must be macros so they can be accessed from assembly */ +#define X86_64_SCALAR 0 /* disable SIMD optimisations */ +#define X86_64_BASELINE 1 /* CMOV, CX8, FPU, FXSR, MMX, OSFXSR, SSE, SSE2 */ +#define X86_64_V2 2 /* CMPXCHG16B, LAHF-SAHF, POPCNT, SSE3, SSSE3, SSE4_1, SSE4_2 */ +#define X86_64_V3 3 /* AVX, AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, OSXSAVE */ +#define X86_64_V4 4 /* AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL */ + +#define X86_64_MAX X86_64_V4 /* highest supported architecture level */ +#define X86_64_UNDEFINED -1 /* architecture level not set yet */ + +#ifndef __ASSEMBLER__ +#include + +dlfunc_t __archlevel_resolve(u_int, u_int, u_int, u_int, + int32_t[X86_64_MAX + 1]) __hidden; +#else +#include + +#define ARCHRESOLVE(func) \ + .globl CNAME(func); \ + .type CNAME(func), @gnu_indirect_function; \ + .set CNAME(func), __CONCAT(func,_resolver); \ + ARCHENTRY(func, resolver); \ + lea __CONCAT(func,_funcs)(%rip), %r8; \ + jmp CNAME(__archlevel_resolve); \ + ARCHEND(func, resolver) + +/* + * The func_funcs array stores the location of the implementations + * as the distance from the func_funcs array to the function. Due + * to compiling for the medium code model, a 32 bit integer suffices + * to hold the distance. + * + * Doing it this way both saves storage and avoids giving rtld + * relocations to process at load time. + */ +#define ARCHFUNCS(func) \ + ARCHRESOLVE(func); \ + .section .rodata; \ + .align 4; \ + __CONCAT(func,_funcs): + +#define NOARCHFUNC \ + .4byte 0 + +#define ARCHFUNC(func, level) \ + .4byte __CONCAT(__CONCAT(func,_),level) - __CONCAT(func,_funcs) + +#define ENDARCHFUNCS(func) \ + .zero 4*(X86_64_MAX+1)-(.-__CONCAT(func,_funcs)); \ + .size __CONCAT(func,_funcs), .-__CONCAT(func,_funcs) + +#define ARCHENTRY(func, level) \ + _START_ENTRY; \ + .type __CONCAT(__CONCAT(func,_),level), @function; \ + __CONCAT(__CONCAT(func,_),level):; \ + .cfi_startproc + +#define ARCHEND(func, level) \ + END(__CONCAT(__CONCAT(func,_),level)) + +#endif /* __ASSEMBLER__ */ diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index cb370bc6be1c..1bfefa7be98c 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -1,6 +1,7 @@ # $FreeBSD$ MDSRCS+= \ + amd64_archlevel.c \ bcmp.S \ memcmp.S \ memcpy.S \ diff --git a/lib/libc/amd64/string/amd64_archlevel.c b/lib/libc/amd64/string/amd64_archlevel.c new file mode 100644 index 000000000000..c06566658c59 --- /dev/null +++ b/lib/libc/amd64/string/amd64_archlevel.c @@ -0,0 +1,241 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#include +#include +#include + +#include +#include + +#include "amd64_archlevel.h" +#include "libc_private.h" + +#define ARCHLEVEL_ENV "ARCHLEVEL" + +static volatile int amd64_archlevel = X86_64_UNDEFINED; + +static const struct archlevel { + char name[10]; + /* CPUID feature bits that need to be present */ + u_int feat_edx, feat_ecx, amd_ecx, ext_ebx; +} levels[] = { + { + .name = "scalar", + .feat_edx = 0, + .feat_ecx = 0, + .amd_ecx = 0, + .ext_ebx = 0, + }, { +#define FEAT_EDX_BASELINE (CPUID_FPU | CPUID_CX8 | CPUID_CMOV | CPUID_MMX | \ + CPUID_FXSR | CPUID_SSE | CPUID_SSE2) + .name = "baseline", + .feat_edx = FEAT_EDX_BASELINE, + .feat_ecx = 0, + .amd_ecx = 0, + .ext_ebx = 0, + }, { +#define FEAT_ECX_V2 (CPUID2_SSE3 | CPUID2_SSSE3 | CPUID2_CX16 | CPUID2_SSE41 | \ + CPUID2_SSE42 | CPUID2_POPCNT) +#define AMD_ECX_V2 AMDID2_LAHF + .name = "x86-64-v2", + .feat_edx = FEAT_EDX_BASELINE, + .feat_ecx = FEAT_ECX_V2, + .amd_ecx = AMD_ECX_V2, + .ext_ebx = 0, + }, { +#define FEAT_ECX_V3 (FEAT_ECX_V2 | CPUID2_FMA | CPUID2_MOVBE | \ + CPUID2_OSXSAVE | CPUID2_AVX | CPUID2_F16C) +#define AMD_ECX_V3 (AMD_ECX_V2 | AMDID2_ABM) +#define EXT_EBX_V3 (CPUID_STDEXT_BMI1 | CPUID_STDEXT_AVX2 | CPUID_STDEXT_BMI2) + .name = "x86-64-v3", + .feat_edx = FEAT_EDX_BASELINE, + .feat_ecx = FEAT_ECX_V3, + .amd_ecx = AMD_ECX_V3, + .ext_ebx = EXT_EBX_V3, + }, { +#define EXT_EBX_V4 (EXT_EBX_V3 | CPUID_STDEXT_AVX512F | \ + CPUID_STDEXT_AVX512DQ | CPUID_STDEXT_AVX512CD | \ + CPUID_STDEXT_AVX512BW | CPUID_STDEXT_AVX512VL) + .name = "x86-64-v4", + .feat_edx = FEAT_EDX_BASELINE, + .feat_ecx = FEAT_ECX_V3, + .amd_ecx = AMD_ECX_V3, + .ext_ebx = EXT_EBX_V4, + } +}; + +static int +supported_archlevel(u_int feat_edx, u_int feat_ecx, u_int ext_ebx, u_int ext_ecx) +{ + int level; + u_int p[4], max_leaf; + u_int amd_ecx = 0; + + (void)ext_ecx; + + do_cpuid(0x80000000, p); + max_leaf = p[0]; + + if (max_leaf >= 0x80000001) { + do_cpuid(0x80000001, p); + amd_ecx = p[2]; + } + + for (level = X86_64_BASELINE; level <= X86_64_MAX; level++) { + const struct archlevel *lvl = &levels[level]; + + if ((lvl->feat_edx & feat_edx) != lvl->feat_edx || + (lvl->feat_ecx & feat_ecx) != lvl->feat_ecx || + (lvl->amd_ecx & amd_ecx) != lvl->amd_ecx || + (lvl->ext_ebx & ext_ebx) != lvl->ext_ebx) + return (level - 1); + } + + return (X86_64_MAX); +} + +static int +match_archlevel(const char *str, int *force) +{ + int level, want_force = 0; + + *force = 0; + + if (str[0] == '!') { + str++; + want_force = 1; + } + + for (level = 0; level <= X86_64_MAX; level++) { + size_t i; + const char *candidate = levels[level].name; + + /* can't use strcmp here: would recurse during ifunc resolution */ + for (i = 0; str[i] == candidate[i]; i++) + /* suffixes starting with : or + are ignored for future extensions */ + if (str[i] == '\0' || str[i] == ':' || str[i] == '+') { + if (want_force) + *force = 1; + + return (level); + } + } + + return (X86_64_UNDEFINED); +} + +/* + * We can't use getenv(), strcmp(), and a bunch of other functions here as + * they may in turn call SIMD-optimised string functions. + * + * *force is set to 1 if the architecture level is valid and begins with a ! + * and to 0 otherwise. + */ +static int +env_archlevel(int *force) +{ + size_t i; + + if (environ == NULL) + return (X86_64_UNDEFINED); + + for (i = 0; environ[i] != NULL; i++) { + size_t j; + + for (j = 0; environ[i][j] == ARCHLEVEL_ENV "="[j]; j++) + if (environ[i][j] == '=') + return (match_archlevel(&environ[i][j + 1], force)); + } + + *force = 0; + + return (X86_64_UNDEFINED); + +} + +/* + * Determine the architecture level by checking the CPU capabilities + * and the environment: + * + * 1. If environment variable ARCHLEVEL starts with a ! and is followed + * by a valid architecture level, that level is returned. + * 2. Else if ARCHLEVEL is set to a valid architecture level that is + * supported by the CPU, that level is returned. + * 3. Else the highest architecture level supported by the CPU is + * returned. + * + * Valid architecture levels are those defined in the levels array. + * The architecture level "scalar" indicates that SIMD enhancements + * shall not be used. + */ +static int +archlevel(u_int feat_edx, u_int feat_ecx, u_int ext_ebx, u_int ext_ecx) +{ + int islevel, wantlevel, hwlevel, force; + + islevel = atomic_load_int(&amd64_archlevel); + if (islevel != X86_64_UNDEFINED) + return (islevel); + + wantlevel = env_archlevel(&force); + if (!force) { + hwlevel = supported_archlevel(feat_edx, feat_ecx, ext_ebx, ext_ecx); + if (wantlevel == X86_64_UNDEFINED || wantlevel > hwlevel) + wantlevel = hwlevel; + } + + /* + * Ensure amd64_archlevel is set only once and + * all calls agree on what it was set to. + */ + if (atomic_cmpset_int(&amd64_archlevel, islevel, wantlevel)) + return (wantlevel); + else + return (atomic_load_int(&amd64_archlevel)); +} + +/* + * Helper function for SIMD ifunc dispatch: select the highest level + * implementation up to the current architecture level. + */ +dlfunc_t +__archlevel_resolve(u_int feat_edx, u_int feat_ecx, u_int ext_ebx, + u_int ext_ecx, int32_t funcs[static X86_64_MAX + 1]) +{ + int level; + + for (level = archlevel(feat_edx, feat_ecx, ext_ebx, ext_ecx); level >= 0; level--) + if (funcs[level] != 0) + return (dlfunc_t)((uintptr_t)funcs + (ptrdiff_t)funcs[level]); + + /* no function is present -- what now? */ + __builtin_trap(); +} From nobody Thu Aug 3 22:55: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 4RH42H25TZz4V9DY; Thu, 3 Aug 2023 22:55: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 4RH42H0Qy9z3gml; Thu, 3 Aug 2023 22:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH2IbkPVHgGJch1ASU0gf3whyU8Kv4ElyWQeCwaBHSI=; b=jtSDafJoIUmsPoXEZdZvGw6czAeQdHs8VgfEG3Nz6GzkdSvjEv+Bv4oTzArGt+3Dsa76nh 31NPdYBrgMlkMfxBz315o6tO5tXbZkNVgV5hVUkO05KMpB3yvG0BWQcfxiGsmNoBgjNKt+ 8vUHvhQj61SP0OZdQIEZgpw2ciaqg1t5/BDHkT/sN9z5mBMbuLRtumZwAi5QO1mWWFG75+ GHrMYp3xjv3ZNeVZozRCXCGCZPJpq8C8CXe4FrFCzQqof0CIvup73Nvnlt0cZ5jCTiVrM+ T3Z9FEdUPbkCChUGI4LVAraWJkBKzUZXeO1Yd6gP93+hpS50SsDbXIuqaymoqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH2IbkPVHgGJch1ASU0gf3whyU8Kv4ElyWQeCwaBHSI=; b=P5yuZF6jMmpTWWgO8INe4dCq/6W90lcRWyrCvU4ChdkOzfo6DNk3E1U0woCQjESx565kVV c+yU81HA4vOSzFOE4dzC+imxTQD3mJwBPusFWlnuVPXWfX6+qrdMQJB8JIMAhqbxhjEBvF x0X830Gz1mQpArwEDL7fRJVGqjQs0ONtlACfZT49O6lz9/nz3t+srJwQFVOyliTrWW2Uyd +fiZT8hs1RAaDbTZK41YjFDqHmIYSOnyrRFDqhXzwiSLVB8VG9ZVrroZ6CqhekEbTSonYU q1HZK7j6rFrKJyAAoQNqHIoN9zA7rlHYTeMtq4W76SQFBWHs6FUNG1go5VTLlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691103351; a=rsa-sha256; cv=none; b=bzw7f/WD1ITtVg2be+1ybdyULzugmZGHRpnIFAP54x/Ix5FxpmYlzDGK9GiymAdSvJ8Yie Fpqr0SgVwKXv8SPbQ//gu4R+dB2PZ8ykZqsFvHFbO+QZN/2j2pKs5oSqk31TIk2zFt5YKX oHGfPqnmVh3DCkbXZJcLyG/MPBv5jbooEWbUIQ55bdmJip8vkC8bAA4LLzl7/2VQqWIq7Z 8Lr1W03RSKMnd0/DtxYH7GEF6afodloE3Bju00M6nU82AaUGPkYXJpVT330FiA53pW0lRS QbC6RI9tz7LFh8M6HK53g7ClzYc7tFiNdIjguLqMe67NlRqmyuRgNYGwift9pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH42G6NwJzfmX; Thu, 3 Aug 2023 22:55: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 373MtoKj072031; Thu, 3 Aug 2023 22:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373Mtolv072030; Thu, 3 Aug 2023 22:55:50 GMT (envelope-from git) Date: Thu, 3 Aug 2023 22:55:50 GMT Message-Id: <202308032255.373Mtolv072030@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: d8385768fb12 - main - lib/libc/amd64/string/strlen.S: add amd64 baseline kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8385768fb12e6205d73a20ad05fba9f3281b6e1 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d8385768fb12e6205d73a20ad05fba9f3281b6e1 commit d8385768fb12e6205d73a20ad05fba9f3281b6e1 Author: Robert Clausecker AuthorDate: 2023-08-03 22:48:32 +0000 Commit: Robert Clausecker CommitDate: 2023-08-03 22:54:23 +0000 lib/libc/amd64/string/strlen.S: add amd64 baseline kernel This performs very well. x86-64-v3 and x86-64-v4 kernels were written, too, but performed worse than the baseline kernel on short strings. These may be added at a future point in time if the performance issues can be fixed. os: FreeBSD arch: amd64 cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz │ strlen_scalar.out │ strlen_baseline.out │ │ B/s │ B/s vs base │ Short 1.667Gi ± 1% 2.676Gi ± 1% +60.55% (p=0.000 n=20) Mid 5.459Gi ± 1% 8.756Gi ± 1% +60.39% (p=0.000 n=20) Long 15.34Gi ± 0% 52.27Gi ± 0% +240.64% (p=0.000 n=20) geomean 5.188Gi 10.70Gi +106.24% Sponsored by: The FreeBSD Foundation Approved by: kib Reviewed by: mjg jrtc27 Differential Revision: https://reviews.freebsd.org/D40693 --- lib/libc/amd64/string/strlen.S | 58 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/lib/libc/amd64/string/strlen.S b/lib/libc/amd64/string/strlen.S index 1d2428e3420e..7e2514de44b0 100644 --- a/lib/libc/amd64/string/strlen.S +++ b/lib/libc/amd64/string/strlen.S @@ -1,11 +1,18 @@ -/* +/*- * Written by Mateusz Guzik + * Copyright (c) 2023 The FreeBSD Foundation + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * * Public domain. */ #include __FBSDID("$FreeBSD$"); +#include "amd64_archlevel.h" + /* * Note: this routine was written with kernel use in mind (read: no simd), * it is only present in userspace as a temporary measure until something @@ -14,6 +21,11 @@ __FBSDID("$FreeBSD$"); #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ +ARCHFUNCS(strlen) + ARCHFUNC(strlen, scalar) + ARCHFUNC(strlen, baseline) +ENDARCHFUNCS(strlen) + /* * strlen(string) * %rdi @@ -30,7 +42,7 @@ __FBSDID("$FreeBSD$"); * * The latter contains a 32-bit variant of the same algorithm coded in assembly for i386. */ -ENTRY(strlen) +ARCHENTRY(strlen, scalar) movabsq $0xfefefefefefefeff,%r8 movabsq $0x8080808080808080,%r9 @@ -76,6 +88,46 @@ ENTRY(strlen) leaq (%rcx,%rdi),%rax subq %r10,%rax ret -END(strlen) +ARCHEND(strlen, scalar) + +ARCHENTRY(strlen, baseline) + mov %rdi, %rcx + pxor %xmm1, %xmm1 + and $~0xf, %rdi # align string + pcmpeqb (%rdi), %xmm1 # compare head (with junk before string) + mov %rcx, %rsi # string pointer copy for later + and $0xf, %ecx # amount of bytes rdi is past 16 byte alignment + pmovmskb %xmm1, %eax + add $32, %rdi # advance to next iteration + shr %cl, %eax # clear out matches in junk bytes + test %eax, %eax # any match? (can't use ZF from SHR as CL=0 is possible) + jnz 2f + + ALIGN_TEXT +1: pxor %xmm1, %xmm1 + pcmpeqb -16(%rdi), %xmm1 # find NUL bytes + pmovmskb %xmm1, %eax + test %eax, %eax # were any NUL bytes present? + jnz 3f + + /* the same unrolled once more */ + pxor %xmm1, %xmm1 + pcmpeqb (%rdi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rdi # advance to next iteration + test %eax, %eax + jz 1b + + /* match found in loop body */ + sub $16, %rdi # undo half the advancement +3: tzcnt %eax, %eax # find the first NUL byte + sub %rsi, %rdi # string length until beginning of (%rdi) + lea -16(%rdi, %rax, 1), %rax # that plus loc. of NUL byte: full string length + ret + + /* match found in head */ +2: tzcnt %eax, %eax # compute string length + ret +ARCHEND(strlen, baseline) .section .note.GNU-stack,"",%progbits From nobody Thu Aug 3 22:55: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 4RH42J2gRYz4V9Bt; Thu, 3 Aug 2023 22:55: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 4RH42J1d1Qz3gY7; Thu, 3 Aug 2023 22:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWmB5schb2nhe0+3jYFTItVqLpoF4y4Cp9lgi9lwB68=; b=oz925CnWC0bGRTiFCtWkJVqsvfwgL0S/g3JZGEoerXtkQ7OSf+uGJXSbXM5TRggkORJDqg 1vlw6aHme9V2+fVBFHEOQzRHA86cGspTqeXZerpRdoy3I2ZzWxRU10CEqA1peqqcUw/+6b JXaBGaaSNcWTkCSqVVmNUfK+AW/ow+eDhBR1edu2yeyf4Qqbh7wgsjyARUwsQL2rjbCdMW XVgmJh0Qwb+pMI7zxfeB8AV4/puuqIVG7mOkcWfr8QQ/kp/fx/tdD60Aa8tnt1Q2CVeyzJ EzSoo6OKlxyiSfsHWGC+bOTPPShQmrMkK+AKUvYjlUHrg0t+fe59wjpeCXE/8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWmB5schb2nhe0+3jYFTItVqLpoF4y4Cp9lgi9lwB68=; b=HFpvryuYmA8SJmFCuwt491FYNLBb2NcZRUGGj6jHMsO5L9tEqbDRP9EZltxqtZYaWQ/BmH IOLI6Thg7n41pJwZpPTOZ7jHBTw4uh26Nc+PFlZCYScGm5WE1i0cTv1FWp7yAJqcD0SU+4 4LI7v6LFNtT5/8ipEYMaApbYfFJn5C0VEyjKOHI9h/ygjqX58TMbAGz2yb2SM3zooFKzJs uR10tk9hMjHtxY9UeCT1cfxoVO6NHjainHb+gfoIXfQt9I4bBPiBi8aAwtril0cyqXMF1z qiNxUP4zIm6lMmUbzSgzT59OaBSbrT0YK7mve4ylv1kgn6/KEvUen6Hs7QAcmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691103352; a=rsa-sha256; cv=none; b=oY7GK7XnF5p8TNqzoM/5gfJHCXCK1tuYyhX/y6AtJAVVjOofRNEi4daWLtVdxr6tO/yH51 2UFugL4QRFwrgHB2xu+3TC/FIxHvRAZ8zM4U31Pn6Ejm05KfrUr7fJVdGW5pDpKBDnelBy KOrZJhu829fSHpRuEi1PjyjG7sx271V8xN0xaN/oMSaXo5TKXGdXUoYvJf56EzmAWuVDAA S50DxP1HGxVVCBiC47ZtvR91RPK2AlwES7BVHMeAEk1thoDbRn6fGB33bVqb9QcRujA+Sd 5sDDRC9xKL1B2a89uYEJDMsLt7fl18uTsu34a3eo6Sn3j+Zg6p/PETVUsvZ4sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH42J0RwbzfmY; Thu, 3 Aug 2023 22:55: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 373MtpTB072053; Thu, 3 Aug 2023 22:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373Mtp3i072052; Thu, 3 Aug 2023 22:55:51 GMT (envelope-from git) Date: Thu, 3 Aug 2023 22:55:51 GMT Message-Id: <202308032255.373Mtp3i072052@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: 0588819779cd - main - share/man/man7: document libc simd usage in new man page simd(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0588819779cd82dc8fd9a1b63bcb531b296986eb Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0588819779cd82dc8fd9a1b63bcb531b296986eb commit 0588819779cd82dc8fd9a1b63bcb531b296986eb Author: Robert Clausecker AuthorDate: 2023-08-03 22:51:31 +0000 Commit: Robert Clausecker CommitDate: 2023-08-03 22:54:44 +0000 share/man/man7: document libc simd usage in new man page simd(7) This documents SIMD usage in libc for all architectures with specific details on the new amd64 SIMD dispatch framework. Sponsored by: The FreeBSD Foundation Approved by: kib Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40693 --- share/man/man7/Makefile | 1 + share/man/man7/simd.7 | 226 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index f50e31cdeb11..56ade5092275 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -26,6 +26,7 @@ MAN= arch.7 \ release.7 \ sdoc.7 \ security.7 \ + simd.7 \ sizeof.7 \ sprog.7 \ stats.7 \ diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 new file mode 100644 index 000000000000..c8e17cb9e0ef --- /dev/null +++ b/share/man/man7/simd.7 @@ -0,0 +1,226 @@ +.\" Copyright (c) 2023 The FreeBSD Foundation +. +.\" This documentation was written by Robert Clausecker +.\" under sponsorship from the FreeBSD Foundation. +. +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +. +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE +. +.Dd July 3, 2023 +.Dt SIMD 7 +.Os +.Sh NAME +.Nm simd +.Nd SIMD enhancements +. +.Sh DESCRIPTION +On some architectures, the +.Fx +.Em libc +provides enhanced implementations of commonly used functions, replacing +the architecture-independent implementations used otherwise. +Depending on architecture and function, an enhanced +implementation of a function may either always be used or the +.Em libc +detects at runtime which SIMD instruction set extensions are +supported and picks the most suitable implementation automatically. +On +.Cm amd64 , +the environment variable +.Ev ARCHLEVEL +can be used to override this mechanism. +.Pp +Enhanced functions are present in the following architectures: +.Bl -column FUNCTION_ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 +.It bcmp Ta Ta Ta S Ta S +.It bcopy Ta Ta S Ta S Ta S Ta SV +.It bzero Ta Ta S Ta S Ta S +.It div Ta Ta Ta S Ta S +.It index Ta S +.It ldiv Ta Ta Ta S Ta S +.It lldiv Ta Ta Ta S +.It memcmp Ta Ta S Ta S Ta S +.It memcpy Ta S Ta S Ta S Ta S Ta SV +.It memmove Ta S Ta S Ta S Ta S Ta SV +.It memset Ta Ta S Ta S Ta S +.It rindex Ta S +.It stpcpy Ta Ta Ta S +.It strcat Ta Ta Ta S Ta S +.It strchr Ta S Ta Ta Ta S +.It strcmp Ta Ta S Ta S Ta S +.It strcpy Ta Ta Ta S Ta S Ta S2 +.It strlen Ta Ta S Ta S134 +.It strncmp Ta Ta S Ta Ta S +.It strncpy Ta Ta Ta Ta Ta S2 +.It strrchr Ta S Ta Ta Ta S +.It swab Ta Ta Ta Ta S +.It wcschr Ta Ta Ta Ta S +.It wcscmp Ta Ta Ta Ta S +.It wcslen Ta Ta Ta Ta S +.It wmemchr Ta Ta Ta Ta S +.El +.Pp +.Sy S Ns :\ scalar (non-SIMD), +.Sy 1 Ns :\ amd64 baseline, +.Sy 2 Ns :\ x86-64-v2 +or PowerPC\ 2.05, +.Sy 3 Ns :\ x86-64-v3, +.Sy 4 Ns :\ x86-64-v4, +.Sy V Ns :\ PowerPC\ VSX. +. +.Sh ENVIRONMENT +.Bl -tag +.It Ev ARCHLEVEL +On +.Em amd64 , +controls the level of SIMD enhancements used. +If this variable is set to an architecture level from the list below +and that architecture level is supported by the processor, SIMD +enhancements up to +.Ev ARCHLEVEL +are used. +If +.Ev ARCHLEVEL +is unset, not recognised, or not supported by the processor, the highest +level of SIMD enhancements supported by the processor is used. +.Pp +A suffix beginning with +.Sq ":" +or +.Sq "+" +in +.Ev ARCHLEVEL +is ignored and may be used for future extensions. +The architecture level can be prefixed with a +.Sq "!" +character to force use of the requested architecture level, even if the +processor does not advertise that it is supported. +This usually causes applications to crash and should only be used for +testing purposes or if architecture level detection yields incorrect +results. +.Pp +The architecture levels follow the AMD64 SysV ABI supplement: +.Bl -tag -width x86-64-v2 +.It Cm scalar +scalar enhancements only (no SIMD) +.It Cm baseline +cmov, cx8, x87 FPU, fxsr, MMX, osfxsr, SSE, SSE2 +.It Cm x86-64-v2 +cx16, lahf/sahf, popcnt, SSE3, SSSE3, SSE4.1, SSE4.2 +.It Cm x86-64-v3 +AVX, AVX2, BMI1, BMI2, F16C, FMA, lzcnt, movbe, osxsave +.It Cm x86-64-v4 +AVX-512F/BW/CD/DQ/VL +.El +.El +. +.Sh DIAGNOSTICS +.Bl -diag +.It "Illegal Instruction" +Printed by +.Xr sh 1 +if a command is terminated through delivery of a +.Dv SIGILL +signal, see +.Xr signal 3 . +.Pp +Use of an unsupported architecture level was forced by setting +.Ev ARCHLEVEL +to a string beginning with a +.Sq "!" +character, causing a process to crash due to use of an unsupported +instruction. +Unset +.Ev ARCHLEVEL , +remove the +.Sq "!" +prefix or select a supported architecture level. +.Pp +Message may also appear for unrelated reasons. +.El +. +.Sh SEE ALSO +.Xr string 3 , +.Xr arch 7 +.Rs +.%A H. J. Lu +.%A Michael Matz +.%A Milind Girkar +.%A Jan Hubi\[u010D]ka \" \(vc +.%A Andreas Jaeger +.%A Mark Mitchell +.%B System V Application Binary Interface +.%D May 23, 2023 +.%T AMD64 Architecture Processor Supplement +.%O Version 1.0 +.Re +. +.Sh HISTORY +Architecture-specific enhanced +.Em libc +functions were added starting +with +.Fx 2.0 +for +.Cm i386 , +.Fx 6.0 +for +.Cm arm , +.Fx 6.1 +for +.Cm amd64 , +.Fx 11.0 +for +.Cm aarch64 , +and +.Fx 12.0 +for +.Cm powerpc64 . +SIMD-enhanced functions were first added with +.Fx 13.0 +for +.Cm powerpc64 +and with +.Fx 14.0 +for +.Cm amd64 . +.Pp +A +.Nm +manual page appeared in +.Fx 14.0 . +. +.Sh AUTHOR +.An Robert Clausecker Aq Mt fuz@FreeBSD.org +. +.Sh CAVEATS +Other parts of +.Fx +such as cryptographic routines in the kernel or in +OpenSSL may also use SIMD enhancements. +These enhancements are not subject to the +.Ev ARCHLEVEL +variable and may have their own configuration +mechanism. +. +.Sh BUGS +Use of SIMD enhancements cannot be configured on powerpc64. From nobody Thu Aug 3 23:01:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RH48L3Twbz4V9TT for ; Thu, 3 Aug 2023 23:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH48L31l6z4F4M; Thu, 3 Aug 2023 23:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsUpfCRgrB4cU5xJpYU/dV1joARWkhsyArCtKibPkxA=; b=UjEpOmGVjjOhH1lVtgs53J+g0YrgIDjrJI7MSFsMJ2tSPKjycvKFG7CLxvkpf9bD7bNSZm KpFHb0ymZP0DyURRHW6BvEADnHlGAL3AdPC2tWxBna/00rq2Nu+iNZuKEaJ5DrlWWnTXjI xbG1uELSALwV/CB2zMsiCETGeV6xwZROqqVp7zZQImh6ExmdBeQa5+GchYRv0s7u+7q8pv 3JX7X/R6wwvWj2yiYICU4ak+SffZV6Pve0Xnnbs/rnsGrLFPMH/fy9KxdZglXBm6jHDJbT oaA3IPvbqz8I6gVLwxr7YGMKBcmtWLNOTkQ5TZxRGpz/YoWvUAAMxAEBgbmhOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsUpfCRgrB4cU5xJpYU/dV1joARWkhsyArCtKibPkxA=; b=v/svduOa94RdSwRSfJ/YlB/Cja2vZ3BYDbO8KMyFcGByP0vfLzf/Q4b30NLdZSbzJYK0UZ g1+vT//FPQvq8kH71dA6fxQW8EscVc0hg+VwB4Q7axZ8U7madx9r3udScxvGGprFPbAmd2 DKSDql0rmSqQrPIaoeb5ZxaW3hhbIel2rQiPt8gnkvFDgRvksFq1vXGMVw+lgIazHTbzQB J+v9TrmhYucTxcHt3uoSI1/jX3NNFGmIozX/PM4aaudLn7KkIbXvHnDNcXJPnxpPShe+1H pt3t1fbVKynV/uow7CIHLhAPnwCtnp7BpY7F8tgAwyEmuNQevGjpH1Lb2wT96g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691103666; a=rsa-sha256; cv=none; b=CiVxCriURoQLejDAXY8bD0KqvWO9zs/T4AvPb1e+4m7h7sSl5el+HcnfIubgcV6HyPo/yt aaS581hI2vw5B9p67egnHWbdVYpKV2z4WWwYxGx9Gr489dNh5sjGXyhNR+NP6jApjlTnIM zCdXJuxa1/8zMI2GHNqckm7M72eTD+UjUi25G/LqJ8j8QPQ6w9IQ3sl8/tu95AbeQF6ksm CFTLepCWUElqIn9N5iToiF6H/MPwiCFwlZT0j/DWJKdmqkfuo/qD0MVLoD0XutWZC88NMH KALf1Y92zYX33YJfBefGZ/9jg9n/LDyR8Yd/+4djtivWDIIODdDIibiIrjHYmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH48L1mzdzfl2; Thu, 3 Aug 2023 23:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373N16cG083284; Thu, 3 Aug 2023 23:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373N16L6083283; Thu, 3 Aug 2023 23:01:06 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:01:06 GMT Message-Id: <202308032301.373N16L6083283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: f8035ed8e513..80517d0d48d9 - vendor/libarchive - 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/libarchive X-Git-Reftype: branch X-Git-Commit: 80517d0d48d96fdd3e9c80d30eb30289d5004133 X-Git-Oldrev: f8035ed8e51381281e5718a81233fa41b5b9e1d0 X-Git-Newrev: 80517d0d48d96fdd3e9c80d30eb30289d5004133 Auto-Submitted: auto-generated The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=f8035ed8e513..80517d0d48d9 80517d0d48d9 Update vendor/libarchive to libarchive/libarchive@5c5a9f2b7 From nobody Thu Aug 3 23:00: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 4RH48M3Hdpz4V9MC for ; Thu, 3 Aug 2023 23:01:07 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH48M1CYkz4DwL for ; Thu, 3 Aug 2023 23:01:07 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fe32016bc8so14205085e9.1 for ; Thu, 03 Aug 2023 16:01:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691103665; x=1691708465; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kUqLIOMH+1QmmIIZz0FEQH8ZrhQgsk+E8eq0fBshNQ8=; b=GXhXdjxiFQiUf7gKiqQFh/hwNS7DSkLDvM52KkQUO/4i2BdrrVWDi2SgcwVV8nRzxm ZHN27qQGB5rBfFZB6+WhfHBsDCvaYuokw6mLuJUT1rtdSwKpsoS9FvUoMHxpe993cWGv VGUULkN0sqNJS2Bs+bm9OIakZNh9oyjGhNMQT8aYlP88cCKwnsNI+XThiEGqQ/njHsld NMbygOp+p4biJDZ3bE0QAkwzYu5uYWjQ8zYH95/p1QFHesEri9vA/502rAdcocHywHkx ZTQgdsCcQPIOFpI7P3hWmy2yt5f1U7QN0JrSx8DdBkqbJ5XjkRrr8pG8rvHxE9LsRshE qxlQ== X-Gm-Message-State: AOJu0YwPP8WlEaMlQWarejMJfBqwsgqDbQKnO1OVoBDWcaRi9uIYZxp5 igYzeSwF3T+woMgb8mR5M9th5xB9qutoaxJTszU= X-Google-Smtp-Source: AGHT+IHe+/JzvH7cv14WPnfBMndbAWLBcbF16pV+TogiQ6yQcYm6OTMQ6iIuYF+Y+fk7ZWQC6TiyQQ== X-Received: by 2002:a1c:720c:0:b0:3fc:e00:5282 with SMTP id n12-20020a1c720c000000b003fc0e005282mr154642wmc.0.1691103664705; Thu, 03 Aug 2023 16:01:04 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id p14-20020a1c740e000000b003fe20db88e2sm5262376wmc.18.2023.08.03.16.01.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2023 16:01:04 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: ad2fac552c3f - main - lib/libc/amd64: add archlevel-based simd dispatch framework From: Jessica Clarke In-Reply-To: <202308032255.373MtnOY072011@gitrepo.freebsd.org> Date: Fri, 4 Aug 2023 00:00:53 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <71830984-F775-4688-83B7-13996B397E8D@freebsd.org> References: <202308032255.373MtnOY072011@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RH48M1CYkz4DwL X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 3 Aug 2023, at 23:55, Robert Clausecker wrote: >=20 > The branch main has been updated by fuz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dad2fac552c3fcb577feb3055fa083f2d= 256c06ed >=20 > commit ad2fac552c3fcb577feb3055fa083f2d256c06ed > Author: Robert Clausecker > AuthorDate: 2023-08-03 22:47:31 +0000 > Commit: Robert Clausecker > CommitDate: 2023-08-03 22:53:43 +0000 >=20 > lib/libc/amd64: add archlevel-based simd dispatch framework >=20 > Add a framework for selecting from one of multiple implementations > of a function based on amd64 architecture level (cf. amd64 SysV > ABI supplement). >=20 > Sponsored by: The FreeBSD Foundation > Approved by: kib > Reviewed by: jrtc27 This is news to me :), I only gave some review suggestions on earlier iterations of this patch; this should really be Reviewed by: kib? Same goes for strlen even more so; I didn=E2=80=99t even attempt to look = at the SIMD assembly. Jess From nobody Thu Aug 3 23:04: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 4RH4Dd4JMSz4V9t5; Thu, 3 Aug 2023 23:04: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 4RH4Dd3VWzz4FdX; Thu, 3 Aug 2023 23:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBeCPNFppC6MNzDssCl+QB3HjDAB44YUSTkl91EO6BU=; b=So/bO70xDLmPhVNO63dWWLtC9CpoZVlIsX5jeW8vNV6zXFu87AIk5dr+VEah1D5UbTmukg X0SHk4ZhjJ1hjmV3hEmbTnFFrPj/IOJoPUaaKUJwBOhwj1zuwL3dx0qQCS4eAjlpFyQXB2 9htLU3rTH/g/mX+BNwuf7o9lVK5m4L8jMpdLW9MoRhnpPVYFME91KVPGTrsZpQdbxNRIOu z9v9ksckRAV+ISQL62pcBFs/DvNJhrny7Wg8qQHXhBDg0QvcpBWWi06p4gjtxJfjyX9Xwz F4qmRM+IcdyWQy8GATEg01L2P96CjEKWONIqiXaqkSrbJVeWxx2e5UPsG9PZOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691103889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBeCPNFppC6MNzDssCl+QB3HjDAB44YUSTkl91EO6BU=; b=jXHRkUQ0i5/wLclvrpeRaERthuXN5VRBNLj23RIOnDUza1l2XSSBc3vgUsndxolqyehaDQ iOACwMUvojn8WDq75lc67UeLfohyjBGKnzzibV4xk8J8+IrrEesBSsGjOe5N8koSQL55EY 3hVej+pZPbYcoHYCH3fvUFDiD3gJDhmm8TUs2eSY1SD4fPThSQQhCXTmZhZIeT9NXWMX6a re4kVdEaCem3CZ1MgNP74bkNmQnhaw2eXanLC5Nrtg6pUSce58A0YtKWffcfRxPgJhKkaX DPNUYvDXEPKEPACsejYfCB2hno7xSru78SG428Kv4zynoPXyETJIoJ1uCs/Jdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691103889; a=rsa-sha256; cv=none; b=PgR91BWrPXNYdCVLYoofsnl7ggXPhmA6+u8LLoIdlYWC+P78AzNaIjt/YPXay0P1Aj36hu yKqvZ6u7dhdyC9z+Y59PlKJVQRTez33lvVoVIBqjlYifB2C1KsNCu5TLFtRTiTKJjrepLl rHnUlCZiL997DMVFBVH+RyJ5XiqJX232EC2vbQJuPM4LXSooHguK77FP5TtfRXhNy/H733 JKSiP4mreFHTT+PBzFuJ/egYJhOG/B3f8Ehnp0yz5eFEwJD0Qkg2/kkWJN6XO1z1Mkiugr 3oYbpB8+zdKBqno+a0DaL9efSRMA7B7Qr2Zs0CX9vxlPtAEodXO7NCm/wcYybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Dd2YgVzfst; Thu, 3 Aug 2023 23:04: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 373N4npI089179; Thu, 3 Aug 2023 23:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373N4nXk089178; Thu, 3 Aug 2023 23:04:49 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:04:49 GMT Message-Id: <202308032304.373N4nXk089178@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: 058ab969fd2f - main - libarchive: merge 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/main X-Git-Reftype: branch X-Git-Commit: 058ab969fd2f7a8d04240d1e9bc9d63918480226 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=058ab969fd2f7a8d04240d1e9bc9d63918480226 commit 058ab969fd2f7a8d04240d1e9bc9d63918480226 Merge: 0588819779cd 80517d0d48d9 Author: Martin Matuska AuthorDate: 2023-08-03 23:04:14 +0000 Commit: Martin Matuska CommitDate: 2023-08-03 23:04:14 +0000 libarchive: merge from vendor branch Changes to not yet connected unzip only. MFC after: 1 week contrib/libarchive/unzip/bsdunzip.c | 19 ++++++++++++++++ contrib/libarchive/unzip/bsdunzip.h | 7 ++---- contrib/libarchive/unzip/cmdline.c | 2 -- contrib/libarchive/unzip/test/test_d.c | 22 +++++++++++++++++-- contrib/libarchive/unzip/test/test_x.c | 40 ++++++++++++++++++++++++++++++++-- 5 files changed, 79 insertions(+), 11 deletions(-) From nobody Thu Aug 3 23:13: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 4RH4Qg2z7lz4VBXV; Thu, 3 Aug 2023 23:13: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 4RH4Qg23QCz4GVr; Thu, 3 Aug 2023 23:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaNgU6XhsGwGH4H6Id7+kqXqAnslxYh21HOPJGJZ8+c=; b=I3g2240W8EYoPjTFuZXsqMrr2QgxsWQwfDjmp2XVFJgIU3X5hIIEc1SZCkjYFa5I0qHapk 9Dq6298Kq11CxFwULbEzgxEGuO9dy7+nY+rib+ROFKSa0VmxzxTpMPqWDFMiCel++4VOr4 UQmocdwpdlQZP/QJ1Woth2uSrOPZ6aRsNVCuq6MwlcwpT0pFHYajLNgRCi/i2IROWUC+2C pUX9RloDaQDwn1y1EPrQOr0wZlFjOz1x+/t5Tg1aaE8OQuMuttHyQCbyTMgRkx/svZYe43 5dLwTxci2Xjck1lwYYnaFlVgpZho94G+iXCCYVOLo3w4pTvSiz+aq7HLkX+afw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaNgU6XhsGwGH4H6Id7+kqXqAnslxYh21HOPJGJZ8+c=; b=by+ycwKjF4ueneyozIS3xzMnHotfJ8fBI5wXHX1bzHpkF4beZE8pEbg+r4zrGuNjAMLv29 2Ul9SSJje31SOqJLxGlcBPDndQLzDpPPg6L37SmHnBzdKTSFdrAX1dRrYnZQZW2O2nMbxq D5wHqpe6guSO28yKt1lCouEsAeLnMkz6bd7U1eIMqmbX1dsigCVCXIixMycoJABh8Hlaq8 Ou8G9MVo0OWkHBdjc2mAJgTayAdUDcJaYqDvu+4N0KJ+lT3Cy1Q4YwRr5Q1jaD5i4aBKS3 hTSCS5xyhDUv5UykylgihOkZtzRfaVKS+u4eXgz2G6XxUSB51BHx0MTn3nGdPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104411; a=rsa-sha256; cv=none; b=KK/zHB0Bih9tlU+PCK+r/ETsbIaLb5wFQMmbCVEkNEeLygf3tjDyNMNnKGLFOGE2WNukjK bRiJrNVE1TAi5Nu5ZemVZgGC3+90LL7EAkS4A/Hk14SmLsCsfbKE6T2KaNu5NvzDtxS3KG IrWR+i74FYDju9KRdgBRCfEeqa1ngnlUUOm5IbQQCbQQDi1F9fMic2GP23/cLcrfYFC6xZ O+izL/sRsxAcgzoNy1EEpIITMrXD8hr2dkI9wWCwRzeTyIMn+u1pH84wGFDv8nyzSRNg3X rV7nTa7ZiqhydGTL5aOH+xBBRxf+ILpymvwf03qkdPxswoa0REHN6KEN3CAsTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Qg17MyzfpQ; Thu, 3 Aug 2023 23:13: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 373NDVib005231; Thu, 3 Aug 2023 23:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDVV3005230; Thu, 3 Aug 2023 23:13:31 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:31 GMT Message-Id: <202308032313.373NDVV3005230@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: dd0f2d02c683 - main - libibverbs: remove nonexistent symbols from the linker map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dd0f2d02c683c6ee885dda8ed323a1586c409967 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0f2d02c683c6ee885dda8ed323a1586c409967 commit dd0f2d02c683c6ee885dda8ed323a1586c409967 Author: Konstantin Belousov AuthorDate: 2023-08-01 22:56:40 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:13 +0000 libibverbs: remove nonexistent symbols from the linker map The function ibv_query_device_ex is static inline, it is not exported from the dso. With lld 16, which is much more picky about versioning and undefined symbols, this becomes an error. The ibv_register_driver driver symbol is explicitly versioned in sources, it is non-existent in un-versioned object files. Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/libibverbs/libibverbs.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/ofed/libibverbs/libibverbs.map b/contrib/ofed/libibverbs/libibverbs.map index 540124110e11..b49c09a06ce3 100644 --- a/contrib/ofed/libibverbs/libibverbs.map +++ b/contrib/ofed/libibverbs/libibverbs.map @@ -10,7 +10,6 @@ IBVERBS_1.0 { ibv_get_async_event; ibv_ack_async_event; ibv_query_device; - ibv_query_device_ex; ibv_query_port; ibv_query_gid; ibv_query_pkey; @@ -65,7 +64,6 @@ IBVERBS_1.1 { ibv_fork_init; ibv_dontfork_range; ibv_dofork_range; - ibv_register_driver; ibv_node_type_str; ibv_port_state_str; @@ -136,7 +134,6 @@ IBVERBS_PRIVATE_14 { ibv_cmd_rereg_mr; ibv_cmd_resize_cq; ibv_query_gid_type; - ibv_register_driver; verbs_register_driver; verbs_init_cq; }; From nobody Thu Aug 3 23:13: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 4RH4Qh3bw9z4VBfx; Thu, 3 Aug 2023 23:13: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 4RH4Qh30v5z4GYv; Thu, 3 Aug 2023 23:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNNifocL3VxGMyjdxE87rCcYXYo7zSwJlPMYcRFuvS8=; b=mggWthbkLXEzbe5H9ygbPNNNWRVLAK/yXIgMGQ4phrJS3wk6oCPkDHXxkpCJ+SsVGyzND7 575opJe6uQV967CF2YHxm9yPlRPdzwmncNkdACiovESqnl9QCkGMozRxffIU/n1ZpbW74M 47i4McL2hM5dD0EMO9x266J2mVc/3j07QlsRT9IKE9ZzGSMCsJzQ0O+srY3bfvUkiN2gbs AvatWFgBjqqB/qWUXhas1ta4s1KQUtRL3i2fITB46GHirrvdg0E8vcvOaCjhdMoZKbaHOm 8GgNTMts4veM9YWgO0I4OwQsJI/0ktx1l17gSpX4FdUHQLKdIexBVuM/K7Q9ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNNifocL3VxGMyjdxE87rCcYXYo7zSwJlPMYcRFuvS8=; b=HTIIqlj1CVadXfLHCiipg+Ye+zwbZknHucZKi1S35gAOtcrXEaN2AMgORZEt4OWmkRY/0Q nSwwtvKHXLRJRCGW/rnhFqZ7S72+M3k4hp9su8OKWntCv1czWTUsCg9g1FH0dXAdgdHv4d 9JLODWApOYKzAckUg/6evktV2mcZRoIp/D7a9JXceDzYXy2471fxH+J+PqmYNDmKfTPWoP SzKM5EmYhKvvJyNe0w6rdcI+ana9ISV4L+FtGlXdgsv+tH5Wavq7U904tkdOzD4W2SGKRA Mz2l19Fq6GnyUxRWgx/IHvkhuwwnQDf3SFOp/j2tNL5IpQvBdwPmcSvTTWNu0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104412; a=rsa-sha256; cv=none; b=BBFxtVn82hth2wT38Smt5et7Nqu8IUXVFpg4POatDCEPa8yuDXmd++2ppge2khcwU/vjpp b1M0er63DlfcftMEq5M2LnnLRX/BzEZW5wI1jg00c4q+H0mGElxX0ZXI1MiYAIViVuiJJl VrePQgWqtN4yBCMWlzw2txR+ACH6Ak2yfIzzJA8i0T8jj8ZOpSytB5ptAiMwui9/eo8VSo V328cTiLIE6/GRSdAo28X3kq2aOIt0blBH4QpwcxLDa5yjzrcPf6+QLsLyfhX6/peCKTTQ MA6hCqrqJZ67NkEASUy7SwiAIEf3vF64FRlUSznx+zSnbBHAPbK6PgylUNLKWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Qh24vlzfth; Thu, 3 Aug 2023 23:13: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 373NDWsi005251; Thu, 3 Aug 2023 23:13:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDWWI005250; Thu, 3 Aug 2023 23:13:32 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:32 GMT Message-Id: <202308032313.373NDWWI005250@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: 9a7eba89f972 - main - librdmacm: remove rsocket symbols from the map 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a7eba89f972e0dac0f53d0d442328248eb949ec Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7eba89f972e0dac0f53d0d442328248eb949ec commit 9a7eba89f972e0dac0f53d0d442328248eb949ec Author: Konstantin Belousov AuthorDate: 2023-08-03 07:54:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:13 +0000 librdmacm: remove rsocket symbols from the map file rsocket support was never compiled on FreeBSD at all. Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/librdmacm/librdmacm.map | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/contrib/ofed/librdmacm/librdmacm.map b/contrib/ofed/librdmacm/librdmacm.map index 1c8d74350265..e2eebbe576b4 100644 --- a/contrib/ofed/librdmacm/librdmacm.map +++ b/contrib/ofed/librdmacm/librdmacm.map @@ -36,33 +36,6 @@ RDMACM_1.0 { rdma_destroy_ep; rdma_create_srq; rdma_destroy_srq; - rsocket; - rbind; - rlisten; - raccept; - rconnect; - rshutdown; - rclose; - rrecv; - rrecvfrom; - rrecvmsg; - rsend; - rsendto; - rsendmsg; - rread; - rreadv; - rwrite; - rwritev; - rpoll; - rselect; - rgetpeername; - rgetsockname; - rsetsockopt; - rgetsockopt; - rfcntl; - riomap; - riounmap; - riowrite; rdma_create_srq_ex; rdma_create_qp_ex; local: *; From nobody Thu Aug 3 23:13:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RH4Qj4bCxz4VBZs; Thu, 3 Aug 2023 23:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH4Qj3rFcz4GmT; Thu, 3 Aug 2023 23:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqPvojPQPii53tKESdMk6v0Q1/e3NHI/WQmfq38Uu8I=; b=xNDPwfbsUCeM6fPL5XjQDSEirb9bvMzST3rFF/weTazqbZdHZ9DGtAukdq1CWaAH/tyROk y4XrYXDnEFhqkECGXxo6C3Lzi+dynJPUoJ82xo4SG6NYQSuOXJWeZ/dDucXK1NjtlLp9LO j6SLYoB0C4pqVsqy6aM/Nj3kDd42ZQYBElS4k3j0vO2O9gvxjBOka8O8iAtqjB1OV/xjb+ jxZgjLXUT5pcXNZDnxucnmHZYUNrDgAWVEaUHhnjFIt21Rb33RpybW9Mktl6LrNFYmbzJT /MYjUE4hU6mtMFg0pQo+8m0DxvDOJle1UwPYkBckwKBjuMJVFmjvsRPBl3H1pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqPvojPQPii53tKESdMk6v0Q1/e3NHI/WQmfq38Uu8I=; b=WKgTM93A+QomveaYd4oZpPsYCtke0XC6e+jZ0ndwwnEbDN9Uy16qy00TrsTKTemR5Uft7x nTOh0hdqMcB8o26Qq28w4ccvVHOYq67BEk6M8xmBCD+FnOPT/Qjgn+NSCJzhUGKSfVt2kU DGCKir6wJ7wrWfRuZhbX7yxTmInmT5lwXvmvUUsu01SbChAeVvQLqWp5BwG/xTvtcuungg Ku4zm4qYB4PrwKcJpPz1fNAqeE5m2qTQq/AtCYfX0X26eNsEA9adeT2ApqyQ3wYMVu1IMX RatcI70XWPSo0mfd8V9VxOdpR1i9+ddFsXy45SqYYeaWmFAZHJHrJIqpCqaPUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104413; a=rsa-sha256; cv=none; b=i0lizx4FopTmXSCEMX6x+FReAKmLbEwO/jgRNPkN5UjRahXjaODXzev1+ccAqVbQl/ztI3 p2f3WCWS5HFjYmPg0eK8Ukn2cJN1+cFrcmuH7nUoy63oISfgI3/YQ94PvfXvklkvrEykEs FHupbNexzZO6pNwOSyHAwY/DaZCVghVNhYpBj3yIpCQC/NIgfrkmCN9qknvJEt1ZnHzj82 qT9QGuj6dtdznGRzh3komfNxoPYm4pTkRWWFjjj2p8+g/r4P7EUViPx9bS7WNoC3mxp8KK OVw6EUm5dINmQHUaR1UW64VuEdxmqvS0cU3MXKe+Mp3mVRGsEVKXuHbimGVQ1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Qj2xyPzfpR; Thu, 3 Aug 2023 23:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373NDXdU005271; Thu, 3 Aug 2023 23:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDXuA005270; Thu, 3 Aug 2023 23:13:33 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:33 GMT Message-Id: <202308032313.373NDXuA005270@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: e5cf232b3f24 - main - librmdacm: rdma_get_local_addr and rdma_get_peer_addr are not exported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e5cf232b3f2484601b2a30f71dcbe9861e22370e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e5cf232b3f2484601b2a30f71dcbe9861e22370e commit e5cf232b3f2484601b2a30f71dcbe9861e22370e Author: Konstantin Belousov AuthorDate: 2023-08-03 08:08:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:13 +0000 librmdacm: rdma_get_local_addr and rdma_get_peer_addr are not exported they are static inline, remove them from the version script. Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/librdmacm/librdmacm.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/librdmacm/librdmacm.map b/contrib/ofed/librdmacm/librdmacm.map index e2eebbe576b4..2d826e03238c 100644 --- a/contrib/ofed/librdmacm/librdmacm.map +++ b/contrib/ofed/librdmacm/librdmacm.map @@ -26,8 +26,6 @@ RDMACM_1.0 { rdma_free_devices; rdma_event_str; rdma_set_option; - rdma_get_local_addr; - rdma_get_peer_addr; rdma_migrate_id; rdma_getaddrinfo; rdma_freeaddrinfo; From nobody Thu Aug 3 23:13: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 4RH4Qk55zmz4VBb4; Thu, 3 Aug 2023 23:13: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 4RH4Qk4dd4z4Gx3; Thu, 3 Aug 2023 23:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nUL6eUKujCFXxfsQZnWw4zsVYXivhw/i6XgwILCt20=; b=aZrewgmCOytD45BHswIdEJ/VA4tncfES7noc4OpXuS/jFwfOyN78PmFj2hSnDRvQbN4Dbz nb9xMfxaXwgyEjfKwoek5lntrseFGATWDP/0UQBO6M6CRz9sPvyhw4srJSCuubMLzPBiOu fqVq5Yf8v6KqJdDICbFihK8xZehQvYEy7wpvm/mVL9Ygvu3Fvvz1/MCE+d6aukCLn8weUI eR9wONnhlwnWFMxDf86G1Fa/UlpQRlHC0oSRJffplRAwEr2jQUGiQ8iU5vPDunQ9BQrxaH QOiTwvpeDWS4AYDvEY/9twcMTN0XrrTMFsOU3ccTGl9rdopwU5ba3r/TXf6RSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nUL6eUKujCFXxfsQZnWw4zsVYXivhw/i6XgwILCt20=; b=ov+MytmNSGnOayVm9TetVN9xDeTYxa3ah2CQzRoCs1Kw2tRnRIFE833Ythn2yPKmSAGw9q DuG76m6++xc8jtW49SOLia625wwwtPfsjfX+tL3ctED/1EmDCjKRM6DwdowwEuP5jhymyC Psw9lQk5j0OQZlK3031DtbTJ+nD/Fx0uX3TvVhoc8LEU+CF/EjQRm7vRhAEHNTenozzY3n WFf6XEYWTJFX9vMwgtZ6DMFd4BKZ93Nt3uIBmI7lfnA2XZ50vp8ka23BZKnPZnrU8C1rTz 2WwgSiSJq9aBTP6OULL/57AQ643+KXeY4FSQvXG3IxQc6jTW1ZtCEfA7l8Mf5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104414; a=rsa-sha256; cv=none; b=CPSfsY8uf8KT89ApiRsQGeiGKjwsFXRwPCuC8I33kzL7ussUVa/6cJJlRCmpBvPFIf4i5D 1s5QSvsvZ7mfNyW1QetE9fH6wxNZu4+ngtDdm5LMOH144B2qftnotmjehUS4I8vtnsscXI yf1Gtny7IFb6bdKvql1d944WGqYzMvih3rb59wtOUYTwNn4U0w5LLoVYEMZu0mV/tVVmdP dyw+4jUAiq5VLkI0ekdoTZ7dFtCwh4PtJ76cbsaYHmncpApW4n/3hJGLCEFnfDtbJQh3fs q0JOB2YBHuvt8sS/LWKpFASzTviPN6rc3vsy7o5uyQ27zrmVZcxNPYvzahe8Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Qk3glZzfmJ; Thu, 3 Aug 2023 23:13: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 373NDYju005291; Thu, 3 Aug 2023 23:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDY3S005290; Thu, 3 Aug 2023 23:13:34 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:34 GMT Message-Id: <202308032313.373NDY3S005290@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: 67c5de2dcacc - main - opensm libosmcomp: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 67c5de2dcacc7642f4648f9ec25eb10dd7387de1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=67c5de2dcacc7642f4648f9ec25eb10dd7387de1 commit 67c5de2dcacc7642f4648f9ec25eb10dd7387de1 Author: Konstantin Belousov AuthorDate: 2023-08-03 08:29:31 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:13 +0000 opensm libosmcomp: remove non-existent symbols from the version map Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/opensm/complib/libosmcomp.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/ofed/opensm/complib/libosmcomp.map b/contrib/ofed/opensm/complib/libosmcomp.map index 52410ccccf08..eaa5a1742a5d 100644 --- a/contrib/ofed/opensm/complib/libosmcomp.map +++ b/contrib/ofed/opensm/complib/libosmcomp.map @@ -112,7 +112,6 @@ OSMCOMP_2.3 { cl_thread_stall; cl_proc_count; cl_is_current_thread; - cl_thread_pool_construct; cl_thread_pool_init; cl_thread_pool_destroy; cl_thread_pool_signal; @@ -126,7 +125,6 @@ OSMCOMP_2.3 { cl_timer_trim; cl_get_time_stamp; cl_get_time_stamp_sec; - cl_vector_copy_general; cl_vector_copy16; cl_vector_copy32; cl_vector_copy64; @@ -142,7 +140,6 @@ OSMCOMP_2.3 { cl_vector_find_from_start; cl_vector_find_from_end; cl_atomic_spinlock; - cl_atomic_dec; ib_error_str; ib_async_event_str; ib_wc_status_str; From nobody Thu Aug 3 23:13: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 4RH4Ql6R8Lz4VBgL; Thu, 3 Aug 2023 23:13: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 4RH4Ql5Ss4z4GyB; Thu, 3 Aug 2023 23:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfnEOqz3p9SO6l++XNErQHpYnxZpbANwBbZsizL6mqE=; b=hKEv7uCRmKcHx7CZEwmmLLe7ddkL+xPNjTj9d+DTt32Q6TJa8RYWekFVoOmO5SeH8RSQHy EOb9IQzY2ct09YkFh8DZbuG1i3vXQJp6o5GTX0S2021ki582RVSo5yUelHsYQFu16SN8al wQRYdjdfDy95xqTEoLPj/GQ2WcnnL8lz+w6wHyUwGq2G5OZqeL5rJ3Rl13o5mHNwu8eJh0 hKy/8UQ25vLHVypmaSVczhL9BzP3tl4LhLX9Gt/1/QKHz+pSk1jaa2ARNYZCusXD/Ywtx/ gB8mA4+wkSu6y49SJmdrPvu28+BOIz8GQYGM7bD1hZuEOIoqidFcTE1f1uIpsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfnEOqz3p9SO6l++XNErQHpYnxZpbANwBbZsizL6mqE=; b=BM8FMIih2cyA6d0AzHkAn+fDcA51EhzdQnWyjwtE92+wnrFjhPhG2zlGFBnTDkX/V0BBUB MNAjXkspXfrxqQ8KLFeSHPvfVZdPgQ13doQar9IJWLnyIxuIhn/uIO0nomsCTio/k368gw McaqVSeUhUkbXaTyF1ljR7XEeGYPg+mRGYf+MpcM/tjs6tTZyrhswnIj7Nb5l3VOcHV5rs N29Zaf9DXSTkfo2evfNjkTjKo7kEdX25i84tqSixrVEPJcHqwx1bB9jAfQsMR9HNxEJwtN 7A3igNVt0l3+mL8e4ZvXjldPZYCkQTavNg4IDP7Vmfe2USBR4428ZHoh4SPZWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104415; a=rsa-sha256; cv=none; b=kpCV5yZMpJOPDyL0P+QHpmG4K9Lieucux7+m4p0Brh3lq1Fx5Q2Uym8eKJMf/01XZCW9GD jjmVUF5kQFE0kl4qE9lJISHKUw/FWuzLPp/k6NCmkPBaQaTQYWOsVwSez3Gzz/7hDImMta VCFE+bogfaJX58AQJHR1kk93ox/kBG6nxgCqUx31szxX6ufvKGhfFs5GOaa5s5qSpDsEdR 7Qs3r1Q8qQC5Var7ct1zCT4+WZdxoxqP9PSJqGaimRFwb4Pl/vvhY6Xyz1rp9OXeTfAS2D ePKjIBys5kVcdvJj6WxzcopID8oI6jyNed01heyxB3p1EfRCXmsGZydYIkZv8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Ql4XXLzgG6; Thu, 3 Aug 2023 23:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373NDZcQ005310; Thu, 3 Aug 2023 23:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDZOZ005309; Thu, 3 Aug 2023 23:13:35 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:35 GMT Message-Id: <202308032313.373NDZOZ005309@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: 6fdf714d5d18 - main - opensm libvendor: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6fdf714d5d18f5d6d3f2ae3889a788a3ebead5cc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fdf714d5d18f5d6d3f2ae3889a788a3ebead5cc commit 6fdf714d5d18f5d6d3f2ae3889a788a3ebead5cc Author: Konstantin Belousov AuthorDate: 2023-08-03 08:44:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:14 +0000 opensm libvendor: remove non-existent symbols from the version map Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/opensm/libvendor/libosmvendor.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/opensm/libvendor/libosmvendor.map b/contrib/ofed/opensm/libvendor/libosmvendor.map index 17416b35e9fb..2656b42cef1c 100644 --- a/contrib/ofed/opensm/libvendor/libosmvendor.map +++ b/contrib/ofed/opensm/libvendor/libosmvendor.map @@ -1,6 +1,5 @@ OSMVENDOR_2.0 { global: - umad_receiver; osm_vendor_init; osm_vendor_new; osm_vendor_delete; @@ -15,6 +14,5 @@ OSMVENDOR_2.0 { osm_vendor_set_debug; osmv_bind_sa; osmv_query_sa; - osm_vendor_get_guid_ca_and_port; local: *; }; From nobody Thu Aug 3 23:13: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 4RH4Qn1BLfz4VBpK; Thu, 3 Aug 2023 23:13: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 4RH4Qm6M2zz4HMk; Thu, 3 Aug 2023 23:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez3oKEvVG+RGiwx4m5uxEoSoEXE4HUSbDkeAfGSXVvE=; b=eLZSjNTzB8CVC/pom/STQ1tMlWgDEmZkr3N47M5i4ebCHBfpMNC0AvijxXtLsuHvjdpW69 CGRyXR3FIM58ZdRQ8FhJ/pTprzBTJAlFSvzTicXHDEtDmEn+lrkOd5Zpj6877TMUgUEjyU jqRoJI4HsWZ/K+u9CAr8jToYew6/M3RTDLZ+X4WspkHza+KGamlAcU0jLSpPHWqJxuk2/z 8NRAr8zR1rzJgJTvUVJ2qbQ5C+p/MfHiAEE8SoH2fMqWOZdY+cA8O2hPYaXhPMOhjmy2wf ZNDgionZJByF++8FCESR5feBrSw8isRJPhVuftauKzhXnBiCS0ewagKw8CQEeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691104416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez3oKEvVG+RGiwx4m5uxEoSoEXE4HUSbDkeAfGSXVvE=; b=Ny6Xkwg2QHzA5xb/bEHunEZP05EuqHe49LlizzEmP2vARtb9Cl1bcAnb3cY6G0D2ZQZAoI UrBEvdVZ4Bx1BUqaXjeX/iPI/R9QBdmrOfthzFp5iWlDa/E8wtgVzRWA4EcmfP7C8d8Vwn NKBxhGMOhH4QdHAWUDjr+3eprH+by2KXcUnhqRAeSziD4eoD4703DRE7tv633isuxt9upA AYSLUafdyh1AXrYfzBTACnoFaDcyXqn0f9MeAY1ofSXm9mVYrX0j9/YK+UkW6nEH4+43OG RrR2Pv78/W6N0j6vRsP0jQmIeQehTl+23eT/uQ95JBRlbWCdQyIPUyepZ+u6kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691104416; a=rsa-sha256; cv=none; b=X5d9LTQncdpBYrZI8HvTRD/Hbh5sIkfasvv45yBUbrZKeE0lCzIW/UUWwgecv5T3GwNvwX IJHuWzNtrLvZYlN8JzmeULdTwW8nK3Mlh38gGGebqb0cWloMcS69r6UAwKDzfi/VKGpgEM qORamgpaZkWX2mp1uNIkOdEXvXdNs76fpwHKWwNtvSYGb5z2wcowcA77J+35Aq7palElVr YqkAEx1goY775lsRISxTmkXijmq4FVgga5ZuFlxj+CCqEnAnLITIqtU/6IfBhIQu4VAQ5Q Ka4xrYSQ3U8EGp7tVaUWM7HEgY1HerA0fSul/oHOUPBU1OB5mUq3BOJ0fcFLlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH4Qm5S2DzfpS; Thu, 3 Aug 2023 23:13: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 373NDaHL005339; Thu, 3 Aug 2023 23:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373NDaUi005338; Thu, 3 Aug 2023 23:13:36 GMT (envelope-from git) Date: Thu, 3 Aug 2023 23:13:36 GMT Message-Id: <202308032313.373NDaUi005338@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: 21d6c29f344d - main - opensm libopensm: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 21d6c29f344d587a99314f9cd960cc008cb3dec4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21d6c29f344d587a99314f9cd960cc008cb3dec4 commit 21d6c29f344d587a99314f9cd960cc008cb3dec4 Author: Konstantin Belousov AuthorDate: 2023-08-03 08:52:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-03 23:13:14 +0000 opensm libopensm: remove non-existent symbols from the version map Sponsored by: NVidia networking MFC after: 1 week --- contrib/ofed/opensm/opensm/libopensm.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/opensm/opensm/libopensm.map b/contrib/ofed/opensm/opensm/libopensm.map index 087e69ad464a..128f4716db7c 100644 --- a/contrib/ofed/opensm/opensm/libopensm.map +++ b/contrib/ofed/opensm/opensm/libopensm.map @@ -71,7 +71,6 @@ OPENSM_1.5 { osm_dump_pkey_block; osm_dump_pkey_block_v2; osm_log_raw; - osm_get_sm_state_str; osm_get_sm_signal_str; osm_get_disp_msg_str; osm_get_port_state_str_fixed_width; @@ -91,7 +90,6 @@ OPENSM_1.5 { osm_dump_mlnx_ext_port_info_v2; osm_log_v2; osm_log_msg_box_v2; - osm_log_is_active_v2; osm_get_log_per_module; osm_set_log_per_module; osm_reset_log_per_module; From nobody Fri Aug 4 01: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 4RH7305qg3zZX5F; Fri, 4 Aug 2023 01: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 4RH7305Npsz4Wj9; Fri, 4 Aug 2023 01: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=1691111500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KNSvFD8zBH+r5+cKM5NG8NdOzeXVBfNzUAwx0TCR8t0=; b=mM8qXBY4iFVQ2A18h646Aul+ysQ1/0Kv3sq+gNS6k+kbEKxVHU9H3kOud2hNjcjTKCO9ov ot/rKzyPZBYQOcmII8oY81z1c8HrPZ3rg1pcCFKW2fYIPft4vuEqCAiqrmNBHg3Pu0hLuC 8uqQ48e2AqUvKWCZFF0Acdnm4kDRAUhNAigir2nSPLAJF8KO+RsVkjGBemoKWIiD8FcXhf 1HPNc5niZvDGA8iCbwZ8LDlfzJELEnQv8kcvLlOxT2iVrKQ6R3O9NiuqpGZHiheF8xVsqu temm7d7abY/EIF0D8lAEDwSSdHRkurpvrcZdaN4hZmaWnpqdfpRISxGw/ZY83A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691111500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KNSvFD8zBH+r5+cKM5NG8NdOzeXVBfNzUAwx0TCR8t0=; b=yWK4aIl4KH92hmK+QARNIE5bkYBuoSQ+NRSTVRaviDSS5MUAnPZVyBQtR/UugF60G2JEmb 0W6P0BXDvrKBF0ToxsWdvgi1+ekxKP1JyC+oOVwWw+8Uj5GK60c87bQK8MgsOegVegXIJM DcO/GTHBbl1cLGzOjxS9jxcRzmqYgiWWbqVf495XrDU9RrFG0fOptDjHW5bTqqfXII7+uo ZvCQHCGoyrHvZNp1am/D1qMawU8i4S/sDwW54Hhmw8sX9mB3I9lMuLmzGk+gxCW/vHEBkD ZwYI15XbJ81YBVcHVxc1kr+faIlBURiCdeUkv7Wju3ACcfknixZ/8HXw72RgXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691111500; a=rsa-sha256; cv=none; b=h6qKyXr4+yafKyoOwBwtt+j/PjVUdHoIBNENTNWBdiVd1NMZLcvdcwh2S7FZR0j0lE5nps YDy2oMULPTAwCyVg908P/bYzlDicbsnsK5R8RncZySaeSd+W/U9QRwUfETpY+3QmeYw3VF FySTBEqOR8rbLldFFMtL4TWLoLkkbgD1WjqQ0dToR8AgIip2sMViEJOsiuIWt9J1mbWt3X 0ofbE9qH7k+t4/BozEqdCthu7G4Gv9WuGCYN0k4CQIqQXOwCzheofSSfDiLEwcCeXFQMhm eLIJZwfOffIBvXYg53Heu40AHug+9HV0lE77/xKjd56uSuTm3/4vegGdDXyU4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7304RvvzjKN; Fri, 4 Aug 2023 01: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 3741BeTv002474; Fri, 4 Aug 2023 01: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 3741BeMp002462; Fri, 4 Aug 2023 01:11:40 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:11:40 GMT Message-Id: <202308040111.3741BeMp002462@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: c45dba3890e4 - stable/13 - e1000: Some fixes for em(4) TSO setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c45dba3890e489225e0c837abb38b35defc80480 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=c45dba3890e489225e0c837abb38b35defc80480 commit c45dba3890e489225e0c837abb38b35defc80480 Author: Kevin Bowling AuthorDate: 2023-07-21 01:51:02 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:11:07 +0000 e1000: Some fixes for em(4) TSO setup Always set TXD_CMD_IP for 82544 Otherwise set TXD_CMD_IP for IPv4, not IPv6 Reviewed by: markj (previous version) Differential Revision: https://reviews.freebsd.org/D30072 (cherry picked from commit 201c4b7c29da44500ccb9e47b854dc1207df8b0a) --- sys/dev/e1000/em_txrx.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 255aea6347d2..47f9b187aa14 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -141,8 +141,10 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, if_softc_ctx_t scctx = sc->shared; struct em_tx_queue *que = &sc->tx_queues[pi->ipi_qsidx]; struct tx_ring *txr = &que->txr; + struct e1000_hw *hw = &sc->hw; struct e1000_context_desc *TXD; int cur, hdr_len; + uint32_t cmd_type_len; hdr_len = pi->ipi_ehdrlen + pi->ipi_ip_hlen + pi->ipi_tcp_hlen; *txd_lower = (E1000_TXD_CMD_DEXT | /* Extended descr type */ @@ -183,12 +185,23 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, TXD->tcp_seg_setup.fields.mss = htole16(pi->ipi_tso_segsz); TXD->tcp_seg_setup.fields.hdr_len = hdr_len; - TXD->cmd_and_length = htole32(sc->txd_cmd | - E1000_TXD_CMD_DEXT | /* Extended descr */ - E1000_TXD_CMD_TSE | /* TSE context */ - E1000_TXD_CMD_IP | /* Do IP csum */ - E1000_TXD_CMD_TCP | /* Do TCP checksum */ - (pi->ipi_len - hdr_len)); /* Total len */ + /* + * 8254x SDM4.0 page 45, and PCIe GbE SDM2.5 page 63 + * - Set up basic TUCMDs + * - Enable IP bit on 82544 + * - For others IP bit on indicates IPv4, while off indicates IPv6 + */ + cmd_type_len = sc->txd_cmd | + E1000_TXD_CMD_DEXT | /* Extended descr */ + E1000_TXD_CMD_TSE | /* TSE context */ + E1000_TXD_CMD_TCP; /* Do TCP checksum */ + if (hw->mac.type == e1000_82544) + cmd_type_len |= E1000_TXD_CMD_IP; + else if (pi->ipi_etype == ETHERTYPE_IP) + cmd_type_len |= E1000_TXD_CMD_IP; + TXD->cmd_and_length = htole32(cmd_type_len | + (pi->ipi_len - hdr_len)); /* Total len */ + txr->tx_tso = true; if (++cur == scctx->isc_ntxd[0]) { From nobody Fri Aug 4 01:11: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 4RH7320CsqzZWxg; Fri, 4 Aug 2023 01:11: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 4RH7316dPsz4X2d; Fri, 4 Aug 2023 01:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691111501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLMr1DNsUylg8Fzdqs1HZ2krt9spYhbUOo6GakaTQn0=; b=nw6p6TxK0aw/faJgrfNvtF67owyZK5Z3NzaI6LET+58t0goUckv5X2mPt5oeXZhjgQ2yA6 rG6k8yvEUIC4lSAuCJLrvH02s1zPqRpgVwK+wAc17JjSkFswRj+DPXCWR1XMxQWJ5SZPU9 yypy4V9vYIexnk4Dtgz8UscfFygpXMdLiRgYnV/mKsMuK72a+oUah3g8r74jJ1D2cQIvJD GO8d62gHgsnqHV+s26pEc0kPye7Om6QpYNz92hhb9sjOPL2m/e+XoKvB4gEaJhDKBqdTq6 BoRi4MXXAoSS+XbwJQDJjYFjdXBoZsqKps3VGlGd4Hc0nPqyned5+kB2go7ASg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691111501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLMr1DNsUylg8Fzdqs1HZ2krt9spYhbUOo6GakaTQn0=; b=DUQ/P3qHgeGwF9+6wRyaq43P/DL6pBaRuW/bqR0VKkbE21dRdHBIsfBuUHszo9P8CBJ61a anasrftGGLxTI91d5iruwHc8s06TnSUpoHTKrLljs5Ny6EZ0uWnaX9aokhHiPBYOHvL2F9 llmeI1aQqFPmZBBVFPgJiMReUp7u2sxFRr1/KdgTNHjBdo5CZuJ3FA9/VN9wHLTSSpLb0X zZoiBgdEh7YU4Fc9wmfCH6WUuyeRdgFn+3RMVkZxPfbDJdXpOBN72vAyvJz6g3VFPus2Vt bzLPkzVArzW3b4t4OdUTgFrHB9m3aXl4FYtjwyCVJofWJsYEBYcFmTzE84WU2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691111501; a=rsa-sha256; cv=none; b=Ypa5RyWbu5Yom/PYQl3ZjpFSIJMpDZfTU0DtMMSNq2Cfpbtdf6OB/nozpkc8wiCmlpTsjW L3AjZsVBXoo49IYFwgbkHVKFGJ94CHqi3buHSlkXyD23PozQBovlPNx1Plof6yDFaY+mm0 QwSffiBRzj+NEv9rCmyZiTZ/9zs9DxBG+czd/IQLsBt9pfh7G8Dmo9w2sToBg2E0CF31MH FEhMVGK622aPAlrhjHHBvCLF4yR9UIqLTq2O+OyKdhkGfZNxYIuwSsICEKeT1CSWjktxwW Gd0RWev+tU3jt1OuEgBLVqC9+Mp8cdv9b8pWy+Aa1ZwUGSKvGHbQjkke9wjpMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7315MVYzjmC; Fri, 4 Aug 2023 01:11: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 3741BfKW002820; Fri, 4 Aug 2023 01:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741BfWh002819; Fri, 4 Aug 2023 01:11:41 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:11:41 GMT Message-Id: <202308040111.3741BfWh002819@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: bd07d5c45199 - stable/13 - e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd07d5c451995353cbf1d86f97c5264232ea401b Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bd07d5c451995353cbf1d86f97c5264232ea401b commit bd07d5c451995353cbf1d86f97c5264232ea401b Author: Kevin Bowling AuthorDate: 2023-07-21 03:30:00 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:11:30 +0000 e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes * em(4) obey administrative ifcaps for using hwcsum offload * em(4) obey administrative ifcaps for hw vlan receive tagging * em(4) add additional TSO6 ifcap, but disabled by default as is TSO4 * lem(4) obey administrative ifcaps for using hwcsum offload * lem(4) add support for hw vlan receive tagging * lem(4) Add ifcaps for TSO offload experimentation, but disabled by default due to errata and possibly missing txrx code. * lem(4) disable HWCSUM ifcaps by default on 82547 due to errata around full duplex links. It may still be administratively enabled. Reviewed by: markj (previous version) Differential Revision: https://reviews.freebsd.org/D30072 (cherry picked from commit 95f7b36e8fac45092b9a4eea5e32732e979989f0) --- sys/dev/e1000/em_txrx.c | 15 ++++++++------- sys/dev/e1000/if_em.c | 48 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 47f9b187aa14..069a1c00a4b2 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -674,12 +674,12 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); - /* XXX add a faster way to look this up */ - if (sc->hw.mac.type >= e1000_82543) + if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(status, errors, ri); - if (status & E1000_RXD_STAT_VP) { - ri->iri_vtag = le16toh(rxd->special); + if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && + status & E1000_RXD_STAT_VP) { + ri->iri_vtag = le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); ri->iri_flags |= M_VLANTAG; } @@ -699,11 +699,11 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) uint16_t len; uint32_t pkt_info; - uint32_t staterr = 0; + uint32_t staterr; bool eop; int i, cidx; - i = 0; + staterr = i = 0; cidx = ri->iri_cidx; do { @@ -739,7 +739,8 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(staterr, staterr >> 24, ri); - if (staterr & E1000_RXD_STAT_VP) { + if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && + staterr & E1000_RXD_STAT_VP) { ri->iri_vtag = le16toh(rxd->wb.upper.vlan); ri->iri_flags |= M_VLANTAG; } diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 09a063191107..1338206e5ed0 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -783,19 +783,21 @@ em_set_num_queues(if_ctx_t ctx) return (maxqueues); } -#define LEM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER - -#define EM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO - -#define IGB_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 |\ +#define LEM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_JUMBO_MTU + +#define EM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ + IFCAP_TSO6 + +#define IGB_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ IFCAP_TSO6 /********************************************************************* @@ -899,7 +901,7 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; /* - * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} + * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} * by default as we don't have workarounds for all associated * silicon errata. E. g., with several MACs such as 82573E, * TSO only works at Gigabit speed and otherwise can cause the @@ -914,8 +916,9 @@ em_if_attach_pre(if_ctx_t ctx) * work for a few MACs of this class - at least when sticking * with Gigabit - in which case users may enable TSO manually. */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); - scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO; + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); + scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | + CSUM_IP6_TCP | CSUM_IP6_UDP; /* * We support MSI-X with 82574 only, but indicate to iflib(4) * that it shall give MSI at least a try with other devices. @@ -934,6 +937,19 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP; scctx->isc_txrx = &lem_txrx; scctx->isc_capabilities = LEM_CAPS; + + /* + * For LEM-class devices, don't enable IFCAP {TSO4,VLAN_HWTSO} + * by default as we don't have workarounds for all associated + * silicon errata. TSO4 may work on > 82544 but its status + * is unknown by the authors. Please report any success or failures. + */ + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); + + /* 8254x SDM4.0 page 33 - FDX requirement on these chips */ + if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) + scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); + if (hw->mac.type < e1000_82543) scctx->isc_capabilities &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); /* 82541ER doesn't do HW tagging */ From nobody Fri Aug 4 01:22: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 4RH7HN2BDhzZY0S; Fri, 4 Aug 2023 01:22:24 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher 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 "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH7HM5sdCz4Y5W; Fri, 4 Aug 2023 01:22:23 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3741MHRE043363; Thu, 3 Aug 2023 20:22:17 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1691112137; bh=G2VFzlyhA5RkJWqjfrVzBsePpcWblym1RzwPgIoL9qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N31kAsirYxGIpZgLJFQkKlDPYsXuRyaklq9Jlg5z7gRY7pXuoeQpxJeViMoOp3NnR UYko+beBLI0+h04QBQh0h7a0ld5315wWzSgR+s49sriGCAMosAPzEQ6FKKc1eVa4gk f5PJ0tA2Re5Yw0RspDbYvp2xqNmsMFGUHJUtr5jc++/ttmJ8pvSlaSEsbN4bWUUcy1 VMbJAFpAR1zzDcXG/Kpob+JMjcc3g4J73nNJY0jCWhg6QmQKb4kAon2ZieYuHIhDfp mPlZ+lEvb2rqPMrkLuRNejJ/LJA80FMlnlqv3JTQgwUUoqblG1ZEHSSgx+dAd4t4fU f1EvAbK4flqMw== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id LgK4EslSzGRhqQAAs/W3XQ (envelope-from ); Thu, 03 Aug 2023 20:22:17 -0500 From: Mike Karels To: Doug Moore Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c9b06fa52776 - main - vm_phys_enqueue_contig: handle npages==0 Date: Thu, 03 Aug 2023 20:22:16 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: <870960EF-BC8B-4FD4-A428-BFC789DB39B1@karels.net> In-Reply-To: <202308031421.373ELqS8022332@gitrepo.freebsd.org> References: <202308031421.373ELqS8022332@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 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RH7HM5sdCz4Y5W X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] On 3 Aug 2023, at 9:21, Doug Moore wrote: > The branch main has been updated by dougm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc9b06fa52776fbf555b9397a= 8d28a54c957108ec > > commit c9b06fa52776fbf555b9397a8d28a54c957108ec > Author: Doug Moore > AuthorDate: 2023-08-03 14:19:48 +0000 > Commit: Doug Moore > CommitDate: 2023-08-03 14:19:48 +0000 > > vm_phys_enqueue_contig: handle npages=3D=3D0 > > By letting vm_phys_enqueue_contig handle the case when npages =3D=3D= 0, > the callers can stop checking it, and the compiler can stop > zero-checking with every call to ffs(). Letting vm_phys_enqueue_con= tig > call vm_phys_enqueue_contig for part of its work also saves a few > bytes. > > The amd64 object code shrinks by 128 bytes. > > Reviewed by: kib (previous version) > Tested by: pho > Differential Revision: https://reviews.freebsd.org/D41154 My machine panics like this during startup with this change in place agai= n: real memory =3D 68717379584 (65534 MB) panic: vm_phys_enq_range: page 0xfffffe006cdc8108 and npages 0 are misali= gned cpuid =3D 0 time =3D 1 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff831= 77ac0 vpanic() at vpanic+0x132/frame 0xffffffff83177bf0 panic() at panic+0x43/frame 0xffffffff83177c50 vm_phys_enq_range() at vm_phys_enq_range+0x12d/frame 0xffffffff83177c60 vm_phys_alloc_contig() at vm_phys_alloc_contig+0x557/frame 0xffffffff8317= 7cf0 vm_page_find_contig_domain() at vm_page_find_contig_domain+0xbe/frame 0xf= fffffff83177d60 vm_page_alloc_contig_domain() at vm_page_alloc_contig_domain+0x135/frame = 0xffffffff83177df0 kmem_alloc_contig_pages() at kmem_alloc_contig_pages+0x92/frame 0xfffffff= f83177e80 kmem_alloc_attr_domainset() at kmem_alloc_attr_domainset+0x20d/frame 0xff= ffffff83177f40 vm_ksubmap_init() at vm_ksubmap_init+0x65/frame 0xffffffff83177f80 cpu_startup() at cpu_startup+0x20b/frame 0xffffffff83177fa0 mi_startup() at mi_startup+0x1f1/frame 0xffffffff83177ff0 btext() at btext+0x23 KDB: enter: panic [ thread pid 0 tid 0 ] Stopped at kdb_enter+0x32: movq $0,0xe29533(%rip) db> If I comment out the assert, it boots and runs. Mike From nobody Fri Aug 4 01:23: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 4RH7Jm0b1ZzZXvr; Fri, 4 Aug 2023 01:23: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 4RH7Jm06dDz4YL9; Fri, 4 Aug 2023 01:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrf3bSvWGGMuwpo5dHaYmA4j/18zGQxzDvccdfJGd3M=; b=lGAOWFZZK0FtQRcH62EEFKEp69BAgiQ3AiJCais1GJNC/GaMsOubAj8VTNF0onGsqM5wyp aXB/Oy9SQjjhgQmELj7f8h/Iwt3IM9feAJ3/eSJqUN22STXPof+MTg9UiTqUoQElcyWmoL StQ9aHuHrhzbS/aR0zkgkQ1p62n3AC6r9Bsp840l5CNQ/P2urhN+z70eWXj22VVPXvpryn DYeOHjroBbK1AoPVVe7BxWNNm+9LHxBz7W2KtlFHFSRKETbs/NRJtTw5xmS5lnLp42P+Pv 4I+Xzhed1JTnkVfyxGO++ksrBaCA94HnnBNKVyagnIjLwG0LVASTv/NFJG63uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrf3bSvWGGMuwpo5dHaYmA4j/18zGQxzDvccdfJGd3M=; b=rV3EbSElOcTTgbGYiM6cTy2fughl0Xhe7z2MjQ5WzTTw0SsOY95BRPctdq1FfdKLmQULwD nu6CCA8dpUiSNlh23/4L1xUdu8p4tUpLVzZt68E94W0WMwTjL9duaMzP+VhV6FcPRtTZ+I XAEleQWfz0D79merQSfFfPuz4jEXybSYUvg0gsiDOJD9kS3gCB//0GY9x8ZAaI/l500Tb7 heKJZZ0pl870cg1PkGWU9zZ+XoOjge2FA+3M2XdjrDOFyuI+jFWwwQdweJxBI5herLDHSb DEfm4hcfxvhxR7xE6WH/Kcl1468d3TnEHsSildiaQzzHLx5tnMICdL3ytMBAfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112216; a=rsa-sha256; cv=none; b=ss4mnXRZhTR0e5dDKkXlCQ53nAnTnY38JmzubPy37PMQUPVc+8FZG3eWbQ2TgIj2PUuR45 Nj69d/1jJUMKIwobX5X7PcNG2oo5kJyxL771p3FW4r0eEASCXg11/hTV35ShWJ8IOH2zLN YmvnQcnmBg7XY3IxdjNBUE9smCz5NkaeBQFm8lFYccEMDaEN9Ltv1PttLEfc1QDaRDeJAF Cuu8xlwGfVrRIKgldkkMvjZ8X4Al89+g45yfVPQo9URYktQcVD4fXOQCFVFjcyCdzieCe3 k5Vsy35rewYuWehCIO3A6xxC1Pq2aPkJXCQrYBrvGW0x53gJrp0/uhO10e3lXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Jl5rtZzjtw; Fri, 4 Aug 2023 01:23: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 3741NZaa021217; Fri, 4 Aug 2023 01:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741NZUZ021216; Fri, 4 Aug 2023 01:23:35 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:35 GMT Message-Id: <202308040123.3741NZUZ021216@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: d7dd3b563011 - stable/13 - Revert "e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d7dd3b56301142bf12bdc8149e370c428195a2bc Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d7dd3b56301142bf12bdc8149e370c428195a2bc commit d7dd3b56301142bf12bdc8149e370c428195a2bc Author: Kevin Bowling AuthorDate: 2023-08-04 01:21:00 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:21:00 +0000 Revert "e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes" This reverts commit bd07d5c451995353cbf1d86f97c5264232ea401b. --- sys/dev/e1000/em_txrx.c | 15 +++++++-------- sys/dev/e1000/if_em.c | 48 ++++++++++++++++-------------------------------- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 069a1c00a4b2..47f9b187aa14 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -674,12 +674,12 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); - if (scctx->isc_capenable & IFCAP_RXCSUM) + /* XXX add a faster way to look this up */ + if (sc->hw.mac.type >= e1000_82543) em_receive_checksum(status, errors, ri); - if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && - status & E1000_RXD_STAT_VP) { - ri->iri_vtag = le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); + if (status & E1000_RXD_STAT_VP) { + ri->iri_vtag = le16toh(rxd->special); ri->iri_flags |= M_VLANTAG; } @@ -699,11 +699,11 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) uint16_t len; uint32_t pkt_info; - uint32_t staterr; + uint32_t staterr = 0; bool eop; int i, cidx; - staterr = i = 0; + i = 0; cidx = ri->iri_cidx; do { @@ -739,8 +739,7 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(staterr, staterr >> 24, ri); - if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && - staterr & E1000_RXD_STAT_VP) { + if (staterr & E1000_RXD_STAT_VP) { ri->iri_vtag = le16toh(rxd->wb.upper.vlan); ri->iri_flags |= M_VLANTAG; } diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1338206e5ed0..09a063191107 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -783,21 +783,19 @@ em_set_num_queues(if_ctx_t ctx) return (maxqueues); } -#define LEM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_JUMBO_MTU - -#define EM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ - IFCAP_TSO6 - -#define IGB_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ +#define LEM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER + +#define EM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO + +#define IGB_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 |\ IFCAP_TSO6 /********************************************************************* @@ -901,7 +899,7 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; /* - * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} + * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} * by default as we don't have workarounds for all associated * silicon errata. E. g., with several MACs such as 82573E, * TSO only works at Gigabit speed and otherwise can cause the @@ -916,9 +914,8 @@ em_if_attach_pre(if_ctx_t ctx) * work for a few MACs of this class - at least when sticking * with Gigabit - in which case users may enable TSO manually. */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); - scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | - CSUM_IP6_TCP | CSUM_IP6_UDP; + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); + scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO; /* * We support MSI-X with 82574 only, but indicate to iflib(4) * that it shall give MSI at least a try with other devices. @@ -937,19 +934,6 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP; scctx->isc_txrx = &lem_txrx; scctx->isc_capabilities = LEM_CAPS; - - /* - * For LEM-class devices, don't enable IFCAP {TSO4,VLAN_HWTSO} - * by default as we don't have workarounds for all associated - * silicon errata. TSO4 may work on > 82544 but its status - * is unknown by the authors. Please report any success or failures. - */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); - - /* 8254x SDM4.0 page 33 - FDX requirement on these chips */ - if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) - scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); - if (hw->mac.type < e1000_82543) scctx->isc_capabilities &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); /* 82541ER doesn't do HW tagging */ From nobody Fri Aug 4 01:23: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 4RH7Jn1X6gzZXt1; Fri, 4 Aug 2023 01:23: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 4RH7Jn0XMYz4Yqv; Fri, 4 Aug 2023 01:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xbRTR4KCWmc6KWeQymjj3xHyEa12MyHAa5V/GqmOjk=; b=kjlFhj8hkS9qhGLEJiC8pIde5eNAOUEjgNjy99gJ/TYyJGF9S16b5JBFZCiKBppMsTy14h 39DTEv/Zg+JEAYR84KzXPOZm6y12JV/LdqtqAsF4uHGYdjud4Z5yQxWzSCgsL/qHVy4+GB JRuvfbkKzBiRqKbGa1zH78F6f9EsWTDeGe0oWzeEM0AS1Zt62cfERuUrY7c2X6bCdJqYYP rO2F7VmKUIglY9dViyfxYwCMus/bsNgVFcugDyHEs9xTjoL46GPi8Xg2X4oHmypkL8j06I sZGDRj9Assan4/zvkINTj3CglJjVqXt8nqnPBu9n3IK99RUkmpVeEUMCwurJ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xbRTR4KCWmc6KWeQymjj3xHyEa12MyHAa5V/GqmOjk=; b=v8h97kSeAadoIu914GWByPrYZq7lV8yBGMmlrn7viCbq7/s8b8Vqg2jQrbNg7YyrFvB6Fo hOY//rjIqW8N/zjnL+usFXZhrna4mCkSb+awgZIaLS40TpTJG3GwPM5RyhcmxXZFw7+C2e Nv/BCstzA2nsVLie1GPm9ZLxhTa0oJRwCmTh60969jIShwI6yPz6JN2tRbzucC0chmazSr +VcdMN6hD53djs7So3jEC6kHP/2FgOoGrV3rLbI8pYWfVm1B4/kW5/bOBxSl+A9jMVEDcP igFIIT/W/6K81gcr7p0TBFbZpON+GkN3/LseGkbV9b749Hy2CTCUpOcoqcu4zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112217; a=rsa-sha256; cv=none; b=GwtNq4rJ5NpkLh4WT6EkHBAmRuRHKg2OnHbder10nbZgPs/ammcxjyF02ud200IxACIhgT JRVV7TN2nPkPs/SLz+m83K9gk7m3c1hSQJDgSX2JaXzDcL9CTHKGp1CULNBfIuXnVntJmg khASS+NZ+qjBllwcVrkrx9BooBohsmEfI6DuXjwWh77mpxSRO/RmyKIXLEUr9xCAo0bthR 1ZNqJJ+Qe4ECtXKeNtqCmTh1vcLCUQzy0WZvqVOW2AZbq7e0H+2ssu0j+gsZh+bnNzp3iz q+5UOoBQggGFtb5Uf1e80ktR1vNlcAmd+nkivhgbnM1FtAE3Z3Gf0viV4grCjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Jm6d92zkQF; Fri, 4 Aug 2023 01:23: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 3741Nagm021244; Fri, 4 Aug 2023 01:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741NaGP021243; Fri, 4 Aug 2023 01:23:36 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:36 GMT Message-Id: <202308040123.3741NaGP021243@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: d483953e9975 - stable/13 - e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d483953e99753ac951c5d56e007ee09b8a3afdd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d483953e99753ac951c5d56e007ee09b8a3afdd2 commit d483953e99753ac951c5d56e007ee09b8a3afdd2 Author: Kevin Bowling AuthorDate: 2023-07-22 18:33:27 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:21:23 +0000 e1000: lem(4)/em(4) ifcaps, TSO and hwcsum fixes * em(4) obey administrative ifcaps for using hwcsum offload * em(4) obey administrative ifcaps for hw vlan receive tagging * em(4) add additional TSO6 ifcap, but disabled by default as is TSO4 * lem(4) obey administrative ifcaps for using hwcsum offload * lem(4) add support for hw vlan receive tagging * lem(4) Add ifcaps for TSO offload experimentation, but disabled by default due to errata and possibly missing txrx code. * lem(4) disable HWCSUM ifcaps by default on 82547 due to errata around full duplex links. It may still be administratively enabled. Reviewed by: markj (previous version) Differential Revision: https://reviews.freebsd.org/D30072 (cherry picked from commit 918c25677d882a901696672bd4d39b62faa56dfa) --- sys/dev/e1000/em_txrx.c | 15 +++++++------ sys/dev/e1000/if_em.c | 57 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 47f9b187aa14..069a1c00a4b2 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -674,12 +674,12 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); - /* XXX add a faster way to look this up */ - if (sc->hw.mac.type >= e1000_82543) + if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(status, errors, ri); - if (status & E1000_RXD_STAT_VP) { - ri->iri_vtag = le16toh(rxd->special); + if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && + status & E1000_RXD_STAT_VP) { + ri->iri_vtag = le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); ri->iri_flags |= M_VLANTAG; } @@ -699,11 +699,11 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) uint16_t len; uint32_t pkt_info; - uint32_t staterr = 0; + uint32_t staterr; bool eop; int i, cidx; - i = 0; + staterr = i = 0; cidx = ri->iri_cidx; do { @@ -739,7 +739,8 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(staterr, staterr >> 24, ri); - if (staterr & E1000_RXD_STAT_VP) { + if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && + staterr & E1000_RXD_STAT_VP) { ri->iri_vtag = le16toh(rxd->wb.upper.vlan); ri->iri_flags |= M_VLANTAG; } diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 09a063191107..6e8970ccf6f6 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -783,19 +783,22 @@ em_set_num_queues(if_ctx_t ctx) return (maxqueues); } -#define LEM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER - -#define EM_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO - -#define IGB_CAPS \ - IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ - IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 |\ +#define LEM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO| IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ + IFCAP_TSO6 + +#define EM_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ + IFCAP_TSO6 + +#define IGB_CAPS \ + IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ + IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ IFCAP_TSO6 /********************************************************************* @@ -899,7 +902,7 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; /* - * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} + * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} * by default as we don't have workarounds for all associated * silicon errata. E. g., with several MACs such as 82573E, * TSO only works at Gigabit speed and otherwise can cause the @@ -914,8 +917,9 @@ em_if_attach_pre(if_ctx_t ctx) * work for a few MACs of this class - at least when sticking * with Gigabit - in which case users may enable TSO manually. */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); - scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO; + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); + scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | + CSUM_IP6_TCP | CSUM_IP6_UDP; /* * We support MSI-X with 82574 only, but indicate to iflib(4) * that it shall give MSI at least a try with other devices. @@ -931,9 +935,25 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_rxqsizes[0] = roundup2((scctx->isc_nrxd[0] + 1) * sizeof(struct e1000_rx_desc), EM_DBA_ALIGN); scctx->isc_txd_size[0] = sizeof(struct e1000_tx_desc); scctx->isc_rxd_size[0] = sizeof(struct e1000_rx_desc); - scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP; scctx->isc_txrx = &lem_txrx; - scctx->isc_capabilities = LEM_CAPS; + scctx->isc_tx_tso_segments_max = EM_MAX_SCATTER; + scctx->isc_tx_tso_size_max = EM_TSO_SIZE; + scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; + scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; + /* + * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} + * by default as we don't have workarounds for all associated + * silicon errata. TSO4 may work on > 82544 but its status + * is unknown by the authors. Please report any success or failures. + */ + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); + scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | + CSUM_IP6_TCP | CSUM_IP6_UDP; + + /* 8254x SDM4.0 page 33 - FDX requirement on these chips */ + if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) + scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); + if (hw->mac.type < e1000_82543) scctx->isc_capabilities &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); /* 82541ER doesn't do HW tagging */ @@ -941,7 +961,6 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_capabilities &= ~IFCAP_VLAN_HWTAGGING; /* INTx only */ scctx->isc_msix_bar = 0; - scctx->isc_capenable = scctx->isc_capabilities; } /* Setup PCI resources */ From nobody Fri Aug 4 01:23: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 4RH7Jp3RFGzZXnf; Fri, 4 Aug 2023 01:23: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 4RH7Jp255Cz4Ygn; Fri, 4 Aug 2023 01:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIwdQddtL+EfFuoCkByeTi/+PM3WECB1MWJmzSJXy/E=; b=I8DxG+VbKTVNkbTUAFGB/s5c0TKHevHHtQQohuMlbpyaqiBBOQ4FedAb7NPl/egM2Z5wUQ HXMUt9vMye+h5CBXdeodj59spMZYhXMy2VogrbXSyVdgfpw8De0LCew8Wz9YRMRLg7GJC5 7V3xW+CiqxfJtL7XyNWkFfL45AjZCWZS5t2NLoE+/JzbqyR+cMpTmHOvScTdRwQ6xPz7c6 lWNvBMmjYMX40jhZvG5hS9SSY4XuVr0PvtVlEiRpl0Woc86Nz7pwf1dlZbUIOjL8EwzjAg 2kQao1+np0Cdkd/U4tcVLEGmWnYdORgt4Y18MA4Hor6jyJs3hxZ+00wNTEjB2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIwdQddtL+EfFuoCkByeTi/+PM3WECB1MWJmzSJXy/E=; b=GFWiVZcz9sqJLmvNFQ0IcUYlfoh9XE2ApcujZCNPBc0cI3JK3bkJLz1UglBWVInOdWi9Rn /pWOzcjIp2yWDNWm0K5JF7TgKgWfJPX5AU9ahWMKDDw2JApz2DB8lD81RfTF2PCjjorpxE mlXA88oNYsoKRj1FYFMP+XRXETh2CvwuZBNK4h7HS1iEwEjiF7xcVYX/+Avr4CoyJwUZTU Peg3enZd/7sLv6iPFWjcS2EFYoMag+eeAyNDRioUpWr+3Z7HY1f0E49uTYodo1wa+zhO/i NU2DgkZra5i0ieJJ7vHkEHGXImVsCOQt0YpB3Cr0Osd02N9z6RR4zg3EhXKjsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112218; a=rsa-sha256; cv=none; b=cZ/O/miG7mtKW5ireKOOdiKSCo9CnXeAR6nGnLNJLr0jnEB1w1NKAtK9eAq4LDCacaDuNV 1be6LxQxqSqlwmYcEfDOap5nGG533l0HpPkfx3nSRsaHaR/c+5hfCWFm4+3l2vDyNU/ahl nuO/XNBuj8Ynqx1j0I2DnYLRZQ775VAFml1B5Y/EC5shU2nWdrKNkd/JPMPjpigWpsiKLo v4Dus7tTOqIzbNPBv9/JdRRzXoRYRQxeriAq3ADQDcRY/TwuZW6PwoYUqPdlseLy3bLyWv EwkxnmMtKpkk1HLZAD2vsy7Rp3oQe1qftRNW2O3nxVNBv8HzLE1UAJaGURsuVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Jp0Py5zkQ7; Fri, 4 Aug 2023 01:23: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 3741NbNa021263; Fri, 4 Aug 2023 01:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741NbZC021262; Fri, 4 Aug 2023 01:23:37 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:37 GMT Message-Id: <202308040123.3741NbZC021262@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: 17b587e0ba8e - stable/13 - e1000: Fix/enable IPv6 transmit checksum offload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 17b587e0ba8ed4d1092537232b969b755b7a92f1 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=17b587e0ba8ed4d1092537232b969b755b7a92f1 commit 17b587e0ba8ed4d1092537232b969b755b7a92f1 Author: Kevin Bowling AuthorDate: 2023-07-22 22:58:34 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:21:41 +0000 e1000: Fix/enable IPv6 transmit checksum offload Fixes and enables txcsum6 offload for lem(4) and em(4). MFC after: 2 weeks (cherry picked from commit 4f9a44a215f873c6842a693f2e81e0abbe1531cf) --- sys/dev/e1000/em_txrx.c | 4 ++-- sys/dev/e1000/if_em.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 069a1c00a4b2..1192286d1c9c 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -285,13 +285,13 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, cmd |= E1000_TXD_CMD_IP; } - if (csum_flags & (CSUM_TCP|CSUM_UDP)) { + if (csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_IP6_TCP | CSUM_IP6_UDP)) { uint8_t tucso; *txd_upper |= E1000_TXD_POPTS_TXSM << 8; *txd_lower = E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D; - if (csum_flags & CSUM_TCP) { + if (csum_flags & CSUM_TCP | CSUM_IP6_TCP) { tucso = hdr_len + offsetof(struct tcphdr, th_sum); cmd |= E1000_TXD_CMD_TCP; } else diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index a46ce2fdb6ae..8c5abf5b48cb 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -333,10 +333,13 @@ #define EM_TSO_SIZE 65535 #define EM_TSO_SEG_SIZE 4096 /* Max dma segment size */ #define ETH_ZLEN 60 -#define EM_CSUM_OFFLOAD (CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP) /* Offload bits in mbuf flag */ + +/* Offload bits in mbuf flag */ +#define EM_CSUM_OFFLOAD (CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP | \ + CSUM_IP6_UDP | CSUM_IP6_TCP) #define IGB_CSUM_OFFLOAD (CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP | \ CSUM_IP_SCTP | CSUM_IP6_UDP | CSUM_IP6_TCP | \ - CSUM_IP6_SCTP) /* Offload bits in mbuf flag */ + CSUM_IP6_SCTP) #define IGB_PKTTYPE_MASK 0x0000FFF0 #define IGB_DMCTLX_DCFLUSH_DIS 0x80000000 /* Disable DMA Coalesce Flush */ From nobody Fri Aug 4 01:23: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 4RH7Jq2l7MzZXhm; Fri, 4 Aug 2023 01:23: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 4RH7Jq28Mfz4Yps; Fri, 4 Aug 2023 01:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PosSMUJWPFTCIRMWgzpWST1jZF5vmpcoDyZaVu2Za4w=; b=pkWFXgD+XK8QTyAWIL9XjI9UwnSh2Nc6B1gc0YZ5CRKQwlk1+KOuo8IH53OJYIGfyJCX79 UElUBm2GQZg2zU9k9Ky/B1MXTHN5X8u8kr1DXMK9NyX1g0eJDIg7XhJ1BLv5MfZtlx7lN5 ivULWmi6G1TW5SQWk13Rqb9e2wXPsKuuXBdzQZi9V2D2BVNUuRR92F4wX0qZ0AH8tnLLIb q/ROg6OTdBnw8CcANUqr8Q0ZJnwae8wKb11x1Kr/YAaPSZPbo/b7Odj3fGYKhjR008LUIf +XUeCOELWpcYLp6z7Gz8EC0WSTpaBRpMkxJNAiRr+cZ3ryOt46yDBRlNo5BEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PosSMUJWPFTCIRMWgzpWST1jZF5vmpcoDyZaVu2Za4w=; b=vsFsmHO3L1/xH8mOPqnxuVIq7r1ZobzvOvJpqNFGxGI9TPAZh/QcUQLRh9Z2562pg08omB VNMsbNmfxFxMIqn0u0O04Dg2uj4+BSLVSjGwWTcW1s6BEhIoVntGIhEhHLmKuuvoEzfAy3 /VoZ3mJUa6ujQQiYZ8Q5H4GD7YTcqp1GRiJRQCKq1cqL7QdctVz5EIRur+GVfClrUUz+Zj Thhq1s+8nBwVEfUiOd3BHHMPI4yh8DlfxVxGhdUyYyD1l+67VW4O+jKdPskhP2DXF1LNKf CMulAU2m6eRxlDnbvGojUYMLNVbHP/SoN8mYAUWL9lJslJB53GF8bM1pl/6S9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112219; a=rsa-sha256; cv=none; b=KFDlnvvUmq/iNo/Hzji+g8YvzugWz8mYHHXv4DK4DMLPZwaoOKhfIY1KbAeFT1aV/F2AaH UZTUxAjhTrDYR4bNDxlwuo+w1ewlVcozMZObAYn8ByctYCCbrGjk7/oarBuinvtwWN77Ln 0otIQvbiEOb+b55nSNeNTIvf//VYZyZuC6efgom9qy799smVE4DdaFi6qQzesKgkVqBCdk 8o4+QH8w4dBF0ldcH3FrvQCdVWGYHzWde99sojWnH9u4jMuxnQDExTxgJ5w4oGHGEQg9QV JxDRAPF261DIEzEnkF1WrW8k3mpDXHGPnf5lAkzM8xurU+LRmgoiI4Q7eRfBeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Jq16pdzkSf; Fri, 4 Aug 2023 01:23: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 3741Ndi3021283; Fri, 4 Aug 2023 01:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741NdUv021282; Fri, 4 Aug 2023 01:23:39 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:39 GMT Message-Id: <202308040123.3741NdUv021282@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: 41e440c38147 - stable/13 - e1000: add missing parens in csum setup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 41e440c38147dc37188b49cfdb051c33f056e6eb Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=41e440c38147dc37188b49cfdb051c33f056e6eb commit 41e440c38147dc37188b49cfdb051c33f056e6eb Author: Kevin Bowling AuthorDate: 2023-07-23 00:03:26 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:22:14 +0000 e1000: add missing parens in csum setup Reported by: rscheff Fixes: 4f9a44a215f8 e1000: Fix/enable IPv6 transmit checksum offload (cherry picked from commit 92fd2f39e5b1fd588fdc49a07d626273eb8f7539) --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 1192286d1c9c..8b1d2817490f 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -291,7 +291,7 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, *txd_upper |= E1000_TXD_POPTS_TXSM << 8; *txd_lower = E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D; - if (csum_flags & CSUM_TCP | CSUM_IP6_TCP) { + if (csum_flags & (CSUM_TCP | CSUM_IP6_TCP)) { tucso = hdr_len + offsetof(struct tcphdr, th_sum); cmd |= E1000_TXD_CMD_TCP; } else From nobody Fri Aug 4 01:23: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 4RH7Jr4NlQzZY5f; Fri, 4 Aug 2023 01:23: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 4RH7Jr34Vqz4Z15; Fri, 4 Aug 2023 01:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KK/eHNCU1A6aBWfqNtblmRY2U3DLpw00BnRg0Imx0U=; b=tmKOgMpyew5prnMmuegS3tiK+CvQPwf8QveyJiTgN/sQbwuDJsvOx27VKsuSZYRY1GH++e QeNHoS9euvgdhMn0pzNZrKNwU6jDDYsdAEie49sbxDTqK87XtqDWgJNEMyjlGF+7AJNUM1 n7Ics9LiRMq9L1Z/oxB3t/UmcmYOGlmoINUoxAvp3b/AyfwvJ2uY576XLDF83xowt3bk3R YHnYQCPGxE1nP9Nd7oGhFi+fbIA7HAEjSHz3gV2sAyuF1O1ICEgUTgzUznvPj1gz9FkrYV be3JxwdNjtFTvsZ98/x7h3C+87SOaCmu1cQt1QQ1gNZ1atR7geRLjz00LfTU2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KK/eHNCU1A6aBWfqNtblmRY2U3DLpw00BnRg0Imx0U=; b=CnGjg2FAEGRQ/ZyXMohrcxCTNcpMPHlF3DcV3S7q52CLwj73NiFf45vsOH5BhGY3qOPxX0 Fu+6bM1k6aUpOkEWKrXh2DhlWcFIxcCKya++cbpMdLacKDCfNP8r23Bhb5tODDsNl9op2Z Xuec5SMaaGAuMW44nwTun1BTX0CcjsufAOZB652NGZSB6Y5TqYNcgszmR1tMmKiCxTxxpc XksomiWEzxirXcHgJ0c9i0YTrNm3UD7uOsi1ta0dgvyke2Tnpa30/dVdEofmI2TslbVHLX wWBlVkbxTpLbn7vc2qQu9maap82iAa/VhWzw6U2QAtDh5UYcDAEtPqrhIfKptA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112220; a=rsa-sha256; cv=none; b=SPUZs7IsGtdilTTD30IosihVxqFnMAOZr+kZ4lUkn9y1nij9u3mjtTHpYGt+S1+xrsWk6c opodu1iG9RdbyPw7KQ5dnp06GlzxEImWnKqv7yY/PqCh4xeRS95pf6dZz5vLQuBoBUhVC/ SmYIM9Pvwwnv4A4+8If2i6MszXdBZeyZ8Byguux4NINCFCThDMkAVnAsWgyY3uN6eZcdRR PexPkVz6hOXY8UakJWGkd9hTU4tZe8APcaaNQDnAnkwDzD9fgJB7L58gIB1jFOOOF9BW91 dgxFisKM0eDfwyAOw1VFZxfWjWNbMaWxDgWX1BZSjYqdw0i6dUFdlOVHUNBnWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Jr257zzkDL; Fri, 4 Aug 2023 01:23: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 3741Ne3X021303; Fri, 4 Aug 2023 01:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741Neup021302; Fri, 4 Aug 2023 01:23:40 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:40 GMT Message-Id: <202308040123.3741Neup021302@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: b71d11ba9476 - stable/13 - e1000: Corrections for lem(4)/em(4) txcsum offload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b71d11ba9476cd1c4e001f465a519a94caeef4fa Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b71d11ba9476cd1c4e001f465a519a94caeef4fa commit b71d11ba9476cd1c4e001f465a519a94caeef4fa Author: Kevin Bowling AuthorDate: 2023-07-27 22:50:32 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:22:34 +0000 e1000: Corrections for lem(4)/em(4) txcsum offload Explicitly set ipcss/ipcse/ipcso for IPv6 per intel SDM as indicated in inline comments. Fix and consolidate 82543/82547 hwcsum exemption. While here rearrange and expand some commentary. (cherry picked from commit cbcab907f8ad1a4ac38dbc574c747ac2901faa54) --- sys/dev/e1000/em_txrx.c | 37 +++++++++++++++++++++++-------------- sys/dev/e1000/if_em.c | 11 ++++------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 8b1d2817490f..0e433f388ac5 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -186,7 +186,7 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, TXD->tcp_seg_setup.fields.hdr_len = hdr_len; /* - * 8254x SDM4.0 page 45, and PCIe GbE SDM2.5 page 63 + * "PCI/PCI-X SDM 4.0" page 45, and "PCIe GbE SDM 2.5" page 63 * - Set up basic TUCMDs * - Enable IP bit on 82544 * - For others IP bit on indicates IPv4, while off indicates IPv6 @@ -212,10 +212,6 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, return (cur); } -#define TSO_WORKAROUND 4 -#define DONT_FORCE_CTX 1 - - /********************************************************************* * The offload context is protocol specific (TCP/UDP) and thus * only needs to be set when the protocol changes. The occasion @@ -232,6 +228,7 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, * in turn greatly slow down performance to send small sized * frames. **********************************************************************/ +#define DONT_FORCE_CTX 1 static int em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, @@ -271,20 +268,30 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, } TXD = (struct e1000_context_desc *)&txr->tx_base[cur]; + /* + * ipcss - Start offset for header checksum calculation. + * ipcse - End offset for header checksum calculation. + * ipcso - Offset of place to put the checksum. + * + * We set ipcsX values regardless of IP version to work around HW issues + * and ipcse must be 0 for IPv6 per "PCIe GbE SDM 2.5" page 61. + * IXSM controls whether it's inserted. + */ + TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; + TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + + offsetof(struct ip, ip_sum); if (csum_flags & CSUM_IP) { *txd_upper |= E1000_TXD_POPTS_IXSM << 8; - /* - * Start offset for header checksum calculation. - * End offset for header checksum calculation. - * Offset of place to put the checksum. - */ - TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len); - TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + - offsetof(struct ip, ip_sum); cmd |= E1000_TXD_CMD_IP; - } + } else if (csum_flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) + TXD->lower_setup.ip_fields.ipcse = htole16(0); + /* + * tucss - Start offset for payload checksum calculation. + * tucse - End offset for payload checksum calculation. + * tucso - Offset of place to put the checksum. + */ if (csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_IP6_TCP | CSUM_IP6_UDP)) { uint8_t tucso; @@ -320,6 +327,8 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, return (cur); } +#define TSO_WORKAROUND 4 /* TSO sentinel descriptor */ + static int em_isc_txd_encap(void *arg, if_pkt_info_t pi) { diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 6e8970ccf6f6..6ceab6be2b8a 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -950,15 +950,13 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; - /* 8254x SDM4.0 page 33 - FDX requirement on these chips */ - if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) + /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ + if (hw->mac.type < e1000_82543 || hw->mac.type == e1000_82547 || + hw->mac.type == e1000_82547_rev_2) scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); - - if (hw->mac.type < e1000_82543) - scctx->isc_capabilities &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); /* 82541ER doesn't do HW tagging */ if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) - scctx->isc_capabilities &= ~IFCAP_VLAN_HWTAGGING; + scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING; /* INTx only */ scctx->isc_msix_bar = 0; } @@ -1354,7 +1352,6 @@ em_if_init(if_ctx_t ctx) E1000_RAR_ENTRIES - 1); } - /* Initialize the hardware */ em_reset(ctx); em_if_update_admin_status(ctx); From nobody Fri Aug 4 01:23: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 4RH7Js4zgfzZXtk; Fri, 4 Aug 2023 01:23: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 4RH7Js3xwPz4Yvm; Fri, 4 Aug 2023 01:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m3AbihwkdHSieusktWlNE0qD8XoQkZLPLJJ6W55Jp4k=; b=pPKbb5NfFhGXATpgehzS2kyN87B+LlHbTbTsmAYNni6BWZT8hqhMcuZal95dPVRuP3aYdV HhYOxISQo9oMzEjwc7W9nyG0lSVZo4vXDqxWs30GD7A+5g4ZZI1Bqdr78mTKCQANyAQipY sjczJ3YtPAOCGdEQrdOWMgJq5A7qDmV3P6bZdDbiBp2W8nV3YX3avn35TWeVGhLdQiU8Md 4zTyVF4/fLPCrPnonb78BxsbntxvfSzgPfRHeVyzR4eg8EcsMZX9gKaq1Kh9no+Ld7SRnW COX02DAODDgt0ihJWxxciol1LvNRK7F8nUqCMbTXH8sjQzdj+yfj5xc0n0+4Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m3AbihwkdHSieusktWlNE0qD8XoQkZLPLJJ6W55Jp4k=; b=EEinCziGhB4r9crW6+Xow5YhEer6AWom9Nzctgjcv+XKAmOWNCANO9F8HGrwFjK5JvHHGn LWVtkxW8fOWtBlQUH1DTIUz7XeX+/SdxUfG27CmblbL/xcehiufMPzqSr4nCaztnYprCR/ pxCLNGT/+5Le0sKbKXpKy3ixoB5FNpzpwVZZhG3m+e9Btz3Iqu5zAtH2raOnhNcQ9EQzDG LAtEw3ufBEFgdexv+V1owuQ3eywBQe/cikeiQF0T4+mPG579lE48dSfgEXqK8nuRjGMhiM niu3ICPQC8A+M1Jfap9HqotQdnfCfklOpxBAn57U1Mr2uS2fcCE7/ZjFDHZ8og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112221; a=rsa-sha256; cv=none; b=vUJkUlRpKGj8dEJbGmzUxPClUB4abP5GEFTYPQhnKksl9UJg4x5ckKeAK/tVL1RdcUPgcy AzEq8Rn4W/mg/KsAkafztpEiMvEuf0XZpdkKEdxnllhlBhBOb77hM5VU0ZyINhW3gRJRXl +bAwp82Is9Ja8R8IEDXalTwMHgxpNTCveMnFgfmwrGBeWwqm6anj4XiCap6BmheDFM8vj+ +ed4rz9VGq4009rJA1mQX8BkQXwZU8T6z9sHGo3NdpuQUZXo1T24YT52XrbJbrKnbKKsWV l1qTkS0yBpxv5rCNHcVy8Xb8rpLgXOLgFLCYvFvJta1cgO6zUyNR9rSBwCp4Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH7Js2scmzjxp; Fri, 4 Aug 2023 01:23: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 3741Nfql021323; Fri, 4 Aug 2023 01:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741Nf9a021322; Fri, 4 Aug 2023 01:23:41 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:41 GMT Message-Id: <202308040123.3741Nf9a021322@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: a24e9d851227 - stable/13 - e1000: HWCSUM excemption fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a24e9d851227bd7e403befa77392e963859451bb Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a24e9d851227bd7e403befa77392e963859451bb commit a24e9d851227bd7e403befa77392e963859451bb Author: Kevin Bowling AuthorDate: 2023-07-29 01:14:29 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:22:59 +0000 e1000: HWCSUM excemption fixes Also disable IPV6 checksum offload. Spell hw->mac.type < e1000_82543 as e1000_82542. Confusingly, chips like 82540 and 82541 come later and do not have these issues. There is no functional change here, as the enum was defined in such a way it worked correctly. But this reads literally. (cherry picked from commit 38588749af45d738e6f548f15beb415c46ba8658) --- sys/dev/e1000/if_em.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 6ceab6be2b8a..ad1780e03fc5 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -951,9 +951,10 @@ em_if_attach_pre(if_ctx_t ctx) CSUM_IP6_TCP | CSUM_IP6_UDP; /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ - if (hw->mac.type < e1000_82543 || hw->mac.type == e1000_82547 || + if (hw->mac.type == e1000_82542 || hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) - scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); + scctx->isc_capenable &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | + IFCAP_HWCSUM_IPV6); /* 82541ER doesn't do HW tagging */ if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING; From nobody Fri Aug 4 06:02: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 4RHFVf5tTFz4gctj; Fri, 4 Aug 2023 06:02: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 4RHFVf5PDNz3THv; Fri, 4 Aug 2023 06:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691128954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4BqJStWGySR4MvvdTgNEA47+iMeewhHfSKJmHsit/nw=; b=KGK4sRT5R0XWNeT3ZuOx4iB1W32V/e+PMQ2sF77mFU0LMJSmD8O0jxt4HkyLLbOnv2QFjT mcqUnTVdtP3jCGDkqrg5fAwyhMSnH1JguVUWgTB1UvLlLpD6caIP19jUaRdZVWx04UXW4w 4naml+xHWdCorFJfxF7bwoz8GBTHh+QXocqzbWaYH+b4zKTrL8dU1EG/IYrBs80LlLEYS8 XS+ZgH9d4bD8MBLmxKLHA/6nPHO/A6RNG1tjpkBbH8LAFptUBBEytLudspTpnGNRsXBhEv 6FHCSLOBc8Ei/O8kolCD+YH8cwn/jJnxxgAZO1a4HLKg8ZVGfqKYEDnpmXMbdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691128954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4BqJStWGySR4MvvdTgNEA47+iMeewhHfSKJmHsit/nw=; b=Jet3YymYmsWQQ+hLmzDGYy982QPFqMcVd8S19OPjbVmwKhgz3kSVVWQCXZ7QOw2VXcKn2s 3H2fsJglIF+jszX6ZLplLLmEeomOhty60Xg0iilwZIwDKAK0b6m7jbiDt91st0xUqXKd+/ Nj7Y6pr6VHei4G572bjfZOG87RppapZLr97wKJDtmYAHk5arnEbsmY44oz77zunk5fGPie OnjeDQbLMsX4GPJGgcFRun2D6xX4sqz7kcM0TIo1W0lzW9edxHqkmjC8OX6dIORwKZd3pw ktZlGHUuVNceTDIc8H1OpUe23NbRWsaHtyN1r2WzNH3AR2C50+BNws3LBmN08g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691128954; a=rsa-sha256; cv=none; b=IQvnSpR1/T1/vKvYTzlcu9XX5AAarr3uh8Dlx809RjpULKdzVCYXJ8wd4axanUtUS3tiV9 DKk6iJXaP/RiN70xEyI8B9fWdzs5l5Af3wP6jVXDbEYJwN1INlFGrCxAS4nlc0GscOsVej 59iYfIQOmnPz8mVAn+0QosoA5f1e3wxoMG6kXdkdrbqSc9ed9iXNkZ3hFDBc4MKJDZs1lG A3L8Woe2dnbPH6LE8FyCK1MUwS6FJsKGZSCEZdLsvLwXNnnR4rXME+8dnktudugBzjg2Ev wJQT6DdjONip8Z17nD7PSxQNBY9VLAIHndWGdJDYtxa17ISQHke321R8SbbsLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHFVf4S6Rzrbl; Fri, 4 Aug 2023 06:02: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 37462YqF087400; Fri, 4 Aug 2023 06:02:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37462Y5Z087399; Fri, 4 Aug 2023 06:02:34 GMT (envelope-from git) Date: Fri, 4 Aug 2023 06:02:34 GMT Message-Id: <202308040602.37462Y5Z087399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b26e36c34e7c - stable/13 - sk(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b26e36c34e7c75e37c7640200d1290041f7722bd Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b26e36c34e7c75e37c7640200d1290041f7722bd commit b26e36c34e7c75e37c7640200d1290041f7722bd Author: Gordon Bergling AuthorDate: 2023-08-01 05:50:45 +0000 Commit: Gordon Bergling CommitDate: 2023-08-04 06:02:26 +0000 sk(4): Fix a typo in a source code comment - s/nomral/normal/ (cherry picked from commit 135c2b71562f6a6b8e918cc66d5468342c198d02) --- sys/dev/sk/if_sk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 9a0dc1eab81f..346878e49108 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -2576,7 +2576,7 @@ skc_resume(device_t dev) * to get correct checksum value but couldn't get correct one. So TCP/UDP * checksum offload was disabled at the moment and only IP checksum offload * was enabled. - * As nomral IP header size is 20 bytes I can't expect it would give an + * As normal IP header size is 20 bytes I can't expect it would give an * increase in throughput. However it seems it doesn't hurt performance in * my testing. If there is a more detailed information for checksum secret * of the hardware in question please contact yongari@FreeBSD.org to add From nobody Fri Aug 4 06:02:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHFVy2sVSz4gclN; Fri, 4 Aug 2023 06:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHFVy1hm5z3T7R; Fri, 4 Aug 2023 06:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691128970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhTpLr0bpHpAjv+TKluXuxUIe/s7R9VcoMEh9Ay1Nac=; b=p+B+sooqryz6jKNpDr6di9Vv3ilunUrXUvye4ybMqDGBIxQIYU7T8kxhAa+6YuicwdNf2c LZFjTF5y8XbKtyrNvshk/gS08VRxcqY6indoap6yh9Ryz6ydJ6e5ByCDK13f6Lxruts63q 6+zi6fHM5N/lbsV9xVaP9HnVJis8+JbjxpedF9Mw/x2LWdbAnkRU6EbReLucoCDar2tQVM NCdFaTBZi2rcHH7ke55kYTwkha47UX3trE3Ys5xPcxikqs0LtTuxwJwufvUq5U/T7wlhY8 +ckKbZM39+7wdkj5io7e/rK0rjXB/2FaqheIT1rPlalf9CSzf6bGeNzkG09muw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691128970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhTpLr0bpHpAjv+TKluXuxUIe/s7R9VcoMEh9Ay1Nac=; b=sTUpWR7SbEHiwwKh8NVzL8Mq4JOFEUm6Bu9G3cyCyYhvtyb7x/t0oiy1BkhL8NKLD2vaL/ baCJyne2M2eonFvk9uZS3sb6eDMGVSurNNI64E7QtqLPWScmPINxzkF9Xn2/I2n/Hs5xWV azbj2cy0CGrUolyU3d22nuu4nwbyCVpOZjZELJM0sRlXKLIHFx2s+CjllRjUPfY26ltLmV g04FjSxGnPoelS5N/Yo6OOlNsxWmOIBF5pL/LawKEYElLpa0vcZz6ZU+2+U/motyZYFIWU QNtHi70dj4EIsupbBhNZMKEHIaB7rpf+mQu6P42OsuQAOrLAjeHmh2OBJFloWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691128970; a=rsa-sha256; cv=none; b=xXRJLV0PdchTuJBJVI/G1RxxkWLBauOxeFOkGVXno2OdBO9rP+RL3/0IBaUsuF2368jbR6 1AdXUYzdzGsrjsp/jlAvFEnuoirscJUs2jTd7OWVTU345JijgSGxVOgOadfHh/kzGBe6he Kl9dEsNTb4xiJDm876IGQnVVM42gbEIdfF+TaFBe3hkiAy5RyQ6Y8+ZR+1h0FKa6FQS1IN wdCGR/FnN5xuxtEzG0KKPeeu6fRolPeqbYp5EKQYccI7Gjctbw40+PGzXsGE6dmRYI5Jyo vWSlCAIzIAt/D9Xe+Jj0TUcaM4jecNfflPHcUJeCoHYnw0BIRBVmb8mayrt2Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHFVy0gw1zrhM; Fri, 4 Aug 2023 06:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37462oZh087535; Fri, 4 Aug 2023 06:02:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37462nfX087534; Fri, 4 Aug 2023 06:02:49 GMT (envelope-from git) Date: Fri, 4 Aug 2023 06:02:49 GMT Message-Id: <202308040602.37462nfX087534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8d8b3e18f73a - stable/12 - sk(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8d8b3e18f73a946760d9e340b83b41eacfa52f43 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8d8b3e18f73a946760d9e340b83b41eacfa52f43 commit 8d8b3e18f73a946760d9e340b83b41eacfa52f43 Author: Gordon Bergling AuthorDate: 2023-08-01 05:50:45 +0000 Commit: Gordon Bergling CommitDate: 2023-08-04 06:02:43 +0000 sk(4): Fix a typo in a source code comment - s/nomral/normal/ (cherry picked from commit 135c2b71562f6a6b8e918cc66d5468342c198d02) --- sys/dev/sk/if_sk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index d6fae635d70b..95db263f7eeb 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -2654,7 +2654,7 @@ skc_resume(dev) * to get correct checksum value but couldn't get correct one. So TCP/UDP * checksum offload was disabled at the moment and only IP checksum offload * was enabled. - * As nomral IP header size is 20 bytes I can't expect it would give an + * As normal IP header size is 20 bytes I can't expect it would give an * increase in throughput. However it seems it doesn't hurt performance in * my testing. If there is a more detailed information for checksum secret * of the hardware in question please contact yongari@FreeBSD.org to add From nobody Fri Aug 4 09:08:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHKdX69f4z4gtFP; Fri, 4 Aug 2023 09:08: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 4RHKdX5v6kz4HvQ; Fri, 4 Aug 2023 09:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691140128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JurOjFiwxB8ykGlvCeMpyKA286rE+iF0Wd7DAZq1fTU=; b=Hd5oaaZEqcaAqWIRkeb4TTyxg6Dmn+hXF57uCKrdaL99hj/Rlox6pX4IjScRYot3HBfIxB T+m4uLu4WCgWrOOW3H0b+SNiNSYru2UXPHKqoykZz60slkm+ybXfFcPHCI70FcJ1mEzyG4 nOTSgU3f8mmhSGuFoBlkEDswskysmoJxvufyW0qfTrgGLkevTncYzzMo2AnNhndLvGBFJR YdIJFPdsnk3Ip/H7jiACt39ENtdoQAgVvgngVuS6DL5kOVfTrIKRtZZbqDHJ9MepQhu8Mi 4i/voa2BT3krPeBxkbSLKoiPqp+WNOEgtOJp5T45+kt5UaVT1omreeR7kgHZDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691140128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JurOjFiwxB8ykGlvCeMpyKA286rE+iF0Wd7DAZq1fTU=; b=v8iD/Wn72b74TuLjlA8vs2jRbmmwSKrRENNYl4fIMfTTfQ8oRngxGQAtvOzgX9xOo1u1gc j6YPjmdR5OllraaYftc4ycq3IRf/jhBVimAXwODzmMjvirAGVGSTEbZBQ2/0m+37ZYZYeP 65m0u0o1SWvx6HU8GZMYaIc2UNpP82nIf6N2/CbnPOhhWIz03DGv1Ubhf/aeLJr86hBkNn HLABcKhZlLi6wNUROYDvTO0rf7hu6iu3PgcZNSTw1nZJkt80B3BdEQeRBnXjEnP4nM/tKR vOUUdto7kr1EfFcskODTkcMHK8jrcMbd0YYG4YX59icwvKiZ3CfCUgLHiSsphw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691140128; a=rsa-sha256; cv=none; b=GT6lnAKAnuXdxLTW1+wKE8+xZZ6i1aMSi1/uBlAxAY0eZjWFi37UQcCl4PacadhB60se5N L1IJEu8RP0jsJ7wth7e7Rn4EujfuZ52u/BFQtE9l9TBK6BkscjRmhfatV0ZnvHtP2Rv1Fc D7Y0CfZECV+rlvgXU/zMpdqkDsXcfKf5ylRU1IrljRW/qsOHRSauY77WsworEmAwRbZOZ9 ISJ+ZbqlpW7WGs4aP+oQ+Yd2/HpYR7oglVlpdkHWdYbho60Z0yqx+im3c3qQVTGusJ/ZN4 BRgQ6f5Dki/KesHYoNsPiN93OaQS6xZgGbJ/ZVz66xwZfEq+UXX2DUI6bOPsKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHKdX4wvhzwpd; Fri, 4 Aug 2023 09:08: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 37498m7b088918; Fri, 4 Aug 2023 09:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37498k0T088913; Fri, 4 Aug 2023 09:08:46 GMT (envelope-from git) Date: Fri, 4 Aug 2023 09:08:46 GMT Message-Id: <202308040908.37498k0T088913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: b306c604df54 - main - locale: update to CLDR 43 and Unicode 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b306c604df541dede4d0f3cc96188bbf5b6719fe Auto-Submitted: auto-generated The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=b306c604df541dede4d0f3cc96188bbf5b6719fe commit b306c604df541dede4d0f3cc96188bbf5b6719fe Author: Yuri Pankov AuthorDate: 2023-08-03 23:47:16 +0000 Commit: Yuri Pankov CommitDate: 2023-08-03 23:47:16 +0000 locale: update to CLDR 43 and Unicode 15 Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D41151 --- share/colldef_unicode/Makefile | 2 +- share/colldef_unicode/af_ZA.UTF-8.src | 250 +- share/colldef_unicode/am_ET.UTF-8.src | 96 +- share/colldef_unicode/ar_SA.UTF-8.src | 302 +- share/colldef_unicode/be_BY.UTF-8.src | 266 +- share/colldef_unicode/ca_AD.UTF-8.src | 250 +- share/colldef_unicode/cs_CZ.UTF-8.src | 250 +- share/colldef_unicode/da_DK.UTF-8.src | 250 +- share/colldef_unicode/el_GR.UTF-8.src | 78 +- share/colldef_unicode/en_US.UTF-8.src | 250 +- share/colldef_unicode/es_MX.UTF-8.src | 250 +- share/colldef_unicode/et_EE.UTF-8.src | 294 +- share/colldef_unicode/fa_AF.UTF-8.src | 382 +- share/colldef_unicode/fa_IR.UTF-8.src | 380 +- share/colldef_unicode/fi_FI.UTF-8.src | 246 +- share/colldef_unicode/fr_CA.UTF-8.src | 250 +- share/colldef_unicode/he_IL.UTF-8.src | 270 +- share/colldef_unicode/hi_IN.UTF-8.src | 148 +- share/colldef_unicode/hu_HU.UTF-8.src | 250 +- share/colldef_unicode/hy_AM.UTF-8.src | 112 +- share/colldef_unicode/is_IS.UTF-8.src | 250 +- share/colldef_unicode/ja_JP.UTF-8.src | 14580 +++-- share/colldef_unicode/kk_KZ.UTF-8.src | 264 +- share/colldef_unicode/ko_KR.UTF-8.src | 144 +- share/colldef_unicode/lt_LT.UTF-8.src | 250 +- share/colldef_unicode/lv_LV.UTF-8.src | 286 +- share/colldef_unicode/nn_NO.UTF-8.src | 250 +- share/colldef_unicode/pl_PL.UTF-8.src | 250 +- share/colldef_unicode/ro_RO.UTF-8.src | 250 +- share/colldef_unicode/ru_RU.UTF-8.src | 270 +- share/colldef_unicode/se_NO.UTF-8.src | 298 +- share/colldef_unicode/sk_SK.UTF-8.src | 250 +- share/colldef_unicode/sl_SI.UTF-8.src | 250 +- share/colldef_unicode/sr_RS.UTF-8.src | 272 +- share/colldef_unicode/sr_RS.UTF-8@latin.src | 250 +- share/colldef_unicode/sv_SE.UTF-8.src | 250 +- share/colldef_unicode/tr_TR.UTF-8.src | 250 +- share/colldef_unicode/uk_UA.UTF-8.src | 264 +- share/colldef_unicode/zh_CN.UTF-8.src | 84289 ++++++++++++------------- share/colldef_unicode/zh_TW.UTF-8.src | 5551 +- share/ctypedef/C.UTF-8.src | 301 +- share/monetdef_unicode/Makefile | 2 +- share/monetdef_unicode/ar_AE.UTF-8.src | 4 +- share/monetdef_unicode/ar_EG.UTF-8.src | 4 +- share/monetdef_unicode/ar_JO.UTF-8.src | 4 +- share/monetdef_unicode/ar_MA.UTF-8.src | 4 +- share/monetdef_unicode/ar_QA.UTF-8.src | 4 +- share/monetdef_unicode/ar_SA.UTF-8.src | 4 +- share/monetdef_unicode/bg_BG.UTF-8.src | 2 +- share/monetdef_unicode/he_IL.UTF-8.src | 4 +- share/monetdef_unicode/hr_HR.UTF-8.src | 50 - share/monetdef_unicode/is_IS.UTF-8.src | 2 +- tools/tools/locale/Makefile | 22 +- tools/tools/locale/README | 6 +- tools/tools/locale/etc/final-maps/map.UTF-8 | 4491 +- tools/tools/locale/etc/final-maps/widths.txt | 9993 ++- 56 files changed, 71313 insertions(+), 56878 deletions(-) diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile index 6193c2fb499e..8ddfc447e9b9 100644 --- a/share/colldef_unicode/Makefile +++ b/share/colldef_unicode/Makefile @@ -8,7 +8,7 @@ FILESNAME= LC_COLLATE .SUFFIXES: .src .LC_COLLATE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps -CLDR_VERSION= "41.0" +CLDR_VERSION= "43.0" .include diff --git a/share/colldef_unicode/af_ZA.UTF-8.src b/share/colldef_unicode/af_ZA.UTF-8.src index aeb1a06fd276..0861ec5cf5fa 100644 --- a/share/colldef_unicode/af_ZA.UTF-8.src +++ b/share/colldef_unicode/af_ZA.UTF-8.src @@ -34,6 +34,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -62,7 +63,6 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -79,20 +79,20 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -101,7 +101,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -160,11 +160,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -262,13 +262,13 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -288,11 +288,11 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -356,10 +356,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -367,16 +366,16 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -387,6 +386,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -395,9 +395,9 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -539,6 +539,7 @@ order_start forward;forward;forward;forward + @@ -567,7 +568,6 @@ order_start forward;forward;forward;forward - @@ -584,20 +584,20 @@ order_start forward;forward;forward;forward + + - - - - - - + + + + + + + + + - - - - - @@ -606,7 +606,7 @@ order_start forward;forward;forward;forward - + @@ -665,11 +665,11 @@ order_start forward;forward;forward;forward - + @@ -767,13 +767,13 @@ order_start forward;forward;forward;forward - - + - + + @@ -793,11 +793,11 @@ order_start forward;forward;forward;forward - + @@ -861,10 +861,9 @@ order_start forward;forward;forward;forward - - + @@ -872,16 +871,16 @@ order_start forward;forward;forward;forward - + + - @@ -892,6 +891,7 @@ order_start forward;forward;forward;forward + @@ -900,9 +900,9 @@ order_start forward;forward;forward;forward - + @@ -1061,20 +1061,20 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1083,7 +1083,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; @@ -1324,12 +1324,12 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1435,7 +1435,7 @@ order_start forward;forward;forward;forward "";"";""; "";"";""; "";"";""; - "";"";""; + "";"";""; ;;; ;;; ;;; @@ -1683,8 +1683,8 @@ order_start forward;forward;forward;forward ;"";""; ;"";""; ;"";""; - ;"";""; - ;"";""; + ;"";""; + ;"";""; "";"";""; "";"";""; "";"";""; @@ -1716,14 +1716,14 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -1795,13 +1795,13 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -2014,29 +2014,29 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -2083,21 +2083,21 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; @@ -2127,7 +2127,7 @@ order_start forward;forward;forward;forward "";"";""; "";"";""; "";"";""; - "";"";""; + "";"";""; "";"";""; "";"";""; ;;; @@ -2142,10 +2142,10 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; ;;; diff --git a/share/colldef_unicode/am_ET.UTF-8.src b/share/colldef_unicode/am_ET.UTF-8.src index 73d6363faa7f..ae42f2d20420 100644 --- a/share/colldef_unicode/am_ET.UTF-8.src +++ b/share/colldef_unicode/am_ET.UTF-8.src @@ -13,13 +13,13 @@ LC_COLLATE collating-symbol collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol -collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -49,21 +49,21 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -75,7 +75,7 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -351,13 +351,13 @@ order_start forward;forward;forward;forward + + + - - - @@ -387,21 +387,21 @@ order_start forward;forward;forward;forward + + - - - - - - + + + + + + + + + - - - - - @@ -413,7 +413,7 @@ order_start forward;forward;forward;forward - + @@ -712,9 +712,9 @@ order_start forward;forward;forward;forward IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; IGNORE;IGNORE;IGNORE; - IGNORE;"";""; - IGNORE;"";""; - IGNORE;"";""; + IGNORE;"";""; + IGNORE;"";""; + IGNORE;"";""; ;;; ;;; ;;; @@ -739,20 +739,20 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; - ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; ;;; "";;""; @@ -771,7 +771,7 @@ order_start forward;forward;forward;forward ;;; ;;; ;;; - ;;; + ;;; ;;; ;;; ;;; diff --git a/share/colldef_unicode/ar_SA.UTF-8.src b/share/colldef_unicode/ar_SA.UTF-8.src index f04377e7c01f..01157b428642 100644 --- a/share/colldef_unicode/ar_SA.UTF-8.src +++ b/share/colldef_unicode/ar_SA.UTF-8.src @@ -62,48 +62,49 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol -collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -145,10 +146,10 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -173,24 +174,24 @@ collating-symbol collating-symbol collating-symbol collating-symbol +collating-symbol +collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol +collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol collating-symbol collating-symbol collating-symbol @@ -202,8 +203,8 @@ collating-symbol collating-symbol collating-symbol collating-symbol -collating-symbol -collating-symbol +collating-symbol +collating-symbol collating-symbol collating-symbol collating-symbol @@ -405,48 +406,49 @@ order_start forward;forward;forward;forward + + + - - - + - - - - - + + + + + + + - - - + - - *** 161386 LINES SKIPPED *** From nobody Fri Aug 4 09:50: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 4RHLYn2RTfz4gwtf; Fri, 4 Aug 2023 09:50: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 4RHLYn1sXqz4L78; Fri, 4 Aug 2023 09:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691142637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxBdpW04LzKmy3kh4jxJUjmgbM4x4gxhVV7IUWetBTs=; b=ZwcosV4rUQqvS5HgcLU6G7wi3U85RklCTfKeVmCeX0/whX/ME0RAK1sm/FwMNzUBpwJPRE MknIVUGfC8nB0BB5bP9FDGhGCpzDfthVQnusGqFVcdF/xBceY5GDi4msEHTg1eSu7EjH59 q5Knt9xafXOhRMSf0/BiJ2tmzXZj47ECCq9uuJq6UaqXux3kxoe3RcTyKKtTx/iCZ63T+5 3F6UJkiAGTesP2RJ99etMmaoN+Vrs4QaE3GdK5mAyFNv60g5QXvC3vqeQI67J1y+2ziWdC ootmkwO23oADmbiRgOAWfGwLNgQk2u5dFwyccYEwSB1IL3BOeoqy/hEmKv9KXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691142637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxBdpW04LzKmy3kh4jxJUjmgbM4x4gxhVV7IUWetBTs=; b=BpPqqTD9MR4UPCmeUKtIHwtKhWB75TPU96G6TnnFWQwC9RwrpDJWZEx3cSgyfMiiIXU5qG wjfStMYqkgMys3EtjTrLW97sDiaVFfSneNi+cHHliHFr8Dd3H6BXFDr4NWXWrb6YLvsod1 meafrq3ZkdIGeWnvA8vFz9cmz6a89ab9BiJ6bjqA7S/dbeFUZXAjs9p+4am9/YM1b5gUgD QXgzBMPErjlp4JthSywJufpDsBKzHlSbLtWo1HCN8yHk4VScKNWnJYxYHmEOxFBoL8vR6i 9QO32AdO0w5jE4+AvDeNvhIgavKD1Fjr3qrq7055BVgqQrkXz8SniNnYFXkmuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691142637; a=rsa-sha256; cv=none; b=xZg2kutMPc6PX2b6mjZOImv08LY4g8FxYepkr9Mt5dFh9ImqDIxvoGUM2kNt6afef2L1cw v1Dpnjg9tmP5vIX0E4cVHO/HIon08kD7iKsRm0k8BaC+6J79bCMTcw+KzMGfoPGKT+1VD+ MZ8PgjSqaYOjzlZWBOmlK0km6mXJJBWxzxXPTda/ZsXL/E3qOlU+wbeW97hUyqSAT/JsqW Sn3QQil37OVr3SAYuL1KbQCQWmwV9cXTKH+2qx6WvWQ5KdAL8FxMTyf5LGBl55rJSsiBWQ 6bVBtGc9CfpdRNVEVpHwI+FvxtViK8Li4b1ZjQNyGYdkU7XFEOeHLU/WZWeq6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHLYn0xCpzyC3; Fri, 4 Aug 2023 09:50: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 3749obMY063190; Fri, 4 Aug 2023 09:50:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3749obUW063189; Fri, 4 Aug 2023 09:50:37 GMT (envelope-from git) Date: Fri, 4 Aug 2023 09:50:37 GMT Message-Id: <202308040950.3749obUW063189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4350a03fef2c - main - arm64: Make dpcpu static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4350a03fef2c2da393b222de514821d50b1c656f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4350a03fef2c2da393b222de514821d50b1c656f commit 4350a03fef2c2da393b222de514821d50b1c656f Author: Andrew Turner AuthorDate: 2023-08-03 20:32:57 +0000 Commit: Andrew Turner CommitDate: 2023-08-04 09:50:09 +0000 arm64: Make dpcpu static We don't use this directly outside this file so it can be static. Sponsored by: Arm Ltd --- sys/arm64/arm64/mp_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 9aef6a9a080f..6f38cd8d0f1a 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -147,7 +147,7 @@ static volatile int aps_started; static volatile int aps_ready; /* Temporary variables for init_secondary() */ -void *dpcpu[MAXCPU - 1]; +static void *dpcpu[MAXCPU - 1]; static bool is_boot_cpu(uint64_t target_cpu) From nobody Fri Aug 4 09:50: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 4RHLYp3bHFz4gwg3; Fri, 4 Aug 2023 09:50: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 4RHLYp2rt2z4LQ9; Fri, 4 Aug 2023 09:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691142638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l45RITMyBHLnt5vWFq0oyXUF6cpijXOAT2dwFSms/ZU=; b=TV3Z5AdlERLfrLB6Zq2Vr2DkKEl5jCMDr9s/d5Uv1DT2J6jeLEKmtcCosjhiZpoFLe+5Vw Z0Is9P2K+/e1ZWNP9+MgRbaEmnIrQMAvFxRWZ3OCSt2GFrBPKySXspdjVg0Jlgi5aseGTk aKcSP4XYVm3N4fPM4bIzOILmBiqBgYqps7SoOYBnYr9x3ePQy+VQmvjWrdbhCYZLX5jniF 5hclKpF8GmaOdBC3Fiy9GbBH3Y40z67pulIJIzBdkKdq1/atUfdtk/V5Cc8kmP4txeF+em l9j1ddpmk2WSBLberG6yuDVJcR9pR682sLfvKMOFDyfqKeajxK7WKrRLuaVMOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691142638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l45RITMyBHLnt5vWFq0oyXUF6cpijXOAT2dwFSms/ZU=; b=Sq+JvMNRCFqmyhXvYqcimWwR0DuCHGnqSARogEdyjjNe9J8qO8gVTNvn+4rm5ondGTzoGG gGixzIar9cEMVOlH9/CgjdqCKgg3+82c+RE9xvkOuwaiq2mqB0b4ZZx4cKFksS8umOFNfk hNVwx9ftW9jjBwTMthYgD1peUAGlJHDUfHcQNFwKulGaTlc0+jVcUEzklBN6JJFqIlWtD9 wSHiXKJgidw6+SGOwdgrx2lG8WAiLryMdUWdjqV4HmLx+U5WwDUO4/4SnSK6tR/2EJtOlv Fis76Mdln8Z82BlZK6ABUQleOi0lyF/CRkYL7DjArICooPijoMN6bR3mI0o4vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691142638; a=rsa-sha256; cv=none; b=gpMvbC/lDY9lR4Sq0IUF93jX4blcVPNZVaKTzKFz/IAFezKeWk6qMPGv7Hfys0WQRVgCKr CRCqYbXTfd7DzNPzKxZsqQLVAShtoPAYszgTTgkJMYlcvcyE04IpODm4ab4wSnkAdiOgF6 jEYXe/w0YG0ga+sZV4/nfRcyZa8bjzDuK+Y4+YYKHXBl7ELigE1Ot96PNNucF+q4Mvfjz6 1RXhWHE2F0/93jDDnZ+l6jLRPCM9RqRpYq+70U2p5FCgXL7CT4VGT5KTPW0fwwNdFQ74n3 D2WQ1/0TgiwSCgUa+KvjBAkiGEBtY5GaR2J7hFrZJu7d9BMSjkB+Fr7OMIcUHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHLYp1rK5zxvj; Fri, 4 Aug 2023 09:50: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 3749ocCa063218; Fri, 4 Aug 2023 09:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3749ocPT063217; Fri, 4 Aug 2023 09:50:38 GMT (envelope-from git) Date: Fri, 4 Aug 2023 09:50:38 GMT Message-Id: <202308040950.3749ocPT063217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a2afd7b818fa - main - Remove MAXCPUS from the gicv3 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2afd7b818fa6c25c1e66871339d907c7658322c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a2afd7b818fa6c25c1e66871339d907c7658322c commit a2afd7b818fa6c25c1e66871339d907c7658322c Author: Andrew Turner AuthorDate: 2023-08-04 09:14:16 +0000 Commit: Andrew Turner CommitDate: 2023-08-04 09:50:09 +0000 Remove MAXCPUS from the gicv3 driver We create a static array of pointers to per-CPU data. Because the cpuid space on arm64 is not sparse there is no need to add an extra level of indirection. Move to use mallocarray to allocate the redistributors as a single array. Sponsored by: Arm Ltd --- sys/arm64/arm64/gic_v3.c | 46 +++++++++++++++++--------------------------- sys/arm64/arm64/gic_v3_var.h | 10 +++++----- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index d108cabfe4d9..c448320a86e8 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -226,8 +226,8 @@ gic_r_read_4(device_t dev, bus_size_t offset) struct resource *rdist; sc = device_get_softc(dev); - rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)]->res; - offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)]->offset; + rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)].res; + offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)].offset; return (bus_read_4(rdist, offset)); } @@ -238,8 +238,8 @@ gic_r_read_8(device_t dev, bus_size_t offset) struct resource *rdist; sc = device_get_softc(dev); - rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)]->res; - offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)]->offset; + rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)].res; + offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)].offset; return (bus_read_8(rdist, offset)); } @@ -250,8 +250,8 @@ gic_r_write_4(device_t dev, bus_size_t offset, uint32_t val) struct resource *rdist; sc = device_get_softc(dev); - rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)]->res; - offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)]->offset; + rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)].res; + offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)].offset; bus_write_4(rdist, offset, val); } @@ -262,8 +262,8 @@ gic_r_write_8(device_t dev, bus_size_t offset, uint64_t val) struct resource *rdist; sc = device_get_softc(dev); - rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)]->res; - offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)]->offset; + rdist = sc->gic_redists.pcpu[PCPU_GET(cpuid)].res; + offset += sc->gic_redists.pcpu[PCPU_GET(cpuid)].offset; bus_write_8(rdist, offset, val); } @@ -431,7 +431,6 @@ int gic_v3_detach(device_t dev) { struct gic_v3_softc *sc; - size_t i; int rid; sc = device_get_softc(dev); @@ -446,8 +445,7 @@ gic_v3_detach(device_t dev) for (rid = 0; rid < (sc->gic_redists.nregions + 1); rid++) bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->gic_res[rid]); - for (i = 0; i <= mp_maxid; i++) - free(sc->gic_redists.pcpu[i], M_GIC_V3); + free(sc->gic_redists.pcpu, M_GIC_V3); free(sc->ranges, M_GIC_V3); free(sc->gic_res, M_GIC_V3); @@ -497,7 +495,7 @@ gic_v3_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) *result = (intr_nirq - sc->gic_nirqs) / sc->gic_nchildren; return (0); case GICV3_IVAR_REDIST: - *result = (uintptr_t)sc->gic_redists.pcpu[PCPU_GET(cpuid)]; + *result = (uintptr_t)&sc->gic_redists.pcpu[PCPU_GET(cpuid)]; return (0); case GIC_IVAR_HW_REV: KASSERT( @@ -1231,8 +1229,8 @@ gic_v3_wait_for_rwp(struct gic_v3_softc *sc, enum gic_v3_xdist xdist) offset = 0; break; case REDIST: - res = sc->gic_redists.pcpu[cpuid]->res; - offset = sc->gic_redists.pcpu[PCPU_GET(cpuid)]->offset; + res = sc->gic_redists.pcpu[cpuid].res; + offset = sc->gic_redists.pcpu[PCPU_GET(cpuid)].offset; break; default: KASSERT(0, ("%s: Attempt to wait for unknown RWP", __func__)); @@ -1368,16 +1366,8 @@ gic_v3_dist_init(struct gic_v3_softc *sc) static int gic_v3_redist_alloc(struct gic_v3_softc *sc) { - u_int cpuid; - - /* Allocate struct resource for all CPU's Re-Distributor registers */ - for (cpuid = 0; cpuid <= mp_maxid; cpuid++) - if (CPU_ISSET(cpuid, &all_cpus) != 0) - sc->gic_redists.pcpu[cpuid] = - malloc(sizeof(*sc->gic_redists.pcpu[0]), - M_GIC_V3, M_WAITOK); - else - sc->gic_redists.pcpu[cpuid] = NULL; + sc->gic_redists.pcpu = mallocarray(mp_maxid + 1, + sizeof(sc->gic_redists.pcpu[0]), M_GIC_V3, M_WAITOK); return (0); } @@ -1423,12 +1413,12 @@ gic_v3_redist_find(struct gic_v3_softc *sc) do { typer = bus_read_8(r_res, offset + GICR_TYPER); if ((typer >> GICR_TYPER_AFF_SHIFT) == aff) { - KASSERT(sc->gic_redists.pcpu[cpuid] != NULL, + KASSERT(cpuid <= mp_maxid, ("Invalid pointer to per-CPU redistributor")); /* Copy res contents to its final destination */ - sc->gic_redists.pcpu[cpuid]->res = r_res; - sc->gic_redists.pcpu[cpuid]->offset = offset; - sc->gic_redists.pcpu[cpuid]->lpi_enabled = false; + sc->gic_redists.pcpu[cpuid].res = r_res; + sc->gic_redists.pcpu[cpuid].offset = offset; + sc->gic_redists.pcpu[cpuid].lpi_enabled = false; if (bootverbose) { device_printf(sc->dev, "CPU%u Re-Distributor has been found\n", diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 47e73c1ab3b7..21fce2326d03 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -56,7 +56,7 @@ struct gic_redists { /* Number of Re-Distributor regions */ u_int nregions; /* Per-CPU Re-Distributor data */ - struct redist_pcpu *pcpu[MAXCPU]; + struct redist_pcpu *pcpu; }; struct gic_v3_softc { @@ -138,8 +138,8 @@ void gic_r_write_8(device_t, bus_size_t, uint64_t var); u_int cpu = PCPU_GET(cpuid); \ \ bus_read_##len( \ - (sc)->gic_redists.pcpu[cpu]->res, \ - (sc)->gic_redists.pcpu[cpu]->offset + (reg)); \ + (sc)->gic_redists.pcpu[cpu].res, \ + (sc)->gic_redists.pcpu[cpu].offset + (reg)); \ }) #define gic_r_write(sc, len, reg, val) \ @@ -147,8 +147,8 @@ void gic_r_write_8(device_t, bus_size_t, uint64_t var); u_int cpu = PCPU_GET(cpuid); \ \ bus_write_##len( \ - (sc)->gic_redists.pcpu[cpu]->res, \ - (sc)->gic_redists.pcpu[cpu]->offset + (reg), \ + (sc)->gic_redists.pcpu[cpu].res, \ + (sc)->gic_redists.pcpu[cpu].offset + (reg), \ (val)); \ }) From nobody Fri Aug 4 10:09: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 4RHLzh67xrz4gyFY; Fri, 4 Aug 2023 10:09: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 4RHLzh5fkjz4N1p; Fri, 4 Aug 2023 10:09:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691143776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fwp/TN8MSI6RyPrB+IRHfyYmF95Rn5RzYrLYrCYztSQ=; b=E/win6FGn5MHQnUJothWyw/DqOwTIajQNigi5xdBO7fqkYuE35w9AH71a0Rn9oyCgw61Rj pd8pX6j3AZrVD452B4jiQAEvcuFengxy4ZENOu2EaCsQlYz3KYOwZJnW+7nxO7/0Po84ge LmsTO+6v0sTBpcgxbYsDedj5Mk6xDCne1lntfMXREnPHQIhNOUQa2nHRexMnQMjdeUtowi MmwGYl7TKKBOA28W89DWdKLsz3pAzcrlhmPBJ09Jg/TszsZ9USP+PSxEwqlaBnsPYMElwr mxQAwtjQg09NgXM1FUqCfg2fysgXXZP5PCl8YkIInyjX+GxmIEU5yIQf9MqASQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691143776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fwp/TN8MSI6RyPrB+IRHfyYmF95Rn5RzYrLYrCYztSQ=; b=qVf16ztXACrHWrTb4h/VfHVOQNuh5ftqyDFtW2xaR7O2g60nERnoRgzuBbzDzdzLIORpya otLTAaA3XfzsoQ2PWdOgeqmcllhhg9g1qiw72tdjKgKLp8/Xd/48+cj0jAg5GymQg8MPJe JWZFrGonajPP+TkDRX43yTXvicgNkhLb5D5BhZqyICPP5UIHEeuZywBhvaQmKt8DbRc4VW Q9+xOMHLDo4aNguv6JAkD4TBoMAWUk1+gP3/I8RMS8kBaQUCe497sjcyG/L2AscSvMVmfq sOSa4/e+ixn3tFVTKfI498r/lf+yapD7BRfKi2G4NuFQlKVqTRfsTGaqdSfbKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691143776; a=rsa-sha256; cv=none; b=EYLqZ0EIhRaaac1dTaS5n8xggZYFs0I2Nmb5d84AtI8NbPkWpC/IDunB52iu6xpec7/XhN zRUkelOIfzT4Zx676vRvHWp3HsdcthdJpYTb7Nm0+4uUlvyCkbXf2woe2gsUA0HzEI1Vlo oI8MVV0S/43JcEOkS2mojbyiP+ux5qZok5CLWf/c5rioLEXl55+4VDEypIUxJVdxWnhNzU dy0Tgmt7BymDFFGvt60MU/DxGbCObPdtt1IzyXAWbf6DxADY/+88F7780XiRmgmin9XfdC BAeqUIAsLR1Ch+Af7VIWq4vkLBiyXL7el+z0muSIneh5kO+8ZA/aTMvFhagUAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHLzh4bgWzycb; Fri, 4 Aug 2023 10:09: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 374A9apJ088442; Fri, 4 Aug 2023 10:09:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374A9arH088441; Fri, 4 Aug 2023 10:09:36 GMT (envelope-from git) Date: Fri, 4 Aug 2023 10:09:36 GMT Message-Id: <202308041009.374A9arH088441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: dd3055a75f3f - main - OptionalObsoleteFiles: add missed keymaps for sycons List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd3055a75f3f97c53b403905ec679ea4ccced6ef Auto-Submitted: auto-generated The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=dd3055a75f3f97c53b403905ec679ea4ccced6ef commit dd3055a75f3f97c53b403905ec679ea4ccced6ef Author: Yuri Pankov AuthorDate: 2023-08-04 10:04:17 +0000 Commit: Yuri Pankov CommitDate: 2023-08-04 10:09:08 +0000 OptionalObsoleteFiles: add missed keymaps for sycons --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 783e75e5b4c3..8a3ad037f4e5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7480,6 +7480,7 @@ OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/colemak-dh.iso15.acc.kbd OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd @@ -7564,6 +7565,7 @@ OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.macbook.kbd OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm From nobody Fri Aug 4 10:46: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 4RHMpR60Kbz4h1Yf; Fri, 4 Aug 2023 10:46: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 4RHMpR5p1wz4Qrg; Fri, 4 Aug 2023 10:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691145999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTxGf7SxOXVwwlmf60mf6VjoEFGjCvSvVdf/VT18Ses=; b=vHszI6NKWKXB6qJyAlFnLOLAGlGu+PSq0m88Q9+XNawAirbwRSOApz6MNF5wKR5AStJ2sU cEW53YPZZERmba2adynhM22HBb4n4yxqPAIpdMY1H9QTWw9m9p6/vS6o0/kBILU0HbAhOd PTR0Ahy0urU5tkcTNMfy+fpgudk5W42UT0A5T8fz4qDmDEF0ZmdRy4JLt+BDTwVjE1uDxA X+O/vYU5PPa+qiGpt8FlSqn/KNjjJYdtxD4lk5fKHkXerxLMkFH/lTBnBGM21nKYHOXloh LELTvQohbBqFoV5Udnj3JMmEOqtmyCkeMqA4d/vbIZG7vgqyDTYR39ZgdYLAow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691145999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTxGf7SxOXVwwlmf60mf6VjoEFGjCvSvVdf/VT18Ses=; b=B8ij8zFD5hafamOE8rV+Ro+P3tQwo8/MstTm+tcbtBnqxKMo/GMtA8NsZ3wOxhsMqAQHNd KXSN2QMh3qs8E6mW+3vZz913I5hS35CWS48c6/cNSC0wGO9Uro4ApA4o1Nka/Q2q9bNhFI TRuFhSf0qc5ffuV9l53BwI0CKgpm/Oay/04Ct/4cNyZQQDa2ZGTG8LxLw/hTmf7Qk10Q6b zuVX6GjzWOX/OsrInjMh4n/v+vNtyd2yXSNp47OIgSTSxdy8Pq0gelrpyFlMSjdYDBm+fJ 8d8HBRSBRSzCmLeDyEYIpXoses9GwZpoA8OrN87EDMpAZV3N8RCmHBEHlfsCng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691145999; a=rsa-sha256; cv=none; b=ORjbd9A8n+TMdtXLR/Ssl6foDlevHSu17Sb8sASkSfLf1EBWgnz7v6rRd/Kd0HqFHFNmjz VuhQzW9vkLW5EWnQasm3axGI7z0Z2WmCbsVhA+82FnAHG3/1X39maMr0rtSo/Jnc1ySHSy +lMjHF46qJqqmX95HFKL+6mOJdIJ9askmMeFIibJl7Qviq1S9cSha6EGpolxigiePgx7m3 buIExgKhomyEdGTY+o2pFnqjGWP3WUiR4uKR67fKrRrbFmsnu5zpWUBN5kZsvZDbYltjx4 9dWThKg4LXWtdcubjc0J4X184IruwBuFJZySzRU8l+IEPNHvNiY7m/0Ncvb19g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHMpR4rZQz10Br; Fri, 4 Aug 2023 10:46: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 374Akd1C053673; Fri, 4 Aug 2023 10:46:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374AkdRv053672; Fri, 4 Aug 2023 10:46:39 GMT (envelope-from git) Date: Fri, 4 Aug 2023 10:46:39 GMT Message-Id: <202308041046.374AkdRv053672@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: b5a3a89c5067 - main - unzip: swtich to bsdunzip from libarchive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b5a3a89c50671a1ad29e7c43fe15e7b16feac239 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a3a89c50671a1ad29e7c43fe15e7b16feac239 commit b5a3a89c50671a1ad29e7c43fe15e7b16feac239 Author: Martin Matuska AuthorDate: 2023-07-31 11:54:58 +0000 Commit: Martin Matuska CommitDate: 2023-08-04 10:45:41 +0000 unzip: swtich to bsdunzip from libarchive Unzip from FreeBSD has been ported to libarchive. Change usr.bin/unzip to use bsdunzip from libarchive. Differential Revision: https://reviews.freebsd.org/D41239 PR: 272845 (exp-run) MFC after: 1 month --- etc/mtree/BSD.tests.dist | 2 + lib/libarchive/config_freebsd.h | 5 + usr.bin/unzip/Makefile | 28 +- usr.bin/unzip/tests/Makefile | 74 +++ usr.bin/unzip/tests/Makefile.depend | 24 + usr.bin/unzip/tests/functional_test.sh | 56 ++ usr.bin/unzip/unzip.1 | 207 ------ usr.bin/unzip/unzip.c | 1141 -------------------------------- 8 files changed, 188 insertions(+), 1349 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 9312a6c2980b..943924c56bae 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1134,6 +1134,8 @@ .. uniq .. + unzip + .. vmstat .. wc diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 408bd1f12dbc..5211513610f3 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -113,6 +113,8 @@ #define HAVE_FCNTL 1 #define HAVE_FCNTL_H 1 #define HAVE_FDOPENDIR 1 +#define HAVE_FNMATCH 1 +#define HAVE_FNMATCH_H 1 #define HAVE_FORK 1 #define HAVE_FSEEKO 1 #define HAVE_FSTAT 1 @@ -125,6 +127,8 @@ #define HAVE_GETEUID 1 #define HAVE_GETGRGID_R 1 #define HAVE_GETGRNAM_R 1 +#define HAVE_GETLINE 1 +#define HAVE_GETOPT_OPTRESET 1 #define HAVE_GETPID 1 #define HAVE_GETPWNAM_R 1 #define HAVE_GETPWUID_R 1 @@ -205,6 +209,7 @@ #define HAVE_SYS_MOUNT_H 1 #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_POLL_H 1 +#define HAVE_SYS_QUEUE_H 1 #define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_STATVFS_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/usr.bin/unzip/Makefile b/usr.bin/unzip/Makefile index c1713e95222b..e0b5ac74246d 100644 --- a/usr.bin/unzip/Makefile +++ b/usr.bin/unzip/Makefile @@ -1,6 +1,32 @@ # $FreeBSD$ -PROG = unzip +.include + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive + +PROG= bsdunzip + +BSDUNZIP_VERSION_STRING!= sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \ + ${_LIBARCHIVEDIR}/libarchive/archive.h + +.PATH: ${_LIBARCHIVEDIR}/unzip +SRCS= bsdunzip.c + +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe +SRCS+= cmdline.c err.c passphrase.c + +CFLAGS+= -DBSDUNZIP_VERSION_STRING=\"${BSDUNZIP_VERSION_STRING}\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" +CFLAGS+= -I${_LIBARCHIVEDIR}/unzip -I${_LIBARCHIVEDIR}/libarchive_fe + LIBADD= archive +SYMLINKS=bsdunzip ${BINDIR}/unzip +MLINKS= bsdunzip.1 unzip.1 + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include +# DO NOT DELETE diff --git a/usr.bin/unzip/tests/Makefile b/usr.bin/unzip/tests/Makefile new file mode 100644 index 000000000000..577c0936a151 --- /dev/null +++ b/usr.bin/unzip/tests/Makefile @@ -0,0 +1,74 @@ +# $FreeBSD$ + +PACKAGE= tests + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +BINDIR= ${TESTSDIR} + +PROGS+= bsdunzip_test + +CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" +CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/unzip -I${_LIBARCHIVEDIR}/unzip/test +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +CFLAGS.test_utils.c+= -Wno-cast-align + +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe +UNZIP_SRCS+= err.c + +.PATH: ${_LIBARCHIVEDIR}/unzip/test +TESTS_SRCS= \ + test_0.c \ + test_C.c \ + test_L.c \ + test_P_encryption.c \ + test_Z1.c \ + test_basic.c \ + test_d.c \ + test_glob.c \ + test_j.c \ + test_n.c \ + test_not_exist.c \ + test_o.c \ + test_p.c \ + test_q.c \ + test_singlefile.c \ + test_t.c \ + test_t_bad.c \ + test_version.c \ + test_x.c + +SRCS.bsdunzip_test= list.h \ + ${UNZIP_SRCS} \ + ${TESTS_SRCS} + +.PATH: ${_LIBARCHIVEDIR}/test_utils +SRCS.bsdunzip_test+= test_main.c \ + test_utils.c + +LIBADD.bsdunzip_test= archive + +list.h: ${TESTS_SRCS} Makefile + @(cd ${_LIBARCHIVEDIR}/unzip/test && \ + grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= list.h list.h.tmp + +${PACKAGE}FILES+= test_basic.zip.uu +${PACKAGE}FILES+= test_encrypted.zip.uu +${PACKAGE}FILES+= test_singlefile.zip.uu +${PACKAGE}FILES+= test_t_bad.zip.uu + +.include diff --git a/usr.bin/unzip/tests/Makefile.depend b/usr.bin/unzip/tests/Makefile.depend new file mode 100644 index 000000000000..138ae4120671 --- /dev/null +++ b/usr.bin/unzip/tests/Makefile.depend @@ -0,0 +1,24 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libarchive \ + lib/libbz2 \ + lib/libc \ + lib/libcompiler_rt \ + lib/libexpat \ + lib/liblzma \ + lib/libthr \ + lib/libz \ + secure/lib/libcrypto \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.bin/unzip/tests/functional_test.sh b/usr.bin/unzip/tests/functional_test.sh new file mode 100755 index 000000000000..1b39e057d538 --- /dev/null +++ b/usr.bin/unzip/tests/functional_test.sh @@ -0,0 +1,56 @@ +# +# Copyright 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +SRCDIR=$(atf_get_srcdir) +TESTER="${SRCDIR}/bsdunzip_test" +export BSDUNZIP=$(which bsdunzip) + +check() +{ + local testcase=${1}; shift + + # For some odd reason /bin/sh spuriously writes + # "write error on stdout" with some of the testcases + # + # Probably an issue with how they're written as it calls system(3) to + # clean up directories.. + atf_check -e ignore -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}" +} + +atf_init_test_cases() +{ + # Redirect stderr to stdout for the usage message because if you don't + # kyua list/kyua test will break: + # https://github.com/jmmv/kyua/issues/149 + testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + for testcase in ${testcases}; do + atf_test_case ${testcase} + eval "${testcase}_body() { check ${testcase}; }" + atf_add_test_case ${testcase} + done +} diff --git a/usr.bin/unzip/unzip.1 b/usr.bin/unzip/unzip.1 deleted file mode 100644 index fd826fbe1c05..000000000000 --- a/usr.bin/unzip/unzip.1 +++ /dev/null @@ -1,207 +0,0 @@ -.\"- -.\" Copyright (c) 2007-2008 Dag-Erling Smørgrav -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD$ -.\" -.Dd June 27, 2023 -.Dt UNZIP 1 -.Os -.Sh NAME -.Nm unzip -.Nd extract files from a ZIP archive -.Sh SYNOPSIS -.Nm -.Op Fl aCcfjLlnopqtuvy -.Op { Fl O | Fl I No } Ar encoding -.Op Fl d Ar dir -.Op Fl x Ar pattern -.Op Fl P Ar password -.Ar zipfile -.Op Ar member ... -.Sh DESCRIPTION -.\" ... -The following options are available: -.Bl -tag -width Fl -.It Fl a -When extracting a text file, convert DOS-style line endings to -Unix-style line endings. -.It Fl C -Match file names case-insensitively. -.It Fl c -Extract to stdout/screen. -When extracting files from the zipfile, they are written to stdout. -This is similar to -.Fl p , -but does not suppress normal output. -.It Fl d Ar dir -Extract files into the specified directory rather than the current -directory. -.It Fl f -Update existing. -Extract only files from the zipfile if a file with the same name -already exists on disk and is older than the former. -Otherwise, the file is silently skipped. -.It Fl I Ar encoding -.It Fl O Ar encoding -Convert filenames from the specified encoding. -.It Fl j -Ignore directories stored in the zipfile; instead, extract all files -directly into the extraction directory. -.It Fl L -Convert the names of the extracted files and directories to lowercase. -.It Fl l -List, rather than extract, the contents of the zipfile. -.It Fl n -No overwrite. -When extracting a file from the zipfile, if a file with the same name -already exists on disk, the file is silently skipped. -.It Fl o -Overwrite. -When extracting a file from the zipfile, if a file with the same name -already exists on disk, the existing file is replaced with the file -from the zipfile. -.It Fl p -Extract to stdout. -When extracting files from the zipfile, they are written to stdout. -The normal output is suppressed as if -.Fl q -was specified. -.It Fl P Ar password -Extract encrypted files using a password. -Putting a password on the command line using this option can be -insecure. -.It Fl q -Quiet: print less information while extracting. -.It Fl t -Test: do not extract anything, but verify the checksum of every file -in the archive. -.It Fl u -Update. -When extracting a file from the zipfile, if a file with the same name -already exists on disk, the existing file is replaced with the file -from the zipfile if and only if the latter is newer than the former. -Otherwise, the file is silently skipped. -.It Fl v -List verbosely, rather than extract, the contents of the zipfile. -This differs from -.Fl l -by using the long listing. -Note that most of the data is currently fake and does not reflect the -content of the archive. -.It Fl x Ar pattern -Exclude files matching the pattern -.Ar pattern . -.It Fl y -Print four digit years in listings instead of two. -.It Fl Z Ar mode -Emulate -.Xr zipinfo 1L -mode. -Enabling -.Xr zipinfo 1L -mode changes the way in which additional arguments are parsed. -Currently only -.Xr zipinfo 1L -mode 1 is supported, which lists the file names one per line. -.It Ar [member ...] -Optional list of members to extract from the zipfile. -Can include patterns, e.g., -.Ar 'memberdir/*' -will extract all files and dirs below memberdir. -.El -.Pp -Note that only one of -.Fl n , -.Fl o , -and -.Fl u -may be specified. -If specified filename is -.Qq - , -then data is read from -.Va stdin . -.Sh ENVIRONMENT -If the -.Ev UNZIP_DEBUG -environment variable is defined, the -.Fl q -command-line option has no effect, and additional debugging -information will be printed to -.Va stderr . -.Sh COMPATIBILITY -The -.Nm -utility aims to be sufficiently compatible with other implementations -to serve as a drop-in replacement in the context of the -.Xr ports 7 -system. -No attempt has been made to replicate functionality which is not -required for that purpose. -.Pp -For compatibility reasons, command-line options will be recognized if -they are listed not only before but also after the name of the -zipfile. -.Pp -Normally, the -.Fl a -option should only affect files which are marked as text files in the -zipfile's central directory. -Since the -.Xr archive 3 -library does not provide access to that information, it is not available -to the -.Nm -utility. -Instead, the -.Nm -utility will assume that a file is a text file if no non-ASCII -characters are present within the first block of data decompressed for -that file. -If non-ASCII characters appear in subsequent blocks of data, a warning -will be issued. -.Pp -The -.Nm -utility is only able to process ZIP archives handled by -.Xr libarchive 3 . -Depending on the installed version of -.Xr libarchive 3 , -this may or may not include self-extracting or ZIPX archives. -.Sh SEE ALSO -.Xr libarchive 3 -.Sh HISTORY -The -.Nm -utility appeared in -.Fx 8.0 . -.Sh AUTHORS -The -.Nm -utility and this manual page were written by -.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . -It uses the -.Xr archive 3 -library developed by -.An Tim Kientzle Aq Mt kientzle@FreeBSD.org . diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c deleted file mode 100644 index 1200aa53e7e3..000000000000 --- a/usr.bin/unzip/unzip.c +++ /dev/null @@ -1,1141 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2009, 2010 Joerg Sonnenberger - * Copyright (c) 2007-2008 Dag-Erling Smørgrav - * 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 - * in this position and unchanged. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - * - * This file would be much shorter if we didn't care about command-line - * compatibility with Info-ZIP's UnZip, which requires us to duplicate - * parts of libarchive in order to gain more detailed control of its - * behaviour for the purpose of implementing the -n, -o, -L and -a - * options. - */ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -/* command-line options */ -static int a_opt; /* convert EOL */ -static int C_opt; /* match case-insensitively */ -static int c_opt; /* extract to stdout */ -static const char *d_arg; /* directory */ -static int f_opt; /* update existing files only */ -static char *O_arg; /* encoding */ -static int j_opt; /* junk directories */ -static int L_opt; /* lowercase names */ -static int n_opt; /* never overwrite */ -static int o_opt; /* always overwrite */ -static int p_opt; /* extract to stdout, quiet */ -static char *P_arg; /* passphrase */ -static int q_opt; /* quiet */ -static int t_opt; /* test */ -static int u_opt; /* update */ -static int v_opt; /* verbose/list */ -static const char *y_str = ""; /* 4 digit year */ -static int Z1_opt; /* zipinfo mode list files only */ - -/* debug flag */ -static int unzip_debug; - -/* zipinfo mode */ -static int zipinfo_mode; - -/* running on tty? */ -static int tty; - -/* convenience macro */ -/* XXX should differentiate between ARCHIVE_{WARN,FAIL,RETRY} */ -#define ac(call) \ - do { \ - int acret = (call); \ - if (acret != ARCHIVE_OK) \ - errorx("%s", archive_error_string(a)); \ - } while (0) - -/* - * Indicates that last info() did not end with EOL. This helps error() et - * al. avoid printing an error message on the same line as an incomplete - * informational message. - */ -static int noeol; - -/* for an interactive passphrase input */ -static char *passphrase_buf; - -/* fatal error message + errno */ -static void -error(const char *fmt, ...) -{ - va_list ap; - - if (noeol) - fprintf(stdout, "\n"); - fflush(stdout); - fprintf(stderr, "unzip: "); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, ": %s\n", strerror(errno)); - exit(EXIT_FAILURE); -} - -/* fatal error message, no errno */ -static void -errorx(const char *fmt, ...) -{ - va_list ap; - - if (noeol) - fprintf(stdout, "\n"); - fflush(stdout); - fprintf(stderr, "unzip: "); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - exit(EXIT_FAILURE); -} - -/* non-fatal error message + errno */ -static void -warning(const char *fmt, ...) -{ - va_list ap; - - if (noeol) - fprintf(stdout, "\n"); - fflush(stdout); - fprintf(stderr, "unzip: "); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, ": %s\n", strerror(errno)); -} - -/* non-fatal error message, no errno */ -static void -warningx(const char *fmt, ...) -{ - va_list ap; - - if (noeol) - fprintf(stdout, "\n"); - fflush(stdout); - fprintf(stderr, "unzip: "); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); -} - -/* informational message (if not -q) */ -static void -info(const char *fmt, ...) -{ - va_list ap; - - if (q_opt && !unzip_debug) - return; - va_start(ap, fmt); - vfprintf(stdout, fmt, ap); - va_end(ap); - fflush(stdout); - - if (*fmt == '\0') - noeol = 1; - else - noeol = fmt[strlen(fmt) - 1] != '\n'; -} - -/* debug message (if unzip_debug) */ -static void -debug(const char *fmt, ...) -{ - va_list ap; - - if (!unzip_debug) - return; - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fflush(stderr); - - if (*fmt == '\0') - noeol = 1; - else - noeol = fmt[strlen(fmt) - 1] != '\n'; -} - -/* duplicate a path name, possibly converting to lower case */ -static char * -pathdup(const char *path) -{ - char *str; - size_t i, len; - - if (path == NULL || path[0] == '\0') - return (NULL); - - len = strlen(path); - while (len && path[len - 1] == '/') - len--; - if ((str = malloc(len + 1)) == NULL) { - errno = ENOMEM; - error("malloc()"); - } - if (L_opt) { - for (i = 0; i < len; ++i) - str[i] = tolower((unsigned char)path[i]); - } else { - memcpy(str, path, len); - } - str[len] = '\0'; - - return (str); -} - -/* concatenate two path names */ -static char * -pathcat(const char *prefix, const char *path) -{ - char *str; - size_t prelen, len; - - prelen = prefix ? strlen(prefix) + 1 : 0; - len = strlen(path) + 1; - if ((str = malloc(prelen + len)) == NULL) { - errno = ENOMEM; - error("malloc()"); - } - if (prefix) { - memcpy(str, prefix, prelen); /* includes zero */ - str[prelen - 1] = '/'; /* splat zero */ - } - memcpy(str + prelen, path, len); /* includes zero */ - - return (str); -} - -/* - * Pattern lists for include / exclude processing - */ -struct pattern { - STAILQ_ENTRY(pattern) link; - char pattern[]; -}; - -STAILQ_HEAD(pattern_list, pattern); -static struct pattern_list include = STAILQ_HEAD_INITIALIZER(include); -static struct pattern_list exclude = STAILQ_HEAD_INITIALIZER(exclude); - -/* - * Add an entry to a pattern list - */ -static void -add_pattern(struct pattern_list *list, const char *pattern) -{ - struct pattern *entry; - size_t len; - - debug("adding pattern '%s'\n", pattern); - len = strlen(pattern); - if ((entry = malloc(sizeof *entry + len + 1)) == NULL) { - errno = ENOMEM; - error("malloc()"); - } - memcpy(entry->pattern, pattern, len + 1); - STAILQ_INSERT_TAIL(list, entry, link); -} - -/* - * Match a string against a list of patterns - */ -static int -match_pattern(struct pattern_list *list, const char *str) -{ - struct pattern *entry; - - STAILQ_FOREACH(entry, list, link) { - if (fnmatch(entry->pattern, str, C_opt ? FNM_CASEFOLD : 0) == 0) - return (1); - } - return (0); -} - -/* - * Verify that a given pathname is in the include list and not in the - * exclude list. - */ -static int -accept_pathname(const char *pathname) -{ - - if (!STAILQ_EMPTY(&include) && !match_pattern(&include, pathname)) - return (0); - if (!STAILQ_EMPTY(&exclude) && match_pattern(&exclude, pathname)) - return (0); - return (1); -} - -/* - * Create the specified directory with the specified mode, taking certain - * precautions on they way. - */ -static void -make_dir(const char *path, int mode) -{ - struct stat sb; - - if (lstat(path, &sb) == 0) { - if (S_ISDIR(sb.st_mode)) - return; - /* - * Normally, we should either ask the user about removing - * the non-directory of the same name as a directory we - * wish to create, or respect the -n or -o command-line - * options. However, this may lead to a later failure or - * even compromise (if this non-directory happens to be a - * symlink to somewhere unsafe), so we don't. - */ - - /* - * Don't check unlink() result; failure will cause mkdir() - * to fail later, which we will catch. - */ - (void)unlink(path); - } - if (mkdir(path, mode) != 0 && errno != EEXIST) - error("mkdir('%s')", path); -} - -/* - * Ensure that all directories leading up to (but not including) the - * specified path exist. - * - * XXX inefficient + modifies the file in-place - */ -static void -make_parent(char *path) -{ - struct stat sb; - char *sep; - - sep = strrchr(path, '/'); - if (sep == NULL || sep == path) - return; - *sep = '\0'; - if (lstat(path, &sb) == 0) { - if (S_ISDIR(sb.st_mode)) { - *sep = '/'; - return; - } - unlink(path); - } - make_parent(path); - mkdir(path, 0755); - *sep = '/'; - -#if 0 - for (sep = path; (sep = strchr(sep, '/')) != NULL; sep++) { - /* root in case of absolute d_arg */ - if (sep == path) - continue; - *sep = '\0'; - make_dir(path, 0755); - *sep = '/'; - } -#endif -} - -/* - * Extract a directory. - */ -static void -extract_dir(struct archive *a, struct archive_entry *e, const char *path) -{ - int mode; - - /* - * Dropbox likes to create '/' directory entries, just ignore - * such junk. - */ - if (*path == '\0') - return; - - mode = archive_entry_mode(e) & 0777; - if (mode == 0) - mode = 0755; - - /* - * Some zipfiles contain directories with weird permissions such - * as 0644 or 0444. This can cause strange issues such as being - * unable to extract files into the directory we just created, or - * the user being unable to remove the directory later without - * first manually changing its permissions. Therefore, we whack - * the permissions into shape, assuming that the user wants full - * access and that anyone who gets read access also gets execute - * access. - */ - mode |= 0700; - if (mode & 0040) - mode |= 0010; - if (mode & 0004) - mode |= 0001; - - info(" creating: %s/\n", path); - make_dir(path, mode); - ac(archive_read_data_skip(a)); -} - -static unsigned char buffer[8192]; -static char spinner[] = { '|', '/', '-', '\\' }; - -static int -handle_existing_file(char **path) -{ - size_t alen; - ssize_t len; - char buf[4]; - - for (;;) { - fprintf(stderr, - "replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", - *path); - if (fgets(buf, sizeof(buf), stdin) == NULL) { - clearerr(stdin); - printf("NULL\n(EOF or read error, " - "treating as \"[N]one\"...)\n"); - n_opt = 1; - return -1; - } - switch (*buf) { - case 'A': - o_opt = 1; - /* FALLTHROUGH */ - case 'y': - case 'Y': - (void)unlink(*path); - return 1; - case 'N': - n_opt = 1; - /* FALLTHROUGH */ - case 'n': - return -1; - case 'r': - case 'R': - printf("New name: "); - fflush(stdout); - free(*path); - *path = NULL; - alen = 0; - len = getline(path, &alen, stdin); - if ((*path)[len - 1] == '\n') - (*path)[len - 1] = '\0'; - return 0; - default: - break; - } - } -} - -/* - * Detect binary files by a combination of character white list and - * black list. NUL bytes and other control codes without use in text files - * result directly in switching the file to binary mode. Otherwise, at least - * one white-listed byte has to be found. - * - * Black-listed: 0..6, 14..25, 28..31 *** 655 LINES SKIPPED *** From nobody Fri Aug 4 11:53:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHPH35X5xz4kKZ5; Fri, 4 Aug 2023 11:53: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 4RHPH34kR2z4Vls; Fri, 4 Aug 2023 11:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691149983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSM4nlVwcVszjAzob7EmUUsEJxJl6qbs7YverM1Taxs=; b=bkla+zTap2hal/AC4vb4kWe0+PonxRPyxTltAUE0Gfr0mBoQ81vHeoWPjZe++XwkSDTtRh jB4f7fFdmC35Xv0ESiYswgotop+Os6DZmMvfZMMCntgSpik6yIQVKNNf+s0Eak77ToHunB zGktRjQd7cm7gtJhIeaJlI7cZqG//4ueiZskqTbbNG9KX0JXH03l+D2Y0huRtl3wc1I/Wg PJW0gwh7H3UOequ6SXz4VqD23U6otFx5a9FaLDxxCnlEvZfMK9n6B/AJVp1QrTHVNWzFEW xEomTvyFeW57PC734rV9JgZAeVP1x0DebrMVAh+LTgvw//HzcdN8B8E0b5AePw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691149983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSM4nlVwcVszjAzob7EmUUsEJxJl6qbs7YverM1Taxs=; b=brotaJVFgi+6rU6TUWB/9Bg2Bie3iK8UlWVJTWASDQeu9ERjWd0KBMxQ3wfHd7WqnuMxsf 3l3RnzE9IZtRpTJfx2tmxtijpxA4aBmLDvOMZnTFgqGWtyWcu+ptrMCwRRZVOSvduz1dMC UMwUw2zlHaQtYoRFpT1uZmGHpfQSwCGCygU9zDEazMfzzK1wgGsZGZK0Go7UA+nrzY/6dP dFBzr0rXM1oD1yGeqUeZHOkw1eWiznM+SML+IpFO0O3KmSHGbaf3TSI2febKUBXBcEr2aB nYtrkIw/OYjSEhhWv7TmJIxAiYM8ZBIBAiCrxGdifVJnltjgajUGQvEhTXquTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691149983; a=rsa-sha256; cv=none; b=gB/amthgXEbj9pUgsg/9+1StCBF4UXni5YdDtUIhCeZZYcAXrMB4soq+Enz3tKfa2Ms3MS wQ+2cfZh5y1SekN0OOLAIWcwfT+ORooqXcOiN5gQT2TAUe4elE4/S0C6+mPSHa3JSuwPUF 9XzIls5RVisXoSiOdEl7lm0NNggMntwtpArnaB8m3ojas/b36Pzf6j4vZfeIAmeX8/BwZI Utb44pyf9r0aiwkgCGIcecensFwuWoN/RdDtzSJj5kuhQpqFoTf4NHtOvabzurzfAV4fEx zSM/dlsWOhQZGSDsQVgH0rBNaG7Fb69sWhySCngJX1nMRjtd9+Ksz/WSCJLXjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHPH33gr2z11Kh; Fri, 4 Aug 2023 11:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374Br334069649; Fri, 4 Aug 2023 11:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Br3bg069648; Fri, 4 Aug 2023 11:53:03 GMT (envelope-from git) Date: Fri, 4 Aug 2023 11:53:03 GMT Message-Id: <202308041153.374Br3bg069648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 85dab3fe7a85 - main - i2c.8: Fix a typo in the 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85dab3fe7a8521d593eba3845c9d10cb0f1f1f56 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=85dab3fe7a8521d593eba3845c9d10cb0f1f1f56 commit 85dab3fe7a8521d593eba3845c9d10cb0f1f1f56 Author: Gordon Bergling AuthorDate: 2023-08-04 11:50:48 +0000 Commit: Gordon Bergling CommitDate: 2023-08-04 11:50:48 +0000 i2c.8: Fix a typo in the manual page - s/endianess/endianness/ MFC after: 5 days --- usr.sbin/i2c/i2c.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/i2c/i2c.8 b/usr.sbin/i2c/i2c.8 index 7c995f5743a4..3b5ac900a4d9 100644 --- a/usr.sbin/i2c/i2c.8 +++ b/usr.sbin/i2c/i2c.8 @@ -130,7 +130,7 @@ specified with .Fl o to the slave. Zero means that the offset is ignored and not passed to the slave at all. -The endianess defaults to little-endian. +The endianness defaults to little-endian. .El .Sh INTERPRETED MODE When started with From nobody Fri Aug 4 11:53: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 4RHPH50mVTz4kKjL; Fri, 4 Aug 2023 11:53: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 4RHPH45FdGz4VX3; Fri, 4 Aug 2023 11:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691149984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lr/sppzVMaAtnBjggw/EixhumGPgVs5R6PHlZYgaLRU=; b=FQJhMk9zHfQ+ba4EzERI15rErp1qjZxgtoriwgHAa4QwdHKq0OZ/yvbujIMhqoDbRwWP2j ELGB8KdSUxmkIO5wcYfREsrYMmSm0Dm9ObaXQUC8ixRIsE3RN8MEOcSgxh1seW3udZG8+G l+rjpm5h/+GmWIyRde5bJ6iIs7GbhCLFKLGs00z4KAe4tcmusWCj/mEOjBGSpHhUsGxXVg C+ML+KdpfEIdjdGDBaXDD2Pmre0sPPWjG7mas9v1nwWYnX/dl3zvcaGVcstc8Fei8DKwv1 tkL7G2v/JOLPGoe998SUC+fn6AjLvULm7Wk+ZZIXuvxp1kSpbT3V4GaEpc1bPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691149984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lr/sppzVMaAtnBjggw/EixhumGPgVs5R6PHlZYgaLRU=; b=ctbDr5SXB/JL8QD7lg5z7OKusYIvaumMg1MMGYy94BeNqn98mRPZ73J/VUeIcil4NhoGsa eV9f6SIOKTRWje4sMnWq0JW6RXUdxt4XHQLWey+jhhz4Re35DgsIY1ElIR5E4YMA/krUol N/GigtV1+hzC/yVOS/G3smU1dlHf0gzoWuQdGkvjUXCxIvbxUBoqMixugWVtTkBsLtt79q s+1LfnqVnLSY+rY0oJPy/eIzti62XPq5JlJZc77hrMa/RHGG9040dLjIU9HHs/18xA3k+Q SLzOLSSChytF3Z7zNx2ECoxOoDVd/NxkC+1CCWpt0dEOVj2UjXLdihEdk0+ojA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691149984; a=rsa-sha256; cv=none; b=CpHCBtLryj3q1Rf6aeiy4lqDhIls5VkobW+FNb81zHq8p/Wuw0iMkKZvoiKYHfX62Jz2mv Hras+8qAvMm+TMaqj604Wzf41tP2JFRSo9aXtIiKz/i69jjiEKEUEwxjUEIWPmM+yHJEUT J/jTrA7I30QXZbga6gfJV6q6SuAyK9X+HckHvUHPLU428OZkM6nw7AtIXlcY4nC1tii+KM p6fLg1vOsLqWfDwTSVpducV3i+LQuY/RAb83LEKYq6Cvkez2Jg8wRKEIwjkl/zUHMTHPqY JYu3jnzCbHOIQcX+dowUCogp1y4zKLhUv7nVg2J9JPh84J/CkAlp+4Pb9PPJ0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHPH446bYz11Kj; Fri, 4 Aug 2023 11:53: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 374Br4wZ069675; Fri, 4 Aug 2023 11:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Br4NC069674; Fri, 4 Aug 2023 11:53:04 GMT (envelope-from git) Date: Fri, 4 Aug 2023 11:53:04 GMT Message-Id: <202308041153.374Br4NC069674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f0ab805200fc - main - arm64-iommu: Fix a typo in a kernel 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0ab805200fc304e4255fc68f9fb8d5400de84ce Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ab805200fc304e4255fc68f9fb8d5400de84ce commit f0ab805200fc304e4255fc68f9fb8d5400de84ce Author: Gordon Bergling AuthorDate: 2023-08-04 11:52:36 +0000 Commit: Gordon Bergling CommitDate: 2023-08-04 11:52:36 +0000 arm64-iommu: Fix a typo in a kernel message - s/endianess/endianness/ MFC after: 5 days --- sys/arm64/iommu/smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 3316321bc41b..834ab9ce0504 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1359,7 +1359,7 @@ smmu_check_features(struct smmu_softc *sc) switch (reg & IDR0_TTENDIAN_M) { case IDR0_TTENDIAN_MIXED: if (bootverbose) - device_printf(sc->dev, "Mixed endianess supported.\n"); + device_printf(sc->dev, "Mixed endianness supported.\n"); sc->features |= SMMU_FEATURE_TT_LE; sc->features |= SMMU_FEATURE_TT_BE; break; From nobody Fri Aug 4 13:03:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHQrn3psfz4kQrT; Fri, 4 Aug 2023 13:03:53 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHQrn3KYxz4bp4; Fri, 4 Aug 2023 13:03:53 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ldphx5e8uJ/6Tz6B4ioXFO/bISRF1SG4Fy6JjbNdhkY=; b=snqbhsezH3RzaP/+jF483XhrysnQM7nkuIm+uOeR9D0DUd8iUrZUCjvrQOFdh6b/nO/7F7 8bqWBoGNtvDvNNn5jyo9TNO0SEUNFsag5LYuCaTvftT+NbIk8vOpMnPjzxfBk6CUnESwqm mN/48YzW60LnOKP3fV0mNXZz0RrcxXHhwhTcqKvlj1L5H6mzF5P3oWn0BfOhzRoN2qJ0ei Gt6/jGxb/tuqTQrIMwv43cybebjzB3MdbU+a/DDRoh2xEXspnSUnTlrtavp5PVplRDoi8j MqBDM2IouaCFIzlHT6kIO2ilr8tHe965fO385R0lPDXhaJoib0u/96PnJb9kjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ldphx5e8uJ/6Tz6B4ioXFO/bISRF1SG4Fy6JjbNdhkY=; b=pOIEZ92X96UmS2FxMNc6hZDoqfRXeoHFnBtJu/cO+PgwEgx4/+/0sHwcr07WdNioQi6h+y LdE8hT6udVgfK9JDDYebNAGwn6281RrDvLDSCE6+nlHKj9igg+Ea9OtyikHUA9RX6Ybd0z fBjcHg9IMJ98OLFq2rOfWQ14tzVScRROkr0TW1Qy+6bytluyUe3ugNUSbBF+RYBdAl3lH2 ZL0QMKUWDeKEZg/wmA8uSKOqnKhcLg6vcJMrj9ylYeZMJbz76urJgP+FGK65WMfrT9dWde w4/enFkUlth53ffrlSnrUW5FjpQEwRMp80ffG6wJtsqtNPNsnkuoj1uYXUfCOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691154233; a=rsa-sha256; cv=none; b=nj3LdwsZnUqHetuN2FZbwtDokfT70+jvwxVim1DZSOIWMBlcwqNjtnd3gjqbDKyLU1rmAS tmstI2onv6v9fmf6CvURfYqbFGefwHojJG3LF/s/FywXZvwM3QEchPH41JSOm7Um9T8KKu H5ypIw4VEZQbFYD6xsO8QY3j5WhDde/bm0CG+HB5RLQostd6c6waFhefbU+axQX1+KdMW4 HQ7g69wtxZH3w60MMLYD67kiqfc8/gaWUEmSUFLa+MLrUFxumN+LjS3lnvetK7VaWJzEVh o8IDmz9UBiM514xg6lBO+k4evB7ZfMPSBhOtd2NkC2IVckuXuKVLibDpf5t9fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHQrn0qDkz11Kp; Fri, 4 Aug 2023 13:03:53 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 6D4AC50BDB; Fri, 4 Aug 2023 15:03:51 +0200 (CEST) From: Kristof Provost To: Michael Tuexen Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b279e84a47dd - main - sctp: improve consistency Date: Fri, 04 Aug 2023 15:03:50 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <202307282203.36SM3C98056354@gitrepo.freebsd.org> References: <202307282203.36SM3C98056354@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_77BDF089-8206-4FA3-8412-9857890C3CAE_=" --=_MailMate_77BDF089-8206-4FA3-8412-9857890C3CAE_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 29 Jul 2023, at 0:03, Michael Tuexen wrote: > The branch main has been updated by tuexen: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3Db279e84a47ddb59e55b5a3cec31c5= 1cd41bf0dc3 > > commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 > Author: Michael Tuexen > AuthorDate: 2023-07-28 12:36:11 +0000 > Commit: Michael Tuexen > CommitDate: 2023-07-28 12:36:11 +0000 > > sctp: improve consistency > > This is simplifying a patch to address PR 260116. > > PR: 260116 > MFC after: 1 week It looks like this commit (or maybe the next one, = c620788150d274c09a070ab486602c98407d73b0) causes a panic in the SCTP = code during the `sys/netpfil/pf/sctp:basic_v4` test: panic: Counter goes negative cpuid =3D 7 time =3D 1691145655 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xfffffe026ea9a3a0 vpanic() at vpanic+0x132/frame 0xfffffe026ea9a4d0 panic() at panic+0x43/frame 0xfffffe026ea9a530 sctp_abort_notification() at sctp_abort_notification/frame = 0xfffffe026ea9a540 sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame = 0xfffffe026ea9a640 sctp_process_control() at sctp_process_control+0xf62/frame = 0xfffffe026ea9a990 sctp_common_input_processing() at = sctp_common_input_processing+0x561/frame 0xfffffe026ea9ab10 sctp_input_with_port() at sctp_input_with_port+0x1fa/frame = 0xfffffe026ea9abe0 sctp_input() at sctp_input+0x10/frame 0xfffffe026ea9abf0 ip_input() at ip_input+0x2ab/frame 0xfffffe026ea9ac50 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9acb0 ether_demux() at ether_demux+0x17a/frame 0xfffffe026ea9ace0 ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe026ea9ad30 netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9ad90 ether_input() at ether_input+0xd9/frame 0xfffffe026ea9adf0 epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame = 0xfffffe026ea9ae40 taskqueue_run_locked() at taskqueue_run_locked+0xab/frame = 0xfffffe026ea9aec0 taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame = 0xfffffe026ea9aef0 fork_exit() at fork_exit+0x82/frame 0xfffffe026ea9af30 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe026ea9af30 --- trap 0, rip =3D 0x35c39ec8bda0, rsp =3D 0, rbp =3D 0x35c39ec8ec90 --= - KDB: enter: panic That seems to be panicking during SCTP packet handling, so I do not = believe this to be a pf bug. Reverting both commits avoids the problem. It=E2=80=99s also failing during the CI tests: = https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/23957/consol= e (To reproduce, kldload pf sctp ; cd /usr/tests/sys/netpfil/pf ; sudo = kyua test sctp:basic_v4). Best regards, Kristof --=_MailMate_77BDF089-8206-4FA3-8412-9857890C3CAE_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 29 Jul 2023, at 0:03, Michael Tuexen wrote:

The branch main has been updated by= tuexen:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Db279e84a47ddb59e55b5a3cec31c51cd41bf0dc3

commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-07-28 12:36:11 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-07-28 12:36:11 +0000

sctp: improve consistency

This is simplifying a patch to address PR 260116.

=

PR: 260116
MFC after: 1 week

It looks like this commit (or maybe the next one, c620788= 150d274c09a070ab486602c98407d73b0) causes a panic in the SCTP code during= the sys/ne= tpfil/pf/sctp:basic_v4 test:

pa=
nic: Counter goes negative
cpuid =3D 7
time =3D 1691145655
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe026ea=
9a3a0
vpanic() at vpanic+0x132/frame 0xfffffe026ea9a4d0
panic() at panic+0x43/frame 0xfffffe026ea9a530
sctp_abort_notification() at sctp_abort_notification/frame 0xfffffe026ea9=
a540
sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame 0xffff=
fe026ea9a640
sctp_process_control() at sctp_process_control+0xf62/frame 0xfffffe026ea9=
a990
sctp_common_input_processing() at sctp_common_input_processing+0x561/fram=
e 0xfffffe026ea9ab10
sctp_input_with_port() at sctp_input_with_port+0x1fa/frame 0xfffffe026ea9=
abe0
sctp_input() at sctp_input+0x10/frame 0xfffffe026ea9abf0
ip_input() at ip_input+0x2ab/frame 0xfffffe026ea9ac50
netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe026ea9acb=
0
ether_demux() at ether_demux+0x17a/frame 0xfffffe026ea9ace0
ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe026ea9ad30
netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe026ea9ad9=
0
ether_input() at ether_input+0xd9/frame 0xfffffe026ea9adf0
epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame 0xfffffe0=
26ea9ae40
taskqueue_run_locked() at taskqueue_run_locked+0xab/frame 0xfffffe026ea9a=
ec0
taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame 0xfffffe026ea=
9aef0
fork_exit() at fork_exit+0x82/frame 0xfffffe026ea9af30
fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe026ea9af30
--- trap 0, rip =3D 0x35c39ec8bda0, rsp =3D 0, rbp =3D 0x35c39ec8ec90 ---=

KDB: enter: panic

That seems to be panicking during SCTP packet handling, s= o I do not believe this to be a pf bug.

Reverting both commits avoids the problem.

It=E2=80=99s also failing during the CI tests: https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/23957/co= nsole

(To reproduce, kldload pf sctp ; cd /usr/tests/sys/netpfi= l/pf ; sudo kyua test sctp:basic_v4).

Best regards,
Kristof

--=_MailMate_77BDF089-8206-4FA3-8412-9857890C3CAE_=-- From nobody Fri Aug 4 13:04: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 4RHQt03fT0z4kRCr; Fri, 4 Aug 2023 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHQt031crz4bsx; Fri, 4 Aug 2023 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HI4wK0Xpw5NQnOMkwIThWrQbc/yGTAuO+n8DtVxJL/c=; b=RwZcrlHOJrs5vF0pVgZFkHc0j8ml1eBopguVjwRx2ylZNVAHSobUfmhWTYqSMa7pNGAggG rmV7WU2cLHY/YR4u1RXSNcgd3nd/G6Ba6YvZaK506s/PM6AntWYWy9OsGhlNLX0RtdeABz kJVbIUSV9cxqKEfAZZgBfmrP0MPvGVPM4qeshuXnJ5PiOC95aPS1vQWAR61BaK7l34PTUt mUzKjo43jpcvgoS4LbvcuZRb/fgIgqEKCV9dtK9MCpRCKV/4McnDYqK/Pax+hfd+5SoLun /9Rz5V2xA3DqSHYWYl64siR1TA74zOfoHyHZZyx6AnDqbFvEIQ0NUy+37eO0Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HI4wK0Xpw5NQnOMkwIThWrQbc/yGTAuO+n8DtVxJL/c=; b=XwdXLlry5vH5PjQg/0YqKCP2MdZn1PWR23iec+E8o3JsdS+Ez+r6i8VQ/xj/3dgRgmyBea CJ2nCLrjSwPWyobiSdET8kWPsz8z5MMpvCJGbQqEtSkvA0C6TcJZ5mjChnNpfdpPIjKGYc 22HVs4gJfBFajDmGKA6rW6Jin6JgnjO3haSIx61kZqHyXLKmUPUhWpT5GObfPfZPibW5Es 9NsBNdir+HTSCGlCt8U18QpNkGm2rQogt5zTWhPoYDaYAX9f4YXfOoQiFqUOli8XpuYtqB vjqyyRnS2qm3ioWVeX2o0o6eGYugM6D+IC9qj7hdgFMj7p1F4j5RdxyhYUOJvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691154296; a=rsa-sha256; cv=none; b=TiPa/jpzzZXPdDc1xaJj4HyO9/eI0ssk4ENhsJgJeylGH7mJbqadsBhk5A/j5r3opG1nTG I6l1Z3eYtHcuZIlPqCvCidoxMU0lWJtIW4cjqdRjL8pVDpkXtvJ+RAiBJ4rBUu5TW3vmSh 9rC2G9CiEkTMtmhDOu3jv9cjyHG8/Uxe1PreniPNGXNa1emT+i1qsKHGjdHrqVkIAzAw3c oMWPHiC3QSTMr/3WQ2xPUHSX9JdHgW/NMehLihd6OHfJnvxocaMRZ6TiVQ+xJhInqG8Lt5 HhL7KIWKbDnXZIKqfmXdEE1aeOYBlIQEJefsbLHeRzWEG4bDq4R00r56Bjs6kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHQt026QXz13Np; Fri, 4 Aug 2023 13:04: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 374D4uvv086774; Fri, 4 Aug 2023 13:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374D4ud4086773; Fri, 4 Aug 2023 13:04:56 GMT (envelope-from git) Date: Fri, 4 Aug 2023 13:04:56 GMT Message-Id: <202308041304.374D4ud4086773@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: 1c83154e4936 - main - linux(4): Modify ioprio syscalls to match 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: 1c83154e493615389f51813447d1b7f89774c5e2 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1c83154e493615389f51813447d1b7f89774c5e2 commit 1c83154e493615389f51813447d1b7f89774c5e2 Author: Dmitry Chagin AuthorDate: 2023-08-04 13:03:55 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-04 13:03:55 +0000 linux(4): Modify ioprio syscalls to match Linux MFC after: 1 month --- sys/amd64/linux/syscalls.master | 15 +++++++++++---- sys/amd64/linux32/syscalls.master | 15 +++++++++++---- sys/arm64/linux/syscalls.master | 15 +++++++++++---- sys/i386/linux/syscalls.master | 15 +++++++++++---- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 6d8e4102d6fc..929c42fc4056 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1465,11 +1465,18 @@ 250 AUE_NULL STD { int linux_keyctl(void); } -251 AUE_NULL STD { - int linux_ioprio_set(void); +251 AUE_SETPRIORITY STD { + int linux_ioprio_set( + l_int which, + l_int who, + l_int ioprio + ); } -252 AUE_NULL STD { - int linux_ioprio_get(void); +252 AUE_GETPRIORITY STD { + int linux_ioprio_get( + l_int which, + l_int who + ); } 253 AUE_NULL STD { int linux_inotify_init(void); diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index e871f6fdbfc8..d1eb57a8295a 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1577,11 +1577,18 @@ int linux_keyctl(void); } ; Linux 2.6.13: -289 AUE_NULL STD { - int linux_ioprio_set(void); +289 AUE_SETPRIORITY STD { + int linux_ioprio_set( + l_int which, + l_int who, + l_int ioprio + ); } -290 AUE_NULL STD { - int linux_ioprio_get(void); +290 AUE_GETPRIORITY STD { + int linux_ioprio_get( + l_int which, + l_int who + ); } 291 AUE_NULL STD { int linux_inotify_init(void); diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 04748e30182c..da2ad24997ce 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -187,11 +187,18 @@ l_ulong arg ); } -30 AUE_NULL STD { - int linux_ioprio_set(void); +30 AUE_SETPRIORITY STD { + int linux_ioprio_set( + l_int which, + l_int who, + l_int ioprio + ); } -31 AUE_NULL STD { - int linux_ioprio_get(void); +31 AUE_GETPRIORITY STD { + int linux_ioprio_get( + l_int which, + l_int who + ); } 32 AUE_FLOCK NOPROTO { int flock( diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 614731ee2cfe..1fd02302ae37 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1594,11 +1594,18 @@ int linux_keyctl(void); } ; Linux 2.6.13: -289 AUE_NULL STD { - int linux_ioprio_set(void); +289 AUE_SETPRIORITY STD { + int linux_ioprio_set( + l_int which, + l_int who, + l_int ioprio + ); } -290 AUE_NULL STD { - int linux_ioprio_get(void); +290 AUE_GETPRIORITY STD { + int linux_ioprio_get( + l_int which, + l_int who + ); } 291 AUE_NULL STD { int linux_inotify_init(void); From nobody Fri Aug 4 13:04: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 4RHQt14kxPz4kRBH; Fri, 4 Aug 2023 13:04: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 4RHQt13r1Fz4bwl; Fri, 4 Aug 2023 13:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BaG8hiv/e58fFJ760REByVGM3bo8YQu0Xo0Lu65i8Dk=; b=E5WOcQ34j6fx4MPxQSvAPdUsBtM5LiATyfXgdlcBnfTm5ZFOtFBBYGs5JXfn/LBQZT8l5r 2vkH/ffxeHsX9UcH1jAJy+sDR5t5Ut6tWzEB2cbtlWAgyeFBcTgBV2N4+OzX94KMNIl8XD 2zz54nTNbv5P/gKDE0da1So0QJGh+MlFMwDnjPwZDVbIdn8ENp4gp/N8DGtmHBMuUlPM/6 hLtM+9ECUO/PDPjU+0hxhnWbaQVkETh4qvI0pxUIixa8MW32JekF357ImJiBhQKUYDVlmR kuZyObdtU7kpUFj6t1+9TFtb1oZlZH3Z6LFUisIhS6eooBmY0KM9nKiRu1Oo7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BaG8hiv/e58fFJ760REByVGM3bo8YQu0Xo0Lu65i8Dk=; b=SZy6qLKl0dxz4I57aJEo8zqk/qwdA4en4UBvvpR3t4Uqbo6hzY6ntJV8IUUuW3kyCAX9uQ bObBmoLlQ5d/WTzjCnRqT+KENrjNMIoGQ2erODb1f0MWfa/AIooUluEsYa88AXqEGYJbOQ HgAn9B4fgjUzEYYSxt3t3x0KD0HgWtuPYfY1nR2VFA/L84VG79TC2hfvySe/tpmsjzjpCQ zqAfu1rra2fpdjn3knKBv1fVP17FGUjrgDOdGbdDlj9pR8VhqAjr91HM6tf1TetCSjIglW /xJZH6gK8/FNGTWJbsQJ+XmK8z0dmz+8jZNzJdzzGD+vV7TMKYIdYxPC2TNQ5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691154297; a=rsa-sha256; cv=none; b=Y4IghAF1C6c2TEz6iT5wv2IqpoR10RYFCemVRwEzDOhW/+ehQRpLqUKdqX9kBtxjeS5N6o z0dmr4qBmRQfTZmC0B0Amt4+VQssBp6+A32X+H0x7aYAObTaOfcZsu4d8AijdrNgt2uWWZ rdvchDTGqIthrlurQDSOsEVAGphN8E/S6UmRmoTUq/ApDy23PdT8JHIA6if1IKQ/IPM3eH uoOjfhG2SXOdHgp1kQTdob7nCL0ZPBrGFjXcXb1FUV/1b5/Zz/Jenxr8tzsZ0OHdiWqp/C hteINqTO6qa8kCIuFyV7Jt3C8giLWX6OH7kJtYnHRxJRK6uL3vJMjAidzeT7VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHQt12vZ1z13Qt; Fri, 4 Aug 2023 13:04: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 374D4vXY086793; Fri, 4 Aug 2023 13:04:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374D4v1S086792; Fri, 4 Aug 2023 13:04:57 GMT (envelope-from git) Date: Fri, 4 Aug 2023 13:04:57 GMT Message-Id: <202308041304.374D4v1S086792@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: b5c0b9555d15 - main - linux(4): Regen for ioprio syscalls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b5c0b9555d1533506e6cb4fe88060134c3ec577f Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c0b9555d1533506e6cb4fe88060134c3ec577f commit b5c0b9555d1533506e6cb4fe88060134c3ec577f Author: Dmitry Chagin AuthorDate: 2023-08-04 13:03:57 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-04 13:03:57 +0000 linux(4): Regen for ioprio syscalls MFC after: 1 month --- sys/amd64/linux/linux_proto.h | 11 +++++---- sys/amd64/linux/linux_sysent.c | 4 ++-- sys/amd64/linux/linux_systrace_args.c | 40 +++++++++++++++++++++++++++++-- sys/amd64/linux32/linux32_proto.h | 11 +++++---- sys/amd64/linux32/linux32_sysent.c | 4 ++-- sys/amd64/linux32/linux32_systrace_args.c | 40 +++++++++++++++++++++++++++++-- sys/arm64/linux/linux_proto.h | 11 +++++---- sys/arm64/linux/linux_sysent.c | 4 ++-- sys/arm64/linux/linux_systrace_args.c | 40 +++++++++++++++++++++++++++++-- sys/i386/linux/linux_proto.h | 11 +++++---- sys/i386/linux/linux_sysent.c | 4 ++-- sys/i386/linux/linux_systrace_args.c | 40 +++++++++++++++++++++++++++++-- 12 files changed, 188 insertions(+), 32 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 3bf8ea0fc7b1..84d3b04de1a4 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -893,10 +893,13 @@ struct linux_keyctl_args { syscallarg_t dummy; }; struct linux_ioprio_set_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; + char ioprio_l_[PADL_(l_int)]; l_int ioprio; char ioprio_r_[PADR_(l_int)]; }; struct linux_ioprio_get_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; }; struct linux_inotify_init_args { syscallarg_t dummy; @@ -1884,8 +1887,8 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_add_key AUE_NULL #define LINUX_SYS_AUE_linux_request_key AUE_NULL #define LINUX_SYS_AUE_linux_keyctl AUE_NULL -#define LINUX_SYS_AUE_linux_ioprio_set AUE_NULL -#define LINUX_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_set AUE_SETPRIORITY +#define LINUX_SYS_AUE_linux_ioprio_get AUE_GETPRIORITY #define LINUX_SYS_AUE_linux_inotify_init AUE_NULL #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index 813c3c648322..c2550aec6831 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -267,8 +267,8 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_add_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 248 = linux_add_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_request_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 249 = linux_request_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_keyctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 250 = linux_keyctl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = linux_ioprio_set */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 252 = linux_ioprio_get */ + { .sy_narg = AS(linux_ioprio_set_args), .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = linux_ioprio_set */ + { .sy_narg = AS(linux_ioprio_get_args), .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 252 = linux_ioprio_get */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_init, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 253 = linux_inotify_init */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_add_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = linux_inotify_add_watch */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_rm_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 255 = linux_inotify_rm_watch */ diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 6ff1764b077c..45e4cce95095 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1896,12 +1896,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_ioprio_set */ case 251: { - *n_args = 0; + struct linux_ioprio_set_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + iarg[a++] = p->ioprio; /* l_int */ + *n_args = 3; break; } /* linux_ioprio_get */ case 252: { - *n_args = 0; + struct linux_ioprio_get_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + *n_args = 2; break; } /* linux_inotify_init */ @@ -5767,9 +5774,32 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_ioprio_set */ case 251: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "l_int"; + break; + default: + break; + }; break; /* linux_ioprio_get */ case 252: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_inotify_init */ case 253: @@ -8225,8 +8255,14 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 250: /* linux_ioprio_set */ case 251: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_ioprio_get */ case 252: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_inotify_init */ case 253: /* linux_inotify_add_watch */ diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 1b4892124c7c..4085791419ae 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -967,10 +967,13 @@ struct linux_keyctl_args { syscallarg_t dummy; }; struct linux_ioprio_set_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; + char ioprio_l_[PADL_(l_int)]; l_int ioprio; char ioprio_r_[PADR_(l_int)]; }; struct linux_ioprio_get_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; }; struct linux_inotify_init_args { syscallarg_t dummy; @@ -2278,8 +2281,8 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX32_SYS_AUE_linux_add_key AUE_NULL #define LINUX32_SYS_AUE_linux_request_key AUE_NULL #define LINUX32_SYS_AUE_linux_keyctl AUE_NULL -#define LINUX32_SYS_AUE_linux_ioprio_set AUE_NULL -#define LINUX32_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX32_SYS_AUE_linux_ioprio_set AUE_SETPRIORITY +#define LINUX32_SYS_AUE_linux_ioprio_get AUE_GETPRIORITY #define LINUX32_SYS_AUE_linux_inotify_init AUE_NULL #define LINUX32_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX32_SYS_AUE_linux_inotify_rm_watch AUE_NULL diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index 12eae3fce9fd..f005ffb9ea54 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -305,8 +305,8 @@ struct sysent linux32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_add_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 286 = linux_add_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_request_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 287 = linux_request_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_keyctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 288 = linux_keyctl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 289 = linux_ioprio_set */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 290 = linux_ioprio_get */ + { .sy_narg = AS(linux_ioprio_set_args), .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 289 = linux_ioprio_set */ + { .sy_narg = AS(linux_ioprio_get_args), .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 290 = linux_ioprio_get */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_init, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 291 = linux_inotify_init */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_add_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 292 = linux_inotify_add_watch */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_rm_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 293 = linux_inotify_rm_watch */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index c137bcb18fd6..80940f5428d3 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -2014,12 +2014,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_ioprio_set */ case 289: { - *n_args = 0; + struct linux_ioprio_set_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + iarg[a++] = p->ioprio; /* l_int */ + *n_args = 3; break; } /* linux_ioprio_get */ case 290: { - *n_args = 0; + struct linux_ioprio_get_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + *n_args = 2; break; } /* linux_inotify_init */ @@ -6448,9 +6455,32 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_ioprio_set */ case 289: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "l_int"; + break; + default: + break; + }; break; /* linux_ioprio_get */ case 290: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_inotify_init */ case 291: @@ -9689,8 +9719,14 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 288: /* linux_ioprio_set */ case 289: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_ioprio_get */ case 290: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_inotify_init */ case 291: /* linux_inotify_add_watch */ diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 1c3dffcd6bb6..34108364f751 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -153,10 +153,13 @@ struct linux_ioctl_args { char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)]; }; struct linux_ioprio_set_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; + char ioprio_l_[PADL_(l_int)]; l_int ioprio; char ioprio_r_[PADR_(l_int)]; }; struct linux_ioprio_get_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; }; struct linux_mknodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; @@ -1475,8 +1478,8 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL #define LINUX_SYS_AUE_linux_ioctl AUE_IOCTL -#define LINUX_SYS_AUE_linux_ioprio_set AUE_NULL -#define LINUX_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_set AUE_SETPRIORITY +#define LINUX_SYS_AUE_linux_ioprio_get AUE_GETPRIORITY #define LINUX_SYS_AUE_linux_mknodat AUE_MKNODAT #define LINUX_SYS_AUE_linux_mkdirat AUE_MKDIRAT #define LINUX_SYS_AUE_linux_unlinkat AUE_UNLINKAT diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 6f92bfe3d054..00f4f2f2f735 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -46,8 +46,8 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_add_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 27 = linux_inotify_add_watch */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_rm_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 28 = linux_inotify_rm_watch */ { .sy_narg = AS(linux_ioctl_args), .sy_call = (sy_call_t *)linux_ioctl, .sy_auevent = AUE_IOCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 29 = linux_ioctl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 30 = linux_ioprio_set */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 31 = linux_ioprio_get */ + { .sy_narg = AS(linux_ioprio_set_args), .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 30 = linux_ioprio_set */ + { .sy_narg = AS(linux_ioprio_get_args), .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 31 = linux_ioprio_get */ { .sy_narg = AS(flock_args), .sy_call = (sy_call_t *)sys_flock, .sy_auevent = AUE_FLOCK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 32 = flock */ { .sy_narg = AS(linux_mknodat_args), .sy_call = (sy_call_t *)linux_mknodat, .sy_auevent = AUE_MKNODAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 33 = linux_mknodat */ { .sy_narg = AS(linux_mkdirat_args), .sy_call = (sy_call_t *)linux_mkdirat, .sy_auevent = AUE_MKDIRAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 34 = linux_mkdirat */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index a2ef2d257037..b45fbcf746f4 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -229,12 +229,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_ioprio_set */ case 30: { - *n_args = 0; + struct linux_ioprio_set_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + iarg[a++] = p->ioprio; /* l_int */ + *n_args = 3; break; } /* linux_ioprio_get */ case 31: { - *n_args = 0; + struct linux_ioprio_get_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + *n_args = 2; break; } /* flock */ @@ -2746,9 +2753,32 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_ioprio_set */ case 30: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "l_int"; + break; + default: + break; + }; break; /* linux_ioprio_get */ case 31: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* flock */ case 32: @@ -6356,8 +6386,14 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_ioprio_set */ case 30: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_ioprio_get */ case 31: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* flock */ case 32: if (ndx == 0 || ndx == 1) diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 22564f25f484..ecd5f4cb3e75 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -960,10 +960,13 @@ struct linux_keyctl_args { syscallarg_t dummy; }; struct linux_ioprio_set_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; + char ioprio_l_[PADL_(l_int)]; l_int ioprio; char ioprio_r_[PADR_(l_int)]; }; struct linux_ioprio_get_args { - syscallarg_t dummy; + char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; + char who_l_[PADL_(l_int)]; l_int who; char who_r_[PADR_(l_int)]; }; struct linux_inotify_init_args { syscallarg_t dummy; @@ -2269,8 +2272,8 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_add_key AUE_NULL #define LINUX_SYS_AUE_linux_request_key AUE_NULL #define LINUX_SYS_AUE_linux_keyctl AUE_NULL -#define LINUX_SYS_AUE_linux_ioprio_set AUE_NULL -#define LINUX_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_set AUE_SETPRIORITY +#define LINUX_SYS_AUE_linux_ioprio_get AUE_GETPRIORITY #define LINUX_SYS_AUE_linux_inotify_init AUE_NULL #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 1b7fcf714e0d..d08b8458740a 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -305,8 +305,8 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_add_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 286 = linux_add_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_request_key, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 287 = linux_request_key */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_keyctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 288 = linux_keyctl */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 289 = linux_ioprio_set */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 290 = linux_ioprio_get */ + { .sy_narg = AS(linux_ioprio_set_args), .sy_call = (sy_call_t *)linux_ioprio_set, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 289 = linux_ioprio_set */ + { .sy_narg = AS(linux_ioprio_get_args), .sy_call = (sy_call_t *)linux_ioprio_get, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 290 = linux_ioprio_get */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_init, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 291 = linux_inotify_init */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_add_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 292 = linux_inotify_add_watch */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_inotify_rm_watch, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 293 = linux_inotify_rm_watch */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index e93d46556092..8121297a5fd8 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -2049,12 +2049,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_ioprio_set */ case 289: { - *n_args = 0; + struct linux_ioprio_set_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + iarg[a++] = p->ioprio; /* l_int */ + *n_args = 3; break; } /* linux_ioprio_get */ case 290: { - *n_args = 0; + struct linux_ioprio_get_args *p = params; + iarg[a++] = p->which; /* l_int */ + iarg[a++] = p->who; /* l_int */ + *n_args = 2; break; } /* linux_inotify_init */ @@ -6516,9 +6523,32 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_ioprio_set */ case 289: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "l_int"; + break; + default: + break; + }; break; /* linux_ioprio_get */ case 290: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_inotify_init */ case 291: @@ -9769,8 +9799,14 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 288: /* linux_ioprio_set */ case 289: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_ioprio_get */ case 290: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_inotify_init */ case 291: /* linux_inotify_add_watch */ From nobody Fri Aug 4 13:04: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 4RHQt26kNJz4kRBJ; Fri, 4 Aug 2023 13:04: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 4RHQt24hlHz4byq; Fri, 4 Aug 2023 13:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYnVi3QWfg80PqvlC5Xg0l9Dc0XRRBZ66eny5Hm9rbw=; b=NqjxXeFKCe5+ixlsygp+fKI2s3mKTqTr2lmvmUv8wC2bT3o2h7ipm5XY0IM8Akp+VduK2d 9Ht6y7NSbjRYMm/0Q9mD0F73aWvotBcE23ZDtY5e/oD1A1Lm+mt66VmXLPH8DPr4bcsIwU /c6GfBV8Mzqr7STxPbjgbzSSefcRa1N/EhFBCX/KhdrMLUAt2M1UviexAS2wP9QJ8KmoIe l4cZI1KuyO0MGldELiSC97A6Dx1da7KgBDc5QLg2r1LrvDEjUQyuxqBFKSS9q7UR7vU/KX DiBFLT9P1HbY8JXLM4Nmewmoir9981WP1+7R9oP46kHE3WjWE0Dqx2RqWY2KVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691154298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYnVi3QWfg80PqvlC5Xg0l9Dc0XRRBZ66eny5Hm9rbw=; b=jzDYYn1cbRPtXpEfaa32biyae9jwU9md1T8VeWv6Dik0Lf1C6oqjGjs4hgpwy/BJaZZ8Pv PpzCeIYH1D4R7NAcva9FP7K4p0HxLs7F4MCI9l+1lIzbTq/rDKaFwSV8acPjB09j1HmFBD qofzwyoY/Fp6gUwkhC5xVrp8pSzffhCgHvgToE8SQDW3mLnBEtLEPByxEMrCw4+Le9mmcN j5qHq8RQviw77IZFRm6R2YnJuXRGw2v0SxyEIixDuWGyspkXZhHgt9JEn9UMF00pXVhTxg dUkE0bXOgOE8swUuagLTaM3vJ2TKUcuWhx34HOrEPpSzy+PdsfPrrcLwPHeWuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691154298; a=rsa-sha256; cv=none; b=qjSoNFZGuGQQdlXFvHS0/AcT6lhwxrsAGGALTtSUJao24IBJAk2x/WR8qQr++u60IBpL7H cmY8c/xc79sDFG9m/k7WvMSSKl3WOBf7QiAtUaXu0IFHrUIUdx4/6agjcHc5dL/RzKMh4U Qv97AwLbfHS1uZLyuiG4rMrqlhZ/P7L2wi1pyVY3a9xSkHiTxt9NCzOjOBaSu9irEbN71S P57XURMZF+agod9zMURr6iGT4YpZuxwBKDsuyLSerTk+rhvQ+nMWCo8qfolg64Y7Ck6DAH jcnRq0PABsShRXPrQahzgVrPdrFv6wMdy4w1Ff8TIRccQfyrN6pWpOsmsqc3tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHQt23pxlz13LH; Fri, 4 Aug 2023 13:04: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 374D4wTA086812; Fri, 4 Aug 2023 13:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374D4w2V086811; Fri, 4 Aug 2023 13:04:58 GMT (envelope-from git) Date: Fri, 4 Aug 2023 13:04:58 GMT Message-Id: <202308041304.374D4w2V086811@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: bbe017e0415a - main - linux(4): Add a dedicated ioprio system calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bbe017e0415a60114036f2315605ff6881ed9c46 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe017e0415a60114036f2315605ff6881ed9c46 commit bbe017e0415a60114036f2315605ff6881ed9c46 Author: Dmitry Chagin AuthorDate: 2023-08-04 13:03:57 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-04 13:03:57 +0000 linux(4): Add a dedicated ioprio system calls On Linux these system calls have an effect only when used in conjuction with an I/O scheduler that supports I/O priorities. If no I/O scheduler has been set for a thread, then by defaut the I/O priority will follow the CPU nice value. Due to FreeBSD lack of I/O scheduler facilities, the default Linux behavior is implemented. Ubuntu 23.04 debootstrap requires Linux ionice which depends on these syscalls. Differential Revision: https://reviews.freebsd.org/D41153 MFC after: 1 month --- sys/compat/linux/linux_dummy.c | 2 - sys/compat/linux/linux_misc.c | 270 +++++++++++++++++++++++++++++++++++++++++ sys/compat/linux/linux_misc.h | 24 ++++ 3 files changed, 294 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 861482b67d8f..5556652b31a1 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -78,8 +78,6 @@ DUMMY(add_key); DUMMY(request_key); DUMMY(keyctl); /* Linux 2.6.13: */ -DUMMY(ioprio_set); -DUMMY(ioprio_get); DUMMY(inotify_add_watch); DUMMY(inotify_rm_watch); /* Linux 2.6.16: */ diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 583cc25f1c43..0cea43001a0d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2653,3 +2654,272 @@ linux_execve(struct thread *td, struct linux_execve_args *args) AUDIT_SYSCALL_EXIT(error == EJUSTRETURN ? 0 : error, td); return (error); } + +static void +linux_up_rtprio_if(struct thread *td1, struct rtprio *rtp) +{ + struct rtprio rtp2; + + pri_to_rtp(td1, &rtp2); + if (rtp2.type < rtp->type || + (rtp2.type == rtp->type && + rtp2.prio < rtp->prio)) { + rtp->type = rtp2.type; + rtp->prio = rtp2.prio; + } +} + +#define LINUX_PRIO_DIVIDER RTP_PRIO_MAX / LINUX_IOPRIO_MAX + +static int +linux_rtprio2ioprio(struct rtprio *rtp) +{ + int ioprio, prio; + + switch (rtp->type) { + case RTP_PRIO_IDLE: + prio = RTP_PRIO_MIN; + ioprio = LINUX_IOPRIO_PRIO(LINUX_IOPRIO_CLASS_IDLE, prio); + break; + case RTP_PRIO_NORMAL: + prio = rtp->prio / LINUX_PRIO_DIVIDER; + ioprio = LINUX_IOPRIO_PRIO(LINUX_IOPRIO_CLASS_BE, prio); + break; + case RTP_PRIO_REALTIME: + prio = rtp->prio / LINUX_PRIO_DIVIDER; + ioprio = LINUX_IOPRIO_PRIO(LINUX_IOPRIO_CLASS_RT, prio); + break; + default: + prio = RTP_PRIO_MIN; + ioprio = LINUX_IOPRIO_PRIO(LINUX_IOPRIO_CLASS_NONE, prio); + break; + } + return (ioprio); +} + +static int +linux_ioprio2rtprio(int ioprio, struct rtprio *rtp) +{ + + switch (LINUX_IOPRIO_PRIO_CLASS(ioprio)) { + case LINUX_IOPRIO_CLASS_IDLE: + rtp->prio = RTP_PRIO_MIN; + rtp->type = RTP_PRIO_IDLE; + break; + case LINUX_IOPRIO_CLASS_BE: + rtp->prio = LINUX_IOPRIO_PRIO_DATA(ioprio) * LINUX_PRIO_DIVIDER; + rtp->type = RTP_PRIO_NORMAL; + break; + case LINUX_IOPRIO_CLASS_RT: + rtp->prio = LINUX_IOPRIO_PRIO_DATA(ioprio) * LINUX_PRIO_DIVIDER; + rtp->type = RTP_PRIO_REALTIME; + break; + default: + return (EINVAL); + } + return (0); +} +#undef LINUX_PRIO_DIVIDER + +int +linux_ioprio_get(struct thread *td, struct linux_ioprio_get_args *args) +{ + struct thread *td1; + struct rtprio rtp; + struct pgrp *pg; + struct proc *p; + int error, found; + + p = NULL; + td1 = NULL; + error = 0; + found = 0; + rtp.type = RTP_PRIO_IDLE; + rtp.prio = RTP_PRIO_MAX; + switch (args->which) { + case LINUX_IOPRIO_WHO_PROCESS: + if (args->who == 0) { + td1 = td; + p = td1->td_proc; + PROC_LOCK(p); + } else if (args->who > PID_MAX) { + td1 = linux_tdfind(td, args->who, -1); + if (td1 != NULL) + p = td1->td_proc; + } else + p = pfind(args->who); + if (p == NULL) + return (ESRCH); + if ((error = p_cansee(td, p))) { + PROC_UNLOCK(p); + break; + } + if (td1 != NULL) { + pri_to_rtp(td1, &rtp); + } else { + FOREACH_THREAD_IN_PROC(p, td1) { + linux_up_rtprio_if(td1, &rtp); + } + } + found++; + PROC_UNLOCK(p); + break; + case LINUX_IOPRIO_WHO_PGRP: + sx_slock(&proctree_lock); + if (args->who == 0) { + pg = td->td_proc->p_pgrp; + PGRP_LOCK(pg); + } else { + pg = pgfind(args->who); + if (pg == NULL) { + sx_sunlock(&proctree_lock); + error = ESRCH; + break; + } + } + sx_sunlock(&proctree_lock); + LIST_FOREACH(p, &pg->pg_members, p_pglist) { + PROC_LOCK(p); + if (p->p_state == PRS_NORMAL && + p_cansee(td, p) == 0) { + FOREACH_THREAD_IN_PROC(p, td1) { + linux_up_rtprio_if(td1, &rtp); + found++; + } + } + PROC_UNLOCK(p); + } + PGRP_UNLOCK(pg); + break; + case LINUX_IOPRIO_WHO_USER: + if (args->who == 0) + args->who = td->td_ucred->cr_uid; + sx_slock(&allproc_lock); + FOREACH_PROC_IN_SYSTEM(p) { + PROC_LOCK(p); + if (p->p_state == PRS_NORMAL && + p->p_ucred->cr_uid == args->who && + p_cansee(td, p) == 0) { + FOREACH_THREAD_IN_PROC(p, td1) { + linux_up_rtprio_if(td1, &rtp); + found++; + } + } + PROC_UNLOCK(p); + } + sx_sunlock(&allproc_lock); + break; + default: + error = EINVAL; + break; + } + if (error == 0) { + if (found != 0) + td->td_retval[0] = linux_rtprio2ioprio(&rtp); + else + error = ESRCH; + } + return (error); +} + +int +linux_ioprio_set(struct thread *td, struct linux_ioprio_set_args *args) +{ + struct thread *td1; + struct rtprio rtp; + struct pgrp *pg; + struct proc *p; + int error; + + if ((error = linux_ioprio2rtprio(args->ioprio, &rtp)) != 0) + return (error); + /* Attempts to set high priorities (REALTIME) require su privileges. */ + if (RTP_PRIO_BASE(rtp.type) == RTP_PRIO_REALTIME && + (error = priv_check(td, PRIV_SCHED_RTPRIO)) != 0) + return (error); + + p = NULL; + td1 = NULL; + switch (args->which) { + case LINUX_IOPRIO_WHO_PROCESS: + if (args->who == 0) { + td1 = td; + p = td1->td_proc; + PROC_LOCK(p); + } else if (args->who > PID_MAX) { + td1 = linux_tdfind(td, args->who, -1); + if (td1 != NULL) + p = td1->td_proc; + } else + p = pfind(args->who); + if (p == NULL) + return (ESRCH); + if ((error = p_cansched(td, p))) { + PROC_UNLOCK(p); + break; + } + if (td1 != NULL) { + error = rtp_to_pri(&rtp, td1); + } else { + FOREACH_THREAD_IN_PROC(p, td1) { + if ((error = rtp_to_pri(&rtp, td1)) != 0) + break; + } + } + PROC_UNLOCK(p); + break; + case LINUX_IOPRIO_WHO_PGRP: + sx_slock(&proctree_lock); + if (args->who == 0) { + pg = td->td_proc->p_pgrp; + PGRP_LOCK(pg); + } else { + pg = pgfind(args->who); + if (pg == NULL) { + sx_sunlock(&proctree_lock); + error = ESRCH; + break; + } + } + sx_sunlock(&proctree_lock); + LIST_FOREACH(p, &pg->pg_members, p_pglist) { + PROC_LOCK(p); + if (p->p_state == PRS_NORMAL && + p_cansched(td, p) == 0) { + FOREACH_THREAD_IN_PROC(p, td1) { + if ((error = rtp_to_pri(&rtp, td1)) != 0) + break; + } + } + PROC_UNLOCK(p); + if (error != 0) + break; + } + PGRP_UNLOCK(pg); + break; + case LINUX_IOPRIO_WHO_USER: + if (args->who == 0) + args->who = td->td_ucred->cr_uid; + sx_slock(&allproc_lock); + FOREACH_PROC_IN_SYSTEM(p) { + PROC_LOCK(p); + if (p->p_state == PRS_NORMAL && + p->p_ucred->cr_uid == args->who && + p_cansched(td, p) == 0) { + FOREACH_THREAD_IN_PROC(p, td1) { + if ((error = rtp_to_pri(&rtp, td1)) != 0) + break; + } + } + PROC_UNLOCK(p); + if (error != 0) + break; + } + sx_sunlock(&allproc_lock); + break; + default: + error = EINVAL; + break; + } + return (error); +} diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index 80f12ef13545..92cc7be636d2 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -191,4 +191,28 @@ struct syscall_info { }; }; +/* Linux ioprio set/get syscalls */ +#define LINUX_IOPRIO_CLASS_SHIFT 13 +#define LINUX_IOPRIO_CLASS_MASK 0x07 +#define LINUX_IOPRIO_PRIO_MASK ((1UL << LINUX_IOPRIO_CLASS_SHIFT) - 1) + +#define LINUX_IOPRIO_PRIO_CLASS(ioprio) \ + (((ioprio) >> LINUX_IOPRIO_CLASS_SHIFT) & LINUX_IOPRIO_CLASS_MASK) +#define LINUX_IOPRIO_PRIO_DATA(ioprio) ((ioprio) & LINUX_IOPRIO_PRIO_MASK) +#define LINUX_IOPRIO_PRIO(class, data) \ + ((((class) & LINUX_IOPRIO_CLASS_MASK) << LINUX_IOPRIO_CLASS_SHIFT) | \ + ((data) & LINUX_IOPRIO_PRIO_MASK)) + +#define LINUX_IOPRIO_CLASS_NONE 0 +#define LINUX_IOPRIO_CLASS_RT 1 +#define LINUX_IOPRIO_CLASS_BE 2 +#define LINUX_IOPRIO_CLASS_IDLE 3 + +#define LINUX_IOPRIO_MIN 0 +#define LINUX_IOPRIO_MAX 7 + +#define LINUX_IOPRIO_WHO_PROCESS 1 +#define LINUX_IOPRIO_WHO_PGRP 2 +#define LINUX_IOPRIO_WHO_USER 3 + #endif /* _LINUX_MISC_H_ */ From nobody Fri Aug 4 13:53: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 4RHRy81QLKz4kV9W; Fri, 4 Aug 2023 13:53:36 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHRy73HvLz3Dxm; Fri, 4 Aug 2023 13:53:35 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:e80f:4253:61d8:bc92]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id BDDB383B0D6D8; Fri, 4 Aug 2023 15:53:31 +0200 (CEST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: b279e84a47dd - main - sctp: improve consistency From: tuexen@freebsd.org In-Reply-To: Date: Fri, 4 Aug 2023 15:53:31 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307282203.36SM3C98056354@gitrepo.freebsd.org> To: Kristof Provost X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4RHRy73HvLz3Dxm 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:680, ipnet:193.174.0.0/15, country:DE] > On 4. Aug 2023, at 15:03, Kristof Provost wrote: >=20 > On 29 Jul 2023, at 0:03, Michael Tuexen wrote: > The branch main has been updated by tuexen: > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db279e84a47ddb59e55b5a3cec31c51cd= 41bf0dc3 > commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3=20 > Author: Michael Tuexen =20 > AuthorDate: 2023-07-28 12:36:11 +0000=20 > Commit: Michael Tuexen =20 > CommitDate: 2023-07-28 12:36:11 +0000 > sctp: improve consistency > This is simplifying a patch to address PR 260116. > PR: 260116=20 > MFC after: 1 week > It looks like this commit (or maybe the next one, = c620788150d274c09a070ab486602c98407d73b0) causes a panic in the SCTP = code during the sys/netpfil/pf/sctp:basic_v4 test: > panic: Counter goes negative > cpuid =3D 7 > time =3D 1691145655 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xfffffe026ea9a3a0 > vpanic() at vpanic+0x132/frame 0xfffffe026ea9a4d0 > panic() at panic+0x43/frame 0xfffffe026ea9a530 > sctp_abort_notification() at sctp_abort_notification/frame = 0xfffffe026ea9a540 > sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame = 0xfffffe026ea9a640 > sctp_process_control() at sctp_process_control+0xf62/frame = 0xfffffe026ea9a990 > sctp_common_input_processing() at = sctp_common_input_processing+0x561/frame 0xfffffe026ea9ab10 > sctp_input_with_port() at sctp_input_with_port+0x1fa/frame = 0xfffffe026ea9abe0 > sctp_input() at sctp_input+0x10/frame 0xfffffe026ea9abf0 > ip_input() at ip_input+0x2ab/frame 0xfffffe026ea9ac50 > netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9acb0 > ether_demux() at ether_demux+0x17a/frame 0xfffffe026ea9ace0 > ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe026ea9ad30 > netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9ad90 > ether_input() at ether_input+0xd9/frame 0xfffffe026ea9adf0 > epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame = 0xfffffe026ea9ae40 > taskqueue_run_locked() at taskqueue_run_locked+0xab/frame = 0xfffffe026ea9aec0 > taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame = 0xfffffe026ea9aef0 > fork_exit() at fork_exit+0x82/frame 0xfffffe026ea9af30 > fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe026ea9af30 > --- trap 0, rip =3D 0x35c39ec8bda0, rsp =3D 0, rbp =3D 0x35c39ec8ec90 = --- > KDB: enter: panic >=20 > That seems to be panicking during SCTP packet handling, so I do not = believe this to be a pf bug. > Reverting both commits avoids the problem. > It=E2=80=99s also failing during the CI tests: = https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/23957/console= > (To reproduce, kldload pf sctp ; cd /usr/tests/sys/netpfil/pf ; sudo = kyua test sctp:basic_v4). Thank you very much for that line!! I think I know what the problem is. It comes down to an inconsistent = handling of shutdown() calls. This results in inconsistent sb_ccc / sb_acc values which are now = caught. I'm working on a patch which also fixes several syzkaller issues. Using = the above line, I'll also make sure it fixes the issue you are observing. Should be fixed by Monday. Best regards Michael > Best regards, > Kristof From nobody Fri Aug 4 13:59: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 4RHS4g11H3z4kVKd; Fri, 4 Aug 2023 13:59: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 4RHS4f5vXdz3FbX; Fri, 4 Aug 2023 13:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691157554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaaHiRAGtBKsdsJH8pmHdN0oWP7vJ21sUlESFBYguBs=; b=WVK3xj7Gu3KGgdES1Vdl3GopXNfp2dJNg22ZGdqIEcXNVGOSKhh60FtdxKGpGxTbgszu7A UbI19r0gwZKm1zJub4+BdkOSrwB6W2sKSHIQHWPqT5YImy/9uHiXCwU5/sKai31s7BV8pd DRqSIHWURWWJ6Zlnt0j6G8cq9cbmNgfok8cL7woWZbB2dkEmPvVGREVSfZV72EXX8oI+Zd Zvb2cthEkMVf4G6iOPNaMHkO+1zlmVoKZOhLHFKZZeS8XiqRpUbdsWOZnVl1cknoEpsRTp 8iVUx8RcuZfvT5T6UyzSVpXVjnmEPNB0iQgoYuM7tHtfyAYvFI4aRfGotAqcEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691157554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaaHiRAGtBKsdsJH8pmHdN0oWP7vJ21sUlESFBYguBs=; b=q30Ibpodeyt9ivC8FvPD4/qqENhuGcOcXzCPQ6aSCARYmG5+BnNBOfZEUWxg1Hw5ZV0kmg 6m0HgJ7BJcDBTNtkesKxQ2fT15QDaXrot0XyD5KfHbyuYCZzCwwIZejjOZZ6DoO8/IDkfG moYPazMPrEGv+Yu0poxKMXw75JA7oxQK3AgKHldX1sndDv95c6wW3jPGWmzDWD8rsMp5zK oakmDBahesb/wtoyHfujtx5QNzRqoX4xu19/tml7Br6rcM1lQLvBy678ZdXb1zyysDhuQN D1vX2w/CUyD6ET9pouXVKNGQm/RFoT/YcPwGOJ2Djw9BB35349ued4VxhG6olA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691157554; a=rsa-sha256; cv=none; b=VWQm47Tj7yDoMcm35sjNb3g3UySZyEcat2+6mK1yV7cIqXfbAzXY+1vfSu3McqJjfmWGZm 7/gR91P5kNyUwOalstbiiFM0xAiXia2iKWaK2dvcyd9S3/7ioPtH3XqTG5XynxGU9gR+x6 ESpCxPeAfZI+eWT48rK91cAoSHD/77W2XzhFkRqn1M+j1OM3uid9gKqR2+72o8jidU3XZY e7X21xfdsfOgsa4yvxdmkCDgXu2Kivv3NeDGanx5QgY6QDZYMN8VIvS592p65KrRrOlwNn 1aE9qZK5Kp1x3EMxrSdRSd/qaoW5dIgI7yNPo9wPX8iGcSK2EBmUcSjEwT5bvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHS4f4ztHz14pC; Fri, 4 Aug 2023 13:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374DxEpf070027; Fri, 4 Aug 2023 13:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374DxEIb070026; Fri, 4 Aug 2023 13:59:14 GMT (envelope-from git) Date: Fri, 4 Aug 2023 13:59:14 GMT Message-Id: <202308041359.374DxEIb070026@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: 76afcbb52492 - main - pf: handle multiple IPv6 fragment 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48 commit 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48 Author: Kristof Provost AuthorDate: 2023-07-13 08:25:49 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 13:23:49 +0000 pf: handle multiple IPv6 fragment headers With 'scrub fragment reassemble' if a packet contains multiple IPv6 fragment headers we would reassemble the packet and immediately continue processing it. That is, we'd remove the first fragment header and expect the next header to be a final header (i.e. TCP, UDP, ICMPv6, ...). However, if it's another fragment header we'd not treat the packet correctly. That is, we'd fail to recognise the payload and treat it as if it were an IPv6 fragment rather than as its actual payload. Fix this by restarting the normalisation on the reassembled packet. If there are multiple fragment headers drop the packet. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) MFC after: instant Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 6dda410d8327..d3fb5dcc00ab 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1254,6 +1254,8 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) goto drop; +again: + h = mtod(m, struct ip6_hdr *); plen = ntohs(h->ip6_plen); /* jumbo payload option not supported */ if (plen == 0) @@ -1322,6 +1324,8 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, return (PF_PASS); fragment: + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) goto shortpkt; @@ -1339,7 +1343,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, return (PF_DROP); pd->flags |= PFDESC_IP_REAS; - return (PF_PASS); + goto again; shortpkt: REASON_SET(reason, PFRES_SHORT); From nobody Fri Aug 4 13:59: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 4RHS4h6K3wz4kVKp; Fri, 4 Aug 2023 13:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHS4g6n85z3Fmd; Fri, 4 Aug 2023 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691157556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DLb9WVg+VM/D8s4ClXfXcduDzkrQC6S+dXJNpVREwyk=; b=XMhS7RaByhgjVARkDL/eGdDEZPZo0+jhMr3qChynaB2dUlOUivnRyPtEpQvJ2Kq08w3L+b UyNtpbg0VscQjtjRPcSOTubpiZQJeyR/ZeX/N8FZOxJhhYIOyav8+xZDwc8gAgYVAkJ+MW YjpmLd28X/AQckXB9qdnQUUaA5ApTnVn66enZKSsqo/hLYGdTPshpAWbYtLTMNG62arcfH Oj4iYOqhjxF/SIh1YGZaY+8tJ6nV6go74O8rQYFTTVgZjDx98Wu9k5AXlghcsPWAZQbICk QooQYiP5WhgmmFnBdH3B7LwgX1zx74ttM3OArAgBMIXMRRpl2rqtN1T7T1HiUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691157555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DLb9WVg+VM/D8s4ClXfXcduDzkrQC6S+dXJNpVREwyk=; b=sZSbJjg8OJOF/VMp0tcgssMFuyzIFpXyw/fzdXA/yDPU889dd9REEqxK2hOVqcTJ8Q87fe 2RK4mW+i2hlssHb0tIuUUnfOnltNNGZeukW978j446EnaCJ6eEL80Y5vLAhe3PBBv6suN3 I9K4xiQfCHwLqxePUbXvhhnAD/1duTV+1lVQ8PLhr8238lwgQPjybX5M/rjMVFEN3q1VxJ UmcNGZdXn/Gv5VoiDsw+Vwyr/QqoZJD+sExST+O2bbd9NN/e71y95aCQvDoAPOuCx6R1fO 6RvmY4KcKY9uxGygHZBiMNHB661/4AMOe6EirSI47KfvAA1Pp718nv+tIY6pqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691157555; a=rsa-sha256; cv=none; b=sD7fS3xMvk/s33KeMLP7bK5d6Ia4Rsi8F6WuwpwxlvwDjvjlZNHCJryeFQAX7grFzGtT08 bHYjD/nk2n8gkghqxnKX57c36z93t9GIMavf2umZDiBM4RzNKZcZFxwtZusBIpSlRu2mc/ HAsb7NuMEU6ZjcP8kAdo1OsvoY2aZmwjsBeERLEbzPot0FCjqfDCJ4Q6UnakGHngXBaJBO X50e4oVeZ0LUp+CLJUXJg1lnfzDB90+H6V4BF9/TfXhIQCtKzj2YWXuQiqTta2vINXIZHx di3kQQcm0RlqwNijBg6ZTWxpKcVYZjMRpxoNYX1ATij5p7Ltvi3fxMB/O6iezg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHS4g5sSPz14pD; Fri, 4 Aug 2023 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374DxFD2070047; Fri, 4 Aug 2023 13:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374DxFGx070046; Fri, 4 Aug 2023 13:59:15 GMT (envelope-from git) Date: Fri, 4 Aug 2023 13:59:15 GMT Message-Id: <202308041359.374DxFGx070046@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: b23dbabb7f3e - main - pf: test rules evaluation in the face of multiple IPv6 fragment 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b23dbabb7f3edb3f323a64f03e37be2c9a8b2a45 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b23dbabb7f3edb3f323a64f03e37be2c9a8b2a45 commit b23dbabb7f3edb3f323a64f03e37be2c9a8b2a45 Author: Kristof Provost AuthorDate: 2023-07-13 06:34:54 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 13:24:16 +0000 pf: test rules evaluation in the face of multiple IPv6 fragment headers Send an ICMPv6 echo request packet with multiple IPv6 fragment headers. Set rules to pass all packets, except for ICMPv6 echo requests. pf ought to drop the echo request, but doesn't because it reassembles the packet, and then doesn't handle the second fragment header. In other words: it fails to detect the ICMPv6 echo header. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) MFC after: instant Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/atf_python/sys/net/tools.py | 21 ++++++++++++++ tests/sys/netpfil/pf/Makefile | 2 ++ tests/sys/netpfil/pf/frag6.py | 60 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/tests/atf_python/sys/net/tools.py b/tests/atf_python/sys/net/tools.py index 567d9d4b21ac..44bd74d8578f 100644 --- a/tests/atf_python/sys/net/tools.py +++ b/tests/atf_python/sys/net/tools.py @@ -1,6 +1,7 @@ #!/usr/local/bin/python3 import json import os +import subprocess class ToolsHelper(object): @@ -13,6 +14,26 @@ class ToolsHelper(object): print("run: '{}'".format(cmd)) return os.popen(cmd).read() + @classmethod + def pf_rules(cls, rules, verbose=True): + pf_conf = "" + for r in rules: + pf_conf = pf_conf + r + "\n" + + if verbose: + print("Set rules:") + print(pf_conf) + + ps = subprocess.Popen("/sbin/pfctl -g -f -", shell=True, + stdin=subprocess.PIPE) + ps.communicate(bytes(pf_conf, 'utf-8')) + ret = ps.wait() + if ret != 0: + raise Exception("Failed to set pf rules %d" % ret) + + if verbose: + cls.print_output("/sbin/pfctl -sr") + @classmethod def print_output(cls, cmd: str, verbose=True): if verbose: diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 19c87486d8bb..5c59584d2ec9 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -40,6 +40,8 @@ ATF_TESTS_SH+= altq \ table \ tos +ATF_TESTS_PYTEST+= frag6.py + # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py new file mode 100644 index 000000000000..28b1829d418c --- /dev/null +++ b/tests/sys/netpfil/pf/frag6.py @@ -0,0 +1,60 @@ +import pytest +import logging +import threading +import time +logging.getLogger("scapy").setLevel(logging.CRITICAL) +from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import VnetTestTemplate + +class DelayedSend(threading.Thread): + def __init__(self, packet): + threading.Thread.__init__(self) + self._packet = packet + + self.start() + + def run(self): + import scapy.all as sp + time.sleep(1) + sp.send(self._packet) + +class TestFrag6(VnetTestTemplate): + REQUIRED_MODULES = ["pf"] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1"]}, + "if1": {"prefixes6": [("2001:db8::1/64", "2001:db8::2/64")]}, + } + + def vnet2_handler(self, vnet): + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "scrub fragment reassemble", + "pass", + "block in inet6 proto icmp6 icmp6-type echoreq", + ]) + + def check_ping_reply(self, packet): + print(packet) + return False + + @pytest.mark.require_user("root") + def test_dup_frag_hdr(self): + "Test packets with duplicate fragment headers" + srv_vnet = self.vnet_map["vnet2"] + + # Import in the correct vnet, so at to not confuse Scapy + import scapy.all as sp + + packet = sp.IPv6(src="2001:db8::1", dst="2001:db8::2") \ + / sp.IPv6ExtHdrFragment(offset = 0, m = 0) \ + / sp.IPv6ExtHdrFragment(offset = 0, m = 0) \ + / sp.ICMPv6EchoRequest(data=sp.raw(bytes.fromhex('f00f') * 128)) + + # Delay the send so the sniffer is running when we transmit. + s = DelayedSend(packet) + + packets = sp.sniff(iface=self.vnet.iface_alias_map["if1"].name, + timeout=3) + for p in packets: + assert not p.getlayer(sp.ICMPv6EchoReply) From nobody Fri Aug 4 14:08: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 4RHSHC5cygz4kWL8; Fri, 4 Aug 2023 14:08: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 4RHSHC4zZ0z3Gxq; Fri, 4 Aug 2023 14:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4h0BhqdiSVhiJXY4x3gTVt9jtGzlb0TGBOQKtX65hRQ=; b=F7hUrus5JuClR2kNGS02KTpKTMaFBiD3e8inQvi+Ox6dtJ+nwvSUJyftAnCILdVoNjL5R5 MWsR5/4XIx07KBcRCYPGomm2zqKoteFjfP9UG9ZGuisjEkk9Mh6HuPw/Wn5PyesZ8tFL98 ICAygKlUCx9H/duux4n1vsOQODpOd/cKbTz2Gd8rrDgtGySHxw1i2cs1ZBLEVX9CawWZs5 nuuxYYXrQEZoPShnrUcjx+GsraSEglp4gHTPmuW84v2HKGhRnoEG+aapThSGMVNajZ7YiV htzuWkyaP5Yev98mfBt42rtUSBC3GnvzlcJMydEjmDLzo1kiPxmnsMz7kCLk2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4h0BhqdiSVhiJXY4x3gTVt9jtGzlb0TGBOQKtX65hRQ=; b=VNERSPiLSPEpWxBQUH+WkzWBhYhz7evVo4iTBh6xAOTWCDZMJY6eYRqay46L4BXzl57bV3 y5mtOryV+WhruOD8B6sL5qlgGU6l5LPeYRVtiIXgZ1DgeqeGR3d0k+v0C8PXjPPRLlKZOi WsAYdjrM/8OO+vqDsGuQAbJODUJjrW43YiCjSPNlVAS006VLtuo4jYRAOh23ZfyGcW9k9r WcxpubMkzZ4AEWmWtDRuu9vnFfG87Fl/8MPRlkJT8fCf0W4EKUNIz1zmL4uGSlAyFY3Gld mGsDOPXAaCGrdT3JlYEMu2TUK0zz/Nob+D2+WkRsokOfO5CSRgk1s2FwQoeVBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691158103; a=rsa-sha256; cv=none; b=V945WUI8bJCnhaJRm2+PkY0q369Bl/+X1cgCGsi7gxQNjZDg9BBEQvxaJ9McdHaDlTsL9M 8AZqfNzjxS8sB7s46C0ZEk/OGHb0pY/8bkFkIg8BWKlB/+MWmLQ3dL+fmuH8ATPb98rPju jGa2awKoiSuDct9Q0CzR5XYRNkh5iJ/As3mwPTOroz558PQcYzWuiD0Yl3i0tuZnE3g4eH yqzDSs4N9bQQXwvf7dO0HbeIO4PZqgrKupSlZrrPycKzQyCfnyh66bI3xxVCxXGO+Cansb bgwbpf9GiBIq8ruD6WMZH26ho5g1NmhAkGfxlUaVuRrrprJqlQQUIYh2dmI6QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHSHC43tGz15DX; Fri, 4 Aug 2023 14:08: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 374E8NiS087504; Fri, 4 Aug 2023 14:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374E8NeP087503; Fri, 4 Aug 2023 14:08:23 GMT (envelope-from git) Date: Fri, 4 Aug 2023 14:08:23 GMT Message-Id: <202308041408.374E8NeP087503@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: 06185987d36f - stable/13 - atf_pytest_wrapper: fix use with pytest-7.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06185987d36ffdeff4e34608bb910fe629c76da5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06185987d36ffdeff4e34608bb910fe629c76da5 commit 06185987d36ffdeff4e34608bb910fe629c76da5 Author: Kristof Provost AuthorDate: 2023-07-18 14:20:47 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 14:08:05 +0000 atf_pytest_wrapper: fix use with pytest-7.4 As of pytest 7.4 it no longer walks all the way to the root directory of the file system to find conftest files. As a result we don't find / usr/tests/conftest.py, and don't load atf_python. That in turn causes atf_python tests to fail. Explicitly set the confcutdir, as advised by the pytest changelog. See also: https://github.com/pytest-dev/pytest/pull/11043 MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D41064 (cherry picked from commit 9f23cbd6cae82fd77edfad7173432fa8dccd0a95) --- libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp index 78b045b9775f..b0cc600bde21 100644 --- a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp +++ b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp @@ -141,6 +141,8 @@ class Handler { std::vector args = {"pytest", "-vv", "-p", "no:cacheprovider", "-s", "--atf"}; + args.push_back("--confcutdir=" + python_path); + if (flag_list) { args.push_back("--co"); args.push_back(script_path); From nobody Fri Aug 4 14:08: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 4RHSHD6YW5z4kVSd; Fri, 4 Aug 2023 14:08: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 4RHSHD5nF7z3GtF; Fri, 4 Aug 2023 14:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zd9KuwPNmK9ee4lp2eENilvlGNzjsgpDBAyh5cc20Qw=; b=LmeZToxCuevoQQm9tMfEs9n7aE0DnIa1wf5nC953BT0R6rXHpT0TcFRo3qvFYlKZqfwBpH NPwPnSLc9NOswOnr2n8XM0EFQ5gYbae/5xCFjuopS8V6EQKEt4Sb3bcfwzoxkwMnzU+K7g YTdw3prjQr0q2iFkPL2Z4PvdszXGruz2GFWL8wLhFda+ZDa/Z1wkTXHeSsUG8DIuyngVxb 8LTNvhUW2S1OSFOEjsm2tCOTz8la8uM3DMkXYWnJYMPi2QBSUnO+uj+Bo7axGxiBdJ/Och ZtYSNllYd7pq05Lrw6gsgajrWg0wk7LfFzHGe1agddr0rul7s8e9z+F22MvFdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zd9KuwPNmK9ee4lp2eENilvlGNzjsgpDBAyh5cc20Qw=; b=i2b7WWvjduJS87/nNktPG8oc6DMDCOjOwTQ+ZrdpGBMg6UISw+6uPa6VTWg1PaSLJGNbOw JdeVX1okDOWuhilwGB7izDcoSjLX/qTuM9h2DWqv4BXqkzN1CeGULCHaO24XwEp8QVhYnN IVQkr7WfPFtbFsSWLDRuFqeg0LljZ2o1ReHH+dsZPSiG3g0WaUOzFUwGTo8W8gRHPNUrgH FQBMSrGjCLjkKj/cYQNzaXGzUDIHZvQmzppH5TDVlgm20sxxgXuIBZOYMfnV+dMDcV+bNg Mn/iKafFIiu478BSgvxd+P166E4wXgfNIdlFDHbUzAl3Ocq652qDFpVEv4xE/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691158104; a=rsa-sha256; cv=none; b=FFYzdrYdAeQ/e46CRNkClJVPPkjIUROlo7+so+rFtiG6NVRUpnJAGm88D3XXhP07Vgpido tqh6T7S6Q609Hp9q/fQcdrgCTxTWN0WFQlZnVu2i6YWKyypqANGcMSYSId3vFh+s/zTAXL AKCznXf+hg+mpiW2LeJBXe55Pb03Aducpm7UMB8JM41JJVMA80X4N3W5WhbQg36X40xEfq pF7zMREZsh01z0RayS/8bgxUGTSbi42muodNAbLY+4I5xJvpLn2nBAs5GkbVAFlAoL4pj7 SGTjXQuqroi9Ew80GbPpntFkJ2Hz6cIn/y5pqiESVXpkRq1l8IlJFaXG2zUl9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHSHD4lp9z14py; Fri, 4 Aug 2023 14:08: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 374E8O1w087524; Fri, 4 Aug 2023 14:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374E8Ob8087523; Fri, 4 Aug 2023 14:08:24 GMT (envelope-from git) Date: Fri, 4 Aug 2023 14:08:24 GMT Message-Id: <202308041408.374E8Ob8087523@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: 3a0461f23a4f - stable/13 - pf: handle multiple IPv6 fragment 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3a0461f23a4f4fe8fc82b3445285d3d07787b016 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3a0461f23a4f4fe8fc82b3445285d3d07787b016 commit 3a0461f23a4f4fe8fc82b3445285d3d07787b016 Author: Kristof Provost AuthorDate: 2023-07-13 08:25:49 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 14:08:05 +0000 pf: handle multiple IPv6 fragment headers With 'scrub fragment reassemble' if a packet contains multiple IPv6 fragment headers we would reassemble the packet and immediately continue processing it. That is, we'd remove the first fragment header and expect the next header to be a final header (i.e. TCP, UDP, ICMPv6, ...). However, if it's another fragment header we'd not treat the packet correctly. That is, we'd fail to recognise the payload and treat it as if it were an IPv6 fragment rather than as its actual payload. Fix this by restarting the normalisation on the reassembled packet. If there are multiple fragment headers drop the packet. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) MFC after: instant Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48) --- sys/netpfil/pf/pf_norm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index cac9c1fe391f..ae026fb9cee1 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1216,6 +1216,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) goto drop; +again: + h = mtod(m, struct ip6_hdr *); plen = ntohs(h->ip6_plen); /* jumbo payload option not supported */ if (plen == 0) @@ -1286,6 +1288,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_PASS); fragment: + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) goto shortpkt; @@ -1303,7 +1307,7 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_DROP); pd->flags |= PFDESC_IP_REAS; - return (PF_PASS); + goto again; shortpkt: REASON_SET(reason, PFRES_SHORT); From nobody Fri Aug 4 14:08: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 4RHSHG4jhCz4kW04; Fri, 4 Aug 2023 14:08: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 4RHSHF6XjVz3H49; Fri, 4 Aug 2023 14:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqjWv79rl1A5H7rVsPqYpVHZlKP0LCwXZxRlTcSmdUg=; b=PahedTV+3LBYKNSHiXQVT5d1PjG6WWK6aTmGg3PYWXi1ADeFbih+7rqZgocfwrLs3HjuzP eTtPEaCvx8rFJbOc7xYfVSdWPI5giFblZ2Nn5Zjv1q5pqcKzuLlL1w7Wwu+Kk+jp0SApqa MOW5R4+aYFJ0Ye/qT5OgcjpesqZDyr+dd7kINsOxapLOk8oXzwXgDQ1LAXk+7oPCLySFje 2fRuMzIoJU+1w9C7i6h+/zdEs5MvzPkjGbc2PVEyY+gc1LwjsT3jyoAmePsvnlB9nBiPcH TkMLbHvC/jgHFLW7qIHZN37wn2S0DWGC47i9TYYNjJ3mQ15TFRzrF+IerjkmqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqjWv79rl1A5H7rVsPqYpVHZlKP0LCwXZxRlTcSmdUg=; b=ZvYalBC7iy+B79dIcVnR6xomSrbQpkV0YEjUDObYF0VL/bYc0QroVXceppcwA+t4fEhypW UCd+MHQcIw+OCwNpWTsUhasGTHC2sSyrnZswjsRJ2qKbVt+0WR2S0Ees5APSgCGZq3QTU2 uJexlfmER4pW24aYElnrkKXo5xZQTEHSB12s8lRA+kymBrIEmvTzRABhjhFWocpDUwHi/G q6dmuhJa8fmudl0iWEMpvvYgw6jd1qHy1S+kwP/GjfL2ETa+tDhCr0jTVTULh8LpSp6sop PfhyrPyoVtgBRmnlkvuJQp3xdx10sgqHvlXcdW5+awkdj7MsyMdfKR3X34bXEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691158106; a=rsa-sha256; cv=none; b=lncKbLZFkWekxb5kfPX5Dbxr21kPAcwptvSRasUMzJxV8vTK6t4l6IwLzvzphZFtZguGha TwLL8i7ipmscpirpNL1+b/inShs3dBfm2LqTMqCaIbH3p+akVhrK5dGj67K54FjvgnHuHA MpwBoMvqZnkWHmfoRv6gMjLcVhaSqk9VBP5FN3KG+MT8y1efg4B9uq6/nxL8vC1xSa9Ttp V/6Wm31XytGjKyX2OdWklpTtgIqwi/ozXp9kvGrlAYYxO9+PSoLhghXHxyvG2wKpFdu3KL JytOsmdM9CwbJL0n0uCZsMWzPYORY1JB5Yjyy+FUTgbLlIno8KXDIQtM4d02rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHSHF5Wmfz14L2; Fri, 4 Aug 2023 14:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374E8PpY087549; Fri, 4 Aug 2023 14:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374E8PJj087548; Fri, 4 Aug 2023 14:08:25 GMT (envelope-from git) Date: Fri, 4 Aug 2023 14:08:25 GMT Message-Id: <202308041408.374E8PJj087548@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: 0607df059582 - stable/13 - pf: test rules evaluation in the face of multiple IPv6 fragment 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0607df059582abc970b21cc3ce6e297dec1d5eeb Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0607df059582abc970b21cc3ce6e297dec1d5eeb commit 0607df059582abc970b21cc3ce6e297dec1d5eeb Author: Kristof Provost AuthorDate: 2023-07-13 06:34:54 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 14:08:05 +0000 pf: test rules evaluation in the face of multiple IPv6 fragment headers Send an ICMPv6 echo request packet with multiple IPv6 fragment headers. Set rules to pass all packets, except for ICMPv6 echo requests. pf ought to drop the echo request, but doesn't because it reassembles the packet, and then doesn't handle the second fragment header. In other words: it fails to detect the ICMPv6 echo header. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) MFC after: instant Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit b23dbabb7f3edb3f323a64f03e37be2c9a8b2a45) --- tests/atf_python/sys/net/tools.py | 21 ++++++++++++++ tests/sys/netpfil/pf/Makefile | 2 ++ tests/sys/netpfil/pf/frag6.py | 60 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/tests/atf_python/sys/net/tools.py b/tests/atf_python/sys/net/tools.py index 567d9d4b21ac..44bd74d8578f 100644 --- a/tests/atf_python/sys/net/tools.py +++ b/tests/atf_python/sys/net/tools.py @@ -1,6 +1,7 @@ #!/usr/local/bin/python3 import json import os +import subprocess class ToolsHelper(object): @@ -13,6 +14,26 @@ class ToolsHelper(object): print("run: '{}'".format(cmd)) return os.popen(cmd).read() + @classmethod + def pf_rules(cls, rules, verbose=True): + pf_conf = "" + for r in rules: + pf_conf = pf_conf + r + "\n" + + if verbose: + print("Set rules:") + print(pf_conf) + + ps = subprocess.Popen("/sbin/pfctl -g -f -", shell=True, + stdin=subprocess.PIPE) + ps.communicate(bytes(pf_conf, 'utf-8')) + ret = ps.wait() + if ret != 0: + raise Exception("Failed to set pf rules %d" % ret) + + if verbose: + cls.print_output("/sbin/pfctl -sr") + @classmethod def print_output(cls, cmd: str, verbose=True): if verbose: diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 8f6b57797e23..26e5710d6f81 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -32,6 +32,8 @@ ATF_TESTS_SH+= altq \ table \ tos +ATF_TESTS_PYTEST+= frag6.py + # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py new file mode 100644 index 000000000000..28b1829d418c --- /dev/null +++ b/tests/sys/netpfil/pf/frag6.py @@ -0,0 +1,60 @@ +import pytest +import logging +import threading +import time +logging.getLogger("scapy").setLevel(logging.CRITICAL) +from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import VnetTestTemplate + +class DelayedSend(threading.Thread): + def __init__(self, packet): + threading.Thread.__init__(self) + self._packet = packet + + self.start() + + def run(self): + import scapy.all as sp + time.sleep(1) + sp.send(self._packet) + +class TestFrag6(VnetTestTemplate): + REQUIRED_MODULES = ["pf"] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1"]}, + "if1": {"prefixes6": [("2001:db8::1/64", "2001:db8::2/64")]}, + } + + def vnet2_handler(self, vnet): + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "scrub fragment reassemble", + "pass", + "block in inet6 proto icmp6 icmp6-type echoreq", + ]) + + def check_ping_reply(self, packet): + print(packet) + return False + + @pytest.mark.require_user("root") + def test_dup_frag_hdr(self): + "Test packets with duplicate fragment headers" + srv_vnet = self.vnet_map["vnet2"] + + # Import in the correct vnet, so at to not confuse Scapy + import scapy.all as sp + + packet = sp.IPv6(src="2001:db8::1", dst="2001:db8::2") \ + / sp.IPv6ExtHdrFragment(offset = 0, m = 0) \ + / sp.IPv6ExtHdrFragment(offset = 0, m = 0) \ + / sp.ICMPv6EchoRequest(data=sp.raw(bytes.fromhex('f00f') * 128)) + + # Delay the send so the sniffer is running when we transmit. + s = DelayedSend(packet) + + packets = sp.sniff(iface=self.vnet.iface_alias_map["if1"].name, + timeout=3) + for p in packets: + assert not p.getlayer(sp.ICMPv6EchoReply) From nobody Fri Aug 4 14:13: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 4RHSNp0kCvz4kWrV; Fri, 4 Aug 2023 14:13: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 4RHSNn74gZz3Hv8; Fri, 4 Aug 2023 14:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGQQGe+uVFk735P/pgZ5eLshawSL8VXnxxhyv7bTqzA=; b=Toja3FJdt6QgOHL9agVITP7xxl8Gr4VP1SG8bGq/qyhBeSRQf0dhYq6NEIzkl356UCwQ7v vFT5KadBREaUonjcpkHEigo+0rSNrLvnzq1TJgeBSWxe3Zuxep0YFuj2CKYizYfrOI/+m6 +h+6kyVlBKvLuxOM3Go/9EdHIURgCbD2zdfXqeo866ZYXEDl27q6VRhEPRuI8FjQpdNllS Y+33VGkt30sMJ/9iJPfcegOAehVtXJiwxpaXl2+d90boAigKmAqSBe7NM1r5njcix586kV jOD6wYLqyuGssI+jeYayHbov9zJJXSUy2ZUlUahKpPG21gxpxIzFWg/sIWr4LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGQQGe+uVFk735P/pgZ5eLshawSL8VXnxxhyv7bTqzA=; b=qONktvLDG3f1wcGeAU+dSK8b9ZWdQofBsBH+4eW2iyn7yUCtyVSVodlr1+vqpfMwyRu0Aw 77+jmQUU3mG3TW2Baqnp9DhDfqpF596QVxIMLCqiEU3VdJuGETVEVqF7lW2HRJgC0gFVRr 3ETIHVCuOyrekEkxaX/GJD0T0XpDsfubeqv9WswySZBy/zDwMFSlcWwu2xDKv23Dlh5+VX zvA8vBjLQqMxc0f7LIxEZsr+BrH7xK0x1vEdROvAJIUzeYKMK/1VTGr1ztBTnRZellF6CV e5TQ8qhnqkDT/v0C8se1wkmkUnaX6LBcH63nLX1JW1aOkAGZFoOmSfOV9dbVmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691158394; a=rsa-sha256; cv=none; b=t5nOgY6+Mx7ssyTLPceBcqkD075Cb+0/PE/zK71B3haODNywx7dLRuey+KLeMblhrtRwLL s5MqWYzUZkPSUCsatNTPqyp6V/twS9unL8aCSdZDXx2sUWHl0MYm/ASIH82SuHN3wLJbOO oRJtJNjNDcpgddRXvxuy8WxLswwnI8hb468Yzar+nt8Ye+6JboFKMj2koxFfGmqSFz2XUX q4Cq2ZUgP4koxKaFU/RItgiWYUppU1LFbyfM7HhRMzjaFNxN4YzXfgS0YLQNblANS9+cMp IBj+pL3yFe0VENISMs25MfyIBGS/j1DdYK7UqFNGsXJ5TUUS0zcc91eieou5Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHSNn67V9z154G; Fri, 4 Aug 2023 14:13: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 374EDDw6003574; Fri, 4 Aug 2023 14:13:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374EDD75003573; Fri, 4 Aug 2023 14:13:13 GMT (envelope-from git) Date: Fri, 4 Aug 2023 14:13:13 GMT Message-Id: <202308041413.374EDD75003573@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: 8922b9ac0b48 - stable/12 - pf: handle multiple IPv6 fragment 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8922b9ac0b48749be42689ea959e6a1664f96b12 Auto-Submitted: auto-generated The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8922b9ac0b48749be42689ea959e6a1664f96b12 commit 8922b9ac0b48749be42689ea959e6a1664f96b12 Author: Kristof Provost AuthorDate: 2023-07-28 09:39:33 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 14:01:23 +0000 pf: handle multiple IPv6 fragment headers With 'scrub fragment reassemble' if a packet contains multiple IPv6 fragment headers we would reassemble the packet and immediately continue processing it. That is, we'd remove the first fragment header and expect the next header to be a final header (i.e. TCP, UDP, ICMPv6, ...). However, if it's another fragment header we'd not treat the packet correctly. That is, we'd fail to recognise the payload and treat it as if it were an IPv6 fragment rather than as its actual payload. Fix this by restarting the normalisation on the reassembled packet. If there are multiple fragment headers drop the packet. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) MFC after: instant Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48) --- sys/netpfil/pf/pf_norm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index ec063f82c1d9..9e936bcd1da5 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1213,6 +1213,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) goto drop; +again: + h = mtod(m, struct ip6_hdr *); extoff = 0; off = sizeof(struct ip6_hdr); proto = h->ip6_nxt; @@ -1303,6 +1305,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_PASS); fragment: + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); /* Jumbo payload packets cannot be fragmented. */ plen = ntohs(h->ip6_plen); if (plen == 0 || jumbolen) @@ -1324,7 +1328,7 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_DROP); pd->flags |= PFDESC_IP_REAS; - return (PF_PASS); + goto again; shortpkt: REASON_SET(reason, PFRES_SHORT); From nobody Fri Aug 4 15:16: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 4RHTp46Gj2z4Tlgt; Fri, 4 Aug 2023 15:16:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 4RHTp43KKlz3RTS; Fri, 4 Aug 2023 15:16:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-76c93abeb83so170651685a.0; Fri, 04 Aug 2023 08:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691162202; x=1691767002; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=geAQseklUR/icIYaRObxR7a+H/IwCxQnF+C3DkWTESQ=; b=lNSv09c5z2/Cct4SXNiydOvcwvPqRbzwEUhK9M93s2+/uvwEnPQ+QzQ7SfcuI+khYE qjWfVZ+ya8Bb1H1eG+vMtpedExo4N2yyR00OkEIA3aiBGNYK1CX03q24JLuC1H1IPLb6 hxt9fgSfamGxHEbrUpy19zMX3dx5V7mqALqcgGh7UekoAYI9a41OkdnSLQN0r7wd3c5z hbcxXaYM9tvhnAcSv0PWNXIkHSqh/UuinzTGbqQngj1X9VDtgt6P52rLSz/eN0Ekd9+I SfPiflXsJOaG8+rLjE0+LwSo+wl2z8uLfAySuiSQx7oQzs448K/J1Mj32y78yr8xwaZv IeQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691162202; x=1691767002; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=geAQseklUR/icIYaRObxR7a+H/IwCxQnF+C3DkWTESQ=; b=UMPCIk9FJlxiXRRAY4MiIrfd7BkFj4LsLZVwAxa2fkLWJLF9mXzG2ah2NMAo+WeLLq 3ynG1X973HfFkCNqZeBry1Z0pmPwm6eKigrCUn/GRRLI+lK4M6OYpPzJmujWP/eIK00r PWDbG+3DucHrvgmz4N1vV9qXFbNzOpYe/boL7pOxjMdnLrAacQ35GxP8Secg2a5YmOj0 qYuUiMIo8QUdTAyBeqiOqFngUFco9O+i4Z2L2EZUwrEIRTcRgjppca4qlImYkx09wkP8 HtpP7fO4qKLTQKJHuVETpnVLZlIk/65WnZuF2u4TjRUkW/waEU7GV8RaCHWDEQtxuZ+X 7w2Q== X-Gm-Message-State: AOJu0YwYWp4GWC32y2Lya357Y6cu+bwPfcwf1Kv54anPg2tIEoQiNR5Q SKAFrGVbJoLOUZ5n+bZbg/7xyDhcZA4= X-Google-Smtp-Source: AGHT+IEaq782DcyDzUYYM2AbFlcebUxA+mZ04hhMx+Tirpx5cXmA9/pt1YTtArIIyZKo0aM4hP+n9w== X-Received: by 2002:a05:620a:3904:b0:76c:b87c:16cc with SMTP id qr4-20020a05620a390400b0076cb87c16ccmr2684262qkn.61.1691162202398; Fri, 04 Aug 2023 08:16:42 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id i17-20020a05620a145100b0076ca9269de7sm703211qkl.124.2023.08.04.08.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 08:16:41 -0700 (PDT) Date: Fri, 4 Aug 2023 11:16:39 -0400 From: Mark Johnston To: tuexen@freebsd.org Cc: Kristof Provost , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: b279e84a47dd - main - sctp: improve consistency Message-ID: References: <202307282203.36SM3C98056354@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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4RHTp43KKlz3RTS X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Fri, Aug 04, 2023 at 03:53:31PM +0200, tuexen@freebsd.org wrote: > > On 4. Aug 2023, at 15:03, Kristof Provost wrote: > > > > On 29 Jul 2023, at 0:03, Michael Tuexen wrote: > > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 > > commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3 > > Author: Michael Tuexen > > AuthorDate: 2023-07-28 12:36:11 +0000 > > Commit: Michael Tuexen > > CommitDate: 2023-07-28 12:36:11 +0000 > > sctp: improve consistency > > This is simplifying a patch to address PR 260116. > > PR: 260116 > > MFC after: 1 week > > It looks like this commit (or maybe the next one, c620788150d274c09a070ab486602c98407d73b0) causes a panic in the SCTP code during the sys/netpfil/pf/sctp:basic_v4 test: > > panic: Counter goes negative > > cpuid = 7 > > time = 1691145655 > > KDB: stack backtrace: > > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe026ea9a3a0 > > vpanic() at vpanic+0x132/frame 0xfffffe026ea9a4d0 > > panic() at panic+0x43/frame 0xfffffe026ea9a530 > > sctp_abort_notification() at sctp_abort_notification/frame 0xfffffe026ea9a540 > > sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame 0xfffffe026ea9a640 > > sctp_process_control() at sctp_process_control+0xf62/frame 0xfffffe026ea9a990 > > sctp_common_input_processing() at sctp_common_input_processing+0x561/frame 0xfffffe026ea9ab10 > > sctp_input_with_port() at sctp_input_with_port+0x1fa/frame 0xfffffe026ea9abe0 > > sctp_input() at sctp_input+0x10/frame 0xfffffe026ea9abf0 > > ip_input() at ip_input+0x2ab/frame 0xfffffe026ea9ac50 > > netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe026ea9acb0 > > ether_demux() at ether_demux+0x17a/frame 0xfffffe026ea9ace0 > > ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe026ea9ad30 > > netisr_dispatch_src() at netisr_dispatch_src+0xad/frame 0xfffffe026ea9ad90 > > ether_input() at ether_input+0xd9/frame 0xfffffe026ea9adf0 > > epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame 0xfffffe026ea9ae40 > > taskqueue_run_locked() at taskqueue_run_locked+0xab/frame 0xfffffe026ea9aec0 > > taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame 0xfffffe026ea9aef0 > > fork_exit() at fork_exit+0x82/frame 0xfffffe026ea9af30 > > fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe026ea9af30 > > --- trap 0, rip = 0x35c39ec8bda0, rsp = 0, rbp = 0x35c39ec8ec90 --- > > KDB: enter: panic > > > > That seems to be panicking during SCTP packet handling, so I do not believe this to be a pf bug. > > Reverting both commits avoids the problem. > > It’s also failing during the CI tests: https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/23957/console > > (To reproduce, kldload pf sctp ; cd /usr/tests/sys/netpfil/pf ; sudo kyua test sctp:basic_v4). > Thank you very much for that line!! > > I think I know what the problem is. It comes down to an inconsistent handling of shutdown() calls. > This results in inconsistent sb_ccc / sb_acc values which are now caught. > > I'm working on a patch which also fixes several syzkaller issues. Using the above line, I'll also make > sure it fixes the issue you are observing. Should be fixed by Monday. In the meantime, it's impossible to run through the test suite. Would it be possible to revert the offending commit(s) until a bug fix is ready? From nobody Fri Aug 4 15:24: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 4RHTyj2HZcz4Tm6L; Fri, 4 Aug 2023 15:24: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 4RHTyj1tSzz3SWw; Fri, 4 Aug 2023 15:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691162653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZZE18FDrdrwfV2tf01H2jdfOHmCC3oXPketdxrfH8c=; b=PkGkL9vnstJEe1Jxrb71QU01okhI//xNX0MBEYxWe0c1uLnO4fHkmmX7jf8zz5Ziv6YbbM tmdTqB0kT5tSIuk7RJrBWEhwiIIBLQ0FRc3CrcQD8VuUZXDKcP/xT9DD47KysLH6RdjF8W T7kI9UOm6LfNc8XsrdwCKx5JRjfMYDmXTTgdpUL2WbWC5wXUOJJwGgnME8fzMt8135exgC qfSiTpSq9osaJsmA+mQ0mg5j3Hm2Enuks9XepgkezGhIMo0aDCPlJfTwPUGwAiLwcjNwbm 2/FxVRmugGO6oJ5vF0T55+vUnNwRA7PpxBvP5+yPE/zDnGQVDJ0SHh7R3sqYPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691162653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZZE18FDrdrwfV2tf01H2jdfOHmCC3oXPketdxrfH8c=; b=iLd/lMzFABb9JXJTWMx5pwPHAnvJ7X+EbfqgPm9ROwaHrq88OricwAFD+vSYfOUfbCPXs2 npcm02F/xhGJsFFY8qUbcvxm+wK/bPhernLsYnjjPT7ibYjg5g9PhpLV1x0R0Z/5oPHfnl LHMExEcmzCfQmU5x8BfOxNA3rhnRlyiIUDIkK0rBHOK3w6c8BQiPKPkveCdUVrBMXW2YCQ g0tUpAtCyHuTsheEfCQke3jOPHB6fm+o0qVJYn589sqUHUiUmKh5zO/qMQ4vIbZKHYHCgs RprnBnfhHwbeBR3UfMdjaRpBbGRsiGEyU0aEEpZkP+eStTr5ak2INfilfnA6ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691162653; a=rsa-sha256; cv=none; b=yfBZkTppwpbt7cMtYORXEhZtTJ3/zsfUYaIuVi8H1mlXvoDb5CwJxrm00ZqeCk0Xb8bZnL JGXIhLLMuPC0hc0oFLW8qviEqJRUu/YGiT3CsubU0qnXepaS3tOCs4eem3uFaT4UUTe/RV PSyeQ05hHqy8WkNuW2gCqjGno9oOCo1wLFSc+BDR8aNfdRalma/ldlHlhG5+14ZiNeg5Lz h27Wpi4qcalRdYVnzn4C70MO4X754243Ng94QcvBOFGAQq7jTUnHVUiszaRMiaioPN4EuF DORhGiyWzkr/QLP2zN8xA1oxAP6A1RHy3nDFBqQlImYS1G+xFzHbtzH6jOrM/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHTyj0zXYz16yj; Fri, 4 Aug 2023 15:24: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 374FODEw025588; Fri, 4 Aug 2023 15:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374FODwJ025587; Fri, 4 Aug 2023 15:24:13 GMT (envelope-from git) Date: Fri, 4 Aug 2023 15:24:13 GMT Message-Id: <202308041524.374FODwJ025587@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: 301e69218ccb - main - ncthwm: Use `sysctl_handle_16` to match CTLTYPE_U16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 301e69218ccbc314830fb989c852ae74ef2073d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=301e69218ccbc314830fb989c852ae74ef2073d9 commit 301e69218ccbc314830fb989c852ae74ef2073d9 Author: Stéphane Rochoy AuthorDate: 2023-08-04 09:31:33 +0000 Commit: Ed Maste CommitDate: 2023-08-04 15:23:42 +0000 ncthwm: Use `sysctl_handle_16` to match CTLTYPE_U16 Pull Request: https://github.com/freebsd/freebsd-src/pull/810 --- sys/dev/ncthwm/ncthwm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ncthwm/ncthwm.c b/sys/dev/ncthwm/ncthwm.c index b62dff68f171..813b8474bdef 100644 --- a/sys/dev/ncthwm/ncthwm.c +++ b/sys/dev/ncthwm/ncthwm.c @@ -158,7 +158,7 @@ ncthwm_query_fan_speed(SYSCTL_HANDLER_ARGS) NCTHWM_VERBOSE_PRINTF(sc->dev, "%s: read %u from bank %u offset 0x%x-0x%x\n", fan->name, val, sc->nctdevp->fan_bank, fan->high_byte_offset, fan->low_byte_offset); - return (sysctl_handle_int(oidp, &val, 0, req)); + return (sysctl_handle_16(oidp, &val, 0, req)); } static int From nobody Fri Aug 4 15:28: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 4RHV3Q2mQPz4TlnG; Fri, 4 Aug 2023 15:28: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 4RHV3Q1c8wz3SwP; Fri, 4 Aug 2023 15:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691162898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad8VoCxACzbDLz+dlGUNymwefAuGGybYs8MPp5xhhOI=; b=pGX93VDZ9QVYQnEOl8zRFnZmEachhYAjjHoYrDKmTnD1terUryWm9+VMLsVdPzvrLLKZJL cXGhkETT+7uvPVkAPTWXOFaGBlfe5/GmL7/jqO/meFZEY8Uban0FgUiTTzsADTKPtYrHF/ 7+cygRplZEk/4wi04V3reoEId4D92OYLyGMi3btYIVrk94u6YT8L0z7X0BrxLjcuIrRXUX CQgUp4gkU8t11T9SZQpB/79n54yx6bhHGULBG2dfeaLbL+nN1nixDDj/VUHI3C+9/0Baq1 NQNU1rfsexemWx1vk9cnGh8ZpvIH6txX17gfzJy93+ZGZdhDTxc/jjJigIB6PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691162898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad8VoCxACzbDLz+dlGUNymwefAuGGybYs8MPp5xhhOI=; b=am5WsDY2cyoO02/RzFJIOs+ncMYKShi+517cUhCK02EIkkVP7pgr7wprEqc5k+CGpNVCKJ 927sREfsPjFC0YKKYXksxN6eEJOn9wpSGsvZe/QvBHBO1WsD+CkpaGWLMVCXf12RaQ3h31 7ppO8zug7pacmbamZKJFzQyWtQoanSRfEQ3YFMhbm4ix2K3jy1uTM4b/RQ6U8hQ2YQ1wMR Djoo7Kpt6rLhpJU71dqlWJF7UovjmR8Qlzpa7is5PCntLryNtpr+aPZM33c0xn0QIdA5LW glIlh8zi5Cg1OOQXOluotJ0GX8n2RpddC1wG5rraFmPVHQ0aA/Ts5UR/FduLwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691162898; a=rsa-sha256; cv=none; b=KRQGNimWo9P6acSVhaB5TKqoLo9Z1Y0zP1ryxqtW7FCPRCR0FT+QWyc8fhdjg2g38H1U+/ LDjXGgopPcW2qdvbUiZNlSaw8qW2RrCTbaGqJqZlnoXQKpv41O4q71Y+XhDdQKJSV0H6Ss IpgSEZaO42FmJgTTrtntAjNHiE2+h7GYCrYL+p2Ys/wibV6PMablD8GEv+GZnYxyj0CUX9 gvZaC6evPNlh28mEnG3pjsoKaOpx9r3cIoEQXwYY3ZE2aDH8dZDvlHJ/Ed/1mVxD+NXO24 AKcdMF1axX+lqteXnhxBSWAhLjqOBtZ81BYq0OB39vNQbyDR17nKOw8FXbZ0Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHV3Q0fxKz16yl; Fri, 4 Aug 2023 15:28: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 374FSI9K026270; Fri, 4 Aug 2023 15:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374FSI0S026269; Fri, 4 Aug 2023 15:28:18 GMT (envelope-from git) Date: Fri, 4 Aug 2023 15:28:18 GMT Message-Id: <202308041528.374FSI0S026269@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: 8e4aa6317eb8 - main - nctgpio: Enable all the 9 groups for NCT6116D and remove FIXMEs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8e4aa6317eb8145a8a9f6a61e235d13302cd13e3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8e4aa6317eb8145a8a9f6a61e235d13302cd13e3 commit 8e4aa6317eb8145a8a9f6a61e235d13302cd13e3 Author: Stéphane Rochoy AuthorDate: 2023-07-04 13:57:08 +0000 Commit: Ed Maste CommitDate: 2023-08-04 15:27:54 +0000 nctgpio: Enable all the 9 groups for NCT6116D and remove FIXMEs Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/810 --- sys/dev/nctgpio/nctgpio.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/nctgpio/nctgpio.c b/sys/dev/nctgpio/nctgpio.c index 07208e0fbd90..393553aae227 100644 --- a/sys/dev/nctgpio/nctgpio.c +++ b/sys/dev/nctgpio/nctgpio.c @@ -637,7 +637,7 @@ struct nct_device { { .devid = 0xd282, .descr = "GPIO on Nuvoton NCT6112D/NCT6114D/NCT6116D", - .ngroups = 2, + .ngroups = 9, .groups = { { .grpnum = 0, @@ -646,7 +646,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x01, .data_ldn = 0x07, - .ppod_reg = 0xe0, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe0, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xe0, @@ -658,7 +658,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x02, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xe4, @@ -670,7 +670,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x04, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xe8, @@ -682,7 +682,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x08, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xec, @@ -694,7 +694,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x10, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xf0, @@ -706,7 +706,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x20, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xf4, @@ -718,7 +718,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x40, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xf8, @@ -730,7 +730,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x80, .data_ldn = 0x07, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xfc, @@ -742,7 +742,7 @@ struct nct_device { .enable_reg = 0x30, .enable_mask = 0x01, .data_ldn = 0x09, - .ppod_reg = 0xe1, /* FIXME Need to check for this group. */ + .ppod_reg = 0xe1, .caps = NCT_GPIO_CAPS, .npins = 8, .iobase = 0xf0, From nobody Fri Aug 4 16:08: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 4RHVyF5wqHz4Tpj1; Fri, 4 Aug 2023 16:08: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 4RHVyF5KCNz3YVf; Fri, 4 Aug 2023 16:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691165333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31lW/J+xUmpOGahz+vV27xfacGmmY7QpArfsOpWqZRE=; b=Gsf2PEhAR6kk/IRCeZEL+uy9CG2f4ASBW9G/hHAXVO/pxswBHJ0cpdInqDqn0ZHATjyA7V Mfc6EaJLccxS1FHixXv/Va59IBgB5Cxrlt8ZncLn/KovLX0h99U9x5SNcY70Ts6/LIu8DW a2eeTSapCJjymk7UwPie8Orm+9lSfbxCet/QSworPBMSFLTORQZxmg7DwnDG3I1eeNzP7P 8ZwLILHAzqL9Uo+Z+QIKgS/RII499E3udSeuXiodAYhin76WOh/WP01AXyZfd1E5HOlUKH v7ek2JRpIoy4kdKMvy9OC7yboQxJFwHIJHrr0I763FZexzKRxdm+6rUUX42lsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691165333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31lW/J+xUmpOGahz+vV27xfacGmmY7QpArfsOpWqZRE=; b=M42amH7iKFp5xMWUZP2GGGiBS+1N0vX4IwlUZJcyYcT6M78yIJGIZDAdhzP2NPxj6aAFSu Nj4zR0I5mjsvzMoUjvMHtPDFupgom8CmBiJMT01HcTsnKHJ4Zit5QO5wQwmXh2mv36VICH HH0PthTUXh1anKh5ihDtaL6JqbFb3wyKz2Nidl3Gx1iWEgRQU+NaTcVNA51G9mQC1xbEfB U8SjPruzZbNTkZldivpCldFBldSWjF1OkKhD+ufiL+kGS6HPVWj/gcOgOzjPlOCnQNeCip +NAz3qsImx0y+Cr6wgw6sST0gK3b81klopCdxeO+o25ZOGwVKNy2/l7SAjdyhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691165333; a=rsa-sha256; cv=none; b=ZtHZGZX1pooot3E6rASIFmE5Svn+/EP1IV4w2KEZyRDwGWYapxs7JbXv9upvvZ/PN7Fyib sLw2yljw7MgMHXm+dd5HFrzMUt6YXKH1MDR4OMe0JKeXg3Xzc3Zkfy5ratcQGh2ga2Mzt9 vk08nSh1/339uDgllNTE4QbN3TC3EuPoSbbrEi1stDM/gf0uEVHAUgpMDfnHPBagEeIyrz LlE5qhfDJSIkMuGWIV2cE/Kcz/R2UXchzgDumaXtcAVqw5gCQrUOMe/IY4cS99HgNjTenn JLW1QSv1HlTudRT6VLBPZ6QJBgylpIZVIgMgOitGw12ZEAIUjCLDfW8UMlCCdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHVyF4LXkz17gg; Fri, 4 Aug 2023 16:08: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 374G8rpT093962; Fri, 4 Aug 2023 16:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374G8rfc093961; Fri, 4 Aug 2023 16:08:53 GMT (envelope-from git) Date: Fri, 4 Aug 2023 16:08:53 GMT Message-Id: <202308041608.374G8rfc093961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: acc7cf8641dc - main - pam_krb5: Clarify a loop condition. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: acc7cf8641dcedad295ff0e569c3f3a28939ada0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=acc7cf8641dcedad295ff0e569c3f3a28939ada0 commit acc7cf8641dcedad295ff0e569c3f3a28939ada0 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-04 16:08:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-04 16:08:37 +0000 pam_krb5: Clarify a loop condition. The closing parenthesis was in the wrong location, so instead of assigning the return value to krbret and then comparing it to zero, we were assigning the result of the comparison to krbret and then comparing that to zero. This has no practical significance since the value is not used after the loop terminates. PR: 229719 Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41299 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3c7976297ed2..378de46d769f 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -576,8 +576,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Prepared for iteration"); /* Copy the creds (should be two of them) */ - while ((krbret = krb5_cc_next_cred(pam_context, ccache_temp, - &cursor, &creds) == 0)) { + while (krb5_cc_next_cred(pam_context, ccache_temp, &cursor, &creds) == 0) { krbret = krb5_cc_store_cred(pam_context, ccache_perm, &creds); if (krbret != 0) { PAM_LOG_KRB5_ERR(pam_context, krbret, From nobody Fri Aug 4 16:08: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 4RHVyG6C3yz4Tpg6; Fri, 4 Aug 2023 16:08: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 4RHVyG5qsTz3Yhm; Fri, 4 Aug 2023 16:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691165334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdGbDjX9vvN0FvOAGf0t0njzCMYHybcOQHsBhXKn8wk=; b=k7iLgGutbHTSge1SKrJGFPy79L4nH5VXuCq+FD1K+uVQKLRIzGB8ZfYbqocK+TD4Ut4iJr h9H3V7lZwjbjBwxZhw++Te1rO1Gzrmn1HhO3qLBsAa+jbsiCtOq8XAhTnTdjl3fLwl6zrI ryE/ZQOUeOG30BKpIXeYEP4NPEivUsoDCWQm9Qmk2E3jFY8wX6AR6YM+kUuwH82XkbvCEI pZiw76Z2kqZAd+oy2JChKARYob7mbsVlBpYkUwwU5pWhuvCClmVFESyi2IuyVSZSIAMI9L YwhxZpyZrkyKFpV1k7/P55LijLbQB2nuKQqVPPvagTv+E62b5zZ4ojfQCmnzJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691165334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdGbDjX9vvN0FvOAGf0t0njzCMYHybcOQHsBhXKn8wk=; b=JU8e4TLpCM9yEAtdkL6XE/vZPy9uqE3TSi8OhyacF8xRCQWRWN82jDg5URT63tfOpZTmVk znCUudc5q/54hwkXrDOMlvJxXRIoKaiyyJE107TlaHRF0+W/5+O0o6EUTkCCk43oIn9SzY FJVvd3/hdc0+lCPBF0qMZM2yVETppkHm/aZr4LLHakwJT93zf2dIR8WgdThvOkw7JzN+/N OwWLOolCyY9dYu4v0lpxTPgMNC2zGxBduHXeNZVRnDGtzYul1UKNRm5ZgnMB+nukmsaxXu 282jOTshxv5UJGGkhLib41tBNLWxiV1Ob8JDku1zDzv2Npbma8uaNIr87pMcMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691165334; a=rsa-sha256; cv=none; b=ue9WPbXpwrbSmEvOnit0AQCmrUK0SzmpRgC8zpslVAT8wrYyP9ehRmddaZsObVeXLAP48U Fctev0mTNYbjkT3Jm3ykn9RC2AzkcYivs/ag/CuTQABR3gT3Y1VyBbyve7eAY6ZGgJ47Z9 RGxUPzi7Xfl/TJH7qFDibwrtMkcc+XOcVK9xJnTO6HTn7xnb0TAn0kUfmPOveT+lFlOoxX UlqRiP29bGeExB2d+yhLUPemI+jJ4cmT7C2p3fv3+m+6NssDiO5DY1sVYuvAk9c1s8u/Ea 4ua30mmrybbVeyaQxFp5OkR79ZP5AXADC1owm0JXXBmPjXZc/40/8pm5lUF+Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHVyG4xZqz180q; Fri, 4 Aug 2023 16:08: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 374G8sGF093996; Fri, 4 Aug 2023 16:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374G8shS093995; Fri, 4 Aug 2023 16:08:54 GMT (envelope-from git) Date: Fri, 4 Aug 2023 16:08:54 GMT Message-Id: <202308041608.374G8shS093995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 9c2823bae92c - main - pam_krb5: Rename a 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c2823bae92c09e5356623118da2777bc3ed521d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9c2823bae92c09e5356623118da2777bc3ed521d commit 9c2823bae92c09e5356623118da2777bc3ed521d Author: Dag-Erling Smørgrav AuthorDate: 2023-08-04 16:08:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-04 16:08:38 +0000 pam_krb5: Rename a variable. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41300 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 180 ++++++++++++++++----------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 378de46d769f..ef39fe8acb22 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -114,7 +114,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; int debug; const char *auth_service; krb5_principal auth_princ; @@ -154,7 +154,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, goto cleanup6; } - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -164,7 +164,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Context initialised"); debug = openpam_get_option(pamh, PAM_OPT_DEBUG) ? 1 : 0; - krbret = verify_krb_v5_tgt_begin(pam_context, srvdup, debug, + krbret = verify_krb_v5_tgt_begin(krbctx, srvdup, debug, &auth_service, &auth_princ, auth_phost); if (krbret != 0) { /* failed to find key */ /* Keytab or service key does not exist */ @@ -180,7 +180,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } } - krbret = krb5_cc_register(pam_context, &krb5_mcc_ops, FALSE); + krbret = krb5_cc_register(krbctx, &krb5_mcc_ops, FALSE); if (krbret != 0 && krbret != KRB5_CC_TYPE_EXISTS) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -197,10 +197,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Created principal: %s", principal); - krbret = krb5_parse_name(pam_context, principal, &princ); + krbret = krb5_parse_name(krbctx, principal, &princ); free(principal); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, "Error krb5_parse_name()"); + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_parse_name()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup3; @@ -210,9 +210,9 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Now convert the principal name into something human readable */ princ_name = NULL; - krbret = krb5_unparse_name(pam_context, princ, &princ_name); + krbret = krb5_unparse_name(krbctx, princ, &princ_name); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_unparse_name()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -235,11 +235,11 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Verify the local user exists (AFTER getting the password) */ if (strchr(user, '@')) { /* get a local account name for this principal */ - krbret = krb5_aname_to_localname(pam_context, princ, + krbret = krb5_aname_to_localname(krbctx, princ, sizeof(luser), luser); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_aname_to_localname()"); retval = PAM_USER_UNKNOWN; goto cleanup2; @@ -264,15 +264,15 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } /* Initialize credentials request options. */ - krbret = krb5_get_init_creds_opt_alloc(pam_context, &opts); + krbret = krb5_get_init_creds_opt_alloc(krbctx, &opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_opt_alloc()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup2; } - krb5_get_init_creds_opt_set_default_flags(pam_context, + krb5_get_init_creds_opt_set_default_flags(krbctx, service, NULL, opts); if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) @@ -282,12 +282,12 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Get a TGT */ memset(&creds, 0, sizeof(krb5_creds)); - krbret = krb5_get_init_creds_password(pam_context, &creds, princ, + krbret = krb5_get_init_creds_password(krbctx, &creds, princ, pass, NULL, pamh, 0, NULL, opts); - krb5_get_init_creds_opt_free(pam_context, opts); + krb5_get_init_creds_opt_free(krbctx, opts); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_password()"); retval = PAM_AUTH_ERR; goto cleanup2; @@ -296,28 +296,28 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got TGT"); /* Generate a temporary cache */ - krbret = krb5_cc_new_unique(pam_context, krb5_cc_type_memory, NULL, &ccache); + krbret = krb5_cc_new_unique(krbctx, krb5_cc_type_memory, NULL, &ccache); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_new_unique()"); retval = PAM_SERVICE_ERR; goto cleanup; } - krbret = krb5_cc_initialize(pam_context, ccache, princ); + krbret = krb5_cc_initialize(krbctx, ccache, princ); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_initialize()"); retval = PAM_SERVICE_ERR; goto cleanup; } - krbret = krb5_cc_store_cred(pam_context, ccache, &creds); + krbret = krb5_cc_store_cred(krbctx, ccache, &creds); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_store_cred()"); - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); retval = PAM_SERVICE_ERR; goto cleanup; } @@ -325,14 +325,14 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stashed"); /* Verify them */ - krbret = verify_krb_v5_tgt(pam_context, ccache, srvdup, + krbret = verify_krb_v5_tgt(krbctx, ccache, srvdup, debug, auth_service, auth_princ, auth_phost); free(srvdup); srvdup = NULL; if (krbret == -1) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); retval = PAM_AUTH_ERR; goto cleanup; } @@ -341,7 +341,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, retval = pam_get_data(pamh, "ccache", &ccache_data); if (retval == PAM_SUCCESS) { - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_AUTH_ERR; goto cleanup; @@ -349,8 +349,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stash not pre-existing"); - asprintf(&ccache_name, "%s:%s", krb5_cc_get_type(pam_context, - ccache), krb5_cc_get_name(pam_context, ccache)); + asprintf(&ccache_name, "%s:%s", krb5_cc_get_type(krbctx, + ccache), krb5_cc_get_name(krbctx, ccache)); if (ccache_name == NULL) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_BUF_ERR; @@ -358,7 +358,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } retval = pam_set_data(pamh, "ccache", ccache_name, cleanup_cache); if (retval != 0) { - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup; @@ -367,21 +367,21 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stash saved"); cleanup: - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Done cleanup"); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); if (princ_name) free(princ_name); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); cleanup4: - verify_krb_v5_tgt_cleanup(pam_context, debug, + verify_krb_v5_tgt_cleanup(krbctx, debug, auth_service, auth_princ, auth_phost); PAM_LOG("Done cleanup4"); @@ -407,7 +407,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, #else krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_principal princ; krb5_creds creds; krb5_ccache ccache_temp, ccache_perm; @@ -448,7 +448,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Got user: %s", (const char *)user); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_SERVICE_ERR); @@ -467,9 +467,9 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, retval = PAM_CRED_UNAVAIL; goto cleanup3; } - krbret = krb5_cc_resolve(pam_context, cache_data, &ccache_temp); + krbret = krb5_cc_resolve(krbctx, cache_data, &ccache_temp); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve(\"%s\")", (const char *)cache_data); retval = PAM_SERVICE_ERR; goto cleanup3; @@ -540,22 +540,22 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Got cache_name: %s", cache_name); /* Initialize the new ccache */ - krbret = krb5_cc_get_principal(pam_context, ccache_temp, &princ); + krbret = krb5_cc_get_principal(krbctx, ccache_temp, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_get_principal()"); retval = PAM_SERVICE_ERR; goto cleanup3; } - krbret = krb5_cc_resolve(pam_context, cache_name, &ccache_perm); + krbret = krb5_cc_resolve(krbctx, cache_name, &ccache_perm); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, "Error krb5_cc_resolve()"); + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve()"); retval = PAM_SERVICE_ERR; goto cleanup2; } - krbret = krb5_cc_initialize(pam_context, ccache_perm, princ); + krbret = krb5_cc_initialize(krbctx, ccache_perm, princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_initialize()"); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -564,11 +564,11 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Cache initialised"); /* Prepare for iteration over creds */ - krbret = krb5_cc_start_seq_get(pam_context, ccache_temp, &cursor); + krbret = krb5_cc_start_seq_get(krbctx, ccache_temp, &cursor); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_start_seq_get()"); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -576,27 +576,27 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Prepared for iteration"); /* Copy the creds (should be two of them) */ - while (krb5_cc_next_cred(pam_context, ccache_temp, &cursor, &creds) == 0) { - krbret = krb5_cc_store_cred(pam_context, ccache_perm, &creds); + while (krb5_cc_next_cred(krbctx, ccache_temp, &cursor, &creds) == 0) { + krbret = krb5_cc_store_cred(krbctx, ccache_perm, &creds); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_store_cred()"); - krb5_cc_destroy(pam_context, ccache_perm); - krb5_free_cred_contents(pam_context, &creds); + krb5_cc_destroy(krbctx, ccache_perm); + krb5_free_cred_contents(krbctx, &creds); retval = PAM_SERVICE_ERR; goto cleanup2; } - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Iteration"); } - krb5_cc_end_seq_get(pam_context, ccache_temp, &cursor); + krb5_cc_end_seq_get(krbctx, ccache_temp, &cursor); PAM_LOG("Done iterating"); if (strstr(cache_name, "FILE:") == cache_name) { if (chown(&cache_name[5], pwd->pw_uid, pwd->pw_gid) == -1) { PAM_LOG("Error chown(): %s", strerror(errno)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -604,21 +604,21 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, if (chmod(&cache_name[5], (S_IRUSR | S_IWUSR)) == -1) { PAM_LOG("Error chmod(): %s", strerror(errno)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } PAM_LOG("Done chmod()"); } - krb5_cc_close(pam_context, ccache_perm); + krb5_cc_close(krbctx, ccache_perm); PAM_LOG("Cache closed"); retval = pam_setenv(pamh, "KRB5CCNAME", cache_name, 1); if (retval != PAM_SUCCESS) { PAM_LOG("Error pam_setenv(): %s", pam_strerror(pamh, retval)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -626,10 +626,10 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Environment done: KRB5CCNAME=%s", cache_name); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); seteuid(euid); @@ -652,7 +652,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_ccache ccache; krb5_principal princ; int retval; @@ -671,7 +671,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got credentials"); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_PERM_DENIED); @@ -679,20 +679,20 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Context initialised"); - krbret = krb5_cc_resolve(pam_context, (const char *)ccache_name, &ccache); + krbret = krb5_cc_resolve(krbctx, (const char *)ccache_name, &ccache); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve(\"%s\")", (const char *)ccache_name); - krb5_free_context(pam_context); + krb5_free_context(krbctx); return (PAM_PERM_DENIED); } PAM_LOG("Got ccache %s", (const char *)ccache_name); - krbret = krb5_cc_get_principal(pam_context, ccache, &princ); + krbret = krb5_cc_get_principal(krbctx, ccache, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_get_principal()"); retval = PAM_PERM_DENIED; goto cleanup; @@ -700,16 +700,16 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got principal"); - if (krb5_kuserok(pam_context, princ, (const char *)user)) + if (krb5_kuserok(krbctx, princ, (const char *)user)) retval = PAM_SUCCESS; else retval = PAM_PERM_DENIED; - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); PAM_LOG("Done kuserok()"); cleanup: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup"); return (retval); @@ -724,7 +724,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_creds creds; krb5_principal princ; krb5_get_init_creds_opt *opts; @@ -743,7 +743,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Got user: %s", (const char *)user); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_SERVICE_ERR); @@ -752,9 +752,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Context initialised"); /* Get principal name */ - krbret = krb5_parse_name(pam_context, (const char *)user, &princ); + krbret = krb5_parse_name(krbctx, (const char *)user, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_parse_name()"); retval = PAM_USER_UNKNOWN; goto cleanup3; @@ -762,9 +762,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, /* Now convert the principal name into something human readable */ princ_name = NULL; - krbret = krb5_unparse_name(pam_context, princ, &princ_name); + krbret = krb5_unparse_name(krbctx, princ, &princ_name); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_unparse_name()"); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -780,9 +780,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Got password"); /* Initialize credentials request options. */ - krbret = krb5_get_init_creds_opt_alloc(pam_context, &opts); + krbret = krb5_get_init_creds_opt_alloc(krbctx, &opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_opt_alloc()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -792,11 +792,11 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Credentials options initialised"); memset(&creds, 0, sizeof(krb5_creds)); - krbret = krb5_get_init_creds_password(pam_context, &creds, princ, + krbret = krb5_get_init_creds_password(krbctx, &creds, princ, pass, NULL, pamh, 0, "kadmin/changepw", opts); - krb5_get_init_creds_opt_free(pam_context, opts); + krb5_get_init_creds_opt_free(krbctx, opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_password()"); retval = PAM_AUTH_ERR; goto cleanup2; @@ -822,11 +822,11 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, retval = PAM_BUF_ERR; goto cleanup; } - krbret = krb5_set_password(pam_context, &creds, passdup, NULL, + krbret = krb5_set_password(krbctx, &creds, passdup, NULL, &result_code, &result_code_string, &result_string); free(passdup); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_change_password()"); retval = PAM_AUTHTOK_ERR; goto cleanup; @@ -845,16 +845,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, free(result_code_string.data); cleanup: - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Done cleanup"); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); if (princ_name) free(princ_name); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); @@ -1018,17 +1018,17 @@ verify_krb_v5_tgt_cleanup(krb5_context context, int debug, static void cleanup_cache(pam_handle_t *pamh __unused, void *data, int pam_end_status __unused) { - krb5_context pam_context; + krb5_context krbctx; krb5_ccache ccache; krb5_error_code krbret; - if (krb5_init_context(&pam_context)) + if (krb5_init_context(&krbctx)) return; - krbret = krb5_cc_resolve(pam_context, data, &ccache); + krbret = krb5_cc_resolve(krbctx, data, &ccache); if (krbret == 0) - krb5_cc_destroy(pam_context, ccache); - krb5_free_context(pam_context); + krb5_cc_destroy(krbctx, ccache); + krb5_free_context(krbctx); free(data); } From nobody Fri Aug 4 16:55: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 4RHWzy4Ptfz4TrxD; Fri, 4 Aug 2023 16: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 4RHWzy3r04z3ftC; Fri, 4 Aug 2023 16: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=1691168126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBtUKKM3Rq2zni3N6ZeJrdmLbAzI9Jb4GvIXR2/8tD0=; b=m47pUgYRKfmV+nJ9oo/2WqzuNhGvF65avT8t4eEhad0eNKOkbpw4SYH4Y9oRZBYCKkzLqV eqzKysc2Ijfo7j3k+rWB9ANi43e8fzWGhgxgaiVTtqbs9r1NXE+QFqo2IGvV11Ph+RmHTg mGcfkz3rfCavpX5f59Iq8QtY3p36lWnbBcPd0RZd+cf01FGcZtcWtScm5ZamRl1xdQHf7x ratKTmrv1ANj142ch0hGK7JDXJEhuzDbnCPNcX8hM2ioqCT2myJuxMBtMwbo96WRw4/vpG 1vRKYpy/1iVHc+R3Mg2NjQWHPpbOMrm6uKO8gfIXhObQb0c29DS4gX4epyc00A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691168126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBtUKKM3Rq2zni3N6ZeJrdmLbAzI9Jb4GvIXR2/8tD0=; b=nM66V6D+OoYfqyrtEVgaLruuxSrAAZHBL9L2R9YHyb8+nqlPT+e6jT5/NYG6KVSMBRirWJ 6OvczEBH3D4ysSZc3FfWWJOsJhjjPM8NtpQ3xvGcKhEDsoQq9KYD8uL6CdwJW4dISoj/oa CNsZfi5luPQ2OJBrgaEWmB0GnFTe833K53WfDO6l7AC4KQUA36/KFCS0P6Nn9GNpWnamU0 Ch2sa5vnKbgTVeRf43FLqcW7jmZRt9IvyOvJAG9VdPcnVUR/VXpWv441coNeYVPPPGfzeu jBt7Aczbgq3lf9tbHfPWK555WcTC9nuw/DZJN7ZmKKSYLKbwgmAPwOzPRLPywA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691168126; a=rsa-sha256; cv=none; b=YVpLUQIfWQiv+xsJDV9cHji1ag5GJKVgUN/LT9Of6U2XDEQn5gdI8xNoVMT9v3M8aF7CPO xN72dAYB+bDeTsLDJf6CGquhUFLwEy3bDXd1EumfQanKn/XcssqJDl58gvV/Yg89mwW5S8 PKkudLFDNL1lPmi5b25Vtzi9Bnsv+JZk/JWdmlj19VN8wSO1RE949mdgw6uY0dHhLKnnjQ 8F+fdeTeCXIu83AJTwuwJQ0+HFtRxOzEmsmf1b5OZD9T5cDkDAcUBmR19aKVdKvp9yigzE 1bwyEpw24XEHjER3mtxITskqE3YuvaFWcxulrFtkjMzUHaYd20CnG/aKMQWnSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHWzy2tHsz195S; Fri, 4 Aug 2023 16: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 374GtQOQ075560; Fri, 4 Aug 2023 16:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374GtQXp075559; Fri, 4 Aug 2023 16:55:26 GMT (envelope-from git) Date: Fri, 4 Aug 2023 16:55:26 GMT Message-Id: <202308041655.374GtQXp075559@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: 78cc000cbae9 - main - amd64: Increase sanitizers' static shadow memory reservation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 78cc000cbae9913e924aee13ec4fd367cb87336e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78cc000cbae9913e924aee13ec4fd367cb87336e commit 78cc000cbae9913e924aee13ec4fd367cb87336e Author: Mark Johnston AuthorDate: 2023-08-04 16:25:50 +0000 Commit: Mark Johnston CommitDate: 2023-08-04 16:38:24 +0000 amd64: Increase sanitizers' static shadow memory reservation Because KASAN shadows the kernel image itself (KMSAN currently does not), a shadow mapping of the boot stack must be created very early during boot. pmap_san_enter() reserves a fixed number of pages for the purpose of creating and mapping this shadow region. After commit 789df254cc9e ("amd64: Use a larger boot stack"), it could happen that this reservation is insufficient; this happens when bootstack crosses a PAGE_SHIFT + KASAN_SHADOW_SCALE_SHIFT boundary. Update the calculation to take into account the new size of the boot stack. Fixes: 789df254cc9e ("amd64: Use a larger boot stack") Sponsored by: The FreeBSD Foundation --- sys/amd64/amd64/pmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5bc40bd00a32..5d747e62d37c 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -11642,13 +11642,16 @@ pmap_pkru_clear(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) /* * Reserve enough memory to: * 1) allocate PDP pages for the shadow map(s), - * 2) shadow one page of memory, so one PD page, one PT page, and one shadow - * page per shadow map. + * 2) shadow the boot stack of KSTACK_PAGES pages, + * so we need one PD page, one or two PT pages, and KSTACK_PAGES shadow pages + * per shadow map. */ #ifdef KASAN -#define SAN_EARLY_PAGES (NKASANPML4E + 3) +#define SAN_EARLY_PAGES \ + (NKASANPML4E + 1 + 2 + howmany(KSTACK_PAGES, KASAN_SHADOW_SCALE)) #else -#define SAN_EARLY_PAGES (NKMSANSHADPML4E + NKMSANORIGPML4E + 2 * 3) +#define SAN_EARLY_PAGES \ + (NKMSANSHADPML4E + NKMSANORIGPML4E + 2 * (1 + 2 + KSTACK_PAGES)) #endif static uint64_t __nosanitizeaddress __nosanitizememory From nobody Fri Aug 4 17:31: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 4RHXnD3BBDz4TvTN; Fri, 4 Aug 2023 17:31: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 4RHXnD2JZtz4FNt; Fri, 4 Aug 2023 17:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691170272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPdB6CEjs8KtksclDNfT/niKls4tYmueOOB/2FuI6UY=; b=Sk+8TGjPBaGfZQPrWK5bSy51GWP4DJeuolOmP5G0rdfqMeTrLLzXop/kAiRFBgvgW7gll5 QKl/p/a8ovohO3HCgBMA1Xq2rGPybN8ysMwCx4YWM+yyNhlXEP+kZndm8pot2+Dr+Mfpk3 MqBwNPXIdLPJjss1K1RqnXTm+Lh0lxZ2WNLLgsBJUaQvGbCqHeJ7BUBNVqOoghK4TRDdhb DYRl24TkKOf22XnqVW9YNeNcn6amDy9WSQbqBYt/1iQ6Q1q3Csq9+j4UJCBST1O4xrO0RH z+YQsbnsqD2eTFJZthUedXcbCJdMA0nWazxYB53A5umAJq8fSAeElIxJgLNSCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691170272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPdB6CEjs8KtksclDNfT/niKls4tYmueOOB/2FuI6UY=; b=JMG3AEHD5gUnNzpsUqvHlKzTTtEv2SXWsGfyQhdSnJLxOD++nQAyPb9VYRo9OewuWOH/5w P1DQAS5B2FTJc2T2BbltmiJYXwhCY2Fl8cCGfeUiB11pQwMXjurlvGN+GwMwuNU/lNJUUc KFEZOBchkHGPYuRPA4TJxOSaWbO680FDj8JiNCIHAlrl1XijTxT0eRrRHtqc6udt2emCEN 1tzOJ/iI4MBpLBCVOCI5nM3ULa1aNJhfTYTWljsJwdOC5JcH5F15LvCIQBMaKcN+XT47zQ U5VpAbwm7FFrAaXKqrO8K8f9d+BKj/0cG/HKpRpmkTzN2Yh6OsfMSPJercp8dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691170272; a=rsa-sha256; cv=none; b=X5nigXWWZpFdlG+hv9QUTIzKCXJ+9dZwlVmeMABgq7BnkaSCf+OFtAUIjJO/NaqMETs5Dl fTCiGmaCOcaCIKQZ4e8cH4aq/oYdlPnrFZ0HpSqlwuQXYWcdhYONK08+w3onVkflLy0lmq myh285kdRJRpMkPI4vh/IVk9S1rYvXd3Qaz2eNbKYjLaPG51udL7pjNQ0V5HPglS65rj2q 3mVjVIYVNYgyZde+WLbklf+p+Ry6m7hZBiGFuxsIw997rbw9jbKS383tiFXl8iUruBEqSy A4BkJLKw16Xa+hF6NX53yRMjMMix3TWaaoVGQHS3yT0mlvrunuBYW/Af9RWQSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHXnD143tz19rF; Fri, 4 Aug 2023 17:31: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 374HVCMD039890; Fri, 4 Aug 2023 17:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374HVCxU039889; Fri, 4 Aug 2023 17:31:12 GMT (envelope-from git) Date: Fri, 4 Aug 2023 17:31:12 GMT Message-Id: <202308041731.374HVCxU039889@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: 348bea10b6f2 - main - openssh: retire HPN option handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 348bea10b6f2b86f757011652ea798ccb3f696c1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=348bea10b6f2b86f757011652ea798ccb3f696c1 commit 348bea10b6f2b86f757011652ea798ccb3f696c1 Author: Ed Maste AuthorDate: 2023-08-02 14:37:12 +0000 Commit: Ed Maste CommitDate: 2023-08-04 17:29:04 +0000 openssh: retire HPN option handling The HPN patch set was removed from base system SSH in January 2016, in commit 60c59fad8806. We retained the option parsing (using OpenSSH's support for deprecated options) to avoid breaking existing installations upon upgrade, but sufficient time has now passed that we can remove this special case. Approved by: des Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41291 --- crypto/openssh/FREEBSD-upgrade | 6 ++---- crypto/openssh/readconf.c | 7 ------- crypto/openssh/servconf.c | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 905b65ec4e3d..8d3f3a14f823 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -182,10 +182,8 @@ 11) Retired patches - We no longer have HPN patches (adaptive buffer size for increased - throughput on high-BxD links) or client-side VersionAddendum, but we - recognize and ignore the configuration options to avoid breaking - existing configurations. + We no longer have client-side VersionAddendum, but we recognize and ignore + the configuration options to avoid breaking existing configurations. 12) PrintLastLog bugfix diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 616a6e8b9bd4..3798c2507717 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -323,13 +323,6 @@ static struct { { "requiredrsasize", oRequiredRSASize }, { "enableescapecommandline", oEnableEscapeCommandline }, - /* HPN patch - retired in 60c59fad8806 */ - { "hpndisabled", oDeprecated }, - { "hpnbuffersize", oDeprecated }, - { "tcprcvbufpoll", oDeprecated }, - { "tcprcvbuf", oDeprecated }, - { "noneenabled", oUnsupported }, - { "noneswitch", oUnsupported }, /* Client VersionAddendum - retired in bffe60ead024 */ { "versionaddendum", oDeprecated }, diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index de45475dbc33..2f9632992751 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -708,12 +708,6 @@ static struct { { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ - /* HPN patch - retired in 60c59fad8806 */ - { "noneenabled", sUnsupported, SSHCFG_ALL }, - { "hpndisabled", sDeprecated, SSHCFG_ALL }, - { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, - { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, - { NULL, sBadOption, 0 } }; From nobody Fri Aug 4 17:53: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 4RHYH41Nk2z4TwjV; Fri, 4 Aug 2023 17:53: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 4RHYH35vklz4H7K; Fri, 4 Aug 2023 17:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uysTpwjp0l0c3hi1PXZFe6NdRW/cxcdIwIsS37IsSJk=; b=t7zEdhrkJVC9DRtczqOD3tP8h+Wd3vHl+g/trDOoIMuhbU5CIlEij2Z5GVco6mW3ai5A3n HQUVOHyZBf8CgiMKPVNaEOaUuMwjCJf+JiIt4JTNA0YuZS9wqh/qlrElVYiWO50XctuCB5 Mbc5Kr/5lvP7kp3KH5W/kRkpPfXMBwqdewisXytvZEaO3H/K84sPKlfcnkNH07m30icBPg ZYSaYik6H+gGWmtEwpOai+CADXs2E04uT8MsBATNA/UwSpchm0kRkmQaEQuregPOl+8/7x gXd/pFpxfU9MAtuehVZM+PLzQ8p55dpg5dHvt1B8yAKyYylXcAdCHqK7/HBADg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uysTpwjp0l0c3hi1PXZFe6NdRW/cxcdIwIsS37IsSJk=; b=d4EMraGE1WXcuKLOyRIZsxnMrzcpMt+eekPq+rA+rNQIsQWZQ3T+uZjX2V6WMwN5i9zjzs PAmsmrm7ERlYRJuQkI5JRU//koNIv/sdy2bawhG/UZKzw13XoWQubqT1TXRGS23Shs9cCs DIQyEaxo0VcvJH8Ykci0e5XMVGU595V/Fsr4pncituLA03bzj85LcD3ILri9SpOU2qsMzp RfYGKa2evRjLtpj+2mZ64sZITGHXxlxCw9VbjS0egnGDpZW4bvvO9aOIR+W75V49uT3Yuw B/FPekKwGEo4MaNx9FfGHj+yqu5dEY/MtGaCfh7EXyyb7fD65br0psZ69E9B6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691171615; a=rsa-sha256; cv=none; b=H//oUYmDubhX12UvLAsjUSSirNNXS+CIRJ52ds6cTSxWshEGmNfZ5kU80Cs0aUTOeRH9CD nE3Cuv8vaUbZaYEr/dbQBfOepQgodcE4ofm95sr8dF6D+i0zoDb22VpnFSRQkMwzCGVOJF uOKGQqRTjdawmVqX3+HBSfvdrRh+3ute7E+aqYhF3h5j1ZIS0bgGUb398nAr/p5g3WUmET kdw8OG1YDW6Fb06CQkP2PX+/eCMx1v+RqUUtV/0T9XjIa+Kl3YulN92GlIQJ7DHMqerjs1 hKMVtqM9yS7gV+kWZFfkXEqwEhC9wDeQ2r2z7aGlnzn9OlQBM8yubYuzvWi9Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHYGw3N21z1BLb; Fri, 4 Aug 2023 17:53: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 374HrRsw076210; Fri, 4 Aug 2023 17:53:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374HrRBP076209; Fri, 4 Aug 2023 17:53:27 GMT (envelope-from git) Date: Fri, 4 Aug 2023 17:53:27 GMT Message-Id: <202308041753.374HrRBP076209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a0e20c0ded1a - main - Limit the number of CPUs in the gicv1/2 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0e20c0ded1ae98ec25ded317c6a331fbd40e18c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e20c0ded1ae98ec25ded317c6a331fbd40e18c commit a0e20c0ded1ae98ec25ded317c6a331fbd40e18c Author: Andrew Turner AuthorDate: 2023-08-04 15:06:44 +0000 Commit: Andrew Turner CommitDate: 2023-08-04 17:47:47 +0000 Limit the number of CPUs in the gicv1/2 driver The GICv2 can only send IPIs to 8 CPUs. Because of this it should only be in machines with no more than 8 cores. Create a new macro to hold this limit to reduce the size of the softc. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41322 --- sys/arm/arm/gic.c | 19 +++++++++++++++---- sys/arm/arm/gic.h | 9 ++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index a6f81254fe7d..3ff1276f7a3e 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -146,7 +146,7 @@ static int gic_debug_spurious = 0; #endif TUNABLE_INT("hw.gic.debug_spurious", &gic_debug_spurious); -static u_int arm_gic_map[MAXCPU]; +static u_int arm_gic_map[GIC_MAXCPU]; static struct arm_gic_softc *gic_sc = NULL; @@ -209,6 +209,7 @@ arm_gic_init_secondary(device_t dev) /* Set the mask so we can find this CPU to send it IPIs */ cpu = PCPU_GET(cpuid); + MPASS(cpu < GIC_MAXCPU); arm_gic_map[cpu] = gic_cpu_mask(sc); for (irq = 0; irq < sc->nirqs; irq += 4) @@ -317,6 +318,12 @@ arm_gic_attach(device_t dev) if (gic_sc) return (ENXIO); + if (mp_ncpus > GIC_MAXCPU) { + device_printf(dev, "Too many CPUs for IPIs to work (%d > %d)\n", + mp_ncpus, GIC_MAXCPU); + return (ENXIO); + } + sc = device_get_softc(dev); if (bus_alloc_resources(dev, arm_gic_spec, sc->gic_res)) { @@ -362,6 +369,7 @@ arm_gic_attach(device_t dev) /* Find the current cpu mask */ mask = gic_cpu_mask(sc); /* Set the mask so we can find this CPU to send it IPIs */ + MPASS(PCPU_GET(cpuid) < GIC_MAXCPU); arm_gic_map[PCPU_GET(cpuid)] = mask; /* Set all four targets to this cpu */ mask |= mask << 8; @@ -649,7 +657,7 @@ gic_bind(struct arm_gic_softc *sc, u_int irq, cpuset_t *cpus) { uint32_t cpu, end, mask; - end = min(mp_ncpus, 8); + end = min(mp_ncpus, GIC_MAXCPU); for (cpu = end; cpu < MAXCPU; cpu++) if (CPU_ISSET(cpu, cpus)) return (EINVAL); @@ -988,9 +996,12 @@ arm_gic_ipi_send(device_t dev, struct intr_irqsrc *isrc, cpuset_t cpus, struct gic_irqsrc *gi = (struct gic_irqsrc *)isrc; uint32_t val = 0, i; - for (i = 0; i < MAXCPU; i++) - if (CPU_ISSET(i, &cpus)) + for (i = 0; i < MAXCPU; i++) { + if (CPU_ISSET(i, &cpus)) { + MPASS(i < GIC_MAXCPU); val |= arm_gic_map[i] << GICD_SGI_TARGET_SHIFT; + } + } gic_d_write_4(sc, GICD_SGIR, val | gi->gi_irq); } diff --git a/sys/arm/arm/gic.h b/sys/arm/arm/gic.h index 5db11a16a4e2..e0780c85fdf9 100644 --- a/sys/arm/arm/gic.h +++ b/sys/arm/arm/gic.h @@ -39,6 +39,13 @@ #ifndef _ARM_GIC_H_ #define _ARM_GIC_H_ +/* The GICv1/2 only supports 8 CPUs */ +#if MAXCPU > 8 +#define GIC_MAXCPU 8 +#else +#define GIC_MAXCPU MAXCPU +#endif + struct arm_gic_softc { device_t gic_dev; void * gic_intrhand; @@ -50,7 +57,7 @@ struct arm_gic_softc { struct mtx mutex; uint32_t nirqs; uint32_t typer; - uint32_t last_irq[MAXCPU]; + uint32_t last_irq[GIC_MAXCPU]; uint32_t gic_iidr; u_int gic_bus; From nobody Fri Aug 4 17:55: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 4RHYK64CFLz4Twlt for ; Fri, 4 Aug 2023 17:55: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 4RHYK63fVYz4HQl; Fri, 4 Aug 2023 17:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sc/ydhuUWW2lH+6PVDnpS95X7DZm5QQJ6fPXwzeRwX8=; b=puMMfyaW8gVUTXWrHCSHczkoKwLU/wCkVtqnDap2bHtLytvpC2Nd2KVsU4iF9Zgeb3Hqj2 30QYilwNccWCnXBZn4HQuP6ZXRndLCcfrK5RxdnkwF2qRKcXICTx6AY+v1fFW8NGcNKx+H re6DfbFl7m1kBvrwqP1hMMLQoCzSwJWDJwp2H8u1wgjSufZxIQmm9UXCyKcqajHbLrdAYz j69akmV99orL6Pb67130YbDF3JmfbfBU0enDKgCyYUnxiIpyNAKUeOfj2zuZHRmjmEEzmd 6/6JzaRcgITIqON4vbMgh5Z61vdesbr5knvcKKu87YvdPsOdTyLRr4uDkCAjaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sc/ydhuUWW2lH+6PVDnpS95X7DZm5QQJ6fPXwzeRwX8=; b=xdvt0BbyI9mem5sbHvyPFl5AACJr1eiypO14gM80FZV4l0paidwlWV7++ewwS2Yh+4+Z/Q TC6ua6TsKkNKDdTLEtDN0dZqgKPFKlrRtkWPVot3eWTFZdmGEgKTNf5/Sp+9YxyzdH1PxF zVY4IPLshrml7OigEErYg7l5bDo4e1hrTyPS9CUs+poH9r6JiqBeF3qDAx2nJKmj9dDagV DYnGz6gzBgdlPssA5MkEZmmO00pwd3V1KXD4+ynVojey4Y3pJZnq1FTS2q5wBGRm+IdN28 CHkBhrXlgzuPNwOrzH9/TZ01cg1GSex4xFZot/D+kc3z7/SxflW9WkwgEl++Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691171722; a=rsa-sha256; cv=none; b=agD0ZeXPFFG5mrx0RSub27UxBq7cCLNkaPZIkaz/VNQrtOQQ7uu11AxP0wpizP9MCdkGcg 7p2ZAxnf4aLH6mwQsv8u5ZJhFXf+i7ELCDMROcR9/O4NwRLrd18UrJY0vhyLEJJ1K9C99Z xTlf6d4t0p5RVQBJ2typuNsMboU5VRz6ClbHVCYjzpfFkju5Ii/jQUvDdRo7fe9EQa8Vtb mtlCMSBMi34mNYfOD6j8BS1aZWp3V/HW4hJQJMfgkXwNYdNWRzfseW6N2n9tfVqiAoPo4j Dixv/xh4CrkNUSkHpHaIE6diCIde32Q3lCfnTLYZVpxJ1LgQXvxFQjwGGRw7Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHYK62Kbfz1BYJ; Fri, 4 Aug 2023 17:55: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 374HtMgb076596; Fri, 4 Aug 2023 17:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374HtMmY076595; Fri, 4 Aug 2023 17:55:22 GMT (envelope-from git) Date: Fri, 4 Aug 2023 17:55:22 GMT Message-Id: <202308041755.374HtMmY076595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: b0e4d68d5124..0320e0d5bb9f - vendor/krb5 - 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/vendor/krb5 X-Git-Reftype: branch X-Git-Commit: 0320e0d5bb9fbb5da53478b3fd80ad79b110191d X-Git-Oldrev: b0e4d68d5124581ae353493d69bea352de4cff8a X-Git-Newrev: 0320e0d5bb9fbb5da53478b3fd80ad79b110191d Auto-Submitted: auto-generated The branch vendor/krb5 has been updated by cy: URL: https://cgit.FreeBSD.org/src/log/?id=b0e4d68d5124..0320e0d5bb9f 0320e0d5bb9f krb5: Update to 1.21.1 From nobody Fri Aug 4 17:55: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 4RHYK65qfFz4Twcd for ; Fri, 4 Aug 2023 17:55: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 4RHYK65MnLz4HJ7; Fri, 4 Aug 2023 17:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJH/sisdcAMvaerWKQDq37r/ndB3Kupq097xTF6s7/0=; b=eeUxhA2ZuNt3NOcxX0DRGf58JzYbOgcPHqrQCg8HhTDmVXOAxBSn50UYwpy/nfLBRM0HZ7 lEfviKFAv6z9b0IaE9RKmmH+j4NU6ms6p15mna2lydkeaqggHyr9hnbqhVEXmRpV78Ug5z ORMjmsT0KILMxu7o+RuMV8vyH8fKh19VYvseQh5QajjF635/7meGzBCVbtVBmLbHSmSYf0 jjboKiu1b9SXOY4lfT2QxWigmyPMebq58NTmMJ3i0XBRIZafIN9gbvlW0aLppLMEcYJR/P XBJtutE1Sm4sk2g8dfDmX5y/CCHk6usC+fpDCUV4nVcf9z440BEN283Pe3iLGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691171722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJH/sisdcAMvaerWKQDq37r/ndB3Kupq097xTF6s7/0=; b=f9BNDUcirsg5305Vmh4uov74UBMgztWSFkSpZ/yIkjro1gWo6qC0ES8dwyj0XpXbyKBhTp KzH0vpNIT461WbYCsx2pL8UU3qLzSV84ek2awi5DAtu1xKATStR51b4Of+lHXh7CO+Ruly 6Oy9GNmAVdnVTUIOHrC4/tO8JUgbijWZSsPVpOrzRMWsjEsi6PTqHfmkkNDFcZXHaVm2Wx +Bw+D5T3+8SIjmib05g/0ENAv+8Mx1TLSsl5tPDfwfwCLV9Ptl1EZJncfquG7HmD2Cqz4z xr0510hBinpQiGJ2/rHrsoyN8pXSueEI03OcgAKHhxsDPPOQ1RUJYIbE51EQfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691171722; a=rsa-sha256; cv=none; b=rqoTJ7pNgrjv+GmtWLeVoajJNYWLGrdNefEVLtyYKdjHSgfYt5mNkzHQ7MguQa67j4whBQ 22uGb3rI7QnpVQuVKC6rJv9tV5BxCOcSoUu9jlmZ5IA8w++m9wu1tfGyV0lUt/dsQBQvep ZQUAbMNws/ZUSxWCMWCNY664h8o13Qf+MUfj82t3BLhsKFGgLpIhiRNWMNN0RvjwZIhk6g cDcYob9+HEIs0ZtwgiBCkP5YdAK1me5Id0ZmASm7SWnN+pgV8g66f46YXDElCVcj5tY/qJ zImZb2rIsQLi8IukangK0Ms/741oMzHRuKHUQyQE4+N9VCboPIFBZPdZmeb4ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHYK645nhz1Bj0; Fri, 4 Aug 2023 17:55: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 374HtMeX076615; Fri, 4 Aug 2023 17:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374HtMq5076614; Fri, 4 Aug 2023 17:55:22 GMT (envelope-from git) Date: Fri, 4 Aug 2023 17:55:22 GMT Message-Id: <202308041755.374HtMq5076614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: 1b22c8b77e57 - Create tag vendor/krb5/1.21.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/tags/vendor/krb5/1.21.1 X-Git-Reftype: annotated tag X-Git-Commit: 1b22c8b77e57462514a84a7804cf60add36d6ade Auto-Submitted: auto-generated The annotated tag vendor/krb5/1.21.1 has been created by cy: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/krb5/1.21.1 tag vendor/krb5/1.21.1 Tagger: Cy Schubert TaggerDate: 2023-08-04 17:54:28 +0000 krb5: Tag 1.21.1 commit 0320e0d5bb9fbb5da53478b3fd80ad79b110191d Author: Cy Schubert AuthorDate: 2023-08-04 17:53:10 +0000 Commit: Cy Schubert CommitDate: 2023-08-04 17:53:10 +0000 krb5: Update to 1.21.1 From nobody Fri Aug 4 18:43:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHZNm6blmz4gstL; Fri, 4 Aug 2023 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHZNm65Chz4M72; Fri, 4 Aug 2023 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691174616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ldwn24VhcYhBpCvC4t2ntzGhIG4zEY5O+P3Q0eSpqY=; b=LLQsT7H2T6HbfVfq4c+QmFYCTPtsTtwoItgL98BOWKFBihpDK6Rx2Ay/Y3FetxVZEZcugA NRCqbGZiKUusYMg6IVKQ8YtN3hcj68NIxt8B2UqM8bc7U+rJK4RrNWEMBLAaXg/+Y4OjAL RC1IJPx4WoZlnfGTXXQbgIK5X3sTKgYEHK6KShegroyCknkHsCW0DHZ00D/f6n9EsdhZaP ncXgxNQ/f8EFv2Wd2SvD5fP+jeM8BrMrZ8YJd5IeWLCU7brGpac+EnEWCk1a4dizRKOcY2 NgW36hf7x8gMbqtmO5MtTVrzHQEYr8Dwq4hWwSqIYQTtlrMZRNyrWtXyYP4B8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691174616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ldwn24VhcYhBpCvC4t2ntzGhIG4zEY5O+P3Q0eSpqY=; b=YxpAJxMqhT0AWcV7EAx3k3mAGJZ9jlOffHPT0gZzUvLqLmSPj+PDV3VWvmn401dcd/+CeS qlmGnLILIcQ/DmL2gEjCg221gtroESrmGnY0+aGbFVyjJlhF9EG3OorSkFpYcdPhK03/rc wQif3allVGhTaEaIYqHZrnzNJgzqqq5LbirVqycRJkldGNzw9v1lhUSdwAxnrQEztz8SsC 3pwC35zUjNtVs08wKxtO7zbFiJBr49+RPgST3RWUnY0PBYeqKg1Mq8CMnQq9fd7tGVnIie 0gSsWcG7+uF1NLN/W+n9h81FlZj9Z79VpDUU+47nUWs9sWRcrJCDc97QhEBGsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691174616; a=rsa-sha256; cv=none; b=w89RXemArByc7CP+wcR0R2gehKcXTVtUnn6waKB9ySqfW2kY3I+dTFgLKYLMNZln9eSmxs G/tK8bdEmzBK7mYxSXxCsiOZI9DZ7EacRxcGyhbAtQvA6wT1AEfft/fSz4vYdVpjfctAwi BF7UOWzD2RSeSQuvyeXlMVkqHEv/1J7OU3aMpEAD8MDl7UoLVoczl84dqjcu+w0fUJRPL5 /eDpEKnrnzRjIAEVlni2pFGO1C+tjmJ1rUR/GA2X1dVHsAKBlHr/6aGgMsK8Bo+5JRr/aI CW9DwvE2wyGmo/4fbgKArZ3HZ+poqqdv7GgH5r99RiMdi2sJnAcE6/h0g+K6WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHZNm55nZz1D2T; Fri, 4 Aug 2023 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374IhaQ5060301; Fri, 4 Aug 2023 18:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374IhapQ060300; Fri, 4 Aug 2023 18:43:36 GMT (envelope-from git) Date: Fri, 4 Aug 2023 18:43:36 GMT Message-Id: <202308041843.374IhapQ060300@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: ccdb28275db7 - main - vm_phys_enq_range: no alignment assert for npages==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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccdb28275db7c94ffdafc542d9e29fd43f51f39b Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=ccdb28275db7c94ffdafc542d9e29fd43f51f39b commit ccdb28275db7c94ffdafc542d9e29fd43f51f39b Author: Doug Moore AuthorDate: 2023-08-04 18:41:59 +0000 Commit: Doug Moore CommitDate: 2023-08-04 18:41:59 +0000 vm_phys_enq_range: no alignment assert for npages==0 Do not assume that when vm_phys_enq_range is passed npages==0 that the vm_page argument is valid in any way, much less that it has a page-aligned address. Just don't look at it. Assert nothing about it. Reported by: karels Differential Revision: https://reviews.freebsd.org/D41317 --- sys/vm/vm_phys.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index ed358d7cd4a9..a3af3964fba4 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -690,15 +690,17 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, * term fragmentation by promoting contemporaneous allocation and (hopefully) * deallocation. * - * The physical page m's buddy must not be free. + * If npages is zero, this function does nothing and ignores the physical page + * parameter m. Otherwise, the physical page m's buddy must not be free. */ static vm_page_t vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) { int order; - KASSERT(((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & - ((PAGE_SIZE << fls(npages / 2)) - 1)) == 0, + KASSERT(npages == 0 || + ((VM_PAGE_TO_PHYS(m) + npages * PAGE_SIZE) & + ((PAGE_SIZE << (fls(npages) - 1)) - 1)) == 0, ("vm_phys_enq_range: page %p and npages %u are misaligned", m, npages)); while (npages > 0) { From nobody Fri Aug 4 21:04: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 4RHdWr31lCz4h5PY; Fri, 4 Aug 2023 21:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHdWr2MnNz4YCs; Fri, 4 Aug 2023 21:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691183096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMg22io4Cr6LreVJA8E/p/p3XtDjKUR/OXPnC+xZ/x4=; b=kyFpfrLYte8RaZ9SGEwBmFAz5vo8FoEfWpeUWyZ5OYKNQCvVmLP+4HrN96McpCdWHi6Per +QOn5Ejl2L2ONZT5U7/GoU3G04itrqdI++yxizShvLFCAL5DKZfTO1eFuihG5LDb6FbYjE r1u1EJF88pTWO0xrdk+jABpSeLGbBHMUeyNSsmsbWc3OC2qHqzopds0ClVNj3PqEXj4aXq LOZYFt8DEPxdJC8ZSh/fHgefV3pINh6whSu8TgnwUHxklX48UALU6caI5Qopwu5t1Tpvud L3khdGlb2gMhkObs0dcNHKxVNBX4jUIlYJMW7Ia63/TJHNYNnqgdRSlFnBFNGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691183096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMg22io4Cr6LreVJA8E/p/p3XtDjKUR/OXPnC+xZ/x4=; b=WEZx13HF5ta4lKkQzQ/G+L8BCeAU4/cDW13ddxiPh+ywI+oYK5gKG+vOwQtL/MeowrDJYB dccSZjnyNj9IJOElWLIASOn3F/xE8QKogMk7H5clK/ukUSKk7ZcdgeIk7jdB+XpWrSZMYV Bw5CJx/2hjMk9aMKsqH3Cp7aLsoCvdeNI6c/iTkxdS+PFhy3cxcLO1sMd0pID2PqLOEsk9 jZiUm1bTLKhkafFR29Bw42NgsCAjLw/ZTaB3yjxuh2upHkb+VmJ/GRw1LWTwBvSkiBW7XB vLA8mURKPNxjCUodj/SgahJokSZ7xUbIlPsIrJevA83NhbE2HExRtacuH98d4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691183096; a=rsa-sha256; cv=none; b=CW9PBlHLsK0tQV4U1mpN6nzdbefy4u0xggkZWqUUT06mOqWz1vna4Jhf06pzg2cfwtXZdA U2Y58GJwz4cp6Fx7dj/TI91yUGwCtN7TbwtWu56MJyhhtXImqj79ApvWj+0oAiGEc6EoRn RwMPx9kRbdkdGY0RxRGeERC+FG/qBYr1hwrU0fK2uyA8HPfvWJqrDx5avGozg8qPtxjnwN 1UgojHmibTSfNz41RyDNoQs9gKU4vTXU18zkw25v4bDfMlHX3Q0ZOZFsPuP0ulWhR7/V1r r2CHOdJLBwkMcmzOu0t2shiULkMAj7zUVoGWHSfGv7xSRa2fTGUSt07MMOZuBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHdWr1NYhz1HKR; Fri, 4 Aug 2023 21:04: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 374L4uR1093733; Fri, 4 Aug 2023 21:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374L4uNX093732; Fri, 4 Aug 2023 21:04:56 GMT (envelope-from git) Date: Fri, 4 Aug 2023 21:04:56 GMT Message-Id: <202308042104.374L4uNX093732@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: efb04fb404b2 - main - sctp: improve consistency of acc and ccc handling in snd 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efb04fb404b240a99c618e49174cd6260217edaa Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=efb04fb404b240a99c618e49174cd6260217edaa commit efb04fb404b240a99c618e49174cd6260217edaa Author: Michael Tuexen AuthorDate: 2023-08-04 06:32:25 +0000 Commit: Michael Tuexen CommitDate: 2023-08-04 06:32:25 +0000 sctp: improve consistency of acc and ccc handling in snd buffer Don't clear the counters for the socket snd buffer when shutdown(..., SHUT_WR) or shutdown(..., SHUT_RDWR) is called. This was causing the system to panic() when SCTP pf tests were running. Reported by: dchagin, kp MFC after: 1 week --- sys/netinet/sctp_usrreq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index d603ef5efcd6..aa957ffa9f96 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -838,7 +838,6 @@ sctp_flush(struct socket *so, int how) SOCK_LOCK(so); KASSERT(!SOLISTENING(so), ("sctp_flush: called on listening socket %p", so)); - SCTP_SB_CLEAR(so->so_snd); SOCK_UNLOCK(so); } return (0); From nobody Fri Aug 4 21:12: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 4RHdht3TyCz4m41P; Fri, 4 Aug 2023 21:12:46 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHdht0Z2fz4ZBq; Fri, 4 Aug 2023 21:12:46 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (ip4d15f6ca.dynamic.kabel-deutschland.de [77.21.246.202]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id 0790475DB4D5C; Fri, 4 Aug 2023 23:12:36 +0200 (CEST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: b279e84a47dd - main - sctp: improve consistency From: tuexen@freebsd.org In-Reply-To: Date: Fri, 4 Aug 2023 23:12:35 +0200 Cc: Kristof Provost , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1C294E86-083A-45E9-8032-51F5B45C18B6@freebsd.org> References: <202307282203.36SM3C98056354@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4RHdht0Z2fz4ZBq 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:680, ipnet:2001:638::/32, country:DE] > On 4. Aug 2023, at 17:16, Mark Johnston wrote: >=20 > On Fri, Aug 04, 2023 at 03:53:31PM +0200, tuexen@freebsd.org wrote: >>> On 4. Aug 2023, at 15:03, Kristof Provost wrote: >>>=20 >>> On 29 Jul 2023, at 0:03, Michael Tuexen wrote: >>> The branch main has been updated by tuexen: >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db279e84a47ddb59e55b5a3cec31c51cd= 41bf0dc3 >>> commit b279e84a47ddb59e55b5a3cec31c51cd41bf0dc3=20 >>> Author: Michael Tuexen =20 >>> AuthorDate: 2023-07-28 12:36:11 +0000=20 >>> Commit: Michael Tuexen =20 >>> CommitDate: 2023-07-28 12:36:11 +0000 >>> sctp: improve consistency >>> This is simplifying a patch to address PR 260116. >>> PR: 260116=20 >>> MFC after: 1 week >>> It looks like this commit (or maybe the next one, = c620788150d274c09a070ab486602c98407d73b0) causes a panic in the SCTP = code during the sys/netpfil/pf/sctp:basic_v4 test: >>> panic: Counter goes negative >>> cpuid =3D 7 >>> time =3D 1691145655 >>> KDB: stack backtrace: >>> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame = 0xfffffe026ea9a3a0 >>> vpanic() at vpanic+0x132/frame 0xfffffe026ea9a4d0 >>> panic() at panic+0x43/frame 0xfffffe026ea9a530 >>> sctp_abort_notification() at sctp_abort_notification/frame = 0xfffffe026ea9a540 >>> sctp_express_handle_sack() at sctp_express_handle_sack+0x647/frame = 0xfffffe026ea9a640 >>> sctp_process_control() at sctp_process_control+0xf62/frame = 0xfffffe026ea9a990 >>> sctp_common_input_processing() at = sctp_common_input_processing+0x561/frame 0xfffffe026ea9ab10 >>> sctp_input_with_port() at sctp_input_with_port+0x1fa/frame = 0xfffffe026ea9abe0 >>> sctp_input() at sctp_input+0x10/frame 0xfffffe026ea9abf0 >>> ip_input() at ip_input+0x2ab/frame 0xfffffe026ea9ac50 >>> netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9acb0 >>> ether_demux() at ether_demux+0x17a/frame 0xfffffe026ea9ace0 >>> ether_nh_input() at ether_nh_input+0x39f/frame 0xfffffe026ea9ad30 >>> netisr_dispatch_src() at netisr_dispatch_src+0xad/frame = 0xfffffe026ea9ad90 >>> ether_input() at ether_input+0xd9/frame 0xfffffe026ea9adf0 >>> epair_tx_start_deferred() at epair_tx_start_deferred+0xd7/frame = 0xfffffe026ea9ae40 >>> taskqueue_run_locked() at taskqueue_run_locked+0xab/frame = 0xfffffe026ea9aec0 >>> taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame = 0xfffffe026ea9aef0 >>> fork_exit() at fork_exit+0x82/frame 0xfffffe026ea9af30 >>> fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe026ea9af30 >>> --- trap 0, rip =3D 0x35c39ec8bda0, rsp =3D 0, rbp =3D = 0x35c39ec8ec90 --- >>> KDB: enter: panic >>>=20 >>> That seems to be panicking during SCTP packet handling, so I do not = believe this to be a pf bug. >>> Reverting both commits avoids the problem. >>> It=E2=80=99s also failing during the CI tests: = https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/23957/console= >>> (To reproduce, kldload pf sctp ; cd /usr/tests/sys/netpfil/pf ; sudo = kyua test sctp:basic_v4). >> Thank you very much for that line!! >>=20 >> I think I know what the problem is. It comes down to an inconsistent = handling of shutdown() calls. >> This results in inconsistent sb_ccc / sb_acc values which are now = caught. >>=20 >> I'm working on a patch which also fixes several syzkaller issues. = Using the above line, I'll also make >> sure it fixes the issue you are observing. Should be fixed by Monday. >=20 > In the meantime, it's impossible to run through the test suite. Would > it be possible to revert the offending commit(s) until a bug fix is > ready? I committed a fix for the particular problem triggering the panic when running the SCTP tests in = https://cgit.FreeBSD.org/src/commit/?id=3Defb04fb404b240a99c618e49174cd626= 0217edaa Thanks to kp@ for providing a hint how to run the particular tests. The = SCTP pf tests should pass now again. Best regards Michael= From nobody Fri Aug 4 21:15: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 4RHdlj5D9zz4m4B8; Fri, 4 Aug 2023 21:15:13 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHdlh2y5kz4Ztm; Fri, 4 Aug 2023 21:15:12 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 193.175.24.27 is neither permitted nor denied by domain of tuexen@freebsd.org) smtp.mailfrom=tuexen@freebsd.org; dmarc=none Received: from smtpclient.apple (ip4d15f6ca.dynamic.kabel-deutschland.de [77.21.246.202]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id 69F3282A9B346; Fri, 4 Aug 2023 23:15:08 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: c620788150d2 - main - sctp: keep sb_acc and sb_ccc in sync From: tuexen@freebsd.org In-Reply-To: Date: Fri, 4 Aug 2023 23:15:07 +0200 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <9BC2D69B-0A3E-4D39-924A-86A0087B2DA2@freebsd.org> References: <202307282217.36SMHSJD073301@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Result: default: False [-0.39 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; MV_CASE(0.50)[]; NEURAL_SPAM_SHORT(0.31)[0.308]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[193.175.24.27:from]; RCVD_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE]; FROM_NO_DN(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[tuexen]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4RHdlh2y5kz4Ztm > On 31. Jul 2023, at 10:44, Dmitry Chagin wrote: >=20 > On Fri, Jul 28, 2023 at 10:17:28PM +0000, Michael Tuexen wrote: >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc620788150d274c09a070ab486602c98= 407d73b0 >>=20 >> commit c620788150d274c09a070ab486602c98407d73b0 >> Author: Michael Tuexen >> AuthorDate: 2023-07-28 13:16:23 +0000 >> Commit: Michael Tuexen >> CommitDate: 2023-07-28 13:16:23 +0000 >>=20 >> sctp: keep sb_acc and sb_ccc in sync >>=20 >> PR: 260116 >> MFC after: 1 week >> --- >=20 > Hi, Michael, > perhaps some of the recent fixes have broken these tests: > = https://ci.freebsd.org/view/all/job/FreeBSD-main-amd64-test/lastFailedBuil= d/console Fixed in = https://cgit.FreeBSD.org/src/commit/?id=3Defb04fb404b240a99c618e49174cd626= 0217edaa = Best regards Michael From nobody Fri Aug 4 22:18: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 4RHg8j1flvz4m8Rn; Fri, 4 Aug 2023 22:18:29 +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 4RHg8h5H0xz4fwc; Fri, 4 Aug 2023 22:18:28 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 374MIKnJ066305; Sat, 5 Aug 2023 01:18:20 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 374MIK7M066304; Sat, 5 Aug 2023 01:18:20 +0300 (MSK) (envelope-from dchagin) Date: Sat, 5 Aug 2023 01:18:20 +0300 From: Dmitry Chagin To: tuexen@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c620788150d2 - main - sctp: keep sb_acc and sb_ccc in sync Message-ID: References: <202307282217.36SMHSJD073301@gitrepo.freebsd.org> <9BC2D69B-0A3E-4D39-924A-86A0087B2DA2@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: <9BC2D69B-0A3E-4D39-924A-86A0087B2DA2@freebsd.org> X-Rspamd-Queue-Id: 4RHg8h5H0xz4fwc 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:61400, ipnet:195.93.173.0/24, country:RU] On Fri, Aug 04, 2023 at 11:15:07PM +0200, tuexen@freebsd.org wrote: > > On 31. Jul 2023, at 10:44, Dmitry Chagin wrote: > > > > On Fri, Jul 28, 2023 at 10:17:28PM +0000, Michael Tuexen wrote: > >> The branch main has been updated by tuexen: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=c620788150d274c09a070ab486602c98407d73b0 > >> > >> commit c620788150d274c09a070ab486602c98407d73b0 > >> Author: Michael Tuexen > >> AuthorDate: 2023-07-28 13:16:23 +0000 > >> Commit: Michael Tuexen > >> CommitDate: 2023-07-28 13:16:23 +0000 > >> > >> sctp: keep sb_acc and sb_ccc in sync > >> > >> PR: 260116 > >> MFC after: 1 week > >> --- > > > > Hi, Michael, > > perhaps some of the recent fixes have broken these tests: > > https://ci.freebsd.org/view/all/job/FreeBSD-main-amd64-test/lastFailedBuild/console > Fixed in https://cgit.FreeBSD.org/src/commit/?id=efb04fb404b240a99c618e49174cd6260217edaa > > Thank you! From nobody Fri Aug 4 22: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 4RHgrm6NcSz4mBTB; Fri, 4 Aug 2023 22: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 4RHgrm5t63z3G1G; Fri, 4 Aug 2023 22:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691189384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=annsLJQc/4dGEjIZt6xR+HF/rbhMsh2VF4forxkvhAM=; b=ZRiWLmLas7QKlu5mzMD+Rss+vyJYs5y9LZfoucOoaHEj9IWw72zHJ7hPdKaaWzLALDCufb Dzg/4eW4bfNbWrgdE9F3Q9ZGLaBXuOWm4mc5PCrh/LRtrYkWABFWy+a2chYxCSXW6vr5l7 iQZa07LfbJTZ+l6MuPXw5w+wRkZgiNbLzHq0tmMjAgOetW5cP9+YcvO9wfldXOASl7G1N7 x8Kr22LFV5S7n+4+SXqc9wwmSbjhO1mC5mN48i11L+n89Z3gVzOQbHyCo7WTeLpR4DtZIG ORny3KpX1R6/UtoRw71ZmUHsxYJIAaSclafiW5+Bwc20Epr9t2ZlOn0Sl+VMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691189384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=annsLJQc/4dGEjIZt6xR+HF/rbhMsh2VF4forxkvhAM=; b=FpOcbcc/ARMoORWnYo7vC16i9/433Qpt6Gc598rW/W1XGKKtof1qwstyP6ktcLBYx69LLU UYp/oN4AHKNRWHlhWEosBnaZ6J+HOEKCLLdxSBduA1eRzcJQ4bDPmxSuPCkRODocxKKaMM PZvS4mkKLP6jKFKm1PCFDZJV71IiwSi4cvjx/rmsw3iIHUy4nFOhA+E9893P3EW4vWCbuY FbJk5TLwyQ+pUsbYDHWY83ci9gQwmAr8mfj050b1KteZdICynf4zUQxCRQKkW3zVOZZOqW PPYXEfLZPNtpgXnfG7wr7L0FAA0EEauXu3jUG2fTC/awqnd3Zspai+E9o0nvPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691189384; a=rsa-sha256; cv=none; b=EQoroBaOa0OcvCpvHFSK73n6CcjnA6Ia4+yQtUIn2g7ALJMbtdbO6r9n1a6U7T9utrtyQL VMP1xxxjV57w0qQ0afrdENTWyXdDiEXPVbQNEvwNMWCdFO+dUA7BFYOlGHKtXCKEaq9aI5 9ACw4/bRZMDsyrXK0/xy3a9ggYTcrULUPXySNYsdUg7iLKtYFqwHRQuFaAoPJ2j9CzOoYQ sOkUOwSaYKdGKqXHtdFhJWSSB+AuVzzhPmnEesLuLgxHWrLYMgvflo9hbUhH+4nFvcc7mC YVM/smShFMpeuvJocLqGvgfHKergnYWJ/yi4DaAaxXwYI4x//LDVLQQe+fgt2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHgrm4ppWz1K7r; Fri, 4 Aug 2023 22: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 374MnitT060237; Fri, 4 Aug 2023 22: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 374Mnieb060236; Fri, 4 Aug 2023 22:49:44 GMT (envelope-from git) Date: Fri, 4 Aug 2023 22:49:44 GMT Message-Id: <202308042249.374Mnieb060236@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: 9e6941a2c7a3 - main - udf: reject invalid block sizes from lvd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9e6941a2c7a393aefe6a123952c6eacbc23098a6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6941a2c7a393aefe6a123952c6eacbc23098a6 commit 9e6941a2c7a393aefe6a123952c6eacbc23098a6 Author: Konstantin Belousov AuthorDate: 2023-08-04 22:47:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-04 22:49:36 +0000 udf: reject invalid block sizes from lvd PR: 272893 Reported by: Robert Morris Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/udf/udf_vfsops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 0b028718085a..a8aa811a0d6c 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -413,6 +413,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) lvd = (struct logvol_desc *)bp->b_data; if (!udf_checktag(&lvd->tag, TAGID_LOGVOL)) { udfmp->bsize = le32toh(lvd->lb_size); + if (udfmp->bsize < 0 || udfmp->bsize > maxbcachebuf) { + printf("lvd block size %d\n", udfmp->bsize); + error = EINVAL; + goto bail; + } udfmp->bmask = udfmp->bsize - 1; udfmp->bshift = ffs(udfmp->bsize) - 1; fsd_part = le16toh(lvd->_lvd_use.fsd_loc.loc.part_num); From nobody Fri Aug 4 23:43:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHj2L6Vgnz4mFmR; Fri, 4 Aug 2023 23:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHj2L62s6z3LcD; Fri, 4 Aug 2023 23:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/m/w5dM5LwH1QwwY0aQWOSOGtb1kka2gO+ljux6CKSo=; b=ITrasczvZ6wk1RaWZVrs2MMw6sWEECn1eJ1OUm7c4ZVKsSAhaHxwk7ynvCfp99MgwxXJtH V4/yyhWsn9b8QlaqBKr3W7zL6boSaCILtIpLigIBvnL8U6m9UKTshXHvLPQrzNKimeimPL obIKLV1ELFUxuPCGQklTmscfErRThkIbSkNxLK7S8YMbYO41O/IslMYBRQRUjRSogCeePR 1Y7e5LEK7Dl4X/cOK5/gSlnPSZ6LH/Nm0X+3H7QIhahoMenEdDdmVS4yASwHI/YQO8Fupi eoPV9B06rFs7PQ8aXFJxIHtQJnmtjvRYq1PkUk+ZFUBVz1vQW05IKxP9f1GKRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/m/w5dM5LwH1QwwY0aQWOSOGtb1kka2gO+ljux6CKSo=; b=jiGtzINq5w/HmYrN9VSj3HpQC1balYZEYr3BPzJ6ivlRS8m6AGiUR21zyiTgSIWKWZN2cF 6IWlLCg9rMuQnfpckMA0KMZ+HbPB0wPvVBr/uBmXO9jIxNajI6nI8JI+YTqwigLX0ucGxN ZICBEXCOyE/nN99ITfkBSO3RQC50KJ+Hh43bjk8nqLsrggzWB37mJqvzj4IP37vQ3yQrs2 K3RZY6T0anC3j6uVVOjW2gihVaajnmwX6o+/Yklb0xiQL3qbWG8beJ/ccPCiaroAUySHOY senXB19i+rWNLrpRZSPdSxkq4+AUWSIDOg/fhw3sVKKzW2K66qge86jokoB2EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691192586; a=rsa-sha256; cv=none; b=Ew/iKeF2Lufsg+Q2ziSKzaSHCaL+Zi1hli+/ZurxX312t58yCTg4qZnbQfZgGQl/QDioHd qeMdwvuLxJoIcVNBI3GnvJu35RcB7jAzDtF+2csx+pbNH6psdDv2fWo9NjIG7AeUOWQvnW FBXJXQMDC+KtD7q1gNjo4Loe5c77lJmLZ7iRYywo9JQpPXz3SwbscyXcxLK584Jpa9K1bQ V37iD8gQ360Y8keW1oDdbv0bLGbpT+7d+GFCz2HLnSLTq4hBz987yxchxTCyjpKUBTgDSZ kem4/GEYvYtPlVrZukDlfRh8RkrUS0vViuXyembcMlHyhXDRKhlJjC3zgLTgdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHj2L55c9z1Lr6; Fri, 4 Aug 2023 23:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374Nh6sa059163; Fri, 4 Aug 2023 23:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Nh69b059162; Fri, 4 Aug 2023 23:43:06 GMT (envelope-from git) Date: Fri, 4 Aug 2023 23:43:06 GMT Message-Id: <202308042343.374Nh69b059162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c70e615051b0 - main - udf: Reject read requests with an invalid length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c70e615051b00671d54651d99af5cdec4b091d92 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c70e615051b00671d54651d99af5cdec4b091d92 commit c70e615051b00671d54651d99af5cdec4b091d92 Author: John Baldwin AuthorDate: 2023-08-04 23:40:19 +0000 Commit: John Baldwin CommitDate: 2023-08-04 23:40:19 +0000 udf: Reject read requests with an invalid length - If the size is negative or if rounding it up to a multiple of the block size overflows, fail the read request with ERANGE. - While here, add a sanity check that the ICB length for the root directory is at least as long as a minimum-sized file entry. PR: 257768 Reported by: Robert Morris MFC after: 1 week Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41220 --- sys/fs/udf/udf.h | 4 +++- sys/fs/udf/udf_vfsops.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h index b210427a63d7..8500088ec9b7 100644 --- a/sys/fs/udf/udf.h +++ b/sys/fs/udf/udf.h @@ -97,8 +97,10 @@ struct ifid { MALLOC_DECLARE(M_UDFFENTRY); static __inline int -udf_readdevblks(struct udf_mnt *udfmp, int sector, int size, struct buf **bp) +udf_readdevblks(struct udf_mnt *udfmp, daddr_t sector, int size, struct buf **bp) { + if (size < 0 || size + udfmp->bmask < size) + return (ERANGE); return (RDSECTOR(udfmp->im_devvp, sector, (size + udfmp->bmask) & ~udfmp->bmask, bp)); } diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index a8aa811a0d6c..b0a221df6391 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -482,6 +482,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) */ sector = le32toh(udfmp->root_icb.loc.lb_num) + udfmp->part_start; size = le32toh(udfmp->root_icb.len); + if (size < UDF_FENTRY_SIZE) { + printf("Invalid root directory file entry length %u\n", + size); + goto bail; + } if ((error = udf_readdevblks(udfmp, sector, size, &bp)) != 0) { printf("Cannot read sector %d\n", sector); goto bail; From nobody Fri Aug 4 23:43: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 4RHj2N0zMZz4mFc7; Fri, 4 Aug 2023 23:43: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 4RHj2M6z4Rz3LX4; Fri, 4 Aug 2023 23:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqyPQ7U4u8pnFqthmNlwjmGp/vpNF9nVDlmFc+aU9kM=; b=MJs1EWlOSqp+ijHXFP9qnrO0Vk3xsLzm/i/gPvRt58YhieDYIQp1fXEQmpwEMyv4adaL6i nKrDcHmmooeJ1k1mzkSbDVSQMp8wR+EKhtNMNG5ljuVwV2CsEDPPPPKJcTfr9jr1Uif8t7 D+GZj8yXwiQ8hubjqLh2lTe+DqDxQbY1eLYx2MqPcjJxNO7AaI/ojjU1vQTPQUC6weohmo kChU889Cz+FEUblypqDASieh+QYsZXuBeZ8/YShAwG+P9aO9Xfcq6QyZZ2HScc7fFLAoGA AxXLmVqpjYX0DTILGeUilHRYX87nKtr6UMWhuPldlHxu8xX0gwQ+Lt0LsXLCZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqyPQ7U4u8pnFqthmNlwjmGp/vpNF9nVDlmFc+aU9kM=; b=naJYG8SkIUMI/y4MfeXWU+6sSbVX/1Al9p5gCKzNx89Uf1O0GBGofhC3YAxRu1ivYDtElK OCkfXFA0ca95haLuud/Fg1reB5Woy3hvzz0DTUVeL7HWUtmmHsp9oW5chcu8CjvSQR1Ya2 fsEZP7GUc/+WrIVWqL6rqLTjQvNzup1NfcnxsC8MHqC479AkyTj8I9BjClvRm0BzAlzPiA hMVQy6eDe/YcD+2QVxvYjGb9ks0Sqx1blGAAqd93zZ0LzsPWtQIpobRWGGjTcM2d4OEv79 wGnBAV2BY0cbxlgaGTdAW4sJ6ghlKZLUJUkn4aTZ9jEsaGdt8UAPxh82XRLkSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691192588; a=rsa-sha256; cv=none; b=noIrniTHgycz8x6cwk+WmKv7XoOwU+5tzwFckb4fl5ICgD0RW8PKAqM++j9KF5iSmyrqmQ opgd50tEcXRzqpqymDnZYYWk6mw9w2PP7QqUQXx2Rty4aYgMcBQmdcDnZDtRN9ixf6bLbV a/CcjHfQmV06mohVM9svKIYH6byTFZTRqw9nxATEJNqEu0NkuS0djM2OaGTtzKDhYxl5TJ qBxqyym80bat8bdIFwFUpHSu+uOCADDNsasmClxfSalmjUSFbmho37u8rp4QsEYSaTnUwJ 2KnScxyP9G58KKHyYpVcRaQyL6VGITlzacm57KcxvIBw2R3c9MsMGGtscb5tbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHj2M5ml0z1M09; Fri, 4 Aug 2023 23:43: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 374Nh7jT059183; Fri, 4 Aug 2023 23:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Nh7OR059182; Fri, 4 Aug 2023 23:43:07 GMT (envelope-from git) Date: Fri, 4 Aug 2023 23:43:07 GMT Message-Id: <202308042343.374Nh7OR059182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4c89c0127dca - main - g_raid concat: Fail requests to read beyond the end of the volume List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c89c0127dcadaa0d337c23d028f3fea5e76317a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4c89c0127dcadaa0d337c23d028f3fea5e76317a commit 4c89c0127dcadaa0d337c23d028f3fea5e76317a Author: John Baldwin AuthorDate: 2023-08-04 23:41:05 +0000 Commit: John Baldwin CommitDate: 2023-08-04 23:41:05 +0000 g_raid concat: Fail requests to read beyond the end of the volume Previously a debug kernel would trigger an assertion failure if an I/O request attempted to read off the end of a concat volume, but a non-debug kernel would use an invalid sub-disk to try to complete the request eventually resulting in some sort of fault in the kernel. Instead, turn the assertions into explicit checks that fail requests beyond the end of the volume with EIO. For requests which run over the end of the volume, return a short request. PR: 257838 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41222 --- sys/geom/raid/tr_concat.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c index eac62b3171d2..632501f323cd 100644 --- a/sys/geom/raid/tr_concat.c +++ b/sys/geom/raid/tr_concat.c @@ -240,8 +240,10 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", bp->bio_offset)); + if (no >= vol->v_disks_count) { + g_raid_iodone(bp, EIO); + return; + } bioq_init(&queue); do { sd = &vol->v_subdisks[no]; @@ -267,10 +269,8 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %ju)", - bp->bio_offset, bp->bio_length)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + bp->bio_completed = bp->bio_length - remain; while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -308,8 +308,8 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual, offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", boffset)); + if (no >= vol->v_disks_count) + return (EIO); do { sd = &vol->v_subdisks[no]; length = MIN(sd->sd_size - offset, remain); @@ -321,10 +321,9 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual, addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %zu)", - boffset, blength)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + if (remain > 0) + return (EIO); return (0); } @@ -340,7 +339,6 @@ g_raid_tr_iodone_concat(struct g_raid_tr_object *tr, g_destroy_bio(bp); pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { - pbp->bio_completed = pbp->bio_length; g_raid_iodone(pbp, pbp->bio_error); } } From nobody Fri Aug 4 23:43: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 4RHj2P6nnLz4mFfk; Fri, 4 Aug 2023 23:43: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 4RHj2P0mNtz3Lw2; Fri, 4 Aug 2023 23:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoTWaJWWrS7U364n12YwgJqgJhjxedPy+aRtg5I5SJ0=; b=kNA9/qSeOKL3OldRrA08X9bWKdRX1Vw/EoPEaSg1csmdNXAzw+63LzFijBljo8RjEiNvJf hXzCew5BWSstUkRn47OMQ3WHQUaoT0Y/nwwIHU3cDKPBL2zgbBRENtTPLD314ufMpJmfwt gbvhha6tFi8wSudrMyhtxDiXqt3yPWiYUX/zgOlBbGyh2bfHgyyWZJ124Vimlz7FQ3LSUf KdsStFxAi/Or7uc6a+a2Ew1HwGNXI6a+r+KqRq9jAlQo/dLQTSv0xEHJuhh9AQF2nY65yp Ieup5xmxrOuc+LXU8UTcF2WbxN0+OFELF4Xo+E3FIGCAQJGwoBO3mSBKUGrZyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WoTWaJWWrS7U364n12YwgJqgJhjxedPy+aRtg5I5SJ0=; b=maHxvkNdL5CsOL/oAbGuoF6q9mBTNSaDOt8bCdiUoJhkhlNbl9v8UvYFq4PXnGR/H7nOlb y5j47MNQjjFL1/jT6kRfnlqRFGWLp+giZg9XhUX3CDg92fA1NLgOMI0C1L/OZh85VOjOMV gbarYa2ZnFCE8HHAInYz0dQdOHyz/pZZon9zRNi2fhZGdfnnbgz7xIsxKEDR3tJfGe6wSI QeeESWukHrJOil5fBwzYttaCU2vcfOj0eLR4n2XsxybNYbtnyhOsS4kDIkOvnqufO4pPPY zsfgEofGIhxd9/RPy6mUfZx+3SwdSYSYrG3y+04BJY/mE9mP9D87mlcpuvcjMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691192589; a=rsa-sha256; cv=none; b=GyT0IlSji+QIubv6+hu5ZnDiYenQRbhvgAtvqbH5Ap1vUw/TErX4xAqdCMyDal1mrnIESS fQgsiaUZQvnhCYDycQ+LElni7p6Eho627IM7U6HlfNPMJAqU2U8ot3Yh58tXfSxeo+qBAz F4MN5/DRKalBjkYBQSLpo5a6iMG3YW7EaxzWgVkiPW9O6kpS2/WiJineeIG1HIJWNCBFOP qIUkG5T2L9F5kmd5dZN/T/KKsI1T9kxC3asZRm+XpBzFfzPcZlkCVVCmU7kK1Y4h1C1sEC n9kdYOq4fK6PoU5yoWzna8DP18bkJcetMIAyh/hwzyuRUlWjYnwMsAdfRB2NXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHj2N6y4Vz1Lsf; Fri, 4 Aug 2023 23:43: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 374Nh8N5059202; Fri, 4 Aug 2023 23:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Nh8UW059201; Fri, 4 Aug 2023 23:43:08 GMT (envelope-from git) Date: Fri, 4 Aug 2023 23:43:08 GMT Message-Id: <202308042343.374Nh8UW059201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4af849d71f69 - main - cd9660: Reject volumes with small logical block sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4af849d71f69306432941d91fa46c3c303059d63 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4af849d71f69306432941d91fa46c3c303059d63 commit 4af849d71f69306432941d91fa46c3c303059d63 Author: John Baldwin AuthorDate: 2023-08-04 23:41:50 +0000 Commit: John Baldwin CommitDate: 2023-08-04 23:41:50 +0000 cd9660: Reject volumes with small logical block sizes ISO9660 permits specifying a logical block size that is any power of 2 greater than or equal to 512. The geom disk layer requires requests to be aligned on sector boundaries of the provider. With a volume that uses a logical block size smaller than the underlying disk sector size (e.g. a logical block size of 512 or 1024 on a CD which uses 2048 byte sectors), the current cd9660 vfs can issue requests for partial sectors, or on non-sector boundaries. Fixing this properly would require wrapping all of the calls to bread*/bwrite* in cd9660 vfs to roundup requests to be on sector boundaries which can include both the length, but also the starting sector number (and thus requiring use of an offset relative to b_data in the resulting buf). These images do not seem to be common however given that no one has fixed this in cd9660's vfs in the past few decades, so just reject them during mount with an error. If such images are found to be used in the wild in practice, then the larger fix can be applied. PR: 258063 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41228 --- sys/fs/cd9660/cd9660_vfsops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 6d5551c69312..015d4b308978 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -336,6 +336,13 @@ iso_mountfs(struct vnode *devvp, struct mount *mp) goto out; } + if (logical_block_size < cp->provider->sectorsize) { + printf("cd9660: Unsupported logical block size %u\n", + logical_block_size); + error = EINVAL; + goto out; + } + rootp = (struct iso_directory_record *) (high_sierra? pri_sierra->root_directory_record: From nobody Fri Aug 4 23:43: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 4RHj2Q2gLNz4mFcB; Fri, 4 Aug 2023 23:43: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 4RHj2Q1h1xz3Ld8; Fri, 4 Aug 2023 23:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vv8bo4OBbga5du6dZ2z2MOMXHZcBhR7+fqsdaV6QSRU=; b=h7+rE1xjfFkLa9050Fi3z/eHJpqSKtrXRfwsBlqdpTI3fIJ7slLrnbJhU9r/tDxvGvnMoh lmXYulsAUZ2DBNm6fW/R4B650qZT8+KdC9F/11zaiyaOo6EyTM3F0p36HHHIupKsTtrJzS npipSKGRirEScWUEwca9w01pc9Z7R8lwGg7aXpDClU9cCU3bnoaxql7eLLjAPXtpPe1fQE tDZUiIlT7rwDiSSOZfyymVAAKsunbjI8TvpjJEGlKTw9gzxtmGFdIXxxwKSwoodpV+klMj CMJjaXAvxsYeRP5USVOD5Clw7PCumXvYZsHLwTkkYApzK98lzv4tDrZdeiUr4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vv8bo4OBbga5du6dZ2z2MOMXHZcBhR7+fqsdaV6QSRU=; b=qAL48XfcR3W9djDm/IiO/ugdTAUAOaDH62z6oGY3Q9aAsS4lhj/a4ITCEvaOMMn+8doT/O LPmRdxXKbaJq9OO9Cd+gOXxsmH+aa4GrWSzdq+5+l4OLl+I3ywW1jGN5XHtVd3tXnsw7Ic Tb7/wb9xr3rZFqMkuLCCKlSQNeJUhXPwnXf1BEo1Hq/MnBd5MvAcaNc+r4/FUcbNYMaoWL P/J+IfCz4Cy6V/C0V39Zt3dlQW6dPwDvQGG/oLY8qi3fIOKDgvd1SePo9eAdZ1bWZsN7hG XRBdKgfpVKTaY6uP+mI44zt4QIGKCx80AqY0hX3Tf8JIFH/JabK1Wyxxb65W2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691192590; a=rsa-sha256; cv=none; b=m2/Tai3w7UfrqBHJChHlpb1ZO//5IExfZe0cTp0rQD0PvGj8IsHmN/qPfAk+1BqR434Xsl 71r+GlokWHLQE1MOc7Ow289OqJt7csTEScAMmUqfbrrWxdWBA0+qcs9ZdcFUgatzl3LXLZ 8totsZM6XiqorGJ44TwhGTJfy6tmSBbDucfxEAaCHbGgQg54zvewnHkzAtZCgJPm3JM0KO 1AHIqSM9vZo5UedNah1CEZurZjsUNEKc7KaiYvVPDJxhAKPyForHuepEOncP25MOfKLFRW EOnRhLDFgmvwnyHRPh7pLXXI2gpuDEsFo+CPtLYDQekdsUGVwNRREII9g1l4kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHj2Q0mnsz1Lr7; Fri, 4 Aug 2023 23:43: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 374NhAoh059226; Fri, 4 Aug 2023 23:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374NhARn059225; Fri, 4 Aug 2023 23:43:10 GMT (envelope-from git) Date: Fri, 4 Aug 2023 23:43:10 GMT Message-Id: <202308042343.374NhARn059225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: aca3d65fedff - main - netsmb: Add bounds checking to smb_t2_placedata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aca3d65fedffbbe71399a88d33ea8ecf550177eb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aca3d65fedffbbe71399a88d33ea8ecf550177eb commit aca3d65fedffbbe71399a88d33ea8ecf550177eb Author: John Baldwin AuthorDate: 2023-08-04 23:42:41 +0000 Commit: John Baldwin CommitDate: 2023-08-04 23:42:41 +0000 netsmb: Add bounds checking to smb_t2_placedata Verify that the requested region of the mbuf chain is not beyond the end of the chain before trimming it from the end. If it is out of bounds, fail with an error (EPROTO). While here, properly handle the case that the amount of data at the end of the chain might span more than one mbuf by using m_adj to drop the extra bytes rather than assuming m_len of the last mbuf can be adjusted directly. PR: 258504 Reported by: Robert Morris Co-authored-by: Robert Morris MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41229 --- sys/netsmb/smb_rq.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index 3e4fc0804620..1af1ff92dfa0 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -425,12 +425,18 @@ static int smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count, struct mdchain *mdp) { - struct mbuf *m, *m0; + struct mbuf *m0; int len; + len = m_length(mtop, NULL); + if (offset + count > len) + return (EPROTO); + m0 = m_split(mtop, offset, M_WAITOK); - len = m_length(m0, &m); - m->m_len -= len - count; + if (len != offset + count) { + len -= offset + count; + m_adj(m0, -len); + } if (mdp->md_top == NULL) { md_initm(mdp, m0); } else From nobody Sat Aug 5 00:22: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 4RHjvd2BvFz4mJZX; Sat, 5 Aug 2023 00:22: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 4RHjvd17kXz3S0Y; Sat, 5 Aug 2023 00:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691194941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrzGtVT63xpYgncOWVtIQZworWry0Drqe8Tt8swYZkA=; b=XrvvUCxwS+stYcbPBi+Z2wBLJ0Nym6N+T+sCI+CZ1alKp4pMNYschrMPsp/E54QMclOsLI IiFfMXNPmNRoS9CU6cvF3R7TE1VgjyB/EpQeDT1aiK3w2fwPMtjj0373RQsd9c6yQiqt6x mV/6IMiMw1KUZXJJfvJ4TUD2vvpCDX9gDbVmjrYl3H/ZDd0H+Gr/q76zVxppJd87ARSl9t C2b2yeyZJuZGUNeixEEV/VUAPu6TFofsTkfT+XWmd5U6fHSvwig71KwMyKqIND1cSEDF9W LzqYvJYa4XJP166sy+v/6y4MlwXquN5bDTvQIj3fzSnLgF+SSFPE/neRCD7qbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691194941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrzGtVT63xpYgncOWVtIQZworWry0Drqe8Tt8swYZkA=; b=AUImTPlwtDSprmbJky8dQYd5Eju220d1ODtG9j51p5cdWSwN6L/4LBeWMnyaPq7qk4cxTa OY2J4PTNTwkjIkZmWETN7JIVIV7sULKkQkKz6CONjAQVIRErphwwq83uxNLqZbQ+220vbo n/V8oZhWPemmEb0doGLTIq6DE/mJRkCJfBJr2UzgrTgcEYRUgSdiHW3LGdQG9RMRqgh8zb H+pwFg0mT49IVUyJXXV2GYgFqEegHvJbh+Ligty+LH72NPPYWJ9I3idG5MlOEERZOndHzW 6XP9pTMeqAyMloPPyGVvKXUCqtNZpsc/J5JS9QCxhEu+c46hBI2J4K3ZvGbgNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691194941; a=rsa-sha256; cv=none; b=lv4uUQM+AhMuZ3dokOjyEJqEbWVu33TERaQ1a3vnxQCban+BVkul82pZ2YipSAioNX7y/K TDLBgsjbOkFskbFiWTXnotUc9OrnfrqXtAPJzzj5XHXexUoI234kHPX8k0PSZGHI9sCirP 1X5xnAViU+MyAq+GmWUFMfy7Uw1/+OhNcWXj6Ncwu2paBXK3CdFaveGSsNoqkQxD2TojYe Wp8c2rnJ8KYiqTCveCGP9dEsYv5nDQWTMmQAIaLWubeN36Ra78O1BSXt59lRcTpMHtmLSp 6sON/DE0RGMrkWhFWFV8bjoN3pdijkLf0tanmvZJ37vtK10NImme8WGvLy3moA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHjvd0Cc1z1N8K; Sat, 5 Aug 2023 00:22: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 3750MKX8025419; Sat, 5 Aug 2023 00:22:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3750MKem025418; Sat, 5 Aug 2023 00:22:20 GMT (envelope-from git) Date: Sat, 5 Aug 2023 00:22:20 GMT Message-Id: <202308050022.3750MKem025418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 106c9ff5aca4 - main - stand: Export _start on arm like other architectures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 106c9ff5aca46b3bf9c82c1a56b432134a7cf36b Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=106c9ff5aca46b3bf9c82c1a56b432134a7cf36b commit 106c9ff5aca46b3bf9c82c1a56b432134a7cf36b Author: Jessica Clarke AuthorDate: 2023-08-05 00:14:16 +0000 Commit: Jessica Clarke CommitDate: 2023-08-05 00:14:16 +0000 stand: Export _start on arm like other architectures By not exporting _start, we get various warnings of the form: ld: warning: cannot find entry symbol _start Note that in practice these don't matter because we manually construct our PE header and use objcopy -O binary, so the entry point is set to whatever we put explicitly in the PE header, but we should still do the right thing and silence these warnings. This was found in CheriBSD, where bsd.prog.mk has similar logic to bsd.lib.mk and sets -Wl,--(no-)fatal-warnings based on LD_FATAL_WARNINGS (unlike FreeBSD which only does so in the latter). --- stand/efi/loader/arch/arm/start.S | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/efi/loader/arch/arm/start.S b/stand/efi/loader/arch/arm/start.S index 5b6182d67d0a..bd8f425ca9e0 100644 --- a/stand/efi/loader/arch/arm/start.S +++ b/stand/efi/loader/arch/arm/start.S @@ -140,6 +140,7 @@ section_table: _end_header: .text + .globl _start _start: /* Save the boot params to the stack */ push {r0, r1} From nobody Sat Aug 5 00:43:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHkMg6L4mz4mKcd; Sat, 5 Aug 2023 00:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHkMg4hHtz3VSr; Sat, 5 Aug 2023 00:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691196191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tqyr3hd/IDkWHccXHbrwTyF0EliAZfvHsYY3F5FM/pI=; b=oUm01CHEZg1syVrRJhZhqnFgWARtGiS8F26+GFODdyfICQyj8NnDrmKFQRRKSuNznj1jGt Q2SySjYQ5oeEMZZ85r9dURGH/Ggc0fd6NLxpm5VMQPXlrxP9rjP+3TpN5eCnwhbunYjq30 vuot7wkznZJj3xq4/y819DapPz6WodhZz0pREO7Hsl7sZLCh4CFgxsha8XYjnClqc5PpvX 5IPiXYVGZn5JsSSAoQDg8lvHYgRyeR2X8dMK1F1FyudwW8r6+5Dq1gkC+UOINUDDbCLERD PSnDUzTw3vZswubxBFQ2oDZ/4KzuRWtGC0epIZLruJd1I+e+54i2MzFLpun3Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691196191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tqyr3hd/IDkWHccXHbrwTyF0EliAZfvHsYY3F5FM/pI=; b=xq1B9ldx+XW/RfY5zpJftVgwnC0Y8d5PzwpE1afzsGyZvkdyXYY6COUlt09Ia+Q3y4M1vJ MVNc7s8C1EAFDnSpjcZ3KjzcC7eTZDipvYMJ5FIr87RmRq5CIL5cNFjMEGjYncUVq9Ag2F dzRRpZlAlO86e6dAzeLk+yCljOvTWCOX8evqTL+gB/3QWm8Q+QZfe/3Y7Rkt1nh3Pxv887 ouIx2FwGjp9Lvxz4njhOS+dR+Gi/uIZyBqDMElCXMXMy6SHwV7cXWXCHRWLzamRaVigE7U 1t/KmrVpS6tpzz3McgVHL7hDSdg1oS3DMEinGpa/ymJw/nf6qzUoAkQovBvLLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691196191; a=rsa-sha256; cv=none; b=GMJKzaSjGrTIy9E2ZV0yKEZApn8q18GQL2iBPdOM0+u2dp8ZlL8v9xwYxX2CtaAQ3ulwTr L5e1aU9fPixz+ICOjdQZspXfRq1lxAkrt4E/f3sqhJ1zQx4IkLE0mWi296lNXYo0J4m7yo uYIt/r77TQtbg0UVqe327P7FaZ35/BSb+syFRl2zNWHs7Rm60w6xLToeA8VdfPoaEzeKjD Jwd6W9SVJ9CSH1AHWaa2As1cNPEaeAwTP1uC0CRl0GjNBst05F8DWdAcAUnS2zfVzYy5ZH MkNNF7Rxxif0vCmzV7/eLPyj+MfAJeemQbxiTKj0W/GFT2ATyAu/tVdQHavwRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHkMg3mqwz1N7l; Sat, 5 Aug 2023 00:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3750hB7S058091; Sat, 5 Aug 2023 00:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3750hBWw058090; Sat, 5 Aug 2023 00:43:11 GMT (envelope-from git) Date: Sat, 5 Aug 2023 00:43:11 GMT Message-Id: <202308050043.3750hBWw058090@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: 452661c96721 - main - exit1(): fix a comment 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 452661c96721e0f8a8117f21b679016b6ec2c59c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=452661c96721e0f8a8117f21b679016b6ec2c59c commit 452661c96721e0f8a8117f21b679016b6ec2c59c Author: Igor Ostapenko AuthorDate: 2023-08-03 11:49:27 +0000 Commit: Ed Maste CommitDate: 2023-08-05 00:42:07 +0000 exit1(): fix a comment typo Signed-off-by: Igor Ostapenko Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/809 --- sys/kern/kern_exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index a92d5cc0f642..cb0939ded6e1 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -691,7 +691,7 @@ exit1(struct thread *td, int rval, int signo) prison_proc_free(p->p_ucred->cr_prison); /* - * The state PRS_ZOMBIE prevents other proesses from sending + * The state PRS_ZOMBIE prevents other processes from sending * signal to the process, to avoid memory leak, we free memory * for signal queue at the time when the state is set. */ From nobody Sat Aug 5 01: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 4RHklg5HpJz4mLfL; Sat, 5 Aug 2023 01: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 4RHklg48s3z3XWv; Sat, 5 Aug 2023 01: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=1691197231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Hzs5ONwXofbHQc2bWX2IGLpHKtZNCyFsY4OT9HXrWg=; b=fKFjQeNedwSKyMlMJ5Ut9doNSnn7AJuZ8kU+K9fDs5JN8BmAW/OmXTl4qO/b4uABEicyAi k/pNC0gFCw4zPvDwipwMVOoOWZP4TMcNTl2MHIM2LoWlTGumYoA8x2JPaoMrMPluUYTxK6 z1lNigLM56/QoskoCkAk/df6QRmRXHHdwRW4wccJU0K1JXciPbghc17CTek3rzW9s7YOlp Cpom4JIW0g4HMxwLlN7JNwBj5FKujRfIn4Gp/calWjQHaGTl6iKbn+aexBVTm/R/3ednN4 ishT6v7p0tasYqXQxrh5u/a9OGM6YYYrEgvYhg3K7z66Zx9G9n+ntKbOa7IwKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691197231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Hzs5ONwXofbHQc2bWX2IGLpHKtZNCyFsY4OT9HXrWg=; b=lxbZY9q/ARNO99afsuz8J9ZH+M4SMnYRaQTRt+YlJWbtQvWAjsoHSmu9TmEjXOvjmxWSvX ek3rovthMaEXhBJ7Zv2I8vrsCf7AC8w+aIyNWscbqIyV6gZ56uN7YN27Zti7C3UFgTfQ4i r9LUNK5gjE+M7VzqCtB3F6CYD4NIRyw8sIboHsszjapYBd7Hfh/ykRPMB5ydALfIFw44hq E8847ksFV4JMXOj7elnRbFxZ/juh39HwLj/pK7MoMljfJKf4sHOypTddwdpiNHw6BX+Xch OgEmZBKvlQF//6nM4qWl94uoR+eCh1R0KtSzgFvnI4SMNPgiv0ZZK9RoaJAjBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691197231; a=rsa-sha256; cv=none; b=eT0V1+mi+236djMXsDmsRk/W2VlY4tL2vjK9lsdHhEr7oBlbgHA1YPvEFclr2v0+a8LAN3 bPx2R3mTPmoy41arir789D3+u1HJzNwWE8xv8gHmUdNl5tfLt7F/VVDZSOhgdCtzWbSm/X Vja2B1rUaE2EFWURBG+Afxz0dyQFu+z41hWEgMzHRdH4Kd1/vCBFz5gT5MYE0sL1t40MLD A6ncEkCyU6U1VuxbDLIXUW7q+t2Hpi+YE2YFMbRqrN4E6YN+E94XcbcFsepovsPPhpMpYS ASzQidMREkozUmzcC7R8FtM48a0fVAr/h0JQ7dd19a1Wcy7DrfEhQ8jwYAZzQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHklg3Bssz1NwT; Sat, 5 Aug 2023 01: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 37510VN9085556; Sat, 5 Aug 2023 01: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 37510VDJ085555; Sat, 5 Aug 2023 01:00:31 GMT (envelope-from git) Date: Sat, 5 Aug 2023 01:00:31 GMT Message-Id: <202308050100.37510VDJ085555@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: dedc71fd3890 - main - libc: unsplit log message to to make it greppable in src List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dedc71fd3890803a81047a0c480b95a327bd7214 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dedc71fd3890803a81047a0c480b95a327bd7214 commit dedc71fd3890803a81047a0c480b95a327bd7214 Author: Ed Maste AuthorDate: 2023-04-17 15:58:59 +0000 Commit: Ed Maste CommitDate: 2023-08-05 00:59:30 +0000 libc: unsplit log message to to make it greppable in src Also use __func__ rather than hardcoding the function name. This code now fits in 80 columns without splitting the log message. Reviewed by: zlei Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39619 --- lib/libc/stdlib/cxa_thread_atexit_impl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/cxa_thread_atexit_impl.c b/lib/libc/stdlib/cxa_thread_atexit_impl.c index 0f0a7a314fa9..cdd918e2c496 100644 --- a/lib/libc/stdlib/cxa_thread_atexit_impl.c +++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c @@ -109,8 +109,9 @@ walk_cb_call(struct cxa_thread_dtor *dtor) __elf_phdr_match_addr(&phdr_info, dtor->func)) dtor->func(dtor->obj); else - fprintf(stderr, "__cxa_thread_call_dtors: dtr %p from " - "unloaded dso, skipping\n", (void *)(dtor->func)); + fprintf(stderr, + "__cxa_thread_call_dtors: dtr %p from unloaded dso, skipping\n", + (void *)(dtor->func)); } static void From nobody Sat Aug 5 02:11: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 4RHmKj2RCwz4mQls; Sat, 5 Aug 2023 02:11: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 4RHmKj20bKz3cYQ; Sat, 5 Aug 2023 02:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691201497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK1Uka0suiNT5e3VkAmczeQhrxFPmmSGj13RbMG0eTM=; b=d1zYa9P/HVmlT3uiicZd99EbsI6hfoLG//weA4h5enzzHEigy1fzwU/hDG8T6fk7X+b4NZ zfVYPbtwip6KCMUKej3exK6H8BA34kI7wqE0xVZ4pt3w3pWkbU+AVAvLv8Ih24uu+8LlQU HflmG5QG7gZJlzM+O/d5ljsiU3MLulwmLj7xTMXDcf7xtLOwJjy3DYQywW5ukUDfaviZAc 6lDKeKFcEXLzM8U2JFgT8oGudyyXHGDYVlcVqdRxORvzkxnGcgvPx0gVY9M184XqdevUsf +hXoR+Dl6CMEsfo4KeNQGto8YoN1Ih+uI+4kfRGFDnzSUqZoxzYxV/GjQ/9ndw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691201497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK1Uka0suiNT5e3VkAmczeQhrxFPmmSGj13RbMG0eTM=; b=t23xO0ijs2FpqROQ4UHZ+qBpFpgtjq12nWoLrsb+zgf/FdhE5mmul3nJxmFYc4aCT5uROl GnP8LzMmkq2ey0ItixGmqI+oVND/I4R8en+9MdeurV9Kk8hV1jixV/EItbW2tOZZbOlo8t C5mQ10vCjUt1axpLY81j7j041V1YS0YmCrApdlQDdopXjaCDJT0Rls5txB6JXNN4AbkE/V AzYLrd0IpOpJTCwX71NpoJxxZcLiVOo0lMQWWqgRD8MQNBuCdMA/WoUnRX0Jlv8ZA4X+cW 3wU3vorCqgaCuGFnb4mEBsHybTjhCE/ajbM552KiJWmir5Zi4uapGpx3nlzt1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691201497; a=rsa-sha256; cv=none; b=UH+nHOM8I4Vb/lsKLXj3hmK/Emq8pr7y+lV3oGtnLPhq4HsQ/CceeHnqfeWjXsZkFfpZ8d YKW6veuZhOuWG4QeGHzMZk+mSWPp5PmDT6xTlHomld/0Ui31lHbgXB/l2xwOU1NEoAIn2B +c6iEd57AsI35wQSH4cQUUSsGRcrt03Tbpr2QIik42W2H8jnAlAsNoWMLytapZ6mH22XDp nMUZZMSTBMgjPeILHnU+7mTprPPCEGizY4YUlVI/NNt/GAj/nhJv28ATop8vheBOAdPm8D 4TMs0szedHsn9wo3GpDoWhSxgY5VKERFOipKLytsl6RkdVRk+VBrbOqmFWttnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHmKj13Lpz1PvM; Sat, 5 Aug 2023 02:11: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 3752BbCv004018; Sat, 5 Aug 2023 02:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3752Bb1I004017; Sat, 5 Aug 2023 02:11:37 GMT (envelope-from git) Date: Sat, 5 Aug 2023 02:11:37 GMT Message-Id: <202308050211.3752Bb1I004017@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: e77f4e7f5972 - main - vm_phys: tune vm_phys_enqueue_contig loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e77f4e7f597261bc873227a0dfc05d178c367727 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e77f4e7f597261bc873227a0dfc05d178c367727 commit e77f4e7f597261bc873227a0dfc05d178c367727 Author: Doug Moore AuthorDate: 2023-08-05 02:09:39 +0000 Commit: Doug Moore CommitDate: 2023-08-05 02:09:39 +0000 vm_phys: tune vm_phys_enqueue_contig loop Rewrite the final loop in vm_phys_enqueue_contig as a new function, vm_phys_enq_beg, to reduce amd64 code size. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41289 --- sys/vm/vm_phys.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index a3af3964fba4..bc9db6559bfe 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -680,6 +680,41 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, } } +/* + * Add the physical pages [m, m + npages) at the beginning of a power-of-two + * aligned and sized set to the specified free list. + * + * When this function is called by a page allocation function, the caller + * should request insertion at the head unless the lower-order queues are + * known to be empty. The objective being to reduce the likelihood of long- + * term fragmentation by promoting contemporaneous allocation and (hopefully) + * deallocation. + * + * The physical page m's buddy must not be free. + */ +static void +vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) +{ + int order; + + KASSERT(npages == 0 || + (VM_PAGE_TO_PHYS(m) & + ((PAGE_SIZE << (fls(npages) - 1)) - 1)) == 0, + ("%s: page %p and npages %u are misaligned", + __func__, m, npages)); + while (npages > 0) { + KASSERT(m->order == VM_NFREEORDER, + ("%s: page %p has unexpected order %d", + __func__, m, m->order)); + order = fls(npages) - 1; + KASSERT(order < VM_NFREEORDER, + ("%s: order %d is out of range", __func__, order)); + vm_freelist_add(fl, m, order, tail); + m += 1 << order; + npages -= 1 << order; + } +} + /* * Add the physical pages [m, m + npages) at the end of a power-of-two aligned * and sized set to the specified free list. @@ -1190,14 +1225,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) m += 1 << order; } /* Free blocks of diminishing size. */ - while (m < m_end) { - KASSERT(seg == &vm_phys_segs[m->segind], - ("%s: page range [%p,%p) spans multiple segments", - __func__, m_end - npages, m)); - order = flsl(m_end - m) - 1; - vm_freelist_add(fl, m, order, 1); - m += 1 << order; - } + vm_phys_enq_beg(m, m_end - m, fl, 1); } /* From nobody Sat Aug 5 02:11: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 4RHmKy6N7gz4mQn2 for ; Sat, 5 Aug 2023 02:11:50 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHmKy2vtyz3dJN for ; Sat, 5 Aug 2023 02:11:50 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3175d5ca8dbso2191418f8f.2 for ; Fri, 04 Aug 2023 19:11:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691201509; x=1691806309; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E5HWLlMCIjjCz9z1CjpIvjkT/jbtvGLsuljHefjPX/U=; b=lJddZ0EBnJKsm/9z3s3shwesKt64MbT/Yq+rRR1zZCuc17+bQo+Hy4SrZiWtNKWVV2 oOdSE6PBRPp4mbcEHKn7ccD4AT0SfUY4w7/CmYggoJbTMl+IP4UoT1CNydNrvLNHqF14 2XgZM5w2zA5GEsP2BGb36916WUQTqM4t8+VbpKqReoeb2kIP3LQ2fydUwK+MlhcoOZ7u /0JwExJN/ox2iwKbgwhUHd090n/rsKpbJfAJEOh/hF4peUIMdgfUKaCHRbdvMxRTrcJ/ SNM3MytRcN2I5ULe0StASmFz5BvNlP6AqMCLcjp4SCHim7vshTJAQQLqP9c75b5209Ud WQIg== X-Gm-Message-State: AOJu0YxaIIKr3yrBP9mMUnScmwjg9hdrQHNGE7GTSYqad9WWosxgFUKt TbTm9MnZbI6Lt+Y4+Em4B/JClQ== X-Google-Smtp-Source: AGHT+IF3VJKM8BJ+ktLkRA2ieBxVDW7BRfon7lvW03IFbvU0PSvdu7KoDnQn/qqYzTQFj/BGO3eG7g== X-Received: by 2002:adf:f346:0:b0:313:f1ec:f429 with SMTP id e6-20020adff346000000b00313f1ecf429mr2289476wrp.46.1691201507998; Fri, 04 Aug 2023 19:11:47 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id w17-20020adff9d1000000b00301a351a8d6sm3855836wrr.84.2023.08.04.19.11.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2023 19:11:47 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: dedc71fd3890 - main - libc: unsplit log message to to make it greppable in src From: Jessica Clarke In-Reply-To: <202308050100.37510VDJ085555@gitrepo.freebsd.org> Date: Sat, 5 Aug 2023 03:11:36 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202308050100.37510VDJ085555@gitrepo.freebsd.org> To: Ed Maste X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RHmKy2vtyz3dJN X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 5 Aug 2023, at 02:00, Ed Maste wrote: >=20 > The branch main has been updated by emaste: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Ddedc71fd3890803a81047a0c480b95a3= 27bd7214 >=20 > commit dedc71fd3890803a81047a0c480b95a327bd7214 > Author: Ed Maste > AuthorDate: 2023-04-17 15:58:59 +0000 > Commit: Ed Maste > CommitDate: 2023-08-05 00:59:30 +0000 >=20 > libc: unsplit log message to to make it greppable in src >=20 > Also use __func__ rather than hardcoding the function name. This = code > now fits in 80 columns without splitting the log message. This doesn=E2=80=99t match the commit? Jess > Reviewed by: zlei > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D39619 > --- > lib/libc/stdlib/cxa_thread_atexit_impl.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/lib/libc/stdlib/cxa_thread_atexit_impl.c = b/lib/libc/stdlib/cxa_thread_atexit_impl.c > index 0f0a7a314fa9..cdd918e2c496 100644 > --- a/lib/libc/stdlib/cxa_thread_atexit_impl.c > +++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c > @@ -109,8 +109,9 @@ walk_cb_call(struct cxa_thread_dtor *dtor) > __elf_phdr_match_addr(&phdr_info, dtor->func)) > dtor->func(dtor->obj); > else > - fprintf(stderr, "__cxa_thread_call_dtors: dtr %p from " > - "unloaded dso, skipping\n", (void *)(dtor->func)); > + fprintf(stderr, > + "__cxa_thread_call_dtors: dtr %p from unloaded dso, skipping\n", > + (void *)(dtor->func)); > } >=20 > static void From nobody Sat Aug 5 04: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 4RHqfC4VSnz4pZMv; Sat, 5 Aug 2023 04: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 4RHqfC3y2fz4LdG; Sat, 5 Aug 2023 04: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=1691210467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfS6InplrtUBl4L4LAxSHVLlvzS2AACp8VzkAr0WLtI=; b=GpQo7I+4CBHkISkH84slyAcmDoksnD4Oluzxa1wWijE7tw/YM4+x38iTlLuMR06BvImDmP N4T9q6DyOzfKgeyNY/6s7CEN/emXAuKKdxjbGgLv5HE8RqMLQLI47F/vFRJnrPUlcH9cbM mRw4LcJN3I3e/XnnFEJaiTOF7GX9mI/dx4zM22KyYNLu7YO/C3Rro+ojVO09eM0kYLBmf+ Io/ASK6VkzsnZbeH1gD0tuc9cgCUiFwbvlIeIpii15SlDW058j/crvxL+L4wDUo0YDOV1b cMPFr/OKq15s7WqSTdJ3+TetdTxp3Sab6vd8VtDmgWkDBzZeIr4Ol7b2y2JxHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SfS6InplrtUBl4L4LAxSHVLlvzS2AACp8VzkAr0WLtI=; b=OkStiBP+E4D+9CPus+sl3Z5T9s6XpnsqEAHiIHCVDEQu4IINpdAgYL90u7cIEvDLVnV32c UcchA3L6t1agGOg29zddhKD+nHLRfyfmb6fOZxMHnXydnUxuMm0XJuJlYF83yC9PyBveoT JdqJiYWgrrxWE2J+OOXxG4qTatrqPbZUxDd1eV3gItozyWKzbeFGIbGj8GXcwxonwjXoHY iUeBiGhJOpba7Gg5mZmu777krAL5Tz7OQBibhL0c4qffOnkjJnhRDMWL9wUcTEqolAGnYK AIN3vNeLtusRX4lLyKtYlGSzZSnIi31tP4Hr0Qqhfc2I20zzzAKJO9TeBbBcXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210467; a=rsa-sha256; cv=none; b=LScx+uF4k4uy81Xd+GBPFP5F7TRZsxXSuI9QGFIAzcLPVcCNd/5eaDnID7BHXOBKHr2MX5 wNIQsVWm8a6yH6pzNXTpaev0FGlrAD+D6vVqb1qkCJZ4ZqC9zNIi6D7aoTIbrj8EBcanon M1ucwECeFZebCIJX+AnO+5u8+Qu/Qk9glzDpQ9gxEleln1s7XvufqngDTYzoYIiJhx7VBf tGL+PsWGAxJqjU+i6yJS1MW/LK5HGO0bFA3g+sg4fxNntwIuGD+QEZ6c0Pz94dFAZ+6Vi6 VyjNEeA3C4E0G54DCoHOPF/ejbql5HfzqijyRej746yknPUnwoNkec2sNi7O2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfC30Fyz1ZN; Sat, 5 Aug 2023 04: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 3754f7PH056772; Sat, 5 Aug 2023 04: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 3754f7ta056771; Sat, 5 Aug 2023 04:41:07 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:07 GMT Message-Id: <202308050441.3754f7ta056771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ede5eb7e4a3d - stable/13 - et(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ede5eb7e4a3d9331c85bcd6a23058fbfe9d628a5 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ede5eb7e4a3d9331c85bcd6a23058fbfe9d628a5 commit ede5eb7e4a3d9331c85bcd6a23058fbfe9d628a5 Author: Gordon Bergling AuthorDate: 2023-08-02 07:09:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:38:45 +0000 et(4): Fix a typo in a source code comment - s/diabled/disabled/ (cherry picked from commit 734c9698d9ae83206a47daa40031a4de3bce9c28) --- sys/dev/et/if_et.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index 99865142bf37..0d0c0c73a33d 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -2000,7 +2000,7 @@ et_init_txmac(struct et_softc *sc) */ CSR_WRITE_4(sc, ET_TXMAC_FLOWCTRL, 0 << ET_TXMAC_FLOWCTRL_CFPT_SHIFT); - /* Enable TX MAC but leave FC(?) diabled */ + /* Enable TX MAC but leave FC(?) disabled */ CSR_WRITE_4(sc, ET_TXMAC_CTRL, ET_TXMAC_CTRL_ENABLE | ET_TXMAC_CTRL_FC_DISABLE); } From nobody Sat Aug 5 04:41: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 4RHqfF1LnFz4pZWn; Sat, 5 Aug 2023 04:41: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 4RHqfD53Rwz4Lgy; Sat, 5 Aug 2023 04:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JQF0LN3HS0EgQoJPcGTC05uvQzFWaO2SDZaNBMlF10=; b=StA8Jgk5fT7K/AB1UpzgU6P0o/54MlbGYz2FqNWxs2KckHIdIPJ0FIV/1s1w/GEGLbokMM pA6M/DsaWT/R9PcOb+XhLCLCpJv97XUsdLuTp3XfdqJr4yaLRcrWGW4v/QFz7WutKRbaxp M7o+jCvrtrqVKb1TLsy7qS4NjEYM2yhEpM4KgTJX+NFHD7ZvU9EbXTtLv4zZ528xAg/eIt 9VmCjE7c5+iP/9i5aCtgYnsYaoI+ryHr8p6SaBGaA2lZDQGfkJSIatffGQ6V6DS0w9lg4W tl6CxAT1aCufFnMdtzcWDwTEsla2pvmT0Qyl726oDvcLGL99JJEaMBWjP6DZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JQF0LN3HS0EgQoJPcGTC05uvQzFWaO2SDZaNBMlF10=; b=Ammh8ON7ebT1kJhs4VPO2oUWRX6FubVbQyvOh6QZC44XRYm2o/up7kNsxMIiwZRUElxnmm ImiK6YLfbm8jz/2/2d7+M1diVEift4uI19BHU5K38uNa+dhxojZiWYQopK2LPNoqFguXiq zJwrWluAYSi64u0YZmAH4WE0srLOMzHheiHaOq45jO7G0frMkSFH9zUU7BWLZz93G3qsZF 5TTZfXxCttbSb3WD8hfbarQT6Ubu1BFptWO/oF57KrhXAbtNgTmoM++gwupoFZJFMbxYBh EOHeaG1xPfaBAzTpFj/xRWeaz0zOmu4fHWWBCvLrgbZ4Sm5hQrFcxpWTrAU+Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210468; a=rsa-sha256; cv=none; b=Q9vEKViDjmybQuATw2YKc+Ux2Fm/MrP0YDxIyq6TxGSJRulezawiuRAQ2V1HStncp1ofNH 8baKwGfG/7Yu078R47rw64sDf75MaNYGdNakBZHy4SQgWDujyj7P/XxoYJtiiID4sU/mkr pDHN+D2jAeR8k66PN7nlG9ZBwHxi8M+wjOyJIQI3/tOKyAnrwzg7OUYyM0dRgw71qh9PHv GRJsj9HJ7Ssx7pYNfMhGhx08rkVMmROwvXcBtfaPvkNUIIEwMFdEHgOJnr17Q6tnauh8ic Yp2laTv/6jDCAMVGtwnyFOchzr5vYXtauKlLHerk1Ev2U7377qUHia1sg1kW2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfD3xH7z1ZP; Sat, 5 Aug 2023 04:41: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 3754f8J3056793; Sat, 5 Aug 2023 04:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754f8MJ056792; Sat, 5 Aug 2023 04:41:08 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:08 GMT Message-Id: <202308050441.3754f8MJ056792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1531b7a09b4a - stable/13 - usb(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1531b7a09b4a682189ae5c8e2385b592518e1928 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1531b7a09b4a682189ae5c8e2385b592518e1928 commit 1531b7a09b4a682189ae5c8e2385b592518e1928 Author: Gordon Bergling AuthorDate: 2023-08-02 09:04:24 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:39:06 +0000 usb(4): Fix a typo in a source code comment - s/determin/determine/ (cherry picked from commit a924b48579c7a0c794431fbd3f540ce56c4cd662) --- sys/dev/usb/video/udl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c index 892e61ae2da0..0233e70b152e 100644 --- a/sys/dev/usb/video/udl.c +++ b/sys/dev/usb/video/udl.c @@ -788,7 +788,7 @@ udl_select_chip(struct udl_softc *sc, struct usb_attach_arg *uaa) /* * WS Tech DVI is DL120 or DL160. All deviced uses the * same revision (0.04) so iSerialNumber must be used - * to determin which chip it is. + * to determine which chip it is. */ if (strlen(pserial) > 7) { From nobody Sat Aug 5 04:41: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 4RHqfF6rrXz4pZWp; Sat, 5 Aug 2023 04:41: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 4RHqfF5pQ5z4Lh9; Sat, 5 Aug 2023 04:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+lVMqrlsazoC91Giiy3LPjq6FQLt+zERTU33Sau0zec=; b=nWrctnHAeIqVZnB7ZoAokN8dbbXFkbvMlCk2Ozy3yHmrE0ZtOiuTx4PtWjbO1MQj87U/9A Lm1+yMFRqu9eWAkUtLdfGo+7ywlZcoGLVJyd8a/D5p3vRE0o0Ol9Uf1ON3k63auzBKavTW Fki4YbRlTm4Mk58IkUlIl4hw12hxOW95jvep+qdxEg4+S8drkjUGv96jjsIgHUHpV4vODJ /V05Vg4thVc3Pi9XDOsjscQLy+CyAZ26uaDN6+qJ/pggcYlrtwFe7lEgROzsKica4d1SGz UMM21Si9qIC2FgCzv9FRSDcRlM26Dbu3C9xx4gahN+nInZkBdUG5JsQRgj50Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+lVMqrlsazoC91Giiy3LPjq6FQLt+zERTU33Sau0zec=; b=UdThyYFB79Yi52C33lmS2bqU9wREfbOh6E5l5+i1pt8z25F+8trcWcHbbY70vP26ESadNl +bx4SNA/5hXFIqrAA6LwT8ZDpY3v3XPygzgJc3vTnkm7mjf7F4u9deX1OkzbkwKcDMY1E6 DB5GH5oZltbuqORwYO1poUpaXETAaxDXs5Mp/adDrVhPpgTeVveGwfJge/hZe2JIWOPg8k Ja9wkle6LldvRZW410zlGzfvjYgKQdK8RGmPOc7fhsQbmEu+NIRPQItBp4wIP/aEF0xyRW GyLPSjr+2x0N63Vxs+12BLK7+M+FAbDnkQ2wq5tjSt7MSamYWB910KpBD+7PjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210469; a=rsa-sha256; cv=none; b=TSGkyAvjsLVgMD/IZjmfRP0GkSaVPW7ps23x+9PYKEAGngn1iQsEPZHIfsSijIBJyQAx3D O3/WapfBJnz2WbjMsQFX9tx63UK2kQF1sI/O+IYH5EmYFlf1pF+apBfMLwtNN96hdxbQ9V nszCnsn2Xccppbi0fu8XIzEUKttDlTlv2iCgfI+dIrBTBjwC/XgXsPbhUfZk0BmlTNnBFK kV2sH3AwtzwDHoqP7svviiwsoN9hRkDFYaGQxs/+B1jDYMRfW2qCWmVUo26TP/cIZy8LV7 4uFE8vE0c4prqCZq7k9/3Ki4+hJFXJVUKQyPvKNXKvKcjEG6l03CGouUU3C18w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfF4vh7z1ZQ; Sat, 5 Aug 2023 04:41: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 3754f9Ln056815; Sat, 5 Aug 2023 04:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754f9UN056814; Sat, 5 Aug 2023 04:41:09 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:09 GMT Message-Id: <202308050441.3754f9UN056814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fdb4c376673d - stable/13 - vnic: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fdb4c376673de0fa29ee4847b9e5be345777b107 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fdb4c376673de0fa29ee4847b9e5be345777b107 commit fdb4c376673de0fa29ee4847b9e5be345777b107 Author: Gordon Bergling AuthorDate: 2023-08-02 07:33:35 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:39:22 +0000 vnic: Fix a typo in a source code comment - s/Enabele/Enable/ (cherry picked from commit b73763fc10d8000ec5c5682abccf6c8489eee8e3) --- sys/dev/vnic/thunder_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/thunder_mdio.c b/sys/dev/vnic/thunder_mdio.c index c61c0eeecf62..932f6382332a 100644 --- a/sys/dev/vnic/thunder_mdio.c +++ b/sys/dev/vnic/thunder_mdio.c @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); #define SMI_CLK_MODE (1UL << 24) #define SMI_EN 0x20 -#define SMI_EN_EN (1UL << 0) /* Enabele interface */ +#define SMI_EN_EN (1UL << 0) /* Enable interface */ #define SMI_DRV_CTL 0x28 From nobody Sat Aug 5 04:41: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 4RHqfH05MJz4pZN0; Sat, 5 Aug 2023 04:41: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 4RHqfG6Xdnz4Lpm; Sat, 5 Aug 2023 04:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2SUxvbxhR0UUSijqciKVqUzgNtzAVy1P/hfBM5Kc9rw=; b=yYiwmXn4+M4K/T+oWMxVt3ih+kwVI4qalQT+zBMXUVvvkwD0PlBgYUV2LCH7tywkPX/V+K sD1Sj8G0b2LjoMZ4oK/MAntd66ppX3Caw5hLlepWxmxwxLGfrbSVuLk4+TNG6L8p5fTKrz GrviXl5Cgc4KlEvsE3eR5UiPDf5pBKIMZRMEYqH1eSuRM4pnQrqmw+JVjbgGQ54opbHhp2 9ZVrtCnLVTzQyQadIVEhKYqkRQ/Nq7wVN7MSWMlmFg2XDs9T6np4piGhqXb/8owoHikXSf PQN5eR2vNESxQScV1cLWmm16Jfvjzc4fiGDFp6Dw9VIOcrCeVXqEsw2OiKIwsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2SUxvbxhR0UUSijqciKVqUzgNtzAVy1P/hfBM5Kc9rw=; b=R1Sb/w1poG4lesc+4ON9Qooq31RIGmdnfE0FZbTaxkqU6Np2BnSinrrlfBl8sQQ6o35SLd K5r1btzUa3Ndzg1n5XURyuFUXBxz/u+PKmcTU5ZCYnsqkQkunP7lHOCUC1vJRk5HYRqbrb AyP1SrZJhqoxEaJ/b7OdP6w8OsztpCZyBSn39qEwXytowRpNAKF4jhel5hL+5X0AD/AC1r O/76Yopxyy+rXFC7qpbvZXJh9VjIjN2sSkrgUD6pEBPGGq4thC+kzkdFZrgWq0smMCYL5t LlRFL4C4LzWaI9Oenyk1JukXYz7L6llsWA3alX31fhR4oPBtrNnGULiZQmmPmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210470; a=rsa-sha256; cv=none; b=NbdRhLQQUZdXSzBm4ZXtZ2+kN6/vzZ+B+GuMLadLqC4hJYgB3uCsNZEu8ssQWZUXIXBahq OzAi4//nILumY/HC2RCUZ07ROJEFqGP1Wq8YhCXVlwtl2laEifWZoi5UnoQ0BoAKPvzMHo RM5DL0giat66oDmykdoyY5Krwxskt2ZM5YD2GjGza5rCDQvMEPUl9o3Vwk3X625pUfU/5R m6/zXaNXNA8IHvg0DvFoZJcWxpku8tPcG6kbXunGAu2dOxemPk6MM5ppTgwiTsyyneLJVz nGC7h5EDaUtZ335f/GrZyaTWYX+a7VzQx4ctjIowf7AUm9/yDJqSigQCoB92OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfG5RTPz1ZS; Sat, 5 Aug 2023 04:41: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 3754fAnj056840; Sat, 5 Aug 2023 04:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fArg056839; Sat, 5 Aug 2023 04:41:10 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:10 GMT Message-Id: <202308050441.3754fArg056839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a806c88b6931 - stable/13 - psm(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a806c88b6931f5fde9faa9beec8057d3d17bc409 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a806c88b6931f5fde9faa9beec8057d3d17bc409 commit a806c88b6931f5fde9faa9beec8057d3d17bc409 Author: Gordon Bergling AuthorDate: 2023-08-02 07:14:04 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:39:37 +0000 psm(4): Fix a typo in a source code comment - s/diable/disable/ (cherry picked from commit 7eb8fbfb0421d38ec83a73f9b8ea13e7c52d3314) --- sys/dev/atkbdc/psm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 5ecddd7616ee..73d2c62e2051 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -5449,7 +5449,7 @@ enable_kmouse(struct psm_softc *sc, enum probearg arg) if ((status[1] == PSMD_RES_LOW) || (status[2] == rate[i - 1])) return (FALSE); - /* the device appears be enabled by this sequence, diable it for now */ + /* the device appears be enabled by this sequence, disable it for now */ disable_aux_dev(kbdc); empty_aux_buffer(kbdc, 5); From nobody Sat Aug 5 04:41: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 4RHqfJ108Vz4pZT2; Sat, 5 Aug 2023 04:41: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 4RHqfJ0SK7z4M5c; Sat, 5 Aug 2023 04:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wbeLn0N1zhp06z3vL9phB9K65VOx232/MwQGG5OktFE=; b=LMdlS4//NasaOXcyNlDCaO5z0HO+CX+rkP0hDvK886s9mdEpt7gR5c/ix68teTdsoYlGYu Nn5Fdu9nMpoac+2QsDjGzvtjqScdnljxO6awgEcak0pkzgXBCzgUkXul1gdtRDsXtXE/8M sjeA1vkj+9pIcjHgaXZUSTwTd3TGj/wc/nebXaoGzmprXSOLD0dLy1gp0pB29HN9IMCV0T OSpqfNlYA0xMbnYJR8ovKr0+hEOJ8i5gY2hzKAjgEKeAoQKaStnhI2DveHSViO63G8fzhp bH2DkRny+g38MpFeLkEwT5JNHIQgpHIbIUL3TEVxg3RxkYlW5G7aT71UYUwMhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wbeLn0N1zhp06z3vL9phB9K65VOx232/MwQGG5OktFE=; b=paD1IDm3rotYjq/Kq+W1J+7ZKL7hAXZyYywzEqsW/hUcaoV7Czj59DkzH2c27o5eAGxSTj Xnz3SMMvuh3iWDlAwMyBRl0yYyCvJVaFMVezGKd+V9QPhxf4ffjD2aRwdDfWqp8/kQiGgO 4cJubeCFVTVa4LJ2PHPGAvUNrpOM2cL83HYRUn2ISNPlAdcJZa6t/EkyLsbwTokTUyWeZ9 HsfezX0jKw6HFFbNHgefHFW82R6P1T+81Amtccr2D2mNCGEVkQa97ICn9o6LDEo3g/vT5t An5slZpPEK1RPSXXJ/k01EMtLo1oqz8RfJa/oTU0GLzOF2Df5iSP70uI+FqaHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210472; a=rsa-sha256; cv=none; b=Gh/sAjFvY2cFkyGJ0Xpo18ZrMlHHiihWLRgQeMw3EJmZ5S+wsXrPZnkhnR4VAIOj1v01uG 4NL7CVwqs3xR8D9aI1t54k73dSbI46YEcQtyy0Gxn0RyHPcW9MmmzVXZtFEQ9WLrTDMYbg Ep2QKFvtW1qNOlHfO0hJX5SLMbzO0tknHlSnQFUfOOYCJDRCnfmkHUx2exgmBgvNw0JDuy NL2/nM1MXmUd5ovTFGdar1unrZqq7KKbo0ozdf07jjncbpVHHqWyvPBysGqP3gYBx7uO1W OA71CpGJ3EtZDccna6m7xIdx+WqECh74Z5j0d5pQ6UIjgifV1iP6KFlBLohM3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfH6bXsz1fM; Sat, 5 Aug 2023 04:41: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 3754fB0x056861; Sat, 5 Aug 2023 04:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fBRE056860; Sat, 5 Aug 2023 04:41:11 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:11 GMT Message-Id: <202308050441.3754fBRE056860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4b5826ca9dc5 - stable/13 - linux(4): Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b5826ca9dc56e64e01b7be976d3c330020599ed Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5826ca9dc56e64e01b7be976d3c330020599ed commit 4b5826ca9dc56e64e01b7be976d3c330020599ed Author: Gordon Bergling AuthorDate: 2023-08-02 09:55:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:39:53 +0000 linux(4): Fix two typos in source code comments - s/decriptors/descriptors/ (cherry picked from commit 29eab3e4e0c9a6e954b0ee858e3d4c2a9f283ea4) --- sys/amd64/linux32/linux32_machdep.c | 2 +- sys/i386/linux/linux_machdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 23d8f8767282..992b4ec72af0 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -625,7 +625,7 @@ linux_set_thread_area(struct thread *td, /* * Semantics of Linux version: every thread in the system has array * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. - * This syscall loads one of the selected TLS decriptors with a value + * This syscall loads one of the selected TLS descriptors with a value * and also loads GDT descriptors 6, 7 and 8 with the content of * the per-thread descriptors. * diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index daae6a9f711b..1b1854cb0d40 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -519,7 +519,7 @@ linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args /* * Semantics of Linux version: every thread in the system has array of * 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This - * syscall loads one of the selected tls decriptors with a value and + * syscall loads one of the selected tls descriptors with a value and * also loads GDT descriptors 6, 7 and 8 with the content of the * per-thread descriptors. * From nobody Sat Aug 5 04:41: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 4RHqfK3hr3z4pZC1; Sat, 5 Aug 2023 04:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHqfK1GByz4M7K; Sat, 5 Aug 2023 04:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5CnMW9bOfrwR6VUEFORdEF5VJ/itfe40DPYW/9Yxyg=; b=gS+6OT2qnu52ozporMoecFIg/gCdBcq68RqgTQHOYpTwBr5Pi5pUmvWAnX47zVhql2xT4W AaJXiySV8agY6fkXXtnrVzyEo8EBKM8VeTekjauclB+hg3yinayGgRoZi9b5yiZ8A4Lv/I LeGDzBQJKTrACT7doRfoohjGiPCaa6uHwaEEkD/yTRE4dj9QLV8mRx/YjzENzIJm4EQm1V J5TQnhPU8qIr2tYxZUUAlzFMJM4E+PWBtDYv1irkYUULv8b+Xy9kmYaL86YXjk4nHi7O/V vThhIV1WS0GHOpn4eGocVdxF+AGneid4OPS+l3MqxXF+ndoQ4RaKIUkrEKOETg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5CnMW9bOfrwR6VUEFORdEF5VJ/itfe40DPYW/9Yxyg=; b=cpyN8e85/TBHYSNAe5NOAJnrjA3WQ3Yx195aUYMQyvadXQo2Jqqw2qUmURvSwZcah3QR6F W3i96nCIUJYdF5/o3IrY5mcUrNRRJv7Xbq/wXwd0ukJLfFcXp4Wmqe+Hqa3rqYDidNxzFc r/bDGW4sOSskLovrU38nNi5ZnUcFR4nLb3IEbSuwbNFIq2dE845dCpSzNVgnwaqO2XXo5R Tss/cTrM4FK0YMMUM1i1wYFuBUBQT0WE4rComSYZNzZPa55vgQ8Q9BInzaH0Lcbjk+rvFW QVNxPj+tMGV7jg/plShE0OkKHaAzMq3jVXXl6RP0aCUV4VeavpPwkUTJSTBy3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210473; a=rsa-sha256; cv=none; b=qN/g/Y/fiON/CfJuz4j9ZWvt9jE5vMYL62whp80zDO6/n7N6soDCLf1qSHIWVaAwsae9J1 tqTEvZmA7A49vaYuI2YxjlC7SEOclYX/+KmYFGoK6ihaUzKYMsHHT1EbArOgrk1L0VdvJk lAuDQ5tifAsJHLwyPBmThzlYpLXJr7tL62aqibZGr2s8aW/fgE+pj3dtsE+XPmbsUvVf36 EbnieOHhh6ciurzVpxXPalwNsh9xhZL8bfUuZAyDTttQkat7j2i72clnA/D6qnJspkXouv Iv4Hj3FGgEHSxhz9Pcrzm2kFZI/Y81CuPHCPQNIw9n+uFEldQxZmtHPNLr8K5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfK0MZKz1ht; Sat, 5 Aug 2023 04:41: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 3754fCMO056881; Sat, 5 Aug 2023 04:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fCO4056880; Sat, 5 Aug 2023 04:41:12 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:12 GMT Message-Id: <202308050441.3754fCO4056880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 50ba320afcf7 - stable/13 - elf(3): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50ba320afcf7db7eac2b2c2bb6cfa52270c87821 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=50ba320afcf7db7eac2b2c2bb6cfa52270c87821 commit 50ba320afcf7db7eac2b2c2bb6cfa52270c87821 Author: Gordon Bergling AuthorDate: 2023-08-02 09:51:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:40:06 +0000 elf(3): Fix a typo in a source code comment - s/speciaal/special/ (cherry picked from commit 2f0e0bd50633eafdfda503ec388151911e7383af) --- sys/sys/elf_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 3d0d87acb052..a2b5a7a919fd 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1159,7 +1159,7 @@ typedef struct { #define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */ #define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */ #define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */ -#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ +#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB special */ #define R_IA_64_SUB 0x85 /* immediate64 A - S */ #define R_IA_64_LTOFF22X 0x86 /* immediate22 special */ #define R_IA_64_LDXMOV 0x87 /* immediate22 special */ From nobody Sat Aug 5 04:41: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 4RHqfL3kw3z4pZYb; Sat, 5 Aug 2023 04:41: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 4RHqfL2Bznz4LpD; Sat, 5 Aug 2023 04:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCLHIes8+w/wlwq6GwxvE4NwuUs/ssdj4+ND7T20qgw=; b=eqPxB49qxsx/lEe+lII/J36+EMmiA2pUDr4w0ZK0XB9o42aENI8eINWGSucY0iXnQ4+06x LQ2DeHqDSa0YcrZzD/f4uqUTBafD2ohVTn3rCwweQUnDr4ZLQNZFhRzpYIFA2tcqEET+bY V5e5KwtlQt68P5s9AzaD6WvRgd+27XPGWJecr08H2C6C+O4XonWW9GC+1VIN07v8frhb7G avMtMYnCd1t5aBA5YIrU1+NyiWuLAGv++PhrxzCX55XV4Ab9DEm8rnZBET1j65LmpXsJAL 4+IPz0SQSncqpz0fkRPENNqZu0hmcYRkB1xd8FxXHdz4CPJzC51zNCBW/m3huA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCLHIes8+w/wlwq6GwxvE4NwuUs/ssdj4+ND7T20qgw=; b=olKYtcaKIMGAJPwMvueZ74oNUUNE4Ga4kIh4aXJufM0sGg1b2wXj2V4atLNFzQULOoU4mw 5zIB/2ysLHxPadHCsLDGKe7tU3nY61+lzYdl963G0D4Nx3BBGuw0tcQXQ0niZwcQJPHPLP bAcjpKiX6hhNUlZuwdLF19auHPb6CvoLdcT52iml3xklGdNJjnN3eC5iJcOK2MpFgIGTwp laF5JwjW9e33TpYGF1PpFFajr8Gsl5yEaGRifqtbvRKRl35SfvsRF2f4ZhdNgxgAmtyKNI JZHTMtp1IfOUljj6GKFpv5PmaoEzhsDYxJEvv05icpXCcljKwzh1sU7OxCk80Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210474; a=rsa-sha256; cv=none; b=Xbyjy9/dO2MlWrqcsbqP/gFnoydVPSxpvcuORx5Djk9bJ3iC1bBoVnTbtXfuf4gU5EXRte urU16ZdkJBIeNzP3j1+G90OcbjgA2KD1yOnA3+59w5KVz8XjCQMEDvD9yoKXq3KpTAejDI lcF3lZeK8tIvPgjYTzV0Ba2iz5zQaA/nPM9NdXgZauVOWTv4GwH3S4tGlV39KmPyMcHgi1 nky85z/YR2GP3+u+XH36p9yekZvP9aPf2EEtCKpa4t9TgmsnwEFVD1fEypgwHMyF9BXfBB rqJ8tsyL514KT3O8wNnIa8YvNLJZvIGSy1zeTO09xcEYquuqw9ORk7J14mOxLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfL1Hx1z1c3; Sat, 5 Aug 2023 04:41: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 3754fEI9056900; Sat, 5 Aug 2023 04:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fEcK056899; Sat, 5 Aug 2023 04:41:14 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:14 GMT Message-Id: <202308050441.3754fEcK056899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8229a3a2ae6e - stable/13 - cam(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8229a3a2ae6e56ad5ac756c434485309dc7f3cc8 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8229a3a2ae6e56ad5ac756c434485309dc7f3cc8 commit 8229a3a2ae6e56ad5ac756c434485309dc7f3cc8 Author: Gordon Bergling AuthorDate: 2023-08-02 09:14:53 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:40:19 +0000 cam(4): Fix a typo in a source code comment - s/uppper/upper/ (cherry picked from commit 586eda6b244632d28d740e417133227b14324e3d) --- sys/cam/cam_iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index f59d10661df7..66e9155da6ff 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -1536,7 +1536,7 @@ cam_iosched_queue_work(struct cam_iosched_softc *isc, struct bio *bp) { /* - * A BIO_SPEEDUP from the uppper layers means that they have a block + * A BIO_SPEEDUP from the upper layers means that they have a block * shortage. At the present, this is only sent when we're trying to * allocate blocks, but have a shortage before giving up. bio_length is * the size of their shortage. We will complete just enough BIO_DELETEs From nobody Sat Aug 5 04:41: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 4RHqfM3vVRz4pZKm; Sat, 5 Aug 2023 04:41: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 4RHqfM38Z3z4MD2; Sat, 5 Aug 2023 04:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfCs5UuIxmDQXw9fIVrTnrCc3NcIQOlc03e819k/U8E=; b=j3rN7i7BDQpoUD52DNb+0R37JgsBCImHXQVPhvbsz1FBbA/GbkoUH75SHl+kUopAX+5ylu /PkCmlieS9UGBvQg6w9MF6+7puEQd3VtwrAlaQwugzU80ZlDEHoj1ETGvOaKT1M2SB2k4U A0B4rwdpDIALe7R97qQjvzCXOOvTDBdy8YDJodBAr+f/6t9QpBodK+tsLw8sdfWn4jgpkj UAxIYubj7xuwDy6bc3Zm4oBkATWBlI00w5MhRxSGZJSOx8IscJViSHE4Nv0hPEk1Lo5dQq W+AYUYEk89mdlbO/eAp8/x7M6k3oaD6iSCtylH5W4h2KBn09EaKVIzxv/E/Skg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfCs5UuIxmDQXw9fIVrTnrCc3NcIQOlc03e819k/U8E=; b=FVVs2xmhipcznSpuD+2TgTosJMZRcabEx7lT79LIqabZLhiEBShS5hPdVDaRgyMYa82iE+ Vnc4fFcaxWN/yj2K/+DnXMn11z6h6xEGk4bOqAyyb7ZrzY3qr2ZlqO5JOrv5kcMcLs5GjF as1C4EI4AnLqXxw9uMw4gRdkkPuDb9GXEIRyaDnu2q9YL+AxMQScCyZE1teVamBFxAyWHl mgg3SupkE3oLA0FlYWEp0ua03PzZSbnjBtCVsVWBV1X5KfhTxlO3fmEXum4NH/GLdUeKGq Aj4qKYagF2ofq33OLWlf2s8kerL2oDuc/9sDmsdteqiX+ngvSBmxZ/X6tP0/7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210475; a=rsa-sha256; cv=none; b=VGzbsZ+cFBxE6EBgwn0H4Xi86lXPcdK+w4gDCfA+JK/mNzBI9QjsghjaB95vdjKbhVgxSf kIsINPFu4RyF4U7q34rnWcldJm36U7ETO3IHHSuxKGFiU3RayrB7qUX2ajy8csiGXLRL57 6DtCu54d0Q6ShuqE3NO1Q4H6UvfE4GkhPxHnDHLwJpjHs7/G9H2QP0Qwhar59xMdBPsLv4 q3GpkDYQTCTGcIR/GjpLlC36+L2klVAEz4Utdmlm1gBsqrYBss0jfmVPzcjI3aEVRjhfbS nf4+OlKIu3XwCtMvFlUhVrJ1v5qCsVm+DaufA5C7UWuboLaEkgt7Tbrt9m75+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfM2FSxz1hv; Sat, 5 Aug 2023 04:41: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 3754fF4x056919; Sat, 5 Aug 2023 04:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fFln056918; Sat, 5 Aug 2023 04:41:15 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:15 GMT Message-Id: <202308050441.3754fFln056918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 68edbc8a903f - stable/13 - isp(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68edbc8a903f3a8df5adbf5d92841447d57d865f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=68edbc8a903f3a8df5adbf5d92841447d57d865f commit 68edbc8a903f3a8df5adbf5d92841447d57d865f Author: Gordon Bergling AuthorDate: 2023-08-02 09:48:46 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:40:32 +0000 isp(4): Fix a typo in a source code comment - s/Constatns/Constants/ Obtained from: NetBSD (cherry picked from commit d3367c35cb12d4acde62ffbb72740801352cd3fc) --- sys/dev/isp/isp_target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h index 1650c4f4dd54..8c09a54cb04c 100644 --- a/sys/dev/isp/isp_target.h +++ b/sys/dev/isp/isp_target.h @@ -71,7 +71,7 @@ typedef struct isp_notify { } isp_notify_t; /* - * Special Constatns + * Special Constants */ #define INI_ANY ((uint64_t) -1) #define VALID_INI(ini) (ini != INI_NONE && ini != INI_ANY) From nobody Sat Aug 5 04:41: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 4RHqfN5FkPz4pZRC; Sat, 5 Aug 2023 04:41: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 4RHqfN49qSz4MH3; Sat, 5 Aug 2023 04:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MheiVVJxkcmKh2JzdfzoUY7huqZWXy4wNOiRoRZVgnU=; b=kkVePfyEtgt1SPfZXcBxepII5idP8h6ufFM4d9ns6tmoal17m+Kkk+ipLdkVZCkW9tA2Mq tSYzwKjfxSnJv6hr8qR0DLRzOjWBVwowABQQpN0pr4llovd/2wB4Kl56VVN2mMK61bGAH0 jTPTS9XOnvtS7kfldGZO8sxUVisHAcdWyZ/Hh+qObqzx0sTbjpCsLQQ6ui9Q+Y0gY4bXGS GC/HyjvupBulyE9W2Ke+oQyNiVUe+OORc1Adjh47TffWNiPgh9q4RuJkk/zyzPbcFn7trh Myi6/iZqB7l2EZhLuY2Uk0feJVvzOLDoaqjTm3Pg7ZQbkoxILdSVgJjCtxd5vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MheiVVJxkcmKh2JzdfzoUY7huqZWXy4wNOiRoRZVgnU=; b=duYejLOitLgjULv8zO7bUeXMK/Pjyn/+K4nhPE0nTsnSVzonFacQcyZzyYAYOrPcf6QwOJ 5r3K1FDx3d/DhMD1R4SIRY7EX45vB2dFDRVoCT/nyAZUWKrDoFJLm0l9yrYbCQzmUpv/75 EnI2ijlpNw8dhYB7Hf/HtRvI/kIpK9Iy+FQPkh2XKwFwwVDjp+XHILL2erKjhZvWe7uy/t v7FRQ90QRna51MD0/inwhGG1OmNHS+eAnUKh+jR8vzwUXlyJfIJVc6Xc9sFa4dpXvSPvwz 05fEDC0Iko8ccPiIjVn4A3aE6ojQxLNMaFn2W7TFy2viCcf77VPAuizoQ70eQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210476; a=rsa-sha256; cv=none; b=tRTQ4Zt03ObaUJPgYBNGng6VPA6o1P7FCqOLKU2LJu6xtQhxBAAEAbDBVtaEHvcTHs82Yv a1JDtkRvt3K53SwZpyNx0neKmeRfEK575JRZeZARv7pobmpBM5HVEAPNfAGTyhIHAfbjZk YtZM0p9Za/YmLO4XoMuBVjV024kVYe6z2pSp6QdpBYv5LzscXhah8RWbb7DUZcFVq9aE6S AdPQdKvXhNLy3CbfNEOq1Vq9zuwfnavZhTmo5Gl3uG7scNw95RRCbaF/TctJddjSQcWy1K eUgecsrOnwQPkb0x38KIIYXRXCusQXPxsahoNhlGzhDmAOdaIN4WPB52dYN+Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfN3DZZz1Bb; Sat, 5 Aug 2023 04:41: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 3754fGHZ056938; Sat, 5 Aug 2023 04:41:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fGLb056937; Sat, 5 Aug 2023 04:41:16 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:16 GMT Message-Id: <202308050441.3754fGLb056937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9d9da1c5d0dd - stable/13 - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d9da1c5d0dd8fa051b094a39cbea78154b354ca Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9d9da1c5d0dd8fa051b094a39cbea78154b354ca commit 9d9da1c5d0dd8fa051b094a39cbea78154b354ca Author: Gordon Bergling AuthorDate: 2023-08-02 07:20:17 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:40:46 +0000 aic7xxx: Fix two typos in source code comments - s/reslection/reselection/ (cherry picked from commit 3514686b344da607515decb500018d25aadacd33) --- sys/dev/aic7xxx/aic79xx.c | 2 +- sys/dev/aic7xxx/aic7xxx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 30c383288d0f..fac585698f6b 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -9451,7 +9451,7 @@ bus_reset: /* * The sequencer will never re-reference the * in-core SCB. To make sure we are notified - * during reslection, set the MK_MESSAGE flag in + * during reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ ahd_outb(ahd, SCB_CONTROL, diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 0e43ce1e4318..b2b355c5d646 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7188,7 +7188,7 @@ bus_reset: * In the non-paging case, the sequencer will * never re-reference the in-core SCB. * To make sure we are notified during - * reslection, set the MK_MESSAGE flag in + * reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ if ((ahc->flags & AHC_PAGESCBS) == 0) { From nobody Sat Aug 5 04:41: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 4RHqfP605vz4pZJ4; Sat, 5 Aug 2023 04:41: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 4RHqfP4tpmz4MHx; Sat, 5 Aug 2023 04:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMsNJDrDrz8BfV6wT/r0//JI2IXJccOYLgi1W+q/Ox4=; b=eL3cZ86Udyp2DrHfdg/eMJtY+K06CEcxPw7n4EnO6mwXU1JpcYK1ZEipW6ZrczvRLWM6Xz yXw5rsG8YddxzT4+2ZV4zHfMVWaWPughzMVqpiSV8YZIPb/SBbpqQMJ6W6j1nmfLhCU/1T dyJrAf59tIbV+A8xMWT6cwovbSHyGKOIVhhCeTdMTOqzl3shpWWXn4fzugF/YS697ZPVZZ dUXvMYvmn2F1gCsC4wkfhZKRf27ZzS8Ky3rlWtMrSUE5JK1M3VWgQzk/oUmi4de+FW2QYH htw0pmLmSFrZETje9p922hiGm1YqDtuGucmaOVO37aWl5O+jb5Kha+/OG5o3jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMsNJDrDrz8BfV6wT/r0//JI2IXJccOYLgi1W+q/Ox4=; b=oExrscxCxPSoOMRGge1osd9NDbAIEeuBZrovuwBRssEk+bhIrGNn9+kg6B7FoGZauk/0mp N4a5hFE96lNBiGXSJI1St8LaHBNVvb8TuJSC8ogoEmQKadiXxk66PQaYuWLlKe4yCWh/f8 T6n0gnj/AeENz7JSrdM1tFRsr+Hh3YCdcRr0GThQW4JpANP/fJ3c1/Knqm1ypO/+ENrTSG pDm+t0d/dVwlhp/YzdDo1pCvmFCxkDEmrF3/QhKeoPjlYnOzkRLoAsbcRM2AzQ1JKgWWVy S/iEMNYn3oDcYflEe0eA1LLPXJbQAyj5YqjcpZCGiQPaOdqEwn4/aeKNkYSkWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210477; a=rsa-sha256; cv=none; b=V44ifuZqZxmuQkAkDPORdD2alt8n1tYHxvb7/dq94ATKmr/YTXASSJPEECkYWm1RIWP8F+ 5+vCvRtApVVCyo2xy5pBYpBdGahEGb2umyxKMBDbr+muy3V8UW5t/BrZISAfeH0uezZw07 QNPt3AfkfOGvM7ty6iudOyuIj4YnILgFdD7CKsgm3qFscsD7VzDFgdA2musmLsZqAsq2YN 8AmRmJ68z37zXIzjzWGaSLq3Qg8FPIr5Een0LMeCGf7h1jtzcsOH0pwlM/0Q49XmPRd9HW ZeW7rmzHht0+ieosijkKXg19f9aeId6fCf/p44ezLqYIh7CgUeNamnl2caXO0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqfP3y7Kz1Bc; Sat, 5 Aug 2023 04:41: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 3754fHW2056964; Sat, 5 Aug 2023 04:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fHFD056963; Sat, 5 Aug 2023 04:41:17 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:17 GMT Message-Id: <202308050441.3754fHFD056963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fd46c830fd9a - stable/13 - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd46c830fd9a902f4e9382a3ecfca837477e5b2d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fd46c830fd9a902f4e9382a3ecfca837477e5b2d commit fd46c830fd9a902f4e9382a3ecfca837477e5b2d Author: Gordon Bergling AuthorDate: 2023-08-02 07:41:29 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:41:00 +0000 netpfil: Fix a typo in a source code comment - s/interprted/interpreted/ (cherry picked from commit cfd05de1946799c6353b07da5d351027d8471203) --- sys/netpfil/ipfilter/netinet/ip_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 463416f454a9..88e5ae96406b 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -1255,7 +1255,7 @@ ipf_state_matchisps(ipstate_t *is1, ipstate_t *is2) case IPPROTO_TCP : case IPPROTO_UDP : case IPPROTO_GRE : - /* greinfo_t can be also interprted as port pair */ + /* greinfo_t can be also interpreted as port pair */ rv = ipf_state_matchports(&is1->is_ps.is_us, &is2->is_ps.is_us); break; From nobody Sat Aug 5 04:41: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 4RHqfg1PXhz4pZZm; Sat, 5 Aug 2023 04:41: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 4RHqfg0ZDVz4N4H; Sat, 5 Aug 2023 04:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+QeqZqdX6/CEJz/OjtCkDe2/f1TqLa7pDayST0oOI8=; b=rxp/Ey0Yjk9k+Pm3AO5fxOsHbK/E04leMU5UBWZUU7mHLiWXXAxbIsC0DNDXCa/o6mJ7ct jQiPTrq50h+v3FFzYKoxvELUEuafr58rlhakeFgOlhHa4HQZBxoadMKs4sXz6efJzoDaxi y/3o2RsSo4KVVK2/wJTLJf+lnmlzzSlJmW7AR7CqwAu/icJpKed4kz9xXr/0Nvgbg2ZE2M qrDALDA5I8C5U1k8HPkbb0wl5MNBHKEJRBKzB3u1kwvUd3hRpchqsYhtJOBLh8+IXUl46e 8Jn6lw15L97nOUpNrjCE4X73ZWVLmyneMqUT6IrCKgcrXk6tOXggsWPuoP660w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+QeqZqdX6/CEJz/OjtCkDe2/f1TqLa7pDayST0oOI8=; b=PyHTuA3pqoi+133knXYR2Ib12KgjttpYXp0uZAxl2NrtLsS79mlvrXBCAfCgHkOvSyfVsW EjZfKl9By9wQm8+nRvhSJ5nk0FRC6CwAnkhaNzxoS2AwvM6WF1zDBynybuEpQf7CMHV8eb 7bXr2KKtRvjMPJ2kYYp3hZTyLQ6mZgSBo3VWsdfapKPeVan3Hy0pvNePw8CFPuFAvbr3mO Pz66ELELmY9gy0v1rKWX6lPvr88RZX0XDsBy7FGn/hoN7AF6QjoWRYWet+HQhVKzAnnYJ/ xs0NM5bNRaYId+YaWCCJ/kUQ8akyz3AONDZUVEV+kJQ2tRZKyOymiD4+HGxrVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210491; a=rsa-sha256; cv=none; b=kxzatAuZm9Vp7joE9Jq+6crtMEfgJMOu62GiyJNGLLbBSQ7qlox9JxdObwwxYVxKYibhsf V14rBD2tObih99ozzjHWRyL5q8+Duqk9Uhnufg8b78kBULA8SqKarwWAWpnqWJjZqlW0Dt qx7gHbJLxI4RmtkrTNHERgACpl4GkSo4j2MbaNSwtP6E3ZJtOz8LLqA5zcVA3UARB7gMlh Af3fDNGtz5ayZCvfvppfG3kMQeDwvH5+ENfxqeuTFoxAv7XHITphhMslTTCjSgNlnqXcbU oassu/3ghQedw8glGOLX8fBcY+JilH2GWxpA/rwV5E5bxnWnoYKD1S7ySHtmKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqff6c1Yz1c6; Sat, 5 Aug 2023 04:41: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 3754fUHu057148; Sat, 5 Aug 2023 04:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754fU3I057147; Sat, 5 Aug 2023 04:41:30 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:41:30 GMT Message-Id: <202308050441.3754fU3I057147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2e0e659b1832 - stable/13 - nfsserver: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e0e659b1832ecd5b84a8ba1ce4c54f7027aadff Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2e0e659b1832ecd5b84a8ba1ce4c54f7027aadff commit 2e0e659b1832ecd5b84a8ba1ce4c54f7027aadff Author: Gordon Bergling AuthorDate: 2023-08-02 09:27:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:41:23 +0000 nfsserver: Fix a typo in a source code comment - s/restared/restarted/ (cherry picked from commit 11892bc710a741a03735b164dc089d40d7d80374) --- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 4e7a75b3c637..b4fd50aa6436 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4629,7 +4629,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, * client somehow does an RPC without a * SequenceID Op that causes a callback just * after the nfsd threads have been terminated - * and restared we could conceivably get here + * and restarted we could conceivably get here * without a backchannel xprt. */ printf("nfsrv_docallback: no xprt\n"); From nobody Sat Aug 5 04:43:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHqjD3222z4pZmD; Sat, 5 Aug 2023 04:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHqjD2Qknz4Pgb; Sat, 5 Aug 2023 04:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4InDuwtMu4kSeDYupKNC/w0xHkVegaBToO2SG7U3v+8=; b=v8pfbONBE3O1WlRC2prXNGtzwUrE2r6/HDvUk+8wEpKquvPLtGdzvM+ycaujk/XFV49gXn nQTNojyqhi0YN3Kis54ZUbzYo8mpwEm0rpi0TJ4j2H14JxHPPGx5gRdSP1sMOy2cG5yfYT oGU0Z2cmJO5qpRINi6ZpdKFjAwNrINr9j3RV50kd/j4ByBFBXAj7MZro9LosRmKZBYvgdC l/S9J6Isd8Owi5c/1PPgU3IFB7VT9grsm53HY/UTSCF1CfaAWBGCXzIw8teBInDsZqzLVp B/N5tdxRNRqlDniTGWc8oBMj4Td3IxgzfbpWn7QkuIAsyZ/UgbUU6dryFwok8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4InDuwtMu4kSeDYupKNC/w0xHkVegaBToO2SG7U3v+8=; b=TrX35QdKv+BcaWCDFA5HhkQwHoGVU0lSWgvSBU0awL/HijSgA4oMk+jF8lMVi1Lgyuwb8j W1squ3TCybIpiFYuZBFZR3ZJwZR37FILfqd17vSGOfXLz4kBUHCOTJ1/LKvZN59hFaeHfM PiWioNdEjrVSna3ETsWwXmu5Khjh8P/1sdIozUh7gHHzYI7RoNru6iLfTaB0+ztu+YLirC HMBmu+D7tCz4UzHZoUvkhJCSdP+EmxvEPKBcKa38FmGpAPafoleRSyGOPNoseqn3b0pCiT iioeIo6TdO1j+h+7hyB1jeiaFDkP4f/77uMHnk5eYTDDucfmPXnPppiRpkzm6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210624; a=rsa-sha256; cv=none; b=Q0aKq3z1H1w2ov1OtYYdDHV4rd1MIT+iqvooBgk9cMo6bg6fD5CsYZkzAwyk/kF4rLiN2t CL5MtXrFgFdwuClGElxu/17if56p2+np4vVI5Ilcp+buxNKlnzP2TpQAczmq0lhGH9o9OL d+Wtouo69EKzp/cetP0j27+vGlada9/E0Ez9yTnOS7YERIvRcJpoboOuydqj15y8nF1hO4 c3Mlj3pNsS1X8wN/1d2f+UL/OujvdL7imCAwKBRaNj9v1mkd9QnQ3/MNTYCpqMeSMWouoY rnsgeSEmhJiFhy/QVRbj4Jn1SY+sukQQtnn5CR1Xlr9eqIk/0CH51K4SS96fmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqjD1WN5z16J; Sat, 5 Aug 2023 04:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3754hi3T059984; Sat, 5 Aug 2023 04:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754hijT059983; Sat, 5 Aug 2023 04:43:44 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:43:44 GMT Message-Id: <202308050443.3754hijT059983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b0fca69edb96 - stable/12 - nfsserver: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b0fca69edb96febe5fd37d2574b429da6f32530c Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b0fca69edb96febe5fd37d2574b429da6f32530c commit b0fca69edb96febe5fd37d2574b429da6f32530c Author: Gordon Bergling AuthorDate: 2023-08-02 09:27:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:41:43 +0000 nfsserver: Fix a typo in a source code comment - s/restared/restarted/ (cherry picked from commit 11892bc710a741a03735b164dc089d40d7d80374) --- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 50bb201a2ca6..cb4597ec1575 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4589,7 +4589,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, * client somehow does an RPC without a * SequenceID Op that causes a callback just * after the nfsd threads have been terminated - * and restared we could conceivably get here + * and restarted we could conceivably get here * without a backchannel xprt. */ printf("nfsrv_docallback: no xprt\n"); From nobody Sat Aug 5 04:43:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHqjF48yTz4pZgW; Sat, 5 Aug 2023 04:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHqjF3RFhz4Pb7; Sat, 5 Aug 2023 04:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qahVQ6PSkJXUpxssmxfHRPZhUNX1KtJ3Ulv8WYvsjr0=; b=EtOfPdoIFYV8cdFDW6yoBlfuhw47Z9HOfMtKl+UnMk4tEg885sg1GVoIGCFi7AzT5p1wfM D6rOwxmEQS1chljyJnNUIMOTWivnuZcUVZfFDsrAMyaBnWWdkxCHRTlQMfazvH/T3gh57z sqHOcs6DtyJ7Rd5ocYrKCIED1SrpKC39goLwJb7dFcCBwqRXEyB1LUW5WD3qh0Zb86NDKX YIhsG3GY0gfwuX5TuSxx1vt4qslAQI2w5PrSlyGgPol8SlQ01Ooo2Nuy9o+gIJRxyeTacT /KkqlEJOoF3TLnTt7GMSrmurWq3zonGoYt/uo+ZV2zGRY6wBSz4vG2bXeRzPSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qahVQ6PSkJXUpxssmxfHRPZhUNX1KtJ3Ulv8WYvsjr0=; b=d90BIDkTylV102ycSv1oZNDfEyV8q3UxnctYztpYfN3LUgq1B7FgiI9QvASyp+MBhJ4sMO jO4qurYxe6PDQ33ihJCkE276PxKejKPA+y1xT8J+VFVyH6ly/aU+FrpYboNl1nOD8Zaow5 dZylHHW4PywCuZtPkt5S+j3KMLqm7DXuGSJHOCjSkmdTT4BSSOSa+k9rbZvFRugqGDJQ0S 7HTLwQo5X8pTTHlLGyMWZILTggs5NZFDyK1qyKindHPZeAXlvrQ6le5Vk4tWvQM3Y4UMSI xse9qEn6P8LU5M3TUIyzgWX6+axQvBDGfgrFzlupI3rTd+zFZHUB0GnNjiGk1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210625; a=rsa-sha256; cv=none; b=qsmnjjStDiWErme8asV6XC/z1B2ZgboAJFYbNKe6CGk2LFNbQgyrNP8wqacNl6O6hU9zfk nSSxyZr6O/kOxOHSQLYUnYaeMKfWK0Sm3zhqLyld03+Vl0fDjIg1WhayLpf/3hvLjeWZ9/ S9V+xROPwvhsZ8CoC7n0/AyjeQnMNEIuLHJS9U6Mx5vHz0O/hjzPZ/lBxDrZc2SXD9Z7rP pqgp/zNgXVL5Xir66Y6YN1tpN3Gsd31XCgQ4LGmqgIp9GQV0PIDgn6yGkRZ6YkUBg/iz4L O6RbgRLfcnnDlAjmd+ZhRXjLrIu+sqk0yles4KHlza2BlqQyN8JFehaLw2Jf4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqjF2TW0z1b1; Sat, 5 Aug 2023 04:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3754hjvW060010; Sat, 5 Aug 2023 04:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754hj2Z060009; Sat, 5 Aug 2023 04:43:45 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:43:45 GMT Message-Id: <202308050443.3754hj2Z060009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bb23c1b4b19c - stable/12 - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bb23c1b4b19ca79e19797b80e4a518418981f99d Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bb23c1b4b19ca79e19797b80e4a518418981f99d commit bb23c1b4b19ca79e19797b80e4a518418981f99d Author: Gordon Bergling AuthorDate: 2023-08-02 07:41:29 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:42:02 +0000 netpfil: Fix a typo in a source code comment - s/interprted/interpreted/ (cherry picked from commit cfd05de1946799c6353b07da5d351027d8471203) --- sys/netpfil/ipfilter/netinet/ip_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 463416f454a9..88e5ae96406b 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -1255,7 +1255,7 @@ ipf_state_matchisps(ipstate_t *is1, ipstate_t *is2) case IPPROTO_TCP : case IPPROTO_UDP : case IPPROTO_GRE : - /* greinfo_t can be also interprted as port pair */ + /* greinfo_t can be also interpreted as port pair */ rv = ipf_state_matchports(&is1->is_ps.is_us, &is2->is_ps.is_us); break; From nobody Sat Aug 5 04:43: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 4RHqjH6Cz2z4pZmF; Sat, 5 Aug 2023 04:43: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 4RHqjH1xSDz4Pn8; Sat, 5 Aug 2023 04:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAq4p+3FGC4/rlsI2y+vEBKfVXeafxah3xDbXjLfgsQ=; b=T82FOd6NezW/PNt2rknWu4cnq/zL2zaKsH16ZMyxpEyAKxRxFqM8LHEHmyItGuNqWL4v+8 UsH6XUMq8s2Bzrmff6cA/cq8H0xreglgRbHBIDdejWiQAQ5hMmrgHrJPdwvkNOmMginrh5 KxEOuyUPgpBvx6wggNazW47Cv0yN5bY26ACqfD4e8gXLylqoFRBiMFSLGdXWDNFlzd/y+E JR+9O+o9sfst8frvYbF0+JaRD3IwrOTQBinChK14WuIMV2urLr5QAC6ryI8l1aNOwHOojH A0Td0bgXuo+9BqhV27cAEE3hpHlIL+KBEf4Nv4IyBpditYbQMbW9h7nOsRDwnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAq4p+3FGC4/rlsI2y+vEBKfVXeafxah3xDbXjLfgsQ=; b=wQOE3gmL/P4SRKWNvt3QqaCllRbOal+l1SiEeqZSUzhPnP30DQYIN3cNZ33xyL9c9T+1ZI n/7dtj8f1DGNb4WkyCp2zcpPhj8m1ge2+njMmjFdBSPX0bABaDpIAbiKIWeN1Cc36QlaeJ 37J7JS6udCkfbLnNJb3FlrdGS+DU5p55+hUBD5HOLDwDjNMj5GuU4OJ0DzEYx329kjTk8j e4H8RdF+T4KQ89L1ja5l+6ksWKq7zym+cV6NXEsZzd4mjVAeKbz0u6mGb3Yfd6eIGyGJbT AUZ51BDBYTlmodRVF9E/hyJ4rxGDoExHxDc+9zUu92Trt/vd6sYIk9OYBzvvBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210627; a=rsa-sha256; cv=none; b=fLG39Cz5j89y2ySgCGfBPlj/Ujd7yc0ri0BCMMTNbMa/LvWB+Pmw5qYLSQLkeZWlyiSDf6 zNnaCfKcPMTzihxMXPcvSz9o6Qn0hCS0brFrHOHB0ua2sDXz5rn/tx4zFCnCRKlSbrMXVT yXOVO1UC9Oebdk9jPhcKCnIe3poNMHEZnMLpU5mLgwbwzvuiDTDVIUKDCfiQPvUcWYS01p 9BhpBzRN319iH+QhuZaKFigH7YjFEpOIr8+CIjIGZdSgK4v4NPSKGNCKiOAIoH2WG75vgy 8d7C4o48TslcRQVi+sjRuHDs5lL2Lc25YKCfNtRIFels3TWmg7G5zTAzMYpAlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqjG43ztz1rS; Sat, 5 Aug 2023 04:43: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 3754hkLh060031; Sat, 5 Aug 2023 04:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754hk0a060030; Sat, 5 Aug 2023 04:43:46 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:43:46 GMT Message-Id: <202308050443.3754hk0a060030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6b5988f20138 - stable/12 - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6b5988f201380040bda44d5f7b893db441f7034b Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6b5988f201380040bda44d5f7b893db441f7034b commit 6b5988f201380040bda44d5f7b893db441f7034b Author: Gordon Bergling AuthorDate: 2023-08-02 07:20:17 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:42:18 +0000 aic7xxx: Fix two typos in source code comments - s/reslection/reselection/ (cherry picked from commit 3514686b344da607515decb500018d25aadacd33) --- sys/dev/aic7xxx/aic79xx.c | 2 +- sys/dev/aic7xxx/aic7xxx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 2f1b07e12fb8..0834b0bf09c4 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -9504,7 +9504,7 @@ bus_reset: /* * The sequencer will never re-reference the * in-core SCB. To make sure we are notified - * during reslection, set the MK_MESSAGE flag in + * during reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ ahd_outb(ahd, SCB_CONTROL, diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 97af917b9c2e..3f47a445404e 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7221,7 +7221,7 @@ bus_reset: * In the non-paging case, the sequencer will * never re-reference the in-core SCB. * To make sure we are notified during - * reslection, set the MK_MESSAGE flag in + * reselection, set the MK_MESSAGE flag in * the card's copy of the SCB. */ if ((ahc->flags & AHC_PAGESCBS) == 0) { From nobody Sat Aug 5 04:43: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 4RHqjJ2cm1z4pZLx; Sat, 5 Aug 2023 04:43: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 4RHqjJ0GScz4Pvh; Sat, 5 Aug 2023 04:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObClx4JDPrKd6VLYJHvEFdUE2R6ywCOzUsjBxqvTUtc=; b=v8mewhXyNdpX/b+aWG34XZHK8/+4wp1LPPWMHj3Xdkz/TcfE6P3co3KUrVz9xjrNQGKQCk a6vxAtGs1XMs3XBan7Z8GkraoQiDXyy2VCzGAiVqvL8zYTe0tAzSJwv/rMtJXsKVdBHCf3 wM61RZxPuYB4kXOuesKStqrUKSSwc8seekprfW8iCyPbJfPzJndDPnOOG8lc2YFqXAFbHq oI9u30xnHDfsR0LLixRAekENPUNKFBZa+7i9N/7i46Ahlj9hzqMEm1iTxdR6v/jsthm2Ap 3KP512m+KyJo54r66VYG3+fI2p7qoaTKzBNm6ByMp0DugNnSJuM9stQzBgpAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObClx4JDPrKd6VLYJHvEFdUE2R6ywCOzUsjBxqvTUtc=; b=KTEp3KjdgU8MUqD2XBN8CaUY9rqvWbmkoPDV3URgvpWgf0fcS7DII2YQJ4ZrKFcZnQYPYh uJhlSrOKrrC9EUoDcbbMoqBcM/P8LAbyqaUWRPZ+GFoddZRczXRLK4XpkjAP3fPqnLo6zM ARIwkOgJpxQSvDAkj6E/FHe6KzHtyWrwMMQcaUvGoQmnBgcTBzvq2DspfmMQjHK0qTWKh9 sP7befipTHXWrAZTdqcVsWvbv0Sozje8erlrPvNwx1WfMAMNQIZ9LKr6JDFGGShmVfL5ox eOeR4Yb2fHGnvcNxaFBJQ2jfBBcvNL/l6j4rVF0gO+3ASxbY9OYi3UIIvRQsZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210628; a=rsa-sha256; cv=none; b=Pr5/jzYUcsJHDMpCDOBgnmM4as9TPBgShmZv2oww2TQY9bRBXu1sfy4fekqyDbPGw7Kbf7 fqqbnFmNXNnysU4Pf86BullBWtYG8fNybea99zAgyjwNXCra1PeLwUWNRRvNoCWXV9ZeGX M9KlrP/h8wRGc6DIdH8FAVmABJFxIbhkiJ70lpnfVKXy0KTWAS5QqbfCYkdsCoO7UTw4/4 axTQ6HtMCkXykj0gojVDrCxN6W/646RuFWVnYwOLcE/Bfzdfq9NebZtpX4Fmdg12HREo9W cfgGLlFXkyvlh/4obhPQX5RgF81DwUItabRUDOA71q4sVKWTACm+tHlUOXbv7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqjH4JRrz1R8; Sat, 5 Aug 2023 04:43: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 3754hloZ060051; Sat, 5 Aug 2023 04:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754hlWX060050; Sat, 5 Aug 2023 04:43:47 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:43:47 GMT Message-Id: <202308050443.3754hlWX060050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 61697581ec7a - stable/12 - elf(3): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 61697581ec7a25ed24415c58b0dd73bd78e6e489 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=61697581ec7a25ed24415c58b0dd73bd78e6e489 commit 61697581ec7a25ed24415c58b0dd73bd78e6e489 Author: Gordon Bergling AuthorDate: 2023-08-02 09:51:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:43:01 +0000 elf(3): Fix a typo in a source code comment - s/speciaal/special/ (cherry picked from commit 2f0e0bd50633eafdfda503ec388151911e7383af) --- sys/sys/elf_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index d77fc31720a4..83c3c897d6d1 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1098,7 +1098,7 @@ typedef struct { #define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */ #define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */ #define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */ -#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ +#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB special */ #define R_IA_64_SUB 0x85 /* immediate64 A - S */ #define R_IA_64_LTOFF22X 0x86 /* immediate22 special */ #define R_IA_64_LDXMOV 0x87 /* immediate22 special */ From nobody Sat Aug 5 04:43: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 4RHqjM2SdYz4pZt4; Sat, 5 Aug 2023 04:43: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 4RHqjK1QjFz4Pvx; Sat, 5 Aug 2023 04:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzu7BDxX51nXjJLkY6E6UWn1YhNjTcJ3s85PCcogmuo=; b=PxAQ7UUb84anbsTZfKVfzNWwwt+kQDwXowsWPQ4CFPJukpTVDpvgAKDMm1uE/WItH5Id71 3hXf6XAxrj+HknLKvm/e+2RcK+ZLDFZra238FU0veDmr65Jq34G2MbOPBxy16MRSAlx2Xh LPMHXZj175z6laqRJEJeh4WV/dLQ8HJt+EoZAX8tf/1/qb8vi2WS54r8uFY1Wc/6MqAlSG psRW6GYGwgmIsQZmq2eskkKoJt/kAr3d6iQqXEcIP2xQ3g6P2UHa3J2YpnB3MI+9uxt10R N91OD/ZC6IGytremj5JPar5rIObRiJEYbUhX0XjocFTv6iOvXapWLar55w5jKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzu7BDxX51nXjJLkY6E6UWn1YhNjTcJ3s85PCcogmuo=; b=oWmQUwsBUxbL+/15fnQQDd0LB389cL9tJj1xSIRnnjO6vQ1OmRS0Hp6CrwYNmGm/Ep9TNF QjNI23aep7vVrO/N19OT17Kcp4OtRUveXRPRaoQacV8rVIoBHB6FmxK02B40ZYzR39UGjP +MpzSz6n5T62JkSzQZGR+6CL8OLiUWpQ9bKbCxKOD1tJzqBsmK4JKtajEDb0e3laF7hGNd HplOy2KypeDLZdbt64diQ8aUbd6Uf/JHyOopubhzKaDeXIMg+FSgEeAq1ogv/vd0xykjj2 wAieCw8NiVDcw0rTQZ4unWMnWrRytfrpIZuElnMpNROzZ487heCd8sG52CbpXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210629; a=rsa-sha256; cv=none; b=c0CNXP/KqB6wmfzk7b+r0xqEf58SKCgiX3birpXMRI9FAPco1T/enRFXylMF0MdFheDowI cOYSpm25LxnxihwAEBYrQ9Jmwk99V1pv0QPnxdVMKY2gNVvRg8BkAwZ8Mr+FfVtAacbwo0 tYQWGvhUlE1a/JFHSK4NAyBkz0JTVG4quyfPJv914I/nl18R3klHz+N8K4c3PAjmT5uBQO XloGy0fIuoxlBDVk09t8IegsRvcLVuaUC30HF1u4QOEDnhBM9wPketdI7NhJDNDgLhqQG0 IH00iSqcjoZStnZrjynoynpyL6WXaDyE/wr9VkMZ5ucII1L6IFeM7jOkCJTtuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHqjJ58jmz1R9; Sat, 5 Aug 2023 04:43: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 3754hmtU060070; Sat, 5 Aug 2023 04:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754hmum060069; Sat, 5 Aug 2023 04:43:48 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:43:48 GMT Message-Id: <202308050443.3754hmum060069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a2384525c961 - stable/12 - linux(4): Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a2384525c961305e84d719f73c425163f77a632f Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a2384525c961305e84d719f73c425163f77a632f commit a2384525c961305e84d719f73c425163f77a632f Author: Gordon Bergling AuthorDate: 2023-08-02 09:55:30 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:43:16 +0000 linux(4): Fix two typos in source code comments - s/decriptors/descriptors/ (cherry picked from commit 29eab3e4e0c9a6e954b0ee858e3d4c2a9f283ea4) --- sys/amd64/linux32/linux32_machdep.c | 2 +- sys/i386/linux/linux_machdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 42d9146c6df1..712d0156d561 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -682,7 +682,7 @@ linux_set_thread_area(struct thread *td, /* * Semantics of Linux version: every thread in the system has array * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. - * This syscall loads one of the selected TLS decriptors with a value + * This syscall loads one of the selected TLS descriptors with a value * and also loads GDT descriptors 6, 7 and 8 with the content of * the per-thread descriptors. * diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index ce177e78dc18..aa9fa4dbf0a9 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -579,7 +579,7 @@ linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args /* * Semantics of Linux version: every thread in the system has array of * 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This - * syscall loads one of the selected tls decriptors with a value and + * syscall loads one of the selected tls descriptors with a value and * also loads GDT descriptors 6, 7 and 8 with the content of the * per-thread descriptors. * From nobody Sat Aug 5 04:45: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 4RHql33mnCz4pZy2; Sat, 5 Aug 2023 04:45: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 4RHql33BRDz4Qqh; Sat, 5 Aug 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqMe3/8VUYcqR2eLCqaLUr/JP1zw6PMhZ5vbuwCXqWk=; b=fq4i5gUN64LsMTYwYo/8SPSE82HP6LR1/ydL6u0axiXPFbLlIBejNCLNcuzIhlydEd8Szl V9UA9H0nZ6Lddppbwa2xWZ4c8bzh0yIiqKieHZGQ9dbhg8dBoDnVHmWjke1qGJpBn0zxtm tvsXD6J3hg/wIpzGf72LNUEvDBGtqpoD1FwCpMfBBxO6I2kQ8GOSV5RKJA4kdyoapDj3d6 hNlhO50K51F5iJzn8cAHwzujD+Mj/KOREqer7TaBGvIpwRAcQdfW2hsobBloykiB3Qo41I lRW12TQfeYUdLuHguyaApCL1WmrUquZ+4IxLu5NijI36ALowwbnk9IcpxlBfaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqMe3/8VUYcqR2eLCqaLUr/JP1zw6PMhZ5vbuwCXqWk=; b=eMMZIkRXFulDrOuPUZOqostOWHgt/Hm7+ljS6Sp4GD4Jpuw4uGrSEFZB9BIqP8dRdUgGVz QjwecG9Hs94sbXVlJDRanixCphKJm7SWMax3T/4XZkNHzwHHouKIUpJJqae0r1SqIugQsD 3OZEWesnxEyq4unjO51Ys8FQ2lV/inPKV6K2DkSi94P/yHPtCzRr1NY2t55ZyuUk8NYUwF 7Aba1itrJ0lG3og/+xGU/RkA8IwrF2AxFmS6HXgk4u9V5eWhU4FUwHANLDWsMJORAUq+C2 MWHgYtZ+rz5TR5gPEMjskvoYUNuhuwdMhqt4XWfJzTa+CT+37V7WOyVwEU9/0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210719; a=rsa-sha256; cv=none; b=tGyQeaUsPfR2yfi5MlDoIRCKwm5RshefD6SmqpqZnva4sqxlyckLpnP/Xc6p7MiI/4GkiV yQHyYCfefdJlsgZfEIOEBeEaJcKK1ld0f2GZaXaI+pcLq01NuOBRQvAftVleroqPQ/dh/1 oOD6HsRA/OMBPQmHPixx2k3Ls20vOIcStwtC7ixDgrKQIkBfASZ52vierC8HE4o8j14hhT 5FP8VsRwE/5veqrHU6LmhoCs+m6nY9DSrhMiNx89IYGXKqZiUkYgF1ZpeViu7eKuW8dH5a 17OOMyjUhomMBFZyv+LIJa+kCZIZFO+NQonoxMj0RDARV6AEpfyV9jkm7y90vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHql32GPGz1b5; Sat, 5 Aug 2023 04:45: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 3754jJce060423; Sat, 5 Aug 2023 04:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754jJqu060422; Sat, 5 Aug 2023 04:45:19 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:45:19 GMT Message-Id: <202308050445.3754jJqu060422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 49f796ac9212 - stable/12 - vnic: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 49f796ac92128837960edcb08f32f09f2916820c Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=49f796ac92128837960edcb08f32f09f2916820c commit 49f796ac92128837960edcb08f32f09f2916820c Author: Gordon Bergling AuthorDate: 2023-08-02 07:33:35 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:44:13 +0000 vnic: Fix a typo in a source code comment - s/Enabele/Enable/ (cherry picked from commit b73763fc10d8000ec5c5682abccf6c8489eee8e3) --- sys/dev/vnic/thunder_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/thunder_mdio.c b/sys/dev/vnic/thunder_mdio.c index c3bd560b52c1..b013481626f6 100644 --- a/sys/dev/vnic/thunder_mdio.c +++ b/sys/dev/vnic/thunder_mdio.c @@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$"); #define SMI_CLK_MODE (1UL << 24) #define SMI_EN 0x20 -#define SMI_EN_EN (1UL << 0) /* Enabele interface */ +#define SMI_EN_EN (1UL << 0) /* Enable interface */ #define SMI_DRV_CTL 0x28 From nobody Sat Aug 5 04:45: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 4RHql50Lrqz4pZy4; Sat, 5 Aug 2023 04:45: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 4RHql44WH2z4Qsd; Sat, 5 Aug 2023 04:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwvpvbWat8LThvhLT92rG4yGCUbgSFDCA0hR4EBdcLY=; b=m7K0WUYTOPeX5Q/+YOHxyzCJhaGYoQgsihRavafNfoKBWGbJdD6/pwuSageTGtPQzzoC6Z Sj4aon0pKsbMJjGyOgJ8R27AhoM/OgYTAIt5tog1SmeZE29uyaM/uvFIaNTeEQrPr2S7Aj j0OzhsjPsgJlsHu/x3bLMKpACtZwo4pjNleMPon0AEE2X8Izr4jL1SeQ7f8hDR/+xQRhi/ zmqOUEvEeEX/XABzIY7QeZyjjGkMwLvzv6ynHnQGpslG2v9kA9kgN0t4BXhK0PvaKSYfMZ 39iFmT3HEWZqWR03anRvuWXbkQZUikfUEeNEYCjcvldv1tRq/e2XgCskqZdCBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwvpvbWat8LThvhLT92rG4yGCUbgSFDCA0hR4EBdcLY=; b=iIsn0jzI0PUZL3cwzLavNTlxxBbU27jeFfwM14aOSDwzLfFaEwkp7wikfBaUQyFnHl4HJ0 upRCKRjdDkI8VgJwreq/FQkqEVfh4Tf4ieZyL+o+8YtiPM+M41xCTtx/l/R8xqMiUQ0rH7 AMj7j/RbK32xs0ZOPC7lcJmRyXEWgrwu3161GJeGK+XNQCKxvOosUe08jkNvU7en1pbC3Y CVSgbVrl4Bt6A+xep5qGWU0SPb5+1CDD7p2hLIYVR2fybUqX1YFCtI2AhBuo93DP7V06Vi 0+ivBx1FlsvZr/5tcCEtM9WNqdvbbfL2u64ZJzVhCSnHaP8Amz/T7UcWNIG7MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210720; a=rsa-sha256; cv=none; b=TVCLLPzPC7tgqQT80EfEyrccjnloTWaKKqIf2qZ8irk3ZvLr02+5a5IAG0s/yo8m/THFa1 oTJiqFlqhT/trBRX2osIT5abpCRX56dE5DKD9wz3kERdbwh2aWe9jcr6uFaHq5pY1dKXrh po+HZgmim5dr2vgoG/BNNy85PSIr8A2xawxSXij6lMN55xFkvuvGuaxuctyPQ5YbVFQsqt 8GqPH3T+xPw5x3L4VYop2yGq2au/89o4wE09TLOWbXvgP0w5Ir7PQz99+YWL9JnUHnin5V JhJocrT5o3hU8q9y4CpX8cN4hrXJ04S2JzbOIxft47hVCpq3w47fWnTK8pMiHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHql43C69z1tv; Sat, 5 Aug 2023 04:45: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 3754jK5s060442; Sat, 5 Aug 2023 04:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754jKgu060441; Sat, 5 Aug 2023 04:45:20 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:45:20 GMT Message-Id: <202308050445.3754jKgu060441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c487db6d0ccb - stable/12 - usb(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c487db6d0ccb455423c63ad11c38123919f7bc67 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c487db6d0ccb455423c63ad11c38123919f7bc67 commit c487db6d0ccb455423c63ad11c38123919f7bc67 Author: Gordon Bergling AuthorDate: 2023-08-02 09:04:24 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:44:31 +0000 usb(4): Fix a typo in a source code comment - s/determin/determine/ (cherry picked from commit a924b48579c7a0c794431fbd3f540ce56c4cd662) --- sys/dev/usb/video/udl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c index 44fc8fcf2b1f..fe86bf06362c 100644 --- a/sys/dev/usb/video/udl.c +++ b/sys/dev/usb/video/udl.c @@ -788,7 +788,7 @@ udl_select_chip(struct udl_softc *sc, struct usb_attach_arg *uaa) /* * WS Tech DVI is DL120 or DL160. All deviced uses the * same revision (0.04) so iSerialNumber must be used - * to determin which chip it is. + * to determine which chip it is. */ if (strlen(pserial) > 7) { From nobody Sat Aug 5 04:45: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 4RHql61tj0z4pZhF; Sat, 5 Aug 2023 04:45: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 4RHql54bDBz4QwC; Sat, 5 Aug 2023 04:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kvi+wOIIY6j0Eqf3/dG35HAsIGTBTTwHlHSbVH7soU=; b=XC5DED+ot/wVzB8jGxIZZhrHcnb4DhBPTs3Ca3/Ix1/Yphlc5gxy85qpGB8V+c/vKW6/oe IzdBINwJMrtd2BMcr5cm1XPZTRWQH8H0iBP7S/zz8UWF8mlzRJUfgIyK0mV+jnn8oeqDch 7iqviiXokhJIUvR/zOJFPNN0zxCOvtkCV4dk15oIYrD+LXmuR4Tp09CWOgQDjIRdunU0rf 5CDj2JJnhRx4TM3whvYxrOtFLAT//x0xd2EyiV/mnbGwCMM9vk3YB3P7nbo5anbenaKa97 I3QJ+/XofULhjt8yDpQsK6dtkYOV+hJlzpmyDP8fYW5LJ03nDBFaSPgIy0yl+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691210721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kvi+wOIIY6j0Eqf3/dG35HAsIGTBTTwHlHSbVH7soU=; b=KnRkdmkoql0V7qqJlH+hjupAPBNo8D/lXQsueJmKo/0rOV6m1xF4sqYfoz/5JSc+DaCVUs H0DlR+vqBwQY4Tjg6kDjnZla/fa6fnIBbq022LwKPJLPDTGyqQwSF0MluhgrsU37wh5K7A MOu32BfKgisILaKExN5NFy4+UKQTldQG1QdCn4FeWsYVn+t91cKjw5Tv1Z6afTA/nK4emt ixx0khzRySpCwrMqVYgZe583ydHziogXdsEqPguclv8vLBVNQNt3K1d4mNm2OFk3xeNu+o 1gxcJwS5xps0bfk65yjqcllvKyhPXVYIWH7YQiSVAGyxFDXIumBeKDJI4//R+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691210721; a=rsa-sha256; cv=none; b=MuRqB9CXI0asgpkepkWd7+4BKHBQ6CGFgEpGG6LvljasTOkXwz6I1yUMXUghOFUNKrAFFV f9ViQRbzNAcfr/W/ZLfKaAwyc5VxAVRp+1vwvrHI3JPZr9gTG2VITh2FevbbWJSQpM1VwC I4sk7AaJjCqDz0mvayrt3pzRG9AFkzkldArEPvlapciIsNeFZhQsu4xwPHQlC1xvPOFCcL pNqgAd6eLgAjPbA7WBi2ylQETQFAnO3GolC4NpwxhHkBC/3BWfoO9ybbcvLWLMOoJKXBOs XEhpv+/N0F9erCQphRsJYHOqb81eh/o57t6Iq9Y2pG9MpPUezfE3sQ3/8vokIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHql53ZNNz1tw; Sat, 5 Aug 2023 04:45: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 3754jLIJ060469; Sat, 5 Aug 2023 04:45:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3754jLTQ060468; Sat, 5 Aug 2023 04:45:21 GMT (envelope-from git) Date: Sat, 5 Aug 2023 04:45:21 GMT Message-Id: <202308050445.3754jLTQ060468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 53c5e2732978 - stable/12 - et(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 53c5e2732978e2faa60999962ad6c008f017a7c1 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=53c5e2732978e2faa60999962ad6c008f017a7c1 commit 53c5e2732978e2faa60999962ad6c008f017a7c1 Author: Gordon Bergling AuthorDate: 2023-08-02 07:09:56 +0000 Commit: Gordon Bergling CommitDate: 2023-08-05 04:44:46 +0000 et(4): Fix a typo in a source code comment - s/diabled/disabled/ (cherry picked from commit 734c9698d9ae83206a47daa40031a4de3bce9c28) --- sys/dev/et/if_et.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index 294d9d5e55aa..9efab103bd22 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -2004,7 +2004,7 @@ et_init_txmac(struct et_softc *sc) */ CSR_WRITE_4(sc, ET_TXMAC_FLOWCTRL, 0 << ET_TXMAC_FLOWCTRL_CFPT_SHIFT); - /* Enable TX MAC but leave FC(?) diabled */ + /* Enable TX MAC but leave FC(?) disabled */ CSR_WRITE_4(sc, ET_TXMAC_CTRL, ET_TXMAC_CTRL_ENABLE | ET_TXMAC_CTRL_FC_DISABLE); } From nobody Sat Aug 5 05:55: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 4RHsHv4b8rz4pgB7; Sat, 5 Aug 2023 05:55:23 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHsHv3wV6z4X86; Sat, 5 Aug 2023 05:55:23 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691214923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b7H/b760qC2nWYM0EqFkLoi0seq5rs+4Uxg43npyAWo=; b=BJMQEo7GOLCz9GUqmUt2qOhNJjN1Xs2/4Khz2HFDWT8V8a1Xq8u4/lGExF+ZzxUvePW6pj TayvmNE5/ANDYBDkEhwzUiPfI4IH8jjUX6iMFymr5sC2RkGjyoaGSD74F5bEVGukpj61ds k4a75M1vnM5TlLPbZGsbOSHQkK57Pihxsb8xKh0a9UOQ8lQ0TmBVzgZ77vSY0ZJsTuYVSe 9GDZQZtjUaynNS32hu8bIdx48z37hPMYmZbdLmI1wRS+dqso+DomgfVJfmNujD5dGtmCk1 uR5ZrwUp/hb2+aJ1ZjDUQBtegQRnjqAVNDCsVeuhAPslXi2H0BK+WWo13TesSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691214923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b7H/b760qC2nWYM0EqFkLoi0seq5rs+4Uxg43npyAWo=; b=QG8UP2TS+IMuDpFr0gGoKIVHVdFDuv0EZmBcSskLOxKVbbBJFCmCO8+oo6m9meJFViuotw QAgKW7VSf2LwhkqioQGeMEoUkDihdwCQZqh/Xio9vvY439I7dUkUL5AGxOgSAfMU6O42fZ /+GyFx45oeS1RUMnqorjHUPr8MbG505/y7f+oMGyHKkSTgwrphPxjK/V80Gyqf7gepisCM so7mnLYsg9Wvtl4RxSRPIiOKf/AH4EcYbfd29D2Bnx7sMcOGRbykIsqDBWHvorJWFE02K/ wMKXl01FnfEHsg4qOMQWr227Bwq0cg6/rQ6MUJRVZrbnK0orzDyrlYxv30Qx4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691214923; a=rsa-sha256; cv=none; b=NElHVH/hOeV+PaB44wp8hnufpEB3ZR8B1Z/3ElM5pswOG8Vyrlld9rrylms8EMSRyIxM2s IlxET/4D6clW2Wi5zLUIrdci25yzvEO/QUE7cDGEdupjiArni/xw6ua7bEq8vD8W4Xj9w9 jEXCOoC4fbH6glQ47crnpOQvHXaqQYLZ/k8mf4R5RN+qa6GkqRfb8YFHNCKglGRH4PUZLN WdbQwuZXCwzD6E95p4DT5zYyqoz/DwCmDOyIbqqPOKnDUq/R5NDLfP9QZFSsKnZNaWuETk tmlR2u/IY4hiaWMqexFlLG/MFRkjM/Y/LPaND+6RZLMbfzVDiVz0eSn8s8xNkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.no (unknown [IPv6:2001:4647:d671:0:36e8:94ff:feca:9834]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RHsHv26rlz1KbJ; Sat, 5 Aug 2023 05:55:23 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id D475F11D06; Sat, 5 Aug 2023 07:55:21 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Mark Johnston Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 6de02228409f - main - dtrace: Add WITH_DTRACE_ASAN In-Reply-To: <202308021315.372DFig3021615@gitrepo.freebsd.org> (Mark Johnston's message of "Wed, 2 Aug 2023 13:15:44 GMT") References: <202308021315.372DFig3021615@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (berkeley-unix) Date: Sat, 05 Aug 2023 07:55:21 +0200 Message-ID: <861qgiowxi.fsf@ltc.des.no> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@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 Mark Johnston writes: > commit 6de02228409fd2b7ca1d7e3b8d9043a105093cdd > Author: Domagoj Stolfa > AuthorDate: 2023-08-02 00:10:46 +0000 > Commit: Mark Johnston > CommitDate: 2023-08-02 13:15:08 +0000 > > dtrace: Add WITH_DTRACE_ASAN >=20=20=20=20=20 > See commit 4ae6991228105eb34989c870194ae7b0a1e23be4. This version of > the commit avoids inadvertently changing SHLIBDIR for libdtrace.so. This is still broken. % yes | sudo make delete-old ; sudo make installworld -j8 >/dev/null 2>&1 ;= make check-old >>> Removing old files (only deletes safe to delete libs) remove /usr/lib32/libdtrace.so.2? remove /usr/lib/debug/usr/lib32/libdtrace= .so.2.debug? >>> Old files removed >>> Removing old directories >>> Old directories removed To remove old libraries run 'make delete-old-libs'. >>> Checking for old files /usr/lib32/libdtrace.so.2 /usr/lib/debug/usr/lib32/libdtrace.so.2.debug >>> Checking for old libraries >>> Checking for old directories To remove old files and directories run 'make delete-old'. To remove old libraries run 'make delete-old-libs'. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat Aug 5 06:02: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 4RHsSJ2qXrz4phDL; Sat, 5 Aug 2023 06:02: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 4RHsSJ24Bkz4XnB; Sat, 5 Aug 2023 06:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691215360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8R1YxunGpJSth1K1UlEqd3aQiDo14/6a7SDkJl+dRI=; b=iadj7w4vTjaRbsAWZeqP1di/q0oR3ll3DtHxzIndb83jMTZXxEQPRu4DNTQKVtsd29K9zD tbzpSz9umxdoPSVmJyoiAFzOz4ho+deyhxv2hA00TsyiLiaIdZVTlO/oRWL0wv1wLdPMcM NgOcoZn8DICnjp3XmYEGH4Vr3NzyqrBB0vtRBTqMrW8ONd0Z0XWWpQ5Sh+Tv54M/Q2b0tc hxLgqHcXHnB/m+VTV/F9bTAVZqCI3prZpba9G20y9JTrnaXlteUSbkt1rKTNjP4scATJYy gA8+68NJlTJkXJ9vi2sR9SSG2P6lpeNM12PRK6fM8JlvG5psNActkNV/Tu/QLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691215360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8R1YxunGpJSth1K1UlEqd3aQiDo14/6a7SDkJl+dRI=; b=sJzvXYEDG3Kjs1KVB8FT/9QQViTUvmY8UKNacqfZhZBQWzH7nwf8WUaS1VZE0/E8c2q7w/ 8LalMG/vwG9/GZDBAi/WaAd31vd+zWfkMEj3zrEC/GM5v2NBcHFUBBeRdKhC4TPmKp+vol e2VOa+H1BoAhS+BrkfcMgFPxrZRxZj6Yxa70M2Zip531GhIlWtc+xFQvNrIbCykdT9FSYg 4nKwHHQQ9g4PwDPxTqIw3K6WEe5jPfg+0BZnpQ80nOsRlJNi5t8jL+qHS+jIBYvAAMtAaF mpfWM+o96UxFEGl9pIXowoQLmZM8vxh2TpBsCm6eCuKuUDCRRW1ezSFCPWXbcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691215360; a=rsa-sha256; cv=none; b=ter5TrdaqWo+8aE5rp7k/w3Kxdn6xRNFycenLVkLOAUGksb1d6Av9165sNse/iOu0eCXS4 0p5JKw8dAFQepW4DSF1TFA2I5LMQKUgKP0IqJkVnYY20frfUShB/Q8SlaHWZ9tyJubffdU E/V8qhpe3FCEm/+Ai+PZyE3cQ9VW+P6O3HDfjhtTEp582ovmz0wqERmvkYtWcKFe2Vrg/A nxDnyf3XfNmozDFGBJv2Vw9q8ozLnT5nvfrqYJw+oVQbSnZH/3q9fOa9z8KQKZJqstTA9b BAaQ9A5NQVzm01b05YBIfYdnd1nx+u4SLuo9BX7nCZQNLfsgZCCM+iWj01ZAnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHsSJ16yGz3gT; Sat, 5 Aug 2023 06:02: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 37562eoI093442; Sat, 5 Aug 2023 06:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37562e7L093441; Sat, 5 Aug 2023 06:02:40 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:02:40 GMT Message-Id: <202308050602.37562e7L093441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 995d2b3e3bcf - main - ObsoleteFiles.inc: Don't try and delete /usr/lib32/libdtrace.so.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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b commit 995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b Author: Jessica Clarke AuthorDate: 2023-08-05 06:02:27 +0000 Commit: Jessica Clarke CommitDate: 2023-08-05 06:02:27 +0000 ObsoleteFiles.inc: Don't try and delete /usr/lib32/libdtrace.so.2 OLD_FILES and OLD_LIBS implicitly include the libcompat variant, whereas MOVED_LIBS exists specifically for files that have moved between /lib and /usr/lib, and thus don't get a libcompat equivalent. Reported by: des Fixes: 5fd1da4d8501 ("ObsoleteFiles.inc: Add an entry for libdtrace.so.2 in /usr/lib") --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 67bdb1f3d8e0..d77ced3c817d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -56,7 +56,7 @@ OLD_FILES+=usr/include/net/iflib_private.h # 20230802: Remove a copy of libdtrace.so installed to the wrong path -OLD_FILES+=usr/lib/libdtrace.so.2 +MOVED_LIBS+=usr/lib/libdtrace.so.2 # 20230726: Removal of support for the VTOC8 partitioning scheme OLD_FILES+=usr/include/sys/disk/vtoc.h From nobody Sat Aug 5 06:03: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 4RHsTK6rscz4ph7x for ; Sat, 5 Aug 2023 06:03:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHsTK4wKVz4YKQ for ; Sat, 5 Aug 2023 06:03:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-307d58b3efbso2272703f8f.0 for ; Fri, 04 Aug 2023 23:03:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691215412; x=1691820212; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LVYpBHdaoswbWiUj6MItbnFyEC/15+Cl5J4hjeKtLvs=; b=eYUTgvnSqU8nBqTgcHdiamKB3Mtjo+yil419lQsH/TYWhm1hQk4rxShfCFDgtopaUX jkTIN4rVDqLhy5+Ww/YLSRsj4CGgX+EA0QS1dO+LqleOcUWCUvjWmEZHyrTUpNdip9sY MQ7t40zB7zxMydp5ZDMQna/SGn0OfUHHA6cV6dD5rSg0ysjpvDAoHGp48wkuQ29R/gT7 rtCjQ7rgVRJABMCHn4ezpOro5Z1m0C4A19lRYCiozbzCUOnc306Ed3vr/7/92o4utPBi +I9AzAAjKWpTo5N4Da33t0gHGmdf9nYFX1ekxMo91I9flFfCQ4urCUXZIXjH/4FeNbtS MXfA== X-Gm-Message-State: AOJu0YxtHzABiTpTHsM8gg+U5J8X1OEIEyaX9lUoGU6dfoNTOKoT3paO yh0EiR5MgEbGmtpENI4G8H5Wtt4JCNoAT7alWGE= X-Google-Smtp-Source: AGHT+IGi97PWyfVVe/RMskIxsbTAEGvKyF+aiTo/jx4TvoiJEzn+Hz4gxfThNDKH2s31p1ty3uAZvw== X-Received: by 2002:a05:600c:260c:b0:3f8:f382:8e1f with SMTP id h12-20020a05600c260c00b003f8f3828e1fmr2612534wma.24.1691215411953; Fri, 04 Aug 2023 23:03:31 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id f10-20020a7bc8ca000000b003fe20533a1esm4057091wml.44.2023.08.04.23.03.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2023 23:03:31 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 6de02228409f - main - dtrace: Add WITH_DTRACE_ASAN From: Jessica Clarke In-Reply-To: <861qgiowxi.fsf@ltc.des.no> Date: Sat, 5 Aug 2023 07:03:21 +0100 Cc: Mark Johnston , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <503EDB9C-2866-4B00-9D13-408478EC599F@freebsd.org> References: <202308021315.372DFig3021615@gitrepo.freebsd.org> <861qgiowxi.fsf@ltc.des.no> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RHsTK4wKVz4YKQ X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 5 Aug 2023, at 06:55, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Mark Johnston writes: >> commit 6de02228409fd2b7ca1d7e3b8d9043a105093cdd >> Author: Domagoj Stolfa >> AuthorDate: 2023-08-02 00:10:46 +0000 >> Commit: Mark Johnston >> CommitDate: 2023-08-02 13:15:08 +0000 >>=20 >> dtrace: Add WITH_DTRACE_ASAN >>=20 >> See commit 4ae6991228105eb34989c870194ae7b0a1e23be4. This version = of >> the commit avoids inadvertently changing SHLIBDIR for = libdtrace.so. >=20 > This is still broken. >=20 > % yes | sudo make delete-old ; sudo make installworld -j8 >/dev/null = 2>&1 ; make check-old >>>> Removing old files (only deletes safe to delete libs) > remove /usr/lib32/libdtrace.so.2? remove = /usr/lib/debug/usr/lib32/libdtrace.so.2.debug? >>> Old files removed >>>> Removing old directories >>>> Old directories removed > To remove old libraries run 'make delete-old-libs'. >>>> Checking for old files > /usr/lib32/libdtrace.so.2 > /usr/lib/debug/usr/lib32/libdtrace.so.2.debug >>>> Checking for old libraries >>>> Checking for old directories > To remove old files and directories run 'make delete-old'. > To remove old libraries run 'make delete-old-libs=E2=80=99. Hopefully 995d2b3e3bcf fixes that. Jess From nobody Sat Aug 5 06: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 4RHsfh4Cn0z4phCk; Sat, 5 Aug 2023 06: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 4RHsfh3c4jz4Z7Q; Sat, 5 Aug 2023 06: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=1691215900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1cEmnDS9r8ZHI9pL8Gw0dYOuu+f0wAb4yLBWN8ot80=; b=sm+pa/IqAeJTAg2LsCdKabQ3D5YMrGRTz2zbZKaq7xQJ/nrezPV+qXaZRQ2TO0PEyxW+FQ J8EEor2W/AxEpJCb/iTpOph5awOhXUPWYVyxRFw0WOjXoCk66ZJYT7oa5gouXtgCSvFhjO W2+W9f9m6Z23ni56ID3Ndy+5pj3H+6q+OO6nCeTLgz13m6eMxTkOqcXQpCFcpFdCMAQkAd /EL8lEM/EXhzj929ak93//tAYOoy0GeW2xBkbAq/wDHV7/SDv1iwXItoxLmBkQcIgnHrPr 6AD7UHtKjA+/3+yHyGWSt14wzRVtumSDojqxw7wK4dJiaR7RbJPi/c7ymswwpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691215900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1cEmnDS9r8ZHI9pL8Gw0dYOuu+f0wAb4yLBWN8ot80=; b=wcVv3C4yu1efuEALfdPhh5/deDq6eOM/CeopCIRTBT41OafCvn6z60mLrgULJYNyOfqSIK GE/Bkmbq+thSnQ3TnT8FTIEWG9NSxGU+1g3G47G5+ezW/2GcJQ6iwqGzzlXHkjsp1X68nm azeLIsI3u49bcRYPfXQYqU3cpKY2WvEpBxC2MPsDXmS2txRrAugYd20JklfN8EsW3nSJSk J1Ce6wV/Res6uJDVBTy8OvCbKjLcmda5hngvH3MQKm3ibfkF9lGOynj7/KrF6IDXLrgeve 8t/UDtStRIkdq2tF8MhhKsTtPl5td7rslvpSGmTJbZp5GELdCY7YBkNy3ZQqYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691215900; a=rsa-sha256; cv=none; b=OnvIQu3S3HYgtLIlGnYRZhsN/E/LnhzjDErqNpJcG1ZbY0iXOLX09zQTFlpLf1OphkMyC+ BjqoMO9Qj4MKAf17wjUm1xAz+Y/JmFwhrd854EUOdGLrMWnEU81RpX25hTC2e5r7BlJuZ4 tbOStFllfSsdR26NOcB/HBww58gX6MWJBmnlER2WFd31nXc27QnM/B9D1EA+SNg4Dw4Cm1 h88O9+DBQT36A8kRF/kajEi5l5RDRyvL8W15RBRBcwFfKxpKcBb84qg+I5CGycGXqOO4+l +r/XVBPwv7e965EKxmNctGWSS14QTiiRPv2OgqGIJC9NAXGw+dF4es6tD+W7xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHsfh2jQ2z3mc; Sat, 5 Aug 2023 06: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 3756Be2Q005807; Sat, 5 Aug 2023 06: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 3756BetC005806; Sat, 5 Aug 2023 06:11:40 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:11:40 GMT Message-Id: <202308050611.3756BetC005806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 1cd2b2f96fad - stable/13 - Text format cleanups. No functional changes intended. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1cd2b2f96fad833ffeb5bb582e9d87956bbd9d10 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=1cd2b2f96fad833ffeb5bb582e9d87956bbd9d10 commit 1cd2b2f96fad833ffeb5bb582e9d87956bbd9d10 Author: Kirk McKusick AuthorDate: 2023-07-18 00:28:07 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:11:08 +0000 Text format cleanups. No functional changes intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 239597e0309d4d8e84c35929513aa4a2470735ad) --- sbin/fsck_ffs/fsck.h | 6 +++--- sbin/fsck_ffs/gjournal.c | 15 ++++----------- sbin/fsck_ffs/globs.c | 24 ++++++++++++------------ sbin/fsck_ffs/main.c | 8 +++++--- sbin/fsck_ffs/pass1.c | 2 +- sbin/fsck_ffs/pass5.c | 34 ++++++++++++++++++++++------------ sbin/fsck_ffs/suj.c | 27 +++++++++++++++------------ 7 files changed, 62 insertions(+), 54 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index a32e6feb3bea..df09a373bdd2 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -112,7 +112,7 @@ struct inostat { #define FSTATE 0x2 /* inode is file */ #define FZLINK 0x3 /* inode is file with a link count of zero */ #define DSTATE 0x4 /* inode is directory */ -#define DZLINK 0x5 /* inode is directory with a zero link count */ +#define DZLINK 0x5 /* inode is directory with a zero link count */ #define DFOUND 0x6 /* directory found during descent */ /* 0x7 UNUSED - see S_IS_DVALID() definition */ #define DCLEAR 0x8 /* directory is to be cleared */ @@ -297,8 +297,8 @@ struct dups { struct dups *next; ufs2_daddr_t dup; }; -extern struct dups *duplist; /* head of dup list */ -extern struct dups *muldup; /* end of unique duplicate dup block numbers */ +extern struct dups *duplist; /* head of dup list */ +extern struct dups *muldup; /* end of unique duplicate dup block numbers */ /* * Inode cache data structures. diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index f3bdd5a66907..03bf7f08b662 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -77,7 +77,6 @@ gjournal_check(const char *filesys) fs = &sblock; /* Are there any unreferenced inodes in this file system? */ if (fs->fs_unrefs == 0) { - //printf("No unreferenced inodes.\n"); sbdirty(); ckfini(1); return; @@ -105,7 +104,6 @@ gjournal_check(const char *filesys) /* Are there any unreferenced inodes in this cylinder group? */ if (cgp->cg_unrefs == 0) continue; - //printf("Analizing cylinder group %d (count=%d)\n", cg, cgp->cg_unrefs); /* * Now go through the list of all inodes in this cylinder group * to find unreferenced ones. @@ -150,20 +148,15 @@ gjournal_check(const char *filesys) inodirty(&ip); irelse(&ip); cgdirty(cgbp); - if (cgp->cg_unrefs == 0) { - //printf("No more unreferenced inodes in cg=%d.\n", cg); + if (cgp->cg_unrefs == 0) break; - } } /* - * If there are no more unreferenced inodes, there is no need to - * check other cylinder groups. + * If there are no more unreferenced inodes, there is no + * need to check other cylinder groups. */ - if (fs->fs_unrefs == 0) { - //printf("No more unreferenced inodes (cg=%d/%d).\n", cg, - // fs->fs_ncg); + if (fs->fs_unrefs == 0) break; - } } /* Write back updated statistics and super-block. */ sbdirty(); diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index 2340636fe3a9..4e1b4a266baf 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -60,18 +60,18 @@ ino_t cursnapshot; long dirhash, inplast; unsigned long numdirs, listmax; long countdirs; /* number of directories we actually found */ -int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */ -int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */ -int setsize[MIBSIZE]; /* MIB command to set inode size */ -int adjndir[MIBSIZE]; /* MIB command to adjust number of directories */ -int adjnbfree[MIBSIZE]; /* MIB command to adjust number of free blocks */ -int adjnifree[MIBSIZE]; /* MIB command to adjust number of free inodes */ -int adjnffree[MIBSIZE]; /* MIB command to adjust number of free frags */ -int adjnumclusters[MIBSIZE]; /* MIB command to adjust number of free clusters */ +int adjrefcnt[MIBSIZE]; /* MIB cmd to adjust inode reference cnt */ +int adjblkcnt[MIBSIZE]; /* MIB cmd to adjust inode block count */ +int setsize[MIBSIZE]; /* MIB cmd to set inode size */ +int adjndir[MIBSIZE]; /* MIB cmd to adjust number of directories */ +int adjnbfree[MIBSIZE]; /* MIB cmd to adjust number of free blocks */ +int adjnifree[MIBSIZE]; /* MIB cmd to adjust number of free inodes */ +int adjnffree[MIBSIZE]; /* MIB cmd to adjust number of free frags */ +int adjnumclusters[MIBSIZE]; /* MIB cmd to adjust number of free clusters */ int adjdepth[MIBSIZE]; /* MIB cmd to adjust directory depth count */ -int freefiles[MIBSIZE]; /* MIB command to free a set of files */ -int freedirs[MIBSIZE]; /* MIB command to free a set of directories */ -int freeblks[MIBSIZE]; /* MIB command to free a set of data blocks */ +int freefiles[MIBSIZE]; /* MIB cmd to free a set of files */ +int freedirs[MIBSIZE]; /* MIB cmd to free a set of directories */ +int freeblks[MIBSIZE]; /* MIB cmd to free a set of data blocks */ struct fsck_cmd cmd; /* sysctl file system update commands */ char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ char *cdevname; /* name of device being checked */ @@ -91,7 +91,7 @@ char ckclean; /* only do work if not cleanly unmounted */ int cvtlevel; /* convert to newer file system format */ int ckhashadd; /* check hashes to be added */ int bkgrdcheck; /* determine if background check is possible */ -int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ +int bkgrdsumadj; /* kernel able to adjust superblock summary */ char usedsoftdep; /* just fix soft dependency inconsistencies */ char preen; /* just fix normal inconsistencies */ char rerun; /* rerun fsck. Only used in non-preen mode */ diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index df86cb5fb107..dab614d61bf4 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -351,16 +351,18 @@ checkfilesys(char *filesys) * Determine if we can and should do journal recovery. */ if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { - if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && + skipclean) { sujrecovery = 1; if (suj_check(filesys) == 0) { - printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + pwarn("\n**** FILE SYSTEM MARKED CLEAN ****\n"); if (chkdoreload(mntp, pwarn) == 0) exit(0); exit(4); } sujrecovery = 0; - printf("** Skipping journal, falling through to full fsck\n\n"); + pwarn("Skipping journal, " + "falling through to full fsck\n"); } if (fswritefd != -1) { /* diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index d328234220ad..5b27cf8cbfbe 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -104,7 +104,7 @@ pass1(void) if (!reply("REBUILD CYLINDER GROUP")) { cgheader_corrupt = 1; if (!nflag) { - printf("YOU WILL NEED TO RERUN FSCK.\n"); + pwarn("YOU WILL NEED TO RERUN FSCK.\n"); rerun = 1; } } else { diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 58143a0e8211..d973183eb36a 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -411,43 +411,53 @@ pass5(void) printf("adjndir by %+" PRIi64 "\n", cmd.value); if (bkgrdsumadj == 0 || sysctl(adjndir, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) - rwerror("ADJUST NUMBER OF DIRECTORIES", cmd.value); + rwerror("ADJUST NUMBER OF DIRECTORIES", + cmd.value); } cmd.value = cstotal.cs_nbfree - fs->fs_cstotal.cs_nbfree; if (cmd.value != 0) { if (debug) - printf("adjnbfree by %+" PRIi64 "\n", cmd.value); + printf("adjnbfree by %+" PRIi64 "\n", + cmd.value); if (bkgrdsumadj == 0 || sysctl(adjnbfree, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) - rwerror("ADJUST NUMBER OF FREE BLOCKS", cmd.value); + rwerror("ADJUST NUMBER OF FREE BLOCKS", + cmd.value); } cmd.value = cstotal.cs_nifree - fs->fs_cstotal.cs_nifree; if (cmd.value != 0) { if (debug) - printf("adjnifree by %+" PRIi64 "\n", cmd.value); + printf("adjnifree by %+" PRIi64 "\n", + cmd.value); if (bkgrdsumadj == 0 || sysctl(adjnifree, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) - rwerror("ADJUST NUMBER OF FREE INODES", cmd.value); + rwerror("ADJUST NUMBER OF FREE INODES", + cmd.value); } cmd.value = cstotal.cs_nffree - fs->fs_cstotal.cs_nffree; if (cmd.value != 0) { if (debug) - printf("adjnffree by %+" PRIi64 "\n", cmd.value); + printf("adjnffree by %+" PRIi64 "\n", + cmd.value); if (bkgrdsumadj == 0 || sysctl(adjnffree, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) - rwerror("ADJUST NUMBER OF FREE FRAGS", cmd.value); + rwerror("ADJUST NUMBER OF FREE FRAGS", + cmd.value); } - cmd.value = cstotal.cs_numclusters - fs->fs_cstotal.cs_numclusters; + cmd.value = cstotal.cs_numclusters - + fs->fs_cstotal.cs_numclusters; if (cmd.value != 0) { if (debug) - printf("adjnumclusters by %+" PRIi64 "\n", cmd.value); - if (bkgrdsumadj == 0 || sysctl(adjnumclusters, MIBSIZE, 0, 0, - &cmd, sizeof cmd) == -1) - rwerror("ADJUST NUMBER OF FREE CLUSTERS", cmd.value); + printf("adjnumclusters by %+" PRIi64 "\n", + cmd.value); + if (bkgrdsumadj == 0 || sysctl(adjnumclusters, MIBSIZE, + 0, 0, &cmd, sizeof cmd) == -1) + rwerror("ADJUST NUMBER OF FREE CLUSTERS", + cmd.value); } } } diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index c56d6f131af1..0b1202866fe5 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -500,7 +500,8 @@ blk_free(ino_t ino, ufs2_daddr_t bno, int mask, int frags) * deallocate the fragment */ for (i = 0; i < frags; i++) - if ((mask & (1 << i)) == 0 && isclr(blksfree, cgbno +i)) { + if ((mask & (1 << i)) == 0 && + isclr(blksfree, cgbno +i)) { freefrags++; setbit(blksfree, cgbno + i); } @@ -1302,8 +1303,8 @@ ino_trunc(ino_t ino, off_t size) return; } if (debug) - printf("Truncating ino %ju, mode %o to size %jd from size %jd\n", - (uintmax_t)ino, mode, size, cursize); + printf("Truncating ino %ju, mode %o to size %jd from " + "size %jd\n", (uintmax_t)ino, mode, size, cursize); /* Skip datablocks for short links and devices. */ if (mode == 0 || mode == IFBLK || mode == IFCHR || @@ -1509,8 +1510,8 @@ blk_check(struct suj_blk *sblk) sino->si_blkadj = 1; } if (debug) - printf("op %d blk %jd ino %ju lbn %jd frags %d isat %d (%d)\n", - brec->jb_op, blk, (uintmax_t)brec->jb_ino, + printf("op %d blk %jd ino %ju lbn %jd frags %d isat %d " + "(%d)\n", brec->jb_op, blk, (uintmax_t)brec->jb_ino, brec->jb_lbn, brec->jb_frags, isat, frags); /* * If we found the block at this address we still have to @@ -2333,8 +2334,8 @@ restart: recsize <= fs->fs_bsize) goto restart; if (debug) - printf("Found invalid segsize %d > %d\n", - recsize, size); + printf("Found invalid segsize " + "%d > %d\n", recsize, size); recsize = real_dev_bsize; jblocks_advance(suj_jblocks, recsize); continue; @@ -2477,7 +2478,8 @@ suj_check(const char *filesys) cg_apply(cg_adj_blk); cg_apply(cg_check_ino); } - if (preen == 0 && (jrecs > 0 || jbytes > 0) && reply("WRITE CHANGES") == 0) + if (preen == 0 && (jrecs > 0 || jbytes > 0) && + reply("WRITE CHANGES") == 0) return (0); /* * Check block counts of snapshot inodes and @@ -2505,10 +2507,11 @@ suj_check(const char *filesys) sbdirty(); ckfini(1); if (jrecs > 0 || jbytes > 0) { - printf("** %jd journal records in %jd bytes for %.2f%% utilization\n", - jrecs, jbytes, ((float)jrecs / (float)(jbytes / JREC_SIZE)) * 100); - printf("** Freed %jd inodes (%jd dirs) %jd blocks, and %jd frags.\n", - freeinos, freedir, freeblocks, freefrags); + printf("** %jd journal records in %jd bytes for %.2f%% " + "utilization\n", jrecs, jbytes, + ((float)jrecs / (float)(jbytes / JREC_SIZE)) * 100); + printf("** Freed %jd inodes (%jd dirs) %jd blocks, and %jd " + "frags.\n", freeinos, freedir, freeblocks, freefrags); } return (0); From nobody Sat Aug 5 06:14:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHsk73mPRz4phbC; Sat, 5 Aug 2023 06:14: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 4RHsk73FKYz4c5X; Sat, 5 Aug 2023 06:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCfYfRnxheecy6xp+eXUXivB4quqoOiXYYueKDgNOb8=; b=du9nX+uLQSvoWZ5CvWwsy2GfGuqfw08ptcKduDDcZ4xOT50yL7zd2FKiSPRCgqFsylyseJ 39M5MYUWuPeg+R6waXo9IYvxkIujPJdQm5q+N/ooKN6mbYcJCxIJuZW+2nB0aJrxlaRntN tQ3aQOG3WAHn0Ifw+sMn///WFdh7UHcaGFL+45crBP7zG0JRD5zIdOiSAhRUB9Ph4LyNAs m+3O+BeE++dty1NwEtSH5wfErWm/LNdGKFxzxJ6Nwz4LuTtYRQyDRmlEa4qlzPXKqRh0fT k0Fzp7xyspVexy3D6miob96wNxHknXxj8W/OxgMMH141WL9QNOcRulqqYb+0fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCfYfRnxheecy6xp+eXUXivB4quqoOiXYYueKDgNOb8=; b=WQU3wOBsMq43Wopn5Uv1INpWlSR6BoKRxwAvz7SntXLSmnSntBYPjtsaX8m1FAvjXAl5Vi tJZZeBoM+TNRyT46jZaQ2gNvrmE0NHkAsKWTwuA8t73w4JbKFduvnY4rst3HRwUDXmkMd9 UlKlK420gHlV0CdwnIMIuUoYec0nw3txRehvsPoTY+HB+qPpYhyoneBRvoOTRzNiqfK4Ej yA6+D4diiBQ3kWuxoAHf1tSInzLiHrer4fKSewsCb417+CnFfcfsoUHO/WdQSyDobNtx0Q Ep2DJDkXzZVDFn28ILCNDbV+YVq7OgzR14SuVN/deKy/ifUQ0L9ju0+1dZppoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216079; a=rsa-sha256; cv=none; b=hoh+AKP++zqxoJR1Y/OP17s6J4AjuKP7Gx/SdVpV3qh5u0DVcuCJHMYX88sIu2bHU5d6Ag yS5EZsc3YNvk+Ge+kQoc6dzcliPkKSg5Z3ZrFDTCRAQdZZ0AT8IK9V1VWe1KcW907t+Apr Q55qlISQRFZVz+e+Oer36+4sbCZiRtl02Ov7Tct4OF0fL9mlZx6sfj3psMjkaMZF68GOBg bxZk4ikPm2fZeYJGu9869DCZ/QTElUfnYgTnCV5AuSBaXORgVB3YjOl7VyEg6Ik8ECGbPn krZMqB/io8MlCDpqOxE+PZwrEgT0NENKxhS7LECUdbZcNfcHe8TPLnDpptAffQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHsk72JP6z3l8; Sat, 5 Aug 2023 06:14: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 3756Ed4j010553; Sat, 5 Aug 2023 06:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3756Ed42010552; Sat, 5 Aug 2023 06:14:39 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:14:39 GMT Message-Id: <202308050614.3756Ed42010552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: f40d616aecd7 - stable/13 - Debugging output additions. No functional changes intended. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f40d616aecd777803d8856b6c6e381b983fc69ae Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=f40d616aecd777803d8856b6c6e381b983fc69ae commit f40d616aecd777803d8856b6c6e381b983fc69ae Author: Kirk McKusick AuthorDate: 2023-07-25 21:02:33 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:13:25 +0000 Debugging output additions. No functional changes intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 4d512b07357f6a4feff8ac266f90d34939a57be4) --- sbin/fsck_ffs/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index dab614d61bf4..a0746ea0f68e 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -438,7 +438,7 @@ checkfilesys(char *filesys) /* * 1: scan inodes tallying blocks used */ - if (preen == 0) { + if (preen == 0 || debug) { printf("** Last Mounted on %s\n", sblock.fs_fsmnt); if (mntp != NULL && mntp->f_flags & MNT_ROOTFS) printf("** Root file system\n"); @@ -457,7 +457,8 @@ checkfilesys(char *filesys) preen ? "-p" : "", (preen && usedsoftdep) ? " AND " : "", usedsoftdep ? "SOFTUPDATES" : ""); - printf("** Phase 1b - Rescan For More DUPS\n"); + if (preen == 0 || debug) + printf("** Phase 1b - Rescan For More DUPS\n"); pass1b(); IOstats("Pass1b"); } @@ -465,7 +466,7 @@ checkfilesys(char *filesys) /* * 2: traverse directories from root to mark all connected directories */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 2 - Check Pathnames\n"); pass2(); IOstats("Pass2"); @@ -473,7 +474,7 @@ checkfilesys(char *filesys) /* * 3: scan inodes looking for disconnected directories */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 3 - Check Connectivity\n"); pass3(); IOstats("Pass3"); @@ -481,7 +482,7 @@ checkfilesys(char *filesys) /* * 4: scan inodes looking for disconnected files; check reference counts */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 4 - Check Reference Counts\n"); pass4(); IOstats("Pass4"); @@ -489,7 +490,7 @@ checkfilesys(char *filesys) /* * 5: check and repair resource counts in cylinder groups */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 5 - Check Cyl groups\n"); snapflush(std_checkblkavail); if (cgheader_corrupt) { From nobody Sat Aug 5 06: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 4RHsly5Lp2z4pj0x; Sat, 5 Aug 2023 06: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 4RHsly4nP6z4cVQ; Sat, 5 Aug 2023 06: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=1691216174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLZqEv/5k/gxQpqA66oyyTGsNiO5crquaM6KrjALh0I=; b=WARuGFI20e7JLs2+IKHBwX9l7bg+V7rijjXrtpx0rYpAzld1rUc1gI5u9TZ0Uzq6p7tZSp YySZwhODzw/nI5/jJtYzHq9DvmgCtGQfwjAjrdyii4akGA8cu18xtag7Oy3D5d1a8H6eSf MFcfrdANxTStip1NNBDHoocgBYXGD/XxpudSjFTTc6cvD3Vd60ZdxeA98SjW00pePRHqDh JVvOhsm80JVU8YUZosW8jfJmBJXbPThcR8ZJyzIaWjDqzKLf04YT2xFbiC1cPHWUcG3yp8 CsKIfAKO5uDqU5BABXG25k3Kxyk48j842Ol/JJj73Wlig1x38etgki88ktNqGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLZqEv/5k/gxQpqA66oyyTGsNiO5crquaM6KrjALh0I=; b=Z5MPlfXE9kVxM8Pxi3ZmkB5qjEX+iKWhvvhS0qbClPBUIhWm8X0M5Jilr+U5UJlgm+Xc4a f0tE10PHGb4Wo/yDpLqq8Z0VH0t561/rbDHFNNMEZ17Sw2hG03WcpBrAhn4NoPnrc5NsCG pXlArz2tml2AzHcEdQI41yw+3Fj+L80ADBJH5WEuBf5tfrtySd9lNiAXdNK5wA7+Digk5R tEEui4Barsw3QurccjwzFYzPU3aPNa6k0kwyQH+2OXLRo8M3SHyXyT0LpaaDR/4wGw/Y+Y qUQzbpX1uYfS4d20c1/0pL7VyLFJ0/6eF2v4yWwStYpxCHG2i0BXHh+VXbSAOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216174; a=rsa-sha256; cv=none; b=dYaX21DR2sl1Ry5Dq5llvc2k07cDXqraXP8I6BMRh52g+igd+X6XUDP325Qq3PXy07tGrZ e5WNl8o8yITxiNMdppMC5D60q/seIkeVjedpc/PBJzF6fRPs28L8SFNiAnuqLifom95MRI K+oSqpUYtBc6X3DHUY0UPd5bq/DSuQBkRhDUY6ZXUox5a/bSMleyWQq5Lb3UJRylkPqlPj 0F5ryXcOt+Yt2QuZufWdO32Y4w6GAKzMBl4z24DVufv532RypOJxoBizQuP4/q8SsUtRLC s9IOJrfkI4tZkpQr6XgGVBSH+/S5oTI9BHPOHggQEBcQVJ+/VOy/JOF3E8SE9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHsly3pSVz32X; Sat, 5 Aug 2023 06: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 3756GEsC010892; Sat, 5 Aug 2023 06: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 3756GE8N010891; Sat, 5 Aug 2023 06:16:14 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:16:14 GMT Message-Id: <202308050616.3756GE8N010891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 080ebe84fb42 - stable/13 - Comment cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 080ebe84fb420a17d43ddb8b571ddc9c2ce7b38f Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=080ebe84fb420a17d43ddb8b571ddc9c2ce7b38f commit 080ebe84fb420a17d43ddb8b571ddc9c2ce7b38f Author: Kirk McKusick AuthorDate: 2023-07-25 21:07:31 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:15:32 +0000 Comment cleanup. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 4a3444428de5e74f8e847f656eb25ad559902a74) --- sys/ufs/ffs/ffs_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 957be753ce15..c3e6fa3b093c 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -3100,7 +3100,7 @@ ffs_fserr(struct fs *fs, /* * This function provides the capability for the fsck program to - * update an active filesystem. Fourteen operations are provided: + * update an active filesystem. Sixteen operations are provided: * * adjrefcnt(inode, amt) - adjusts the reference count on the * specified inode by the specified amount. Under normal From nobody Sat Aug 5 06:19: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 4RHsqb3JMhz4pjJW; Sat, 5 Aug 2023 06:19: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 4RHsqb0pQ1z4cXQ; Sat, 5 Aug 2023 06:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shQNRNcrV2M2GHFLh9cPx8gHsR2oWL11h6FYMTCkrlM=; b=ZvbS5gCWDbqjYUvSqoQj3PHVRk8JCkl3Gh8uox17AJUm4viXnfRKr6fC7Hxn6fJdv6HLdV c60VUQA+eBBayMiAbCEFADjyXarUHdu5bUSh0ityW58I8p58kFRVZFBP+UJLutneoZm5av tnZdwxoaW9CqAYO4JuSufF6EkU1Y2yAli/8YGo6UCFPxYh78X5sV8rKvWen3w+pt9nMa6s Lnbm5knrLtQDPd+v+PzMK5e3mWSqzOAcWthr87O/Y/BF2lBIhWTjtps8GJXua2RrWCiSHp vcVEkL94BCbU18trDLxpq/w1HNrfCj+wM8SiSd3k+hJSTKgQCmzlTW1PERan5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shQNRNcrV2M2GHFLh9cPx8gHsR2oWL11h6FYMTCkrlM=; b=W53twepJT5UY37PZDvKZ6SrRlate9zvnijfI9OtvxOE3bjw/wtMGAHJE0QkQXw0uNqx6ec URe1h8pRcoxHnCpsnxtA+VOBX2FGEAR6dZ9RQldqxtyq/qa9Q67x45Bqbp6f42aNNQuMcf 0PQR60sEPg0dM9/k3KRFMB/Qb3NsPf5v6GF0SLEnXtMVXsglGYX3Qk321SG4O/Pmt+bJgN kDjdylBOhc5xPeRInM61bveLq8cZkb/Wh1fAn4X4u2ZCdwR1oGRqZwYVttulpxrpCo6xI4 HuApSLJvJhh3EOORXWXZZAkuPWigWLr0hAyTPNKT44Az9bLdt2XMbe1bpa42/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216363; a=rsa-sha256; cv=none; b=FO6+SMQSKHQsJTjumdUdG6fbUAhyskcoCdMsOnoT79ZXD7T6Nxsm0DpWxuMUAK7HBjnmuc fub3FQtJ/THbhyEhj3SFAi4YpVoDIIEJD2h/gZn7dWbnT5AddzM9YLwbvrM7slb7PHl7tg +/OfIVbdaOQ6mZR/4tCL63t/sqbXUqzaxOlyc8fezN+8w8R1+0MpRR8mnvXufqKF9iI1b/ lWY0nUZUCDPJiJ0Qa8ksOkQ/ZFFGF1bzeEKF7rPaRgHvNTGj8elnaFCd2XvLOwz2FJ637e ga/oxA8NZVvS/13PeJHKTIJZqP7BaC11rVeJHmSR48yv2DEW9jE1Ju2e1eYWiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHsqZ70Zmz3xv; Sat, 5 Aug 2023 06:19: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 3756JM9S011420; Sat, 5 Aug 2023 06:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3756JMqe011419; Sat, 5 Aug 2023 06:19:22 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:19:22 GMT Message-Id: <202308050619.3756JMqe011419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: bcbb927b97cb - stable/13 - Have fsdb(8) only mark a filesystem dirty when it is modified. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bcbb927b97cb27cf6309c540ea7100fdbdccf048 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bcbb927b97cb27cf6309c540ea7100fdbdccf048 commit bcbb927b97cb27cf6309c540ea7100fdbdccf048 Author: Kirk McKusick AuthorDate: 2023-07-26 02:27:59 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:17:30 +0000 Have fsdb(8) only mark a filesystem dirty when it is modified. Sponsored-by: The FreeBSD Foundation (cherry picked from commit d51bdf327d9381807cbeffead1ed3cc466bdb87b) --- sbin/fsdb/fsdb.c | 109 +++++++++++++++++++++++++++---------------------------- sbin/fsdb/fsdb.h | 3 +- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index f907ea160a16..c80d4b65a830 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -63,6 +63,23 @@ static int find_blks64(uint64_t *buf, int size, uint64_t *blknum); static int find_indirblks32(uint32_t blk, int ind_level, uint32_t *blknum); static int find_indirblks64(uint64_t blk, int ind_level, uint64_t *blknum); +/* + * Track modifications to the filesystem. Two types of changes are tracked. + * The first type of changes are those that are not critical to the integrity + * of the filesystem such as owner, group, time stamps, access mode, and + * generation number. The second type of changes are those that do affect + * the integrity of the filesystem including zeroing inodes, changing block + * pointers, directory entries, link counts, file lengths, file types and + * file flags. + * + * When quitting having made no changes or only changes to data that is not + * critical to filesystem integrity, the clean state of the filesystem is + * left unchanged. But if filesystem critical data are changed then fsdb + * will set the unclean flag which will require a full fsck to be run + * before the filesystem can be mounted. + */ +static int fsnoncritmodified; /* filesystem non-critical modifications */ +static int fscritmodified; /* filesystem integrity critical mods */ struct inode curip; union dinode *curinode; ino_t curinum, ocurrent; @@ -119,9 +136,13 @@ main(int argc, char *argv[]) nflag? "Examining": "Editing", fsys, sblock.fs_fsmnt); rval = cmdloop(); if (!nflag) { - sblock.fs_clean = 0; /* mark it dirty */ - sbdirty(); - ckfini(0); + if (fscritmodified != 0) { + sblock.fs_clean = 0; /* mark it dirty */ + sbdirty(); + } + ckfini(fscritmodified ? 0 : sblock.fs_clean); + if (fscritmodified == 0) + exit(0); printf("*** FILE SYSTEM MARKED DIRTY\n"); printf("*** BE SURE TO RUN FSCK TO CLEAN UP ANY DAMAGE\n"); printf("*** IF IT IS MOUNTED, RE-MOUNT WITH -u -o reload\n"); @@ -167,36 +188,35 @@ struct cmdtable cmds[] = { { "help", "Print out help", 1, 1, FL_RO, helpfn }, { "?", "Print out help", 1, 1, FL_RO, helpfn }, { "inode", "Set active inode to INUM", 2, 2, FL_RO, focus }, - { "clri", "Clear inode INUM", 2, 2, FL_WR, zapi }, + { "clri", "Clear inode INUM", 2, 2, FL_CWR, zapi }, { "lookup", "Set active inode by looking up NAME", 2, 2, FL_RO | FL_ST, focusname }, { "cd", "Set active inode by looking up NAME", 2, 2, FL_RO | FL_ST, focusname }, { "back", "Go to previous active inode", 1, 1, FL_RO, back }, { "active", "Print active inode", 1, 1, FL_RO, active }, { "print", "Print active inode", 1, 1, FL_RO, active }, { "blocks", "Print block numbers of active inode", 1, 1, FL_RO, blocks }, - { "uplink", "Increment link count", 1, 1, FL_WR, uplink }, - { "downlink", "Decrement link count", 1, 1, FL_WR, downlink }, - { "linkcount", "Set link count to COUNT", 2, 2, FL_WR, linkcount }, + { "uplink", "Increment link count", 1, 1, FL_CWR, uplink }, + { "downlink", "Decrement link count", 1, 1, FL_CWR, downlink }, + { "linkcount", "Set link count to COUNT", 2, 2, FL_CWR, linkcount }, { "findblk", "Find inode owning disk block(s)", 2, 33, FL_RO, findblk}, { "ls", "List current inode as directory", 1, 1, FL_RO, ls }, - { "rm", "Remove NAME from current inode directory", 2, 2, FL_WR | FL_ST, rm }, - { "del", "Remove NAME from current inode directory", 2, 2, FL_WR | FL_ST, rm }, - { "ln", "Hardlink INO into current inode directory as NAME", 3, 3, FL_WR | FL_ST, ln }, - { "chinum", "Change dir entry number INDEX to INUM", 3, 3, FL_WR, chinum }, + { "rm", "Remove NAME from current inode directory", 2, 2, FL_CWR | FL_ST, rm }, + { "del", "Remove NAME from current inode directory", 2, 2, FL_CWR | FL_ST, rm }, + { "ln", "Hardlink INO into current inode directory as NAME", 3, 3, FL_CWR | FL_ST, ln }, + { "chinum", "Change dir entry number INDEX to INUM", 3, 3, FL_CWR, chinum }, { "chname", "Change dir entry number INDEX to NAME", 3, 3, FL_WR | FL_ST, chname }, - { "chtype", "Change type of current inode to TYPE", 2, 2, FL_WR, newtype }, + { "chtype", "Change type of current inode to TYPE", 2, 2, FL_CWR, newtype }, { "chmod", "Change mode of current inode to MODE", 2, 2, FL_WR, chmode }, - { "chlen", "Change length of current inode to LENGTH", 2, 2, FL_WR, chlen }, { "chown", "Change owner of current inode to OWNER", 2, 2, FL_WR, chowner }, { "chgrp", "Change group of current inode to GROUP", 2, 2, FL_WR, chgroup }, - { "chflags", "Change flags of current inode to FLAGS", 2, 2, FL_WR, chaflags }, + { "chflags", "Change flags of current inode to FLAGS", 2, 2, FL_CWR, chaflags }, { "chgen", "Change generation number of current inode to GEN", 2, 2, FL_WR, chgen }, - { "chsize", "Change size of current inode to SIZE", 2, 2, FL_WR, chsize }, + { "chsize", "Change size of current inode to SIZE", 2, 2, FL_CWR, chsize }, { "btime", "Change btime of current inode to BTIME", 2, 2, FL_WR, chbtime }, { "mtime", "Change mtime of current inode to MTIME", 2, 2, FL_WR, chmtime }, { "ctime", "Change ctime of current inode to CTIME", 2, 2, FL_WR, chctime }, { "atime", "Change atime of current inode to ATIME", 2, 2, FL_WR, chatime }, - { "chdb", "Change db pointer N of current inode to BLKNO", 3, 3, FL_WR, chdb }, + { "chdb", "Change db pointer N of current inode to BLKNO", 3, 3, FL_CWR, chdb }, { "quit", "Exit", 1, 1, FL_RO, quit }, { "q", "Exit", 1, 1, FL_RO, quit }, { "exit", "Exit", 1, 1, FL_RO, quit }, @@ -280,7 +300,7 @@ cmdloop(void) known = 0; for (cmdp = cmds; cmdp->cmd; cmdp++) { if (!strcmp(cmdp->cmd, cmd_argv[0])) { - if ((cmdp->flags & FL_WR) == FL_WR && nflag) + if ((cmdp->flags & (FL_CWR | FL_WR)) != 0 && nflag) warnx("`%s' requires write access", cmd_argv[0]), rval = 1; else if (cmd_argc >= cmdp->minargc && @@ -294,6 +314,12 @@ cmdloop(void) } else rval = argcount(cmdp, cmd_argc, cmd_argv); known = 1; + if (rval == 0) { + if ((cmdp->flags & FL_WR) != 0) + fsnoncritmodified = 1; + if ((cmdp->flags & FL_CWR) != 0) + fscritmodified = 1; + } break; } } @@ -308,7 +334,7 @@ cmdloop(void) return 0; } if (rval) - warnx("rval was %d", rval); + warnx("command failed, return value was %d", rval); } el_end(elptr); history_end(hist); @@ -930,30 +956,8 @@ CMDFUNCSTART(newtype) return 0; } -CMDFUNCSTART(chlen) -{ - int rval = 1; - long len; - char *cp; - - if (!checkactive()) - return 1; - - len = strtol(argv[1], &cp, 0); - if (cp == argv[1] || *cp != '\0' || len < 0) { - warnx("bad length `%s'", argv[1]); - return 1; - } - - DIP_SET(curinode, di_size, len); - inodirty(&curip); - printactive(0); - return rval; -} - CMDFUNCSTART(chmode) { - int rval = 1; long modebits; char *cp; @@ -970,12 +974,11 @@ CMDFUNCSTART(chmode) DIP_SET(curinode, di_mode, DIP(curinode, di_mode) | modebits); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNCSTART(chaflags) { - int rval = 1; u_long flags; char *cp; @@ -995,12 +998,11 @@ CMDFUNCSTART(chaflags) DIP_SET(curinode, di_flags, flags); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNCSTART(chgen) { - int rval = 1; long gen; char *cp; @@ -1013,19 +1015,19 @@ CMDFUNCSTART(chgen) return 1; } - if (gen > INT_MAX || gen < INT_MIN) { - warnx("gen set beyond 32-bit range of field (%lx)\n", gen); + if (gen > UINT_MAX) { + warnx("gen set beyond 32-bit range of field (0x%lx), max is 0x%x\n", + gen, UINT_MAX); return(1); } DIP_SET(curinode, di_gen, gen); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNCSTART(chsize) { - int rval = 1; off_t size; char *cp; @@ -1045,7 +1047,7 @@ CMDFUNCSTART(chsize) DIP_SET(curinode, di_size, size); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNC(chdb) @@ -1080,7 +1082,6 @@ CMDFUNC(chdb) CMDFUNCSTART(linkcount) { - int rval = 1; int lcnt; char *cp; @@ -1100,12 +1101,11 @@ CMDFUNCSTART(linkcount) DIP_SET(curinode, di_nlink, lcnt); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNCSTART(chowner) { - int rval = 1; unsigned long uid; char *cp; struct passwd *pwd; @@ -1127,12 +1127,11 @@ CMDFUNCSTART(chowner) DIP_SET(curinode, di_uid, uid); inodirty(&curip); printactive(0); - return rval; + return 0; } CMDFUNCSTART(chgroup) { - int rval = 1; unsigned long gid; char *cp; struct group *grp; @@ -1153,7 +1152,7 @@ CMDFUNCSTART(chgroup) DIP_SET(curinode, di_gid, gid); inodirty(&curip); printactive(0); - return rval; + return 0; } int diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h index fee35886f675..d13caa3c0e93 100644 --- a/sbin/fsdb/fsdb.h +++ b/sbin/fsdb/fsdb.h @@ -49,7 +49,8 @@ struct cmdtable { unsigned int flags; #define FL_RO 0x0000 /* for symmetry */ #define FL_WR 0x0001 /* wants to write */ -#define FL_ST 0x0002 /* resplit final string if argc > maxargc */ +#define FL_CWR 0x0002 /* wants to write critical data */ +#define FL_ST 0x0003 /* resplit final string if argc > maxargc */ int (*handler)(int argc, char *argv[]); }; extern struct inode curip; From nobody Sat Aug 5 06:21: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 4RHssv4qBlz4pjJt; Sat, 5 Aug 2023 06:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHssv3rPSz4d5Z; Sat, 5 Aug 2023 06:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPYQM5m+XmAOBTecIK0h6VPp/ksgrYhWcup5DIKcIQw=; b=n4a32HiwqKN28Ivo+Ty4rUMV52o+9+R/l6/G1Cr+XF30aVJKR94I8Hx0g6GkR0gaIBAxzC S1Qc3nb8XUaC3CEkAjcXzAalGPANqyuoBE7lHcfvvyy7fOTbFLo2C3z97s0+2wdUAFVzYg VnOCSz8oNdmydpdgicUPtcBVHfCzFCEyCl0ov45vYnJPexBae/5zxXvPDw1rsBB4xujX+8 F2t3sYIYACuDppbMJwGXhtr4SjILlnBGAjLRDt2EXYFudSGrqGKc2N0BzG2YEfiUbGmm+R ZsK3729sr7iu3LhpFuRzL49bWa37fR45hApzVmu54zxeDsVCH1c5T9bdM52uBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPYQM5m+XmAOBTecIK0h6VPp/ksgrYhWcup5DIKcIQw=; b=IBI3IzyOql965jQxBnekMAd7CxhuZpax2rnM+xJSxojn0gG9MSoSpfWUEEARd8o+D2fSJN CRmMT6dCGAi+Ev/U6l7T5G8VoUSs1l3s84KgPfVEi5hzy8bcTchiJ6c3nqYT7YAH/Duzuh yZD8hpj2d+BBjiOACBEXfg980lRfhCawIdZR9MdXDyPtizKm0v6JJ18sYy2QQY38JzKpWS ehhNkdQD7YmxMbeSWXEZ5WN8xnroaKaU4WU8AJz4P+TYmxHaP4u2JUDv/df9OLjLljn/lR /Rvj91HORhemHkrHuGHbuk1GGgAtfpUA5rqw9XUGa8ur+H0/ONDJFFfQ+ToYOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216483; a=rsa-sha256; cv=none; b=Asqoxn47FJsjkIErS8uHHHs70MxkDEqdUcizY/LmWVCiVxqbbnwIh8PGHLgkBFCKL89FSl OZUDsMERuwwRQZctYQTh5uaLjYyzwFGV+J2Ixkrm4azTa5F6mB65yFThttW8GXDsEqvKWP 56B/jEAiGjdzcs3TBv/zy0z6FCBLZrdQmeubY544wsqdH1I6nFbXjcPh9AqVqN98+CSEZ8 na6DFcLqfx1TDkaboaPjrlu12wYsoPI48uD63w8BI+IrmKIMRxRDbAf8bpcXw4tsMjIi/6 pCWn6NtM68YFob4uhX+EnKDJpUn27b5JrOLpYfS6iie5q5MNyTBA1N4KmUoerQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHssv2vrDz3hp; Sat, 5 Aug 2023 06:21: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 3756LNmX024518; Sat, 5 Aug 2023 06:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3756LNOt024517; Sat, 5 Aug 2023 06:21:23 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:21:23 GMT Message-Id: <202308050621.3756LNOt024517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 98b660abffac - stable/13 - Add quitclean command to fsdb(8) to request a filesystem not be marked dirty. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98b660abffacc3caa36f59b7eb62955a5f5e151b Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=98b660abffacc3caa36f59b7eb62955a5f5e151b commit 98b660abffacc3caa36f59b7eb62955a5f5e151b Author: Kirk McKusick AuthorDate: 2023-07-26 02:42:41 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:20:25 +0000 Add quitclean command to fsdb(8) to request a filesystem not be marked dirty. Sponsored-by: The FreeBSD Foundation (cherry picked from commit d059e44b800a308822ad920c28f948a1afcc0fa3) --- sbin/fsdb/fsdb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index c80d4b65a830..1564810ee79d 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -163,6 +163,7 @@ CMDFUNC(uplink); /* incr link */ CMDFUNC(downlink); /* decr link */ CMDFUNC(linkcount); /* set link count */ CMDFUNC(quit); /* quit */ +CMDFUNC(quitclean); /* quit with filesystem marked clean */ CMDFUNC(findblk); /* find block */ CMDFUNC(ls); /* list directory */ CMDFUNC(rm); /* remove name */ @@ -217,6 +218,7 @@ struct cmdtable cmds[] = { { "ctime", "Change ctime of current inode to CTIME", 2, 2, FL_WR, chctime }, { "atime", "Change atime of current inode to ATIME", 2, 2, FL_WR, chatime }, { "chdb", "Change db pointer N of current inode to BLKNO", 3, 3, FL_CWR, chdb }, + { "quitclean", "Exit with filesystem marked clean", 1, 1, FL_RO, quitclean }, { "quit", "Exit", 1, 1, FL_RO, quit }, { "q", "Exit", 1, 1, FL_RO, quit }, { "exit", "Exit", 1, 1, FL_RO, quit }, @@ -402,6 +404,16 @@ CMDFUNCSTART(quit) return -1; } +CMDFUNCSTART(quitclean) +{ + if (fscritmodified) { + printf("Warning: modified filesystem marked clean\n"); + fscritmodified = 0; + sblock.fs_clean = 1; + } + return -1; +} + CMDFUNCSTART(uplink) { if (!checkactive()) From nobody Sat Aug 5 06:26: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 4RHszT70hPz4pjZH; Sat, 5 Aug 2023 06:26: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 4RHszT6F2Lz4dpt; Sat, 5 Aug 2023 06:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7noKvawolYpIC6OZ7hTbhvLBIvsgz6DTv9Sr+EYHQg=; b=IoYJkLTz9bLeTqT/hDd3DGLD2049DRZos2+bWQ6pys3VtUvvYZptPSRJjP3CnVSalKZud+ uN3AI/RcOBALPPj9xITzwLHB4AS+PYlB7PKH10T8i6rvA03yASuB9VzJG2T6j6jWES9Ld7 kpWGwf35ia30fAMvo4SlpH7TAxOWyWcb9/JTuq2/KEmIrRLBFjy1wBDYOmIGU1YVFATS8v C4rW8WxeQJZTsT5PjyOzZbuLyBCX5Mpbb+FoOUs8+iA8YF8KqAtMfqqh00Cy0SzwzavtVL ZbeduGoectlkDV7JhfuAzqoTk1R0SZCvMBTWiUg0nVsnW2h3gsB1f33EmefSQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7noKvawolYpIC6OZ7hTbhvLBIvsgz6DTv9Sr+EYHQg=; b=RpX48JUR7/ffmkPVBHfhJHYORErIaOOdgX/SjKhjaL+EAiNcGIhaIq4Tk2IYmjgZURES+r arOqbrR8CvzflRVfsYLXrSGbW1uM1/igdgLChsqwR29XM/LeYQe48DrAKXvDbFF/ogtkrv GBARoZuYxa9EL2lgnNN4Sljlh+IDyYcnI6RL2sKpfY7A+AQ1DVlzUdZRYiUoFNVEtU5UHo nC3sh1JV0L1dOOE6lXoJ+K86QTTMwwXrW2RcotGyfQJxn48IEKEjeGWPUOusMrZEF+1sE2 83o5TA69py+Eeq8FQTVtVnC9SnhL5AoVOb9lvjZMj4UPGVbzYDyWjanEWXOUAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216773; a=rsa-sha256; cv=none; b=ccol51rpxY2zbk9C9XqfC9tV5/qSvE8rio9S23PV6Bm42sREOQgcbhw22ae2L13+6zbHd7 ObVqNf0Afbw7WM7omgjvyFdalJ3qoV99E7tpfwmYpF4h9K/DDlM5PonRzUlJr9yJECv96R HzeDL14xbl7DvPn71UO61/1ouabVdw09FAPDF6HAoJciAHM4A/3dtv7IPaavCSd4BfHiTj 8vEMxT1YugJSLaFKD2BeU9duemvidv5h6k00BLrbqx5A+hK8HLFPFup8AMrf7EKTpQNnj6 8gS8MqAyno70LIWpfsvn+QKL2ZCAs0NCmTd9flsIzt84PEjSBad2KseH/Cuw9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHszT5BW5z3jF; Sat, 5 Aug 2023 06:26: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 3756QDG1027999; Sat, 5 Aug 2023 06:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3756QDEw027998; Sat, 5 Aug 2023 06:26:13 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:26:13 GMT Message-Id: <202308050626.3756QDEw027998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 44e4279e565f - stable/13 - Add diagnostics to fsck_ffs(8) for journaled soft-updates 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44e4279e565fbd00804bb8e9ad03df03ab6ac5ee Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=44e4279e565fbd00804bb8e9ad03df03ab6ac5ee commit 44e4279e565fbd00804bb8e9ad03df03ab6ac5ee Author: Kirk McKusick AuthorDate: 2023-07-26 21:49:07 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:22:19 +0000 Add diagnostics to fsck_ffs(8) for journaled soft-updates debugging. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 6f0ca273a393bad293cc3ae12b3816ab1582bbc2) --- sbin/fsck_ffs/suj.c | 32 +++++++++++++++++--------------- sys/ufs/ffs/fs.h | 14 +++++++++++++- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 0b1202866fe5..1ae9d4d4b675 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -113,6 +113,7 @@ static TAILQ_HEAD(seghd, suj_seg) allsegs; static uint64_t oldseq; static struct fs *fs = NULL; static ino_t sujino; +static char *joptype[JOP_NUMJOPTYPES] = JOP_NAMES; /* * Summary statistics. @@ -1444,9 +1445,9 @@ ino_check(struct suj_ino *sino) err_suj("Inode mode/directory type mismatch %o != %o\n", mode, rrec->jr_mode); if (debug) - printf("jrefrec: op %d ino %ju, nlink %ju, parent %ju, " + printf("jrefrec: op %s ino %ju, nlink %ju, parent %ju, " "diroff %jd, mode %o, isat %d, isdot %d\n", - rrec->jr_op, (uintmax_t)rrec->jr_ino, + JOP_OPTYPE(rrec->jr_op), (uintmax_t)rrec->jr_ino, (uintmax_t)rrec->jr_nlink, (uintmax_t)rrec->jr_parent, (uintmax_t)rrec->jr_diroff, @@ -1510,9 +1511,10 @@ blk_check(struct suj_blk *sblk) sino->si_blkadj = 1; } if (debug) - printf("op %d blk %jd ino %ju lbn %jd frags %d isat %d " - "(%d)\n", brec->jb_op, blk, (uintmax_t)brec->jb_ino, - brec->jb_lbn, brec->jb_frags, isat, frags); + printf("op %s blk %jd ino %ju lbn %jd frags %d isat %d " + "(%d)\n", JOP_OPTYPE(brec->jb_op), blk, + (uintmax_t)brec->jb_ino, brec->jb_lbn, + brec->jb_frags, isat, frags); /* * If we found the block at this address we still have to * determine if we need to free the tail end that was @@ -1694,9 +1696,9 @@ ino_append(union jrec *rec) (uintmax_t)mvrec->jm_newoff, (uintmax_t)mvrec->jm_oldoff); else if (debug && (refrec->jr_op == JOP_ADDREF || refrec->jr_op == JOP_REMREF)) - printf("ino ref: op %d, ino %ju, nlink %ju, " + printf("ino ref: op %s, ino %ju, nlink %ju, " "parent %ju, diroff %jd\n", - refrec->jr_op, (uintmax_t)refrec->jr_ino, + JOP_OPTYPE(refrec->jr_op), (uintmax_t)refrec->jr_ino, (uintmax_t)refrec->jr_nlink, (uintmax_t)refrec->jr_parent, (uintmax_t)refrec->jr_diroff); sino = ino_lookup(((struct jrefrec *)rec)->jr_ino, 1); @@ -1856,8 +1858,8 @@ ino_build_ref(struct suj_ino *sino, struct suj_rec *srec) TAILQ_REMOVE(&sino->si_newrecs, srn, sr_next); break; default: - err_suj("ino_build_ref: Unknown op %d\n", - srn->sr_rec->rec_jrefrec.jr_op); + err_suj("ino_build_ref: Unknown op %s\n", + JOP_OPTYPE(srn->sr_rec->rec_jrefrec.jr_op)); } } ino_add_ref(sino, srec); @@ -1886,8 +1888,8 @@ ino_build(struct suj_ino *sino) TAILQ_INSERT_TAIL(&sino->si_movs, srec, sr_next); break; default: - err_suj("ino_build: Unknown op %d\n", - srec->sr_rec->rec_jrefrec.jr_op); + err_suj("ino_build: Unknown op %s\n", + JOP_OPTYPE(srec->sr_rec->rec_jrefrec.jr_op)); } } if (TAILQ_EMPTY(&sino->si_recs)) @@ -1909,9 +1911,9 @@ blk_build(struct jblkrec *blkrec) int frag; if (debug) - printf("blk_build: op %d blkno %jd frags %d oldfrags %d " + printf("blk_build: op %s blkno %jd frags %d oldfrags %d " "ino %ju lbn %jd\n", - blkrec->jb_op, (uintmax_t)blkrec->jb_blkno, + JOP_OPTYPE(blkrec->jb_op), (uintmax_t)blkrec->jb_blkno, blkrec->jb_frags, blkrec->jb_oldfrags, (uintmax_t)blkrec->jb_ino, (uintmax_t)blkrec->jb_lbn); @@ -2016,8 +2018,8 @@ suj_build(void) ino_build_trunc((struct jtrncrec *)rec); break; default: - err_suj("Unknown journal operation %d (%d)\n", - rec->rec_jrefrec.jr_op, off); + err_suj("Unknown journal operation %s at %d\n", + JOP_OPTYPE(rec->rec_jrefrec.jr_op), off); } i++; } diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index 70e24242b01b..9b1181250669 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -755,7 +755,7 @@ lbn_offset(struct fs *fs, int level) /* * Softdep journal record format. */ - +#define JOP_UNKNOWN 0 /* JOP operation is unknown */ #define JOP_ADDREF 1 /* Add a reference to an inode. */ #define JOP_REMREF 2 /* Remove a reference from an inode. */ #define JOP_NEWBLK 3 /* Allocate a block. */ @@ -763,6 +763,18 @@ lbn_offset(struct fs *fs, int level) #define JOP_MVREF 5 /* Move a reference from one off to another. */ #define JOP_TRUNC 6 /* Partial truncation record. */ #define JOP_SYNC 7 /* fsync() complete record. */ +#define JOP_NUMJOPTYPES 8 +#define JOP_NAMES { \ + "unknown", \ + "JOP_ADDREF", \ + "JOP_REMREF", \ + "JOP_NEWBLK", \ + "JOP_FREEBLK", \ + "JOP_MVREF", \ + "JOP_TRUNC", \ + "JOP_SYNC" } +#define JOP_OPTYPE(op) \ + (op) < JOP_NUMJOPTYPES ? joptype[op] : joptype[JOP_UNKNOWN] #define JREC_SIZE 32 /* Record and segment header size. */ From nobody Sat Aug 5 08: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 4RHwmy1rr5z4Tpdy; Sat, 5 Aug 2023 08:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHwmy1NNSz4pkY; Sat, 5 Aug 2023 08:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU3aZRPsJkdx/o4Vp7u7huE+BlCwG4BdB/hgdyz2kcA=; b=RsVpt+VrOj1XAraiNE35xRgH6SFKGU3lqdZuHBDYe4EJpiw0VQIpekVeUrYcjJPMX1+pDs xoazEsuwSBFlanG772Sl3vlJFxI5Izm/s0SDpNs8IbK7yPNeFtEthr1VA7m01lw9Pded+m u0BhVc0/lX2NVwpQKbFjYWicaw4whVHq1jorgmMyeJFrk0daFEwVfNJGsaAv77OnXe2he+ wZ2hKj00CWF9Di1y5UEWPYZKZGejAyWbrIxp9I+MaMDAdH38JJxScVH86o5Nim+b8bqkP8 BBOjPPgqE1QXw41k5mZkfBfqOOMtK0+wcb4U5NxRT2g3VC6fwns8Pstw7BxMYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU3aZRPsJkdx/o4Vp7u7huE+BlCwG4BdB/hgdyz2kcA=; b=iVfdu0U+TzmYCXUWdVGV9l1qQO6riAV4vdW+AlvL5ONCXEoxiUu5/jNX61c+jy4hwcUG3i 4K9HvhbbwleHxT/0bXZFepNaJWjDDaOOkkbp1Fv4zR5RTTRw0Riu0e9TYTCsBxGam2L9/U uz7OULVCHMU1xAVfvphlg/XQNEe14bMFrC+sWphs4h2ckgkE65X+NKGkaQu/UOHLKiEOXT m5TTVAG3rq/bT7pWF5/hvg7YaNm2STKqvUOB4uhtqbLExYJN4iuxsstpQAXePyVtgeznmf BIYBr4AfeJHR7CkLo0VufdkXHKxGDn2MANHbfPB8IDw23s51c01Nr1ElJBSfuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691224338; a=rsa-sha256; cv=none; b=LgqPXQf3rLBveldukeiU6NiZCrzuMCGJN4qVC0FN+euJIYdZCvTuKBykdO1FYUpKQO5pc3 5+wLHKhqV6gp+CiQJSMIS+qAUbj4IZBGmksjk+urZK8dzO6L9vV+ayZFJzw2m6vghKIjJI wgrEPRjytazRcESH4ASY55CkmrU0KsxGPvwS8/79KOJTBeToqpYzTYjM6uvVVRdUt2Yg5w EEKa4vsiZxth4QnM2Bfg+hYQPKuJBoQdkDsOhKTcYawnRa+1kvK9avJzZ+EZY+CpQCw4ld iksFCAPpx6yqF4CC7vgt+lR//jEFPj6ZzHfGAh+vr4ZDXV+tqs8z62fg3BAyHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHwmy081yz7X4; Sat, 5 Aug 2023 08:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3758WHmY042624; Sat, 5 Aug 2023 08: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 3758WHqC042623; Sat, 5 Aug 2023 08:32:17 GMT (envelope-from git) Date: Sat, 5 Aug 2023 08:32:17 GMT Message-Id: <202308050832.3758WHqC042623@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: 1d7ffb373c9d - main - pkgbase: reorganise caroot and openssl packages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 commit 1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 Author: Doug Rabson AuthorDate: 2023-07-31 14:38:45 +0000 Commit: Doug Rabson CommitDate: 2023-08-05 08:30:35 +0000 pkgbase: reorganise caroot and openssl packages This splits out the certctl utility into a new certctl package and the openssl libs into an openssl-lib package. PR: 272816 Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41321 --- release/packages/Makefile.package | 10 ++++++++-- release/packages/{caroot.ucl => certctl.ucl} | 0 release/packages/generate-ucl.sh | 14 ++++++++------ secure/lib/libcrypto/Makefile | 2 +- secure/lib/libssl/Makefile | 2 +- usr.sbin/certctl/Makefile | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 9bd2994c882a..e1256e02b2ad 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -26,10 +26,14 @@ bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities +caroot_COMMENT= SSL Certificates +caroot_DESC= SSL Certificates clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries +certctl_COMMENT= SSL Certificate Utility +certctl_DESC= SSL Certificate Utility console-tools_COMMENT= Console Utilities console-tools_DESC= Console Utilities csh_COMMENT= C Shell @@ -113,8 +117,10 @@ nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities -openssl_COMMENT= OpenSSL Library and Utility -openssl_DESC= OpenSSL Library and Utility +openssl_COMMENT= OpenSSL Utility +openssl_DESC= OpenSSL Utility +openssl-lib_COMMENT= OpenSSL Libraries +openssl-lib_DESC= OpenSSL Libraries pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility diff --git a/release/packages/caroot.ucl b/release/packages/certctl.ucl similarity index 100% rename from release/packages/caroot.ucl rename to release/packages/certctl.ucl diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 2b1f71e95c11..0c90a9ec4553 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -42,8 +42,8 @@ main() { # clibs should not have any dependencies or anything # else imposed on it. ;; - caroot) - pkgdeps="openssl" + certctl) + pkgdeps="caroot openssl" ;; # -dev packages that have no corresponding non-dev package @@ -139,14 +139,16 @@ main() { cp "${uclsource}" "${uclfile}" if [ ! -z "${pkgdeps}" ]; then - cat <> ${uclfile} -deps: { - FreeBSD-${pkgdeps}: { + echo 'deps: {' >> ${uclfile} + for dep in ${pkgdeps}; do + cat <> ${uclfile} + FreeBSD-${dep}: { origin: "base", version: "${PKG_VERSION}" } -} EOF + done + echo '}' >> ${uclfile} fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 89f330ca2800..6b2a1f3bd157 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -6,7 +6,7 @@ SUBDIR= engines modules .include .include -PACKAGE= openssl +PACKAGE= openssl-lib LIB= crypto SHLIB_MAJOR= 30 VERSION_MAP= ${.CURDIR}/Version.map diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 4cf17b8d5c51..dc308bcfb146 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -5,7 +5,7 @@ LIB= ssl SHLIB_MAJOR= 30 VERSION_MAP= ${.CURDIR}/Version.map -PACKAGE= openssl +PACKAGE= openssl-lib NO_LINT= diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile index df5acb606143..d583bf3055bd 100644 --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE= caroot +PACKAGE= certctl SCRIPTS=certctl.sh MAN= certctl.8 From nobody Sat Aug 5 09:42: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 4RHyLC5Rzhz4Ttlf; Sat, 5 Aug 2023 09:42: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 4RHyLC3v4hz4vcm; Sat, 5 Aug 2023 09:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691228563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CrFz1pgv8bmCkDJLYK7kDQveMimyDz2Kt+o1dUGl2Jc=; b=lSEGvpHljUulbDoMEWBwWOULG4prlFqqAIRktSn2ynA1AWPNAHj2wtNrQElm1C6z5dqNqz lr7hq9pJyS2TXXQsCy8nr2DktenlTa7Teq/VtYaq66Rv3P7Z9NZqmtqwNuCmENwngT71Gk VyifGMh8MCnU6vjofTI+a21b32sESXH/Lp4P0PRfdYSN6D3R/fRSAaLPD6G8gVRCB4IAMR TKkcZs17skSUI+OsDWr8ABoqMHYX5g+80ukMsqax9t3mR2y7ZGuz5rSOWi81WbBNceHckW tvG3KdWreYozWi1IBBbNAnGUpnScVy5dYS0/1GUv0z3mXJXpYqBrpYTq5+EZsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691228563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CrFz1pgv8bmCkDJLYK7kDQveMimyDz2Kt+o1dUGl2Jc=; b=cDaSdWUtp15Gz8LUaUtJ8TOM4nErlF361wKfz1lA46FX7VIpoZR1vLEDqvAXeN/4nh24iw qyLHoAjFRO0rBbq384aR1GaXlvQp4qfbwyD44EgoctRuCkf9OM+3fSjN+w99pvDr4FqFk7 RyIU63qXEcO0QPxMIPy+YXfkNSDdRp4tRGJadz9jIM9Ss3PjObMUG8hptPx8kxFe8dsjJh dHFcVN/Tlt2+QCUZgI6OVcKT8hMo/rCSCAiisiKB77h4uobuvXHPlbb5qeOk1RtjXd5iaU kWzs+YSlm8Sl6pft0XRrQShATptBrBJjbZEIT8/j3k7fBGyxjVZoRZMYtk/YCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691228563; a=rsa-sha256; cv=none; b=cpMC5xTn8bYcSnbYE/RVbyBMv7Un8Kjvehlo2eft9CLmGmZn6MmioYPCIARiPhGRXZML90 5X/QW7o1It/wkexZKGoyI3ej+Jn81mZFhTv5PMgMF1uLiBzljAnvohlNGNZEEBtkj5Vpt6 HI2g1HtTCaRTQ/45O1gvI5gqqKmzecJv5nIcPhmv57lmjDEqLDcumrAUVtMMVC/V0GmQ18 4baImXNctlGxKnsnjMakHTJowOtJb2H9vDb0i+XpbaDXU7iBJpsHojZ1TPbTlxtbUBE+Nh rT3g6rOHv17bzSpk81h5J1DC1O/7ueyGY8QvsbXnA1A5pqzbaZRHTBcA6NYzmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHyLC2zb0z9Gm; Sat, 5 Aug 2023 09:42: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 3759ghkf058960; Sat, 5 Aug 2023 09:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3759ghXQ058959; Sat, 5 Aug 2023 09:42:43 GMT (envelope-from git) Date: Sat, 5 Aug 2023 09:42:43 GMT Message-Id: <202308050942.3759ghXQ058959@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: e3771cc03419 - main - sctp: remove redundant check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e3771cc03419b69c8ee851c1ffa85230d0fde1d5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e3771cc03419b69c8ee851c1ffa85230d0fde1d5 commit e3771cc03419b69c8ee851c1ffa85230d0fde1d5 Author: Michael Tuexen AuthorDate: 2023-08-05 09:26:45 +0000 Commit: Michael Tuexen CommitDate: 2023-08-05 09:26:45 +0000 sctp: remove redundant check This is already checked by the caller. MFC after: 1 week --- sys/netinet/sctputil.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index a4d4e806c00e..6da4123308d4 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3655,9 +3655,6 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, /* event not enabled */ return; } - if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ) { - return; - } m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) From nobody Sat Aug 5 09:45: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 4RHyP552S6z4Tv2M; Sat, 5 Aug 2023 09:45: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 4RHyP54Whnz3Bmb; Sat, 5 Aug 2023 09:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691228713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAxAam/2XwgpGFc9uiE+TBvYhZklGpO3zBoICI9KL4E=; b=kRQpDT2cPNRo6861ZMIY/nsBO+loTC2PBA8ZA8UbhTh5HWv/mr7OsOGPicx2sSLoSDFb+B 56uxoB2x2wC3/BKe0VCNqFZxRxSE2OkS+AmIEVnUXtuFbE/XtciKPsrevLtiQLYHbz4/1u g25KhDXeBi5gWZ66IZDGkkPBhDcaKsTsrLc4T9GPNSY5QWTBRDNfoNp2HbsQ3TrOfc7ZyD 1u5zlsHfJGpiEclXn+OeRzMibwCPKdVKl4KkhnPIk4P+WO5ucO730y92kWs6RfAo7dsPnY 1wRdn01ikMwXRNRIDuPrr8q2cUEBMK+B8PVIoFQUid5iCkwsAC3eM5HBZ2syJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691228713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAxAam/2XwgpGFc9uiE+TBvYhZklGpO3zBoICI9KL4E=; b=WwHdpb7RxZ2wUZvkogKm7VbkapVSRM0xa8X3eCtsexwK8AwghHVpzfxJpMSqUWZ8F1X1d2 zXfsg4qqbCIuF8sqGqUkONfDxwk822nrMURWN73NejolIq0qVmXRJv8cnB6ghmQjfK8tyw tqeCRWRFHguADbAbBHqk9WjMBTetH5Qyvarho4mfjDOhjKdSaoIkibhwZ8xXA2nSxNGv2f 5wDlBZSwj/CmKptJZMIOBfnZTHUE2se+B6NUh1u2bzuI7zmT4E4rtFaA84NoorRYg3srO2 cZMTGOHKM+NW8EePdnaiuy0bSkcI3IS7sgkQMc4oTuspdm+kgoTAB8n7FcwOYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691228713; a=rsa-sha256; cv=none; b=j0d5lQzkB0p1T/ToO40xiigHa1KnEu1yYJGfh+WGP8+ijzDmtZLF6aQALNo3AV4joJ9efU av1CsXsKV8ib19WtQAYa4UvndPEizAkq/Z1N44QYWrISFQzu4VW+MJZ2Clk0jRpRLfFVJP etZSVndl4GVLk5EosvvSZ/ncTfqwnsSwhjuIBMVTFjKnH++e3O6aZqxI3ir6Z7DNQkTR2Q 9xrBAhq1DvyKcAD9ol1uC3X0rzK2TQ/BsHRIHV26YgfQanQekQx8v20PkvJ1L7jzNbLU5E 3wdbUnv3WL6OdxDF9yF4TvWg+x22xbg8AyYiTWVhE0pDI256xG+DrqKkwOuvqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHyP53dQZz91G; Sat, 5 Aug 2023 09:45: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 3759jDaf059443; Sat, 5 Aug 2023 09:45:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3759jDjK059442; Sat, 5 Aug 2023 09:45:13 GMT (envelope-from git) Date: Sat, 5 Aug 2023 09:45:13 GMT Message-Id: <202308050945.3759jDjK059442@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: 10b2b30670d7 - main - sctp: improve consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 10b2b30670d7c389b26533aa43e8d0c3aef55ff3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=10b2b30670d7c389b26533aa43e8d0c3aef55ff3 commit 10b2b30670d7c389b26533aa43e8d0c3aef55ff3 Author: Michael Tuexen AuthorDate: 2023-08-05 09:29:23 +0000 Commit: Michael Tuexen CommitDate: 2023-08-05 09:29:23 +0000 sctp: improve consistency MFC after: 1 week --- sys/netinet/sctputil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 6da4123308d4..136a2285c6d7 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -6118,7 +6118,7 @@ get_more_data: if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_SB_LOGGING_ENABLE) { sctp_sblog(&so->so_rcv, control->do_not_ref_stcb ? NULL : stcb, SCTP_LOG_SBFREE, (int)cp_len); } - SCTP_SB_DECR(&so->so_rcv, (int)cp_len); + SCTP_SB_DECR(&so->so_rcv, cp_len); if ((control->do_not_ref_stcb == 0) && stcb) { atomic_subtract_int(&stcb->asoc.sb_cc, (int)cp_len); From nobody Sat Aug 5 11:38: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 4RJ0wh0Xq4z4gvf6; Sat, 5 Aug 2023 11:39:16 +0000 (UTC) (envelope-from dim@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 4RJ0wh00Lcz3KZG; Sat, 5 Aug 2023 11:39:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691235556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=v/GIphF9gCvoWjFeESWaRojmK02zK/iKxkeR4utTJeM=; b=Z3PS+h/ZMpql7QrtP19lcHsGXft73TAXkaN4FLFWtSHS18ibJBmF9YyXVGly13CiNCCm+d W+Njmabkb3F3XyIfFr7PR0Q+Z7qNYIyvZluCNSnmd9ZBrl+1L/AzfRtvQho/AdRvpIIhJ8 bE4izgWHBhG0IeEhjV76kXdWMNdGFZRvWMuGOCvp2z4yo0ymGmPUYcs3RQ1L874Vjk+51B QjDdGAn/QEuF9krIfcLX22yWGC0V7q25VAk+EWuQM6VqEPRqfJhpHtZbNkQZjOl5gt52i2 JksU10I3ldjSNdPMLhRfnsBAk7DVWmWgtcyAd6eTvsGqKLqA8vS3yz/J9bdKwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691235556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=v/GIphF9gCvoWjFeESWaRojmK02zK/iKxkeR4utTJeM=; b=tKIJdZhr2BoZwxjK65QTmj+M9HpZ8xibPqdsRZWRWa+kX5bud5P1o3jACMEXzSqiNIIkCD f7OJ29fT3q3VA4mIJvnVyh7C9N+fI//PBL1ZkPqRO8yQfAjdsZNGjtXibA8hsVIyVxuJHO 3e5hxmWVUrtvtD0j5fF7bbIULDf6/Z6B25fVVhFt293207TIwUW4pfWzLvbBi1xhzNyOCa SKG1K7a3O2IOtMDB75isijcoQWd11kY84TOg0dKIG3mSUkBfkndrU0fqlRyhv0fNehj9RB dZF4A2WFaRgiHXfW30FNPvvPeHdnXkjjYKNf2bl3CqFS2096tlwHUobAtkVpUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691235556; a=rsa-sha256; cv=none; b=S870jAa9sv5BWtgUJQ29y/XZJiUPQRF/IggDo/nI3zZu/h2sQV2ySAzfoks+1W3r5hS6nd V9+4SswtwaHXS74yAcefYhTS1H+TEqOAvkaXG1naCll8sKb9u4fyvOcV6sddBkajWRcxVN bA9mDUt7Yw4CXpzAFXSjfdt8f5Z3Xt14DxZ99jHbSD+vBZL4hNF5OmeSRaMlKj0V++CZYA LVNcvxws9+pQIjpQBdm2waYKPdly3peHyCotbdiHssWOTsxqI9RGd2RTGhSA/kqeKLxFzv hHqr6jUu/ZtW//phTs03H3gflwAdF0cGv6R8jV7PPJomVlQsy/TMSks5T/vugw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RJ0wg5Gbyz1Q56; Sat, 5 Aug 2023 11:39:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id DA354728CC; Sat, 5 Aug 2023 13:39:13 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_7F86D804-E676-4B7B-AD56-F2673A9670B9"; protocol="application/pgp-signature"; micalg=pgp-sha1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: dedc71fd3890 - main - libc: unsplit log message to to make it greppable in src From: Dimitry Andric In-Reply-To: Date: Sat, 5 Aug 2023 13:38:57 +0200 Cc: Ed Maste , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202308050100.37510VDJ085555@gitrepo.freebsd.org> To: Jessica Clarke X-Mailer: Apple Mail (2.3731.700.6) --Apple-Mail=_7F86D804-E676-4B7B-AD56-F2673A9670B9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 5 Aug 2023, at 04:11, Jessica Clarke wrote: >=20 > On 5 Aug 2023, at 02:00, Ed Maste wrote: >>=20 >> The branch main has been updated by emaste: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Ddedc71fd3890803a81047a0c480b95a3= 27bd7214 >>=20 >> commit dedc71fd3890803a81047a0c480b95a327bd7214 >> Author: Ed Maste >> AuthorDate: 2023-04-17 15:58:59 +0000 >> Commit: Ed Maste >> CommitDate: 2023-08-05 00:59:30 +0000 >>=20 >> libc: unsplit log message to to make it greppable in src >>=20 >> Also use __func__ rather than hardcoding the function name. This = code >> now fits in 80 columns without splitting the log message. >=20 > This doesn=E2=80=99t match the commit? Indeed, during the review I noted that __func__ would not expand to the expected value ("__cxa_thread_call_dtors"), so that part was actually removed. Now the effective result only unsplits the message line. I guess this is a case of Phabricator or arc making it difficult to adjust the commit message before 'landing'. -Dimitry --Apple-Mail=_7F86D804-E676-4B7B-AD56-F2673A9670B9 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCZM400QAKCRCwXqMKLiCW o39JAJ9EbyMcsluqu4nIMybrzAHxfyCBDwCeKM0EwjhFmX3sIgmr1+fLVKNgGwg= =Q+rD -----END PGP SIGNATURE----- --Apple-Mail=_7F86D804-E676-4B7B-AD56-F2673A9670B9-- From nobody Sat Aug 5 12:38: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 4RJ2Dq34Cjz4h13r; Sat, 5 Aug 2023 12:38: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 4RJ2Dq0d8Nz3STZ; Sat, 5 Aug 2023 12:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691239099; h=from:from:reply-to:subject:subject: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+W85Qre6rzANsGe1C9chPWPsVV2kYL2GEW+AEzbXl4=; b=pjXBSkTihxg3LW4TYDMyUe4pBDedfYjXqfhGmdc8goW2RLvEI1+VH+4pkqbjyOK9l+5uNt zWmaFPO0RdZW3nyvm8G9XWUyUTT38JR6JBBXnRU+DnJ6CiUnLpSoaa83VcZ+MVchiv5CxX ZZbaN3bkTv4fF77ekaH/cgdzQv/IFp8NEI/o437eFTiMarPh1K6+7Z2b5k+HWbV4Qy61Td Oj8/pf6JCBbwrTaFH0YUZJJ2USiVa6cEXgqApODKQgNHkJ/hnJorVwf7pKvNEyuZdZGYck b5teZqN5HZicFIt9EO82erK+012CeyLzNi/LjG3gxt71g5cvCuXHtTzbujw2mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691239099; h=from:from:reply-to:subject:subject: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+W85Qre6rzANsGe1C9chPWPsVV2kYL2GEW+AEzbXl4=; b=jMWpuIIAosEqQt7jWTqLw4C9RFQ0xoLfJBBWFD8g/CchZ24qq1rXwpVE2IPVmPpLyRAFDw iXpSMko9hzUv4jGY6RcKVZxN+PS4e1mQlz90cG6tdrBMdk4GBOGJGJPSumQnp4xfggIYDf Lap7xZCwB0P8XSnputeVVPrkoyvoJysqBsdtIwe2wvCS3/mTjrd4XYakcivj7YI/BMuX9q bxm7/BRQk88S54rZ07zbNOR9nHF7yvOan9cfPO577V6PiI+adSowc0v0H5k0zgBPAcU+si n+dKUa8DJQXjoKFXl6CGLLDilgym0bcABIuzpK7WG2IwfZSf/ekB3V3AmVOCQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691239099; a=rsa-sha256; cv=none; b=orJT7NBY9Xw7tHgHk2jJ6pf+fqy6bJdNQezM5zAb/1m8WJ9JHFqzC1uTCIkOj9aWZqF/Wt iNIEcabHmOIw9RDYePgM9nG9AFDx3MKvLmqt+6yaWqiwtl2Ux92ipH097fuFiyMkw+07mu cEuiQayfYr3ZPxgE5NV9sdhGiewEBq/k0/ILhMsh80W8H5xGhGmNsv7+Tp9Y8yh/V9dTG+ Pc08NL8ygMvw8VkQNe5MD+bqJIny+p5IsqufJjGdIRfgSl8dXvUwWslWAwb5jK5bMtSggW TVcWxzm5o/XZ9CzxzOvpaS9N82pfMBHMGz5Ae7eUOcXE8MSqNy0TWUQ10Z40Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJ2Dp6r8gzTsv; Sat, 5 Aug 2023 12:38: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 375CcIVQ042818; Sat, 5 Aug 2023 12:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375CcI7F042817; Sat, 5 Aug 2023 12:38:18 GMT (envelope-from git) Date: Sat, 5 Aug 2023 12:38:18 GMT Message-Id: <202308051238.375CcI7F042817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 6f15b7e19952 - main - ldconfig script: enable 32-bit compat on aarch64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 6f15b7e199527e50aa459340607ff98bbff8e905 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=6f15b7e199527e50aa459340607ff98bbff8e905 commit 6f15b7e199527e50aa459340607ff98bbff8e905 Author: Mike Karels AuthorDate: 2023-08-05 12:19:01 +0000 Commit: Mike Karels CommitDate: 2023-08-05 12:37:39 +0000 ldconfig script: enable 32-bit compat on aarch64 Add aarch64 to set of architectures that support 32-bit compat libraries. --- libexec/rc/rc.d/ldconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 5dd25ced0cd4..2d30ac0e6db3 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -43,7 +43,7 @@ ldconfig_start() machine_arch=$(sysctl -n hw.machine_arch) case ${machine_arch} in - amd64|powerpc64) + aarch64|amd64|powerpc64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` From nobody Sat Aug 5 23:18: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 4RJJRp4yb6z4TtVs; Sat, 5 Aug 2023 23:18: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 4RJJRp46Hzz3ZH4; Sat, 5 Aug 2023 23:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691277526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5LUr6k6GcHoVxQqu0FCHpmZKUeSh34uYLKOrd9Dkf+c=; b=jzJ1gPdUd9QSz90sECvvE9pcI+K70145g19bza3Y9vSV/DokHlojFyRDfUBiVeS8h0ArZ4 k6x0yVWkBYVJwaQeCEgTicfDUVTEqaoIuK946RzlehbwkbKJzmUHAVFNH2JOPalZqvMMHF gpUm0TQcnZ6L7X8n69WSf47arT0fqLL4ZWcn53bWZya9uli5wZhy/Tusjm0opGmN2elp9Y AdcVSeoKIW8C6RmtmNxor1gPz1WScESSv76mjwVwvona0MCQmq46ikVOa5iP6/LrFPLQAa h0/vfAlrNSqYF0d1eJk3sIkZmPJh0KzG1LrKz3YYuXDTXBQAoVrbkkb2Mv9PPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691277526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5LUr6k6GcHoVxQqu0FCHpmZKUeSh34uYLKOrd9Dkf+c=; b=pXco/nYNh77eY14tcINWqbJPcqV9TY0Ch4cw4bhQjpdqYEcJqs0BD8XAgYrPh2SaY65FuF lIhpCjtuPSY2cD7Kiga5Q5456gxNgKB9d311RGJzlcTLWMnujZuJL4j40vqx19owHjpzu6 FYCyq/xAXOH7txVHyWF4dF3/YN/6rsilZer8Z2Z8iKQxXeAbzxnkn+6oqfSFn/fs/TreNy XwkEhLg6Qq4lqWHazsNCJAhfSTsLxLdu5EKlHotwRSWHCrc105fDfjRWL2uetR0KZVir/h NhG8zb0WTWJAAwiotEm5+9XVXQwQKjNcyRcvR09Dhngmpqj4b60LqFUbbeEJZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691277526; a=rsa-sha256; cv=none; b=ISU38RTXH8Iuyi/XbIaEB5RXIlg61wKbbUaTArOULfEeAgXpd3yTdBB59PjcpxKTUytEa1 vO58txxjcIS2gSOu56K3lLXtTaVKfirM03+OuuSGoZEqzw1kZQUUALL2NCJKDlQeFjdElw 7O5qJ18nJvW3B8JNQTzgxXdtN7c7+SSol3NWNYgHPNRcynRpk86pXBKOj1r4lK2jH3iGce sj8hiw6trHWyHD78Kbefu/hfQ4lI0Z7KdJi/1l1afXjb2b8TzHx905YEdsfmSyKFthK5qA JBVTeqKgMpMK1UXN/wSry4HHIK2DXbrAOD5EIRxxfX+Z2etIeRybrFbQ12G/0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJJRp35GyznRT; Sat, 5 Aug 2023 23:18: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 375NIkcG010295; Sat, 5 Aug 2023 23:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375NIkEg010294; Sat, 5 Aug 2023 23:18:46 GMT (envelope-from git) Date: Sat, 5 Aug 2023 23:18:46 GMT Message-Id: <202308052318.375NIkEg010294@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: 6edbe5616c76 - main - Provide some more information for userland core dumps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6edbe5616c761bff9e570d9c77db0644a9487174 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6edbe5616c761bff9e570d9c77db0644a9487174 commit 6edbe5616c761bff9e570d9c77db0644a9487174 Author: Ed Maste AuthorDate: 2017-10-27 14:26:03 +0000 Commit: Ed Maste CommitDate: 2023-08-05 23:18:35 +0000 Provide some more information for userland core dumps Previously the log message indicated only "(core dumped)" if a core was successfully created, or nothing if it was not. This provides insufficient information to faciliate debugging. Dtrace is no help as coredump() is static and we cannot find the return value via fbt. Expand the log message to include error return value information. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39942 --- sys/kern/kern_sig.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 5876e2e93920..df3ebc0103c4 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -3598,6 +3598,8 @@ void sigexit(struct thread *td, int sig) { struct proc *p = td->td_proc; + const char *coreinfo; + int rv; PROC_LOCK_ASSERT(p, MA_OWNED); proc_set_p2_wexit(p); @@ -3622,16 +3624,31 @@ sigexit(struct thread *td, int sig) * XXX : Todo, as well as euid, write out ruid too * Note that coredump() drops proc lock. */ - if (coredump(td) == 0) + rv = coredump(td); + switch (rv) { + case 0: sig |= WCOREFLAG; + coreinfo = " (core dumped)"; + break; + case EFAULT: + coreinfo = " (no core dump - bad address)"; + break; + case EINVAL: + coreinfo = " (no core dump - invalid argument)"; + break; + case EFBIG: + coreinfo = " (no core dump - too large)"; + break; + default: + coreinfo = " (no core dump - other error)"; + } if (kern_logsigexit) log(LOG_INFO, "pid %d (%s), jid %d, uid %d: exited on " "signal %d%s\n", p->p_pid, p->p_comm, p->p_ucred->cr_prison->pr_id, td->td_ucred->cr_uid, - sig &~ WCOREFLAG, - sig & WCOREFLAG ? " (core dumped)" : ""); + sig &~ WCOREFLAG, coreinfo); } else PROC_UNLOCK(p); exit1(td, 0, sig);