From nobody Mon Apr 22 00:31:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VN5lR4FtFz5Htrc; Mon, 22 Apr 2024 00:31: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 4VN5lR0sZcz4R7n; Mon, 22 Apr 2024 00:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713745875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvuluoNuA177qhSlLycFT0qwiG7WvxgeGcGk9byRtmU=; b=MVLiL6EbnQ4V4AJq+ZtQy1+C4RZEhX+NVUcQAkRWBWePmnmuw0B6tJA8VaHs7BzdpgS3L/ 6EaZ1tHgiM8Skn/MQc93LUtVI4X1jr+4AgwG62DrhUr8jLzAZ/O1yQ3Vc3xkGJ2ZF4lLUD muQSR10uDZHMr8nsqBBY8TEN9Yg9a8Pve8fwSXd/2GBEDAxKjhvX4dfk4igGNiWHDmgNzs cUr6tR3EXqcuZb92Nqs5y10bU6oqiJdyJnasNoSekszn0As+HSO5W9nYYeuC9nC1BK4DGF BxWDuCn3YI9PrpAqkvdxr0tHSVHQkqzhIGS+ILMx0VX7q4a/sxf6Dqx8acMJsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713745875; a=rsa-sha256; cv=none; b=ezaP5l+FRQTUzFjG1EN7wKOjWy+CwL0GvkTrpELbTrWE+8Ggy7kMAoxP0nw8bb3y6Nylxu 7hzEwlTM4BWQiyvBI/39GZ5O9kva8+K76WrjoEW/RmXNx4pRW/DJ9gC+B/WpBqS28oEI8g PI0hXJi7px1b4Wwpf/xh/lMexYwep3tmL1y6pn3bIEDcit0u41oPk//dolYwVgZnndcn4E fvtTnYrHZH8eJZefXwyOReWSYBlWT2fK6xTDH5ZX/B34Yo13FH+oTluAgUCKYQodbiyWaL xtAuUDLYMm3nvSO+x2dCJNDJ2maXiPqccO2VJFKb5K9Vsms1NLenErn3f1E0gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713745875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvuluoNuA177qhSlLycFT0qwiG7WvxgeGcGk9byRtmU=; b=d/ZdYDtxEv9lUIyxWR5qKOPJj0m/uUpKk+LbteayiVkJQvbEmTPQ2C/1B4suDqbcSh2+li dktTyhmxY8//wU66PDjd+oH7upo/UiR011D+lMdkGCHS4A7fapS0RITYA3hfygwg7D3Uul byslpnKAMZ7QohpeMs0a+K3G+oUF8vLeUzO+Nw8fAiAL67av0l2591rMg+UFsqmtuIjGL8 /qw4Kcxwg5YG4G8O/NzhJiSbo717bJwnL4VhOtj6pgftVZ9eZ1W77y2ODkc2g4j4vvZALp yBx6E1F3UWJrZJemVR38FkhYVJnn0g0OUK5Q+GTzuCGF6JGBHzlLrM8CnXK/AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VN5lR058dzRfn; Mon, 22 Apr 2024 00:31: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 43M0VEjc079244; Mon, 22 Apr 2024 00:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43M0VEDX079241; Mon, 22 Apr 2024 00:31:14 GMT (envelope-from git) Date: Mon, 22 Apr 2024 00:31:14 GMT Message-Id: <202404220031.43M0VEDX079241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 933490d3b6d4 - stable/14 - kasan: fix false-positive kasan_report upon thread reuse List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e commit 933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e Author: Ka Ho Ng AuthorDate: 2024-04-19 19:18:27 +0000 Commit: Ka Ho Ng CommitDate: 2024-04-22 00:30:58 +0000 kasan: fix false-positive kasan_report upon thread reuse In fork1(), if a thread is reused and thread_alloc_stack() is not called, mark the reused thread's kstack pages clean in the KASAN shadow buffer. Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44875 (cherry picked from commit 68a3a7fc94833020403190c20bd9be186c6156ce) --- sys/kern/kern_fork.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index edcd8a1f2139..9bbe7c8a8153 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -1028,6 +1029,10 @@ fork1(struct thread *td, struct fork_req *fr) error = ENOMEM; goto fail2; } + } else { + kasan_mark((void *)td2->td_kstack, + ptoa(td2->td_kstack_pages), + ptoa(td2->td_kstack_pages), 0); } } From nobody Mon Apr 22 00:59:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VN6Mq3Vw3z5HxK0; Mon, 22 Apr 2024 00:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VN6Mq2zRwz4SyQ; Mon, 22 Apr 2024 00:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713747559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p6JTinFCKpnBTw0vm0KThzeOj9uzxeuQoCpspyInAQ=; b=dQMJxp3U5I0VYteOagfBVEL7CFcfJ3VBLcNAB2OP1a2TSbrwrMp+S19rhdoI6dZAbx9orA iodc5L3hOpZ/Z0wZkOoYyRWVHaT1m1GLJax9cF6/gP7mcJ/2plYP3QU71F1T+h6ls9Hpqt 6nIGGq6BGFCdQMvesdX3P10x7y275MEqkTtro7tJALKXZr9qdL3n7MTmtrabIy6BMYmE1L IsdSeW2e7G2FSa4ruuhy/KqjPdZRkUAZfXa7pRqdYHiKEBN9ks8smUCMTkCnajOlImfSW4 pni4LKYkE6Ua5OFwCi8adptUKTXMZ/4SZFtISEIJIzWKqDc8sx+hlzZKNEpWVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713747559; a=rsa-sha256; cv=none; b=CL+bLGKE9aNzp9bao38SHCjkPvW51Xwv0kp0T0TZWDe04DoHhYHZWNj9iflFHiudMY7zKd Zf6oGDyUYqtWWqJWDRrztTVX7gzxBs/kYUP7lUysI6XtSQXWHB5uYJOeRytsAN0xknrWGy VT1hxvMFkXyaPgQ2NnlBgVYCvbDrEwnJ+kUa0OZJt/5/fJ2Tdp3OT74px0u1+T6jyB2761 pBinMVEClVnnSwQe6gXxehVwDKJ4zQ8P+ZvrGYSRYsuUQBGZP4x4PlmtBf7fdLDkZQMwbx Y2FPNklCHfedf1VJFn1L4xEyMmMjF1DZIIPBGPikCH/xIgBGLqdFicT3cY6/gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713747559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p6JTinFCKpnBTw0vm0KThzeOj9uzxeuQoCpspyInAQ=; b=PXIzVJHSwhy4G9mk92zu/SlGh0PRydzkYxF6XIXXcCEDhxECyE0dYDe6chRyXslA0MjOLY nCkMscFs9/6lOfypO+ke3DZ452d3rNqHJLh375jMckNX5aot8BYwM0Ba3loT+aXga01zPs 2rO8UMl8JM/hvTZ8GHM07FXwWHxyU+6HjXNGePK5i7P86yn46h9svnog4cdijHfNRor2uK dIL1pHqJi+4uOSH6/ka228lmDWykcf0inphcTYpr743AfTJNnRPA0gY5QCiBr5RBQBIqK9 cb/V/PEjPF/MNwHI8quM0Pxs/0HgjZtrNwktiG3mDmcGwfLGlqlHCtKlYtnoPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VN6Mq2GwczRvp; Mon, 22 Apr 2024 00:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43M0xJux020334; Mon, 22 Apr 2024 00:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43M0xJeI020330; Mon, 22 Apr 2024 00:59:19 GMT (envelope-from git) Date: Mon, 22 Apr 2024 00:59:19 GMT Message-Id: <202404220059.43M0xJeI020330@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: dd03eafacba9 - main - riscv: create a convenience composite macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dd03eafacba962c9dcec929c3ed9d63e7c43da3a Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=dd03eafacba962c9dcec929c3ed9d63e7c43da3a commit dd03eafacba962c9dcec929c3ed9d63e7c43da3a Author: Doug Moore AuthorDate: 2024-04-21 22:24:29 +0000 Commit: Doug Moore CommitDate: 2024-04-21 23:36:00 +0000 riscv: create a convenience composite macro Define PTE_TO_VM_PAGE to compose the PHYS_TO_VM_PAGE and PTE_TO_PHYS macros. Use it where appropriate, and drop some variables that it makes unnecessary. Reviewed by: jhb (previous version) Differential Revision: https://reviews.freebsd.org/D44700 --- sys/riscv/riscv/pmap.c | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 118efa3a4f55..b92cb816f44a 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -362,6 +362,7 @@ pagezero(void *p) ((((pte) & ~PTE_HI_MASK) >> PTE_PPN0_S) * PAGE_SIZE) #define L2PTE_TO_PHYS(l2) \ ((((l2) & ~PTE_HI_MASK) >> PTE_PPN1_S) << L2_SHIFT) +#define PTE_TO_VM_PAGE(pte) PHYS_TO_VM_PAGE(PTE_TO_PHYS(pte)) static __inline pd_entry_t * pmap_l0(pmap_t pmap, vm_offset_t va) @@ -940,7 +941,6 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { pt_entry_t *l3p, l3; - vm_paddr_t phys; vm_page_t m; m = NULL; @@ -948,8 +948,7 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) l3p = pmap_l3(pmap, va); if (l3p != NULL && (l3 = pmap_load(l3p)) != 0) { if ((l3 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) { - phys = PTE_TO_PHYS(l3); - m = PHYS_TO_VM_PAGE(phys); + m = PTE_TO_VM_PAGE(l3); if (!vm_page_wire_mapped(m)) m = NULL; } @@ -1252,7 +1251,6 @@ pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) static void _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) { - vm_paddr_t phys; PMAP_LOCK_ASSERT(pmap, MA_OWNED); if (m->pindex >= NUL2E + NUL1E) { @@ -1275,8 +1273,7 @@ _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) vm_page_t pdpg; l1 = pmap_l1(pmap, va); - phys = PTE_TO_PHYS(pmap_load(l1)); - pdpg = PHYS_TO_VM_PAGE(phys); + pdpg = PTE_TO_VM_PAGE(pmap_load(l1)); pmap_unwire_ptp(pmap, va, pdpg, free); } else if (m->pindex < NUL2E + NUL1E && pmap_mode != PMAP_MODE_SV39) { pd_entry_t *l0; @@ -1284,8 +1281,7 @@ _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) MPASS(pmap_mode != PMAP_MODE_SV39); l0 = pmap_l0(pmap, va); - phys = PTE_TO_PHYS(pmap_load(l0)); - pdpg = PHYS_TO_VM_PAGE(phys); + pdpg = PTE_TO_VM_PAGE(pmap_load(l0)); pmap_unwire_ptp(pmap, va, pdpg, free); } pmap_invalidate_page(pmap, va); @@ -1312,7 +1308,7 @@ pmap_unuse_pt(pmap_t pmap, vm_offset_t va, pd_entry_t ptepde, if (va >= VM_MAXUSER_ADDRESS) return (0); KASSERT(ptepde != 0, ("pmap_unuse_pt: ptepde != 0")); - mpte = PHYS_TO_VM_PAGE(PTE_TO_PHYS(ptepde)); + mpte = PTE_TO_VM_PAGE(ptepde); return (pmap_unwire_ptp(pmap, va, mpte, free)); } @@ -1487,8 +1483,7 @@ _pmap_alloc_l3(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp) lockp) == NULL) goto fail; } else { - phys = PTE_TO_PHYS(pmap_load(l1)); - pdpg = PHYS_TO_VM_PAGE(phys); + pdpg = PTE_TO_VM_PAGE(pmap_load(l1)); pdpg->ref_count++; } } else { @@ -1512,8 +1507,7 @@ _pmap_alloc_l3(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp) NUL2E + l1index, lockp) == NULL) goto fail; } else { - phys = PTE_TO_PHYS(pmap_load(l1)); - pdpg = PHYS_TO_VM_PAGE(phys); + pdpg = PTE_TO_VM_PAGE(pmap_load(l1)); pdpg->ref_count++; } } @@ -1553,7 +1547,7 @@ retry: ("%s: L1 entry %#lx for VA %#lx is a leaf", __func__, pmap_load(l1), va)); /* Add a reference to the L2 page. */ - l2pg = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l1))); + l2pg = PTE_TO_VM_PAGE(pmap_load(l1)); l2pg->ref_count++; } else { /* Allocate a L2 page. */ @@ -1570,7 +1564,6 @@ pmap_alloc_l3(pmap_t pmap, vm_offset_t va, struct rwlock **lockp) { vm_pindex_t ptepindex; pd_entry_t *l2; - vm_paddr_t phys; vm_page_t m; /* @@ -1588,8 +1581,7 @@ retry: * hold count, and activate it. */ if (l2 != NULL && pmap_load(l2) != 0) { - phys = PTE_TO_PHYS(pmap_load(l2)); - m = PHYS_TO_VM_PAGE(phys); + m = PTE_TO_VM_PAGE(pmap_load(l2)); m->ref_count++; } else { /* @@ -2223,7 +2215,7 @@ pmap_remove_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t sva, pvh = pa_to_pvh(PTE_TO_PHYS(oldl2)); pmap_pvh_free(pvh, pmap, sva); eva = sva + L2_SIZE; - for (va = sva, m = PHYS_TO_VM_PAGE(PTE_TO_PHYS(oldl2)); + for (va = sva, m = PTE_TO_VM_PAGE(oldl2); va < eva; va += PAGE_SIZE, m++) { if ((oldl2 & PTE_D) != 0) vm_page_dirty(m); @@ -2261,7 +2253,6 @@ pmap_remove_l3(pmap_t pmap, pt_entry_t *l3, vm_offset_t va, { struct md_page *pvh; pt_entry_t old_l3; - vm_paddr_t phys; vm_page_t m; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -2271,8 +2262,7 @@ pmap_remove_l3(pmap_t pmap, pt_entry_t *l3, vm_offset_t va, pmap->pm_stats.wired_count -= 1; pmap_resident_count_dec(pmap, 1); if (old_l3 & PTE_SW_MANAGED) { - phys = PTE_TO_PHYS(old_l3); - m = PHYS_TO_VM_PAGE(phys); + m = PTE_TO_VM_PAGE(old_l3); if ((old_l3 & PTE_D) != 0) vm_page_dirty(m); if (old_l3 & PTE_A) @@ -2487,7 +2477,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pd_entry_t *l0, *l1, *l2, l2e; pt_entry_t *l3, l3e, mask; vm_page_t m, mt; - vm_paddr_t pa; vm_offset_t va_next; bool anychanged, pv_lists_locked; @@ -2543,8 +2532,7 @@ retryl2: if ((prot & VM_PROT_WRITE) == 0 && (l2e & (PTE_SW_MANAGED | PTE_D)) == (PTE_SW_MANAGED | PTE_D)) { - pa = PTE_TO_PHYS(l2e); - m = PHYS_TO_VM_PAGE(pa); + m = PTE_TO_VM_PAGE(l2e); for (mt = m; mt < &m[Ln_ENTRIES]; mt++) vm_page_dirty(mt); } @@ -2585,7 +2573,7 @@ retryl3: if ((prot & VM_PROT_WRITE) == 0 && (l3e & (PTE_SW_MANAGED | PTE_D)) == (PTE_SW_MANAGED | PTE_D)) { - m = PHYS_TO_VM_PAGE(PTE_TO_PHYS(l3e)); + m = PTE_TO_VM_PAGE(l3e); vm_page_dirty(m); } if (!atomic_fcmpset_long(l3, &l3e, l3e & ~mask)) @@ -2851,7 +2839,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, * destroyed by pmap_remove_l3(). */ if (ml3 == NULL) - ml3 = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); + ml3 = PTE_TO_VM_PAGE(pmap_load(l2)); KASSERT(ml3->pindex == pmap_l2_pindex(va), ("pmap_promote_l2: page table page's pindex is wrong")); if (pmap_insert_pt_page(pmap, ml3, true, all_l3e_PTE_A != 0)) { @@ -2953,7 +2941,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, va, &lock))) { l3 = pmap_l2_to_l3(l2, va); if (va < VM_MAXUSER_ADDRESS) { - mpte = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); + mpte = PTE_TO_VM_PAGE(pmap_load(l2)); mpte->ref_count++; } } else if (va < VM_MAXUSER_ADDRESS) { @@ -3266,7 +3254,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, * Both pmap_remove_l2() and pmap_remove_l3() will * leave the kernel page table page zero filled. */ - mt = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); + mt = PTE_TO_VM_PAGE(pmap_load(l2)); if (pmap_insert_pt_page(pmap, mt, false, false)) panic("pmap_enter_l2: trie insert failed"); } else @@ -3424,7 +3412,6 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte, struct rwlock **lockp) { struct spglist free; - vm_paddr_t phys; pd_entry_t *l2; pt_entry_t *l3, newl3; @@ -3464,8 +3451,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, if (l2 != NULL && pmap_load(l2) != 0) { if ((pmap_load(l2) & PTE_RWX) != 0) return (NULL); - phys = PTE_TO_PHYS(pmap_load(l2)); - mpte = PHYS_TO_VM_PAGE(phys); + mpte = PTE_TO_VM_PAGE(pmap_load(l2)); mpte->ref_count++; } else { /* @@ -4023,7 +4009,7 @@ pmap_remove_pages(pmap_t pmap) continue; } - m = PHYS_TO_VM_PAGE(PTE_TO_PHYS(tpte)); + m = PTE_TO_VM_PAGE(tpte); KASSERT((m->flags & PG_FICTITIOUS) != 0 || m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad pte %#jx", From nobody Mon Apr 22 09:16:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNKPS6CQXz5JhTT; Mon, 22 Apr 2024 09:16:28 +0000 (UTC) (envelope-from freebsd@omnilan.de) Received: from mx0.gentlemail.de (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]) (using TLSv1.3 with cipher TLS_AES_256_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 4VNKPR5M1Mz4GFp; Mon, 22 Apr 2024 09:16:27 +0000 (UTC) (envelope-from freebsd@omnilan.de) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@omnilan.de designates 2a00:e10:2800::a130 as permitted sender) smtp.mailfrom=freebsd@omnilan.de Received: from mh0.gentlemail.de (ezra.dcm1.omnilan.net [IPv6:2a00:e10:2800:0:0:0:0:a135]) by mx0.gentlemail.de (8.15.2/8.15.2) with ESMTP id 43M9GIaJ011306; Mon, 22 Apr 2024 11:16:18 +0200 (CEST) (envelope-from freebsd@omnilan.de) X-Authentication-Warning: mx0.gentlemail.de: Host ezra.dcm1.omnilan.net [IPv6:2a00:e10:2800:0:0:0:0:a135] claimed to be mh0.gentlemail.de Received: from [172.21.3.1] (s1.omnilan.de [217.91.127.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mh0.gentlemail.de (Postfix) with ESMTPSA id 097F6E68; Mon, 22 Apr 2024 11:16:18 +0200 (CEST) Content-Type: multipart/alternative; boundary="------------Djtb7k34W0VVt4JFbvQmeUvu" Message-ID: <04ea81b1-c6a2-4dcd-921c-729fb5f5f944@omnilan.de> Date: Mon, 22 Apr 2024 11:16:17 +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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP To: Shawn Webb , Philip Paeps Cc: Ronald Klop , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org References: <901819076.6938.1708005969197@localhost> <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@freebsd.org> <4A6EC239-4B9B-442C-ACFB-8F99A951630A@freebsd.org> Content-Language: en-US From: Harry Schmalzbauer Organization: OmniLAN In-Reply-To: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.27 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.979]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; XM_UA_NO_VERSION(0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; HAS_ORG_HEADER(0.00)[]; ASN(0.00)[asn:61157, ipnet:2a00:e10:2800::/38, country:DE]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; HAS_XAW(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[omnilan.de]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4VNKPR5M1Mz4GFp This is a multi-part message in MIME format. --------------Djtb7k34W0VVt4JFbvQmeUvu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2024-02-15 15:55, Shawn Webb wrote: ... >>> I'm curious to learn why you chose http:// rather than https://. >> Because https:// only adds work. And work is heat. >> >> bsdinstall uses the MANIFEST to confirm integrity. >> >> If your bsdinstall and MANIFEST are from a trustworthy source, anything >> downloaded over http:// will be trustworthy. Just as trustworthy, in fact, >> as anything downloaded over ftp://. > There is the problem of metadata leakage, which HTTPS helps to address > (though not completely.) The connection itself leaks the significant part, no matter if it's HTTP or HTTPS. Anything else from the header, which is plain on HTTP vs. HTTPS, doesn't tell much more: A 500MB stream from ftp.freebsd.org let's anyone guess you're downloading a setup image.  Which one exactly isn't hurting privacy imho, nor which agent is in use etc... I totally agree that general TLSing is a bad idea. Another advantage of HTTP (plain) vs. HTTPS is that proxies can easily cache, saving load from the net and the servers alike. (if intercepting beforehand anyways - which is 'standard' wherever I access the internet @work! - caching would work too of course, but in real world, the mitm-boxes rarely are proxies. Even small sized companies utilize F.ate/P.lto SSL-inspection feature - cheap and easy to turn on.  If TLSing madness wouldn't have caused encypted weather/newspaper/ads, maybe we wouldn't have precautionary man-in-the-middle boxes all over the places - which do inspect banking and everything else if not carefully extra ruled out) Just my 2 ¢ --------------Djtb7k34W0VVt4JFbvQmeUvu Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 2024-02-15 15:55, Shawn Webb wrote:
... 
I'm curious to learn why you chose http:// rather than https://.

Because https:// only adds work.  And work is heat.

bsdinstall uses the MANIFEST to confirm integrity.

If your bsdinstall and MANIFEST are from a trustworthy source, anything
downloaded over http:// will be trustworthy.  Just as trustworthy, in fact,
as anything downloaded over ftp://.

There is the problem of metadata leakage, which HTTPS helps to address
(though not completely.)


The connection itself leaks the significant part, no matter if it's HTTP or HTTPS.
Anything else from the header, which is plain on HTTP vs. HTTPS, doesn't tell much more: A 500MB stream from ftp.freebsd.org let's anyone guess you're downloading a setup image.  Which one exactly isn't hurting privacy imho, nor which agent is in use etc...

I totally agree that general TLSing is a bad idea.
Another advantage of HTTP (plain) vs. HTTPS is that proxies can easily cache, saving load from the net and the servers alike.

(if intercepting beforehand anyways - which is 'standard' wherever I access the internet @work! - caching would work too of course, but in real world, the mitm-boxes rarely are proxies. Even small sized companies utilize F.ate/P.lto SSL-inspection feature - cheap and easy to turn on.  If TLSing madness wouldn't have caused encypted weather/newspaper/ads, maybe we wouldn't have precautionary man-in-the-middle boxes all over the places - which do inspect banking and everything else if not carefully extra ruled out)

Just my 2 ¢

--------------Djtb7k34W0VVt4JFbvQmeUvu-- From nobody Mon Apr 22 13:47:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNRQb4VL9z5H7tg; Mon, 22 Apr 2024 13:47: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 4VNRQb40hkz4fLH; Mon, 22 Apr 2024 13:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKCugiBJF57dzHsEcl5IeR/10PDA/ZAc1b53y3jV/0Q=; b=KjTSwg9pNhzLpt+lueyF60eFj0gXlA8LLvxN+0vFqC0WoktN1k0/r7HO5hN9uCN+Tonyg0 ytOVTrA5Vl6wEBpjOj6A7VsKWEh7b+vmyq+EzQkw2X6fq/A3MWj6IwNfZOj3nUxSyAxtWM ktBqmA5B0JgpFwW9LnErVjNoVQWUxfmgri1m3SASZTsq4aDiYmYIZjFH6b6MWet+6tz0Z8 lc6MsI37sPk4OWVC960hv1m8pq5TTzdNS5Jt5rXYrSyLsN1p2Ez9vpb6WEkbBjeHx1n+73 x3hnlajr90Ms3TqKKebUaCQs5qMlKcbczGqXzzyrwYNZkLP7Bj6hfLYVmG+tJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793671; a=rsa-sha256; cv=none; b=TH9G2zMp13nYJvM2ZjxPGT5b3QGdP8qVVm4SKXGmZE3omIWP/BdcnIlx43zYZNIoGy4I2q gGhqrguVgp02RMrhum0U689xNIu6OtV4x6HZBP+u6532pwJ0NZUdKi1AGQqjWN+Oy137ej iLjvnN1B6MaRx99bBUKHXCJiB2vHAPNMeWOsPCnDruIStqMmxmjcYQdr/Gk0ZVdxbc7iCw dSEkxQq3nG/FtRdD/04rB1sgaXe8hwmCBsDVni4eIzlhGc1Swu/HXXFE4RecpPrZv3OrG6 Vu9lG65K54EIJMQHlwk0fRRysgqBLouiqCRZiDV3IH9SODspZ599rtDHcnjCzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKCugiBJF57dzHsEcl5IeR/10PDA/ZAc1b53y3jV/0Q=; b=WAFiJ7ZcgQKNHzAsT5rG/DS7lAjDuLpc6kooCsrCHOnmdR7i4wb8p7kaBf3aGIYeTmzRhP OxQtjdlD0xZNeNSsmlhHcpUptqxxn0Q4tiz4AJbejJreFZa0AyLxpO+RkkjBfYr5Azq5ye MTpp5UB7MmFeidB1aQWSWjSIJTDDht4w7JjOMX3607UVp9eu0mq2e1LhAEX5SVWNSvqJyr ojOrzQorVGYKxMeIvJmdkXoPayytQvKCEYg9Z9HSIJ1LFeb7STTHGcQVcxW0r6IYsEU+Ma yyfydYGyHgnfbwoZ0D8pSPuEC8Sv6T3WlYA3buqcCaoUkVhvg4j9NXmBEvS1tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRQb3Tg8zqp0; Mon, 22 Apr 2024 13:47: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 43MDlp96021605; Mon, 22 Apr 2024 13:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDlpNU021602; Mon, 22 Apr 2024 13:47:51 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:47:51 GMT Message-Id: <202404221347.43MDlpNU021602@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: 753de7251761 - stable/14 - tarfs.5: Provide some guidance on zstd frame 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 753de7251761e9ce7dfe7a6196b6d2ef7806d996 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=753de7251761e9ce7dfe7a6196b6d2ef7806d996 commit 753de7251761e9ce7dfe7a6196b6d2ef7806d996 Author: Mark Johnston AuthorDate: 2024-04-05 15:28:55 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 13:47:37 +0000 tarfs.5: Provide some guidance on zstd frame sizes Reviewed by: des, emaste MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44636 (cherry picked from commit fd56d24725860a3c1f12180cf8503d38d8d0c70d) --- share/man/man5/tarfs.5 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/man/man5/tarfs.5 b/share/man/man5/tarfs.5 index 5378491b9c9f..56c56ac43287 100644 --- a/share/man/man5/tarfs.5 +++ b/share/man/man5/tarfs.5 @@ -74,6 +74,15 @@ to create the tar file, this can be achieved using the and .Cm ztsd:frame-per-file options. +Sensible frame sizes are powers of 2 between the system's base page size +(see +.Xr arch 7 ) +and the value of the +.Sy kern.maxphys +sysctl. +Smaller frames will generally yield a worse compression ratio and require extra +kernel memory to maintain an index, and larger frames will on average require +more CPU time to access data when performing random I/O. .Sh DIAGNOSTICS If enabled by the .Dv TARFS_DEBUG From nobody Mon Apr 22 13:47:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNRQc5B7Wz5H7cj; Mon, 22 Apr 2024 13:47: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 4VNRQc4d8yz4fg4; Mon, 22 Apr 2024 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaIvjqGkc3hCAfHdeJfoe3gnlG2bnoynmMt/blC1zOc=; b=t8HREv1RO1liYSOdKRoMJ3rSXFEcVMQ8RpD7XpNnj7sIpLvW1N+QKYYiRUgDI5bQB2vcf1 p6XqUPHhKhllnDZtTF+4Sjk5EugxAULcAsT3NXkWGajUIV9jPuE+rviUGB3PqYT9zLA7+S DIx0fISgjSElSQ6YwyYSixAmilxYcvJNJzwHzKaAAm7Bd37KNZ0hCbMnoWEK+jyQp7hhQu fGCGw8s9iyRwoQdbxFIWSFlDdwq+HEtTlNL6JmlSRoFlUsrRm8sURgN2HTo0aEgFxpcaal 7EiVUTXP125wfKsZVvcUM+EdAtkTQblulZ5REVdASLWUBuk26a2PS42FbjblNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793672; a=rsa-sha256; cv=none; b=RHTJU21EnNvN6ZkeWtFD8VXTGht44WSS4jPz/KiWPidkdFbMdDYT5cF5okoCzmpBHKKD7N 58pDhkDLFBExIQ8BgJTmD1SA8u6AMbiuNHmcqtKfpe0OV7wsbhqQOc5V0+VyV0lQwaYJbX daNwVeStZrn7RQ+/NxIA2ORrHbCW/WVwiMMQyvl8/qZgsWTTn+inDF0DSdC3Dp4ho9GL2s mt9UhJpXo2oil8RSN+KMfCgOabu++Vsuf3dIStMsm6Qo5gClJ6aKoAFV4oTiLeYyoJy2gV tCFqhRBJdXQOF7sD/IQMrJvEVma/GaNDC+VhmEzd8xLuL0SGYoNmh6jXclj+CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaIvjqGkc3hCAfHdeJfoe3gnlG2bnoynmMt/blC1zOc=; b=HxsvIzACvtVZsp4GU8AopasXef+daNQAXw22ztETB7l4AQZjfqXt+Lx2nI4Zk0nNpk0Fd2 p9dhVkn5dYHi7Hkc7ueNj4k1hGbPEk3OPtKM3rAaBJo6pM67G45bMm7zKJDl0B8Ki99WIC VcDn9oEM9TLu0e+usPpAu4pTHS4HEzUoQY9z8tqKulQjDP+e8GrFsV6INOzfaT/gsSzecf ZZPHOFfPvOl49gx0EvigY/bqlUSFPFoPBPHaSAe56x+cMZ32AyimpwhYzok5a51U7t+Phl +LLNxsRs6l3pNHcQ8Si3uvjxIFEvrd2RemKfaZqOXojRoH56hBtf6HMk0V+9gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRQc4DL5zr3y; Mon, 22 Apr 2024 13:47: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 43MDlqf1021667; Mon, 22 Apr 2024 13:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDlqkL021665; Mon, 22 Apr 2024 13:47:52 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:47:52 GMT Message-Id: <202404221347.43MDlqkL021665@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: fc045609789f - stable/14 - arm64: add CPU part identifiers for Apple M1 and M2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc045609789feec9d6dce75c3558fd080d53a004 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc045609789feec9d6dce75c3558fd080d53a004 commit fc045609789feec9d6dce75c3558fd080d53a004 Author: Lexi Winter AuthorDate: 2024-03-23 16:18:24 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 13:47:38 +0000 arm64: add CPU part identifiers for Apple M1 and M2 Part numbers are sourced from Linux (arch/arm64/include/asm/cputype.h). MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1144 (cherry picked from commit da2b732288c72b347b128e1fa9a169c7bba3beb8) --- sys/arm64/arm64/identcpu.c | 19 ++++++++++++++++++- sys/arm64/include/cpu.h | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index d02be636ad50..8ecb4926c198 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -251,6 +251,23 @@ static const struct cpu_parts cpu_parts_qcom[] = { CPU_PART_NONE, }; +/* Apple */ +static const struct cpu_parts cpu_parts_apple[] = { + { CPU_PART_M1_ICESTORM, "M1 Icestorm" }, + { CPU_PART_M1_FIRESTORM, "M1 Firestorm" }, + { CPU_PART_M1_ICESTORM_PRO, "M1 Pro Icestorm" }, + { CPU_PART_M1_FIRESTORM_PRO, "M1 Pro Firestorm" }, + { CPU_PART_M1_ICESTORM_MAX, "M1 Max Icestorm" }, + { CPU_PART_M1_FIRESTORM_MAX, "M1 Max Firestorm" }, + { CPU_PART_M2_BLIZZARD, "M2 Blizzard" }, + { CPU_PART_M2_AVALANCHE, "M2 Avalanche" }, + { CPU_PART_M2_BLIZZARD_PRO, "M2 Pro Blizzard" }, + { CPU_PART_M2_AVALANCHE_PRO, "M2 Pro Avalanche" }, + { CPU_PART_M2_BLIZZARD_MAX, "M2 Max Blizzard" }, + { CPU_PART_M2_AVALANCHE_MAX, "M2 Max Avalanche" }, + CPU_PART_NONE, +}; + /* Unknown */ static const struct cpu_parts cpu_parts_none[] = { CPU_PART_NONE, @@ -261,7 +278,7 @@ static const struct cpu_parts cpu_parts_none[] = { */ const struct cpu_implementers cpu_implementers[] = { { CPU_IMPL_AMPERE, "Ampere", cpu_parts_none }, - { CPU_IMPL_APPLE, "Apple", cpu_parts_none }, + { CPU_IMPL_APPLE, "Apple", cpu_parts_apple }, { CPU_IMPL_APM, "APM", cpu_parts_apm }, { CPU_IMPL_ARM, "ARM", cpu_parts_arm }, { CPU_IMPL_BROADCOM, "Broadcom", cpu_parts_none }, diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 9ef5b7897a7c..c84d48438964 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -134,6 +134,20 @@ #define CPU_PART_KRYO400_GOLD 0x804 #define CPU_PART_KRYO400_SILVER 0x805 +/* Apple part numbers */ +#define CPU_PART_M1_ICESTORM 0x022 +#define CPU_PART_M1_FIRESTORM 0x023 +#define CPU_PART_M1_ICESTORM_PRO 0x024 +#define CPU_PART_M1_FIRESTORM_PRO 0x025 +#define CPU_PART_M1_ICESTORM_MAX 0x028 +#define CPU_PART_M1_FIRESTORM_MAX 0x029 +#define CPU_PART_M2_BLIZZARD 0x032 +#define CPU_PART_M2_AVALANCHE 0x033 +#define CPU_PART_M2_BLIZZARD_PRO 0x034 +#define CPU_PART_M2_AVALANCHE_PRO 0x035 +#define CPU_PART_M2_BLIZZARD_MAX 0x038 +#define CPU_PART_M2_AVALANCHE_MAX 0x039 + #define CPU_IMPL(midr) (((midr) >> 24) & 0xff) #define CPU_PART(midr) (((midr) >> 4) & 0xfff) #define CPU_VAR(midr) (((midr) >> 20) & 0xf) From nobody Mon Apr 22 13:48:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNRRW151Pz5H82W; Mon, 22 Apr 2024 13:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNRRW0XrQz4g9H; Mon, 22 Apr 2024 13:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyV0KWFrRCNS8lP20wZ8ob4+ueGAH8L0mkbjs/4JMBA=; b=w5Dwo/Kyv+X70ZiXlHp2CRb8HAc/Izoox+zvDcUJkFK4Yb32Z/tp2xbsXXPTYpGLWNRdBf MFMy8Et1MFwAK2A2buMolbsR2j29RcmZQM7mnoeVnvOG8GFm4nzwd+jMIdnfUPMUPD4XlI huG4JNHTgbtKBySA+hLVdj7jhA31C1hbgqbjI7jnoFbjUJD2LARprbBJJF4z37m3dM/K1W zcLXrT9lKTAZFqTsZzFw7AtNA13KcQiEtx9Ml+tD2MwmWM5G0zP5CEEoPItnxDyMTO7SSj x7F0JF7eONLqSshg6EjHLlUueOvuplI2JO/K60A94lfmTyfWuQL1eTT78PZQ3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793719; a=rsa-sha256; cv=none; b=yHchQXS+i2aZpRqjKz2aDhVt1u/P+4DrH/GEeuX1Ynhi3rmIs9NcRMHtT8aaZDjkINMdl1 kw5N/xrl3qiR2aL9tYvgyLhd7u8C9Xyp5m1srM9j+GNpo0Jhuv7RhqcbMyLkkeImyR0qTF uagnnOjPrrE4JUNPLFV/1PT0G73C7desK9hhyPep/M0CpkLen6nPM4FLRMMSGJyKE4tpMk ZKI0dmonD7CZ5jh67WhfNkM5iS+aaWg0/P1Z9A1K3gOSgKsVCmcvk4e1ps3NuvblZ3DNTg TCWb2xSMhNRCPy33SbeIq4MlNHiaNg8Cfj8/EsPm4wW1/OW14c706oU6Clp9hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyV0KWFrRCNS8lP20wZ8ob4+ueGAH8L0mkbjs/4JMBA=; b=twRhwobZc/AlMyWku1aw/6b9Z8EFq9Tw78RHcsOZNHZv7MDMMXgdyolh0cpVrPO+qB6tFD CTR7cmIcWaHUbkfB99q8rO+HQRKucPcbBg6FQupsBiUo7D3TPdVZcD75IqyMtipYgjeC9W VlY9KTTKAVTb+V6WUwyc9Fjw06RuQ1d1j2bbX+dGcRAHGk8ioOsIanopTcSJCyJgeGM8sp x3yr+qFaAf11VWHJVgKJjmq00qNFzN0aodWcU7EFqKNANnafA+NzGSNWDnxo5jy4mqYV8u 8B/dbXjODAo+Z4h4ZQcQvCTAy+rqKT7THcn+/9mVruKBP8E023tZQqIGbA6fIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRRV6y6dzqZZ; Mon, 22 Apr 2024 13:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MDmcrT021952; Mon, 22 Apr 2024 13:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDmcnk021949; Mon, 22 Apr 2024 13:48:38 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:48:38 GMT Message-Id: <202404221348.43MDmcnk021949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a1e55af8d123 - stable/14 - Fix MNT_IGNORE for devfs, fdescfs and nullfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1e55af8d12398ae43725ff6987b2fdbb2044fd2 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a1e55af8d12398ae43725ff6987b2fdbb2044fd2 commit a1e55af8d12398ae43725ff6987b2fdbb2044fd2 Author: Doug Rabson AuthorDate: 2023-08-26 09:32:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-22 13:48:15 +0000 Fix MNT_IGNORE for devfs, fdescfs and nullfs The MNT_IGNORE flag can be used to mark certain filesystem mounts so that utilities such as df(1) and mount(8) can filter out those mounts by default. This can be used, for instance, to reduce the noise from running container workloads inside jails which often have at least three and sometimes as many as ten mounts per container. The flag is supplied by the nmount(2) system call and is recorded so that it can be reported by statfs(2). Unfortunately several filesystems override the default behaviour and mask out the flag, defeating its purpose. This change preserves the MNT_IGNORE flag for those filesystems so that it can be reported correctly. MFC after: 1 week (cherry picked from commit b5c4616582cebdcf4dee909a3c2f5b113c4ae59e) --- sys/fs/devfs/devfs_vfsops.c | 2 +- sys/fs/fdescfs/fdesc_vfsops.c | 2 +- sys/fs/nullfs/null_vfsops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index a81a63ebf27a..dbc29fbe4d78 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -224,7 +224,7 @@ static int devfs_statfs(struct mount *mp, struct statfs *sbp) { - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 309134798374..30924580dece 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -219,7 +219,7 @@ fdesc_statfs(struct mount *mp, struct statfs *sbp) freefd += (lim - fdp->fd_nfiles); FILEDESC_SUNLOCK(fdp); - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 262a6793b285..5114fa0b50ae 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -372,7 +372,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED)) | + MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; From nobody Mon Apr 22 13:48:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNRRX3HkNz5H89b; Mon, 22 Apr 2024 13:48: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 4VNRRX1Drgz4fxM; Mon, 22 Apr 2024 13:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=nqQeZUWnoiqWz24mVtUiyk5ZyULNSMVoTFyHLBt2Sa3Pn4XP5AbCpt5HLds1QkWW0vf6JZ s9Phceohe1VmK42lEUR8eSpfwTG48kqEkmwv/ImbHHk8KtYPJ1Bc3K9yP/ie+C3HOY2fB8 gzjmGNf4HZ0tRS97pFksYU61/G1b02lZsx9d3eAOdqqsFXubjAeFkutktlhYBHBNgDCAwk fvPCDAj12AjSV48RoS4cXs95uA2euFJo+Pv12bzSgyYnUcs0j1Avol4vv9oUwk3CLGG6pS bkKzi1q9VEBCBF2V9Xc6JX5ML2LjJaKv3rFxLQyfO8j5QeV/4u+2i0a/b78xtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793720; a=rsa-sha256; cv=none; b=ThIhSFEgGOUpzZetnHokogibo3auKz4XuVP8zA4KhwpqQ5NClSoLX8F8xJGWY9SlZAwjgb XtjBQ5SsteJdsyYe1JnbkQnynzNWFbXonYwBaebQYN2oQWYiW0i7PRysmxS40fBrwVRi7t M9GKBelpEHHQGHMF97y+V9PLGGrjqqbg0ahxXQkIetwRZ7VyrpEUAMNe1VYQFwIhXrB0zy 83pERvReG3CJ+43iFVZBlvqeFnqj4XUtTohOaBzg/Ygfqstqz8pbi5TvJHLCBp204HLZ51 VPlouo5DAWCqP0g7jyAqMU+JttoDIVNdAFuhqEVvjld+KACtOZWm2tZ/7tO7RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=M5lODXOnS2zQTtaHLcG5k0vUDSCYU6One5TiFdrF6AtnC9rgpMkTLX9sTKkxAfxkIqZQ+N x9xDko1l5vl9yDK+JqCjUIfcK3STUEcb5SwI1BXAhFfQ2icrSdkuaL5mEQuxa5LYf5zJEG EU0eUoITE3y4hhm1Bq+fq1+XwSA4PAJptFzibdlWV+3BuCisk1TaSE1xUdFylFznwssatM 4MySpLzy+FNlowqQ0OKuKv82KqWJn6tOy3QGvqu9ogvYlh7EbVl01K/uQc3byYb/ljYWnG kHcA07ikL+iC1q1eEXIlgw8Ju8XJ6+99yR3dh1JeLSGFibmpn6q9L4WjhCK02w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRRX0r9BzqZb; Mon, 22 Apr 2024 13:48: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 43MDmeoK021997; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDmefA021994; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:48:40 GMT Message-Id: <202404221348.43MDmefA021994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0ee0770fafc3 - stable/14 - nullfs: Show correct exported flag. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 commit 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-22 13:48:15 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 (cherry picked from commit 2b258dd17caf329bc549f93d9858b74109a479d7) --- sys/fs/nullfs/null_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 5114fa0b50ae..35d0f46d0ef7 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -371,9 +371,10 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | - (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); + sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | + MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; + mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); + sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks; From nobody Mon Apr 22 15:54:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNVDh261wz5HMqD; Mon, 22 Apr 2024 15:54: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 4VNVDh1bW2z440n; Mon, 22 Apr 2024 15:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mrmXBrAJuGkNE0fpjzjWA9eQZ9MktbCNgIOT1rXdIXU=; b=tI7ukZUW1Ge1hawqxzsMR5hsdDQILR+nxHXK8YmBvHixPbYEYG2wYdjq95AkaQ4p4CEDEc aqdV/sCFuQatxTvqVxS1h7N02aqYarcGiRzof5H35KQHDEi2yzsLKtsSCj8nMIZ05JBwjD k6XofN2Qqloo/z4VYk+hUJVaWw+/9U77qrqgTuExpuBZUYwrEKV07enathCLukynJr3Zg+ cwF5iX8Vr9U/VRfBAdlIv0CpCj80OWnj1+ySDUPwvyEUPDg0wB7XIDnZBFryWi2xCbvTb/ QFgCXfruYatsijfSTaSGMgQlLyBwlV9h6tyZd4zxANnwJssN/t8UITYdkpVCzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713801268; a=rsa-sha256; cv=none; b=NJERIPc9D/dgNp4M0ERv4bgi3QgbjP9ud4nMRj22wQb1erQVu6Y2nepR0Jq8yyYYEbrUCH P5nnxkKdFEEKkAGdde3mwVxZvYLxDg46Mt9RluZUO2zx7W+zNJzfVhFUwPG9UZb+zsvlMt 9Xjxa3uajUCBGbmhZ7JW9PjxGaqbRkQSG9ezLNiHxXAYVd+KcEaUugzJa2ClDAs+dqfiBQ Ow0QyysZn1/RCKVb2VkUdpkeMruomkODoS6QH9QrMeT9POiNIkSwv6BFbshItpxXMN84ld ripaKihnsBMWMLTbf8IWVb/XzJuPZ5G0EgR+MwvhewQumrV9l0pI4+QxQvQX9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mrmXBrAJuGkNE0fpjzjWA9eQZ9MktbCNgIOT1rXdIXU=; b=yvIfb+tkLP6QTjDmQvORRmOtkVNFfK2d3vXa2u289AZwtA6OHulU0H0eT2j82gNGhNxdJn 0as0HVrr1HYBu4ce0CbbLARcpl/v4TibusgjfUg5Sxeh4ZODIBYpMZfY70LFptyPOu54ba WkXfMHaZBFpedwhMJ/LwmEaf0Oc5dqc4drTHChdAkdTJ5dCfHNLMM+uJeCO3cTO0BRkb4M ISyCn7xr4KTvmEsLYPc9c5lW+v5O2I6H4kv0N2iMqkl1fOQwy95++jNGViLJCz+h04pwpB VsFwu8J6JaQpc2gPheUQzYZHqx48b/CxkbEIv4Df6g4DC5zrLv/6Cpjop5G9WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNVDh0wDZztNh; Mon, 22 Apr 2024 15:54: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 43MFsRPC041221; Mon, 22 Apr 2024 15:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MFsR3n041218; Mon, 22 Apr 2024 15:54:27 GMT (envelope-from git) Date: Mon, 22 Apr 2024 15:54:27 GMT Message-Id: <202404221554.43MFsR3n041218@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: 800da341bc4a - main - thread: Simplify sanitizer integration with thread creation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 800da341bc4a35f4b4d82d104b130825d9a42ffa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=800da341bc4a35f4b4d82d104b130825d9a42ffa commit 800da341bc4a35f4b4d82d104b130825d9a42ffa Author: Mark Johnston AuthorDate: 2024-04-22 15:43:17 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 15:46:59 +0000 thread: Simplify sanitizer integration with thread creation fork() may allocate a new thread in one of two ways: from UMA, or cached in a freed proc that was just allocated from UMA. In either case, KASAN and KMSAN need to initialize some state; in particular they need to initialize the shadow mapping of the new thread's stack. This is done differently between KASAN and KMSAN, which is confusing. This patch improves things a bit: - Add a new thread_recycle() function, which moves all kernel stack handling out of kern_fork.c, since it doesn't really belong there. - Then, thread_alloc_stack() has only one local caller, so just inline it. - Avoid redundant shadow stack initialization: thread_alloc() initializes the KMSAN shadow stack (via kmsan_thread_alloc()) even through vm_thread_new() already did that. - Add kasan_thread_alloc(), for consistency with kmsan_thread_alloc(). No functional change intended. Reviewed by: khng MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44891 --- sys/kern/kern_fork.c | 17 +++-------------- sys/kern/kern_thread.c | 20 ++++++++++++-------- sys/kern/subr_asan.c | 10 ++++++++++ sys/sys/asan.h | 4 ++++ sys/sys/proc.h | 2 +- sys/vm/vm_glue.c | 9 ++++----- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index d0044dfc19a0..41f6a76c4fa1 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include @@ -1019,19 +1018,9 @@ fork1(struct thread *td, struct fork_req *fr) } proc_linkup(newproc, td2); } else { - kmsan_thread_alloc(td2); - if (td2->td_kstack == 0 || td2->td_kstack_pages != pages) { - if (td2->td_kstack != 0) - vm_thread_dispose(td2); - if (!thread_alloc_stack(td2, pages)) { - error = ENOMEM; - goto fail2; - } - } else { - kasan_mark((void *)td2->td_kstack, - ptoa(td2->td_kstack_pages), - ptoa(td2->td_kstack_pages), 0); - } + error = thread_recycle(td2, pages); + if (error != 0) + goto fail2; } if ((flags & RFMEM) == 0) { diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 0bcd5c2f2add..725791769ac3 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -798,6 +798,7 @@ thread_alloc(int pages) } td->td_tid = tid; bzero(&td->td_sa.args, sizeof(td->td_sa.args)); + kasan_thread_alloc(td); kmsan_thread_alloc(td); cpu_thread_alloc(td); EVENTHANDLER_DIRECT_INVOKE(thread_ctor, td); @@ -805,15 +806,18 @@ thread_alloc(int pages) } int -thread_alloc_stack(struct thread *td, int pages) +thread_recycle(struct thread *td, int pages) { - - KASSERT(td->td_kstack == 0, - ("thread_alloc_stack called on a thread with kstack")); - if (!vm_thread_new(td, pages)) - return (0); - cpu_thread_alloc(td); - return (1); + if (td->td_kstack == 0 || td->td_kstack_pages != pages) { + if (td->td_kstack != 0) + vm_thread_dispose(td); + if (!vm_thread_new(td, pages)) + return (ENOMEM); + cpu_thread_alloc(td); + } + kasan_thread_alloc(td); + kmsan_thread_alloc(td); + return (0); } /* diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index c3664d9cf6c2..75d9e75c531a 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.26 2020/09/10 14:10:46 maxv Exp $"); #include #include #include +#include #include #include @@ -294,6 +295,15 @@ kasan_mark(const void *addr, size_t size, size_t redzsize, uint8_t code) } } +void +kasan_thread_alloc(struct thread *td) +{ + if (td->td_kstack != 0) { + kasan_mark((void *)td->td_kstack, ptoa(td->td_kstack_pages), + ptoa(td->td_kstack_pages), 0); + } +} + /* -------------------------------------------------------------------------- */ #define ADDR_CROSSES_SCALE_BOUNDARY(addr, size) \ diff --git a/sys/sys/asan.h b/sys/sys/asan.h index a3becdef5f57..6a01d0531725 100644 --- a/sys/sys/asan.h +++ b/sys/sys/asan.h @@ -53,14 +53,18 @@ #define KASAN_KSTACK_FREED 0xFE #define KASAN_EXEC_ARGS_FREED 0xFF +struct thread; + void kasan_init(void); void kasan_init_early(vm_offset_t, size_t); void kasan_shadow_map(vm_offset_t, size_t); void kasan_mark(const void *, size_t, size_t, uint8_t); +void kasan_thread_alloc(struct thread *); #else /* KASAN */ #define kasan_init() #define kasan_shadow_map(a, s) #define kasan_mark(p, s, l, c) +#define kasan_thread_alloc(t) #endif /* !KASAN */ #endif /* !_SYS_ASAN_H_ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 33b836f4150e..1b542d1374b4 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1262,7 +1262,6 @@ void cpu_thread_free(struct thread *); void cpu_thread_swapin(struct thread *); void cpu_thread_swapout(struct thread *); struct thread *thread_alloc(int pages); -int thread_alloc_stack(struct thread *, int pages); int thread_check_susp(struct thread *td, bool sleep); void thread_cow_get_proc(struct thread *newtd, struct proc *p); void thread_cow_get(struct thread *newtd, struct thread *td); @@ -1275,6 +1274,7 @@ void thread_exit(void) __dead2; void thread_free(struct thread *td); void thread_link(struct thread *td, struct proc *p); void thread_reap_barrier(void); +int thread_recycle(struct thread *, int pages); int thread_single(struct proc *p, int how); void thread_single_end(struct proc *p, int how); void thread_stash(struct thread *td); diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 4292a7533503..f9235fe03fab 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -543,8 +543,6 @@ vm_thread_new(struct thread *td, int pages) td->td_kstack = ks; td->td_kstack_pages = pages; td->td_kstack_domain = ks_domain; - kasan_mark((void *)ks, ptoa(pages), ptoa(pages), 0); - kmsan_mark((void *)ks, ptoa(pages), KMSAN_STATE_UNINIT); return (1); } @@ -562,11 +560,12 @@ vm_thread_dispose(struct thread *td) td->td_kstack = 0; td->td_kstack_pages = 0; td->td_kstack_domain = MAXMEMDOM; - kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); - if (pages == kstack_pages) + if (pages == kstack_pages) { + kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); uma_zfree(kstack_cache, (void *)ks); - else + } else { vm_thread_stack_dispose(ks, pages); + } } /* From nobody Mon Apr 22 15:54:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNVDj2WQBz5HMqH; Mon, 22 Apr 2024 15:54: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 4VNVDj1h5qz44Rt; Mon, 22 Apr 2024 15:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYGTPfmQsaWjJyTs8K5+LL7vDHK1vlOmJD3FHhZYv5M=; b=Uj2woHJARZlB9YEcSnBL/zk+c/eN3uxJXjRZL1lMG/qtTcZVLKyN8Yz6UJnZlZOuesHzam sCj2G2Fh728f8ZW1Ddbzsj4pUwB1iV2FZQvvZOt+wxW3oIjg4y3xV8+PGEqdbgnx/OTwUZ dr1W/xSpnr1u3Zbf/9dcg1tG4vOJe9Xkl7kt5+zTI3jHqqdpm1FFJjsRr/YjXhICLGJW5C iD19ym9LNjoCr3YFdLmCaCBHGl8uwK2ycMNRsReNMR30Z8MpI/f1NhWyxRD+YDZl2iOiPV F9WzMdDpGk+W4y1cJsKNS8Q34VSLPOGHQVFOfgXWfmJ4UiBZN5w6EwdoJlAnsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713801269; a=rsa-sha256; cv=none; b=EweF7OGJZAsO/Mtz7XU5j86ZN40QDbVHvoLukChxXgwJyTd79dL2NNlFhCoup494hIe6HU 7zkfJfLl+sTHNUExrSk6HK+u1lZxv0adCpkS4LThgp98lPvgtWlqpVOzK9zA8qYNoxMRZz V4WtViHzxGQHzwYG1VoMtXDj5YbxKz+XhvI9RH2D2BO0hzQbHR7P0nyxHoXx18cWFKOvCQ lgsp8XOo+q3+bUZM/R4/8Kct3UqIAuN2YFtd+qdTh/dcyaJCZZS3nEQ5XnaZK0W6HCvo2l X0IeY/hwGP9iPNElKRSwvR+2qTCpLEVlQvtW6Ke7KiHWbp5/pPnY/lIuIP2GIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYGTPfmQsaWjJyTs8K5+LL7vDHK1vlOmJD3FHhZYv5M=; b=kokvj55cTDeQvgnzjkeb/hIWxEGwl2QtiWfUlGWPNJaSHRJl03RkqplXXZ10uTvVvgApCY JPoYVqCF1kfbOij2Ds+y+SKBKCRt139TDIAJuBTnhUl80HdtJ5XHA0Q8g/I/KFFoAY9Vp6 XPlbNgMZ0FB/6cMsD8y1HVf0BsY+HQLESjRyXir5f3yoKMds11i7jFvbLro70wzXzd5rHA IjkPvE8MdyeJECSDuKao3WukW3CkE5MTO5XuK69vZmmScz3NBIIZWz6CucV/jvcgsT0KYM KeSeHGND6DZT4qHsXXl5F/Iy75J6koHIKDyxnNx0dYFZvW2oRed6kdrncrieyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNVDj1JVzztNj; Mon, 22 Apr 2024 15:54: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 43MFsT2T041273; Mon, 22 Apr 2024 15:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MFsTsg041270; Mon, 22 Apr 2024 15:54:29 GMT (envelope-from git) Date: Mon, 22 Apr 2024 15:54:29 GMT Message-Id: <202404221554.43MFsTsg041270@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: 7f7b4926a779 - main - ng_hci: Add sockaddr validation to sendto() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 7f7b4926a779845116913c85ecbb10527daeab02 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f7b4926a779845116913c85ecbb10527daeab02 commit 7f7b4926a779845116913c85ecbb10527daeab02 Author: Mark Johnston AuthorDate: 2024-04-22 15:48:00 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 15:48:00 +0000 ng_hci: Add sockaddr validation to sendto() ng_btsocket_hci_raw_send() wasn't verifying that the destination address specified by sendto() is large enough to fill a struct sockaddr_hci. Thus, when copying the socket address into an mbuf, ng_btsocket_hci_raw_send() may read past the end of the input sockaddr while copying. In practice this is effectively harmless since ng_btsocket_hci_raw_output() only uses the address to identify a netgraph node. Reported by: Oliver Sieber MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 5d015b2eac6e..b8caf0c515fd 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -1598,6 +1598,17 @@ ng_btsocket_hci_raw_send(struct socket *so, int flags, struct mbuf *m, goto drop; } + if (sa != NULL) { + if (sa->sa_family != AF_BLUETOOTH) { + error = EAFNOSUPPORT; + goto drop; + } + if (sa->sa_len != sizeof(struct sockaddr_hci)) { + error = EINVAL; + goto drop; + } + } + mtx_lock(&pcb->pcb_mtx); error = ng_btsocket_hci_raw_filter(pcb, m, 0); From nobody Mon Apr 22 16:04:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNVS71yBPz5HN9M; Mon, 22 Apr 2024 16:04: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 4VNVS71VKsz456x; Mon, 22 Apr 2024 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vJtOyBGtu0rmVJd+Wc7SXUSsgFvIlhdnGGkN1kaB8E=; b=S5DLW24o+tCgN5o2k1lHT2BZ0NKxFM9hqIF7uB0bwCvJY44aovU8DbGYnK2X5uCp9aqyHg Jfjdp0+BHvws822WgAQKToiF3VU9s9xuMqj0k3xKiyBdC0F4KKIVbyvqNy2oe8KycSdSxW 59bs09KLFdRTWDN5IOInlRspYCcQayb2WWbIcNy0oriYLhJqItKJZukGfkLpR8kbR13Yhg HdLmI1/SjrBqk7fg9xpflYIIr2pt1cVSwKeTUC1YyWZj8Hk7XSNKdEyqHeUxxta/iR22Gl lfl/WnYh0ehKixVNA8IXMOHqXrfhBvpqaN+Sqp0fGgzMlG2whNBmVsdSVwMSrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713801863; a=rsa-sha256; cv=none; b=tfKEn1lW03RKyVTzKkFQ1QRRxM9IxrIz8247OMC+IzYmmq8mAxIDFuC8YompHK/0JYPy+V I7l/dopfavBFrQqj3vdwzshYEo1bzQYL4RJv4mcjQmfIBdm9zafh7b5JxYIvJiiSsyEf+E GwHNc5EVpDujCD8xQk+wn2wnJqnZFB+oouK4uIWSeI0gy6WdfOpQ/Y58+M4CRqISRE/VFB m6HhTaq89Lhu8GGYNbgcEfRKFE2XNHMwM3VWAh7dBtzL8sBcD76F7iK1HVpczJHOVoczyA PguUb66S3r3p4noGhVe9X12Buih/LefD+TGsNl7CwGSwnjdT4cq3e2oVBdAynQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713801863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vJtOyBGtu0rmVJd+Wc7SXUSsgFvIlhdnGGkN1kaB8E=; b=wvWHeTNsyWhMTDZRXI4sIWvaRm4CTKDUyprG7bmxTowSdADJEJgRYDljEAZydcRL4uvxmo 6ngmzR2/5dGPeD7LX2fZd+CjPKpURkBu6Di+qzh8WIKg52zGFGArX3FxPM9eZJE1kFlTMY eFb9vXSCB/Fv/MdXC5fJqf9v0jEe5Ob81DdmmHKXELVWx/x3nrGicTuA80o6H94THFibm4 bbrjaaoHb5S7MAgSKEwF94CawMgoQsa9uE0XhPvrkkgAQXDO2CdPA5kmBqChYDyOtcQ2M2 ol4DnBDpgALZD7si5Evgz4LVWkmRh7eGjza/J/Jk3w1M0glsyPTFUY0IgzatJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNVS715p2zvTZ; Mon, 22 Apr 2024 16:04: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 43MG4NI2058935; Mon, 22 Apr 2024 16:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MG4NIT058932; Mon, 22 Apr 2024 16:04:23 GMT (envelope-from git) Date: Mon, 22 Apr 2024 16:04:23 GMT Message-Id: <202404221604.43MG4NIT058932@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: ef84dd8f4926 - main - if_bridge: clean up INET/INET6 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ef84dd8f4926304306d5989ca9afdbf760c6d813 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef84dd8f4926304306d5989ca9afdbf760c6d813 commit ef84dd8f4926304306d5989ca9afdbf760c6d813 Author: Lexi Winter AuthorDate: 2024-04-21 18:56:23 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 16:01:27 +0000 if_bridge: clean up INET/INET6 handling The if_bridge contains several instances of: if (AF_INET code ... #ifdef INET6 AF_INET6 code ... #endif ) { ... Clean this up by adding a couple of macros at the top of the file that are conditionally defined based on whether INET and/or INET6 are enabled, which makes the code more readable and easier to maintain. No functional change intended. Reviewed by: zlei, markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1191 --- sys/net/if_bridge.c | 65 +++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 31758733adb1..1b4ac92b62a3 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -134,6 +134,31 @@ #include +/* + * At various points in the code we need to know if we're hooked into the INET + * and/or INET6 pfil. Define some macros to do that based on which IP versions + * are enabled in the kernel. This avoids littering the rest of the code with + * #ifnet INET6 to avoid referencing V_inet6_pfil_head. + */ +#ifdef INET6 +#define PFIL_HOOKED_IN_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head) +#define PFIL_HOOKED_OUT_INET6 PFIL_HOOKED_OUT(V_inet6_pfil_head) +#else +#define PFIL_HOOKED_IN_INET6 false +#define PFIL_HOOKED_OUT_INET6 false +#endif + +#ifdef INET +#define PFIL_HOOKED_IN_INET PFIL_HOOKED_IN(V_inet_pfil_head) +#define PFIL_HOOKED_OUT_INET PFIL_HOOKED_OUT(V_inet_pfil_head) +#else +#define PFIL_HOOKED_IN_INET false +#define PFIL_HOOKED_OUT_INET false +#endif + +#define PFIL_HOOKED_IN_46 (PFIL_HOOKED_IN_INET6 || PFIL_HOOKED_IN_INET) +#define PFIL_HOOKED_OUT_46 (PFIL_HOOKED_OUT_INET6 || PFIL_HOOKED_OUT_INET) + /* * Size of the route hash table. Must be a power of two. */ @@ -2127,11 +2152,7 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp) return; } - if (PFIL_HOOKED_OUT(V_inet_pfil_head) -#ifdef INET6 - || PFIL_HOOKED_OUT(V_inet6_pfil_head) -#endif - ) { + if (PFIL_HOOKED_OUT_46) { if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0) return; if (m == NULL) @@ -2429,11 +2450,7 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif, ETHER_BPF_MTAP(ifp, m); /* run the packet filter */ - if (PFIL_HOOKED_IN(V_inet_pfil_head) -#ifdef INET6 - || PFIL_HOOKED_IN(V_inet6_pfil_head) -#endif - ) { + if (PFIL_HOOKED_IN_46) { if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0) return; if (m == NULL) @@ -2465,11 +2482,7 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif, dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) goto drop; - if (PFIL_HOOKED_OUT(V_inet_pfil_head) -#ifdef INET6 - || PFIL_HOOKED_OUT(V_inet6_pfil_head) -#endif - ) { + if (PFIL_HOOKED_OUT_46) { if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0) return; if (m == NULL) @@ -2626,12 +2639,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) #define CARP_CHECK_WE_ARE_SRC(iface) false #endif -#ifdef INET6 -#define PFIL_HOOKED_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head) -#else -#define PFIL_HOOKED_INET6 false -#endif - #ifdef DEV_NETMAP #define GRAB_FOR_NETMAP(ifp, m) do { \ if ((if_getcapenable(ifp) & IFCAP_NETMAP) != 0 && \ @@ -2670,8 +2677,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) /* Hand the packet over to netmap if necessary. */ \ GRAB_FOR_NETMAP(bifp, m); \ /* Filter on the physical interface. */ \ - if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \ - PFIL_HOOKED_INET6)) { \ + if (V_pfil_local_phys && PFIL_HOOKED_IN_46) { \ if (bridge_pfil(&m, NULL, ifp, \ PFIL_IN) != 0 || m == NULL) { \ return (NULL); \ @@ -2710,7 +2716,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) #undef CARP_CHECK_WE_ARE_DST #undef CARP_CHECK_WE_ARE_SRC -#undef PFIL_HOOKED_INET6 #undef GRAB_FOR_NETMAP #undef GRAB_OUR_PACKETS @@ -2765,11 +2770,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if, sbif = bridge_lookup_member_if(sc, src_if); /* Filter on the bridge interface before broadcasting */ - if (runfilt && (PFIL_HOOKED_OUT(V_inet_pfil_head) -#ifdef INET6 - || PFIL_HOOKED_OUT(V_inet6_pfil_head) -#endif - )) { + if (runfilt && PFIL_HOOKED_OUT_46) { if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0) return; if (m == NULL) @@ -2812,11 +2813,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if, * pointer so we do not redundantly filter on the bridge for * each interface we broadcast on. */ - if (runfilt && (PFIL_HOOKED_OUT(V_inet_pfil_head) -#ifdef INET6 - || PFIL_HOOKED_OUT(V_inet6_pfil_head) -#endif - )) { + if (runfilt && PFIL_HOOKED_OUT_46) { if (used == 0) { /* Keep the layer3 header aligned */ i = min(mc->m_pkthdr.len, max_protohdr); From nobody Mon Apr 22 17:06:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNWrY3wT3z5HTgR; Mon, 22 Apr 2024 17:07:09 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNWrY1PSxz4J0w; Mon, 22 Apr 2024 17:07:09 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 4256D240AC2; Mon, 22 Apr 2024 19:07:01 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 5DFEE24012F; Mon, 22 Apr 2024 19:06:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1713805619; 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=FWrduIrs1CPu8b4lAIC8C+UCgqeuHO3z1TteGaNY8Qk=; b=WAvH2haBMvFER81vDjHIBN5MkbjpEsrZ83ReNRFWml0ZKM9uDUhhVUb0goP+JUaMkOQ7Iy N8zkDEQAqMPTuFAId8iUGe5RLIVjs5A7CVE3EFNSU7VIlW/xCtaL7r4u8bmEcEtP/CwCLW 76+VYFT1u9qElk1/PklvZejXOjeswVbCv5cl3VF60GVmk4a9D/+EolzDQQ7z0XOMjdYlvB ux4BISm1xP2cL9m2YdignH+wmfiYmF/xNzgJKKn3Lh9OYOSV3IfkJSN0dvJk4eMk/xvN26 rKgx+NzfShDra99uOKfqUZdnZR2lVeQI8XmXAQ3ULpjN+p/92OaGgSFFvBoq4g== Received: from thor.intern.walstatt.dynvpn.de (dynamic-089-014-212-179.89.14.pool.telefonica.de [89.14.212.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 160922400D5; Mon, 22 Apr 2024 19:06:59 +0200 (CEST) Date: Mon, 22 Apr 2024 19:06:31 +0200 From: FreeBSD User To: Mark Johnston Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 800da341bc4a - main - thread: Simplify sanitizer integration with thread creation Message-ID: <20240422190658.51b1484e@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202404221554.43MFsR3n041218@gitrepo.freebsd.org> References: <202404221554.43MFsR3n041218@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: c4e74d X-Rspamd-UID: f6e8cb 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:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Queue-Id: 4VNWrY1PSxz4J0w Am Mon, 22 Apr 2024 15:54:27 GMT Mark Johnston schrieb: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=800da341bc4a35f4b4d82d104b130825d9a42ffa > > commit 800da341bc4a35f4b4d82d104b130825d9a42ffa > Author: Mark Johnston > AuthorDate: 2024-04-22 15:43:17 +0000 > Commit: Mark Johnston > CommitDate: 2024-04-22 15:46:59 +0000 > > thread: Simplify sanitizer integration with thread creation > > fork() may allocate a new thread in one of two ways: from UMA, or cached > in a freed proc that was just allocated from UMA. In either case, KASAN > and KMSAN need to initialize some state; in particular they need to > initialize the shadow mapping of the new thread's stack. > > This is done differently between KASAN and KMSAN, which is confusing. > This patch improves things a bit: > - Add a new thread_recycle() function, which moves all kernel stack > handling out of kern_fork.c, since it doesn't really belong there. > - Then, thread_alloc_stack() has only one local caller, so just inline > it. > - Avoid redundant shadow stack initialization: thread_alloc() > initializes the KMSAN shadow stack (via kmsan_thread_alloc()) even > through vm_thread_new() already did that. > - Add kasan_thread_alloc(), for consistency with kmsan_thread_alloc(). > > No functional change intended. > > Reviewed by: khng > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D44891 > --- > sys/kern/kern_fork.c | 17 +++-------------- > sys/kern/kern_thread.c | 20 ++++++++++++-------- > sys/kern/subr_asan.c | 10 ++++++++++ > sys/sys/asan.h | 4 ++++ > sys/sys/proc.h | 2 +- > sys/vm/vm_glue.c | 9 ++++----- > 6 files changed, 34 insertions(+), 28 deletions(-) > > diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c > index d0044dfc19a0..41f6a76c4fa1 100644 > --- a/sys/kern/kern_fork.c > +++ b/sys/kern/kern_fork.c > @@ -40,7 +40,6 @@ > > #include > #include > -#include > #include > #include > #include > @@ -1019,19 +1018,9 @@ fork1(struct thread *td, struct fork_req *fr) > } > proc_linkup(newproc, td2); > } else { > - kmsan_thread_alloc(td2); > - if (td2->td_kstack == 0 || td2->td_kstack_pages != pages) { > - if (td2->td_kstack != 0) > - vm_thread_dispose(td2); > - if (!thread_alloc_stack(td2, pages)) { > - error = ENOMEM; > - goto fail2; > - } > - } else { > - kasan_mark((void *)td2->td_kstack, > - ptoa(td2->td_kstack_pages), > - ptoa(td2->td_kstack_pages), 0); > - } > + error = thread_recycle(td2, pages); > + if (error != 0) > + goto fail2; > } > > if ((flags & RFMEM) == 0) { > diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c > index 0bcd5c2f2add..725791769ac3 100644 > --- a/sys/kern/kern_thread.c > +++ b/sys/kern/kern_thread.c > @@ -798,6 +798,7 @@ thread_alloc(int pages) > } > td->td_tid = tid; > bzero(&td->td_sa.args, sizeof(td->td_sa.args)); > + kasan_thread_alloc(td); > kmsan_thread_alloc(td); > cpu_thread_alloc(td); > EVENTHANDLER_DIRECT_INVOKE(thread_ctor, td); > @@ -805,15 +806,18 @@ thread_alloc(int pages) > } > > int > -thread_alloc_stack(struct thread *td, int pages) > +thread_recycle(struct thread *td, int pages) > { > - > - KASSERT(td->td_kstack == 0, > - ("thread_alloc_stack called on a thread with kstack")); > - if (!vm_thread_new(td, pages)) > - return (0); > - cpu_thread_alloc(td); > - return (1); > + if (td->td_kstack == 0 || td->td_kstack_pages != pages) { > + if (td->td_kstack != 0) > + vm_thread_dispose(td); > + if (!vm_thread_new(td, pages)) > + return (ENOMEM); > + cpu_thread_alloc(td); > + } > + kasan_thread_alloc(td); > + kmsan_thread_alloc(td); > + return (0); > } > > /* > diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c > index c3664d9cf6c2..75d9e75c531a 100644 > --- a/sys/kern/subr_asan.c > +++ b/sys/kern/subr_asan.c > @@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.26 2020/09/10 14:10:46 maxv > Exp $"); #include > #include > #include > +#include > #include > #include > > @@ -294,6 +295,15 @@ kasan_mark(const void *addr, size_t size, size_t redzsize, uint8_t code) > } > } > > +void > +kasan_thread_alloc(struct thread *td) > +{ > + if (td->td_kstack != 0) { > + kasan_mark((void *)td->td_kstack, ptoa(td->td_kstack_pages), > + ptoa(td->td_kstack_pages), 0); > + } > +} > + > /* -------------------------------------------------------------------------- */ > > #define ADDR_CROSSES_SCALE_BOUNDARY(addr, size) \ > diff --git a/sys/sys/asan.h b/sys/sys/asan.h > index a3becdef5f57..6a01d0531725 100644 > --- a/sys/sys/asan.h > +++ b/sys/sys/asan.h > @@ -53,14 +53,18 @@ > #define KASAN_KSTACK_FREED 0xFE > #define KASAN_EXEC_ARGS_FREED 0xFF > > +struct thread; > + > void kasan_init(void); > void kasan_init_early(vm_offset_t, size_t); > void kasan_shadow_map(vm_offset_t, size_t); > void kasan_mark(const void *, size_t, size_t, uint8_t); > +void kasan_thread_alloc(struct thread *); > #else /* KASAN */ > #define kasan_init() > #define kasan_shadow_map(a, s) > #define kasan_mark(p, s, l, c) > +#define kasan_thread_alloc(t) > #endif /* !KASAN */ > > #endif /* !_SYS_ASAN_H_ */ > diff --git a/sys/sys/proc.h b/sys/sys/proc.h > index 33b836f4150e..1b542d1374b4 100644 > --- a/sys/sys/proc.h > +++ b/sys/sys/proc.h > @@ -1262,7 +1262,6 @@ void cpu_thread_free(struct thread *); > void cpu_thread_swapin(struct thread *); > void cpu_thread_swapout(struct thread *); > struct thread *thread_alloc(int pages); > -int thread_alloc_stack(struct thread *, int pages); > int thread_check_susp(struct thread *td, bool sleep); > void thread_cow_get_proc(struct thread *newtd, struct proc *p); > void thread_cow_get(struct thread *newtd, struct thread *td); > @@ -1275,6 +1274,7 @@ void thread_exit(void) __dead2; > void thread_free(struct thread *td); > void thread_link(struct thread *td, struct proc *p); > void thread_reap_barrier(void); > +int thread_recycle(struct thread *, int pages); > int thread_single(struct proc *p, int how); > void thread_single_end(struct proc *p, int how); > void thread_stash(struct thread *td); > diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c > index 4292a7533503..f9235fe03fab 100644 > --- a/sys/vm/vm_glue.c > +++ b/sys/vm/vm_glue.c > @@ -543,8 +543,6 @@ vm_thread_new(struct thread *td, int pages) > td->td_kstack = ks; > td->td_kstack_pages = pages; > td->td_kstack_domain = ks_domain; > - kasan_mark((void *)ks, ptoa(pages), ptoa(pages), 0); > - kmsan_mark((void *)ks, ptoa(pages), KMSAN_STATE_UNINIT); > return (1); > } > > @@ -562,11 +560,12 @@ vm_thread_dispose(struct thread *td) > td->td_kstack = 0; > td->td_kstack_pages = 0; > td->td_kstack_domain = MAXMEMDOM; > - kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); > - if (pages == kstack_pages) > + if (pages == kstack_pages) { > + kasan_mark((void *)ks, 0, ptoa(pages), KASAN_KSTACK_FREED); > uma_zfree(kstack_cache, (void *)ks); > - else > + } else { > vm_thread_stack_dispose(ks, pages); > + } > } > > /* > It seems to me that this commit breaks make buildkernel: [...] ===> accf_dns (all) --- kern_thread.o --- /usr/src/sys/kern/kern_thread.c:801:2: error: call to undeclared function 'kasan_thread_alloc'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] 801 | kasan_thread_alloc(td); | ^ /usr/src/sys/kern/kern_thread.c:818:2: error: call to undeclared function 'kasan_thread_alloc'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] --- modules-all --- --- all_subdir_accf_http --- ===> accf_http (all) --- kern_thread.o --- 818 | kasan_thread_alloc(td); | ^ 2 errors generated. Kind regards, oh -- O. Hartmann From nobody Mon Apr 22 17:11:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNWxP3Xk3z5HV4N; Mon, 22 Apr 2024 17:11: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 4VNWxP2Y9Nz4Kmg; Mon, 22 Apr 2024 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713805881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5xKECDSIat5hjxQwvDbhzyl5OIhtjEzMfRRMEila/w=; b=BOEJD6Ocrs0iTQc/qS+udXv8rqW1P4gGitZ6Ors+lXxeiaIXzfCmtQjvaKpNJ3NYESUa8t v4uHL34aM0HPEAr2ZqZIglbvwrmlI6Uh9lmOaT1OdjNwr8JTHCg0UK8oiBg/IIGKwEGq6m +IRRqhFYSliqxqqIpdx2fCy0uXZrpUZpXeYkqx2o1JBKV0Q2pa837VBjwvAfPAwnF167XX on2TJ91hBubTNCeQMtQe43K3Aowfznz5211c3EOv7207OFCrZKla/QDRrOyJ5C65OC+Yt/ YegKd6n+9tDtPk8LKmeZEzW4TCpg6avFs6mN8lXgFuye2noOBJWeJ3vn9YDHpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713805881; a=rsa-sha256; cv=none; b=CPOkjLYoVTx6cTkUP635xSI3Jf3R73VL+bVgJFqik0OMROovmjlj2e4bB9i9rHdv5WrOdO OjL/SHeMC1EbVs3x8uDipf9Br1m1mf6zEJBy4hnBTqIcXNp/QPJjMvRJ1g4aL4uSWXrsDO OiVWxKo81NcZpXp+WW9mbQiyRviYFl9rb1yxJs/97d69yqxnlkzLIndt8DP1+VI5IEktv5 VFtpNm3CzQDaEnId86Jw8FwS2YRi0HisGFsiDqCBaqyFQUjruGNFn1g8DtY67JghgVZbz2 wyzs5ut5wiLZ6Be/PhmeuEVyLZvJPWodjnKfLBTJQG8+lpZ4sTa96xhwf9P24w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713805881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5xKECDSIat5hjxQwvDbhzyl5OIhtjEzMfRRMEila/w=; b=q1TkP0IQacJWnq1df0eSxxyM1GHR0UySWvEbc3T7z+TwCnnPWKNambgHNkK6OwQg1YUOF5 gChgXSFZShcsAEzdDQ6wmJSjiMqQ+UJX7dVYOX4Zkuus9GDVrqfiCyMixcW/UpAF0XWVlo dQOvuGP/f8QrzHhZJ4zVoyqAZqrOPPeFEoQfVdM0j2A6AGTWBiaMbcECcyyrtICcfW4VFC fYVi/RfBgxl8h2gsBNH92kCnQBadnlYQFee06nSGHZRh6i8PfwUdY/q2QnEA/B25FrfKkx 3o2/pSf31XSOZWow7hBsC3fynxTBdk320qo+4A1FwyT08/bmGJOBC+4MsnBSsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNWxP1sCzzwV3; Mon, 22 Apr 2024 17:11: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 43MHBLxL071590; Mon, 22 Apr 2024 17:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MHBLiM071587; Mon, 22 Apr 2024 17:11:21 GMT (envelope-from git) Date: Mon, 22 Apr 2024 17:11:21 GMT Message-Id: <202404221711.43MHBLiM071587@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: 7a7063cc5427 - main - thread: Add a missing include of asan.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 7a7063cc54274a44192fb65c71360a5e72c171b9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7063cc54274a44192fb65c71360a5e72c171b9 commit 7a7063cc54274a44192fb65c71360a5e72c171b9 Author: Mark Johnston AuthorDate: 2024-04-22 17:07:53 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 17:07:53 +0000 thread: Add a missing include of asan.h I didn't notice this during testing because invariants-enabled kernels implicitly include asan.h via kassert.h. Reported by: Lexi Winter Fixes: 800da341bc4a ("thread: Simplify sanitizer integration with thread creation") --- sys/kern/kern_thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 725791769ac3..4a9d1bc8a042 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include From nobody Mon Apr 22 17:12:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNWyW2wGyz5HV21; Mon, 22 Apr 2024 17:12:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 4VNWyW1F2qz4MBK; Mon, 22 Apr 2024 17:12:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-69b6d36b71cso21970396d6.3; Mon, 22 Apr 2024 10:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713805938; x=1714410738; darn=freebsd.org; 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=uaRFLJeJ/Z765Kr+dCoO7X7cQZB9Y2UKiDtFJJSfPKM=; b=k8/ExoeniU2AD/kmQ8nidqWnfhpCbMGM2iU9rmSbu0JgFtd73f8s36CSILqPznHjBy yKwGxu9dxba4EyFYpq0PPKcFygPw7+ch09YIkXBCd8cWEao159FO/NBR4K/5BH3l45md axGSepB1el/cWWP8LryyJpoYGLx8UywNnfcVqRPwjjx67OVKl0QV2sC0g3BUyscbvnQ9 f4PJFJfBvhR3IRff344zcqSR5qn4/onx3QCzkfHlt3r+w6OkIfupLCQu94vow0gxIjhQ sQsIyY1o/vRshAIXtvqfOyk903aUJ/NjnsLQyTDUyETrH126rFGQZyvb5Hq2aKvdm55t XHkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713805938; x=1714410738; 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=uaRFLJeJ/Z765Kr+dCoO7X7cQZB9Y2UKiDtFJJSfPKM=; b=maZ/Q8cdUrx1R6HScoiot0JJpCnJnV46Rt7xHtXc5QU9OAkRZSku6NG9jaU6J5SYfX dFGxJ0Y+jIWWi087YidUqnd+LJC+aaa/+83aG4Jhv6mqylMZMHBIBv8nE0ICCqypvl5X oRMkQ7u47yaS4FXXLJW3DUw1iaN8UA2eupDKG8Siw4vXcj/9JxfHzKxOcrPNrDzUAR83 fvuPlHBcpzlcCEVVDGhJYzgHYlYbvzUTiCfnhNQTCfZ5sOO+BakTpmsvhoFt7pCbG5UK mxiIhDXTWubpRxXE/tXaX5U4onYvtgQtkND6P7FVSAl2issFo3CCz2XVClsUC6VV3p9b 0kHw== X-Forwarded-Encrypted: i=1; AJvYcCW9tXzRd5NFYoVuxa8Zwq6Pn07SftsB6eD4KycaxoTYmeqdn7liSJ7k3R3rChzs4z7LIPouzCgNJy+aOakI5+y64ap23XDJM8fVOpJlZS28qpQogF/N2O2kO18dTP3nZhfuMuvWzFaTjo1T4gVIGFJ8Xg== X-Gm-Message-State: AOJu0Yxo4lKpL+vYUFcrqIESslzp2nuFyHYZScP9G9+fvGVgoCRhWYNn r6YS/5C4dxv8qIe/1XBNTb7fIHmglM9JiTT/8ly2B/NevihiuZxjIa13KQ== X-Google-Smtp-Source: AGHT+IGSfs/Ou2KoVbyYH/eWdWpLfRHt1OIXNrp/g1K1uXRGipsIU/0vBeGfWoQvzXGRE2JoYepVZg== X-Received: by 2002:a05:6214:424b:b0:6a0:6bf1:446f with SMTP id ne11-20020a056214424b00b006a06bf1446fmr7072033qvb.48.1713805937992; Mon, 22 Apr 2024 10:12:17 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id u5-20020a0c8dc5000000b0069b412e3716sm3357586qvb.80.2024.04.22.10.12.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 10:12:17 -0700 (PDT) Date: Mon, 22 Apr 2024 13:12:14 -0400 From: Mark Johnston To: FreeBSD User Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 800da341bc4a - main - thread: Simplify sanitizer integration with thread creation Message-ID: References: <202404221554.43MFsR3n041218@gitrepo.freebsd.org> <20240422190658.51b1484e@thor.intern.walstatt.dynvpn.de> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240422190658.51b1484e@thor.intern.walstatt.dynvpn.de> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4VNWyW1F2qz4MBK On Mon, Apr 22, 2024 at 07:06:31PM +0200, FreeBSD User wrote: > Am Mon, 22 Apr 2024 15:54:27 GMT > Mark Johnston schrieb: > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=800da341bc4a35f4b4d82d104b130825d9a42ffa > > > > commit 800da341bc4a35f4b4d82d104b130825d9a42ffa > > Author: Mark Johnston > > AuthorDate: 2024-04-22 15:43:17 +0000 > > Commit: Mark Johnston > > CommitDate: 2024-04-22 15:46:59 +0000 > > > > thread: Simplify sanitizer integration with thread creation > > > > fork() may allocate a new thread in one of two ways: from UMA, or cached > > in a freed proc that was just allocated from UMA. In either case, KASAN > > and KMSAN need to initialize some state; in particular they need to > > initialize the shadow mapping of the new thread's stack. > > > > This is done differently between KASAN and KMSAN, which is confusing. > > This patch improves things a bit: > > - Add a new thread_recycle() function, which moves all kernel stack > > handling out of kern_fork.c, since it doesn't really belong there. > > - Then, thread_alloc_stack() has only one local caller, so just inline > > it. > > - Avoid redundant shadow stack initialization: thread_alloc() > > initializes the KMSAN shadow stack (via kmsan_thread_alloc()) even > > through vm_thread_new() already did that. > > - Add kasan_thread_alloc(), for consistency with kmsan_thread_alloc(). > > > > No functional change intended. > > > > Reviewed by: khng > > MFC after: 1 week > > Differential Revision: https://reviews.freebsd.org/D44891 > > [...] > It seems to me that this commit breaks make buildkernel: > > [...] > ===> accf_dns (all) > --- kern_thread.o --- > /usr/src/sys/kern/kern_thread.c:801:2: error: call to undeclared function > 'kasan_thread_alloc'; ISO C99 and later do not support implicit function declarations > [-Werror,-Wimplicit-function-declaration] 801 | kasan_thread_alloc(td); | ^ > /usr/src/sys/kern/kern_thread.c:818:2: error: call to undeclared function > 'kasan_thread_alloc'; ISO C99 and later do not support implicit function declarations > [-Werror,-Wimplicit-function-declaration] --- modules-all --- --- all_subdir_accf_http --- > ===> accf_http (all) > --- kern_thread.o --- > 818 | kasan_thread_alloc(td); > | ^ > 2 errors generated. I've just pushed a commit to fix this. From nobody Mon Apr 22 17:58:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNXzf5dxHz5HZ5s; Mon, 22 Apr 2024 17:58: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 4VNXzf55T9z4Tj6; Mon, 22 Apr 2024 17:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713808702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ZWNIGotzh1j7kCtLLXQ9TBSJdsS/Fxa8OVQVkHRM4o=; b=eHhRvRovtdUVdLFKAhSkb+v0pxbKk32756IzhVpZoifmptI5sEPezjNGmuEd8dvoFL7zEO DIZvdOAH9+LygdvUQ2EdGmrg3Co78Dh2q2kiKaGOYVHUqHVCF4UyKV2kJ79TkIVjSOprWN cvXqWs/eCjoprWh+8GaEh5Datp4UbFVtrwdY1a14+cwiL+FmzNEWn5AVMZ16kwzprsRFIa HSucYgoTK7UPZ/CRSfw5pWjzjbShgio2TYQHudsVeYvGt0WmW6Z+bgsqdkZPffBBI53M9b oEx0gkkyzTWXv9ItFTd2xQPsV8WRGDHG7STEy00Bzbik2FMjATGndkFydBC3mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713808702; a=rsa-sha256; cv=none; b=MhHCxt6ALearcBzkoidkSFxRNXsUO/g1dMO+yJf8cZqFAjylZ4WaCOyGZqXIbI1mNsnPRW ITTE6oraiUjdjgoxEtwQrShfg4KSMtqQOKu0UKf+ZOJUoJDidzvmSP+U2Qk3hfdIg5o3pF 6kxMjqrAn1X3lBypFPNJ41agBGZcq2BIpiZ00ZIYjTNTC/fupphPUee/XCvT/+LSYURJA+ +Kj1mffZ/QaMFNO9KmjtPgj5J5tIJrbS9vQcy/rd8zI2RG+oOvEh0zmo/8+zPpexs8a53R P8OQYMmQT9w03E52g0Z7hmbd5d533w6KBKSHM4pox4L0kATM1XoBnZV/q4OLhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713808702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ZWNIGotzh1j7kCtLLXQ9TBSJdsS/Fxa8OVQVkHRM4o=; b=hmnxxr7MvynKaP+DSA/v8P/ot5Q2C7DfPpKBbikv9mdy03r6cpWMDXdjTqKGuglZzKWcT3 K+DBKPiGWM0aT0dtJ0AaIy1coUjsyoUAW9ziy0Bs5vPy8gZFjTQAKWpNixpnDxlrXNQ9+Y TOy+pgaec6u1mkUnIb5E6NOuce4QnZVD5nzswGorr/hUxPRsKZ4yFSmoHnPpIL0iZ5PWxS owF0Qj9NFZBZtzL+K2vG4uqkfjHJBKGagX7gtiZ/8tFeDkzgDz0rnMcpOTJ2u1CjNb/CGB RJiHd/bti6Gv6IkgorOq3YAicVjTqxJexLhIKl/frWTZTKVtaRYwsJmIFg133w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNXzf4ZrXzxxg; Mon, 22 Apr 2024 17:58: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 43MHwMa6045290; Mon, 22 Apr 2024 17:58:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MHwM0T045287; Mon, 22 Apr 2024 17:58:22 GMT (envelope-from git) Date: Mon, 22 Apr 2024 17:58:22 GMT Message-Id: <202404221758.43MHwM0T045287@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: 76a8625bc71d - main - mfc-candidates: use stable/14 as default MFC-to 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 76a8625bc71da3fa63eef5abb4782553d2588f5c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76a8625bc71da3fa63eef5abb4782553d2588f5c commit 76a8625bc71da3fa63eef5abb4782553d2588f5c Author: Ed Maste AuthorDate: 2024-04-22 17:54:52 +0000 Commit: Ed Maste CommitDate: 2024-04-22 17:57:17 +0000 mfc-candidates: use stable/14 as default MFC-to branch This tool is typically invoked from within a working tree containing the desired MFC target branch, which is detected automatically. It also has a default for when it is invoked from elsewhere. Switch the default to the most recent branch, stable/14. Sponsored by: The FreeBSD Foundation --- tools/tools/git/mfc-candidates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index cf71c314cb95..c232a1ad3345 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -41,7 +41,7 @@ if [ "${repo}" = "ports.git" ]; then qtr=$(((month-1) / 3 + 1)) to_branch="freebsd/${year}Q${qtr}" elif [ "${repo}" = "src.git" ]; then - to_branch=freebsd/stable/13 + to_branch=freebsd/stable/14 # If pwd is a stable or release branch tree, default to it. cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) case $cur_branch in From nobody Mon Apr 22 18:49:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNZ745MhLz5Hfl5; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNZ744r7vz4bNB; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713811792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgw49yU5twjNCKG8ZDFa0eRw+r7baVOfm3SPt67TiQU=; b=wZi8j8mUv5pjdCWOJSCsqV0n1KsovlG4iVl+oljmjQ5Kd6Hm7i7irOi2GEKSPhc/WSdk3l /QTyHRXdw++PXQXNhycOyupLvVYak+v2bhtRiZ5le+Zveuor9cQOJ2MXJtK/v3NY2jP0vD v8cNf7e2zHmHKCKbgyiddI/BUdOZJJ9KFqQHS5ctg2CMmqZC8iLjOd4N+Th78nYbu8u+wN luE2ZqsDgAm8/b7pJX6A6htY8jgsw76JfQ10Fltq9r7OC+UTHY7N1Oqlemkowsdqq3lFSe 0pPXUdVIj/O77PXGjXYEaEG/17wHpIElz0G+HY4CM1uG9PYWbiFGThJYAEvW6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713811792; a=rsa-sha256; cv=none; b=y0WjczjAZflA+stGayjTcFMiHlA8kNbSs3xdZTSHKBbR/1FQa9YAWJVRg3dlz25ahYTyWc 7aX69xM4uDLCfDdgOO1UcSjpFtibBZWZcd+FLuUGEuFCP2JEQf0hjgn2ydb0ZWRy1yC3SS /3yoT3+WHx2TH+tF8Z6OIupNf0mOHB+4e+Mm0HN1CPLbf/gvYzu3gXNajGZMyydoIwjBvt s47H1Gsnj0wOiD4sxhB2frFkHk7R3/mivtMzCXlxLz7JGXWa1j8nxtlwdBOHOxmovbkUC1 00YJFt2atRLTwpUDKkZWt9k6pm8Uhe9Y8VyrvuoY/2EjcnM76u9s0xw+pcW6bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713811792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgw49yU5twjNCKG8ZDFa0eRw+r7baVOfm3SPt67TiQU=; b=K6QKGUDGgPCztcpdLPAexcmAOyyUmpO70iGRkn40rWJOUO3PL8L/32aPwqdRyawFkc+Sng basN3TRoFa3GJznaoBSvf1ynT6URLYMl4LqzhKIrdyLsHOIdU6sqmZlDqSO6Kp88NAmRUB Im298Gh1vele/tcFq9MlW8iFAlgaWHEiaQZOofeUQA6qWWnw3V4tzqHOSb/h6ZYuPiQ/xr thZaSAEL0Iz2Xu5UoBAIb8S/6jZfRx/AzW8EjnBwtnnygo9+m6kFr9r19gDU0iXveEW4dd CTDRkGeHDT327rByReOK0c+G+ibcK98AYCvbXdVmUYvMr06RGFumk1I2Y7JNpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNZ744RWYz10Zl; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MInq76030940; Mon, 22 Apr 2024 18:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MInqCP030937; Mon, 22 Apr 2024 18:49:52 GMT (envelope-from git) Date: Mon, 22 Apr 2024 18:49:52 GMT Message-Id: <202404221849.43MInqCP030937@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: 911a6479e18b - main - libcxxrt: define SHLIBDIR before including bsd.own.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 911a6479e18bcaa7010c7328f491ea338c5f381c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=911a6479e18bcaa7010c7328f491ea338c5f381c commit 911a6479e18bcaa7010c7328f491ea338c5f381c Author: Dimitry Andric AuthorDate: 2024-04-22 18:43:27 +0000 Commit: Dimitry Andric CommitDate: 2024-04-22 18:46:45 +0000 libcxxrt: define SHLIBDIR before including bsd.own.mk Otherwise bsd.own.mk overrides it, causing libcxxrt.so.1 to be erroneously installed into /usr/lib. Also add an ObsoleteFiles.inc entry, for removing the bad copy. Reported by: Josef 'Jeff' Sipek Fixes: da77a1b4f0df --- ObsoleteFiles.inc | 3 +++ lib/libcxxrt/Makefile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8a9cf20beef5..a4301ebdab41 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240422: remove improperly installed libcxxrt.so.1 +OLD_LIBS+=usr/lib/libcxxrt.so.1 + # 20240414: unix_socketpair_test renamed OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index 57f41e9bf59b..afae306e7bbe 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -1,10 +1,11 @@ +SHLIBDIR?= /lib + .include PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt SHLIB_MAJOR= 1 -SHLIBDIR?= /lib .PATH: ${SRCDIR} From nobody Mon Apr 22 19:09:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNZYg3Yr5z5HhgB; Mon, 22 Apr 2024 19:09: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 4VNZYg1cTVz4dv4; Mon, 22 Apr 2024 19:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713812967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+z5i5vXHKltlbnxyiFNktYbpVJIIHLgLCEtoaOQTGbc=; b=tsV8ddW2s3YMutMhWhVsr9d6P+ng6J13Xv03urB9mD8IOII/1D8olme5n6pxKu/bKuX96h N6VQl8TmHskQ3hy7nHUTBK0Imy7pFdFvvdmtqprjNc8hs8xSHA39w/CFjM8Px0vwChT8g9 Wy7gE9N8glKSS1YdMMucpu64uWPN4jxP+kXZm9Rf8nYr0JpwKmpDffqz6t3Yp69uwMAm0x CLQCtAGcB12r+ftIVjVG+2ohNWt+pj/nXxv8ZGeMtWsI14yWIEIdQ6yg3X4yLxZ7vrRdDO ZF6G1KwEne3NMz3PBgilJO8gqcmUQ16YSSswRjphkQyGAUYMyaZAT1vQNaXgcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713812967; a=rsa-sha256; cv=none; b=LJUlONZqclm738RyRPkL/21+kuhyFLpcyV2XUWk41jCA14oQkHWWQSpr8NoC06OrbsHaUc uGWxDUShQHE3S960ET3KB1FmVhdpgkJ9S9WctBXUcqYxS4Gg0p2Dvu/cNbsNmayduaDZ9z wY1u5HRDg9PB36g5pb8ZwQP8Fk9jHB8bVLKMLeFdWygj6gGnSBWUWV91QBnZNHuPUA2pFX +wti5JSv3nQZ1iJ3PW6DZHfy9mXI91h7AzF9jLPyUSoEC9n8oBzm8+rfQsfWICQDWx5tdk kdZz04WXpNm3PUFRAEJjyfHpXXsOyz/yXXM+Mx18ph2PXsVdBY5u7lP/3H2MXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713812967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+z5i5vXHKltlbnxyiFNktYbpVJIIHLgLCEtoaOQTGbc=; b=XAEMFtvnhq8fnFOs9dCZ274N7gOVv/sNaKX2SC4B5DJl9rNjarI5lTzbFH9vhdqrf3b8k3 iMsAG2nCF58zBy+HoEWU4LNNLIN11tUoQ92QuzEFm39AjkMAxQpu/JHSSU54BqImKOuXKG Sc0Rs9MRsV58bOl6rZeukYRZO5AiVhW7wODob/9cRkja0U5ixmXB2cgBqVuvmwluxjrBSh FI7l60JHWqG2gNmC6KQXptiaXuZOKHlip/sSVYAfy0jog7/Vsc0hCycvFpsaM70ZjLqiEV dvs3ss7BYRWIhzlEp0cHDaxmXosJlR/hAbpRl3ooUkFk15QEO9/s7ztAji97Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNZYg1DXgz10nQ; Mon, 22 Apr 2024 19:09: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 43MJ9ROQ065849; Mon, 22 Apr 2024 19:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJ9RY4065846; Mon, 22 Apr 2024 19:09:27 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:09:27 GMT Message-Id: <202404221909.43MJ9RY4065846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 5cafc38f1129 - main - adduser: Fix a syntax error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cafc38f11297cb302514f3cedb703a3ed199a22 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=5cafc38f11297cb302514f3cedb703a3ed199a22 commit 5cafc38f11297cb302514f3cedb703a3ed199a22 Author: Joseph Mingrone AuthorDate: 2024-04-22 19:04:13 +0000 Commit: Joseph Mingrone CommitDate: 2024-04-22 19:06:38 +0000 adduser: Fix a syntax error Reported by: Jose Luis Duran Fixes: b37333899bd2 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44871 --- usr.sbin/adduser/adduser.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index d1c9e12098f7..9739b2e589fa 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -477,8 +477,7 @@ get_zfs_home() { # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS - if ! "$KLDSTATCMD" -q -m zfs || - Zcreate="no" + if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no"; then return fi if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) || From nobody Mon Apr 22 19:20:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNZpq66Yhz5HjlN; Mon, 22 Apr 2024 19:20: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 4VNZpq5B8Gz4hTr; Mon, 22 Apr 2024 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713813651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oy7GmpKHVv/WZjtrAs9yKa91Noka2RbEsEee6T6o7kc=; b=QNisBhG8aIT511sUcu7C8GVeNTg79YgTQCG+SNs00auKluJm1H0/TJtILtsisdLwvhKv2n JyTD6wejqYEvpzZk+eeYQzlH3Ws5Bf4WlTk0S2FBq1EAmHJpBaH7IIk3rt5+LXcolO72qL LALGvgRs0kU1JE0Qav94dAXBJ7wyzr/yvaNp+qG+yzUbu6Ivh81Dq3HD17y0I0ThRTPtaS BQA8iO65V9kUZM1MLEMukNGO+x7P/hzZ6/vEg/qN11oExwdEkdIinejrlEyDuN0NsvBJDs lhGxIga1A9VvWlS+XYToFw6WHeOyNwU4ppSF0+/+3tfG5lvY1QGkkZB/y0UmuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713813651; a=rsa-sha256; cv=none; b=Z7MFgtjZmf+oYhA9gcTPioPSrmJZPkLCKM9IECq8ym5YHRJdUry8Cp2sXdHu7UXRFxThWU szgwcqKTczh7WRptpiqy0RA7cn6CUhDVsXQmcE6oHGw6peJ8etL8urRiLR9CZTO4TVMhDn Q6P9YQNyXi9/88sdptVjf00Wc8xRH1UmEWcjR5ArYOPNXx51NgshmxCUA31Ltx89E77NEf bILKBPZWBzLXdrZc8bvoed0GeiHTbJTjGIrr5EiYgKrGgfe6vZjpqD90luqPzIfsI1caZZ hS9DM2A6VkhXXi9nGBu9ulFU95VEhvYaO9BwjPuKUhgOKfl/8g7tVSqewiZhlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713813651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oy7GmpKHVv/WZjtrAs9yKa91Noka2RbEsEee6T6o7kc=; b=rmHANTy3KcutYI7VmosR18A/37dpUebnCZ5ys88PwSKqvYIuHkjOoaxRY779WloBxYt6YN +8ij7UahTaxAv1K4XU6oWp0SQ6q4s4gLUx2ujfHzxdicfPU+skOzXfvHZvRkRTN3Mt4MBL Df25BU5X+DO97DP5MueEy6UdrVaOEJ/FbNfpX5ULjIZ/gIJNAC15/3OBbDKd+OWYhR/p23 fk4wiFs/QN52F5caSGQ11An/UCUwFbRNQWpqODi5ErFiUDdXzjTl6IjLZ54kx3A5PYzvkO RGtTNyj4F5oOfW4Z4SsqJ1IxurVDDtUkmpfD0ZBko5V4OhJR1B4OsEIWgHpFrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNZpq4nlmz11P6; Mon, 22 Apr 2024 19:20: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 43MJKp9e091165; Mon, 22 Apr 2024 19:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJKpTZ091162; Mon, 22 Apr 2024 19:20:51 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:20:51 GMT Message-Id: <202404221920.43MJKpTZ091162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 3acf3feaa8c5 - main - geli: add a read-only kern.geom.eli.use_uma_bytes sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3acf3feaa8c5b15e820e86c1526c9a97fc5ad247 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3acf3feaa8c5b15e820e86c1526c9a97fc5ad247 commit 3acf3feaa8c5b15e820e86c1526c9a97fc5ad247 Author: Alan Somers AuthorDate: 2024-04-22 18:03:40 +0000 Commit: Alan Somers CommitDate: 2024-04-22 19:20:03 +0000 geli: add a read-only kern.geom.eli.use_uma_bytes sysctl It reports the value of the g_eli_alloc_sz variable. Allocations of this size or less will use UMA. Larger allocations will use malloc. Since malloc is slower, it is useful for users to know this variable so they can avoid such allocations. For example, ZFS users can set vfs.zfs.vdev.aggregation_limit to this value. MFC after: 1 week Sponsored by: Axcient Reviewed by: markj, imp Differential Revision: https://reviews.freebsd.org/D44904 --- sys/geom/eli/g_eli.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index 2bcd61f45640..5d769d606d20 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -100,11 +100,13 @@ SYSCTL_BOOL(_kern_geom_eli, OID_AUTO, blocking_malloc, CTLFLAG_RWTUN, static bool g_eli_unmapped_io = true; SYSCTL_BOOL(_kern_geom_eli, OID_AUTO, unmapped_io, CTLFLAG_RDTUN, &g_eli_unmapped_io, 0, "Enable support for unmapped I/O"); +static int g_eli_alloc_sz; +SYSCTL_UINT(_kern_geom_eli, OID_AUTO, use_uma_bytes, CTLFLAG_RD, + &g_eli_alloc_sz, 0, "Use uma(9) for allocations of this size or smaller."); static struct sx g_eli_umalock; /* Controls changes to UMA zone. */ SX_SYSINIT(g_eli_umalock, &g_eli_umalock, "GELI UMA"); static uma_zone_t g_eli_uma = NULL; -static int g_eli_alloc_sz; static volatile int g_eli_umaoutstanding; static volatile int g_eli_devs; From nobody Mon Apr 22 19:43:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKQ1pXpz5Hlvn; Mon, 22 Apr 2024 19:43: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 4VNbKP6zVHz4lyC; Mon, 22 Apr 2024 19:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5I3q19OH6pnnEJPF3nUwjUPmn6JemRfVFhi0v0W3tg=; b=uuqh619tkNWtw2SmRoeuwfXhv9C17h7JhNW8U/eAqazrdFf9qwtSr/bq0MrieVyZyR8U6k Xy40ARgCkO+BoE26dar4f6seGO/wdBfU9YTb8M9v2oRw5RHLOYkbl5RIU20WUFKW/Q28cI kuF+itjKVajlg5M8JMQt/mPEsGCHlJZXkn4MFU9W0/Aa1efcO4Pey+mw3EWtNhfyTIGyfR 6NeOlwnVTYAjyaUhEHfYqHOQDK35HNXaWrkfXBSkjEK/urPOEoq6EaYUWC60VF9g6uME8h +pHtQknSpW7dPiArQ75fKHlnVBjzIQGHveFJ2kNqxxxHzbgjKt7JgWFrNZjE6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815034; a=rsa-sha256; cv=none; b=PQiRRiV9IXOoJXJVkJXbXS+ZyVzi+IA5rhdH4f8rblgc2rd81jz+FWMkv3uZOdeKEDnt7d 3j/qdqg2QAfGcpilnAHU7fdZH0j1yODgrNR1YV85iWiqvqMIfOg0rs5teu83esdlhK6hst uvQCj9SBmZKHwp3fjOIej8zytHUsZHvwd5cMWqE8YFRKlizvmeNXosptAfVE5lgA+yHlk3 /KhlAF0i0yFr7b1DRSKUJhjdl0tyPogiLa26BlJObm25waLtjWU7IgZ2q0fGKwNeoO8x5C it5c2NOu552GIJ91MGstmM29g+Np2rZiidNgqDN+K9MhaMf+nA9XVe0QOhvsgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5I3q19OH6pnnEJPF3nUwjUPmn6JemRfVFhi0v0W3tg=; b=q8ZfD+JKtqnthfKGyW23/8HIYS/QKa2gVh/tjy17Yy5rlHL//cKBZlULJvX4FvJ4Pz7CRz y6nHisU3RvOGGrDh9S4VAL5Gjb/Rd/F5H2NndLhd0yPuIEtIHjAkAsHlEcdDAV4ELb0tZx 7IYpYZ/gjPmOIOt8TYfKeu6GoML8Dgx5S79QgYK2WKBKtISwIbQ2S9WU6L60c5h8PL6Ple PciOJgthFBbR0F1tG17SiXKTzNkjJ+Wz3bNLvwGYc5L1kl7YYHdaQWCP3JocIRaGK+J7jX 0VoTyllIhhpj75kyPG4RBf2Mx53ouWr61GVfJlBfw5bXt8AAlbsqzZs6ifvmsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKP6bYvz126l; Mon, 22 Apr 2024 19:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MJhrpN031872; Mon, 22 Apr 2024 19:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhr8s031869; Mon, 22 Apr 2024 19:43:53 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:53 GMT Message-Id: <202404221943.43MJhr8s031869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f44b05ee942f - stable/14 - LinuxKPI: add PCI_VENDOR_ID_ITTIM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f44b05ee942f0ca94d6a73988e3abe0737a95900 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f44b05ee942f0ca94d6a73988e3abe0737a95900 commit f44b05ee942f0ca94d6a73988e3abe0737a95900 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:40:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:23 +0000 LinuxKPI: add PCI_VENDOR_ID_ITTIM Add PCI_VENDOR_ID_ITTIM as needed by mt76. Sponsored by: The FreeBSD Foundation (cherry picked from commit ce707e674f7941c0743e72193c433fcf554a82b5) --- sys/compat/linuxkpi/common/include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci_ids.h b/sys/compat/linuxkpi/common/include/linux/pci_ids.h index f23cd7d6a124..b52ecc525db6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci_ids.h +++ b/sys/compat/linuxkpi/common/include/linux/pci_ids.h @@ -51,6 +51,7 @@ #define PCI_VENDOR_ID_HP 0x103c #define PCI_VENDOR_ID_IBM 0x1014 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_VENDOR_ID_ITTIM 0x0b48 #define PCI_VENDOR_ID_MEDIATEK 0x14c3 #define PCI_VENDOR_ID_MELLANOX 0x15b3 #define PCI_VENDOR_ID_QCOM 0x17cb From nobody Mon Apr 22 19:43:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKR1wBDz5Hly4; Mon, 22 Apr 2024 19:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKR0lBtz4lsK; Mon, 22 Apr 2024 19:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJnILKmuJL7YFXb57bhbJZ9kkYfZ0Q4GxoCleU9R/ZE=; b=Goscu3S7n/UU4rkfj77ZcBlqTJ9RtowX6DJjb7a8dOqoTAq781fK0jFuahRk2LRFvyYZWg U7L6V3nrunbVB8pflZcH7sDfZqKB5fr/3XULcyD4jfzqHjSukdn+D6G3QCkm+I6q3k6NhV PrFm9lq3PA/eqca60Ta2F2zK3lbas5NWoYukqXjZAHJYo3RTdli3cktgwP9+gLbGOYWLAp fszRUjW/607BEXho6VfnbG1o9gQBiduqxfYjUSHl7b+kGeMX31wYcWPikVi5SEwkbnr30a mo3lHRyKVjYpH3U6UNrn1kk6W/gKEtrF+FkrcP9Lnzj38899pTaR8lXNinujrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815035; a=rsa-sha256; cv=none; b=SR1CTw/ucfHUo5U8/nwv/Z2n5pSmwHQetepAry29ojsLlI3IqI0PPo/UFJNJZjDRVFgahc aoIoa6AVn5sq90wlojHhPOf7Uf/F4KFsJwJ/m8R54juR+LRJQijQf26GOiaK2FqwZ/cr8z ucidHjgGaXX63w2spRenRwxpiAC/7yCuEfPLxH+xEMaIIclMrpDlpMFxLSZOBY6S6IK7VX NUEtIJDzw55zM6nUwAXioHb4OYQgz33LpjJIk2TO5NZdrD4WFbgGfYB4J28DGSaXnb1j1m EiH+6h1n2DQSw1RDFcNE7HRDq6v68UC00bYT30O8TU4oZp1TqIJ9a1PzcUiycg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJnILKmuJL7YFXb57bhbJZ9kkYfZ0Q4GxoCleU9R/ZE=; b=NAVuEK0Vl/xpc3T7MzcGVNkAWBLDyTo9+/793Ejg7R4ggxYEPgOFVfn4cU/HlBL2nnzsou 424AInjGMnXNzHRpLEicEm1QSyYEBjEh3YGLODO02Un4u7XtRXElk9BDuh3IJDOO9OWf2g 6mk1v+1stGh4qNf23A17gOywj+dX3yMxVL7TXJnsYL0v1i197DjbYrVPndOldi0FnNLMYN Km7DK6csGKlo+Mi//Aw6Z3sZkxIgipLdau1kT1PSpmpq0UNM0DZpeIuv0ZERHb0cxd0CZ1 pOnMvy09dPfKKQxLaXAOb/Mx9Q61U601qtu0k73gUlRCxmHA4MV7wEzalDyg/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 4VNbKR0LV0z11pT; Mon, 22 Apr 2024 19:43: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 43MJhsur031924; Mon, 22 Apr 2024 19:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhsBl031921; Mon, 22 Apr 2024 19:43:54 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:54 GMT Message-Id: <202404221943.43MJhsBl031921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0af78fa479ca - stable/14 - LinuxKPI: add further constants to pci.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0af78fa479ca3dee46f4deeba0e543ec7b77afc0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0af78fa479ca3dee46f4deeba0e543ec7b77afc0 commit 0af78fa479ca3dee46f4deeba0e543ec7b77afc0 Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:26:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:30 +0000 LinuxKPI: add further constants to pci.h Updated wireless drivers require more knowledge about PCI (BAR) bits. Sponsored by: The FreeBSD Foundation Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D44573 (cherry picked from commit a1cdddcf1596d258ce0b01b156dfd9921bd60e08) --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 174599d06141..98ba160150f7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -105,6 +105,8 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define to_pci_dev(n) container_of(n, struct pci_dev, dev) #define PCI_STD_NUM_BARS 6 +#define PCI_BASE_ADDRESS_0 PCIR_BARS +#define PCI_BASE_ADDRESS_MEM_TYPE_64 PCIM_BAR_MEM_64 #define PCI_VENDOR_ID PCIR_VENDOR #define PCI_DEVICE_ID PCIR_DEVICE #define PCI_COMMAND PCIR_COMMAND From nobody Mon Apr 22 19:43:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKS3f4Kz5Hlny; Mon, 22 Apr 2024 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKS1X9Kz4mGV; Mon, 22 Apr 2024 19:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXlTSrlkq6V3CZ+prXH5FcXLt0Y1ALO4LIYpErzsIZI=; b=mlki8TuOb5zJSjSgE0dFThoAKSggqLij1XWiHHlHh6T92YUMIUXbqNK8Gsr1AnZT7PclI7 PW6Iuq5GFKJ/VllKxhW0t8a6fPdCiwZ5hu8AC4yu4DbA6hy0qWc/4w+NIFKpIQ7CLA5abD F9X5fwiyxvVGDuAZXybi5V0hdrbbjUTUtyjsJrDY7kxupdOZ3+PqxMn8cISthGCKvZr4G0 f1Ft62WZ4W10Z/GLhhHBMga8qJTYVYO3lrVkMYL3b3rGWU8J8aYaV2E7PPR8HOaBHVWtHQ uDDy8+C/I3+udqzziA1rf/09JK0V+d/II5qwEhP/UZhnqhAzeFaavABEGNLEmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815036; a=rsa-sha256; cv=none; b=rRcRFaedVQA7oiDqz4O/Uw/onF+jaJ5ONRWwlqrplheFn8Yg/6e4aWYnGDzGG5CqCygJaH vXKauMajaRQK5gffTQbx+w0L9ZSAQwE24BWmk5NyKhZmQxvWOZCrd16dQ0DpqvPYGjueot IGISa6hnWw5jPH+T7TOva5r45e73d3QqWIk3solcXYLDxJ0HFRviaemrHDMXMUH6vzSeZ+ PgLHIHD/rsL30WzI0TqHCSkZlup15O9fkCRQFYbqAqx4XURShgTlF0pZkW9bmlCNaMX06x zOXo33tKpRn0RADDQQkaR16ti55A6h1t1vCdrpZOTThh1PThebRWNH0PrGbzlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXlTSrlkq6V3CZ+prXH5FcXLt0Y1ALO4LIYpErzsIZI=; b=gb/i8RRfQoCQ0H5kct4ICjugOMoJDzUr6vTKY57HXlni7I5Sf0c4bmcYTgoAvrCJsLlZD1 YShhX63BjHImwoZxZdpECX9gyUBvSKtJIM+9o60MDpnb4IzU24PSaVp7ZG2h1yfG7MQyMN xYnL5SWy6gh2UlUcDi5fXwn5/NL1ubLt0GODlxKhyfV/kEpuDbobMZCZbymapwDR9zYuSw LuNK6U+Tpd34N85CRR2B7PBuGUdy8ku/30FVziIXn7vnjxvgbXj/YS59u3NOp9D0d53PWv vHvMOKWJHompiAbYsEm+fnImRjhOR7rtt/1EtVSzMznj86OLnYEriaas5XN+lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKS15DSz11x0; Mon, 22 Apr 2024 19:43: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 43MJhux5031966; Mon, 22 Apr 2024 19:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhuIs031963; Mon, 22 Apr 2024 19:43:56 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:56 GMT Message-Id: <202404221943.43MJhuIs031963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7a52baf2805f - stable/14 - LinuxKPI: implement memzero_explicit() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a52baf2805fbb954a8db98921253a1c288efeb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7a52baf2805fbb954a8db98921253a1c288efeb2 commit 7a52baf2805fbb954a8db98921253a1c288efeb2 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:30:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:36 +0000 LinuxKPI: implement memzero_explicit() Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44586 (cherry picked from commit 218b2ccf8cc90698487515c681f3e3453b0dcead) --- sys/compat/linuxkpi/common/include/linux/string.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index f745c2f6d343..06dcdbd97663 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -273,4 +273,11 @@ memcpy_and_pad(void *dst, size_t dstlen, const void *src, size_t len, int ch) memset(_ptr + _o, _c, sizeof(*(ptr)) - _o); \ }) +static inline void +memzero_explicit(void *p, size_t s) +{ + memset(p, 0, s); + __asm__ __volatile__("": :"r"(p) :"memory"); +} + #endif /* _LINUXKPI_LINUX_STRING_H_ */ From nobody Mon Apr 22 19:43:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKT3yNMz5Hlbx; Mon, 22 Apr 2024 19:43: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 4VNbKT2Sprz4mYt; Mon, 22 Apr 2024 19:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlrAeD0Y8qxHb6jtYfIGtCrfNcPhqCXvEo4OrLhztvM=; b=YFF/hNZrCKvQTP7yeT712bCrYwzqWx0gx8sO/s6zT2i8h0+JRd6GVgCNtf3bIwUdeSpU21 G3gbLN9VIAnhmQlMgKSmN6zsH3Fa+RVl98fx6eaXZSdM3IKWTuWPD315zCWViRfEgnB1VS SNBtAA/Vm1jhlhg9z8ON7ClfWdZCjT+lmcNRZfusW+SE+e6eX9TKs/6QooKIXkdNeOD8rO z6fSGbanUix6VkCKZd6Yh+eHaAWfgsGMRpUnIkKxYR9bNi3RlnERvvJ+cBx+nsAoPwO/Xz 5A1h6sOqUe8xY8E6twYFvp1k+gfeABuo3xfRHF+NJ+IFeWCUnsCAKgr0Q1mMsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815037; a=rsa-sha256; cv=none; b=l91lxK546uBVM7VzOZwW3W9Ye0ZRE6dBtAav5EqluI7SNtcNoO3Wgrclnc9pHxiw1XOVgf V1sUqXdNx8eeTZXlHtOnkr5DNU4GKBYcHi9q6kCnKSu157OFrGC1AVR/7Oz6r+2hrsTG+2 nKRJ7AJcruekGwoiyQAnd4vihCJR3jrUrKQPv4uGftmIJ/PKTCPAB97yx8+jpIyF39EQDi IX8NaUtcYAY/ac4FqdeuSrbHp2CMBCa15bJ6TnRUk4/TyFZ/9YeSkdqtRJh5kOLuJLdevB jNzlCMbTpKoXHDYTnouF8E0GmgedH8b6DSkDFNLAwSNKIimFAal8T9ebQ62ObQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlrAeD0Y8qxHb6jtYfIGtCrfNcPhqCXvEo4OrLhztvM=; b=N2kvgB+vGX3ECpB1uC++ikdJPzNWNEatckuh3qS8ZUJIRa+GDdwaUW95nl0/M+9nNY56uu PkXLPYn/I0RLCQ0ATa+aPR3FBnGUnHRPaultXxNgcV6F/A77y5Xjffe69nzuIlkMHzmlsg tfY+o+wdrjkjybHsRU48hDxAQX098VM6wMuLtrEKFOLvki2RkW43nf8BdJRjq4ULOA2WT/ eXWZB91kNSH9HCN/ex8P21b25Pn2Obm5OQmptPmZqiXJmDa4NTXzg80a66LhsY2gnwfEAk zz0fG4xC8r9G2aPP7T4/soPIMMCQqxyyy2mGOsoAoi8GtRcSmusMGELUi70Tbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKT222Hz11fd; Mon, 22 Apr 2024 19:43: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 43MJhvTu032007; Mon, 22 Apr 2024 19:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhvcO032004; Mon, 22 Apr 2024 19:43:57 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:57 GMT Message-Id: <202404221943.43MJhvcO032004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a939c9544033 - stable/14 - LinuxKPI: add BITS_TO_BYTES() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a939c954403314318d64d848534a4f9e3578217a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a939c954403314318d64d848534a4f9e3578217a commit a939c954403314318d64d848534a4f9e3578217a Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 23:48:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:40 +0000 LinuxKPI: add BITS_TO_BYTES() Just like BITS_TO_LONG() ... used in rtw89. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44603 (cherry picked from commit f674f016c03d49e14f1c651ed088a6f2d01a62ee) --- sys/compat/linuxkpi/common/include/linux/bitops.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 58677631b604..1415d5224084 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -54,6 +54,7 @@ #define GENMASK_ULL(h, l) (((~0ULL) >> (BITS_PER_LONG_LONG - (h) - 1)) & ((~0ULL) << (l))) #define BITS_PER_BYTE 8 #define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) +#define BITS_TO_BYTES(n) howmany((n), BITS_PER_BYTE) #define hweight8(x) bitcount((uint8_t)(x)) #define hweight16(x) bitcount16(x) From nobody Mon Apr 22 19:43:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKV5SBgz5HlqC; Mon, 22 Apr 2024 19:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKV3QsSz4mT3; Mon, 22 Apr 2024 19:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eqlFJwK6O3bYLadXq2xed6KxfGEpitVKUi5MGvdxsY=; b=dcmC6M1O2UpEQDa/aJPgqXwYQwvXMXAQZsE4ENXnNcrjdIk7noCWRO+I841OR4wn4KcqGN 5Q99ka7AbdbpgDptLMlsatpQj9yz20GHqAI1lgIDBwqxrUoN/Au7m34WEngLC46kDE3ov4 hFlzahAcifuddrywzlvRs2FP5PuuTQSoV5b2NUyQvL/e/JGhHInpAcg6jAaSohkcF17/Ce CsxsbqiZ93YptdEtv3UV6itsDJHoPZuFAAvL26DqU2uUMLWZ65shXgZKFd/deM78SkQ7bN B/PC0jDteYp7eI/opRosQiJ+LiI7wZ11Csa0WqzUAK6kzkn4Rw1q3t8C9J1aHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815038; a=rsa-sha256; cv=none; b=SvAW9GKvma/YnV0nqce/0XeRGCaeLwEbiJ4P1oqUarx3F8mfw+2zRthIpp4iv1UrqtdRP6 4IxJ/z49AyoMcUI8hyiTvSQriLuHszLdwYUCBsUhzAyw8nNtWHNVWVFWKkTRzoJhN5paRB ZrFaFzLyKjD1jSfp4/ijEdSAK2bYm/piU4mUyEwP6ta6FTp77XZ50fLzVaR9lKZRRWYj3L Qo29RQIEchm5cfJ7H4QUcczPN7onsfHkuePA7uOBQsfyCQ3WVmGDD5NI+R9WLArVaK0dRR qwwteA/AF59Eo36hwPO3UnmSx6gU8UeX01EO8yC6CIOcVNQyBwoJMV5HhhOOfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eqlFJwK6O3bYLadXq2xed6KxfGEpitVKUi5MGvdxsY=; b=vq+obQvc3JaVYzIgkCU9rNkTWJyxVUZzUyuDwz0k/XGuWG0Z1YAX3vXYJwMM76WoLtOFG7 W142Q0aUQR/UMNa38p0DEa222P8BgQRL2dSzzkIyUsMaUw3C0o+m4/S1SGBQX2K24fKDk6 8Zl7uu4C02Foke2+2IzWKA5HgebNFIHXu9djSXfHNd9O1tF4nYTWbKXwJK/AESB5ErMoHf N6a26KgNqFDlwCxnTIMBUxbMtdxVjsXhvnFxUKY/ViySQg1NMBp0CN5Uec+GPtdBNMkyJJ KSayr1jkXJu4Tm2W9W4sJ5LMESX9ax7NolIvXMwSsdJYblOCfMQJXru1jcKKbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKV33Xmz126m; Mon, 22 Apr 2024 19:43: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 43MJhwmG032046; Mon, 22 Apr 2024 19:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhw0v032043; Mon, 22 Apr 2024 19:43:58 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:58 GMT Message-Id: <202404221943.43MJhw0v032043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8cf307284f6c - stable/14 - LinuxKPI: add dev_alloc_pages() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cf307284f6c1508b5c075155c711a7d3a8dab39 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8cf307284f6c1508b5c075155c711a7d3a8dab39 commit 8cf307284f6c1508b5c075155c711a7d3a8dab39 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:45 +0000 LinuxKPI: add dev_alloc_pages() Add dev_alloc_pages() though it seems a weird KPI, not passing a dev despite its name. Used by updated wireless driver. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44588 (cherry picked from commit 738c02ba24c66391870067602f1c9c030d5c5e5d) --- sys/compat/linuxkpi/common/include/linux/gfp.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index c5de09e896de..2fcc0dc05f29 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -138,6 +138,12 @@ __free_page(struct page *page) linux_free_pages(page, 0); } +static inline struct page * +dev_alloc_pages(unsigned int order) +{ + return (linux_alloc_pages(GFP_ATOMIC, order)); +} + /* * Page management for mapped pages: */ From nobody Mon Apr 22 19:43:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKX0N06z5Hlvx; Mon, 22 Apr 2024 19:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKW4gxJz4mM6; Mon, 22 Apr 2024 19:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxrpBQ77HRuS/YQSukDAUJKNKG9iS5/9i/H9PKugmvY=; b=ho0aEqc7dgK2x9aTKV/u+5PqNDGRLHtpcPoQ/wkbUu5RPPy4EAf7k8WeoZ41aKPnt3ic1D cvjB3+RK8ESYADi5KSDGFdHmUEC/M79wpYTQp3/8EOzyh35qWtvESaUaAhOlupMHR4FSIW R/vWdRGIKiPaFTQ1IBdK1afQchFluKR0t5bBHrNXfSvKNzBA9AYV2qARomS8nEVjhkfzNk l+O62/f9QynYseLfrLmKiZo6oE8Qqnl+oeatFUifqxELS7UpwMN2wV+peBVuBSDrY1w8vY O3q4EvJPJL/Z0iR019jzkmoS37sl+unS92T5IJ1W4/aKfVQYt2Z/Y+ntOuNU5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815039; a=rsa-sha256; cv=none; b=JSuJchPvKhKnO/tq0NzZRFqPxJzdJOnHrE6lgkb1KZfMMm75fqlko8Jm8KqK6WApErIeUV 3bvVK9o3ZCR+f+YkOevh9BA6cp9EeyACL62sV8OAw2xW5KcKFw6OSGuYS8c24S+RTr0Ouk BinsxkKORh+PaJ6R1YG1UuMAxRcENmGSNmILqDmJpLBy4fc5F8Shr/opcQT7vqPxRDmC0E fzS890Sqr3Cv0+p18vvI6WSkPiu/yuVFOCAD/MbK50WMBRWoldZfPYbeTkS2lUjTH07iWO tT+JNF9XpqYVU3vrFHs4zKb9dKAfB3i4OWMD+gAvMJH0UbEEpJvdZ+gWTdgdpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxrpBQ77HRuS/YQSukDAUJKNKG9iS5/9i/H9PKugmvY=; b=GIFdR13jL7WMKNFMsw853ZjXQKUbs8kBfDSXxMG2tmmxWnj95L2NcpV0UNhee4JC6+TbVD 8Y9KdAbCAxmvn/QYxlsjPePzaP6+47dx9125H+oGpkaUkgA5/HIgfjH2T7q+5BZW5uuew1 /dxeUooVZS7c2GiNyJGbVGAARyumy/wlDKD/cSXiWQGvP5fux4h2W7boY+jCtQk+LXrD4U zxIepblnd7nxxZ1sC2xjCWAiBqEEdPym+LoF34mpCGMB2YDetcuN5Lzj8FFe3ig/IjmxIK FW6N6mva19PXYc+cr3AwU+8JTXYi10IsG2SzeL2ORs/+zRsxIVacwjjCIY9UmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKW44CCz11RH; Mon, 22 Apr 2024 19:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MJhxvQ032096; Mon, 22 Apr 2024 19:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhxIK032093; Mon, 22 Apr 2024 19:43:59 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:59 GMT Message-Id: <202404221943.43MJhxIK032093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 10c94114ac5c - stable/14 - net8011: radiotap: add more EHT constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10c94114ac5c5440e85b653a4fe54bceff75a181 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=10c94114ac5c5440e85b653a4fe54bceff75a181 commit 10c94114ac5c5440e85b653a4fe54bceff75a181 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 23:34:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:49 +0000 net8011: radiotap: add more EHT constants (cherry picked from commit ab95bca9988ab15a2502efd03db43068a0a2b18b) --- sys/net80211/ieee80211_radiotap.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index dba454a8fa42..d44f81b68b8c 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -540,6 +540,11 @@ struct ieee80211_radiotap_eht_usig { #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK 0x00000080 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER 0x00007000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW 0x00038000 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_20MHZ 0x0 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_40MHZ 0x1 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_80MHZ 0x2 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_160MHZ 0x3 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_1 0x4 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL 0x00040000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR 0x01f80000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP 0xfe000000 From nobody Mon Apr 22 19:44:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKY0dcSz5Hm1D; Mon, 22 Apr 2024 19:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKX5VCvz4mPR; Mon, 22 Apr 2024 19:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4uxfh9wFhuLhZJYYPbp2XK35Lar8Hp9GRvA38ElBXY=; b=G2JttdPBUMqNPUUv0XM+19SivishLwNUY2Aw3cPvY2Muqu/5J6MUspLhTAvIWjg/rZbogz lJlVpNumXZ8dAGazHAjM6ZE5ovSFgfvAfNbhX3zB0JWFvTgk84Kd79hqVG2mG1FPvanJDJ RvwY+VFOxcJUyg6NIDLcvDlGdGDuBInJFgl8cMYuTP1vFiZ+Ltm5TE9MY2HhBFl7HXocGj skt5xRsTB0/Er7XTjqCYpk+bh4ywom/Q5kEc6J6gh69rsJaxIOt+vGzCECH6LUkLDiZCL9 KEcJ/nYSz4SrGDpoQO45EdHEWEd6nrAcZT88+csATn+eUHOc+ws6rjlXBSAESA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815040; a=rsa-sha256; cv=none; b=SO455EXuPLQ+4I+c0emsJJMc/bJS0ZDzzjPZE4AC3AWzMbYbKyTOx6sG3YpVea2HDKsN43 HIboCpc+AeZ8rGzdZjRgrPZ6iadGiCJPPS+wRhXyLK57O/A18qrNZsZx1WhqtlW/PQVVCc nUwd3Gcvd34kLMbwxO9aw1SO3knftDSIDadWNze0WQn50j5LL1z4Adrso5G0gGYTE4y+Df zI4TmrnXU9zkGIr5RBhwo5s9V8cLpeAypGoiWDtW5GNPDL73n43A+oTXBkpTMwwQsv2b7x Sr9XC2b83GLZmEhzLDjJROKM6fbghgNhYw4/rxyb1C4BT1/AlT3PhNjHMukCjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4uxfh9wFhuLhZJYYPbp2XK35Lar8Hp9GRvA38ElBXY=; b=HhuliBHRCvMl5+u9kM9i/0XaIBgbMxuAbAJT2F7ml0plGQCSijWENUdK+MXQLvCPWZGPPx 6mKsufXqe269mtMNndTLUoUP2IL2JBuQFlOS4KnUf3WeRykfGVQhkXTevNe+8K98+IunSq T7ZndjpxQ+N/3PaCIvS1IJMuC4kAfWM1g1fgzNdWBx+3vAOJ6Wg8PtvmdmiZDbKm+/0Vo0 6sH3zDyrnnea4DHkQpKRMEhHaNZeaGCqhZtUeOC7UJhUkw60R73U7uryxojhX5njVsmvxy Z7KdK3yVdU5gi0aOLzjWC33M6EODCzHjU+BFbLJljBYxQ5n/ldvuMs0FCfqa1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKX52sMz11tZ; Mon, 22 Apr 2024 19:44: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 43MJi0qx032165; Mon, 22 Apr 2024 19:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi0JV032162; Mon, 22 Apr 2024 19:44:00 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:00 GMT Message-Id: <202404221944.43MJi0JV032162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b2686ca9bc6 - stable/14 - LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 commit 6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:17:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:54 +0000 LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() Implement skb_queue_splice_tail_init() and SKB_DATA_ALIGN() as needed by the mt76 wireless driver. Sponsord by: The FreeBD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44590 (cherry picked from commit 3d3ec17825a124f0119d76c4d2523d73012fa226) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 02190a29e241..ee3f427aa6e9 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -89,6 +89,7 @@ struct skb_shared_hwtstamps { }; #define NET_SKB_PAD max(CACHE_LINE_SIZE, 32) +#define SKB_DATA_ALIGN(_x) roundup2(_x, CACHE_LINE_SIZE) struct sk_buff_head { /* XXX TODO */ @@ -824,7 +825,7 @@ skb_mark_not_on_list(struct sk_buff *skb) } static inline void -___skb_queue_splice_init(const struct sk_buff_head *from, +___skb_queue_splice(const struct sk_buff_head *from, struct sk_buff *p, struct sk_buff *n) { struct sk_buff *b, *e; @@ -847,7 +848,21 @@ skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) if (skb_queue_empty(from)) return; - ___skb_queue_splice_init(from, (struct sk_buff *)to, to->next); + ___skb_queue_splice(from, (struct sk_buff *)to, to->next); + to->qlen += from->qlen; + __skb_queue_head_init(from); +} + +static inline void +skb_queue_splice_tail_init(struct sk_buff_head *from, struct sk_buff_head *to) +{ + + SKB_TRACE2(from, to); + + if (skb_queue_empty(from)) + return; + + ___skb_queue_splice(from, to->prev, (struct sk_buff *)to); to->qlen += from->qlen; __skb_queue_head_init(from); } From nobody Mon Apr 22 19:44:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKZ0RBWz5Hm1H; Mon, 22 Apr 2024 19:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKY6Rmxz4mTn; Mon, 22 Apr 2024 19:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4+Hwog2VqsilgO1MxNNxkIPfH3HkL4DPHwggbPmV6o=; b=Np19xcDbMS3QkvAOZnG5so1o0tcv1F74jYHwUshfH9CfObNW2/yM+ybZ14FWIcTD4HAQzQ t/7EyrZ0Kjh9nzD/CZsMtMNYJqzBjIZVFAVsDkJFluWZ7lF+Op+uS8RLwlRN4FpWPexwij R5kraGTfWoNkaAayE/Urqk1mvKU8HbIA6vC3qKsZBMOqpIBQi2D4/rjEdKKK4ILK/TtFWv Pv4mXm0Qb2oIgjC7wFsL7AggZkYZfMU+qTK1EhoEhm3Fk1re49ntLaV+7DJqvFKYB+36LM xEXTNQpIGJqZNVRIq3QFZZGPsqBweKjBcef2BxBAghrFYXqaOH62uD8ja/CQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815041; a=rsa-sha256; cv=none; b=i47FnrCGmnWh9X2bFX+sX86ynGWL76XJH7b9AqmDMe+D9dFsJLbvbV38UU9KxNb5vxJSAX mBl6zis+bN/nLQTE2AeEdxcIB9bmXtHjb9mx1OgNfoo2eYUORStdfH2J81ifx1NY2bsNY5 qXIAmckVJRDXMWc31ntC9wlQB8sW77jraj4pJ+vpvLLcZFEzVY5LWzYsOKuuHh3iJiuk/j 9FIJdZdHPkhHjDvjDT9GxdFJ6ARYaX61wnHggTExSIs7nLdwGY6W7wyi02Y5ZGP+FDnfuE 5Ue8XSrKuZpfbhAqVpuN53wxwBUc6whszkdCjz+bxk8FAC9fvpOFD/Z40AUzQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4+Hwog2VqsilgO1MxNNxkIPfH3HkL4DPHwggbPmV6o=; b=sKTvwaQOC5VM/Gjk+NaVqDQSAzJZdvXPkzZXn0mbiolZZf0gWPm2WH8JCUOXRVEbFrJqaJ NG6UJxKicJBc7U8a0v3bMKocHU+zN8Gkx5ysjApjl3bMVtL8/ho/C+Gp/9jFrpcvuvjwOA LFhX9X4Aj6QlmssoBQBBBMPMTF3G+9PvYCUfmWeYGs5itwPTZLA/7h7o32VSalmo6+Gs97 GB49dGZAgMhoSmnqaDWyFau7BfSCzPMR/kJSZAJ/BhNt5U9GV9Jhtn31yuYqPOSeO56mGQ u8byIhHFL+AY15N015hyDYN3fHPNZt9bv2nW74md0YR7TpBjX1u7EwqelimjdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKY63Btz11RJ; Mon, 22 Apr 2024 19:44: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 43MJi1PX032223; Mon, 22 Apr 2024 19:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi1wl032220; Mon, 22 Apr 2024 19:44:01 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:01 GMT Message-Id: <202404221944.43MJi1wl032220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 25e0847ef7d2 - stable/14 - LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25e0847ef7d213107e4238677489dadcff90a6fd Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=25e0847ef7d213107e4238677489dadcff90a6fd commit 25e0847ef7d213107e4238677489dadcff90a6fd Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:27:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:00 +0000 LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() A newer version of iwlwifi requires a return value from napi_schedule(); unclear if the function always should have been bool. Add the bool to test based on the napi_schedule_prep() result. Also add napi_is_scheduled() for rtw89. Sponsored by: The FreeBSD Foundation Reviewed by: emaste (previous version) Differential Revision: https://reviews.freebsd.org/D44591 (cherry picked from commit 21761f2ede4ebad13e78112b9409c1f20f946781) --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 ++++++++- sys/compat/linuxkpi/common/src/linux_netdev.c | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 95fbf2a0f48c..3d2b309909b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -230,7 +230,7 @@ void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *, void linuxkpi_netif_napi_del(struct napi_struct *); bool linuxkpi_napi_schedule_prep(struct napi_struct *); void linuxkpi___napi_schedule(struct napi_struct *); -void linuxkpi_napi_schedule(struct napi_struct *); +bool linuxkpi_napi_schedule(struct napi_struct *); void linuxkpi_napi_reschedule(struct napi_struct *); bool linuxkpi_napi_complete_done(struct napi_struct *, int); bool linuxkpi_napi_complete(struct napi_struct *); @@ -272,6 +272,13 @@ netif_napi_add_tx(struct net_device *dev, struct napi_struct *napi, netif_napi_add(dev, napi, napi_poll); } +static inline bool +napi_is_scheduled(struct napi_struct *napi) +{ + + return (test_bit(LKPI_NAPI_FLAG_IS_SCHEDULED, &napi->state)); +} + /* -------------------------------------------------------------------------- */ static inline void diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c index 61ebcdbf7a39..61342395f03c 100644 --- a/sys/compat/linuxkpi/common/src/linux_netdev.c +++ b/sys/compat/linuxkpi/common/src/linux_netdev.c @@ -185,7 +185,7 @@ linuxkpi___napi_schedule(struct napi_struct *napi) } } -void +bool linuxkpi_napi_schedule(struct napi_struct *napi) { @@ -195,8 +195,12 @@ linuxkpi_napi_schedule(struct napi_struct *napi) * iwlwifi calls this sequence instead of napi_schedule() * to be able to test the prep result. */ - if (napi_schedule_prep(napi)) + if (napi_schedule_prep(napi)) { __napi_schedule(napi); + return (true); + } + + return (false); } void From nobody Mon Apr 22 19:44:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKb2NL9z5HlyL; Mon, 22 Apr 2024 19:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKb0SrNz4mdj; Mon, 22 Apr 2024 19:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPC55nbiBlqGZSfvM5VaQHHU0rPzmIznjxTYTmwOIc8=; b=BAKaF6DJicrmASqxQitJmmM+uu7iBeT+xdn0J4ZiSd1ngln50HijKDub8vex1boknDxmIi 2UB+h86hwiFSerlzIOruN2I8nlHBp0vob1cwF0ivkfNXLNvqGt9TIoldUdXYHqzHDu6N/E cVpxBo6AJTVy0Q2e0gqB0wwoUmhE2D9z5vzFPzsW+cWw7gb0pc4WltFxXXtojBQfw4dP7k 1D4J00PGB18Ex5JxIgjg/pnnIR7xVbYdOgeGq5NA1QJJdVlN++VfgBo5kuXAg0nM1ENDNO piuiSGbh79oKFzBZB0EktpxomhBW3aPPzs59j4D/F7xRk7sRhMSvh9nS3jp9Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815043; a=rsa-sha256; cv=none; b=it3nnBrnIacpxYujBZu7kQJRuj/LX0+X9QcxIfxPgX8PZ3q05+hM9XEHSoBVnwalOVc/lJ /QN6sR3kDuvv5meJauxzEUdACK/FoEoKqhZXkcepby1ZjTGKYp2seNezpw1W4kj/KhytTj Y8maU49ezCMRjHg0V2V8ZfjRt8wFqEeqPJX3ErGFu8hC/qqDDrzfQPCZPb6xdlIdi3EvPP NhviR/GRrKbLcD6j1DZE38EnGdqNSByGcfJUlxUu+F8Wj9904wM8Hxiy6jC90k+diOnhDm zDtlBqZqS1J2u+qdvwOxFOsklaLxcOjBEzSLEvGY5nTImd4U46Wo1nayi5VY3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPC55nbiBlqGZSfvM5VaQHHU0rPzmIznjxTYTmwOIc8=; b=V9AZTzBDlrwLKV42InlWVCmXgu8T9CeVSvr7GN0OeG1YJVkIx6Zayltr/UCq44EhRYAWXc BTohy7zSZKTBohvFPBRP68CSVVUshT6UWYwqoSlUf2S+n8tuDu34gxExS49/FhJZWgBSLR PJ8WnNO7dWRU7EgXZKzZxTYZlhUxU9KhKGeulQIg4fmbDVoDseS+ifzPxOsPcdEJDCy0nv QW2Y8qCo8D3qpsErjSutQt93WtsOoyU14tB+Y1SF0L26u1wr/ZTGOTiYwEFs9IDYHZYsNa 3g3MR99TZdEGKmlsW6woVyXuTDk6gtZkuOhesQz5zPERlHOfs0XklE5hK0Nxnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKb04fNz11qn; Mon, 22 Apr 2024 19:44: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 43MJi2Sq032262; Mon, 22 Apr 2024 19:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi2Ag032259; Mon, 22 Apr 2024 19:44:02 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:02 GMT Message-Id: <202404221944.43MJi2Ag032259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 24293e9f97a4 - stable/14 - LinuxKPI: add devm_kfree() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 commit 24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:45:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:08 +0000 LinuxKPI: add devm_kfree() mt76 calls devm_kfree() directly, so alias it to our lkpi_devm_kmalloc_release() function. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44589 (cherry picked from commit 170c2e0e2bb1b2d9a7661ba729f8264381c9d9d7) --- sys/compat/linuxkpi/common/include/linux/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 7e5b1423311b..4ac041298ab7 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -281,6 +281,7 @@ int lkpi_devres_destroy(struct device *, void(*release)(struct device *, void *) void lkpi_devres_release_free_list(struct device *); void lkpi_devres_unlink(struct device *, void *); void lkpi_devm_kmalloc_release(struct device *, void *); +#define devm_kfree(_d, _p) lkpi_devm_kmalloc_release(_d, _p) static inline const char * dev_driver_string(const struct device *dev) From nobody Mon Apr 22 19:44:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKc301Tz5HltD; Mon, 22 Apr 2024 19:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNbKc1HXpz4mVN; Mon, 22 Apr 2024 19:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6M8HIJfKoTvwTZeu+J3kZQtTF2RTq7zW1Nrmk1ICyZs=; b=FHMVS5WfYcn6R316ugm5gHzHztLsulRh3BQsdaoHk5BXPaNI+2t08cfx5blQRzVVcQZpy3 abWZGvHr8vfQFZPVWbM+pGzpOldjMUo3PwTZ0LXl26V4YbE54Prx00yUg2hlK0iO/wb378 acsEhxMNOYCOBkXtYDPpGxysEsDGN/+scodyqXxcGICf5iw9Wo9wue5hw9+WVzhyeSdVpm KiwcgvGmLF4l6kgI7psxqPGbe5DOWFIKT0Uf++XofqTw9vRjfwij/lObbAJqxNZvA80AVI hhL4emnM+P0AdVZPBVUFudTeosFDa4+Rd+02nHqV+gQVoKaL8eRgnBcO/WNpKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815044; a=rsa-sha256; cv=none; b=HA7NMHAOc8nOOhVL4TTYgyiRlWuEEymhI771E4G8ON3y2gTLPqY+O92oxv7t8xtj1CqunN 1+kgEl+3tLWv1/TYccQ6S7y+eSMESVazbjxf7IZhP1h0fhfemkFMHACaX8Ev/cERkHyKOo UqXv+y1gjt36Iu1lbqENLzTokKF7jthRKhsvMwG5kvLJTIix9OZ5jNW1HELVipcel9RKM4 W1NgBDd+otLA8SbyObvCit2dGx6rrRP09fKuTt/WCOwEFDnq9ykqr4Y9U4UsCB5fTvZhLW 48vjo0oepIJKC8fZtEtOUa9NUeFyuF21V6AhIQZWpd3ptGJZlQBVT0bcHAyv+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=1713815044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6M8HIJfKoTvwTZeu+J3kZQtTF2RTq7zW1Nrmk1ICyZs=; b=daFEc16pt7Q/AaOSgLSkyBmxGgn9Kdss/vHx4bS424qT6CTJXwX57dw2ZPh/ptX2W1aVDt JHD/yca0sejyuqxeyvf2Ds7ADn+KqDYqzP+zxSXEk2rBp5Fo8RdgX+GgpzdgYq9podUGKu 0kyrr2KwuFi45oIx/S/t5f2AlksWt7FpPyQFeoKJN77cp8x/dRr/JXCsk0/STSJLx4+not wisNGOzDU+a/KMJBoPN+7qGZFORFq812kSjq4cVbE+LhiDg5YuTkhTjBZ4wDxdXnYwDGrK EPRanTQEZ0seNs9FRlIFbMerivww+W5grXUmVtBiCSiOsrWi4KNEWMbmPX1TMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKc0thRz11x1; Mon, 22 Apr 2024 19:44: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 43MJi4R6032323; Mon, 22 Apr 2024 19:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi4pK032320; Mon, 22 Apr 2024 19:44:04 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:04 GMT Message-Id: <202404221944.43MJi4pK032320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fb94767f7863 - stable/14 - LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 commit fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:07:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:16 +0000 LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() Given we are passed the lsta in as a function argument there is no need to re-lookup the sta by ni and possibly not find it. We know the sta and ni from the lsta and whether it is uploaded to firmware or not we can check directly from the local lsta flag. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43965 (cherry picked from commit ac867c20e67423e5019ab90148c387ea127eeffb) --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 +++++++++++++--------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d5a97009200f..daf7eb7a5661 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -142,8 +142,10 @@ const struct cfg80211_ops linuxkpi_mac80211cfgops = { */ }; +#if 0 static struct lkpi_sta *lkpi_find_lsta_by_ni(struct lkpi_vif *, struct ieee80211_node *); +#endif static void lkpi_80211_txq_task(void *, int); static void lkpi_80211_lhw_rxq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); @@ -3584,6 +3586,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) struct ieee80211_tx_info *info; struct ieee80211_sta *sta; struct ieee80211_hdr *hdr; + struct lkpi_txq *ltxq; void *buf; uint8_t ac, tid; @@ -3694,54 +3697,45 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif #endif - lsta = lkpi_find_lsta_by_ni(lvif, ni); - if (lsta != NULL) { - sta = LSTA_TO_STA(lsta); + sta = LSTA_TO_STA(lsta); #ifdef LKPI_80211_HW_CRYPTO - info->control.hw_key = lsta->kc; + info->control.hw_key = lsta->kc; #endif - } else { - sta = NULL; - } IMPROVE(); - if (sta != NULL) { - struct lkpi_txq *ltxq; - - ltxq = NULL; - if (!ieee80211_is_data_present(hdr->frame_control)) { - if (vif->type == NL80211_IFTYPE_STATION && - lsta->added_to_drv && - sta->txq[IEEE80211_NUM_TIDS] != NULL) - ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); - } else if (lsta->added_to_drv && - sta->txq[skb->priority] != NULL) { - ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); - } - if (ltxq == NULL) - goto ops_tx; + ltxq = NULL; + if (!ieee80211_is_data_present(hdr->frame_control)) { + if (vif->type == NL80211_IFTYPE_STATION && + lsta->added_to_drv && + sta->txq[IEEE80211_NUM_TIDS] != NULL) + ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); + } else if (lsta->added_to_drv && + sta->txq[skb->priority] != NULL) { + ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); + } + if (ltxq == NULL) + goto ops_tx; - KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " - "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); + KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " + "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); - LKPI_80211_LTXQ_LOCK(ltxq); - skb_queue_tail(<xq->skbq, skb); + LKPI_80211_LTXQ_LOCK(ltxq); + skb_queue_tail(<xq->skbq, skb); #ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE_TX) - printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " - "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " - "WAKE_TX_Q ac %d prio %u qmap %u\n", - __func__, __LINE__, - curthread->td_tid, (unsigned int)ticks, - lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, - skb_queue_len(<xq->skbq), ltxq->txq.ac, - ltxq->txq.tid, ac, skb->priority, skb->qmap); + if (linuxkpi_debug_80211 & D80211_TRACE_TX) + printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " + "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " + "WAKE_TX_Q ac %d prio %u qmap %u\n", + __func__, __LINE__, + curthread->td_tid, (unsigned int)ticks, + lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, + skb_queue_len(<xq->skbq), ltxq->txq.ac, + ltxq->txq.tid, ac, skb->priority, skb->qmap); #endif - LKPI_80211_LTXQ_UNLOCK(ltxq); - lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); - return; - } + LKPI_80211_LTXQ_UNLOCK(ltxq); + lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + return; ops_tx: #ifdef LINUXKPI_DEBUG_80211 @@ -3753,9 +3747,7 @@ ops_tx: #endif memset(&control, 0, sizeof(control)); control.sta = sta; - lkpi_80211_mo_tx(hw, &control, skb); - return; } static void @@ -5225,6 +5217,7 @@ linuxkpi_ieee80211_frequency_to_channel(uint32_t freq, uint32_t flags __unused) return (ieee80211_mhz2ieee(freq, 0)); } +#if 0 static struct lkpi_sta * lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) { @@ -5241,6 +5234,7 @@ lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) return (NULL); } +#endif struct ieee80211_sta * linuxkpi_ieee80211_find_sta(struct ieee80211_vif *vif, const u8 *peer) From nobody Mon Apr 22 19:44:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKd4tFqz5Hm3m; Mon, 22 Apr 2024 19:44: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 4VNbKd3Kmfz4mh0; Mon, 22 Apr 2024 19:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wwWFLsJAAsLkW6yyrKAk7/IYx1Wo9so//WHtzSMoZY=; b=KPZLNssj8mZTf0qa03NJDwrsVpnSBCIwSP6ztY34UheEY4lkpqFnWgoOlzs3dD/Lj837mo XOBX0YcMv2qg5ihoGzkibOU+KcYb06gv0I9adA81jPw5UYTaqVUO32gQeR5I8q76pdc80V za6h6pRjSisp/JnWg768cca0MVDDl5arHvu8Cupm+eFep9Uh/0MPp4KSVgX4TQVdohZz3/ qoyFoaIfzwTANLSfhYGNyEdM6UC6H4/05x8jN23g78qpXu7p9b5bSgeOtUO3x+sV0Uw7u1 qSpJkUCZ/MAahGFTlGU/l5KkgyM5Iv4euoX9cGhmiejfT1m4idSnF0v1ebmgqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815045; a=rsa-sha256; cv=none; b=yPpoegbh7tyC+YAbCdFkmZBXZ1eZrih1TkMipoYYyGWgCugSQovfndngctuqM0qVx6Lk72 4KQFgCVugag03q5TDYYsCTA7cQc0QQojcLa7uGEInibwt8SNc8NdhMwzWnmVgzryuLP4qs x5XFq7QoPLNGGdSGAN8LtrabkUFigfmnnCiFZzq8psagJ3Hy6aDjL69eIL+W4YvjaP71RY /7l7NRn5/oaOeARDvo2T12FOWgAtZJ1YI+cTbsdTQbDLt/PiLu33JtBcihdmMAt+YRbuYT 2SgwKVe4Rv5YGXgPvGYOcExvDtaVq3MZuN7HRrlgvGCSldauQH4wXEKAJ8taMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wwWFLsJAAsLkW6yyrKAk7/IYx1Wo9so//WHtzSMoZY=; b=wmNZBaZqx2ujWhioFXDZCczklfEvx0Qz7ehByLL2NWI73SdjHohllmqUbzWRxS+DMoLvBf 4MqBD0fa3321BlkBgmWeXixNx21VKVWSFTmubjx0lcWRRNdShLE9h6gTS4lFW7gVP37ej9 ssyjgZmjmbPgnHDVKHTpVqSCZoWT3Oi8noyLvhOdKRiQ8njX24+vGh1aB7xuQ5T3QDvWvd L4klCELjGZfSZFMovXlKtAY8W5ZqGaQhicfjdVW9zW1wWRd5ca9ctfPjtEssXTMQWlotRu z/uOC42Kc7BYIHZcYG1pFeo8jG3Whyiwtn7sVbIlVVaVHOmU7g0ss7GRTP8XsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKd1t2qz11RK; Mon, 22 Apr 2024 19:44: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 43MJi55J032371; Mon, 22 Apr 2024 19:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi58d032368; Mon, 22 Apr 2024 19:44:05 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:05 GMT Message-Id: <202404221944.43MJi58d032368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 634fd711b003 - stable/14 - net80211: amrr_init: change order of commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 634fd711b003fa59fda39533a2b578228299031a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=634fd711b003fa59fda39533a2b578228299031a commit 634fd711b003fa59fda39533a2b578228299031a Author: Bjoern A. Zeeb AuthorDate: 2024-02-05 14:48:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:22 +0000 net80211: amrr_init: change order of commands First run the KASSERT before trying to do the free operation. Better for reporting and debugging. Add a guard setting the value to NULL afterwards. NULL pointers are a lot easier to test for. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43751 (cherry picked from commit cd9fee3d2c370e81109505c2abfd381af952e9b3) --- sys/net80211/ieee80211_amrr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c index 7248af0edccf..461554d75ea1 100644 --- a/sys/net80211/ieee80211_amrr.c +++ b/sys/net80211/ieee80211_amrr.c @@ -132,8 +132,9 @@ amrr_init(struct ieee80211vap *vap) static void amrr_deinit(struct ieee80211vap *vap) { - IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); KASSERT(nrefs > 0, ("imbalanced attach/detach")); + IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); + vap->iv_rs = NULL; /* guard */ nrefs--; /* XXX locking */ } From nobody Mon Apr 22 19:44:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKf41tqz5Hm3n; Mon, 22 Apr 2024 19:44: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 4VNbKf3Gv7z4mk3; Mon, 22 Apr 2024 19:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ4oATT6GNgY8Szfd+ehRevre7twMLOaR9a+reUGbLs=; b=WYnYRYLLQYMBBJFa7nJtwNzbAGJrfSzyVe/3mtez1clzjcRpoxYT02pKTfzb3lM6dQhD74 E6dUPYx8PCjsfrAzfUfAECc0GRY73Vp/JFCz9p+81KqufEWmEMhOAJ9lFN/gTkOJxvD4pT V70RVmm510r2eVGcD6O5kD/zNfmg/VtdpiSbls48QF+QdGRaXjcpKN90rfMxocW97VhXnh vl2xoGhI1S+CmJS2mrP6eCSFwreCpXK9Ir17YrfDTWwPwvd2jL0m1eJ4dvzOt60nxQJTOY LQ/rzqk8Nj/9A46AFoeQBdB6Y/F24BTW4B+h3TKXXqgREoUq54ij0oS5htVoeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815046; a=rsa-sha256; cv=none; b=wnuJoxnewSxzCQZxHlS+GNmx1ohk2csKIk6hlVQZe+mthWrydgwgoX3owQVGpW7zGBnMIS 8Hh0bkm/WmgfL3v2z+hPQcf8e0dep5Ff8FQCBFNAzagAqeZJS9U6S0CLCVFXf4Ri0d7uv+ atg/qkUK3x+hKo+u+DD/Q+g5lqdrcE7k1cROqoTAgkeKJFkFnj8OwIFRyxbUhn3cc/sTDh PoDzaheeyFRGR/r0b9grR/2AhpqOh2s/nNE9RieAmUr2DNZq6sPh1gX37CytHVyxMA8r9z qZZFR8QdPWBV5TN7JxeNTTVAi2nhCLvkP+9RHyJAlKmYVDtqkFAZxIVdHVD40A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ4oATT6GNgY8Szfd+ehRevre7twMLOaR9a+reUGbLs=; b=MJrDUH2GSupjFlFb61hVrRftT/9F4oJ4RkQ9a045FS3r0ctuXseE9RTeeHHay5A/yDVPpQ GoR6PHU8HfDnINieiFHu2SWq6nuh2eWLnU1pJTfvG8PTUulTcAhcmq33CApH7TaWjbdWdq YYTLg/gl0XF0Twg6D333eBYozxT0rx5x3Ds2btK8W+knn3MXNqQRYKby3VKEX+dhtexwBI MJy3w0poRdSOpBzUIw3spiBlHoNf1tokcFFxMH5mKB8JkT4/l8icXM32V5kgQNroIGynFc h1I3fn5LOvBsqQgrt6O7OioM5BbpkJSrcbdAVv1jhOy538oM58J12dSmkpzHBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKf2cNgz11ff; Mon, 22 Apr 2024 19:44: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 43MJi6OI032431; Mon, 22 Apr 2024 19:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi6SJ032428; Mon, 22 Apr 2024 19:44:06 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:06 GMT Message-Id: <202404221944.43MJi6SJ032428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b5cf81e20984 - stable/14 - LinuxKPI: 802.11: disable early queue wakeup workaround; better classify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5cf81e209848b3abee365de2eca56f74305b025 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b5cf81e209848b3abee365de2eca56f74305b025 commit b5cf81e209848b3abee365de2eca56f74305b025 Author: Bjoern A. Zeeb AuthorDate: 2024-02-16 21:14:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:27 +0000 LinuxKPI: 802.11: disable early queue wakeup workaround; better classify We used to call lkpi_wake_tx_queues() for all queues early on in order to make sure they are ready. Turns out whatever logic in iwlwifi startup is working correctly these days under LinuxKPI so this is no longer needed. As the comment indicated the "workaround" did not always work. Disable it for now. The second part of the improvement is to properly classify Non-QOS non-data frames (mgmt and ctl frames for now, unless we have to be even more careful in the future about certain sub-types) as TID 7/VO. Contrary to net80211 we must not promote PAE frames. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43944 (cherry picked from commit 1665ef979d3adab05d178480077674ab5978e4f0) --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index daf7eb7a5661..758db287d613 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1312,6 +1312,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); +#if 0 /* * Wakeup all queues now that sta is there so we have as much time to * possibly prepare the queue in the driver to be ready for the 1st @@ -1321,6 +1322,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * for all queues. */ lkpi_wake_tx_queues(hw, LSTA_TO_STA(lsta), false, false); +#endif /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); @@ -3670,8 +3672,16 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) hdr = (void *)skb->data; tid = linuxkpi_ieee80211_get_tid(hdr, true); if (tid == IEEE80211_NONQOS_TID) { /* == IEEE80211_NUM_TIDS */ - skb->priority = 0; - ac = IEEE80211_AC_BE; + if (!ieee80211_is_data(hdr->frame_control)) { + /* MGMT and CTRL frames go on TID 7/VO. */ + skb->priority = 7; + ac = IEEE80211_AC_VO; + } else { + /* Other non-QOS traffic goes to BE. */ + /* Contrary to net80211 we MUST NOT promote M_EAPOL. */ + skb->priority = 0; + ac = IEEE80211_AC_BE; + } } else { skb->priority = tid & IEEE80211_QOS_CTL_TID_MASK; ac = ieee80211e_up_to_ac[tid & 7]; From nobody Mon Apr 22 19:44:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKh0003z5Hm6M; Mon, 22 Apr 2024 19:44: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 4VNbKg4DRMz4mrr; Mon, 22 Apr 2024 19:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppR2YbIZP5GpxcmhQjfFh8/MCGnoGBRRYid2SEmN7Vk=; b=Fwbd5nwI3MID6SDX9ccdgTY7EhRjp2n6V+uw7dZlLmKVGLw8nqU0upLJmk41etP9PdxXMX Sukl/vSOJLMoeXiqAIQsuScWQFh8B0zZtV662sk8c5/PQjMRILyOPgagHwIqNFqVQq5YoA Lv7xF7KQgm9FfKfrl6rtcB3/5EFEc4E3WKFeXgo19gkE8Jwq75Ema86iexti125rfdF7b1 gRZt61+Bq5FFtOzaXKkJ+CysbpPmtwnmRxcnjWNgWTfYy2eOlXJTewg3r82QyntLZ0eWBM HUjPTBoqkkGghf46+jweuK1wRWvyQgnuFHWM/Kyvik49KuENQF8YPmAuKSggsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815047; a=rsa-sha256; cv=none; b=dZPgaXkCHFRoYseXTdRtnfgS0srcSNVsCjAJS1Ly1PuGMuDBL6zykaekwIF82iKgmsMhSz rIaSiJ2zfTarFmIJkz7yNdnsUfelGYzutbWJj4I8cmV6uq9HP7+860JkjgLpoRCZ4EioNO KzyVqh10O6dsiscRfnCmrpgN+6AJTHsAl7Z5H4Zh7jwjIfLwTOAwGcS0EMmH0D+5+tcVbj IWBfP9m74UXQjw3CIHKxrg3U57WZPGvBwQcL+y5BCF3pQkXCyYL2QA4dKfVDy5xbBjHmbk CRPj5TjiCnjSQILTSID7EL2CGY8QQjQh7wFYT+ZvKlkBkbP16gk8G/FyYsUhTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppR2YbIZP5GpxcmhQjfFh8/MCGnoGBRRYid2SEmN7Vk=; b=X+bsgTtvDdwp04lLi1Ss1q/nyRKEMT5g10AMWgmfIKy9IUHcxUAwvo7mboNBV9A0Awxy+B Gd3tJrS9a8wxyelp9WtWsjpOO9imxhsmc90Xg+9zEk94d2/v+mg+7IfEyICGHujXuxF3UH WdJTQ7nmqnZwLPB/iDKu3mHh4zdvlH2Wd2Mo8XIc4OoOidhtif34SpJThlLhzKiBVqRshP CgVydYDvhQJppLhI125BhBdYY1hfXb3RyOK1CLFpMyBMgQdnhaqDuaInlJEMBUIecsRTOH C6hcHd1AjnwNNIfoESoDaesWeFFU5277B4eVN73TiH0F5gtefQUZHFjrWAvDOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKg3q16z11tb; Mon, 22 Apr 2024 19:44: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 43MJi757032480; Mon, 22 Apr 2024 19:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi73e032477; Mon, 22 Apr 2024 19:44:07 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:07 GMT Message-Id: <202404221944.43MJi73e032477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6290fe776c74 - stable/14 - LinuxKPI: add __counted_by() and __nonstring List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6290fe776c74297eb6fd14bee08a31b17a6a54b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6290fe776c74297eb6fd14bee08a31b17a6a54b2 commit 6290fe776c74297eb6fd14bee08a31b17a6a54b2 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:41:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:48 +0000 LinuxKPI: add __counted_by() and __nonstring Add checks for __counted_by(_x) and __nonstring as and depending on compiler support enable the attribute/feature. This is needed to make mtk76 and ath1xk drivers compile. Sposnored by: The FreeBSD Foundation Reviewed by: emaste, dim Differential Revision: https://reviews.freebsd.org/D44587 (cherry picked from commit 2a8c50592f7fce8bceedf004f674a5a9eae0fd46) --- sys/compat/linuxkpi/common/include/linux/compiler.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 97687ccdc7e1..59c7d3cc04e7 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -67,6 +67,17 @@ #define ____cacheline_aligned_in_smp __aligned(CACHE_LINE_SIZE) #define fallthrough /* FALLTHROUGH */ do { } while(0) +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#if __has_attribute(__counted_by__) +#define __counted_by(_x) __attribute__((__counted_by__(_x))) +#else +#define __counted_by(_x) +#endif + #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #define typeof(x) __typeof(x) From nobody Mon Apr 22 19:44:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNbKh6WQwz5Hm3r; Mon, 22 Apr 2024 19:44: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 4VNbKh4bwxz4mhZ; Mon, 22 Apr 2024 19:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+xqtcBwRaiX91neoDMFTRD/yYamQU8O60juzB1mzPs=; b=ZipuASsCgMHiUz5TTeLara5y0ywVMzDOefB8Jd2kfEzMi4nyQ+m3ETGl4+dfyomsgzxqYw l5sD5pRPtz1bdhxb3AyXXayv1WQhpld7cGacbAnfPDWhciyNd4hxxeDa5wb3IuZRuyIKW/ CQDzvwOJBtX/1TXkEB3FtnEjndQcfQWyBmEFWDbNyT1tTL6EJAcLHI3dq+bfWRsR7LfOsI 8+k8un0Ps7I+4/NxjNVn3bvd6GKFqpuM+8Z5cDz/uqTgi8EGtBegLvRLW16ia1n3/NW0k6 ddhNdoWmHlH4uiTHpBjizlj166T/uS+GpvyhzXphrXw3iWAVzw/+cpKhjDiCmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815048; a=rsa-sha256; cv=none; b=iaXO87aYWYLhwU6kre6an4tgFvSkRrFGLkAkRjB4dI1DB58+6xwmLyQDz6FzF2SFQv+Jiy OG4wfrRXWbOh/0DtgO2sSzRAFq6qUjkunEfR68IgqIilXzDmNW3OrDLh7uiQNM6W3gNGxr fX2CB0vwMe5g3gXq8RuO6y89dbO786TBzxNp2htjUQAdLc9+VS3kqPaqMWAAcw4iqqdUzC biG2W+280HEhjseX/wrpQzc7o9/xnrN2BTlGeavt05yVflN+satuUqvLROJOxHPAl0NxF5 1WgxGU9OSJqTjiBHzKsxRmuKKoRvJvP0s0WYKGZlFPZ+CeLxUWkCRhy7c1nqfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+xqtcBwRaiX91neoDMFTRD/yYamQU8O60juzB1mzPs=; b=H1R4P6tVANueQ64Jr4LzdHYryxg9vcdt3eQc18klRX7maE8/n9AWEVB0nYB4X77nGo7xQK QAp5NzUJxO+xIqiXdidlNaDq5vddVQeKkyLPgllXkW2wmKYdtac29te/8jLEpfQuNc8OlL utO+0xmEHtajRIs/+6oOpvn/u2OKfl73/0rnMkTp22idcvj10hWFNGCUDBG/Cvagz7/rwu 6XWOoKo1G2g/mEfsX6HXjsR5IZX4gAGgHNimWHLsyJBO4RXqDQlCXktt3pfG4yby4fKtzS p0qNzAcKoghvB79rcFHG38+jiukQZ2RYxbqfhRfYveYuzZM3q8hgGZszjk97YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKh4Czdz11tc; Mon, 22 Apr 2024 19:44: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 43MJi8SO032529; Mon, 22 Apr 2024 19:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi8ps032526; Mon, 22 Apr 2024 19:44:08 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:08 GMT Message-Id: <202404221944.43MJi8ps032526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f4ccd1122a79 - stable/14 - LinuxKPI: utsname.h add missing SPDX-License-Identifier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4ccd1122a79ac55ed1b9aca58a23337008f6933 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ccd1122a79ac55ed1b9aca58a23337008f6933 commit f4ccd1122a79ac55ed1b9aca58a23337008f6933 Author: Bjoern A. Zeeb AuthorDate: 2024-04-19 18:23:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:53 +0000 LinuxKPI: utsname.h add missing SPDX-License-Identifier Reported by: markj (2023-05-24; sorry took me a while) (cherry picked from commit 563c72e2137cb8cb9eb0eabf78319e8fe9c8aedd) --- sys/compat/linuxkpi/common/include/linux/utsname.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/utsname.h b/sys/compat/linuxkpi/common/include/linux/utsname.h index e6c52f8a5020..3239801ca17b 100644 --- a/sys/compat/linuxkpi/common/include/linux/utsname.h +++ b/sys/compat/linuxkpi/common/include/linux/utsname.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without From nobody Mon Apr 22 20:29:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKh1JrLz5Hqhv; Mon, 22 Apr 2024 20: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 4VNcKh0lkRz4wmL; Mon, 22 Apr 2024 20: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=1713817752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sypu2JfLx+ZIpFOqUgGWuKeS5gUgKpbGeo/O0+Mp7as=; b=Vviv0fltW7NYNPnMj3yKPywqzxkZ0tq/6Xez8Z2sUlKKewU37Q7IE5RaaoZhfByNTW1/SN jlboZ2LVWOpxW1hP1DiuPC7N+i961DuTHg6ih/GjQHxHdprGXnX8kDGbq5Mx2V5kNwW5NS hKT73ztZZCdSvTR4HCbFHO4etsZ0t3kvmNq861wICW97cEaMlsjax2jN5uqzyKrJDkSDsS N/OEHhCeVI3aHRDszu/LV6FOacZia5VgizJogcUmvwuSYfbe3xB9KJIMgoyNY9E4ImPIRU x7FDR85k0ahhu/appUakg87xtzilffytVkQ9VYv3TgVwInEyR0KsIykZZgongA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817752; a=rsa-sha256; cv=none; b=gGTADiNfzF3wjw8gp6uPBv4ObluObF1+HNqmFCwsLLuO29tE3EPLyqIVEGn7/Pbax+RXeI hFsShiJ6bHNRPB5myTdyP2CMb614LZLB568fbqfSmtXF+jrVuR2xp5tp8lUhvK6Kaq5a+U K9Y0t0YWAgvqgJmoq39+s8FgqB19ksTEhVFP3MqP7ycR9AzRUUSHSRPoJ9UE83rvPd2PhP NYpBgXwwWHf2I00gWSoel+HqTes5Dzuzy47A4Q9jevJ5Z52UVgaZsxR+ngWVED3hAMOnWD RmfP+PxhGe49KAHERVaVa09RkqqlzTjJtPIp68f0k0HlEc31zNXjpt7mwoYktQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sypu2JfLx+ZIpFOqUgGWuKeS5gUgKpbGeo/O0+Mp7as=; b=ZAIwi4LEqKGWA0qmSk26ksIgI0DZIbUU48KqlRX8B3OT5386SIi8MXKIL85Q8XQ83OwCmg 3IR5I1CZQ0CpzCZDP+SQ2WxF/GTZHUGweQJxmhBT5eZIW/gGIKmim/bbVlRL7bzugH24Nb fl0UYI6xBzq/Sar2tKIRI+1Z2aLRVJc6F8G4oaIuBYZvUUqOybiUkgaO939/V0VPIGvjud 8ZUda8MsAs08Ft+5DC9ab+Df684MtUTFxA2eC0jLYjBym0wwi53uKuZjDazbJZbGEq7P8v 5bdRkfi2J/avcFTsxqpuDYgTQ1fWJPMsF2ki795M0AtZRS2Bmd9Cs9OS99ZAwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKh0MKVz12tK; Mon, 22 Apr 2024 20: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 43MKTBI8000930; Mon, 22 Apr 2024 20: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 43MKTBTV000927; Mon, 22 Apr 2024 20:29:11 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:11 GMT Message-Id: <202404222029.43MKTBTV000927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 672464f756e8 - main - libthr: always use __libc_interposing_slot() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 672464f756e8e2f723789f27df62704725e9fb82 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=672464f756e8e2f723789f27df62704725e9fb82 commit 672464f756e8e2f723789f27df62704725e9fb82 Author: Brooks Davis AuthorDate: 2024-04-22 18:24:26 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:26 +0000 libthr: always use __libc_interposing_slot() Use __libc_interposing_slot() in favor of __libsys_interposing_slot() so that the interposing interface is entierly between libc and libthr with libsys only involved as an implementation detail. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44880 --- lib/libthr/thread/thr_syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c index 348825cd6198..ba07c92576c2 100644 --- a/lib/libthr/thread/thr_syscalls.c +++ b/lib/libthr/thread/thr_syscalls.c @@ -651,7 +651,7 @@ __thr_interpose_libc(void) #undef SLOT #define SLOT(name) \ - *(__libsys_interposing_slot(INTERPOS_##name)) = \ + *(__libc_interposing_slot(INTERPOS_##name)) = \ (interpos_func_t)__thr_##name; SLOT(accept); SLOT(accept4); From nobody Mon Apr 22 20:29:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKj2cFBz5HqbC; Mon, 22 Apr 2024 20: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 4VNcKj20r9z4wk5; Mon, 22 Apr 2024 20:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJCedCW2lUbj4kjaDaNivZjwa83uxnKIQwsq4eT/5kA=; b=C37aNi4Vv+gyrqkZ0zaRrZFayTWaxMRuEzkIm3KIMRNtBMlK/WN8KAo+X6vJns3D2fhVGh 9osKdo4JFytN7cXdlOeqofJq5gBsQ4a+91OQjWZitQsLaVyOob++d6QA40CGSyuOBlSVMO FfBVKwkXK7Iq0gd1FVEmKmqttrUiznJLd+ZCQrAxo+K5emJlP7lx+sNAsSh9HyXx4M8HeO mZZavAgWMzvkEczHr6oB0FlD/E8RUP0w7CzsNxLKbUeaOst6geWjf7WnE87IpFctTbgbeV uApnv6mFzO/VFiho8O6NWbZRAWQgzXyopUUW9smTHl4HaaSY/ezrV7NTr8zL4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817753; a=rsa-sha256; cv=none; b=UHko3T+pC9vEpwtWHcclEHD92dH8UVCy1EXX/XYfQfM5g/djEFvYNiwKIlhQJutvXvalUb vD8bmzio5n8Im8fsjBEcR9kqsJ+oydPF37ox7j68UviAOkLn7JAKQpEx9PHgXDumDe+a24 LkPGrwquk9Kjr0iPRnXT3XnyeqOllQwR01P2H8TavNrqvHyikM/Ah+SCIGV1w9F8Cf2t4v 7LVKiI/P8fT+XdVYNbuICjQPLn0NeX/3cUcEbQBl7ltsjXPpdqdkPdlfkVMRJx0IxQF0mh iRt9IX+BW4AtSV0QI8Jxd76qaZCyNPthbQ2egZxZb5hxvLKegWQe1fgGobK4MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJCedCW2lUbj4kjaDaNivZjwa83uxnKIQwsq4eT/5kA=; b=gKL3N5uKoayVEcCtMDA3d+m9/XEnGzxbm+aGj5dpLlqBGksyBJwSgvVr390os6kV3OH7SK kdgPYq/YYZLMWILb/UsFXeyyLvZxSvHmXazw0Kx8qHypBzYoNqF7DLonSuKdGP6WH2NDvx MLbXlmZsE7M4t6BYbcqNKBkpWVo23HLQ7+ZSDEwHN+BXnW3Ztqudt32qxXvjn8Lpy13sqq 7aHXp3G+HAPegvjGd3IyHzP40oI3gFvvQ6sX/doPD4G6FLyF/eNScFw7DLO7kccPF0y38I mQasepbG0eYJDWfRPODUUyDwxfB/ZmKAIsj9d8f/pBkgrmQMF8DQJ13NpT3NOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKj1b9Vz12qR; Mon, 22 Apr 2024 20:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MKTDNS000974; Mon, 22 Apr 2024 20:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTDtA000971; Mon, 22 Apr 2024 20:29:13 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:13 GMT Message-Id: <202404222029.43MKTDtA000971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7448408656b0 - main - Make __libsys_interposing_slot libsys only List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7448408656b05b7aa6f81c72366296c567591df9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7448408656b05b7aa6f81c72366296c567591df9 commit 7448408656b05b7aa6f81c72366296c567591df9 Author: Brooks Davis AuthorDate: 2024-04-22 18:24:36 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:26 +0000 Make __libsys_interposing_slot libsys only Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44881 --- lib/libsys/Makefile | 3 ++- lib/libsys/Makefile.sys | 3 ++- lib/libsys/Symbol.map | 1 + lib/libsys/Symbol.sys.map | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 93b880cd67fe..b4c0e91e860c 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -60,7 +60,8 @@ MIASM= NOASM= SYM_MAPS+= ${LIBSYS_SRCTOP}/Symbol.map -SRCS+= auxv.c +SRCS+= auxv.c \ + interposing_table.c .include "${LIBSYS_SRCTOP}/Makefile.sys" diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 98a9688e58a1..205f6bc1a5eb 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -37,7 +37,6 @@ SRCS+= \ __getosreldate.c \ getpagesize.c \ getpagesizes.c \ - interposing_table.c \ libsys_sigwait.c .if ${LIB} == "c" @@ -46,6 +45,8 @@ SOBJS+= libc_stubs.pico # Link the full implementation of ELF auxargs for static libc. STATICOBJS+= auxv.o + +STATICOBJS+= interposing_table.o .endif NOASM= yield.o diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index 99cc171dd405..2cd524c19a3f 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -2,6 +2,7 @@ FBSDprivate_1.0 { __elf_aux_vector; __getosreldate; __realpathat; + __libsys_interposing_slot; _elf_aux_info; freebsd11_fstat; freebsd11_fstatat; diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 822c007d32f1..464086985cfc 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -384,7 +384,6 @@ FBSD_1.8 { FBSDprivate_1.0 { /* Add entries in sort(1) order */ - __libsys_interposing_slot; __set_error_selector; __sigwait; gssd_syscall; From nobody Mon Apr 22 20:29:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKk4ggvz5HqRq; Mon, 22 Apr 2024 20:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNcKk2lZhz4wnp; Mon, 22 Apr 2024 20:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ocngdcdOkFOzWJuyguJWOIn1iSzLe8tHSaeKp81ipVQ=; b=wKf/gqcdzotHh7Sfy6gUw0wOsZ/FBKbbUh472ZrYLdzGdG0j83+zXtoaT39LFnthb75WzU v9RVGIdg4gWCO6dYQrJ7LqCSmcAflVWlxbqaGckXqAbFzRM3UfeGKupIr3aUxorj4Yrwt7 6J6yfZP78G83znbnLhsOoKIKGMwuPe2rJITH1J7ybkCbCf+8j27NUvCLOCyn5+KkuwzdMd TdjbL+qFia10gzVqEqz+uVzCKSQ1CBFSZ57/WqRE2nXSjQbqfRqCvAy5N7Jc+Rl9dkpGMs iobuzAYbdf8JNxFG8TRXuYl3Ub49tklYoVPyhv8zUIbjLjlfrnoRFj54TwuCOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817754; a=rsa-sha256; cv=none; b=w6dWP6TT9LnUS3sawIKJ4514s/0les6aa1yD8vofUn2A3x3OCy5+WekoxQCv+54E13ubt7 f/adq4cPLSW051Wd1zhXtH16uwvqb9hfIE1t5nVDt2ClmLowH6u5/X5TURTdklNoVPWIfK 5I+tmaeTbBMyolIAd1YOifiMoK30sTzO+3F0EGS2iHajEYaFXMAdAHjAJ+D5ZSo/AX6cRG tWnxZrpu24b0rBzQJdUK7yeMha/UVPx1XS5CpgOZlRt1fOAYk6mWM7HHYubLK7TSWvC2G/ DQRLgPwbn7uRbdpF9o3T7CRuUbE0hWGNLR5iCyZDnKqoz8GynuYJrnxAwJWbfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ocngdcdOkFOzWJuyguJWOIn1iSzLe8tHSaeKp81ipVQ=; b=YvVM3BsnAP6EDZC4A6bdK7SxRW/TWpJYvUYjtijyNtyoxBmN0uuSd8tyi5eN0J5Zmg2Sm0 g/gFTCh7pzf5LzRW+ERP3a76EfLkL5dA+cXXxcUanZmsyrGF6y5fIoFPTxdB3B+B35GGTK lJtnFa3LglJzoBXcQXNAErXrNQw3rZTncHi8NR+MZjhR5ZGw1fywiHlM2/gJKF+Vi4lntP dTEnS4spaAGQqnNlbV4hLUtuJsLQfydUi5McuIqh4E0TKSNB5eks6BE2pGx8b3LAndOOmt ZdJovYplM36GtuCn4OdUlbyaaWTJsWnvXDoYrdHaHMlhQRHK9emqLELbOvKuaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKk2KPxz12nj; Mon, 22 Apr 2024 20:29: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 43MKTEru001020; Mon, 22 Apr 2024 20:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTEre001017; Mon, 22 Apr 2024 20:29:14 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:14 GMT Message-Id: <202404222029.43MKTEre001017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e5700dab1e7a - main - src.conf.5: rebuild after WITH_NVME 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5700dab1e7ad84b9a97025d263f0acd3599a1c2 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e5700dab1e7ad84b9a97025d263f0acd3599a1c2 commit e5700dab1e7ad84b9a97025d263f0acd3599a1c2 Author: Brooks Davis AuthorDate: 2024-04-22 18:41:44 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:27 +0000 src.conf.5: rebuild after WITH_NVME changes WITH_NVME is no longer marked broken on armv7, riscv64, or powerpc. Fixes: 2fda3ab0ac19 WITH_NVME: Remove from broken. Differential Revision: https://reviews.freebsd.org/D44850 --- share/man/man5/src.conf.5 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index c6546e951e13..3f35e4146b52 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 March 15, 2024 +.Dd April 18, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1318,14 +1318,6 @@ and related programs. Do not install the limited cloud init support scripts. .It Va WITHOUT_NVME Do not build nvme related tools and kernel modules. -.Pp -This is a default setting on -arm/armv7, powerpc/powerpc and riscv/riscv64. -.It Va WITH_NVME -Build nvme related tools and kernel modules. -.Pp -This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. .It Va WITHOUT_OFED Do not build the .Dq "OpenFabrics Enterprise Distribution" From nobody Mon Apr 22 20:29:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKl5BRTz5HqKc; Mon, 22 Apr 2024 20:29: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 4VNcKl40TVz4wv7; Mon, 22 Apr 2024 20:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Lz8bY29qW4d45nenJ5WLzm2tnF77C4NHviD2BVucPo=; b=ljoH0MNNC4SKeuEgBMvKwSzKUb3QX7g+Plf3J+o/RTrIAEJ8wfJ9NGv3YcmuFG8TPrSkXX GsdL34CFQtcUCpVkn1+RwrV6hjBOKD8nVzqzfHYQHPmylamJLCe7KlTjDMuGCU4qQtm64S QnR/NUn4EeHN8vyhBlpLkE24EcXc/nuDZBrwIksg6oQ1qCFJq8oUHGyM/qZtG5itB5JuIx EBlU5tMVIWMRTlOyWpV8tvsrgnadf1vTzPp0jPha2BrV8DXbmL+1K9O7isJM6pM9exr2Wl TUQeQ7WT0hAPTrxAlZQBxOsW/O4IdsR7YtDgtUW5hGVam3PKA3iM4UZMkgqc1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817755; a=rsa-sha256; cv=none; b=KbcgtXIeUGCMTPsBsieV3qxIN35koODE5HWDLmvjuj2BubVvKm/zwue193TEjX0eGiLo7b q3FEpdaExBPXpxDtzHzekDqvJBQRBnH129Jaxir6CCi4NCom+dr7H7Z2bJKC+nFpoY07cO znQ1iNA/fWGxk3zeGHSJxD3aLEX3/dAVw8BBE+T2cNadBypRFSSaZNO2wmO73/Ze5eVbO/ h6NtHDSBlXQKUd7SzDB7VE4KgoE1U57b1Jk9jTx/vzYq/aS0MCnu2oc0Mrwh4KqQI3ZTW1 KQvhuR1zoA1lAyZ66vpqNq4cxRG4O0uREfofRz1mY8daFvwUr1oFe3bGYKaeIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Lz8bY29qW4d45nenJ5WLzm2tnF77C4NHviD2BVucPo=; b=Tc6V6C+8IZzsKQMDD2qkUeWoYzmFTsyfU2ZtYMtDxRvfpIudUdmglQ68aIbcAn3ReW3Pgh t68/saOcG+vprQ/VjJNT8FkkjbFklTd3U+xsSqtjtJwMn8g2liLcQHTzBiLPf7FZ5mpra0 VUAOAb45rmVKmxqmUzGYizWDdGNCaTs6ntTgXhP6vM611hVx44CN0SWwI0SzVDorEgLrO8 hmaEpi1brTEYFex5SBvgPsJwoDQRNZTvsNbhaaNt9jnVax5DoygknP4xQk2sxl/YDY6gya sahhc7s3sxO4Kc73FL2vvSWoIw/uryy+sz9zp3Y6Jvvsupk1DMu57oCDor9QCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKl3Lwzz12nk; Mon, 22 Apr 2024 20:29: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 43MKTFpG001064; Mon, 22 Apr 2024 20:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTF4a001061; Mon, 22 Apr 2024 20:29:15 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:15 GMT Message-Id: <202404222029.43MKTF4a001061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5ffb5c849c86 - main - openssl: don't export nonexistant symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ffb5c849c86fbc300e2b35bb9ee42997c3535e7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5ffb5c849c86fbc300e2b35bb9ee42997c3535e7 commit 5ffb5c849c86fbc300e2b35bb9ee42997c3535e7 Author: Brooks Davis AuthorDate: 2024-04-22 19:13:28 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:51 +0000 openssl: don't export nonexistant symbols These are all OpenSSL 1.1.0 and 1.1.1 symbols that aren't present in our OpenSSL 3.0 builds. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44249 --- secure/lib/libcrypto/Version.map | 133 --------------------------------------- secure/lib/libssl/Version.map | 4 -- 2 files changed, 137 deletions(-) diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version.map index 557b4a4b7b84..86575078bf6c 100644 --- a/secure/lib/libcrypto/Version.map +++ b/secure/lib/libcrypto/Version.map @@ -813,7 +813,6 @@ OPENSSL_1_1_0 { CRYPTO_get_ex_new_index; CRYPTO_get_mem_functions; CRYPTO_malloc; - CRYPTO_mem_ctrl; CRYPTO_memcmp; CRYPTO_memdup; CRYPTO_new_ex_data; @@ -843,7 +842,6 @@ OPENSSL_1_1_0 { CRYPTO_secure_used; CRYPTO_secure_zalloc; CRYPTO_set_ex_data; - CRYPTO_set_mem_debug; CRYPTO_set_mem_functions; CRYPTO_strdup; CRYPTO_strndup; @@ -1362,7 +1360,6 @@ OPENSSL_1_1_0 { ERR_load_CT_strings; ERR_load_DH_strings; ERR_load_DSA_strings; - ERR_load_DSO_strings; ERR_load_EC_strings; ERR_load_ENGINE_strings; ERR_load_ERR_strings; @@ -1390,7 +1387,6 @@ OPENSSL_1_1_0 { ERR_print_errors; ERR_print_errors_cb; ERR_print_errors_fp; - ERR_put_error; ERR_reason_error_string; ERR_remove_state; ERR_remove_thread_state; @@ -1407,23 +1403,17 @@ OPENSSL_1_1_0 { ESS_SIGNING_CERT_free; ESS_SIGNING_CERT_new; EVP_BytesToKey; - EVP_CIPHER_CTX_block_size; EVP_CIPHER_CTX_buf_noconst; EVP_CIPHER_CTX_cipher; EVP_CIPHER_CTX_clear_flags; EVP_CIPHER_CTX_copy; EVP_CIPHER_CTX_ctrl; - EVP_CIPHER_CTX_encrypting; EVP_CIPHER_CTX_free; EVP_CIPHER_CTX_get_app_data; EVP_CIPHER_CTX_get_cipher_data; EVP_CIPHER_CTX_iv; - EVP_CIPHER_CTX_iv_length; EVP_CIPHER_CTX_iv_noconst; - EVP_CIPHER_CTX_key_length; EVP_CIPHER_CTX_new; - EVP_CIPHER_CTX_nid; - EVP_CIPHER_CTX_num; EVP_CIPHER_CTX_original_iv; EVP_CIPHER_CTX_rand_key; EVP_CIPHER_CTX_reset; @@ -1435,14 +1425,10 @@ OPENSSL_1_1_0 { EVP_CIPHER_CTX_set_padding; EVP_CIPHER_CTX_test_flags; EVP_CIPHER_asn1_to_param; - EVP_CIPHER_block_size; EVP_CIPHER_do_all; EVP_CIPHER_do_all_sorted; - EVP_CIPHER_flags; EVP_CIPHER_get_asn1_iv; EVP_CIPHER_impl_ctx_size; - EVP_CIPHER_iv_length; - EVP_CIPHER_key_length; EVP_CIPHER_meth_dup; EVP_CIPHER_meth_free; EVP_CIPHER_meth_get_cleanup; @@ -1461,10 +1447,8 @@ OPENSSL_1_1_0 { EVP_CIPHER_meth_set_init; EVP_CIPHER_meth_set_iv_length; EVP_CIPHER_meth_set_set_asn1_params; - EVP_CIPHER_nid; EVP_CIPHER_param_to_asn1; EVP_CIPHER_set_asn1_iv; - EVP_CIPHER_type; EVP_CipherFinal; EVP_CipherFinal_ex; EVP_CipherInit; @@ -1509,18 +1493,14 @@ OPENSSL_1_1_0 { EVP_MD_CTX_ctrl; EVP_MD_CTX_free; EVP_MD_CTX_md; - EVP_MD_CTX_md_data; EVP_MD_CTX_new; - EVP_MD_CTX_pkey_ctx; EVP_MD_CTX_reset; EVP_MD_CTX_set_flags; EVP_MD_CTX_set_update_fn; EVP_MD_CTX_test_flags; EVP_MD_CTX_update_fn; - EVP_MD_block_size; EVP_MD_do_all; EVP_MD_do_all_sorted; - EVP_MD_flags; EVP_MD_meth_dup; EVP_MD_meth_free; EVP_MD_meth_get_app_datasize; @@ -1544,9 +1524,6 @@ OPENSSL_1_1_0 { EVP_MD_meth_set_input_blocksize; EVP_MD_meth_set_result_size; EVP_MD_meth_set_update; - EVP_MD_pkey_type; - EVP_MD_size; - EVP_MD_type; EVP_OpenFinal; EVP_OpenInit; EVP_PBE_CipherInit; @@ -1599,8 +1576,6 @@ OPENSSL_1_1_0 { EVP_PKEY_asn1_set_public; EVP_PKEY_asn1_set_security_bits; EVP_PKEY_assign; - EVP_PKEY_base_id; - EVP_PKEY_bits; EVP_PKEY_cmp; EVP_PKEY_cmp_parameters; EVP_PKEY_copy_parameters; @@ -1626,13 +1601,11 @@ OPENSSL_1_1_0 { EVP_PKEY_get1_DSA; EVP_PKEY_get1_EC_KEY; EVP_PKEY_get1_RSA; - EVP_PKEY_get1_tls_encodedpoint; EVP_PKEY_get_attr; EVP_PKEY_get_attr_by_NID; EVP_PKEY_get_attr_by_OBJ; EVP_PKEY_get_attr_count; EVP_PKEY_get_default_digest_nid; - EVP_PKEY_id; EVP_PKEY_keygen; EVP_PKEY_keygen_init; EVP_PKEY_meth_add0; @@ -1678,17 +1651,14 @@ OPENSSL_1_1_0 { EVP_PKEY_print_private; EVP_PKEY_print_public; EVP_PKEY_save_parameters; - EVP_PKEY_security_bits; EVP_PKEY_set1_DH; EVP_PKEY_set1_DSA; EVP_PKEY_set1_EC_KEY; EVP_PKEY_set1_RSA; - EVP_PKEY_set1_tls_encodedpoint; EVP_PKEY_set_type; EVP_PKEY_set_type_str; EVP_PKEY_sign; EVP_PKEY_sign_init; - EVP_PKEY_size; EVP_PKEY_type; EVP_PKEY_up_ref; EVP_PKEY_verify; @@ -1801,15 +1771,10 @@ OPENSSL_1_1_0 { EVP_get_cipherbyname; EVP_get_digestbyname; EVP_get_pw_prompt; - EVP_idea_cbc; - EVP_idea_cfb64; - EVP_idea_ecb; - EVP_idea_ofb; EVP_md4; EVP_md5; EVP_md5_sha1; EVP_md_null; - EVP_mdc2; EVP_rc2_40_cbc; EVP_rc2_64_cbc; EVP_rc2_cbc; @@ -1819,10 +1784,6 @@ OPENSSL_1_1_0 { EVP_rc4; EVP_rc4_40; EVP_rc4_hmac_md5; - EVP_rc5_32_12_16_cbc; - EVP_rc5_32_12_16_cfb64; - EVP_rc5_32_12_16_ecb; - EVP_rc5_32_12_16_ofb; EVP_read_pw_string; EVP_read_pw_string_min; EVP_ripemd160; @@ -1839,8 +1800,6 @@ OPENSSL_1_1_0 { EVP_whirlpool; EXTENDED_KEY_USAGE_free; EXTENDED_KEY_USAGE_new; - FIPS_mode; - FIPS_mode_set; GENERAL_NAMES_free; GENERAL_NAMES_new; GENERAL_NAME_cmp; @@ -1866,14 +1825,6 @@ OPENSSL_1_1_0 { HMAC_Init_ex; HMAC_Update; HMAC_size; - IDEA_cbc_encrypt; - IDEA_cfb64_encrypt; - IDEA_ecb_encrypt; - IDEA_encrypt; - IDEA_ofb64_encrypt; - IDEA_options; - IDEA_set_decrypt_key; - IDEA_set_encrypt_key; IPAddressChoice_free; IPAddressChoice_new; IPAddressFamily_free; @@ -1894,10 +1845,6 @@ OPENSSL_1_1_0 { MD5_Init; MD5_Transform; MD5_Update; - MDC2; - MDC2_Final; - MDC2_Init; - MDC2_Update; NAME_CONSTRAINTS_check; NAME_CONSTRAINTS_check_CN; NAME_CONSTRAINTS_free; @@ -2004,15 +1951,6 @@ OPENSSL_1_1_0 { OCSP_REQUEST_get_ext_count; OCSP_REQUEST_new; OCSP_REQUEST_print; - OCSP_REQ_CTX_add1_header; - OCSP_REQ_CTX_free; - OCSP_REQ_CTX_get0_mem_bio; - OCSP_REQ_CTX_http; - OCSP_REQ_CTX_i2d; - OCSP_REQ_CTX_nbio; - OCSP_REQ_CTX_nbio_d2i; - OCSP_REQ_CTX_new; - OCSP_REQ_CTX_set1_req; OCSP_RESPBYTES_free; OCSP_RESPBYTES_new; OCSP_RESPDATA_free; @@ -2059,7 +1997,6 @@ OPENSSL_1_1_0 { OCSP_id_get0_info; OCSP_id_issuer_cmp; OCSP_onereq_get0_id; - OCSP_parse_url; OCSP_request_add0_id; OCSP_request_add1_cert; OCSP_request_add1_nonce; @@ -2082,9 +2019,7 @@ OPENSSL_1_1_0 { OCSP_response_status; OCSP_response_status_str; OCSP_sendreq_bio; - OCSP_sendreq_nbio; OCSP_sendreq_new; - OCSP_set_max_response_length; OCSP_single_get0_status; OCSP_url_svcloc_new; OPENSSL_DIR_end; @@ -2127,7 +2062,6 @@ OPENSSL_1_1_0 { OPENSSL_isservice; OPENSSL_issetugid; OPENSSL_load_builtin_modules; - OPENSSL_memcmp; OPENSSL_sk_deep_copy; OPENSSL_sk_delete; OPENSSL_sk_delete_ptr; @@ -2479,13 +2413,6 @@ OPENSSL_1_1_0 { RC4; RC4_options; RC4_set_key; - RC5_32_cbc_encrypt; - RC5_32_cfb64_encrypt; - RC5_32_decrypt; - RC5_32_ecb_encrypt; - RC5_32_encrypt; - RC5_32_ofb64_encrypt; - RC5_32_set_key; RIPEMD160; RIPEMD160_Final; RIPEMD160_Init; @@ -2558,14 +2485,12 @@ OPENSSL_1_1_0 { RSA_padding_add_PKCS1_PSS_mgf1; RSA_padding_add_PKCS1_type_1; RSA_padding_add_PKCS1_type_2; - RSA_padding_add_SSLv23; RSA_padding_add_X931; RSA_padding_add_none; RSA_padding_check_PKCS1_OAEP; RSA_padding_check_PKCS1_OAEP_mgf1; RSA_padding_check_PKCS1_type_1; RSA_padding_check_PKCS1_type_2; - RSA_padding_check_SSLv23; RSA_padding_check_X931; RSA_padding_check_none; RSA_print; @@ -2825,7 +2750,6 @@ OPENSSL_1_1_0 { TS_TST_INFO_set_time; TS_TST_INFO_set_tsa; TS_TST_INFO_set_version; - TS_VERIFY_CTS_set_certs; TS_VERIFY_CTX_add_flags; TS_VERIFY_CTX_cleanup; TS_VERIFY_CTX_free; @@ -3003,7 +2927,6 @@ OPENSSL_1_1_0 { X509_CRL_get_nextUpdate; X509_CRL_get_signature_nid; X509_CRL_get_version; - X509_CRL_http_nbio; X509_CRL_match; X509_CRL_new; X509_CRL_print; @@ -3070,7 +2993,6 @@ OPENSSL_1_1_0 { X509_NAME_get_index_by_OBJ; X509_NAME_get_text_by_NID; X509_NAME_get_text_by_OBJ; - X509_NAME_hash; X509_NAME_hash_old; X509_NAME_new; X509_NAME_oneline; @@ -3386,7 +3308,6 @@ OPENSSL_1_1_0 { X509_getm_notAfter; X509_getm_notBefore; X509_gmtime_adj; - X509_http_nbio; X509_issuer_and_serial_cmp; X509_issuer_and_serial_hash; X509_issuer_name_cmp; @@ -4038,7 +3959,6 @@ OPENSSL_1_1_0 { X509_VAL_it; X509_it; ZLONG_it; - _shadow_DES_check_key; }; OPENSSL_1_1_0a { @@ -4229,34 +4149,6 @@ OPENSSL_1_1_1 { EVP_PKEY_new_raw_public_key; EVP_PKEY_param_check; EVP_PKEY_public_check; - EVP_PKEY_set_alias_type; - EVP_aria_128_cbc; - EVP_aria_128_ccm; - EVP_aria_128_cfb128; - EVP_aria_128_cfb1; - EVP_aria_128_cfb8; - EVP_aria_128_ctr; - EVP_aria_128_ecb; - EVP_aria_128_gcm; - EVP_aria_128_ofb; - EVP_aria_192_cbc; - EVP_aria_192_ccm; - EVP_aria_192_cfb128; - EVP_aria_192_cfb1; - EVP_aria_192_cfb8; - EVP_aria_192_ctr; - EVP_aria_192_ecb; - EVP_aria_192_gcm; - EVP_aria_192_ofb; - EVP_aria_256_cbc; - EVP_aria_256_ccm; - EVP_aria_256_cfb128; - EVP_aria_256_cfb1; - EVP_aria_256_cfb8; - EVP_aria_256_ctr; - EVP_aria_256_ecb; - EVP_aria_256_gcm; - EVP_aria_256_ofb; EVP_sha3_224; EVP_sha3_256; EVP_sha3_384; @@ -4265,12 +4157,6 @@ OPENSSL_1_1_1 { EVP_sha512_256; EVP_shake128; EVP_shake256; - EVP_sm3; - EVP_sm4_cbc; - EVP_sm4_cfb128; - EVP_sm4_ctr; - EVP_sm4_ecb; - EVP_sm4_ofb; NAMING_AUTHORITY_free; NAMING_AUTHORITY_get0_authorityId; NAMING_AUTHORITY_get0_authorityText; @@ -4357,25 +4243,6 @@ OPENSSL_1_1_1 { PROFESSION_INFO_set0_professionItems; PROFESSION_INFO_set0_professionOIDs; PROFESSION_INFO_set0_registrationNumber; - RAND_DRBG_bytes; - RAND_DRBG_free; - RAND_DRBG_generate; - RAND_DRBG_get0_master; - RAND_DRBG_get0_private; - RAND_DRBG_get0_public; - RAND_DRBG_get_ex_data; - RAND_DRBG_instantiate; - RAND_DRBG_new; - RAND_DRBG_reseed; - RAND_DRBG_secure_new; - RAND_DRBG_set; - RAND_DRBG_set_callbacks; - RAND_DRBG_set_defaults; - RAND_DRBG_set_ex_data; - RAND_DRBG_set_reseed_defaults; - RAND_DRBG_set_reseed_interval; - RAND_DRBG_set_reseed_time_interval; - RAND_DRBG_uninstantiate; RAND_keep_random_devices_open; RAND_priv_bytes; RSA_generate_multi_prime_key; diff --git a/secure/lib/libssl/Version.map b/secure/lib/libssl/Version.map index 457493beafb5..0c02b50d793b 100644 --- a/secure/lib/libssl/Version.map +++ b/secure/lib/libssl/Version.map @@ -264,7 +264,6 @@ OPENSSL_1_1_0 { SSL_get_info_callback; SSL_get_options; SSL_get_peer_cert_chain; - SSL_get_peer_certificate; SSL_get_peer_finished; SSL_get_privatekey; SSL_get_psk_identity; @@ -387,9 +386,6 @@ OPENSSL_1_1_0 { SSL_waiting_for_async; SSL_want; SSL_write; - SSLv3_client_method; - SSLv3_method; - SSLv3_server_method; TLS_client_method; TLS_method; TLS_server_method; From nobody Mon Apr 22 20:29:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKm5jSJz5HqgY; Mon, 22 Apr 2024 20:29: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 4VNcKm4ShWz4x3G; Mon, 22 Apr 2024 20:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLX9P5YtJhWF2AalOPavJgoBXwSQLRxDUER21IquNuI=; b=u7t1UeYv3Tej6rcLSeteQfZqM82HECXYuYDNJnEB5+6rLwIWJrFmRZmIhc9i6BqeDOa+SL DKs9+0VjI4/m0ykFIA4Hk1uW0zhHdkw5B0bS41f+Ijdah/0sKV7Dw2p+z7lYruRYpBa/Gk bgUP9L7nkRYH5HHOcCJa2vGFzC0tSiMFy8SZ1POzV+ce5U7FqH9krOaUZtubp+39GEl5CO aCmcikJhuqy/pRB+oKiX9v7O0x80qGMOnPoQw2n2AfMndRxr2w/Zq9O4WPPX3JT4lA/6Bp 410eHqKIk5lbNdY26aP9nlzqXj8ev3Z+rWPaBR4gVRX9CMS4luf2HCgfbkCRmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817756; a=rsa-sha256; cv=none; b=hDJUAKFFcQQoRqQbKtMQWppzBAB8IjzklM8p79HSuUU+0yZ+VOo4RyyZ+YSIEUcRG4lsrl bLTePd4wvUM3EzzIrhq9VrrwFlyJoj+Qt6RrRpF8BNUvkrXhMKQev0WXIjlwhskytr6iDT pz37BsSQ7cvUemLVDBehAuV1m13pUvvj08z6MfAhQHg19pwx2sLza94APsinOdhG1LybhV zMrXhSsnNbPvWzRDW7PFJ3KjfAVvk9dbYtbdmhgS0tAhZYEI0Q6H4RFx/42Dda2Iua8PJo 6roxYHxEs/W0oOdXKMtUYKTaP6Jf/AMOaRfpUT3C/50Bff9vdcjcVmsO76lHWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLX9P5YtJhWF2AalOPavJgoBXwSQLRxDUER21IquNuI=; b=imMLyg/zaXRNubAx0HJOHHRO76DR3INcwZPoHgX0wFXZSSshUnPRZdCYYedj2u5Dqfd/75 KdYOsz9/HH4um13KFLtDCuULrqO9joq1Cx7ibyssclkMVR+yUw1I40zJ0py2ZoqA/u+ai/ Vb4D0IiXZBlxq9i8jsyQzbSCVKT1rpMH/F3Q8Rk2apO8BF/C6Qw5dPNGuD0SR2PDOikWIh b/n0oJbCwkuiYrs9OXsyYhVL6NMo6otD2axzBIkpyGPKOlFLEgJ5lqNRtAzSFohy1qjYoV VJjU05Jkle0pJJUi4FhE2my5d+Lh0Hb2wl5gq3t1NyJnYAwqPfijEoOiau5YWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKm44gwz12nl; Mon, 22 Apr 2024 20:29: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 43MKTGXk001112; Mon, 22 Apr 2024 20:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTG6T001109; Mon, 22 Apr 2024 20:29:16 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:16 GMT Message-Id: <202404222029.43MKTG6T001109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 80ffc7398b83 - main - libsys/arm: make vfork less of an outlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80ffc7398b8302b2d54d783d8349e54d877a4250 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=80ffc7398b8302b2d54d783d8349e54d877a4250 commit 80ffc7398b8302b2d54d783d8349e54d877a4250 Author: Brooks Davis AuthorDate: 2024-04-22 19:13:35 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:51 +0000 libsys/arm: make vfork less of an outlier Following the pattern of other architectures, make __sys_vfork the main symbol and _vfork and vfork weak aliases. This avoids the need to special case vfork in the generated list of symbols. Differential Revision: https://reviews.freebsd.org/D44330 --- lib/libsys/arm/vfork.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libsys/arm/vfork.S b/lib/libsys/arm/vfork.S index 2b92f56ad4e4..ef9a426c6de5 100644 --- a/lib/libsys/arm/vfork.S +++ b/lib/libsys/arm/vfork.S @@ -42,13 +42,17 @@ .text .align 0 -ENTRY(vfork) +ENTRY(__sys_vfork) + .weak _C_LABEL(vfork); + .set _C_LABEL(vfork), _C_LABEL(__sys_vfork); + .weak _C_LABEL(_vfork); + .set _C_LABEL(_vfork), _C_LABEL(__sys_vfork); mov r2, r14 _SYSCALL(vfork) bcs PIC_SYM(CERROR, PLT) sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ and r0, r0, r1 /* r0 == 0 if child, else unchanged */ mov r15, r2 -END(vfork) +END(__sys_vfork) .section .note.GNU-stack,"",%progbits From nobody Mon Apr 22 20:29:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNcKn73YFz5HqlH; Mon, 22 Apr 2024 20:29: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 4VNcKn5mVVz4wrn; Mon, 22 Apr 2024 20:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ccGzjJnSq0iua1tA8Z55qLfoQFGRDO1B/OCGx4kRdc=; b=URL/FzhIIQBGTfw4ISj2FqqGuvk3PCgYjukEDi+aC6+VwxJjtoNbGaVd2Rp2aPXFzJo1Cx mPTCzFdB1NPFcQXIHFoQTQB8Hsj/bJdhAli62QwnHMdUaKw/OtjP9dEDZ3laQJuLEoiCN6 /z34jv/pyVa1ia6SVFsWvRICY+GX4FPWjeSAsIRPoRK+0oNXYwEiWZf1+Xz29n/MX+3R50 xT7sX9rQLad+9w+x7AeyPkdy5irqDQl3/p6uuOJkZ62vRaiZonIvwPAqKbWGV5xWRrbxbZ Kp9oXIfieEN7ShxMzGX+GxuP5lIvJleZUNb8pcLZKdExSF2kxKt0HTRZJ0heBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817757; a=rsa-sha256; cv=none; b=ixQ3UeNl/AaXOuMUG3lqzKokec7bpJsPL5BqYXk4fwT2EuadaQlLLiyBcBfu27QYuwmImY SZxqgzWeBujpcQziDX7zTc2fL+m6mVXw8mUHwyLEYRTYFcD0txOlkmOOV34c/VfcCgkQzn VxrQ9Kb0P0F0oP01MECNu0k0liZEwtGIAotMk52hwN4VMUzQ7YIWjeOi2T9YFaEFIqO/9H U9AbN3XNFFczA4UHPfDgSMl0IAHSdD9C/RaWstzv0LvLgySNQCMEr4eQPxKQtulp/Y8PLL 0qAznQBzQEdhIbv6ibXJqRCL3ACPNdOicht6bX8ic3VKaQof7ab323a++Sf5OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ccGzjJnSq0iua1tA8Z55qLfoQFGRDO1B/OCGx4kRdc=; b=HVJ5uoR6Bnkzv/6SNKg/JrvixQYWjoz6txXUxfLZ9kBoB2kk6YyR+Mbjd2hXf8iNDyxCs1 UCsOwRQ4X1c6yoklr6piO7zS9nIj3CrFPkMC43js+uzhLIVJPfikaliTP/mF9kKUyGsCnd Rdi+edrHS37hkd+t8wCJwQKu1VwB17sK/kh5FOVStuPQ2u0iervsMNy42bEyUGigAN68FP xKK51kFdwKE8zGCmHwIdUTPUGOZhbzA1Os8lY+NbhiNd6Z9PDpVqdXdEupLc+GDOK7T/pL SFBLDqP7jUgP2tq2cRs/Hj6QhgyZfBc+Ybz6VsrZLS8DWcNTAD7JXys7n2DE8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNcKn5P0Zz12wF; Mon, 22 Apr 2024 20:29: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 43MKTHZm001154; Mon, 22 Apr 2024 20:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTH6e001151; Mon, 22 Apr 2024 20:29:17 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:17 GMT Message-Id: <202404222029.43MKTH6e001151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6077246e88b0 - main - libcxxrt: align more with libc/Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6077246e88b0ef6f90cbee0e580b42730a641f0f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6077246e88b0ef6f90cbee0e580b42730a641f0f commit 6077246e88b0ef6f90cbee0e580b42730a641f0f Author: Brooks Davis AuthorDate: 2024-04-22 18:37:17 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:51 +0000 libcxxrt: align more with libc/Makefile Use src.opts.mk instead of bsd.own.mk and define PACKAGE first. Fixes: da77a1b4f0dff libcxxrt: don't export nonexistant symbols --- lib/libcxxrt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index afae306e7bbe..6ad89e9da107 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -1,8 +1,8 @@ +PACKAGE= clibs SHLIBDIR?= /lib -.include +.include -PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt SHLIB_MAJOR= 1 From nobody Mon Apr 22 21:55:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNfF61fLPz5HlD3; Mon, 22 Apr 2024 21: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 4VNfF614Clz57xq; Mon, 22 Apr 2024 21: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=1713822922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YKey9yQT1qP79rCEJrpR7QzKFIMa2XYVSZkC5VvGjY=; b=A0fZKoAJBxt5A4g4qYxpdyx9QYbUH/qo0UhlaEry7XizclyV1b2JqCCrdSaDelj1vvGEHL 60oil7a+6tPdhnKTXwehUvO4jjRiavr7SkNehUwaqbJFspJEkwZeanOFefkSP4Yy8wsjkO uYb6q25KMBP0Q5d8jX9KTjT+f7oQ6mFgdSBnKE9Hoc9kO8+cOGDSPxkOrAt4O3871Vo6lU i2Z4pShLdkGCPrPiua9Gm/cSXNgme+GLeJs9eYxW4n2Uo5l5IeEkDMDG3IqGx6qmXHLDj9 kq7MM7xJA22RCE1Sz7S5lilx/Dv9xjly9gM+beFIQzYVwlfeMemaWjjURdtFfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713822922; a=rsa-sha256; cv=none; b=yKWiaZlU344PcXSMoqJUGyMB+3mG+eqw19z4BmJDa9qEV2uSvwrE8khOl5nlGaaaV4fvgh Ne8D9eC/1N28DNy2i2GuwguY+ugvmMRjLFX5eZDkCJv/tXVPuOc/ik61tjrvTxrn2j5pBi uWilRWmTPpxA9gQgxbQPxRQke9SrRCt0UOUFEKE7j9L2W36dbUUjpLHSOUrUGFzTL2bPAa G5Qvw5maf5Ak4vbgEqhfsJUU8CWKmcvarNjTlaZzSyxCCsTfleNg827SPWabWvIoYZ0AVY q5nq00R2BSVtBBZUsSZIEv59Kgxt6K1jgQU6+J/XWYm0VdF41BZHXJs+4ne1aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713822922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YKey9yQT1qP79rCEJrpR7QzKFIMa2XYVSZkC5VvGjY=; b=QkE1GMK0QLT8+N1Z0J/KNMmYpnn5OAwRJsA5YHtsozV90AEFh4u5z2a6E6W7AleJZORumf HAmKGWaheQMe1qzRRwW9An2xHNaGFX/ok2E1AAHdg9ls2Dus/b/tiCwfUt9V2ANmNaK39p DqTmtk2Z8FQ7fJ7SmyMC9qT4Py0D8URi3EdeedH9oqtDZRKLvryy0ghij1N2lRM5IVtUX9 y9AAR/qKWFja196Gw6CfrKBJKJ/8QXIizO/impVawowFbJFCqEqafSmrHZFhAWzuuiv+H+ XMQcklyOPZAmCe1u84Kdc/Il2qS9e+ZawUAMrX1yP7oo00iBuvvM3jbE2ikgMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNfF60Rbjz14Z2; Mon, 22 Apr 2024 21: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 43MLtLen052477; Mon, 22 Apr 2024 21:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MLtLwm052474; Mon, 22 Apr 2024 21:55:21 GMT (envelope-from git) Date: Mon, 22 Apr 2024 21:55:21 GMT Message-Id: <202404222155.43MLtLwm052474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: c0f02dcd4c9c - main - geli.8: minor proofreading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0f02dcd4c9c17181c59fa3c43259cce793a0b21 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f02dcd4c9c17181c59fa3c43259cce793a0b21 commit c0f02dcd4c9c17181c59fa3c43259cce793a0b21 Author: Alan Somers AuthorDate: 2024-04-22 21:11:09 +0000 Commit: Alan Somers CommitDate: 2024-04-22 21:54:56 +0000 geli.8: minor proofreading MFC after: 3 days Sponsored by: Axcient Reviewed by: imp, pauamma (manpages) Differential Revision: https://reviews.freebsd.org/D44907 --- lib/geom/eli/geli.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8 index c378c591290c..501b948fde49 100644 --- a/lib/geom/eli/geli.8 +++ b/lib/geom/eli/geli.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2022 +.Dd April 20, 2024 .Dt GELI 8 .Os .Sh NAME @@ -867,7 +867,7 @@ If set to 0, a CPU-pinned thread will be started for every active CPU. When set to 1, can speed-up crypto operations by using batching. Batching reduces the number of interrupts by responding to a group of crypto requests with one interrupt. -The crypto card and the driver has to support this feature. +The crypto card and the driver have to support this feature. .It Va kern.geom.eli.key_cache_limit : No 8192 Specifies how many Data Keys to cache. The default limit @@ -884,7 +884,7 @@ Reports how many times we were looking up a Data Key and it was not in cache. This sysctl is not updated for providers that need fewer Data Keys than the limit specified in .Va kern.geom.eli.key_cache_limit . -.Va kern.geom.eli.unmapped_io +.It Va kern.geom.eli.unmapped_io Enable support for unmapped I/O buffers, currently implemented only on 64-bit platforms. This is an optimization which reduces the overhead of I/O processing. From nobody Tue Apr 23 00:32:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNjkc28Q1z5J1w4; Tue, 23 Apr 2024 00:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNjkc1S17z4CQV; Tue, 23 Apr 2024 00:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsGx/h6JFYef4kAiaHHDq4e9959aAs3bOjV87g2CxKU=; b=ZoRNXFtxEObxKe2DxgLtNgFph1bzDwAnWNzpiO6U6BjmTNFA3jJjaBNH6OdeDbD92JcKoj j95w5Nxiv0BQfFP2Awk7ptnbVgt0kLThZIFM5XEcB3fyXvIjAOZJR8Q9icLUcR5uxWFzkN 4aBa5KYpgNckL6x8AHh1/f9DpGZhAzLJikdYlo+FG39Jr6VFBROFM8xA211BfCxnzim4FI GOXXwF2L3pqS2usYE5NayBXRdpg0Hvfa3OmN+lsqc3HD4YzktKAFnSX3mYI/rzl89A25ha W0HsOBMuOtY0ggRMulhVxQg8UOQyZ6fort1UdKhOR+Ap+YkR24RwG84mNwlBCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832360; a=rsa-sha256; cv=none; b=Rap9iqMk2PculakYiGOk02DGLl140FCmG34iPNGocnFSyGKy9mHvt8OPaEtaGwkGwv9jk5 uaNdZX3svQAwcpyBnLwDuOdseM0YNyohRhP9aVBceGpHDnIIMjn5ptFnr287oMPeOk7ncT 1gkQv4YlWxq4B8HoGv8CZxm/1tdJspv6la9cLNBoaumjrdH3tnAk9XhiwgsNMk6W5sZrIW UaRg/2yBjWb28isrbmfiLYaveGMLQWYeeUQTwtCMBVP+bMYmG2LlH82U8uP/K0csKIe0wr YHJaOR17hBM2/3xl59Ft+J403K/r13uxrp83+xc6KuPJshUsNWSwErf0eIPOqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsGx/h6JFYef4kAiaHHDq4e9959aAs3bOjV87g2CxKU=; b=XV9rnebg+9Xu9si6/hmKuITUlDIardhrD/8mhP9F6Tu/LJHlXlf/RULh+1gu7j+Oc/z3w8 9d+duBsuVZAXRSBtio1wSqVMk6RQ4qltJG2MdvR8BbRVIF/nk6zz7l7ay/caBca3aQhjnL wUQqiv2L1EMozhS/1wd4OaV/EiZlBoz+1vf4avFOrxhETMzfkmxq/6INqA96ZMxrPx5Dgl 8ZP87PYFR0U2mgjuoQZQ5C9pXVkhRsakGT6336x03SkHfGu0dgGtZvw8nkAb40xbwmE2Ms uv7SvTxIEkTLX3trUfNR2AILiKBEkUJ9/ctXI9X/PhRg6o7AmvJG7CTcfVby5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjkc13Ldz18tg; Tue, 23 Apr 2024 00:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N0WeGG022278; Tue, 23 Apr 2024 00:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0Wedo022275; Tue, 23 Apr 2024 00:32:40 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:32:40 GMT Message-Id: <202404230032.43N0Wedo022275@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: 2cd1939e2e58 - stable/14 - rtld(1): minor clarification for LD_STATIC_TLS_EXTRA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2cd1939e2e587626c6811ee09e7688129cf749d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2cd1939e2e587626c6811ee09e7688129cf749d4 commit 2cd1939e2e587626c6811ee09e7688129cf749d4 Author: Konstantin Belousov AuthorDate: 2024-04-20 13:47:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:21 +0000 rtld(1): minor clarification for LD_STATIC_TLS_EXTRA (cherry picked from commit 8d7473703520f315c1bcd3b3d12498eee10d563e) --- libexec/rtld-elf/rtld.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 4d97159b0aaf..a152dd444bd7 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -324,8 +324,11 @@ control to any user code. If the variable is specified and has a numeric value, .Nm will set the size of the static TLS extra space to the specified number -of bytes. The static TLS extra space is used when loading objects with -dlopen. The minimum value that can be specified is \'128\'. +of bytes. +The static TLS extra space is used when loading objects compiled for +initial-exec TLS code model with +.Xr dlopen 3 . +The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm From nobody Tue Apr 23 00:33:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNjlF533qz5J1yM; Tue, 23 Apr 2024 00:33: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 4VNjlF4LxKz4Cn1; Tue, 23 Apr 2024 00:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCBfM6ThKjA+geIMCGUh/QU8fvDvMAWC7uhWdRvNRog=; b=HYQ/KCvtG3U+vK3X4fTRItPkfi5cPr/pnMz48idfKhGD+tHOHzF6NiTtmjVcu3AqMhZ8Q5 jIMK+nJDGIyBT75/pBO9BRLdG4ojVVaRY7cq/dzzN8Nj/K2PSkeJBs1mHHCmzEOkxqlKv3 i7ZZGsh5onRshwJSix4rZUuXRCGY6WpNulNtYF2joR8UoQDyo2VlAe6Lv95dMk5iP7kv23 LxJwpMnfmRZ4KGnQIdPyApHYNk+HNKzL33TxfxDp4+IFMrRWsyT0dvWlRdUo5lZHvNKe8L dhr2hHlyCgVGL4MHSfzsPYLSWOXLy00c7cPBrN3qDd3Cb/tZdMgvfrEst5IioQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832393; a=rsa-sha256; cv=none; b=SaVa6a+ujQZSkfmNV+f3+xylDO+gxsvL0QB+UVlKAwJzqVPRURyBr/kkrJI6qouX4SE5fd XGgVsthOXnH83ehytmjtd2G6WHnRYYjifF8cRSmSPhSwNKgeRkdlFmGuBG2ML3gH78q/7+ ww5IxpaTtM6amcAyequiMiRt2KkgAVTV1Mo7U1M6iPEEvd9qSBjbjYF2ZEMxDAq05vh1lK BziIMdiatTMYi/cQueUMkTLrEcOdckya30q9waFkyWtERCphUaVxje/FLYTWVCIyelquGn //+7LQ/Knai4zEiq/dw4bmzLqdb7preTXupp8b/q10D2w/8K1GfcWapwZmPU/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=1713832393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCBfM6ThKjA+geIMCGUh/QU8fvDvMAWC7uhWdRvNRog=; b=Sb7BI4szqkFfLPjSphIrLIA1O5yohaZM7LE5gHxJLsTPd7p5kTBfqE+ldY6G7gvUqRY9Sh 8mYkLUBYe1bt7xGY559DsFuVfX4pCOAZvy/WsZqMF7KVuWv3Rt2G7CwYKG53taiywh5EVc 08ox/E62Hg8DNrHAeKRuFldHE6hRkzZ1cs0FGU1wL8K6RZfqK+TQ+yJA0Tb1htFKqSA8O8 jC6NF04lYPNJptKIM6tvUsAd+YdpOyfCoKlXfPan7Tn+ll3oUB1fdsz5mHP0c7/SHW4WCW Ke0s1zqx+ShhQO/OrPx0yg3hdLoJE462e5c6ZhKFvkrbwWsOBYojNVAOOx5cMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjlF3fWwz18Yp; Tue, 23 Apr 2024 00:33: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 43N0XDaK022549; Tue, 23 Apr 2024 00:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0XDSQ022546; Tue, 23 Apr 2024 00:33:13 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:33:13 GMT Message-Id: <202404230033.43N0XDSQ022546@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: 57d49c4bcb49 - stable/13 - rtld: introduce STATIC_TLS_EXTRA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 57d49c4bcb494bb6c630713369fe6f0a0b277944 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=57d49c4bcb494bb6c630713369fe6f0a0b277944 commit 57d49c4bcb494bb6c630713369fe6f0a0b277944 Author: Stephen J. Kiernan AuthorDate: 2023-10-29 21:13:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:54 +0000 rtld: introduce STATIC_TLS_EXTRA (cherry picked from commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8) --- libexec/rtld-elf/aarch64/reloc.c | 2 +- libexec/rtld-elf/amd64/reloc.c | 2 +- libexec/rtld-elf/arm/reloc.c | 3 ++- libexec/rtld-elf/i386/reloc.c | 2 +- libexec/rtld-elf/powerpc/reloc.c | 3 ++- libexec/rtld-elf/powerpc64/reloc.c | 3 ++- libexec/rtld-elf/riscv/reloc.c | 2 +- libexec/rtld-elf/rtld.1 | 8 +++++++- libexec/rtld-elf/rtld.c | 21 +++++++++++++++++---- libexec/rtld-elf/rtld.h | 1 + 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index c8f09d797215..907377f2619a 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index ce74c54cc5c3..9c5887def356 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic * modules to use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; addr = allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index 83bea4092065..e2dc7f8c9eb9 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -497,7 +497,8 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 8e8966926839..04a8354343bc 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -510,7 +510,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic modules to * use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; tls = allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _tcb_set(tls); } diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 8254f21a3ce6..73a1c89991e2 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -817,7 +817,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 5bfb05116315..70928829aeda 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -714,7 +714,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 5ed516bc4337..d806e1ec3d63 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -392,7 +392,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 807ecb31ad7c..4d97159b0aaf 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 10, 2022 +.Dd October 29, 2023 .Dt RTLD 1 .Os .Sh NAME @@ -320,6 +320,12 @@ If set, causes .Nm to dump content of the aux vector to standard output, before passing control to any user code. +.It Ev LD_STATIC_TLS_EXTRA +If the variable is specified and has a numeric value, +.Nm +will set the size of the static TLS extra space to the specified number +of bytes. The static TLS extra space is used when loading objects with +dlopen. The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index fadde9561662..1078ddd0551a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -225,6 +225,8 @@ static Obj_Entry *obj_main; /* The main program shared object */ static Obj_Entry obj_rtld; /* The dynamic linker shared object */ static unsigned int obj_count; /* Number of objects in obj_list */ static unsigned int obj_loads; /* Number of loads of objects (gen count) */ +size_t ld_static_tls_extra = /* Static TLS extra space (bytes) */ + RTLD_STATIC_TLS_EXTRA; static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */ STAILQ_HEAD_INITIALIZER(list_global); @@ -365,6 +367,7 @@ enum { LD_TRACE_LOADED_OBJECTS_FMT2, LD_TRACE_LOADED_OBJECTS_ALL, LD_SHOW_AUXV, + LD_STATIC_TLS_EXTRA, }; struct ld_env_var_desc { @@ -398,6 +401,7 @@ static struct ld_env_var_desc ld_env_vars[] = { LD_ENV_DESC(TRACE_LOADED_OBJECTS_FMT2, false), LD_ENV_DESC(TRACE_LOADED_OBJECTS_ALL, false), LD_ENV_DESC(SHOW_AUXV, false), + LD_ENV_DESC(STATIC_TLS_EXTRA, false), }; static const char * @@ -515,7 +519,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) struct stat st; Elf_Addr *argcp; char **argv, **env, **envp, *kexecpath; - const char *argv0, *binpath, *library_path_rpath; + const char *argv0, *binpath, *library_path_rpath, *static_tls_extra; struct ld_env_var_desc *lvd; caddr_t imgentry; char buf[MAXPATHLEN]; @@ -738,9 +742,16 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) else ld_library_path_rpath = false; } + static_tls_extra = ld_get_env_var(LD_STATIC_TLS_EXTRA); + if (static_tls_extra != NULL && static_tls_extra[0] != '\0') { + sz = parse_integer(static_tls_extra); + if (sz >= RTLD_STATIC_TLS_EXTRA && sz <= SIZE_T_MAX) + ld_static_tls_extra = sz; + } dangerous_ld_env = libmap_disable || libmap_override != NULL || ld_library_path != NULL || ld_preload != NULL || - ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak; + ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak || + static_tls_extra != NULL; ld_tracing = ld_get_env_var(LD_TRACE_LOADED_OBJECTS); ld_utrace = ld_get_env_var(LD_UTRACE); @@ -6211,13 +6222,15 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, "Env prefix %s\n" "Default hint file %s\n" "Hint file %s\n" - "libmap file %s\n", + "libmap file %s\n" + "Optional static TLS size %zd bytes\n", machine, __FreeBSD_version, ld_standard_library_path, gethints(false), ld_env_prefix, ld_elf_hints_default, ld_elf_hints_path, - ld_path_libmap_conf); + ld_path_libmap_conf, + ld_static_tls_extra); _exit(0); } else { _rtld_error("Invalid argument: '%s'", arg); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 8cf8b2771a24..1f9b82caef33 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -50,6 +50,7 @@ extern size_t tls_last_size; extern size_t tls_static_space; extern Elf_Addr tls_dtv_generation; extern int tls_max_index; +extern size_t ld_static_tls_extra; extern int npagesizes; extern size_t *pagesizes; From nobody Tue Apr 23 00:33:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNjlG6Qvkz5J2Cm; Tue, 23 Apr 2024 00:33: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 4VNjlG5L1Pz4Cdl; Tue, 23 Apr 2024 00:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsAwn9Wftsemo8a9cl3roxmMTDGLDn46i9YPFP6SClg=; b=HYSRlHa+Po/FRsv+uiTQfxShwG8UTpvEdlSk/8pDQ7U8g9ZyMTBD6cWKUMmLqoM2xwQz9y j5lDh3eIhGFs7OnfSVHngUja0P/LKhBJQT19ncMg4TL6AvS/xS1KCthGQZUPKlwytLfYsB iPmCngbDgUlVN4vsaFoCFmyxIHLPSyySA1NikVOpNyPLEc9W3NISFsT1F2osqJfOw3Yc18 dT4UyIksw+vBk3CahV35C0JYr4QLtjolhFXr3ot7TnNTp+ekPng62jdz3zuz5+OdW8Lv3U JTMy6hdR9vFs8LL4boWFUkgePZC0NwS0DWF5XVN784YR/KQgvMfLKI9hJDA3Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832394; a=rsa-sha256; cv=none; b=YHrMORfLcqSVAdiJLj1DiYhCsCOXOYDoSAUcnx6nXM7MmX4vzm7zhGlu3CjnAQogW0WkO1 +B2JXIcKOPjRSK7DrYKr3xdAYV+BI+WW59HdJJ2SG9eQMBvSn0OxFU/GK9E1i6TTD5Iyic oncSPPgfonjunxR8/YhmVditRvHrBWlzMWEOzSMoQtyCJO6U9q77DV7SFHw7+17vQrrfSE EjeuhTJh9afBiRU8QGva0XNjz68i6YeJ8VIz0j5zTLLF8ptfORA6di2tho3OABxBw/4zDT RhDon8e3cc8CGjsHuqLM3EjNrEzjSv0erDEH9bSrxx+AvJR/L0uheKpRentjKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsAwn9Wftsemo8a9cl3roxmMTDGLDn46i9YPFP6SClg=; b=f1+F89Nt2vhHdezIRzW5Igmiq4YAuYcBnnHpIvX36AGtpU8mGY7Gd67lMf7bhGmZjzZwKc 7iuYKszzLaUAJgdx56EHGi0vJXKR7oZoXfKoSqWEEQbgpzDUbu8Xj8oAttLxCOe7PRR0Ga WAkNkNY6923KwwFajWa3PHhHuLcwNC+BgV9cLeeHG4GJ27DHFYaZpmYRn7XBhapbS+N9ie j2u+8B/8pO8HjrJFab/tDQMZh3lr+JvPSHSXHDN+o3WOE5Pqi3o5LFeuqvJhnWYD3tnyDK 2y+kL8xS5vjnxvlkcbGAHpTr5mF+Re0Lr975k5PcYz0EVsYbtTA1D4vzFhR3UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjlG4xWwz18tj; Tue, 23 Apr 2024 00:33: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 43N0XEBP022593; Tue, 23 Apr 2024 00:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0XEh3022590; Tue, 23 Apr 2024 00:33:14 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:33:14 GMT Message-Id: <202404230033.43N0XEh3022590@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: ed9f44083dba - stable/13 - rtld(1): minor clarification for LD_STATIC_TLS_EXTRA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 commit ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 Author: Konstantin Belousov AuthorDate: 2024-04-20 13:47:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:54 +0000 rtld(1): minor clarification for LD_STATIC_TLS_EXTRA (cherry picked from commit 8d7473703520f315c1bcd3b3d12498eee10d563e) --- libexec/rtld-elf/rtld.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 4d97159b0aaf..a152dd444bd7 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -324,8 +324,11 @@ control to any user code. If the variable is specified and has a numeric value, .Nm will set the size of the static TLS extra space to the specified number -of bytes. The static TLS extra space is used when loading objects with -dlopen. The minimum value that can be specified is \'128\'. +of bytes. +The static TLS extra space is used when loading objects compiled for +initial-exec TLS code model with +.Xr dlopen 3 . +The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm From nobody Tue Apr 23 04:52:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVg3QFVz5JQML; Tue, 23 Apr 2024 04:52: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 4VNqVg2Zjpz4YSB; Tue, 23 Apr 2024 04:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TRFF0fks9dOC3eyHfASATQTxgmWqAhnQVBE5yp5prr4=; b=txSsS88Tg/GYmsb3mHVa0WprwREg2zC7WbztEha7+tg95kkg0BNnFwxSU2lXTFtNiCKQix MBJFFs6GXKEb/0Esw0NIMTGevwBfcsywutaVXFA5SojUbOpGZoaUEw2ibWSFNr6yrOA0zI 7u+sYOVM8W/7Ir+R6rdFHVCvnDVVyG8ClcE84fCIlSlHIZoeo/q0C3tVAJMRpZCyuBjB1R JKnyJQLskSSjCGWmPsmskXhFQUGdM9aU3g3UbYMUKtEwR7BelRXdKW2eUmJ9uxLWQmDYCe UnJJ/3IzX3HON31/ls7tQXTV3otChZdAIbiJK4gS6ON69NyjLpvsceySZUEKJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847963; a=rsa-sha256; cv=none; b=dmQOI7tJjqQYrpN23/EmD6OQCXTGYWrFVTLX2cjD8KfZPhY52a+PUATOnraOW6aMxuZnRf DKzrPTQb+KX9NWv4XJ4RO8wnEEMmLiGdlVrkJAwKcssSXcaUlEexXI7yfuUu3/5C4JE553 OTBBscGgkBkxvH5N+MryP3W2krD6yDYM/AAWi4zT3i/eGNKaT96g8rdIT/1hKQAjX4oCGe pufs5hMDF31Cr8hmNRZb6IGKH1dN9Zuj4s19AVBelSSJnHp9dx+D3Eot2dg8kTLeEyoCE+ Es1y4/fMTwrQKnoDWoxOaXESN8YNPuoM5ierviVfS7VbLiVD6VV/V60Ubpv+fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TRFF0fks9dOC3eyHfASATQTxgmWqAhnQVBE5yp5prr4=; b=Tfr6uE93K/xLbogQcIlSHbZGiX85RnbCATZKGugIV1knBpStLjWA44J3pnUjnvgsfSB+IB Zy45qAXxItW6bRVKufUC8ehZCjCINq+ayNroc+hgTyE+28lUCOs3Tht8afBdnVkrVtSGlr rus4OSjwWwjlXgbB6zpEm61UpLvr5A2gWXOimKS+KQCZgxnVnyz/jbqFBGhXhQm8h1OSWt j1/JVf/ovQ6EgJdqlVNAoaHCeFzDcII7qGhsZ7J87m8dztmVVE2SdYuG7wNlbrXvr7LeYz Jy0SoTvjJB0f3canTzrgE7m7EyElnqRDKxZ1qt1xV3x3zHHRpxuSrGRCupeVbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVg293hzHmT; Tue, 23 Apr 2024 04:52: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 43N4qh1T063684; Tue, 23 Apr 2024 04:52:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qhYd063681; Tue, 23 Apr 2024 04:52:43 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:43 GMT Message-Id: <202404230452.43N4qhYd063681@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: 50ecbc5142e1 - main - libipsec: make const-correct List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a commit 50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a Author: Lexi Winter AuthorDate: 2024-04-22 21:56:24 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:34 +0000 libipsec: make const-correct - add const to the appropriate places in the libipsec public API and the relevant internal functions needed to support that. - replace caddr_t with c_caddr_t in ipsec_dump_policy() - update the ipsec_dump_policy manpage to use c_caddr_t (this manpage was already wrong as it had "char *" instead of caddr_t previously). While here, update pfkeyv2.h to not cast away const in the PFKEY_*() macros. This should not cause any ABI changes as the actual types have not changed. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1099 --- lib/libipsec/ipsec_dump_policy.c | 4 ++-- lib/libipsec/ipsec_get_policylen.c | 2 +- lib/libipsec/ipsec_set_policy.3 | 6 +++--- lib/libipsec/policy_parse.y | 20 ++++++++++---------- sys/net/pfkeyv2.h | 8 ++++---- sys/netipsec/ipsec.h | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c index 49b643d80115..5ad8a84b2052 100644 --- a/lib/libipsec/ipsec_dump_policy.c +++ b/lib/libipsec/ipsec_dump_policy.c @@ -67,9 +67,9 @@ static char *set_address(char *, size_t, struct sockaddr *); * When delimiter == NULL, alternatively ' '(space) is applied. */ char * -ipsec_dump_policy(caddr_t policy, char *delimiter) +ipsec_dump_policy(c_caddr_t policy, const char *delimiter) { - struct sadb_x_policy *xpl = (struct sadb_x_policy *)policy; + const struct sadb_x_policy *xpl = (const struct sadb_x_policy *)policy; struct sadb_x_ipsecrequest *xisr; size_t off, buflen; char *buf; diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c index 8080bec0f48e..2454d875e1fa 100644 --- a/lib/libipsec/ipsec_get_policylen.c +++ b/lib/libipsec/ipsec_get_policylen.c @@ -41,7 +41,7 @@ #include "ipsec_strerror.h" int -ipsec_get_policylen(caddr_t policy) +ipsec_get_policylen(c_caddr_t policy) { return policy ? PFKEY_EXTLEN(policy) : -1; } diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3 index 6a40e03af45f..ce4d8d244292 100644 --- a/lib/libipsec/ipsec_set_policy.3 +++ b/lib/libipsec/ipsec_set_policy.3 @@ -41,11 +41,11 @@ .Sh SYNOPSIS .In netipsec/ipsec.h .Ft "char *" -.Fn ipsec_set_policy "char *policy" "int len" +.Fn ipsec_set_policy "const char *policy" "int len" .Ft int -.Fn ipsec_get_policylen "char *buf" +.Fn ipsec_get_policylen "const char *buf" .Ft "char *" -.Fn ipsec_dump_policy "char *buf" "char *delim" +.Fn ipsec_dump_policy "c_caddr_t *buf" "const char *delim" .Sh DESCRIPTION The .Fn ipsec_set_policy diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y index 65894e37965a..35512dcc1f58 100644 --- a/lib/libipsec/policy_parse.y +++ b/lib/libipsec/policy_parse.y @@ -77,16 +77,16 @@ static struct sockaddr *p_src = NULL; static struct sockaddr *p_dst = NULL; struct _val; -extern void yyerror(char *msg); -static struct sockaddr *parse_sockaddr(struct _val *buf); +extern void yyerror(const char *msg); +static struct sockaddr *parse_sockaddr(const struct _val *buf); static int rule_check(void); static int init_x_policy(void); static int set_x_request(struct sockaddr *src, struct sockaddr *dst); -static int set_sockaddr(struct sockaddr *addr); +static int set_sockaddr(const struct sockaddr *addr); static void policy_parse_request_init(void); -static caddr_t policy_parse(char *msg, int msglen); +static caddr_t policy_parse(const char *msg, int msglen); -extern void __policy__strbuffer__init__(char *msg); +extern void __policy__strbuffer__init__(const char *msg); extern void __policy__strbuffer__free__(void); extern int yylex(void); @@ -211,7 +211,7 @@ addresses %% void -yyerror(char *msg) +yyerror(const char *msg) { fprintf(stderr, "libipsec: %s while parsing \"%s\"\n", msg, __libipsecyytext); @@ -220,7 +220,7 @@ yyerror(char *msg) } static struct sockaddr * -parse_sockaddr(struct _val *buf) +parse_sockaddr(const struct _val *buf) { struct addrinfo hints, *res; char *serv = NULL; @@ -346,7 +346,7 @@ set_x_request(struct sockaddr *src, struct sockaddr *dst) } static int -set_sockaddr(struct sockaddr *addr) +set_sockaddr(const struct sockaddr *addr) { if (addr == NULL) { __ipsec_errcode = EIPSEC_NO_ERROR; @@ -383,7 +383,7 @@ policy_parse_request_init(void) } static caddr_t -policy_parse(char *msg, int msglen) +policy_parse(const char *msg, int msglen) { int error; pbuf = NULL; @@ -413,7 +413,7 @@ policy_parse(char *msg, int msglen) } caddr_t -ipsec_set_policy(char *msg, int msglen) +ipsec_set_policy(const char *msg, int msglen) { caddr_t policy; diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index 912607a11582..a0246c9223ba 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -444,13 +444,13 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, "struct size mismatch"); /* Utilities */ #define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1))) #define PFKEY_EXTLEN(msg) \ - PFKEY_UNUNIT64(((struct sadb_ext *)(msg))->sadb_ext_len) + PFKEY_UNUNIT64(((const struct sadb_ext *)(msg))->sadb_ext_len) #define PFKEY_ADDR_PREFIX(ext) \ - (((struct sadb_address *)(ext))->sadb_address_prefixlen) + (((const struct sadb_address *)(ext))->sadb_address_prefixlen) #define PFKEY_ADDR_PROTO(ext) \ - (((struct sadb_address *)(ext))->sadb_address_proto) + (((const struct sadb_address *)(ext))->sadb_address_proto) #define PFKEY_ADDR_SADDR(ext) \ - ((struct sockaddr *)((caddr_t)(ext) + sizeof(struct sadb_address))) + ((const struct sockaddr *)((c_caddr_t)(ext) + sizeof(struct sadb_address))) /* in 64bits */ #define PFKEY_UNUNIT64(a) ((a) << 3) diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index eea0a39af5ea..88594d250fdb 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -350,9 +350,9 @@ extern int m_striphdr(struct mbuf *m, int skip, int hlen); #endif /* _KERNEL */ #ifndef _KERNEL -extern caddr_t ipsec_set_policy(char *, int); -extern int ipsec_get_policylen(caddr_t); -extern char *ipsec_dump_policy(caddr_t, char *); +extern caddr_t ipsec_set_policy(const char *, int); +extern int ipsec_get_policylen(c_caddr_t); +extern char *ipsec_dump_policy(c_caddr_t, const char *); extern const char *ipsec_strerror(void); #endif /* ! KERNEL */ From nobody Tue Apr 23 04:52:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVh4MqCz5JQm5; Tue, 23 Apr 2024 04:52: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 4VNqVh3Lf6z4YXc; Tue, 23 Apr 2024 04:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxeeLsoe2xrDhbzWH4b2AmReqOmx74ZXu2sf5m7vRjc=; b=U3YqDxuM5sD3Cf86Re2RoiIyMEXlNim/G/0eh/UKcYUtAd81qMTj2cScjTsVQM9v4gLrOi 4KQ6p8tvbYjIgS09T10wscPY/CyzdsTNygnWnsU1rKnSgVkINsgNjeWqGlOJoM6nrFxhRb /wLkANkPohVQygJEnzmqGmYSgpXQOFblqcfARvOkUOsz/yUOjE4DCJOXk5eu5gksm6K3W/ b5dqN7T+e7FGa+FXZAmYoqx6E0ViYkv5LsThvMQgCRhh/JgvCx6OhekTRPNDo4DNngKOWB 9AooQGXVTvGEsu2u14rzaytIapqQ40Rce3YgjmWomdi58CCfvJta96h71Ir4AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847964; a=rsa-sha256; cv=none; b=nAZ5ApN696etgKBH/kOykNRWRZptSYIoYpqkiSzkuYjQOalu0kln/WcrAUndNSZJqaTtRs Qd7yD53OEg6XNkr7mEUut5Lgxek434s+9XfrsGZV2fZUOOl+WIQacstpEqZv/0lkNCVgOf sCdfOGaoRS/l9K6m0WBX2Usby6gsVs96LASu/S74QFOpbI3BDTZEc0ZNMc+wPFrljdODxI 3045OVXutNgSlXXcRYHfnHQaN3no5wKFRFT1V/8Sq1Z781HEtYwO1ro5VEavkpTes+BQy+ 1e3RkdQvliJsfHd/rwrhFfSfkHYCjYaToahx4bm0/CnwGXMudFk8sS1YjKEkXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxeeLsoe2xrDhbzWH4b2AmReqOmx74ZXu2sf5m7vRjc=; b=wsqSwIpI4dSnGSw96YlLs3qTIK1YUGHXav0ri+7pmQ7JnfqwvA9uV+cTISXxvgZniZrQfb a2+nuEMEfYmf/tnCkaXqlgCk2NefQ6hGnqDXKWteSHya3EObC+iGy61Vxbbjz9RuXZ9Hvr y1d/5T6cnmKTJmz5MY4MrDEGZrYOIafdvUVJe6oP07NHCK+cJvWtaMP9S4NcHBjc03axtv zpLc7tHr+G21PzW8uuq4dyIQvd3CPJkBURAd06zel7C6oXSp+Ic+FA3h0N1GgX7FN0iat/ qMNBah/lgBlaI7R1PshmpvXrgYrwxDwukcAtrJj4M64telb2n8WVraA4ZYodcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVh2x0czJBZ; Tue, 23 Apr 2024 04:52: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 43N4qit5063720; Tue, 23 Apr 2024 04:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qiLN063717; Tue, 23 Apr 2024 04:52:44 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:44 GMT Message-Id: <202404230452.43N4qiLN063717@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: ca63710d3668 - main - linux: ignore setsockopt(IPV6_RECVERR) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ca63710d3668cf6f3cb4faf065d8b4eeffa028ad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca63710d3668cf6f3cb4faf065d8b4eeffa028ad commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad Author: Lexi Winter AuthorDate: 2024-04-22 21:58:11 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:34 +0000 linux: ignore setsockopt(IPV6_RECVERR) Under Linux, the socket options IP_RECVERR and IPV6_RECVERR are used to receive socket errors via a dedicated 'error queue' which can be retrieved via recvmsg(). FreeBSD does not support this functionality. For IPv4, the sysctl compat.linux.ignore_ip_recverr can be set to 1 to silently ignore attempts to set IP_RECVERR and return success to the application, which is wrong, but is required for (among other things) a functional DNS client in recent versions of glibc. Add support for ignoring IPV6_RECVERR, controlled by the same sysctl. This fixes DNS in Linux when using IPv6 resolvers. Reviewed by: imp, Jose Luis Duran Pull Request: https://github.com/freebsd/freebsd-src/pull/1118 --- sys/compat/linux/linux_socket.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 1e578982fced..36cffc979802 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -501,6 +501,11 @@ linux_to_bsd_ip6_sockopt(int opt) "unsupported IPv6 socket option IPV6_RECVFRAGSIZE (%d)", opt); return (-2); + case LINUX_IPV6_RECVERR: + LINUX_RATELIMIT_MSG_OPT1( + "unsupported IPv6 socket option IPV6_RECVERR (%d), you can not get extended reliability info in linux programs", + opt); + return (-2); /* unknown sockopts */ default: @@ -2112,6 +2117,14 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_IPV6: + if (args->optname == LINUX_IPV6_RECVERR && + linux_ignore_ip_recverr) { + /* + * XXX: This is a hack to unbreak DNS resolution + * with glibc 2.30 and above. + */ + return (0); + } name = linux_to_bsd_ip6_sockopt(args->optname); break; case IPPROTO_TCP: From nobody Tue Apr 23 04:52:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVj5JbXz5JQpR; Tue, 23 Apr 2024 04:52: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 4VNqVj43j1z4Y9v; Tue, 23 Apr 2024 04:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB3Ep2ARDPq/u+hp+iF3x/c5k8ec0xW1eZ5J9Sxl6gg=; b=H1ClEB3nIAmpekHkx/XjOWaSvtd7++5jjXmPpbv8ItQVeg5+Cabj9MlTO0u8g/6Ca4/2XB sNadPqlaPupTdSsSDUQTmY6KVE0A3IZNiXnK3uk17r1EgDZhqD1h86szk1V6zX64pClGhf tqeR4adt4F9OKq+ZhDzxGIjfoL6oCIFXK4+1XbwmHeXHoQRpaLU1MeDtR1ckKqN4DQSVIz vD+6qj++BzSg1Qj5NlfyMDHqHUmudmq2qaTFgzAreuLpVZh2F72f2ucumpr1g/s/kO8OKc c+hiZMeEsIest4FxUILb2+luEQnN707mw3GGKIhq5eQfA5/TTIq/c/PLL4oa2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847965; a=rsa-sha256; cv=none; b=yIbAfpfmdQtS3oFlhUFjaj0PnHWG0l3SJ8sw21GqhUZhBg6qJxh1KkvJcqS+SJh0dkjhKh GuOhlRtkScUHdWArWekDYCFCz1DIOf8eykFEJ3vbaj3EzfX7Hwt2ZHRX+xa6Y66Ap5Ad/H xnwj91Ej1kPFgnG/ggqB/cmvdwff76X5zWUCcYbhkZUOrNkPkyl2h07oaUdP18QXgVSK1b rW4bxozZe9RCtQ7Od1YDg2GrmJ9d/H+uehJuwxNXCJ7Z1l8MSdmoeY5eskfKDGREZ9al/D a346zg9OCcB7p/FqmkrfSeuuk3FYWyQ4oypm66AdSaetOI/3r6PxX9uzNy7p0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB3Ep2ARDPq/u+hp+iF3x/c5k8ec0xW1eZ5J9Sxl6gg=; b=kIXUnTxJqQLtGUrzgZNfDV9/leVmG3K9bPZ8J9xo6aqnVeojFf883Ql0hK8ThG2cfdCxLJ Sk5j5WnGljgAJD6/ciTNtMKMMXWTRb3NRxr3ZGbjEA9hrxp0Gfg4EzH1rVTaz3kq87cojt 6ts5/ynUuNPDArE5iZ7lKxLOnbCxbYSQfJaaHk/XQbSFzoM/OtH/PcrrXLOLX8aGGDj3pl 7yOL74BS62ytb9C86R3ZN3eoeY86rVWoXrTzZWNWnii18EARK/xljdNMkPqIRfTzcX01hV kVpRvtxv4PiTGKgePFKv2yXvEvDS+OFCFekx/N4fft9DgVopsSg/7GzM0l6RCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVj3dfdzJPg; Tue, 23 Apr 2024 04:52: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 43N4qjlj063764; Tue, 23 Apr 2024 04:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qj6g063761; Tue, 23 Apr 2024 04:52:45 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:45 GMT Message-Id: <202404230452.43N4qj6g063761@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: 6ca1f3de5769 - main - package: move hv_{vss,kvp}_daemon into hyperv-tools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6ca1f3de57692994a57acb7632cc4cbfdcac6241 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ca1f3de57692994a57acb7632cc4cbfdcac6241 commit 6ca1f3de57692994a57acb7632cc4cbfdcac6241 Author: Lexi Winter AuthorDate: 2024-04-22 22:00:55 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 package: move hv_{vss,kvp}_daemon into hyperv-tools Reviewed by: imp, manu Pull Request: https://github.com/freebsd/freebsd-src/pull/1170 --- usr.sbin/hyperv/tools/kvp/Makefile | 1 + usr.sbin/hyperv/tools/vss/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/usr.sbin/hyperv/tools/kvp/Makefile b/usr.sbin/hyperv/tools/kvp/Makefile index 4fb5f68ce2b1..a74af47c3f48 100644 --- a/usr.sbin/hyperv/tools/kvp/Makefile +++ b/usr.sbin/hyperv/tools/kvp/Makefile @@ -4,6 +4,7 @@ HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools .PATH: ${HV_KVP_DAEMON_DISTDIR} +PACKAGE=hyperv-tools PROG= hv_kvp_daemon MAN= hv_kvp_daemon.8 diff --git a/usr.sbin/hyperv/tools/vss/Makefile b/usr.sbin/hyperv/tools/vss/Makefile index 03bd6eccd54f..70314f04a30b 100644 --- a/usr.sbin/hyperv/tools/vss/Makefile +++ b/usr.sbin/hyperv/tools/vss/Makefile @@ -5,6 +5,7 @@ DIRDEPS = lib/libc HV_VSS_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools .PATH: ${HV_VSS_DAEMON_DISTDIR} +PACKAGE=hyperv-tools PROG= hv_vss_daemon MAN= hv_vss_daemon.8 From nobody Tue Apr 23 04:52:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVl0bd9z5JQpY; Tue, 23 Apr 2024 04:52: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 4VNqVk5d5fz4YQD; Tue, 23 Apr 2024 04:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tirkCrWFvahilwahR6x0ooRIQJ/B+Wx5kk9fETeU80=; b=BvliL316T9aPVufnTLhy31udqSvwz9IDmqWhMYjnvJZeH/ciG7U2/imLAj1PK04tle/r5i n+yXZwHzLwJ1iqL6bx8yJULheKxO/aZ9iG9zEDMcJjvGNuAl9gtKYu/XUpbbFlDa9e43tj /bj+wnTnSaIEvQZIfJ2TTQ7Np9YeCGAtgszYGr8P7+fQzP/8eNL6Iu7g0+MSOeDaf+/NR5 IQvk/r3v2AnlHAM5rHbcbdkGaM2AajYn/Ia6O6jMPYJugTYs6ope2gcJTajyaVvQJtWWfK rJq4+HB7h9j3BhDkzVSU7T05p5CPS+3biMOiQI6JS/PFtPy6MKhFj0Lmc86HpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847966; a=rsa-sha256; cv=none; b=bZ4Boabs+ZNG+r8gatI6t3bhAlgwPtomqsLr+V/2Gkxb3kfTAL9899op1b9Rf0p6HmcktL 9SrxvAuYD04bcjP6fIU3r+IsjMAa27simRK3x1NuaiwYcWbx1NmmA6k53zNtfcP8XqdhUY uLHSwqdlZFNfkc025damiLBGpcBS6ERiFWgx7rovbL5YLpyLiZIcSNwFn+5qdVmKjYu1J5 Upkd10yYwqO/xvkjMahPIUxCre1bELBa1RTtCH3AVauiI16TdaFBWrtlXq8wtriIatGtwo NwZmyd+na10oTkbmwc1sdYTYPpB1KfvYqqBNqniMdmPmF14rHBQdNmtD9nrFKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4tirkCrWFvahilwahR6x0ooRIQJ/B+Wx5kk9fETeU80=; b=mlCXPBlquU6nIAuwKvakp0jdoXv4ToqYNL9NiZwoAest3Wyz77TG4zUU56gu50+3go2jl8 5z92yUuY71W0ljlILMvB8Dtz8yn++iNRIBRoOsC7aeBKVbvj12kPvoiOvGW19tuLNJ5LPE M0S+e3M5CZRR1Z+euRxvzoY8c9JDT8ZVVGagKdJiQp3Dk86ol/hubxcFfPr1WqriKEwfbV koi3zepWTnmz5m7N2ZskxzFdfoodB2vFCBuNUkvRphbSG5J8twtmzSPuXUpz+t7puwBwbJ 0YoV3aKH2J4FdKz9+X5VSJ+QyYV3QV855MZ4Rj6/YnpGTbh5s9FM92CUt7NNzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVk507lzJBb; Tue, 23 Apr 2024 04:52: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 43N4qk7D063817; Tue, 23 Apr 2024 04:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qksG063814; Tue, 23 Apr 2024 04:52:46 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:46 GMT Message-Id: <202404230452.43N4qksG063814@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: 7209444a80fd - main - package: move cron into its own package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 7209444a80fd37de0e19c7cf93623f84709827e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7209444a80fd37de0e19c7cf93623f84709827e3 commit 7209444a80fd37de0e19c7cf93623f84709827e3 Author: Lexi Winter AuthorDate: 2024-04-22 22:05:53 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 package: move cron into its own package Reviewed by: imp, manu, Mina Galic Pull Request: https://github.com/freebsd/freebsd-src/pull/1172 --- lib/libpam/pam.d/Makefile | 5 ++++- libexec/rc/rc.d/Makefile | 5 ++++- usr.sbin/cron/cron/Makefile | 1 + usr.sbin/cron/crontab/Makefile | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index 218d79e12ab4..d2cc192f3599 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -7,7 +7,6 @@ NO_OBJ= CONFGROUPS= CONFS CONFS= README \ - cron \ imap \ login \ other \ @@ -18,6 +17,10 @@ CONFS= README \ CONFDIR= /etc/pam.d CONFSMODE_README= 444 +CONFGROUPS+= CRON +CRON+= cron +CRONPACKAGE= cron + .if ${MK_AT} != "no" CONFGROUPS+= AT AT+= atrun diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 15dcc811d9b4..6e9cb7fc50ae 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -17,7 +17,6 @@ CONFS= DAEMON \ cfumass \ cleanvar \ cleartmp \ - cron \ ctld \ ddb \ defaultroute \ @@ -129,6 +128,10 @@ CONFGROUPS+= RESOLVCONF RESOLVCONF= resolv RESOLVCONFPACKAGE= resolvconf +CONFGROUPS+= CRON +CRON+= cron +CRONPACKAGE= cron + .if ${MK_NIS} != "no" CONFS+= ypbind \ ypldap \ diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index 673ae49e01a1..206f001b8387 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,4 +1,5 @@ +PACKAGE=cron CONFS= crontab PROG= cron MAN= cron.8 diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile index 7b4901b7a281..5fbd2b44b2fa 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,6 +1,7 @@ BINDIR= /usr/bin +PACKAGE=cron PROG= crontab MAN= crontab.1 crontab.5 BINOWN= root From nobody Tue Apr 23 04:52:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVm21t0z5JQgN; Tue, 23 Apr 2024 04:52: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 4VNqVl6NC0z4YQQ; Tue, 23 Apr 2024 04:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ss38+5bueEbCtzRPpdK75NW1qfESbjQFjFJawXfKmqo=; b=nq8xfmixU6Mj764aMQOxRk5VIs0+WNLAbYD6y0metgFn0/AzfCJDPTWx9NvDfkrIzOh/Xg MdZsPocA8ciOujRFk9jtKu4GsHXh604GGpGBvxaw3RO+lD7b1JvA4kzJGpVxWUqWT78ELo /IabAE0tWs3MMr3trnJxLwwx/6fS94FCrqB6Tq8C8iCjjqPPvRKgUpfytzT8/ChuwaDtqn KUndi1wp0IG7bttuxPSpjiqQrA1krhtZwedJa+bySiXYpXRJoOtIH84L84fwejv7Qn6u9x 86Z3VM/JJt6yXO+DZAvyitN+QLVMSw5y5Xq3Z1HfNYsPDc6CCjlO6Mp9x/u5/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847967; a=rsa-sha256; cv=none; b=HaplO7ZREsqA8guSjtRLRPpsrUtnHeAXbyYVc9PVMcoI51/YGoLC66QAgFyl8FfUk9FkgU Gr5ewLVwVJUPbBgWYZK1/ekWQR4JgoiiHcvNvbEiaSfFj0k24X8lvm2PDPDnry4UrBOvFF mf7nooR+db9teYpN7PxRHm3QyO8zjItF3JvbygkDSAuL5UK3dLOQt+cp1WiFqfeb7zd1Un uK9rJXDN8FS02eqHZ7lHSfPvNH8M3kUboJnRmmLUpZnXR0Pb3qIZcS1Y6XoZj8ocztSAUF voPq90AEBaOVFthkiUIf/1Djb46A93Mgg2VBdWyi38GOxfXnwYZsNY2p6P3jGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ss38+5bueEbCtzRPpdK75NW1qfESbjQFjFJawXfKmqo=; b=Xeq2CpCueCFWbRWQL9KnQgsEIGOMnWClxH8PpqkdydfMW/x21PwBQZGaCbsvarVW2+y3qd DFuM7EMTyGktfaiZfcoYQKF5y2Y+bpn9PyE2xzrvJx9NuO+M2fs5rbfUxxFjbPaaC0YArt Hxaads0M/Aj5QOGKkPQ1CtNy0SjNaQmSG4M+p1U7S8EayaivChNZslcEV3ABgS3tfzAGaT rFsFdQYZRmXgZmOHaQ7XM6hCmNOOnbxu7wx2ohEec+TZIHMV3G1KxLMsb32dX3glXNpEBX 4oKct7ZTR7gZYZuOo76gtwSJy55JyaPOXGTASdZiRp/8L6+OgFqb4ASk1Bq/xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVl5zVczHjn; Tue, 23 Apr 2024 04:52: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 43N4qlC6063868; Tue, 23 Apr 2024 04:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qleK063865; Tue, 23 Apr 2024 04:52:47 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:47 GMT Message-Id: <202404230452.43N4qleK063865@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: 8aaa58ada45e - main - package: add DESC and COMMENT for cron package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8aaa58ada45e830fc4ca12418e5262e84b87b648 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8aaa58ada45e830fc4ca12418e5262e84b87b648 commit 8aaa58ada45e830fc4ca12418e5262e84b87b648 Author: Lexi Winter AuthorDate: 2024-04-22 22:05:54 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 package: add DESC and COMMENT for cron package Reviewed by: imp, manu, Mina Galic Pull Request: https://github.com/freebsd/freebsd-src/pull/1172 --- release/packages/Makefile.package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 72a521eebe8b..c7d906b387fd 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -37,6 +37,8 @@ certctl_COMMENT= SSL Certificate Utility certctl_DESC= SSL Certificate Utility console-tools_COMMENT= Console Utilities console-tools_DESC= Console Utilities +cron_COMMENT= cron(8) and crontab(1) +cron_DESC= cron(8) and crontab(1) csh_COMMENT= C Shell csh_DESC= C Shell ctf-tools_COMMENT= CTF Utilities From nobody Tue Apr 23 04:52:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVn3Zljz5JQmG; Tue, 23 Apr 2024 04:52: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 4VNqVn0GMPz4YTL; Tue, 23 Apr 2024 04:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjq0Krc5xEW+9FE9/ms6jA5mHEw6BVzgmlUHHP0b6k8=; b=FumT0BQQftmqwVPGqx4172GYVlVkPpiYPf43XJ0ymsp7Y2QBV3haN49RF3cRab1mTpHE+e ey0JnRiJ5pcDdO8fCxh9FTkIX0IegbaMehvqLetMnRfCwRLJaMDOWdJfi9F6MTzhmHaWDk R9NNu4SMyoCJHfIi3WRF5jhe+4vNG5M7SNkRsp0FJ/5K2dlbxxQwxz+pbN9zE9udRjSlx5 +AEsry+uVPBZLR2hb99hkhsdRQgx1N3IJpJKYyb6wjwGUJuJH+alxQfd6RRGUNd+cIGBn6 eL+3tUwlm29Jj4rULwo0GsgJg/8wsn6Lwee/s+BoZbvvsvgbEavkMUNLdbliWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847969; a=rsa-sha256; cv=none; b=nvrB3CYJJG87KD6nghBTyWid+qmYQ14jpRdFASZEeIIwVPgDXW3/3ED4dCm6daDdlSY8Pe wB1R2PYLGyAR/C/LoAUErPCybwqD0EdYva4XZOo5z7o//1AI7K0vr+4/fpIXJQubE5z4cQ CBkM8SpDCEFD59ItGF2r0QHvW/cGybiQTFi2u6bXgYGduHmrQAZ1QaJAW5SSF3ZlR8vBIA KOkokZsbaVSxEudbfVcf+IY4jdRkzG+cel7NgkgZFXsWwv/q8KEthpKvIkBwJ2uLJ2s2up XmFZO6mDcfJyWYSZP/Zh1MCW8Z4mJo+ri/ce8d4TBQBQk9N3RbldJuVavqNdcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjq0Krc5xEW+9FE9/ms6jA5mHEw6BVzgmlUHHP0b6k8=; b=XGx/rTRxCnND5z/frSlO0eV8lEVIBbn4DuhF2bIGuONSZJHx3BmiIsitMrNAEXdOHXhWw5 Fkhy6BTaXq1yGPlED4F5nwU697SfpTORuh4FcsrBN7ZnUn7A1E78hw//rZ9YT/SX4gtYot PVJwhUae5NqXFxYizKUzeHYPDk18eytHIvzOeKD0A/kN75xlKPzdfQ1Gd7L4XTeD7xxKHr KxU+pkXJfg2iYVpjDH2wKJrgwhrqsv8Dkvrv+5dce61MBaVfYsRI2pKdaFBKqHDY6odqdU 8uA6eGHPKyqlhmwGlKBClmOtSz8BCmdLkn1jP3v20CFhWFB/6YN33lrcsA73gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVm6z5FzJBc; Tue, 23 Apr 2024 04:52: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 43N4qmGW063913; Tue, 23 Apr 2024 04:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qmLl063910; Tue, 23 Apr 2024 04:52:48 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:48 GMT Message-Id: <202404230452.43N4qmLl063910@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: c3dd71ab4c1c - main - share/examples: move examples into appropriate 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 commit c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 Author: Lexi Winter AuthorDate: 2024-04-22 22:08:22 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 share/examples: move examples into appropriate packages Allow a new variable SE_xxxPACKAGE to be used to place an example group into a package. Move the following examples into existing appropriate packages: - bhyve examples into FreeBSD-bhyve - bootforth examples into FreeBSD-bootloader - csh examples into FreeBSD-csh - ipfw examples into FreeBSD-ipfw - jail examples into FreeBSD-jail - pf examples into FreeBSD-pf - ppp examples into FreeBSD-ppp - printing examples into FreeBSD-lp - uefisign examples into FreeBSD-efi-tools - ypldap examples into FreeBSD-yp - hast examples into FreeBSD-hast Move all other examples into the new 'FreeBSD-examples' package. This removes a significant number of files from the FreeBSD-utilities package. Reviewed by: imp, manu Pull Request: https://github.com/freebsd/freebsd-src/pull/1176 --- release/packages/Makefile.package | 2 ++ share/examples/Makefile | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index c7d906b387fd..2c0aa259737d 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -65,6 +65,8 @@ efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries +examples_COMMENT= Examples in /usr/share/examples +examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities diff --git a/share/examples/Makefile b/share/examples/Makefile index 504f3d7807dc..0425e36c1cf5 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -45,6 +45,7 @@ SE_BSD_DAEMON= \ .if ${MK_BHYVE} != "no" LDIRS+= bhyve SE_DIRS+= bhyve +SE_BHYVEPACKAGE=bhyve SE_BHYVE= vmrun.sh PACKAGE_bhyve/vmrun.sh= bhyve .endif @@ -57,6 +58,7 @@ SE_FREEBSD_VERSION= \ README SE_DIRS+= bootforth +SE_BOOTFORTH_PACKAGE=bootloader SE_BOOTFORTH= \ README \ boot.4th \ @@ -67,7 +69,8 @@ SE_BOOTFORTH= \ screen.4th SE_DIRS+= csh -SE_CSH= dot.cshrc +SE_CSHPACKAGE= csh +SE_CSH= dot.cshrc SE_DIRS+= drivers SE_DRIVERS= \ @@ -98,9 +101,11 @@ SUBDIR+= ipfilter .endif SE_DIRS+= ipfw +SE_IPFWPACKAGE= ipfw SE_IPFW= change_rules.sh SE_DIRS+= jails +SE_JAILPACKAGE= jail SE_JAILS= \ README \ VIMAGE \ @@ -203,6 +208,7 @@ SE_PERFMON= \ .if ${MK_PF} != "no" SE_DIRS+= pf .if ${MK_STAGING} == "no" +SE_PFPACKAGE= pf SE_PF= \ ackpri \ faq-example1 \ @@ -223,6 +229,7 @@ SE_PPI= \ ppilcd.c SE_DIRS+= ppp +SE_PPPPACKAGE= ppp SE_PPP= \ chap-auth \ login-auth \ @@ -240,6 +247,7 @@ SE_PPP= \ ppp.secret.span-isp.working SE_DIRS+= printing +SE_PRINTINGPACKAGE=lp SE_PRINTING= \ diablo-if-net \ hpdf \ @@ -342,13 +350,16 @@ SE_SUNRPC_SORT= \ LDIRS+= uefisign SE_DIRS+= uefisign SE_UEFISIGN= uefikeys +SE_UEFISIGNPACKAGE=efi-tools .endif SE_DIRS+= ypldap SE_YPLDAP= ypldap.conf +SE_YPLDAPPACKAGE=yp .if ${MK_HAST} != "no" LDIRS+= hast +SE_HASTPACKAGE= hast SE_DIRS+= hast SE_HAST= ucarp.sh \ ucarp_down.sh \ @@ -379,6 +390,11 @@ SER_${d:tu:C/\//_/g}+= ${d}/${f} .endfor FILESGROUPS+= SER_${d:tu:C/\//_/g} SER_${d:tu:C/\//_/g}DIR+= ${SHAREDIR}/examples/${d} +.if ${SE_${d:tu:C/\//_/g}PACKAGE:U} != "" +SER_${d:tu:C/\//_/g}PACKAGE= ${SE_${d:tu:C/\//_/g}PACKAGE} +.else +SER_${d:tu:C/\//_/g}PACKAGE= examples +.endif .endfor BINDIR= ${SHAREDIR}/examples From nobody Tue Apr 23 04:52:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVp3tTCz5JQRc; Tue, 23 Apr 2024 04:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNqVp0yMlz4Yf6; Tue, 23 Apr 2024 04:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9U2Lh40M+gicnhonok4u/4v52XIzBfsfp7P0916JOk=; b=HUd0Zgvybbc2ai92xLk7JLNsngoMM7SjdmOluiksJ5kNCFuLsN7/riOr4fNZr7Xl7E5hxX pNKKYzlslu8YJlt7RQa4N+O/wq4M0I7wNz2C1au+3jqMCB5ONrIZY/sYep7788BEz4Au4l +38tojGHaieyuQ1cxuQ1QMy5uEhgNxTAC5ONre+lRmRrE+Ss2mrL5eBnizQUTHMyahsHBm jRZ+sDJT0Qo6/WCeYFKA8fIFO2U25+UCNUr0huUohxXrMy9pBRjZ70PUy7tJLhv/owQ1Jw 5fgVNdN+tAwbHsMzBxRXO83DoJgLuXjqVwOoikSKbFhKtyqYiS2z41ran1wagg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847970; a=rsa-sha256; cv=none; b=QCWun6BIxYrSyrWjwREi4cTTgNFmgmIIYkWs54xf/RJZKNg5bwcgAs4JL6aqdIRBQPi64H jWMo5pYzb5Exdqitpbpy6OYzp1nCrIbffDKOCI7rnDVUw014Vq4O1Qx6fBL3y9WOf4JWdV dELnubiqpx6IphkRvvoS0NhMlWRItZ3CyrFWELpEtXvzUknMqcW2jnk1GqELn4sIrhRtvZ q0uRxT5NFZ6O+Wr0LmEX0sD3cfbXyMZ7fHMDl1R+ThbWRUOquNjHpUgGb0jFTWgXLmYsM/ uMjrM6yV4iG3QfIqv6oUWy2EYENuh1xGFG1Jo+F5YcPfeHtxpN5hMJa+6ZmSdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9U2Lh40M+gicnhonok4u/4v52XIzBfsfp7P0916JOk=; b=SFNEEfALFfLBQAd+k3mCUF6s0wKfS1xUcrAfvYzZ8c7WH6LbDy5snZjHFQJBl3tbdp4BSO jWp02o6CTRGMoVjyeo/bFb/sMcOP0FkffMNpyRlhnyniKGXvLQzmO8Ui+DzzDcTz1NadWy 0JZO9aCh6Rcq7bBQHORbonB/Mszo4YaD5F6mQu8/ie//SDUvpFh02+c8K9CqKUfGY97l0i wvSuGqjUZ3BMkiOZUgqJrokr98ONH53itG+a54+WQlNLC3lxd47eokd61fd/opRzsaUF6n hB6hbsXfpGTTIkbz5bKDobjKB6pe+1oFep8y6u1dyC9qgY6sLnTuis2zCFRUPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVp0VlrzHjp; Tue, 23 Apr 2024 04:52: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 43N4qnwr063967; Tue, 23 Apr 2024 04:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qnCC063964; Tue, 23 Apr 2024 04:52:49 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:49 GMT Message-Id: <202404230452.43N4qnCC063964@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: e96d0d746844 - main - umount: Support partitions & slices with -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e96d0d7468446d7cabd76ae213889297711bb144 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e96d0d7468446d7cabd76ae213889297711bb144 commit e96d0d7468446d7cabd76ae213889297711bb144 Author: Ricardo Branco AuthorDate: 2024-04-22 22:08:58 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 umount: Support partitions & slices with -d option Signed-off-by: Ricardo Branco Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1183 --- sbin/umount/umount.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 5314f8e0c56f..c15fd13d065a 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -673,19 +673,17 @@ md_detach(const char *device) char *eptr; int fd; - memset(&mdio, 0, sizeof(mdio)); - - mdio.md_version = MDIOVERSION; - mdio.md_options = fflag ? MD_FORCE : 0; - if (strncmp(device, DEV_MD, sizeof(DEV_MD) - 1)) { if (!all) warnx("invalid md device: %s", device); return (-1); } + memset(&mdio, 0, sizeof(mdio)); + mdio.md_version = MDIOVERSION; + mdio.md_options = fflag ? MD_FORCE : 0; mdio.md_unit = strtoul(device + sizeof(DEV_MD) - 1, &eptr, 0); - if (mdio.md_unit == (unsigned)ULONG_MAX || *eptr != '\0') { + if (mdio.md_unit == (unsigned)ULONG_MAX || eptr - device == sizeof(DEV_MD) - 1) { warnx("invalid md device: %s", device); return (-1); } From nobody Tue Apr 23 04:52:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVq4ZPxz5JQmK; Tue, 23 Apr 2024 04:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNqVq2d9gz4YYm; Tue, 23 Apr 2024 04:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDp06HwhGMXN8zHT8yHG/pwclzY980h+zySq8nsOE9s=; b=Z+kBjUDHCg/+gmZNhQVQg5weYfQ82FzEDcWtS12O+hBOXe8mL06EqkQC9wNJizM08FnDCm qAJvrqU2oucQ87QuLf8uuJzVtrF9HpmaGeBD6bIfjX096WoAC8118Q395cSwL2j9KSWY60 r2QXzS6ZHf9+QIgIYRL06Av4lj902kG2icHNB/JmGUq9B48mZOs5usaqVMn9cQwLhOUp4X LODkVaM6RxjPDEHX2lLyf+8u7ARz50oFMpogBMKxuV7Xc3m+G0G4PA/ZkjonNjwLsNwHaD Nb9eplioQ0nxP3AJJg6TTihpR4k9vY1mlHZoyV9uQztW7bWIqzLJVmdSulRrAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847971; a=rsa-sha256; cv=none; b=U2USyPK1UhumJTd7wkBgHiCOnot/pcHCN+bpijWyS+aRdm/+yqoKte6BytXDOpm1qEh4k2 G+/+K0WC8GaOxuvbnqZcbhz51o56nbrFpWhG+m0yhuPI/6bAepz6N4dWKCrX640bC8Al1w fqfZegjmpcwckKOFnIFMeyh7xiNGZ1hlHIAspbTG7C5C+bFdS3Wwt94Na1RAN/XwRjzUWi l2pCXt2QX798JTcggkY+1s70LNOn6Sft7JksbtH0msKdBl18YgQcqJZwygzdXvAP9WB9u0 fNRTRhRg4P4kKL/F6cFeY/dICIRoRvDHmr//c2QbFG7ly8JDFf3kWKRYHPdXDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDp06HwhGMXN8zHT8yHG/pwclzY980h+zySq8nsOE9s=; b=azTUHP5Pg5xryY82wD2/GGvjGf3MkzwVFdz4KnaMGml2e0dZt8Azgll3mYGb7koQG1DC7p Vgyo6F0D9UsZ3TJ+yYu9yPzueXAjvjY0pvBDxWLC4up0tBvZ4BIjBWjB7XFNRNoDeTxRU3 gvsBbu8iEuKgDKxdLM9d0qxQp34QXmQPV/ufGVZDXwoNTWw6Oes4UIIp9U8X/wWDGBuQmU EBuf4vNVH72fTkjaNomGn3xn23ceOD1KPEsacK7yrJfJfwA4XBOZdQjucdjZS/8u0ltaRx fSXOWVGtowvq8sZDHxpgpPgI4Q6bcRCw2vlyei9ynNUDbkL+WJFpb/BspHu5gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVq1hrjzHp0; Tue, 23 Apr 2024 04:52: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 43N4qphA064018; Tue, 23 Apr 2024 04:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qp34064015; Tue, 23 Apr 2024 04:52:51 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:51 GMT Message-Id: <202404230452.43N4qp34064015@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: 05a95d19cb24 - main - alc(4): disable MSI-X by default on Killer cards List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 05a95d19cb248203acdd4e069d3eedfe597c3b49 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05a95d19cb248203acdd4e069d3eedfe597c3b49 commit 05a95d19cb248203acdd4e069d3eedfe597c3b49 Author: Lexi Winter AuthorDate: 2024-04-22 22:09:26 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 alc(4): disable MSI-X by default on Killer cards Several users with alc(4)-based "Killer" Ethernet cards have reported issues with this driver not passing traffic, which are solved by disabling MSI-X using the provided tunable. To work around this issue, disable MSI-X by default on this card. This is done by having msix_disable default to 2, which means "auto-detect". The user can still override this to either 0 or 1 as desired. Since these are slow (1Gbps) Ethernet ICs used in low-end systems, it's unlikely this will cause any practical performance issues; on the other hand, the card not working by default likely causes issues for many new FreeBSD users who find their network port doesn't work and have no idea why. PR: 230807 MFC after: 1 week Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1185 --- share/man/man4/alc.4 | 6 +++++- sys/dev/alc/if_alc.c | 24 +++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/share/man/man4/alc.4 b/share/man/man4/alc.4 index 478558657799..5ce5ce97d68a 100644 --- a/share/man/man4/alc.4 +++ b/share/man/man4/alc.4 @@ -136,7 +136,11 @@ This tunable disables MSI support on the Ethernet hardware. The default value is 0. .It Va hw.alc.msix_disable This tunable disables MSI-X support on the Ethernet hardware. -The default value is 0. +The default value is 2, which means to enable or disable MSI-X based on the +card type; for "Killer" cards (E2x00) MSI-X will be disabled, while on other +cards it will be enabled. +Set this to 0 to force MSI-X to be enabled, or 1 to force it to be disabled +regardless of card type. .El .Sh SYSCTL VARIABLES The following variables are available as both diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c index 86e120a8b3f6..86ae705667de 100644 --- a/sys/dev/alc/if_alc.c +++ b/sys/dev/alc/if_alc.c @@ -91,8 +91,14 @@ MODULE_DEPEND(alc, miibus, 1, 1, 1); /* Tunables. */ static int msi_disable = 0; -static int msix_disable = 0; TUNABLE_INT("hw.alc.msi_disable", &msi_disable); + +/* + * The default value of msix_disable is 2, which means to decide whether to + * enable MSI-X in alc_attach() depending on the card type. The operator can + * set this to 0 or 1 to override the default. + */ +static int msix_disable = 2; TUNABLE_INT("hw.alc.msix_disable", &msix_disable); /* @@ -1410,6 +1416,14 @@ alc_attach(device_t dev) case DEVICEID_ATHEROS_E2400: case DEVICEID_ATHEROS_E2500: sc->alc_flags |= ALC_FLAG_E2X00; + + /* + * Disable MSI-X by default on Killer devices, since this is + * reported by several users to not work well. + */ + if (msix_disable == 2) + msix_disable = 1; + /* FALLTHROUGH */ case DEVICEID_ATHEROS_AR8161: if (pci_get_subvendor(dev) == VENDORID_ATHEROS && @@ -1439,6 +1453,14 @@ alc_attach(device_t dev) default: break; } + + /* + * The default value of msix_disable is 2, which means auto-detect. If + * we didn't auto-detect it, default to enabling it. + */ + if (msix_disable == 2) + msix_disable = 0; + sc->alc_flags |= ALC_FLAG_JUMBO; /* From nobody Tue Apr 23 04:52:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqVr4p4Pz5JQlP; Tue, 23 Apr 2024 04:52: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 4VNqVr373Gz4Yn9; Tue, 23 Apr 2024 04:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ajfk6IUMnYRkWegI07ejOam99eJrTvIjd7BvKedRNo=; b=tvv57GVh28NPBG/MFPHCL5bVetgbx2DHFrqyeKSCjLJx9pB7Gibepz5n/uqLawVK5Wfti4 pPGMRE/bY/unk5s3BoKeMSZ9QxfuM8ybuCJgAT2zO4ZLDVGEqxRyfTHgxFtWkAVr6bJuAf GOU60EM6lDo66kAClYOClFTkCcfkzI6qD26ZoniGmnajERorF6m4lUG8jRmu8y65eoUthL iUwDcPyD/dPVqYC3vHe3hmZC5SwAJuzTWjwbpUGXlHwKzvVA8m6bnumSeBT4BXEkGqH6pB ZFeHsYIk8n6PH+2v6rltr4HT14XolodnkvbtBqHLvt9XGgzhl7nA5b6XFQEocg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847972; a=rsa-sha256; cv=none; b=XU9gj12gDQv8t4UQbQHp/82lchPpYZY2gdBqatl4E/rMuqSnZqwkh3HM20r36JFCwDr/y/ VlWi4F9MeX0BKQAvZxOrcX/f/0a2cykqWAaLbG3L03tRCtLne4F5+XO/FdJXR+XZ4Sa+AQ pV/73c6pMYm6B2Heb/uHZjdVxc0HxHrdBK1KVzk9nYjBEXoRC1C7ih7EYcwX8DMlAtzj6j Qw3RQOJdqduesWRaAYM5jZSvL2OOcHqEgBmYtM4+W35NuulZMlxrqaBh24p6vMZ4QPWl1U TK1VEw2TtZ4P0hj0VtaYhp/zrM5fTXmgcaGE4Kll6oFsC7Socd/jBrNNmOJiTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ajfk6IUMnYRkWegI07ejOam99eJrTvIjd7BvKedRNo=; b=Dk7UGjpNsX/g6s4IOPOs2EJpsSg2dEOSa8vpC0qIlJRL07OjbTRaWoyj9OQfV1kHvBwD7/ tJb0FeznVViBSCOE1kmfkeq6Vfv27Vn3O/EqkWgc6OtF8cNj02AzJsQI6rRO72tVYCa7x2 QbE2XjH9d6+81DNFnXmTve8rwHnJQ2WzRKchsSga8cEeSMaeCOM8D5dpZ04+LudBCR4qWD RG7qXj69NcqT2WFFOSN1aVcrybNi5GcSEgVyXHelcWQ82KpjikWgrJbjZ0FJ+/F7spaWt5 ja2/nHb94MV/9cRKfSWvBu0jLTN5TXl7z5YOl9dNxYnMx1dcLZvabmfVq6PVLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqVr2jNqzJBd; Tue, 23 Apr 2024 04:52: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 43N4qqRW064069; Tue, 23 Apr 2024 04:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qqYI064066; Tue, 23 Apr 2024 04:52:52 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:52 GMT Message-Id: <202404230452.43N4qqYI064066@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: f578d0199761 - main - ifconfig tunnelfib is implemented in wg(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f578d0199761136e82850d8f086b8806f2dbad8d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f578d0199761136e82850d8f086b8806f2dbad8d commit f578d0199761136e82850d8f086b8806f2dbad8d Author: Gregory Shapiro AuthorDate: 2024-04-22 22:10:00 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:52:14 +0000 ifconfig tunnelfib is implemented in wg(4) MFC After: 1 week Reviewed by: imp, zlei, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/1186 --- sbin/ifconfig/ifconfig.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index b88772e0e5e9..e8a18d08635b 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -549,9 +549,10 @@ A FIB .Ar fib_number is assigned to all packets encapsulated by tunnel interface, e.g., .Xr gif 4 , -.Xr gre 4 +.Xr gre 4 , +.Xr vxlan 4 , and -.Xr vxlan 4 . +.Xr wg 4 . .It Cm maclabel Ar label If Mandatory Access Control support is enabled in the kernel, set the MAC label to From nobody Tue Apr 23 05:03:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqks525Wz5JRPd; Tue, 23 Apr 2024 05:03: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 4VNqks4DnVz4d6b; Tue, 23 Apr 2024 05:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713848597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jFi3KBnHGz4d6cNU1+t8yMbae6HN5ABsIehz4UbFVc=; b=kPvdlMpUWykwnmbsD2UzZtU3Uuxth9iqIH38TZ6Cn6KfE9rFAqntVolvMnRvzmsPbrq6Jv 7xbaArhRMIzQnCcgWRDJRkI55+qMOM0Oyb8FtxfXL22YTdGzPG7mYQF2vSHSxbSSoTQxjr OLL/8ACZeq2CNW1C6Rm5ArW1XBQB2seSHYbgFeKrT06lv7xTkoizscBd+7D5tvrMJrGg5s 4HdoyWWXX3xy5aV1Z2vlIqP9NBJvIkNow2qwiG8RoRYzr8Y+i5/ApjXldDtPxFQCX3hh4H jYY0TPk6FKzc56R2yxlfu1sD+uYjUTXhsFNtdQTeF4qAXdx2XdWjr2XAamyeiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713848597; a=rsa-sha256; cv=none; b=lcOxIZHx+Rua8WeSw3jSv+yrsPGM3/QsPewnbG8Qcwk9Xj5C4DNj4DeU4xZjey31vm6iOr 9hS/zYO3eCu/GxGXOMPJya1DqZm7psYnFJjs8t7247shFhnuLCDOOKGBXf7X+/1ZZwHFjR svK1z2rOLWQI9D220RPBKwD5C/3h37aVDk30qpIsdR5lbhlXD5B67ZWv+8GunHFG2Ihye5 BOT7xd1GaeDdMVghud/AHsB01LG4PIV8+rJY4lCFiXrHd1F3iTw1ZpZpU8vGcDG3EQCsQW mmqGygNGJP+idK7yQJM5p+7Zu9CneC6Mv5yGK64POuEqj1B4IBgOeoMReUxbxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713848597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jFi3KBnHGz4d6cNU1+t8yMbae6HN5ABsIehz4UbFVc=; b=INJs4n+39M08SPNMijEuuMYe24xZEOoQ042ycwEG4xcCT9keiGd69vRACJQNB8HC0iaO7L 9i324Yo33AiNmSCb9hAX7/IburjAvwiYXK+dLtb2OHo1HvuzpEbkGt6cp7oSrqm9RjS426 npicX1Oqzq1w1mvOl5bRizLxEIv4T6ThO6FwGCbu04evYcYc0631ld00Nob4j1UpLOMSYv QqAgjapQABmpno0w4/X/4ZK1Tmxz9jmiZDZa1HQAO7G6hbpezazm6LnxAIQgxaYzErB6Xu z4bXrOVcdWJhDd6MuDeUSfcJYHsSNzZpu3kxFPVsuxM+z98zpyAYvxRG4bcGuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqks3rLhzJjL; Tue, 23 Apr 2024 05:03: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 43N53Hdn081672; Tue, 23 Apr 2024 05:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N53HWZ081669; Tue, 23 Apr 2024 05:03:17 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:03:17 GMT Message-Id: <202404230503.43N53HWZ081669@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: bac2eea13ae3 - main - swab.c(libc): use a simplified version of byte swapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bac2eea13ae3e4dc8fd2aec261b2a18930138495 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bac2eea13ae3e4dc8fd2aec261b2a18930138495 commit bac2eea13ae3e4dc8fd2aec261b2a18930138495 Author: rilysh AuthorDate: 2024-04-22 21:52:25 +0000 Commit: Warner Losh CommitDate: 2024-04-23 05:01:54 +0000 swab.c(libc): use a simplified version of byte swapping This version of swab function simplifies the logic of swapping adjacent bytes. Previous version of swab() used an arbitrary unrolling, which was relevant back in the day but unnecessary for modern compilers, as if the input size is known at compile time, they can do it automatically. This version of swab() is inspired by musl. A similar version can be found at: https://github.com/openbsd/src/blob/master/lib/libc/string/swab.c Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1086 --- lib/libc/string/swab.c | 58 ++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c index e3765fa08d07..2b044d68ca46 100644 --- a/lib/libc/string/swab.c +++ b/lib/libc/string/swab.c @@ -1,35 +1,6 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Jeffrey Mogul. - * - * 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. - * - * 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. + * SPDX-License-Identifier: BSD-2-Clause + * Copyright (c) 2024 rilysh */ #include @@ -37,22 +8,15 @@ void swab(const void * __restrict from, void * __restrict to, ssize_t len) { - unsigned char temp; - size_t n; - const unsigned char *fp; - unsigned char *tp; + const unsigned char *f = from; + unsigned char *t = to; - if (len <= 0) - return; - n = (size_t)len >> 1; - fp = (const unsigned char *)from; - tp = (unsigned char *)to; -#define STEP temp = *fp++,*tp++ = *fp++,*tp++ = temp - /* round to multiple of 8 */ - for (; n & 0x7; --n) - STEP; - for (n >>= 3; n > 0; --n) { - STEP; STEP; STEP; STEP; - STEP; STEP; STEP; STEP; + while (len > 1) { + t[0] = f[1]; + t[1] = f[0]; + + f += 2; + t += 2; + len -= 2; } } From nobody Tue Apr 23 05:04:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNqlr11scz5JRKx; Tue, 23 Apr 2024 05:04: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 4VNqlr0X3pz4dS4; Tue, 23 Apr 2024 05:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713848648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q74tubgfojgLAKPcyMB0VPSxblQCh2SzfFGOljNlTTw=; b=oZrWSDq/3EKsoDQwCzWs9Amxzy0vUNOZWLKMWAd9Pm00WoF4PfSwnSiBRRLTJ8nzBdkX2J o9Cm6fQvrrnGtUxMGiMMhnTTmOAwgyGYm/dh1h9KzVc2m/s08uyGVm7gQwJlSHHzvvk7SL k1zoJVi9gqxan19yVIyoU0NKJ4dovk4UlubTt5Fq5ZKcno9iiaQsSUnqlJthz6E+XIos4X WLLU0SXtB3IbhFUaFIrEATDh0HUCeBdvCEamJUir8zFey8cb0SZkiHvn7m+2mdt+Ag1yHm B0UpzHWvmLeyvtaiQdezD+NXj0j7EyTO1ZS+Dpz21LViAq7o7Azu9kfYm+9W6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713848648; a=rsa-sha256; cv=none; b=AzIWAEWdzU+MFjn012q46c+TCqIeF3Flb6wsT+AXHJM0p6YL8FttsdjdfCw3IKXjbGWqqD ZDVpF31zsLQ0HIWd6iLOonZbhnmERsGS1WouJ9bEHLZVoM3oKAT/s5+1mepR1QFWWCcYiG Jsiz/DkBuDeNTZmheP7j+pOZwKICHl+7Rx5F0u/BIP3wiPsYzlg/dYd9srecbin5HeB+vB hXkmzpa/OAU7C6bpa/XQsKq4jC0rL9YmP2FWmM1nXOl1MyMMdL8W9vGQZL4cI90NaA2/jy RMkwiK795xy/nmJM7Kepegu/Q4cA7PKbqCQtrAE/fChkbxpvoFt3mt9z7LnUnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713848648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q74tubgfojgLAKPcyMB0VPSxblQCh2SzfFGOljNlTTw=; b=b9mUwK35bHb2IwFoobKyzyC6e/O0TK/RhOtJi/idg3jo46UD5jIy/7fhveonHKjkPU8xhe gPQLS+ePyPfwx43eNq6G+C7KS/Nf0cfghDoP4bdkTEtXbDLkPNqx8lgQzVolB4xZF2kUyQ rge6Xnzu4ptMT9lSYgo7ZUks4MzNbR+NBAtn2PxmYUCs/2c6Dkb3O4Yk0vcRGmI9hP79vv 8q7NGhHKs6sP3GJwYivqnAc6g2OwA/EiU2nF9trS5zfjPn3WImfvYF5itdo4FOgbfCTyTq Tblw3wSxxFrLUxddA0ay2VISVI+bUlrqOYUNgyoHnYX2zEEeJQSaJZu3yfUuzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNqlr07RjzJfr; Tue, 23 Apr 2024 05:04: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 43N547a3081908; Tue, 23 Apr 2024 05:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N547xn081905; Tue, 23 Apr 2024 05:04:07 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:04:07 GMT Message-Id: <202404230504.43N547xn081905@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: 74adb39cf2a5 - main - zfsbootcfg(8), zpool_influxdb(8): move to the zfs package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 74adb39cf2a545e966390c9d7df85cd514db0130 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=74adb39cf2a545e966390c9d7df85cd514db0130 commit 74adb39cf2a545e966390c9d7df85cd514db0130 Author: Lexi Winter AuthorDate: 2024-04-22 22:07:30 +0000 Commit: Warner Losh CommitDate: 2024-04-23 05:04:03 +0000 zfsbootcfg(8), zpool_influxdb(8): move to the zfs package These tools are only useful on a system running ZFS. Reviewed by: imp, manu Pull Request: https://github.com/freebsd/freebsd-src/pull/1175 --- cddl/usr.libexec/zpool_influxdb/Makefile | 1 + sbin/zfsbootcfg/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile index 7c0a245903a7..bd50df9e3c4c 100644 --- a/cddl/usr.libexec/zpool_influxdb/Makefile +++ b/cddl/usr.libexec/zpool_influxdb/Makefile @@ -4,6 +4,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool_influxdb .PATH: ${ZFSTOP}/man/man8 +PACKAGE=zfs PROG= zpool_influxdb MAN= zpool_influxdb.8 BINDIR?= /usr/libexec/zfs diff --git a/sbin/zfsbootcfg/Makefile b/sbin/zfsbootcfg/Makefile index 1833fc542ce0..318de8a030fa 100644 --- a/sbin/zfsbootcfg/Makefile +++ b/sbin/zfsbootcfg/Makefile @@ -1,3 +1,4 @@ +PACKAGE=zfs PROG= zfsbootcfg MAN= zfsbootcfg.8 From nobody Tue Apr 23 05:24:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrC92jHjz5JSkD; Tue, 23 Apr 2024 05:24: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 4VNrC929Bkz4hD7; Tue, 23 Apr 2024 05:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgRczKwoprCIOMPcvkGwSieeIrFkDVP//cIpmSxsjO0=; b=VH36LB+kt/PUxYJHou/7LS5+pdBq9p0/Bk519qSCZDaFqX+vR+QubONSWldzNZnsI1vfex nOINpSw9mWhdS78R3bHAn7aTgSwy5wV49Ny/G52AtHx4Zhuf83rGbbtWlNQvgRHc8meWP7 ivFe2Dg/PLdABnv+h24+8zRmDIQEvY8n6dt/aPPlUs4augWjFHq8ewPW8UT5YHla1vXJiA vZDoRRvHMzMQq3hYgsbJDBhLoS6EyuSNI9vJevpNn7+YjEzP33luwqP2MujS1B4JeXzhQY B/DpPZd4aOGde608h4KZ7h9IfydGvhbB1yIYrV/mNf/sPLgmBWYy2a5/nZJ7VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849861; a=rsa-sha256; cv=none; b=H0DEFDSdVBNJ60M+3R7Mqo7K1+Jn/IaDBBJRA9QfXs0Dfqf78If7mF9JY46NOULLNOUq/g szkbqw3wUtoQlaqDRAZ/pyU1YAICK06y6tNyCoXD62GuY7Q6VO/UrOm370BJwFfcZ6ixpA GYA9UnKYosHUXtxgP+bFwjq4Q4f/fzTo6mQX+mXKXqPnaxzqC5lQKNEAeaCAUyY00mAK0p XA66i9mnyTZZ/FBkw0CSF5CXfaZpD3V/SxQI1pokca+wxQzeF3wN9yyS/uefxQI+mIY0lF i5jKJmGgcVCFacSBnyJOmtJBdxCbb/rlzNe6X9Nsbz7FGPOCEmBKdkiKpTz5Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgRczKwoprCIOMPcvkGwSieeIrFkDVP//cIpmSxsjO0=; b=Uzwjeb8bvTt3SIuDAaoLQUvBOQAobnXOQKBocesXxRhkJenv7MbdqjT/ILdU1hx9izP0cs 7Jhi5ErgwQTntG8sE1GolyworsOpZIUBa0jfqG4I947MQcyPty3iG7Q079xx5wdNvWkKBz Qw+nd/Poed+PvcKN/yVTt6JMa4IIHWjNLJdFYRZ6bGYEJbR5d+GsPPBjF2+5X3VHeubiCx ERh1GdSEAhIU6+p8slhT1tdt05D3AjKdSTLojBrvNPYB0RvprKp/amird/Ngy4fz3WZ4l+ IKxBwVtUxznUYGtcZUGrKHtOcu7JC04XWiUz2hB406KFc6evYZkVy3mvRxVfRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrC91mfxzJGJ; Tue, 23 Apr 2024 05:24: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 43N5OLIE015637; Tue, 23 Apr 2024 05:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OLE9015634; Tue, 23 Apr 2024 05:24:21 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:21 GMT Message-Id: <202404230524.43N5OLE9015634@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: 4a393999f312 - stable/14 - usb(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a393999f3124626161fbc72658e4f19e2a96a38 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4a393999f3124626161fbc72658e4f19e2a96a38 commit 4a393999f3124626161fbc72658e4f19e2a96a38 Author: Gordon Bergling AuthorDate: 2024-04-20 12:10:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:21:45 +0000 usb(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 604511f84ae6378db25ae3080e9db2e3bc9e0811) --- sys/dev/usb/usb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index a4355de237c5..c4fe3b4a6ab6 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len) #ifdef USB_VERBOSE /* - * Descriptions of of known vendors and devices ("products"). + * Descriptions of known vendors and devices ("products"). */ struct usb_knowndev { uint16_t vendor; From nobody Tue Apr 23 05:24:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCB3spnz5JStx; Tue, 23 Apr 2024 05:24: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 4VNrCB37Hxz4hP3; Tue, 23 Apr 2024 05:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQRCw8Wwh9n4DQ6I1xqp2inx/T9SRI3QAOebvirVnG8=; b=jdTNOVFAA+PoJPcqqp/1YsG13AN+dFt66Iw8X2qeM46Hh2XeWAY15oaQttQ8JSGvx22a8X iMhX54FGHB8lfqGkFYyBQINYhOoJa0GD4DEk6dv3aReAoAs2CQ199cuZlKRa821PhrZlkZ GPO36JE8hzTtS87mvcZhsYM0xeRkUJTMom7v6PrFM8zSGhQBEmUqYXc1bYK3i5VIWn5O/r HVqOc3aBSCvdxwazAMQpIWy+3mnDpSqfea5GnWltCXccCMrGY0JXopv95Nnpkc8UotiiaI 8w31M588NSeZVq59La5/PFr7MEmQdTN1AxrQJhXRR+MSX5CdPnmmjpVC+v235A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849862; a=rsa-sha256; cv=none; b=VTUE8D25VZGCGQUfUEHdvvTNPXXwntUIhuJtTipibzK8dmJcuzks4QfwCig9SYg6rVV4Gd gWGIGu+bIfSOp1PEKb5CQl8zulA3PoU8aGFwHUz42cohCtm2V9vunXPZLlzHij6O46XKOx qzjd2DN8jUAXiyGDBbfSvADMCikK1UHEYbttdAojYYAGyCjYIIKz1b9l/3oJjXxvTPbvsr 1EAKlKEWzI0dx44vBhbZT8fM031EP6lCkVjh2LvTQNr/DNgHWYSQo8YtkckDiYfLjNOOSf KMBrsThYzJw2RUAOjPtKJuP2yFqkaUxsdsJ11L2RiVtGAKjne2UB3OmYHDj3sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQRCw8Wwh9n4DQ6I1xqp2inx/T9SRI3QAOebvirVnG8=; b=X5SCjK2nPXzAob3rwteG9QYiY30bSjvPpSotOtzTW2mRMDNOjeNaAHzb+r2QB7Rm/ugwRX 0+HLZvAWCG0hdEv33uIHt+kc+KUGJZ5xHmA0W6US72caAWBIz4RXPEyrWMUc3DitENH96B 0qLq4fJwfhjSHqkMcV7SD3nAYjuBhWLNPzb4s8TNJRouG46bmfxXk86bLS9O0YLxJ2SYpx dru8EB1iFdpJA+Imx2m8pWHag5l587u0V6B+Jfl3F9AmW2Zx8DSMdnQk4gO5P6jorKMdkL zAgHSsY9v/Xn5o3cxo8HZmoGvw6DlUlxgMLGrnZrg2N+xHrGfajOJtaeGmaK8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCB2kvNzK9v; Tue, 23 Apr 2024 05:24: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 43N5OMs0015689; Tue, 23 Apr 2024 05:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OM5m015686; Tue, 23 Apr 2024 05:24:22 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:22 GMT Message-Id: <202404230524.43N5OM5m015686@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: 7b6a12da16a6 - stable/14 - binmiscctl.8: Remove a double word List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b6a12da16a629ba7cf1a93631ed5f588cec2e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6a12da16a629ba7cf1a93631ed5f588cec2e17 commit 7b6a12da16a629ba7cf1a93631ed5f588cec2e17 Author: Gordon Bergling AuthorDate: 2024-04-20 09:15:20 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:22:06 +0000 binmiscctl.8: Remove a double word - s/the the/the/ (cherry picked from commit 5235e9d646e7771cc532b8fc02f742a8157a41e5) --- usr.sbin/binmiscctl/binmiscctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 36b69f5d3375..178389920448 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -128,7 +128,7 @@ To make the interpreter automatically available in jails and chroots, use the .Fl -pre-open option to allow the kernel to open the binary at configuration time -rather then lazily when the the interpreted program is started. +rather then lazily when the interpreted program is started. .Pp The interpreter .Ar path From nobody Tue Apr 23 05:24:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCC5jwYz5JT85; Tue, 23 Apr 2024 05:24: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 4VNrCC3vDxz4hS0; Tue, 23 Apr 2024 05:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErHPLpSNmAT4b4d1rdDy3vw+mu2AM5ZanQLR45j7qRc=; b=G9HE87v9uM4C729vVPfAIhMFkuUFnSoAqCZi6dEEMa9WDR4UROY9Va1eYL34sLRyRH+ofH ODBXmQVibWwXAv4aiyt1Q71HsF3DCc/zSnaljeSNUCwPkdkSL5L5bJo3akx0h0hxak3YmU EUe8chvz9dN8UatuQ47hl7WPq6lg+p7/7A7s80o6qyYpnEC7WQElP5jE8fmOM7dQfv85o3 Ld2Rn2WvD7u/RiwSO0oQWdFn6GSzYI55LuSb1bSvP3t8Kj7E4XlD78iDgDdp7iMeL8mOJ4 3Sk1//QNyd/ARnht5x0a/2bIm7guMNTa5RMmKyhcmuPgOmR1pquxf24oKZ5eyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849863; a=rsa-sha256; cv=none; b=qD8o74E+GHtrZKQLL1wKHgNOeDyPuzU296FYZloyOUf5ZKD4MrWfqYBIqsua6m1C+Vmstb EEq4B6Sbw5HIo1DwipCGbQLPrzxb+YmyebWEhb+SvGH0u50DLROmEKys5OfpXqh/PVdvnO SkomNJ6OhPcVdhGDJDWZA9Oh5De9doir5i5QyxnytbCAEcqQRlgTo7vAerWADAfO6vWP1G RyAgT2aJu37nv4qlIhMn0gCQ8MD7KY9+IzaanZayxwSTqpea5oos/ZMWXRLBKMacdth5C4 VkHnutvnDX2DEj5m6GLWqsSOncUDTBv+UYLfALnFKctmMDb+0PsI+VZ/SlYkdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErHPLpSNmAT4b4d1rdDy3vw+mu2AM5ZanQLR45j7qRc=; b=Kx8Kw8ZG+4hPzlE4yAOzmhj9+akc36jkjp5ZB3hbICx7m4vN3a+3OSdyZ5a8gu/rBWrQfx OfAgr4iXq1yqG6J7vkpId7fzZT7Awwid3amaxrp7+Z0eLcq7sdmmPap055aSCzVaQn6hKg tcfFRM9QaHK86XcXFaOW4A+6l1UK3ID1zDcmWzC3F6UG2u4JZJIaReGJg94U10AuYYmZvI uPKszu0zwCCHGHgkLdtcZi8KMYb75UEh9x9tg1vGlryRSOTm16NHPvCHzid5K9fra17m5X queZUJuVWMMsa5kPYdfk/6dHYc7yi4pzaNUza+JuHXhMKN4iLs7iBw53+tP4JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCC3ScZzJyn; Tue, 23 Apr 2024 05:24: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 43N5ONOA015731; Tue, 23 Apr 2024 05:24:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5ONFG015728; Tue, 23 Apr 2024 05:24:23 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:23 GMT Message-Id: <202404230524.43N5ONFG015728@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: 499d4a609480 - stable/14 - timerfd.2: Remove a double word List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 499d4a6094806b5867903a600f1de07daf8ade07 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=499d4a6094806b5867903a600f1de07daf8ade07 commit 499d4a6094806b5867903a600f1de07daf8ade07 Author: Gordon Bergling AuthorDate: 2024-04-20 09:31:25 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:22:46 +0000 timerfd.2: Remove a double word - s/is is/is/ (cherry picked from commit bbef63ec27fdb86814e34c4b4013cd92ba86bc42) --- lib/libc/sys/timerfd.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/timerfd.2 b/lib/libc/sys/timerfd.2 index e5dab05821bd..7a112ad0dfcb 100644 --- a/lib/libc/sys/timerfd.2 +++ b/lib/libc/sys/timerfd.2 @@ -300,7 +300,7 @@ object fails if: .It Bq Er EAGAIN The timer's expiration counter is zero and the .Nm -object is is set for non-blocking I/O. +object is set for non-blocking I/O. .It Bq Er ECANCELED The timer was created with the clock ID .Dv CLOCK_REALTIME , From nobody Tue Apr 23 05:24:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCF0Vg5z5JSpW; Tue, 23 Apr 2024 05:24: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 4VNrCD5KSGz4hTh; Tue, 23 Apr 2024 05:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VqOVdzPmyDM1p0GApU7zYV+gcs3Iws0rNZd/uutsoIE=; b=CA7DOFEMQdZqpKcg/AvMHNGnGiyXtq2gBdrejeVbuPE6IV6iycR3WfL2dA2GHBxkFUpBmJ 25XzEWxB0SMKHI3lLB6qrqvdm0bB3rhQ+jNyIUz15vjPP702tdTtkoFP11OkBwVBEBoECL 0zbg+l3w+rL94urtwE9Mc37j0Vxi1tHTqFJqwBLOK/IzsNwFNPpPF9meEfoLZIbau7Hi3T fovPgV/ouWfaOrq+cnK/mZAoqkD13hU3WXBGDnVUTZnLpKQUMQJqH0opv0/RVpgBa25l+0 3HwRsJjSdzuE0DgtMTM68VX9T06Pp10EksXl19vqnMy+bOXlfs/8gaM6/xfF4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849864; a=rsa-sha256; cv=none; b=CJj319xkTkAvYHFEpz2SKB3w9jXZbi1689/G3btEUvXC0W/z1en+fdjKvKBLHaxK136Cgu H1ui2keKrXS6r7KamLZVFvY7CRLshQnmx/+F+cSv1qYwzKyW3nU4br8lN9UGJIwcDIOKhx v/ejZ4kLQAMZc0R0DV5SHIXgPOxUhM4Fz3rMYSIXS5OQP2IUzwE21WizqxWMF94PEq75HX tKed5k7SqGJ/IFdbgKBn2PMpNdkCoJbqu6Chd04TTXoQSlHW5cKtKNX+kvsyTL7iMDIJ4v cx3NtSpgk01UfuLOHEFF9FZOStib25uf/khJ0yDfGUaRa0Vp3mA5AylofxVnbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VqOVdzPmyDM1p0GApU7zYV+gcs3Iws0rNZd/uutsoIE=; b=WIZWEvvf86tX3IQ+FA6EXzqutiTlVJ7ir+Eyrj2zdP5Dc43UkNbDpf3FU1u8QGc+kPux03 soGUmD6bXnymukwA42VS6Z0jx/pmn70KDCVdc8MXajLxSc5QkdyFL9oxlmiYGn8prAXKZE DZm49KKgH+/KGZRw8DhctNCpmrWhQRITqPJODb/h1UsabuLTdpaq49qxzLIAt57p9MkG2I KBfaZbslHC1Zu9CfD946N14T0EMprw30wM7AZughRZt1Zh0QBUSUt7sFpUtCVaplunO2xT VxzauwsIgek5wPslWttY4samE7ZPJ1ii1VQUbuYsBVWlwFMXvxD5BgeBxRAYaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCD4ptHzJbs; Tue, 23 Apr 2024 05:24: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 43N5OOxL015788; Tue, 23 Apr 2024 05:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OOSG015785; Tue, 23 Apr 2024 05:24:24 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:24 GMT Message-Id: <202404230524.43N5OOSG015785@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: 1e17c1177995 - stable/14 - safe(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e17c11779954a283deceeb715c7208ead1749ba Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1e17c11779954a283deceeb715c7208ead1749ba commit 1e17c11779954a283deceeb715c7208ead1749ba Author: Gordon Bergling AuthorDate: 2024-04-20 12:12:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:04 +0000 safe(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7) --- sys/dev/safe/safe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index bafee29b9a9a..da2afbd38fad 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -1777,7 +1777,7 @@ safe_dmamap_aligned(const struct safe_operand *op) * of an operation. The hardware requires that each ``particle'' * but the last in an operation result have the same size. We * fix that size at SAFE_MAX_DSIZE bytes. This routine returns - * 0 if some segment is not a multiple of of this size, 1 if all + * 0 if some segment is not a multiple of this size, 1 if all * segments are exactly this size, or 2 if segments are at worst * a multiple of this size. */ From nobody Tue Apr 23 05:24:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCG017kz5JSpX; Tue, 23 Apr 2024 05:24: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 4VNrCF5rYyz4hV3; Tue, 23 Apr 2024 05:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXxNITpjujzhkaF2Z0mZ/UrAY2KTmkEs08bP3w9LNYA=; b=HwvBDsgXGju0kvLQhCVWLQrW5aq0SvMq0yv6RxG9obBzFYlMI2wlg2OfryM9AolZks7tHz 2+Y95vbUrfx9o80RzgWKsS/Tvk7Wr/v16UPNw0wHwL90ojeqKkT95JrZKbLlnqNOmRiJIr zMEJkJtCEMpZg9ZwgK3dfjT2m2I1xujTSlAhFUC2WlQ9lixEkTAOVNPwXe0y3sJtEBow0K o0HclViLgc2qs1um8l2kC0Qs+yolEk2LyQOf8fgP74f5VzMYSaQXom+wlgFfJ0m31tMuji KR6mbOxsVAiUVuVrzMMucBXiK5tC0n/rptyMUAjQOWbL6VSa78OqrTqn45O3bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849865; a=rsa-sha256; cv=none; b=EZfquSlAw34DJYYGPl0enqvFBVVQP6ETfjcaPKDz1/sU7lshEuht75hW3/0Yyjivj8lJHv TrCjE4FGNZLjs0c5ahIzEEYRVNqRdySK0yUyf6IvAoRlfT0b4+5eQajLumNMmt1jti5vBe HaMuZn7KRR9Ihhllfn0CwonTiZsvjGwtWKTK7lHRJ+jxPmdGfm+Iv085ThpWq0fMF+T5Zu 52VveDjg5TcYVODmPA1Lqt6t3h3jSlY3ui58UEeWGuLfPHrbyhaRKYrFbVxCz0SgIjvcX5 NYjFbgauqSn5YXo9zxpH8gMtJy4MWt43P3CKTZ/aDXxwbFOSLdg6q/erDPDYAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXxNITpjujzhkaF2Z0mZ/UrAY2KTmkEs08bP3w9LNYA=; b=tdyZZoJQKnVapTnib54tTtkfkl70kTBhw2yCYVeEEYy8sC9eismNpSZuvQNQ/qwJdr+wFq nEpU/RgOezep3Rn8MDbsW214E3u035qJqXes8ECN6bsivWpgnZpE1WDYGxem1iboY2VDcZ pP7QM4kn3ykco9SfJaTavdm79PzQuymZioxgiKv6k+TUlXCDWjTfyqTa8TrOC+CSs9XPfb eRoSjz9OPxScAQY/Ybypu4H8AGbBk2pYfVr6bMImCvFsjXWYALpkRpcqSyOOipnZSUB0zq VW5MoBmFKvrBjRGteq+PrRBTJtc0vdqn1zJvuUPnUS0BBMLAxjOG1y4FXst1bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCF5T6bzK9w; Tue, 23 Apr 2024 05:24: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 43N5OPds015845; Tue, 23 Apr 2024 05:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OPXG015842; Tue, 23 Apr 2024 05:24:25 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:25 GMT Message-Id: <202404230524.43N5OPXG015842@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: 0b396f0185c7 - stable/14 - bhnd(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 commit 0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 Author: Gordon Bergling AuthorDate: 2024-04-20 12:09:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:21 +0000 bhnd(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit d2747968c068b8cfc890901f4955037bad7adb9a) --- sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c index cdb92551e887..5467bcbaac20 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c +++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c @@ -56,7 +56,7 @@ * The Broadcom NVRAM NUL-delimited ASCII format is used by most * Broadcom SoCs. * - * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value' + * The NVRAM data is encoded as a stream of NUL-terminated 'key=value' * strings; the end of the stream is denoted by a single extra NUL character. */ From nobody Tue Apr 23 05:24:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCH1PmYz5JTDR; Tue, 23 Apr 2024 05:24: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 4VNrCG6bBGz4hVR; Tue, 23 Apr 2024 05:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOkiJ6sgPYYI5kVFjolFP2R35BAMw0v5a21oKoQvaSE=; b=bt4g7JOgfgU+A+R0hYDQsKtLBcin70JOdR+SlQc6/Wi/V5tmHZmC9iOV58UnGFF74NljGN 26GypJ16sPYhlkn46SyjI3vZXy3mIC0+TQzVeg/eSAixab32NF7MB0V2RfelCo5y/oYlxJ IF+CbhPvi7zAgfTNhX1X9xBcKvJ/vp75f4WO2GAtAppvp9rbTlIZ5emaaDZl/LFfYyIPJ/ U7Ny63hC3u5s1SH77gj8SpsnttJ5i20ktWBXFFrJJpDuZrr0zXF03b0MdYuHW7lKK1WRHs 1hDPXqR1jVUc62ORchdab8nTJFp5VOkxEBJ5/4jJxh+VIfwq5akAXedKe9pYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849866; a=rsa-sha256; cv=none; b=PYlF5ROwc9gQsshwo99Q/7qCPdIJkK8RgqhAHaCnhMC2ZYuZUnvzFWptO2raNswnop10Ol LouOr3OkqO7TYvIAWVY5frLk8rbq+J5FSzZyTv4umiXqypRm7CYtiNTMhO1AQqeKZDMzeg zSd2ianWgOoefjtSqNvBsRynxGAl6is3tl23FDD4ZzOuSOqzr1nQ2djkmjoAX1I2Dw/yXX bSpxSV5hOrwCIxz1M0+n3/7M5CwjRAkxXbzkxCZlc90hRHzGh9C1nVNpeF7Rw550wnMnrP Pvy0w97S4UiGmOi0+Rjha8THAmD2shQoG/HcXclJ0f+K6ed8QqqL43w0tux5NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOkiJ6sgPYYI5kVFjolFP2R35BAMw0v5a21oKoQvaSE=; b=s4fTnTzNiqJ86jO6KoMfXp76Q/nz92pXiHFDtTUwMNjI85aWHlpyqoHkoIYHllv5dZiDuU 6DJAygVlxuC1WwiFr9uGv9DQ18lttvcGSyOouieuf4/xXG31ZiLyIT7xN7O+tfDq10jed4 qimiHdx45p297V+ViU4ZjavdbQuwGnBaBbm4xOIOXQgIFkzzp4hrH83Ews/4zLtlV7+6ZL 0evp4YB91WutPEUHP47LuKQy2gK+N2HY66tLd6H8IFXDCc0/XmRTSxJoazBURTyPveOJYk QzseN0Dci4qGkCxiEsc49wnH5yBWmk46SgqnJl1Q5vGqRD1uoIpi2oOwv4C1MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCG6BPSzK6x; Tue, 23 Apr 2024 05:24: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 43N5OQLt015901; Tue, 23 Apr 2024 05:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OQRl015899; Tue, 23 Apr 2024 05:24:26 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:26 GMT Message-Id: <202404230524.43N5OQRl015899@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: 6e97dd94f34e - stable/14 - ifconfig(8): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6e97dd94f34e6f74090e92100d9127a89b100b80 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6e97dd94f34e6f74090e92100d9127a89b100b80 commit 6e97dd94f34e6f74090e92100d9127a89b100b80 Author: Gordon Bergling AuthorDate: 2024-04-20 12:01:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:37 +0000 ifconfig(8): Fix two typos in source code comments - s/the the/the/ (cherry picked from commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a) --- sbin/ifconfig/ifieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index bde079deb4c6..c6875785f8f5 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2784,7 +2784,7 @@ printvhtcap(if_ctx *ctx, const char *tag, const u_int8_t *ie) const struct ieee80211_vht_cap *vhtcap; uint32_t vhtcap_info; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtcap)) { printf(""); return; @@ -2814,7 +2814,7 @@ printvhtinfo(if_ctx *ctx, const char *tag, const u_int8_t *ie) if (ctx->args->verbose) { const struct ieee80211_vht_operation *vhtinfo; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtinfo)) { printf(""); return; From nobody Tue Apr 23 05:24:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCJ1V11z5JSrp; Tue, 23 Apr 2024 05:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrCJ0V36z4hZp; Tue, 23 Apr 2024 05:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7JUgfLvH2K5LtxvmGrODDIk7Sxx+OoHSx77ugpBi80=; b=QOfXtW+AJ0qc6RzxMwJAg43RYGj87JP4ZOKzGFPW1ZJQOHkHvaxjrzgP5Eho80byEFEmAN 7+GdigpxRPpPC7TiR1WEjg9bkmTEm88xbGSRE7yE9KLY419zCDBZLSCorqK9Kv6LsXewCQ SoM7fIGvdSc6SdQfJbUNbld4220dfeSPgCILs0IjH1xdj3KO1E0b6UULj+HFPL7Esd87MJ +1OQBJKUqu6ZIH7LUb/MT6GkCKXZCk3y+xkBp75vlSrc2q6RAKEkKVISuz8eps20LnbzCH l0bu5YK9K0pfCyqRX/5lxHR3vXZB5+bq+d91bzFkZ9X/wPaOjAawTp6LFdK6NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849868; a=rsa-sha256; cv=none; b=x4sX5J3pyetBSAXF4u3anfONqj5R2ji0kOVu+2wQkr1fM6FL4IItTAB6SFZjwbZGNYVoNq LM9DatRSA9A6U5junEn3DZgqpeWEaiVDGcpcoz1vTV/i6KUoTKB7qYUoLkxMJsDhFQxebu hFOAPfBS2zhDx5jSl6uHRwtHvw5h639fhmy2jhKpQwqnRfBHmFMItsG23hrYXzv0fEIBdv uv6xjn2OVVemnaOWVtlNGFtCt3L/Sy6tGyr7pO3lUzslx0aVO3B427t3kJ/A4M+bWUaA5N /nhcrsjvPemBOknaxlXhujtDa7srWGh6vgeonxST/1fnvIJQKFIsuyBm30gKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7JUgfLvH2K5LtxvmGrODDIk7Sxx+OoHSx77ugpBi80=; b=xsVdqE1PHbJJ5pbK0eujFHlHUSbM2cEOcCJRciePk+Xddr6M+ptg01waS8z8PGHpX5RNcR gFPTsaR5bZ28EOVllPYAgj3GSUC6nocvDU759B/24AQ38GBevGR4LzK/YUfbbWmX03keOy 6uX4xpi1cl0KkUg+C+NPqfKspWwwCtKyoQnsc808wn5BKsAYZfaHb8L2JzWwEKRtiKfUOE spSGkmWtPX51l/hWYpQm9N7oPXzqAHLTz9Mid0ahm8hdbv3gNEjZvDITnXFumXcmaW8PNr 8KI+hD4jUeF/TY7rbFf+Rxha0it053bvrc2grAGfnGEVz5elumXVr04m9fjcsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCJ06Y5zK6y; Tue, 23 Apr 2024 05:24: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 43N5ORkX015964; Tue, 23 Apr 2024 05:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OR9X015961; Tue, 23 Apr 2024 05:24:27 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:27 GMT Message-Id: <202404230524.43N5OR9X015961@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: fa4b1ab76983 - stable/14 - arm64: Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa4b1ab76983e54b34f303eb7c911f84dafc0751 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa4b1ab76983e54b34f303eb7c911f84dafc0751 commit fa4b1ab76983e54b34f303eb7c911f84dafc0751 Author: Gordon Bergling AuthorDate: 2024-04-20 12:06:53 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:53 +0000 arm64: Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 516e591db11a29c7bb3d8135a94530b27b94f91d) --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index 825043a09faf..2323b4bc5e1f 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -61,7 +61,7 @@ struct qoriq_dw_pci_cfg { uint32_t pex_pf0_dgb; /* offset of PEX_PF0_DBG register */ - uint32_t ltssm_bit; /* LSB bit of of LTSSM state field */ + uint32_t ltssm_bit; /* LSB bit of LTSSM state field */ }; struct qorif_dw_pci_softc { From nobody Tue Apr 23 05:24:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrCK3QpRz5JSpj; Tue, 23 Apr 2024 05:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrCK1d0Bz4hYQ; Tue, 23 Apr 2024 05:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wi2S5FkYWxm8VLizMtNj1J65xCy/zurKmJ8Pq7rjrXM=; b=PK7Rf/n6+n1wcW4huFy5jP2m0Lqk8Kac5fDL+XZBv/r15Gf6dOk05Vl7OQYYcKoFJdrWup 9x4WZBxC7wwySTg9MmONfVFlkx4+h+mHV3TOibT5parv1ZPOTzPdNsPX6Reivop9Qmg8jT 4MHfcINk1Z0uhrNVOUa9qsXAZTyzCYIHqWfCIF7UpidgVd9B91jmRFucd+JJ56mHQTvNop EtLA+r8s+8/MulJ1SHmVXHEMHRJJ4JGZ6NFAh3MWeLqgx9psz6YNl51yGwPhmNIHjFdRox c75ITIeI9u6eQJb2RVRSUIblP7AHLOXQ6XT8KAJOZsEmeqmkHZw1t+8qtYHLVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849869; a=rsa-sha256; cv=none; b=D4EnrEslkXw/HBFtBmKRUR1RzMeyAdwLMsMOcptYGOqXMvRoJ6WxUHnV38oXJCk8NVoDyt oOtmM6R3m86NrSekutcg3Q2ITyoG0hHy0BvAh0BRGTrt55gZdVKZ5wrxTTpHzZ4xdYqpvb ywX5s+vLvoDglO1NLAJW2lImYdmQvcbyB3GV+xjlrjPkJFjwT+93yuGftMJJe7P0VVwtIQ C2L9/B7zpwWwG1rMz3g+WAraZd+0TXV1bdm1htXAs+q/8VwXyOIEwSwCYn1sXLrJNkriVE I56BE+7dpEHdol9fplSv4WiAWkOxyhiXLgQjh4u7SzoxbQ4lAexGT4fjhFMPQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wi2S5FkYWxm8VLizMtNj1J65xCy/zurKmJ8Pq7rjrXM=; b=NdpyoNnnaL/Ac3eb3ck39Z8jqpI9/mK9I8PmwDBcTDT6mwUK+6BtZX8/RPnLpUQUamyaHX cksLit2C8HVyz603s39fZlLodKiTL91cEnDYdsscn7ptsGAfbFxuoNH22BaUgN6gwc0QpM gBD7ARdNcFl5IFgqcjo2QhwJBOgbyZfeC2jqRA4ok2DCGq6NLl+nUQuzKsrErAOI2i990G cwzjOJ8/PJUr7wkDL5otC7uvZx3Oc2Hi/HRfeEDKX+vfalKUt4syG4hEDhWGw+2Q9yRge3 B/mOUhcqd8RQPTHkWyvVJ2qEE5GF03MuQrQEgRprdFiJ9Rv/b4VhVRHOuZx9Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCK1C5QzK70; Tue, 23 Apr 2024 05:24: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 43N5OTh4016012; Tue, 23 Apr 2024 05:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OTA9016009; Tue, 23 Apr 2024 05:24:29 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:29 GMT Message-Id: <202404230524.43N5OTA9016009@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: 0744d3268e07 - stable/14 - NOTES: Remove a double word in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0744d3268e074605c279e553f605cd62dc134883 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0744d3268e074605c279e553f605cd62dc134883 commit 0744d3268e074605c279e553f605cd62dc134883 Author: Gordon Bergling AuthorDate: 2024-04-20 12:08:04 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:24:09 +0000 NOTES: Remove a double word in comment - s/of of/of/ (cherry picked from commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad) --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 45dd6c30c7ba..c6434d1ea85d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2744,7 +2744,7 @@ options MAXFILES=999 options RANDOM_ENABLE_UMA # slab allocator # Select this to allow high-rate but potentially expensive -# harvesting of of the m_next pointer in the mbuf. Note that +# harvesting of the m_next pointer in the mbuf. Note that # the m_next pointer is NULL except when receiving > 4K # jumbo frames or sustained bursts by way of LRO. Thus in # the common case it is stirring zero in to the entropy From nobody Tue Apr 23 05:27:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGK4jcDz5JTDH; Tue, 23 Apr 2024 05:27: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 4VNrGK3Bg8z4l5R; Tue, 23 Apr 2024 05:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBjA8i098AxquTmR845pq3xeId1n5nufI5pYmuzmYY=; b=xQtnV2hqJUmxjsbI+mLtdk8n5a8hhtfZojeqa7eUjJOoTWh/5LFgD7I48pGzZIQEWT4vTU Rwa1EQcg8FxIMJN9kQSQMVu9VWyaAbm/1ignp8YhB0KFifZpoFMsEKMCcaAZHfS2i8VR2f ayHnEedXif1R6EvvC4JIB7zcYnn7nHnZSoz+7GzPglTeYwhFGBll1sj24lRppvb5cdkoAw StZU/3qSs2KMR2V26VjJzzQNgayDw+Dx5spMrgJ8Ve0f4DvyBIUew00XhyxXE8FbkI0z5u INko/M5SSmQUEhWTTbew60EYtbhuovEKo/bPPi+yj4j0vQzZdH84cXpGKZpUOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850025; a=rsa-sha256; cv=none; b=uc5RH5apuuav8rcjKTcIQDqORXRF7vwx6ES70jkM7CuXAhJQ7QL626RiAAyFDfJfmOHOCV jXFxiaYgHbqwWWc/2xgDqI7WEYUi04ekxvGncVXwLl7rztCmgK43pLwn2zDwexLhYG2E7e j+NN2C4e5Uv3/wGfyBfaytGcOCg29J0aAUafENhBJWJifrveqSPoCNxvaedx54jz8hT5f4 sfyE4lCQfkt6cHVUZz6fMDHY5b8Cig2NK2dQ9ZzQgyPcNLB4XX14wdkVkLNdY6gHmmSy7j fJRX3pC84hnxdGA8NRxVQ5K5pHgu5jkMflHAoEq1pHh+/lSikPNxxnEY2VBEKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBjA8i098AxquTmR845pq3xeId1n5nufI5pYmuzmYY=; b=AHlTLbIcG92LeRDFrLWS/kdKdP5CO9M6Ty/xpJ/Koi7OkJJMvdyVpVjdDasvD4dbycJbTJ ise+R8sHk9JhsQKpvEvm0Rgvikud26fYzIquypnNDVqLiLKxPG5nU9iuZoJtXwHLMvRo/E 1G4dZdPCcq+C8BNwyzF0s4rK8vXFljTN1xawS0XOkt6UjwdtDWeNdG7HrlXGldm9BDgDv0 33i4D8KJ8LY+AS3JguG8ikFWTF5vJdE8/bOBToTGSKMjXlBE+WpMFBUTHdFgu3v/uTDEw3 UOBMU8riPVSm+r8AzcIKlKfqGnCoID7iu/dQ31AmFbt2RIr42C35m/HZ0D+iMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGK2GjmzKB0; Tue, 23 Apr 2024 05:27: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 43N5R5Zr016712; Tue, 23 Apr 2024 05:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R5kf016709; Tue, 23 Apr 2024 05:27:05 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:05 GMT Message-Id: <202404230527.43N5R5kf016709@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: db6bf2d09bec - stable/13 - usb(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: db6bf2d09bec47a3729485eb999ffc393126ec30 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=db6bf2d09bec47a3729485eb999ffc393126ec30 commit db6bf2d09bec47a3729485eb999ffc393126ec30 Author: Gordon Bergling AuthorDate: 2024-04-20 12:10:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:24:57 +0000 usb(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 604511f84ae6378db25ae3080e9db2e3bc9e0811) --- sys/dev/usb/usb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index a4355de237c5..c4fe3b4a6ab6 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len) #ifdef USB_VERBOSE /* - * Descriptions of of known vendors and devices ("products"). + * Descriptions of known vendors and devices ("products"). */ struct usb_knowndev { uint16_t vendor; From nobody Tue Apr 23 05:27:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGL5r20z5JTLj; Tue, 23 Apr 2024 05:27: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 4VNrGL41FRz4kyJ; Tue, 23 Apr 2024 05:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyd1x0Qun2MRwwXqnnHMjqLc96aMbNyKDX0RGXpocA=; b=rrHD7zAgdPj7hJXybNXc37MJ4w9C4QfaB9T/J03qKA8cgTTin3ZiWfqLraUxDx0O4oBz8L fx7dBXRSPU184VBtep7FRETskDPdRwNK7uWqJdYQUsXOSo2l9SPkNISn2bbeUOVjqO9UMJ g9qP/HVKY5r4aItB/gPDXN43zcmwLBQ0FrA/XNWVsKQH4CfLAHEUwNxzPl0DERyYntfMRA YTMIf8QZok4T6QAB9UpNFZfcZU/r+LlMC5pa44OXeg96qqZ48rAz03QlBkoFc8bfkre2CW SFCgMqwJgYMHZDO57vC+X4MinAlwKbgvvUMKpHO8fgkZF9jyxawCBmgD0wMCQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850026; a=rsa-sha256; cv=none; b=fv5jcTq3RvdLOzJtQkuqWaLP7+Zk5R351Gli/nitJWOS4PoUpm4HNYfobq9DduPGeVh9jv D4lEHqfanLHonoVysEQs/O/I3SLZWnrR9/9F+/Sq1WkJEkxhO38AkjJksrn2pUhMjeJvXm RWSP1y6PgXV51tSF+eBKfTmc5lDnmzqSREUZtfXjyr277bItmFzxDxBFWvr3RR123qao0n /PmfX1adYHiitRHIZqkTm9bAta6LDl6bKRFvJ9KsVr4229P82ET+/kwdbLEGmyObB7Z1hv ZmZ7MTib+BhZq6N6L3EOUWIY/r0/FdV40j8f/aymoaqAs33aG0IwxArNRFOayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyd1x0Qun2MRwwXqnnHMjqLc96aMbNyKDX0RGXpocA=; b=vWrcRbMjNkWXcyEDtR61h1egB5pSuFrsaIEUkLN0r8ldtj5WleJroI2FgWQex88fVp6IMh 3buPDMckSCHI7+CtvgzuiQ03qv9FOYyFXOG9FtyLP7ENQcJfYPYgGOYCiIGLJeCYPaZhiA Vt5AjOXan+2o4eQbE4oEZ0t/jTJS2KzqkW67Ov34TcpS+VjZnqfUYe2F2dph7djL9WYWXO ntP3UDzTJQ+wy+o7IMNI9nnXFRVTqTzsJVaTxHd7zJj+w++IdAPAxcskYwyrQ5St+AKeUf QwqtlWaeiXZq+UGeLQLymVy1S+1JBPhnWoroUw0nmGI6xtVgCAQ6RC6bFKmG0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGL3XFRzJyp; Tue, 23 Apr 2024 05:27: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 43N5R68Q016758; Tue, 23 Apr 2024 05:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R6Dj016755; Tue, 23 Apr 2024 05:27:06 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:06 GMT Message-Id: <202404230527.43N5R6Dj016755@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: b6ddbb47e120 - stable/13 - binmiscctl.8: Remove a double word List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa commit b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa Author: Gordon Bergling AuthorDate: 2024-04-20 09:15:20 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:25:10 +0000 binmiscctl.8: Remove a double word - s/the the/the/ (cherry picked from commit 5235e9d646e7771cc532b8fc02f742a8157a41e5) --- usr.sbin/binmiscctl/binmiscctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 36b69f5d3375..178389920448 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -128,7 +128,7 @@ To make the interpreter automatically available in jails and chroots, use the .Fl -pre-open option to allow the kernel to open the binary at configuration time -rather then lazily when the the interpreted program is started. +rather then lazily when the interpreted program is started. .Pp The interpreter .Ar path From nobody Tue Apr 23 05:27:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGN0Bcrz5JTJj; Tue, 23 Apr 2024 05:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGM569Kz4kyL; Tue, 23 Apr 2024 05:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rgIleGDYiz/O5mxhHFEGBgHU7agKYZC5y8QgK9iZfE=; b=yYsA3rEf0Bb669b//w/mq+z5BgVpIXs0sveJZ9Dno0eSEYNxZ0q4F9D0HkE6qcurS0vEYI jdo3Uk2A19kqogVVuvqLEl/apRLgkZJMbM+qZAGgBl6fPOI+IqQnNhHTO8tQi6mEDqn/BZ 0mCe9XEtB0awKLwc25+ehYuOhekXYdR4UinXCpy4YwDmJ8Dp6/6IWhqZ4HuFn1tjzK3jQn QjRjrFoa7NozfcYXWkF+oL0dTHQldxA+M47MAqMW7EiSqrnbBBgCZfIzEeu/28A/1ANVjG sljjUxb+OyEH/e6gZ2sJ94QttlHcoD+xOPX9YawJzft2Sbxq0RhT93gSEphYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850027; a=rsa-sha256; cv=none; b=isfDScrMu/Nm2KEPqIHxHFpAphZ7Z/JYB6w+vC21Vkbwj48wOfr+pFMNdY8WEwuu4QIt1t WHOJJzfuG4vgU+aj0Un9ZqoEJx0bvOi3dd7j8CDCXUaz4N9marSbfivGwWC1bhgHQIPLR5 4fK3IEAXGRLQVGzTBtPVAN+aVhgHjmdZz0CveBfkbvAYEfQnxJukrcD5PQdbEiTFUivWZf +cs7I6/lb8BuPaapy+Zu4L17r70cDiJCpuupi1zbbDgNBU7uIBzsg1UG4ulpdkigpBCjp8 72rDPQ9U5+E1uqxVlT/284K0gGg3gD4jUy0IVWbQ+QTIGwgQ7j74Xjrn099z9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rgIleGDYiz/O5mxhHFEGBgHU7agKYZC5y8QgK9iZfE=; b=GtecJbcKwgwTwurs5Ed7sPMg5UopGjaX2UX7/nw8Q0xE3ArARqhDaTC4Ru9lI6cpEROAvH Gbwdgv+rOPfOsk+Z6Puxr8UHmnJbjxmO6MKOF4uCSSDaSkJY/1HFdlF0QtE239SpQgqA+X vAq8kmqpM1yyxEuBZgXPQ0DppxXK0yTRCyrMHJXib4snUVYhy/5jdWY/z9KGAsqBwXDOA6 Rq7UWRjcJ0Y6bpjbcrXZzjA6bWqxL9rl3XR8ov4iP2L1smuFVr5NTkDA8euUpPuWyQxu2y 0e5GRjv62NpMWclnp2thdmJwua3Huibt2P2Dgfuxyw0TgcldgjTSspCbgkB2PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGM4bJKzKB1; Tue, 23 Apr 2024 05:27: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 43N5R75Y016818; Tue, 23 Apr 2024 05:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R79F016815; Tue, 23 Apr 2024 05:27:07 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:07 GMT Message-Id: <202404230527.43N5R79F016815@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: 8e73397eb632 - stable/13 - safe(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8e73397eb632ca273e8d4b01695393f12dcce62c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8e73397eb632ca273e8d4b01695393f12dcce62c commit 8e73397eb632ca273e8d4b01695393f12dcce62c Author: Gordon Bergling AuthorDate: 2024-04-20 12:12:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:00 +0000 safe(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7) --- sys/dev/safe/safe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index 8ce093b637db..f33905b1ce57 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -1779,7 +1779,7 @@ safe_dmamap_aligned(const struct safe_operand *op) * of an operation. The hardware requires that each ``particle'' * but the last in an operation result have the same size. We * fix that size at SAFE_MAX_DSIZE bytes. This routine returns - * 0 if some segment is not a multiple of of this size, 1 if all + * 0 if some segment is not a multiple of this size, 1 if all * segments are exactly this size, or 2 if segments are at worst * a multiple of this size. */ From nobody Tue Apr 23 05:27:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGP0Nftz5JTLr; Tue, 23 Apr 2024 05:27: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 4VNrGN6BhCz4lBT; Tue, 23 Apr 2024 05:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLY/XhCdXBqEaiYZnDYQQra2KP2thclOI/NV8z9k5mw=; b=nUbwOWMXnXYDlYrfAHuxYnIcf2Pb8D+aAenWcqG148cJ+lfMn7Bh7/fJ+D/9HGQhyUoXsu 7sI0lP3ls5RXRqnukuqJ61Iz1DbBwj+AtXEG/4vViy7K5ucNw9CH6ySmBjIPwLGOpNeImP KCrsRjEh2fKMaoGlmDHj20bGDmKht/VrnlcxHuQ8ZL1jX9OAz0d1DEEf9so3/Enj54AUCT iGLjBa8tdgnK4o22eS3zEfjpHqkw13X8+Ub7fO9lkpipBx8yRcQlR34qOOk3MSfQ1kqzRj Jt2+Hfex1k3xPNB2l9B4hBMnpa4u2qSe+M1jEw2vv3HG5U5ThtgJ52s3hct1Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850028; a=rsa-sha256; cv=none; b=CzydYNGmXPzP3cvseG0fYFgb8RTSQPX12wcUMFtzk+gKMVdF7SLNOqGxKLuqHunigIzuQd 31MIfOY9CCQCQPBu/Pyph67TaLnNWSdL9EcNQBSaULY/X4eO4cMjG0Bfx+l76X67tpko9z FytELGobC2YH6RBJ/ywPP9uiovVsZclm3BUtEgCpCJ8cS+dj6ROcD8k9KjSw6o35dl3yfk hX0gf33CSUVtt9iuK1Fo1+8Y78Bkn0WVrwEhDgQo6OAfBVIfuygRRgloUkPMr53/sJGtM8 X1q6UGe7a+95zaMnqYSrlyAUsTXxxtmJ5FUfE6jfK0PjEEMDYC5mVCUIKngvLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLY/XhCdXBqEaiYZnDYQQra2KP2thclOI/NV8z9k5mw=; b=Lryj9zTxLNPFZHZwXjlIbHlbPk05aUaxXM1wr+t7dlvwQA9k5OoFAB23sYjzlhWq8WvGxx iTw7JFg8MofIYf4mnwYPd3DfXtob/+leKDAI94ykqWphzCoQX9DoUXXj5dyt5SbrgllpBp 1u7dKMB/qavzGQSGMwjBZyse2MAt0w0gkLZSnAqTfqpMKpKzqhAAUWRbJ3TUauznL0xbrN TCpo4etcg1yM6Ik6Zq0RCLXuODakBGAqRjwJ4K05A1j+Z77kvCctXJNYDX69nhQeQ4Dr/B 8Df8sucTladvo0LcMFPXqbhXRANfAs95uP3kVvclUvwRQAVJW2DCvH8UgUKNlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGN5j1rzJfG; Tue, 23 Apr 2024 05:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N5R8ac016875; Tue, 23 Apr 2024 05:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R8Bk016872; Tue, 23 Apr 2024 05:27:08 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:08 GMT Message-Id: <202404230527.43N5R8Bk016872@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: 4fef442e75cd - stable/13 - bhnd(4): Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4fef442e75cd11f475fccec5c0bdfac88628d984 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4fef442e75cd11f475fccec5c0bdfac88628d984 commit 4fef442e75cd11f475fccec5c0bdfac88628d984 Author: Gordon Bergling AuthorDate: 2024-04-20 12:09:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:15 +0000 bhnd(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit d2747968c068b8cfc890901f4955037bad7adb9a) --- sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c index cdb92551e887..5467bcbaac20 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c +++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c @@ -56,7 +56,7 @@ * The Broadcom NVRAM NUL-delimited ASCII format is used by most * Broadcom SoCs. * - * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value' + * The NVRAM data is encoded as a stream of NUL-terminated 'key=value' * strings; the end of the stream is denoted by a single extra NUL character. */ From nobody Tue Apr 23 05:27:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGQ2ytQz5JTLs; Tue, 23 Apr 2024 05:27: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 4VNrGQ1Gtgz4kyl; Tue, 23 Apr 2024 05:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyKBAc/iL1ISWVaAUE4PVePwcGZmA/tca4KDgIlmFPM=; b=yaxoe+qgoHOxKQze77WFT4C4/SyikMof2kiHBH5auWrb7TAhqqIBmVeNbueXmwGYl9UFxR zlib4F6YYpO6Tjf3qMffjiAWynAFGIWkTiCeVA6EqL/cjAaGKOBWWUangRo9prpq1D1VQp u7XyoZG4hpE4yDZ0XzEVQHHBmGN2tm4uK9zADcYn7i2oHW3hEibzmJOxNdvNZ0Zk0yPvg4 OpBwd646EykmgiyJyHWqhiBu3JOVjH0U8wbH+mijOvaypOf3z2rkNkT7C6/iAURDsEQCo+ LbxyOpqVGFGsgiuNTT99fTKYTwkm7JBwbrv7tivDLSXGuDVBpodG6NFvGz0hog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850030; a=rsa-sha256; cv=none; b=xEmVbpqs5Bh5dkPLqV3KYXwoj+itYSVCwXE5VMAkNhFp4QXeaNPWhewYOYVgVzn1tBJzdW LJlA5FjNyQzCy0/6SzAFDNk4cIJfISx33+zB2Wd4NYIg4x4wK+2reva3ZD0wQu9TpnykfM FWcvkLfTp2W87oqIDAy3GjBT8YhcEPzbLjN8wLzkY51n2oc7sglIEGpS63HIGMKTxwypDm ev5FaImBy37EUIWxMgngoXg/WepWnzryHwBJbGU+QUJnEPs/uGKD0pUtUebvNg7yIpb+eo 8J0visv31/ft9NHAgqMTkeGjnkQOYUdm45s95xzcsi9u9veCj49ML1m6qkZt1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyKBAc/iL1ISWVaAUE4PVePwcGZmA/tca4KDgIlmFPM=; b=qyaVTnpvFQOWf70aOhfC14kB6UfcAnCYzF0DD2PCyypYSCrHd5vEvzUnolCKGaZqSI3G1t oJEadl5TAynZYwQ09oZ+6UzmvFd38LvhZxW/fC+H41Ng0wZQ89B0QYBgx50NzsvN1IR88R BXuUbG77jDe7Byr8QugtjZlsP9EV2oBMW7DwRHYXfchDYmcS6XXtDz3u3gYsgMAxVYt63i 3SyDnV6HxBq19lxOnrb+yqYbhls000KBNiUAeFsQtGpge7HwUReTWKgG65CvwLjNzE/fjt GL6C2zApUGqHg9IEbId/BYR+U1gawkDmDD42wiV3oDl27+RKqFo8pXo6gFfYow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGP6t5dzJw9; Tue, 23 Apr 2024 05:27: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 43N5R9Uq016931; Tue, 23 Apr 2024 05:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R96A016928; Tue, 23 Apr 2024 05:27:09 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:09 GMT Message-Id: <202404230527.43N5R96A016928@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: cdadad917ea2 - stable/13 - ifconfig(8): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cdadad917ea282443d215db6ed6a3e9e6f9551c3 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cdadad917ea282443d215db6ed6a3e9e6f9551c3 commit cdadad917ea282443d215db6ed6a3e9e6f9551c3 Author: Gordon Bergling AuthorDate: 2024-04-20 12:01:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:30 +0000 ifconfig(8): Fix two typos in source code comments - s/the the/the/ (cherry picked from commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a) --- sbin/ifconfig/ifieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 0271fded95ba..b537b70edf0b 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2784,7 +2784,7 @@ printvhtcap(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) const struct ieee80211_vht_cap *vhtcap; uint32_t vhtcap_info; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtcap)) { printf(""); return; @@ -2814,7 +2814,7 @@ printvhtinfo(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) if (verbose) { const struct ieee80211_vht_operation *vhtinfo; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtinfo)) { printf(""); return; From nobody Tue Apr 23 05:27:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGR3wBVz5JTDP; Tue, 23 Apr 2024 05:27: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 4VNrGR1hMjz4l6L; Tue, 23 Apr 2024 05:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJtZW7CLZNVnbbDEwQI3/A+mMoqCKvPJtfEaLcEuUZI=; b=bmjpRj3j6l2BiV0H7wLXZME9fBJrf8lZWG6KgP4uvvlEjlvHPf0dhvB34SfEnKpQqoRMM/ Zb590EjgIog/2WhEMZnWwa+Xel4/evWQpJpzCvxVqeT9EURDCoUl46MPjh0w6kbAVsdt+S MFujUDLjfyhe/6UM1fypLgEpDi4Z13iHr29y17iu3tP4bctwmi70kVF2QooI6IC5GO21o7 vxYiIvohNrircVTe1KM64iX+S0xw5fbifsV+CMoIr3xpBTIP33jwEyyE93mYV5fUMYyud1 vWioot/Z5lkU51XXpdDuMq00hkoLatTFu5NkT7IoaxVx36p80BDfymnrHmqW5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850031; a=rsa-sha256; cv=none; b=rHipMSJe/ieoB8YVljc6Qymy2F1184nJUmDxpmTPpoZWrHUyhC4H937cRPxBC63tRB+iAy Gsvc76rPWrlZsn5ouHHXKg72Cy4T7+veH8e/VopRN6mtsDJHp33XONv+WUCyiHBDaW8rUT meB+uVioTNAemdR9lpWBhR90i0OeRPjdgXVK7HmUsMhMlL0fG6sQMKVskbHHqABnMHpOai MAimZcgn6SRPj5TXqtKmVZehEsVWci6vnpHgcxfEEhztNdKDrCtfM5p2/36+WtsOrnFyZD EO+N/EojOj+rLMdWeaqLM+TOe7CeLN4I9I1ODR6XptyKrjzA5uRlXUlK0uurkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJtZW7CLZNVnbbDEwQI3/A+mMoqCKvPJtfEaLcEuUZI=; b=ohY/BQ4NuxIIDxF6hAnoxuMhNziTKfCyTw/W6B8DTs/XgWXZJtgtJeYP7P2Ux4qb9ehu5k qhIt8POE15NQM7ThJkG5BGa+vj1vVpzCscfHjuQkqyjXO+IPAbx5mn7bkuMEVAojg447F3 aECjLnkmwfaewbkAV+RC1TI+XqHPtR1Me5KWmWp9D/XnV5WioZxxgQ3n8K8P+BFWEfMpBC 5zK0l0G2ySP+141Suwa8nph6NOED7XFNTxvygbDA4/Wbsj7AXwyJhGujj+q0xzh97zG4c8 j7YJnF2K4pqbDP+KgpyssU+g1QiW8vo8zZIhsogz3gLYti1m2asbzBOhcMLWng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGR0hvFzJwB; Tue, 23 Apr 2024 05:27: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 43N5RAvZ016988; Tue, 23 Apr 2024 05:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5RABJ016985; Tue, 23 Apr 2024 05:27:10 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:10 GMT Message-Id: <202404230527.43N5RABJ016985@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: 4cea50b47df8 - stable/13 - arm64: Remove a double word 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4cea50b47df8dc1cddeed5237492fc3f4e256c1f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4cea50b47df8dc1cddeed5237492fc3f4e256c1f commit 4cea50b47df8dc1cddeed5237492fc3f4e256c1f Author: Gordon Bergling AuthorDate: 2024-04-20 12:06:53 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:42 +0000 arm64: Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 516e591db11a29c7bb3d8135a94530b27b94f91d) --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index 38005ec44c95..4e80ef66c7b7 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -61,7 +61,7 @@ struct qoriq_dw_pci_cfg { uint32_t pex_pf0_dgb; /* offset of PEX_PF0_DBG register */ - uint32_t ltssm_bit; /* LSB bit of of LTSSM state field */ + uint32_t ltssm_bit; /* LSB bit of LTSSM state field */ }; struct qorif_dw_pci_softc { From nobody Tue Apr 23 05:27:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrGS60Ndz5JTLt; Tue, 23 Apr 2024 05:27: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 4VNrGS1yKhz4kkF; Tue, 23 Apr 2024 05:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9Pt99olKFz9o9BFvtdYukKrRvps7fmLp6+XCf1F8K0=; b=jkJ1R3PGsvAd0FtVBvHjI3Bnubxki2LzU/x4VXGwzR+b59v7wxZ1QDUchDZRiWstOA1tW4 OiQNOYDxVVx8+mp1VAlf2pLxL4ffsWhZzMozmpB8ylBR0IWxjJR3WLLw1JIZLvfgVk/6Yf Dzu483D5NXAGkQLP+TjtEJIWe8gHvydJEYohf8Cj+1FO7BHz84NyalIsOo5b3o+coYr3u0 wnzNkhZhOxNBC2wY6Nuv1rul2cSgYDZshyBAjXOzl/m9plK7Ao0aj8luNag1YLdlj5gohJ /uzuS1FTY+8SPAztzFE4vK+aSSZkppFw2x3DuCutyxMw3MqJ2hZX86fVsxdzNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850032; a=rsa-sha256; cv=none; b=j8+uM7pmtDZ2KDAIjTTzV0PxylUn8Ie6MrO3KoUn0SDbHS9hbMniPd/SVZpChB8Ilo60Hd 17s7619S6xkTWs6uulcWJT6f5TUTAjhepyQ95XLkEvZQW/pR/QivgMMqSm9Yr5l2cjoB89 rRxDKdnX2JvOm+bqNpZLiKU/gsW//q6nyO4/yTWrUm7+P/f7favTTM+2ZDj2ieaTaUHC41 mpUty1ag/fDtQcg+2UMvabfTD197thP+NPENaO425yphpqHHoAXIz88MaPmF4rRta09Mrq r39bbpor7C80khtaClFLvqy7TSrjQ563s3ic1uiypEWYHs9NZsJwsgdvUQSBVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9Pt99olKFz9o9BFvtdYukKrRvps7fmLp6+XCf1F8K0=; b=o/tud+JlpRxT3+9kU3Pl4h/bSiUrYRiuGsc2G5GnlS7iBb2zqWuZr0s9AW2Rxh1I3jl1u+ qcAPRBwnJmeZE1TjgdU9WsmxkPK1ic98nthLIZ2lV+oaNMSOQH5SvTbAyFIZ0JnTotyWHY FH+zybkZFluVw4vQp/PgvrY8RZW0FiKn5f3e/R4Ooslug+ePpgXSgU2fExPt0Sw0WwGMov PdIhz3cAOc1jhmhlHBhMpCSZO1kQZCSPvfn+0rK41K8qFoWK6ay2kKxq+BS0b+U/3D0HX+ EdrbXproZqwrjuLbzRaKolxB+tLrMQ2sVvKdRAkJsHMcPDO5bS0QXc5R0yx4pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGS1V7CzKB2; Tue, 23 Apr 2024 05:27: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 43N5RCD5017038; Tue, 23 Apr 2024 05:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5RC5E017035; Tue, 23 Apr 2024 05:27:12 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:12 GMT Message-Id: <202404230527.43N5RC5E017035@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: 78de6a587cd7 - stable/13 - NOTES: Remove a double word in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 78de6a587cd7ebe8041e39f290f2023517cb4b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=78de6a587cd7ebe8041e39f290f2023517cb4b22 commit 78de6a587cd7ebe8041e39f290f2023517cb4b22 Author: Gordon Bergling AuthorDate: 2024-04-20 12:08:04 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:55 +0000 NOTES: Remove a double word in comment - s/of of/of/ (cherry picked from commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad) --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3b92c610283a..c688f7947123 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2787,7 +2787,7 @@ options MAXFILES=999 options RANDOM_ENABLE_UMA # slab allocator # Select this to allow high-rate but potentially expensive -# harvesting of of the m_next pointer in the mbuf. Note that +# harvesting of the m_next pointer in the mbuf. Note that # the m_next pointer is NULL except when receiving > 4K # jumbo frames or sustained bursts by way of LRO. Thus in # the common case it is stirring zero in to the entropy From nobody Tue Apr 23 05:34:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNrQn1kFYz5JTqt; Tue, 23 Apr 2024 05:34:25 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrQm41f0z4nn8; Tue, 23 Apr 2024 05:34:24 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1713850457; 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=kknUAAxE3vW4Xoqt9g2joOVL6nSts+K0zN7kBgvN78w=; b=DVR/16BKfandWWYpsWedYYYt3jjK5f3D3rvz0cZF62h5LwdAIGj91b2oTHZbt981diEb1s 2xPsg14LrUbF1uA/9vlB1dCoJ+6zDf3cdFQkhIdbsei1Es45aeIXvxauuZBNScFRBT2x8X KhOzpz2Z9VaeeMPc5ZVsJiLCY5kHnrs= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id c66585b1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 23 Apr 2024 05:34:17 +0000 (UTC) Date: Tue, 23 Apr 2024 07:34:16 +0200 From: Emmanuel Vadot To: lexi@le-Fay.ORG, Warner Losh Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 7209444a80fd - main - package: move cron into its own package Message-Id: <20240423073416.3d80f63230474c0f6ddf9099@bidouilliste.com> In-Reply-To: <202404230452.43N4qksG063814@gitrepo.freebsd.org> References: <202404230452.43N4qksG063814@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4VNrQm41f0z4nn8 Hi, On Tue, 23 Apr 2024 04:52:46 GMT Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7209444a80fd37de0e19c7cf93623f84709827e3 > > commit 7209444a80fd37de0e19c7cf93623f84709827e3 > Author: Lexi Winter > AuthorDate: 2024-04-22 22:05:53 +0000 > Commit: Warner Losh > CommitDate: 2024-04-23 04:36:35 +0000 > > package: move cron into its own package > > Reviewed by: imp, manu, Mina Galic > Pull Request: https://github.com/freebsd/freebsd-src/pull/1172 > --- > lib/libpam/pam.d/Makefile | 5 ++++- > libexec/rc/rc.d/Makefile | 5 ++++- > usr.sbin/cron/cron/Makefile | 1 + > usr.sbin/cron/crontab/Makefile | 1 + > 4 files changed, 10 insertions(+), 2 deletions(-) Something I forgot to say in the PR but we need an UPDATING entry to tell people to pkg install FreeBSD-cron as they will lost cron on a regular update. Cheers, -- Emmanuel Vadot From nobody Tue Apr 23 12:27:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP1bD73dGz5H8LY; Tue, 23 Apr 2024 12:27: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 4VP1bD5njMz4cBD; Tue, 23 Apr 2024 12:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713875240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPko+7xHlKKJO/qDmnGyLw5nT0z8IzYRhEqGts1+6XQ=; b=X6o9oLtjGD/gyLmvj4Kbzjg5qSFur86+PKHxOQRogNSIso0kdXsZ7xSg0WDAgbZ3qmroy3 zcteBmcjFpXB9KI1H+sEbKDLAe8LjWVcgE/m/TEPaZnOrV6t6zdxj3kSOjiaRAOQev2jmP qUU2iKNalNuQaFM4+ptuvsHq8b6VF1p6SHDhMuGRP4PhLMlvMYtDohandh5179u1R8EL2L DaEreKSnX02qdh6JqWYjkD6cTRcDJ3DTUQiQ1XPLoX5TimfRKJ7sS10KVAYRM9MkRtD0FD 4TZDD2j2hrMRlpjH1yVFiohct6lKywtevvpmb1+BtzT7VTYWVJ2z4pywG9Yvuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713875240; a=rsa-sha256; cv=none; b=XqBKWYyKDRHiyfsTXu2YO1ti4SUIjsNTLzVN92oap/YhjQxlFLuf4VZ8Z0T9eQXa4DnbOk /9uoNRGe08pPlVqNVfQBPUO+NKI7bQVRmSjWW0nQjpY+MwsHF5lCK3FQt6LK0VRgnzE0mt 9jznm0XRpnk7Q7LHGWQtBazkPsl8YNt/XdYAGaJ+oq7Hjh4QNpHhgc0JDf7/qti/atQbIw 4uzgYjvTQGBH75j8LFTY6gpbOkqjdQxetLfW2Atg1wvksLJEZ9xY9YAKsHPxCIPI52EWie pia95g/uzllwOAzpAttpIBOXVNVCpkOtsZFHTG6mT06L9X+L53Bm4EInhluewQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713875240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPko+7xHlKKJO/qDmnGyLw5nT0z8IzYRhEqGts1+6XQ=; b=oPHCuvbK2YGeM4I2KdPVEniO8jxthmnX1pjtOUdj/R7mucJ7Lh5E0zc1NZkHx7eEPnZCPG wCdLyJAvvWbePjYgFBQTegoBve+ZHN75flAzL1OUwaLs7NsnMYmeFRuSp+UAqZ/+UrA29D p0eMwd4qcDsDTm+3MIHzRcfavPnYgFNCHCZUe3wFoLCyis6pdj/1TkzUNfvYHTUhKEsdVO e38KhhNHmY/PGHabosAt5NDLP27tPDia5NBZkpLtaI9MKPo8vBuzhyPguqTzL+tVBqZHYS miOE8cTLri2fzRNNh3FDMQxvm2PRb64vm52W4r4VNf4DXLv3scoFNInTu5/0ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP1bD55qXzXXd; Tue, 23 Apr 2024 12:27: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 43NCRKtY030631; Tue, 23 Apr 2024 12:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NCRKnq030628; Tue, 23 Apr 2024 12:27:20 GMT (envelope-from git) Date: Tue, 23 Apr 2024 12:27:20 GMT Message-Id: <202404231227.43NCRKnq030628@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: 91d35fb663e0 - main - Remove WITHOUT_CAPSICUM build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 91d35fb663e0276abc4963ae559e4759ea929842 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=91d35fb663e0276abc4963ae559e4759ea929842 commit 91d35fb663e0276abc4963ae559e4759ea929842 Author: Ed Maste AuthorDate: 2024-04-23 11:20:59 +0000 Commit: Ed Maste CommitDate: 2024-04-23 12:26:28 +0000 Remove WITHOUT_CAPSICUM build support Capsicum is non-optional as of c24c117b9644 ("Remove WITHOUT_{CAPSICUM,CASPER} options"). `#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of downstream consumers, but is never defined in FreeBSD. Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42077 --- share/mk/src.opts.mk | 5 ----- tools/build/options/WITHOUT_CAPSICUM | 1 - usr.bin/xz/Makefile | 4 ---- 3 files changed, 10 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 2ea0cbf24268..3d3a1299fac9 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \ ZONEINFO_LEAPSECONDS_SUPPORT \ __REQUIRED_OPTIONS = \ - CAPSICUM \ CASPER # LEFT/RIGHT. Left options which default to "yes" unless their corresponding @@ -383,10 +382,6 @@ BROKEN_OPTIONS+= TESTS # Force some options off if their dependencies are off. # Order is somewhat important. # -.if ${MK_CAPSICUM} == "no" -MK_CASPER:= no -.endif - .if ${MK_SOURCELESS} == "no" MK_SOURCELESS_HOST:= no MK_SOURCELESS_UCODE:= no diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM deleted file mode 100644 index 19d821f6c981..000000000000 --- a/tools/build/options/WITHOUT_CAPSICUM +++ /dev/null @@ -1 +0,0 @@ -This option has no effect. diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile index e3cbafb0ebc3..5b61202a981e 100644 --- a/usr.bin/xz/Makefile +++ b/usr.bin/xz/Makefile @@ -43,10 +43,6 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common -.if ${MK_CAPSICUM} == "no" -CFLAGS+= -DWITHOUT_CAPSICUM -.endif - LIBADD= lzma .include From nobody Tue Apr 23 12:49:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP24H2yN1z5H9tB; Tue, 23 Apr 2024 12:49: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 4VP24H2PtPz4fyw; Tue, 23 Apr 2024 12:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713876543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpKRQnUZ7SsYVFsx5T8L3pZ6zYDpg3UzM143G0QX3cA=; b=XwSFcqx5RLlCoXGDFazxF9EJK4jzhSeQ94Ps2hslHnHnfm+d21yqvgodYqezhAhl/NcCGH LEvy7I8P9JFIXBUJ7P3VVEeOZP8U82YVnT1hIrpcvHzujsF/teN8574GTlCWb0bh3lK6PW afH/3BJ1KlZSVaKkxVEiKs99biZ948ITcB7V+XAgqmAvRkqwmyD3ZYzp2XyXOoiqens5Wt EY0ChSX9pZL9QAyqpi68A+BC1gHVMTmwAdykB0VXLqiiubJF7Dy3C1Yi0404Ssp2lXKQTG yew4qkXEXpJBtn/Ng/YOuErvqrqtuA10szeIEarb8k8LRaba6xArmCbgjZXfQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713876543; a=rsa-sha256; cv=none; b=OXu+OH6Yl8q6DlAaQfMopMSuZG5WT/neUevPofr3xoAMK1Do2kvuSmX5H4XfYt1OyB4QcG y4C5V9ZXTviqdVSKClgv5878PGcdZSVOY8Z7mR26pRL3lc57lkIOvTFtX5WqxCt3QBI+Qh GE4Ln6RWADOKj2bcrvyy61cKoWZOxmSJZcXrTeEGsjCmm+v7VA90ghGSomS0GtRwbWuCZZ a3b2bTyWe9QZdKOZS8PpCBNmQyDvpwhnM0tPYqdbBJFIGi4gF5XGKaGOuxR+2a6XZ7vxeF otinGCptq8eMyeBay5PtDyNMA4RjW0FfqTUj/7YcxDzTD08cG7GQfLiqw/PWog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713876543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpKRQnUZ7SsYVFsx5T8L3pZ6zYDpg3UzM143G0QX3cA=; b=fOEl+FDDf9CmYl+5UdHnhDXTZNwTKji2UgxfXrLDXzTutpJQckUcY4PauTpft7DN40ZKkH qBMyo9JGZGV5x02seCoa5rKTttGADdOPq3ZLHfzK+jTVll5Ld1fnjVfoDFnlPWI4RsOpcJ BsknvfH4u9NSwlVOGs+vFZ4S52oBWPzBhEbbvCa9WxI57+/2Ljib7h0tS9GUs/7RuABx6G W15bHpR1S52Skuf4hqrFBKbauuqU8WKQ6t/EVya+SueB39kIM5OEm0qYAFsKRtUoUzI9Dh ybXsSOn0FTCqsZf/vU8ZdqIORjwNq7Pg5UtIeF+IHGSPc8COSsG+36BIbUMNxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP24H2147zY0X; Tue, 23 Apr 2024 12:49: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 43NCn3Z7065167; Tue, 23 Apr 2024 12:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NCn3sk065164; Tue, 23 Apr 2024 12:49:03 GMT (envelope-from git) Date: Tue, 23 Apr 2024 12:49:03 GMT Message-Id: <202404231249.43NCn3sk065164@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: 4329887454b0 - main - src.conf: regen after 91d35fb663e0, WITHOUT_CAPSICUM removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4329887454b008e42e809dcd275a69f596b9dc83 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4329887454b008e42e809dcd275a69f596b9dc83 commit 4329887454b008e42e809dcd275a69f596b9dc83 Author: Ed Maste AuthorDate: 2024-04-23 12:48:18 +0000 Commit: Ed Maste CommitDate: 2024-04-23 12:48:18 +0000 src.conf: regen after 91d35fb663e0, WITHOUT_CAPSICUM removal Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 3f35e4146b52..7effd3f08ccc 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd April 18, 2024 +.Dd April 23, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -264,8 +264,6 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . -.It Va WITHOUT_CAPSICUM -This option has no effect. .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. From nobody Tue Apr 23 13:52:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP3TF0J7pz5HHxJ; Tue, 23 Apr 2024 13:52: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 4VP3TD6vWcz4mx7; Tue, 23 Apr 2024 13:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pzz9ps1/BzjifA5bayg7gyxfFfLxWJUfCn/f+mv4kE=; b=t6PZtbNYGhCkuPbFJejzBMWDoq2d7Xo1ppcDBUYIswDGAl//mrZ+uVFDEpkYjjBO46giAF h2Ohto7yDrBsp00PLWYvTzB8tSljdbmKc7PnDC2oKYGM121x2ka/4NZfz+eZJ6SSNn9q3B c/k3/aX+ODGgbC1wXbSp1wXgaOPQGaJeR9wRekkBpM6uBAAZst7ToD2dExVfEmsokpp0Cz ThPWlGkS+t41fmCLqmb7vF+zb35phzSaC+0M5GlbikZZn5GWWaM86FUhScNU2U85P2+iZo wvT6eESGz0RSkAkjMMblX+WHBK7GNYyQWX73yhmudjFIfYzcpzbUqTFvu63i4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880337; a=rsa-sha256; cv=none; b=k7e8E/wGSU1q2wE2caXZr35ptCuA0J4xMk7lCKEdrkrG/xsOds785ER1TrvvJXvLjMnUDg hzGZhZ6UjuUodyL58BJaQnCGDSb4U5IRMs+738e+8ZM7BRpe2DlIN05P667Mauy2WV7aTV 2nfKzDPW/ncd8QI8RwCY/9BHOgdgNd3mMEd9nvaA4lMiAhnUKxk+Zc3WQ17xExM3BNUsEZ qbZDUfRmpq+2NoxOBM6IkET5tjHSdoRxHTn0UEZkfp1Pz4+EMttfIfaeuCCxOCgMnDs2Ug zqxM5lw8t10jDlNv7jVgpI0zO43kKuBU6XmKa0Whpg/+j2He6503cjON0xTdxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pzz9ps1/BzjifA5bayg7gyxfFfLxWJUfCn/f+mv4kE=; b=T8SXUbd3yXX3NlogSn9vfxsqPN80nhOvHSBPr0q8szEeTetCyT8aNI2PHQod+QlTDPnSjk MiPsTFPcuMylkYF4zG1RIiVpQYzojuwKscm2cQCYOI5mOWVLaIUo/tXya4Wja2QsbsWrnK b9f2M9rWYYNT7BhzueUhLXPcN3iMGgeJU2MKHrmOw0g23/gBhgqpFkxau7Fj3VffmriPYl nwvXMv6uH5v5KiuIqkdluDBpVWbk3qnExWNiA0QZ0nBIIDZ6w/EVOTOeJ7duCK1v0ht4KQ 7EUNHznMA4XoYt1ZWgBDqQ3OtS41K+h6pjj/shCBRvBh7iODxDoWxrKIgnC5Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TD6WCrzZXD; Tue, 23 Apr 2024 13:52: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 43NDqGuR081993; Tue, 23 Apr 2024 13:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqGK7081990; Tue, 23 Apr 2024 13:52:16 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:16 GMT Message-Id: <202404231352.43NDqGK7081990@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: 21d1f73f886d - stable/14 - exports.5: Clarify that exported dirs should be local mount points List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21d1f73f886dff0dde314ead91f09526f6e23c08 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21d1f73f886dff0dde314ead91f09526f6e23c08 commit 21d1f73f886dff0dde314ead91f09526f6e23c08 Author: Mark Johnston AuthorDate: 2024-04-16 22:25:57 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:24 +0000 exports.5: Clarify that exported dirs should be local mount points If not, then in general the entire filesystem containing the exported directory is accessiable. This may be surprising, so try to make it more clear. Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44614 (cherry picked from commit 9d975e47d5a3638d4f575b2cf97e07bf22b53c7e) --- usr.sbin/mountd/exports.5 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index aa249c1a882b..6e5429886bd0 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -27,7 +27,7 @@ .\" .\" @(#)exports.5 8.3 (Berkeley) 3/29/95 .\" -.Dd April 7, 2024 +.Dd April 16, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -57,8 +57,8 @@ file system or the NFSv4 tree root for one or more hosts. A long line may be split over several lines by ending all but the last line with a backslash .Pq Ql \e . -A host may be specified only once for each local file or the NFSv4 tree root on the -server and there may be only one default entry for each server +A host may be specified only once for each local file system or the NFSv4 tree +root on the server and there may be only one default entry for each server file system that applies to all other hosts. The latter exports the file system to the .Dq world @@ -68,7 +68,26 @@ be used only when the file system contains public information. In a mount entry, the first field(s) specify the directory path(s) within a server file system that can be mounted on by the corresponding client(s). -There are three forms of this specification. +Note well that exporting a directory on the server does not guarantee that only +files below the exported directory will be accessible. +This is true even in the absence of the +.Fl alldirs +flag. +To provide this guarantee, the exported directories must be local file system +mount points on the server. +For example, if one exports +.Pa /home , +and +.Pa /home +is not a file system mount point, then clients will be able to access arbitrary +files on the root file system. +As such, to avoid confusion with respect to what is exported, it may be prudent +to limit exported directories to server local file system mount points. +When exporting ZFS datasets with the +.Sy sharenfs +property, this is auomatically the case. +.Pp +There are three forms of the directory path specification. The first is to list all mount points as absolute directory paths separated by whitespace. This list of directory paths should be considered an @@ -599,6 +618,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr strunvis 3 , .Xr nfsv4 4 , .Xr netgroup 5 , +.Xr zfsprops 7 , .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , From nobody Tue Apr 23 13:52:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP3TG3pVpz5HJ0l; Tue, 23 Apr 2024 13:52: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 4VP3TG1mk9z4nCb; Tue, 23 Apr 2024 13:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=Ja/YyBh008AV4lSFWaDb+1EnpY2BQwAXWRPGRwIP8VnlkVB0G4VjQc0cCvJ+OFHWCYeIqz VUdBF4zI68Wgz/Q6sYVG5dDDWuiO42aYof9HxwSlvhw75tXuX3zo4Lk4jftOF4RDoQvypJ QWmuWYfMtPRFf5ekjuLNvotsMrwX1t6VX5kuOZVkBcVAaCBb9ofhLeXuKa6E/kMDxwQVIP l94gsiiKp9k5GGcGA0+b3DUeztTixTsUbMqQA2oMa/JjKM6ijIIGmxqav2j2EBmjw6ne3c oDucOZiJbX1SXb2SdKCPp4TaBJ7vbztqBWqeQ53CIuHOaq5/LNGI0Ajol1uNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880338; a=rsa-sha256; cv=none; b=UxpS4hrqYHTw/4QNRuzMkeBgNIWpNXE1bXKgCtSLzlusHlMkTNiqYnftH/V8g6VGr/DtHD 5jQFdR9Jx1Cgsq8W5l9fx8lP5u7HXtlEQ443ergi7XghjwhgheIcZN51+GU/lTlBJglgTd hju4o8wuoJ9jkBpUq6QwBWql84HF9p+ZKxc3AHW9Gq/Bl24VrfwKXTEoSgSjfj6BYsAXhw sMpzp7abAGI1aFIG0H8D4s3ufGOhPXDD0cPCa8BKqkqcVIOcYMt+jdTW/fW329sOv3UxVn 1KUQTlhyvIJhf+zUkDG3zJHqm8rUmKULg/7B4blreMWJQPFBAHphd6OHhJbH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=amxyXMSwrIftFmtIzt3BmPJ2CJ/qGrwaW0q268R4A4kv3rPoCK6uo1CkpHJT1IdO4KjzzS GU9IcL2Rz40QAMOIHqRj02QeKhOt8f9bINPr9kSs7SUH08eQLbJFZgUpx/lAy+PG3Wx9vx 5zx83n6RsLEg+CZld/7pblvR6MSJmspHTi/fQu2K3Td/YE+Zreq+ZvUlsTetVyn3ZInJEK pwE+05OczV/moWizVALVZGGCPV6xQHkKzRU7cKlvGkVXoyLHvsZFxu+BHrmAF8LNKK5eA7 SLnQaa8DaH3/iuX+1F2SGVIVeKUJBfOajdEL2yvbFDr7NuK7tZPBdWNIpXxojw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TG0hNZzZXF; Tue, 23 Apr 2024 13:52: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 43NDqHi3082042; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqHAe082039; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:17 GMT Message-Id: <202404231352.43NDqHAe082039@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: 692106afb8a8 - stable/14 - graid3: Fix teardown in g_raid3_try_destroy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 commit 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Author: Mark Johnston AuthorDate: 2024-04-20 16:02:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:33 +0000 graid3: Fix teardown in g_raid3_try_destroy() Commit 33cb9b3c3a22 replaced a g_raid3_destroy_device() call with a g_raid3_free_device() call, which was incorrect and could lead to a panic if a RAID3 GEOM failed to start (e.g., due to missing disks). Reported by: graid3 tests Fixes: 33cb9b3c3a22 ("graid3: Fix teardown races") MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 955f213fa2f14d5b5e9b655d8922e28315eb9fa3) --- sys/geom/raid3/g_raid3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 721610cefbec..c2d05b48d80d 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2033,7 +2033,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_free_device(sc); + g_raid3_destroy_device(sc); } return (1); } From nobody Tue Apr 23 13:52:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP3TH4968z5HHLR; Tue, 23 Apr 2024 13:52: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 4VP3TH271yz4mxH; Tue, 23 Apr 2024 13:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM8ffUsOJB1SiNZpzSjAUNczsb0/v1tkYy5DFsoPFao=; b=nk/6ANpbi2yUCchoSbRhMISAva092I8o2NckTlPJmY0Kmj09Zb8SHmFNMy0+DNz05wud4O 7JZVMEJejXjKEryHcNx4m4V6yYIulFdQANq7dFfCCk+ky01X5WianErp0wRvgBexoIb4an pWlD7kLiLio5GlMzJIsGxDMD1v11IMRLQ7oOjEkS9jgzt8M611Nfnx5uGBLs9yVEBONKiA 8Okb1BIEL16NI6yF1iof2ZBCJjNkN6xBmY9zEVQzqK2JCZX5cGX9/+Q1ptHXo0bH7ODrCw 63uxu6mWQA4QC9L87JEriO2mB5xMW+wQT2rIJoKUDOBRrS3dj6REgwzeN4GhKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880339; a=rsa-sha256; cv=none; b=EChiFf6lec7hMH5uDQ6z3SDuqobPAk3H45nPloEUupxqCUX7DsG78LrPcZqM8qi0m23JNy glJbPTVhr8wcZM7bCayuQfuLDSRNfcHRsMx0mYvxbkrD/osxzEZRgJ1hO0e4/jJtjnqTN7 jC3svxJXiyPkQc3HK8OqEFJCvY2jfrkGsxcTVL8FVn4Yni8tWTy8rH7I0iz+5yMDaMsmGt 9TyELWp/OHHUG9viGMHmVIwLe4tu6DPwYNggtETBDO8cLJ5FEXB1m4Cq6jitcVe+dqbMTm jgrZKA25e2IwvP02Fn1xasK0/rwNiwv5sEqN9Cy3DTPIzlPuS+43TLs7NDcAvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM8ffUsOJB1SiNZpzSjAUNczsb0/v1tkYy5DFsoPFao=; b=gzID0AWyVf3cm2ITruX8kSvHjQNRrNyhSQfRJe3NDMHu5CTgGDpIg5psq1jc3c1sZ2sKQy io4t5ZZDHCh70vToNO5/ByLDYuev9uaNuI0pIaj9QFYe2mx1IPpc8mQnSLde2if9c/7nA4 6qXtu+fWBHn/uIvi3KHYtiuHZGZA8fEECdSce59t9974FE/0w8qI9r9zwVPPPjmPhvW1qU uP0F0FTFSkV1RrNqQjPl2DhRR0xFNjHu3h79Ziq3nufIBWkOYf7BKHqod2cficw5uSFE/x 9brN66qBYx8Ei0mruVlOBUWgDQz0tP15bpKBmFGPaXKCExtyrVTozpiP15lupg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TH1k7VzZTw; Tue, 23 Apr 2024 13:52: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 43NDqJ9t082092; Tue, 23 Apr 2024 13:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqJkR082088; Tue, 23 Apr 2024 13:52:19 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:19 GMT Message-Id: <202404231352.43NDqJkR082088@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: 60546b68864f - stable/14 - exports.5: Update an example to use service(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60546b68864f37618e3cf81ec15464a83d28dfa3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60546b68864f37618e3cf81ec15464a83d28dfa3 commit 60546b68864f37618e3cf81ec15464a83d28dfa3 Author: Mark Johnston AuthorDate: 2024-04-16 22:25:19 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:41 +0000 exports.5: Update an example to use service(8) MFC after: 1 week (cherry picked from commit 88d09ddea0111abd74579e5c3c4ed029351feccb) --- usr.sbin/mountd/exports.5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 6e5429886bd0..c3a6af5a9f0e 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -423,7 +423,7 @@ utility can be made to re-read the .Nm file by sending it a hangup signal as follows: .Bd -literal -offset indent -/etc/rc.d/mountd reload +service mountd reload .Ed .Pp After sending the @@ -622,6 +622,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , +.Xr service 8 , .Xr showmount 8 .Sh STANDARDS The implementation is based on the following documents: From nobody Tue Apr 23 14:21:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP46z409sz5HLQl; Tue, 23 Apr 2024 14:21:31 +0000 (UTC) (envelope-from gbe@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 4VP46z3Z22z4r2B; Tue, 23 Apr 2024 14:21:31 +0000 (UTC) (envelope-from gbe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713882091; 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=n6BXeTFQB5LbXToY4JUm8kdwWoAMIFR2M283UjQK6fc=; b=emMLHaV27g9O85yHOeSr3NJYtvXEae2d+vNmWYiAksi3iL1h3uPrrpJVDi3KULNUm6eHVK mfcbjo0gGk9tfEuYvYY2zhktG2M8YvPu4lOj64Bo7tdgosjrW5QOK4Md0TBNvfhhoBJohN QUfcuOJ/I1yuvkr0iPZZakApyKpfdX9HcRkLyR1kS1LCLLdN6KH6xTXP4s+k9YchukQfpD 4oEW8gRN53xjcXj0M3cE6rlf8hCtD82Dj3E7d5Pu1jkn4BkVrKDQk71dDjrpmkMaHHTMb2 j2VAI8F7Iwe3RjDQvQmuaSiRoXxOG3FEEf5PCQHtGbHTq4ziUCwLmIIUkiYMQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713882091; a=rsa-sha256; cv=none; b=yXDUj0vhGj31+FXuxR8NCq5U4QI8L9v12nw4gcyANLy+RIOIjVrIGxM+EXjcNfrkK25iCo UuoFTAfw2yFQ/kVjOvWyUWTRKi5TUoVo7CX82G2rRBAmietDk3R88GveEqWiruuQLcKoHD g/KQ0ultHfeyvglWFEbjcnJLnU6f4VIo4FzbNMO1u0IN1U0wjMHnaApRrwky0EZxMq3qlf NUUSZc+URSfPuihsZ9mQ2RPOPGNcEuD2QBmBdXPXuEjrLzqtHcqEIVQtuVJ7Y/vfs15THF R+HyLmUn4ahi86wdgZjkYie04YB0c3Uqz0Qj3O5WRxm8LtlXZzOBlSvHIvYhFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713882091; 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=n6BXeTFQB5LbXToY4JUm8kdwWoAMIFR2M283UjQK6fc=; b=wJvrTdTs3zuiZTp6kYPwj8OChD2r/R5EF00TYELXZRcdXt/F5R9EvvW+tYDlWh446V7PB2 7nU2ahR+wJy3ppIbHpMqH9EDchrg0yhkq1ddfUCnL3a6qciN5UnANP9iqhGSzNQ1s8MWL9 2elHDlrTcCCxaCSEG/39NnDf79aq7Ln6qYJc+SeApCt/q97QXKRZ64zAWSvf0Mi8838cdA OoMN34Kx5A2sst/aIj9xoFDakWqKGqfhHBYo0g/00QB0bSEhbb7IQnQskOsC7FTuGKOG+q s/31YBe91fPswZ329NC+p1au0GiHCU8JKLM6phlaDd4EhvhtxW5Epb5DTB5EdQ== Received: from localhost (p200300cb8707821becb918c29f154d1c.dip0.t-ipconnect.de [IPv6:2003:cb:8707:821b:ecb9:18c2:9f15:4d1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VP46z0KH1zb1g; Tue, 23 Apr 2024 14:21:30 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Tue, 23 Apr 2024 16:21:30 +0200 From: Gordon Bergling To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option Message-ID: References: <202404191540.43JFeDXd088443@gitrepo.freebsd.org> <86plujaklx.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PUq3DGEPkp19jxkN" Content-Disposition: inline In-Reply-To: <86plujaklx.fsf@ltc.des.dev> X-Url: X-Operating-System: FreeBSD 14.0-RELEASE-p6 amd64 X-Host-Uptime: 4:06PM up 7 days, 22:20, 3 users, load averages: 0.24, 0.26, 0.24 --PUq3DGEPkp19jxkN Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi des, On Sat, Apr 20, 2024 at 09:40:26PM +0200, Dag-Erling Sm=F8rgrav wrote: > Gordon Bergling writes: > > expand.1: Fix markup for the '-t' option > > =20 > > When viewing the manpage the '-t' option is shown as follows > > =20 > > -t -Sm tab1, tab2, ..., tabn Sm > > =20 > > with the markup '\&Sm' included within '.It Fl t', which doesn't > > makes any sense. > > =20 > > So just remove it. >=20 > You can't just remove the Sm, you need to add Ns before and after each > comma to do what the Sm was intended to do. This is why we have a patch > review system, please use it. I usualy always create differentials for changes, but I try to avoid them for one-line changes. I have tested various combinations for the .Sm usage, but I didn't saw any change in the manual page formating when removing the macro, so that was the easiest thing to have the '-t' option not advertising a none existing '-Sm' option. --Gordon --PUq3DGEPkp19jxkN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEYbWI0KY5X7yH/Fy4OQX2V8rP09wFAmYnw+gACgkQOQX2V8rP 09zWqAf5AdbDDc2359uTyAhHWEMTgBxdw0wMF7gL99vXHfPwdppd+YlIcdLUhQbw 7W+bxG3r9TzhlxF4ljJZxFfyQbYkMBptcCtnp6eb39sBZoFvRbFMC3LMA37VuvV3 Q/w3RNTC/M21U+g/TdniT9iWh1OjhLVmRuy//cKH1vWZ+zS+3XbMSKSwBcHhOLAB XoWOH0d5hAjTWnulHiFcTl2ehcrJa8b5KwfZE2z5Uld9Bz6ylY9q+YIuBZ3LGKu6 PQzRM2JLOpABXtP/oQysPT8R9MoQgRMghKcFjhnbFE4r7OlimIy7o9UEqkyJCMo7 Cnl1lKGiHzSUtJGHcuGorTngRqeWRA== =SRTp -----END PGP SIGNATURE----- --PUq3DGEPkp19jxkN-- From nobody Tue Apr 23 14:50:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP4mf4tvGz5HPd9; Tue, 23 Apr 2024 14:50:42 +0000 (UTC) (envelope-from des@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 4VP4mf2dFdz4twT; Tue, 23 Apr 2024 14:50:42 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713883842; 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=zL9d7fVFr56FM28bwJbGQpnWw5G03WHsUhZiu9xB6mA=; b=mLyqSoQQIzGry3OanjgxUIi5R4DrBXKLFeGVpJMTYJwePt2cupwoOwwUCgo6BDrWy0/Cd7 2CKy6YqAE8EORiQQ2sOfo4LX5LHtGWdVCGinpI6hATBYxI9WIDaChv9HjrJGCEn8ofGoHl 3fnMa3li1xc74jGoLeFCCtudDmN6phYA1z5O6a8GQgZkUN04FnoFEwkky3gGwkkBVs+j+6 O37sZB+wbcykvbJ5TCOBu2mYzLUCMmIrRFuWHIRs/10Hw/voZLoAeDSJlyw5VPeT94ff4S VDWc/NP4DCZYsfaSveX+RD9Xa0xws5ol+DYSuQK/lGsilGU3g81vX84EHQ12nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713883842; a=rsa-sha256; cv=none; b=wfP60Y/6G+fmJwjO2fYAoLzRftjSANz56Yj+yCC6baaiBN/AkbS4eAoISiCcYO5HF2LTGW zY7GVeXjAyt7b4lHEsNBbYm22nlv2rwQ+MifeGxLDlNLiXuxSxnILY3giY/mgmb98NH4d9 VJ39+AVqBuf2A0mPrB0m9YeICNznvETTxlW9orPtCNF8GDD+nu1x51dPAzH+m7AjvRVOUv rQSgJUUldPjWpRWkpi4/mWee6Wl1Cjdqx7suuiexBeXLL7Ykvs4LcTgCNL1RHXB3gPZHYr ilydJxrnZIaXB06+dHhZw7nrKdO/JZgm9ufQUDU5iDAZr5unFOTm/+n4UB6S8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713883842; 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=zL9d7fVFr56FM28bwJbGQpnWw5G03WHsUhZiu9xB6mA=; b=WZ06D3E5zWdc9boQDD5yY/VOtkxUfUg73cCtW8QEyBnGWoJSot2q7gJFeV40pmaeKAAFIy /PO1BJl8sdq6+8M20C7EZ8PHmmCeJ4UjSbrs2Zl35b18C0ikAEtoWu45pkuwkPGtaGCYqR 1wJnL4h7xhoD+3mtI6Eu+uUIVTpOwaC7S8pfMxcX0HR/mRzVKz7+irQJDl7bniSi4JwMzG mmW0xfT2/fR+vcNEIFeY2AXQtBy9eaqOo9zdxDJEGAb6JlfR78KaWqkW2gk7gKmXygPe7T 7B128/wsBloNMlwIj5LXhC0hopunQ1n4EYZG4XnVHtk0vBqmeOBH7YHZvolLmg== Received: from ltc.des.dev (2a02-8428-0993-f001-922e-16ff-fef1-acef.rev.sfr.net [IPv6:2a02:8428:993:f001:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_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 4VP4mf1DzSzbbs; Tue, 23 Apr 2024 14:50:42 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id E71EA1F285; Tue, 23 Apr 2024 16:50:40 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gordon Bergling Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option In-Reply-To: (Gordon Bergling's message of "Tue, 23 Apr 2024 16:21:30 +0200") References: <202404191540.43JFeDXd088443@gitrepo.freebsd.org> <86plujaklx.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 23 Apr 2024 16:50:40 +0200 Message-ID: <86h6fs6slb.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gordon Bergling writes: > I usualy always create differentials for changes, but I try to avoid them > for one-line changes. I have tested various combinations for the .Sm usag= e, > but I didn't saw any change in the manual page formating when removing the > macro, so that was the easiest thing to have the '-t' option not advertis= ing > a none existing '-Sm' option. Sm is used to turn spacing on and off, cf. mdoc(7) or even just the synopsis section of the man page you were editing. I don't know why it doesn't work in that specific context, the easiest solution is to use Ns before and after each comma. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Apr 23 15:52:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP68B6PtRz5HWFs; Tue, 23 Apr 2024 15:52: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 4VP68B5yQcz43gc; Tue, 23 Apr 2024 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713887562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFUpRIZ0mqJDNmouV7jvtfKy4b6rrAgq8kJ/Q9TmunM=; b=a/cEBxCI/JKVJGcaaLIb+KMtSAXnqL+oALFhj6LytLEYvdaU3nu6O98/Wal6PFdW11t1En NJLI83nrHysR0P9mnBbyEZ9iOe6qrPej1TtdOM39YFh/GC2ilUi175WsTHgZJlMFHolr+7 L4OdU8fvVGitZJ9qK1T8WJzUXhREI5Bv/oSTIpz/4idLXnQkDhA1EUDPM7oahlsaUeUupT y7hSA3jO04/zxCeILQKBhrOLSpFfNqyhGGaJgO8ppTqByVI0PyiQxcixwrWTs7ZCMw7r7R uTv3c/l+izhugUyQEj9ZFFqD9ncTNhNUEnZCd4HrG7jj176W98IHJuXBRiFi2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713887562; a=rsa-sha256; cv=none; b=sWzo5c7kgFH9Ixx7QD7+qtSw/6DCAadzGI/Hqh7AROdVdR1MtUWx65TrGvYs2fBE+e0wAe ygD6e2TM3/bhVUC23ZemTSR66sRtTqCRnjjdh/ggMCSZRFLRoP3QOFgERqb7sLaCSSdlN2 1jXdLpGBRg4ZojnPreO1Q93bn9CivChRNMqA+V8sFXE4v0B0i4tNowwfJfhwmSXINXolng ef6Q8r2zKTtjVbMW9cdU9XeZrPu6Q+KKkVSRo1s1oB725a4kWz0lCMCiwMFJzUCuDaY5HX zMO+Nha2oMLOGqbtfyWFFQrJjfD27YYWQMtznasDQPngj6dvwDAJKNw8sq3HOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713887562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFUpRIZ0mqJDNmouV7jvtfKy4b6rrAgq8kJ/Q9TmunM=; b=i6UBsHdFlOZx4PpwHCt+mhU/TiKULGCrEGYjOVd/hMoPwCX+R0UOIsP1SBy+1sRGQ1RsC/ LxmtJ8ncVgXHV7nUW99h9z4J+B4JPiPzEl9VWu/2B3NuQs+u60CwbFeNicPZV2Vj2nZFEr gcNAiNGNTh7J/K6SPK2GbHjMqIUaNChf+opVkDtPKMuxTlrgqKljVGHXlocRJ8tdvuuBsQ hdRNYgMzdA+13vB39PiCxkrkXsv8aGG5k86cw9zlWjk7kJeCJtsSMacnmJml7xs94bR2E4 ndbGpG49Nm9zNkRqe/3ke1nV2xUG9Ak2o89otxkF2D2TktKr6t2ldoz+r1gNHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP68B5FHDzdgg; Tue, 23 Apr 2024 15:52: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 43NFqgI0086987; Tue, 23 Apr 2024 15:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NFqga9086984; Tue, 23 Apr 2024 15:52:42 GMT (envelope-from git) Date: Tue, 23 Apr 2024 15:52:42 GMT Message-Id: <202404231552.43NFqga9086984@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: 96a2e036b709 - main - Update manual page references and macros to align to mandoc syntax List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 96a2e036b7095e819cc536b6145950b54dffb929 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=96a2e036b7095e819cc536b6145950b54dffb929 commit 96a2e036b7095e819cc536b6145950b54dffb929 Author: Christopher Davidson AuthorDate: 2024-02-09 03:57:52 +0000 Commit: Mitchell Horne CommitDate: 2024-04-23 15:50:54 +0000 Update manual page references and macros to align to mandoc syntax xlocale.3: Comment out reference to atof_l(3), atoi_l(3), atol_l(3), atoll_l(3) These manual page references do not exist. lagg.4: Change the reference for /etc/rc.conf from a reference link .Xr -> .Pa based on the context within the manual page it is used. buf.9: Remove .Xr entries from the file The buf.9 manual page contains a commented out .Xr reference. The 9 entry is a placeholder and has been removed for clarity. Reviewed by: mhorne Pull Request: https://github.com/freebsd/freebsd-src/pull/1114 --- lib/libc/locale/xlocale.3 | 8 ++++---- share/man/man4/lagg.4 | 2 +- share/man/man9/buf.9 | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libc/locale/xlocale.3 b/lib/libc/locale/xlocale.3 index daa754dfc473..3af7a38a76d1 100644 --- a/lib/libc/locale/xlocale.3 +++ b/lib/libc/locale/xlocale.3 @@ -166,10 +166,10 @@ along with the headers that expose them, is provided here: .Xr vsprintf_l 3 , .Xr vsscanf_l 3 .It In stdlib.h -.Xr atof_l 3 , -.Xr atoi_l 3 , -.Xr atol_l 3 , -.Xr atoll_l 3 , +.\".Xr atof_l 3 , +.\".Xr atoi_l 3 , +.\".Xr atol_l 3 , +.\".Xr atoll_l 3 , .Xr mblen_l 3 , .Xr mbstowcs_l 3 , .Xr mbtowc_l 3 , diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4 index b2ca5a02b4a9..4eaed2cf3a88 100644 --- a/share/man/man4/lagg.4 +++ b/share/man/man4/lagg.4 @@ -214,7 +214,7 @@ The following example shows how to create an infiniband failover interface. .Ed .Pp Configure two ethernets for failover with static IP in -.Xr /etc/rc.conf 5 : +.Pa /etc/rc.conf : .Bd -literal -offset indent cloned_interfaces="lagg0" ifconfig_lagg0="laggproto failover laggport bge0 laggport bge1 \e diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9 index 975a1bf2074f..ecd4a1487735 100644 --- a/share/man/man9/buf.9 +++ b/share/man/man9/buf.9 @@ -132,8 +132,6 @@ instantiated VM Buffers (struct buf's) prevent their underlying pages in the buffer cache from being freed. This can complicate the life of the paging system. -.\" .Sh SEE ALSO -.\" .Xr 9 .Sh HISTORY The .Nm From nobody Tue Apr 23 16:00:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP6Kb2sbmz5HWbt; Tue, 23 Apr 2024 16:00: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 4VP6Kb1StSz44DL; Tue, 23 Apr 2024 16:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713888051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U9N/QYudOD3gbv5fq8Pli4ZolVdNHPMDJRoq+C/kPxM=; b=r3O4yU167ILSQmLVvlN2IRzbi+3CE0dlNK1mumIb0dqcgdw0y84O+lJsYHZASp9mXBYZY7 UNns8f8emcV1vBB7A+pSI+4unuiogUC4eDWJbExsAz9c/nm6vvMgdUXzXxUD+CdK1dH9y8 bSS1O5HLiKV42ExgiRs4M+3a5zZSptGggQ/D9rB1iZ6Gw5D1CzNBJjkPFye559Po4UnyVs s0Ukx2jxPBb/wx3JKZZktpRakSZr8jemayF/pClONGmBXzYn3BpnLps6LYhl21lvZft21Z C0IrJOl2mN2YPCJTsCbyoFtgbjPMRvgHeDGxLeOPHA+sPquuJL9c14HlA8ufjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713888051; a=rsa-sha256; cv=none; b=ngLrQLpwDdBp2XuJs1pyoJp29H2Q1oBztwMoW0MLcD0Zd40P/9ZprzXcf8TKDUW2r+uu02 xBHZyNDkU5PzWWF5abyCKISvcHLVP+gnm9Z//TgawhB6m7OvfB5DBeFwm4MH57ocEWL6e7 zgzV04gvbNTxqkNWKQYlm0JN6DH0JqSRRB4hweoOul0Faf66YUYaJ7yUce2ogwes7tZVBM OcyJZfV64EZIeEloBfaV4f21RdXcbDIpMo8Fy4KVl4av36JtSogHGE9VScWilWAhvfmX+U bf/t7cZNyZV8ucUNX6pG0Swa69KY91fnWznAkEJtKDXOzMew6J3kqkzWVxJxyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713888051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U9N/QYudOD3gbv5fq8Pli4ZolVdNHPMDJRoq+C/kPxM=; b=IhWEcNebkz+S99K2Y+IgST37ahRrKuBC0XDWbqwtu8+AgOovQsl5+gaVNjPUV3+xAuCbfz tayN8c5U27f+4m34SZ+SJDaYE6umrMMJvz+QyrvT4KyCw0FbABpL0OZAfG8gtrvXMIFlhg /Onh4lMmlqlSZX+W4HfBo5qnOOoZOCJO5xZ2qwbRxBrrC0EtcmSGkiG9VSwvsB/dVbFmKF MzVn4nf8MqogX20WnIbinNlaVosQXiN+nnaXyQ04AYCghrTVcrJkMDWmJmyms9jQRLYedq RqmmJb++DmvsD1HUEUbW4lApfDEEXegjziIMYkTAr/7/QeJdoPhpZdwNbvja8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP6KZ6Xqzzdsc; Tue, 23 Apr 2024 16:00: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 43NG0oqu098782; Tue, 23 Apr 2024 16:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NG0ouf098779; Tue, 23 Apr 2024 16:00:50 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:00:50 GMT Message-Id: <202404231600.43NG0ouf098779@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: c5989febcc00 - main - ieee80211_vap(9): fix the title List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c5989febcc00be41e05b4b714bbfc6ea1359abaf Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c5989febcc00be41e05b4b714bbfc6ea1359abaf commit c5989febcc00be41e05b4b714bbfc6ea1359abaf Author: Mitchell Horne AuthorDate: 2023-03-19 22:58:56 +0000 Commit: Mitchell Horne CommitDate: 2024-04-23 16:00:28 +0000 ieee80211_vap(9): fix the title MFC after: 3 days --- share/man/man9/ieee80211_vap.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/ieee80211_vap.9 b/share/man/man9/ieee80211_vap.9 index e0c9760d8d31..ee811107f035 100644 --- a/share/man/man9/ieee80211_vap.9 +++ b/share/man/man9/ieee80211_vap.9 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .Dd August 4, 2009 -.Dt IEEE8021_VAP 9 +.Dt IEEE80211_VAP 9 .Os .Sh NAME .Nm net80211_vap From nobody Tue Apr 23 16:31:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP70h0RXQz5HZpL; Tue, 23 Apr 2024 16:31: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 4VP70h01zdz46cp; Tue, 23 Apr 2024 16:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713889876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhNGnw/S2QqkX6l53e2yCG/t8ywhu78kx5vk1eELCWc=; b=hk060D/PLk0oMAybLI9Enir7Ia5PwOyLNuJhJcAKWCSuFywfb2wgnBafrXuC8IU+i12jb2 nS3uSyr7UO+RLAYX7bHGkeP+sFdZTx/siVbGseDGw9TSPWhm1cwGjRC1UcPRBOUM6FwNWp wH9+YMY6U5gxjjEdqmuuzbFAjrbE65y4kJF/bspUcUL6eLmIkj4K0IgNb0hOJS3/p8C/p9 IY4pB/YQZHTJM35u3jSln1VNMM3efQBIwP2uG2AIafdHvTXSSWqYSTEZivW/yQnhJjLjSH aALWeeyRWdLTCjdZeUsm7QFzAf4qZVeq/UK26YJ1zrQ6oixPeDC1UzPq+MLb4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713889876; a=rsa-sha256; cv=none; b=ZTBe9cIOJQ6C33kG/FfVYHsTCq5zsc0t2H5FTxWPGPNNg0CH363YiW8P0B1agUqd8NPLGi HdMFhuxWztHGXa1kRrXVg+U40d1q6GLJVetG8Qzm72WaqRxblzbH9eV6vFmfpsu/LmY05Y AkopSRLHxINFxucChPTYvrICScGwbWaIvFxdk09i7xIOuJ1H2O4Uhs3IMgKIraA17ihYOq thYAhxPozq9C0HIjlzq4cJi7/mmTn2Y66T53fHEoWe7WUCz4OwQ0LXxKryib97feYZSLP2 8iWGVBJvP7ZCuCKP9pp+/VLyg2KWVlL4Qpyy2H9/XeYGgQpwCoGs5ybWnWnkaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713889876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhNGnw/S2QqkX6l53e2yCG/t8ywhu78kx5vk1eELCWc=; b=As0T5CV315xVII3LYh5DiZzFEWncnETvhYka0bS/xAAIhoQkxPiu71a6PH5G3fxOv+VsOq Wqs+SE1jrA63oJk/m45GJ3QYfA5H1W4T9WKR56Fa5PFf7HvX9BCVzshU+8Clw3cEVHkAOa 7YGlunKxiKteei9kitGv6nwU57gwIm2XPbzrx8uJD/JSm+ka1rf5CxqNf8BfrRR9FgOgGs NImi3Lk1TzniSQ7rbfL9sskz0ppMarkZIehANoTfBCw9KJkhpE6fvtv+RW1Orki/wz9BL9 kJlbwOpntt4y7VFfMzJkTs6Kz+wQCRR39Ys0b4yLt8BYzhdGRf1Amzn0LlEihA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP70g6lPfzftq; Tue, 23 Apr 2024 16:31: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 43NGVFfS047450; Tue, 23 Apr 2024 16:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGVFJn047447; Tue, 23 Apr 2024 16:31:15 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:31:15 GMT Message-Id: <202404231631.43NGVFJn047447@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: fcdf9a19893b - main - Support ARP for 802 networks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: fcdf9a19893b9b5beb7a21407de507f0ae4c500b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fcdf9a19893b9b5beb7a21407de507f0ae4c500b commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-23 16:30:53 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0c3ee5d7acc6..6a944276674c 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -45,7 +45,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 4b3d2a91d996..543e6a3922fb 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -682,6 +682,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband"; From nobody Tue Apr 23 16:52:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TC3Z9Gz5HcXM; Tue, 23 Apr 2024 16:52: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 4VP7TC33sKz486b; Tue, 23 Apr 2024 16:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=871OyYucLEf0d/STERroQYHPziIprfXy6l0E5/XTJ+M=; b=iu9idOfROcHtSU2aBLrtxRLNmm/z4/8iLtY04QBj813PUwBRsbqAihj5xeKcb3aUnEIgvH xs14MGGyZgwEcrv7h6Hh3Sb2wqWp0a05+ipGGLXsRrG9gzT1s9H8gvOJ/OPXIiS47DAirF gbdV+c99atN+Nab1gj0ab2RA55IdQH5gWzOAIgaETGzBMLJfKvEN0HK++lOOgA3oLHCUdY NoA7q0noTkjUIfwrpeFtM/UDr7SzAA+hLXGH9teozP/OlBN7uSWuT8uWeZpn3y8tB3wPPH yqnPGLi27mgfdnOO9mXi7vgE0/6v/cWNBeLksjfTIhHWAt1GHaHyWlZX4yvx7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891151; a=rsa-sha256; cv=none; b=ddhp+aOaJlKXPQMH4179LDi+Q5RwcjcrVBdjaNIVm+RXakWD2XOP1cJah9VQVr0hdD6REZ ZKShvx3Bxkz+doAkkLyszVnhvypPUxZ1tPj5GD/n9KWZ/p5Z5pzqeHQqoDU5E1xg+KnzzU PjpN/VSmdqnkFWPeZ+gjPTxa8TDPA2mhLLzN5NtRK1UgnaGfCAaA6n4PwssyUohOGvr/H+ bmdfMkzBmapgOJPioLUmUXbI7/iqp9hDy8h+w7jfXwphDnu6yF7WyWgTSumAAMTArNydI2 t1PDayZp0m/odllQlj6YEipmAB61zckeOriu8HjiOUUVlPBMIydg8ewPt2umsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=871OyYucLEf0d/STERroQYHPziIprfXy6l0E5/XTJ+M=; b=telsBagY4ZRCKnXzZEuyfqL+BdNukHZ5tq7BzUj5sIPB+apvodvFGbK4jOMdwnHbMbTft6 OgHyxtxLV6aaSogxtbOTRjjVVT8kJMcnGJisev+bBlrDaeQpwgA6RzkHo4tpXHday8Ta44 rZqbQD7xDyidrek7Bin78YgdgiqEWdFXiIvWiIHy0835sVMAV5YrELBg5ubdpIs20zH+0H NNPyO3kV5icAQRjlVWaIiSzY7tTKhS86kt4p7Qayj8qB+XHjPTDjOEk7mF6OHOCbAwC4UD 8kCQgHbaVm8YGxxa098qTDCyXE/rMfB88NQEnzGj4oCl0hRtlYHeizSsgNXltQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TC2gQXzgNx; Tue, 23 Apr 2024 16:52: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 43NGqVQ4087986; Tue, 23 Apr 2024 16:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqVk9087983; Tue, 23 Apr 2024 16:52:31 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:31 GMT Message-Id: <202404231652.43NGqVk9087983@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: 53e0938b0b56 - main - kern_thread.c: remove unneeded include of sys/param.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 53e0938b0b5619fa851e8550c2396bd8c440b7ae Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=53e0938b0b5619fa851e8550c2396bd8c440b7ae commit 53e0938b0b5619fa851e8550c2396bd8c440b7ae Author: Konstantin Belousov AuthorDate: 2024-04-19 14:46:08 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:03 +0000 kern_thread.c: remove unneeded include of sys/param.h Handled by sys/systm.h already. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- sys/kern/kern_thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4a9d1bc8a042..179ced38b715 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -31,7 +31,6 @@ #include "opt_witness.h" #include "opt_hwpmc_hooks.h" -#include #include #include #include From nobody Tue Apr 23 16:52:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TD5xRvz5HcXP; Tue, 23 Apr 2024 16: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 4VP7TD43C4z484k; Tue, 23 Apr 2024 16:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHiCc63xM+R3p0jWmDIEzRSoF1lMZMzKhMnMzKWnRSg=; b=F1tKUqd5HuEdX1LoupKuECPndZ9N1q63tFJfWAhN8QZpVbjXm24Mp8f5zD2YJezxA9dWZ3 cfKlyp3wA1+/A2z9pXwMGuEF/ng4MOo5rC729DKH1JdtbMwW7CTVZBUKLO0pg6gzEplGEI roqiZVhg/BDoyJVBR4SXxG4gPHHmBikBGIsP/nqJt2Mre5deM89YAseufNs3zopje4YDHb 3f2TDy3WjUVxpajy0TcuQmalcutTN24A+W5m1TIf3FVQqU0anAGUKAa1R2lW1folJUGg/d VlcabdUYFeP0i5dGe65OrKUOaRPw2iAZxjL+TxhlhKd4SN8vW4LsPmDDeZ97QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891152; a=rsa-sha256; cv=none; b=wPlnLjSrysKLFCHUZu7O30G4pmNkNcaYb0jQNe0N2/G/Zs31jkooOIf4Ktb6ehHRgaQ+qq 3oN9AdxxhndyGbcyR4KTNImEfF6iyBOB1U2rgCVVCL94DBF1PlD8lX+ZmhAYU52goR8sAr C7hg6kagA5JWPaPGlVuLf40RfAS0QOAOjL9IB2yghzGlGP8hAt1y2D+E6mggSNIZQI+9up HRAV86ryuIr7inrdqKJoo1YPw9WEXNAo8jZyTqtSyuBWE1gfdWA8vWfRW1U0mL0fZ6MJso MsmVCPYij3MjN8/nU7drnStKiiQndErjb08+xzOi/45cqlWgGJQWFE+aAaWoaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHiCc63xM+R3p0jWmDIEzRSoF1lMZMzKhMnMzKWnRSg=; b=lKp/404C8XhpKKC9gsZjqhsZoS9qVoUxVkJuknrFq7vgMZCkQjHgp4f2qGqcDpAkBlUYry CH+sIgtObDZ35Ddav0e4zI8z4o860zHNzqNBcalaKKRCx+brXhqO4iJLDWw9/J/cRZ5L05 TKFPrwp1lAQVjpGE4VddyLtGw4Npwgx/FEmFMdLM8Evu0PTwvkEZChzt07k9lsmpvP0ZkX 1UzgbNz2xFukIgNUfIeR0YPSGn1N35CJV8yYWO1oHM4jB+m5VjX7F5mY2NtNYeKDiRmcwM Pq7YrLNc4mspeSOR2oLJoJprdyk8NkFq2xIu10tQ8BvUbpopR+6WYBuZ+azxKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TD3g1gzfgH; Tue, 23 Apr 2024 16:52: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 43NGqWAP088022; Tue, 23 Apr 2024 16:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqW9q088019; Tue, 23 Apr 2024 16:52:32 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:32 GMT Message-Id: <202404231652.43NGqW9q088019@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: 2effad53b467 - main - kern_thr.c/kern_sig.c: remove sys/cdefs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2effad53b4676dcfe4da892cd72a9a235a9539d1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2effad53b4676dcfe4da892cd72a9a235a9539d1 commit 2effad53b4676dcfe4da892cd72a9a235a9539d1 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:25:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:05 +0000 kern_thr.c/kern_sig.c: remove sys/cdefs.h Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- sys/kern/kern_sig.c | 1 - sys/kern/kern_thr.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 11b3a3374a4d..a533460090eb 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -34,7 +34,6 @@ * SUCH DAMAGE. */ -#include #include "opt_capsicum.h" #include "opt_ktrace.h" diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index e2f1b6baca4b..5df5620842fd 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -26,9 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_posix.h" #include "opt_hwpmc_hooks.h" + #include #include #include From nobody Tue Apr 23 16:52:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TF5h3Wz5HcTv; Tue, 23 Apr 2024 16:52: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 4VP7TF4wwHz489D; Tue, 23 Apr 2024 16:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB683nGuWMuY+LbxhnqzRMA3/D1BNT5c0AQoaOWZjyQ=; b=kQP4oIbmip5kSPibQqSIV/RAwblDMlCnt0O5lgVWGHkQaKDD3vnOyYqgfkCmwfa67yMf+V gvq8ucn0ipHg0DMheXPL2RVEZIQl9stNxl+qdo8pcTdnX3ca5r/q4uUborIh6vlX/msMwG CuJW4AjNID2pMN+Y098nqnJHi921ickt8Q82mmx+QksLUvA8mZaEMbnA9cFiJZMlTlvhgp BIxQVOEsLsZ5maUkoYngSZ4EZ8KZzkkzpdu3wLEY2lIGKIR3dLIYtx0y8Ym7qRU0r2uNih Wdbaodd3O9r5E6gv0fsh9iKnibdoK3ceseNw3Q74e2norezmd1hhKzNwmQptgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891153; a=rsa-sha256; cv=none; b=xNiAtnHghjsCxpmtvIQZ7rNMyWDhHwJkYbc/Fb0u8wjWxtSZ4T67CJ2LgAN0cazG46kbhH JUfsKtJ0xVb2OqdO/kQ7IOs8Cv9oSlFV2tGTmNpTuIuiIm+RCNytOBXDLZLgivZGYdvW1y 3Rz5+km0a2+GRmDon73VnI/MB/9dRlLqr9PjX067uCFiTpjQLM/1YvEEKRV43McVjJz67Y rTQ1EYzfQ5qDy2ElHkcJ4cNQa7zuDbgENvyD8cCEPPHom6CgRu+W17HoESTDrkS2BbQ+M3 7nvHo3SiPd/IRtM8JgCr4KrApg/faRw0PfCyNKkHROXib6rmiXfZH+8A3yXghw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tB683nGuWMuY+LbxhnqzRMA3/D1BNT5c0AQoaOWZjyQ=; b=ihNPsXBeNinQ52pRZqXzJqytjY1w2FOTX92BOFZTiCarVwDx1z/fR5JgDLBFgtIMWJZGP1 Iu8zwGUC3V6SxtsOQXAnfHpMH1yZ5mJi6fw09+xurWalcZ0TO8yRO4sV4IUrYMMHtsH126 kxIPl9of3F2ZRmKh4ci4yg002dwRZXXnrAOMoL/7kSF2oRb5pCtzWKaac88wl5xUwFYHGQ 4RaIHt4HTFJJFt8Lz4ioaZVzijzcWKQ7VNfneOW2/LD4xg/k4qxljdXhAHTgrkHNhgYhCd 5Htb86JHedVzkxgT5LL0dNUVkG4rlJBacleFRVeibGdMW4eFVARtGPPC68vOWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TF4QVmzgB7; Tue, 23 Apr 2024 16:52: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 43NGqXFD088066; Tue, 23 Apr 2024 16:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqXDH088063; Tue, 23 Apr 2024 16:52:33 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:33 GMT Message-Id: <202404231652.43NGqXDH088063@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: 0c11c1792b13 - main - kern_thr.c: normalize includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0c11c1792b139baffbf74e5f1c6fe065708301cc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c11c1792b139baffbf74e5f1c6fe065708301cc commit 0c11c1792b139baffbf74e5f1c6fe065708301cc Author: Konstantin Belousov AuthorDate: 2024-04-19 14:27:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:07 +0000 kern_thr.c: normalize includes Remove extra sys/param.h, provided by sys/systm.h. Order the rest alphabetically. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- sys/kern/kern_thr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 5df5620842fd..0ab4cb5f7970 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -29,8 +29,9 @@ #include "opt_posix.h" #include "opt_hwpmc_hooks.h" -#include +#include #include +#include #include #include #include @@ -39,21 +40,19 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include -#include #include -#include +#include #include -#include #ifdef HWPMC_HOOKS #include #endif From nobody Tue Apr 23 16:52:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TH1FqHz5HcMh; Tue, 23 Apr 2024 16:52: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 4VP7TG5pbgz4875; Tue, 23 Apr 2024 16:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPxgEIbd6gSpTls4ab0knQ6/mkxv+VewSBVLqcZlaWU=; b=CCShln7ASYXMsPPFMSzBjnseemabL7hx7INsQ/UjcD2Tr/2TZFgqkgQUhiCe3jnx/P9qpy VCK5N4eo9IEGiOsL969UC/3q0AZtkRofq6hCt994MuE+91W/8gF8tzRm8lyOhJfOA6WCuI eUTiHyY0XK8xLsuCyIL9q6FMml2KkS2WFmVCva9EaJxgJctq+pihP6U336LKY/0/RLxSZB LA5WmfRQrx7qLpJdqpWMeDGn5rK9fNMarWlkpfo45b38GuwzDE5zXk0xNB/Yf7WgoEfBkF /eeF0pNsxd92YWu2CiaFz4nx6wzOSHL6KqLAW5MEBaRlXbua9Sh6asmSY6kPlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891154; a=rsa-sha256; cv=none; b=U9cJlP3pk8uvpiSYonGJqlUh4ltFlAG7q9svCDKJgeKrcTscVztpCewV+MWOyVOgh8+GIN nsPLt40F8n7gdW4AqWzhs5Vi3ZgjhadhQCp4Ra0XFUB/jW1bxiv4xbFFv/yY448CAaW1KB rMx7dVHjXv9jG61zHCaifU+trr6u6WF7y2CnsE0GQV1SBrdJBEJKX8UUur21Qxx01GnsV0 RzyexsZRz6+o8++PHJdvzWzNV8HmOjrYFfLsK/7j3HuSgNqISyex7Ci6VAkyX53vMYo3Lc sJiDFOXC9mW80DgHCoKObEGR5O+2tf3hxqGJbIWdHgX6LuXc7/DfPqsvCZ7Ztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPxgEIbd6gSpTls4ab0knQ6/mkxv+VewSBVLqcZlaWU=; b=ClM7tjqRMnSH2j17Rc4KNiXh83jY1i+aWMbDtd64/rXaEqbYo8soSKAPKxgGzSk6KhiQBV 1e6ua59R7ZAd6HRXRgYdfUqAotoRWXGjpGy38L1Xfij8tU6hRA20xB4JL6VpYuxWvYvg5O wt4k4xgQ7xFWASPCao/GkLw5WZIhvJipbqTNt58KBtqCKREAFPM08CBSKhv/4sQEanIqno GyUeTL9HXeNF+/DH8vOGAzM3l3fbq93+TPFJHG3m8SARMxXCxTfArE7f7XpXM2fDwOa3O6 qVMfyy4XIQciWxh1BUelxJ2pJQ9mzTB5Ab4fhUtqo/LaVL4Np1PASgS7jkLBuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TG55hqzgB8; Tue, 23 Apr 2024 16:52: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 43NGqYm5088111; Tue, 23 Apr 2024 16:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqYxS088108; Tue, 23 Apr 2024 16:52:34 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:34 GMT Message-Id: <202404231652.43NGqYxS088108@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: 53186bc1435e - main - sigqueue(2): add impl-specific flag __SIGQUEUE_TID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 53186bc1435e2c3ccf9c2124c066a08c6a80c504 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=53186bc1435e2c3ccf9c2124c066a08c6a80c504 commit 53186bc1435e2c3ccf9c2124c066a08c6a80c504 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:29:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:09 +0000 sigqueue(2): add impl-specific flag __SIGQUEUE_TID The flag allows the pid argument to designate a thread from the calling process. The flag value is carved from the high bit of the signal number, which slightly changes the ABI of syscall. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- sys/kern/kern_sig.c | 22 +++++++++++++++++----- sys/sys/signal.h | 4 ++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a533460090eb..7ac9dcb8cb40 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2012,13 +2012,16 @@ sys_sigqueue(struct thread *td, struct sigqueue_args *uap) } int -kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) +kern_sigqueue(struct thread *td, pid_t pid, int signumf, union sigval *value) { ksiginfo_t ksi; struct proc *p; + struct thread *td2; + u_int signum; int error; - if ((u_int)signum > _SIG_MAXSIG) + signum = signumf & ~__SIGQUEUE_TID; + if (signum > _SIG_MAXSIG) return (EINVAL); /* @@ -2028,8 +2031,17 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) if (pid <= 0) return (EINVAL); - if ((p = pfind_any(pid)) == NULL) - return (ESRCH); + if ((signumf & __SIGQUEUE_TID) == 0) { + if ((p = pfind_any(pid)) == NULL) + return (ESRCH); + td2 = NULL; + } else { + p = td->td_proc; + td2 = tdfind((lwpid_t)pid, p->p_pid); + if (td2 == NULL) + return (ESRCH); + } + error = p_cansignal(td, p, signum); if (error == 0 && signum != 0) { ksiginfo_init(&ksi); @@ -2039,7 +2051,7 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) ksi.ksi_pid = td->td_proc->p_pid; ksi.ksi_uid = td->td_ucred->cr_ruid; ksi.ksi_value = *value; - error = pksignal(p, ksi.ksi_signo, &ksi); + error = tdsendsignal(p, td2, ksi.ksi_signo, &ksi); } PROC_UNLOCK(p); return (error); diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 068a7e7bc6da..690cab414e9e 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -475,6 +475,10 @@ struct sigstack { #if __BSD_VISIBLE #define BADSIG SIG_ERR + +/* sigqueue(2) signo high-bits flags */ +#define __SIGQUEUE_TID 0x80000000 /* queue for tid, instead of pid */ +#define __SIGQUEUE_RSRV 0x40000000 /* reserved */ #endif #if __POSIX_VISIBLE || __XSI_VISIBLE From nobody Tue Apr 23 16:52:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TJ2SVGz5HcdB; Tue, 23 Apr 2024 16: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 4VP7TJ0t4Tz48vp; Tue, 23 Apr 2024 16: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=1713891156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5X5orykgk5Zd919uzUWBCuD7vScWmfgkK1sj2IAakQ=; b=IUUepOUZTRX6ErBBXTdmpczQQgndLLVS7YK+ANA9B40fcA4vG9cUU4T7+XNHI7DaKgL88Q mAoWWAchdBQiZTZuAF2h6IYRahlrma2sTqdhCTPLKihXiGSYivBjAaqvVsot7bD+rP7aKI wZ2ibMdAcsPCtIT92ww62/Fht6Xk2tagdXy1SdxLn7u2rNFSHpAWgzKBo3PeCvv6eBRiil OXfhm0A5+osa3hJI3T0MujXHbLLg6gGbu4+skVdKXEJuWZS8GxsgYv8wLOob4ysAY8UllE o9j5YL0nWuydknj2hAV31/7O3saBlnZYCvuh3iV+0slWX0xpJ3NDXN5pOFwP8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891156; a=rsa-sha256; cv=none; b=XcvZWclJLRrdOfiFPevLAF49jLQ9qr/z3ecTJV4RHM5jWd1qwySXrqMZfVNBM3XyBkU3Dm FevNu9m6X8hLJIfT7TASdleGpH15llW4vTl+JYCo1CBepj4nBvjhtLBTZwlXgq/hNpYLKM Ioc9S7ByHDFjKgB+eD7daCNRKZT4kWo4dRrOAYgDlFwxMmiiWfCaB1rOcpsnKzZLPEQ6UY Vn/qH8n6xjnOmLDVm5BTl3K7JwTwB1B8M6oqOOnomNbnMULGz5DNgX3T93mlNvwdxyPe/z xahYO+Y8I0Ecbtf78psNShofmJMEEoPeWwDNH91fzwAN7Szd9EUkhSPgufgHYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5X5orykgk5Zd919uzUWBCuD7vScWmfgkK1sj2IAakQ=; b=cg7jSN5/xEhb9KdSS6cICjIXpDyiyOSxAGpNRMLx6s9YwliSU8972HLgIORSwGxQ9HqbFx Ierlk7hWpP8SaMnhR43x5Es7dtVWqESMX0UhDAicfVQw7tb1YRZwL3EpORBELmUkiyflnZ v4quY6OGw2Do8S9ZI/DA8sFNzqRew4btf/bpmW9UrlS22i26SRbZWrA0lAfyyTjqxESs7n p1EU9watT9UWsMhJYtV/u9YsHo51r3igKnQ4oB1IJ/ALwkTcvOjOYXD9koFWyqkUq+vIvw Hrlu6Pq1gFzI1MwBKYz3RzDli67c3FPn7B8Ajq7ER9tk2wUddSeCgFnWngHWOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TH64lbzfxr; Tue, 23 Apr 2024 16:52: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 43NGqZxx088156; Tue, 23 Apr 2024 16:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqZjS088153; Tue, 23 Apr 2024 16:52:35 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:35 GMT Message-Id: <202404231652.43NGqZjS088153@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: dcc180c51b9c - main - sigqueue(2): Document __SIGQUEUE_TID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dcc180c51b9c13df3d1158d14d450308711fe93c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc180c51b9c13df3d1158d14d450308711fe93c commit dcc180c51b9c13df3d1158d14d450308711fe93c Author: Konstantin Belousov AuthorDate: 2024-04-20 21:58:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:10 +0000 sigqueue(2): Document __SIGQUEUE_TID Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- lib/libsys/sigqueue.2 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/libsys/sigqueue.2 b/lib/libsys/sigqueue.2 index 5b154efa20fd..2fac63610ac7 100644 --- a/lib/libsys/sigqueue.2 +++ b/lib/libsys/sigqueue.2 @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 5, 2017 +.Dd April 21, 2024 .Dt SIGQUEUE 2 .Os .Sh NAME @@ -96,6 +96,19 @@ be selected for delivery, it is the lowest numbered one. The selection order between realtime and non-realtime signals, or between multiple pending non-realtime signals, is unspecified. +.Pp +As a +.Fx +extension, the value of +.Fa signo +can be or-ed with the following flags: +.Bl -tag -width __SIGQUEUE_TID +.It Dv __SIGQUEUE_TID +The +.Fa pid +parameter is the thread identifier of a thread in the current process, +and the specified signal is queued into the specified thread' queue. +.El .Sh RETURN VALUES .Rv -std .Sh ERRORS @@ -122,6 +135,10 @@ to the receiving process. The process .Fa pid does not exist. +.It Bq Er ESRCH +The thread with id +.Fa pid +does not exist in the current process. .El .Sh SEE ALSO .Xr kill 2 , From nobody Tue Apr 23 16:52:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TK1mHVz5Hcb2; Tue, 23 Apr 2024 16:52: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 4VP7TK04qxz48tf; Tue, 23 Apr 2024 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGf31jmc61w56+NKk0e6gn+/AFHOTvDHE3kDdYARYtk=; b=BLeuiYTlRUmrVUmo2+JqH2fRAAcfOA/4s9a53+eYfU0KSyWJ9C0I90IBQxFkvTgwfup3xD ACMbkfUnhmWQW+ipuxdMjSS1mqBoBQI0lap77bQjmGkolrYQDmnG7Wak2KQh9CJ6xaPOrz m6ITZbOAB9d0Dv/DiZoDGPz81HVqELJ+siWq2Tt15styGvbLHoR+fswyq2OXLoyNYPk5qx NpWsgN6Fx1ToNENzhBr7vJKKyPc3NXqMlhSa+aHo6a/by4fgErgvT1xTOGn5EA6sb74wZU s3dYFdfdFJP39OG1Em43OgQQ7Kdd2MAkBY3RKbXUhKRBBy0ccGIra4TjciCiPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891157; a=rsa-sha256; cv=none; b=II7MIH1a+0lCOfZmgiQPtlwiF5GpekkDyo9BbGQy8xcH+WNovZkMFKos4BbXN+TUMPI4Vx fX8usNjE8a0cMDBkKmWl7GhBF0hvJdkrk9Z1DoZuVHXemGc1xecrw/9oJKFTAv4sMGc2bz RYFg4+dXztTyJS45pk5GqwurzAts/V/7SYALMQGgGMfjoKyvGXJQY7yJT8zG3BiaztStAt AXK4x6o+NmxwwvtLBogk5jLitk+47YGpLjUxlAetIBUV3gMhce0EVDb6yvEdjbAw/0OSuS ArZTBMdcFaljsQbh7ysbnXydHzLFvcKBLjP3k6Pfsc2k5trdSoBS7PnxzN6XdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGf31jmc61w56+NKk0e6gn+/AFHOTvDHE3kDdYARYtk=; b=Y05sFespw2tlpeeEPthwHjG7OTC5jRZ085BvwlAlvIYO91BMMoD6pt8wAf/BJ8hYdvy5dm uFij9XHtGyJXNWdDMbqAnE+0lJNYdkphhWrvgS5r86n2aPdsqNXTT/ON6rnCHU5b7I1kmY FAhHwt+gPXkRD/Y8wcR3j8ulM7R/CCemCpzZWTo07d+Feh6MHnB5oLakkEBRpPomAIsF6d 9aScQKr69R/lWydQGqLwBwqn7laHpf+Qj3zXSFutWHquxmUQJl4ZUACIGVXaHaSkDKtv+q xZb6hq7vUw+8xlFgm0mDORzJQk43Ue0c7/Q6wLDZRG/9B87gznLMW1GKkiC2Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TJ6njxzfxs; Tue, 23 Apr 2024 16: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 43NGqacJ088210; Tue, 23 Apr 2024 16: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 43NGqaFZ088207; Tue, 23 Apr 2024 16:52:36 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:36 GMT Message-Id: <202404231652.43NGqaFZ088207@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: 97acb35bd704 - main - sys/signal.h: move union sigval into dedicated private header sys/_sigval.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 commit 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:57:51 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:20 +0000 sys/signal.h: move union sigval into dedicated private header sys/_sigval.h Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- sys/sys/_sigval.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/signal.h | 22 +------------------- 2 files changed, 62 insertions(+), 21 deletions(-) diff --git a/sys/sys/_sigval.h b/sys/sys/_sigval.h new file mode 100644 index 000000000000..b25a88b9bd71 --- /dev/null +++ b/sys/sys/_sigval.h @@ -0,0 +1,61 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1982, 1986, 1989, 1991, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * 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. + * + * 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. + */ + +#ifndef __SYS__SIGVAL_H +#define __SYS__SIGVAL_H + +#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500 +union sigval { + /* Members as suggested by Annex C of POSIX 1003.1b. */ + int sival_int; + void *sival_ptr; + /* 6.0 compatibility */ + int sigval_int; + void *sigval_ptr; +}; + +#if defined(_WANT_LWPINFO32) || (defined(_KERNEL) && defined(__LP64__)) +union sigval32 { + int sival_int; + __uint32_t sival_ptr; + /* 6.0 compatibility */ + int sigval_int; + __uint32_t sigval_ptr; +}; +#endif +#endif + +#endif /* __SYS__SIGVAL_H */ diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 690cab414e9e..113b5aaa9fa1 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -41,6 +41,7 @@ #include #include #include +#include #include /* __MINSIGSTKSZ */ #include /* sig_atomic_t; trap codes; sigcontext */ @@ -165,27 +166,6 @@ typedef __sigset_t sigset_t; #endif #endif -#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500 -union sigval { - /* Members as suggested by Annex C of POSIX 1003.1b. */ - int sival_int; - void *sival_ptr; - /* 6.0 compatibility */ - int sigval_int; - void *sigval_ptr; -}; - -#if defined(_WANT_LWPINFO32) || (defined(_KERNEL) && defined(__LP64__)) -union sigval32 { - int sival_int; - uint32_t sival_ptr; - /* 6.0 compatibility */ - int sigval_int; - uint32_t sigval_ptr; -}; -#endif -#endif - #if __POSIX_VISIBLE >= 199309 struct pthread_attr; From nobody Tue Apr 23 16:52:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TL4Ndsz5Hcb3; Tue, 23 Apr 2024 16:52: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 4VP7TL160nz48vQ; Tue, 23 Apr 2024 16:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ku3mgbf6f+GOCSTCVV2LULmgeweBeWYdEhlJ5HFtf/I=; b=W+nytnbAzblldr7p54OZNKI+GG2MIIdNqnSnaBZkGO364U8MttosegXDIwH+G9nXEyfCSt I5JzySz1azab3QNd775MwqtF7+Tf02vEK8YnLamGYr4qThKqT4189s6698PW66xF41Jv4W 3nfsQB+Atz6y+O13dJem9MPWowHtJ+IaRuAy5Qltu+AoOq8t1dj/TKnFMPCU/Fufcbiw5+ 0QQL469B3N0X6i0LoentL+XXfBRmU/cbeN/ET6hjng2uDb7cGJLbzSE/yVnFXU6r8MRN4/ HwfFyh62WI9eyui7tkcXWD8/j+70v0ghfZxEJik+Pj+dOamK5RAOQowc46jt1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891158; a=rsa-sha256; cv=none; b=n221rUQWMUvG+ByasFvmcS9NrIQeLmIrxYharBunW+eY/BiW5WQsyaGzYzcAzKtKyBP+2g U2329lmcso04QP0dpus3zgqtfOHJ7Nqk2vGFnrebgj4gmcz59GMLjmOMmZt8jQXY6OVB/C y8GnogpcvDCNldLKyLjfsgJ8nyay7Mx6cLseHkY4FOsygwG8EGtXF/DIZ6/q4uzkOkk8c5 3DbHPf+q9dfJpXjBoFSN3wQgvaqn+1jk6gfQ9rmpEnXslbJnbMo8bCaJyX0X53y6pFh+oD LtjfCDhI8+ecm1BE1vgQHqkoRfuTnIsIrD88bK2FIg3LYqpUaQWqCFdBOs6FGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ku3mgbf6f+GOCSTCVV2LULmgeweBeWYdEhlJ5HFtf/I=; b=UHSnX3PKRAUN74Fk4lgolEnaZmjNsGNMaZtqsJ0cp6f46rjE86A/mmtAz3ZZ3JzspvjkIf vO20Wzu9R7tDWbqfiTauN7wPDX79pyrawEe2Yywgo4FRdKAzo3dUFtjEkr5Gz255JzFvHU gCwuVFTNEyf6lEmzytNxY6qAqaWon/hhyt01gxXuL3TlrgagRqSEkZxesDG21Ct6+OQAQp NWbr9LP8N1mvnJCxtUSQx40X4Jrcs/KTFtX38t9+k1xnI3PIjKVGTTjk+huxQBEhTMxqSp ToHuFlqvWdFgoxdiAeUZ3ArPGxBBYWRuPaWsgzVkWvr4yHvobj6yj6i11C448A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TL0gbczgBB; Tue, 23 Apr 2024 16:52: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 43NGqbRZ088246; Tue, 23 Apr 2024 16:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqb1C088243; Tue, 23 Apr 2024 16:52:37 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:37 GMT Message-Id: <202404231652.43NGqb1C088243@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: 220aa0f45040 - main - libthr: add pthread_sigqueue(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 220aa0f450409948b869237e5c4505f992c913ce Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=220aa0f450409948b869237e5c4505f992c913ce commit 220aa0f450409948b869237e5c4505f992c913ce Author: Konstantin Belousov AuthorDate: 2024-04-19 14:40:40 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:22 +0000 libthr: add pthread_sigqueue(3) PR: 278459 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- include/pthread.h | 7 ++++ lib/libthr/pthread.map | 4 ++ lib/libthr/thread/Makefile.inc | 1 + lib/libthr/thread/thr_private.h | 1 + lib/libthr/thread/thr_sigqueue.c | 79 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+) diff --git a/include/pthread.h b/include/pthread.h index feb094c39fce..311211cb48f1 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -43,6 +43,9 @@ #include #include #include +#if __BSD_VISIBLE +#include +#endif #include #include @@ -302,6 +305,10 @@ void pthread_yield(void); int pthread_getname_np(pthread_t, char *, size_t); int pthread_setname_np(pthread_t, const char *); + +int pthread_sigqueue(pthread_t thread, int sig, + const union sigval value); + #endif int pthread_mutexattr_getprioceiling( diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index aa9abb7e6114..f75ef4c9135e 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -337,3 +337,7 @@ FBSD_1.6 { pthread_peekjoin_np; pthread_setname_np; }; + +FBSD_1.8 { + pthread_sigqueue; +}; diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc index 33b95e9dd76d..c75322d6be95 100644 --- a/lib/libthr/thread/Makefile.inc +++ b/lib/libthr/thread/Makefile.inc @@ -47,6 +47,7 @@ SRCS+= \ thr_setprio.c \ thr_setschedparam.c \ thr_sig.c \ + thr_sigqueue.c \ thr_single_np.c \ thr_sleepq.c \ thr_spec.c \ diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index e590fb0c1e7a..f89941f96c78 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -1102,6 +1102,7 @@ int __Tthr_mutex_lock(pthread_mutex_t *); int __Tthr_mutex_trylock(pthread_mutex_t *); bool __thr_get_main_stack_base(char **base); bool __thr_get_main_stack_lim(size_t *lim); +int _Tthr_sigqueue(pthread_t pthread, int sig, const union sigval value); __END_DECLS __NULLABILITY_PRAGMA_POP diff --git a/lib/libthr/thread/thr_sigqueue.c b/lib/libthr/thread/thr_sigqueue.c new file mode 100644 index 000000000000..6f7ad8c63bad --- /dev/null +++ b/lib/libthr/thread/thr_sigqueue.c @@ -0,0 +1,79 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1997 John Birrell . + * All rights reserved. + * + * Copyright 2024 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * 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. + * 3. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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 "namespace.h" +#include +#include +#include +#include "un-namespace.h" + +#include "thr_private.h" + +__weak_reference(_Tthr_sigqueue, _pthread_sigqueue); +__weak_reference(_Tthr_sigqueue, pthread_sigqueue); + +int +_Tthr_sigqueue(pthread_t pthread, int sig, const union sigval value) +{ + struct pthread *curthread; + int e, ret; + + if (sig < 0 || sig > _SIG_MAXSIG) + return (EINVAL); + + curthread = _get_curthread(); + ret = 0; + + if (curthread == pthread) { + if (sig > 0) { + e = sigqueue(pthread->tid, sig | __SIGQUEUE_TID, + value); + if (e == -1) + ret = errno; + } + } else if ((ret = _thr_find_thread(curthread, pthread, + 0)) == 0) { + if (sig > 0) { + e = sigqueue(pthread->tid, sig | __SIGQUEUE_TID, + value); + if (e == -1) + ret = errno; + } + THR_THREAD_UNLOCK(curthread, pthread); + } + + return (ret); +} From nobody Tue Apr 23 16:52:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TM6Qndz5HcXZ; Tue, 23 Apr 2024 16:52: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 4VP7TM2XcPz49Gj; Tue, 23 Apr 2024 16:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR8ST/cnlBvaj6SORULJuz+/7VCbZrq1+dPQpJbKnhs=; b=t1Q4csbDda0RHmA4amJvAbouXEYmLW0eHYutUwGRUE/LgZBp80/7KW4gaSdNI2OzEeC1ok FYcYHltKd1D9s0Ax+VcMeicmDSJ5sRkZTEsqHdOMwh+tiqiQfCi9HhgGUEtOWuctvfl11s jFJOvyAroK6qVtqtVkxWv1RudoSlHjJ6+sAU1xwMVnuuoWt6oTaX1aK/1l7DyhNjRCszut XEgUxeKgVwkp4uk6L8ohmcSop57J9BkI6F/4n+mw4pMxcNMTNkdHJdw+URK7ltucb9yIGU moT+4uTMaAC+ZHRI57/Urs8aDO/dT75zAIQAZGHBIRUV7tIBdUMar+6QOc3d3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891159; a=rsa-sha256; cv=none; b=o/2UlHfJqdsYpG3dwn74QAIRvXdhFHKE3Uw7b/Fxm48jt/AC2mBF7Cm19Gz8u5DFeGbk7n Yw97+d1gCZnapQ5Y5S4A8a3QYmv2VlKZXx39dhZuzX4w5X2wnxDXm2e9bKS9eADq+NcD/U B81sGA8WA2eXPTOFJTbhb9kcxWPM1JegWLHqhm2/aORbXNVl2FKTLCmROTunaQQ/8d53jA cI8SP1WTKaJHoMcmciNWqVbq81q85Csk/KDvwy0VmM1L7l+HCaz4fZLN+i3XR3b2oScAqV jtAI++OdU/LeCUOco2vfFzIp5x36V70RYtwz0ODWOQU9SyhYxPV2QSY9lYC+jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR8ST/cnlBvaj6SORULJuz+/7VCbZrq1+dPQpJbKnhs=; b=BMC5VByEQpR0yUkoQa+EI0O2T8z3zQ+Fbu5pttOJcAqGLM+XRlpJTt0riNww0OTB4NOfTL 7gYeLvOlEypPw3ugDwWZCWZSiofZUfPiqmKrjeW4gP9h8t+eu9Ayfbm3ifyq4jKTECAvHx O5pxz3tF+PaTLE1Pv0YczNdWZevl7M0F8MYJfBgSpPE24EsH1ojori6hbnDTuhScloulGZ DS0MqX3USAAag6XL+LuWIxzDtjsRZKeO4dSffJ9CLKC/uNPeDZmgO3rBu5c0IRhNFHwSi3 u25l948xr1+MN7KoufDGIoZeRMaEgyimTaa2qBHAIXaFyWvoEDzhtSH8RW/U8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TM1kcJzfxt; Tue, 23 Apr 2024 16:52: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 43NGqd8c088279; Tue, 23 Apr 2024 16:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqdwI088276; Tue, 23 Apr 2024 16:52:39 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:39 GMT Message-Id: <202404231652.43NGqdwI088276@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: 91da6becae62 - main - pthread_sigqueue(3): document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 91da6becae6291533b9b59646b59bace2f905c81 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=91da6becae6291533b9b59646b59bace2f905c81 commit 91da6becae6291533b9b59646b59bace2f905c81 Author: Konstantin Belousov AuthorDate: 2024-04-20 22:16:08 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:25 +0000 pthread_sigqueue(3): document Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- share/man/man3/Makefile | 1 + share/man/man3/pthread_sigqueue.3 | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index d82ff2bccd51..5c8dced71743 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -452,6 +452,7 @@ PTHREAD_MAN= pthread.3 \ pthread_set_name_np.3 \ pthread_setspecific.3 \ pthread_sigmask.3 \ + pthread_sigqueue.3 \ pthread_spin_init.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ diff --git a/share/man/man3/pthread_sigqueue.3 b/share/man/man3/pthread_sigqueue.3 new file mode 100644 index 000000000000..bf5dd62f04e6 --- /dev/null +++ b/share/man/man3/pthread_sigqueue.3 @@ -0,0 +1,102 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright 2024 The FreeBSD Foundation, Inc. +.\" +.\" This documentation was written by +.\" Konstantin Belousov 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(s), this list of conditions and the following disclaimer as +.\" the first lines of this file unmodified other than the possible +.\" addition of one or more copyright notices. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice(s), 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 HOLDER(S) ``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 HOLDER(S) 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 April 21, 2024 +.Dt PTHREAD_SIGQUEUE 3 +.Os +.Sh NAME +.Nm pthread_sigqueue +.Nd queue a signal to a specified thread +.Sh LIBRARY +.Lb libpthread +.Sh SYNOPSIS +.In pthread.h +.In signal.h +.Ft int +.Fn pthread_sigqueue "pthread_t thread" "int sig" "const union sigval value" +.Sh DESCRIPTION +The +.Fn pthread_queue +function queues a signal, specified by +.Fa sig , +to a thread, specified by +.Fa thread . +If +.Fa sig +is 0, error checking is performed, but no signal is actually sent. +The +.Fa value +is queued together with the signal, and becomes available in +.Vt siginfo_t +data passed to the signal handler. +.Pp +The +.Nm +function is similar to +.Xr sigqueue 2 , +but targets a thread in the current process instead of a process. +See +.Xr sigqueue 2 +for details about signal queueing and delivery selection. +.Sh RETURN VALUES +If successful, +.Fn pthread_sigqueue +returns 0. +Otherwise, an error number is returned. +.Sh ERRORS +The +.Fn pthread_sigqueue +function will fail if: +.Bl -tag -width Er +.It Bq Er EAGAIN +No resources are available to queue the signal. +The current process has already queued +.Brq Dv SIGQUEUE_MAX +signals that are still pending, +or a system-wide resource limit has been exceeded. +.It Bq Er ESRCH +.Fa thread +is an invalid thread ID. +.It Bq Er EINVAL +.Fa sig +is an invalid or unsupported signal number. +.El +.Sh SEE ALSO +.Xr sigqueue 2 +.Sh STANDARDS +The +.Fn pthread_sigqueue +function is a +.Fx +extension. +An identical function with the same semantic is available in other +operating systems. From nobody Tue Apr 23 16:52:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7TP0WJkz5HcXc; Tue, 23 Apr 2024 16:52: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 4VP7TN3BRvz49Mg; Tue, 23 Apr 2024 16:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWcuxf1Q+UaEnFHq6HKkCjdJm3UAuebLIcm2THUoU0U=; b=fcBQ+A2FBIY3MuH0vG9zjIS5tTeKY1oylNGoTpB3e/Rmlq1BH1WV5t837MZI/j9Fun2Imw U5H89VhtmsF1k8fViZncG6LcUiJY7WlmMKVzKsB1VrrrHSnI97wZ1gg85wVx6CfttNNFit vwKJL8c/4DxeA3sbUPd6O5FG+bwFSZTiGt2XgkUagYlfZ68OpPAIrilnNHsDmRSlBdYeQO R7RjGRxvAZV95kXi/oBP5pnrA8/D/5+pCmxSEz4jCi50esU3s4YQKfewMGUuzDrK84r9z/ gdqx6Ly9vtT38+5bB6ApxQEalafOAap39uVleYm8f2areDHHAIZxgbgdbkRsMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891160; a=rsa-sha256; cv=none; b=la8CSESQpXIor9tcRrYa6bNug7DDQ3iJ9GB72Udf0V33xliThVSQW22JKsHA3IcY4qNTSb LqqsFgtCxw6hbps5Uki0656BkzB5GfRlp1rUvgXLyO1kXN+cxRAxcK+BefoZAIpAbJ7Lle rVwQRTawzG+BfZBlchQFuJVAFHKVi/fG4J7R+cRQOCrjWQH69AxxxrCiObJpcL/ACgYsOd 9ZrToKOezvIxQ7mNBgp+xoYbmnZ3nQOU+N0Fcg5afMk7d0pnTzVwA0cRCWrqNmV8aTNtl1 tIEi/GU01Fo6iEdG0TA5tvYyXrrdNlY2xlk9U0ta2W72Ii6jqRNQv/p1jOyFWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWcuxf1Q+UaEnFHq6HKkCjdJm3UAuebLIcm2THUoU0U=; b=nINYoVSLvHfhbn+myAUAr7blVZKtrQtgctCjLtsiuYFxB0olU+W386xw3GlK4AyYozwvOd DVor3rq1RmvH3tff8HDAhLolC7DIFQlLm6LWz87d5scmfbTnTEFkIBm/jDY2ZiSgaAJr/f e1gdMq3j2/MPac09eCGVtppNLa5VJ1Bga/6vaI23PLxSmEE7lmCAKRHqPZZOZMuhO4KwQr GF0EJGGGpUF24UsYonsc3m5PtJv1Yxu2MoV+9qRjSc1s0rFnq9qY1Yapg0IhSw1ZGnJAN7 +rnsX2t1DAhhJ9amF1qVwG/rQ7is/v1nX5oSQ5pGcLkmd8knIZhViWkqrhOGOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7TN2mcmzfxv; Tue, 23 Apr 2024 16:52: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 43NGqeIH088318; Tue, 23 Apr 2024 16:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqep0088315; Tue, 23 Apr 2024 16:52:40 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:40 GMT Message-Id: <202404231652.43NGqep0088315@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: fb2ab7ce52d3 - main - Add test for pthread_sigqueue(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: fb2ab7ce52d3f1e9d0998f3e5c12c3468ce4563a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fb2ab7ce52d3f1e9d0998f3e5c12c3468ce4563a commit fb2ab7ce52d3f1e9d0998f3e5c12c3468ce4563a Author: Konstantin Belousov AuthorDate: 2024-04-20 19:59:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 16:51:31 +0000 Add test for pthread_sigqueue(3) Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44867 --- lib/libthr/tests/Makefile | 1 + lib/libthr/tests/pthread_sigqueue_test.c | 120 +++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile index 8b7850b94265..d882ccfd877c 100644 --- a/lib/libthr/tests/Makefile +++ b/lib/libthr/tests/Makefile @@ -35,6 +35,7 @@ NETBSD_ATF_TESTS_SH+= exit_test NETBSD_ATF_TESTS_SH+= resolv_test ATF_TESTS_C+= umtx_op_test +ATF_TESTS_C+= pthread_sigqueue_test LIBADD+= pthread LIBADD.fpu_test+= m diff --git a/lib/libthr/tests/pthread_sigqueue_test.c b/lib/libthr/tests/pthread_sigqueue_test.c new file mode 100644 index 000000000000..053a8dac4039 --- /dev/null +++ b/lib/libthr/tests/pthread_sigqueue_test.c @@ -0,0 +1,120 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2024 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * 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 +#include + +#define NTHREADS 330 +static int value[NTHREADS]; +static pthread_t thr[NTHREADS]; +static pthread_barrier_t barrier; + +static void +handler(int signo __unused, siginfo_t *info, void *data __unused) +{ + pthread_t self; + int i; + + /* + * Formally this is thread-unsafe but we know context from + * where the signal is sent. + */ + self = pthread_self(); + for (i = 0; i < NTHREADS; i++) { + if (pthread_equal(self, thr[i])) { + value[i] = info->si_value.sival_int; + pthread_exit(NULL); + } + } +} + +static void * +threadfunc(void *arg __unused) +{ + pthread_barrier_wait(&barrier); + for (;;) + pause(); +} + +ATF_TC(pthread_sigqueue); +ATF_TC_HEAD(pthread_sigqueue, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Checks pthread_sigqueue(3) sigval delivery"); +} + +ATF_TC_BODY(pthread_sigqueue, tc) +{ + struct sigaction sa; + union sigval sv; + int error, i; + + error = pthread_barrier_init(&barrier, NULL, NTHREADS + 1); + ATF_REQUIRE_EQ(0, error); + + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = handler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_SIGINFO; + + if (sigaction(SIGUSR1, &sa, NULL) != 0) + atf_tc_fail("sigaction failed"); + + memset(&sv, 0, sizeof(sv)); + + for (i = 0; i < NTHREADS; i++) { + error = pthread_create(&thr[i], NULL, threadfunc, NULL); + ATF_REQUIRE_EQ(0, error); + } + error = pthread_barrier_wait(&barrier); + ATF_REQUIRE(error == 0 || error == PTHREAD_BARRIER_SERIAL_THREAD); + + for (i = 0; i < NTHREADS; i++) { + sv.sival_int = i + 1000; + error = pthread_sigqueue(thr[i], SIGUSR1, sv); + ATF_REQUIRE_EQ(0, error); + error = pthread_join(thr[i], NULL); + ATF_REQUIRE_EQ(0, error); + } + for (i = 0; i < NTHREADS; i++) + ATF_REQUIRE_EQ(i + 1000, value[i]); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, pthread_sigqueue); + return atf_no_error(); +} From nobody Tue Apr 23 16:56:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7YM4Q0yz5HdGX; Tue, 23 Apr 2024 16:56: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 4VP7YM3rxGz4Dy4; Tue, 23 Apr 2024 16:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q3J6Y3ym1t0JKNE36xoy7dcZ2HEzsB+yVwphuzTpPAE=; b=eR1b5dn11G8pWKYqFQv8LBvdeRRQURSLVkb7clgFN2ynec+/jKOwCdo3670Zm/ir0Th4MB vJLcPX6ffFeL5AbqZUtLbWG7fMD1t4alQb5C4g1AnW84Nt1RsW4wA7Wh2yiVWe8pJVJHtV 3durl1Si8TYKGIjNnybheffIlxyKKhOI0RzSmA9tWNomCPJXi9gRXj50Uls9x91MZ4iHy/ 241U4012ggG3UarOnKigwxVbggPxWXsGvCNdxu54A3eNJFVehUl0+/fDlkrtrEv/HQesj4 YuVt3p++UjFDs5PQnt9BQGvYsDFLVUUAU90/7NeZ6VtCh5Fiu/S9wSBcjp+MUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891367; a=rsa-sha256; cv=none; b=LAqEnmkkO4NbbIWmBLfK2Bta+hV3q1cvBbrPRVDaVtY4JnF6gLA1gfOnQ6B7LA/6a/sw/2 X+AeLjMEoATFB9TyartsUYkadsr3QSzy9iuCqbv2sgYb8ROPIcgTwU6aUCXW1wlKuVH2Zq Px/5uYzB6EQVyENMY45bYwyqcs4z2j4F01zTAisDK1mRNhu6nKBaJVvKqHs3qK51rYlPSC 1h6NATkMds/u9/pteumXHwd76W6v9mFBkSezmjGa9Xne7O2QnjCQPIF6AxQ3S+1iKNtP9S fGp9Y0cSKkJQomaszQ+BhrBwNzHKBg2h0zv1CxtHITr5rjD4zdImLEiy5lXeIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q3J6Y3ym1t0JKNE36xoy7dcZ2HEzsB+yVwphuzTpPAE=; b=lS1bySo4IqFGwIqZxTBL/Q8krrk9w9ouL9GFb1Xk1hShfqqaX0J7bZbcnUWWkVikwF9S3p g8UbXlU0Vbx2+pC/+nZ4qTs6X/JxRHxZe/ufngalIB+OJsv03qQ9O/NXQHeDZy3oVk65Tx N3dcFxTbsWPQnvr6pCIgAGJa9IFzfFqxQ090Dd07OnEY+ZnSyKAT+qc89zCBkr9/Z3gyB9 Sh5+WicVhrWaURE7QVdlG7+umH7Bd2hWaAeQyQIDb99oA+RMKVRP4ZuJqOUDGNW8HPMbPI Kaxurco0w4L0cVDw1uq4YvisaZ+7JKVxZXuPyr6MuzrnZARGNYO5Zf0j0i/mqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7YM3SNgzgNy; Tue, 23 Apr 2024 16:56: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 43NGu7Pd088996; Tue, 23 Apr 2024 16:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGu7M5088993; Tue, 23 Apr 2024 16:56:07 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:56:07 GMT Message-Id: <202404231656.43NGu7M5088993@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: 6d5ce2bb6344 - main - nfsserver: Default to nfs_reserved_port_only="YES" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6d5ce2bb63445e9c09c3b5c29fb18983e1e2628c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6d5ce2bb63445e9c09c3b5c29fb18983e1e2628c commit 6d5ce2bb63445e9c09c3b5c29fb18983e1e2628c Author: Mark Johnston AuthorDate: 2024-04-23 16:51:03 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 16:54:46 +0000 nfsserver: Default to nfs_reserved_port_only="YES" This setting causes the NFS server to check that all RPCs are sent from a privileged (<= 1023) port, rejecting those that are not. This slightly raises the bar for a user with network access to an unauthenticated NFS server to access exported NFS filesystems. Users that use traditional NFS clients (e.g., those provided by FreeBSD or Linux) should not see any difference, assuming that unprivileged filesystem mounting is disallowed. Note that the setting is per-VNET, so may be overridden in VNET jails without affecting the rest of the system. Discussed with: freebsd-arch@ Reviewed by: rmacklem, bz, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44906 --- libexec/rc/rc.conf | 2 +- sys/fs/nfsserver/nfs_nfsdkrpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 96dd0c534dc2..6a8b6e257b17 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -386,7 +386,7 @@ nfs_server_maxio="131072" # Maximum I/O size for the nfsd. mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r -S" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. -nfs_reserved_port_only="NO" # Provide NFS only on secure port (or NO). +nfs_reserved_port_only="YES" # Provide NFS only on secure port (or NO). nfs_bufpackets="" # bufspace (in packets) for client rpc_lockd_enable="NO" # Run NFS rpc.lockd needed for client/server. rpc_lockd_flags="" # Flags to rpc.lockd (if enabled). diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 022f7403d28b..ce1189d40425 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -82,7 +82,7 @@ int newnfs_nfsv3_procid[NFS_V3NPROCS] = { SYSCTL_DECL(_vfs_nfsd); -NFSD_VNET_DEFINE_STATIC(int, nfs_privport) = 0; +NFSD_VNET_DEFINE_STATIC(int, nfs_privport) = 1; SYSCTL_INT(_vfs_nfsd, OID_AUTO, nfs_privport, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, &NFSD_VNET_NAME(nfs_privport), 0, "Only allow clients using a privileged port for NFSv2, 3 and 4"); From nobody Tue Apr 23 16:56:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP7YN6YdGz5Hcxj; Tue, 23 Apr 2024 16:56: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 4VP7YN4qqKz4Dj0; Tue, 23 Apr 2024 16:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oCzBBgalZzbBbY43o0tZPD8b//FerMBGAOfZtOyeNc=; b=sjhoAKeaZjZKT6RD4WvP98t6H5/rTQcFYcsQQi0TcnXMjMxN7YxohseYMsgI8WPS4O4m4w G7nIlf43FSdLQWJv7SD3kRN7t2JVZepmAr7fkQLheLi9VnqL1/MqDK/db7V8e9BsH8dppR OO2Exz0H56Vwparpz+A5WC0vht2n47jFBr980qY0Q19Q14xPypBcJy6QMeQ6drQdKgZE+Z 6qY87UsQS1W0QCW/udj31X8Ki9zYblAq5Q13HZUlIEu9Bd7NZEXThOkEYUEFbpa4Fzxlli IiliPtE55v8KjK27olUZiF3b5OJylhTZHNAtGucuHzXCjoy42pHLj+d0ogDiBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891368; a=rsa-sha256; cv=none; b=RXneRfDUPBhPFkyU2WnRU0NTdfuepGELwNuttWe5NcKkCJ8/0zSWVmDqXMplHNC2nz7OL+ BkwfxNYJJWBtWUn368sUb02fgpq6RfHDeNBURj4K82vteO3kjAVr7+FXA7PnDJqGUpbRGv AhHzbadkjb7bIRk43MQxibgnoZPHHADrlM7+xv0rXRH8+w/DlqNCVXnnbrvsjXtU2HL9xe xVf9I3P54kq2lv1usRvrsmwfGJDVM5plgGgmav0JdWjgIA7bhi5cXJO4IocdEDszDcmL6w OIHmrirBE0W0WOlsfo5RiNFfTFKJ56iZVdmYfKFgYi3YLne8h1nqFMyvO7TPDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oCzBBgalZzbBbY43o0tZPD8b//FerMBGAOfZtOyeNc=; b=Mx/EDJYXHG5iOeKfg+Gr0VgBxdQHDm1byP3zBzfXJHm8ebwNl/aBlC3J5aIsdv62nnf9mw b3sgru2LsOvT+i92LMIiP9ixa1HzZOsusRQ5W5U13VYvkXRlxE1Lpp6Z+hbkoHdfFPr+R8 GDflWe2HFo0pkug4QqmJ5v8fhaxeq57t+ceioUO8edrBV7nDG1+pQDKNFKU7dStainkAg6 4OE7++SEmR6EprdUkdWM8feGooh6JPZSd9rYTja/207MIwSxg89qh7gS8qg8lhwTT18Gt/ Z/VSDiwzGu20W66yJW2bgwkEA5c40J7PKFO8SpqkmspJhrydSxxOPeAlj2424Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP7YN4S78zg0q; Tue, 23 Apr 2024 16:56: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 43NGu8Oh089050; Tue, 23 Apr 2024 16:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGu8N5089048; Tue, 23 Apr 2024 16:56:08 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:56:08 GMT Message-Id: <202404231656.43NGu8N5089048@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: ca0620b70750 - main - RELNOTES: Add an entry for the nfs_reserved_port_only default change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ca0620b70750d4b5b03a7f03393acbe9600870c1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0620b70750d4b5b03a7f03393acbe9600870c1 commit ca0620b70750d4b5b03a7f03393acbe9600870c1 Author: Mark Johnston AuthorDate: 2024-04-23 16:52:30 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 16:55:10 +0000 RELNOTES: Add an entry for the nfs_reserved_port_only default change Sponsored by: The FreeBSD Foundation --- RELNOTES | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/RELNOTES b/RELNOTES index 59131dc70dac..91d6d74a38fc 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,10 +10,19 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +6d5ce2bb6344: + The default value of the nfs_reserved_port_only rc.conf(5) setting has + changed. The FreeBSD NFS server now requires the source port of + requests to be in the privileged port range (i.e., <= 1023), which + generally requires the client to have elevated privileges on their local + system. The previous behavior can be restored by setting + nfs_reserved_port_only=NO in rc.conf. + aea973501b19: ktrace(2) will now record detailed information about capability mode violations. The kdump(1) utility has been updated to display such information. + f32a6403d346: One True Awk updated to 2nd Edition. See https://awk.dev for details on the additions. Unicode and CSVs (Comma Separated Values) are now From nobody Tue Apr 23 17:37:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP8TG3P6Xz5Hhxv; Tue, 23 Apr 2024 17:37: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 4VP8TG1Jm1z4JSM; Tue, 23 Apr 2024 17:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sr26TameZBK4phpEJijHqY46E3ONEDc6Yjm5WoQOOiI=; b=nuzK6gbZuxfe3JTgtCwN7EUDMIqtDbYKF9NJcusGODaEyyjnommnWOsC927Tc4dt2S+sSr 9DoD77pZQdrHRNZzgzHKIeg54fO1ytmwBACQuqaC3u9urqtEUJJnAigrvkme3iH/Jt5T9z 0Mo+eX70tziZNufWbX5FfLjYmbMVMXOVXkU+FBAc7HumKTd+qPduupyteO45PC91lCvntA j/XMUx/pRgwvTrPdDF20m+R107dQD9YI5ZxuiZ4iSakNMV2tmLsipmOtACP5WbWsRvNM/7 plHgNM7kpr3MslZD32iCkdL8xVVZFPuo+czxJ1L6occON6hfxMLT7MSgien9XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713893858; a=rsa-sha256; cv=none; b=lu+loBFjvu5KhbnEys6RTTh3FAsEG3somb52E4jJ5vFS9cIoV7911xRVL7gOBIyVSzqaIy b/dyRQ2PVkJh3TnllvAOqf1/l3iXQTOVwU6f5QNHv0l7yKpSgTWSyBlhQjNUQoh2iQng6z smvuUa3HZLZ9DqMASh+NEyt1StBBZQhF/Db7kgdMVqDQu6UGkboeOHFtLS6kz+ZzIJF+EE wegVxuIId0Nq8ggrYD+whRIR/uDB/iVmHupBkMf5ROS6+GjK+sND8MoArY3wpAx9RUB6yK UXV0zjgYe8GdzZ58P2Z82IcpSpKejL/vmuSyjGkrcGyUTKBI3hbEeGxpRVMVJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sr26TameZBK4phpEJijHqY46E3ONEDc6Yjm5WoQOOiI=; b=wnoSyZAADgs+PuM5xJH9xoW94LWEFLZcekhr540+RyAWce+Qb4Cl3xgJ8DpPWrUGgoLFkS i2fchIraBnwlTx/ASx+u93sJ79k8QdXO2nGMXy68+xPcHi7AG4e/naBbCBOu3PsDt/8F3O NH2LLG6NFdDx6+1FeQLXJAm7p7fG6F3xvs7gJbPBDVnpD8HfgbuhTl8bQys/vEU4DXTN6r jJwDOuYXJAC3h3TA2UWnW4SFZHzqMksRXgoBcIKlRCHSlCsVcFjD3P1fJnMoRiA3RY0Q5x R/7iSGa9R4IWFDFaInq/Fd8lDZJf6YiggZQdKYUMp8GbAqFEmMjb3UOMTcDd8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8TG0wmXzh75; Tue, 23 Apr 2024 17:37: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 43NHbcwo057135; Tue, 23 Apr 2024 17:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHbbJg057132; Tue, 23 Apr 2024 17:37:37 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:37:37 GMT Message-Id: <202404231737.43NHbbJg057132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 854034a32cf6 - stable/14 - Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 854034a32cf6a2472392f4b7e1c11fbef93d9041 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=854034a32cf6a2472392f4b7e1c11fbef93d9041 commit 854034a32cf6a2472392f4b7e1c11fbef93d9041 Author: Dimitry Andric AuthorDate: 2024-04-20 12:01:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-23 17:33:06 +0000 Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6. PR: 276104 MFC after: 3 days (cherry picked from commit dfa39133b333f57ca3133bf6c71cd75be4c3e801) --- .../llvm-project/clang/include/clang/Basic/Attr.td | 2 + .../clang/lib/Format/TokenAnnotator.cpp | 20 ++++---- .../clang/lib/Headers/__stddef_unreachable.h | 4 ++ .../compiler-rt/lib/builtins/riscv/restore.S | 42 +++++++++++++++ .../compiler-rt/lib/builtins/riscv/save.S | 42 +++++++++++++++ .../include/__format/formatter_floating_point.h | 2 +- contrib/llvm-project/libcxx/include/stddef.h | 29 ++++------- contrib/llvm-project/lld/COFF/Chunks.cpp | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 7 ++- contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 42 +++------------ .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 3 ++ .../llvm/lib/Target/Mips/Mips32r6InstrInfo.td | 8 +-- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++------------------ .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 44 ++++++++++++++++ .../llvm/lib/Target/X86/X86MCInstLower.cpp | 4 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +++++++- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 25 files changed, 234 insertions(+), 140 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/Attr.td b/contrib/llvm-project/clang/include/clang/Basic/Attr.td index 58838b01b4fd..dbf2dd2120fb 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/Attr.td +++ b/contrib/llvm-project/clang/include/clang/Basic/Attr.td @@ -1590,6 +1590,7 @@ def RegCall : DeclOrTypeAttr { } def Final : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"final">, CustomKeyword<"sealed">]; let Accessors = [Accessor<"isSpelledAsSealed", [CustomKeyword<"sealed">]>]; let SemaHandler = 0; @@ -2472,6 +2473,7 @@ def Overloadable : Attr { } def Override : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"override">]; let SemaHandler = 0; // Omitted from docs, since this is language syntax, not an attribute, as far diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index d0c4273cfc7e..4d482e6543d6 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -3450,10 +3450,11 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { for (AnnotatedLine *ChildLine : Line.Children) calculateFormattingInformation(*ChildLine); - Line.First->TotalLength = - Line.First->IsMultiline ? Style.ColumnLimit - : Line.FirstStartColumn + Line.First->ColumnWidth; - FormatToken *Current = Line.First->Next; + auto *First = Line.First; + First->TotalLength = First->IsMultiline + ? Style.ColumnLimit + : Line.FirstStartColumn + First->ColumnWidth; + FormatToken *Current = First->Next; bool InFunctionDecl = Line.MightBeFunctionDecl; bool AlignArrayOfStructures = (Style.AlignArrayOfStructures != FormatStyle::AIAS_None && @@ -3475,16 +3476,15 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName); IsCtorOrDtor || isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) { - if (!IsCtorOrDtor) { - LineIsFunctionDeclaration = true; + if (!IsCtorOrDtor) Tok->setFinalizedType(TT_FunctionDeclarationName); - } + LineIsFunctionDeclaration = true; SeenName = true; break; } } - if (IsCpp && LineIsFunctionDeclaration && + if (IsCpp && (LineIsFunctionDeclaration || First->is(TT_CtorDtorDeclName)) && Line.endsWith(tok::semi, tok::r_brace)) { auto *Tok = Line.Last->Previous; while (Tok->isNot(tok::r_brace)) @@ -3507,7 +3507,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (IsCpp) { if (!LineIsFunctionDeclaration) { // Annotate */&/&& in `operator` function calls as binary operators. - for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) { + for (const auto *Tok = First; Tok; Tok = Tok->Next) { if (Tok->isNot(tok::kw_operator)) continue; do { @@ -3644,7 +3644,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { calculateUnbreakableTailLengths(Line); unsigned IndentLevel = Line.Level; - for (Current = Line.First; Current; Current = Current->Next) { + for (Current = First; Current; Current = Current->Next) { if (Current->Role) Current->Role->precomputeFormattingInfos(Current); if (Current->MatchingParen && diff --git a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h index 518580c92d3f..61df43e9732f 100644 --- a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h +++ b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h @@ -7,6 +7,8 @@ *===-----------------------------------------------------------------------=== */ +#ifndef __cplusplus + /* * When -fbuiltin-headers-in-system-modules is set this is a non-modular header * and needs to behave as if it was textual. @@ -15,3 +17,5 @@ (__has_feature(modules) && !__building_module(_Builtin_stddef)) #define unreachable() __builtin_unreachable() #endif + +#endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S index 73f64a920d66..6f43842c8ca6 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S @@ -22,6 +22,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -86,8 +88,29 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + lw s1, 0(sp) + lw s0, 4(sp) + lw ra, 8(sp) + addi sp, sp, 12 + ret + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -161,6 +184,25 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + ld s1, 0(sp) + ld s0, 8(sp) + ld ra, 16(sp) + addi sp, sp, 24 + ret + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S index 85501aeb4c2e..3e044179ff7f 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S @@ -18,6 +18,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -92,8 +94,29 @@ __riscv_save_0: sw ra, 12(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -12 + sw s1, 0(sp) + sw s0, 4(sp) + sw ra, 8(sp) + jr t0 + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -181,6 +204,25 @@ __riscv_save_0: sd ra, 8(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -24 + sd s1, 0(sp) + sd s0, 8(sp) + sd ra, 16(sp) + jr t0 + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h index 6802a8b7bd4c..46a090a787ae 100644 --- a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h +++ b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h @@ -689,7 +689,7 @@ __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__par // Let P equal the precision if nonzero, 6 if the precision is not // specified, or 1 if the precision is 0. Then, if a conversion with // style E would have an exponent of X: - int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); + int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); if (__result.__exponent == __result.__last) // if P > X >= -4, the conversion is with style f or F and precision P - 1 - X. // By including the radix point it calculates P - (1 + X) diff --git a/contrib/llvm-project/libcxx/include/stddef.h b/contrib/llvm-project/libcxx/include/stddef.h index 887776b150e4..1583e78e3739 100644 --- a/contrib/llvm-project/libcxx/include/stddef.h +++ b/contrib/llvm-project/libcxx/include/stddef.h @@ -7,18 +7,6 @@ // //===----------------------------------------------------------------------===// -#if defined(__need_ptrdiff_t) || defined(__need_size_t) || defined(__need_wchar_t) || defined(__need_NULL) || \ - defined(__need_wint_t) - -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif - -# include_next - -#elif !defined(_LIBCPP_STDDEF_H) -# define _LIBCPP_STDDEF_H - /* stddef.h synopsis @@ -36,15 +24,18 @@ Types: */ -# include <__config> +#include <__config> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -# if __has_include_next() -# include_next -# endif +// Note: This include is outside of header guards because we sometimes get included multiple times +// with different defines and the underlying will know how to deal with that. +#include_next + +#ifndef _LIBCPP_STDDEF_H +# define _LIBCPP_STDDEF_H # ifdef __cplusplus typedef decltype(nullptr) nullptr_t; diff --git a/contrib/llvm-project/lld/COFF/Chunks.cpp b/contrib/llvm-project/lld/COFF/Chunks.cpp index 39f4575031be..e2074932bc46 100644 --- a/contrib/llvm-project/lld/COFF/Chunks.cpp +++ b/contrib/llvm-project/lld/COFF/Chunks.cpp @@ -652,6 +652,13 @@ void SectionChunk::getRuntimePseudoRelocs( dyn_cast_or_null(file->getSymbol(rel.SymbolTableIndex)); if (!target || !target->isRuntimePseudoReloc) continue; + // If the target doesn't have a chunk allocated, it may be a + // DefinedImportData symbol which ended up unnecessary after GC. + // Normally we wouldn't eliminate section chunks that are referenced, but + // references within DWARF sections don't count for keeping section chunks + // alive. Thus such dangling references in DWARF sections are expected. + if (!target->getChunk()) + continue; int sizeInBits = getRuntimePseudoRelocSize(rel.Type, file->ctx.config.machine); if (sizeInBits == 0) { diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index d0c27cae0dff..72b6dfa181e8 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -439,7 +439,8 @@ static Value *threadBinOpOverSelect(Instruction::BinaryOps Opcode, Value *LHS, // Check that the simplified value has the form "X op Y" where "op" is the // same as the original operation. Instruction *Simplified = dyn_cast(FV ? FV : TV); - if (Simplified && Simplified->getOpcode() == unsigned(Opcode)) { + if (Simplified && Simplified->getOpcode() == unsigned(Opcode) && + !Simplified->hasPoisonGeneratingFlags()) { // The value that didn't simplify is "UnsimplifiedLHS op UnsimplifiedRHS". // We already know that "op" is the same as for the simplified value. See // if the operands match too. If so, return the simplified value. diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3135ec73a99e..e806e0f0731f 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -3575,6 +3575,11 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, return SDValue(); if (Opcode != ISD::UADDO && Opcode != ISD::USUBO) return SDValue(); + // Guarantee identical type of CarryOut + EVT CarryOutType = N->getValueType(0); + if (CarryOutType != Carry0.getValue(1).getValueType() || + CarryOutType != Carry1.getValue(1).getValueType()) + return SDValue(); // Canonicalize the add/sub of A and B (the top node in the above ASCII art) // as Carry0 and the add/sub of the carry in as Carry1 (the middle node). @@ -3622,7 +3627,7 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, // TODO: match other operations that can merge flags (ADD, etc) DAG.ReplaceAllUsesOfValueWith(Carry1.getValue(0), Merged.getValue(0)); if (N->getOpcode() == ISD::AND) - return DAG.getConstant(0, DL, MVT::i1); + return DAG.getConstant(0, DL, CarryOutType); return Merged.getValue(1); } diff --git a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp index cbb64b299e64..f105bdb4816a 100644 --- a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp +++ b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp @@ -746,7 +746,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, Min = Min.zext(ResultBitWidth); Max = Max.zext(ResultBitWidth); } - return ConstantRange(std::move(Min), std::move(Max)); + return getNonEmpty(std::move(Min), std::move(Max) + 1); } case Instruction::SIToFP: { // TODO: use input range if available @@ -757,7 +757,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, SMin = SMin.sext(ResultBitWidth); SMax = SMax.sext(ResultBitWidth); } - return ConstantRange(std::move(SMin), std::move(SMax)); + return getNonEmpty(std::move(SMin), std::move(SMax) + 1); } case Instruction::FPTrunc: case Instruction::FPExt: diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 196aa50cf406..95d8ab95b2c0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -1658,40 +1658,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM, setMaxAtomicSizeInBitsSupported(128); if (Subtarget->isWindowsArm64EC()) { - // FIXME: are there other intrinsics we need to add here? - setLibcallName(RTLIB::MEMCPY, "#memcpy"); - setLibcallName(RTLIB::MEMSET, "#memset"); - setLibcallName(RTLIB::MEMMOVE, "#memmove"); - setLibcallName(RTLIB::REM_F32, "#fmodf"); - setLibcallName(RTLIB::REM_F64, "#fmod"); - setLibcallName(RTLIB::FMA_F32, "#fmaf"); - setLibcallName(RTLIB::FMA_F64, "#fma"); - setLibcallName(RTLIB::SQRT_F32, "#sqrtf"); - setLibcallName(RTLIB::SQRT_F64, "#sqrt"); - setLibcallName(RTLIB::CBRT_F32, "#cbrtf"); - setLibcallName(RTLIB::CBRT_F64, "#cbrt"); - setLibcallName(RTLIB::LOG_F32, "#logf"); - setLibcallName(RTLIB::LOG_F64, "#log"); - setLibcallName(RTLIB::LOG2_F32, "#log2f"); - setLibcallName(RTLIB::LOG2_F64, "#log2"); - setLibcallName(RTLIB::LOG10_F32, "#log10f"); - setLibcallName(RTLIB::LOG10_F64, "#log10"); - setLibcallName(RTLIB::EXP_F32, "#expf"); - setLibcallName(RTLIB::EXP_F64, "#exp"); - setLibcallName(RTLIB::EXP2_F32, "#exp2f"); - setLibcallName(RTLIB::EXP2_F64, "#exp2"); - setLibcallName(RTLIB::EXP10_F32, "#exp10f"); - setLibcallName(RTLIB::EXP10_F64, "#exp10"); - setLibcallName(RTLIB::SIN_F32, "#sinf"); - setLibcallName(RTLIB::SIN_F64, "#sin"); - setLibcallName(RTLIB::COS_F32, "#cosf"); - setLibcallName(RTLIB::COS_F64, "#cos"); - setLibcallName(RTLIB::POW_F32, "#powf"); - setLibcallName(RTLIB::POW_F64, "#pow"); - setLibcallName(RTLIB::LDEXP_F32, "#ldexpf"); - setLibcallName(RTLIB::LDEXP_F64, "#ldexp"); - setLibcallName(RTLIB::FREXP_F32, "#frexpf"); - setLibcallName(RTLIB::FREXP_F64, "#frexp"); + // FIXME: are there intrinsics we need to exclude from this? + for (int i = 0; i < RTLIB::UNKNOWN_LIBCALL; ++i) { + auto code = static_cast(i); + auto libcallName = getLibcallName(code); + if ((libcallName != nullptr) && (libcallName[0] != '#')) { + setLibcallName(code, Saver.save(Twine("#") + libcallName).data()); + } + } } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h index 541a810fb5cb..74d0c4bde8dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h @@ -1001,6 +1001,9 @@ private: /// make the right decision when generating code for different targets. const AArch64Subtarget *Subtarget; + llvm::BumpPtrAllocator BumpAlloc; + llvm::StringSaver Saver{BumpAlloc}; + bool isExtFreeImpl(const Instruction *Ext) const override; void addTypeForNEON(MVT VT); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td index 854563ab32bd..3ef04e488f01 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td @@ -152,15 +152,15 @@ class SELNEZ_ENC : SPECIAL_3R_FM<0b00000, 0b110111>; class LWPC_ENC : PCREL19_FM; -class MAX_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; -class MAX_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; +class MAX_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; +class MAX_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; class MIN_S_ENC : COP1_3R_FM<0b011100, FIELD_FMT_S>; class MIN_D_ENC : COP1_3R_FM<0b011100, FIELD_FMT_D>; class MAXA_S_ENC : COP1_3R_FM<0b011111, FIELD_FMT_S>; class MAXA_D_ENC : COP1_3R_FM<0b011111, FIELD_FMT_D>; -class MINA_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; -class MINA_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; +class MINA_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; +class MINA_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; class SELEQZ_S_ENC : COP1_3R_FM<0b010100, FIELD_FMT_S>; class SELEQZ_D_ENC : COP1_3R_FM<0b010100, FIELD_FMT_D>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp index c30129743a96..2c2554b5b4bc 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp @@ -388,32 +388,18 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( Opcode = Mips::XOR; break; case Mips::ATOMIC_LOAD_UMIN_I8_POSTRA: - IsUnsigned = true; - IsMin = true; - break; case Mips::ATOMIC_LOAD_UMIN_I16_POSTRA: IsUnsigned = true; - IsMin = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MIN_I8_POSTRA: - SEOp = Mips::SEB; - IsMin = true; - break; case Mips::ATOMIC_LOAD_MIN_I16_POSTRA: IsMin = true; break; case Mips::ATOMIC_LOAD_UMAX_I8_POSTRA: - IsUnsigned = true; - IsMax = true; - break; case Mips::ATOMIC_LOAD_UMAX_I16_POSTRA: IsUnsigned = true; - IsMax = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MAX_I8_POSTRA: - SEOp = Mips::SEB; - IsMax = true; - break; case Mips::ATOMIC_LOAD_MAX_I16_POSTRA: IsMax = true; break; @@ -475,42 +461,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( // For little endian we need to clear uninterested bits. if (STI->isLittle()) { - if (!IsUnsigned) { - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), OldVal) - .addReg(OldVal) - .addReg(ShiftAmnt); - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), Incr) - .addReg(Incr) - .addReg(ShiftAmnt); - if (STI->hasMips32r2()) { - BuildMI(loopMBB, DL, TII->get(SEOp), OldVal).addReg(OldVal); - BuildMI(loopMBB, DL, TII->get(SEOp), Incr).addReg(Incr); - } else { - const unsigned ShiftImm = SEOp == Mips::SEH ? 16 : 24; - BuildMI(loopMBB, DL, TII->get(Mips::SLL), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SLL), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - } - } else { - // and OldVal, OldVal, Mask - // and Incr, Incr, Mask - BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) - .addReg(OldVal) - .addReg(Mask); - BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr) - .addReg(Incr) - .addReg(Mask); - } + // and OldVal, OldVal, Mask + // and Incr, Incr, Mask + BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) + .addReg(OldVal) + .addReg(Mask); + BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr).addReg(Incr).addReg(Mask); } + // unsigned: sltu Scratch4, oldVal, Incr // signed: slt Scratch4, oldVal, Incr BuildMI(loopMBB, DL, TII->get(SLTScratch4), Scratch4) diff --git a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 215a8ea83190..6855471840e9 100644 --- a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -434,6 +434,50 @@ bool SparcAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, default: // See if this is a generic print operand return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O); + case 'L': // Low order register of a twin word register operand + case 'H': // High order register of a twin word register operand + { + const SparcSubtarget &Subtarget = MF->getSubtarget(); + const MachineOperand &MO = MI->getOperand(OpNo); + const SparcRegisterInfo *RegisterInfo = Subtarget.getRegisterInfo(); + Register MOReg = MO.getReg(); + + Register HiReg, LoReg; + if (!SP::IntPairRegClass.contains(MOReg)) { + // If we aren't given a register pair already, find out which pair it + // belongs to. Note that here, the specified register operand, which + // refers to the high part of the twinword, needs to be an even-numbered + // register. + MOReg = RegisterInfo->getMatchingSuperReg(MOReg, SP::sub_even, + &SP::IntPairRegClass); + if (!MOReg) { + SMLoc Loc; + OutContext.reportError( + Loc, "Hi part of pair should point to an even-numbered register"); + OutContext.reportError( + Loc, "(note that in some cases it might be necessary to manually " + "bind the input/output registers instead of relying on " + "automatic allocation)"); + return true; + } + } + + HiReg = RegisterInfo->getSubReg(MOReg, SP::sub_even); + LoReg = RegisterInfo->getSubReg(MOReg, SP::sub_odd); + + Register Reg; + switch (ExtraCode[0]) { + case 'L': + Reg = LoReg; + break; + case 'H': + Reg = HiReg; + break; + } + + O << '%' << SparcInstPrinter::getRegisterName(Reg); + return false; + } case 'f': case 'r': break; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp index 58ebe023cd61..7ce0aa22b997 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp @@ -959,8 +959,10 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI, SmallString<256> Code; unsigned MinSize = MI.getOperand(0).getImm(); - if (NextMI != MI.getParent()->end()) { + if (NextMI != MI.getParent()->end() && !NextMI->isInlineAsm()) { // Lower the next MachineInstr to find its byte size. + // If the next instruction is inline assembly, we skip lowering it for now, + // and assume we should always generate NOPs. MCInst MCI; MCIL.Lower(&*NextMI, MCI); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 0a9e2c7f49f5..1fbd69e38eae 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -11653,12 +11653,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, -1)) TysForDecl.push_back( FixedVectorType::get(CI->getType(), E->Scalars.size())); + auto *CEI = cast(VL0); for (unsigned I : seq(0, CI->arg_size())) { ValueList OpVL; // Some intrinsics have scalar arguments. This argument should not be // vectorized. if (UseIntrinsic && isVectorIntrinsicWithScalarOpAtArg(ID, I)) { - CallInst *CEI = cast(VL0); ScalarArg = CEI->getArgOperand(I); OpVecs.push_back(CEI->getArgOperand(I)); if (isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) @@ -11671,6 +11671,25 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n"); return E->VectorizedValue; } + auto GetOperandSignedness = [&](unsigned Idx) { + const TreeEntry *OpE = getOperandEntry(E, Idx); + bool IsSigned = false; + auto It = MinBWs.find(OpE); + if (It != MinBWs.end()) + IsSigned = It->second.second; + else + IsSigned = any_of(OpE->Scalars, [&](Value *R) { + return !isKnownNonNegative(R, SimplifyQuery(*DL)); + }); + return IsSigned; + }; + ScalarArg = CEI->getArgOperand(I); + if (cast(OpVec->getType())->getElementType() != + ScalarArg->getType()) { + auto *CastTy = FixedVectorType::get(ScalarArg->getType(), + VecTy->getNumElements()); + OpVec = Builder.CreateIntCast(OpVec, CastTy, GetOperandSignedness(I)); + } LLVM_DEBUG(dbgs() << "SLP: OpVec[" << I << "]: " << *OpVec << "\n"); OpVecs.push_back(OpVec); if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 82f25ad621b6..687fb1656937 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 782f047618b5..536f72efec52 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 18.1.3 -#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION 18.1.4 +#define CLANG_VERSION_STRING "18.1.4" #define CLANG_VERSION_MAJOR 18 #define CLANG_VERSION_MAJOR_STRING "18" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index c9d51f35c752..65838f76ba5d 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7cef82df9e4f..1fc1a4d88b7b 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 18.1.3 -#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION 18.1.4 +#define LLDB_VERSION_STRING "18.1.4" #define LLDB_VERSION_MAJOR 18 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5cf49eceeced..a017437dc568 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -344,10 +344,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 18.1.3" +#define PACKAGE_STRING "LLVM 18.1.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "18.1.3" +#define PACKAGE_VERSION "18.1.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 2b7d5b3e9504..fb878ccdde4d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -180,10 +180,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "18.1.3" +#define LLVM_VERSION_STRING "18.1.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index b1a8aef7de29..e324de0f9fc6 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Tue Apr 23 17:38:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP8Vg48zxz5Hj18; Tue, 23 Apr 2024 17:38: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 4VP8Vg3vSJz4KCJ; Tue, 23 Apr 2024 17:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53kkQNoEVTDtf87oWcpn1ynKitRABfYoR7hRVmdA1o4=; b=pkz5iI1rcMC2d7ChBvNclonvSw3rXA3O3TA9/9yK7mG0JxqOekv7xq9hYJ6emMMLpE5e0Y oZqRw0YKrewi4CTf2KrUi1Dg9nNrZaWO+JlwFHBIA8HiGBjkz5iZtqbf00SKK+vYYk2Ktu 8lLNGvP17vB2QTv2BFDWvajEo1F/dM3/MhbnzwrfouRdv1RYdtUIUj/FbGuYEbryL+FdVx FRKohGBvsO6ETlLqf375+54QIj9minKPNJtxji5XKmo46xdXZ9re5SvXYNweVxxUHch0/I q0ASlCiI5wnUUUSnV805KKPUwOnQbIDSXlAxwlgWZittRawAud1zIxKOf9QB1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713893931; a=rsa-sha256; cv=none; b=DQ59w1kZhCBdiFplk7uLH3PidKZTBGpNc1bJFKZdEvXfbJCG3e8y6SPI+2qgCu0LtKWo8x N+W/LMVr6RTYZz8wMB/I2fUGHIMEjmpU1C3PjvMk1lqvSejXtqzDFh7oErJa4lveKSElTY mxbd9pZKHhsYnT1yqpXBSjb5NPj9dYbBKxTCghEXhiMz8IJHoY++5X1fO6N7f40A3loN5M QFtkpDGDAOfFGXyaEpiksVVMCil8jSOqWS9xp7ntGy+GHa4Vc1Kn0NF2r9mvIlyoe/V7Vo TcoizNdDqfk1/5Z/C0GWOL0KFKRC51diMDcl456WQxADMJMlgmcL62YQOC8hEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53kkQNoEVTDtf87oWcpn1ynKitRABfYoR7hRVmdA1o4=; b=bt0d1MewFCUPC7Zz2i4C50DNX3INmodz9dJWsdVJRc4bng/CKSTf9/eRoZ//M8B2XXEJe+ CwG2fLxck6kF5tHIYsVowPSaV7X1ys0UmEaY+EliBc4YZV/jgGR5EyLCMXqVbtzLfWEi6d ItGFHS/0LTqbBZFkR+GFQopLJRd+JyJtNUGHCXB5gE2rujD6MSCBcaEMyEmVZaXhtGkVqz zmMoEXD7U46rTDcjECbTEk1+OfdF177+bswZExEbVmR9z8QBFoKHiWCjLBk6+YJ0cUPqfM oxvkP0tZ9HOoa/9K1jisWUNpSjvnaH6Bw7iaZ1yE31AkhwhUAT+MCnvWVlrabA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8Vg3VlCzhPH; Tue, 23 Apr 2024 17:38: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 43NHcpdx057547; Tue, 23 Apr 2024 17:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHcpwF057544; Tue, 23 Apr 2024 17:38:51 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:38:51 GMT Message-Id: <202404231738.43NHcpwF057544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7929070fb753 - stable/13 - Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7929070fb7533cf16f60ffdefacc8cc6687b5f3d Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7929070fb7533cf16f60ffdefacc8cc6687b5f3d commit 7929070fb7533cf16f60ffdefacc8cc6687b5f3d Author: Dimitry Andric AuthorDate: 2024-04-20 12:01:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-23 17:33:14 +0000 Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6. PR: 276104 MFC after: 3 days (cherry picked from commit dfa39133b333f57ca3133bf6c71cd75be4c3e801) --- .../llvm-project/clang/include/clang/Basic/Attr.td | 2 + .../clang/lib/Format/TokenAnnotator.cpp | 20 ++++---- .../clang/lib/Headers/__stddef_unreachable.h | 4 ++ .../compiler-rt/lib/builtins/riscv/restore.S | 42 +++++++++++++++ .../compiler-rt/lib/builtins/riscv/save.S | 42 +++++++++++++++ .../include/__format/formatter_floating_point.h | 2 +- contrib/llvm-project/libcxx/include/stddef.h | 29 ++++------- contrib/llvm-project/lld/COFF/Chunks.cpp | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 7 ++- contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 42 +++------------ .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 3 ++ .../llvm/lib/Target/Mips/Mips32r6InstrInfo.td | 8 +-- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++------------------ .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 44 ++++++++++++++++ .../llvm/lib/Target/X86/X86MCInstLower.cpp | 4 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +++++++- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 25 files changed, 234 insertions(+), 140 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/Attr.td b/contrib/llvm-project/clang/include/clang/Basic/Attr.td index 58838b01b4fd..dbf2dd2120fb 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/Attr.td +++ b/contrib/llvm-project/clang/include/clang/Basic/Attr.td @@ -1590,6 +1590,7 @@ def RegCall : DeclOrTypeAttr { } def Final : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"final">, CustomKeyword<"sealed">]; let Accessors = [Accessor<"isSpelledAsSealed", [CustomKeyword<"sealed">]>]; let SemaHandler = 0; @@ -2472,6 +2473,7 @@ def Overloadable : Attr { } def Override : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"override">]; let SemaHandler = 0; // Omitted from docs, since this is language syntax, not an attribute, as far diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index d0c4273cfc7e..4d482e6543d6 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -3450,10 +3450,11 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { for (AnnotatedLine *ChildLine : Line.Children) calculateFormattingInformation(*ChildLine); - Line.First->TotalLength = - Line.First->IsMultiline ? Style.ColumnLimit - : Line.FirstStartColumn + Line.First->ColumnWidth; - FormatToken *Current = Line.First->Next; + auto *First = Line.First; + First->TotalLength = First->IsMultiline + ? Style.ColumnLimit + : Line.FirstStartColumn + First->ColumnWidth; + FormatToken *Current = First->Next; bool InFunctionDecl = Line.MightBeFunctionDecl; bool AlignArrayOfStructures = (Style.AlignArrayOfStructures != FormatStyle::AIAS_None && @@ -3475,16 +3476,15 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName); IsCtorOrDtor || isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) { - if (!IsCtorOrDtor) { - LineIsFunctionDeclaration = true; + if (!IsCtorOrDtor) Tok->setFinalizedType(TT_FunctionDeclarationName); - } + LineIsFunctionDeclaration = true; SeenName = true; break; } } - if (IsCpp && LineIsFunctionDeclaration && + if (IsCpp && (LineIsFunctionDeclaration || First->is(TT_CtorDtorDeclName)) && Line.endsWith(tok::semi, tok::r_brace)) { auto *Tok = Line.Last->Previous; while (Tok->isNot(tok::r_brace)) @@ -3507,7 +3507,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (IsCpp) { if (!LineIsFunctionDeclaration) { // Annotate */&/&& in `operator` function calls as binary operators. - for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) { + for (const auto *Tok = First; Tok; Tok = Tok->Next) { if (Tok->isNot(tok::kw_operator)) continue; do { @@ -3644,7 +3644,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { calculateUnbreakableTailLengths(Line); unsigned IndentLevel = Line.Level; - for (Current = Line.First; Current; Current = Current->Next) { + for (Current = First; Current; Current = Current->Next) { if (Current->Role) Current->Role->precomputeFormattingInfos(Current); if (Current->MatchingParen && diff --git a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h index 518580c92d3f..61df43e9732f 100644 --- a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h +++ b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h @@ -7,6 +7,8 @@ *===-----------------------------------------------------------------------=== */ +#ifndef __cplusplus + /* * When -fbuiltin-headers-in-system-modules is set this is a non-modular header * and needs to behave as if it was textual. @@ -15,3 +17,5 @@ (__has_feature(modules) && !__building_module(_Builtin_stddef)) #define unreachable() __builtin_unreachable() #endif + +#endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S index 73f64a920d66..6f43842c8ca6 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S @@ -22,6 +22,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -86,8 +88,29 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + lw s1, 0(sp) + lw s0, 4(sp) + lw ra, 8(sp) + addi sp, sp, 12 + ret + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -161,6 +184,25 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + ld s1, 0(sp) + ld s0, 8(sp) + ld ra, 16(sp) + addi sp, sp, 24 + ret + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S index 85501aeb4c2e..3e044179ff7f 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S @@ -18,6 +18,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -92,8 +94,29 @@ __riscv_save_0: sw ra, 12(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -12 + sw s1, 0(sp) + sw s0, 4(sp) + sw ra, 8(sp) + jr t0 + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -181,6 +204,25 @@ __riscv_save_0: sd ra, 8(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -24 + sd s1, 0(sp) + sd s0, 8(sp) + sd ra, 16(sp) + jr t0 + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h index 6802a8b7bd4c..46a090a787ae 100644 --- a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h +++ b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h @@ -689,7 +689,7 @@ __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__par // Let P equal the precision if nonzero, 6 if the precision is not // specified, or 1 if the precision is 0. Then, if a conversion with // style E would have an exponent of X: - int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); + int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); if (__result.__exponent == __result.__last) // if P > X >= -4, the conversion is with style f or F and precision P - 1 - X. // By including the radix point it calculates P - (1 + X) diff --git a/contrib/llvm-project/libcxx/include/stddef.h b/contrib/llvm-project/libcxx/include/stddef.h index 887776b150e4..1583e78e3739 100644 --- a/contrib/llvm-project/libcxx/include/stddef.h +++ b/contrib/llvm-project/libcxx/include/stddef.h @@ -7,18 +7,6 @@ // //===----------------------------------------------------------------------===// -#if defined(__need_ptrdiff_t) || defined(__need_size_t) || defined(__need_wchar_t) || defined(__need_NULL) || \ - defined(__need_wint_t) - -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif - -# include_next - -#elif !defined(_LIBCPP_STDDEF_H) -# define _LIBCPP_STDDEF_H - /* stddef.h synopsis @@ -36,15 +24,18 @@ Types: */ -# include <__config> +#include <__config> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -# if __has_include_next() -# include_next -# endif +// Note: This include is outside of header guards because we sometimes get included multiple times +// with different defines and the underlying will know how to deal with that. +#include_next + +#ifndef _LIBCPP_STDDEF_H +# define _LIBCPP_STDDEF_H # ifdef __cplusplus typedef decltype(nullptr) nullptr_t; diff --git a/contrib/llvm-project/lld/COFF/Chunks.cpp b/contrib/llvm-project/lld/COFF/Chunks.cpp index 39f4575031be..e2074932bc46 100644 --- a/contrib/llvm-project/lld/COFF/Chunks.cpp +++ b/contrib/llvm-project/lld/COFF/Chunks.cpp @@ -652,6 +652,13 @@ void SectionChunk::getRuntimePseudoRelocs( dyn_cast_or_null(file->getSymbol(rel.SymbolTableIndex)); if (!target || !target->isRuntimePseudoReloc) continue; + // If the target doesn't have a chunk allocated, it may be a + // DefinedImportData symbol which ended up unnecessary after GC. + // Normally we wouldn't eliminate section chunks that are referenced, but + // references within DWARF sections don't count for keeping section chunks + // alive. Thus such dangling references in DWARF sections are expected. + if (!target->getChunk()) + continue; int sizeInBits = getRuntimePseudoRelocSize(rel.Type, file->ctx.config.machine); if (sizeInBits == 0) { diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index d0c27cae0dff..72b6dfa181e8 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -439,7 +439,8 @@ static Value *threadBinOpOverSelect(Instruction::BinaryOps Opcode, Value *LHS, // Check that the simplified value has the form "X op Y" where "op" is the // same as the original operation. Instruction *Simplified = dyn_cast(FV ? FV : TV); - if (Simplified && Simplified->getOpcode() == unsigned(Opcode)) { + if (Simplified && Simplified->getOpcode() == unsigned(Opcode) && + !Simplified->hasPoisonGeneratingFlags()) { // The value that didn't simplify is "UnsimplifiedLHS op UnsimplifiedRHS". // We already know that "op" is the same as for the simplified value. See // if the operands match too. If so, return the simplified value. diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3135ec73a99e..e806e0f0731f 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -3575,6 +3575,11 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, return SDValue(); if (Opcode != ISD::UADDO && Opcode != ISD::USUBO) return SDValue(); + // Guarantee identical type of CarryOut + EVT CarryOutType = N->getValueType(0); + if (CarryOutType != Carry0.getValue(1).getValueType() || + CarryOutType != Carry1.getValue(1).getValueType()) + return SDValue(); // Canonicalize the add/sub of A and B (the top node in the above ASCII art) // as Carry0 and the add/sub of the carry in as Carry1 (the middle node). @@ -3622,7 +3627,7 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, // TODO: match other operations that can merge flags (ADD, etc) DAG.ReplaceAllUsesOfValueWith(Carry1.getValue(0), Merged.getValue(0)); if (N->getOpcode() == ISD::AND) - return DAG.getConstant(0, DL, MVT::i1); + return DAG.getConstant(0, DL, CarryOutType); return Merged.getValue(1); } diff --git a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp index cbb64b299e64..f105bdb4816a 100644 --- a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp +++ b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp @@ -746,7 +746,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, Min = Min.zext(ResultBitWidth); Max = Max.zext(ResultBitWidth); } - return ConstantRange(std::move(Min), std::move(Max)); + return getNonEmpty(std::move(Min), std::move(Max) + 1); } case Instruction::SIToFP: { // TODO: use input range if available @@ -757,7 +757,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, SMin = SMin.sext(ResultBitWidth); SMax = SMax.sext(ResultBitWidth); } - return ConstantRange(std::move(SMin), std::move(SMax)); + return getNonEmpty(std::move(SMin), std::move(SMax) + 1); } case Instruction::FPTrunc: case Instruction::FPExt: diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 196aa50cf406..95d8ab95b2c0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -1658,40 +1658,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM, setMaxAtomicSizeInBitsSupported(128); if (Subtarget->isWindowsArm64EC()) { - // FIXME: are there other intrinsics we need to add here? - setLibcallName(RTLIB::MEMCPY, "#memcpy"); - setLibcallName(RTLIB::MEMSET, "#memset"); - setLibcallName(RTLIB::MEMMOVE, "#memmove"); - setLibcallName(RTLIB::REM_F32, "#fmodf"); - setLibcallName(RTLIB::REM_F64, "#fmod"); - setLibcallName(RTLIB::FMA_F32, "#fmaf"); - setLibcallName(RTLIB::FMA_F64, "#fma"); - setLibcallName(RTLIB::SQRT_F32, "#sqrtf"); - setLibcallName(RTLIB::SQRT_F64, "#sqrt"); - setLibcallName(RTLIB::CBRT_F32, "#cbrtf"); - setLibcallName(RTLIB::CBRT_F64, "#cbrt"); - setLibcallName(RTLIB::LOG_F32, "#logf"); - setLibcallName(RTLIB::LOG_F64, "#log"); - setLibcallName(RTLIB::LOG2_F32, "#log2f"); - setLibcallName(RTLIB::LOG2_F64, "#log2"); - setLibcallName(RTLIB::LOG10_F32, "#log10f"); - setLibcallName(RTLIB::LOG10_F64, "#log10"); - setLibcallName(RTLIB::EXP_F32, "#expf"); - setLibcallName(RTLIB::EXP_F64, "#exp"); - setLibcallName(RTLIB::EXP2_F32, "#exp2f"); - setLibcallName(RTLIB::EXP2_F64, "#exp2"); - setLibcallName(RTLIB::EXP10_F32, "#exp10f"); - setLibcallName(RTLIB::EXP10_F64, "#exp10"); - setLibcallName(RTLIB::SIN_F32, "#sinf"); - setLibcallName(RTLIB::SIN_F64, "#sin"); - setLibcallName(RTLIB::COS_F32, "#cosf"); - setLibcallName(RTLIB::COS_F64, "#cos"); - setLibcallName(RTLIB::POW_F32, "#powf"); - setLibcallName(RTLIB::POW_F64, "#pow"); - setLibcallName(RTLIB::LDEXP_F32, "#ldexpf"); - setLibcallName(RTLIB::LDEXP_F64, "#ldexp"); - setLibcallName(RTLIB::FREXP_F32, "#frexpf"); - setLibcallName(RTLIB::FREXP_F64, "#frexp"); + // FIXME: are there intrinsics we need to exclude from this? + for (int i = 0; i < RTLIB::UNKNOWN_LIBCALL; ++i) { + auto code = static_cast(i); + auto libcallName = getLibcallName(code); + if ((libcallName != nullptr) && (libcallName[0] != '#')) { + setLibcallName(code, Saver.save(Twine("#") + libcallName).data()); + } + } } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h index 541a810fb5cb..74d0c4bde8dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h @@ -1001,6 +1001,9 @@ private: /// make the right decision when generating code for different targets. const AArch64Subtarget *Subtarget; + llvm::BumpPtrAllocator BumpAlloc; + llvm::StringSaver Saver{BumpAlloc}; + bool isExtFreeImpl(const Instruction *Ext) const override; void addTypeForNEON(MVT VT); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td index 854563ab32bd..3ef04e488f01 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td @@ -152,15 +152,15 @@ class SELNEZ_ENC : SPECIAL_3R_FM<0b00000, 0b110111>; class LWPC_ENC : PCREL19_FM; -class MAX_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; -class MAX_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; +class MAX_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; +class MAX_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; class MIN_S_ENC : COP1_3R_FM<0b011100, FIELD_FMT_S>; class MIN_D_ENC : COP1_3R_FM<0b011100, FIELD_FMT_D>; class MAXA_S_ENC : COP1_3R_FM<0b011111, FIELD_FMT_S>; class MAXA_D_ENC : COP1_3R_FM<0b011111, FIELD_FMT_D>; -class MINA_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; -class MINA_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; +class MINA_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; +class MINA_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; class SELEQZ_S_ENC : COP1_3R_FM<0b010100, FIELD_FMT_S>; class SELEQZ_D_ENC : COP1_3R_FM<0b010100, FIELD_FMT_D>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp index c30129743a96..2c2554b5b4bc 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp @@ -388,32 +388,18 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( Opcode = Mips::XOR; break; case Mips::ATOMIC_LOAD_UMIN_I8_POSTRA: - IsUnsigned = true; - IsMin = true; - break; case Mips::ATOMIC_LOAD_UMIN_I16_POSTRA: IsUnsigned = true; - IsMin = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MIN_I8_POSTRA: - SEOp = Mips::SEB; - IsMin = true; - break; case Mips::ATOMIC_LOAD_MIN_I16_POSTRA: IsMin = true; break; case Mips::ATOMIC_LOAD_UMAX_I8_POSTRA: - IsUnsigned = true; - IsMax = true; - break; case Mips::ATOMIC_LOAD_UMAX_I16_POSTRA: IsUnsigned = true; - IsMax = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MAX_I8_POSTRA: - SEOp = Mips::SEB; - IsMax = true; - break; case Mips::ATOMIC_LOAD_MAX_I16_POSTRA: IsMax = true; break; @@ -475,42 +461,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( // For little endian we need to clear uninterested bits. if (STI->isLittle()) { - if (!IsUnsigned) { - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), OldVal) - .addReg(OldVal) - .addReg(ShiftAmnt); - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), Incr) - .addReg(Incr) - .addReg(ShiftAmnt); - if (STI->hasMips32r2()) { - BuildMI(loopMBB, DL, TII->get(SEOp), OldVal).addReg(OldVal); - BuildMI(loopMBB, DL, TII->get(SEOp), Incr).addReg(Incr); - } else { - const unsigned ShiftImm = SEOp == Mips::SEH ? 16 : 24; - BuildMI(loopMBB, DL, TII->get(Mips::SLL), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SLL), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - } - } else { - // and OldVal, OldVal, Mask - // and Incr, Incr, Mask - BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) - .addReg(OldVal) - .addReg(Mask); - BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr) - .addReg(Incr) - .addReg(Mask); - } + // and OldVal, OldVal, Mask + // and Incr, Incr, Mask + BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) + .addReg(OldVal) + .addReg(Mask); + BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr).addReg(Incr).addReg(Mask); } + // unsigned: sltu Scratch4, oldVal, Incr // signed: slt Scratch4, oldVal, Incr BuildMI(loopMBB, DL, TII->get(SLTScratch4), Scratch4) diff --git a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 215a8ea83190..6855471840e9 100644 --- a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -434,6 +434,50 @@ bool SparcAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, default: // See if this is a generic print operand return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O); + case 'L': // Low order register of a twin word register operand + case 'H': // High order register of a twin word register operand + { + const SparcSubtarget &Subtarget = MF->getSubtarget(); + const MachineOperand &MO = MI->getOperand(OpNo); + const SparcRegisterInfo *RegisterInfo = Subtarget.getRegisterInfo(); + Register MOReg = MO.getReg(); + + Register HiReg, LoReg; + if (!SP::IntPairRegClass.contains(MOReg)) { + // If we aren't given a register pair already, find out which pair it + // belongs to. Note that here, the specified register operand, which + // refers to the high part of the twinword, needs to be an even-numbered + // register. + MOReg = RegisterInfo->getMatchingSuperReg(MOReg, SP::sub_even, + &SP::IntPairRegClass); + if (!MOReg) { + SMLoc Loc; + OutContext.reportError( + Loc, "Hi part of pair should point to an even-numbered register"); + OutContext.reportError( + Loc, "(note that in some cases it might be necessary to manually " + "bind the input/output registers instead of relying on " + "automatic allocation)"); + return true; + } + } + + HiReg = RegisterInfo->getSubReg(MOReg, SP::sub_even); + LoReg = RegisterInfo->getSubReg(MOReg, SP::sub_odd); + + Register Reg; + switch (ExtraCode[0]) { + case 'L': + Reg = LoReg; + break; + case 'H': + Reg = HiReg; + break; + } + + O << '%' << SparcInstPrinter::getRegisterName(Reg); + return false; + } case 'f': case 'r': break; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp index 58ebe023cd61..7ce0aa22b997 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp @@ -959,8 +959,10 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI, SmallString<256> Code; unsigned MinSize = MI.getOperand(0).getImm(); - if (NextMI != MI.getParent()->end()) { + if (NextMI != MI.getParent()->end() && !NextMI->isInlineAsm()) { // Lower the next MachineInstr to find its byte size. + // If the next instruction is inline assembly, we skip lowering it for now, + // and assume we should always generate NOPs. MCInst MCI; MCIL.Lower(&*NextMI, MCI); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 0a9e2c7f49f5..1fbd69e38eae 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -11653,12 +11653,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, -1)) TysForDecl.push_back( FixedVectorType::get(CI->getType(), E->Scalars.size())); + auto *CEI = cast(VL0); for (unsigned I : seq(0, CI->arg_size())) { ValueList OpVL; // Some intrinsics have scalar arguments. This argument should not be // vectorized. if (UseIntrinsic && isVectorIntrinsicWithScalarOpAtArg(ID, I)) { - CallInst *CEI = cast(VL0); ScalarArg = CEI->getArgOperand(I); OpVecs.push_back(CEI->getArgOperand(I)); if (isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) @@ -11671,6 +11671,25 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n"); return E->VectorizedValue; } + auto GetOperandSignedness = [&](unsigned Idx) { + const TreeEntry *OpE = getOperandEntry(E, Idx); + bool IsSigned = false; + auto It = MinBWs.find(OpE); + if (It != MinBWs.end()) + IsSigned = It->second.second; + else + IsSigned = any_of(OpE->Scalars, [&](Value *R) { + return !isKnownNonNegative(R, SimplifyQuery(*DL)); + }); + return IsSigned; + }; + ScalarArg = CEI->getArgOperand(I); + if (cast(OpVec->getType())->getElementType() != + ScalarArg->getType()) { + auto *CastTy = FixedVectorType::get(ScalarArg->getType(), + VecTy->getNumElements()); + OpVec = Builder.CreateIntCast(OpVec, CastTy, GetOperandSignedness(I)); + } LLVM_DEBUG(dbgs() << "SLP: OpVec[" << I << "]: " << *OpVec << "\n"); OpVecs.push_back(OpVec); if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 82f25ad621b6..687fb1656937 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 782f047618b5..536f72efec52 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 18.1.3 -#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION 18.1.4 +#define CLANG_VERSION_STRING "18.1.4" #define CLANG_VERSION_MAJOR 18 #define CLANG_VERSION_MAJOR_STRING "18" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index c9d51f35c752..65838f76ba5d 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7cef82df9e4f..1fc1a4d88b7b 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 18.1.3 -#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION 18.1.4 +#define LLDB_VERSION_STRING "18.1.4" #define LLDB_VERSION_MAJOR 18 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5cf49eceeced..a017437dc568 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -344,10 +344,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 18.1.3" +#define PACKAGE_STRING "LLVM 18.1.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "18.1.3" +#define PACKAGE_VERSION "18.1.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 2b7d5b3e9504..fb878ccdde4d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -180,10 +180,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "18.1.3" +#define LLVM_VERSION_STRING "18.1.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index b1a8aef7de29..e324de0f9fc6 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Tue Apr 23 17:43:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP8c70Cfnz5HjGP; Tue, 23 Apr 2024 17:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VP8c66jv8z4L3V; Tue, 23 Apr 2024 17:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713894214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmbz2ItH6lXLUvslH8q9PtOwuuMr3pI32PF25Hyq1JQ=; b=iqY1vIc6b2Fy6pDCHWYiVhZbNpaozXLlSJ6TmGAFAiZajj3+Z3R5Zp+jhUMb/6udAibl9A DQ7SlNbUDEC/Eby6pJHcR0413OOPTtL4TlyVr+fl1WqGq0DBX8MHvMwzFJDitk5BkItuWK TLJqsviCXSc2uoE+kRK33+CTVyubS6flZO+kcvdsOZgbOgApmEBoflpEcYQJVgBdW0cKAF 5IDC6CE1snJ77NE1YKfS505fPrUX3CDAn0vWdDu59e43vCe+29y4XBLUAzELQtcG4BUsR2 1xLbF7DdsSykQlCarJnRhDecX8VacHdkjDXvcnd3/igTbYkNIY0Pqes5CYUflw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713894214; a=rsa-sha256; cv=none; b=FNSeb33bDCmVi54wxbLcoCGHkWhwlFxfRYiDFetkdW4HQk+wSGRAKDAaUgQ0v/pQ2/xVlh A0jWklT+plYWtsl7MzM3T+ZsKTmwjNR182FpdIDIt5XbeKlwgvFBjk4c+WG6sB7MAPNkhC fpLYGFcJTWNFyGP/eeRXcDYN6l9GdTiTTBDyorfr93T85pHypEzAB8MW8EnLUTxEsfnOCs aV6hDmGYp7QsnRpUrHd+lh+4coZ5tGs7hpvnQs5j3jr0a0n50CGbpdoLoKgz1U+C4JEe42 s4XV2bsDz67al09u+J8xBmik0io9vl9DvC5tIyQ30bvSQlZJQ82jd1J5cSq/Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713894214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmbz2ItH6lXLUvslH8q9PtOwuuMr3pI32PF25Hyq1JQ=; b=uQm12it8BhHEEvBeETgV73IEuMtlxXnP7MMAHBk4z2GoEyPpFLPuIgiwrC9yf8rDKODzPl ce4cK5DhyL5GVfmLYu59/DWOT0hywBAuZX2E2RF5UAt9E7xOrmd1kypbS79FD4pzZ8Avg0 Q+1q8UbKHKoR0FZ5W+DOvObyFNF2c1P+WJok52Ilfk6dZvqvjvbtxaQddMBchSbGmC3fS5 tCiCCdLHWxz7MgEhx7jNZG4k5WjHqFt9hUbwPU09UFUKNiDf8Nu8HzkY7INWWlpCJp/+b4 1nyDdQ71G1iQxtdTNviOe5AiHg3R3yREda08Z+heZ+oAIscaoTJriwMoNtJAYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8c66KDwzh7x; Tue, 23 Apr 2024 17:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NHhYWt073125; Tue, 23 Apr 2024 17:43:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHhYC2073122; Tue, 23 Apr 2024 17:43:34 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:43:34 GMT Message-Id: <202404231743.43NHhYC2073122@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: f48643d376a4 - main - Use MOVED_LIBS for usr/lib/libcxxrt.so.1 ObsoleteFiles.inc entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f48643d376a45529094d39db25a471a19ab40870 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f48643d376a45529094d39db25a471a19ab40870 commit f48643d376a45529094d39db25a471a19ab40870 Author: Dimitry Andric AuthorDate: 2024-04-23 17:40:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-23 17:40:29 +0000 Use MOVED_LIBS for usr/lib/libcxxrt.so.1 ObsoleteFiles.inc entry Otherwise, the "make delete-old-libs" mechanism also deletes 32-bit copies, such as in /usr/lib32. Reported by: Josef 'Jeff' Sipek Fixes: 911a6479e18b --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a4301ebdab41..02477bbebd0b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,7 +52,7 @@ # done # 20240422: remove improperly installed libcxxrt.so.1 -OLD_LIBS+=usr/lib/libcxxrt.so.1 +MOVED_LIBS+=usr/lib/libcxxrt.so.1 # 20240414: unix_socketpair_test renamed OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test From nobody Tue Apr 23 17:57:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP8vj4WLKz5Hk2l; Tue, 23 Apr 2024 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VP8vj3ytYz4PBC; Tue, 23 Apr 2024 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713895025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/431zGEdsNQZ29LchYSG3UQrCBVVuMnJJD7ApEm0XM=; b=Ntitk+1zoqncj5TFkzCTmI5VhNQV5j3l6/Sfsz+6UsPAfM4mcplVH/4+et8hTIx4pQveAW 1ZSBsaLVOf3dIp0F4g4RZ3PmCfzgT2uioQ5TJ3LNZU3zmBlSaMxoYqPnaSkc7jjaj3BaOI 1cehZzYlqb4eaB6HsYPNAPGrbE3qjTk8d3Imh6q7HPJR+OV62hUHg5jJ9Zs5xZuBUP2cX5 McYvBtXhypnCStvnktewa2iG9uF+SfWSFtKJnCYFV/0myHiJV6OcsuFXsA5o+bY5HNKtDb B3zY2kqVIBiD+8DAULOK8FNlFmx9r0NVZpRYFHiOkP4ClPKTuN3rOWoQYnZOdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713895025; a=rsa-sha256; cv=none; b=M/QeqpfWUgkazbjYKbvHQdB9KaAremPeX0tlykuIzOSg9Xo+w9NDTnFvp3qxgYh0k1GuSK zrMzwwU+J0orf9hQete50HupmTefJ9SUJ37Ra29t6yKV5cx7AkHRzG7S97aRSdKMsywgBg h2FR969Afp7TeY1zXi0cxcyg2W2QvekO/8V8eO5bx66pxtzVA/sQMc+O9SpNSI5KSw0Hc0 aDlTpsGJ7wjBoqpwx7E9RPmNiV2vn4gDRdc+GWkGs+HFYusMlhpAyThdxbpARWWxynTNKK b+/KAY4QCnz+/ExEckyHI7IREHrP8nw4RdBtWpW8H2kOOHOum+oKf4TJSzH90w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713895025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/431zGEdsNQZ29LchYSG3UQrCBVVuMnJJD7ApEm0XM=; b=yUJ9ioUD0OJqIpeNu4FDIC7ruPchymfV68FmxAQlFGMSvtRgup0bfjvEfp33dwI3GgBiO5 hxuDccIjslMZpEEn+4bimP60CUIkxpkKXgteDEvNxK/1Tc23bnm359SpY3IFL0IfO3e7JP EZLwW6nI6551ropuncbOTk5xqIj+GEHDbTuN1ysS3fVo3WTxUWXRz7Vn/lTI0C4DUnHqQL HIHDLiYLkzwIQoxUy3S45tpPtq9CJnIYTZDlDrO1v+dial49YujDW/fOGVZlHnWpm/woOB Is0WuJ2hzwkMshFb3nnYcw1SmxP2w6qg+sMd4rGGw/vK76R+NjhPcgCSAUR86g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8vj3ZXzzhfs; Tue, 23 Apr 2024 17:57: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 43NHv5iV091147; Tue, 23 Apr 2024 17:57:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHv5Uk091144; Tue, 23 Apr 2024 17:57:05 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:57:05 GMT Message-Id: <202404231757.43NHv5Uk091144@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: 86d06911d60b - stable/14 - Cirrus-CI: switch to llvm18 by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 86d06911d60b5bdbd795e9c5a5d3153285aebc6e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=86d06911d60b5bdbd795e9c5a5d3153285aebc6e commit 86d06911d60b5bdbd795e9c5a5d3153285aebc6e Author: Ed Maste AuthorDate: 2024-04-06 21:53:17 +0000 Commit: Ed Maste CommitDate: 2024-04-23 17:56:58 +0000 Cirrus-CI: switch to llvm18 by default As of commit 439352ac8257 Clang/LLVM 18 is the default in-tree compiler. Follow suit in with the external toolchain package used by Cirrus-CI. Sponsored by: The FreeBSD Foundation (cherry picked from commit e8b7c78c1b38d0486ff12993c0529a201030bd07) --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 90d031a919f2..13719a3e2058 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,15 +23,15 @@ task: TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm17 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm18 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Tue Apr 23 18:22:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP9Sn3wvcz5Hnyj for ; Tue, 23 Apr 2024 18:22: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 4VP9Sn3FpGz4VMH; Tue, 23 Apr 2024 18:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713896537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5B8AKQBvFsOF7ymBskf3aBPidgPkgW/AgCw8tWQDOQ=; b=OZ4+i6cnCEvuGitxSfgj9R0xSv9wXuuhC7F7PaQVcO0YHB7B0xJ7a95VSbZnTKd5MWZWMp +Soy5er2n/SUD61dvnpeQ9qEsL90jL9kbtSAfJmxBj7M6/hEfb2RXpwwhnpYeJ7l4iVbdt qiI9V9F1mLXVG7Bg8luRepULtK9Q5na6q1upkz1oMmy/zRfSJ6O+JtB/v1my5CTk6y6Pnx cgE58srS/Knv9bObgURIUwZf8oRoogOEMQJ8IasbMUAH+GT0j5V5rf+rjLDB3DCe9NQuRS rdbW+5oaSqiKERvGK1O/k7cWXor9zoT/06w1fOktruzdMSBCMLBfxB8lF7QCsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713896537; a=rsa-sha256; cv=none; b=r5zGPCQ5Noho+3oJmBkpvlCvusD87nUa1272KLEXrcojqI4arvyfPInvIj3HiKDAFFZ+qa ubiZ2HZ0OLIJM87sxQo4eArCNnpgtFCgUfDTtaAjBWwg2PRxxrnucWZnZZewf5MbJwq+ZH epNAW5TEYI6lUwMxH2Ez+UjcbMdQq+KoSfTGJEGj4xX4t4uwWPahb5+aEWwv13aP71qzI6 dcTFV/kcpmZcS1UE0lSzHfloB9wsRUY+m/6NIhhTW7eqXN+8GcWPj3jBzxYJIj6/+A0DAo bYC/alZqtW3WF5nFZqOXk86AZfmlgqxAbqfzmlcGnW59DlktkXt0LYnB365MOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713896537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5B8AKQBvFsOF7ymBskf3aBPidgPkgW/AgCw8tWQDOQ=; b=r27IThTgUxixZ7zF6V0ucX7MdOkpD9Bs8RNG4UTeCHPKPGURdL3TmFIiVmkB7ag+XsT6Pz tPXtDdsfQ3H3yIhoIf/y9NxKdym3bu9pDZmXgYPp5P/U2qCZfWTWZRyoBO8pWwR2CEw/MG cR5HCXruyNgf1Mpl7J1YqcfylfWt/JEdtRMYTgToKF9IvdWSlu2/15gLv2Xsok2MebNo9f cO9J41AgAPfb+QgVCdwyELE4eBTDmAbaqJC0ybKc3eajoND9QgBw/zTfnhYHnN73AWfFuL 4MZATvt3lc1JNl7pU4z9r8yEyCEb5lH59+W66sBFGl4yVXTXaWz+8uQF9IdfgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP9Sn2sdszj2m; Tue, 23 Apr 2024 18:22: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 43NIMHjV040357; Tue, 23 Apr 2024 18:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NIMHtJ040356; Tue, 23 Apr 2024 18:22:17 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:22:17 GMT Message-Id: <202404231822.43NIMHtJ040356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 90ba19eb7b81..1f940de07224 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 1f940de07224c2068e7c721222b1f3a519820ca9 X-Git-Oldrev: 90ba19eb7b81f0225e63bedfb902000d23383921 X-Git-Newrev: 1f940de07224c2068e7c721222b1f3a519820ca9 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=90ba19eb7b81..1f940de07224 cf60db6ebe51 zts: add a debug option to get full test output 454c0b0e46ec Linux 6.8 compat: META (#16099) 35bf2584852d Fix: FreeBSD Arm64 does not build currently cd3e6b4f4c5e Add zfetch stats in arcstats f75574cbaaa1 tests/quota_005_pos: use a long int for doubling the quota size 26d49fec5f86 tests/quota: consistently clear quota property between tests 9f83eec03904 Handle FLUSH errors as "expected" f4f156157de3 abd_iter_page: rework to handle multipage scatterlists c183d164aa11 Parallel pool import 9b43d7ba8505 Add newline to two zpool messages cdae59e15300 ZTS: user_namespace_004.ksh avoid error in cleanup if unsupported 7e52795aad56 ztest: use ASSERT3P to compare pointers c346068e5efe zfs get: add '-t fs' and '-t vol' options 4036b8d027fb Refactor dbuf_read() for safer decryption 87d81d1d13e0 zfs-kmod: fix empty rpm requires/conflicts 1f940de07224 L2ARC: Cleanup buffer re-compression From nobody Tue Apr 23 18:49:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPB3r5WTXz5Hr3h; Tue, 23 Apr 2024 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPB3r4sXvz4Y5k; Tue, 23 Apr 2024 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA+Omt+tVgzlctiRWMEQ1DBqTTfzfJxgZ2dVsBwJpQo=; b=eKqLIx5IOa0+iF4qO5WE51372krEKodoYB5YArw6qxLbZFYrQCSoKF9RInadkG7ZGsAu78 ughcQGJ2B0tv8lw6GHPMTt9v12wkIIyBgRWUtdtSddO6FbzeKE9pI/WNdg3AzdiCOv5MzE gQt3M7CFf5ttbkmkpnl9QbXuDMkU9tN+aYAF5GcDbB95T9iKI9gQbNbc1HZIXHL4aaLc9F TMmL8cystb6Z0ppoq/jauyUoL/260BC+bqbHICR9GhVeruyaWcvUJ17xIs1QCEAzU2zZ5E xyFtAoMjxD1X2heP6JAI2CpnkSFLGAzCkcKUh5lu/TsMywfAyLe48xXhcvaOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898152; a=rsa-sha256; cv=none; b=oSJGj8rm4Es69/wfvZk0IOGwdQ1/EL+yHyT/VWMs3daoGCww227CAsrfwKoqSx3rfDZzAs Z6XcPu6n36Gja0ZVfvvm6ZHH5k2GrImVlk/2zXEH/hJ5PRItruUookU8OReyeJcGWwTpRe aYjJmKgXQPByMkmcd8GzHcIDbABl0vM9j8KiPKWYLo3CQkvsUkV2sqVf8Fnt+NxSQUGB2Q EiIsHBKiGie1+YzLSE0gM56eiGb1jdek1o3r4ZgOlh9gGm1GeqW4WjmVz6NQWBlD2oGziC da7UAAT+v2xMStHu2I8Ils1vSWiRzHP41LK96qY5pr5iAokxKEeeur7P59Tf6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA+Omt+tVgzlctiRWMEQ1DBqTTfzfJxgZ2dVsBwJpQo=; b=uD1Vjt78a60VRAiXgxhqbG6tarKyDHsjzWLt5LzYWcBON0odfS5zH/c/viFV+EWaVzzeCk kq1QNkPcpWdmtfc6RTOuXuE3UXBwdC8toNZzJbzofSECgZv38BmghTL5FztkoQgbMoMrvp ItWEq1kBeEAxppD7HmFTuRz8vksyTzHpnUYe5mkjnGovMGRtC2S3Nh770TZTsud7p1msvk jClPdUoGsDtuQDNJUyCIDjvokzj9yN+S25fg1mb+Or6jC09cv/CEUjZ4vdAN1aYbywufxW uPDO6HgshdFc+91H3manogqqpyLNxo+WQEZGiGWic+EgUa6rwQ+Gvnkq73iMTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPB3r48k5zkDR; Tue, 23 Apr 2024 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NInCUF076631; Tue, 23 Apr 2024 18:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NInC2C076628; Tue, 23 Apr 2024 18:49:12 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:49:12 GMT Message-Id: <202404231849.43NInC2C076628@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: 2b676a66c00a - main - camcontrol: Enable WITH_NVME unconditionally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2b676a66c00af03e4b64d072658d2478dbdf0a97 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2b676a66c00af03e4b64d072658d2478dbdf0a97 commit 2b676a66c00af03e4b64d072658d2478dbdf0a97 Author: John Baldwin AuthorDate: 2024-04-23 18:46:53 +0000 Commit: John Baldwin CommitDate: 2024-04-23 18:47:12 +0000 camcontrol: Enable WITH_NVME unconditionally MK_NVME is no longer marked broken for any platforms, so just include support for it always as we do for ATA and SCSI. Reviewed by: emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44841 --- sbin/camcontrol/Makefile | 4 +--- sbin/camcontrol/camcontrol.c | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile index e0407dd20a56..b04eb5614c62 100644 --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -14,14 +14,12 @@ SRCS+= progress.c SRCS+= timestamp.c SRCS+= util.c SRCS+= zone.c -.if ${MK_NVME} != "no" .PATH: ${SRCTOP}/sbin/nvmecontrol -CFLAGS+= -I${SRCTOP}/sbin/nvmecontrol -DWITH_NVME +CFLAGS+= -I${SRCTOP}/sbin/nvmecontrol SRCS+= identify_ext.c SRCS+= nc_util.c .PATH: ${SRCTOP}/sys/dev/nvme SRCS+= nvme_util.c -.endif # This is verboten .if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 555a67001443..db26b45ac508 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -60,9 +60,7 @@ #include #include #include "camcontrol.h" -#ifdef WITH_NVME #include "nvmecontrol_ext.h" -#endif typedef enum { CAM_CMD_NONE, @@ -278,9 +276,7 @@ static int print_dev_ata(struct device_match_result *dev_result, char *tmpstr); static int print_dev_semb(struct device_match_result *dev_result, char *tmpstr); static int print_dev_mmcsd(struct device_match_result *dev_result, char *tmpstr); -#ifdef WITH_NVME static int print_dev_nvme(struct device_match_result *dev_result, char *tmpstr); -#endif static int requestsense(struct cam_device *device, int argc, char **argv, char *combinedopt, int task_attr, int retry_count, int timeout); @@ -600,14 +596,12 @@ getdevtree(int argc, char **argv, char *combinedopt) skip_device = 1; break; } -#ifdef WITH_NVME } else if (dev_result->protocol == PROTO_NVME) { if (print_dev_nvme(dev_result, &tmpstr[0]) != 0) { skip_device = 1; break; } -#endif } else { sprintf(tmpstr, "<>"); } @@ -781,7 +775,6 @@ print_dev_mmcsd(struct device_match_result *dev_result, char *tmpstr) return (0); } -#ifdef WITH_NVME static int nvme_get_cdata(struct cam_device *dev, struct nvme_controller_data *cdata) { @@ -843,7 +836,6 @@ print_dev_nvme(struct device_match_result *dev_result, char *tmpstr) cam_close_device(dev); return (0); } -#endif static int requestsense(struct cam_device *device, int argc, char **argv, @@ -2489,7 +2481,6 @@ ataidentify(struct cam_device *device, int retry_count, int timeout) return (0); } -#ifdef WITH_NVME static int nvmeidentify(struct cam_device *device, int retry_count __unused, int timeout __unused) { @@ -2501,12 +2492,10 @@ nvmeidentify(struct cam_device *device, int retry_count __unused, int timeout __ return (0); } -#endif static int identify(struct cam_device *device, int retry_count, int timeout) { -#ifdef WITH_NVME struct ccb_pathinq cpi; if (get_cpi(device, &cpi) != 0) { @@ -2517,7 +2506,6 @@ identify(struct cam_device *device, int retry_count, int timeout) if (cpi.protocol == PROTO_NVME) { return (nvmeidentify(device, retry_count, timeout)); } -#endif return (ataidentify(device, retry_count, timeout)); } @@ -5410,7 +5398,6 @@ cts_print(struct cam_device *device, struct ccb_trans_settings *cts) "enabled" : "disabled"); } } -#ifdef WITH_NVME if (cts->protocol == PROTO_NVME) { struct ccb_trans_settings_nvme *nvmex = &cts->xport_specific.nvme; @@ -5427,7 +5414,6 @@ cts_print(struct cam_device *device, struct ccb_trans_settings *cts) nvmex->speed, nvmex->max_speed); } } -#endif } /* From nobody Tue Apr 23 18:49:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPB3s725Tz5Hqyp; Tue, 23 Apr 2024 18:49: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 4VPB3s5Znyz4YYS; Tue, 23 Apr 2024 18:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/qFzq3LzTeK1+QgeqTkmJBXeLoMOw50u+Hat4+r54xU=; b=x+3piUK4Gx9nZoavX1WZBZ7uVETKDjFD6+kW+hYzK/7Ro6SvipDfGGsVC8UFItn4TN5zqf T7XI4lwtO0+CoJm2tcSSeR7ixCl8k9eulnbt3N//1ckF8GhYJ2QksmRRZMzmnDpwDmx3HU fiXFpDNEtPk1+hGWOH21hAIJnQGVQ6m0LszZ/GhfWnbEpjMOM8ANYhODbgUUtCp7KJp08J +jMuXCI6+0CgVVqiRel0QA8J02II2DgXClZpCKnZTcUOzMn53fG3k+zGWG02aDR+EeH0Nu QTZ+yJD4AZpfSjaC5Yjj+mw5Hzv1JoPb7IEku1HhfU85GSJUPaqSXix2EnIFRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898153; a=rsa-sha256; cv=none; b=Prh0w2wP2gXeLquFejlb1M9rPC6Ax/KtVLrmBZNrag/nBCppSyj5FQRMilZLbFpQF7q5cN gAigRA8ALX2fuSD4iq81f0e9szsViunOYXbkaRvkOMyHjCiOWHF+OHKFgtCIIDFS49CJG6 v831/v7RgZrZaBlcl6heYwTVMs841tF8oAwq+siMSXnCSArtkTT5XAaKS0cGHz+sQ6g16b 2iKdDf8FNKZ/SlB3BvCwaTzhDmLDEqizexInlZtqrI1XkBvWcfQi/24IeMN1XFLjPh1d+J ElVEp+stMf4zTlvvzNrakTl+VMfXNkZJnGudcf1IOrfYVG8lVPfGu8cO+frkEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/qFzq3LzTeK1+QgeqTkmJBXeLoMOw50u+Hat4+r54xU=; b=yIVT2dTKgUotEqyl0bhk2Ks+BAYKROIVxaKf44kRC7LyJ7O7YhfChtbpS/4kUKB8l9aO6k R01gFiv8ctJaF9l30MJYG7uc5GPzP02GqNqQHgGjk03XYPmH6qi6DHxwsIgWSCrV25PIVg Bb2NF0CcJFNCuYUvB+M9vHF+m3GyuTPi8/TDpM8FCxvNDpbzpW8brStDkxvRXBE1AxtAw/ AkK9lTjKjz6Jlprl5Orl8PMXeM8RrESRpV9nlnE+0zQ46Qiz7l5xtCdyAnQMWkXC8RViuJ DrjHvIAGgNoxGYyGCUA48//4AOPkcryWLELzPLLqPNHE2PnbKIp65wovlVqn1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPB3s5B39zk2N; Tue, 23 Apr 2024 18:49: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 43NInD9A076686; Tue, 23 Apr 2024 18:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NInDTE076683; Tue, 23 Apr 2024 18:49:13 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:49:13 GMT Message-Id: <202404231849.43NInDTE076683@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: 2d51a9898e26 - main - nvmecontrol: Always build instead of being conditional on WITH_NVME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2d51a9898e26c87586ba50e71b6b3fdf1591713d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d51a9898e26c87586ba50e71b6b3fdf1591713d commit 2d51a9898e26c87586ba50e71b6b3fdf1591713d Author: John Baldwin AuthorDate: 2024-04-23 18:47:26 +0000 Commit: John Baldwin CommitDate: 2024-04-23 18:47:26 +0000 nvmecontrol: Always build instead of being conditional on WITH_NVME This now builds fine on all platforms so always include it similar to other tools such as camcontrol. Reviewed by: imp, emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44842 --- sbin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/Makefile b/sbin/Makefile index 342f385f090b..200dc9da11c8 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -51,6 +51,7 @@ SUBDIR=adjkerntz \ newfs_msdos \ nfsiod \ nos-tun \ + nvmecontrol \ pfilctl \ rcorder \ reboot \ @@ -77,7 +78,6 @@ SUBDIR.${MK_INET6}+= rtsol SUBDIR.${MK_IPFILTER}+= ipf SUBDIR.${MK_IPFW}+= ipfw SUBDIR.${MK_IPFW}+= natd -SUBDIR.${MK_NVME}+= nvmecontrol SUBDIR.${MK_OPENSSL}+= decryptcore SUBDIR.${MK_PF}+= pfctl SUBDIR.${MK_PF}+= pflogd From nobody Tue Apr 23 18:49:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPB3v10zQz5Hqyq; Tue, 23 Apr 2024 18:49: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 4VPB3t6GvPz4YTB; Tue, 23 Apr 2024 18:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vSf0FyPbA2yGfCK/f1/E6XgP/IqiW+jN4g2kGHR/lo=; b=P9vEbQJq+/4Dax3st1d0kX28KCVE4DjHfgTkYfQ9P6RATBApbKRXv8N+cE6+/PbUnyQg6I 4zzhnN1DZYrDMmtozgFKB8zwRWbnO7nXCDzTe2MCa0jbZ1L7q7sc2B7Nc8i7EOJ1IaV7Tb bMORUyEQZrzZYPLEC24b7oZdIiaH6vYchax80QyhX649DFQ2MeiFxsaDEGsQQfBdBjtbRD 0MZk7jJo16KbWTTvvIZjHIUhzEDkwiWGcmNLXvbkYiN0RNiTPgNW/4w/yW+tiz0FfALyVK g1Rv2nFNSDtzgN7iEhnWEJACNOJk37+NZnD1P5w8DQ5QlHCgqvoina1dMkORqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898154; a=rsa-sha256; cv=none; b=qhoH3nkqsoPbYh38NbESEVY5MTWbcoIqmWDjButwMu3CavixWZuBf1qZBou+2Bo8dG282f 14yV2Hxz2yZid76a2BNMZ8/TAFmU2SDMXVXkFrDjUzPmf3D9LWZPtv8rEkQl4Z5FgXli7k CE/Irj52oNw3fkIrv6Jr1Ti20Ngcj7+m7DCL6JgjfTY/dGmhtUJIeMbx74bHiSQkkmo3Sz fuu3RLPzQqKa5RgXDssDISWKhj57NMRk74WoUZjjGU7EzehpvSc1KHpUzvQNXZ6kU+3v+a foEzivx5m/xKcC8Fc79xV08GihyB3TYLK/oxpzU0837CeQ8/SDpd9j58B9pVMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vSf0FyPbA2yGfCK/f1/E6XgP/IqiW+jN4g2kGHR/lo=; b=KyYUzOwHfCvNLBgcmAL2V754+GUt24c5LXdRDtGmSkGnBQqd2l+uM26HR9v0OiCZkJAHaV NXvVS9HDokXhaAhKW+mnyIIlsrNvg/fGQrHdMvnZWFUqvq2sifz3WEFxWOWE+Mp5AQGLlZ tz/AVYMewz48Ny8THcRZtJfB9/iBhK0nBkIyCuBiiDr5U074xKA9m0PS0gzNMevoxeMjkj JqRAenGut5HgeftM+n65LVaKxulMWfKD1pJDsJz4pEsFCSQBg4pFXci8guhSKJm2RCgZgw UTGbxaCoEFg0ncTXTSjJCP+6PVKd3D65GiHUZnJOQknd1LJk8eIFzwKRP2LuqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPB3t5tSKzjW2; Tue, 23 Apr 2024 18:49: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 43NInEtV076728; Tue, 23 Apr 2024 18:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NInESA076725; Tue, 23 Apr 2024 18:49:14 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:49:14 GMT Message-Id: <202404231849.43NInESA076725@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: ee3187f6fa79 - main - Remove the MK_NVME build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ee3187f6fa7986c6bfaa97528e050b796eaca343 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3187f6fa7986c6bfaa97528e050b796eaca343 commit ee3187f6fa7986c6bfaa97528e050b796eaca343 Author: John Baldwin AuthorDate: 2024-04-23 18:47:44 +0000 Commit: John Baldwin CommitDate: 2024-04-23 18:47:44 +0000 Remove the MK_NVME build option The drivers and utilities are now built and installed unconditionally. Reviewed by: imp, emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44843 --- share/mk/src.opts.mk | 1 - tools/build/options/WITHOUT_NVME | 1 - tools/build/options/WITH_NVME | 1 - 3 files changed, 3 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3d3a1299fac9..b7196b6fe824 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -149,7 +149,6 @@ __DEFAULT_YES_OPTIONS = \ NS_CACHING \ NTP \ NUAGEINIT \ - NVME \ OFED \ OPENSSL \ PAM \ diff --git a/tools/build/options/WITHOUT_NVME b/tools/build/options/WITHOUT_NVME deleted file mode 100644 index 9669deb2ed9e..000000000000 --- a/tools/build/options/WITHOUT_NVME +++ /dev/null @@ -1 +0,0 @@ -Do not build nvme related tools and kernel modules. diff --git a/tools/build/options/WITH_NVME b/tools/build/options/WITH_NVME deleted file mode 100644 index 053cfc568b10..000000000000 --- a/tools/build/options/WITH_NVME +++ /dev/null @@ -1 +0,0 @@ -Build nvme related tools and kernel modules. From nobody Tue Apr 23 18:49:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPB3w2v19z5Hr8T; Tue, 23 Apr 2024 18:49: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 4VPB3w0RJqz4YTX; Tue, 23 Apr 2024 18:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEpp6VBwgAJQfwDAbmj3a4IT3gASHTr0SawbexMFP0E=; b=FK+34KYpFJwXzRabxJAXVy6kNCDgmT4dzznPd17KM0C3R2FEyoFmJLevj1WBa0PeGkKL4P 1M3BEg0jBCqU3d+i1/xv7SjbPGvbrzvk0a9qy8efsT1zpPbW/JB9BMgL90OG4kPVtyba9L rTEZPZWhb+BduopwP6BotBt4hLVa6xS7VWC6/6mFShpViOgZV3f8qq/JjPAmXVIBU0OEoB 93KUsB+TvrgRTUbXrHf9rdEZheL8u2VvBiTZQOiVUnL//pm48u8ON6VX+CQnJfrU6dDRHS JRtkl+OjFNadYCe0e6taUBQfNT9D6TIGhf1AbOwsr7su6AR+wKd8AUjhrybyaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898156; a=rsa-sha256; cv=none; b=Rcy5mqjP0whCKjH0s7hANnOhnlSFP6ysaVWKWjWeoZ9J6t9U3Y3R5Q0KGSjhdj/4exaPIl SwDlPzIRPHDNelbik3cGomaAmi7HILmqir5pmjDatB9TVjWYr6o6Ex7v9KGaiWKlinaVvR DKgBGvgGdmxZ2hUOr6WQWcfus5qbitIIv7Ud56z5GhcH1Mpcmz1LvhPuUkTaq3bLO5vMZY yEUHigLEVRoNmrkJ/N0xstIAqyhtho/tRLk8Xu1C4g5SlRW5Te6XVZsSNqa1g5LH+uvpgO 0Lyo7rTZIzBLuVFn+8I67RbCisFBapqgA5ARzCz59o0I9MVMsV7UO5dvuBQl1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEpp6VBwgAJQfwDAbmj3a4IT3gASHTr0SawbexMFP0E=; b=S5LA92+rtgbwcr6JL2aG26YuGJj5cr0vuRGwURrmj/pZuJyoAGXuVJ3NtWOHZ36c+zdCm4 XtC7Gk/7Mw7oAKFifqj2nJaxNYIJ88OBmR+FKmMMlc/mrxSWCi0mN3Tit1TIOc711kVpL8 3dlEYyyWdTUtY9nolrBtgcAQ5I7yhppECSEpl3L/Q/iwhQ8lC8X10IcCeiZkF62NceSdkV J1dYp2MAQQmsEToh1rQ++yFP4n1g7R1VmoTxn2sxTCnqq835e7G8E6oM0DjRmJed4tz6gw ohUOmXvhNQymW11+cBnId8lsHiOZ9Z+aQv9FY6/EpMIxJajPLqBNssqv0dlm+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPB3w03k4zjW3; Tue, 23 Apr 2024 18:49: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 43NInFZq076773; Tue, 23 Apr 2024 18:49:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NInFXO076770; Tue, 23 Apr 2024 18:49:15 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:49:15 GMT Message-Id: <202404231849.43NInFXO076770@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: cbbc5770a30b - main - src.conf.5: Regen after removing MK_NVME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cbbc5770a30b6769d9d9a3a4504b81a5400a9110 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cbbc5770a30b6769d9d9a3a4504b81a5400a9110 commit cbbc5770a30b6769d9d9a3a4504b81a5400a9110 Author: John Baldwin AuthorDate: 2024-04-23 18:48:50 +0000 Commit: John Baldwin CommitDate: 2024-04-23 18:48:50 +0000 src.conf.5: Regen after removing MK_NVME --- share/man/man5/src.conf.5 | 2 -- 1 file changed, 2 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 7effd3f08ccc..5301fc488021 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1314,8 +1314,6 @@ Do not build and related programs. .It Va WITHOUT_NUAGEINIT Do not install the limited cloud init support scripts. -.It Va WITHOUT_NVME -Do not build nvme related tools and kernel modules. .It Va WITHOUT_OFED Do not build the .Dq "OpenFabrics Enterprise Distribution" From nobody Tue Apr 23 19:02:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPBMM3mB5z5Hs4B; Tue, 23 Apr 2024 19:02:39 +0000 (UTC) (envelope-from glebius@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 4VPBMM2vVRz4bSB; Tue, 23 Apr 2024 19:02:39 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898959; 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=RJS8of/My1AeVFoPPkCllgQtvjL6O6MVS5IsRwSddpM=; b=xNZYIstF+Fg1MNpXzMD4ErGDjsI4525l8PMxOJOM1ihPLegObQ+eX9Zzi7/9MQIqisRrm0 BjoBSnWkA1MEt3R2UYyXeQ47g/cbkf7jhcrwmydDuOOhKFNTW1GvAhvIf3OgU2T8lT0BO5 /UdH4Jp1ZDBZo+iFw1QgbcoJTu7vfKj/Uxi82ccU2ROrJ3gcVHZ3MKoFBrTBFMITQae9i7 7J7jN5qvl8VapvSqZ+uWNDQ+2lOq3rPrnUd3nCt7Seh1VQb4DqXu4EbbvbTkLhxk+4B0a8 y2ETidbbPsipbWM8U80BVr4EOrPmi8C9ER5YcREp+uLUvM1JDiqicq17ZQpwzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898959; a=rsa-sha256; cv=none; b=fDxWD2c0bWI5snjhIJK2uCzm3ta7jTlCHvk1nJDX3pu7AspIYpssFjrjQWh762BZW5vK4x lWavLb0M8KTcDjqrSj6kT3aNTJVsfIQEkI4ROybmsND+kuobIQ1kitTz27hyj+y4BAv4zw vaU77UoGnZpZk1/N4sacbFkPQu/livhHQnykUC3zQAhQ+AQV1O1cI5qyo5oES7gnaRx6t+ ZJv3W6AWTx8Mz6mAYZlNgTbVaqjrOTVFVrSEt/aVnx6NzFiotLOj6lu8j0qEHA+pR42Co5 zcC20U+TF3EL6jPFvOX4zDFo7BxwS60J1Nv9Jd74UcpB/ThWNRnma2dQcefQSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898959; 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=RJS8of/My1AeVFoPPkCllgQtvjL6O6MVS5IsRwSddpM=; b=rLctRsqfzMZGCxP0yq5kVfxHsY/NDZPZqUhR1hBWEiZHvNlENdTaxGgBLVTD0u5/nx3vOg Hk1c4QDpNPYKt4e1j49b6HYiQ1+Bl8aVt1kc71mxIdx6zwgQ46kICqfTCw1lEU9FQ/2YkA JwLjw/7RGDRz8gaqOiK3q8DyTjXPTW464E9dU21Y7c5MB2xKjXsX0sfQL/sT+ItlY4AOPm mrWUev8HwpXyFyEfe2Cx6YSUxdH3KurwnGtS4NTSLs4c5m6TG0gV9jPpSQEGI/BH6s5GGs +34ZxveRrlkpAcekt0olWver37Q4csAHuAVVyodzVTqRc7gA9u3XqE9zgAaWkA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_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: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VPBML4WhWzhWn; Tue, 23 Apr 2024 19:02:38 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 23 Apr 2024 12:02:36 -0700 From: Gleb Smirnoff To: Lexi Winter Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org Subject: Re: git: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change Message-ID: References: <202404181915.43IJFEoG020480@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Lexi, On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote: L> as a non-committer src contributor, i've discussed this with imp@ quite L> a bit and i think this should be phrased more strongly in favour of L> using GitHub for commits. L> L> the current situation is that Phabricator is useless for non-committers L> because 1) you have to know who can review your commit, and 2) once your L> commit is reviewed, someone has to commit it, and Phabricator doesn't L> address this. The 1) is actually not as bad. Phabricator has subscribtion hooks, and many committers have rules installed to get notifications of new reviews that touch certain paths of code. The problem 2), IMHO, equally applies to github and Phabricator. L> i think it might make more sense to suggest that people submit all L> patches via either GitHub or Bugzilla, and only use Phabricator if L> specifically asked to. I don't agree here. Looks like we should address those phabricator submissions that go unnoticed due to lack of maintainers of a code. I don't think submitting same patch to github will improve visibility. -- Gleb Smirnoff From nobody Tue Apr 23 19:34:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPC4F2Qk8z5Hwcv; Tue, 23 Apr 2024 19:34:37 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 4VPC4F0BNpz4f3Y; Tue, 23 Apr 2024 19:34:37 +0000 (UTC) (envelope-from delphij@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3476dcd9c46so4552570f8f.0; Tue, 23 Apr 2024 12:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713900873; x=1714505673; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5oQy2wNwh+0orEsg0qyWPlCjL/huz+bTTa1yh00LnBM=; b=BZEhx/7nZWJBXZUebThg4cvL2dpyjmwoJFvNBmswP3KKbzclVZK9i8NmWW2wCLzn8c 7QsB2cVha/DD8Vt+/L4pC/8R+T4z8xTuII6rdHqIvQEZ4kt97rdz9ZnLgcXa+0WKTd+J 6Dx2ZRkwc96MOHb6koRtq4b6K2G8C5lz7z5oLu+vMXxfH8dh2hIQVkpeaAb0uftFpONu C7PfMJmCt1zEB0vCLEMPd5bO6wcfUZP07XQy6Bf2N4fBsO7GGnoF0WMGEoIiLBzNc2kx HqTH2DJ4ynSVb6OZm5KS5VCX6vY1MjfksaR43XL7LG+bU4aUCfl7DIom5lCAduXQ5kuf i6vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713900873; x=1714505673; 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=5oQy2wNwh+0orEsg0qyWPlCjL/huz+bTTa1yh00LnBM=; b=qJxm1oIc8si/DlBewxZn5fwUPG5vyyd+ZXEGgu9pnHRVyve/ddHEdqxi7VGcvrwotM d+Axvv2YGpTZoaxX3oRK7i7EYdKgeNLEHeMGHp/ylqUk6wvJTI592NLUljVdk/sOQ472 zc1Kt750lA6otKbhi0V0CHx2FtjYQBnXe1d36MN6DnfQwXljyYX14Cccdtz3BJSm2XMk 6+5/5KQ7M3p/cDvqJ8jvuEy2YZiKcwz5Wv8CW2Y1dt3SYPP3jLA983K/Bm8Y5aKzwZLe WCrnMQEEN5DuXrgLLNLSJ5/Id0LhRZkGeIfY6vMEa8OkP/E0Y8D3wK3jNU9qOrQ04CFY U4FQ== X-Forwarded-Encrypted: i=1; AJvYcCV4T2J0y+fecUBJURE4tyOznn93DJWzY9/UcoCDoBYoewjZeFhEAkEXgOCqBFg03ixm7qAiAu8DSma4D0UxQgkIjGz7BzZtXfHZI198g0q6qh5icOs9epp4MB5L6gOBND01aDbUafx8P8LVT8FPsolC0vBsVjxRyWbSwQc7eCFcGzQFjuqvwZWT/BaN2fRew3hiPsuEm1hgCXhPmhKsEJsvh3og8yk2mEAINTJYQGJY1Az6 X-Gm-Message-State: AOJu0YwY9DCU4+i2vNCPRveDbMTjoOuagYR6FwxVR4xCKGGWD7h0eBfT BVqXV68WysildFUEE53CiFu3pq+4GLw3hMBqzuZBS+OLXMTQ6B6X9xlTg08mN15aZVpefMMahU3 w+wH+auyUIuOg8RvMTWoJuHtGHk23hw== X-Google-Smtp-Source: AGHT+IF5o5BDdcxLRJmxmHIhLVWnzfrnM3DrU9pLDi6/18pZMU1ggiOakbMGven42Z2JRsQKF1/FHsMZ7+x5CnKouvY= X-Received: by 2002:adf:fe41:0:b0:345:5f6a:cc05 with SMTP id m1-20020adffe41000000b003455f6acc05mr132685wrs.34.1713900872958; Tue, 23 Apr 2024 12:34:32 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404181915.43IJFEoG020480@gitrepo.freebsd.org> In-Reply-To: From: Xin LI Date: Tue, 23 Apr 2024 12:34:21 -0700 Message-ID: Subject: Re: git: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change To: Gleb Smirnoff Cc: Lexi Winter , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b68e410616c8a429" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VPC4F0BNpz4f3Y --000000000000b68e410616c8a429 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Possibly slightly off-topic, but have we considered some other alternatives to Phabricator, like Gerrit ? (My opinion might be biased as we use Gerrit at $WORK). I liked the review UI more (the context representation is cleaner compared to Phabricator and one can easily navigate between different amendment revisions of one change), and it is integrated with Git with a customizable workflow (e.g. can have complex submit requirements, like a change must be approved by a different person, has to pass certain presubmit workflow, etc.) and is actively developed and maintained (both Android and Chrome makes heavy use of Gerrit). Cheers, On Tue, Apr 23, 2024 at 12:02=E2=80=AFPM Gleb Smirnoff wrote: > Lexi, > > On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote: > L> as a non-committer src contributor, i've discussed this with imp@ quit= e > L> a bit and i think this should be phrased more strongly in favour of > L> using GitHub for commits. > L> > L> the current situation is that Phabricator is useless for non-committer= s > L> because 1) you have to know who can review your commit, and 2) once yo= ur > L> commit is reviewed, someone has to commit it, and Phabricator doesn't > L> address this. > > The 1) is actually not as bad. Phabricator has subscribtion hooks, and > many > committers have rules installed to get notifications of new reviews that > touch certain paths of code. > > The problem 2), IMHO, equally applies to github and Phabricator. > > L> i think it might make more sense to suggest that people submit all > L> patches via either GitHub or Bugzilla, and only use Phabricator if > L> specifically asked to. > > I don't agree here. Looks like we should address those phabricator > submissions that go unnoticed due to lack of maintainers of a code. > I don't think submitting same patch to github will improve visibility. > > > -- > Gleb Smirnoff > --000000000000b68e410616c8a429 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Possibly slightly off-topic, but have we considered some other= alternatives to Phabricator, like Gerrit?=C2=A0 (My opinion might be biased as we use Gerrit at $WO= RK).=C2=A0 I liked the review UI more (the context representation is cleane= r compared to Phabricator and one can easily navigate between different ame= ndment revisions of one change), and it is integrated with Git with a custo= mizable workflow (e.g. can have complex submit requirements, like a change = must be approved by a different person, has to pass certain presubmit workf= low, etc.) and is actively developed and maintained (both Android and Chrom= e makes heavy use of Gerrit).

Cheers,

On Tue, Apr 23, 2024= at 12:02=E2=80=AFPM Gleb Smirnoff <glebius@freebsd.org> wrote:
=C2=A0 Lexi,

On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote:
L> as a non-committer src contributor, i've discussed this with imp@= quite
L> a bit and i think this should be phrased more strongly in favour of L> using GitHub for commits.
L>
L> the current situation is that Phabricator is useless for non-committe= rs
L> because 1) you have to know who can review your commit, and 2) once y= our
L> commit is reviewed, someone has to commit it, and Phabricator doesn&#= 39;t
L> address this.

The 1) is actually not as bad.=C2=A0 Phabricator has subscribtion hooks, an= d many
committers have rules installed to get notifications of new reviews that touch certain paths of code.

The problem 2), IMHO, equally applies to github and Phabricator.

L> i think it might make more sense to suggest that people submit all L> patches via either GitHub or Bugzilla, and only use Phabricator if L> specifically asked to.

I don't agree here. Looks like we should address those phabricator
submissions that go unnoticed due to lack of maintainers of a code.
I don't think submitting same patch to github will improve visibility.<= br>

--
Gleb Smirnoff
--000000000000b68e410616c8a429-- From nobody Tue Apr 23 19:34:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPC4j3qmPz5HwVj for ; Tue, 23 Apr 2024 19:35:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) (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 4VPC4h5gnsz4flr for ; Tue, 23 Apr 2024 19:35:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-5176f217b7bso10251506e87.0 for ; Tue, 23 Apr 2024 12:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1713900898; x=1714505698; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4nABtxjxFiAq3elyYlUpVzeUNJzI/LREKyWCXdEbjjU=; b=IpxfeBiQ3snlai+mewC18ierXhoqF/Z9dneWX25IoI6fnZ0Tkgq3aL9cyCMImWbZQO G0u384O/AZ8jmdaKgHMKkCi+mqv6cP5JBV44g5RlarUGR8TflaHbfa4Ecje8GzPCD0P5 kgNWNm7mr4y/z/Ite+6TPwzXeiZe3OphiCDRVQMbZ66huitQPKK8jF2zeVWFklETY1GB eaCCEhgx/sPCII+zTyTgG2I/4iLO3SlNslHhNQxIdu2ziQxfDbipbt7ECpTUH8OWfycO rF8W5VlVaL3bBkn5kCK0/cH9SNcll1aGZ6YLbgm2xpjGy7FL49F1rmJJDhRolbgH2Ar3 oeyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713900898; x=1714505698; 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=4nABtxjxFiAq3elyYlUpVzeUNJzI/LREKyWCXdEbjjU=; b=gMT9bzOJjx+e/w35mcgu7HMWyltrX2Sbp9QWhJb6LzFAeAKax3X10qDHFcmoUvvrsH RIQ3WZskMvn1ad3P7N+P++g2Nt75qHEUgKMkT4RoPL4Z1H8Yw2SDBbWKE+sWBEFBsTC+ 0ksSlC+5XUjongjTEAcARQ71tw19LCsfnyp9/Mh+oFgR564ounTHhpA2UicUU38veOh/ 66qY9cyFsTo87spf9UIbeYLlGO+IQLhnTDDk3eGpGdrMPHUjQoRHHhA3RoT2wZw32k12 yniQiCFTuWgiEah7B/ZqigBDynGWhQbt0hqBmcpOoG+UCEkgv1jPDoTpEy953bVge+On DD7w== X-Forwarded-Encrypted: i=1; AJvYcCW3PqVmKGgy2pJvgZG8wo6kGotAh58JG+6u+/cNOTqgI9TwbMLIRPo4Rl4Kf/sLi8dPQJL/xTG5u042QRE12dJ0xKcHohvo1HB/GNpnqMIQ X-Gm-Message-State: AOJu0YwjoFai9GGsCFy5mbcFjasBbyrkcwSsZWFBmH/HpU7K9lv7YWdM OC0B7P8sFFf3u/20wFAd0a8UvnZ1pHO/l9PCZYCj0y26Re+9uFN8y8hcNLIuzEI+xdn3kEbaecZ PadmBK1m/SJNL4HFd1EinV7+auU3in7eBBKLauA== X-Google-Smtp-Source: AGHT+IGoQKi2BkPQ6szTmdYqlx2d8fzEwCrPUqvpv8t2ccXNM63BOiB8I2i8TCPErjOcnDB+0EPeS2DKXUV8AESPwlM= X-Received: by 2002:ac2:4ed9:0:b0:51a:f362:ab40 with SMTP id p25-20020ac24ed9000000b0051af362ab40mr443789lfr.2.1713900898322; Tue, 23 Apr 2024 12:34:58 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404181915.43IJFEoG020480@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 23 Apr 2024 13:34:46 -0600 Message-ID: Subject: Re: git: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change To: Gleb Smirnoff Cc: Lexi Winter , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org Content-Type: multipart/alternative; boundary="00000000000039b3cd0616c8a614" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VPC4h5gnsz4flr --00000000000039b3cd0616c8a614 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Apr 23, 2024 at 1:02=E2=80=AFPM Gleb Smirnoff = wrote: > Lexi, > > On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote: > L> as a non-committer src contributor, i've discussed this with imp@ quit= e > L> a bit and i think this should be phrased more strongly in favour of > L> using GitHub for commits. > L> > L> the current situation is that Phabricator is useless for non-committer= s > L> because 1) you have to know who can review your commit, and 2) once yo= ur > L> commit is reviewed, someone has to commit it, and Phabricator doesn't > L> address this. > > The 1) is actually not as bad. Phabricator has subscribtion hooks, and > many > committers have rules installed to get notifications of new reviews that > touch certain paths of code. > Except we have really crappy coverage in phabricator from the herald rules, so external submitters usually don't even get a 'hey we got it' feedback from the submission.... networking gets good reviews, ports get decent reviews, some other select areas are OK... but on the whole, random submissions just disappear here. > The problem 2), IMHO, equally applies to github and Phabricator. > I can land a github PR in < 5 minutes. I can find all the open ones and make sure they are progressing. The tools to automate this are easy to write. I keep refining to reduce this time and push more automation into useful places. We've not even begun to explore what we can do in this space. With Phabricator, though, it's impossible to find things that are languishing, landing them is much harder, and there's no clear set of responsibility for doing something with it. Plus, Phorge doesn't really address these concerns... > L> i think it might make more sense to suggest that people submit all > L> patches via either GitHub or Bugzilla, and only use Phabricator if > L> specifically asked to. > > I don't agree here. Looks like we should address those phabricator > submissions that go unnoticed due to lack of maintainers of a code. > I don't think submitting same patch to github will improve visibility. > I've put a ton of energy into that... Good luck. I'm done trying because it's too hard. I can't even easily do a query for 'Find me all the stalled requests'. Or 'find all the ones I tagged as interesting' or half a dozen other things that are necessary to manage the queue. And lots of people (myself included) have been bad about closing out the stale requests, making the problem even worse. While specific queries can be written to address my concerns, they are so tightly focused that I can't refine them at all (since the criteria for selection isn't in the search interface). It's a mess, and not likely to get better. So until the "disappearing into phab" is fixed, we should concentrate on github pull requests. I've had good luck tagging the right people on github of late... and most of the submissions, frankly, don't require a lot more than a quick once-over to know if it's good or not. There are some that have languished, though, due to this lack... But I've learned to pull people in earlier in the process rather than letting it languish. So respectfully, I'd like to leverage the little bit of github pull request success we've had, reserve phabricator for the 'exception path' when something needs actual review from a developer who will take the responsibility to either commit or explicitly reject the phab review than to pin our hopes on making phabricator easier to use first. Warner --00000000000039b3cd0616c8a614 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Apr 23, 2024 at 1:02=E2=80=AF= PM Gleb Smirnoff <glebius@freebsd= .org> wrote:
=C2=A0 Lexi,

On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote:
L> as a non-committer src contributor, i've discussed this with imp@= quite
L> a bit and i think this should be phrased more strongly in favour of L> using GitHub for commits.
L>
L> the current situation is that Phabricator is useless for non-committe= rs
L> because 1) you have to know who can review your commit, and 2) once y= our
L> commit is reviewed, someone has to commit it, and Phabricator doesn&#= 39;t
L> address this.

The 1) is actually not as bad.=C2=A0 Phabricator has subscribtion hooks, an= d many
committers have rules installed to get notifications of new reviews that touch certain paths of code.

Except we = have really crappy coverage in phabricator from the herald rules,
so external submitters usually don't even get a 'hey we got it'= ; feedback from
the submission.... networking gets good reviews, = ports get decent reviews,
some other select areas are OK... but o= n the whole, random submissions just
disappear here.
= =C2=A0
The problem 2), IMHO, equally applies to github and Phabricator.

I can land a github PR in < 5 minutes. I can f= ind all the open ones and
make sure they are progressing. The too= ls to automate this are easy
to write. I keep refining to reduce = this time and push more automation
into useful places. We've = not even begun to explore what we can
do in this space.

With Phabricator, though, it's impossible to find thing= s that are languishing,
landing them is much harder, and there= 9;s no clear set of responsibility
for doing something with it. P= lus, Phorge doesn't really address these
concerns...
=C2=A0
L> i think it might make more sense to suggest that people submit all L> patches via either GitHub or Bugzilla, and only use Phabricator if L> specifically asked to.

I don't agree here. Looks like we should address those phabricator
submissions that go unnoticed due to lack of maintainers of a code.
I don't think submitting same patch to github will improve visibility.<= br>

I've put a ton of energy into that.= .. Good luck. I'm done trying
because it's too hard. I ca= n't even easily do a query for 'Find me
all the stalled r= equests'. Or 'find all the ones I tagged as interesting'
<= div>or half a dozen other things that are necessary to manage the queue.
And lots of people (myself included) have been bad about closing
out the stale requests, making the problem even worse. While specif= ic
queries can be written to address my concerns, they are so tig= htly
focused that I can't refine them at all (since the crite= ria for selection
isn't in the search interface). It's a = mess, and not likely to get better.

So until the &= quot;disappearing into phab" is fixed, we should concentrate
on github pull requests. I've had good luck tagging the right people
on github of late... and most of the submissions, frankly, don'= ;t require
a lot more than a quick once-over to know if it's = good or not. There are
some that have languished, though, due to = this lack... But I've learned
to pull people in earlier in th= e process rather than letting it languish.

So resp= ectfully, I'd like to leverage the little bit of github pull request
success we've had, reserve phabricator for the 'exception p= ath' when
something needs actual review from a developer who = will take the
responsibility to either commit or explicitly rejec= t the phab review than
to pin our hopes on making phabricator eas= ier to use first.

Warner
--00000000000039b3cd0616c8a614-- From nobody Tue Apr 23 19:44:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCHW5RxVz5HxL7; Tue, 23 Apr 2024 19:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPCHW2Qnqz4h8r; Tue, 23 Apr 2024 19:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyqU+DDEdDNB2MkD106/HGB55s7ukJn4xxCQamdfsZM=; b=AwBJAVln/H0977MDQ1oB/WuPye7+JCS1ZDWs/xFyEmX6xj7M4KqmCnimoRJpWKv5gNU2+p NdLM2fs6Ou8JpzFEncHyUuMFZj8iPxv88D90gdI+jOwuDpNUCVFQSd6ovEfO2W2yRqY9Sq 3VVNpDsbxxXhVj69SFF1BCP1SDPWHMqUyEKtsAfDod7vGdH+ie+ASxLnVyOD3sPr1efILn vVLvfYYrfdoBQG1JdntxV9xugHswtPBBSNHaeSmPaClC9Bz3ZNSf1Hi8ZmJhxnyc/fFf4S ks6uKwqww7MiUaXP85ZZq+yx9oxbFA20pchul1hBWHr+8d3y7owhceSyLbm1LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713901463; a=rsa-sha256; cv=none; b=G6X2aLUl/aeLFP8S16ymUNZa5n/1GG4VNfLEOvS8DipSQR8raVtke9T6vdKE3NqTCL7oYU E8c1v7Zlv+1SN5G0g+PLqhL77PzCaAulW7CzHzKjnh76ZRINP/d5doni13t7OA6H8uB4Bz 7wwAbis2JTo0KXsS1/SuXKhZbOk0F81SSIU4sElqXVkzPeszuT+XM9EnBmLqakbVRliULS 4q0FqpOThbCoxSH+Y04rusNlOvMCsx967lpGqtFQvUIJL9NJFv3FAkoZMaA0ZbH0p3IhOu Pex5V8iablm8L6hkiplc3JBidy0Ece8fZ9xv7IUKquBUymFvwGi+TfpIiAXsjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyqU+DDEdDNB2MkD106/HGB55s7ukJn4xxCQamdfsZM=; b=QbzC927Y4/WT6xr8vVRc8VJvEeKpHerHe89S0li2dZPxx7DPKlIC5eLCXi40nZuCc/GNI6 wn7wwNI4FJFi3F79BKeUxxp5QPrdm7/BX+J0AR+w09EEMl57jC/oZTa2Qgz9FbPjGde3uM B3EbjRfmvE46V1vtUWX+XY4eDMs9Lr4yywDSDGcd2fR//3HpwMA/Cz0KlsAg6F4afOQfi4 SLx7VygME+rGGSuqt12VAEfQs6xCm8EKlmnHScp+9C2lY8MqPBWwJ7aGNv0LidTDd9Npt1 Kk3UfDTI+525x3TrtJfFO+GYKBgi4hrhGpAS05XFcQmoAULM1yFbHkf2gapkhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCHW22rBzlMk; Tue, 23 Apr 2024 19:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NJiN8V077501; Tue, 23 Apr 2024 19:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NJiN85077498; Tue, 23 Apr 2024 19:44:23 GMT (envelope-from git) Date: Tue, 23 Apr 2024 19:44:23 GMT Message-Id: <202404231944.43NJiN85077498@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: 92771bc00ad0 - main - libc: make strerror_rl() usable for libc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 92771bc00ad0f567b27876c34450bef7a0ee61d0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=92771bc00ad0f567b27876c34450bef7a0ee61d0 commit 92771bc00ad0f567b27876c34450bef7a0ee61d0 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:04:29 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 19:40:29 +0000 libc: make strerror_rl() usable for libc Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44916 --- lib/libc/include/libc_private.h | 2 ++ lib/libc/string/strerror.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 73b22beffe88..2b16ce736e3a 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -374,5 +374,7 @@ struct __nl_cat_d; struct _xlocale; struct __nl_cat_d *__catopen_l(const char *name, int type, struct _xlocale *locale); +int __strerror_rl(int errnum, char *strerrbuf, size_t buflen, + struct _xlocale *locale); #endif /* _LIBC_PRIVATE_H_ */ diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c index 69c9d1da69af..ecad55caa673 100644 --- a/lib/libc/string/strerror.c +++ b/lib/libc/string/strerror.c @@ -74,8 +74,8 @@ errstr(int num, const char *uprefix, char *buf, size_t len) strlcat(buf, t, len); } -static int -strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale) +int +__strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale) { int retval = 0; #if defined(NLS) @@ -116,7 +116,7 @@ strerror_rl(int errnum, char *strerrbuf, size_t buflen, locale_t locale) int strerror_r(int errnum, char *strerrbuf, size_t buflen) { - return (strerror_rl(errnum, strerrbuf, buflen, __get_locale())); + return (__strerror_rl(errnum, strerrbuf, buflen, __get_locale())); } char * @@ -124,7 +124,7 @@ strerror_l(int num, locale_t locale) { static _Thread_local char ebuf[NL_TEXTMAX]; - if (strerror_rl(num, ebuf, sizeof(ebuf), locale) != 0) + if (__strerror_rl(num, ebuf, sizeof(ebuf), locale) != 0) errno = EINVAL; return (ebuf); } @@ -134,7 +134,7 @@ strerror(int num) { static char ebuf[NL_TEXTMAX]; - if (strerror_rl(num, ebuf, sizeof(ebuf), __get_locale()) != 0) + if (__strerror_rl(num, ebuf, sizeof(ebuf), __get_locale()) != 0) errno = EINVAL; return (ebuf); } From nobody Tue Apr 23 19:44:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCHX5v0yz5Hx3n; Tue, 23 Apr 2024 19:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPCHX3WNwz4hC1; Tue, 23 Apr 2024 19:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ek64r5YuK5HCM8ITy49MLljM4JYWUp0au6GvsUpuLU=; b=lO27iK6ArDXsaPPIkWkk1wvE4T3eiICRgyXA4iZhI20T0lMqYKPM5jw0RA0kxoj6h4T9TJ fkmQvHZrYEWXqUeMxzonaF6OXp5ZQy+5RHnUDdiVzZTND25BiZrBgQ/9W8njZUcFSiz/MW eCfDV7QQNo27XNwal7kYCWBLvr34InPGNNLBCMkNlXlvpb5I68TzkVDnMphMDoHuUYq3+d 7jK2tOzuvEe7HsthHlAYQVdLil4AZuKPmkwRBG7Rw4MbmIns7JZy2j9sHfGgmZArxgfqBQ pZJbFaVvAw8QpKkdJNTPZtBOSFkXCA2QVvS6st5wFgR/gv75y3UuWmfB3kum/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713901464; a=rsa-sha256; cv=none; b=EYVHUrX83U29H0Jwt8uEzp5kVhsJP5ri1pPSwCR0HjzH3eJkAqSn9cjMXvb76e0HxpshOj pHP05xhtGRZN7ET6pooXg/xQTbWwSJdRi8aVXZZL20VNo1uGmec+4jWj2OIuoeI3JqpJeW AJwCbqyxh5vriWEXUSYKIi8a7gCzXGx6ED7yLWtvggw8tOc0evGuB8H+5JGm08CI0UYHBi 19Ttsq8cP6Zsjk45c2aBJyWAAnUXXCp2C/I9799g6BBFQitqei7P4u4qH8NiJFLMYmwt18 /4Gs7xSp4Q2WFPYoFsU83+7ClBuZYR135qX1XPNLdNe6T0mM408wMAwDLk8OyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ek64r5YuK5HCM8ITy49MLljM4JYWUp0au6GvsUpuLU=; b=QHCYAxTQhB55NJpRDq1tBtC1e2p+O6rxQXNnMUao3KH4VxaiWmUhjBnauN0hoIQpXSuYfR REuLPy572IQz4tbRGo8BEBOwFd4X7qlgy4nRGU0FsfYuOGeDDU0fMrB+cIs8wzfA6/SA64 ke3E7RclGjZ2fesLr76XWv9i8tC/Ld6/X8q76dzirfPLK9FRgohXhOotJ4rhBxIzlBtNln JFtCDhrjhR9VAeGwC5IPSOOM07f6V0NfYJSV8dsqeqWk/ofmmdayDVmoBq/IVs4IDYI3Aj 1x7XEGEyLa1luwfDhLfLSJctKErc1YJiGxD+W1FNMnCzXFbfX+5JPmoO2N3qtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCHX37TSzl8c; Tue, 23 Apr 2024 19:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NJiOvm077546; Tue, 23 Apr 2024 19:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NJiOhl077543; Tue, 23 Apr 2024 19:44:24 GMT (envelope-from git) Date: Tue, 23 Apr 2024 19:44:24 GMT Message-Id: <202404231944.43NJiOhl077543@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: f88766769463 - main - __vprintf(): switch from strerror() to strerror_rl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f887667694632c829b0599b54ff86a072e93df87 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f887667694632c829b0599b54ff86a072e93df87 commit f887667694632c829b0599b54ff86a072e93df87 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:10:30 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 19:43:01 +0000 __vprintf(): switch from strerror() to strerror_rl() This eliminates the use of non-thread-safe function in printf*() family, and make the call locale-aware. Also, it stops obliterating the strerror() static buffer, which aligns with the POSIX requirement that implementations must behave as if no standard-mandated functions call strerror(). PR: 278556 Reported by: Jonathan Gruber Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44916 --- lib/libc/stdio/vfprintf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 6c7c6982c8dc..7048315a8d78 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -312,6 +312,8 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) int width; /* width from format (%8d), or 0 */ int prec; /* precision from format; <0 for N/A */ int saved_errno; + int error; + char errnomsg[NL_TEXTMAX]; char sign; /* sign prefix (' ', '+', '-', or \0) */ struct grouping_state gs; /* thousands' grouping info */ @@ -829,7 +831,9 @@ fp_common: break; #endif /* !NO_FLOATING_POINT */ case 'm': - cp = strerror(saved_errno); + error = __strerror_rl(saved_errno, errnomsg, + sizeof(errnomsg), locale); + cp = error == 0 ? errnomsg : ""; size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); sign = '\0'; break; From nobody Tue Apr 23 19:44:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCHY5C8Jz5Hx3s; Tue, 23 Apr 2024 19:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPCHY4RnHz4gn3; Tue, 23 Apr 2024 19:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCrsLWsSzBmDSdfMeiNA21OMsFra7yZAq1OzudHYM88=; b=p/FaM3ljr+c7KcQXswctKgYYvu54nPBvQmIQOZuUpSjbInE1TUR0P97myMcOrWsRxZ3gbO OiTco4hwM+MUemVh/qO0EwJj3O5JtwG9ahlY1fS7VFQwmRWOqpETjtOs8zdTdc1LoZdmvZ Zie+d9lb+yVFxjkrhQINEvJATGRiYs7dBsYJ1Bz4XUSvjPM1duV8PRGnviecw1++DC+wGl OvMzAbp+XCR0Gy1Ar+KIXwKxfjg3Oc9IWve/jIpOmycgVBLTuDmsq9g5tZAUKxjs5d9kl2 hJBMIgGI5XNcLVpabtiPa1HR0s8zo9QL85xEomiBPujXNdWGWJGNR2bCXrW4Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713901465; a=rsa-sha256; cv=none; b=j12jIbPSdcmRJC676kXE+epkz4sugTGlvLKYeB5f09BiV4s+CvpdgIa7PdNgsPBcCnXInr CA1QD8p7RPSKJNyw3etr2OWjcPeo/YM+qqVZS2iokXD2bHwM/tkIpd9AfentwsUCGVPIkx NpwfJRTiN0oC2T0zW0QdUCN7l0yAiv21XYHmgCHRvCmjl01kGWuUdhGGJiaouVb790zO5E mzdKL9IMivULXb744JCeJB5xYzRkk85YPMLDQIX8/+AoFM/FIzxAKuDXbzW4F2F9i7KBE6 0C89RxhZA57of9RFeFAiSxidz1y/QeGzy+sWJnKEmhAEUn37utgEm7sZ+LsnGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCrsLWsSzBmDSdfMeiNA21OMsFra7yZAq1OzudHYM88=; b=d5qKJXTzXBsIgywoaz897vlaEZzhlRrcliMlpcHxl3DUWJYGl8QANY56dk2Uk7RiTklD74 aUBVnbRIaWTHh60LL3LZrUJleiVlQrTucGNNbPaPuQ21CJ9MAOAOTmgzTIq10eLEQxW+t8 KOAWUPBr4vz5H88BJbDJjKU6jZtWBiGdZgp6Xeo2jniAi0d/RL+9NZJG7lnOZcdwvrygr9 rqjn55QC9t7Gp7YV2SxtFUt4psyzy0/Cx8JSk6KcwF7zWu4u8r7l+3UgIy0yp+LDe35K3N y/IEyaAMvGQpPuHyI3oYrwNP4fSLb8hWTPv/XDZBmWol7oliHfDHItC86lcEuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCHY447yzkt9; Tue, 23 Apr 2024 19:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NJiPjA077593; Tue, 23 Apr 2024 19:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NJiPNh077590; Tue, 23 Apr 2024 19:44:25 GMT (envelope-from git) Date: Tue, 23 Apr 2024 19:44:25 GMT Message-Id: <202404231944.43NJiPNh077590@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: bac9d7e8f293 - main - libc: minor style, wrap long lines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bac9d7e8f2931149815c3d5a9ab69594bbdffde6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bac9d7e8f2931149815c3d5a9ab69594bbdffde6 commit bac9d7e8f2931149815c3d5a9ab69594bbdffde6 Author: Konstantin Belousov AuthorDate: 2024-04-23 17:14:34 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 19:44:07 +0000 libc: minor style, wrap long lines Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44916 --- lib/libc/stdio/xprintf_errno.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c index db897328f0fe..c63a7afd35e0 100644 --- a/lib/libc/stdio/xprintf_errno.c +++ b/lib/libc/stdio/xprintf_errno.c @@ -38,7 +38,8 @@ #include "printf.h" int -__printf_arginfo_errno(const struct printf_info *pi __unused, size_t n, int *argt) +__printf_arginfo_errno(const struct printf_info *pi __unused, size_t n, + int *argt) { assert(n >= 1); @@ -47,7 +48,8 @@ __printf_arginfo_errno(const struct printf_info *pi __unused, size_t n, int *arg } int -__printf_render_errno(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg) +__printf_render_errno(struct __printf_io *io, const struct printf_info *pi + __unused, const void *const *arg) { int ret, error; char buf[64]; From nobody Tue Apr 23 19:44:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCHb1BBmz5Hx6D; Tue, 23 Apr 2024 19:44: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 4VPCHZ5TP7z4gsR; Tue, 23 Apr 2024 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuE0weCK1Yv/KfFwSMIc2/wT122P/Jp2dgLr0TkXkok=; b=C07KmjFSZsOArivrPyoIlp86QG1NSuHFniwQrUxyYOXW0o2h6bS9eJoZiBZiRK180aM6u/ 4tDWBxZRXLCBdMNmmkkwWr5fhdxGhUvWd6AzAP73HcC0A1RilwjUi0BoGkpv4wBF91N35q e4POYkdRbmwNedHwS5WwDwApnNfsDwuD+F3mwlDW3hxhXV4yioUM2enkUF9RT7uGid0Lcw qBqE3X0MJHJK8gHfBeZQHhFHCXnPGfbnpVOqCUghYD7fkiDwOb1s4Iq/YFuAnjfJ/vopEQ uu5qDIP7KknmZJu0qSbKNLWrJJEk/DEqkB4k0HDay6luxyzyE/Rcn2kR3zykTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713901466; a=rsa-sha256; cv=none; b=dGxIT4dNzEHrO8k78H3aHJR1Ck9zqoRYeLKouKcK+VLpBHe8Cd0u/EplKBOKYclSEmMjkk P5NsF0pkgGRt+SB5tMTCUh5b9umFLYsBjtM8kJuoS/u22EVqv3B2Fr0hiYUs+Q8m2crdph csbz28PKhe0mUeET2EOnDYQhy7ASfCcjj2lnsiGwckvYMq8xdxrIpX5q8SmlwDzLMgqV9e HwrxidRBWTlwvWrU3V+HYyepfbGKB6Vtt5i03duZcgB9r9TRfbGZGw4Qm5We+sJNvfCc4O i5gdGeeEl/yBvN/QGu6f7gsrDrwHyTFIo+/pv9WftNGkwgVh9nX3jMybWPLFZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713901466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuE0weCK1Yv/KfFwSMIc2/wT122P/Jp2dgLr0TkXkok=; b=lkYHsnZh5wNDnM84XC57v3VUkpdND02m9AlTspu1FCimDTAOFYjSuczaBB+HXQ1fOivJm6 LcyFVPFFqZ6jRqF6nEVn2n9msJEndlfLhlnI/Htj7iYwvxZRTgCgnHCR3EDELjnUy2AAzl T5LnpfY+qi4RpR6GSkq6OqN8g3v2ZqjchxVEDGLWAefOUs/vVTm8NYUBNJLgQSw+4zLipy M0jxq3aFNEyXSXHqNYJLmCM2dBp3BkgRjsOQJmY0SHEAvWlW33X0VM6qz9kD1T04/nd++9 +ZWnxPCpYfT3yYj63PWUdTnvJdSh/1vFwBNXaN6uoWpYn8eOBkyQ5xvrlJ0jIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCHZ53mxzlLP; Tue, 23 Apr 2024 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NJiQKl077647; Tue, 23 Apr 2024 19:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NJiQfJ077644; Tue, 23 Apr 2024 19:44:26 GMT (envelope-from git) Date: Tue, 23 Apr 2024 19:44:26 GMT Message-Id: <202404231944.43NJiQfJ077644@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: aa66995b4c80 - main - libc printf_render_errno(): do not use strerror() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: aa66995b4c804cbb579f71645d97fe282a798bfc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aa66995b4c804cbb579f71645d97fe282a798bfc commit aa66995b4c804cbb579f71645d97fe282a798bfc Author: Konstantin Belousov AuthorDate: 2024-04-23 17:15:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 19:44:07 +0000 libc printf_render_errno(): do not use strerror() Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44916 --- lib/libc/stdio/xprintf_errno.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c index c63a7afd35e0..f1e5421f60c8 100644 --- a/lib/libc/stdio/xprintf_errno.c +++ b/lib/libc/stdio/xprintf_errno.c @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -53,13 +54,13 @@ __printf_render_errno(struct __printf_io *io, const struct printf_info *pi { int ret, error; char buf[64]; - const char *p; + char errnomsg[NL_TEXTMAX]; ret = 0; error = *((const int *)arg[0]); if (error >= 0 && error < __hidden_sys_nerr) { - p = strerror(error); - return (__printf_out(io, pi, p, strlen(p))); + strerror_r(error, errnomsg, sizeof(errnomsg)); + return (__printf_out(io, pi, errnomsg, strlen(errnomsg))); } sprintf(buf, "errno=%d/0x%x", error, error); ret += __printf_out(io, pi, buf, strlen(buf)); From nobody Tue Apr 23 19:44:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCJ65wJSz5HxVq for ; Tue, 23 Apr 2024 19:44:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (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 4VPCJ63BBXz4jBx for ; Tue, 23 Apr 2024 19:44:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a55911bff66so505444966b.0 for ; Tue, 23 Apr 2024 12:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1713901492; x=1714506292; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=QBA3rCiZsTrs8ArT33wL16SqzNbHpYJ0TEJcwhm6CmY=; b=XozSuXdxm5OedgtkGwQFfZ2OshsVpD1n69OmVdytrry5y4np0q0lAiESPQmg9TSgQM yUOyVIIACgd0+cvsuqz/cFnETdObAy71hU7/x8rJmq8I5Jq63Ljz65YhTowRkCjTG1AP Yxletkfy2GYnL5BnC0NbuK60d18jzwkRTzyvW+V4lOaMCGuOYm9tMZwMIVmQR3fUXuWS AZi6pFvIP+SN25u4TQsGXHt9OE4oLumdlVc2AVprbwB8j/9AZOfi+fNgaEb3F0oZZ7Mb OJ9c3ESn1TOznGtuCXDiUvebHoPyovmFS4MZkbkfrPJ2KMJIiEIHNXnk9uBQLsAzI1uc eAvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713901492; x=1714506292; 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=QBA3rCiZsTrs8ArT33wL16SqzNbHpYJ0TEJcwhm6CmY=; b=I0LtyfWumgadBOEdcNVR6jkcidLiEaSDFHpyHI+4X2SJnL7vycww9BD8hk9Wmpv/es Fa/OzAy3IM4LMzxowET8s+4mMHnQlUkbIZkJ5cFD+zDdhTllBwnDeefh68zRlNxACOM4 MeacrfvGo1Vq/Vgg6q+kkjJWc+ST7dy+INKxJBX1s7gNkVxnW6tVmqOLwa+M6N+V1bWy KRCSyOAW8Eeor2aF0BI7r/kOr11IfV4ZhxDX/02pmztIfBVaQiEpzhut9WJLr2CEDHo9 lg060LgyUCONMXBCgeOj7YW3TftnQIP30wD9QThlUmVsRmk1feYVahGUO06g1xfwdCiK zpNA== X-Forwarded-Encrypted: i=1; AJvYcCU/J4g3/Z0beMi8CzAiZq+t+PX6JMxuGwbUIHGtw/ytkKM9KCELbfImox6Ktzh9A4HE1LZwlCsutXAzTnP84Xeg0rbRBSs+6lN+QNuP18Tb X-Gm-Message-State: AOJu0Yw53rBUVtvHWQcTxdZ29oOYSFYli760Rjl3IYzNsfPo3eJXMXOX c09aMq9v0ZKomBj9NhkyEiKI+tGKVf2RWD3Umu7zvHxU5RTKA9X0dXu3G2FbdgWFaavq5BCIBBf hHkKE9PKnsVEu8E11YrE+jaRCPHvvdzN0FqzDh9uN2tYvEQivd2A= X-Google-Smtp-Source: AGHT+IEm55hFV3ivHxJaaA3c5IG10EPEnQqmpKkrD6sKHAg2o1DlZYjLk/Wwt/fWZ9jJz81KCEPDQhsO8X+DigR6wB0= X-Received: by 2002:a17:906:4687:b0:a55:648f:3f03 with SMTP id a7-20020a170906468700b00a55648f3f03mr208906ejr.53.1713901492068; Tue, 23 Apr 2024 12:44:52 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404181915.43IJFEoG020480@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 23 Apr 2024 13:44:40 -0600 Message-ID: Subject: Re: git: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change To: Xin LI Cc: Gleb Smirnoff , Lexi Winter , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009d821d0616c8c987" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VPCJ63BBXz4jBx --0000000000009d821d0616c8c987 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable We have thought about it. People are setting one (forgejo) up right now as a proof of concept. Contact me if you'd like to participate, or setup something different to evaluate (past calls for the git next generation working group didn't produce too many interested parties that could move the ball). In the long term, though, we'll have to do something like Gerrit, Gitlab, or Forgejo or similar. There's a lot of factors to consider for each of the solutions that are available, but it's hard to setup something even as a test experiment to see if it can make things better. Github pull requests are my attempt to do something to move the needle on the project being so hard to contribute to in a way that won't get ignored. There's plenty of problems with it, but we're also getting some good code and contributors from it. Nothing is stopping other attempts, other than the time and effort it takes to set them up and administer them.... Warner On Tue, Apr 23, 2024 at 1:34=E2=80=AFPM Xin LI wrote: > Possibly slightly off-topic, but have we considered some other > alternatives to Phabricator, like Gerrit > ? (My opinion might be biased as we > use Gerrit at $WORK). I liked the review UI more (the context > representation is cleaner compared to Phabricator and one can easily > navigate between different amendment revisions of one change), and it is > integrated with Git with a customizable workflow (e.g. can have complex > submit requirements, like a change must be approved by a different person= , > has to pass certain presubmit workflow, etc.) and is actively developed a= nd > maintained (both Android and Chrome makes heavy use of Gerrit). > > Cheers, > > On Tue, Apr 23, 2024 at 12:02=E2=80=AFPM Gleb Smirnoff > wrote: > >> Lexi, >> >> On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote: >> L> as a non-committer src contributor, i've discussed this with imp@ >> quite >> L> a bit and i think this should be phrased more strongly in favour of >> L> using GitHub for commits. >> L> >> L> the current situation is that Phabricator is useless for non-committe= rs >> L> because 1) you have to know who can review your commit, and 2) once >> your >> L> commit is reviewed, someone has to commit it, and Phabricator doesn't >> L> address this. >> >> The 1) is actually not as bad. Phabricator has subscribtion hooks, and >> many >> committers have rules installed to get notifications of new reviews that >> touch certain paths of code. >> >> The problem 2), IMHO, equally applies to github and Phabricator. >> >> L> i think it might make more sense to suggest that people submit all >> L> patches via either GitHub or Bugzilla, and only use Phabricator if >> L> specifically asked to. >> >> I don't agree here. Looks like we should address those phabricator >> submissions that go unnoticed due to lack of maintainers of a code. >> I don't think submitting same patch to github will improve visibility. >> >> >> -- >> Gleb Smirnoff >> > --0000000000009d821d0616c8c987 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
We have thought about it. People are setting one (for= gejo) up right now as a proof of
concept. Contact me if you'd= like to participate, or setup something different to evaluate (past
<= div>calls for the git next generation working group didn't produce too = many interested parties
that could move the ball). In the long te= rm, though, we'll have to do something like Gerrit,
Gitlab, o= r Forgejo or similar. There's a lot of factors to consider for each of = the solutions
that are available, but it's hard to setup some= thing even as a test experiment to see if
it can make things bett= er.

Github pull requests are my attempt=C2=A0to do= something to move the needle on the
project being so hard to con= tribute to in a way that won't get ignored. There's plenty
of problems with it, but we're also getting some good code and contri= butors from it.
Nothing is stopping other attempts, other than th= e time and effort it takes to set them
up and administer them....=

Warner

On Tue, Apr 23, 2024 at 1:34=E2= =80=AFPM Xin LI <delphij@gmail.com<= /a>> wrote:
<= div dir=3D"ltr">
Possibly sli= ghtly off-topic, but have we considered some other alternatives to Phabrica= tor, like G= errit?=C2=A0 (My opinion might be biased as we use Gerrit at $WORK).=C2= =A0 I liked the review UI more (the context representation is cleaner compa= red to Phabricator and one can easily navigate between different amendment = revisions of one change), and it is integrated with Git with a customizable= workflow (e.g. can have complex submit requirements, like a change must be= approved by a different person, has to pass certain presubmit workflow, et= c.) and is actively developed and maintained (both Android and Chrome makes= heavy use of Gerrit).
=
Cheers,
<= /div>
O= n Tue, Apr 23, 2024 at 12:02=E2=80=AFPM Gleb Smirnoff <glebius@freebsd.org> wrote:<= br>
=C2=A0 Lexi,

On Thu, Apr 18, 2024 at 08:27:56PM +0100, Lexi Winter wrote:
L> as a non-committer src contributor, i've discussed this with imp@= quite
L> a bit and i think this should be phrased more strongly in favour of L> using GitHub for commits.
L>
L> the current situation is that Phabricator is useless for non-committe= rs
L> because 1) you have to know who can review your commit, and 2) once y= our
L> commit is reviewed, someone has to commit it, and Phabricator doesn&#= 39;t
L> address this.

The 1) is actually not as bad.=C2=A0 Phabricator has subscribtion hooks, an= d many
committers have rules installed to get notifications of new reviews that touch certain paths of code.

The problem 2), IMHO, equally applies to github and Phabricator.

L> i think it might make more sense to suggest that people submit all L> patches via either GitHub or Bugzilla, and only use Phabricator if L> specifically asked to.

I don't agree here. Looks like we should address those phabricator
submissions that go unnoticed due to lack of maintainers of a code.
I don't think submitting same patch to github will improve visibility.<= br>

--
Gleb Smirnoff
--0000000000009d821d0616c8c987-- From nobody Tue Apr 23 19:58:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCbj0qLDz5HyGl; Tue, 23 Apr 2024 19:58:25 +0000 (UTC) (envelope-from pho@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 4VPCbj0FCBz4k02; Tue, 23 Apr 2024 19:58:25 +0000 (UTC) (envelope-from pho@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902305; 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=nULj9aoC1FY/K7CVtmKJWal1IvMItYD2dvBoUygvvVw=; b=kpSB6HhU1JGRCyqsGyC9rQUhtj1yxHAkIgbRus2SFLz8666+eyZakmeDvQ718L2IoZ8aQi IT8cSI6KpmfjNdEWVJFkZS0UCs2JDB5zjn1MFpyxqgb5n1q/F1y/jStWQEof9K1K+Gr7dw t4+W0tg0HZGiGnZAT9o8C+WOvRCyFzNgNcLEoMEFcJvC2/6vOf7/H638hjk6D7biUIih4d miAIgTwxVMzEwdp89vqQ8dfPaffE1OZA36RFnKMo4MyTwdvUnUP2AfmGpxdai7JlvBxJve ZITL513fdxAh4MbeZzJEtUtttAinII5aHdLDUFdYohZASZOXLZ82sPnkIHxChA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713902305; a=rsa-sha256; cv=none; b=xzJaNnBkua6WmM+w5ZDG3avv+vWi6ZUKaDBgWc/LPnV45mcYmjyO8ivFMz5Z6XkAZfSbia rXKYaEaZR6sLOzTgkjed5yv/MmdbDm9/fY2L9M/yEZFbVZVGAyQHvTozW8zTUFByi5X6Xs B0t9fSwTMvfEGslyLZnDwX83IjRifr5x4dUFg4m8Df2NpZ7keYXE449dkrOrEGSAriZuMR Pony0yKG7qAs8MOq0ouYR4X9HZ+f2LeSwcfostpehjy6rjijMtf8pe3SPYprBfCShjjyfR KI2aeQFB+aM/o/PxjhQwBomlY9a5B621s4EwUBq8ORQcKgWP5ord4SvUrrqwQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902305; 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=nULj9aoC1FY/K7CVtmKJWal1IvMItYD2dvBoUygvvVw=; b=IsSIsux/ztQ6x44hj7FrwGG41kDgFEXmY6uFPz+uABZsp6ZpNe2jP7V6lvfDVNC0VKS/1z bdScMlcCsJ2LrM5pZBuHqIrC5Z8acMMsutSF3YO3aWcHSkRbq63j7IBG7WmqoRWiQ9OGSI jGtWjOpBimSAwxchbaDQgt8chSET7ZnYtXK5QYQCRfROzZ6nX0NC7tO7PvN1tYjoZGtx9g md9kP4vytcgafYSXQwWQFC1RnBjv0g0U0q33ZvKnW7qyj7XODy44G0RR53C/6CR0mp9gmW opIaeqfnsd2gYg2fqQv/dXee+lGQD95KlkvnK3cndk+gv24iqvlFtA4URc4W8g== Received: from Peters-Air (c-x599688e4.customers.hiper-net.dk [89.150.136.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 did not present a certificate) (Authenticated sender: pho) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VPCbh2c9MzjkT; Tue, 23 Apr 2024 19:58:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Date: Tue, 23 Apr 2024 21:58:19 +0200 From: Peter Holm To: Brooks Davis Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1fd880742ace - main - libsys: add a libsys.h Message-ID: References: <202404161648.43GGmLAN079971@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202404161648.43GGmLAN079971@gitrepo.freebsd.org> On Tue, Apr 16, 2024 at 04:48:21PM +0000, Brooks Davis wrote: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1fd880742ace94e11fa60ee0b074f0b18e54c54f > > commit 1fd880742ace94e11fa60ee0b074f0b18e54c54f > Author: Brooks Davis > AuthorDate: 2024-04-16 16:48:07 +0000 > Commit: Brooks Davis > CommitDate: 2024-04-16 16:48:07 +0000 > > libsys: add a libsys.h > > This declares an API for libsys which currently consists of > __sys_() declarations for system call stubs and function pointer > typedefs of the form __sys__t. The vast majority of the > implementation resides in a generated _libsys.h which ensures that all > system call stub declarations match syscalls.master. > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D44387 > --- > lib/libsys/Makefile | 2 + > lib/libsys/_libsys.h | 865 +++++++++++++++++++++++++++++++++++++++++++++++++ > lib/libsys/libsys.h | 25 ++ > sys/kern/syscalls.conf | 1 + > 4 files changed, 893 insertions(+) > Shouldn't readv() and writev() return ssize_t? Like this: diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index d0dd144bc8f1..d4cd14ceb75f 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -141,8 +141,8 @@ typedef int (__sys_listen_t)(int, int); typedef int (__sys_gettimeofday_t)(struct timeval *, struct timezone *); typedef int (__sys_getrusage_t)(int, struct rusage *); typedef int (__sys_getsockopt_t)(int, int, int, void *, __socklen_t *); -typedef int (__sys_readv_t)(int, const struct iovec *, u_int); -typedef int (__sys_writev_t)(int, const struct iovec *, u_int); +typedef ssize_t (__sys_readv_t)(int, const struct iovec *, u_int); +typedef ssize_t (__sys_writev_t)(int, const struct iovec *, u_int); typedef int (__sys_settimeofday_t)(const struct timeval *, const struct timezone *); typedef int (__sys_fchown_t)(int, int, int); typedef int (__sys_fchmod_t)(int, mode_t); @@ -540,8 +540,8 @@ int __sys_listen(int s, int backlog); int __sys_gettimeofday(struct timeval * tp, struct timezone * tzp); int __sys_getrusage(int who, struct rusage * rusage); int __sys_getsockopt(int s, int level, int name, void * val, __socklen_t * avalsize); -int __sys_readv(int fd, const struct iovec * iovp, u_int iovcnt); -int __sys_writev(int fd, const struct iovec * iovp, u_int iovcnt); +ssize_t __sys_readv(int fd, const struct iovec * iovp, u_int iovcnt); +ssize_t __sys_writev(int fd, const struct iovec * iovp, u_int iovcnt); int __sys_settimeofday(const struct timeval * tv, const struct timezone * tzp); int __sys_fchown(int fd, int uid, int gid); int __sys_fchmod(int fd, mode_t mode); - Peter From nobody Tue Apr 23 20:04:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCkN3hjFz5HyrY; Tue, 23 Apr 2024 20:04: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 4VPCkN31kWz4l63; Tue, 23 Apr 2024 20:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJMKYG+Llr+Q5GqB5rhccv7ccFDWU/cWsRTKnZ+5pjE=; b=YYy2Zud6QnwLXVS6Es+ryLgIG6C+fwB7KpK7oZ5m6inakOA6q2XQy4BEs/Q9VufgYgliqO 9C/NT8/kLCt+QDg9T8603gGTxX9Zr1rWRBMnlKS6pyZuMhBVTa5CHg0nxUkFwHwXwqeMDG YipxlLGceusCjPnEGxif4BncT4MZiqyOZ0cnzx1oiBfDARcn+/0S21pVLbcIgCVJhJZyvt Uh2UzZsTj18gvq8p+NodPBB6pVacHl693CoDs0zdeKJ3KbHDODcTjHhJFIv+8ViolUH3D0 kyOvkT6HKECOr5pAxg11W6Vm4E+gNZjIz+3XE/Jc9ReYK038fJ0hXtOMrdTowQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713902652; a=rsa-sha256; cv=none; b=ouqHfNbPmW34wCab7t+/W+YIL8K47rN0efaG+gnASdUGK6D4ep6M0OuFST0/0NHhNvfy88 lmtkErZvZru7rDP3d/K3A2+UNCGgM0KUW/cmg9FDj7VVrnm1JxE6zJQ5MTQ4yJ22eWDVQL MuceyZExsaERbA8ZY1bMNR9ywC0LMY7JJPjCLK6vxRxzbqTEAEXDbe6X7Yd78/AjB8edpH 0EyNqY3C9dWtwAX849jMbhYNW0mEnScqz2pybxbB2GQdwpSKSuCMMw6E5OGlmt4aRQI8iI 7XiRWdTJqs4gVhC5oLgTp5f3jK64DmkKFrXD2/H2KaoTs5egKxCU6kkQfmR6vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJMKYG+Llr+Q5GqB5rhccv7ccFDWU/cWsRTKnZ+5pjE=; b=wA3+6MI/Hbfr26oXDZqqQAY7KtH1cgty8RfEhgfgpOgxQlwH4ebjnyjWB/TXr4XmVgSAQv sRumvjaj1qNix3ntpeXzBbUqxXp0yMkLV12JoC99EJQKFj7clPcbilCs8LU36U5g00jPwE 8SzvU8OocXza78+HG/bgXr3BKOdVk4OLQe1ZztQKqldQ/mrbvuGeWbYUYTsiERdluJgfkV 63+IgRRdfcyyrTZn+zRZ9PSRZLDA7vPZk80hybQ0xYbAlb6h9IVxNHvaEzdnQkZwtRJO8N eLJUcKAaRYC3PxUm1Cn+lyfgmCewUWmci6PpJDTbKRoLY3KvTb4IsJw2mHiEKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCkN2dfszlgN; Tue, 23 Apr 2024 20:04: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 43NK4C4I011985; Tue, 23 Apr 2024 20:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NK4C5i011982; Tue, 23 Apr 2024 20:04:12 GMT (envelope-from git) Date: Tue, 23 Apr 2024 20:04:12 GMT Message-Id: <202404232004.43NK4C5i011982@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: e75a1bbc233b - main - pow,powf(3),__ieee754_rem_pio2(f): Avoid negative integer left shift UB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e75a1bbc233bf112b9eb98a20ad4bdf9bc14b2cf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e75a1bbc233bf112b9eb98a20ad4bdf9bc14b2cf commit e75a1bbc233bf112b9eb98a20ad4bdf9bc14b2cf Author: Karl Tomlinson AuthorDate: 2024-04-23 18:18:25 +0000 Commit: Warner Losh CommitDate: 2024-04-23 20:04:07 +0000 pow,powf(3),__ieee754_rem_pio2(f): Avoid negative integer left shift UB A compiler clever enough to know that z is positive with a non-zero biased exponent could, for example, optimize away the scalbnf(z,n) in pow() because behavior for left shift of negative values is undefined. `n` is negative when y*log2(|x|) < -0.5. i.e. |x^y| < sqrt(0.5) The intended behavior for operator<< in this code is to shift the two's complement representation of the first operand. In the pow() functions, the result is added to the IEEE 754 exponent of z = 2^y'. n may be negative enough to underflow the biased IEEE 754 exponent below zero, which is manifested in the sign bit of j (which would correspond to the IEEE 754 sign bit). The conversion from uint32_t to int32_t for out-of-int32_t-range values is implementation defined. The assumed behavior of interpreting the uint32_t value as a two's complement representation of a signed value is already assumed in many parts of the code, such as uses of GET_FLOAT_WORD() with signed integers. This code passes all the current tests, and makes some out of tree fuzzing tests pass again rather than hit UB (detailed in the commentary of the pull request). Signed-off-by: Karl Tomlinson Reviewed by: imp, steve kargl, dim Pull Request: https://github.com/freebsd/freebsd-src/pull/1137 --- lib/msun/src/e_pow.c | 6 +++++- lib/msun/src/e_powf.c | 6 +++++- lib/msun/src/e_rem_pio2.c | 2 +- lib/msun/src/e_rem_pio2f.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c index 85afacdbb6a2..85d1d551b6fb 100644 --- a/lib/msun/src/e_pow.c +++ b/lib/msun/src/e_pow.c @@ -299,7 +299,11 @@ pow(double x, double y) r = (z*t1)/(t1-two)-(w+z*w); z = one-(r-z); GET_HIGH_WORD(j,z); - j += (n<<20); + /* + * sign bit of z is 0. + * sign bit of j will indicate sign of 0x3ff-biased exponent. + */ + j += (int32_t)((u_int32_t)n<<20); if((j>>20)<=0) z = scalbn(z,n); /* subnormal output */ else SET_HIGH_WORD(z,j); return s*z; diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c index 2e7c37542a77..9f670bcd1caa 100644 --- a/lib/msun/src/e_powf.c +++ b/lib/msun/src/e_powf.c @@ -242,7 +242,11 @@ powf(float x, float y) r = (z*t1)/(t1-two)-(w+z*w); z = one-(r-z); GET_FLOAT_WORD(j,z); - j += (n<<23); + /* + * sign bit of z is 0. + * sign bit of j will indicate sign of 0x7f-biased exponent. + */ + j += (int32_t)((u_int32_t)n<<23); if((j>>23)<=0) z = scalbnf(z,n); /* subnormal output */ else SET_FLOAT_WORD(z,j); return sn*z; diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c index 76ae8050d36b..8a4006498a17 100644 --- a/lib/msun/src/e_rem_pio2.c +++ b/lib/msun/src/e_rem_pio2.c @@ -162,7 +162,7 @@ medium: /* set z = scalbn(|x|,ilogb(x)-23) */ GET_LOW_WORD(low,x); e0 = (ix>>20)-1046; /* e0 = ilogb(z)-23; */ - INSERT_WORDS(z, ix - ((int32_t)(e0<<20)), low); + INSERT_WORDS(z, ix - ((int32_t)((u_int32_t)e0<<20)), low); for(i=0;i<2;i++) { tx[i] = (double)((int32_t)(z)); z = (z-tx[i])*two24; diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c index 744060f18010..d9a3e2e34c46 100644 --- a/lib/msun/src/e_rem_pio2f.c +++ b/lib/msun/src/e_rem_pio2f.c @@ -67,7 +67,7 @@ __ieee754_rem_pio2f(float x, double *y) } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ - SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); + SET_FLOAT_WORD(z, ix - ((int32_t)((u_int32_t)e0<<23))); tx[0] = z; n = __kernel_rem_pio2(tx,ty,e0,1,0); if(hx<0) {*y = -ty[0]; return -n;} From nobody Tue Apr 23 20:04:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCkP62vsz5HyxB; Tue, 23 Apr 2024 20:04: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 4VPCkP4LhKz4kh7; Tue, 23 Apr 2024 20:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psPrlt84z8YkVdbmmqVacr+S6N931DmbHEePspx6jHM=; b=pUqrRQ9didR3we5VUyvfsGgBvKWYNjnN6wOwT4abGbSiCKOCjj/L37F3hCfE5rCtX12JlM wH/aIadXDvvNyHjFj7fx7Tx6Eencjdwgrfivu9BI7OKnfxfIBiU3vMWMHV9IdWSPVOZWEs 9A0BFOOYGhFMNaznpI6FFiC3nb6SKq5gVIakviL8PxJR8nnfnmoRGNz+ppwJWuvkOy37Wa uDMMrrbJ7br51ooAbDn6IKc52/4JYdmFYbh39PmkeNYxtO4mPtvHsSnd/zgCHsg+PZf84a JXCqWmzQ1zBxsPwGPQPKczoWc78IfTqSVzNpyBuCgJ7GaESKg7TbQ/ix8iEpZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713902653; a=rsa-sha256; cv=none; b=OzS5TbgEjOz709nS80AyrgiyhirMwQQrEtmAydIeF5YDVnnpZHsw/3+HWjkI1NDo/1UWMl tlciYaGWZqx926ocytppyR5AVketf/2dGpo4sTAWbGpozeqqsqezjoi77LjYSbtiLDw41f 5Ml/fBYklOqT47kzFzSPDevjdNy40d7Wyshr6U2VHPQIQINy2daTi8PoVKN2PdiVrs7mU2 91RxKKEE4h7bPQgSkfOPsszBVPXtfhoJWR9AVWC6JTbe60Z9XF5k6ButhXpD6MDw0HFLeR aLRN6iMObELex/MmYsp3eyzs6MWebZUV/zgn+XH4yPsGdSv+8EMbCFX9jqfaUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=psPrlt84z8YkVdbmmqVacr+S6N931DmbHEePspx6jHM=; b=irF4X8c6p0PatKIhhGbUDwEsZ/TjFlKewgNoXIWe/DoMxAYt2I6plmZa9ndMTtI4pl4PFk NarFyAH/w9dQj+2M472otp9/GoD4ZqTismh52DuXbfv30YMSHQdEInYNW0ruBjWIkCaIcp VIECj3lAzm4ELC3hM/4qvTjZB0wZh410PQ3CUXeWbnGeVwaHhW0WmB1uQlpz14EMR1xos0 5HpUs/+dk+tM2WnSSjf9VbmcJvkVeDKNKi/cXhS3Dl6TYQjpY4hIjm9iqhFqgtuIq2k60Q oetkUjLwE+kmRIxGqYIHBh04+4oIVlvbXwfU9KaW+kWYKDAV+4l/aGkvgUzFPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPCkP3yl1zlTY; Tue, 23 Apr 2024 20:04: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 43NK4DG5012033; Tue, 23 Apr 2024 20:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NK4DlJ012030; Tue, 23 Apr 2024 20:04:13 GMT (envelope-from git) Date: Tue, 23 Apr 2024 20:04:13 GMT Message-Id: <202404232004.43NK4DlJ012030@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: ea6f2d7797c4 - main - checkstyle9.pl: Warn if there's no SOB line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ea6f2d7797c447e3c128b94ae7d825284a137600 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6f2d7797c447e3c128b94ae7d825284a137600 commit ea6f2d7797c447e3c128b94ae7d825284a137600 Author: Warner Losh AuthorDate: 2024-04-23 20:03:28 +0000 Commit: Warner Losh CommitDate: 2024-04-23 20:04:08 +0000 checkstyle9.pl: Warn if there's no SOB line If there's no Signed-off-by: line, complain. Sponsored by: Netflix --- tools/build/checkstyle9.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index df9ec2bbd7c1..7fa02bcabc97 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1252,6 +1252,7 @@ sub process { my $in_header_lines = $file ? 0 : 1; my $in_commit_log = 0; #Scanning lines before patch + my $has_sob = 0; my $non_utf8_charset = 0; our @report = (); @@ -1456,14 +1457,17 @@ sub process { if ($line =~ /^\s*signed-off-by:/i) { # This is a signoff, if ugly, so do not double report. $in_commit_log = 0; + $has_sob = 1; if (!($line =~ /^\s*Signed-off-by:/)) { ERROR("The correct form is \"Signed-off-by\"\n" . $herecurr); + $has_sob = 0; } if ($line =~ /^\s*signed-off-by:\S/i) { ERROR("space required after Signed-off-by:\n" . $herecurr); + $has_sob = 0; } } @@ -2649,6 +2653,10 @@ sub process { } + if ($has_sob == 0) { + ERROR("Missing Signed-off-by: line"); + } + # If we have no input at all, then there is nothing to report on # so just keep quiet. if ($#rawlines == -1) { From nobody Tue Apr 23 20:06:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPCmq6pF6z5HypV; Tue, 23 Apr 2024 20:06:19 +0000 (UTC) (envelope-from brooks@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 4VPCmq67Sdz4lkl; Tue, 23 Apr 2024 20:06:19 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902779; 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=qXF/6u9LSl+xhA2hDmyCX7he6bneR8/jSQ057WG7LLc=; b=cprLb+3fVqqnP/eiY4F0nbWYonX+l6jBddOcAzMJmFAbiSgtf4VtbF9r3qZ+bL1QDNBoSw iW6v/TTNuYDstJB9COuh/6oUp1BhsjQMl6RtVHrVypthXhWywWG0t+Zib6CdZYkCYVlt3t Wgh++K+P6eCXU4/VbNGToHpufu+TZVx/YkCceuJjCoIDPJYExHkX3hhXhUDJcQkaAv57mM g4vrjg0sJEnpJp9VEuyJH8ak8ChhITXsV7Wo+lRqvUpLZMiCfWbIp6Y6A3y3qhmHEnzB72 yYifb6P9aHWmQXxOudB6PNGOUSn+SLeoy3F3krmRHB0g7EbLECAfd3N2ltiUCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713902779; a=rsa-sha256; cv=none; b=YQUQJL7w71vq4SbQzAnf7Nxin+GnBcdSDsWXsQMxbYLsa3rSrTBlDzgkll+bpb0EWUqJ9i 9FN+AKdTKhX9jE61mDp2iO+p2aVqlfqI8LNz0jvmrMqzgtAikwhz4XE1hjj74pN7Qbaoj1 F367MBn/+aHSqPiwHZ6gSufXgdAPvr6s8/tf2O4GbqBW+idX/vLHkglYr1U883fQnnbCuO CJH0Ij0QYDgmJO/8G7RGD95lvk19m+8wF4MngZFs5fqeng2lufxx0XyVslsIvBwI9kb5kB XfZZ7dZL9Rbqm7kAjdmHJg4kbKI6q9uzFU/qKUPzzp/reBV6eWIojpkxWYwUmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713902779; 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=qXF/6u9LSl+xhA2hDmyCX7he6bneR8/jSQ057WG7LLc=; b=A2Wt5LklS+xlmmpmpNcVnqNgRGzHwGSPE0UlHJ2UHgIl1U1jKqr/+9OpH9RisRLQaIK4ck s1nIKAL0tIz3FqmepBszfXnnQs7i24Aok6olroxrmNL/1quU9hWbKKEPmuSN9+8tX1cOAK fRAIGN+BwQxzqyqcaXR0bRi6pUikV93p2O7N+UhRIJw7sgJWfO6xAO71Ud9rxjwFEjhA0R 8GiTbr/oS57idejM9u2VLZkXGiFhpcnzqdp/9Qxs4k5AS4o3rH64npHTKXR7b7DwQibCPh 0QUY0ootsQp+UpQSyYU+gyoVgpnO8+QLEL168srg1OLmcXEw+4HWkHT4JVLivQ== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_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: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VPCmq5RlLzhXj; Tue, 23 Apr 2024 20:06:19 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id BD48D3C019B; Tue, 23 Apr 2024 20:06:18 +0000 (UTC) Date: Tue, 23 Apr 2024 20:06:18 +0000 From: Brooks Davis To: Peter Holm Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1fd880742ace - main - libsys: add a libsys.h Message-ID: References: <202404161648.43GGmLAN079971@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Apr 23, 2024 at 09:58:19PM +0200, Peter Holm wrote: > On Tue, Apr 16, 2024 at 04:48:21PM +0000, Brooks Davis wrote: > > The branch main has been updated by brooks: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1fd880742ace94e11fa60ee0b074f0b18e54c54f > > > > commit 1fd880742ace94e11fa60ee0b074f0b18e54c54f > > Author: Brooks Davis > > AuthorDate: 2024-04-16 16:48:07 +0000 > > Commit: Brooks Davis > > CommitDate: 2024-04-16 16:48:07 +0000 > > > > libsys: add a libsys.h > > > > This declares an API for libsys which currently consists of > > __sys_() declarations for system call stubs and function pointer > > typedefs of the form __sys__t. The vast majority of the > > implementation resides in a generated _libsys.h which ensures that all > > system call stub declarations match syscalls.master. > > > > Reviewed by: kib > > Differential Revision: https://reviews.freebsd.org/D44387 > > --- > > lib/libsys/Makefile | 2 + > > lib/libsys/_libsys.h | 865 +++++++++++++++++++++++++++++++++++++++++++++++++ > > lib/libsys/libsys.h | 25 ++ > > sys/kern/syscalls.conf | 1 + > > 4 files changed, 893 insertions(+) > > > > Shouldn't readv() and writev() return ssize_t? Indeed. This is a bug in syscalls.master from which this header is generated. I'll fix it. Thanks, Brooks From nobody Tue Apr 23 21:02:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPF1d4G65z5J4K9; Tue, 23 Apr 2024 21:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPF1d3vXvz4qtN; Tue, 23 Apr 2024 21:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713906149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+LEWJyvuXENbeyjZjao5vljICQm+Xj1j32rf8Bn0uM=; b=uyXjsS39RJFnf7ktY5TLr5wil1Uclx54X5r3hpEbDs/YA5EKluLJTy2UO6PNsvBhQgFGU5 PItjdAktDu/RZpdinobBiECtvDz34RSzB9Vv4v+3zDp5MCta6W8BIOGo9mdH1v/JHYCEUk wcxAvKG6iRadf32VSNC78bsK24p8Fku3f1d7gvGerbT6x8Rs1iXodDeYRroMGEePL45Fwg 80vPyIjH03QY8h4OMd/EABc62QSl+bnC5uhXmOcHMghzG9jzsAiu3WajjgJc5JNsrrSQ4c rn5dxpHJvW0oRsXFMy1Z+hhLjDhbFhHop+Dq+r6DVvclRaA9V0+Binteu/q06w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713906149; a=rsa-sha256; cv=none; b=nG2M4YyKp666Rx4LPb3tdcmh0bkNaPGBkChk9FJn8UhX2i8S4vKD+QEOEXhnuvImtZrHXD 0QKo5gGsC4X8PpSgiUO1t8nYZeUDUIzdoTxIJP+bN/HkFF5HHXUBC/DfNsBNL1uQc6bZAj 1QlnoxT/hTNdbBfNPlyBk8aeFy76M9Q9tTzRaQPuc2BF+1oDRZcsSslRcJHeUlC84nict6 I1tvFcdbHDnAkSHSnHc96RPQhNzn4masVXrMU2jv0+uy82lZKeJ/gkKZPUJMQr5NxOvIy7 e+r3oNmJhYrZry8kLyyn/IXMlVUT2vZYYYfEajjr3SCzsmv4pfAkjBEWXuSE8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713906149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+LEWJyvuXENbeyjZjao5vljICQm+Xj1j32rf8Bn0uM=; b=yduP7I2Ogcv5wppQvIpgvAOffEkMFo8pPOjmQCF9/0S1C7ZOrCOo6kOaCaCQ1r2NSKUq/b VlGt+hLLCdGx/BzNpMCTfJ8Mwrpzex+T3FmHZlGeVg+A0tXV01EvLxvW4xWA/WELd+9cl0 hYBQANTyGhCqV0HTsHcnZbpFGkrVVPQ0+FvbNAsLKG64I0EjC6Fh2uyeKdSOr2kXamgAVA vQYCjZ7C+1HVAhSabIdwwdIZy9eXbFEI6kM9O8yTlnfUF2PrDEwimbuRGJxXo/Iq5+GpnL mXxlNdn+qxY01BSrrW3YlaznQKVck3Kpq0TJtHOTyHiMScJCbzEwvrC9VCXf0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPF1d3Vp4zmgL; Tue, 23 Apr 2024 21:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NL2T7D013055; Tue, 23 Apr 2024 21:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NL2Tk4013051; Tue, 23 Apr 2024 21:02:29 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:02:29 GMT Message-Id: <202404232102.43NL2Tk4013051@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: 65971073d935 - main - ahc(4) clean up old Linux defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 65971073d935e8314bff8bca26d1445e9e336fce Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65971073d935e8314bff8bca26d1445e9e336fce commit 65971073d935e8314bff8bca26d1445e9e336fce Author: HP van Braam AuthorDate: 2024-04-23 20:55:36 +0000 Commit: Warner Losh CommitDate: 2024-04-23 20:56:11 +0000 ahc(4) clean up old Linux defines Linux removed theirs starting in 2018 in commit: "scsi: aic7xxx: Fix build using bare-metal toolchain" Also remove now-useless sys/cdefs.h includes Signed-off-by: HP van Braam Reviewed by: imp, mav, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/1189 --- sys/dev/aic7xxx/ahc_isa.c | 1 - sys/dev/aic7xxx/ahc_pci.c | 1 - sys/dev/aic7xxx/ahd_pci.c | 1 - sys/dev/aic7xxx/aic7770.c | 7 ------- sys/dev/aic7xxx/aic79xx.c | 35 +---------------------------------- sys/dev/aic7xxx/aic79xx.h | 4 ---- sys/dev/aic7xxx/aic79xx_osm.c | 1 - sys/dev/aic7xxx/aic79xx_pci.c | 6 ------ sys/dev/aic7xxx/aic79xx_reg_print.c | 1 - sys/dev/aic7xxx/aic7xxx.c | 35 +---------------------------------- sys/dev/aic7xxx/aic7xxx.h | 4 ---- sys/dev/aic7xxx/aic7xxx_93cx6.c | 7 ------- sys/dev/aic7xxx/aic7xxx_osm.c | 1 - sys/dev/aic7xxx/aic7xxx_pci.c | 7 ------- sys/dev/aic7xxx/aic7xxx_reg_print.c | 1 - 15 files changed, 2 insertions(+), 110 deletions(-) diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c index 06ef509f2782..e096a9e5bb6d 100644 --- a/sys/dev/aic7xxx/ahc_isa.c +++ b/sys/dev/aic7xxx/ahc_isa.c @@ -37,7 +37,6 @@ * $Id$ */ -#include #include #include /* For CHAR_BIT*/ diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 6911f167c081..1f9cd33f9e00 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -31,7 +31,6 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#19 $ */ -#include #include static int ahc_pci_probe(device_t dev); diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c index ec828517c1c4..6af7169b49ff 100644 --- a/sys/dev/aic7xxx/ahd_pci.c +++ b/sys/dev/aic7xxx/ahd_pci.c @@ -31,7 +31,6 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#17 $ */ -#include #include static int ahd_pci_probe(device_t dev); diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c index 5ca98b8fd080..07d8eaf13419 100644 --- a/sys/dev/aic7xxx/aic7770.c +++ b/sys/dev/aic7xxx/aic7770.c @@ -42,16 +42,9 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $ */ -#ifdef __linux__ -#include "aic7xxx_osm.h" -#include "aic7xxx_inline.h" -#include "aic7xxx_93cx6.h" -#else -#include #include #include #include -#endif #define ID_AIC7770 0x04907770 #define ID_AHA_274x 0x04907771 diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 58b795a9d4ce..61e65bf253d7 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -42,16 +42,9 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#246 $ */ -#ifdef __linux__ -#include "aic79xx_osm.h" -#include "aic79xx_inline.h" -#include "aicasm/aicasm_insformat.h" -#else -#include #include #include #include -#endif /******************************** Globals *************************************/ struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq); @@ -2250,7 +2243,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) printerror = 0; } else if (ahd_sent_msg(ahd, AHDMSG_1B, MSG_BUS_DEV_RESET, TRUE)) { -#ifdef __FreeBSD__ /* * Don't mark the user's request for this BDR * as completing with CAM_BDR_SENT. CAM3 @@ -2262,7 +2254,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_INITIATOR)) aic_set_transaction_status(scb, CAM_REQ_CMP); -#endif ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD, CAM_BDR_SENT, "Bus Device Reset", /*verbose_level*/0); @@ -5223,23 +5214,11 @@ ahd_alloc(void *platform_arg, char *name) { struct ahd_softc *ahd; -#ifndef __FreeBSD__ - ahd = malloc(sizeof(*ahd), M_DEVBUF, M_NOWAIT); - if (!ahd) { - printf("aic7xxx: cannot malloc softc!\n"); - free(name, M_DEVBUF); - return NULL; - } -#else ahd = device_get_softc((device_t)platform_arg); -#endif memset(ahd, 0, sizeof(*ahd)); ahd->seep_config = malloc(sizeof(*ahd->seep_config), M_DEVBUF, M_NOWAIT); if (ahd->seep_config == NULL) { -#ifndef __FreeBSD__ - free(ahd, M_DEVBUF); -#endif free(name, M_DEVBUF); return (NULL); } @@ -5377,17 +5356,13 @@ ahd_free(struct ahd_softc *ahd) case 2: aic_dma_tag_destroy(ahd, ahd->shared_data_dmat); case 1: -#ifndef __linux__ aic_dma_tag_destroy(ahd, ahd->buffer_dmat); -#endif break; case 0: break; } -#ifndef __linux__ aic_dma_tag_destroy(ahd, ahd->parent_dmat); -#endif ahd_platform_free(ahd); ahd_fini_scbdata(ahd); for (i = 0; i < AHD_NUM_TARGETS; i++) { @@ -5423,9 +5398,6 @@ ahd_free(struct ahd_softc *ahd) free(ahd->seep_config, M_DEVBUF); if (ahd->saved_stack != NULL) free(ahd->saved_stack, M_DEVBUF); -#ifndef __FreeBSD__ - free(ahd, M_DEVBUF); -#endif return; } @@ -6146,9 +6118,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd) for (i = 0; i < newcount; i++) { struct scb_platform_data *pdata; u_int col_tag; -#ifndef __linux__ int error; -#endif next_scb = (struct scb *)malloc(sizeof(*next_scb), M_DEVBUF, M_NOWAIT); @@ -6184,7 +6154,6 @@ ahd_alloc_scbs(struct ahd_softc *ahd) next_scb->sg_list_busaddr += sizeof(struct ahd_dma_seg); next_scb->ahd_softc = ahd; next_scb->flags = SCB_FLAG_NONE; -#ifndef __linux__ error = aic_dmamap_create(ahd, ahd->buffer_dmat, /*flags*/0, &next_scb->dmamap); if (error != 0) { @@ -6192,7 +6161,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd) free(pdata, M_DEVBUF); break; } -#endif + next_scb->hscb->tag = aic_htole16(scb_data->numscbs); col_tag = scb_data->numscbs ^ 0x100; next_scb->col_scb = ahd_find_scb_by_tag(ahd, col_tag); @@ -6295,7 +6264,6 @@ ahd_init(struct ahd_softc *ahd) if ((AHD_TMODE_ENABLE & (0x1 << ahd->unit)) == 0) ahd->features &= ~AHD_TARGETMODE; -#ifndef __linux__ /* DMA tag for mapping buffers into device visible space. */ if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1, /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1, @@ -6311,7 +6279,6 @@ ahd_init(struct ahd_softc *ahd) &ahd->buffer_dmat) != 0) { return (ENOMEM); } -#endif ahd->init_level++; diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h index 7c7d023645f0..22de60d56316 100644 --- a/sys/dev/aic7xxx/aic79xx.h +++ b/sys/dev/aic7xxx/aic79xx.h @@ -625,9 +625,7 @@ struct scb { aic_io_ctx_t io_ctx; struct ahd_softc *ahd_softc; scb_flag flags; -#ifndef __linux__ bus_dmamap_t dmamap; -#endif struct scb_platform_data *platform_data; struct map_node *hscb_map; struct map_node *sg_map; @@ -1098,9 +1096,7 @@ struct ahd_completion struct ahd_softc { bus_space_tag_t tags[2]; bus_space_handle_t bshs[2]; -#ifndef __linux__ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ -#endif struct scb_data scb_data; struct hardware_scb *next_queued_hscb; diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index 4a1e3336fe5f..32d4f393882c 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -32,7 +32,6 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#35 $ */ -#include #include #include diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c index 1ccc850648a4..6106b739057b 100644 --- a/sys/dev/aic7xxx/aic79xx_pci.c +++ b/sys/dev/aic7xxx/aic79xx_pci.c @@ -43,14 +43,8 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#88 $ */ -#ifdef __linux__ -#include "aic79xx_osm.h" -#include "aic79xx_inline.h" -#else -#include #include #include -#endif static __inline uint64_t ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) diff --git a/sys/dev/aic7xxx/aic79xx_reg_print.c b/sys/dev/aic7xxx/aic79xx_reg_print.c index 72f4ccd2e6b0..5c0e2de02950 100644 --- a/sys/dev/aic7xxx/aic79xx_reg_print.c +++ b/sys/dev/aic7xxx/aic79xx_reg_print.c @@ -6,7 +6,6 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $ */ -#include #include static ahd_reg_parse_entry_t MODE_PTR_parse_table[] = { diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 4d97d8ee6367..b59a35ab5667 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -42,16 +42,9 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $ */ -#ifdef __linux__ -#include "aic7xxx_osm.h" -#include "aic7xxx_inline.h" -#include "aicasm/aicasm_insformat.h" -#else -#include #include #include #include -#endif /****************************** Softc Data ************************************/ struct ahc_softc_tailq ahc_tailq = TAILQ_HEAD_INITIALIZER(ahc_tailq); @@ -1277,7 +1270,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) printerror = 0; } else if (ahc_sent_msg(ahc, AHCMSG_1B, MSG_BUS_DEV_RESET, TRUE)) { -#ifdef __FreeBSD__ /* * Don't mark the user's request for this BDR * as completing with CAM_BDR_SENT. CAM3 @@ -1291,7 +1283,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) ROLE_INITIATOR)) { aic_set_transaction_status(scb, CAM_REQ_CMP); } -#endif ahc_compile_devinfo(&devinfo, initiator_role_id, target, @@ -3878,23 +3869,11 @@ ahc_alloc(void *platform_arg, char *name) struct ahc_softc *ahc; int i; -#ifndef __FreeBSD__ - ahc = malloc(sizeof(*ahc), M_DEVBUF, M_NOWAIT); - if (!ahc) { - printf("aic7xxx: cannot malloc softc!\n"); - free(name, M_DEVBUF); - return NULL; - } -#else ahc = device_get_softc((device_t)platform_arg); -#endif memset(ahc, 0, sizeof(*ahc)); ahc->seep_config = malloc(sizeof(*ahc->seep_config), M_DEVBUF, M_NOWAIT); if (ahc->seep_config == NULL) { -#ifndef __FreeBSD__ - free(ahc, M_DEVBUF); -#endif free(name, M_DEVBUF); return (NULL); } @@ -4041,17 +4020,13 @@ ahc_free(struct ahc_softc *ahc) case 2: aic_dma_tag_destroy(ahc, ahc->shared_data_dmat); case 1: -#ifndef __linux__ aic_dma_tag_destroy(ahc, ahc->buffer_dmat); -#endif break; case 0: break; } -#ifndef __linux__ aic_dma_tag_destroy(ahc, ahc->parent_dmat); -#endif ahc_platform_free(ahc); ahc_fini_scbdata(ahc); for (i = 0; i < AHC_NUM_TARGETS; i++) { @@ -4085,9 +4060,6 @@ ahc_free(struct ahc_softc *ahc) free(ahc->name, M_DEVBUF); if (ahc->seep_config != NULL) free(ahc->seep_config, M_DEVBUF); -#ifndef __FreeBSD__ - free(ahc, M_DEVBUF); -#endif return; } @@ -4537,9 +4509,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc) newcount = MIN(newcount, (AHC_SCB_MAX_ALLOC - scb_data->numscbs)); for (i = 0; i < newcount; i++) { struct scb_platform_data *pdata; -#ifndef __linux__ int error; -#endif pdata = (struct scb_platform_data *)malloc(sizeof(*pdata), M_DEVBUF, M_NOWAIT); if (pdata == NULL) @@ -4554,12 +4524,11 @@ ahc_alloc_scbs(struct ahc_softc *ahc) next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg); next_scb->ahc_softc = ahc; next_scb->flags = SCB_FLAG_NONE; -#ifndef __linux__ error = aic_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0, &next_scb->dmamap); if (error != 0) break; -#endif + next_scb->hscb = &scb_data->hscbs[scb_data->numscbs]; next_scb->hscb->tag = ahc->scb_data->numscbs; aic_timer_init(&next_scb->io_timer); @@ -4860,7 +4829,6 @@ ahc_init(struct ahc_softc *ahc) if ((AHC_TMODE_ENABLE & (0x1 << ahc->unit)) == 0) ahc->features &= ~AHC_TARGETMODE; -#ifndef __linux__ /* DMA tag for mapping buffers into device visible space. */ if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1, /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1, @@ -4876,7 +4844,6 @@ ahc_init(struct ahc_softc *ahc) &ahc->buffer_dmat) != 0) { return (ENOMEM); } -#endif ahc->init_level++; diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h index 617204580f82..5c32b1e227c5 100644 --- a/sys/dev/aic7xxx/aic7xxx.h +++ b/sys/dev/aic7xxx/aic7xxx.h @@ -589,9 +589,7 @@ struct scb { aic_io_ctx_t io_ctx; struct ahc_softc *ahc_softc; scb_flag flags; -#ifndef __linux__ bus_dmamap_t dmamap; -#endif struct scb_platform_data *platform_data; struct sg_map_node *sg_map; struct ahc_dma_seg *sg_list; @@ -932,9 +930,7 @@ typedef void ahc_callback_t (void *); struct ahc_softc { bus_space_tag_t tag; bus_space_handle_t bsh; -#ifndef __linux__ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ -#endif struct scb_data *scb_data; struct scb *next_queued_scb; diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c index be608358f336..82516f1466f7 100644 --- a/sys/dev/aic7xxx/aic7xxx_93cx6.c +++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c @@ -64,16 +64,9 @@ * bit to be sent from the chip. */ -#ifdef __linux__ -#include "aic7xxx_osm.h" -#include "aic7xxx_inline.h" -#include "aic7xxx_93cx6.h" -#else -#include #include #include #include -#endif /* * Right now, we only have to read the SEEPROM. But we make it easier to diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index 04037773c528..a42aeaef7c86 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -31,7 +31,6 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#20 $ */ -#include #include #include diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c index 855d13f0db0c..26c11dc5dcaa 100644 --- a/sys/dev/aic7xxx/aic7xxx_pci.c +++ b/sys/dev/aic7xxx/aic7xxx_pci.c @@ -44,16 +44,9 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $ */ -#ifdef __linux__ -#include "aic7xxx_osm.h" -#include "aic7xxx_inline.h" -#include "aic7xxx_93cx6.h" -#else -#include #include #include #include -#endif static __inline uint64_t ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) diff --git a/sys/dev/aic7xxx/aic7xxx_reg_print.c b/sys/dev/aic7xxx/aic7xxx_reg_print.c index 0535cab0d4d6..e0711c1a8e5c 100644 --- a/sys/dev/aic7xxx/aic7xxx_reg_print.c +++ b/sys/dev/aic7xxx/aic7xxx_reg_print.c @@ -6,7 +6,6 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $ */ -#include #include static ahc_reg_parse_entry_t SCSISEQ_parse_table[] = { From nobody Tue Apr 23 21:02:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPF1f5sppz5J4CJ; Tue, 23 Apr 2024 21:02: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 4VPF1f50lyz4qws; Tue, 23 Apr 2024 21:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713906150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2VvIn+VOMOyusC1w86cDq4FrXoPzhrTp4SMug/cvzk=; b=L56v7IBCtNvKiYdvrErN1j6vUEq+QWGDjwrRNMDV6Q9QDv20ZvVHkOtVTKLec3/77uqjQJ oYxDt47jUB8RaEen9tgIyDB9kC5EC50fZFEyk8J3Edk4s8Jv100C0MfgtDRiaeQ/VTvseL 8JdGovRXuaAWP9j5CDI75sBe0dkVUgHdPx5E4LLaqqBDcCGFOxiBsZDddDLHo22NhylQw8 eNELRWe6+gR0iTWHmmT7LwH91azm+aiFUkENIW3pSW8NduRQID4xBHVbsulmIl5+aJc9Wt gOPC4NDRf+J7i9dsiL132dOS1Rh8Mg+BmO60UXnoiv5hMFqTitgnQxxSJUSZRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713906150; a=rsa-sha256; cv=none; b=ouwqY4hAVna1Hvcx1tkn0LxYQVmZJ3AXhlw70KnSsLoLvOyPQrP8c9W08WO0ZnjPhVHyEX df8pFPIpa/WIqGWgvMzdoiG2Iwq9ZOygGcIyWfjEMfS8WRCbjwKdw75FvXVMWNbZ1U88gW KfWiIavuFphh0JwEN3IXMhA9JDroyZ4VkS9o0GEhx3LRRsB07nvyeXguucDHVACpFatWf1 cz3QFu0Y4mljauul+nouiYWFZIpnEQ6D8FxSMQOOesYiX2lSXzHmE8tk6jHKxazQOnt7Pd 5NCH7p6AK4TKCQfMHzU74ZoGgpfbfD86us2VNTEGORlvoO+96kNGHZxkrzxC7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713906150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2VvIn+VOMOyusC1w86cDq4FrXoPzhrTp4SMug/cvzk=; b=WF+kAqYiVQhuH7vtBEN0cq+zPXk4QP+kALCK2nWlzOPN1X8in4+D6F4OfV8UenbcESJ9wk mmTXp7vubGdNrJdnHiLWtQvTUm/Tr4wiij/hYwGz45Q8HoNgPa/ylDyh8SHI4O3J+JAaya kmNs76zjYmunX8TaoisDr8TjriUEUSB4KWUTsNiHiVuZlOU62ifWrhYZImUzfVHKyZHBtT 0byVktksl+eIgwdp24nVCrdFZZzg/kzmU1cj+QWgAk0v/LUFHoRa6gJz+Z1sET1tHHLNIv c04WC1BwYvCKbAntlf8zFTTntVMGGPfE8957Z73Qjr9nQ/S5tYDZmc+0Det1ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPF1f4cKvzncM; Tue, 23 Apr 2024 21:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NL2UOx013111; Tue, 23 Apr 2024 21:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NL2UYk013108; Tue, 23 Apr 2024 21:02:30 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:02:30 GMT Message-Id: <202404232102.43NL2UYk013108@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: d31b677356d7 - main - ahc(4)/ahd(4): target mode: cancel outstanding AIOs and INOTs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d31b677356d74b5747814f98a5151e8ee0595399 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d31b677356d74b5747814f98a5151e8ee0595399 commit d31b677356d74b5747814f98a5151e8ee0595399 Author: HP van Braam AuthorDate: 2024-04-23 20:47:12 +0000 Commit: Warner Losh CommitDate: 2024-04-23 20:57:19 +0000 ahc(4)/ahd(4): target mode: cancel outstanding AIOs and INOTs When disabling a lun there can still be outstanding AIOs and INOTs, when this happens previously the lun would just fail to disable and trying to re-use the lun would break the card. isp(4) in target mode does the same thing when disabling a lun, in testing this allows re-starting of ctld(8) with connected initiators and allows initiators to gracefully resume afterwards. Signed-off-by: HP van Braam Reviewed by: imp, mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1190 --- sys/dev/aic7xxx/aic79xx.c | 13 +++++++++++-- sys/dev/aic7xxx/aic7xxx.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 61e65bf253d7..1b1d31769f90 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -9803,6 +9803,7 @@ ahd_handle_en_lun(struct ahd_softc *ahd, struct cam_sim *sim, union ccb *ccb) struct ahd_tmode_tstate *tstate; struct ahd_tmode_lstate *lstate; struct ccb_en_lun *cel; + union ccb *cancel_ccb; cam_status status; u_int target; u_int lun; @@ -10021,12 +10022,20 @@ ahd_handle_en_lun(struct ahd_softc *ahd, struct cam_sim *sim, union ccb *ccb) if (SLIST_FIRST(&lstate->accept_tios) != NULL) { printf("ATIOs pending\n"); - ccb->ccb_h.status = CAM_REQ_INVALID; + while ((cancel_ccb = (union ccb *)SLIST_FIRST(&lstate->accept_tios)) != NULL) { + SLIST_REMOVE_HEAD(&lstate->accept_tios, sim_links.sle); + cancel_ccb->ccb_h.status = CAM_REQ_ABORTED; + xpt_done(cancel_ccb); + }; } if (SLIST_FIRST(&lstate->immed_notifies) != NULL) { printf("INOTs pending\n"); - ccb->ccb_h.status = CAM_REQ_INVALID; + while ((cancel_ccb = (union ccb *)SLIST_FIRST(&lstate->immed_notifies)) != NULL) { + SLIST_REMOVE_HEAD(&lstate->immed_notifies, sim_links.sle); + cancel_ccb->ccb_h.status = CAM_REQ_ABORTED; + xpt_done(cancel_ccb); + }; } if (ccb->ccb_h.status != CAM_REQ_CMP) { diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index b59a35ab5667..1560aa4fe312 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7253,6 +7253,7 @@ ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb) struct ahc_tmode_tstate *tstate; struct ahc_tmode_lstate *lstate; struct ccb_en_lun *cel; + union ccb *cancel_ccb; cam_status status; u_int target; u_int lun; @@ -7520,12 +7521,20 @@ ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb) if (SLIST_FIRST(&lstate->accept_tios) != NULL) { printf("ATIOs pending\n"); - ccb->ccb_h.status = CAM_REQ_INVALID; + while ((cancel_ccb = (union ccb *)SLIST_FIRST(&lstate->accept_tios)) != NULL) { + SLIST_REMOVE_HEAD(&lstate->accept_tios, sim_links.sle); + cancel_ccb->ccb_h.status = CAM_REQ_ABORTED; + xpt_done(cancel_ccb); + }; } if (SLIST_FIRST(&lstate->immed_notifies) != NULL) { printf("INOTs pending\n"); - ccb->ccb_h.status = CAM_REQ_INVALID; + while ((cancel_ccb = (union ccb *)SLIST_FIRST(&lstate->immed_notifies)) != NULL) { + SLIST_REMOVE_HEAD(&lstate->immed_notifies, sim_links.sle); + cancel_ccb->ccb_h.status = CAM_REQ_ABORTED; + xpt_done(cancel_ccb); + }; } if (ccb->ccb_h.status != CAM_REQ_CMP) { From nobody Tue Apr 23 21:43:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFwp3Nlhz5J7TR; Tue, 23 Apr 2024 21:43: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 4VPFwp2Xhqz4vHh; Tue, 23 Apr 2024 21:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KISc76H043viJckgZ94GsF5CN5cGWg9EgtNvzVRZnbo=; b=ps1txq/ptg5jfpiVwCesRXrOLkuSH0+D5BojvzTRTLdyxvrx/64Ts5GYk0J9agzDAKEnPz u08LJScQXJ/hxblfm0yLWTVncUrhk1XFnF1ewhLWyX80VzV1NR36HqzoOdv7/zmdcbhs3H lEJBZ3v+Zb0mw0HWah57X3IWQKHsFHoKxrdmqWfRjSIhk54HQ5XphuIU5lX8Bb7q+0XHBM xpchFXGrQNUHj0c67cJcGHPDmPQcCVQXKAuXPqSKT6i8hvgMHQLC+BnJ+i4zGF6NhLpHPK T8Uxwj9hWk037hQ3wvyeI1PGlEirZBNsakXvL9yqRuGtn9Z+vgK6lUtGKEGm1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908602; a=rsa-sha256; cv=none; b=m6Wt8JgSuP8UJ2cjAsY9SAewDTz3NELVkN9/vNq5D9fzThHLIRokMmqMH541b955Waqg/F 3+TBviI1Og+PWnVewd9DqRcvXhLBqR4U3oIPSJzVQM+nA3mzQZnt9l78jVdEE6uwdmCQyA 7BgVVmJI2XwCG66uM70Ob/YcEIklNYhpwzh/stPn4YlyObAztyHJKrqqsqwipiGLNuZXVF uFnrHt7NgQ5BSgp0AHbkAfE56cQvU6tlOJn38pKqutF77tqnA99amGpBtYai87DiQpQkD4 6AxQRfwgduwxUCcF109LwhqhBxSb4HB7EoyXrmrlL62d9AIRbW1ZKUOahcL/bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KISc76H043viJckgZ94GsF5CN5cGWg9EgtNvzVRZnbo=; b=fgwvPBifM3EsAairKnv2Np/+8BIGd7YTg0FC4abvSNlWSID1ySuT7EYFS5V+qrfeNxZsAX ipfSMW/vF5algliC5u8yyK62vMKh7dJFDShxTC7GdCK5JvBLDnMI8U3qzfsgSKev4Fp4ai VhP0OD72h2v4yMP6zFOn443DK1c4WU1mEOkOaWi7oCXslQ8gvY7RNXi3hgUt605Y/EzL7g k5wwhRN3Dv7UYiFJM2ARpOMk7MNMQ3ggVJS8b6RixR9MgmspPPOEHbNXQFerPsvkey0mlW q1D0y9AYHeVLghfKX+kEc6SfRSywRIy+8dL2O5lpWomFd/RUQ20rWN/OS1TcfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFwp2874zpY0; Tue, 23 Apr 2024 21:43: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 43NLhMsc079921; Tue, 23 Apr 2024 21:43:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhMxd079918; Tue, 23 Apr 2024 21:43:22 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:22 GMT Message-Id: <202404232143.43NLhMxd079918@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: 65767e6126a7 - main - sys/net/if_bridge: support non-INET 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 65767e6126a7e92bc76561b4ffd005cf85ba525e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65767e6126a7e92bc76561b4ffd005cf85ba525e commit 65767e6126a7e92bc76561b4ffd005cf85ba525e Author: Lexi Winter AuthorDate: 2024-04-23 21:12:57 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:00 +0000 sys/net/if_bridge: support non-INET kernels Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1159 --- sys/net/if_bridge.c | 56 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 1b4ac92b62a3..7b44d85d1fe8 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -403,14 +403,19 @@ static int bridge_ioctl_sproto(struct bridge_softc *, void *); static int bridge_ioctl_stxhc(struct bridge_softc *, void *); static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *, int); +static void bridge_linkstate(struct ifnet *ifp); +static void bridge_linkcheck(struct bridge_softc *sc); + +#ifdef INET static int bridge_ip_checkbasic(struct mbuf **mp); +static int bridge_fragment(struct ifnet *, struct mbuf **mp, + struct ether_header *, int, struct llc *); +#endif /* INET */ + #ifdef INET6 static int bridge_ip6_checkbasic(struct mbuf **mp); #endif /* INET6 */ -static int bridge_fragment(struct ifnet *, struct mbuf **mp, - struct ether_header *, int, struct llc *); -static void bridge_linkstate(struct ifnet *ifp); -static void bridge_linkcheck(struct bridge_softc *sc); + /* * Use the "null" value from IEEE 802.1Q-2014 Table 9-2 @@ -3390,12 +3395,15 @@ bridge_state_change(struct ifnet *ifp, int state) static int bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) { - int snap, error, i, hlen; + int snap, error, i; struct ether_header *eh1, eh2; - struct ip *ip; struct llc llc1; u_int16_t ether_type; pfil_return_t rv; +#ifdef INET + struct ip *ip = NULL; + int hlen = 0; +#endif snap = 0; error = -1; /* Default error if not error == 0 */ @@ -3436,31 +3444,36 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) } /* - * If we're trying to filter bridge traffic, don't look at anything - * other than IP and ARP traffic. If the filter doesn't understand - * IPv6, don't allow IPv6 through the bridge either. This is lame - * since if we really wanted, say, an AppleTalk filter, we are hosed, - * but of course we don't have an AppleTalk filter to begin with. - * (Note that since pfil doesn't understand ARP it will pass *ALL* - * ARP traffic.) + * If we're trying to filter bridge traffic, only look at traffic for + * protocols available in the kernel (IPv4 and/or IPv6) to avoid + * passing traffic for an unsupported protocol to the filter. This is + * lame since if we really wanted, say, an AppleTalk filter, we are + * hosed, but of course we don't have an AppleTalk filter to begin + * with. (Note that since pfil doesn't understand ARP it will pass + * *ALL* ARP traffic.) */ switch (ether_type) { +#ifdef INET case ETHERTYPE_ARP: case ETHERTYPE_REVARP: if (V_pfil_ipfw_arp == 0) return (0); /* Automatically pass */ - break; + /*FALLTHROUGH*/ case ETHERTYPE_IP: +#endif #ifdef INET6 case ETHERTYPE_IPV6: #endif /* INET6 */ break; + default: /* - * Check to see if the user wants to pass non-ip - * packets, these will not be checked by pfil(9) and - * passed unconditionally so the default is to drop. + * We get here if the packet isn't from a supported + * protocol. Check to see if the user wants to pass + * non-IP packets, these will not be checked by pfil(9) + * and passed unconditionally so the default is to + * drop. */ if (V_pfil_onlyip) goto bad; @@ -3492,9 +3505,11 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) */ if (dir == PFIL_IN) { switch (ether_type) { +#ifdef INET case ETHERTYPE_IP: error = bridge_ip_checkbasic(mp); break; +#endif #ifdef INET6 case ETHERTYPE_IPV6: error = bridge_ip6_checkbasic(mp); @@ -3514,6 +3529,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) */ rv = PFIL_PASS; switch (ether_type) { +#ifdef INET case ETHERTYPE_IP: /* * Run pfil on the member interface and the bridge, both can @@ -3571,6 +3587,8 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) ip->ip_sum = in_cksum(*mp, hlen); break; +#endif + #ifdef INET6 case ETHERTYPE_IPV6: if (V_pfil_bridge && dir == PFIL_OUT && bifp != NULL && (rv = @@ -3628,6 +3646,7 @@ bad: return (error); } +#ifdef INET /* * Perform basic checks on header size since * pfil assumes ip_input has already processed @@ -3728,6 +3747,7 @@ bad: *mp = m; return (-1); } +#endif #ifdef INET6 /* @@ -3783,6 +3803,7 @@ bad: } #endif /* INET6 */ +#ifdef INET /* * bridge_fragment: * @@ -3859,6 +3880,7 @@ dropit: } return (error); } +#endif static void bridge_linkstate(struct ifnet *ifp) From nobody Tue Apr 23 21:43:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFwq49jkz5J7hg; Tue, 23 Apr 2024 21:43: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 4VPFwq3dp9z4vMc; Tue, 23 Apr 2024 21:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FhTs1Bl8quoMvOhYqKsevabkvO2OfOCQ+fUSp6ezgk=; b=NRnuhcQDGr2mfpS+mmuCzzS9FGacXNeuX7fXLFSS70D0YXS1iud6U0ORF3U6kUZpi1uqd+ IcJYyi1UbrQp5bRczXBRFU0aEGbwZc003gvItc9h3beOM6angPbKzdDn5NY7UV4JQtvgZp T8e6ZEk2MnDNZVCF33AANJEVcKVXCnKtswbO9BeYYQuyuTUkxCvDvkKcoC6lUNXQJ4dypu 8zFFeBSM0ulaD0dWx7xZietceFruPBZV5EfeK8KSjPjiKH/Gldj7b0XysYttHs661/DT70 D1dJvQSwhkJABUrUg5IVe/3/BAha+il65hbRixJn+NOphrnmL0+lqL6rfXIkIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908603; a=rsa-sha256; cv=none; b=srEQ8Jq7L/cPNMTVYQLDOIwgnn+fdwZDc4odMTA3ZEjYvYmqLTbOIZhnvWoiP8yXSvH0hj uE5UdRCUjTjwmj3CTabZfARdZuZ21nntDCjPHE+4BHch+E22MwZkBoQeJmBKuk+WPRT/jE zfxn9sIFkGFU0WPlvBbJCzDqq1N6XryUwuR6ZjSuUciPEy9VOk5NFIQL8PhWI2aiycDOgx rawt+PXSIKo55E0U7xlkx7sDMI4eND4DOIGls+US14k999/TT38FpNduTAIDxP0R40OP9W YwwyYQizmI9ksUAzcOTDQbEDZMeFim8xhGQjjEBG8B9Jgfy1gHEFG/XMmApRmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FhTs1Bl8quoMvOhYqKsevabkvO2OfOCQ+fUSp6ezgk=; b=F42YGLjtRnbW2sRF4ZxsfJX6YfYMXTuwuSTyGL7gX+LiqMx5bG4mr/tgRdE8M5mTUoJz7B lFgWZLOC10UAgrxOXaJ6dseCJuloYozOwR5CK7wyrgRx1jqvbWwVMTVIYZHBu4vQlIGUUb 6xxmGTABMQJmFBnQQYNo5g+hrm6dkBQsFmowV5lwbDsU7A8bEVnGldCenIGjUqvbf8OpdO yFbAoQcV6FQh88F7IO3fbAXoJhXZuQc+z9mMd82HtC72te0M+j1UMsy7uqXsIkU2saA0xv AZ9Dk4vMp1ac+bxfTIWMBZCGdmIuOUIqsn9kdfwcqfM2UJ5ehjPxt7T7CD26JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFwq3FGQznMc; Tue, 23 Apr 2024 21:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhN7H079963; Tue, 23 Apr 2024 21:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhNaQ079960; Tue, 23 Apr 2024 21:43:23 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:23 GMT Message-Id: <202404232143.43NLhNaQ079960@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: 93c5ba5a83d6 - main - sys/netpfil/pf: fix non-INET module build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 93c5ba5a83d6e23329e9ca9b9ed72eea613b611d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=93c5ba5a83d6e23329e9ca9b9ed72eea613b611d commit 93c5ba5a83d6e23329e9ca9b9ed72eea613b611d Author: Lexi Winter AuthorDate: 2024-04-22 21:59:12 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:21 +0000 sys/netpfil/pf: fix non-INET module build pf.ko, when built as a module without 'options INET' but with 'options VIMAGE', won't load: link_elf_obj: symbol vnet_entry_in_loopback_mask undefined This is because it uses IN_LOOPBACK(), which in the VIMAGE case uses INET-specific symbols. Fix by making this check conditional on #ifdef INET. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1157 --- sys/netpfil/pf/pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index cbf5ebfc0e56..0dd4da5f271a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7956,7 +7956,10 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, if (s != NULL && s->nat_rule.ptr != NULL && s->nat_rule.ptr->action == PF_RDR && - ((pd->af == AF_INET && IN_LOOPBACK(ntohl(pd->dst->v4.s_addr))) || + ( +#ifdef INET + (pd->af == AF_INET && IN_LOOPBACK(ntohl(pd->dst->v4.s_addr))) || +#endif (pd->af == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&pd->dst->v6)))) { /* * If we're redirecting to loopback mark this packet From nobody Tue Apr 23 21:43:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFwr66Dqz5J7yF; Tue, 23 Apr 2024 21:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPFwr436Zz4vFM; Tue, 23 Apr 2024 21:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyerBt/sub8WEl5aRdEXy1wy1oQfOHqkfF+0a9FUuRE=; b=P7G3WDr8+Jm+1OGpir9S3s+L+ByRavxFgZ+7yPCC0MVw42aQChu8skgfoA7q6zbYkSTr1n /pJryYTu3S5o5I6ocO1lhSqCkM56706dlM91c9hPJAcNTbwbZXDPQ/LrPfWm2bODKxuW07 QXdiJjosHX3cGEV1054QTBPF4s0EZCJj+lXBwTcjDaTX2QYGe8I54oRLoR27ntftYsf28G yxHqgJztUXIFuXZeOzP94956qdFfsj4IsCQImqyM/U3oq5tpK7nM5rsUK+BAziVg4ktcie lj/d5osfRZlkkpV+XvzEJ3HLyQPP/rufMEZfzCAJX7hw9MGDPzSzR2s5+NRHHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908604; a=rsa-sha256; cv=none; b=LDbJ+fsIbFi51/gjKG/kTAMeiGbcaOBgghq/9YaNMn4yiI4XQKOlN4HPxFRxGYXyVo/MGc e410fra7z8Ig0n9M5WbqxSrWXvPT9VXaGuTQ067Toi7Gak84Sc+dwIcXEcwLOzqIBMkkjG A3mx7zHKuHBrQeiU8UBJmrh7Xh7OmE0n21vxrs9doMpLzIhWPCcUAkKo+KRD/znBn8113t l33gcCWb651V+16xbJbtbdXyZXge3VRDOBTKVbd4XDSssgPBv46SkxItpB2mF4eyV/W8+6 aqIfH+34GE8an/YPAknYBMLyQYm3/IogTfRTec9c6bsFDSmDSGPkA/uIWL7w9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyerBt/sub8WEl5aRdEXy1wy1oQfOHqkfF+0a9FUuRE=; b=vIk0L9sfN8bCv7vNmnfSsLHqRRv4Nb1ZCZNEOMhqnTktKWonP5pshYuJvN0fFCmYELiMXs JyOdDCD7L0Pp5AvblKXON0eQrWMtelrsG7We5yQv0X9VGNOb/UpknZrIM6EfOjM8OWWkef /NPKYlo//20r87pSdYFCIb981hrrD8yo82M9DRJuuzLNsbIwIv9xPmZuDcacgeKGx71RMw ++y0QJUlfPQ0NEUh+n8GUjnf7sTCWD+Vr1mnzyBUFo8ANSMzKBhUyeWFgv+z0S9UnC8k/0 l9TLI3rkvFPYlzIKLZ2BxN3vOMzGSDbW0jeeGKEzNowbm9xBIVrILqbbmLQhiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFwr3ccVzpW8; Tue, 23 Apr 2024 21:43: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 43NLhOLv080008; Tue, 23 Apr 2024 21:43:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhOd0080005; Tue, 23 Apr 2024 21:43:24 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:24 GMT Message-Id: <202404232143.43NLhOd0080005@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: 4f8f9d708e6a - main - sys: add conf/std.debug, generic debugging options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4f8f9d708e6a4143f3b178bfab10d0a9b75ba2fe Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8f9d708e6a4143f3b178bfab10d0a9b75ba2fe commit 4f8f9d708e6a4143f3b178bfab10d0a9b75ba2fe Author: Lexi Winter AuthorDate: 2024-04-23 21:11:24 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:31 +0000 sys: add conf/std.debug, generic debugging options The new sys/conf/std.debug contains the list of debugging options enabled by default in -CURRENT, so they don't need to be listed individually in every kernel config. The enabled options are the set of all debug options which were enabled for the GENERIC kernel on any platform. This means some architectures now have debugging options enabled in GENERIC which weren't previously enabled: - amd64: [1] - arm64: [2] - arm: [2]. [3] - i386: [1], [2] - powerpc: [1], [2], [3] - riscv: [2] [1] ALT_BREAK_TO_DEBUGGER is now enabled. [2] BUF_TRACKING, FULL_BUF_TRACKING, and QUEUE_MACRO_DEBUG_TRASH are now enabled. [3] DEADLKRES is now enabled. While here, move the documentation for the (commented out) K*SAN options for amd64 from GENERIC to NOTES. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1124 --- sys/amd64/conf/GENERIC | 20 +------------------- sys/amd64/conf/MINIMAL | 2 ++ sys/amd64/conf/MINIMAL-NODEBUG | 11 +++++++++++ sys/amd64/conf/NOTES | 12 ++++++++++++ sys/arm/conf/std.armv6 | 14 +++----------- sys/arm/conf/std.armv7 | 14 +++----------- sys/arm64/conf/std.arm64 | 11 +---------- sys/conf/std.debug | 17 +++++++++++++++++ sys/i386/conf/GENERIC | 10 +--------- sys/i386/conf/MINIMAL | 2 ++ sys/i386/conf/MINIMAL-NODEBUG | 11 +++++++++++ sys/powerpc/conf/GENERIC | 9 +-------- sys/powerpc/conf/GENERIC64 | 9 +-------- sys/powerpc/conf/GENERIC64LE | 9 +-------- sys/riscv/conf/GENERIC | 11 +---------- 15 files changed, 68 insertions(+), 94 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f11601891efd..a49a5c006d77 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -94,25 +94,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options BUF_TRACKING # Track buffer history -options DDB # Support DDB. -options FULL_BUF_TRACKING # Track more buffer history -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options QUEUE_MACRO_DEBUG_TRASH # Trash queue(2) internal pointers on invalidation -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default - -# Kernel Sanitizers -#options COVERAGE # Generic kernel coverage. Used by KCOV -#options KCOV # Kernel Coverage Sanitizer -# Warning: KUBSAN can result in a kernel too large for loader to load -#options KUBSAN # Kernel Undefined Behavior Sanitizer -#options KCSAN # Kernel Concurrency Sanitizer +include ../../conf/std.debug # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index fb6d75a2ae1a..c413590586e6 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -78,6 +78,8 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# For full debugger support use (turn off in stable branch): +include ../../conf/std.debug # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/amd64/conf/MINIMAL-NODEBUG b/sys/amd64/conf/MINIMAL-NODEBUG new file mode 100644 index 000000000000..35281b2212d9 --- /dev/null +++ b/sys/amd64/conf/MINIMAL-NODEBUG @@ -0,0 +1,11 @@ +# +# MINIMAL-NODEBUG -- Non-debug MINIMAL kernel. +# +# This is the MINIMAL equivalent to GENERIC-NODEBUG. + +#NO_UNIVERSE + +include MINIMAL +include "../../conf/std.nodebug" + +ident MINIMAL-NODEBUG diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 31db96e6d0e2..a6f12aec7dc8 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -159,3 +159,15 @@ options KSTACK_PAGES=5 # Enable detailed accounting by the PV entry allocator. options PV_STATS + +##################################################################### +# Kernel sanitizers + +#options COVERAGE # Generic kernel coverage. Used by KCOV +#options KCOV # Kernel Coverage Sanitizer +# Warning: KUBSAN can result in a kernel too large for loader to load +#options KUBSAN # Kernel Undefined Behavior Sanitizer +#options KCSAN # Kernel Concurrency Sanitizer +#options KASAN # Kernel Address Sanitizer +#options KCSAN # Kernel Concurrency Sanitizer +#options KMSAN # Kernel Memory Sanitizer diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index b4b83d66809a..9ae37eab90d5 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -63,18 +63,10 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +options USB_DEBUG # Enable usb debug support code + # For full debugger support use (turn off in stable branch): -options DDB # Support DDB -options GDB # Support remote GDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options USB_DEBUG # Enable usb debug support code -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Optional extras, never enabled by default: #options BOOTVERBOSE diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 80b4e898bfdc..72f22efd0c28 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -63,18 +63,10 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +options USB_DEBUG # Enable usb debug support code + # For full debugger support use (turn off in stable branch): -options DDB # Support DDB -options GDB # Support remote GDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options USB_DEBUG # Enable usb debug support code -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Optional extras, never enabled by default: #options BOOTVERBOSE diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 1b6b0e8b1812..cb3c591947fc 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -73,16 +73,7 @@ options PERTHREAD_SSP # Per-thread SSP canary options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Kernel Sanitizers #options COVERAGE # Generic kernel coverage. Used by KCOV diff --git a/sys/conf/std.debug b/sys/conf/std.debug new file mode 100644 index 000000000000..53789f269b80 --- /dev/null +++ b/sys/conf/std.debug @@ -0,0 +1,17 @@ +# +# std.debug -- Enable debug options for -CURRENT. +# + +options BUF_TRACKING # Track buffer history +options DDB # Support DDB. +options FULL_BUF_TRACKING # Track more buffer history +options GDB # Support remote GDB. +options DEADLKRES # Enable the deadlock resolver +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options QUEUE_MACRO_DEBUG_TRASH # Trash queue(2) internal pointers on invalidation +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones +options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index b5898ed94b81..7bd01d4e60e7 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -88,15 +88,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index e27bb68e31fe..b29a179d2bdf 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -86,6 +86,8 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. +# For full debugger support use (turn off in stable branch): +include ../../conf/std.debug # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/i386/conf/MINIMAL-NODEBUG b/sys/i386/conf/MINIMAL-NODEBUG new file mode 100644 index 000000000000..35281b2212d9 --- /dev/null +++ b/sys/i386/conf/MINIMAL-NODEBUG @@ -0,0 +1,11 @@ +# +# MINIMAL-NODEBUG -- Non-debug MINIMAL kernel. +# +# This is the MINIMAL equivalent to GENERIC-NODEBUG. + +#NO_UNIVERSE + +include MINIMAL +include "../../conf/std.nodebug" + +ident MINIMAL-NODEBUG diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 47c84956facd..bb7865301fcb 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -91,14 +91,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 9d2de9c8095b..b077cf3f2feb 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -101,14 +101,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 6ca1a01e5969..f090cd47ecf8 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -97,14 +97,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +include ../../conf/std.debug # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index ca71f7423cfa..52edc01b5c89 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -156,17 +156,8 @@ device spigen options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence +include "std.debug" # options EARLY_PRINTF=sbi -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options EKCD # Support for encrypted kernel dumps From nobody Tue Apr 23 21:43:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFwt13n5z5J83f; Tue, 23 Apr 2024 21:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPFws4wSqz4vjH; Tue, 23 Apr 2024 21:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAZcobxdaQuqTjV7QDU5pzkW1aL+/7DxJ5oVXraThig=; b=XHQDboZYW0y8xQW8gpuJ9wGoJibQNOBCvLWIuEYzvIwVVRUt80b6FilzzJw/Z0VEJguhAM kgp34oKTDwVkSM5YQj0zZgssQ2ff9aFV1sqQdE4OqUR/aQsiBIQpUEz+ICMIqMOzsAmriP HkFIRQmUvvL/0qKpD5YCG8XAIJ3EUEIxrkvEZArINkgpdmmqU+Ezt8ErdFzPTGd28isRQG qGCESIhlZcX/2xNROsZigqdjxy4plEdE0Ks542Ib2ebJPomAxxSPzwpqt4MouvQdKPGFiG 4HBC0nqg+DU5Xyo+B6M9P5KiG+CVZI72pfv5eOc321w38/vOgD3pkc4D5CrXwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908605; a=rsa-sha256; cv=none; b=KJJUyrkP68EKP12oGOESslaxVaJ0Gye7SXtlxtDD+IJ6fTFmHp0XdRPQcK8CLQCJvDeslj BUg36iSZaGrKI+HtkZp7AU8nUxedAzeeETEatknkGiVrt1iDOimrCEqu6coPVGtUuNXt80 izEbGle14wgg0F1eMe8hp7ozc6/+IHkh+qEj4uEsTGDtVh+b6RvP6Geq7LTtOY95IIbD4L XXbs8sVlHatgiWA135GO4RYcAbPkSTNbvGp43xTfMJ8qjXcmu2nYQO3RLpMinP3rXg+hP/ DzmPf/4kzT60SVsRJbtujLzAyr3ilWOx31Lo48s8HUJGmDiQLrdBtGQr6x0CTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAZcobxdaQuqTjV7QDU5pzkW1aL+/7DxJ5oVXraThig=; b=WNJPTtxN9O1CcGPpjnXzp1Ryhq0r+XoaU9SdknYt+jkImxGUn8Tqz8wUI7Y6Hs9xK+S5gm p75sKe/cYRGzx3Qqel6DqcN034dXBgL3A3xx2Kla8/vbOmQvwiRVtC5DHVk3J+FxbwNhnQ /aWuKhP8wSoomREs+CQJ6cdySSWs9+EszMw1J0l2NhxwBOcQiaAeUHlKtvurX/TIv6zot9 IuhoZRW9OzafqFpoQKLkHhdviKL52ewaJcpqm9os1hkXqOEMKMUHG0hQ6Mf9ZZc9UVa9ux 1p+cKhvc1b77Si9VimpAp/HDL+w6DZzo3e8iBVe3Tog6qluka0ugx3N6lgmZbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFws4Y23zpW9; Tue, 23 Apr 2024 21:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhPUc080061; Tue, 23 Apr 2024 21:43:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhP67080058; Tue, 23 Apr 2024 21:43:25 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:25 GMT Message-Id: <202404232143.43NLhP67080058@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: 8a8daeafaf70 - main - sys/*/conf: do not use "../../conf/" when including std.* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8a8daeafaf7094fd6e65f93fa4e7687591e23fc2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a8daeafaf7094fd6e65f93fa4e7687591e23fc2 commit 8a8daeafaf7094fd6e65f93fa4e7687591e23fc2 Author: Lexi Winter AuthorDate: 2024-04-23 21:11:24 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:31 +0000 sys/*/conf: do not use "../../conf/" when including std.* Since config(8) searches sys/conf by default, there's no need to specify the full relative path here; replace it by the filename alone. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1124 --- sys/amd64/conf/GENERIC | 2 +- sys/amd64/conf/GENERIC-NODEBUG | 2 +- sys/amd64/conf/MINIMAL | 2 +- sys/amd64/conf/MINIMAL-NODEBUG | 2 +- sys/arm/conf/GENERIC-NODEBUG | 2 +- sys/arm/conf/std.armv6 | 2 +- sys/arm/conf/std.armv7 | 2 +- sys/arm64/conf/GENERIC-MMCCAM-NODEBUG | 2 +- sys/arm64/conf/GENERIC-NODEBUG | 2 +- sys/arm64/conf/std.arm64 | 2 +- sys/i386/conf/GENERIC | 2 +- sys/i386/conf/GENERIC-NODEBUG | 2 +- sys/i386/conf/MINIMAL | 2 +- sys/i386/conf/MINIMAL-NODEBUG | 2 +- sys/powerpc/conf/GENERIC | 2 +- sys/powerpc/conf/GENERIC-NODEBUG | 2 +- sys/powerpc/conf/GENERIC64 | 2 +- sys/powerpc/conf/GENERIC64-NODEBUG | 2 +- sys/powerpc/conf/GENERIC64LE | 2 +- sys/powerpc/conf/GENERIC64LE-NODEBUG | 2 +- sys/riscv/conf/GENERIC-NODEBUG | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index a49a5c006d77..4a84e8e56596 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -94,7 +94,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG index 85ff32ea329b..1939b0efd352 100644 --- a/sys/amd64/conf/GENERIC-NODEBUG +++ b/sys/amd64/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index c413590586e6..3447cbc366fb 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -79,7 +79,7 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/amd64/conf/MINIMAL-NODEBUG b/sys/amd64/conf/MINIMAL-NODEBUG index 35281b2212d9..7b7c22bbcaf6 100644 --- a/sys/amd64/conf/MINIMAL-NODEBUG +++ b/sys/amd64/conf/MINIMAL-NODEBUG @@ -6,6 +6,6 @@ #NO_UNIVERSE include MINIMAL -include "../../conf/std.nodebug" +include "std.nodebug" ident MINIMAL-NODEBUG diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG index 58f78036470d..0b3199245187 100644 --- a/sys/arm/conf/GENERIC-NODEBUG +++ b/sys/arm/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 9ae37eab90d5..a24227fc838f 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -66,7 +66,7 @@ options KDB_TRACE # Print a stack trace for a panic. options USB_DEBUG # Enable usb debug support code # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Optional extras, never enabled by default: #options BOOTVERBOSE diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 72f22efd0c28..4ef60c331212 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -66,7 +66,7 @@ options KDB_TRACE # Print a stack trace for a panic. options USB_DEBUG # Enable usb debug support code # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Optional extras, never enabled by default: #options BOOTVERBOSE diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG index 6a475c8c6325..b2e865129012 100644 --- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG +++ b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG @@ -9,6 +9,6 @@ #NO_UNIVERSE include GENERIC-MMCCAM -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-MMCCAM-NODEBUG diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG index a0dbb030c109..086942dfaab1 100644 --- a/sys/arm64/conf/GENERIC-NODEBUG +++ b/sys/arm64/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index cb3c591947fc..cc4a5acbb314 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -73,7 +73,7 @@ options PERTHREAD_SSP # Per-thread SSP canary options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel Sanitizers #options COVERAGE # Generic kernel coverage. Used by KCOV diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 7bd01d4e60e7..b32986e13769 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -88,7 +88,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG index 64b9ecb8a332..ea07613a796f 100644 --- a/sys/i386/conf/GENERIC-NODEBUG +++ b/sys/i386/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index b29a179d2bdf..c70fd27a5c69 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -87,7 +87,7 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/i386/conf/MINIMAL-NODEBUG b/sys/i386/conf/MINIMAL-NODEBUG index 35281b2212d9..7b7c22bbcaf6 100644 --- a/sys/i386/conf/MINIMAL-NODEBUG +++ b/sys/i386/conf/MINIMAL-NODEBUG @@ -6,6 +6,6 @@ #NO_UNIVERSE include MINIMAL -include "../../conf/std.nodebug" +include "std.nodebug" ident MINIMAL-NODEBUG diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index bb7865301fcb..6083b4d2baca 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -91,7 +91,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG index 9d069a41acc1..0761376a8160 100644 --- a/sys/powerpc/conf/GENERIC-NODEBUG +++ b/sys/powerpc/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index b077cf3f2feb..26b308a4e06e 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -101,7 +101,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG index 2659899940ef..a4c3dbd856e2 100644 --- a/sys/powerpc/conf/GENERIC64-NODEBUG +++ b/sys/powerpc/conf/GENERIC64-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC64 -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC64-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index f090cd47ecf8..84c27690211d 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -97,7 +97,7 @@ options RCTL # Resource limits options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): -include ../../conf/std.debug +include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG index ab48bf7a0547..fd2d3ca84a19 100644 --- a/sys/powerpc/conf/GENERIC64LE-NODEBUG +++ b/sys/powerpc/conf/GENERIC64LE-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC64LE -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC64LE-NODEBUG diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG index ca4d07fbd2da..e4f4b41f2c41 100644 --- a/sys/riscv/conf/GENERIC-NODEBUG +++ b/sys/riscv/conf/GENERIC-NODEBUG @@ -26,6 +26,6 @@ # include GENERIC -include "../../conf/std.nodebug" +include "std.nodebug" ident GENERIC-NODEBUG From nobody Tue Apr 23 21:43:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFwv0bh8z5J81c; Tue, 23 Apr 2024 21:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPFwt5zkYz4vR4; Tue, 23 Apr 2024 21:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLGhiVlITbbxMh04DJY2Bp71GBDcO6grv5CBL5eAnkY=; b=CAEbbLPh2BbzQuK/6bju6FcOZA6oo2+P71gmLcN83y7Lioe4A2onu/MiPUUFrwp8iy4qMm VqIrwnMkzNaA7UYN9YMuFiQaTFft+mAJF3sOhVhF0dFz/ib3XkTlezY6TY8VbfqVF9DaOR lS0IPbeoqv9gDRBvM6L16uO4SQVz/C6YQ6tFZxLY29v7M/ITYZ4selqnLMk5YhTpiQpBhc Vqp6ZcHwuhSoVIsPZ3o9jTULfT31J4bnlywles8NF8kQKroG+kj/hzSPwq3D5fezIrysAr YT/MQplhy5Pra8BaJCkIFhev5QO9EnzrKZIGCljiM+24osghztx4Q3zY30L70w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908606; a=rsa-sha256; cv=none; b=IyYphtlKmxf31Vj7gFihio4Oeiqk90vkvVtXczxn5AnzoyfT2ODI6avDVUnZsLgV73+tKG IlLSrRY2au/eOMiiWVbrydhfPw0/CJP+aWQyAFEmeHCtRdQIdmK8FWVR5fkkr8Yb5wYoFH yLtMsHsjwnmJqM2ix+fNe9f1lI4/aghAzi+KTP/ckoQDzT+1DLznf/afqu3P+yKqia4SyK 67JkyIFgOBX6XZLu+yUdHTdOXHAKBdhg5NpagbhAykqBF2Gftk+OAM3w9ea6TIK3vJaic5 EJFSFhELwuXuFOKE4cmEczXYRpYS3s1rlTpNluSXz3ZZhsJhwypDqC/9wlMgQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLGhiVlITbbxMh04DJY2Bp71GBDcO6grv5CBL5eAnkY=; b=XSubsEP1ZYdt6ufEw+Th2/VBQrtuAfvcbGInkQHoOT1tAQtfBLEYVEnnB/q3D0VPZOZnGv YFf1q5m/0+iYp/qhmGn5CiZIIl9bNYVh008zDGqvLfpzkqekoNJXwdDTbvmyQvREIMyfiY 2b+szwaZOhQpuI0jzA54HjjnZPHVL7KJAEk5ETOVJ3DQINYZ0GAqB70vsVfNZ/JZRh1gJz tjcM7PcA//79/p4d3Qp1g2B1n5Gf3nDaBPhmhkkc3z5Jm6HoHSryVHzFupxSE8p9RPOtsM YxPYQQNdxAJdg3bo7Dw+FVJVNj+NkTSCbbqqHeGGTX1n5Em0liL0+yC3eqD97w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFwt5cHNzpSK; Tue, 23 Apr 2024 21:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhQ7o080118; Tue, 23 Apr 2024 21:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhQNB080115; Tue, 23 Apr 2024 21:43:26 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:26 GMT Message-Id: <202404232143.43NLhQNB080115@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: 14e3f2d8d3eb - main - nanobsd: Set a GPT label for EFI and cfg partitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 commit 14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6 Author: Jose Luis Duran AuthorDate: 2024-04-23 21:12:45 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:35 +0000 nanobsd: Set a GPT label for EFI and cfg partitions Use efiboot0 for the EFI partition, the nomenclature efiboot + #index was taken from bsdinstall (zfsboot). Use cfg for the cfg partition. Poudriere firmware images are already using this label. PR: 278480 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1187 --- tools/tools/nanobsd/embedded/common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 17caef798af2..bcb1061df629 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -293,9 +293,9 @@ create_diskimage_mbr ( ) ( # p1 is boot for uefi, p2 is boot for gpt, p3 is cfg, p4 is / # and p5 is alt-root (after resize) mkimg -a 2 ${fmtarg} ${bootmbr} -s gpt \ - -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \ + -p efi/efiboot0:=${NANO_WORLDDIR}/boot/efiboot.img \ -p freebsd-boot:=${NANO_WORLDDIR}/boot/gptboot \ - -p ${p3}:=${NANO_LOG}/_.p3 \ + -p ${p3}/cfg:=${NANO_LOG}/_.p3 \ -p ${p4}:=${NANO_LOG}/_.p4 \ -o ${out} ;; From nobody Tue Apr 23 21:43:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPFww2kFkz5J81h; Tue, 23 Apr 2024 21:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPFwv6z0wz4vgC; Tue, 23 Apr 2024 21:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BsmIAZrMEVMPyxVVP46Q+whkfQa0gke4R4LVZnQmeo=; b=ZaihPr8Jezc4rCdsBJ4jKtrmqKrrI9hdAn1fkwOOGHWDB/6icABRI75QoHU9BPWYw0QVMf LntVaHYRCw34Z6C4QWBpS3WUQe9n+p2N4sULjo0JOsGK7rcGFVsWIxT/HZRnrPUv89tV5o tda9LnAe1/BRRQAJ10GqX/pHTudTNWnMnGzLfk2/qWDXfqym7K8Ac4hMCCEbUqAH5cbPDS dqAj54tD95Lv0qq7pzM77chG88ODBeIFvpEvT2pufB8plPzxlNtF5R2S98y8EwHKJ2OyHQ LG7drp+HseyyWXTJGDF1Dvr5z0NNcHMQzjYIf/Xzw3SBiwiopSf+cM0xAybfWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908608; a=rsa-sha256; cv=none; b=eywGnNcMpF7naqyiwZHOZWei8uAC3k3/B+4wseUL1Kn2XHoB8Mhr5mxt1r00bhBpM+pjNy RBuKfJ6KoXScAb7l+2emgsyokNiES55RT8FB5tdWNLwKMlsDGbvqsm1wIj5oCYM50erTAH 5A2+1u/GTb1VT4EAMFZ6nvreu0t8i2INlhWi3qNKKhSgEbjzMUZbcmOJhAPQXjWkdVRVp4 IP0VskEvsDQ6l5x7DzhVCZrfOHiWTiPD2bA+pe7qdGINUhb7rDkfe/JgTlL8PKvsdCzKg0 uWhxmV9sukw/2r2woNLJsMIO9FckM2v7GL2wO+aGrcANCJHxm4iIKoi62UUeAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BsmIAZrMEVMPyxVVP46Q+whkfQa0gke4R4LVZnQmeo=; b=iKKSBvs989Dq8nhEMg3wDvHxKwTx9YkU3j9CUru5P57tOltsLBy++L5qNQncU0dmw3vEk2 NxzCOEwhhmNXd0+8N/Jya4JbEUYboIidhstCznSaeAqRg35LfPt/8nK31sZHXEWG/XDCjD h5W0uW/7QAW/C2Ii8AtX91onGumnNugI5rngk5LuGEcgauPELGdkMS464H7hh+qI9iJ9Hr ZqzYJNXE4367RlTcaipLFNyJmbf3/QVYzjlNS+SJD/9BwpoGWOceRp8uPVicnLyEwfXHha tyhuOTMI13atJ6tyJQJgMZu4BMT4TXbgp7Fit9KKfQS4TR/3V2VrZjvG1o5Wlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPFwv6ZN2zpSL; Tue, 23 Apr 2024 21:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhR7e080169; Tue, 23 Apr 2024 21:43:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhRJE080166; Tue, 23 Apr 2024 21:43:27 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:27 GMT Message-Id: <202404232143.43NLhRJE080166@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: 4f223e0da7b4 - main - release: Change vmimage EFI GPT label List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4f223e0da7b4a055d9416f9161b44ffed765a9c3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f223e0da7b4a055d9416f9161b44ffed765a9c3 commit 4f223e0da7b4a055d9416f9161b44ffed765a9c3 Author: Jose Luis Duran AuthorDate: 2024-04-23 21:12:30 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:40 +0000 release: Change vmimage EFI GPT label This matches the default bsdinstall nomenclature. PR: 278480 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1188 --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 0346e33b81b4..93658b9a03da 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -301,11 +301,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}" + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi - echo "/dev/${ROOTLABEL}/efiesp /boot/efi msdosfs rw 2 2" \ + echo "/dev/${ROOTLABEL}/efiboot0 /boot/efi msdosfs rw 2 2" \ >> ${DESTDIR}/etc/fstab fi From nobody Tue Apr 23 21:50:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPG4l06WWz5J8hK; Tue, 23 Apr 2024 21:50: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 4VPG4k6llTz4y91; Tue, 23 Apr 2024 21:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713909014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnEQbRYB8LDmv7+uRBGeXKhNJBYoP6K2VYUfk6Acrkc=; b=mbXLsMI6d4paitzsi7u1WbHfA+icBRoadcWw+m0yb8P1bYlIZMDOtAxnknVqFb8ifOSXPO f0nB5rL541P01NOTZBy2UXrQufwQveDXqrR/VWzbwLuV5IIAoKCEKJmtiqiAIsACl1rMs0 0voCGBWCFE3jPsIqgRzheeWsHHQyZ9ogzYi1SpDNFhw5GNXg0yGsoDOzoHs6lHoKvKYx+H c1G4t9l0hTVRXO4gRXvH1jWQHFvqCjLS/HowX8C9EN2Ru8REJlvstJd3r32zWDB5CvWn1A cuAJsPAgRNge+sSgFOqyCBdAieeRda/gzD+UrBZQWjljb+fbRTpUUxFQeat1WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713909014; a=rsa-sha256; cv=none; b=lYWz53Lk2raRsVi+9bU0XMBH6dhxgTxTVwqtbWw9ivH7wclE3f+F8HkE9a/dz3W3kO6IWR aQACebTR81ghJD0HnWPgA+kAiB5/vv9xo/GpkYmis0GrT7fmydgTo+cHz5SA49AvNGx5p4 XighCfzaHlMsHmgznySMB/BXcR9wDN9/CXi2jMXp/7n5HEEAmfj2/kZtDuR9nkdvh6WIHg evFZcXk9s7vDSwgZw3xOMyc2wc0V2xSQ0VlPIxhexoXpq6y2jO5tV8DeA3QGVAI4HQy0Ex NlsR9DrmpvGyTyle7qjTFhXOMRlMSSZOQ/mYAGxdiBDdIE0LwtCdPfH2Z54W6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713909014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnEQbRYB8LDmv7+uRBGeXKhNJBYoP6K2VYUfk6Acrkc=; b=MvftF+LwsKa+zouDJvUznxZdCG5ihxwfEOXjsZICvDUCzupUgbkTmZFlZzdAbxP5CPOLNx 4g54041J1Oeox6GklZIDpTEKsiQdDZJ6Y0Ply0cL2kEcf99E3h1ZrgjR9bODihpgTSUl/k DMGROgK2RByBMNv5NKJVCXIxQ/AWdbrVGdXLlDUnA0UChBW5l0/wYZD/Nvs6D1iCjJIzor oMy1aeg4/hA8MHhjqZWUJ6ejunyFb5LEg4oKEIuKO2nOFJLSG+sftQIaC/fPuIiMoCPjBa zY1CdWTD3fvw/5WkKPAbnlMskG+CoywtB5804hQ4kJM6O91BAKTEP4Ze3kJsLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPG4k616tzntS; Tue, 23 Apr 2024 21:50: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 43NLoEPJ087801; Tue, 23 Apr 2024 21:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLoEsI087796; Tue, 23 Apr 2024 21:50:14 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:50:14 GMT Message-Id: <202404232150.43NLoEsI087796@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: cf04a7775a4e - main - swapon: Do not overwrite Linux swap header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cf04a7775a4e8ff6fd28c768be9daa3d83dd382e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf04a7775a4e8ff6fd28c768be9daa3d83dd382e commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e Author: Ricardo Branco AuthorDate: 2024-04-23 21:47:56 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:48:01 +0000 swapon: Do not overwrite Linux swap header Reviewed by: imp, jhb Pull Request: https://github.com/freebsd/freebsd-src/pull/1084 --- sbin/swapon/Makefile | 2 ++ sbin/swapon/extern.h | 5 ++++ sbin/swapon/swaplinux.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ sbin/swapon/swapon.c | 54 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 27808aed5857..930e938e5b05 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -6,6 +6,8 @@ LINKS= ${BINDIR}/swapon ${BINDIR}/swapoff LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 +SRCS= swapon.c swaplinux.c +HDRS+= extern.h LIBADD= util diff --git a/sbin/swapon/extern.h b/sbin/swapon/extern.h new file mode 100644 index 000000000000..cb33dbbee953 --- /dev/null +++ b/sbin/swapon/extern.h @@ -0,0 +1,5 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + */ + +int is_linux_swap(const char *); diff --git a/sbin/swapon/swaplinux.c b/sbin/swapon/swaplinux.c new file mode 100644 index 000000000000..d01a94345e68 --- /dev/null +++ b/sbin/swapon/swaplinux.c @@ -0,0 +1,66 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include +#include +#include +#include + +#include "extern.h" + +/* + * Definitions and structure taken from + * https://github.com/util-linux/util-linux/blob/master/include/swapheader.h + */ + +#define SWAP_VERSION 1 +#define SWAP_UUID_LENGTH 16 +#define SWAP_LABEL_LENGTH 16 +#define SWAP_SIGNATURE "SWAPSPACE2" +#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1) + +struct swap_header_v1_2 { + char bootbits[1024]; /* Space for disklabel etc. */ + uint32_t version; + uint32_t last_page; + uint32_t nr_badpages; + unsigned char uuid[SWAP_UUID_LENGTH]; + char volume_name[SWAP_LABEL_LENGTH]; + uint32_t padding[117]; + uint32_t badpages[1]; +}; + +typedef union { + struct swap_header_v1_2 header; + struct { + uint8_t reserved[4096 - SWAP_SIGNATURE_SZ]; + char signature[SWAP_SIGNATURE_SZ]; + } tail; +} swhdr_t; + +#define sw_version header.version +#define sw_volume_name header.volume_name +#define sw_signature tail.signature + +int +is_linux_swap(const char *name) +{ + uint8_t buf[4096]; + swhdr_t *hdr = (swhdr_t *) buf; + int fd; + + fd = open(name, O_RDONLY); + if (fd == -1) + return (-1); + + if (read(fd, buf, 4096) != 4096) { + close(fd); + return (-1); + } + close(fd); + + return (hdr->sw_version == SWAP_VERSION && + !memcmp(hdr->sw_signature, SWAP_SIGNATURE, SWAP_SIGNATURE_SZ)); +} diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 26a7dc22654a..0f2ad1f5e213 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -54,10 +54,15 @@ #include #include +#include "extern.h" + +#define _PATH_GNOP "/sbin/gnop" + static void usage(void) __dead2; static const char *swap_on_off(const char *, int, char *); static const char *swap_on_off_gbde(const char *, int); static const char *swap_on_off_geli(const char *, char *, int); +static const char *swap_on_off_linux(const char *, int); static const char *swap_on_off_md(const char *, char *, int); static const char *swap_on_off_sfile(const char *, int); static void swaplist(int, int, int); @@ -250,8 +255,13 @@ swap_on_off(const char *name, int doingall, char *mntops) return (swap_on_off_geli(name, mntops, doingall)); } - /* Swap on special file. */ free(basebuf); + + /* Linux swap */ + if (is_linux_swap(name)) + return (swap_on_off_linux(name, doingall)); + + /* Swap on special file. */ return (swap_on_off_sfile(name, doingall)); } @@ -466,6 +476,48 @@ swap_on_off_geli(const char *name, char *mntops, int doingall) return (swap_on_off_sfile(name, doingall)); } +static const char * +swap_on_off_linux(const char *name, int doingall) +{ + const char *ret; + char *nopname; + size_t nopnamelen; + int error; + + if (which_prog == SWAPON) { + /* Skip the header for Linux swap partitions */ + error = run_cmd(NULL, "%s create -o 4096 %s", _PATH_GNOP, + name); + if (error) { + warnx("gnop (create) error: %s", name); + return (NULL); + } + } + + /* Append ".nop" to name */ + nopnamelen = strlen(name) + sizeof(".nop"); + nopname = (char *) malloc(nopnamelen); + if (nopname == NULL) + err(1, "malloc()"); + (void)strlcpy(nopname, name, nopnamelen); + (void)strlcat(nopname, ".nop", nopnamelen); + + ret = swap_on_off_sfile(nopname, doingall); + + if (which_prog == SWAPOFF) { + error = run_cmd(NULL, "%s destroy %s", _PATH_GNOP, nopname); + if (error) { + warnx("gnop (destroy) error: %s", name); + free(nopname); + return (NULL); + } + } + + free(nopname); + + return (ret); +} + static const char * swap_on_off_md(const char *name, char *mntops, int doingall) { From nobody Tue Apr 23 21:59:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPGJ00wjPz5J9Wv; Tue, 23 Apr 2024 22:00: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 4VPGHz54Xtz50s4; Tue, 23 Apr 2024 21:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713909599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=466Tbuae1bTtSxh0lmrEhWealDpDlyX8jbmHL+DTmHk=; b=XmGbhTTol7t8soicFdUAfkNUw/5jxN5CRMGPDRhy6tYu7YkTE7Rivvn+jUWeENozUQdJgc IYuZxSDkfwhA2SxX42gX29Wnz8pr7sLw0KTnmgUPZbbcVQ9J5Smfev1LJgiaGMFqUucjcd OO6WqOW6lx8Orh+Z6VGh6PlNlw14I9Rzw6fOPv3ZKu73kY9JlYcb0qfuY1FPhfpoWDvSKK sWn51VbNY0grsU7IfZF4aii7wWLau/YhSLm5oQ7mwFz8uVveRhGFYG/XcVB9J0ft9Zjj6u CGaDMsfB66M1PAf2JEuHmD/yZJOeCqLCJ+jOvj9ZcQRJidal4H0joi1gHSQPuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713909599; a=rsa-sha256; cv=none; b=t1u21rZsX+mdC77Cz6xfkU8DpTwzG0GSICozy7vOCDrhaUBHWpfACXS1Id8HtwljRJNl5X 688cuRRq1N3SQTxvv68H7QjbMKRiTdE9NgQDD4U9GS5UsR1KHD9Oo/HWLFfBtv8FaeAHdc 0wkwSY5xBrdmSyXRg9GFF5ZkFWLE/xMNuQVBfmlq9Bi1++3Tcq5KYaz0EQ3cmvsaSSNzym 469yaM4oWWz/TY9/4fWDY98vXmdt+ZnR5xDII0st19r8zEJngrATGx+f4iJdr7Mmkkqnjh BKbYX+dt54KFix5lJYr12G8uFXUjDTpPNvMGs37pJW9i4S13kJb2dCyxRCWuDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713909599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=466Tbuae1bTtSxh0lmrEhWealDpDlyX8jbmHL+DTmHk=; b=WnR0KRCTDpiGM/qlHmMUu3N6CZQ/O22aDHf6/0A4JeIhi10SkC6mRyf0fyF/aJPybv6os3 pMOvWqLV6khUKqB2kAykJG7J3buRDU5ImtSyHY7x909FGuwdxtSA6zfgXfLEDW1hVBwK4Y 1ZnC8NArjKuTJGA4Qf5+x3WAYrZrpWMu6v3ifAHNLfRODcBK2anZKsJxREiz3wzyEboiLS wI15nMzUbPZN+D6OcolR2SJ+HLfavhf5Ye7VqbhiEorEJl0ahCVqkaXyvxAgTP/ZgWWB1S ZflhISx9RQc2/fyd2bdl6ZN4o7EqG6cs1sjZWwEYo/oB/Ji05bepnMiTygBn1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPGHz4gbwzpqR; Tue, 23 Apr 2024 21:59: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 43NLxxOx097550; Tue, 23 Apr 2024 21:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLxuUu097544; Tue, 23 Apr 2024 21:59:56 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:59:56 GMT Message-Id: <202404232159.43NLxuUu097544@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: 0d4ad64077bc - main - zfs: merge openzfs/zfs@1f940de07 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0d4ad64077bcddcff5a170ee97273db95b9cab55 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4ad64077bcddcff5a170ee97273db95b9cab55 commit 0d4ad64077bcddcff5a170ee97273db95b9cab55 Merge: cf04a7775a4e 1f940de07224 Author: Martin Matuska AuthorDate: 2024-04-23 21:57:56 +0000 Commit: Martin Matuska CommitDate: 2024-04-23 21:59:18 +0000 zfs: merge openzfs/zfs@1f940de07 Notable upstream pull request merges: #16038 1f940de07 L2ARC: Cleanup buffer re-compression #16093 c183d164a Parallel pool import #16094 cd3e6b4f4 Add zfetch stats in arcstats #16103 35bf25848 Fix: FreeBSD Arm64 does not build currently #16104 4036b8d02 Refactor dbuf_read() for safer decryption #16110 9f83eec03 Handle FLUSH errors as "expected" #16117 c346068e5 zfs get: add '-t fs' and '-t vol' options Obtained from: OpenZFS OpenZFS commit: 1f940de07224c2068e7c721222b1f3a519820ca9 sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/arcstat.in | 47 ++++- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 22 ++- sys/contrib/openzfs/cmd/zinject/zinject.c | 115 ++++++++++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 76 ++++++-- sys/contrib/openzfs/include/libzutil.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 2 + sys/contrib/openzfs/include/sys/spa_impl.h | 3 +- sys/contrib/openzfs/include/sys/zfs_ioctl.h | 4 +- sys/contrib/openzfs/include/sys/zio.h | 4 +- sys/contrib/openzfs/man/man8/zfs-set.8 | 11 +- sys/contrib/openzfs/man/man8/zinject.8 | 8 + sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 120 +++++++----- sys/contrib/openzfs/module/zfs/arc.c | 59 ++---- sys/contrib/openzfs/module/zfs/dbuf.c | 214 ++++++++++----------- sys/contrib/openzfs/module/zfs/spa.c | 58 ++++-- sys/contrib/openzfs/module/zfs/spa_misc.c | 26 ++- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 9 +- sys/contrib/openzfs/module/zfs/zio.c | 3 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 138 ++++++++++++- sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in | 2 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 10 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- .../tests/test-runner/bin/test-runner.py.in | 23 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 3 + .../zpool_import/zpool_import_parallel_admin.ksh | 165 ++++++++++++++++ .../zpool_import/zpool_import_parallel_neg.ksh | 130 +++++++++++++ .../zpool_import/zpool_import_parallel_pos.ksh | 137 +++++++++++++ .../zfs-tests/tests/functional/quota/quota.kshlib | 7 + .../tests/functional/quota/quota_001_pos.ksh | 2 + .../tests/functional/quota/quota_002_pos.ksh | 2 + .../tests/functional/quota/quota_003_pos.ksh | 2 + .../tests/functional/quota/quota_004_pos.ksh | 2 + .../tests/functional/quota/quota_005_pos.ksh | 9 +- .../tests/functional/quota/quota_006_neg.ksh | 2 +- .../user_namespace/user_namespace_004.ksh | 4 +- sys/modules/zfs/zfs_config.h | 6 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 40 files changed, 1141 insertions(+), 304 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh index 000000000000,c681d1b7dd23..c681d1b7dd23 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh index 000000000000,339dc2575ede..339dc2575ede mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh index 000000000000,71b2437a37ec..71b2437a37ec mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh diff --cc sys/modules/zfs/zfs_config.h index 0e18c6092b9c,000000000000..6e1f5de7cf9e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1218 -1,0 +1,1218 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* strscpy() exists */ +/* #undef HAVE_KERNEL_STRSCPY */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + *** 330 LINES SKIPPED *** From nobody Tue Apr 23 22:42:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPHFS4z3nz5JDVX; Tue, 23 Apr 2024 22:42: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 4VPHFS4PLtz53w9; Tue, 23 Apr 2024 22:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713912172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTMxoCM+Vyjm6ePv3qo9PSoBboIxI5qnpuWIb5vYF0Q=; b=PxFTzNXzgLU2r9dA1vi9wylNqQsIfem7UVQmjBPgdd0r49jHthhbTuOcU+8LVlRE89gcT1 tdEocfUkcRPn3qno+qR3irXfUKHlPvYxOKOSyT7QaB0WP9WvOj4fopxZ/SnBQ58VfyqI8W +/z1t1sfy/Jply87KRh+9SwW6xohyt7A5XbUs/9erG9vBO60dUwAFbMCqPuyeDxkCrx4Gk shyG8C7+2khj4ptM5yNsNEOz0vJSQy/R+MDBsr3tCEK5+zKZ1g0szVtiG+yIpW5cIxxM53 Bt2N87O+ZhFQmsjA28kXQEs1CuRCjgK0K7+3NAt/go1/nWVwteEUxAf1pqp8CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713912172; a=rsa-sha256; cv=none; b=gjWxpuEVQvFlviPjAPuSYyM/lLsZHUP+vUh9JK7LIz0w6J312JlLELiKD7aUTUHT/gZynA HnzaG5lOVqEHhnhgZMvULfIrh2w1oG7ZRdD2VgJV5YS+LDgPFisM6XP5RKKSQtjGISgRg9 7njPTXVdUxMyJZa77hoUgJJOy7HIJ269RvJQ1jrbljeLbD6Pa0dWmLlg/UvxBS2VIIlPHg 4K+xcOSJj2jBkzN44FI4tLJ4xLBu4fxSBSUKtEn4jlGjvYKi2dwSuJoT8DsVu7EG9+N6Tf sz+HUdlH8seWFbKsPM+tqgkka+B9Eqd00WVbdR+PUGpwSrY9Pn0RN1Xkd5JyDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713912172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTMxoCM+Vyjm6ePv3qo9PSoBboIxI5qnpuWIb5vYF0Q=; b=CAHF1A5yxjiFPYby0LHWiTsJOA1QM6LpXqz3xyvDpEPHhpkC+EKnGEO81+ZAW5MBuWGqcU D5w1f5jAuuMRSCiLOv8NeB17nBEPgL6uiyzuplWsdj5aOh5jkd4vcBs3CcHm8ziMgyMVnS tyeQoUq98RknoOdik0yklJvHnOXLI8Z1u8+mW0R8ME+tZ/SNddAIvSqsFTDDoeH2sxKWJ8 niXfI50Klb1rT0ev76Z6CL9SrAdYup3fb25Uxlkgi42APHaDqSoR4m2bRpGOnZHMmU6y9l 5Od4rvzyXAl/f+NLvWZsDEuHEsD0suUvP0a+vSjV38vT+ppqQ219JyPMeeSisQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPHFS40HHzqkq; Tue, 23 Apr 2024 22:42: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 43NMgqZF082029; Tue, 23 Apr 2024 22:42:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NMgqxx082026; Tue, 23 Apr 2024 22:42:52 GMT (envelope-from git) Date: Tue, 23 Apr 2024 22:42:52 GMT Message-Id: <202404232242.43NMgqxx082026@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: 91bdebc958bb - main - bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 91bdebc958bb0da03f604bad19f99e3b10e96ac7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=91bdebc958bb0da03f604bad19f99e3b10e96ac7 commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7 Author: rilysh AuthorDate: 2024-04-23 22:40:19 +0000 Commit: Warner Losh CommitDate: 2024-04-23 22:42:38 +0000 bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors 1. Currently, distfetch checks environment variables existence when it will use them or in a case (in chdir()) it doesn't check at all. As they are necessary to set before doing anything with it, check them, if they set or not, before proceeding any further. This also avoids extra cleaning when that environment variable isn't set. 2. Handle memory allocation error in malloc(PATH_MAX) and replace (sizeof const char *) with (sizeof char *). Both are similar and const doesn't have a size. 3. Indent the error message a bit in chdir(). Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1071 --- usr.sbin/bsdinstall/distfetch/distfetch.c | 33 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c index c431e187799d..094929d89ea1 100644 --- a/usr.sbin/bsdinstall/distfetch/distfetch.c +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c @@ -46,7 +46,7 @@ static int fetch_files(int nfiles, char **urls); int main(void) { - char *diststring; + char *diststring, *dists, *distdir, *distsite; char **urls; int i; int ndists = 0; @@ -54,17 +54,24 @@ main(void) char error[PATH_MAX + 512]; struct bsddialog_conf conf; - if (getenv("DISTRIBUTIONS") == NULL) + if ((dists = getenv("DISTRIBUTIONS")) == NULL) errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); - diststring = strdup(getenv("DISTRIBUTIONS")); + if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL) + errx(EXIT_FAILURE, "BSDINSTALL_DISTDIR variable is not set"); + + if ((distsite = getenv("BSDINSTALL_DISTSITE")) == NULL) + errx(EXIT_FAILURE, "BSDINSTALL_DISTSITE variable is not set"); + + if ((diststring = strdup(dists)) == NULL) + errx(EXIT_FAILURE, "Error: diststring variable out of memory!"); + for (i = 0; diststring[i] != 0; i++) if (isspace(diststring[i]) && !isspace(diststring[i+1])) ndists++; ndists++; /* Last one */ - urls = calloc(ndists, sizeof(const char *)); - if (urls == NULL) { + if ((urls = calloc(ndists, sizeof(char *))) == NULL) { free(diststring); errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); } @@ -78,15 +85,21 @@ main(void) bsddialog_backtitle(&conf, OSNAME " Installer"); for (i = 0; i < ndists; i++) { - urls[i] = malloc(PATH_MAX); + if ((urls[i] = malloc(PATH_MAX)) == NULL) { + free(urls); + free(diststring); + bsddialog_end(); + errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); + } + snprintf(urls[i], PATH_MAX, "%s/%s", - getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t")); + distsite, strsep(&diststring, " \t")); } - if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) { + if (chdir(distdir) != 0) { snprintf(error, sizeof(error), - "Could not change to directory %s: %s\n", - getenv("BSDINSTALL_DISTDIR"), strerror(errno)); + "Could not change to directory %s: %s\n", + distdir, strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, error, 0, 0); bsddialog_end(); From nobody Wed Apr 24 00:15:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPKJy050rz5JMwj for ; Wed, 24 Apr 2024 00:16:02 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.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 4VPKJx5QZLz3xNc for ; Wed, 24 Apr 2024 00:16:01 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3455ff1339dso4839254f8f.0 for ; Tue, 23 Apr 2024 17:16:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713917760; x=1714522560; 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=nsc8o3gozv+Iz3FoGcfQRos0OPAlQoiRR0fzOIZ6ubg=; b=JE6kuHaSTmGen5qWEi90EbdolFe0KyTjwaSjNCxrh+5aRzweAte/HmScIguCragSFE mU39xOKa9pzTv8stX3A09B6oEkN/cVSXSQurBgPuT/ASY5C+fYghxKD0arPeMMd0Fgl7 hzl9ShtCIBIn82c3Hj5KFUJtEhWnnAR5+y0fXGtRNlt0frZ7+75D47LIFTb4WNWfhAlT c95WRF/Eg0bI85qKrZCuTYu6ylS1g2sMfkSjX96yJFWzSJjkTefmYoo3Kt7N9b60d6Wu l5Sxpu1h/BekGwczbQjbnC+qA6e4z1yx21RF5l4Bb+jJ3HLeUsqJ7lZc+mNgq0dbH/un yjoQ== X-Forwarded-Encrypted: i=1; AJvYcCVuTRCmyi3km0GbObkk78ZJlKZ3xJwBlOuGOofZYdMtb6rAgLDSTKRtBZot1N6OQJSA4wCNt0jaLL7t7761SJxI+ekfzwWxhcupphQmKIj1 X-Gm-Message-State: AOJu0Yzns0DYozOpstUzdVRp+5ANGXh3WkDEJ2m5rY0e2X/EMvX9xiVw bCyS+2ZvPEl9xEjBVglTgMPYJZTrwuD+f/zBhanhMsYkKF5Hf0o40rswViB7GuQ= X-Google-Smtp-Source: AGHT+IFw39ATGw8OmoD+slq1tR/eEa8+q6KYigqxrRV/uqiaYdPD74xM3yDGFcp2NU8oJx9PIyxZNg== X-Received: by 2002:a5d:4b84:0:b0:34b:88e:3712 with SMTP id b4-20020a5d4b84000000b0034b088e3712mr618494wrt.60.1713917759648; Tue, 23 Apr 2024 17:15:59 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e18-20020a056000195200b003462fec9f5asm15627382wry.62.2024.04.23.17.15.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2024 17:15:58 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: cf04a7775a4e - main - swapon: Do not overwrite Linux swap header From: Jessica Clarke In-Reply-To: <202404232150.43NLoEsI087796@gitrepo.freebsd.org> Date: Wed, 24 Apr 2024 01:15:48 +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: <202404232150.43NLoEsI087796@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VPKJx5QZLz3xNc On 23 Apr 2024, at 22:50, Warner Losh wrote: > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcf04a7775a4e8ff6fd28c768be9daa3d= 83dd382e >=20 > commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e > Author: Ricardo Branco > AuthorDate: 2024-04-23 21:47:56 +0000 > Commit: Warner Losh > CommitDate: 2024-04-23 21:48:01 +0000 >=20 > swapon: Do not overwrite Linux swap header I don=E2=80=99t think this is a sensible default. swapon should, by = default, do exactly what you asked for, rather than magically do something more convoluted and different, with no way to opt out of it. The fact that it looks like some other random OS happened to touch the partition in the past shouldn=E2=80=99t be relevant; we=E2=80=99re not Linux, we=E2=80=99= re FreeBSD. Especially in the age of GPT where the OSes have different GUIDs for their swap partitions. Having some user-friendly way to the gnop dance seems fine, but it should be optional and off by default, not forced upon you. As it stands the only way to avoid this silent behaviour change is to zero out the first 4K of the partition, which is not user-friendly (and starts to sound like going back to the old days when that was a common thing to do when partitioning). I also don=E2=80=99t believe the patch to be uncontested as you state in = your comment on the PR; kib@ had last commented on 1083 that it should be documented and left up to the user to configure. Jess > Reviewed by: imp, jhb > Pull Request: https://github.com/freebsd/freebsd-src/pull/1084 > --- > sbin/swapon/Makefile | 2 ++ > sbin/swapon/extern.h | 5 ++++ > sbin/swapon/swaplinux.c | 66 = +++++++++++++++++++++++++++++++++++++++++++++++++ > sbin/swapon/swapon.c | 54 +++++++++++++++++++++++++++++++++++++++- > 4 files changed, 126 insertions(+), 1 deletion(-) >=20 > diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile > index 27808aed5857..930e938e5b05 100644 > --- a/sbin/swapon/Makefile > +++ b/sbin/swapon/Makefile > @@ -6,6 +6,8 @@ LINKS=3D ${BINDIR}/swapon ${BINDIR}/swapoff > LINKS+=3D ${BINDIR}/swapon ${BINDIR}/swapctl > MLINKS=3D swapon.8 swapoff.8 > MLINKS+=3Dswapon.8 swapctl.8 > +SRCS=3D swapon.c swaplinux.c > +HDRS+=3D extern.h >=20 > LIBADD=3D util >=20 > diff --git a/sbin/swapon/extern.h b/sbin/swapon/extern.h > new file mode 100644 > index 000000000000..cb33dbbee953 > --- /dev/null > +++ b/sbin/swapon/extern.h > @@ -0,0 +1,5 @@ > +/*- > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > +int is_linux_swap(const char *); > diff --git a/sbin/swapon/swaplinux.c b/sbin/swapon/swaplinux.c > new file mode 100644 > index 000000000000..d01a94345e68 > --- /dev/null > +++ b/sbin/swapon/swaplinux.c > @@ -0,0 +1,66 @@ > +/*- > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#include "extern.h" > + > +/* > + * Definitions and structure taken from > + * = https://github.com/util-linux/util-linux/blob/master/include/swapheader.h > + */ > + > +#define SWAP_VERSION 1 > +#define SWAP_UUID_LENGTH 16 > +#define SWAP_LABEL_LENGTH 16 > +#define SWAP_SIGNATURE "SWAPSPACE2" > +#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1) > + > +struct swap_header_v1_2 { > + char bootbits[1024]; /* Space for disklabel etc. */ > + uint32_t version; > + uint32_t last_page; > + uint32_t nr_badpages; > + unsigned char uuid[SWAP_UUID_LENGTH]; > + char volume_name[SWAP_LABEL_LENGTH]; > + uint32_t padding[117]; > + uint32_t badpages[1]; > +}; > + > +typedef union { > + struct swap_header_v1_2 header; > + struct { > + uint8_t reserved[4096 - SWAP_SIGNATURE_SZ]; > + char signature[SWAP_SIGNATURE_SZ]; > + } tail; > +} swhdr_t; > + > +#define sw_version header.version > +#define sw_volume_name header.volume_name > +#define sw_signature tail.signature > + > +int > +is_linux_swap(const char *name) > +{ > + uint8_t buf[4096]; > + swhdr_t *hdr =3D (swhdr_t *) buf; > + int fd; > + > + fd =3D open(name, O_RDONLY); > + if (fd =3D=3D -1) > + return (-1); > + > + if (read(fd, buf, 4096) !=3D 4096) { > + close(fd); > + return (-1); > + } > + close(fd); > + > + return (hdr->sw_version =3D=3D SWAP_VERSION && > + !memcmp(hdr->sw_signature, SWAP_SIGNATURE, SWAP_SIGNATURE_SZ)); > +} > diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c > index 26a7dc22654a..0f2ad1f5e213 100644 > --- a/sbin/swapon/swapon.c > +++ b/sbin/swapon/swapon.c > @@ -54,10 +54,15 @@ > #include > #include >=20 > +#include "extern.h" > + > +#define _PATH_GNOP "/sbin/gnop" > + > static void usage(void) __dead2; > static const char *swap_on_off(const char *, int, char *); > static const char *swap_on_off_gbde(const char *, int); > static const char *swap_on_off_geli(const char *, char *, int); > +static const char *swap_on_off_linux(const char *, int); > static const char *swap_on_off_md(const char *, char *, int); > static const char *swap_on_off_sfile(const char *, int); > static void swaplist(int, int, int); > @@ -250,8 +255,13 @@ swap_on_off(const char *name, int doingall, char = *mntops) > return (swap_on_off_geli(name, mntops, doingall)); > } >=20 > - /* Swap on special file. */ > free(basebuf); > + > + /* Linux swap */ > + if (is_linux_swap(name)) > + return (swap_on_off_linux(name, doingall)); > + > + /* Swap on special file. */ > return (swap_on_off_sfile(name, doingall)); > } >=20 > @@ -466,6 +476,48 @@ swap_on_off_geli(const char *name, char *mntops, = int doingall) > return (swap_on_off_sfile(name, doingall)); > } >=20 > +static const char * > +swap_on_off_linux(const char *name, int doingall) > +{ > + const char *ret; > + char *nopname; > + size_t nopnamelen; > + int error; > + > + if (which_prog =3D=3D SWAPON) { > + /* Skip the header for Linux swap partitions */ > + error =3D run_cmd(NULL, "%s create -o 4096 %s", _PATH_GNOP, > + name); > + if (error) { > + warnx("gnop (create) error: %s", name); > + return (NULL); > + } > + } > + > + /* Append ".nop" to name */ > + nopnamelen =3D strlen(name) + sizeof(".nop"); > + nopname =3D (char *) malloc(nopnamelen); > + if (nopname =3D=3D NULL) > + err(1, "malloc()"); > + (void)strlcpy(nopname, name, nopnamelen); > + (void)strlcat(nopname, ".nop", nopnamelen); > + > + ret =3D swap_on_off_sfile(nopname, doingall); > + > + if (which_prog =3D=3D SWAPOFF) { > + error =3D run_cmd(NULL, "%s destroy %s", _PATH_GNOP, nopname); > + if (error) { > + warnx("gnop (destroy) error: %s", name); > + free(nopname); > + return (NULL); > + } > + } > + > + free(nopname); > + > + return (ret); > +} > + > static const char * > swap_on_off_md(const char *name, char *mntops, int doingall) > { From nobody Wed Apr 24 00:19:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPKNT4bHsz5JNDB; Wed, 24 Apr 2024 00:19: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 4VPKNT446xz3xyF; Wed, 24 Apr 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713917945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajjwMg7FzO/EsP0G/41YDXEf02e/Oj3CK8Rdgql070A=; b=xsnwlSjHUhqbLGVWItLemaN/obM9UZsBUuNaAB10CluOqinn4O1k1yxpXGfBIUJukJc5o6 npbarviRVXLXyemhy7tVaHi/bKYE2OIyxEVFXpZrDuOx26AfOuBjafOVsslsWiSDylLEXE yOKS6IuqqJ6xgHwwOxpw7rgA+lOkDZDbhlbTxVmhCKzsojIfbrtfEzejPBAjXs8iAJ2BXr N/oKiJNNclidNKLcmVnUkzUHDR6Xh+YKmv2ZzHo3+AgNuzn9Y7gCwp1pa4pgL60eHfz4CQ qxVLOy6rNpIHh3o9kxp0S2XiVMyrV89xa6W2UA2+t+7UYyqIPI6pmcKiFPtg6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713917945; a=rsa-sha256; cv=none; b=UADk/An4jOXQ5f9SDDZpkRAQVevSeSD1hV/G6cm4jv3SctraHivudfdut0tr5QVHrB2FNC /MMQnu51Qd6opEgfedeXR+m6MS+6czaHJjeghYdqpkiFEkIaR9pR5kWGxfWxiv8AjVgImZ m75EB/OEDUdudC+iFx8xFKj9jxebdCyTAzeI5Z6PiR2GjxyZOU148rpRTjsJ8NjUnuY+wb Rlt/2oBs3LixdpdE5/MeiPEhyBQTEmwfeejuUopkJsrXKOgCE8wJSMK2sQ/dtd4dopNEfD 6qJ8VscHao6U5w278yAaFajnplAW7PZzZziYNVAYP2qX77qYfr0wUNF5nZZnhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713917945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajjwMg7FzO/EsP0G/41YDXEf02e/Oj3CK8Rdgql070A=; b=AMgTgSlFtKFTucpYUqxuHAjSOAsiUdgpoozRo/SFgqAUoj1ymKNbVOCeAr6V47LfOve6IG SpZKFyDHG1OZ8AgRI3B21Q9EDD4KTGGTZWV5tfgoN+aXeFIKvpsdi72DFMOacI8aHfTDaY Pn6cDgtjE1iN71X6m2nldj+VzMMenhxFWFTOuAolqH/EFfTLstfCS34754yCf8n0dYGehZ yENOwyYXHSOPQ+jgjtZxTZ4QetC+X1ySO4J64QM4vXr5vdf1rVlw/a3i9rjqZE7r98dwBe GVYKsgRF/cSBslXwlsoaNB26opVs2S8OrvIHO54BPoEMvct7WGDx5JKPgRnNUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPKNT3fnqzt3Q; Wed, 24 Apr 2024 00:19: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 43O0J5WG034185; Wed, 24 Apr 2024 00:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O0J50g034182; Wed, 24 Apr 2024 00:19:05 GMT (envelope-from git) Date: Wed, 24 Apr 2024 00:19:05 GMT Message-Id: <202404240019.43O0J50g034182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a8acc2bf5699 - main - sockets: inherit SO_ACCEPTFILTER from listener to child List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8acc2bf5699556946dda2a37589d3c3bd9762c6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a8acc2bf5699556946dda2a37589d3c3bd9762c6 commit a8acc2bf5699556946dda2a37589d3c3bd9762c6 Author: Gleb Smirnoff AuthorDate: 2024-04-24 00:17:14 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-24 00:17:14 +0000 sockets: inherit SO_ACCEPTFILTER from listener to child This is crucial for operation of accept_filter(9). See added comment. Fixes: d29b95ecc0d049406d27a6c11939d40a46658733 --- sys/kern/uipc_socket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index c040bdf4d3eb..f0b36fc5595e 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -761,9 +761,13 @@ solisten_clone(struct socket *head) * including those completely irrelevant to a new born socket. For * compatibility with older versions we will inherit a list of * meaningful options. + * The crucial bit to inherit is SO_ACCEPTFILTER. We need it present + * in the child socket for soisconnected() promoting socket from the + * incomplete queue to complete. It will be cleared before the child + * gets available to accept(2). */ - so->so_options = head->so_options & (SO_KEEPALIVE | SO_DONTROUTE | - SO_LINGER | SO_OOBINLINE | SO_NOSIGPIPE); + so->so_options = head->so_options & (SO_ACCEPTFILTER | SO_KEEPALIVE | + SO_DONTROUTE | SO_LINGER | SO_OOBINLINE | SO_NOSIGPIPE); so->so_linger = head->so_linger; so->so_state = head->so_state; so->so_fibnum = head->so_fibnum; From nobody Wed Apr 24 00:21:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPKRp5qjpz5JNRy for ; Wed, 24 Apr 2024 00:21:58 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 4VPKRp1VFZz40Ts for ; Wed, 24 Apr 2024 00:21:58 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-41af6701806so2359285e9.1 for ; Tue, 23 Apr 2024 17:21:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713918116; x=1714522916; 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=hLqaLJommJyVlke3fhNCKj4COU1kjDI1tkHaz/HPaGg=; b=ZV7uO1DTAJjYiXwWaO+ECygCIVHhRdPnn8swjyHdu/NmHpeVnLCmJHPxDBDAB9y2T5 NPDoe7wZaqQqmJSAbOZ7PTwRCoqvU5sp6Mhxg4n6eDAy2799YEELmKfe9dAlt2JhFYE4 ByAJ9xMlK9AJ6irFpA6wr6hMIUub4eibRnE9foPEVelwt1OOze3wLZSZsk3h8ztHpNvm aox5NKA9sQelseQvKNrIIQpP903s8RiSqXcTUX3Z36l+gHKXCqg6ToCXdKPDwEb4Aqw8 f2g7m0bgXcVsr4Tj+zgj9kyn4kH+VNV7uQfhXqJ/hkaT+V9js7gRMS4V3HHDc7BTPipf iiPQ== X-Forwarded-Encrypted: i=1; AJvYcCWjyku2neuT7PtW3IZwGMmm5M6wcH2M0sMzDh6uRgch56L89HRoi4hBINw/6LBc/6Ez3uEWM4hOTh3QYXwj+yy9w2VwmNiJNyVBq7OX0r5A X-Gm-Message-State: AOJu0YxfrFIsSzH0aq5IDWj6j2RH30BD1qGOEoRopZYJiSmonCSRkp+y bsKHwSy/TQ6+6nFrOps6xypywimjstn+vF0Dwpj0saWNllzQfamtEui5TXpzVAk= X-Google-Smtp-Source: AGHT+IHMJttjP1sLZFVC3JHlZ7nbBM3yJvV/rmuab6fgpBE1cgXINjtVKWPV9s9tgZWcQhWI7SbIJw== X-Received: by 2002:a05:600c:a005:b0:41a:1d3a:3fc1 with SMTP id jg5-20020a05600ca00500b0041a1d3a3fc1mr574770wmb.3.1713918116595; Tue, 23 Apr 2024 17:21:56 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id w14-20020adfee4e000000b00343d6c7240fsm15597785wro.35.2024.04.23.17.21.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2024 17:21:56 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 91bdebc958bb - main - bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors From: Jessica Clarke In-Reply-To: <202404232242.43NMgqxx082026@gitrepo.freebsd.org> Date: Wed, 24 Apr 2024 01:21:45 +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: <9C180198-A6B6-41D3-AB49-D9582D356ADE@freebsd.org> References: <202404232242.43NMgqxx082026@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VPKRp1VFZz40Ts On 23 Apr 2024, at 23:42, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D91bdebc958bb0da03f604bad19f99e3b= 10e96ac7 >=20 > commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7 > Author: rilysh > AuthorDate: 2024-04-23 22:40:19 +0000 > Commit: Warner Losh > CommitDate: 2024-04-23 22:42:38 +0000 >=20 > bsdinstall/distfetch.c: check environment variables before = downloading and handle memory allocation errors >=20 > 1. Currently, distfetch checks environment variables existence > when it will use them or in a case (in chdir()) it doesn't check > at all. As they are necessary to set before doing anything with > it, check them, if they set or not, before proceeding any further. > This also avoids extra cleaning when that environment variable > isn't set. >=20 > 2. Handle memory allocation error in malloc(PATH_MAX) and replace > (sizeof const char *) with (sizeof char *). Both are similar and > const doesn't have a size. Latter is fine I guess but they=E2=80=99re the same by definition, = it=E2=80=99s churn. > 3. Indent the error message a bit in chdir(). AKA violate style(9). > Signed-off-by: rilysh > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1071 > --- > usr.sbin/bsdinstall/distfetch/distfetch.c | 33 = +++++++++++++++++++++---------- > 1 file changed, 23 insertions(+), 10 deletions(-) >=20 > diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c = b/usr.sbin/bsdinstall/distfetch/distfetch.c > index c431e187799d..094929d89ea1 100644 > --- a/usr.sbin/bsdinstall/distfetch/distfetch.c > +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c > @@ -46,7 +46,7 @@ static int fetch_files(int nfiles, char **urls); > int > main(void) > { > - char *diststring; > + char *diststring, *dists, *distdir, *distsite; > char **urls; > int i; > int ndists =3D 0; > @@ -54,17 +54,24 @@ main(void) > char error[PATH_MAX + 512]; > struct bsddialog_conf conf; >=20 > - if (getenv("DISTRIBUTIONS") =3D=3D NULL) > + if ((dists =3D getenv("DISTRIBUTIONS")) =3D=3D NULL) > errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); >=20 > - diststring =3D strdup(getenv("DISTRIBUTIONS")); > + if ((distdir =3D getenv("BSDINSTALL_DISTDIR")) =3D=3D NULL) > + errx(EXIT_FAILURE, "BSDINSTALL_DISTDIR variable is not set"); > + > + if ((distsite =3D getenv("BSDINSTALL_DISTSITE")) =3D=3D NULL) > + errx(EXIT_FAILURE, "BSDINSTALL_DISTSITE variable is not set"); > + > + if ((diststring =3D strdup(dists)) =3D=3D NULL) > + errx(EXIT_FAILURE, "Error: diststring variable out of memory!"); > + > for (i =3D 0; diststring[i] !=3D 0; i++) > if (isspace(diststring[i]) && !isspace(diststring[i+1])) > ndists++; > ndists++; /* Last one */ >=20 > - urls =3D calloc(ndists, sizeof(const char *)); > - if (urls =3D=3D NULL) { > + if ((urls =3D calloc(ndists, sizeof(char *))) =3D=3D NULL) { Moving into the if is pointless. > free(diststring); > errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); > } > @@ -78,15 +85,21 @@ main(void) > bsddialog_backtitle(&conf, OSNAME " Installer"); >=20 > for (i =3D 0; i < ndists; i++) { > - urls[i] =3D malloc(PATH_MAX); > + if ((urls[i] =3D malloc(PATH_MAX)) =3D=3D NULL) { Moving into the if is pointless. > + free(urls); > + free(diststring); Like I said in the review, reviewing urls and diststring but not the elements of urls is a stupid halfway house, and it=E2=80=99s all a waste = of time when you=E2=80=99re about to call errx. If one wants to be super = pedantic and free memory prior to calling errx, fine, but do it in full, don=E2=80=99= t do an arbitrary subset. > + bsddialog_end(); > + errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); > + } > + > snprintf(urls[i], PATH_MAX, "%s/%s", > - getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t")); > + distsite, strsep(&diststring, " \t")); Breaks style(9). > } >=20 > - if (chdir(getenv("BSDINSTALL_DISTDIR")) !=3D 0) { > + if (chdir(distdir) !=3D 0) { > snprintf(error, sizeof(error), > - "Could not change to directory %s: %s\n", > - getenv("BSDINSTALL_DISTDIR"), strerror(errno)); > + "Could not change to directory %s: %s\n", > + distdir, strerror(errno)); Breaks style(9). Jess > conf.title =3D "Error"; > bsddialog_msgbox(&conf, error, 0, 0); > bsddialog_end(); From nobody Wed Apr 24 00:29:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPKbz2ntYz5JNgs; Wed, 24 Apr 2024 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPKbz2Hjsz41Yp; Wed, 24 Apr 2024 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713918543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HljoOh7u6Xd9zN/oRaDrL9yD8j2ofGXUuGm2CAYtqvw=; b=Clgnqj9rtjo72zamXJBLTLt9v5ewtmdNtNGY216mImGCQnMM8Nc1YsNTcFhQ7y6NtQhXvk cGAro9ztFjH7bTPo8Wr4p/196GbjEvKnfVy0b7KP2CW8xVwsAG5HxW8xsYkdtdFy4fqgW1 0nSxnb8+tXJTPGzSY0vizXLWJ7p1yNotLptgZ9E+2X1gYE7cp7ctMw10o5uaJrTcjjAaKT Q68RrlrK2AJ7fw6MlxOoO11DLzBHZ6q5b9PWY9h8ge/UB57drji41vBIrXm2PQQ5dytbfJ CAJ/L0iy4A+6/jx4KzSGKMhk8lhyDuE1aYqVV/+gwAuhIapQhOZkDMpSHinp9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713918543; a=rsa-sha256; cv=none; b=CHQS38lSDOqGRCGFTPrh7KyIIwJmPvct/2HddaM+ysqB45UhKmyw0M+xkQ1dbQBsvFpqG9 54GDPko9J4Oy0nVHdbnaSEJv7/S1j0B3nqFvaU76ulNex6OZftIllwbAuwPg4wZV7okA7j XgzFBkRydOlZIcgNbvoCEjnBB35XPbf9CbsAo6LAUHZQoUp6GQBsmoY2K8/oHwc6ICEyH3 Nt/zhsNfedPyPESX4T8A8ouRPQypq23ZQ8bdWjYEzoE1SbWAVIGpe+Nx3zPfJsrQpeszPg ZS+Okv6eZC764vDRLLXUC4rThTTUVZf+ocIDLqJogOge6RVvRSnbc3FqPkkaug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713918543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HljoOh7u6Xd9zN/oRaDrL9yD8j2ofGXUuGm2CAYtqvw=; b=Ua0IPMvIZps8bOGYDHr29MdSY4TQTzyWgoSbruh561Pe9NITkOoArid1E8PjCqLrjTDliA 9HEET8erPxGT2184LbmcwqxD1fvgWAPEYu+cmfjd7FM0g+mYZaiFz/B3oup0mWHr4kHnXw AEfiXcB8vDrEAsyvyzhhmk+JTDsSjyBc2X1zKtB8VhcLYSz+IR/dAy95gjDKkPp31p75Cd VKEvlcNi7RSAP1dNEzGcLqTjxoPbsbQisu+NaGR1x1sGMmOh24cVehV9G0a9x/BidYhZ9k fIUkKpX+FnT1js1xD6tqXm6eAhuVQiq3+g/KHn2Jt4rUlHd5+AYbRpfJjJxWaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPKbz1vKMzt21; Wed, 24 Apr 2024 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O0T3VB051341; Wed, 24 Apr 2024 00:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O0T3Rp051338; Wed, 24 Apr 2024 00:29:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 00:29:03 GMT Message-Id: <202404240029.43O0T3Rp051338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 4f2ada0d8821 - main - ktrace: Describe CAPFAIL trace point in man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f2ada0d88219746fdfbc0907c28b0950ad18725 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=4f2ada0d88219746fdfbc0907c28b0950ad18725 commit 4f2ada0d88219746fdfbc0907c28b0950ad18725 Author: Jake Freeland AuthorDate: 2024-04-24 00:25:16 +0000 Commit: Jake Freeland CommitDate: 2024-04-24 00:25:16 +0000 ktrace: Describe CAPFAIL trace point in man page Update the ktrace(1) man page to describe the recently improved capability failure tracing. Approved by: markj (mentor) Reviewed by: markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44886 --- usr.bin/ktrace/ktrace.1 | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1 index 7167ad1e646a..5ccb206456b8 100644 --- a/usr.bin/ktrace/ktrace.1 +++ b/usr.bin/ktrace/ktrace.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 26, 2019 +.Dd April 20, 2024 .Dt KTRACE 1 .Os .Sh NAME @@ -151,6 +151,21 @@ The and .Ar command options are mutually exclusive. +.Sh CAPABILITY VIOLATION TRACING +When the +.Cm p +trace point is specified, +.Nm +will record +.Xr capsicum 4 +capability mode violations made by the traced process. +Violations will be logged regardless of whether the process has actually +entered capability mode. +.Pp +For developers that are interested in Capsicumizing their programs, the +.Cm c , n , p +trace points can help quickly identify any system calls and path lookups that +are triggering violations. .Sh EXAMPLES Run "make", then trace it and any child processes: .Dl $ ktrace -i make @@ -183,7 +198,8 @@ Disable tracing of all user-owned processes: .Xr kdump 1 , .Xr truss 1 , .Xr ktrace 2 , -.Xr utrace 2 +.Xr utrace 2 , +.Xr capsicum 4 .Sh HISTORY The .Nm From nobody Wed Apr 24 00:29:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPKc041kQz5JNyk; Wed, 24 Apr 2024 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPKc03bn9z41fg; Wed, 24 Apr 2024 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713918544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7QVpGARZBIGmb7NtUsGx8eWw0p6Lrjc3cq8ocyjO5k=; b=xasMov919lZR4ACRQARe9VtUl8FGGjeYQ7Mwrh6GLdLaruTb2fsR+/LVnay4F5MEpN0QiX Kax6KLOUUQnqCnj4gjl7HIaWM5Wg5xsmci9V4rIFjyHwFGUowhtFtJlUdRrgHrsNqpVfna qukpRVpUNvhYBc6o6KW0Z8ogLbWNXkOV4H5LzxSfF2pzw/+yJ7rfVf0mGwfl6r3Nhmrx0H 7VOI+n41u0+VkxYYkDiFu1PqBX+oGkbeZcaUOt5Tl3RcOTGlDGFdcPs845byA3EC7S2aPL OyfYAPZPS3H4o1u2ZuR3KvcXLPrbp5KEZ1MVEzRbgADdY0kVaUDI+eYheZPLaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713918544; a=rsa-sha256; cv=none; b=msF45pMxy17eWr7kDBgySzX30wOSUyZ4dNohGeotasaE5ooEzp2QB4+Ocbg65fEC2AAmMy qLPUD0qgY0XBM7bad0csUAhTMYc9nkeJKxT01dS1EKO2VUilzok97pi8Sc3XIxeyd22Iw/ wQ14YRD+gOkwapiZks2vmd2rTzCMJvutFMJwe2cmRIoZYoGfaK5j/+vXWToK4ZulJIBaTA W0nvXCwP+rl7gUPBgn15+5LMu2GneHVxj0+TNuHiBYDTzyD0Bf0mhit6CX6aTKqy8eRiLW 7aK6Yv0Cs+71Zi/SnMREhkICa/wzpIgYUPtx0+MFG0uBxrGLDed6QO6yDj1fzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713918544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7QVpGARZBIGmb7NtUsGx8eWw0p6Lrjc3cq8ocyjO5k=; b=x7GGkhCfx2nCPNO0Qe2ds3PmL1Rz2k7PTu1NPVAoJypbaOYytnJGFJ8V+ncEi83Fjmv1PV t6sVv7xWqUJ/lt/CWS+2Xa7osEWxChjVvCl7wATetpcjmk7MGQ2LW22Vwmi4xmIrPSluj2 IR+gcl8RhrYs04KF4k+HAkAqdO1f5ACqPxqiqG2BKr3N1VtM7C4XA+0FH4k+2FYQjpAHiL h3uWIy21oXsExWeAo1qoh+7dFOL2+AJlyc26y74DpH/m3zvQ8p1vvOxo+rv422t0yXUeUP 02Koz3Vmb+9vnIi77Di0X8uZHkAyRkgyBgrmCmVosCScXRABKu6UgbPEo8+2KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPKc03CZWztLn; Wed, 24 Apr 2024 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O0T4U4051389; Wed, 24 Apr 2024 00:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O0T4jF051386; Wed, 24 Apr 2024 00:29:04 GMT (envelope-from git) Date: Wed, 24 Apr 2024 00:29:04 GMT Message-Id: <202404240029.43O0T4jF051386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: f239db4800ee - main - ktrace: Remove CAPFAIL from default trace points List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f239db4800ee9e7ff8485f96b7a68e6c38178c3b Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=f239db4800ee9e7ff8485f96b7a68e6c38178c3b commit f239db4800ee9e7ff8485f96b7a68e6c38178c3b Author: Jake Freeland AuthorDate: 2024-04-24 00:26:14 +0000 Commit: Jake Freeland CommitDate: 2024-04-24 00:26:14 +0000 ktrace: Remove CAPFAIL from default trace points The CAPFAIL tracepoint was recently extended to report ECAPMODE capability violations for processes that do not enter capability mode. This allows developers that are interested in Capsicumizing their programs to determine where violations are being raised. Previously, CAPFAIL only produced output for processes using Capsicum(4) capabilties. Thus, most ktrace users never received log output from the trace point. With the recent changes, this is no longer the case. Having this trace point enabled by default will produce output for all processes that use syscalls that are not permitted in capability mode. This may lead to confusion for users that are not familiar with the feature. Remove KTRFAC_CAPFAIL from ktrace's default points to avoid this. Approved by: markj (mentor) Reviewed by: markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44887 --- usr.bin/ktrace/ktrace.1 | 2 +- usr.bin/ktrace/ktrace.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1 index 5ccb206456b8..da39aac7800f 100644 --- a/usr.bin/ktrace/ktrace.1 +++ b/usr.bin/ktrace/ktrace.1 @@ -137,7 +137,7 @@ trace requests .It Cm + trace the default set of trace points - -.Cm c , i , n , p , s , t , u , y +.Cm c , i , n , s , t , u , y .El .It Ar command Execute diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h index 1022f06532b1..bf3f70539310 100644 --- a/usr.bin/ktrace/ktrace.h +++ b/usr.bin/ktrace/ktrace.h @@ -31,13 +31,12 @@ #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \ KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | \ - KTRFAC_STRUCT | KTRFAC_SYSCTL | KTRFAC_CAPFAIL | \ - KTRFAC_STRUCT_ARRAY) + KTRFAC_STRUCT | KTRFAC_SYSCTL | KTRFAC_STRUCT_ARRAY) #define PROC_ABI_POINTS (KTRFAC_PROCCTOR | KTRFAC_PROCDTOR) -#define ALL_POINTS (DEF_POINTS | KTRFAC_CSW | PROC_ABI_POINTS | \ - KTRFAC_FAULT | KTRFAC_FAULTEND) +#define ALL_POINTS (DEF_POINTS | KTRFAC_CAPFAIL | KTRFAC_CSW | \ + PROC_ABI_POINTS | KTRFAC_FAULT | KTRFAC_FAULTEND) #define DEF_TRACEFILE "ktrace.out" From nobody Wed Apr 24 01:48:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPMMc5h05z5JVvh for ; Wed, 24 Apr 2024 01:48:28 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 4VPMMc3kW1z47Y4 for ; Wed, 24 Apr 2024 01:48:28 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a55b93f5540so339133066b.1 for ; Tue, 23 Apr 2024 18:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1713923307; x=1714528107; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=gebWBBrTSu7bpKrnWlPYXjxLzXv1sON+vhM7CEbEn2k=; b=YiZ4iRTAG2tZZS57u1/Sn1lzwp33sNJFenz/jqRIwvIuO2a8GB4nrvtuA6pxeE2Fyu ztCbHgUEP1YO0R9mMGLFsLNeLDf/Him3T3ePs5IlXJZg0ba+xqZ6qyazk6IIrjuyDbX9 nuP1SMcRKrFp8plTN4pG2atsAYrXDZ4XpRxHz6x3MfrwkUuyF2GRxD5QWczdjS5VVSY3 c8785blaJAvT6x5qknxg+QEG5J1oL9hsiAFORvhCW3euou6WR5AGfj7e2esnFDpcFuwF X7PxPojkO/tbnV0BFT5+FueqLjSShvuhGYWgTM4GvvvD0ZEItuwlO59P8U0ow8prcauz C1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713923307; x=1714528107; 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=gebWBBrTSu7bpKrnWlPYXjxLzXv1sON+vhM7CEbEn2k=; b=E72NpK7ARIJmSJiZMoKPVewKgcGb8G0pjCrimRKck7Bq99Ev9/s3Xi/zeNoyxmqFWr qwz6UtrMZ8S8iix8NZrjw9gtGi12nVuomzZhDVYmBfT3ICTNtq4Bn1ro+/RFrH6E3uK3 N3+QkPzX2jd2PlaEzmlssYrdY4qRL1rMAU0/SSQCW6S/y/ubza7xXBV8XK3LWhgtwZt2 EeTUMwNln40RAj2w06CoeER28VvNegndpkEdncJVXMnntGCYPiMZ9s9eUv2+mG8QeD9n qIlGk8PjXo0GBqjUm8/QXX1Zyqcx4upb1riADq0zvDuW6dBiWkZzANPMUs29T7yUkk2h xoPg== X-Forwarded-Encrypted: i=1; AJvYcCXG/Du4kcwREEGRQjqYhR4fsNW0okqhb4FayQvrR2a/MfI8rxkclux8iQE7sIvMnePewO7dhjvxK6fD8UYBthJPvZbrPYdWIbp9i9qKUC9C X-Gm-Message-State: AOJu0Yz32avZdwrcJEnh6i19b1yhZ8c4PtfjwR6MTYWsT/JudsRxgqtL TEx1upXi4NWqJOrzuKojzg4ypGAu3i9VAu2WxfOFG8MI8xEa1DUji78CNAYNwgNUHofQTRsY5Kw gsycbgYV12cGg18WLiEhYXqiag+AMH6tnU+t1sg== X-Google-Smtp-Source: AGHT+IGnfIafLiwY2r+J411vyzZBKl40iA2T89hKF4lbKaPJxagoXpiEqXNaZzPa+nlm5FAth02udHt5zpDnnPSO/A0= X-Received: by 2002:a17:906:b00b:b0:a58:7832:c278 with SMTP id v11-20020a170906b00b00b00a587832c278mr550823ejy.63.1713923306707; Tue, 23 Apr 2024 18:48:26 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404232150.43NLoEsI087796@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 23 Apr 2024 19:48:14 -0600 Message-ID: Subject: Re: git: cf04a7775a4e - main - swapon: Do not overwrite Linux swap header To: Jessica Clarke Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000de798a0616cddde4" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VPMMc3kW1z47Y4 --000000000000de798a0616cddde4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Apr 23, 2024, 6:16=E2=80=AFPM Jessica Clarke w= rote: > On 23 Apr 2024, at 22:50, Warner Losh wrote: > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dcf04a7775a4e8ff6fd28c768be9daa3= d83dd382e > > > > commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e > > Author: Ricardo Branco > > AuthorDate: 2024-04-23 21:47:56 +0000 > > Commit: Warner Losh > > CommitDate: 2024-04-23 21:48:01 +0000 > > > > swapon: Do not overwrite Linux swap header > > I don=E2=80=99t think this is a sensible default. swapon should, by defau= lt, do > exactly what you asked for, rather than magically do something more > convoluted and different, with no way to opt out of it. The fact that > it looks like some other random OS happened to touch the partition in > the past shouldn=E2=80=99t be relevant; we=E2=80=99re not Linux, we=E2=80= =99re FreeBSD. > Especially in the age of GPT where the OSes have different GUIDs for > their swap partitions. Having some user-friendly way to the gnop dance > seems fine, but it should be optional and off by default, not forced > upon you. As it stands the only way to avoid this silent behaviour > change is to zero out the first 4K of the partition, which is not > user-friendly (and starts to sound like going back to the old days when > that was a common thing to do when partitioning). > > I also don=E2=80=99t believe the patch to be uncontested as you state in = your > comment on the PR; kib@ had last commented on 1083 that it should be > documented and left up to the user to configure. > Yea. I'll back it out... i didn't realize the coupling of the issues until i re-read it... also armv7 is broken... I'm thinking we should just close those two PRs: they aren't ready and the argument is whether to do it or not... Warner Jess > > > Reviewed by: imp, jhb > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1084 > > --- > > sbin/swapon/Makefile | 2 ++ > > sbin/swapon/extern.h | 5 ++++ > > sbin/swapon/swaplinux.c | 66 > +++++++++++++++++++++++++++++++++++++++++++++++++ > > sbin/swapon/swapon.c | 54 +++++++++++++++++++++++++++++++++++++++- > > 4 files changed, 126 insertions(+), 1 deletion(-) > > > > diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile > > index 27808aed5857..930e938e5b05 100644 > > --- a/sbin/swapon/Makefile > > +++ b/sbin/swapon/Makefile > > @@ -6,6 +6,8 @@ LINKS=3D ${BINDIR}/swapon ${BINDIR}/swapoff > > LINKS+=3D ${BINDIR}/swapon ${BINDIR}/swapctl > > MLINKS=3D swapon.8 swapoff.8 > > MLINKS+=3Dswapon.8 swapctl.8 > > +SRCS=3D swapon.c swaplinux.c > > +HDRS+=3D extern.h > > > > LIBADD=3D util > > > > diff --git a/sbin/swapon/extern.h b/sbin/swapon/extern.h > > new file mode 100644 > > index 000000000000..cb33dbbee953 > > --- /dev/null > > +++ b/sbin/swapon/extern.h > > @@ -0,0 +1,5 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-3-Clause > > + */ > > + > > +int is_linux_swap(const char *); > > diff --git a/sbin/swapon/swaplinux.c b/sbin/swapon/swaplinux.c > > new file mode 100644 > > index 000000000000..d01a94345e68 > > --- /dev/null > > +++ b/sbin/swapon/swaplinux.c > > @@ -0,0 +1,66 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-3-Clause > > + */ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "extern.h" > > + > > +/* > > + * Definitions and structure taken from > > + * > https://github.com/util-linux/util-linux/blob/master/include/swapheader.h > > + */ > > + > > +#define SWAP_VERSION 1 > > +#define SWAP_UUID_LENGTH 16 > > +#define SWAP_LABEL_LENGTH 16 > > +#define SWAP_SIGNATURE "SWAPSPACE2" > > +#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1) > > + > > +struct swap_header_v1_2 { > > + char bootbits[1024]; /* Space for disklabel etc. */ > > + uint32_t version; > > + uint32_t last_page; > > + uint32_t nr_badpages; > > + unsigned char uuid[SWAP_UUID_LENGTH]; > > + char volume_name[SWAP_LABEL_LENGTH]; > > + uint32_t padding[117]; > > + uint32_t badpages[1]; > > +}; > > + > > +typedef union { > > + struct swap_header_v1_2 header; > > + struct { > > + uint8_t reserved[4096 - SWAP_SIGNATURE_SZ]; > > + char signature[SWAP_SIGNATURE_SZ]; > > + } tail; > > +} swhdr_t; > > + > > +#define sw_version header.version > > +#define sw_volume_name header.volume_name > > +#define sw_signature tail.signature > > + > > +int > > +is_linux_swap(const char *name) > > +{ > > + uint8_t buf[4096]; > > + swhdr_t *hdr =3D (swhdr_t *) buf; > > + int fd; > > + > > + fd =3D open(name, O_RDONLY); > > + if (fd =3D=3D -1) > > + return (-1); > > + > > + if (read(fd, buf, 4096) !=3D 4096) { > > + close(fd); > > + return (-1); > > + } > > + close(fd); > > + > > + return (hdr->sw_version =3D=3D SWAP_VERSION && > > + !memcmp(hdr->sw_signature, SWAP_SIGNATURE, SWAP_SIGNATURE_SZ)); > > +} > > diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c > > index 26a7dc22654a..0f2ad1f5e213 100644 > > --- a/sbin/swapon/swapon.c > > +++ b/sbin/swapon/swapon.c > > @@ -54,10 +54,15 @@ > > #include > > #include > > > > +#include "extern.h" > > + > > +#define _PATH_GNOP "/sbin/gnop" > > + > > static void usage(void) __dead2; > > static const char *swap_on_off(const char *, int, char *); > > static const char *swap_on_off_gbde(const char *, int); > > static const char *swap_on_off_geli(const char *, char *, int); > > +static const char *swap_on_off_linux(const char *, int); > > static const char *swap_on_off_md(const char *, char *, int); > > static const char *swap_on_off_sfile(const char *, int); > > static void swaplist(int, int, int); > > @@ -250,8 +255,13 @@ swap_on_off(const char *name, int doingall, char > *mntops) > > return (swap_on_off_geli(name, mntops, doingall)); > > } > > > > - /* Swap on special file. */ > > free(basebuf); > > + > > + /* Linux swap */ > > + if (is_linux_swap(name)) > > + return (swap_on_off_linux(name, doingall)); > > + > > + /* Swap on special file. */ > > return (swap_on_off_sfile(name, doingall)); > > } > > > > @@ -466,6 +476,48 @@ swap_on_off_geli(const char *name, char *mntops, > int doingall) > > return (swap_on_off_sfile(name, doingall)); > > } > > > > +static const char * > > +swap_on_off_linux(const char *name, int doingall) > > +{ > > + const char *ret; > > + char *nopname; > > + size_t nopnamelen; > > + int error; > > + > > + if (which_prog =3D=3D SWAPON) { > > + /* Skip the header for Linux swap partitions */ > > + error =3D run_cmd(NULL, "%s create -o 4096 %s", _PATH_GNOP, > > + name); > > + if (error) { > > + warnx("gnop (create) error: %s", name); > > + return (NULL); > > + } > > + } > > + > > + /* Append ".nop" to name */ > > + nopnamelen =3D strlen(name) + sizeof(".nop"); > > + nopname =3D (char *) malloc(nopnamelen); > > + if (nopname =3D=3D NULL) > > + err(1, "malloc()"); > > + (void)strlcpy(nopname, name, nopnamelen); > > + (void)strlcat(nopname, ".nop", nopnamelen); > > + > > + ret =3D swap_on_off_sfile(nopname, doingall); > > + > > + if (which_prog =3D=3D SWAPOFF) { > > + error =3D run_cmd(NULL, "%s destroy %s", _PATH_GNOP, nopname); > > + if (error) { > > + warnx("gnop (destroy) error: %s", name); > > + free(nopname); > > + return (NULL); > > + } > > + } > > + > > + free(nopname); > > + > > + return (ret); > > +} > > + > > static const char * > > swap_on_off_md(const char *name, char *mntops, int doingall) > > { > > --000000000000de798a0616cddde4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Apr 23, 2024, 6:16=E2=80=AFPM Jessica Clarke &= lt;jrtc27@freebsd.org> wrote:<= br>
On 23 Apr 2024, at 22:50, Warner Lo= sh <imp@FreeBSD.org> wrote:

> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dcf04a7775a4e8ff6fd28c768be9daa= 3d83dd382e
>
> commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e
> Author:=C2=A0 =C2=A0 =C2=A0Ricardo Branco <rbranco@suse.de>
> AuthorDate: 2024-04-23 21:47:56 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-04-23 21:48:01 +0000
>
>=C2=A0 =C2=A0 swapon: Do not overwrite Linux swap header

I don=E2=80=99t think this is a sensible default. swapon should, by default= , do
exactly what you asked for, rather than magically do something more
convoluted and different, with no way to opt out of it. The fact that
it looks like some other random OS happened to touch the partition in
the past shouldn=E2=80=99t be relevant; we=E2=80=99re not Linux, we=E2=80= =99re FreeBSD.
Especially in the age of GPT where the OSes have different GUIDs for
their swap partitions. Having some user-friendly way to the gnop dance
seems fine, but it should be optional and off by default, not forced
upon you. As it stands the only way to avoid this silent behaviour
change is to zero out the first 4K of the partition, which is not
user-friendly (and starts to sound like going back to the old days when
that was a common thing to do when partitioning).

I also don=E2=80=99t believe the patch to be uncontested as you state in yo= ur
comment on the PR; kib@ had last commented on 1083 that it should be
documented and left up to the user to configure.

Yea. I'll back it out..= . i didn't realize the coupling of the issues until i re-read it... als= o armv7 is broken...

I&#= 39;m thinking we should just close those two PRs: they aren't ready and= the argument is whether to do it or not...

Warner

Jess

>=C2=A0 =C2=A0 Reviewed by: imp, jhb
>=C2=A0 =C2=A0 Pull Request: https://g= ithub.com/freebsd/freebsd-src/pull/1084
> ---
> sbin/swapon/Makefile=C2=A0 =C2=A0 |=C2=A0 2 ++
> sbin/swapon/extern.h=C2=A0 =C2=A0 |=C2=A0 5 ++++
> sbin/swapon/swaplinux.c | 66 +++++++++++++++++++++++++++++++++++++++++= ++++++++
> sbin/swapon/swapon.c=C2=A0 =C2=A0 | 54 +++++++++++++++++++++++++++++++= ++++++++-
> 4 files changed, 126 insertions(+), 1 deletion(-)
>
> diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
> index 27808aed5857..930e938e5b05 100644
> --- a/sbin/swapon/Makefile
> +++ b/sbin/swapon/Makefile
> @@ -6,6 +6,8 @@ LINKS=3D ${BINDIR}/swapon ${BINDIR}/swapoff
> LINKS+=3D ${BINDIR}/swapon ${BINDIR}/swapctl
> MLINKS=3D swapon.8 swapoff.8
> MLINKS+=3Dswapon.8 swapctl.8
> +SRCS=3D swapon.c swaplinux.c
> +HDRS+=3D extern.h
>
> LIBADD=3D util
>
> diff --git a/sbin/swapon/extern.h b/sbin/swapon/extern.h
> new file mode 100644
> index 000000000000..cb33dbbee953
> --- /dev/null
> +++ b/sbin/swapon/extern.h
> @@ -0,0 +1,5 @@
> +/*-
> + * SPDX-License-Identifier: BSD-3-Clause
> + */
> +
> +int is_linux_swap(const char *);
> diff --git a/sbin/swapon/swaplinux.c b/sbin/swapon/swaplinux.c
> new file mode 100644
> index 000000000000..d01a94345e68
> --- /dev/null
> +++ b/sbin/swapon/swaplinux.c
> @@ -0,0 +1,66 @@
> +/*-
> + * SPDX-License-Identifier: BSD-3-Clause
> + */
> +
> +#include <fcntl.h>
> +#include <err.h>
> +#include <stdint.h>
> +#include <string.h>
> +#include <unistd.h>
> +
> +#include "extern.h"
> +
> +/*
> + * Definitions and structure taken from
> + * https:/= /github.com/util-linux/util-linux/blob/master/include/swapheader.h
> + */
> +
> +#define SWAP_VERSION 1
> +#define SWAP_UUID_LENGTH 16
> +#define SWAP_LABEL_LENGTH 16
> +#define SWAP_SIGNATURE "SWAPSPACE2"
> +#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1)
> +
> +struct swap_header_v1_2 {
> + char=C2=A0 =C2=A0 =C2=A0 bootbits[1024];=C2=A0 =C2=A0 /* Space for d= isklabel etc. */
> + uint32_t=C2=A0 =C2=A0 =C2=A0 version;
> + uint32_t=C2=A0 =C2=A0 =C2=A0 last_page;
> + uint32_t=C2=A0 =C2=A0 =C2=A0 nr_badpages;
> + unsigned char uuid[SWAP_UUID_LENGTH];
> + char=C2=A0 =C2=A0 =C2=A0 volume_name[SWAP_LABEL_LENGTH];
> + uint32_t=C2=A0 =C2=A0 =C2=A0 padding[117];
> + uint32_t=C2=A0 =C2=A0 =C2=A0 badpages[1];
> +};
> +
> +typedef union {
> + struct swap_header_v1_2 header;
> + struct {
> + uint8_t reserved[4096 - SWAP_SIGNATURE_SZ];
> + char signature[SWAP_SIGNATURE_SZ];
> + } tail;
> +} swhdr_t;
> +
> +#define sw_version header.version
> +#define sw_volume_name header.volume_name
> +#define sw_signature tail.signature
> +
> +int
> +is_linux_swap(const char *name)
> +{
> + uint8_t buf[4096];
> + swhdr_t *hdr =3D (swhdr_t *) buf;
> + int fd;
> +
> + fd =3D open(name, O_RDONLY);
> + if (fd =3D=3D -1)
> + return (-1);
> +
> + if (read(fd, buf, 4096) !=3D 4096) {
> + close(fd);
> + return (-1);
> + }
> + close(fd);
> +
> + return (hdr->sw_version =3D=3D SWAP_VERSION &&
> +=C2=A0 =C2=A0 !memcmp(hdr->sw_signature, SWAP_SIGNATURE, SWAP_SIGN= ATURE_SZ));
> +}
> diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
> index 26a7dc22654a..0f2ad1f5e213 100644
> --- a/sbin/swapon/swapon.c
> +++ b/sbin/swapon/swapon.c
> @@ -54,10 +54,15 @@
> #include <string.h>
> #include <unistd.h>
>
> +#include "extern.h"
> +
> +#define _PATH_GNOP "/sbin/gnop"
> +
> static void usage(void) __dead2;
> static const char *swap_on_off(const char *, int, char *);
> static const char *swap_on_off_gbde(const char *, int);
> static const char *swap_on_off_geli(const char *, char *, int);
> +static const char *swap_on_off_linux(const char *, int);
> static const char *swap_on_off_md(const char *, char *, int);
> static const char *swap_on_off_sfile(const char *, int);
> static void swaplist(int, int, int);
> @@ -250,8 +255,13 @@ swap_on_off(const char *name, int doingall, char = *mntops)
> return (swap_on_off_geli(name, mntops, doingall));
> }
>
> - /* Swap on special file. */
> free(basebuf);
> +
> + /* Linux swap */
> + if (is_linux_swap(name))
> + return (swap_on_off_linux(name, doingall));
> +
> + /* Swap on special file. */
> return (swap_on_off_sfile(name, doingall));
> }
>
> @@ -466,6 +476,48 @@ swap_on_off_geli(const char *name, char *mntops, = int doingall)
> return (swap_on_off_sfile(name, doingall));
> }
>
> +static const char *
> +swap_on_off_linux(const char *name, int doingall)
> +{
> + const char *ret;
> + char *nopname;
> + size_t nopnamelen;
> + int error;
> +
> + if (which_prog =3D=3D SWAPON) {
> + /* Skip the header for Linux swap partitions */
> + error =3D run_cmd(NULL, "%s create -o 4096 %s", _PATH_GNOP= ,
> +=C2=A0 =C2=A0 name);
> + if (error) {
> + warnx("gnop (create) error: %s", name);
> + return (NULL);
> + }
> + }
> +
> + /* Append ".nop" to name */
> + nopnamelen =3D strlen(name) + sizeof(".nop");
> + nopname =3D (char *) malloc(nopnamelen);
> + if (nopname =3D=3D NULL)
> + err(1, "malloc()");
> + (void)strlcpy(nopname, name, nopnamelen);
> + (void)strlcat(nopname, ".nop", nopnamelen);
> +
> + ret =3D swap_on_off_sfile(nopname, doingall);
> +
> + if (which_prog =3D=3D SWAPOFF) {
> + error =3D run_cmd(NULL, "%s destroy %s", _PATH_GNOP, nopna= me);
> + if (error) {
> + warnx("gnop (destroy) error: %s", name);
> + free(nopname);
> + return (NULL);
> + }
> + }
> +
> + free(nopname);
> +
> + return (ret);
> +}
> +
> static const char *
> swap_on_off_md(const char *name, char *mntops, int doingall)
> {

--000000000000de798a0616cddde4-- From nobody Wed Apr 24 03:19:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPPN757mVz5JdBW; Wed, 24 Apr 2024 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPPN74S4Rz4HP7; Wed, 24 Apr 2024 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713928743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5wRFnwM7J/irJwG/8RVXU3xGns7LYDE9VUSnthOTe4=; b=NGreFmvUN/3qDrC4ZDxMcnp+Pk7o3IPbehfqu4nVtsbEE+rtFMn0rXMEaZZ3ETCtUia628 k3NYP1PjpuxhlvP4YLRu3OZSfNntpe6BJoeSctRrbICJfO2oo2NMNLKXWThYEVhpp/KWtq xWX3k51EKaJWTjGtwake7hZ7VWrd24e6OiSH+5pgvVN5HkJ0oahdwYNp2h2CKaQGAo7ZYJ vr8S/sU5LUUvwP8A+c2iIZ1FYYBy9NxXGf1sfNWAoYathapyWMgolVL12O0Iefcp9lqcGT 1TijCs0UilaNDVYYA1mDE3xzmQokLbPCVNW60swzQ3tDLjFA3pG9usRj1R5AOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713928743; a=rsa-sha256; cv=none; b=OZpKFBoB8HjtXkjBag08tfqlWeVOqsWOJAoUjZ3d3rMfLLjDQ5+Q6XVEKLSD3CPuIn6Iq9 ogRMS9occf0L1MFMvVh/9qylz+6sexN7JU4I6Cx+vb7Pm64RYn+frouAFb/3JXy7pn49uq GnfiF0/8uQnSis+0iF7NO0+RjcBEGPQn10GJmmbVq9bu+SqCFkpeaU+fXKBJD1hVsRZ3PD /1n4/NYbSYdvFKNcpenaTrtfuAM/rB496KdDlNjYZem2AJ8HZ4DCij/06Pmhl6AqUqWlrs Aqwf3bLAyvNzQXCJzx6MsBipuymKi70ebKINCW2xKLFZTKuuH3k3W7ZfFMEq3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713928743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5wRFnwM7J/irJwG/8RVXU3xGns7LYDE9VUSnthOTe4=; b=tubxtGR+OUMMsgPDjXc+HtL/jea0AmpG0PSxS6wprFg305ru1OWrcWOGzdQi/INmawOTTX lICtvVGjjF23FrIX4090NwCYKiYsS6zRUeW28F4UtKiwoxCn/J2KnR8z0aQDkE+q7mYXkU Be5qP3zd2c5rZKCZRo/1ViMh3oDYdxEl2LzNvaj0lZ8ZQWr0a7k8AwvUtqMtWmNBKwAcuX ev4oWtypOlwXw0I0a7wO86CVrGvJWUmUEyXbOYzclpVejmYztvQSSZazn+8fsp18HLonN6 JUQjDkTdpPIW4GGHP4jvyUqhBfxaT7mgGiajGQiB6UXFVQoze2HrvcKjB+440Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPPN741gNzySD; Wed, 24 Apr 2024 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O3J3Uf038931; Wed, 24 Apr 2024 03:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O3J3XS038928; Wed, 24 Apr 2024 03:19:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 03:19:03 GMT Message-Id: <202404240319.43O3J3XS038928@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: 560931508c7d - main - Revert "bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 560931508c7d69a28bb199b6f6ed855b3e77c52e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=560931508c7d69a28bb199b6f6ed855b3e77c52e commit 560931508c7d69a28bb199b6f6ed855b3e77c52e Author: Warner Losh AuthorDate: 2024-04-24 03:16:58 +0000 Commit: Warner Losh CommitDate: 2024-04-24 03:18:56 +0000 Revert "bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors" This reverts commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7. It wasn't as ready as I thought --- usr.sbin/bsdinstall/distfetch/distfetch.c | 33 ++++++++++--------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c index 094929d89ea1..c431e187799d 100644 --- a/usr.sbin/bsdinstall/distfetch/distfetch.c +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c @@ -46,7 +46,7 @@ static int fetch_files(int nfiles, char **urls); int main(void) { - char *diststring, *dists, *distdir, *distsite; + char *diststring; char **urls; int i; int ndists = 0; @@ -54,24 +54,17 @@ main(void) char error[PATH_MAX + 512]; struct bsddialog_conf conf; - if ((dists = getenv("DISTRIBUTIONS")) == NULL) + if (getenv("DISTRIBUTIONS") == NULL) errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); - if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL) - errx(EXIT_FAILURE, "BSDINSTALL_DISTDIR variable is not set"); - - if ((distsite = getenv("BSDINSTALL_DISTSITE")) == NULL) - errx(EXIT_FAILURE, "BSDINSTALL_DISTSITE variable is not set"); - - if ((diststring = strdup(dists)) == NULL) - errx(EXIT_FAILURE, "Error: diststring variable out of memory!"); - + diststring = strdup(getenv("DISTRIBUTIONS")); for (i = 0; diststring[i] != 0; i++) if (isspace(diststring[i]) && !isspace(diststring[i+1])) ndists++; ndists++; /* Last one */ - if ((urls = calloc(ndists, sizeof(char *))) == NULL) { + urls = calloc(ndists, sizeof(const char *)); + if (urls == NULL) { free(diststring); errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); } @@ -85,21 +78,15 @@ main(void) bsddialog_backtitle(&conf, OSNAME " Installer"); for (i = 0; i < ndists; i++) { - if ((urls[i] = malloc(PATH_MAX)) == NULL) { - free(urls); - free(diststring); - bsddialog_end(); - errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); - } - + urls[i] = malloc(PATH_MAX); snprintf(urls[i], PATH_MAX, "%s/%s", - distsite, strsep(&diststring, " \t")); + getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t")); } - if (chdir(distdir) != 0) { + if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) { snprintf(error, sizeof(error), - "Could not change to directory %s: %s\n", - distdir, strerror(errno)); + "Could not change to directory %s: %s\n", + getenv("BSDINSTALL_DISTDIR"), strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, error, 0, 0); bsddialog_end(); From nobody Wed Apr 24 03:19:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPPN90D8rz5Jd0P; Wed, 24 Apr 2024 03:19: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 4VPPN85gG9z4H4Z; Wed, 24 Apr 2024 03:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713928744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blvRggDsgz7AwSB9DF/QAzZkR66k4UVJ87w0rlReH/I=; b=stZpsxKYkhhQE3eCcuUhxblLIumkPhxJsEph6IcrWxA0wIZXffXqattSkOL141JkoIyued IZrkEcmzvckkMct0D+igpOFPchwZ2aXmQDJYZS9ROLFIA0YEfGwVYDV2qBnaatjXvHcutJ cS5hbJq3YO0FzVar5LEDcOTAvJxikzzDqXSg2o9K+myxdgb56MvjURDR9toOUnD5A+gJed lUMK9am1gDnDOPrk+cIn9cQGLm3r4ygZbD5ePEF3rQETQTB0H9Jf9UEDmysy7s+VGSUk1l DaLfYdwMccfMXVAvOa9c0b8cGQEH2VDz2lesNk2fM6LKWjFFc525KAqmSVO4cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713928744; a=rsa-sha256; cv=none; b=D3EbDwvC0UjzApUyPLsL3UT3WNfiy/lGwrLM6QBjdByN2QZdIMx77d05XLApaSV1ejo91L EoPYVJPUEf5uZDvpMfg7mIBpkbcUPgCFMzX1bUPF5tU+Igrglw/rv+rcK0c5OTZ3gdWYmc Nw0w3yAaIhuVwQBXcpUOk77+19Om+XH+nfblKqRvTqSO/nLhTWggImIHiWhrmk2/GLkx7m IULLYdTuSvdKHMpZ3IAWDVwBkF2VJsiDZww7ppWYgJ+Wey8puohosle1YApdtwRSY3nWMi ojyKL3opnJwxan7rkyaq9m7d84iVZTEB3qsqlRngNxJ34tieq11XN1Q9m7BHfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713928744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blvRggDsgz7AwSB9DF/QAzZkR66k4UVJ87w0rlReH/I=; b=aLrT/2sGuKCB0OU08LfcYFMY3MreajPKntUQRV7iEn5GSf0yJqq3G41oPMirdwkPyaBFvR MHy6zjzIsKkKwJGWq4MzKu7atlyZ4LE8R51RHRRooiazPuNjp3O2Ik4I97fxJosGyYLuuj VsiBjy1xDk3E4Elhyi4KKtYArpt7hGgza032cmORcLwUqzroo1ou/ktsciS08h/ngzK1Mj UhN/AwT9k42ALq8EG47sT1E6zBhVY2Z08MslyIw++RFJkRToQ5S7iSo+4DsFXrgBQhWAtK 8nI9fJlhVx1hmNOEM5SLlQgo3IDAinlCX6KLhYEh2G22UEmopL6tmbIHO0LpmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPPN84yZTzxwG; Wed, 24 Apr 2024 03:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O3J4hk038990; Wed, 24 Apr 2024 03:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O3J4tw038987; Wed, 24 Apr 2024 03:19:04 GMT (envelope-from git) Date: Wed, 24 Apr 2024 03:19:04 GMT Message-Id: <202404240319.43O3J4tw038987@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: feabaf8d5389 - main - Revert "swapon: Do not overwrite Linux swap header" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: feabaf8d5389d43b404aacfcd3298bfed94a41ab Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=feabaf8d5389d43b404aacfcd3298bfed94a41ab commit feabaf8d5389d43b404aacfcd3298bfed94a41ab Author: Warner Losh AuthorDate: 2024-04-24 03:18:00 +0000 Commit: Warner Losh CommitDate: 2024-04-24 03:18:56 +0000 Revert "swapon: Do not overwrite Linux swap header" This reverts commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e.This is broken on armv7, and closer scrutiny of the reviews shows I was in error when I thought it was ready. --- sbin/swapon/Makefile | 2 -- sbin/swapon/extern.h | 5 ---- sbin/swapon/swaplinux.c | 66 ------------------------------------------------- sbin/swapon/swapon.c | 54 +--------------------------------------- 4 files changed, 1 insertion(+), 126 deletions(-) diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 930e938e5b05..27808aed5857 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -6,8 +6,6 @@ LINKS= ${BINDIR}/swapon ${BINDIR}/swapoff LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 -SRCS= swapon.c swaplinux.c -HDRS+= extern.h LIBADD= util diff --git a/sbin/swapon/extern.h b/sbin/swapon/extern.h deleted file mode 100644 index cb33dbbee953..000000000000 --- a/sbin/swapon/extern.h +++ /dev/null @@ -1,5 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - */ - -int is_linux_swap(const char *); diff --git a/sbin/swapon/swaplinux.c b/sbin/swapon/swaplinux.c deleted file mode 100644 index d01a94345e68..000000000000 --- a/sbin/swapon/swaplinux.c +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include -#include -#include -#include - -#include "extern.h" - -/* - * Definitions and structure taken from - * https://github.com/util-linux/util-linux/blob/master/include/swapheader.h - */ - -#define SWAP_VERSION 1 -#define SWAP_UUID_LENGTH 16 -#define SWAP_LABEL_LENGTH 16 -#define SWAP_SIGNATURE "SWAPSPACE2" -#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1) - -struct swap_header_v1_2 { - char bootbits[1024]; /* Space for disklabel etc. */ - uint32_t version; - uint32_t last_page; - uint32_t nr_badpages; - unsigned char uuid[SWAP_UUID_LENGTH]; - char volume_name[SWAP_LABEL_LENGTH]; - uint32_t padding[117]; - uint32_t badpages[1]; -}; - -typedef union { - struct swap_header_v1_2 header; - struct { - uint8_t reserved[4096 - SWAP_SIGNATURE_SZ]; - char signature[SWAP_SIGNATURE_SZ]; - } tail; -} swhdr_t; - -#define sw_version header.version -#define sw_volume_name header.volume_name -#define sw_signature tail.signature - -int -is_linux_swap(const char *name) -{ - uint8_t buf[4096]; - swhdr_t *hdr = (swhdr_t *) buf; - int fd; - - fd = open(name, O_RDONLY); - if (fd == -1) - return (-1); - - if (read(fd, buf, 4096) != 4096) { - close(fd); - return (-1); - } - close(fd); - - return (hdr->sw_version == SWAP_VERSION && - !memcmp(hdr->sw_signature, SWAP_SIGNATURE, SWAP_SIGNATURE_SZ)); -} diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 0f2ad1f5e213..26a7dc22654a 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -54,15 +54,10 @@ #include #include -#include "extern.h" - -#define _PATH_GNOP "/sbin/gnop" - static void usage(void) __dead2; static const char *swap_on_off(const char *, int, char *); static const char *swap_on_off_gbde(const char *, int); static const char *swap_on_off_geli(const char *, char *, int); -static const char *swap_on_off_linux(const char *, int); static const char *swap_on_off_md(const char *, char *, int); static const char *swap_on_off_sfile(const char *, int); static void swaplist(int, int, int); @@ -255,13 +250,8 @@ swap_on_off(const char *name, int doingall, char *mntops) return (swap_on_off_geli(name, mntops, doingall)); } - free(basebuf); - - /* Linux swap */ - if (is_linux_swap(name)) - return (swap_on_off_linux(name, doingall)); - /* Swap on special file. */ + free(basebuf); return (swap_on_off_sfile(name, doingall)); } @@ -476,48 +466,6 @@ swap_on_off_geli(const char *name, char *mntops, int doingall) return (swap_on_off_sfile(name, doingall)); } -static const char * -swap_on_off_linux(const char *name, int doingall) -{ - const char *ret; - char *nopname; - size_t nopnamelen; - int error; - - if (which_prog == SWAPON) { - /* Skip the header for Linux swap partitions */ - error = run_cmd(NULL, "%s create -o 4096 %s", _PATH_GNOP, - name); - if (error) { - warnx("gnop (create) error: %s", name); - return (NULL); - } - } - - /* Append ".nop" to name */ - nopnamelen = strlen(name) + sizeof(".nop"); - nopname = (char *) malloc(nopnamelen); - if (nopname == NULL) - err(1, "malloc()"); - (void)strlcpy(nopname, name, nopnamelen); - (void)strlcat(nopname, ".nop", nopnamelen); - - ret = swap_on_off_sfile(nopname, doingall); - - if (which_prog == SWAPOFF) { - error = run_cmd(NULL, "%s destroy %s", _PATH_GNOP, nopname); - if (error) { - warnx("gnop (destroy) error: %s", name); - free(nopname); - return (NULL); - } - } - - free(nopname); - - return (ret); -} - static const char * swap_on_off_md(const char *name, char *mntops, int doingall) { From nobody Wed Apr 24 03:28:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPPbD6ggpz5JfDv for ; Wed, 24 Apr 2024 03:28:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) (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 4VPPbC3Ff0z4JhN for ; Wed, 24 Apr 2024 03:28:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-51ac9c6599bso6194166e87.1 for ; Tue, 23 Apr 2024 20:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1713929317; x=1714534117; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=tLBfZrUot7JTc6M8RhNNq09LLplwrMoPYmhHS2Ae3Wk=; b=kHCiqdDuMxOO9jcqB4WtWpz1NRtYnH8Ug09gVzYlq9zWixvF/TmUaWciZ4qAfTnDk6 w4lloY82hjdEWduFHtXBI/lv7R5M0bBAe52yxVjaH3PNnXcTZur7w25Nwzg58QTLB9Yq lkBovYckPboUbpD6ZqyQvOyZCvTF3xFaVcfZvGA4tQcxCo9UfMt+d4yWMLG4zDucTUs4 YZlwsSgyS+qJ3c93ZJXJ5Gjyl8b00KEhOouxoPCC9CqR2mqqYvmt8uMavjAxrMI43+wT fhkeh4LM3sxDxC58OR4OxY80KRqkQVPqjYgwEOYn+YrsjzMONKLGZR7BngMoiansaGad DP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713929317; x=1714534117; 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=tLBfZrUot7JTc6M8RhNNq09LLplwrMoPYmhHS2Ae3Wk=; b=lHtng01C4SFH8vUtVNXD8v9pjpaB3Hvw3Qn3gyLg1ty+kJxPGf+vK9MDqfHv+AYaNk YJATYREt5QXsx+qkhbGREKUrl4bKgSx0vBzf+0yGReGft1Bv0sicMIRg0dzbu26UfOeO K+tVfR59615l3TQxdCWLlDeGo142HCVUE0X4y3k49bZvPE74WWkXGbWI/0l5oMwo34FX FU8q95JdH9xJl31veGiTgvfTMEFdbP9DrjWnXQjiapu1klak/yaP6p65lcrkadX7z35R fj5+PgLQreTuXDbVH4XpfrPp8yRMst6Y3uhMHs+7bNEC6ArxzzqSUvAc/LD38S9fOW3K Q4Ig== X-Forwarded-Encrypted: i=1; AJvYcCWyjlEfIG+eV36sFr4LstFNpAHPCVHzqz45Zv6T9dZ4iGh4lYOLeFfHQKnqEOQYydFmtyX0p5G5riJQkKaOjfHdrI4B6Zg64SVKuis8GDJt X-Gm-Message-State: AOJu0YxVuiGUs7IfJHgW1sRB/OdEP2QjlxxmEyrt1fgxv6XYkvO3y+EM GSbah9n9WS9TtvOV16dYL+/KMYP0bTwOIRUx2871iYVwPDo84YcuPZGkVS9YbNMQaCiawkp7wMb epmqXXy8CUBuBD/rwVrausk6fLQeFsZeu75h2rQ== X-Google-Smtp-Source: AGHT+IGModitcFOwINgolXN6Y3e2CiOCZf1JUDY+wKRY4xjLeKcrkcPcyVaD1T3H55WgOrRLQAHNTD8tdcNMkOq3pn4= X-Received: by 2002:a05:6512:3d2a:b0:518:dc5b:6f4a with SMTP id d42-20020a0565123d2a00b00518dc5b6f4amr1191546lfv.45.1713929317020; Tue, 23 Apr 2024 20:28:37 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404232242.43NMgqxx082026@gitrepo.freebsd.org> <9C180198-A6B6-41D3-AB49-D9582D356ADE@freebsd.org> In-Reply-To: <9C180198-A6B6-41D3-AB49-D9582D356ADE@freebsd.org> From: Warner Losh Date: Tue, 23 Apr 2024 21:28:25 -0600 Message-ID: Subject: Re: git: 91bdebc958bb - main - bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors To: Jessica Clarke Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000001c939c0616cf44d6" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VPPbC3Ff0z4JhN --0000000000001c939c0616cf44d6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I've backed this out as well... I'd thought that the style stuff had been worked out... And I'll leave the pull request closed since our newer guidance would suggest this isn't enough of a win (I've been processing the older ones under the old guidance on this point, but now I'm questioning that)... The cleanups aren't that bad (moduo style), but they don't really move the needle enough and would only be acceptable in the context of other improvements (though even then it might be tough to justify). Warner On Tue, Apr 23, 2024 at 6:21=E2=80=AFPM Jessica Clarke = wrote: > On 23 Apr 2024, at 23:42, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D91bdebc958bb0da03f604bad19f99e3= b10e96ac7 > > > > commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7 > > Author: rilysh > > AuthorDate: 2024-04-23 22:40:19 +0000 > > Commit: Warner Losh > > CommitDate: 2024-04-23 22:42:38 +0000 > > > > bsdinstall/distfetch.c: check environment variables before > downloading and handle memory allocation errors > > > > 1. Currently, distfetch checks environment variables existence > > when it will use them or in a case (in chdir()) it doesn't check > > at all. As they are necessary to set before doing anything with > > it, check them, if they set or not, before proceeding any further. > > This also avoids extra cleaning when that environment variable > > isn't set. > > > > 2. Handle memory allocation error in malloc(PATH_MAX) and replace > > (sizeof const char *) with (sizeof char *). Both are similar and > > const doesn't have a size. > > Latter is fine I guess but they=E2=80=99re the same by definition, it=E2= =80=99s churn. > > > 3. Indent the error message a bit in chdir(). > > AKA violate style(9). > > > Signed-off-by: rilysh > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1071 > > --- > > usr.sbin/bsdinstall/distfetch/distfetch.c | 33 > +++++++++++++++++++++---------- > > 1 file changed, 23 insertions(+), 10 deletions(-) > > > > diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c > b/usr.sbin/bsdinstall/distfetch/distfetch.c > > index c431e187799d..094929d89ea1 100644 > > --- a/usr.sbin/bsdinstall/distfetch/distfetch.c > > +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c > > @@ -46,7 +46,7 @@ static int fetch_files(int nfiles, char **urls); > > int > > main(void) > > { > > - char *diststring; > > + char *diststring, *dists, *distdir, *distsite; > > char **urls; > > int i; > > int ndists =3D 0; > > @@ -54,17 +54,24 @@ main(void) > > char error[PATH_MAX + 512]; > > struct bsddialog_conf conf; > > > > - if (getenv("DISTRIBUTIONS") =3D=3D NULL) > > + if ((dists =3D getenv("DISTRIBUTIONS")) =3D=3D NULL) > > errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); > > > > - diststring =3D strdup(getenv("DISTRIBUTIONS")); > > + if ((distdir =3D getenv("BSDINSTALL_DISTDIR")) =3D=3D NULL) > > + errx(EXIT_FAILURE, "BSDINSTALL_DISTDIR variable is not set"); > > + > > + if ((distsite =3D getenv("BSDINSTALL_DISTSITE")) =3D=3D NULL) > > + errx(EXIT_FAILURE, "BSDINSTALL_DISTSITE variable is not set"); > > + > > + if ((diststring =3D strdup(dists)) =3D=3D NULL) > > + errx(EXIT_FAILURE, "Error: diststring variable out of memory!"); > > + > > for (i =3D 0; diststring[i] !=3D 0; i++) > > if (isspace(diststring[i]) && !isspace(diststring[i+1])) > > ndists++; > > ndists++; /* Last one */ > > > > - urls =3D calloc(ndists, sizeof(const char *)); > > - if (urls =3D=3D NULL) { > > + if ((urls =3D calloc(ndists, sizeof(char *))) =3D=3D NULL) { > > Moving into the if is pointless. > > > free(diststring); > > errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); > > } > > @@ -78,15 +85,21 @@ main(void) > > bsddialog_backtitle(&conf, OSNAME " Installer"); > > > > for (i =3D 0; i < ndists; i++) { > > - urls[i] =3D malloc(PATH_MAX); > > + if ((urls[i] =3D malloc(PATH_MAX)) =3D=3D NULL) { > > Moving into the if is pointless. > > > + free(urls); > > + free(diststring); > > Like I said in the review, reviewing urls and diststring but not the > elements of urls is a stupid halfway house, and it=E2=80=99s all a waste = of > time when you=E2=80=99re about to call errx. If one wants to be super ped= antic > and free memory prior to calling errx, fine, but do it in full, don=E2=80= =99t > do an arbitrary subset. > > > + bsddialog_end(); > > + errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!"); > > + } > > + > > snprintf(urls[i], PATH_MAX, "%s/%s", > > - getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t")); > > + distsite, strsep(&diststring, " \t")); > > Breaks style(9). > > > } > > > > - if (chdir(getenv("BSDINSTALL_DISTDIR")) !=3D 0) { > > + if (chdir(distdir) !=3D 0) { > > snprintf(error, sizeof(error), > > - "Could not change to directory %s: %s\n", > > - getenv("BSDINSTALL_DISTDIR"), strerror(errno)); > > + "Could not change to directory %s: %s\n", > > + distdir, strerror(errno)); > > Breaks style(9). > > Jess > > > conf.title =3D "Error"; > > bsddialog_msgbox(&conf, error, 0, 0); > > bsddialog_end(); > > --0000000000001c939c0616cf44d6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I've backed this out as well... I'd thought t= hat the style stuff had been worked out...

And I&#= 39;ll leave the pull request closed since our newer guidance would suggest = this isn't enough of a win (I've been processing the older ones und= er the old guidance on this point, but now I'm questioning that)... The= cleanups aren't that bad (moduo style), but they don't really move= the needle enough and would only be acceptable in the context of other imp= rovements (though even then it might be tough to justify).

Warner

On Tue, Apr 23, 2024 at 6:21=E2=80=AFPM Jessica Clarke &= lt;jrtc27@freebsd.org> wrote:<= br>
On 23 Apr 2024, = at 23:42, Warner Losh <imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D91bdebc958bb0da03f604bad19f99e3b10e96ac7<= /a>
>
> commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7
> Author:=C2=A0 =C2=A0 =C2=A0rilysh <nightquick@proton.me>
> AuthorDate: 2024-04-23 22:40:19 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-04-23 22:42:38 +0000
>
>=C2=A0 =C2=A0 bsdinstall/distfetch.c: check environment variables befor= e downloading and handle memory allocation errors
>
>=C2=A0 =C2=A0 1. Currently, distfetch checks environment variables exis= tence
>=C2=A0 =C2=A0 when it will use them or in a case (in chdir()) it doesn&= #39;t check
>=C2=A0 =C2=A0 at all. As they are necessary to set before doing anythin= g with
>=C2=A0 =C2=A0 it, check them, if they set or not, before proceeding any= further.
>=C2=A0 =C2=A0 This also avoids extra cleaning when that environment var= iable
>=C2=A0 =C2=A0 isn't set.
>
>=C2=A0 =C2=A0 2. Handle memory allocation error in malloc(PATH_MAX) and= replace
>=C2=A0 =C2=A0 (sizeof const char *) with (sizeof char *). Both are simi= lar and
>=C2=A0 =C2=A0 const doesn't have a size.

Latter is fine I guess but they=E2=80=99re the same by definition, it=E2=80= =99s churn.

>=C2=A0 =C2=A0 3. Indent the error message a bit in chdir().

AKA violate style(9).

>=C2=A0 =C2=A0 Signed-off-by: rilysh <nightquick@proton.me>
>=C2=A0 =C2=A0 Reviewed by: imp
>=C2=A0 =C2=A0 Pull Request: https://github.com/f= reebsd/freebsd-src/pull/1071
> ---
> usr.sbin/bsdinstall/distfetch/distfetch.c | 33 +++++++++++++++++++++--= --------
> 1 file changed, 23 insertions(+), 10 deletions(-)
>
> diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdi= nstall/distfetch/distfetch.c
> index c431e187799d..094929d89ea1 100644
> --- a/usr.sbin/bsdinstall/distfetch/distfetch.c
> +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
> @@ -46,7 +46,7 @@ static int fetch_files(int nfiles, char **urls);
> int
> main(void)
> {
> - char *diststring;
> + char *diststring, *dists, *distdir, *distsite;
> char **urls;
> int i;
> int ndists =3D 0;
> @@ -54,17 +54,24 @@ main(void)
> char error[PATH_MAX + 512];
> struct bsddialog_conf conf;
>
> - if (getenv("DISTRIBUTIONS") =3D=3D NULL)
> + if ((dists =3D getenv("DISTRIBUTIONS")) =3D=3D NULL)
> errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set");
>
> - diststring =3D strdup(getenv("DISTRIBUTIONS"));
> + if ((distdir =3D getenv("BSDINSTALL_DISTDIR")) =3D=3D NULL= )
> + errx(EXIT_FAILURE, "BSDINSTALL_DISTDIR variable is not set"= ;);
> +
> + if ((distsite =3D getenv("BSDINSTALL_DISTSITE")) =3D=3D NU= LL)
> + errx(EXIT_FAILURE, "BSDINSTALL_DISTSITE variable is not set&quo= t;);
> +
> + if ((diststring =3D strdup(dists)) =3D=3D NULL)
> + errx(EXIT_FAILURE, "Error: diststring variable out of memory!&q= uot;);
> +
> for (i =3D 0; diststring[i] !=3D 0; i++)
> if (isspace(diststring[i]) && !isspace(diststring[i+1]))
> ndists++;
> ndists++; /* Last one */
>
> - urls =3D calloc(ndists, sizeof(const char *));
> - if (urls =3D=3D NULL) {
> + if ((urls =3D calloc(ndists, sizeof(char *))) =3D=3D NULL) {

Moving into the if is pointless.

> free(diststring);
> errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!");<= br> > }
> @@ -78,15 +85,21 @@ main(void)
> bsddialog_backtitle(&conf, OSNAME " Installer");
>
> for (i =3D 0; i < ndists; i++) {
> - urls[i] =3D malloc(PATH_MAX);
> + if ((urls[i] =3D malloc(PATH_MAX)) =3D=3D NULL) {

Moving into the if is pointless.

> + free(urls);
> + free(diststring);

Like I said in the review, reviewing urls and diststring but not the
elements of urls is a stupid halfway house, and it=E2=80=99s all a waste of=
time when you=E2=80=99re about to call errx. If one wants to be super pedan= tic
and free memory prior to calling errx, fine, but do it in full, don=E2=80= =99t
do an arbitrary subset.

> + bsddialog_end();
> + errx(EXIT_FAILURE, "Error: distfetch URLs out of memory!")= ;
> + }
> +
> snprintf(urls[i], PATH_MAX, "%s/%s",
> -=C2=A0 =C2=A0 getenv("BSDINSTALL_DISTSITE"), strsep(&di= ststring, " \t"));
> + distsite, strsep(&diststring, " \t"));

Breaks style(9).

> }
>
> - if (chdir(getenv("BSDINSTALL_DISTDIR")) !=3D 0) {
> + if (chdir(distdir) !=3D 0) {
> snprintf(error, sizeof(error),
> -=C2=A0 =C2=A0 "Could not change to directory %s: %s\n",
> -=C2=A0 =C2=A0 getenv("BSDINSTALL_DISTDIR"), strerror(errno)= );
> + "Could not change to directory %s: %s\n",
> + distdir, strerror(errno));

Breaks style(9).

Jess

> conf.title =3D "Error";
> bsddialog_msgbox(&conf, error, 0, 0);
> bsddialog_end();

--0000000000001c939c0616cf44d6-- From nobody Wed Apr 24 05:06:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPRlt6t2jz5JnJJ; Wed, 24 Apr 2024 05:06: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 4VPRlt424zz4TMJ; Wed, 24 Apr 2024 05:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=BASIke1HnXgcQZaAJDrdN9IcMevDvHUUxRHcTCCnF1b3OvZi0c4J5tK3/o98livpwMrkPo mWfXr43kVqR0p1Zav/+0iKDiONOPFySQOJe701eDU6qQByuyoEAQCgtfsIbip/D5YYiper 6FdsUhVBG6kRhqFx+Kx0ySq7uAPNcXJNf8gRxRTUeUdtVsIU4TGCqSFTxvGY8BUR/hlbVI d4YfrP1LGUOmtxaGeZl+A2SIxdrM+NHK6YVmDWua5P0q09BAKD9KD+zs3ULn5voUmris8r 7/7JBNRKJ3svL+2MRJ6A3GwY5+9om46heeWQqRIIaPb6gC7ihJByAAXwSq4L0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935178; a=rsa-sha256; cv=none; b=ute4sAhgUf1w5pZ948uhWXX8gZsmR0DD5NUSE7PEPRCazgToWOXgX49u+0n7OkfetOHtIS yGWoqpQOcWMawLtxzQmiJZW8xKcQCEzjnx3Uv9LZFx+Fdj+Z7mrTJgXCCxHT+a1hEQuhzc A0XH7gtP1IzeTVreoi9ffeeZwlBtEqb1I+raIv+PXSuUG03gz8RAMcZpjMzV8ZsEZgXCvh +o1WYfmasa1RfEcVRlNfOwswSTbtKutqQyZaJblgdsIPFv1xq9e/sCJis4CEHTLG7hErCg syzRvcKhXTkGOJK6kDcdGz3tNLJ6Trc6S+yrMQdkW5bNnMQ1XN0yyq/6pV0kiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=ai4iRZjQiEWPDFJ85EAcdXHsO8k6Nt6PGFwX/ZuzyYpywO2T7FvDLDGDBQW+Gq2nXhYmW7 Wb2BYmgbz7+XAdYW70sQ4yuK1xY313ktlKTqrdssxo9fs1DHzVgtCjz0kTJB9W4P1VEnt2 PMyfp0jvNf5/m0UblUuCSH2CI+kE8wR51jgbZXCovsDSr2nhvJHhvyBDEalhADvsNMLz5d BEk4yotJGU1JTm1hgfuLh4qtMKXxGK5meFJ/uLj4lzMxQ+mjU3862jl0ZJ/Damz4aD1DdD CcLL8iQsQnAWrjY8Gm5NbB8y1f5T+upV5N/izm6DsxKTaCmBZH4V5LNbvpFCvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlt3f62z121f; Wed, 24 Apr 2024 05:06: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 43O56Itb023967; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56IWx023964; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:18 GMT Message-Id: <202404240506.43O56IWx023964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1b0e8598970d - stable/13 - release/Makefile.vm: Support read-only ports tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0e8598970dd98eb9248d4f29bb8738abb11eb4 commit 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Author: Colin Percival AuthorDate: 2024-04-11 16:24:59 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:02:02 +0000 release/Makefile.vm: Support read-only ports tree Build qemu (if needed) with WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles so that we can have a read-only /usr/ports and don't contaminate it. This became an issue when I enabled parallel release building, since one image might be creating its ports.txz file at the same time as we're building qemu as a prerequisite for building another image. MFC after: 5 days (cherry picked from commit 6f454c211b295ad13e80fc5b858efc9bad33e33b) --- release/Makefile.vm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 27053208c689..2e5bdb9a7004 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -55,7 +55,10 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) - env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean + env - UNAME_r=${UNAME_r} PATH=$$PATH \ + make -C ${PORTSDIR}/emulators/qemu-user-static \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y From nobody Wed Apr 24 05:06:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPRlw3L5rz5Jnjm; Wed, 24 Apr 2024 05:06: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 4VPRlv6fmtz4TK4; Wed, 24 Apr 2024 05:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=Xl//2q81NXg7mdDQ9Ng2s3RD7vp5KSP1duSP5jFJ68FxetFSTYadepTK7RTB/SwOYho1HH jThrkaahVbw4HnI/E1t+7glM/DyLoMY9VtLLkOwNdhq2b+o2wbBx6q5H478pU1ZpO8IWYe 0fBF8BfabztJRSgivAaEF9TQjEV/8eKtkYDwWvfuDTfgM9S8JlmV0TwlFIpe27C/FHjcFj 0W1rSdMoYA/YbcS90mbZX5pheW5jLeP1XXdTOYQgCIMMKBFeoMDC0FidfCLu3KS9J9d84E TwXhsjyjhfD3wyOOOpHfbIYArn8GenWFS6Easc64y2UwCXvHhoQ3o75E2QG7ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935179; a=rsa-sha256; cv=none; b=Tt825Tx2nlAU5eF41mLYPFzW4oSRdvosBZmd1Uut2pQBqF/sTUTiyO5TSugeyWoxEKS167 xvnJrlhVpp4fLY9Njz1Dsqkp3TxM0eSkmBjqW444Ryet2bIZjcYpJ5M07afwVX9qyNP3qJ ksRnhQKhFyEcaeC65DvC9DJsPqzhG4KHAJ3Ew1PPAJt+iib1MSgj5H8lBgS6iAZMXGhAYt mKRgLPX/ppU85WmtoozKRAiA1OXJal8lm75TTZC1638TeGzkNdBDNH6XLbRdo2y1mL/WJP kUY25gzx/Fde+Na0tT2HubUtTo5YRAntFwS1hZtgxsfeQCaK0VJiVBN3TlvP1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=LEdUk3edqQOzl/WG+TmnaTDTUZIdau8/RnVhiOy9DKOxgv1O6IRrfZU0OL62pPMoe73Gan /yUNo7vA20WWKbMPzgeO3b6bcYohf3oAbDF2mmMoA9DdCY27Y7NZyBJJLf/Uwyb1zX/J+m biZ5F9FbOt8RJxnN709Pb4JevF+QvogSWfcks3Ifpbc1+KGzOCIJn1q0Po/I9T6cgiGzuG elY/FRZBp1p+QOQtU3gwR80pVfUX33triMlQmSC24+YdxBVzva74Ou2Gvq45TnH5NGZ9CM 1Zrr+zW4hxNOz8KmNmiP85mSUU2giuvcRwBtBpT5xMON2sxci3/7f6HNTyTfxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlv4dLXz11ry; Wed, 24 Apr 2024 05:06: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 43O56JLv024012; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56J2G024010; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:19 GMT Message-Id: <202404240506.43O56J2G024010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6b8ca8c4e406 - stable/13 - release: Support r/o /usr/ports for cloudware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e commit 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Author: Colin Percival AuthorDate: 2024-04-12 17:20:25 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:06 +0000 release: Support r/o /usr/ports for cloudware Set WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles when building tools needed for uploading cloudware images. While I'm here, adjust the bsdec2-image-upload build target to match the style used by the Azure/GCE/Vagrant Makefiles. MFC after: 3 days (cherry picked from commit 6c87aed39c3053cd338c1ec18fba5b1d773beca9) --- release/Makefile.azure | 4 +++- release/Makefile.ec2 | 16 ++++++++++------ release/Makefile.gce | 8 ++++++-- release/Makefile.vagrant | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 19d571de9f44..0f63acb0046b 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -38,7 +38,9 @@ azure-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y www/npm . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif . endif npm install -g azure-cli diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 51d32ecd97a6..20a5ae23ac3b 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -43,13 +43,17 @@ CW_EC2_PORTINSTALL= .endif cw-ec2-portinstall: -.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) - env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean -.else -. if !exists(/usr/local/sbin/pkg-static) - env ASSUME_ALWAYS_YES=yes pkg bootstrap -y -. endif +.if !exists(/usr/local/bin/bsdec2-image-upload) +. if !exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload +. else + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/bsdec2-image-upload \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean +. endif .endif @touch ${.TARGET} diff --git a/release/Makefile.gce b/release/Makefile.gce index ea5daf290e3c..c6c19961b673 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -48,8 +48,12 @@ gce-check-depends: env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \ lang/python . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 5fd2c31e9f49..cc72f7456740 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -57,7 +57,9 @@ vagrant-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y curl . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif From nobody Wed Apr 24 05:06:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPRlx3S6hz5JnJb; Wed, 24 Apr 2024 05:06: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 4VPRlw6bWyz4Swx; Wed, 24 Apr 2024 05:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=s16bDNqoYXILC6yJ9SowF3N5/lHiZIoZ0Ui/YWXQnZJ56D9F1nyinDhvhfJXfFfyBFMtvh cKam22TV7eBy0afvqAXzhbUEYuXC7S69uBocsJS7DTc+ZsDBukviloKG0H0ZoKsCF0Rexu M77HkYSh5o53OgTX6seyc1IlV5UQoZTqaX4T7fIFWt9bOX8S0fnip6z/JJMQx6nqvucARa MZGyviMGi+pQUoKfVRRzYj2Gc1OoS2lynHXMRU0HRx3c147U0SAXU43QnRE/E8tZ9baunU Zqho1bubYks6XU1e/99eGOo4OnPLUMKkcWEGbhsNVcwv2aBZ6Ovkg5KmE6nG3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935180; a=rsa-sha256; cv=none; b=cyLSubq8rURtyzKL6iqham0oOjBcOZ+bZCysVaktX4GgH+heNJtIedWKoplqMAhlM1EGcY fE/5B3q5gTC5nm1mwTtIbkrDm40QLG/5+VrpJo4ON7Hhfgf6Ion5YwZ3HVTnNc4XMHiQYU ora7ErV/Jy6ArAXI3HmqXYQsg8CVwCADXuISDdjzJ5o9rwtgAPdxtMqF3fPhy0uqfBPBJC f6iXG2iMiOwedY1hDU6h5Mru7K56hoiMmmuKaqPvJ78aCqgrgy8vhYK/yBHDs0VI+Ueq2l Kic6L/Toyy9VvQSuYiKnsI7gCnUu9pVaPc//HH7YIDNhnX3EHmU2/LMMhSEMFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=nKccSrgt88Zz3aImcHgk2mimFBM8WF5PCmfdulbDR14uzo+fA/i8oeqpXp6cXvX0+ys2gP 5dwW7/CON5rsDLYczB21Ab3CMlXHhXL0qCJlDv8UA1SXsNQlPQopDa/eujHAZM6a0l+MgG HhBTjX0aEDrj1qSNxGoks/n8sQjrGO/jLLNsFkZkiVhEyEpGWtl0cCyp/Eh2gNHcPvSmpu U1Clj0ZT7fqCr5yUVK7D00fRrG7UCeYlutqF4nCNiDwtvNHPhW9/Wdw/sFSTWpC1QUppqV DsVvifKMnP5W/F0OY5y5HGxA0RYph8BFV59hqi5DwqS7f57XP2W60uwz7NZFiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlw5hC3z11s0; Wed, 24 Apr 2024 05:06: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 43O56K1t024073; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56K19024070; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:20 GMT Message-Id: <202404240506.43O56K19024070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 835b1bd4045a - stable/13 - release: Use the ABI of the target release to fetch 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 835b1bd4045a7ef56f58868fc150d099b2ce135b Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=835b1bd4045a7ef56f58868fc150d099b2ce135b commit 835b1bd4045a7ef56f58868fc150d099b2ce135b Author: John Baldwin AuthorDate: 2024-04-13 21:16:01 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:44 +0000 release: Use the ABI of the target release to fetch packages - Point --rootdir at the installed destdir in the dvd tree. This causes pkg to determine the ABI from the installed destdir instead of the host's binaries. Previously the result was that packages for the host's ABI were always downloaded breaking cross-releases (e.g. arm64 releases built on an amd64 host included amd64 packages on the DVD ISO image rather than arm64 packages). This also handles version mismatches, and I tested this by cross-building a 15.x arm64 release on a 14.x amd64 host. - As a result, pkg now does a chdir(3) to the rootdir before running, so the -o argument to fetch needs to be updated to be relative to rootdir instead of the CWD as make runs. - Add a new ROOTDIR variable to limit references to "dvd" to one place. Ideally ROOTDIR would be an argument to this script so that it didn't really know about the dvd layout at all. - While here, simplify creation of symlinks by just using a longer path to the link name instead of using 'cd' in the shell before invoking ln(1). Also use ln -sf to create the pkg.pkg symlink rather than rm + ln. PR: 278273 Reported by: gatekeeper Reviewed by: imp, delphij MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44749 (cherry picked from commit ea2663040d524efd84b12edcbe83884437fdceea) --- release/scripts/pkg-stage.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index b96ce2947bb1..b51bdd4a2117 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -8,7 +8,8 @@ export ASSUME_ALWAYS_YES="YES" export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" -export PKGCMD="/usr/sbin/pkg -d" +export ROOTDIR="$PWD/dvd" +export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip @@ -46,14 +47,13 @@ if [ ! -x /usr/local/sbin/pkg ]; then /usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean fi -export DVD_DIR="dvd/packages" -export PKG_ABI=$(pkg config ABI) -export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null) -export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}" +export PKG_ABI=$(pkg --rootdir ${ROOTDIR} config ABI) +export PKG_ALTABI=$(pkg --rootdir ${ROOTDIR} config ALTABI 2>/dev/null) +export PKG_REPODIR="packages/${PKG_ABI}" -/bin/mkdir -p ${PKG_REPODIR} +/bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR} if [ ! -z "${PKG_ALTABI}" ]; then - (cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI}) + ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} fi # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the @@ -82,11 +82,10 @@ ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} # Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works # using the on-disc packages. -mkdir -p ${PKG_REPODIR}/Latest -(cd ${PKG_REPODIR}/Latest && \ - ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg pkg.pkg) -(cd ${PKG_REPODIR}/Latest && \ - rm -f pkg.txz && ln -s pkg.pkg pkg.txz) +export LATEST_DIR="${ROOTDIR}/${PKG_REPODIR}/Latest" +mkdir -p ${LATEST_DIR} +ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg +ln -sf pkg.pkg ${LATEST_DIR}/pkg.txz ${PKGCMD} repo ${PKG_REPODIR} From nobody Wed Apr 24 05:27:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPSDq29G6z5Jq64 for ; Wed, 24 Apr 2024 05:27: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 4VPSDq1h60z4WcN; Wed, 24 Apr 2024 05:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713936475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4bBZMlwvHlOf14szBibP/LB8E6GoyaM53N7eHQQnPBI=; b=Rf0/evq0yez0bIRj/Zl7FYT5M14rh4EIueJgfx0AYZlhpzruTLSsn2w2ARmpUBgWrIYBon iFs04TfrfGpsLKDgyqIYMMg66+vDf3fw/hb/JezvHl1+faqxo2fFEkOi1EDmhclSOLxxV4 VKE1JTUzJvTt9LlrTu0xiDWIGstPfj9tzMaG/wdyyduzxAWjXodpljn15vcMOWhiAxZXQU DEJV0HrKYxZ0sjvlxn5/ydJr4b+TtsJJZrHuZb0P8F09EobOh9Z7KPcfRYnS+Fzhhzmj4T OOnJkMeN4ThOZ4MkblBT6IXcucu0eldw62aPy0AVqZgzNTOwTbu+cBrJ3VfWlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713936475; a=rsa-sha256; cv=none; b=WStPNH/Pul7hafArDc8QPeLVSQxb0LUi9larO6nkIX5onpfXFxIEr+6mQVkBKtMbedavtx fCIVDY3+ig3qA6uigZ8+W87+dOtZcbH/8wbUkDDr9749SSOh/t/cGhz/Pf+VQSmgEMQPEP j8wLlPMJ+Ms9Rb0VwsKXLgL1P7sLyl1sFCzUITATMj6daLETV0qymAB16ufAYcP0WmUrds zg1SV2D3YFs4G8dcykZLV8581xVnualW3x+9lpaLDYqCV69ZY05ACxdRuWZe5hoSVvFQdT U0oXkH2SqhISvOUMuOurN5GiWJRMt/v1KBZQNfwOfLaFP146j62GyxyaqKjhvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713936475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4bBZMlwvHlOf14szBibP/LB8E6GoyaM53N7eHQQnPBI=; b=jiJsae+comzZoAr27fQRQjwiCY7+P20CCAi3MB+gDSDOsAHtHTpHaGRA7xoO2C/W9CdVfb 5pvpUjZAZcpV7C+uBblNh+wnT51eK5rQCsIwvt70h1A9q53JIpDMJjO40xKi44NLqVKd93 wu3H9J7b7P/VTVeeoBoyqCaKxR1wDa6r/+Z25T7Fjv2u32RB+qgJC7oLENGmMpauN/HNc2 6zxDrE6yDqFeP5ioJqfWJVmqrqIUYLbD4tAZZmuRzJHQk1HrvWYAi14/5pm30rjMtoqKGm VCpcdT8zcOyMoEogFxDw5DTpXvfeVGV2eIKImWaTHgKqb42fbYTUy0Mw40uUNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPSDq0zVvz12bW; Wed, 24 Apr 2024 05:27: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 43O5Rt0j058467; Wed, 24 Apr 2024 05:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5RtwP058466; Wed, 24 Apr 2024 05:27:55 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:27:55 GMT Message-Id: <202404240527.43O5RtwP058466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 448d114b2515..e8ec4b5d1202 - vendor/less - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/less X-Git-Reftype: branch X-Git-Commit: e8ec4b5d1202d935bcc6ed75c361b618e8da627f X-Git-Oldrev: 448d114b25157a4bcc2463e584fae6bdae42fa37 X-Git-Newrev: e8ec4b5d1202d935bcc6ed75c361b618e8da627f Auto-Submitted: auto-generated The branch vendor/less has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=448d114b2515..e8ec4b5d1202 e8ec4b5d1202 less: Do not trust st_size if it equals zero From nobody Wed Apr 24 05:33:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPSMg4qyYz5JqPg; Wed, 24 Apr 2024 05:33: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 4VPSMg4KNfz4XXQ; Wed, 24 Apr 2024 05:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713936831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EI40gCwItkAy8zqUwXvah1h5ls23p93iUKhmgMzOn6w=; b=e0ec9zURJXGosdFyBV4grJ/OvjUN6FaiJhcUbIPqVb62ajueesa9oI9h1kgDygGhUdMlFI sIAbvYyeRXj4/l4v7F7AdVCIgUsOpRagSfbJIlxXJPUgU5FkyFM4Do8Yi0GYm9tcwkp/Ba yowAjgaXDUB3KmxRbURrSq2xy0s1ZQ5hnQz2RsNW5lgTOPLsXW7cYr32J7chAT2ENleyld yhQBZqN9Xc5a3U/rtVlELQ1BpI9kNz8zLEwLu2holu8VKbNEAPGmibXj0UNQ6Xz2KiJWEL RsrfKsXJvaISxw7eTuJ5ijGUyeJpCEp5iXmF9Bsyhi/h87kxLqros7AYGm7iSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713936831; a=rsa-sha256; cv=none; b=f8oIBMoRmkRey+eKE+APRP7L+4Ly90d8hIEz1sFHEToWxU8hBuNYOkyPvgHItRo5ducBry cToVOmFGsZV2Abpmq31Z0BQ/2GiLAwTJvWU9lqUS1U1peomXR8e4YYHTh2j05cb8ow6DY9 N7qsfSz+gE83dff9FK5MBjU6h1HGVL97EHwcf9mS6pxKgNFIiOUu1k6CbVFgMV/4v3/kYF 336uCNA0wVYs0s8cFmKiZuhYZ22Ckv41r40o3nLhFAi6bxRns3qJ85Xn7LqpjEuDohVEEZ vuV9Xfw+7aeQZ/kCUFzkhP8dkxtvfByEuwtW+mrsCPjma+PQ+/xMW1zZSKSh8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713936831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EI40gCwItkAy8zqUwXvah1h5ls23p93iUKhmgMzOn6w=; b=uIkzuOAtCSYH07Q2muK64731r2SZL8WIRcxSPlQU3XW6AZ7EpeQjDNgFhIAcr2OT2Hu9pX Woa78dj13xAHX2iITEspcOOPtEMB3+AYfc3X6dtgo/WOSrm5P75Kv5E61gprgGZzUb3zgS TakFSTrYKJz0Ruq3Qi++SZXVqeqZO/H0qrwNi0hnCD+Wa2UQdEP0I5+Qr2cDGOsD8EPQ62 QO2FIDA9j2TTmfczPiYLJWabvPi3rOnhzzZeeeP00JCBMFLX5DNgTdfsg2dvkJUymw4hZl M9401QOMxgnXN4JjCZBEOX1KrB7QGuClmGjlw0qpOV9ppT8PFNvepu22erYhbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPSMg3sGCz13D6; Wed, 24 Apr 2024 05:33: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 43O5XpGP074346; Wed, 24 Apr 2024 05:33:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5Xpox074343; Wed, 24 Apr 2024 05:33:51 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:33:51 GMT Message-Id: <202404240533.43O5Xpox074343@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: cae336280b0d - main - MFV: less: Do not trust st_size if it equals zero List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cae336280b0d7ad3d49788c5fc0986f91328eb50 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=cae336280b0d7ad3d49788c5fc0986f91328eb50 commit cae336280b0d7ad3d49788c5fc0986f91328eb50 Merge: feabaf8d5389 e8ec4b5d1202 Author: Ricardo Branco AuthorDate: 2024-04-24 05:29:46 +0000 Commit: Xin LI CommitDate: 2024-04-24 05:33:26 +0000 MFV: less: Do not trust st_size if it equals zero This is a smaller version of upstream 1fafd968b48e5cea6c85f126d77071a8de707a55 to address the issue that less not being able to operate on files residing in pseudo-filesystems that advertize a zero size value. PR: bin/276133 MFC after: 3 days contrib/less/ch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) From nobody Wed Apr 24 05:55:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPSr62qxQz5Js75; Wed, 24 Apr 2024 05:55: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 4VPSr62LBmz4bTn; Wed, 24 Apr 2024 05:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6phvVLuvFmcENJ3P8V1+T5OMFa6d9HnhnsxepZAwtJI=; b=l/ksok6y4NzjnH6OwPejUY17rOmf/XUBeASqtnHYcqUpIIRz3SkyLk/ihOU+RZd5MGd1Nr okvLNTzGzSrEGj7GJ1lT0uSvE5Ds9EMyihQqraSK+uQ26w0d/IkB0JDlw3I9lepVzu+6vX cXPKB4KGimzn+9UDo3wyZYEN8CwBoKZRKVXN9N6dH243Gx/GzZw5KDNuCW3dkSTiYsy2DB Ag0EC4kCKhvdwNQ8qG8cMQ2Ur0y1hLdnzzWqfYwELBBXvZSGte9KOGKMrP1i1KlECFAt4n Og08+AvnU7IZ304lDg8uSghbPoeXFfqqjtGoC+5fdhoJ7DPQobJ17v0/fzVuug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713938102; a=rsa-sha256; cv=none; b=fNIW355RiavAeyHhc0tknxC/XfIX72phaSw6Db2fXuLqGjcz0KlPrrnMM/2CWD0uf6+nIQ DjzxJxjE7BcWvR+1zZvl5ZDXzw+tIV4ic9wvxhcr9uE9l4JBOI/8N4CUwi4ooQJ6Pak811 fTgeqlQ1IQOQ1peUrI2uOpa5MURHPjliejfjZ8T0/HJm/K4N9qkYJA9zMY/EQ3VQwFQKv8 71Q42h1RWRXQFdVKMAxxv6fbtFswJ2TQ76LGPN2ZqoDzSO7gC+oM6tnax91ppydCqCsKNY 1VMho5ctCewQdICIUAsVnqR1Bsa/Yuw60Bssd39hUkhgUNC27l9AG4z7fyoJ1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6phvVLuvFmcENJ3P8V1+T5OMFa6d9HnhnsxepZAwtJI=; b=dawadovZZxRRGboNjfbnDqvvqaARLAZegYEQLKq/EGBpwCqt2w6NsjKOr2P3FB3d59uCAU mZSGGij1RODrFn2MKBJo8nRNTlBoXJdL/VMvo9xnNoO+6XHX6aHACyIkuq6FPLXIEjIP8e xs4unMx3wMm6P0jkM+siWibUB9SgGqc6hksCaCkYfyalQAB1vQzoZ9Fj63insWTjbiVfHh AbSVOKAS51BqKbvBtl27+sxi01wUHEc20jC4mpQqXKtgIkEpQZsJFLuktddsiFWMQ93GD1 cxD90PmZ3nRnQtfTy9H/JlkqBMoL8q6umQh1e8xdMM9cUkGkF58W46PVVL/SJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPSr61sKtz13Fd; Wed, 24 Apr 2024 05:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O5t2L8008644; Wed, 24 Apr 2024 05:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5t2BC008641; Wed, 24 Apr 2024 05:55:02 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:55:02 GMT Message-Id: <202404240555.43O5t2BC008641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 9e248b7f645c - main - kdc: Add restart 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e248b7f645cdf05615a49cc15295df49b54d659 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9e248b7f645cdf05615a49cc15295df49b54d659 commit 9e248b7f645cdf05615a49cc15295df49b54d659 Author: Cy Schubert AuthorDate: 2024-04-18 18:56:54 +0000 Commit: Cy Schubert CommitDate: 2024-04-24 05:50:38 +0000 kdc: Add restart option Add a new kdc_restart rc variable that manages kdc (or krb5kdc) under daemon(8). This automatically restarts the kdc should it fail, i.e. when it's configured to use LDAP as a backend and cannot connect to its LDAP directory. Set kdc_restart="YES" to auto restart kdc on abnormal termination. Set kdc_restart_delay="N" to the number of seconds to delay before restarting the kdc. The daemon(8) default seconds applies when not set. Reported by: Lexi Winter PR: 278395 Differential Revision: https://reviews.freebsd.org/D44898 --- libexec/rc/rc.conf | 2 ++ libexec/rc/rc.d/kdc | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 6a8b6e257b17..c91f13bd9812 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -330,6 +330,8 @@ resolv_enable="YES" # Enable resolv / resolvconf kdc_enable="NO" # Run a kerberos 5 KDC (or NO). kdc_program="/usr/libexec/kdc" # path to kerberos 5 KDC kdc_flags="" # Additional flags to the kerberos 5 KDC +kdc_restart="NO" # Auto restart kdc on abnormal termination +kdc_restart_delay="" # Auto restart delay seconds kadmind_enable="NO" # Run kadmind (or NO) kadmind_program="/usr/libexec/kadmind" # path to kadmind kpasswdd_enable="NO" # Run kpasswdd (or NO) diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index c3059f261e09..a2d9f87f8e20 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -12,15 +12,40 @@ name=kdc desc="Kerberos 5 server" rcvar=${name}_enable +: ${kdc_restart:="NO"} +: ${kdc_restart_delay:=""} set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags - load_rc_config $name if [ "${kdc_program}" = /usr/libexec/kdc -o \ "${kdc_program}" = /usr/local/libexec/kdc ]; then - command_args="$command_args --detach" + detach="--detach" + flavor=heimdal +else + flavor=mit + unset detach fi + +case ${kdc_restart} in +[Yy][Ee][Ss]) + if [ "$flavor" = mit ]; then + detach=-n + else + unset detach + fi + case ${kdc_restart_delay} in + "") unset daemon_restart_delay;; + *) daemon_restart_delay="-R ${kdc_restart_delay}";; + esac + command_args="-r ${daemon_restart_delay} ${kdc_program} ${detach} ${command_args}" + kdc_program=/usr/sbin/daemon + ;; +*) + command_args="${detach} ${command_args}" + ;; +esac + run_rc_command "$1" From nobody Wed Apr 24 05:55:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPSr73vdGz5Js3p; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPSr73Fc6z4bjM; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgP0gX2MQ8ADTYCbkzBih3co4JNuGD7VQFDobPzEYag=; b=yOldZ3VLwa9AljJ8xrrCMzfia5lw0ESzxzmCSWIOIFDN53drtNVNqjonjm2dSPe8BPLG9C w6ld09h6FUtohQprLibRVQjZXVCaZVQUkYhWVe132Khgm3HY3Sn8o/Oxv8aZSgwP3aEmtC IovtxR/GRAE2Pm/E0FapyK9QKA0Dli0Zjw0GbDHEtqrRSpUUkrHP9r3RNbp0KNI5suYxHN JGIF1F3Gk/lmMSVWgoHfo4wjxA62QbnWpHVYFO13nP28xkA8oQh7/v8ouWqWm9ekI3T8KO KqvqatRhr5K/kpNI5tDSBQV/1rZOf2P0MswONtC2G3BMZHAohBvQoY+te5TQhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713938103; a=rsa-sha256; cv=none; b=fSTMjZUKMJiZRyi8Ghtf5gEqRq4Ea9Tv5oLh96tpm2GIu1Aib+LksMWUgnmhLx0o1E85ql QEhOg5AksquW/HgxR8IMVwAMi24vsFyB0I2ER7h1Qdno/06Sm7p1d9xhEpP1ZzhkHwBEkK EvLo87wQAuhRxpsXQrEqjl8gVU4ZNSZRffbAQd8wvlp/fwt8midWOgJ2V6kgPQUtuhT03F 9mA04RlslJJdx28QtUfXDhgKkfpetvIxPMq8Xibx34cgE2BmF1gOlEJliEYALJMMXcrNUI J2wdx+kDSz4CuNOHEgD342cXQTDFEsruaYYJMbGpMn1WXe8A454w2kGrStDVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgP0gX2MQ8ADTYCbkzBih3co4JNuGD7VQFDobPzEYag=; b=h7z0SWTV4YnoBtaOSXdUIAD3DZYEiAoXXSiQ7E7eMU/0L6T9BHNMF319q61plCvclGxZFo 9GbWAr1H3Zp+cFPNc7tUeVbmP2oJXJQOEwsUmomhy5XqH6TP4jQEv3aszQOFHpJR9639Ux j9izWbd3zGXDbk3ycsLamtDpNE94ttYTuQKRQhAJ6H1HkdeKdSFj6HB4WrnnK24FkopwNu UtL9QVP0Y1UWk71jwszrEmDVOzraTH1SMCfg/WSFK/RvrE3CCvkRpyahYUElFbdzdG3F5E SX0OiLgfc8s+P1br8lzUxpdwc6ArlSSOCiWwsHh1MSTwUVBbIwRZWom/qdVyYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPSr72s1nz13CH; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O5t35h008698; Wed, 24 Apr 2024 05:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5t3Of008695; Wed, 24 Apr 2024 05:55:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:55:03 GMT Message-Id: <202404240555.43O5t3Of008695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: a0d7d68a2dd8 - main - heimdal: Fix compiling hdb ldap as a module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 commit a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 Author: Cy Schubert AuthorDate: 2014-01-10 19:18:06 +0000 Commit: Cy Schubert CommitDate: 2024-04-24 05:54:20 +0000 heimdal: Fix compiling hdb ldap as a module Fix build when WITH_OPENLDAP defined. PR: 278430 Obtained from: Upstream c1c7da7f79 --- crypto/heimdal/lib/hdb/hdb-ldap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/heimdal/lib/hdb/hdb-ldap.c b/crypto/heimdal/lib/hdb/hdb-ldap.c index 1b4024aa540a..d58ffe8e06e9 100644 --- a/crypto/heimdal/lib/hdb/hdb-ldap.c +++ b/crypto/heimdal/lib/hdb/hdb-ldap.c @@ -44,6 +44,9 @@ static krb5_error_code LDAP__connect(krb5_context context, HDB *); static krb5_error_code LDAP_close(krb5_context context, HDB *); +static krb5_error_code hdb_ldap_create(krb5_context context, HDB **, const char *); +static krb5_error_code hdb_ldapi_create(krb5_context context, HDB **, const char *); + static krb5_error_code LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg, int flags, hdb_entry_ex * ent); @@ -797,10 +800,10 @@ need_quote(unsigned char c) (c == 0x7f); } -const static char hexchar[] = "0123456789ABCDEF"; +static const char hexchar[] = "0123456789ABCDEF"; static krb5_error_code -escape_value(krb5_context context, const unsigned char *unquoted, char **quoted) +escape_value(krb5_context context, const char *unquoted, char **quoted) { size_t i, len; @@ -816,7 +819,7 @@ escape_value(krb5_context context, const unsigned char *unquoted, char **quoted) } for (i = 0; unquoted[0] ; unquoted++) { - if (need_quote((unsigned char *)unquoted[0])) { + if (need_quote((unsigned char)unquoted[0])) { (*quoted)[i++] = '\\'; (*quoted)[i++] = hexchar[(unquoted[0] >> 4) & 0xf]; (*quoted)[i++] = hexchar[(unquoted[0] ) & 0xf]; From nobody Wed Apr 24 10:20:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZk660bmz5H2bk; Wed, 24 Apr 2024 10:20: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 4VPZk6573gz42Nn; Wed, 24 Apr 2024 10:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLTi5QWY6/enTJ7vQhskb1qU7gFRu9TLj3ZUo0Bd7U=; b=PtauhUKTpuMl17KR6Tz2zFMPoZzE0665jjIH4NQDujOMU7+VB6dgpY9UwgsqRGzXnRbQdY AfArV3E2L54Zct+/ile+e+WSK12ZV5q+niNRx2JcxU9PwBJuASBtMuUdklB7ZML9CRiMgd IeMDbCpYSN0VqAocOZoF6gBTySpCCqpQ6EHA1aBkvL2iXmh2fw03w/r1wD9SuY6/ARz/Az Dxr53yctqOL6WB76r21EpZ5si/+JCe7EB8ZD1iaQtgbIuaIEW94XIRcVAFJEfO10yoj1zR gLcn3UPuFxaVrMY40SkPvgvaD4l4d48yzoaBMJ/Ts7v4jbO6AbqQDgUKRw4QpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954014; a=rsa-sha256; cv=none; b=BVV4TAgrqXHy5nmH3URY61R/LqzLdRivu1oG2koDrgGuHRtus9B6bRRHs5GbyqXirVA1Cy L0is7So4DdvD2ebndMoroTuNl2HwVvF1zZ8xu1GhEIcIYL1l53cLrElPFcv2zXTYLw/wLi y6L7G2GhEDclwEWCleJMrTg2LvYOomU2ijF56zaNfCm2/ArOweDZ66LpXHguNge2q1/kSI hzijqGozSgIlONGQpluQjMrXzNYVsTY+ygAqu1S9p/xM/a/Cgkm8Ll4fZutWikHbCq6lP2 GK5oKbXrUwltPGdmxxqOOgsazm0ARch9TUFkA9JJoHA+sg5fIPkJZeChMyNuGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLTi5QWY6/enTJ7vQhskb1qU7gFRu9TLj3ZUo0Bd7U=; b=Toy9JueDZPpx4NJGQ+ERac9+4NofayWIqfCgvs32Z7IDfS34nnbg4lSCX9p1uLLUN38lJi dEHtlQpKPU0w1YiKl6SjzCPjENUrHNcpPS4ekxw7ysT6MoNB2+kogScrtOhEqTV4doDvPe VaI3tIjcgRAN81VV5q9VMt/ythpCZjHK12IsVit+V/g+Pbw92f/r3eaXPZ37sKBjTbt4KW abYCsMgAzQLIalMxvs47fP1Q1H94MmRtPPxXjJK6EhVFMgFkQQ1FRFMySRtzBwh2PuO+ge txNFFXtLkPES728at8KFDoumohdXco7+tVa8PafmPSl5oFdRXxgGhme3TEiZng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk64kYDz1B83; Wed, 24 Apr 2024 10:20: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 43OAKEGD056305; Wed, 24 Apr 2024 10:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKEPS056300; Wed, 24 Apr 2024 10:20:14 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:14 GMT Message-Id: <202404241020.43OAKEPS056300@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: 3b83e014c094 - stable/14 - uipc_domain: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b83e014c09492b3b089571758f4831466f86279 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3b83e014c09492b3b089571758f4831466f86279 commit 3b83e014c09492b3b089571758f4831466f86279 Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:09 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 649bd798ebab..22b8a17295ed 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -226,7 +226,7 @@ pr_init(struct domain *dom, struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:20:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZk818k9z5H2tr; Wed, 24 Apr 2024 10:20: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 4VPZk766Ynz42LF; Wed, 24 Apr 2024 10:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwxEHBCi7d5BItLEO/fEnS7H6njQok7pfHlqaPsOqlg=; b=uv16qO1WdreRSTQ2AFSMEw+GiD6vpspgwC1xJ7gAsAI+dTQs2mRjDMIOTdCs6XE/VMS9Qo vqi2t5KgeLn0jJgDhudGTJnOOR9Xy/R54ny76JWYifgy0QuQSC1GKejirWGEM2Ex3DNk1U vYeSaFUpzBdSj5lLwXJG8wHY+mtMGRn0mNwmh2KWtsQIvUsvtOqcqGffmNvdHeA7jLumQp A+WdDrxLBrO/ts0aRtPY0HTKNRSB4g3aM1wzvRtn6ZjibAqyLSPB1eXg7KFXROD1C2jDFc smQxYdbG38ptDUzkNybesb/+U07MY7GWsThwXFhdkarE/23w0nzvfxIioXiQlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954015; a=rsa-sha256; cv=none; b=GdrGRHPnbJ5rCfYxRyoD5a68h8+pCrRLE0Go0zQtv8w62T5ESLt1lt3yapVgF6CASM9W6F DT5exa6VUNI01cHbeXik8jkfG/zhuZ6wFk9c/gYupHsb5NpNXtt/V+5yObjMn1dhwHysVi Y/4CngCKytUPxUS/B1Yx6FFsAP7Evk8DfvNJRHdI6F5yJLPvndm7dkd2Cb0DT7pGHyuR6M a3yrqTmofbvr1kupp4aYlSMciJi968PZrvNFqQTE99lkyEkYz1n35FcbnPVgsBgbTs/gKO vMhMqLl0US4BcydgLCyhyTo1DpCZ3CIN1QoT6WvBBI70THL8JqJedY3+wXHe4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwxEHBCi7d5BItLEO/fEnS7H6njQok7pfHlqaPsOqlg=; b=tSSDNY5vav1PikYYQmXXgxupntAPwyLOpLL+MHUxTGWc8rTYQ8I+wbHVfSiAydkwtipWU7 Sd4f+yt0CvkjEDp9zRzQK1PGxS4JTVDhrdxH3qTbGcbd5xaT9p96OpfrtOfF9qLoEfXJeD soFdkt+RTyy+VmgC7mX8+QzcdwkOCbJ+VBcFxGsJLJ3rEuTlJZCAZ22qxl6i+OBJoND9eF gHzzImBLXonZ0TwfU4p+eKAqWAZU56BUofC/lLJ6UpQZ5A99qzBElrbvrmgWe7EQAKjsnN uR5z7AewFchQ9pzBiVCc0Czl6r76VSSXhUHq1BKnjV5LzcHK68u3VIatjNotXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk75k0Tz1B84; Wed, 24 Apr 2024 10:20: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 43OAKF6w057017; Wed, 24 Apr 2024 10:20:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKFOs057012; Wed, 24 Apr 2024 10:20:15 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:15 GMT Message-Id: <202404241020.43OAKFOs057012@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: 956a99badeaf - stable/14 - geom(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 commit 956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:28 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 6aa7ded19537..3fef8a918530 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -475,7 +475,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:20:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZk90sChz5H2ps; Wed, 24 Apr 2024 10:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPZk86hshz42LG; Wed, 24 Apr 2024 10:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Afkxc7MqFyydk6boyM0fh7gkZhJqDZ/MtRly8W57Tc=; b=TKMdSx+l8p9/TsePcggCWebNzfmyCz5LWjb/H9NNSytqaljTXqGZaHzhkqGLXg6wkRiRS6 g0xvMM5FinW7ajs4BmF0gV8EooumGRI1RrvSWwHMxeNvUCoVTV+CdsmLJdjlNI45kXrZns ZPxICGRoc1vvphx9rdxcSRcpsnzidQAc3g8UDKRVx9pTTn60QLGB4Jq0k21ITy6QQAVobf BrnU/1Y6amFklRrK/5TDtSZ3UJZsxS9K/CJG8PsAS0OW58cGZSeVy8JvRhBneLliup/LOw +fMiUNPLPdxMCHGQILxuFMgHJ45JPKpAYGuYc3wg8ZhZOHCrBjk3pGCyzVieSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954016; a=rsa-sha256; cv=none; b=vH7S97DXvYZQvm3Nz+j0Ksvah2+bRiYpvS6f36UIGvXWp9Do+ekWmqsgvoZ5mnEkJ+y5m4 WPTsgcMf20/0q1OKK4czyDxnRLfOcUbV9B09TSP04yRix/sBdSw1EKmNVEHeEQxAfWFLxh czgO/V4TargTbVKCjocrAflpVftvtgOgNGPGK4XyBk+NPW65/CsMzRpWak13ELd4dEEaak 8lZ8DLx9gGxoGksiq16HRqx/jO21stc6jnURuDG0daL6c9gpERSMbNn/70E7jal3hN2YJ8 KV+Az72drFQnXhogCdDbVDz5Vh3pXZ25spPtBtZdtyzrN2ksZC1KxS52osE9Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Afkxc7MqFyydk6boyM0fh7gkZhJqDZ/MtRly8W57Tc=; b=gOBEvfeqduftrEeSkOh8h6HAcUtHjs4rLpkfAQYH0a+kGIz4+FvuxD1WUWxnjcG7M3T1R2 4RM1dI2/SiFXNqN9krzkF3EWjH7K1bmf90st2ht58S/xj0mUvfVbrvv8J9fe9ohzw1KvR+ np/zNaC1awrpa3NyhOZJukgWzsTGrsmv7DS/QSHNaTlJ95O6B9xXJUe8MEF6lcl3+bh25s k/CS39J4ryhBpvii7STCfYJhQPvUotNK1BO6Hm0EhkoLw5AXVz6b29aM+Spu11hh8dhSBa Csizt0HN+kGUGwigrr1o8tYsfjlB8cx+Q9HF58d5ReUNzrWu8IZKT0vCHj0gDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk86Jgtz1B9D; Wed, 24 Apr 2024 10:20: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 43OAKGx7057679; Wed, 24 Apr 2024 10:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKGI9057674; Wed, 24 Apr 2024 10:20:16 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:16 GMT Message-Id: <202404241020.43OAKGI9057674@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: 87cf19849942 - stable/14 - freescale: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 87cf198499422281ab57b070b1d8caf0d688209f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=87cf198499422281ab57b070b1d8caf0d688209f commit 87cf198499422281ab57b070b1d8caf0d688209f Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:44 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 5f4733533414..5336dfc6dd57 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -462,7 +462,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:20:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZkB1GN1z5H2ll; Wed, 24 Apr 2024 10:20: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 4VPZkB0CQhz42FX; Wed, 24 Apr 2024 10:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttlgpHb9XbY8+inPebH+QEXyr6Gc5RLCk7PUiZbi9vE=; b=iDASTAgmmf1mFaxRQu5m1khoaMIkGokuBn8K0b9XAz+wn39AsJVM7nFOLL3PL0TJ80VciN wng5RVnIiHnDW5eadXN6fowceU/zFGJ5uq/KzuHLTKtpcnC+5JUSdTpqHlNGgRppiMXOuS swyB9lRHJyPkFdrR2n4/dREaRSmlHiIM5+SYia1uZZYObxeIO+Ovf0GN/16Paq0ikk1El2 2TY2usdxoYRm8SqHrBEGa62DQro3TCjtalvDB3FiVUtZPWha488P6KtPW/0OGuz3Sn9KX9 HcVWOGuA5q8UPieO+AkorFsoVBLBij9wMhRiYLiMBLxxMMqcrBD+u/DbxnTvMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954018; a=rsa-sha256; cv=none; b=cXF8tOK7AdmBMlPKTvRZRwVAjBWNL7xTIYrlIU01kSc/vaQbVcCfROKeUTHLeFqKnoA9PO CURSdfY1EWY90Owh7XM9NFFPkzkulByjX0/UULXH81dFEx9rfPa7RF/Ug5L6RYxX4PRyZb DPG5sNjVWVpwBP50PVMZjq4vE1p2E3+MQxGPx6+Y8FecqMILn+4XOqi3BMOW8VM9kBHWEn Jm0CzdjNMOKt+p8NBd+7t2BT7BE0zSS0BV3cqrbqFTIlQZPRtgkfUlGquCDbX/rzTpjJ6V MYc/Ja62GefPGTP4ZkuQiLqtQTk9oLjphJg7FcD88V7SGVD/q1/9bTYQfDShlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttlgpHb9XbY8+inPebH+QEXyr6Gc5RLCk7PUiZbi9vE=; b=B9o9H61lERq/6gYH9LcsGO61tadzZKn71uWFjtD24ewJU7uKoPI349TaA6xQ2jg6X9Y23e W7swrjI2tgP299z5VkWFVMv+njeQFPSnivRCJ8Ww3zw8W0ZY3TOlgHcafnQ9rJqQ9nRckk Axyj3KxUt5KuUHM82/2mL1ODWVOX+hSpxEGjl881XkfrarGntYFWpo6M6hlvBOMTFjl6K8 pg6aBcjwu/xoa97jI2xM8YqAhpxD8mi7sE4SK3wpeOH7jQSBxLmPw5dUI6m1H1ozfkI28E b7GSxQp02KDGVDxTYmq0iOtGqxMKGLl9T+925cVOrIrz738Nmf/Qhq4RH7K2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk96v55z1B85; Wed, 24 Apr 2024 10:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OAKHv8058276; Wed, 24 Apr 2024 10:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKHtX058268; Wed, 24 Apr 2024 10:20:17 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:17 GMT Message-Id: <202404241020.43OAKHtX058268@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: a6ee6b6fc021 - stable/14 - arm: Fix a typo in a KASSERT 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a6ee6b6fc02115fbbfc679326060cd1531e624f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ee6b6fc02115fbbfc679326060cd1531e624f1 commit a6ee6b6fc02115fbbfc679326060cd1531e624f1 Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:03 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index cb1419c42569..7fbf7e7fd827 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -444,7 +444,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 10:21:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZlZ6nsMz5H2qv; Wed, 24 Apr 2024 10:21: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 4VPZlZ6J4dz43fM; Wed, 24 Apr 2024 10:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztZjElHR1VdhCtXB+jkpXx8Pb/929tcM0HrBRaL3Aqc=; b=v01MHomzzDLpqd5SQQhIUQybWJbnnK+U5n66+9ohjW17tkl2NlBeLP61Popzba+3J0PApQ qBrrlD2DSHCtzuWq2qbhVWA78CunkyKqOJojgtDL4oKe1f1q/YO1N+/kKR8JjkZn1fqM2M SSGmCPwOZRy4DU6MqsGH8PU8ggdWK8ZJktMMsmWQr23KgGWf4igZJTi6atwWFKJqnOc+bE DIa3x1xXDVGOLbd6vIAiEnQIF1u1r6SvSrd3Rl43V/J6TChzCFi8pEeKLBk0dC33uNUGMD gvftyke5qXoeJU53bGgyUKejuMcrfhp6jDc9RSHsLEMV4z1nQNwDUUrHoTJr4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954090; a=rsa-sha256; cv=none; b=S3+5HloYXQB6AoviCZ4ve7YXyndkvXQQMZxaCRMezRTAPLcf+ytV7AcK6D0N6kRpsZL1Yr x+Js0CsfS5VntBSwfaxqkx7yta+3T+eFSH8eKt/iR3zB9qj6FoItc05otg/5d5e5K4QskR cL6hClBQegirCXQsyJLRMg87km/GFkEF1ExFbG9ZyE5v9bVFOYZannVkw8KYGJgsbPrBej P+UjTQvsjwIA/NqePo4R/SocTQL7u6pzag8nnWbueDoKRuYAZl8eG5AMi5FQQ0UmDYTWyh 6YlgexipbTMxmIwU+OXIqlM0uZmhwQ8bKfDPzAFA+NJ3AMEKNE9xXBaCPr0QZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztZjElHR1VdhCtXB+jkpXx8Pb/929tcM0HrBRaL3Aqc=; b=kxNZXFzaRZBD9Weqh+h6JIy2uTBiZhV+yhCvEI0lqznFmT7LLaj6YPw58kPtT3RtGEhFxq uQtzW3q4cKR7U9BHb5u9/mU9cIlVxPJKOiKWnaJW36RvzsA4kyYZjYyOc84lBjtidZgzJD u7/8yf2nNa0pYmATnQ3lv4DVs+rxVLpAv0oXYAmRJvFgVbFUxcowg417a8Qi4r2SAF6Krm g/r2B/WDI4atdgSLYvdeNly26OhpxlfmX1anKU//iAONYLWRsj9ic3gCqMZQi4nvH+aXsu fluOT4bvcMsY/JKNdXdqJgKwdlrmibDJqIHEJOG4YOFC390VVj0PNB467lbk2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlZ5vbSz1BKx; Wed, 24 Apr 2024 10:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OALUZE063311; Wed, 24 Apr 2024 10:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALUmm063309; Wed, 24 Apr 2024 10:21:30 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:30 GMT Message-Id: <202404241021.43OALUmm063309@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: 64dfe0a94bfd - stable/13 - uipc_domain: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 commit 64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:45 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 89cdead26bc5..57bf3ac9771c 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -171,7 +171,7 @@ protosw_init(struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:21:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZlc1WDpz5H2ks; Wed, 24 Apr 2024 10:21: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 4VPZlc0CW6z43Np; Wed, 24 Apr 2024 10:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qM9GVsKzzpKVVOgCmrJOPTXcUAjeNQK6RW0G7WFZFGM=; b=gJMUT5Co3b4SoFB7GhtIWoRZ4QTUfjKjS+jWos3wWMlvUefWMoNXl+T2c+xvEjsjehyAhS 2y0vrmMHdfF0nPj9DEGaEkHwZqhZZ9q4Aseq82lGs3pa1YeS/BgLGB4nh0eqgKmFTTLlyT RLCZL/JMY5ds0n5UcxyChbPNa8RtROzhdEsPrff+4whgjurQjB2KdHxWk1WsNobd/G99HF 5NR9JRYvOzVOhmYP97feseMHwifxRlSFTtoMV6OmhBz8SSOQnsaW2t7SMCet/a/MuCPUzE zjuaN8c8fj5XQ+lLwj7ZclytNHvy+dyZaOV6B4wbRP/6oqa848d2Ye23ko0qFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954092; a=rsa-sha256; cv=none; b=A1y98sGeouOMpre9ygKj5Rpz0qFoidANINnj4QxP3jHen3j0bEibgRPI1ZS/NmFrQE3dqR M057iRioFp5B0M0+mK5iLckQObMfykxnHJNrZ9D3x5WurSI20yJUvMl6hW6PlJC609ecLw ZaPg7+7ORNXuE6aP1bSQZNR9ZVDXbEOq2fGYO/OxKxBXr84/mXlyYfw9rFD8LIk7TCOkqi XuqCFyI/bU2LnNyJXrAZklO7QOEOG4etWgARrTUeSYKLG/cxShipYAtfgB/nv/gl/gnvCt LB7XZyIx8vi+EnvruA5kCJxZkjb/U5/JwymalE2mYm4Ob3cn94ftC+RX8DBbOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qM9GVsKzzpKVVOgCmrJOPTXcUAjeNQK6RW0G7WFZFGM=; b=Po7D5tqfhV4E/9gbFSGS7Lpn18Ifey5edwK1q6ZUVnL2yO5Cna4VKlp224sjF9MQxuvYt6 sHW/hb5gF5d9l3ecNmQBg2xR5VG/M6TATKH+VT7TgQi6jwniWVyCvbgtrKMMIuWEwuqM4F Pont1j/1Jm5pmaTwBg4GAt5jmOjepjuwHcNIhHIJsX4TjN+/3U0O8LOR1xSf9bTQYJaXPQ kT9m3kkxRjJly1zhYDMCso8U0ju6Aoj3V9eHjNjzmO2WdoAB4tZHG+dfzKs87a+WmI4hxn QXQLlcstu012tbnbZGCmV5El9bOPRWtbtDBPqHCve7GAFofKQEv1OuKHuSjroA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlb6xNSz1B9c; Wed, 24 Apr 2024 10:21: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 43OALV6Y063365; Wed, 24 Apr 2024 10:21:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALVaN063362; Wed, 24 Apr 2024 10:21:31 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:31 GMT Message-Id: <202404241021.43OALVaN063362@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: 67e24ed0fc4d - stable/13 - geom(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 commit 67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:58 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 6360cb67b4f1..290c0ea66623 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -476,7 +476,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:21:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZld2MjMz5H2xx; Wed, 24 Apr 2024 10:21: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 4VPZld0Vs1z43c8; Wed, 24 Apr 2024 10:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/wRPf+jAqseNWLw5BMGYJfpV7MfhV9YgnCLdhb2/EM=; b=uS4TSjAdhu58bxGy5LCqkHVAZQ/LSIgdCsGmgM7dCDSvWLx8HQLhSJLxHPfrw79dNpchKA DS4EvrlCAb3YL7IoqJs2CztvwULeQupgefPH19pWWJaXNFfFR3KJVmhd4ooVaFEU2EaOaO GAUAseuiOiVTX3nY/BZ0eaxmgR7rvcFSNwGLdQHq5MIrCf4/eo+xVCicwkT8G1JhXy6KiG LDUBTlymlqMJt0tyZpQHjd5FfWsh6Hho6dG8+OvoiVv1sZPB7SjRsO7Sz+TI7N5KvPjR+g ZBCstBtMAQHN4q4YIQZM768v924CCH2u4AxIJ/mlo4gCS3iejDajvox7q0CbfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954093; a=rsa-sha256; cv=none; b=P/jeHUhQx2I3fkBmwRYL0TBL+u8RUs8L9DNNELdXshSa3vmZZDG7QjwsVtgQapiw5k/08A doxNn/gPhX6BuCR92TgGVGLOr5MWiZLvlO9Fsy4Ui9tNJicvlnGTEU5SjCaA0PCtJpIxBb lnRL4SihTxiSbTgoMZYGfstJhtNwnDdHQE1gkXSmYI4ACbzBSlMtXnvzDNcBe8YxNNtQ39 R5YdQhf/xIbavKA3yEwKHVNe8QALslW884D0wpr/zUH2GjLZ6BiXQlT/kMVC7auTNuXnCC i3myqz0M1t3YH0eaAN4AQ8s1/303HlIUhLt36N0h56jXdunMKPgZSff/ChrkLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/wRPf+jAqseNWLw5BMGYJfpV7MfhV9YgnCLdhb2/EM=; b=Q4IRCV58rVZ1g/W34AbtDp67YcI9IKtyA2S11g+gN5EbSd2TQuHrV+wqHz4BV2cc37MGct U4oabOuRsYeiJdEtRRUedLTzVD9NVRfmgA1STtVetePZz5kGxREHIkjMlqGxS8Pua91c5t kZLXJoMcfGZ6E1SjRWQD49IphPVeZDqMaSJPkRLXv7LCUq2upsmXQzaQX2z2JrQjaOAIpX DGFK489EIitQTRVms1bMfZx5QQRKeo55uP8J5/jr5ohUE3nDepNfgOuRC43HHGAaeThD55 Pcf4m/vTiB2frGfcObNDWxWo+07xEeXLot4CRGf/ejowS/eCBA1D+JKRBcwCdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZld079mz1B9d; Wed, 24 Apr 2024 10:21: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 43OALW0S064366; Wed, 24 Apr 2024 10:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALWXu064339; Wed, 24 Apr 2024 10:21:32 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:32 GMT Message-Id: <202404241021.43OALWXu064339@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: c64f93bf5aef - stable/13 - freescale: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c64f93bf5aef543524234285038111455c84cf77 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c64f93bf5aef543524234285038111455c84cf77 commit c64f93bf5aef543524234285038111455c84cf77 Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:09 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 666fd1b87159..0ff76b6a8d6c 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -462,7 +462,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:21:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZlf4y0Tz5H2ky; Wed, 24 Apr 2024 10:21: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 4VPZlf1xMwz43hs; Wed, 24 Apr 2024 10:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWObu+b64HZVzDeT+y07rxo5odCHoCSiqRb7QJuaUeQ=; b=I4PV0eInCDhKaT9iayf5/LDgexi3+7g5BDAOuKLZzAJPBzc91V00XTjniaXt2dbh4QQBfk gpLP2XQJlemOiw3tt84KtDiH+W8Csc5jMoeLZvD2r9dz+A5LRezN3sqKs9dbMaZcND6Thp 0dGxuvhlsgX4Q5ic7+XOueA2HqrEgIwwAIdL1LcyZCZpVAhTmevcdf9Tdty0ewRj4PI+yv A4Dh2JhFG6TLGapvjOzhooqeoPkARjLDsE6PhhJAbZNWAvK74wspJklv5m/HUCVE+xAq8X AQ/vgy3teTX0sfh8rQ45qxsWkBb98F1qdgIFDUXH3J5pa1y87igBmTv0WpzjLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954094; a=rsa-sha256; cv=none; b=iShBrzzfkHFQzkUEpOR7YyRMYKvEiBPaEw9/OjMfleIVN+tVLWonNWSYdW/GkhgdJm+Ryg mg952F2mNUuiebWzjm5kI6ROAXbiX26gFpb/xPzG2pIyMdpAF/1f3z9saBtDGjRIh5p73E mQU/1v73YnWssvIJnK+5kLXp6FpMSsWR5kGXQ252fPFWLyufvQVl0FIoNIg3LHH/SsI4Vf 5ov0vWCTBIDAKEtQCaClqKwpCSKbEPzeBBw/3PUhlS251hN7TcFtVMM0tWQwSwYd+D82+q 85R22YqTUHl8KZK0jYUy77s5aYsQzRX8UOJ5R/vC8xKA0IzN+nc3oVFfatHQGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWObu+b64HZVzDeT+y07rxo5odCHoCSiqRb7QJuaUeQ=; b=ax2SeMOQ4ntgKmnx4i0Cpqcv3GA7qLGGVJih5NJx3qh8vYqIlQALMR6FoH8WJJAn8NCyho 1ezCQqDfL+++jyrM0P/6L7jHrDroNLMvOKUc3Yu2I3l+UK6dWaVwGMnri5A5eb/isLHcrP WCBKF+jUp6H4mXiCEAcS0hSv9wj2Z6H7jf5IdowPAXxuIr2Sx5F1pf6CC4sk7SFznSAWhL YAsQ8SQZ51Pi9si238vtdgcwoztnpmA4eumNU4vitPM+lWgTk3ZWpZdwGzLZsEpQqm/IsX +2JG+YwpdFcvhfGZKRvJcTw4y6lR+xyxg0xn4e+mhDB06Ym4EaVo/18GgS6JMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlf1VPdz19SQ; Wed, 24 Apr 2024 10:21: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 43OALYxh064506; Wed, 24 Apr 2024 10:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALYGD064503; Wed, 24 Apr 2024 10:21:34 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:34 GMT Message-Id: <202404241021.43OALYGD064503@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: e03c9c311e89 - stable/13 - arm: Fix a typo in a KASSERT 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e03c9c311e892d5f9992f6ba74929a4a0866a325 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e03c9c311e892d5f9992f6ba74929a4a0866a325 commit e03c9c311e892d5f9992f6ba74929a4a0866a325 Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:20 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index e9114c5b0fe6..2f13707c46b8 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -435,7 +435,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 10:22:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZmq4TbDz5H3Tw; Wed, 24 Apr 2024 10:22: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 4VPZmq41jzz44RV; Wed, 24 Apr 2024 10:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIcFivMJ9x/WDoDU96t1JJMRQUdqaYpKuf1MRWERuNU=; b=fiZSiBi2QM+PHG6YjCQIc+Kh1DNiuBTkYTrrMXwvgFtja1ef3RUWz2cMt6kGuB4aEgV29X foI7QkW8QVh9vn8yU3bOZTojzqxUHQxAIhOlAH2rsnFndFzpeIepT4s+tEXwqEVuQiItb7 M/30eyKqhpHYOF6GBoyo0fQhe8hnyDvfzePH375aj8yyHC5AoTnVhrYuwM0UYv0WsLSZ1r X/5mD6vr5rKaoEfSzIi3bFLNQ8iaAm3QJwvIn3Oi1cAD+rVrz/pb1eTdOPc5KeajYXWM56 s83+zddJkTI0nHIuYXCTqcnJnVPj+ev9v2Db6QnYzviGpoDw8eUZ/DfOSuL9vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954155; a=rsa-sha256; cv=none; b=Ba1LL3rmSz/TA/2UQd8JIiIqpY7494E0kGzGtOzBah9vf3VmfjyfQMU1KQK3ygcIvepGNs 1IY7X71AFWH1chlizTk4HRPwyBKEWSg7vrLsIsF8BcvpuBRrLDxeJ4BwiWWOs9++b+ofCZ /uO7ElncdtBWPd6N8hfwoTf7LIGMNVfCG/dcgKs4PjJJinigcB5o/IwwOMzrjwQYyVeBx3 x1Q+Wy2P0B2ug6hukl3R2qtwknFF9/X9A1PlPeS39oPyse6/dczpUalbJjweKBNEtWgQav TFKILHdrvGZdW3FN6cpLilcMSKfVo+/vX/Lq40uDM5j4LheouBD6sj1/1Zg+lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIcFivMJ9x/WDoDU96t1JJMRQUdqaYpKuf1MRWERuNU=; b=UK2orYtStlzHYpUmJHqAdFY120Dqm6axzPH1vMcVTk4m8sYr5+AOppujsirgF9MAdFecJC KEI3L+EfsppbLx4pPueqnzbLy90S1LBLlHmXouf++FDpmqR8F6121Tj246kuRukCTL8Xyj pavYKe6vX2wfhendlYW5i8CjHt5t23kYhQdSY7bfn3sE5ycDZxn0++h5xPx1hfDg16uxmi w4Q+qcHqxIY8MUGyDt6li5chRWEqAvMNFYBGZluvzKeF5bvjzyH2oVCR6L4ME8KkHDct/k 9H8Cz7Cbh8L0IF2AG2OWh1t2/2vwLrh2DexQwK5sk3bDPCE/9YPa8PRNGuZeOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmq3YVdz1BQ0; Wed, 24 Apr 2024 10:22: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 43OAMZEC065745; Wed, 24 Apr 2024 10:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMZKg065742; Wed, 24 Apr 2024 10:22:35 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:35 GMT Message-Id: <202404241022.43OAMZKg065742@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: 656ec7b96663 - stable/12 - uipc_domain: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 656ec7b966632fa7560bc27eda32e245dd4d307c Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=656ec7b966632fa7560bc27eda32e245dd4d307c commit 656ec7b966632fa7560bc27eda32e245dd4d307c Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:47 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index ca7995bee39d..5297d9b303b0 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -163,7 +163,7 @@ protosw_init(struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:22:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZmr6L0tz5H3Ny; Wed, 24 Apr 2024 10:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPZmr4x9hz44t6; Wed, 24 Apr 2024 10:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbEb5VBYzEDRlUHi5qmjApGcYDppcbelYLb6c6TklwE=; b=GbGeUJ2kJJSIXNkUMT3Kyd+0AWpJZEIkC1SSrngaKL5ey9sjmwmEFkd6O5kBM8ykoC/FrR Uh5tm+9b1LOz4P3hL/Izmn20C3HxRbcZUai7WOKEEg+i5Lee/IV/sWhN2KSeXSXa+42PAX xPBDyYZaNr1Lo4YNwzS4LQ5coGB2P3N8qqbFxK+phfDD96XE9n4Usb0HBjSiO387LxH792 SHz3xo68o6YQWHj3I1Y929tJZhEidD4rmpTbRxG5iVKNJUaRrtUVTxub3ImZCpqr0ruxpF 5YdH+UycvfHmN5YDisTinrMdSWZtdWQU3rv74LRbwLsone6xgUwW+B5pYnhIKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954156; a=rsa-sha256; cv=none; b=OmObSLM1eDU/a83+Ui+yt6CQNEKlcDcHT4OmrXhpEdUygMb6JJexyx0ZuKoo+s4iLIZCEF 9xp+ssI26Bnp2w5XoVlNofVaAjDIe/1n0hH93kuJ3oEm56HOHMIFInmWMXYUmO2X/troHH tBwwcY3KggJ2g9J+msMiLd7gjeB1///oW4TwcJPNY5lWSqA9fo1PV/mGD7TbZKMLgZBkfD o0nO0s2acoAV2VVYjYEG9NFWCtT910/+Ajp1K6J3TNiiXF6KEl4Zt8i/I7g/NsVNi94f3a GFarMGINWcefZEuxOPUIbIkouVFGhcpZTZYAME5D3rUPmk19+wIERlF+2VObjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbEb5VBYzEDRlUHi5qmjApGcYDppcbelYLb6c6TklwE=; b=JXx9iInop6uy32MrHc3X1lfFdrt095MEJZ2/C1D5arHHDEHJKtJjPcWmWmgj2eAbxWmcvm 2PSu+rknNwKTdHyvJUgwNzfOSmKR4C+2O3V+um6UCg44XmFngfVUiNKGZeizzJavr3i/uw GW4lKaR+emj01oE4KlET2jEViXi1UITRpLtE4zknTGF/t7ygHZdjg/stDWiUe7OG2r7xTC pUdd4m2Zso7jmnvkk38DC1tJZrqRRmT35od+gc8bP7Ev4HZoL5OMyQShMG25fASWV+w9SY FffLrK6j2fqpcouhOiUTCjjNbeZZH6Vj8ysCtFYJF/t/RkHiUWgJqEBmJ9d4Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmr4XRbz19tn; Wed, 24 Apr 2024 10:22: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 43OAMaVt065803; Wed, 24 Apr 2024 10:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMa1P065800; Wed, 24 Apr 2024 10:22:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:36 GMT Message-Id: <202404241022.43OAMa1P065800@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: 87f5c26218a6 - stable/12 - geom(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 87f5c26218a6665246ea489910861c3fa34f1a5b Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=87f5c26218a6665246ea489910861c3fa34f1a5b commit 87f5c26218a6665246ea489910861c3fa34f1a5b Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:59 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 397d24ba8e13..4867beb63e6f 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -443,7 +443,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:22:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZmt273hz5H345; Wed, 24 Apr 2024 10:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPZms61Ysz44dF; Wed, 24 Apr 2024 10:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv1EnRXyX/B/AvIOI0yLSvA77SBiQHtpvDeT/pbVxk0=; b=Si/usGAbhlAQoIozLd3DVlmiVewgJdh4MOuw+yiLUmacx8w84a8OQUcCcoBd3Z8SL15Ab+ IFY1xWzLwMnk79iuHHbIozYOCrlh1WreCet8DQfqN5kpm8jWrnFOr3nKqR4fgvcSX8GEKG KuEVEa1uxXjTWf2cVYjAeWIcNsxMoa8FEQ9wiYpoVJx68R19494Y45/TkMfuPwcg9yzavP ntq8wLbKXOcu41p32PvhoaMkOgzJ2nkm5kzgLChXSbOd1Q6IaHZ+M94JX4pjD7emXUmhyt Pm1jteQx6NhexUygPZW9yw6ZqQS3xTutPekoR0LkDJ1CuzzxdECGPFYqSJukxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954157; a=rsa-sha256; cv=none; b=esrPtB+NCtJApb4k4dyPI5XCrWvXAIts87+ji4SnPRM91YT7Rf3V5PJd37Kn/WNZ5Haenh nXPA4BZubpiHx20guE0FJEGT4Hwsxv+FzJIaCFKoU3ioK8jupK3lr7V7ckemGoUq+CNPDf Z60/+dXhxm+9T2utnxHdbJyqOjT05dipbUXO3yWLLEN+Tm/Fqgu+vAk3m8WX4fkJnUaN+J gyLHJ7h2VjnLmysGJD4wq0d7KSPOs1MIEdsR1cJtgRroRN5uj7L4/HsiiMd07cnUKCxIdg VfUtYbUEmYLoznHES+d/IW6gkdTozoOACF8OSBdUEO2LoZme/v8hn0gsSUAxxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv1EnRXyX/B/AvIOI0yLSvA77SBiQHtpvDeT/pbVxk0=; b=wLJhrC+mbJztplKiM+7oAY0Ii8l+OlDQrdjdZYYwjeyARiWtin6eDefxqtsTO2qFNIvTH8 vo5wf3+8BXN+LWR0Usr/xRvSt68Wvw2uXmlFwooLugrl1tBLf0pMtlFrHW0F9SvwtH/WIm MmzNXvSioRap8nI2hMwu3l/B62gX09zarXWKW13Lz+kqye91uXIGe6zShrkMrNWxdv8IGa JOVfFt2Aanvdk+ZpfagHfkieG8EUjIJ9O3+CimG/5LTUuKJ8g1YHnanNYXNYUK2zDBBXZL Ez+qqFT8rl7qL7sS2O825tA/vHXckQbYkfA20ITU5Arf4vPcgolkZ7rBDLrugg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZms5bfmz1B9s; Wed, 24 Apr 2024 10:22: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 43OAMb1c065868; Wed, 24 Apr 2024 10:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMbDG065865; Wed, 24 Apr 2024 10:22:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:37 GMT Message-Id: <202404241022.43OAMbDG065865@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: d94c2398888b - stable/12 - freescale: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d94c2398888bfa9660f61ab253bf6f2a26d0ee25 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d94c2398888bfa9660f61ab253bf6f2a26d0ee25 commit d94c2398888bfa9660f61ab253bf6f2a26d0ee25 Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:22:12 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 84dcf991419b..5c8fc48c5423 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -464,7 +464,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:22:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPZmw3l87z5H3Rh; Wed, 24 Apr 2024 10:22: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 4VPZmv66Gcz44gL; Wed, 24 Apr 2024 10:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=; b=IY+s611O2VTsBdiz6yD3Z+CLdEBSR5uGwM0LKcyCtHl6KfYY9muvyHNd2rW0D55qhqqF6d en5UU7U5fcljPd5wR7pLFXXGfewaVQhvMt4dGrQq+VyK1xLI5QjKv/mSVtZs3b/RjplAMC whpiyNYdNX5Hfr0vRsFhQdrqEVsqpxVrr/W9hkUMvF4Puf/odXZ3xgWll74HoYVtjrKY68 shcJio4ZlB+X4n3Nld3Pl4ivuhVK3Q+J+emSL3awSE33mWp+gOkTjuW8sJQ8yExJVoiK/h qQNEU1+CyIHBEAoP+6WoTNCobSzBKoRVJMIcZ2OCyN0Xq33+koYDeM4PV1TLQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954159; a=rsa-sha256; cv=none; b=uzAzo7G6gwSwSP0HHMyVRLSwHGeX3XXnXtG0PwJZWXJ3eG8hyfFjjcwtCXw7zKWNvEncIc mpmOqL7/cPZg8SOuvi7p3AvAIzK1Ijmzqbx76YAO/Qg9lPTJb/JALwv5DdjNU3PoO/c4rp Uy8AD8h0r8xasms9+8+IuR+1LaAVOVH1YthobOYE6MyvupNhEmv2xb8HbXceLkcHfHtB8e dfBf2OWfPhHEzQujan9bSJOB1G7yEZ1J0uBeCBhv4M8GZBqX/efLoKkTNSy9id8uv6Uhhh eIXvfbOaoswCVxGMBlezAPzpH553/epJkGzuyAuozXNinmjXRjlWyb1KAjKx+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=; b=w5ebTCpzPOK5CBV3dmzmu4JHekSVnLzgeOUQDBV9AWdhrx+JPwbiiXgdblTZ9NAlSHlAM3 k5D26PH4z4wsY+8cnzqhqO4xXu8En9yXlhs2Bhv9Qzv9yk6rVgsp9/0Z9RBTdUQJs0n8GM n4AcD4DH4mB1xUTC6MLqXevBeRqWoNY9Q46j+EjyPMVNKgZ8EjHdITr6shr5kkeiezLSbm ZYY4X03PlwBSxXIfaaeOmkM45aSl88KweDuhb522eR2gDD4eOKeMNba7qKkoG5SwTonFBG IDJF4L6fp5ltrGwfMvPICutSdPFI+8T8IMb+YbpeVOasqNbHhj1lVf5Cb/kldQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmv0Fd5z1B9t; Wed, 24 Apr 2024 10:22: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 43OAMcTg065919; Wed, 24 Apr 2024 10:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMcHi065916; Wed, 24 Apr 2024 10:22:38 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:38 GMT Message-Id: <202404241022.43OAMcHi065916@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: d7deb6833d29 - stable/12 - arm: Fix a typo in a KASSERT 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d7deb6833d2948edc63ce7005ae0e2d828561ecc Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d7deb6833d2948edc63ce7005ae0e2d828561ecc commit d7deb6833d2948edc63ce7005ae0e2d828561ecc Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:22:24 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index 9ff0ec110b54..a660722fa6e0 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -439,7 +439,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 11:32:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPcLJ26f3z5H9WJ; Wed, 24 Apr 2024 11:33:12 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (mailgate.leidinger.net [IPv6:2a00:1828:2000:313::1:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (P-256)) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPcLJ0N7tz4CW8; Wed, 24 Apr 2024 11:33:12 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; none List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1713958386; 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=spd8NQ+oav6QL+iDRdb5Z0VgiDnNZ/0zYqGQTPIw0GY=; b=MO8Wd7G7CjG7S8/Q42yGJxB/BaPe6dsWJ1eQQo41JgkRp+akcZ5u7j9FY3vkW0rotU8ceH +G1X7t9DCwv/nPEq19k3Lg81DnOO6iMDf2jt0C6RBcEb+UUgMYshgg8Kch9/SmZyD8Lrn3 A61RkTeolsjn92PJZWmMXp3qtj6n8S3XKql0eySn6i1SXbnQ2YZ014rol9+Py+/qd65fBK BL1SvHq4+OoIlqZP/GBjHp1+jgyluX1RLSG6U+IzXU4DCtXhEGJfLT8GzPtxFzDotFE8aa ehumwGy/Qq/Sc4TUH7gaITYWX+E4MCHDO57ZmA8Y5WRkhPP59hYVIiJqOPnvQA== Date: Wed, 24 Apr 2024 13:32:42 +0200 From: Alexander Leidinger To: Jake Freeland Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f239db4800ee - main - ktrace: Remove CAPFAIL from default trace points In-Reply-To: <202404240029.43O0T4jF051386@gitrepo.freebsd.org> References: <202404240029.43O0T4jF051386@gitrepo.freebsd.org> Message-ID: <1ddb4f99cc141fa6701c0a770382af02@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_169e9ba8f1b0b7778fba92c6a8da64f8"; micalg=pgp-sha256 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:34240, ipnet:2a00:1828::/32, country:DE] X-Rspamd-Queue-Id: 4VPcLJ0N7tz4CW8 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_169e9ba8f1b0b7778fba92c6a8da64f8 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Am 2024-04-24 02:29, schrieb Jake Freeland: > The branch main has been updated by jfree: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=f239db4800ee9e7ff8485f96b7a68e6c38178c3b > > commit f239db4800ee9e7ff8485f96b7a68e6c38178c3b > Author: Jake Freeland > AuthorDate: 2024-04-24 00:26:14 +0000 > Commit: Jake Freeland > CommitDate: 2024-04-24 00:26:14 +0000 > > ktrace: Remove CAPFAIL from default trace points > > The CAPFAIL tracepoint was recently extended to report ECAPMODE > capability violations for processes that do not enter capability > mode. > This allows developers that are interested in Capsicumizing their > programs to determine where violations are being raised. > > Previously, CAPFAIL only produced output for processes using > Capsicum(4) > capabilties. Thus, most ktrace users never received log output from > the > trace point. With the recent changes, this is no longer the case. > > Having this trace point enabled by default will produce output for > all > processes that use syscalls that are not permitted in capability > mode. > This may lead to confusion for users that are not familiar with the > feature. Remove KTRFAC_CAPFAIL from ktrace's default points to > avoid > this. Thanks for the opt-in instead of the opt-out! I stumbled over this a few hours ago and I can confirm that I was confused at first look... until I remembered a commit message about adding more info in this regard. Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_169e9ba8f1b0b7778fba92c6a8da64f8 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmYo7ekACgkQEg2wmwP4 2IZhbw//eGVduCkjhH3DH0TIN2cgizofwfS3Qv8P5hqVL9XvDCJbfKulB+G75w18 cRDMT4EIOneYk5fjGIBb1uE49k6MUFbnKkuazTrObA4XNR9GJeJRp3rNb7RK8S7I WkSha00VjHkcX+PWa7syhhtdkP7SxY6ajVYPx25p32uTUfnSt/4681UNrccQh/W/ 0NNlbcFq5bQFCBH2UBZCVNIiqQGY8f5FqUDqewQBueiAazCNwip5LeQ3PMAx7ZDm KbMYNFhVyIrmKOxxEtq0tuYI+FLErmbH+vsoiNCFFTycZ1uMUdZnUxKF7zv0QJYg 5AL1eAcvjSSYoOT+lgaPM7FgCCgplNImBKj1tMPvY0fZdIrx4d3oHKW13fuULMmJ poXdtbDxEFn4k88yhkRUG4/D6Jh7r1hqB54OEC0oHaaxgxulHvXXyY8/li1nhU2s PDGKj5AwjktVb9S4i1tBGAgq7DdVbo/WAkSqCZRpz+Qcu2/BczyWY/Axf5LnppWU aZNaWLrapFa6YsomGlrHO1MLggWGR19P6Zs79KekNYb96tbuktUmQvlHyQoMHBkQ RVTDfmNsaJOIZyy4D57uydqfvlLUt+4/dGAiAcPpFACC9vyJtf0lVCV8V4QndLB0 Wwkuogf2hI6gkn9cWWZ/2H8DaaWbyQRFemF7RsyWm1vj5q8FKas= =9bda -----END PGP SIGNATURE----- --=_169e9ba8f1b0b7778fba92c6a8da64f8-- From nobody Wed Apr 24 11:40:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPcVV5tpzz5H9yq; Wed, 24 Apr 2024 11:40: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 4VPcVV5H5xz4Cm1; Wed, 24 Apr 2024 11:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713958818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUHWfRUxP5GDtWmMfJ51ZCZmWZKD/kjTfFdWsNtho2c=; b=q/EftUdm/XGccckE8gOVLp2Cn1Tksutw5PwJeIwXreEjMLe9A6kp+z12Kf4zjItga/t2rl b7oOqsHsot/adwMHfKS4gjzaWYHonjJ8zNpgyxv1rEiXxiaiSU5sD0SZgGbKN95Y2ncYln FKtCSkmogT8Rgh8GN8iRuCTyXmZPWQC6KbFnxjQ20SEDvchvxx+DBL1zVHNoGEDzgLiE9Z ZRT4t9mbkySZ8v3p9XVuN49N4qQbdXMJolys1/V8iB9tjAP6DPlGM86WNLYU8YlTiM8AsA 3AXt49loICk3QcAIErCj/JfXjrY7SxONbHKIyz1Q0vTL+aj5qJLDyFX1qv1caQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713958818; a=rsa-sha256; cv=none; b=r/ubo+D1/OadbtTF5Ou45l4vokgAwrZdcV1vASm+Z6oJwc13mSUlnVihyPpY2jomoeR4gj R9z0tr3H1+f2dcg/7gKiYB5IS2oymdyAyeXRsxPvEvRhbJy4Jx/cN1hUoX+QadrWPj7c9/ +BUxsaRQorlttI8rWftvIaIdg1qFYN3CkjudrhvlydgQsYRaBew5Li+5x4N/Z6SOB5s3J8 tRtAX1Kshg5YWUWxE56Xg4PJMREeBkR8h+tGSmRYNcQAMwUK6crXthI3FebYb1r/8SwawA AnwkHlqA00lWhjgdiAyJI90dMj3FnrG3kAxQmuiAM41pKupKv3ajDFxJJ1rK/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=1713958818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUHWfRUxP5GDtWmMfJ51ZCZmWZKD/kjTfFdWsNtho2c=; b=P6ixs5KQNVeUnb4Lrtkda6/jZrTZP5NAMZX5Ti45dAiWaxfcteaZnchz9399kxsOkQQP1m yQ+IqQxJn9OHB4p8SYstg0tDpUA59TVpWe1rWak28VcXcCPSmhMKXFyRMrGWll1XUZShBr tJed6qLEWPUpa+M8aPvQ4YvEnC6BV6Y4LcTIDvjkxXx55D5QGPjQEP+IOpZ5z1qA45DLHF Oi7hhhG8dfC2ZpU9oO+IuoNCFxyS9LBQZdp6rbu9POXVzFsYycntX+Ik8FLz8+zBhAaJkl WiB1CoBmJssyxzewv85hMKmWwWM7HTYbyKvY8yP2DelP4aqB8BtN6sir3MIM0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPcVV4tMSzDdW; Wed, 24 Apr 2024 11:40: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 43OBeIt6093643; Wed, 24 Apr 2024 11:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OBeILj093640; Wed, 24 Apr 2024 11:40:18 GMT (envelope-from git) Date: Wed, 24 Apr 2024 11:40:18 GMT Message-Id: <202404241140.43OBeILj093640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b8e171b73a07 - stable/14 - organization.dot: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8e171b73a07788451ccb64b2af53b105d0a9335 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8e171b73a07788451ccb64b2af53b105d0a9335 commit b8e171b73a07788451ccb64b2af53b105d0a9335 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-18 19:59:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-24 11:40:13 +0000 organization.dot: Fix typos MFC after: 3 days (cherry picked from commit 806bd5e00658e66a5625397335cafa4748112f14) --- share/misc/organization.dot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 1552da1f646e..f33ea0f0dbd0 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -30,9 +30,9 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat\npizzamig, rene, tcberner"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat,\npizzamig, rene, tcberner"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib\n, blackend, delphij, cperciva"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nblackend, delphij, cperciva"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"] portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] From nobody Wed Apr 24 13:17:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffD1rrBz5HKyy; Wed, 24 Apr 2024 13:17: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 4VPffD11Tyz4LQl; Wed, 24 Apr 2024 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HrqYYj9yBMc/Yd8kYNS9QFviZ5xHOsaUpvrTNMNY1A=; b=JH292eo/gjKgtSpwF9aQsnzeIGjsKfKoUBgmLlJiBl1IIjz0qNy2xPxZFeDlIOdEdFctXU arLEZNLbPShud4DGqVgg4zjsVl04l/56vsLdWvtbLlBCiY1eLeILCGNH7pzUMSO4RRVhCs NkpiHpnjUPh5xxFvfkp9TboDkwZVSv+22mwyjx09PQ88+SYbzCpECyGz5rHB91rRCmK0au uJLc0olx4nn2wlL990gSfLYJc1yQrDzdv98XuthEGx+CM8hC5C9KP+ph6ej9JuGCAQLEP3 xm4WdZWPrid+TAQO5+LWcOmOIBkLXU+L2fgf1sw5fy3kcapvY9g00JtONryAiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964628; a=rsa-sha256; cv=none; b=LNOekzkCMRZWO1KAbhOaVQfM4uatZWUxzYtgMDRg1ATINBJGL29QSpgUO+R4+v0YzyFz4a rji8eQ6+4fyrrqJ471FL8lRB/MVn2iZiWRF1Qso8d3zeI0pa8LspT8hwfZyC5OqMC7zJMx G1AixQkbDZDUQ2DKiaN+QEepe1umOrbFlgvElNZvKAmIoqAJGS2FYG1Q1xCcyKqOJKzn/J R+01LcthJkilaZyiEmG/2BgG9Zu40t6ZIK9ioNjYIyglTq6YiYB81SFbSv0h6Je04gWzfP +e3v0ThXCxzOn0D1FeGyo0+1FJghKHLLsJQPxDYDRSkuKF5PnqYoGqw4+oa8Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HrqYYj9yBMc/Yd8kYNS9QFviZ5xHOsaUpvrTNMNY1A=; b=cJ9dBYF5sLMTTZBIPkuk+INxpQJewfTwmR/1i6Q+Kw5A9+0GB0csH9a7aL01Z5Hb0/mHVg 3kxZ7O95YBYhksxFwBTTDYFDth3W/SUv0X3FC8wSeBQZdY8ByC6sIo9tyEMm+ICLK8/P3r QXfZ1CHdIwkxOIQqpDzq3nqlma61AfhcBfrfQEThg2Sw4Ne8YedVJuYVmUZlHmsB9CpoOP NGxuaZkXZU9EIPCtdBf0zk8u8NPfmCPGzm96fzVLUyBr8k03xSh2oo/LLYjwQc7JaXnR1g oCNTh8B5O9KeB35s47eonXMKtO9jCGX1QHSifXyE8YjMGVbhqKidYHSXWbc+uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffD0K8hzH1D; Wed, 24 Apr 2024 13:17: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 43ODH7mY053179; Wed, 24 Apr 2024 13:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODH7Pj053176; Wed, 24 Apr 2024 13:17:07 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:07 GMT Message-Id: <202404241317.43ODH7Pj053176@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: 8512311fb500 - main - ng_pipe: Fix whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8512311fb5004444f43701eb122b6d77c76d7564 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8512311fb5004444f43701eb122b6d77c76d7564 commit 8512311fb5004444f43701eb122b6d77c76d7564 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:50:39 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:40:51 +0000 ng_pipe: Fix whitespace Signed-off-by: Martin Vahlensieck Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index a2966c9a0349..c2424e3db48a 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -34,7 +34,7 @@ * This node permits simple traffic shaping by emulating bandwidth * and delay, as well as random packet losses. * The node has two hooks, upper and lower. Traffic flowing from upper to - * lower hook is referenced as downstream, and vice versa. Parameters for + * lower hook is referenced as downstream, and vice versa. Parameters for * both directions can be set separately, except for delay. */ @@ -195,8 +195,8 @@ static const struct ng_cmdlist ngp_cmds[] = { { .cookie = NGM_PIPE_COOKIE, .cmd = NGM_PIPE_GET_STATS, - .name = "getstats", - .respType = &ng_pipe_stats_type + .name = "getstats", + .respType = &ng_pipe_stats_type }, { .cookie = NGM_PIPE_COOKIE, @@ -494,7 +494,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new, if (new->qin_size_limit == -1) current->qin_size_limit = 0; - else if (new->qin_size_limit >= 5) + else if (new->qin_size_limit >= 5) current->qin_size_limit = new->qin_size_limit; if (new->qout_size_limit == -1) @@ -547,7 +547,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new, } else if (new->bandwidth >= 100 && new->bandwidth <= 1000000000) current->bandwidth = new->bandwidth; - if (current->bandwidth | priv->delay | + if (current->bandwidth | priv->delay | current->duplicate | current->ber) hinfo->noqueue = 0; else @@ -686,9 +686,9 @@ ngp_rcvdata(hook_p hook, item_p item) } /* Drop a frame from the queue head/tail, depending on cfg */ - if (hinfo->cfg.drophead) + if (hinfo->cfg.drophead) ngp_h = TAILQ_FIRST(&ngp_f->packet_head); - else + else ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head); TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link); m1 = ngp_h->m; @@ -783,7 +783,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { hinfo->run.qin_octets -= m->m_pkthdr.len; ngp_f->packets--; } - + /* Calculate the serialization delay */ if (hinfo->cfg.bandwidth) { hinfo->qin_utime.tv_usec += From nobody Wed Apr 24 13:17:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffF2swlz5HL4d; Wed, 24 Apr 2024 13:17: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 4VPffF0z8Nz4L9b; Wed, 24 Apr 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6UZqfSDHpR1KEuMVYkIM0zzSiko82KQkeEQc0Uudtw=; b=gNIDUAw4ip7zIhQyQcmVRkboq908/PlFBlauB/1YgCbOI6p+PCnnkmr4dQLfFcrD005J/n kAxxAKNxYk0OOKF4fV/IM1bkzsrE1BtT/BLxRHN9LBjChZ2lsvcgO/E8g2C/2D8o1TXLJV YWPSDYWfMGB4JuCzh53XrykGhDBauqsCrYv+KzZDdOAA3ufTW6KlNOXrNXyhyFTkx+oDdL OkIXXSXGKaqDG6xr7Pba/PVS9SDt0gTfnu3xh+U805FWOEuAxUMMH+LNNYRo2eceQ1mUht nwbFSDDVJGHeoog1i1PfvoJzqMyYKdoOUpnMZwjBEzbVStY9AsyAqU1MrsayxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964629; a=rsa-sha256; cv=none; b=G3UU5i3wZwe5egk0b8ikfjfRYsmTNAxVr3DpeDyDPtMVD/k7vYoGp/mr3qWXP98UKmZJSu nIc6T6A0c+9F44LKhnTltgzWH1J2+n3d8i8uATHOQKkaA+EaMi4NmTTggWlWiP1EEw/m4l CQz0lveJ6cPpnK6ckt5jm9u4Oii9cZjUFHWw7n0faaYm9oYLHO30TvnxEl6aanEskUXMg/ SNJvXXRuCL9CTqGR8xSwx9wve9lSQjAgD89oPXrpV2ZyTMCx3JX0Lzp40SwC1sig5zsymw MG4rNFRrlQzYj+Z/eB13OI6N2vYi9q8nyqfQBjIwxBbdcfPRl6m7yGgyUWL2tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6UZqfSDHpR1KEuMVYkIM0zzSiko82KQkeEQc0Uudtw=; b=OWtEUCcQ8NF5dCygmczAq40woPB90G0cj6vZ8Akv0ja9Ul1H1qAqtcyelBtbA+V0yy2Cw6 7GxDZKxW7uDkxM/squim18EGi7BzGShTrlZ6vOHTL23NgI7C2824GRyljPGzBmVynIvFyz IWNfLEi1nTO6khMs2g//WS31OF6EEXBFtrUJLjUYK7aCFfFATpcS/ZSSBpGIHLsobnb5D/ ImhYzQVWXUcyKrpUb2N59dRBvuNnPHBLkGCKzWafkjuBPogwhiZXy+Fx8Yb5OxdYAYHz4I 2GRCibemXgtnJJARVCIpf2CvhnMK+t7ua0MIaFtlhI+PgKkMpGwxsZrN4sYcyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffF0b1JzHHl; Wed, 24 Apr 2024 13:17: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 43ODH9MM053230; Wed, 24 Apr 2024 13:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODH921053227; Wed, 24 Apr 2024 13:17:09 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:09 GMT Message-Id: <202404241317.43ODH921053227@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: bb2ab7a374b9 - main - ng_pipe: Remove node when all hooks are disconnected List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bb2ab7a374b9d81f8368acc506c9700af20a22d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2ab7a374b9d81f8368acc506c9700af20a22d6 commit bb2ab7a374b9d81f8368acc506c9700af20a22d6 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:51:40 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:44:50 +0000 ng_pipe: Remove node when all hooks are disconnected This is the behavior described in the man page. Signed-off-by: Martin Vahlensieck Discussed with: glebius Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index c2424e3db48a..7afaf24f5914 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -936,6 +936,7 @@ ngp_disconnect(hook_p hook) struct hookinfo *const hinfo = NG_HOOK_PRIVATE(hook); struct ngp_fifo *ngp_f; struct ngp_hdr *ngp_h; + priv_p priv; KASSERT(hinfo != NULL, ("%s: null info", __FUNCTION__)); hinfo->hook = NULL; @@ -962,6 +963,12 @@ ngp_disconnect(hook_p hook) if (hinfo->ber_p) free(hinfo->ber_p, M_NG_PIPE); + /* Destroy the node if all hooks are disconnected */ + priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); + + if (priv->upper.hook == NULL && priv->lower.hook == NULL) + ng_rmnode_self(NG_HOOK_NODE(hook)); + return (0); } From nobody Wed Apr 24 13:17:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffG44wrz5HL00; Wed, 24 Apr 2024 13:17: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 4VPffG1qDwz4LNN; Wed, 24 Apr 2024 13:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1BNERdWaeDsoKR2DutVKVED6BTgIdvpZOLVOcxdsNc=; b=TyCUmwi4/abXyT1PS3KrVRlfqZAkk5qCuijqDryHvK8gvG68ZarK9tKMsFqukukGmg2miD CDjIKmbeBx1eMcN5F3mIfDPuds0y49gqGnmMRqUou+vFtl4WxpBXolZigwaCsRin0L1Npm wdscADziGIulZ+WrVyEuQtaK6hLF2akFUl/z1V+1KkRZ8SX5eQ/cqoE96uyILFsEifNqBS 8e2EolBOMvKHaHO5bPbFqoGbKbuEhZE11tCbhtGz/PaIJndMCQ4cL4O9+QNt35s7bg4dgv l29g+yX5li87NzXkc7GFAt4OpggJ+rVXLwV3WJW7GE3laYHD7ND9zf4gk7/fqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964630; a=rsa-sha256; cv=none; b=wAk2QWtTDPJ2AUmmIoqnJGTlbWvtshF+aLefDgmHJJcKq9dYSiz/UoutsWWzHQIJrc3eJr qEKE6j9Z09KAn3ApxgAfTN3gEGZ/MatNuYYJgvZRtubzPzPwVXEAjEbzcN9mxJjlrEaFe3 PwfN4iK71lik6uSL3YaWT2SPRwIvP66lIDrLVaZIBEN3ZoEO4f4U98F5SG0FXmOuBTBqYB D/oSqzIrCYgi6Pa2Km5Hysjzv+W2Vve1zNc3wePMBk2vuzivfpAeaUamDvmBI3aA7ZDKIz M322TG9HjizDYhSXrks6HFzyUMdN6sJFU5ZbIVnURCs9etYd09JcSWKrb0iAeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1BNERdWaeDsoKR2DutVKVED6BTgIdvpZOLVOcxdsNc=; b=C+KPPRgKzeXRkqFKXymAePNYy5wGHE21C5hBSnAsEhO0ljl6WJr0mmE2s8CJ9+QRRXooPQ GlMm0hYSKHo2i2spsPqKB3dIEAfUS3H7HDM9iFCykX2xJ6XuQML+6GaFZRbauEugVHGJcU d60gh+DL41obotASKF4a2Gonnyny4a2n64fUa/Pvi97t7yyqS9TJoOCtMqOzPi4O6Hb8PR lOOg+eR5QVJ4qph1BOO5jsX5/5C6KWCD0oR3I/nJUJ6goIJEbL/CorbE/K6t4gCMjggndA rDKSd7pIABY4Y8ugR23cd4rH9Umi6ROYneLhq8nMZcCFEL99IU/e9DovaQioVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffG1QJNzGqF; Wed, 24 Apr 2024 13:17: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 43ODHAq3053281; Wed, 24 Apr 2024 13:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHAMQ053278; Wed, 24 Apr 2024 13:17:10 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:10 GMT Message-Id: <202404241317.43ODHAMQ053278@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: a3ecf8c78636 - main - ng_pipe: Replace deprecated random() with prng32_bounded() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a3ecf8c7863683e53c77a17f96ab7012352265b9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ecf8c7863683e53c77a17f96ab7012352265b9 commit a3ecf8c7863683e53c77a17f96ab7012352265b9 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:59:22 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:44:50 +0000 ng_pipe: Replace deprecated random() with prng32_bounded() Signed-off-by: Martin Vahlensieck MFC after: 2 weeks Reviewed by: markj Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index 7afaf24f5914..d368c142b1ab 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -771,7 +772,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { * the original packet... */ if (hinfo->cfg.duplicate && - random() % 100 <= hinfo->cfg.duplicate) { + prng32_bounded(100) <= hinfo->cfg.duplicate) { ngp_h = uma_zalloc(ngp_zone, M_NOWAIT); KASSERT(ngp_h != NULL, ("ngp_h zalloc failed (3)")); m = m_dup(m, M_NOWAIT); @@ -814,7 +815,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { /* Randomly discard the frame, according to BER setting */ if (hinfo->cfg.ber) { oldrand = rand; - rand = random(); + rand = prng32_bounded(1U << 31); if (((oldrand ^ rand) << 17) >= hinfo->ber_p[priv->overhead + m->m_pkthdr.len]) { hinfo->stats.out_disc_frames++; From nobody Wed Apr 24 13:17:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffH3Pr8z5HL01; Wed, 24 Apr 2024 13:17: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 4VPffH2bdwz4LWn; Wed, 24 Apr 2024 13:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZcOXL59KsefQIMUd9MK//Yhh0K1ciwYRVjirGY9XaY=; b=AUQUrQ92dml2u6kUtzTTY+vzimb/YP7xQPPELHBhusb0rnWePJECEYgkG7Lf9wHo3v5u2g Xywuoc1CWcxFluXicf4b+Z+aybOqsautNiUg/xLGixDR+gRSXzq7wXi8k+wT71IxWs56g9 9L/eLtkzV0/+n86WVDpMaXhxdU+zApJN0CI/0j6X8K9trVhGSSFhI8k7C+lZCGats9qmIL zgdeBgaSRG4j3qNNi/fSclvsGlQkwHpWOIu6eIMzZHL6raec9w6WEY/nVfyXO8TT8kwTMu G2iw7oMIjJNIHSoD6UsA0MttaOrNPG1IRL7GM5dqHdKfj30HhVfTgFsad43fxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964631; a=rsa-sha256; cv=none; b=WCNedQQkOJQ6sPbHXC5qt5Y/wuwDazXC3+nYyjFVfux8qjSNejiNuMcR4Uj3xcBCv/Uh/r ghKaS3YchdsEKuXSMMcNVhMY5M6MQcgy6ukCNwi7c2kZCvCcpK/gzOHKhiUIPmIvxKfM2p IdDWvkw8v7kDJbnW3llMDH8MjVjNOszDAMhSmvF44IxfHyesDOnmXjlT7MqlY5CtlqFNjC 1l5ZN1QqSrRsVqPGggbES641wSAn0kTb2BKomOppYYGhjt3cH7916B7cz5YN0AX8pl/ocH Pd4LiOzkVzze9pQ6GAgyItmjEAmdnmS5ygeNbkonUYVJ3LZwbL7JRhBc4FDUVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZcOXL59KsefQIMUd9MK//Yhh0K1ciwYRVjirGY9XaY=; b=oEOvpj8G8h9wVreo40HhGx59hMNWVHHXZTbSevgPYrFNVZKPFouAbiW3oo5aAwR1/7DId4 xbGNKA2yhet0ebc6azyllEmb1e6hxyGkVIx9GkzsL+5j4OfxblbTrDUs2IhQmiSIYWadQX o6/tMEQk8GgKWli/z/Kh9V3VAqQfCI6IembcaLDq3QZxQwublt8jrstaZX3E4rDK5tLgYg u2n8pSYCpybSwEItI5htWnbblQ+HvH6G5WLqwUr9zQMz+/LbGuuPv/hjU+dFJMEgJdsn42 2PJGIHwHemz7uqxeKB8agZvlWb6sHNl7OAJrYLjKkCDnWW5hAODDYRxlzr1oeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffH27P2zGqG; Wed, 24 Apr 2024 13:17: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 43ODHB6L053340; Wed, 24 Apr 2024 13:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHBiZ053337; Wed, 24 Apr 2024 13:17:11 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:11 GMT Message-Id: <202404241317.43ODHBiZ053337@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: d44c78074d87 - main - ng_pipe: Do not panic when memory allocations fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d44c78074d8738db67a2fa6bf07b630c61eee6ab Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d44c78074d8738db67a2fa6bf07b630c61eee6ab commit d44c78074d8738db67a2fa6bf07b630c61eee6ab Author: Martin Vahlensieck AuthorDate: 2024-04-17 19:01:34 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:44:50 +0000 ng_pipe: Do not panic when memory allocations fail Signed-off-by: Martin Vahlensieck Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index d368c142b1ab..42a5991e8dc7 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -641,12 +641,14 @@ ngp_rcvdata(hook_p hook, item_p item) } /* Populate the packet header */ - ngp_h = uma_zalloc(ngp_zone, M_NOWAIT); - KASSERT((ngp_h != NULL), ("ngp_h zalloc failed (1)")); NGI_GET_M(item, m); - KASSERT(m != NULL, ("NGI_GET_M failed")); - ngp_h->m = m; NG_FREE_ITEM(item); + ngp_h = uma_zalloc(ngp_zone, M_NOWAIT); + if (ngp_h == NULL) { + NG_FREE_M(m); + return (ENOMEM); + } + ngp_h->m = m; if (hinfo->cfg.fifo) hash = 0; /* all packets go into a single FIFO queue */ @@ -659,7 +661,11 @@ ngp_rcvdata(hook_p hook, item_p item) break; if (ngp_f == NULL) { ngp_f = uma_zalloc(ngp_zone, M_NOWAIT); - KASSERT(ngp_h != NULL, ("ngp_h zalloc failed (2)")); + if (ngp_f == NULL) { + NG_FREE_M(ngp_h->m); + uma_zfree(ngp_zone, ngp_h); + return (ENOMEM); + } TAILQ_INIT(&ngp_f->packet_head); ngp_f->hash = hash; ngp_f->packets = 1; @@ -733,7 +739,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { const priv_p priv = NG_NODE_PRIVATE(node); struct hookinfo *dest; struct ngp_fifo *ngp_f, *ngp_f1; - struct ngp_hdr *ngp_h; + struct ngp_hdr *ngp_h, *ngp_dup; struct timeval *when; struct mbuf *m; int plen, error = 0; @@ -768,16 +774,27 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { } /* - * Either create a duplicate and pass it on, or dequeue - * the original packet... + * Either create a duplicate and pass it on, or + * dequeue the original packet. When any of the + * memory allocations for the duplicate package fail, + * simply do not duplicate it at all. */ + ngp_dup = NULL; if (hinfo->cfg.duplicate && prng32_bounded(100) <= hinfo->cfg.duplicate) { - ngp_h = uma_zalloc(ngp_zone, M_NOWAIT); - KASSERT(ngp_h != NULL, ("ngp_h zalloc failed (3)")); - m = m_dup(m, M_NOWAIT); - KASSERT(m != NULL, ("m_dup failed")); - ngp_h->m = m; + ngp_dup = uma_zalloc(ngp_zone, M_NOWAIT); + if (ngp_dup != NULL) { + ngp_dup->m = m_dup(m, M_NOWAIT); + if (ngp_dup->m == NULL) { + uma_zfree(ngp_zone, ngp_dup); + ngp_dup = NULL; + } + } + } + + if (ngp_dup != NULL) { + ngp_h = ngp_dup; + m = ngp_h->m; } else { TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link); hinfo->run.qin_frames--; @@ -983,8 +1000,6 @@ ngp_modevent(module_t mod, int type, void *unused) ngp_zone = uma_zcreate("ng_pipe", max(sizeof(struct ngp_hdr), sizeof (struct ngp_fifo)), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - if (ngp_zone == NULL) - panic("ng_pipe: couldn't allocate descriptor zone"); break; case MOD_UNLOAD: uma_zdestroy(ngp_zone); From nobody Wed Apr 24 13:17:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffJ5SGTz5HLDl; Wed, 24 Apr 2024 13:17: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 4VPffJ3fNRz4LNg; Wed, 24 Apr 2024 13:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GI5tq0QnjHnIpgL9vIPGfqnT/tCmM7G9EWBxwkmk7A0=; b=W8rtj/xMfuoscEDcFS5lu0/RrcklynH2TRg/PkB56R7RIyXthG7dG+DBlePF8MlQ7i/jln Iz4p7K3AZKwpEEDjhnbaUwC9vb907M0RE/q6EgBEl4giD8Ty+M6ketS/MzXa6Yil3ZhfrK xjc13ld1gy8mZIGjdt3zxtoFEAWWJkFi3yweHhRLl6YJEBCLAV9sNpMrkjXOSwSjHLZ3lG 78a368RMvGzYr0/WLEoGk3Xvb0XvAHhky9vGvGaxnOEyFgL0rG6uOB/VQ0plxqzsR294jg H0YFf73Tn3fhsp2ljcDpr7t2gLC2VLJjbaUf/D7MaIQiVS7Ad2mxB0Yns3zXfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964632; a=rsa-sha256; cv=none; b=PE4BjKx3PblgDQ4pBds9+1bi8AZUhZ8u9pI4FVR0zOqJ9EGC6eGCVKjaW43MYZ15stUGDk djerv5+fMJTkMz2dGBGXcNRbtKAaQZ7BCqUE8VhVuaWvH5K+CVpf0Wi57sXQi9cRW7q0E5 2ecVLalEsCMCiqo3geDfwzco3d1R/+aaPN1jBjWT775ZQO3vBRZcTbPWX8rl7Aj8W143nc YUGR5PQJKUCBvjMU2kobWBUxdCE34INNPVqw9ePlikqccKNTi0qE/iK9qbhEYF0JCsEUZH GPK3yJxU/BpwewZ84uo1tGX7jWVWgqyF4TpPPdIN+luRUep1undKHWsSFP1E7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GI5tq0QnjHnIpgL9vIPGfqnT/tCmM7G9EWBxwkmk7A0=; b=VoWA7s9jrDhzYLueu0NEjyKs79/P2ck2klRr2VMj6nH2wu+R6QDftYBwofWvsdHpH1vF0t lQIzpXLOX3fAt3aLOtxnwQTSvE5I/P19tP4JlVM6lcdEfQMcgUXaniO+CbAhQafK0AAlrl NWGJ6TQNAcKFdJf8lMwbECA2V4725gg9jJmUk1zlfCcG1ElgpOXjq60p9IkNuAojeKh4sQ 6tnDrcV0tZf8KSsIiPH1WSqksciiOLRMUPjY2uZ7mDOyHTrBShPzP3Ii+i8XniMhN3rsEJ B3qPPYe+1S7fqaWtJrQ4nK4nOfMYb/a3gMrGxJ3yY8EZ/z088hbkf3lyQ/qZnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffJ3CNfzGdr; Wed, 24 Apr 2024 13:17: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 43ODHC9r053382; Wed, 24 Apr 2024 13:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHC9e053379; Wed, 24 Apr 2024 13:17:12 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:12 GMT Message-Id: <202404241317.43ODHC9e053379@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: 964064937ea0 - main - dpaa: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 964064937ea04519bd400668dc1ce38848d50901 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=964064937ea04519bd400668dc1ce38848d50901 commit 964064937ea04519bd400668dc1ce38848d50901 Author: Mark Johnston AuthorDate: 2024-04-23 16:18:21 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:45:24 +0000 dpaa: uma_zcreate() does not fail No functional change intended. MFC after: 1 week --- sys/dev/dpaa/if_dtsec_rm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/dpaa/if_dtsec_rm.c b/sys/dev/dpaa/if_dtsec_rm.c index 62ea8ba74e9c..0b9f8e0ae6c7 100644 --- a/sys/dev/dpaa/if_dtsec_rm.c +++ b/sys/dev/dpaa/if_dtsec_rm.c @@ -115,8 +115,6 @@ dtsec_rm_fi_pool_init(struct dtsec_softc *sc) sc->sc_fi_zone = uma_zcreate(sc->sc_fi_zname, sizeof(struct dtsec_rm_frame_info), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - if (sc->sc_fi_zone == NULL) - return (EIO); return (0); } @@ -312,8 +310,6 @@ dtsec_rm_pool_rx_init(struct dtsec_softc *sc) sc->sc_rx_zone = uma_zcreate(sc->sc_rx_zname, FM_PORT_BUFFER_SIZE, NULL, NULL, NULL, NULL, FM_PORT_BUFFER_SIZE - 1, 0); - if (sc->sc_rx_zone == NULL) - return (EIO); sc->sc_rx_pool = bman_pool_create(&sc->sc_rx_bpid, FM_PORT_BUFFER_SIZE, 0, 0, DTSEC_RM_POOL_RX_MAX_SIZE, dtsec_rm_pool_rx_get_buffer, From nobody Wed Apr 24 13:17:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffL0JNhz5HKrf; Wed, 24 Apr 2024 13:17: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 4VPffK4YZZz4LXH; Wed, 24 Apr 2024 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYx9mOH5/ypFOxAa/KVAben5Fu0zsyjHN+B0Sl2O010=; b=Gt+U0jj27EGQE2iI17T6NzUTTdhmUCC0edAXmYO1V3Sybr7fBt3tOFmiyyvlAmdo/35+hR KWAFA9Tgwu2TYpXRLXcJs/cTTzkxOD6Y2ypkCM0EZ+IYJK3ShbGTuUMpGO99a6pVE/zdGQ aigfoL+/Vjiq/fhBDN0EZB3Evnn2MDI9hxibaBdTmM5eRAbs+OdvpsWTr7R1LJCvv5kp/E Kl9OEO0ieGPR9wapZ8WQhbB4pxI9aigP+SQKEjWvjWEAJ+kGr8nAq5SHy3twZLoei3BdaU NXtty6/0W3eIqEWqyFYABmqM1bldqgUDo2E0DtZcz9shlaPAgjdKkidSOEYubA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964633; a=rsa-sha256; cv=none; b=oCtyRlLhvEYcRzp4s89ucKigbhIRXfw5WqXVu6Fvp7DXpY/DlXIxrwj0z6Lz6tGx/vTnY6 Z4aHkzsckSDKqPkxOr/opvZVbKy9+JElMSpZTnBqTaj5fwIPwklvmYK/vyOAZxrWTW+yLy mIN+x9szwWQBJqevSvxF2DrXT9Bdw8dfk15RKZSvnHbUacFFRvDi3nAU+R/Cl1z3w4onuP 9BiMJyo5sZHvYBN7ibYwbG8boxcvhVl1nDwOEk2hbf0GtQg3XxUzT3jUEdbeHDRacJoX9j ZI2R+ZBVxHWno/AUHpbz0h7k0VlzUSnLOQhv7Nx2ydxL1K3faANRQwODJPm7Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYx9mOH5/ypFOxAa/KVAben5Fu0zsyjHN+B0Sl2O010=; b=akrus5bq0cyjrv4ZNeTrYMii5VPRq4S186jXslkSp7S+Dj3YBBluyUv+SNNjt2T9cJn75C Ubt7mOGMz5+r3RT2SvEgdHx2YfmqKSZ2Q97pRAQRT/n3JByYX6DCpMxnaMb42mv9KrDNsC u7my36IXAj1I4sfvRP4aK+k5ANQtUdiec+/U/D0BfK3isdpbrsCqxxUfnFcGO9KXKkE9CH St8GVmV/G253+Vjj947a3ZVcpFwlc7hgQNIif8MZHZu+Tk7k8yaBbQwr0aVPYfNqBGF5zJ s24aq6wHGYUoKM7HRTPoxqU0CkGq1bF56g3VGXHbAywptqNKs+rd3q0g+nElWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffK45cFzH5m; Wed, 24 Apr 2024 13:17: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 43ODHDLk053425; Wed, 24 Apr 2024 13:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHD6K053422; Wed, 24 Apr 2024 13:17:13 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:13 GMT Message-Id: <202404241317.43ODHD6K053422@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: b6a0ed7c78dd - main - wg: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b6a0ed7c78dd45937e404706620467bef61c308d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a0ed7c78dd45937e404706620467bef61c308d commit b6a0ed7c78dd45937e404706620467bef61c308d Author: Mark Johnston AuthorDate: 2024-04-23 16:19:08 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:45:40 +0000 wg: uma_zcreate() does not fail No functional change intended. MFC after: 1 week --- sys/dev/wg/if_wg.c | 6 +++--- sys/dev/wg/wg_cookie.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 57caa69bde3b..d0b75d5cbf4b 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -3135,9 +3135,9 @@ wg_module_init(void) [PR_METHOD_REMOVE] = wg_prison_remove, }; - if ((wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), - NULL, NULL, NULL, NULL, 0, 0)) == NULL) - return (ENOMEM); + wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), + NULL, NULL, NULL, NULL, 0, 0); + ret = crypto_init(); if (ret != 0) return (ret); diff --git a/sys/dev/wg/wg_cookie.c b/sys/dev/wg/wg_cookie.c index 6ff9325c6613..80617d473471 100644 --- a/sys/dev/wg/wg_cookie.c +++ b/sys/dev/wg/wg_cookie.c @@ -85,9 +85,8 @@ static uma_zone_t ratelimit_zone; int cookie_init(void) { - if ((ratelimit_zone = uma_zcreate("wg ratelimit", - sizeof(struct ratelimit_entry), NULL, NULL, NULL, NULL, 0, 0)) == NULL) - return ENOMEM; + ratelimit_zone = uma_zcreate("wg ratelimit", + sizeof(struct ratelimit_entry), NULL, NULL, NULL, NULL, 0, 0); ratelimit_init(&ratelimit_v4); #ifdef INET6 From nobody Wed Apr 24 13:17:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffM1BJFz5HL56; Wed, 24 Apr 2024 13:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPffL5TJXz4LXP; Wed, 24 Apr 2024 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Vgh9gn99OzncbM5AVF/ohN9ecUfPHkbAh08PvMTSoI=; b=IXlffjrASyUEX8WaDouJAXtzIwjJeJx1sz/CMA7S0rNRBr+NS+gUGp5Rc/ptLy9zss6JBt dRIZr/9sc+OpcPwkp8gHgiE8PXrme3975Za5A7OhTsHDVNaLizWZHpG9fZYJZsms3jMOe/ xT1w1WE7HpNINfTkbbzmUIl0mCbuWfQn28FDHGtoyGhh4T/mBscy7QNiGmWUCzV4ull5RM 9bcsopTidHFq/T81bseRdJCbpJR4mFfvg9VE6iGgF4mcQ22OOLSh7uS9GveyUiqUiGEfJw Zt4f/scIdZ5q1n/xsUyEsSyGoCsYwBkkDCkgqr6dzKzF+4yj4tqpImseU5w9kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964634; a=rsa-sha256; cv=none; b=LqkMvL8EL5S83gZyOrtaAEwpOsiJfFsRdVcrJh5FaZA5jpfhGBzfQSHW35urU9j7+ki+5y pZnFJvcpvMdmzy+pxPC6qGlSaEYnOBjuL8HwZkfkGxjyKncREb+felxJsNkXNmO1ytUpkm 3eyq+A9RtxB2XyIPK4R6HLcWoVQKXhvI6HQUgyXq7fcOufZ5vK96fgRDUqQ70OkIMe47Vy crwgspf0KwrXk9kB9AjhrF2WYIBggpGkgIvy7hoSHZtUnJd9xYzE5yLYFFb01zoiKEdQsQ c8JaEz53UW4BfWKnU/+vVwmJuFdU6hiSKBST4AxmCipHtjOo5Byp5QgnqsuFUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Vgh9gn99OzncbM5AVF/ohN9ecUfPHkbAh08PvMTSoI=; b=A0zwAXYxUD5lJBxoicyU+jVsSP+S1C26MRT6M25HaMs2vCOc9tMLzXdPTiGmC8uMKVJ3Rx PW3X3pwI+lbLMTjE5KVx6XNvm1ccwOVGm4yQQ/n4R1MRGXZuSXJLdVupyIFyRafWWXSBNU uX4ZSguYcBtyQE5kYmYMoW1L3EowaXhcxmH/Dievkso0Wg3qx+qhlGkvVso5DP2UEM9WZm ZXk3gMfW42IgzhpI6CqwDGJtQyaDYgasVFLaoYaSiiTmBu/qdmFpw+HBoy1fWpPvWMrYKc HpPKZj0QrZ7TReBln5H3+5bd/FhR9sG70W2JNHw5Ml9JkOAZjH4f3QnNClNH3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffL553RzGds; Wed, 24 Apr 2024 13:17: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 43ODHE2Z053467; Wed, 24 Apr 2024 13:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHET5053464; Wed, 24 Apr 2024 13:17:14 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:14 GMT Message-Id: <202404241317.43ODHET5053464@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: 78c51db3c492 - main - udf: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 78c51db3c4927db2437ec616b33ba1faf73f08ee Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78c51db3c4927db2437ec616b33ba1faf73f08ee commit 78c51db3c4927db2437ec616b33ba1faf73f08ee Author: Mark Johnston AuthorDate: 2024-04-23 16:20:50 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:45:59 +0000 udf: uma_zcreate() does not fail While here remove an old comment regarding preallocation; it appears to refer to an optimization that is almost certainly irrelevant at this point. No functional change intended. MFC after: 1 week --- sys/fs/udf/udf_vfsops.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index e844a4e540f4..866d0172f745 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -140,11 +140,6 @@ static int udf_init(struct vfsconf *foo) { - /* - * This code used to pre-allocate a certain number of pages for each - * pool, reducing the need to grow the zones later on. UMA doesn't - * advertise any such functionality, unfortunately =-< - */ udf_zone_trans = uma_zcreate("UDF translation buffer, zone", MAXNAMLEN * sizeof(unicode_t), NULL, NULL, NULL, NULL, 0, 0); @@ -154,12 +149,6 @@ udf_init(struct vfsconf *foo) udf_zone_ds = uma_zcreate("UDF Dirstream zone", sizeof(struct udf_dirstream), NULL, NULL, NULL, NULL, 0, 0); - if ((udf_zone_node == NULL) || (udf_zone_trans == NULL) || - (udf_zone_ds == NULL)) { - printf("Cannot create allocation zones.\n"); - return (ENOMEM); - } - return 0; } From nobody Wed Apr 24 13:17:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffN1mvKz5HKxY; Wed, 24 Apr 2024 13:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPffM6S3Fz4LPK; Wed, 24 Apr 2024 13:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIqwoXlr8LtqKxU4q9uvd+W1sP2dRfyc2+z8WpYoRDM=; b=AAH7YNq8UHK9knX2RPZnI/Dk6usBDFKTsMQKK/cyFbf8OVrI7GwfMUK+5yf8QB3T3eC1xA 7NkBS/BVKnBCKY9g7Wy/3PtGCHFu30sPwSxlGwpeOisYa2xJkT/mvbCuQMwSnLl37Sxmhp fM+vmxMW1qzOxpJeNlYcvKhK5qg9LxOf8R899U0ucrV7dArO6v3vpV+fHzrV6pOyQQOa7S PTy4nciadwdi7ojevLdWfpQhIoK7wlkb3/mSmCSrgicVhG3vjAgZCqK0+C0G161peKYd+I ifxgRmaSQKMMscl23b2+f1o/zVYNdFv6wku45gsAKTiflr4Iq5HoIwL2OlsMBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964635; a=rsa-sha256; cv=none; b=ACzxnfuh68v61vpiRy8TutzfYTVCw6zYOW2kzTsR3zaNxBr2HQifBlBCVTjMgjXZOqIs3T AT+bWBibmRNVQkB7BC80Vam+t3QC1nn+0j84n8zkqzt/XTNYjAzCLmqDkeQkzvxVL7AyF/ wf/F0Eg38h9TzMnsw4SZSOrcfO6SpYobR9FUOg5Z6D3xoBDLOi8vjjeXwZ3fQMFXBz1NpS W1AXm0JodwzO7ivH/INCaHU5+rUiDTB+m+fEe0wGMGe3aKy5x9XR3CyCuhIDYe7rKD4EvO THLxT/pq9d4gbcr83K7SUC/fROWvGVmt0rn0lEBodK5x4wQSnJVsaNCf/hY65Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIqwoXlr8LtqKxU4q9uvd+W1sP2dRfyc2+z8WpYoRDM=; b=AhXgtmSOftGTA3HFJJ9sswNALdAPQZIdAOVC7jAyHG/lk5PyyeDd93KrGjKk98CL3wyyGv UWQSpqq/WvWzTMPbBrup/Q57rcwCYEkLTygnValUXgbW21THRhgmN4qFOK2eB2u6UU3dJm vv+28FDX4ZF396XjJE29oTp8etvrtWPhZh2Om5uBGigSzmj82zz04p0Yi6KUumjcNbnhCq x2Ij1oDNE8AOCkSMWWChTpYdrGStTlJvjs4xuijMe/aKEDDISE+2QOhDYGNJZ9mToTyeYK Y3gtHwA8qOIyEhCSM0HEURAGw3xUlREVZbzBUbzsS4FI04bAgq3mYjj73uzbzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffM64KszGqH; Wed, 24 Apr 2024 13:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ODHF52053513; Wed, 24 Apr 2024 13:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHFtq053510; Wed, 24 Apr 2024 13:17:15 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:15 GMT Message-Id: <202404241317.43ODHFtq053510@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: 1e607a0753ff - main - khelp: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1e607a0753ff93847926a46003fe74087426b580 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1e607a0753ff93847926a46003fe74087426b580 commit 1e607a0753ff93847926a46003fe74087426b580 Author: Mark Johnston AuthorDate: 2024-04-23 16:22:27 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:46:35 +0000 khelp: uma_zcreate() does not fail No functional change intended. MFC after: 1 week --- sys/kern/kern_khelp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c index a5308756b2c4..1ab56780f394 100644 --- a/sys/kern/kern_khelp.c +++ b/sys/kern/kern_khelp.c @@ -330,10 +330,6 @@ khelp_modevent(module_t mod, int event_type, void *data) kmd->helper->h_zone = uma_zcreate(kmd->name, kmd->uma_zsize, kmd->umactor, kmd->umadtor, NULL, NULL, 0, 0); - if (kmd->helper->h_zone == NULL) { - error = ENOMEM; - break; - } } strlcpy(kmd->helper->h_name, kmd->name, HELPER_NAME_MAXLEN); kmd->helper->h_hooks = kmd->hooks; From nobody Wed Apr 24 13:17:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPffP22Vnz5HL59; Wed, 24 Apr 2024 13:17: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 4VPffP0Nngz4LVY; Wed, 24 Apr 2024 13:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6VOrtbhapOul468S9KTbI3r4JtAYjBtE+9HnqYvTtj8=; b=yjkX1PBb3fjbipEep387guWUl3rctQ9gpyp++wP4TZET+arSWj+nOFsK2Si9ZaVEvpIchO TQ8A7hDxCk0Pmgjh1KnN456cX36uk5z5twAN/RI4EmSosujztZm7UVHgnV8y20JZ2wBhrH cwkLjK28AbtneYCgQcNv0GRar9/MkPXgBnyLT2gjaFE1CKpsjilfAPMg96+rjxWBXcWjlH Wai59KVUrp7qoS9RKZXfN2r2qVMmo8XY6G5eUVrb0ANqhcSiDs5yTJ8vPmo5rGsVNy12Qe ymbLFdAPkP33gM+UboY1Y6YhGiXefqlSvGn75NZm6OKF5K50ZvFxMQmJVkf84A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964637; a=rsa-sha256; cv=none; b=QBosIUqDSQlCSMJQZ9UXz/yHRTsE2sSWrdIByhHaKQsCIR+yVYePY05QkTNENTljpHJErY XgQGHPX0XRCEDER0hQSlQ9dc3YpXrdo2GIyS5zXMa//+c1x1qQUc5NF4Fw+SoHh6/qDHXe Z52Ta1n6faYBBzHSsE8lfAdMW5ETG1E4sDKgHrS+feW03EVTfmhS61BIQpnA38s38C4vXd c02FH5v7lMBZHS4+2bLisQw7vP6y8iGdS840nm7SCD5v6QSVfJK/BaLNGbk9Fu9wkrKhud oaMn0n4gFk/kwTID3L9D4mdTvBpGmO31P3uLIFEPOl0dHWCw88AppANmduMeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6VOrtbhapOul468S9KTbI3r4JtAYjBtE+9HnqYvTtj8=; b=IeMryzzlkRvZMo+KFVZxs6b65Dq7UcSrbNj/9GMKpl6Zggs3TY6UPB+xtPM7JkHULvxPT+ Sazc7HfKgmKV9cGlUagy5vVjZmleij41Ks6QUcuJWEGRLQvCWo57WDQ+qxvf/GeHV7AJTQ RG4Drj9IJrLpgz/36tsYRrzCwwj8G0dfDy1dgBTsYs5sdujiKZ4TyzEak8MGOaJ5sVl5yI kB5JMCyUf+/b7ozo00FlQ+xwt0bbAkwnWQG3rOuVlP22FlHJDX+Q2piHJikCnyuRB7ZYyz MeSninKy3H5qMa9M/LgANY/iBuzGL79cu1mOAUJtPECIDlU1G2ylZKJ6jJRaHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPffN75YlzGqJ; Wed, 24 Apr 2024 13:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ODHGx9053557; Wed, 24 Apr 2024 13:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHGjU053554; Wed, 24 Apr 2024 13:17:16 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:16 GMT Message-Id: <202404241317.43ODHGjU053554@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: 8ef2c021822f - main - busdma: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8ef2c021822f59a334e3926e8505c8a8e8a3475f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef2c021822f59a334e3926e8505c8a8e8a3475f commit 8ef2c021822f59a334e3926e8505c8a8e8a3475f Author: Mark Johnston AuthorDate: 2024-04-23 16:23:13 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:46:41 +0000 busdma: uma_zcreate() does not fail No functional change intended. MFC after: 1 week --- sys/kern/subr_busdma_bufalloc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/kern/subr_busdma_bufalloc.c b/sys/kern/subr_busdma_bufalloc.c index 2cc47b006753..fa7191341db6 100644 --- a/sys/kern/subr_busdma_bufalloc.c +++ b/sys/kern/subr_busdma_bufalloc.c @@ -100,10 +100,6 @@ busdma_bufalloc_create(const char *name, bus_size_t minimum_alignment, bz->size = cursize; bz->umazone = uma_zcreate(bz->name, bz->size, NULL, NULL, NULL, NULL, bz->size - 1, zcreate_flags); - if (bz->umazone == NULL) { - busdma_bufalloc_destroy(ba); - return (NULL); - } if (alloc_func != NULL) uma_zone_set_allocf(bz->umazone, alloc_func); if (free_func != NULL) From nobody Wed Apr 24 13:53:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPgSf3Fbfz5HPk6; Wed, 24 Apr 2024 13:53: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 4VPgSf14T7z4Spb; Wed, 24 Apr 2024 13:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713966834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mYrLTzgtlgzOxG+4BaOzDWvSnqJVoxrSDuEPUOOL8I=; b=YMYjMCFK9Src+Mh5PnOxOsUkf9fkTWEzQOiTKR7cQE1Nsm0/Fw7TLvKCKc4+sBk7E4a+Lt QUPwloD2+6hutG5TJX8WXNdjEJj4Bifjo/P5UyFH08GCiVNbMu5cGMeYjN7W8fIL7hKFN7 9c5Y8uFXd0BBOc/0SgKuM6wKxM6/9a4mGQ4bCgi6mPOocdVAaN5zTiIXCDkdbhOfo7Mrvl ou9dJJ/XacYcnXdJEWOyFtxjTKkxX62kXBsA7CZ6d6vTeuI32AiFAi6y0/32hlkq/KhnHq QLKrfzBkz6rm8s3d3sQpnzCZhMnKIPxX7YGLL6DAxoXs2mDqt0vh3TjMj48Z3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713966834; a=rsa-sha256; cv=none; b=sdzrXO54t8IzPWfupx6TXVmwJAvn5KhpaGCKRPardRRN4saFsF8KXU3hxpWtPXiWigU7B9 +ryPd/Ir4ZeQbVgL18f7GiXVDU/JFB72nkxeYNDkeKKXHYs1e4T3rlZ9cJ1SK+yRuMU3s7 QNjMVZTv6upZ/NutZjm7jBdJMVjUDMPgzujungPP1oXTsfoU3KdDIBzTGIP8736cxt0aqm QXQFd0ZuOX7SF0sH1h1wWEUsav/Ra/7jkRVVhllXMbcIlr4ifHlqJp+CY5Cegxx5Isx1W6 C823KxJqCktuWBEVrp9glxmsWoLDrcX8zfs+Iu5KfHKVbVDIVFU+Dyi2FJVqoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713966834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mYrLTzgtlgzOxG+4BaOzDWvSnqJVoxrSDuEPUOOL8I=; b=VuDMDfq9KIAoDopmxmla4eqHn4IaLkXeZTjb0EqDUyvHkMkHdyp9oyQI7pPbBIrh2r/XeQ 3Syr0aE2WaoduAuv8eqP8M8VhHThwakcZLb/972D0/CL2mcbf6+k0w3+rgClJf5mABC833 vYtxfOzAe6YPOCYS6gfekP7hN8V3+XOEpjg9c+MzofWFh8m7dBYzhlzFQ5PZpwttS+2Vr9 xu2r1uWurh5Wpiy2embvq2DmdZzMsrtYnhYpROYtZ/1BlLLIZfZiEs3fBDXHGeykUmi8HT /KP2KyGq9R2u0JNyZ7IVolkNzZbZghuud53rMlaPnFmXy5M1M+tYSEfK38Xx6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPgSf0W4KzJ10; Wed, 24 Apr 2024 13:53: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 43ODrr8p020511; Wed, 24 Apr 2024 13:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODrrPW020508; Wed, 24 Apr 2024 13:53:53 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:53:53 GMT Message-Id: <202404241353.43ODrrPW020508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 4b7949144cfb - main - geli.8: add some notes regarding performance tuning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b7949144cfbf25b0e0bf593b135a88417304d71 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4b7949144cfbf25b0e0bf593b135a88417304d71 commit 4b7949144cfbf25b0e0bf593b135a88417304d71 Author: Alan Somers AuthorDate: 2024-04-22 21:52:07 +0000 Commit: Alan Somers CommitDate: 2024-04-24 13:53:37 +0000 geli.8: add some notes regarding performance tuning MFC after: 1 week Sponsored by: Axcient Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44908 --- lib/geom/eli/geli.8 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8 index 501b948fde49..098ba4d0485e 100644 --- a/lib/geom/eli/geli.8 +++ b/lib/geom/eli/geli.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 20, 2024 +.Dd April 24, 2024 .Dt GELI 8 .Os .Sh NAME @@ -851,6 +851,15 @@ This variable should be set in Specifies how many times the Master Key is overwritten with random values when it is destroyed. After this operation it is filled with zeros. +.It Va kern.geom.eli.use_uma_bytes +.Nm +must allocate a buffer for every write operation, used when performing +encryption. +This sysctl reports the maximum size in bytes for which geli will perform the +allocation using +.Xr UMA 9 , +as opposed to +.Xr malloc 9 . .It Va kern.geom.eli.visible_passphrase : No 0 If set to 1, the passphrase entered on boot will be visible. This alternative should be used with caution as the entered @@ -863,6 +872,9 @@ Specifies how many kernel threads should be used for doing software cryptography. Its purpose is to increase performance on SMP systems. If set to 0, a CPU-pinned thread will be started for every active CPU. +Note that this variable must be set prior to attaching +.Nm +to a disk. .It Va kern.geom.eli.batch : No 0 When set to 1, can speed-up crypto operations by using batching. Batching reduces the number of interrupts by responding to a group of @@ -891,6 +903,34 @@ This is an optimization which reduces the overhead of I/O processing. This variable is intended for debugging purposes and must be set in .Pa /boot/loader.conf . .El +.Sh PERFORMANCE CONSIDERATIONS +The default value of +.Va kern.geom.eli.threads +is usually good for a system with one SSD. +However, it may need to be lowered on systems with many disks, +so as to avoid creating too much thread-switching overhead. +On systems with more disks than CPUs, it's best to set this variable +to 1. +.Pp +.Nm +internally uses +.Xr malloc 9 +to allocate memory for operations larger than +.Va kern.geom.eli.use_uma_bytes , +but malloc is slow for allocations larger than +.Va vm.kmem_zmax . +So it's best to avoid writing more than +.Ms MAX(kern.geom.eli.use_uma_bytes, vm.kmem_zmax) +in a single write operation. +On systems that format +.Xr zfs 4 +on top of +.Nm , +the maximum write size can be controlled by +.Va vfs.zfs.vdev.aggregation_limit +and +.Va vfs.zfs.vdev.aggregation_limit_non_rotating +for HDDs and SSDs, respectively. .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. .Sh EXAMPLES From nobody Wed Apr 24 13:58:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPgYs60qLz5HQFM; Wed, 24 Apr 2024 13:58: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 4VPgYr3xz4z4VbT; Wed, 24 Apr 2024 13:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra8EZCeZbH523yu1Ae7scmG8GPk+nCKMWgcsWoCSDXw=; b=JCDFDKrAa8y7n+sG2o1NG6JsFECrO4sxPvErfCxOsRyzbe+haEqJKcjje4mgQlqgKHRhtn aP15WxGI5EDcUepj1XWLcvdIA9AZFXRUW7g6P8kYgVslpfcYB7ATQiB6nOgI6Z88jf24bh rt0LtIyf/WMVqeycumjCEO2bn1UA4D+QCPyDYrxTpNA3eryjIHGZZCzC2eUsDU+z4c/dR5 BLAbQis8ibEHgJM/wGu2IHUj8uxXxvtyF1nALsVoKO01NsnhXX/ydRJ29vV20pTi0hGNao AGC3T73YkWPEQVWTFHc1MFDUzwCKdG1qci4bB5Y+4FSuI0rFf24ygF2ErP+JRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713967104; a=rsa-sha256; cv=none; b=tjONmwX8y2J0y8AlpXrhwQbt31vMpqmPT2P50IoC74n6cxlL9/tvrDQi8mDvCwYzFqxi+d VuoYfKrAAVCFxh6ExDCy4hfDbm8ACm6JZQoLRey9NoQ6rTuf4yWhfhj1NRCwc74WndXYCM zIEfezFjEy1MvFKlJIXB0bR0kQ4K9ibI+dX3DHFbmCQPSb3PU/tJ0Hct9fB1UE6kG/1Uy8 2JoI27ef1cWQx3dQ7W1649dia0rYvKsBgF0zlOlbmB+G+Wl0K9QtJvtX62fJkiwILh8WZ9 u+dChzf/qqnVsTyaAm7xHSLcTaM3NNa90BRUu61xiTPCPQ7BY5ZOWvJma9cmkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra8EZCeZbH523yu1Ae7scmG8GPk+nCKMWgcsWoCSDXw=; b=axd0alMk71+urGnw58dWLUAAdYjM7RGw5yfkSX167AEcjwCuBq60lWivDuLe8k2tj5UTPM ZGcV8kuM4GxsiQoiyJPmnG5DwKRu5b+ce9vk3I2YNtBqEE5O924JYdmFQykSL7w7jOlhP4 L552YUQnCfW/ybBtg0a39MjbeE40JGiJ3YYjH50xCBem6IyXQBtKL4ARNle9spY4OM+lKM MBuzRdH+UDLWaLYTRMD2r92I6hIsK83oRKNo7xqWSuzRljiM4/MuzqRZeD/CXe/r5b1Eas eXmWSf3XkN1mwheG2DZLEQNS8ZPxobupBtFkhpsqfqs4Y0G67QQdutQy5MZxog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPgYr1ZdDzH7y; Wed, 24 Apr 2024 13:58: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 43ODwN0L021457; Wed, 24 Apr 2024 13:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODwND8021454; Wed, 24 Apr 2024 13:58:23 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:58:23 GMT Message-Id: <202404241358.43ODwND8021454@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: 107584716cde - main - bhyve.8: Remove mention of the -A flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 107584716cdeaa36c718a42861df1cb4b8b87e62 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=107584716cdeaa36c718a42861df1cb4b8b87e62 commit 107584716cdeaa36c718a42861df1cb4b8b87e62 Author: Mark Johnston AuthorDate: 2024-04-24 13:57:12 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 13:57:12 +0000 bhyve.8: Remove mention of the -A flag It is a no-op on amd64 now and is not implemented on arm64, so let's remove mention of it altogether so as to reduce confusion for arm64 users. Reviewed by: corvink, jhb Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D44737 --- usr.sbin/bhyve/amd64/bhyverun_machdep.c | 3 +-- usr.sbin/bhyve/bhyve.8 | 13 +++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/amd64/bhyverun_machdep.c b/usr.sbin/bhyve/amd64/bhyverun_machdep.c index fc2f91e31db7..c453092107d5 100644 --- a/usr.sbin/bhyve/amd64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/amd64/bhyverun_machdep.c @@ -73,11 +73,10 @@ bhyve_usage(int code) progname = getprogname(); fprintf(stderr, - "Usage: %s [-AaCDeHhPSuWwxY]\n" + "Usage: %s [-aCDeHhPSuWwxY]\n" " %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n" " %*s [-G port] [-k config_file] [-l lpc] [-m mem] [-o var=value]\n" " %*s [-p vcpu:hostcpu] [-r file] [-s pci] [-U uuid] vmname\n" - " -A: create ACPI tables\n" " -a: local apic is in xAPIC mode (deprecated)\n" " -C: include guest memory in core file\n" " -c: number of CPUs and/or topology specification\n" diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 12e3f3ba926e..31b093ffaad0 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 29, 2023 +.Dd February 10, 2024 .Dt BHYVE 8 .Os .Sh NAME @@ -30,7 +30,7 @@ .Nd "run a guest operating system inside a virtual machine" .Sh SYNOPSIS .Nm -.Op Fl AaCDeHhPSuWwxY +.Op Fl aCDeHhPSuWwxY .Oo .Sm off .Fl c\~ @@ -110,9 +110,6 @@ runs until the guest operating system reboots or an unhandled hypervisor exit is detected. .Sh OPTIONS .Bl -tag -width 10n -.It Fl A -Generate ACPI tables. -bhyve always generates ACPI tables so this option is obsolete. .It Fl a The guest's local APIC is configured in xAPIC mode. The xAPIC mode is the default setting so this option is redundant. @@ -1033,7 +1030,7 @@ block device backed by the filesystem image, and a serial port for the console: .Bd -literal -offset indent bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ - -l com1,stdio -A -H -P -m 1G vm1 + -l com1,stdio -H -P -m 1G vm1 .Ed .Pp Run a 24GB single-CPU virtual machine with three network ports, one of which @@ -1043,7 +1040,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -s 2:1,virtio-net,tap1 \\ -s 2:2,virtio-net,tap2,mac=00:be:fa:76:45:00 \\ -s 3,virtio-blk,/my/image -l com1,stdio \\ - -A -H -P -m 24G bigvm + -H -P -m 24G bigvm .Ed .Pp Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI @@ -1061,7 +1058,7 @@ hd:/images/disk.7,hd:/images/disk.8,\\ cd:/images/install.iso \\ -s 3,virtio-net,tap0 \\ -l com1,/dev/nmdm0A \\ - -A -H -P -m 8G + -H -P -m 8G .Ed .Pp Run a UEFI virtual machine with a display resolution of 800 by 600 pixels From nobody Wed Apr 24 13:58:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPgYt6fNbz5HQFm; Wed, 24 Apr 2024 13:58: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 4VPgYt2KyLz4Vdq; Wed, 24 Apr 2024 13:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUx6ubs4almqD2UAEk2SpzMxB+eTLrOLNKHhO1iClp0=; b=WsaXPFTOIf39ZDl5/OUc+M9C2fKK+G6AKIdWru1mnGoH+4CxETOAn3PVv5XnY3HSKTKCtl SHSsalMrPPlZeo5KNjWPFCv4pFYegOLdhqf0xwFUUoawYkn4vbZm6UQ7ceT6yTj+yR2YtY wuXc9OBNczXz6xCiBkvXU0Vt3sq1zw4Q4m2KTSvy54Y2cnhiEIdLY4YzET6TAtE+OWG3nx jZOAg2yYn7RlvlgenA9RYvzAh3u1Kz4RXoZaQiVs3KyIvMpk7n6AGd4I1skwZ/lhCEOkxf CR5+eMEZvD8tlhp5r/r+gBe7m5bzN8CkSxTAltDQkKQ10i2REknKiQsJSVoZcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713967106; a=rsa-sha256; cv=none; b=xGLwmYnHNgEmwyGwmFFEmVAPXWJcu+t6MQ7TFknu+N29rl6QnO+0CW5xfGi5B4qyc4JxSu LfnuVW0EOkByLgQ/GUAaL0Z7yLsbqGOz48J8CczOWG+e0w5kFA6WMoGjnEYdXRh526g8hp TlxF0aG2IxloDVSRXUaA0HbhVp42Iqu5GPIsaHe56pNhlA9m+RGGjSjmvJOipeYzHKOtP6 32O7myU5RZanDBo25FOJE286EmRJc3hAygPQoabI6xXG8zUjNqRupq5Ktd7Jfxt9j0sUxj 2KQhmtWyAlT3epj96+18Qwgkjbqfo+FNwUpzP8N5XiVmBvhQhXTgh+/Fl4D/RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUx6ubs4almqD2UAEk2SpzMxB+eTLrOLNKHhO1iClp0=; b=X/GUKzpIXN/ioMN2rLH3V9oTWYOU/D04l5HG3erSXJgWclKSzFBAXoEv4vBhO7jHnVZl3E qU+JHMm77VM9Yg/IFSAlsJnWeEK3ivtdguZ2o2SCB/vvaWDNiY0EUdXvpUW8eBkcjX4OiA tOj0OnyL0+hO942/q5C0TIHzWdnPVYKdfDYJyyX/t413SJXWhcs2LLFrz9GXnQJf/jQEeT uklyufL8gH3xG7bHnCCQWezDWsNX4BG9T4wcdNQq9WMl6Ru60yi0rMRz1jUF+ifTzSNk2n SUnuTXIbuzz+nkTUvIb7aaIjirZeOfc6hsFoR/yrfBh8esTaA85Hd6vuTwZytQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPgYt1wKfzH80; Wed, 24 Apr 2024 13:58: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 43ODwQM5021543; Wed, 24 Apr 2024 13:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODwQxY021540; Wed, 24 Apr 2024 13:58:26 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:58:26 GMT Message-Id: <202404241358.43ODwQxY021540@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: 71b2ba909911 - main - bhyve.8: Document arm64 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 71b2ba9099115db3c63f15e5085c0a677511f8b8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71b2ba9099115db3c63f15e5085c0a677511f8b8 commit 71b2ba9099115db3c63f15e5085c0a677511f8b8 Author: Mark Johnston AuthorDate: 2024-04-24 13:57:42 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 13:58:04 +0000 bhyve.8: Document arm64 support - Mention the options that are amd64-only. - Provide a minimal example for booting an arm64 guest. Reviewed by: corvink Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D44738 --- usr.sbin/bhyve/bhyve.8 | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 31b093ffaad0..42ba328451a9 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -93,17 +93,25 @@ .Nm is a hypervisor that runs guest operating systems inside a virtual machine. +It can run guests on amd64 and arm64 platforms with suitable hardware support. .Pp Parameters such as the number of virtual CPUs, amount of guest memory, and I/O connectivity can be specified with command-line parameters. .Pp +.Nm +is typically used with a boot ROM that can load the guest operating system. +On arm64 platforms, this is currently required. If not using a boot ROM, the guest operating system must be loaded with .Xr bhyveload 8 or a similar boot loader before running .Nm , -otherwise, it is enough to run -.Nm -with a boot ROM of choice. +otherwise. +On amd64, the +.Pa edk2-bhyve +package provides a UEFI firmware that can be used to boot the guest; +on arm64 the +.Pa u-boot-bhyve-arm64 +package provides a U-Boot image that can be used to boot the guest. .Pp .Nm runs until the guest operating system reboots or an unhandled hypervisor @@ -112,10 +120,11 @@ exit is detected. .Bl -tag -width 10n .It Fl a The guest's local APIC is configured in xAPIC mode. -The xAPIC mode is the default setting so this option is redundant. +This option only applies to the amd64 platform. +xAPIC mode is the default setting so this option is redundant. It will be deprecated in a future version. .It Fl C -Include guest memory in core file. +Include guest memory in core files. .It Fl c Op Ar setting ... Number of guest virtual CPUs and/or the CPU topology. @@ -154,7 +163,7 @@ Destroy the VM on guest initiated power-off. Force .Nm to exit when a guest issues an access to an I/O port that is not emulated. -This is intended for debug purposes. +This is intended for debug purposes and only applies to the amd64 platform. .It Fl f Ar name Ns Cm \&, Ns Oo Cm string Ns No | Ns Cm file Ns Oc Ns Cm \&= Ns Ar data Add a fw_cfg file .Ar name @@ -187,6 +196,7 @@ will pause execution at the first instruction waiting for a debugger to attach. .It Fl H Yield the virtual CPU thread when a HLT instruction is detected. If this option is not specified, virtual CPUs will use 100% of a host CPU. +This option applies only to the amd64 platform. .It Fl h Print help message and exit. .It Fl k Ar config_file @@ -235,6 +245,12 @@ The possible values for the argument are listed in the .Fl s flag description. +.Pp +This option applies only to the amd64 platform. +On arm64, the console and boot ROM devices are configured using the +more generic +.Fl o +option. .It Xo .Fl m Ar memsize Ns Oo .Sm off @@ -260,8 +276,12 @@ Set the configuration variable .Ar var to .Ar value . +See +.Xr bhyve_config 5 +for configuration options. .It Fl P Force the guest virtual CPU to exit when a PAUSE instruction is detected. +This option applies only to the amd64 platform. .It Fl p Ar vcpu Ns Cm \& : Ns Ar hostcpu Pin guest's virtual CPU .Em vcpu @@ -938,8 +958,10 @@ Ignore accesses to unimplemented Model Specific Registers (MSRs). This is intended for debug purposes. .It Fl x The guest's local APIC is configured in x2APIC mode. +This option applies only to the amd64 platform. .It Fl Y Disable MPtable generation. +This option applies only to the amd64 platform. .It Ar vmname Alphanumeric name of the guest. This should be the same as that created by @@ -1033,6 +1055,12 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ -l com1,stdio -H -P -m 1G vm1 .Ed .Pp +To do the same on arm64: +.Bd -literal -offset indent +.Ed +bhyve -c 2 -s 0,hostbridge -s 1,virtio-blk,/my/image -o console=stdio \\ + -o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin -m 1G vm1 +.Pp Run a 24GB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent From nobody Wed Apr 24 13:58:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPgYt6f0pz5HPyL; Wed, 24 Apr 2024 13:58: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 4VPgYs6QMbz4Vbc; Wed, 24 Apr 2024 13:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXlufmkcuvhQSkPZjdMk/t+tilyFK1EWKb2jdUBYFmo=; b=LKncHn87QhBJ6LXfTYp2RyFQkZVH19KqQo6T++7o/6C7Jh5fDgVtjSbPg1QMjb1Jmm/13Q bjskz8Uhm/vI1T2vKnWnmWbK17IXpZf8rHSP+JmLs5jN/xOrFBHDWgULEFvJcfqfI+1mDW u7yU1uQhZyrjvnF/z72EkZXCLb7Fbjck6jdR5FaZAXgorLdzUnni7IFQKKgf+mNrn97G7h gKvmT7XkFxqQ41/0++p6eTNXfTT4zts8EHxWQRuMTswIbTvFaCTnbArPeLI+OaOScfCfM1 rNZAfQxX8rTUq5yokCtWeU7QTk3QriXJICDiryxUNK8Ll+/iroGhqIHIChrmCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713967106; a=rsa-sha256; cv=none; b=DJ2zJbotIcltmQewPniS+YSqLTd5zdhqjomLS2oqKqAaksKLWA4bYkIFGPZj6yBPP/3Zp1 wuPr7QftsYAlYw7ioX/o4O+Ym7dbB0Zme4aToa++ubBeDwiwmc7zXA2aW/KbSk/lxpDA5U s4PcVXtbG7bXa3llp6b8axX0TiiuWde9i7XfNuwbmBDFSBBTFXWfEgxlDhB95B6JN7kgd5 LuUdiZDFryjZ2eUbSb4/O25+5VLWuBMYclB2pa5toGraKwLZfNsJxQykWhllLePKL4VeVa Zq08HUbMQjatMROLWxJhbL7w3bjv3gKyA8vTEo6Biw1VP6r4llYTMIZVkD/HhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXlufmkcuvhQSkPZjdMk/t+tilyFK1EWKb2jdUBYFmo=; b=W67HJSBl4xNvgo2YTU/jJYc+DwqaLJeHLi4sQ7lxsJxTFe+fo64zIckzCwprmqXql9ZaEP sOZRbjE0B5c92Qu/5IUdjd6RTHhipTVNrr0F/KPg5GIMzvlVt2sti7tUZglI82xg3LT3nk Cnl75qNNs2JocBUQXi5LpxwW9bPh03HuGpG3XY8Lr7AXBIOxqglwvljMoQBBKlTLZ5ktFW J3Fr3yiR31+Tn6KQ8MuzlDyGgkKoG2iCNRycZ7g2klLSk54lN8OVAmgTZ/ZHzxbP+7dzXW a/b5Irbjc78q4buGvpfUWGAMnAWAIqRXLfNqasIrlIJ1sfOm9JaNbT/iMDejJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPgYs34TnzJGc; Wed, 24 Apr 2024 13:58: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 43ODwPZx021504; Wed, 24 Apr 2024 13:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODwPA8021501; Wed, 24 Apr 2024 13:58:25 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:58:25 GMT Message-Id: <202404241358.43ODwPA8021501@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: 63d5f8c0f25a - main - vmrun.sh: Stop passing -A to bhyve List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 63d5f8c0f25ae0ec17ad902c5ba89644e4bd1019 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=63d5f8c0f25ae0ec17ad902c5ba89644e4bd1019 commit 63d5f8c0f25ae0ec17ad902c5ba89644e4bd1019 Author: Mark Johnston AuthorDate: 2024-04-24 13:57:50 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 13:58:04 +0000 vmrun.sh: Stop passing -A to bhyve It's a no-op now. Sponsored by: Innovate UK --- share/examples/bhyve/vmrun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index 323d8e22a041..19eed87af0bf 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -121,7 +121,7 @@ tap_total=0 disk_total=0 disk_emulation=${DEFAULT_DISK} loader_opt="" -bhyverun_opt="-H -A -P" +bhyverun_opt="-H -P" pass_total=0 # EFI-specific options From nobody Wed Apr 24 14:06:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPglS0rTHz5HQsn; Wed, 24 Apr 2024 14:06: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 4VPglS0CCXz4Xtw; Wed, 24 Apr 2024 14: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=1713967604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrBehe1CZZ/+PvPSg/5ncwWtvNJ71ZMjv4yuWiQfSIs=; b=HdTiKffhhsKz+OAdrY9Rx5i3+wfwpBL0uxpcz0sHGam2iC6YzUeBDVq67rVJXzmFUPy2yQ XgQdv6ybqp3Yd8fLBzZv0jLU5a0SRIXwmhuzDKdFW2s6EO40AO04UZ+sXlV06ysGLXdCJD tKubfwQDGEmXU5AFyY55NkXMwzmVzPS9zyV9Wd+aT9DoJjG6+MLznoCQKqEbw6Uhr6EdWR YDkX3QT1iTiQWwZh1L5KhQOuGNyTmujFPe0aYBUE52YHK4KD2RR5C2I5ytP4CMWLn08Mb6 zAHrQHOuIyLtxuBpRQhJkMyV5mHxZ+M+HYPZzpQ5RWVkgV/rK9aXAz1KVx4wPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713967604; a=rsa-sha256; cv=none; b=PSe14gdjzWJ1+LuX1OK6b7+eVz1JnKqKrKq16KiewygU2LGJK3/ZKCSFiT9wT9FlPSl0fo pLsIIIoO3rvqI1+/929HhqTBrlt34VEmBSS75yfBuMICtlO8c9oSejo2tNesXZ9iwV7DoO k3HlJBH66szFj+QEXfmp6Sn5/KrkS1mgEuwdGYaoEoAmYMPnl5QqR9Iig1o460oVPQ+spA sESNFRoaqCpQ2TGuBg+P/oKIEC1Ew74gmSQUZ5IUX0S6ItVXrb7uSW22TFdEjVAZe25fL/ N373oeBGBoX1xJpAQ9EnfHWW7eAPLpPLRD9i41n8QOs1AA02u7q87V0mnS1YaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrBehe1CZZ/+PvPSg/5ncwWtvNJ71ZMjv4yuWiQfSIs=; b=aiOG/iicLDVdpgXjL89J+nvgydZcvcqjwQiuRR53S74/okr3ezb4Aeb4RiYGVdc3pZcy9p Y8NIccrGJrj4UsxSNyLDI3v6joBh0MlZJztqjkYb8qTGu1v4v9yRJ7OWICZZq7Vgjwc2so m+gUeA4ttXHdJbC9e0NUthsABU9lGDvImctxLrTQQXX01GQMBfC+hyTWMoMwwuI6d9FNv5 pPd5oiNq5QYyRBrrxU5PDNORBv1FvDVxrNgu2eI2O5/9ub0ve8VFxhBTr1Pke0ta7OLDbj 76Dql4rU37EteZ+0rA/enzu+YmQEo8wUMHyAlhDsXmDhaaEa8QZdP6UerMfilw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPglR6w1gzJWQ; Wed, 24 Apr 2024 14: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 43OE6hcP039312; Wed, 24 Apr 2024 14: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 43OE6hE9039309; Wed, 24 Apr 2024 14:06:43 GMT (envelope-from git) Date: Wed, 24 Apr 2024 14:06:43 GMT Message-Id: <202404241406.43OE6hE9039309@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: 1a4e512adbab - stable/13 - acpi_battery: avoid divide-by-zero when no devices have capacity info List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1a4e512adbab4dfc072d6331a7483f4188fb96ce Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a4e512adbab4dfc072d6331a7483f4188fb96ce commit 1a4e512adbab4dfc072d6331a7483f4188fb96ce Author: Josef 'Jeff' Sipek AuthorDate: 2024-04-16 23:01:28 +0000 Commit: Ed Maste CommitDate: 2024-04-24 14:06:08 +0000 acpi_battery: avoid divide-by-zero when no devices have capacity info On laptops with builtin batteries, disconnecting the battery may show up as a battery without any capacity information. (The theory is that one is disconnecting the cells but the electronics identifying the battery are still connected.) As a result, the loop over all batteries in acpi_battery_get_battinfo results in total_lfcap == 0. So, just check that total_lfcap is non-zero to avoid a division by zero (triggerable by sysctl hw.acpi.battery). Reported by: Stefano Marinelli Tested by: Stefano Marinelli Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44818 (cherry picked from commit 2e850b832f5d2adb9b230d191277d67c00caaab9) (cherry picked from commit 788987e034b1c73d779a3aa179f79f672bbdb366) --- sys/dev/acpica/acpi_battery.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c index 7455c6afc6a6..cfd8261d5eab 100644 --- a/sys/dev/acpica/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -266,7 +266,14 @@ acpi_battery_get_battinfo(device_t dev, struct acpi_battinfo *battinfo) */ if (valid_units > 0) { if (dev == NULL) { - battinfo->cap = (total_cap * 100) / total_lfcap; + /* + * Avoid division by zero if none of the batteries had valid + * capacity info. + */ + if (total_lfcap > 0) + battinfo->cap = (total_cap * 100) / total_lfcap; + else + battinfo->cap = 0; battinfo->min = total_min; battinfo->state = batt_stat; battinfo->rate = valid_rate; From nobody Wed Apr 24 16:27:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPktM33dxz5HwCH; Wed, 24 Apr 2024 16:27: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 4VPktM0QQGz4mQR; Wed, 24 Apr 2024 16:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713976075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/rOm0XTDyUeLgNL+kXI2AomX6f9DR0d2aiEUz6nix0=; b=Xt2NJZvA3Egrvp6yt/6ALc426GeQZCTR4PZdUq5eVobzXJW9gZa7pmzVlSbjVgoFOIVaFZ U7qSn/pKjYqawj5+tx8hx8b5REwTxAED1S3kMgPsLICGCAcEMLF+19jQjo+oHkwr+sn2Jz vt9bdqfYmis2li5XyJIHgj5kjTgwT/rj9ECNSZ59gWq6nqatZrfelCrSN63LBfPMQ+TfAF fL0+IW25MlQFQ6cBHHbaBfSoOq+JWHDYcotEaG5bA/7ZR9GceDc3NikezffmLmcryvq+0p qFxW+WVVjDowSuYeRKpU2mE2dvvJqZWhZ4IPo4JJnWlQsdrSEDyMFfiuGJTo2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713976075; a=rsa-sha256; cv=none; b=GvvWqRGavBsQqimntg90Wgld/oMBsKZJv681gFOo4r4axdpG3mBHPdSO4TMJeCYoIAUVhT w3u+9vIC9MiLu+qrqcdLQbfKmlPF3E2N6f/Eya/SzjIEKwswuirtKO3rfn+nDIuVcbYX8t ExDIWW4GGy06uUrluVFXFmtP74/pvCKh3CExpZcsSdxPuofVK9T88+LzGpT5dWVYJ2Ieot j7EHurwfqvK9Xur29M2noYhgPoM4IkkwpKfgZUTqFV0+7icJaCWog2dS1AC+w1rmBlhY+O 2C6CvzpUVmHIP2skcacEv8CzTibyL5lQdQ8yd6U6N2PfVxPoZKA1av1aUCGPWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713976075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/rOm0XTDyUeLgNL+kXI2AomX6f9DR0d2aiEUz6nix0=; b=YZTri0wquKJeYE/OlDEVJgkg61FubMWt+bN0CTOhlca14UkmVADd7vVs5DH9Fig1L6WKYj bLm8szD6goJdiTTQQjHKnv5Q1+g2q6zGo2rKkDP7JT8pxMI7+UE+AReGDDWc/rGvFspO/Q /ptvY4MurxFtFzXwGnxkvMdCvNvPLvdV6Zh4IBoSinJs47zU76TyAVAeVWdR8EoDmTbxIo eP8J2Kh6TijgTwFfWXv+RqPbA5j9ZTr7pzoOCTjpUfO1syc5IQ33yh1K6MV2kjVUKqN1bK +tvzMRSAYJH2XjXOEdbOd/gVAdvgzBJsDS7X78Yk8H1SrVvq2WquW/lRz+PAaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPktL71bgzN23; Wed, 24 Apr 2024 16:27: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 43OGRsHr075709; Wed, 24 Apr 2024 16:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OGRsQT075706; Wed, 24 Apr 2024 16:27:54 GMT (envelope-from git) Date: Wed, 24 Apr 2024 16:27:54 GMT Message-Id: <202404241627.43OGRsQT075706@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: a913f3ab8f20 - stable/13 - Cirrus-CI: bump Clang versions to 16 and 17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a913f3ab8f20a7fe021246d858e648445618983c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a913f3ab8f20a7fe021246d858e648445618983c commit a913f3ab8f20a7fe021246d858e648445618983c Author: Ed Maste AuthorDate: 2024-02-29 22:00:39 +0000 Commit: Ed Maste CommitDate: 2024-04-24 14:06:09 +0000 Cirrus-CI: bump Clang versions to 16 and 17 Clang/LLVM 17 is currently the in-tree default compiler, so use it as the default Cirrus-CI toolchain. Clang/LLVM 18 is coming soon and needs to be added here, but I ran into trouble with llvm18-lite package availability so will look at that later. Reviewed by: dim (earlier), Jose Luis Duran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44162 (cherry picked from commit 51c6bf0478bd331225121eb4a0a60510cc3920b1) (cherry picked from commit adc61137fdf7b31b5f32354b970a8d824347b0de) --- .cirrus.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 51a2940e51eb..2f2b76537968 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,35 +15,35 @@ env: task: matrix: - - name: amd64-llvm15 World and kernel build and boot smoke test + - name: amd64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm16 World and kernel build and boot smoke test + - name: amd64-llvm17 World and kernel build and boot smoke test env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: arm64-llvm15 World and kernel build and boot smoke test + - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm16 World and kernel build and boot smoke test + - name: arm64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' From nobody Wed Apr 24 18:31:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPndC2mZBz5J6S2; Wed, 24 Apr 2024 18:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPndC1clbz4375; Wed, 24 Apr 2024 18:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7YrwQcJts+XJfK6PQw+lEXjlUAMeY9I6nUUntgxbyJA=; b=Aw+O/jkCnvDkM4JnTg8yHXwYg66226wRbjg3OXlyrOYR388QxKqsHCsaAp/fIiDNDlmg7v GXN5EgEaCs+l9bonGePgMLgaGv1dHJr9ITRvT0OLj3eNq3yz+hwp9x/ari6adNlvrdeQEp bk0aiZZ8S7d1QuqyIHOWQI3/vUpfYkpa9ykfFb+wDXt+B2lLPzJJ1qQ3/+5j5bgIrBGQsz AzSAc4i9N0jqnWI20T9GzlGH2ZjOu+734n1YjHo/Lta7ycGsQmbJdMo2qZM6NN+ZzNYVbA Vl81+L/0pqgG97ssr65YWNGhHTmhpwZLr1BY27CtVrZ5B6cbCpX1rZZkuh4Y/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713983503; a=rsa-sha256; cv=none; b=S3oueTblLK/HeiWqnp24AZ8CePFCjAr7WLUBnOkQFT17LbP3NdpgkCsx008Un1IBKgbGei P2f/24R0AUksdVoeuz5/P++MfMsYsWHrOzW8fdVRyYFwBg59c3EKXIrmBlStWm3CFR0xyk zK06KpozOUqm+b+CoiG0TrfWG8kWEOdUtABxLFSdsWIsxMT26VbLgxHU5lA7xih6Hmhzwc 2khkXK67yXZIDnBFZFWtS/Ku+y3c9u5/pQAuzXcRG7VeYnXiEVulM/BqhNlwM+17EPUV1w ZWyNKqgKgozqRkjGka/Bd9THO84H/XP82Be96ESBgSeX8TEqbIwNx0dBbba3QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7YrwQcJts+XJfK6PQw+lEXjlUAMeY9I6nUUntgxbyJA=; b=ruhiMKMre4oit/ML1jOI6SFex0Ys5uBbxATbFFjTLRn6Ikx2kv2RFKVjrfn1wxKCRtlwCZ OrKTSrWZ0fEyHQ4vt4NnyiiIJUW25ZsDMbkpvHDlW50YiXhylUWai2cRh4bkDynBzVIZCN SZpv7H66iC1dZkvq/JjlhnU0/oQy2NBj1pKrhHnWsqEsTIBAo2kip2lk548ube6OVkp7eU eIE6mvHD3vSrOKkIkLRKuZgGhbaj2r3+Kuiblg1GcV9xDMuBZi6YPrAxNS7aW1echhbcoh LgYzUGa5revC3Fy41QhbB8axh3bPOJyh+C7syO1P4awT/Y0Zox2FckT7PFnAOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPndC18mgzR8m; Wed, 24 Apr 2024 18:31: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 43OIVh0A091241; Wed, 24 Apr 2024 18:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIVhIT091238; Wed, 24 Apr 2024 18:31:43 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:31:43 GMT Message-Id: <202404241831.43OIVhIT091238@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: 9d40492efa46 - main - arm64: Check DMAP address is valid in PHYS_IN_DMAP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9d40492efa467095340cf3dca5860880aa441472 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9d40492efa467095340cf3dca5860880aa441472 commit 9d40492efa467095340cf3dca5860880aa441472 Author: Andrew Turner AuthorDate: 2024-04-08 10:44:33 +0000 Commit: Andrew Turner CommitDate: 2024-04-24 18:17:19 +0000 arm64: Check DMAP address is valid in PHYS_IN_DMAP When checking if a physical address is in the DMAP region we assume all physical addresses between DMAP_MIN_PHYSADDR and DMAP_MAX_PHYSADDR are able to be accesses through the DMAP. It may be the case that there is device memory in this range that shouldn't be accessed through the DMAP mappings. Add a check to PHYS_IN_DMAP that the translated virtual address is a valid kernel address. To support code that already checks the address is valid add PHYS_IN_DMAP_RANGE. PR: 278233 Reviewed by: alc, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44677 --- sys/arm64/arm64/efirt_machdep.c | 9 ++------- sys/arm64/arm64/machdep.c | 2 +- sys/arm64/arm64/minidump_machdep.c | 7 ++++--- sys/arm64/include/vmparam.h | 18 +++++++++++++++--- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index 52906779dfb9..0c46d2e6dcc6 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -144,13 +144,8 @@ efi_1t1_l3(vm_offset_t va) vm_offset_t efi_phys_to_kva(vm_paddr_t paddr) { - vm_offset_t vaddr; - - if (PHYS_IN_DMAP(paddr)) { - vaddr = PHYS_TO_DMAP(paddr); - if (pmap_klookup(vaddr, NULL)) - return (vaddr); - } + if (PHYS_IN_DMAP(paddr)) + return (PHYS_TO_DMAP(paddr)); /* TODO: Map memory not in the DMAP */ diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index d566a8e2298c..517f4e7c2e23 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -444,7 +444,7 @@ arm64_get_writable_addr(void *addr, void **out) /* * If it is within the DMAP region and is writable use that. */ - if (PHYS_IN_DMAP(pa)) { + if (PHYS_IN_DMAP_RANGE(pa)) { addr = (void *)PHYS_TO_DMAP(pa); if (PAR_SUCCESS(arm64_address_translate_s1e1w( (vm_offset_t)addr))) { diff --git a/sys/arm64/arm64/minidump_machdep.c b/sys/arm64/arm64/minidump_machdep.c index 87bf41b27fdf..8ee626953aef 100644 --- a/sys/arm64/arm64/minidump_machdep.c +++ b/sys/arm64/arm64/minidump_machdep.c @@ -202,7 +202,8 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state) if ((l3e & ATTR_DESCR_MASK) != L3_PAGE) continue; pa = PTE_TO_PHYS(l3e); - if (PHYS_IN_DMAP(pa) && vm_phys_is_dumpable(pa)) + if (PHYS_IN_DMAP_RANGE(pa) && + vm_phys_is_dumpable(pa)) vm_page_dump_add(state->dump_bitset, pa); } @@ -216,7 +217,7 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state) dumpsize += round_page(sizeof(dump_avail)); dumpsize += round_page(BITSET_SIZE(vm_page_dump_pages)); VM_PAGE_DUMP_FOREACH(state->dump_bitset, pa) { - if (PHYS_IN_DMAP(pa) && vm_phys_is_dumpable(pa)) + if (PHYS_IN_DMAP_RANGE(pa) && vm_phys_is_dumpable(pa)) dumpsize += PAGE_SIZE; else vm_page_dump_drop(state->dump_bitset, pa); @@ -347,7 +348,7 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state) * We always write a page, even if it is zero. If pa * is malformed, write the zeroed tmpbuffer. */ - if (PHYS_IN_DMAP(pa) && vm_phys_is_dumpable(pa)) + if (PHYS_IN_DMAP_RANGE(pa) && vm_phys_is_dumpable(pa)) error = blk_write(di, NULL, pa, PAGE_SIZE); else error = blk_write(di, (char *)&tmpbuffer, 0, diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index d5d4a5691f37..83c55913f56e 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -223,9 +223,21 @@ #define DMAP_MIN_PHYSADDR (dmap_phys_base) #define DMAP_MAX_PHYSADDR (dmap_phys_max) -/* True if pa is in the dmap range */ -#define PHYS_IN_DMAP(pa) ((pa) >= DMAP_MIN_PHYSADDR && \ +/* + * Checks to see if a physical address is in the DMAP range. + * - PHYS_IN_DMAP_RANGE will return true that may be within the DMAP range + * but not accessible through the DMAP, e.g. device memory between two + * DMAP physical address regions. + * - PHYS_IN_DMAP will check if DMAP address is mapped before returning true. + * + * PHYS_IN_DMAP_RANGE should only be used when a check on the address is + * performed, e.g. by checking the physical address is within phys_avail, + * or checking the virtual address is mapped. + */ +#define PHYS_IN_DMAP_RANGE(pa) ((pa) >= DMAP_MIN_PHYSADDR && \ (pa) < DMAP_MAX_PHYSADDR) +#define PHYS_IN_DMAP(pa) (PHYS_IN_DMAP_RANGE(pa) && \ + pmap_klookup(PHYS_TO_DMAP(pa), NULL)) /* True if va is in the dmap range */ #define VIRT_IN_DMAP(va) ((va) >= DMAP_MIN_ADDRESS && \ (va) < (dmap_max_addr)) @@ -233,7 +245,7 @@ #define PMAP_HAS_DMAP 1 #define PHYS_TO_DMAP(pa) \ ({ \ - KASSERT(PHYS_IN_DMAP(pa), \ + KASSERT(PHYS_IN_DMAP_RANGE(pa), \ ("%s: PA out of range, PA: 0x%lx", __func__, \ (vm_paddr_t)(pa))); \ ((pa) - dmap_phys_base) + DMAP_MIN_ADDRESS; \ From nobody Wed Apr 24 18:31:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPndF0Tskz5J6Lr; Wed, 24 Apr 2024 18:31: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 4VPndD2qfQz4347; Wed, 24 Apr 2024 18:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M751VqXBxg80UHckkKhKXxyu8ny0c/9mmAxmq3RLoP0=; b=ngsbOHsXU8+v2ywYu96eQmfjrwlWp+q7wWL6218zydsJavOLi6fRnuQqED6WL2U7gr+Awp eOv8XTAretaceKJHzVJ0eeC3hZ/nwHl02Zl0PSq41VTb1I58cuYQ+kHCjhB0h+TLCXjnk5 AavuC9lz82ewcpZdDnB4GWN/eww98AWaT45dPoIqirB+EFQt4g7I15dXZDzn2b7fxp+HSj JfEh6LH/JLTd530LbRlNXg2ge2PtbcTiGWU3MhQjUeipK0v7Gb4AW4JlD3PJzhtErFf0ZD UQl+veRIzs0ZjpcSnsux3jegXQasU0+VKpWjnyR5m5YIGDwAfL3+i363KIWHwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713983504; a=rsa-sha256; cv=none; b=UtN68Wda6SqnHseNI/o/WAfkVcW3j5kt/IJo/DGeJ4JRe7GPM8r8FSmsJ++LjI8owHUD6d ER7oXqxBUSdcHMxbVy1E2ifTW/18r4bwp4T03IQbuhc72OKT9kjInKG+qb0gblDN7V/uVG xI0Uphe0YU1qhN/IYGSuElTK+mLOpPjmkbMFBmQLGw3uHoqT/LSAnuMA4uLQ16M4EpFrcJ 7uAp2J8WiFgkcCTMakEhBa0N5XovELF72Dd7/EcgX1zE4f0jFP2cU9iLzC3x+EDX7AsHlh uCOwiurcaoui5vYMrfQ0nhOIIc1YKJ3dWeTaORBmApjauB3EoMMrv7NJQ0ZTwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M751VqXBxg80UHckkKhKXxyu8ny0c/9mmAxmq3RLoP0=; b=wE5xUr5iwqe9IvsWRfFNcRYVZi4KXukx1bpAbKQvQN8Bq11TREFvQRsN62jkiZIaVMVCXl KqyHU54nDZQ5FA+VHZvAc88oHEqnAjG3YtNkUqL41rAKhBzJzgQDD9O0Dhqn61YFCwk86a kul2+OcxWNPfdzImKs8hle6MriRa19WPk1Gd/mPysUsyno68ukYGBsdxD/wQ5/yaNGgcML V5CAv5w6cwyBc4TdM3ASUqXcxlUQl4sSz+x6Ztf3AEw2Y5lEndvS8dwVHmxf/NA1qNzHcR qGyZj/XtuB42hSdwTuYMgbbFvan/raloWzYkUKIubQPAoDiG1gKDkt/XHIIR+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 4VPndD2RxvzQqq; Wed, 24 Apr 2024 18:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OIVict091288; Wed, 24 Apr 2024 18:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIVigU091285; Wed, 24 Apr 2024 18:31:44 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:31:44 GMT Message-Id: <202404241831.43OIVigU091285@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: 2c35c867ba05 - main - showconfig: Set MACHINE for src.opts.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2c35c867ba05c8de167e1597c9044a72febdda63 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2c35c867ba05c8de167e1597c9044a72febdda63 commit 2c35c867ba05c8de167e1597c9044a72febdda63 Author: Andrew Turner AuthorDate: 2024-04-18 15:22:46 +0000 Commit: Andrew Turner CommitDate: 2024-04-24 18:17:20 +0000 showconfig: Set MACHINE for src.opts.mk Also set MACHINE and MACHINE_ARCH when reading config options from src.opts.mk. This ensures any machine-dependent options are reported correctly. Reviewed by: emaste, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44838 --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a0fd539ed25f..0728df1221a0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3598,7 +3598,8 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY # showconfig: .PHONY @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \ - ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep -E '^(MK|OPT)_[A-Z]' | sort -u + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}) 2>&1 | \ + grep -E '^(MK|OPT)_[A-Z]' | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ From nobody Wed Apr 24 18:31:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPndF5TPKz5J6GB; Wed, 24 Apr 2024 18:31: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 4VPndF3MQYz439R; Wed, 24 Apr 2024 18:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od1ds+i7wVK+PWJHGKDbNhESxh6G433+RuBZZYYJAY8=; b=BkwN2xBYSGNUUpn3fzvzuXnKAzESE+LM7UAZ8TMM1gM94meHI22fspm8YtE+amaVD/zGif /eWFsBDoxQef2WMzEVo2SxJVmV91rZad3h2elU1AxxdMkdm9oMS8jx3Lr3paj3kRt1Y+q6 5t+JSzC7Ma8uaks2HkBaW8lscvYtgPOcgLAkJ9uh1iLmmee8z6ok+/c+V+H1PnvYtF3BR2 htpkISH8pzMPl3+W88YoP1tdEFJ2IQ42tFIIrV6JCZsaQR85e6v4d28j0fRjUra1p8Pt59 4DJcF0myqPdDhQVnOLyXPEj3HFmsRJZWqaphfoi/tOtmETkRkp/s2EsOQZrsCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713983505; a=rsa-sha256; cv=none; b=TCZNZLtd82MeyMBL6adI2YW8UOhnMgljXPOAIPqVXQk3vuf06cSrnz71X2Vcbyzoire4fW PLZJs2ZwqqQ4ZjFQGN2F9xP3Dw7aCh+afbCMCXK+KQRUH43tUNkzfVq8h0zyNNnrMZIEp5 9RwsN/4cxgnzHMlzzoVRudRJQn/dAjPk3OWHUhF7DXacbDnvXzOZdNDnWO9LCEPz6IJHuI ZjflPf+BHx3aVij+6mFGtgZkXhRgwDo++BSN1k/wQkK5lfKlSxLrufX7Z/tGyWXAKOtjAS gW1+773uuJARzmB182HhEdCf3igS1fG5d3R10SebSvie3EI78njFxl++vfxUgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od1ds+i7wVK+PWJHGKDbNhESxh6G433+RuBZZYYJAY8=; b=Y7Y2Ug+LYWKjTKaGJ5RHHsDzKcKuEdzoBVC0A+ArdwIsyQNvkKHrvpvlswwcKYBucB7csZ Rb0nqQuG5ZnVbJurG3V/fYedzCBVn/WJrwhIfGjyDJM2fTGPjDJYCV6N1GV97hCLXCimyH tDyXpDU7CXWrwNHX/dW20+TpJ7+lwTK3TngvZRZtWy8CXZGw7Y2a3yND61mDkC8aPkiaVF VJt8XrHtHroOavTAK87O3IXFMMP6Khorh8CY0ek9AooMxK5IdtmlpuzwpKRF1BhO7c59Ta eKKmb+628WbkxElzhysPZGzdsjVGLdJjw783EdSPc+xup23vOC6kYLPuTLQ1kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPndF2zvjzQvN; Wed, 24 Apr 2024 18:31: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 43OIVjxV092349; Wed, 24 Apr 2024 18:31:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIVjUV092335; Wed, 24 Apr 2024 18:31:45 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:31:45 GMT Message-Id: <202404241831.43OIVjUV092335@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: d7ac42676dc4 - main - elf_common.h: Add STO_AARCH64_VARIANT_PCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d7ac42676dc403cd31d4a6c9a91a2ed5680cca86 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ac42676dc403cd31d4a6c9a91a2ed5680cca86 commit d7ac42676dc403cd31d4a6c9a91a2ed5680cca86 Author: Andrew Turner AuthorDate: 2024-04-17 13:18:24 +0000 Commit: Andrew Turner CommitDate: 2024-04-24 18:17:20 +0000 elf_common.h: Add STO_AARCH64_VARIANT_PCS This is used to mark symbols that use a variant procedure call with a different calling convention to the main ABI. Reviewed by: kib, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44868 --- sys/sys/elf_common.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 934f66fee953..b9e82cb8fa35 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -883,6 +883,9 @@ typedef struct { #define STV_SINGLETON 0x5 #define STV_ELIMINATE 0x6 +/* Architecture specific data - st_other */ +#define STO_AARCH64_VARIANT_PCS 0x80 + /* Special symbol table indexes. */ #define STN_UNDEF 0 /* Undefined symbol index. */ From nobody Wed Apr 24 19:27:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPps53rNVz5JBb5; Wed, 24 Apr 2024 19:27: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 4VPps53C0Wz4BrM; Wed, 24 Apr 2024 19:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713986825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oacPFf5adgxca/NX0CHZAVxa+3RQBnQ+rxoUImv1O9Y=; b=cngqwGCUbXPVe0MligiuKIEUQe+aYrx9Xzwe1ylV/bYPgw9UJQR/HRiRiYnzbv1htHHtNG EaFkLXJ7spZN8FMhu5FhWHFRZkov0Un5OtyCci2u+d5RDE+pd5f7p4XqVuAHHvw/QV0M37 jrJhuZam5bAKi/vdKrajD5bbpxJZPqA512L+vvvzQRvWhgLIDvANZz2la7S1bydWcPvLys oThZghNx1IM7sV57H+MHHLBYnNXnPJTudo2wqkF5CO6BDwNpegjMQIUdBrUr9GtNM6SH9D 8tLtJkFMlrjSlN89IIKSQBzM5lD9NxrMFzS7FMAxfMnAzJrEhn0Ib8SUHgWSBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713986825; a=rsa-sha256; cv=none; b=ia1M7nkKc+QlejRw/D7Luyd0ggDJZO5W3QLnUiMjg3KVOUKBojfllK5gVXSsavpEwf9r5p PGWCW26lxTqcHRXAM7VcPZ/ltaN6fb/Ppx9IOAkmS0H78KMFqUZ3E3crJ0cdIDsqJa2xal KEvjJFjdOy3ZnJWif735kvSWb4NToWvFiUNVkQ916tJln/GCxhsUwRBC/zUYjbj2jBleyy MhcIjxsy9+IXON3dcAoYPrIW+x73A9KSwfS5HEkxaenVultetU4O+oR9Xu0uDWgHQc1WnT n6hSeztyEyibinr9oNs6cMEsaUBWK+WMebEAnBdq0q/z41CmV9jskQKa3Tb7Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713986825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oacPFf5adgxca/NX0CHZAVxa+3RQBnQ+rxoUImv1O9Y=; b=T0Lg8jyLKhrkgtr91cky8MsLIPLxIvzPzMIVuS66eRrbBq0WW96EAf/90jdfT8hMytuJxI TVPMyvSL+XxetIoAloMvtu8OwlMCRSD1kqX5HRh2YHK8LKEnhkVj1s4KK1ftmvaGAaoQnS GglzvpHz6pZcR6knawvpXvLmtZiwnOGPncWoXIXzjwg/FPRFRpiFGEQ9Kp5vSj81tdzVbZ ONy7ifryIv5NpD/AsOuqKjyCkA7r1P0R0SeZGGOegXUHeDiDL6OUnLFjokS5IK/gBOs0FE E1WOk6U9PryMQlGV4vz16fVifBkzfNTIbkLYpkDGGCMAF7wRqcOT1lP6OdrUFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPps52hP9zSK8; Wed, 24 Apr 2024 19:27: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 43OJR5mh080046; Wed, 24 Apr 2024 19:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OJR5Wc080043; Wed, 24 Apr 2024 19:27:05 GMT (envelope-from git) Date: Wed, 24 Apr 2024 19:27:05 GMT Message-Id: <202404241927.43OJR5Wc080043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 0135101e23f9 - main - meta.autodep.mk do not override start_utc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0135101e23f98205157928dc819ef3bc993a4276 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0135101e23f98205157928dc819ef3bc993a4276 commit 0135101e23f98205157928dc819ef3bc993a4276 Author: Simon J. Gerraty AuthorDate: 2024-04-24 19:25:42 +0000 Commit: Simon J. Gerraty CommitDate: 2024-04-24 19:25:42 +0000 meta.autodep.mk do not override start_utc Update meta.autodep.mk If included at level 0 it is important not to override start_utc --- share/mk/meta.autodep.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/mk/meta.autodep.mk b/share/mk/meta.autodep.mk index 9824570ecc43..55f2d66e56aa 100644 --- a/share/mk/meta.autodep.mk +++ b/share/mk/meta.autodep.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-2-Clause # -# $Id: meta.autodep.mk,v 1.62 2024/02/17 17:26:57 sjg Exp $ +# $Id: meta.autodep.mk,v 1.63 2024/04/24 18:56:41 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -308,7 +308,9 @@ CLEANFILES += *.meta filemon.* *.db # these make it easy to gather some stats now_utc ?= ${%s:L:localtime} +.if !defined(start_utc) start_utc := ${now_utc} +.endif meta_stats= meta=${empty(.MAKE.META.FILES):?0:${.MAKE.META.FILES:[#]}} \ created=${empty(.MAKE.META.CREATED):?0:${.MAKE.META.CREATED:[#]}} From nobody Wed Apr 24 19:43:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPqDH2pM7z5HyqP; Wed, 24 Apr 2024 19:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPqDH25Phz4FPp; Wed, 24 Apr 2024 19:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713987823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmguB/Jj25pXaUbYV2Yb0stpf2PunLCHLZBzgNeN9EI=; b=xKYW8VFe3Qkgad9jujl4QPVRKUSDUhgWZbYAyhUahlGhskoCKqbAW/yPgnigIL1pLpwsyp 7ez2aBGOOnJLeRUIZ0xZ8Cm6Ad6WFZCoxHyRreNRBL+mo7eSW0ZowIZ1C0aKnLo0yCIks7 iwY9XJihCKqi4Vb0aKZeyOQLI8Z3YvWof777TCJ3NTrtbqKgTdGu6GoSshY1mcWi3rKfut uc0yeiFXbvrE8SeGt/fHjPflPk2N2OgYuaMG9CblV+sw9GRgHHtX63eb6rTq8BR0lHimJZ pZ0A7zASMWGGicyTpYSS4gE5V95Zjo+LwHTUNaMWEG2bey3uBPJtNRJ1GJLoxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713987823; a=rsa-sha256; cv=none; b=AfwPzq7zub63zy4btq2+shbWKEMMHu9S+GlSShZ5HPf/xirUt7ygc6CWJjkmokAy547cci SomewQRIOtZS687R9lehoKErmbgBZiYeYuPtGMXeL4SPfS9LzaT6oTL9QzHYxnLBnZLjAw DYoCk/FW8Vullggh0/9SaCugQSjNAY86/nAo1If1+6Up3u+6AnB8X6pQMuDvra7KCWJne9 mfU7tag3M15/F2tNoYDNrik78HYkVbypMGPnJT+I82wPnLf72uHKqb/WrDGo7ehHZzdSCZ hpd1QdNWuHkYqYfsWb6AAOvLerNXv/bFh/5WrKoVPHNfdgKo0fqxNxefUXBWXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713987823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmguB/Jj25pXaUbYV2Yb0stpf2PunLCHLZBzgNeN9EI=; b=QJuoufyKPztGSUoljh1MDmdzAZha5/17x5otxc0I4OQFzyCySkb9udrt8ZNem8+iwhTGsz 7jgQ0TsMj/8jKU7A9zwRL3NUSqZms80FCtRCwrJZi9lp+MUjt5gti2icjlWc3QDzZWcw8W 38quOfmNlyj4PSo8GMRODjYec4LP4+srMqYcOW3oJTXWrarFXWTHzsB21G8PVgKmZZcd9T TJNIJInkvMS8VHmEuTFj23CXda8lYV9jVbw5Pjt057k611v0AVusaBX6Kd6tOsY/cuzaHJ lHAJqbnNZBL9fHCcdRyP/BY27yyjdQtsb5zwlEHUpLpDgyIsCXSqNLzUmdVthg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPqDH1bs1zSyj; Wed, 24 Apr 2024 19:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OJhhOJ013940; Wed, 24 Apr 2024 19:43:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OJhhig013937; Wed, 24 Apr 2024 19:43:43 GMT (envelope-from git) Date: Wed, 24 Apr 2024 19:43:43 GMT Message-Id: <202404241943.43OJhhig013937@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: 66df81021e54 - main - sys/namei.h: move NI_CAP_VIOLATION() macro from namei.h to vfs_lookup.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 66df81021e5437e86ff5e0886c35170feb1cd3a0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=66df81021e5437e86ff5e0886c35170feb1cd3a0 commit 66df81021e5437e86ff5e0886c35170feb1cd3a0 Author: Konstantin Belousov AuthorDate: 2024-04-24 18:55:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-24 19:43:31 +0000 sys/namei.h: move NI_CAP_VIOLATION() macro from namei.h to vfs_lookup.c Reviewed by: emaste, imp, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44931 --- sys/kern/vfs_lookup.c | 5 +++++ sys/sys/namei.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 7d708bac607e..180605f9eb8a 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -86,6 +86,11 @@ static void NDVALIDATE_impl(struct nameidata *, int); ndp->ni_cnd.cn_flags |= ISRESTARTED; \ } while (0) +#define NI_CAP_VIOLATION(ndp, path) do { \ + ktrcapfail(CAPFAIL_NAMEI, (path)); \ + (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ +} while (0) + SDT_PROVIDER_DEFINE(vfs); SDT_PROBE_DEFINE4(vfs, namei, lookup, entry, "struct vnode *", "char *", "unsigned long", "bool"); diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 08395c6d699f..2ea4f502e8fd 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -205,11 +205,6 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NI_LCF_CAP_DOTDOT_KTR 0x0008 /* ".." in strictrelative case */ #define NI_LCF_KTR_FLAGS (NI_LCF_STRICTREL_KTR | NI_LCF_CAP_DOTDOT_KTR) -#define NI_CAP_VIOLATION(ndp, path) do { \ - ktrcapfail(CAPFAIL_NAMEI, (path)); \ - (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ -} while (0) - /* * Initialization of a nameidata structure. */ From nobody Wed Apr 24 19:43:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPqDJ6Jshz5Hyjp; Wed, 24 Apr 2024 19:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPqDJ3vQCz4FHt; Wed, 24 Apr 2024 19:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713987824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvVY/3bEoPQVcpCL5lnzv2gjw+6ZtHsZo1dtfAiy2HY=; b=hGi23EFp3WlUVdu0IvDVAxpuAVRjDKWDKIge90JDFfGsK2gttaTMlGs1VRFGLSnGiGM3Us lNIbyRupHzcHpE4cjIwFbmXGKN/K96NPv2tYipJaPt1/tAt+EEUwEjPbsLqEcVWd9l5t0j qp/KPdIzVlPWgOV/yhW5JYHYB/W2vPOyJbgUaNizJ6k+D885S6LxFuq/OJ/LrDK5oB7057 oVuhfSoPrDxkx68rjVuk2kuOodA4E7LD1d9jQqFWSJF02KJdqpfd6P4FfbO3aFUqHzV0Rd VfYZW3RrQzpssehZoCDn//IN3HZBrTy9y/ZFlIBqoY3hYgVUEKK9pqWH9skoDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713987824; a=rsa-sha256; cv=none; b=fj3F1QLuBeOmy1Ie8wiNFTgcmeAppXUMER5/ACaUBxhdJa8v7SqIRL4BtMstdQPKP0daz0 Rj0mwyzaOmZYvc3IJVJZ+pPMKq9J151lckl9a3euaqZbr6UpZ89MSELe/vNdk/bIC9JKHB y4kgf0XOd819oU5KCmnZZOi7XtDzpT25U7WrDK8mbF/8x8YwxyOvIpF+9Zjp97pIpX5MGC iqiB8q1+TbfVcQ6bLNJtQCndIPaDS2Brkt9Jg1PjQlqlRVaU1XdGKwnrb228E/xPMwgikY HYnMl/GMP7sDzZcZD9W9CjOQtNfACQI5R3gTG8ujPiA+/Sz1PbR3k6FwegTzHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713987824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvVY/3bEoPQVcpCL5lnzv2gjw+6ZtHsZo1dtfAiy2HY=; b=Ync5EW/+2g4Sac/eecqBaroV1LKb3K9fo8iRmrIJyWNZK1i6nu3vsFl0JMgcE9JnK4z8JU 9cG10qZfcqrOKTwk46VZnKL2heYJbDwRgC7Ods1P2o992xabq/wEjb2JI7gRSNk0Zkvcym 4pOQ6ZKabgS4l8HOg3lxhFaGmMQMW0ZzwoTjhYPycIbvS5e1ORz0+cYLrMqTAwk+pX5+5V M+owUdo2FTvrCyH+R/Kvjf7mDd+1nptIrNl0WDEUi/IdK536jCCwCrCRJpcyffpg2uJUnr k189GUyz1IDOFTdztVAgtMnFDu+E87RjTF6pP63e8iihUecXLlJYu1lTTQ4b3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPqDJ2brDzSgQ; Wed, 24 Apr 2024 19:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OJhigt013991; Wed, 24 Apr 2024 19:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OJhi1F013988; Wed, 24 Apr 2024 19:43:44 GMT (envelope-from git) Date: Wed, 24 Apr 2024 19:43:44 GMT Message-Id: <202404241943.43OJhi1F013988@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: 6b0cf2a2379b - main - vfs_lookup.c: only call ktrcapfail() if KTRACE is enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6b0cf2a2379b86b67269ed4549057cd6d69490e5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b0cf2a2379b86b67269ed4549057cd6d69490e5 commit 6b0cf2a2379b86b67269ed4549057cd6d69490e5 Author: Konstantin Belousov AuthorDate: 2024-04-24 19:06:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-24 19:43:32 +0000 vfs_lookup.c: only call ktrcapfail() if KTRACE is enabled Reviewed by: emaste, imp, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44931 --- sys/kern/vfs_lookup.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 180605f9eb8a..290834c10be5 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -86,8 +86,14 @@ static void NDVALIDATE_impl(struct nameidata *, int); ndp->ni_cnd.cn_flags |= ISRESTARTED; \ } while (0) +#ifdef KTRACE +#define NIKTRCAPFAIL(path) ktrcapfail(CAPFAIL_NAMEI, (path)) +#else +#define NIKTRCAPFAIL(path) +#endif + #define NI_CAP_VIOLATION(ndp, path) do { \ - ktrcapfail(CAPFAIL_NAMEI, (path)); \ + NIKTRCAPFAIL(path); \ (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ } while (0) From nobody Wed Apr 24 19:48:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPqLJ3cdBz5HyyG; Wed, 24 Apr 2024 19:48: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 4VPqLJ35wvz4GFD; Wed, 24 Apr 2024 19:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713988136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/68mWIHjynLsDqVx2aj91jNmPdZu3sVhA+Ad2b70ilo=; b=dybOON+rA2EkWyaoTOoe1hLk3VqO/2RToTt7ZB0Tm1bsdvX3wW3QTBFXmf8Ugn4fpiB1uv 3SdI+obxvz9Uj8bQ09jpAhm0kCKNMyobUgqfFE+oDlPb8N/ICXOWbaU6po4KZnRnHDCqZ+ iIDtbGf7jF2UeQ808bsvYfAKcH/CTF0/VeSyi2n7umjT912jO7rEaeImXdWoM+/xJeD3al KduUaSscC6GkBkbS9G5dMbqEXEt5niHjbtAUvAAIEvIDGCQMpJRlf9UI0s9Aun2c4neeD0 7p+fmzXO64i1fUbZBVyISd5t9RtU7Y0a0YwB4sE8kOs+vyh+OcKqIqHJ1UDyYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713988136; a=rsa-sha256; cv=none; b=WacK1I9B7Ps5AS7cRDmoNioqg9Zc/IORkkBBmniiYQfvJfawhAANpETuD7dZZQalXhwEJX IIWp28gtSkpeQg/NIJd3TfJUHPw514y4PqschgYAIZZU+hEwXzX5puITQtE0ebcBovJ/MN NXAvNLGLkuPu1WGD7DU8PQ+Nnb35jPWG6w1bPRB4tV4wHnQzleOgGYjFF3muPBH3Q+iK8Q 6CR7OgoTg18dTTlZrAN5yNN3tYNGlLx63zlUuzmwGC8vWBz+acL/swQuZ+P1bhUCl8Y/+8 z9zmNge6KKS+ElbqPi8c0LP+Wb97Wi/mGgEx0y4YjRLPeHN7ppgKd2jcBn4lFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713988136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/68mWIHjynLsDqVx2aj91jNmPdZu3sVhA+Ad2b70ilo=; b=pUoukVzCWi6drN21d+WBlFLC9NIbl9moalHM75vziSXr39s2GJBqjcXc3oxIWZdnSoSFe1 L/PDLJKQIafYyRD7pXCGFZL/B4GCV6pUgxv+e/qSVqCiEoGN/fvA77OBwQA42J/FhXmXcL GpZhJ4aTkjX+YyDXCa8GRnM9ZE/nCxhrOIkJqz302lzDR4sksW1xSV7ecS+OiNOGm36FUF kJsok9D94kxmkkEOCujfI1zQwnTqD7fMxUnI6k7gJm/8N4OsfW1cJagrR963ITuic6woUY lV/vIhIFE657JCBTL2X9P7955a152IJcE/gQFfg2X2rS+CfXhoUVZKww/41iQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPqLJ2VSszSgR; Wed, 24 Apr 2024 19:48: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 43OJmuqV014904; Wed, 24 Apr 2024 19:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OJmuOL014901; Wed, 24 Apr 2024 19:48:56 GMT (envelope-from git) Date: Wed, 24 Apr 2024 19:48:56 GMT Message-Id: <202404241948.43OJmuOL014901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 78101d437a92 - main - syscalls.master: correct return type of {read,write}v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78101d437a92d539584795ffd2c46724da37e662 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=78101d437a92d539584795ffd2c46724da37e662 commit 78101d437a92d539584795ffd2c46724da37e662 Author: Brooks Davis AuthorDate: 2024-04-24 19:47:22 +0000 Commit: Brooks Davis CommitDate: 2024-04-24 19:48:46 +0000 syscalls.master: correct return type of {read,write}v This was missed when read/write, etc were updated to return ssize_t. Fixes: 2e83b2816183 Fix a few syscall arguments to use size_t instead of u_int. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D44930 --- lib/libsys/_libsys.h | 8 ++++---- sys/compat/freebsd32/freebsd32_systrace_args.c | 4 ++-- sys/kern/syscalls.master | 4 ++-- sys/kern/systrace_args.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index d0dd144bc8f1..d4cd14ceb75f 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -141,8 +141,8 @@ typedef int (__sys_listen_t)(int, int); typedef int (__sys_gettimeofday_t)(struct timeval *, struct timezone *); typedef int (__sys_getrusage_t)(int, struct rusage *); typedef int (__sys_getsockopt_t)(int, int, int, void *, __socklen_t *); -typedef int (__sys_readv_t)(int, const struct iovec *, u_int); -typedef int (__sys_writev_t)(int, const struct iovec *, u_int); +typedef ssize_t (__sys_readv_t)(int, const struct iovec *, u_int); +typedef ssize_t (__sys_writev_t)(int, const struct iovec *, u_int); typedef int (__sys_settimeofday_t)(const struct timeval *, const struct timezone *); typedef int (__sys_fchown_t)(int, int, int); typedef int (__sys_fchmod_t)(int, mode_t); @@ -540,8 +540,8 @@ int __sys_listen(int s, int backlog); int __sys_gettimeofday(struct timeval * tp, struct timezone * tzp); int __sys_getrusage(int who, struct rusage * rusage); int __sys_getsockopt(int s, int level, int name, void * val, __socklen_t * avalsize); -int __sys_readv(int fd, const struct iovec * iovp, u_int iovcnt); -int __sys_writev(int fd, const struct iovec * iovp, u_int iovcnt); +ssize_t __sys_readv(int fd, const struct iovec * iovp, u_int iovcnt); +ssize_t __sys_writev(int fd, const struct iovec * iovp, u_int iovcnt); int __sys_settimeofday(const struct timeval * tv, const struct timezone * tzp); int __sys_fchown(int fd, int uid, int gid); int __sys_fchmod(int fd, mode_t mode); diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index bfcf9a46b485..ff62adce85b9 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -9473,12 +9473,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* freebsd32_readv */ case 120: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* freebsd32_writev */ case 121: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* freebsd32_settimeofday */ case 122: diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 8a681889cc6a..274167ac11d8 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -782,14 +782,14 @@ } 119 AUE_NULL RESERVED 120 AUE_READV STD|CAPENABLED { - int readv( + ssize_t readv( int fd, _In_reads_(iovcnt) _Contains_long_ptr_ const struct iovec *iovp, u_int iovcnt ); } 121 AUE_WRITEV STD|CAPENABLED { - int writev( + ssize_t writev( int fd, _In_reads_(iovcnt) _Contains_long_ptr_ const struct iovec *iovp, u_int iovcnt diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 59152b25177c..e7231bf8570e 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -9618,12 +9618,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* readv */ case 120: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* writev */ case 121: if (ndx == 0 || ndx == 1) - p = "int"; + p = "ssize_t"; break; /* settimeofday */ case 122: From nobody Wed Apr 24 20:21:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPr3W1N2bz5J2dt; Wed, 24 Apr 2024 20:21: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 4VPr3W0v1jz4KQN; Wed, 24 Apr 2024 20:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77MluIy/9yUVDkecvH/kRsjbf1O/y7AbXlqaEDYp3Y=; b=qArfvr3dil6HxFWHkPuwgOMgdEUcFsxNte5mJs9JPpWodNgxFVdofFoQWt1roL8DiWJYPb fr1PE4rAso4RHVaKa93koI82ZHnc0h1wjijQG2T/GvlItX7rb+/YL4D6k/8oRa/pklvpXs Z0q6lr9EG82p5GfJEUtNlG0ulIGJ0qRS1R20rE8iQNYpwQno/JnARGVVCiDX7W6+u+pdW9 XvjH9NUEcqqoAH1Rqb0IsM9gHIfvq1nHRG4n0BDE4rm/v/zlxavjbns6Zk8WXKInA3uH0h 6Cm9sGhMifcy27op1AOFcRqqq8ZmCm91Rg8DC60rKreoXEyYd00Yk5DL9Ru+AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990071; a=rsa-sha256; cv=none; b=RhR/5C+Hb7KPHNO80tQlMJuk68PzYQVJfKdHmR8XEK/IN+awlnsp3dSanP3Uyd34Wz8Xsq N8GhIRSNQLbvelDYhNHBXS8gLfis4DXEluX3sk6hmkx+/pmHEu1gxuOfY1l5ZjwhRbwI0B cVAW23olYHyOYFky9k6RA7FHDUDp0tqHp9ZKD5sY8I7EZyFLUJ1lt+5bQfKRgXJC8yKLlV Rj8tvAML8U7IskcvZsA1AEm6kg6LRXXClNzCRzjD80zXjonrsjrvQl0Og6idZItRcSqodT DEhGo6rdxXXrTPZHYgps4UTRq3BRjuNPlqK5OqgYeghXAAAH0MCX8EJkS6RuoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77MluIy/9yUVDkecvH/kRsjbf1O/y7AbXlqaEDYp3Y=; b=IhZcnbXbQcBA3mKy3EefrgUXh19aCi0O7Uf4E0ERcQ1WuO1elHdFilsEsAQ4nApROx7QS5 1oLwZ4Zo5kqTkefBxzK6+f4pnxLQUxHsAp51CGTT5OVt7A96G9+hZW6xZ8PWBgxoPiIPLA m5yV/jolQX8nm81TyafJJt1W70K6QiJdUETpqryjo1UtHB0Yc5gf9BETB3RRLC6sw7BV7F Bm7b2Syc3S+AzjAtZk/Rk4SVN9XdMRI0oyhx0dewQ/Ign72hxeIfHDpmt2YIvwUY7neL0/ 1g7FChb3rryJo/lKL9vgtTEEBTxIIhp48P2GbLQhex82ZH1zRrQirApgpe2W9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPr3W0C8DzT4Z; Wed, 24 Apr 2024 20:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OKLA0Z075199; Wed, 24 Apr 2024 20:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKLAki075196; Wed, 24 Apr 2024 20:21:10 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:21:10 GMT Message-Id: <202404242021.43OKLAki075196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 266b3bd3f26d - releng/13.3 - Unify arc_prune_async() code, fix excessive ARC pruning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce commit 266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce Author: Alexander Motin AuthorDate: 2023-10-30 23:56:04 +0000 Commit: Gordon Tetlow CommitDate: 2024-04-24 20:06:16 +0000 Unify arc_prune_async() code, fix excessive ARC pruning There is no sense to have separate implementations for FreeBSD and Linux. Make Linux code shared as more functional and just register FreeBSD-specific prune callback with arc_add_prune_callback() API. Aside of code cleanup this fixes excessive pruning on FreeBSD. [olce: This code comes from the OpenZFS pull request: https://github.com/openzfs/zfs/pull/16083, vendor-merged into our tree. Its commit message has been slightly adapted to the present context. The upstream pull request has been reviewed and merged into 'zfs-2.1.16-staging' as 5b81b1bf5e6d6aeb8a87175dcb12b529185cac2f, which should come into our tree at the next vendor import. This is the same code that was merged into stable/14 and main as part of vendor merges, and released as an EN (FreeBSD-EN-23:18.openzfs) over releng/14.0 by markj@.] PR: 275594, 274698 Reported by: Seigo Tanimura , markj, and others Tested by: olce Approved by: emaste (mentor) Approved by: so Obtained from: OpenZFS Sponsored by: iXsystems, Inc. Sponsored by: The FreeBSD Foundation Signed-off-by: Alexander Motin (cherry picked from commit 330954bdb822af6bc07d487b1ecd7f8fda9c4def) --- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +- sys/contrib/openzfs/include/sys/arc.h | 2 +- sys/contrib/openzfs/include/sys/arc_impl.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 62 ---------------------- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 32 +++++++++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 51 ------------------ .../openzfs/module/os/linux/zfs/zpl_super.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 52 ++++++++++++++++++ 8 files changed, 87 insertions(+), 117 deletions(-) diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h index 4e08470e794f..9d048d19aece 100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h @@ -52,7 +52,7 @@ extern const struct file_operations zpl_file_operations; extern const struct file_operations zpl_dir_file_operations; /* zpl_super.c */ -extern void zpl_prune_sb(int64_t nr_to_scan, void *arg); +extern void zpl_prune_sb(uint64_t nr_to_scan, void *arg); extern const struct super_operations zpl_super_operations; extern const struct export_operations zpl_export_operations; diff --git a/sys/contrib/openzfs/include/sys/arc.h b/sys/contrib/openzfs/include/sys/arc.h index 5d8176894e60..9b762c01c159 100644 --- a/sys/contrib/openzfs/include/sys/arc.h +++ b/sys/contrib/openzfs/include/sys/arc.h @@ -81,7 +81,7 @@ typedef struct arc_prune arc_prune_t; typedef void arc_read_done_func_t(zio_t *zio, const zbookmark_phys_t *zb, const blkptr_t *bp, arc_buf_t *buf, void *priv); typedef void arc_write_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv); -typedef void arc_prune_func_t(int64_t bytes, void *priv); +typedef void arc_prune_func_t(uint64_t bytes, void *priv); /* Shared module parameters */ extern int zfs_arc_average_blocksize; diff --git a/sys/contrib/openzfs/include/sys/arc_impl.h b/sys/contrib/openzfs/include/sys/arc_impl.h index db6238fda61e..118bf33632fb 100644 --- a/sys/contrib/openzfs/include/sys/arc_impl.h +++ b/sys/contrib/openzfs/include/sys/arc_impl.h @@ -994,7 +994,6 @@ extern void arc_wait_for_eviction(uint64_t, boolean_t); extern void arc_lowmem_init(void); extern void arc_lowmem_fini(void); -extern void arc_prune_async(int64_t); extern int arc_memory_throttle(spa_t *spa, uint64_t reserve, uint64_t txg); extern uint64_t arc_free_memory(void); extern int64_t arc_available_memory(void); diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 3dd49f05521b..9641bf8bd591 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -51,11 +51,6 @@ #include #include -#if __FreeBSD_version >= 1300139 -static struct sx arc_vnlru_lock; -static struct vnode *arc_vnlru_marker; -#endif - extern struct vfsops zfs_vfsops; uint_t zfs_arc_free_target = 0; @@ -151,53 +146,6 @@ arc_default_max(uint64_t min, uint64_t allmem) return (MAX(allmem * 5 / 8, size)); } -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *arg) -{ - int64_t nr_scan = (intptr_t)arg; - -#ifndef __ILP32__ - if (nr_scan > INT_MAX) - nr_scan = INT_MAX; -#endif - -#if __FreeBSD_version >= 1300139 - sx_xlock(&arc_vnlru_lock); - vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); - sx_xunlock(&arc_vnlru_lock); -#else - vnlru_free(nr_scan, &zfs_vfsops); -#endif -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(int64_t adjust) -{ - -#ifndef __LP64__ - if (adjust > INTPTR_MAX) - adjust = INTPTR_MAX; -#endif - taskq_dispatch(arc_prune_taskq, arc_prune_task, - (void *)(intptr_t)adjust, TQ_SLEEP); - ARCSTAT_BUMP(arcstat_prune); -} - uint64_t arc_all_memory(void) { @@ -248,10 +196,6 @@ arc_lowmem_init(void) { arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, EVENTHANDLER_PRI_FIRST); -#if __FreeBSD_version >= 1300139 - arc_vnlru_marker = vnlru_alloc_marker(); - sx_init(&arc_vnlru_lock, "arc vnlru lock"); -#endif } void @@ -259,12 +203,6 @@ arc_lowmem_fini(void) { if (arc_event_lowmem != NULL) EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem); -#if __FreeBSD_version >= 1300139 - if (arc_vnlru_marker != NULL) { - vnlru_free_marker(arc_vnlru_marker); - sx_destroy(&arc_vnlru_lock); - } -#endif } void diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 6ffd36885655..33581d018256 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -2097,6 +2097,26 @@ zfs_vnodes_adjust_back(void) #endif } +#if __FreeBSD_version >= 1300139 +static struct sx zfs_vnlru_lock; +static struct vnode *zfs_vnlru_marker; +#endif +static arc_prune_t *zfs_prune; + +static void +zfs_prune_task(uint64_t nr_to_scan, void *arg __unused) +{ + if (nr_to_scan > INT_MAX) + nr_to_scan = INT_MAX; +#if __FreeBSD_version >= 1300139 + sx_xlock(&zfs_vnlru_lock); + vnlru_free_vfsops(nr_to_scan, &zfs_vfsops, zfs_vnlru_marker); + sx_xunlock(&zfs_vnlru_lock); +#else + vnlru_free(nr_to_scan, &zfs_vfsops); +#endif +} + void zfs_init(void) { @@ -2123,11 +2143,23 @@ zfs_init(void) dmu_objset_register_type(DMU_OST_ZFS, zpl_get_file_info); zfsvfs_taskq = taskq_create("zfsvfs", 1, minclsyspri, 0, 0, 0); + +#if __FreeBSD_version >= 1300139 + zfs_vnlru_marker = vnlru_alloc_marker(); + sx_init(&zfs_vnlru_lock, "zfs vnlru lock"); +#endif + zfs_prune = arc_add_prune_callback(zfs_prune_task, NULL); } void zfs_fini(void) { + arc_remove_prune_callback(zfs_prune); +#if __FreeBSD_version >= 1300139 + vnlru_free_marker(zfs_vnlru_marker); + sx_destroy(&zfs_vnlru_lock); +#endif + taskq_destroy(zfsvfs_taskq); zfsctl_fini(); zfs_znode_fini(); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c index fc76fe0e0b5c..496dce5abe61 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c @@ -488,57 +488,6 @@ arc_unregister_hotplug(void) } #endif /* _KERNEL */ -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *ptr) -{ - arc_prune_t *ap = (arc_prune_t *)ptr; - arc_prune_func_t *func = ap->p_pfunc; - - if (func != NULL) - func(ap->p_adjust, ap->p_private); - - zfs_refcount_remove(&ap->p_refcnt, func); -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(int64_t adjust) -{ - arc_prune_t *ap; - - mutex_enter(&arc_prune_mtx); - for (ap = list_head(&arc_prune_list); ap != NULL; - ap = list_next(&arc_prune_list, ap)) { - - if (zfs_refcount_count(&ap->p_refcnt) >= 2) - continue; - - zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); - ap->p_adjust = adjust; - if (taskq_dispatch(arc_prune_taskq, arc_prune_task, - ap, TQ_SLEEP) == TASKQID_INVALID) { - zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); - continue; - } - ARCSTAT_BUMP(arcstat_prune); - } - mutex_exit(&arc_prune_mtx); -} - /* BEGIN CSTYLED */ ZFS_MODULE_PARAM(zfs_arc, zfs_arc_, shrinker_limit, INT, ZMOD_RW, "Limit on number of pages that ARC shrinker can reclaim at once"); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c index c2fd3fee1401..9300a7199296 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c @@ -334,7 +334,7 @@ zpl_kill_sb(struct super_block *sb) } void -zpl_prune_sb(int64_t nr_to_scan, void *arg) +zpl_prune_sb(uint64_t nr_to_scan, void *arg) { struct super_block *sb = (struct super_block *)arg; int objects = 0; diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c index 1180853da038..eacc2104a6a6 100644 --- a/sys/contrib/openzfs/module/zfs/arc.c +++ b/sys/contrib/openzfs/module/zfs/arc.c @@ -868,6 +868,8 @@ static void l2arc_do_free_on_write(void); static void l2arc_hdr_arcstats_update(arc_buf_hdr_t *hdr, boolean_t incr, boolean_t state_only); +static void arc_prune_async(uint64_t adjust); + #define l2arc_hdr_arcstats_increment(hdr) \ l2arc_hdr_arcstats_update((hdr), B_TRUE, B_FALSE) #define l2arc_hdr_arcstats_decrement(hdr) \ @@ -6521,6 +6523,56 @@ arc_remove_prune_callback(arc_prune_t *p) kmem_free(p, sizeof (*p)); } +/* + * Helper function for arc_prune_async() it is responsible for safely + * handling the execution of a registered arc_prune_func_t. + */ +static void +arc_prune_task(void *ptr) +{ + arc_prune_t *ap = (arc_prune_t *)ptr; + arc_prune_func_t *func = ap->p_pfunc; + + if (func != NULL) + func(ap->p_adjust, ap->p_private); + + zfs_refcount_remove(&ap->p_refcnt, func); +} + +/* + * Notify registered consumers they must drop holds on a portion of the ARC + * buffers they reference. This provides a mechanism to ensure the ARC can + * honor the metadata limit and reclaim otherwise pinned ARC buffers. + * + * This operation is performed asynchronously so it may be safely called + * in the context of the arc_reclaim_thread(). A reference is taken here + * for each registered arc_prune_t and the arc_prune_task() is responsible + * for releasing it once the registered arc_prune_func_t has completed. + */ +static void +arc_prune_async(uint64_t adjust) +{ + arc_prune_t *ap; + + mutex_enter(&arc_prune_mtx); + for (ap = list_head(&arc_prune_list); ap != NULL; + ap = list_next(&arc_prune_list, ap)) { + + if (zfs_refcount_count(&ap->p_refcnt) >= 2) + continue; + + zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); + ap->p_adjust = adjust; + if (taskq_dispatch(arc_prune_taskq, arc_prune_task, + ap, TQ_SLEEP) == TASKQID_INVALID) { + zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); + continue; + } + ARCSTAT_BUMP(arcstat_prune); + } + mutex_exit(&arc_prune_mtx); +} + /* * Notify the arc that a block was freed, and thus will never be used again. */ From nobody Wed Apr 24 20:21:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPr3X2wcPz5J2Qn; Wed, 24 Apr 2024 20:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPr3X19DJz4KKx; Wed, 24 Apr 2024 20:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtTkSOiO/gqE67U6FGcYRrNz5/jRqso6oTOUDmjBTlM=; b=TDb79P0vzsBMbIze9SMJqsVCNQK8UpOftN29ZdWDgBZbcGsv+8MJ5zAD9f6z3kAOl8ZF7m 5P5JJ+ncphI4a2mM6qclR3N/fn5iSlhULN5w6HWGw4jJ+ixHRnCDBQsUBPgKzw3zYe7cBM xNV75PUGNt91gNXhHt5RBAdCi+XwF9p3CdWgVsIleBWNxdQQXB4Xp4p399wEIRXmmCmSUL aW8u8daKC1cU9u2fBltnjxWTcMIplZBbG09l+w6qP6wRTcOvYL9lhPDfZ/0of7l7RZaDAM S2S+mfLCB/h0u0bXHaiAUgUIb/IMUL4YuDZfZ1SX6EXtmVOkrBVpRgXO9HOwBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990072; a=rsa-sha256; cv=none; b=YtVhQddaFXDuiNzI8WtbwLkA3uwi4mSOlT+LN6k4b/dp6GR0lNwOkKzQtWwSa+DKwMPc2i Mh746MDoBAe0ue3A3Ik9vudX/B/al0muTLtiNZZ7qHHHzhXL58N6xbs2WVHe4mqFa0GGzT TtrTeTgwfL7UzFgg/O9AlTGklWZGbvqPWOQG8jTao3x/FfOBH0+2+/H7dJpKxb9XVKbFhb RzOxjTb25v1AVRRE3op7NI3KFKiWbTOsv8+mRrax0aho6GQkeXc7D9AjHM4xqQR4hlljb5 +0y6kKEaVQDKb8ABiJz7meNwae5mjRkFvyI4ioU7i2GXpPWJfF2Eb7uzUpu3Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtTkSOiO/gqE67U6FGcYRrNz5/jRqso6oTOUDmjBTlM=; b=rmKecONL1UbnfY6hsOJ02sg/MN0ajAaV/bLJjj/JFst2wVW8pqPaEU0P+NPMiL9q2NypbC 88MxnDwtCcrG7eutcRTEfv+hQjUxa/q37/nFnjuZsMeN5CHkifc4KDarJePQW/Xk2JtvrB 7GsZ20+/UUzLYmUCMe9pDMWxv6nzcgDHWBLMTQQV4mBCvP2kdw+dWkAJv6+BZQtMndSymv fF9r8vnIqRzg54rwt2pym7NyF16oa91lN2ymUOXaf6nSAUE5Jysi44nfn3i9TD+c1YSenx z/cXfMvJl2wNQeueZmWzCQDQpGV4vd6UvyY7vVH1/deOS6E09tAtxf9D53aKmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPr3X0nGDzVKG; Wed, 24 Apr 2024 20:21: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 43OKLCXX075250; Wed, 24 Apr 2024 20:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKLCod075247; Wed, 24 Apr 2024 20:21:12 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:21:12 GMT Message-Id: <202404242021.43OKLCod075247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: be4f1894ef39 - releng/13.3 - Add UPDATING entries and bump the branch 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: be4f1894ef399f421bab451e8cf8557e27e5a948 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=be4f1894ef399f421bab451e8cf8557e27e5a948 commit be4f1894ef399f421bab451e8cf8557e27e5a948 Author: Gordon Tetlow AuthorDate: 2024-04-24 20:08:33 +0000 Commit: Gordon Tetlow CommitDate: 2024-04-24 20:08:33 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 9e07b0d7e3a3..97c8abff980a 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240424: + 13.3-RELEASE-p2 EN-24:09.zfs + + Fix high CPU usage by kernel threads related to ZFS [EN-24:09.zfs] + 20240327: 13.3-RELEASE-p1 EN-24:06.wireguard EN-24:07.clang diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4d4f28badbac..c6e44a41b9f8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.3" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Apr 24 20:30:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPrG45yGTz5J3R0; Wed, 24 Apr 2024 20:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPrG45Py7z4LWt; Wed, 24 Apr 2024 20:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5y4IULsgraTXoKCMAIKHISpR+XH5YbTKrLprFe4ElTQ=; b=wE/+SetykJC3I5+Z2D5Y2c0btUnfE7Mm4oAUYbPQuGTJOYMGV+h2lEw3gFzhid6SaVIPli vJmtmYCuCCifEQIz64fjQIwoVKXvis+g6P1IOOoLxhIpay8CXzg34iLFycUEph+rusUB/4 CMzkkp+hdONOTvVExYkrcejEzy6sua605KKSD3khGCELyhDTNIxKCz73YYd5q+mcQRwbn+ e8W2TKkADn5rDbXd5cz9Rch5P5OeJZbL1wZVz9EEmPuOimFPF+xSb07TT9gvbHVKPMDgMF QjeKF4fapWMJx27W8FDdnyHIMLNoxn2M5CVmbh5ZUBO6vd18ixwJSutcrHzTdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990620; a=rsa-sha256; cv=none; b=qgPJxuIW6nrgptbOTKqs0tHyxHFl1ABKTKWq/AwYOS9ZFq80YREcmpR2pVATGf+GOlqd67 8wBe55a3lG35ctgbcyeadIFDa7P/YcUKNxvwr/OzbtVyDbS0LX5pYC3KKRmKYpmCG/ifbD /aTGZBKOcbxEQvT+eHLzPRyvYgIcSNqvq33+SuzjxOhOSFOUiIALMZEE9dHbH4GY57Y0Wq qpnkjJALxxNiDZOwQKJua+EMQpH000FGY05Y+nrVfwjhq08qbsUon9F/YIqj+mhb2suw1h Bo/sQAXQeteqBoe+Y4TKOioJtlfurXCrxMVm7Vfc6gk++Oygg3ictOUN5dW9Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5y4IULsgraTXoKCMAIKHISpR+XH5YbTKrLprFe4ElTQ=; b=rpi1AcTTBvvJ1MZ1U2H8XZ+ZzloIm6Zhl6/zBfCCIs0h6rUoRJofB+Ooq0XP7baNLxzORz uJT1fcnJ+1RMyP0gAiW9kHzT+pmm0t56kQh0ZSMSojDoizueBmrcYSnqI7LG0Ea3q5jpi1 y1B6fgPSIXLetgJ2ylPldyrhlzcejF2BMdZqGntnaiL2mYFJXsZZpRdI7ylqJ8b1e+fYNp YrJv4AsO9M48OUbK2+x5N+H5YD0OiT0zOkfCPC9lz99AEdnf42c7oMhuEsI1iiga+Q+Wfa BL+SaM8IyCNWGmGj9fB3CHLexVDrnf9YQBlJvgUJ3wp4+tFKMaF1Ay2GMbA/9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrG44v5jzVdm; Wed, 24 Apr 2024 20:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OKUKQH091587; Wed, 24 Apr 2024 20:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKUKet091584; Wed, 24 Apr 2024 20:30:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:30:20 GMT Message-Id: <202404242030.43OKUKet091584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d48e7e89e02f - stable/14 - TCP: Fix a rack bug that skyzall found which results in a 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba commit d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba Author: Randall Stewart AuthorDate: 2023-10-04 19:16:01 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:26:27 +0000 TCP: Fix a rack bug that skyzall found which results in a crash. So when we call the fast_rsm retransmit path, we should always move snd_nxt back up to snd_max. In fact during ack-processing if snd_nxt falls behind it should be moved up there as well. Otherwise what can happen is we have an incorrect mark on snd_nxt and incorrectly calculate the offset when we go through the front path (which is what skzyall was able to do) then when we go to clean up the send the offset is all wrong and we crash. Special thanks to Gleb for pointing out the problem and the email that had the reproducer so I could find the issue. Reported-by: syzbot+f5061a372f74f021ec02@syzkaller.appspotmail.com Sponsored by: Netflix Inc (cherry picked from commit 8818f0f1124ea3d0e8028f85d667237536eba10c) --- sys/netinet/tcp_stacks/rack.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 889622b7ff90..0bc3b5588b7b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -12346,8 +12346,8 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una; - if (SEQ_LT(tp->snd_nxt, tp->snd_una)) { - tp->snd_nxt = tp->snd_una; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) { + tp->snd_nxt = tp->snd_max; } if (under_pacing && (rack->use_fixed_rate == 0) && @@ -16369,8 +16369,8 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb /* Send recover and snd_nxt must be dragged along */ if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una; - if (SEQ_LT(tp->snd_nxt, tp->snd_una)) - tp->snd_nxt = tp->snd_una; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) + tp->snd_nxt = tp->snd_max; /* * If the RXT timer is running we want to * stop it, so we can restart a TLP (or new RXT). @@ -19118,6 +19118,8 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma lgb->tlb_errno = error; lgb = NULL; } + /* Move snd_nxt to snd_max so we don't have false retransmissions */ + tp->snd_nxt = tp->snd_max; if (error) { goto failed; } else if (rack->rc_hw_nobuf && (ip_sendflag != IP_NO_SND_TAG_RL)) { From nobody Wed Apr 24 20:37:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPrPw6kgbz5J3qB; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPrPw5n34z4Lr5; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYTt4kJ7a7b8Kt6dSu8GmybXNavVGF6sBVhuBkHpFNE=; b=lG750ncaIRYjCiP2o/0oA0i0Tbq4W2Uw+h3ocQu8MHUqs7aUO4r/zx0dbTx5oCBdPBQxQE L4+VEHuw2kZcAk9JAVax+yLOVQMdVo6atd72jm4vihv6jAB50jRCNr/K1q1bbYT66agt48 eyDSErhaucYwnFelERarsL70mRBYMT45bVYR8mcHtRmQQ1quroq5gx1TRvw25E0pyS+XU/ cL/6LTcAdFAN/Al/leQLev0PrE0qe/tDVVjaNQHTdyl38wDv1GBRlCOkhGSrS5conMj+bH aW7Nr+n3UOzKmv6dtROki2+4D2+EileG2ckInxQHds74/IlZaZ1Y+2eRuAXYiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713991028; a=rsa-sha256; cv=none; b=OXjKY26Dit/usBF+YZEPx6nUYeETB9MQ57jwEN29RJ1Ui3YbOO5NGG8SKKDWmXr+wOohMP roBIvORml0L6gYT5zBLoX/+sLkip17PtDlmn/AGNJJcoxbOXVfFkxEaRKrCFp9K22ng2TN zjTfJuA2kDpX8rF5h8erRIxsfLOdzHIsVHe9QyBbrx8gksY4EkcOzMTvlq39bRCrH8RFbZ 0C4KC4H3KTEkaLu6X6HdkshgdCLSJ7jCDjXjeB5Iv7JNJkXKfDUzKKTVmKPMKKITukxmGH cjSXRIT2sFu8vG1bJanJhm91IVK/8BYcGJF4NC0Mhqr0fV9sTtBYf0UcTBNM8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYTt4kJ7a7b8Kt6dSu8GmybXNavVGF6sBVhuBkHpFNE=; b=iyOBBw2CrP1eEfdfBSLnUXqOFgTtnOqUVTP0X/yrF6Yymanf6BS+wkxDWBXTGW886oX4fc 2Wjk2kY1mz6KTHlTRhRdISuSq6uYizR4SsRSzrILSvPwqreldM9ZDpmEKDQaOiOMbn3Y1X xJO9f1CDLlvueUqq5Lg8j4m1YvEN/OiX+eRP1gpsz6IKXZCZL+hmL0rB3dKJ4UusmWKLNC BnrqMkdLuN4KzSWBuga8WHX6wL6rgg35dOATCVImik5oCJQDiQvqMAbOWEhiXVYnpYUgiv tVBvvDAsWbI/5sjqKVGqGXiLB+ACkkdnNhkTIHfpbHGpwTT7y0/Pses86YKixA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrPw5GBSzWBy; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OKb85O099291; Wed, 24 Apr 2024 20:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKb89E099288; Wed, 24 Apr 2024 20:37:08 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:37:08 GMT Message-Id: <202404242037.43OKb89E099288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 917b5431453d - stable/14 - HTPS has actually three states not two so the macro needs to account for that. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 917b5431453d0a02ac4f976b76511357ed6c5604 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=917b5431453d0a02ac4f976b76511357ed6c5604 commit 917b5431453d0a02ac4f976b76511357ed6c5604 Author: Randall Stewart AuthorDate: 2024-03-01 20:21:15 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:36:32 +0000 HTPS has actually three states not two so the macro needs to account for that. Ok lets fix up the tcp_in_hpts() so that it also says yes if you are in the race state moving and you are scheduled to be put in. This also requires changing the MPASS to be the old version non inline function of tcp_in_hpts(). This change also adds a new inline macro so that a uint64_t timestamp can be obtained by a transport (aka Rack will use this). Reviewed by: glebius, tuexen Sponsored by: Netflix Inc. Differential Revision: https://reviews.freebsd.org/D44157 (cherry picked from commit 638b5ae1c7858373344bc7b9dcb5a1e7fab80bd9) --- sys/netinet/tcp_hpts.c | 2 +- sys/netinet/tcp_hpts.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index af7b2691ff2e..07c5f04b907e 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -821,7 +821,7 @@ tcp_hpts_insert_diag(struct tcpcb *tp, uint32_t slot, int32_t line, struct hpts_ INP_WLOCK_ASSERT(tptoinpcb(tp)); MPASS(!(tptoinpcb(tp)->inp_flags & INP_DROPPED)); - MPASS(!tcp_in_hpts(tp)); + MPASS(!(tp->t_in_hpts == IHPTS_ONQUEUE)); /* * We now return the next-slot the hpts will be on, beyond its diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 0c5cfac28a6c..b097a2b98db9 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -115,7 +115,9 @@ void tcp_hpts_remove(struct tcpcb *); static inline bool tcp_in_hpts(struct tcpcb *tp) { - return (tp->t_in_hpts == IHPTS_ONQUEUE); + return ((tp->t_in_hpts == IHPTS_ONQUEUE) || + ((tp->t_in_hpts == IHPTS_MOVING) && + (tp->t_hpts_slot != -1))); } /* @@ -208,6 +210,17 @@ tcp_gethptstick(struct timeval *sv) return (tcp_tv_to_hptstick(sv)); } +static __inline uint64_t +tcp_get_u64_usecs(struct timeval *tv) +{ + struct timeval tvd; + + if (tv == NULL) + tv = &tvd; + microuptime(tv); + return (tcp_tv_to_lusectick(tv)); +} + static __inline uint32_t tcp_get_usecs(struct timeval *tv) { From nobody Wed Apr 24 20:41:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPrVl1f1lz5J3vS; Wed, 24 Apr 2024 20:41: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 4VPrVk0dK7z4MX2; Wed, 24 Apr 2024 20:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hZejh25Way3YEaaApiPmdqX/4+SgWrAI/AQgx+vcas=; b=jBfqM9iMnQyu6nMMGo9q4RBGiej1V85Jq7qhchV3/vEucRP3uxEdNUF5DxlvRlCsfAp9ve yvlkrJGPpWOBFIcM0PXwMhYoCrzCE/Uh/fOmC/NezbWZ6I8uL+GGvb+RLendP3GXKQhSOY h+hmrSYDQv7eFQvLFwwOewheck6Hr0NoBYQx9TLAC+7l+Uw5jaDEpdeE0Ds7HDdgmB6PxF kx8EhkFqL/aEL6AnLy1XBql3COMAEEDQqJGfanfc+SIUpiTfA70oCEnxK6eHDUaIhTteWs daawo3r3iWr1UkIry/rCEYJ3v5Rqq/PW483nXRB2tFqdCOK+n7HT6rtKj5Zo1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713991278; a=rsa-sha256; cv=none; b=pgTqy5e2e5XAZaeMtOdYLyCOQl7QSJ/HYj6bKEV48NXj8M+TOZJj1B0JZMHR1dnJ04kl5H qPS/3IeHy9pePt9PMSq28krSFI77j/uhdxbV1ZiuzwMgFKb90w0HiFaT5EBj/jvkpfcVbn X7Z1HeI24GkLHpWV6hrLDfRpP5AVbqCqUkc/HsEyKTh6YKavw+kIaNouS7y5+p0Vh7aC22 utTFa3N7PpSWVre0dgJHQAYwbUKRpnRL9JEmilJkS4zApcDEuZWncIl3Q6R76fnCA4YQx7 mcd/pm3fHpbvOtYxNrWbbAOtVgemuvwIxuEeBdUXXgJ+Rupv3iqJ8SD6oEMJRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hZejh25Way3YEaaApiPmdqX/4+SgWrAI/AQgx+vcas=; b=WqYLvtcAUaYvcPFhGXcYQ29UJaPJ9gMTmxIOIgUha2JenFEjRbOlVces38trX5S3Srenw7 Ggpn1m0uA3wREmPcDrCI3H3i4pVZf3sz3Gs5EHvSrpn98jpoLRSWuvlUlkIJneE1z/hLtP jeWqGElcTWr+XYt+8cIi3smSleubY2eDN+3iGKvNx6MNO4OrOrkC1RbfroEfGc9lS5pHC8 kHPSUac5E0hF+Eem0CfFgBdeyPa0seV/cptrcRW+3CBRdMKxj51a3tQ8gY2sZKseQH36RG D19DBwFFDsHERvLqBrTzhOGiziFAO4A/1hJVWUlLnoxC2S53Ux/5oc2b8CyR5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrVk0CTHzWRS; Wed, 24 Apr 2024 20:41: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 43OKfH9J010493; Wed, 24 Apr 2024 20: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 43OKfH8c010490; Wed, 24 Apr 2024 20:41:17 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:41:17 GMT Message-Id: <202404242041.43OKfH8c010490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7fdef9cdb7ee - stable/14 - Optimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 commit 7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 Author: Randall Stewart AuthorDate: 2024-03-28 12:12:37 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:37:40 +0000 Optimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold HPTS inserts a softclock for system call return that optimizes performance. However when no HPTS threads need the help (i.e. when they have less than 100 or so connections) then there should be little work done i.e. check the counter and return instead of running through all the threads getting locks etc.ptimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold. Reported by: eduardo Reviewed by: gallatin, glebius, tuexen Tested by: gallatin Differential Revision: https://reviews.freebsd.org/D44420 (cherry picked from commit b7b78c1c169dd2213b4cb3e14e19c045b2c5e5af) --- sys/kern/subr_trap.c | 2 ++ sys/netinet/tcp_hpts.c | 10 +++++++++- sys/sys/systm.h | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 42ce9e7988b5..5a89ba8b6500 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -76,6 +76,8 @@ #include #endif +volatile uint32_t __read_frequently hpts_that_need_softclock = 0; + void (*tcp_hpts_softclock)(void); /* diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 07c5f04b907e..85341cab0750 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -193,7 +193,8 @@ struct tcp_hpts_entry { uint8_t p_direct_wake :1, /* boolean */ p_on_min_sleep:1, /* boolean */ p_hpts_wake_scheduled:1, /* boolean */ - p_avail:5; + hit_callout_thresh:1, + p_avail:4; uint8_t p_fill[3]; /* Fill to 32 bits */ /* Cache line 0x40 */ struct hptsh { @@ -1684,6 +1685,13 @@ tcp_hpts_thread(void *ctx) ticks_ran = tcp_hptsi(hpts, 1); tv.tv_sec = 0; tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; + if ((hpts->p_on_queue_cnt > conn_cnt_thresh) && (hpts->hit_callout_thresh == 0)) { + hpts->hit_callout_thresh = 1; + atomic_add_int(&hpts_that_need_softclock, 1); + } else if ((hpts->p_on_queue_cnt <= conn_cnt_thresh) && (hpts->hit_callout_thresh == 1)) { + hpts->hit_callout_thresh = 0; + atomic_subtract_int(&hpts_that_need_softclock, 1); + } if (hpts->p_on_queue_cnt >= conn_cnt_thresh) { if(hpts->p_direct_wake == 0) { /* diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 3721db649a3d..eb690b1cf4b4 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -393,8 +393,10 @@ extern int cpu_disable_c2_sleep; extern int cpu_disable_c3_sleep; extern void (*tcp_hpts_softclock)(void); +extern volatile uint32_t __read_frequently hpts_that_need_softclock; + #define tcp_hpts_softclock() do { \ - if (tcp_hpts_softclock != NULL) \ + if (hpts_that_need_softclock > 0) \ tcp_hpts_softclock(); \ } while (0) From nobody Wed Apr 24 21:28:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsXk6ksCz5J87g; Wed, 24 Apr 2024 21:28: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 4VPsXk6BKyz4StV; Wed, 24 Apr 2024 21:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ai5lYLWxQGs3/1G+Z1y/+8j4tEXL0m2yxnGvgDxNmuQ=; b=q9HDdU2OC98lNwJwZtgIhB6tz6djKNRWSlFPuwrbePqAIrxIq+ou3kSNnNzc5skxDZrPx3 C0rH++e14qNoo+o5I6VFGW1f0WXuEuQ81Lv9WvfdlHFHbsebudZhOmdpTbpyBQ6hjhynRI zJC+QzhT2/B0X11nzrW8NKdpbJI2Ti6Y9qnsIykC7hG9VxRpt9Ebk955IYnQbBf13WMKYy hS22/GImUfym7THeoSyem6OrHnwBj+1il5EW6puIeTFJMNA3ihQ/JdQ1XhSxOKhZXlnbc+ 4u+T1X30J+PYT3/GfMv21EqY2NGjLF40zl4S+ARkxlyjIHh5imemiOfjQrimnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994086; a=rsa-sha256; cv=none; b=LJNne2HalSu2XAdSS7o9a+k7zGVgKkYbEM51bLaRQKBD+PoCjnFuO1J8fHu44I9y/NIn+0 +K1VdDCQixLRp0FM7l8zRsnYZYSE9HSMl1PWbXTvglGaiOtimsKZKfngnL5ZKXKvmYqWnT 5i7l9/zzwDz4tx/bALa/9iDzt03aVm+FmIr+gqzwWgZk2oQIz2HMeObAEA67BjZTebM4dr tUYoJAmFgIj2UwI19r1b/3nCqODxbiY3sv7/VwF4IEPBf2oL7AT6Usv8k7TRwudTmh4smn 4sxJOHUPQr0G/WPY50KvHxFccuWLGKwaxkGkB3viF6AcEVA66RaYCg7snEiUxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ai5lYLWxQGs3/1G+Z1y/+8j4tEXL0m2yxnGvgDxNmuQ=; b=xY6jqtj4oeLjkWPDb2/RkCUnvW7LaHZ0iA5KvgvtQVKSAmkb/f8rCUN2p3o4GOgVYcyupN 9i5Gcf7CwkZLmzzMZAzRbrhM/vsEjh6RcXlIZBEHvfVZgWYqKhJFdsKIe+8TdfBf1iUQiP nbmgL2xht8BK0+vsACr8aI2PyJZPEREXhtsIYY7Q33B8V9fjdlZauNEsKmpUwfF/vGHREG i52w4f0wIorUG5qOfdN0ItkcPyGq2hBPFogCmCd3uem2WvtvftUYI7HUrUJiSakRLIoyTr eV4pWUqAAHVuy2VQtG1L/5dcB37Cu7Iutb40uJ5CJuVqVwPtbFuJRtQ3LnD3yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXk5p3kzXmK; Wed, 24 Apr 2024 21:28: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 43OLS60X086194; Wed, 24 Apr 2024 21:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS6Gh086191; Wed, 24 Apr 2024 21:28:06 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:06 GMT Message-Id: <202404242128.43OLS6Gh086191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: feb6e2786dc5 - stable/14 - Add a few missed libclang_rt files to ObsoleteFiles.inc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: feb6e2786dc523a57a9c2384ed67cdb4970dde34 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=feb6e2786dc523a57a9c2384ed67cdb4970dde34 commit feb6e2786dc523a57a9c2384ed67cdb4970dde34 Author: Dimitry Andric AuthorDate: 2024-04-21 21:32:22 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:24 +0000 Add a few missed libclang_rt files to ObsoleteFiles.inc PR: 276104 Reported by: Mark Millard MFC after: 3 days (cherry picked from commit 0ab121e9f9a33dde06b292df02ec2eee03033e1f) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6d3ba576de86..2b0766222429 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -325,6 +325,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -343,6 +344,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Wed Apr 24 21:28:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsXm0g5xz5J7xR; Wed, 24 Apr 2024 21: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 4VPsXm0CK3z4Syx; Wed, 24 Apr 2024 21:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tad2rOsLwLvB7HkeZcKcV5Ig1j3gtjZRxzcUMDmdnNA=; b=VM/wLLOQWUAlSfCtlqEeJe2blU/DrX0uC/pUmEFzQLYw1wmCHdf0TH9UaYdk1rbc7Dc/Bn sl71DHhC/jxCFsXB+hsppOSIyAcgkWk1kckVV3J9eazTAQVLKSIEpAPY5Yz6gqp7qBqF2o k/WoCCydqFigwp0o3P7fEYOgKxiZVNXP1PwFKXo2dBCARzxQw/RR+WUn1HFWnKrHZcXaNX Cs93AwU8bQCpDspJk0/8l2nWxxhhD9Jra0V9rkYG7Aa0F/bQvf0uP5Rc8eQSr6zExPEGhM DGAbBxBN4y/ElvVoxoTzftLu22v5je7V8uHmOZr1gUpMQoCZ6S6tGlK71pP4Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994088; a=rsa-sha256; cv=none; b=VPLx1Bh933iaTYyb36meAlC8FZVEX47XOqQRZisuvC3gGHeFBYz6Z7N31D12Kxs8hyxjPn 2++Fjf1/93eZhiz7F4hYbO+iJFbjddV8OSGXyRWJRUipKRGpDi60YlXwowJC2m3hK9a5GS WWDwxJz7SZnQnN9FMf60SdI+mP2k7CAUC402QXOU1vRFu11+2I90vPVoaYArMRhk9w/QVV CEBB5GqiDPBd20NCytyv3jLQqa6XDxMcYyCnDCS4A7aNa7SEX4BL5JJRhozP5IbHSwxRkP /fnNdNXMShxBBSI79cdSgnPUv71HAHSaxCz6kaTqIcDemLzwbw8hYkv3KyWnBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tad2rOsLwLvB7HkeZcKcV5Ig1j3gtjZRxzcUMDmdnNA=; b=wQEWe7JFDGqLdzvvse7ZxKSNyot+ayU8HE8zU7JfH+VQ+9Z5YrLwawUURXj+pfmf3TLQu5 ptDxe0l5aYIJ0zgt1vLHcxNa9A2qL+4aiTnEkf6M75VbzROk6oCCF2FO/PyZgN3UtpRiQT UEGOiyjoCCSyckCJAGI1OAKNskH/jIf8laCt4c8vwIehRY/5ESp5ltNRQHLN+PGqt3953M 1IN9GQGJrYb4jsXAqrna6rbjcq6+p0jVNQLHd0K+8/cT4h6kzpI+u4SCq1pKWZwlgZIBFQ SoX95yWGmEdQTNj8H1sP5m/I5qBIe01i1nnbQHlAbAmFv7wZF/NkSksMADP4cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXl6wkBzXpk; Wed, 24 Apr 2024 21:28: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 43OLS7KK086247; Wed, 24 Apr 2024 21:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS7qN086244; Wed, 24 Apr 2024 21:28:07 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:07 GMT Message-Id: <202404242128.43OLS7qN086244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 164f125311a6 - stable/14 - heimdal: Add 64-bit integer support to ASN.1 compiler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 164f125311a6cc0217ce9103aaefcfd31fb796bf Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=164f125311a6cc0217ce9103aaefcfd31fb796bf commit 164f125311a6cc0217ce9103aaefcfd31fb796bf Author: Dimitry Andric AuthorDate: 2024-04-16 18:56:37 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:52 +0000 heimdal: Add 64-bit integer support to ASN.1 compiler Import upstream 19d378f44: ASN.1 INTEGERs will now compile to C int64_t or uint64_t, depending on whether the constraint ranges include numbers that cannot be represented in 32-bit ints and whether they include negative numbers. Template backend support included. check-template is now built with --template, so we know we're testing it. Tests included. Also adjusts the generated files: * asn1parse.c, asn1parse.h (not strictly necessary, but nice to have) * der-protos.h, which needs a bunch of new prototypes. I copied these from a der-protos.h generated by the upstream build system, which uses a perl script for this. * adjust printf format strings for int64_t. Upstream uses %lld for this, but that is not portable, and leads to lots of -Werror warnings. This should fix target-dependent differences between headers generated by asn1_compile. For example, when cross compiling world from amd64 to i386, the generated cms_asn1.h header has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..-1), iv OCTET STRING, } while a native build on i386 has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..2147483647), iv OCTET STRING, } These are _both_ wrong, since the source file, cms.asn1, has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..4294967295), iv OCTET STRING -- exactly 8 octets } PR: 276960 Reviewed by: cy, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44814 Differential Revision: https://reviews.freebsd.org/D44815 (cherry picked from commit 1b7487592987c91020063a311a14dc15b6e58075) --- crypto/heimdal/lib/asn1/Makefile.am | 12 +++- crypto/heimdal/lib/asn1/asn1-template.h | 2 + crypto/heimdal/lib/asn1/asn1parse.c | 6 +- crypto/heimdal/lib/asn1/asn1parse.h | 2 +- crypto/heimdal/lib/asn1/asn1parse.y | 6 +- crypto/heimdal/lib/asn1/check-gen.c | 120 ++++++++++++++++++++++++++++++++ crypto/heimdal/lib/asn1/der-protos.h | 50 +++++++++++++ crypto/heimdal/lib/asn1/der_copy.c | 14 ++++ crypto/heimdal/lib/asn1/der_free.c | 12 ++++ crypto/heimdal/lib/asn1/der_get.c | 45 +++++++++++- crypto/heimdal/lib/asn1/der_length.c | 57 +++++++++++++++ crypto/heimdal/lib/asn1/der_put.c | 72 +++++++++++++++++++ crypto/heimdal/lib/asn1/gen.c | 20 +++--- crypto/heimdal/lib/asn1/gen_decode.c | 18 ++--- crypto/heimdal/lib/asn1/gen_encode.c | 12 ++-- crypto/heimdal/lib/asn1/gen_length.c | 12 ++-- crypto/heimdal/lib/asn1/gen_template.c | 22 +++--- crypto/heimdal/lib/asn1/lex.l | 2 +- crypto/heimdal/lib/asn1/symbol.h | 10 ++- crypto/heimdal/lib/asn1/template.c | 2 + crypto/heimdal/lib/asn1/test.asn1 | 2 + 21 files changed, 446 insertions(+), 52 deletions(-) diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/crypto/heimdal/lib/asn1/Makefile.am index 47158b88aa42..608639aed276 100644 --- a/crypto/heimdal/lib/asn1/Makefile.am +++ b/crypto/heimdal/lib/asn1/Makefile.am @@ -37,6 +37,7 @@ gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.x +gen_files_test_template = test_template_asn1-template.c gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -53,7 +54,7 @@ asn1_print_SOURCES = asn1_print.c check_der_SOURCES = check-der.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h -nodist_check_template_SOURCES = $(gen_files_test:.x=.c) +nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) @@ -134,6 +135,7 @@ CLEANFILES = \ $(gen_files_pkcs12) \ $(gen_files_digest) \ $(gen_files_kx509) \ + $(gen_files_test_template) \ $(gen_files_test) $(nodist_check_gen_SOURCES) \ asn1_err.c asn1_err.h \ rfc2459_asn1_files rfc2459_asn1*.h* \ @@ -145,6 +147,7 @@ CLEANFILES = \ pkcs12_asn1_files pkcs12_asn1*.h* \ digest_asn1_files digest_asn1*.h* \ kx509_asn1_files kx509_asn1*.h* \ + test_template_asn1_files test_template_asn1*.h* \ test_asn1_files test_asn1*.h* dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h @@ -170,6 +173,7 @@ priv_headers += pkcs9_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h +priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h @@ -178,7 +182,7 @@ $(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h $(srcdir $(libasn1_la_OBJECTS): $(nodist_include_HEADERS) $(priv_headers) asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(libasn1base_la_OBJECTS): asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(check_gen_OBJECTS): test_asn1.h -$(check_template_OBJECTS): test_asn1_files +$(check_template_OBJECTS): test_template_asn1.h test_template_asn1_files $(asn1_print_OBJECTS): krb5_asn1.h asn1parse.h: asn1parse.c @@ -192,6 +196,7 @@ $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files +$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 @@ -221,6 +226,9 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 + $(ASN1_COMPILE) --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) + test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) diff --git a/crypto/heimdal/lib/asn1/asn1-template.h b/crypto/heimdal/lib/asn1/asn1-template.h index 107706ce8340..5fd6b812630f 100644 --- a/crypto/heimdal/lib/asn1/asn1-template.h +++ b/crypto/heimdal/lib/asn1/asn1-template.h @@ -118,7 +118,9 @@ enum template_types { A1T_IMEMBER = 0, A1T_HEIM_INTEGER, A1T_INTEGER, + A1T_INTEGER64, A1T_UNSIGNED, + A1T_UNSIGNED64, A1T_GENERAL_STRING, A1T_OCTET_STRING, A1T_OCTET_STRING_BER, diff --git a/crypto/heimdal/lib/asn1/asn1parse.c b/crypto/heimdal/lib/asn1/asn1parse.c index 0e04fabf6296..a305f4b0267b 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.c +++ b/crypto/heimdal/lib/asn1/asn1parse.c @@ -304,7 +304,7 @@ struct string_list { typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -1874,7 +1874,7 @@ yyreduce: lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (5)].value)->u.integervalue - 1; + (yyval.range)->max = INT_MAX; } break; @@ -1884,7 +1884,7 @@ yyreduce: if((yyvsp[(4) - (5)].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(4) - (5)].value)->u.integervalue + 2; + (yyval.range)->min = INT_MIN; (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; } break; diff --git a/crypto/heimdal/lib/asn1/asn1parse.h b/crypto/heimdal/lib/asn1/asn1parse.h index 69b7d6dc1a4a..c1ced1df5a44 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.h +++ b/crypto/heimdal/lib/asn1/asn1parse.h @@ -224,7 +224,7 @@ typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; diff --git a/crypto/heimdal/lib/asn1/asn1parse.y b/crypto/heimdal/lib/asn1/asn1parse.y index e3bea6ce0ac9..b419676d3429 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.y +++ b/crypto/heimdal/lib/asn1/asn1parse.y @@ -69,7 +69,7 @@ struct string_list { %} %union { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -370,14 +370,14 @@ range : '(' Value RANGE Value ')' lex_error_message("Non-integer in first part of range"); $$ = ecalloc(1, sizeof(*$$)); $$->min = $2->u.integervalue; - $$->max = $2->u.integervalue - 1; + $$->max = INT_MAX; } | '(' kw_MIN RANGE Value ')' { if($4->type != integervalue) lex_error_message("Non-integer in second part of range"); $$ = ecalloc(1, sizeof(*$$)); - $$->min = $4->u.integervalue + 2; + $$->min = INT_MIN; $$->max = $4->u.integervalue; } | '(' Value ')' diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/crypto/heimdal/lib/asn1/check-gen.c index e686f166cfa0..44699cab4356 100644 --- a/crypto/heimdal/lib/asn1/check-gen.c +++ b/crypto/heimdal/lib/asn1/check-gen.c @@ -764,6 +764,124 @@ check_tag_length(void) return failed; } +static int +check_tag_length64(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\x01\xff\xff\xff\xff"}, + { 1, 7, 7, "\x02\x05\x02\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x7f\xff\xff\xff\xff\xff\xff"}, + { 1, 10, 10, "\x02\x08\x00\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x7f\xff\xff\xff\xff\xff\xff\xff"}, + { 1, 11, 11, "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTuint64 values[] = {0, 8589934591LL, 8589934592LL, + 36028797018963967LL, 36028797018963968LL, + 9223372036854775807LL, 18446744073709551615ULL, + 0, 127, 128, 256, 512 }; + TESTuint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTuint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + +static int +check_tag_length64s(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x01"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x80\x00\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTint64 values[] = {0, -8589934591LL, -8589934592LL, + -36028797018963967LL, -36028797018963968LL, + -9223372036854775807LL, -36028797018963967LL, + 0, 127, 128, 256, 512 }; + TESTint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + static int cmp_TESTChoice (void *a, void *b) { @@ -1291,6 +1409,8 @@ main(int argc, char **argv) ret += test_cert(); ret += check_tag_length(); + ret += check_tag_length64(); + ret += check_tag_length64s(); ret += test_large_tag(); ret += test_choice(); diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/crypto/heimdal/lib/asn1/der-protos.h index 3b3d81d175fb..9ebc78538a9e 100644 --- a/crypto/heimdal/lib/asn1/der-protos.h +++ b/crypto/heimdal/lib/asn1/der-protos.h @@ -67,6 +67,11 @@ der_copy_integer ( const int */*from*/, int */*to*/); +int +der_copy_integer64 ( + const int64_t */*from*/, + int64_t */*to*/); + int der_copy_octet_string ( const heim_octet_string */*from*/, @@ -92,6 +97,11 @@ der_copy_unsigned ( const unsigned */*from*/, unsigned */*to*/); +int +der_copy_unsigned64 ( + const uint64_t */*from*/, + uint64_t */*to*/); + int der_copy_utctime ( const time_t */*from*/, @@ -128,6 +138,9 @@ der_free_ia5_string (heim_ia5_string */*str*/); void der_free_integer (int */*i*/); +void +der_free_integer64 (int64_t */*i*/); + void der_free_octet_string (heim_octet_string */*k*/); @@ -143,6 +156,9 @@ der_free_universal_string (heim_universal_string */*k*/); void der_free_unsigned (unsigned */*u*/); +void +der_free_unsigned64 (uint64_t */*u*/); + void der_free_utctime (time_t */*t*/); @@ -214,6 +230,13 @@ der_get_integer ( int */*ret*/, size_t */*size*/); +int +der_get_integer64 ( + const unsigned char */*p*/, + size_t /*len*/, + int64_t */*ret*/, + size_t */*size*/); + int der_get_length ( const unsigned char */*p*/, @@ -284,6 +307,13 @@ der_get_unsigned ( unsigned */*ret*/, size_t */*size*/); +int +der_get_unsigned64 ( + const unsigned char */*p*/, + size_t /*len*/, + uint64_t */*ret*/, + size_t */*size*/); + int der_get_utctime ( const unsigned char */*p*/, @@ -367,6 +397,9 @@ der_length_ia5_string (const heim_ia5_string */*data*/); size_t der_length_integer (const int */*data*/); +size_t +der_length_integer64 (const int64_t */*data*/); + size_t der_length_len (size_t /*len*/); @@ -388,6 +421,9 @@ der_length_universal_string (const heim_universal_string */*data*/); size_t der_length_unsigned (const unsigned */*data*/); +size_t +der_length_unsigned64 (const uint64_t */*data*/); + size_t der_length_utctime (const time_t */*t*/); @@ -508,6 +544,13 @@ der_put_integer ( const int */*v*/, size_t */*size*/); +int +der_put_integer64 ( + unsigned char */*p*/, + size_t /*len*/, + const int64_t */*v*/, + size_t */*size*/); + int der_put_length ( unsigned char */*p*/, @@ -569,6 +612,13 @@ der_put_unsigned ( const unsigned */*v*/, size_t */*size*/); +int +der_put_unsigned64 ( + unsigned char */*p*/, + size_t /*len*/, + const uint64_t */*v*/, + size_t */*size*/); + int der_put_utctime ( unsigned char */*p*/, diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/crypto/heimdal/lib/asn1/der_copy.c index abaaf8e5d740..4faf87014280 100644 --- a/crypto/heimdal/lib/asn1/der_copy.c +++ b/crypto/heimdal/lib/asn1/der_copy.c @@ -54,6 +54,13 @@ der_copy_integer (const int *from, int *to) return 0; } +int +der_copy_integer64 (const int64_t *from, int64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_unsigned (const unsigned *from, unsigned *to) { @@ -61,6 +68,13 @@ der_copy_unsigned (const unsigned *from, unsigned *to) return 0; } +int +der_copy_unsigned64 (const uint64_t *from, uint64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_generalized_time (const time_t *from, time_t *to) { diff --git a/crypto/heimdal/lib/asn1/der_free.c b/crypto/heimdal/lib/asn1/der_free.c index 4bae5fc2338f..1584cfcb299e 100644 --- a/crypto/heimdal/lib/asn1/der_free.c +++ b/crypto/heimdal/lib/asn1/der_free.c @@ -50,12 +50,24 @@ der_free_integer (int *i) *i = 0; } +void +der_free_integer64 (int64_t *i) +{ + *i = 0; +} + void der_free_unsigned (unsigned *u) { *u = 0; } +void +der_free_unsigned64 (uint64_t *u) +{ + *u = 0; +} + void der_free_generalized_time(time_t *t) { diff --git a/crypto/heimdal/lib/asn1/der_get.c b/crypto/heimdal/lib/asn1/der_get.c index 3112da86f93b..8a456d4d983d 100644 --- a/crypto/heimdal/lib/asn1/der_get.c +++ b/crypto/heimdal/lib/asn1/der_get.c @@ -48,9 +48,28 @@ der_get_unsigned (const unsigned char *p, size_t len, unsigned val = 0; size_t oldlen = len; - if (len == sizeof(unsigned) + 1 && p[0] == 0) + if (len == sizeof(val) + 1 && p[0] == 0) ; - else if (len > sizeof(unsigned)) + else if (len > sizeof(val)) + return ASN1_OVERRUN; + + while (len--) + val = val * 256 + *p++; + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_unsigned64 (const unsigned char *p, size_t len, + uint64_t *ret, size_t *size) +{ + uint64_t val = 0; + size_t oldlen = len; + + if (len == sizeof(val) + 1 && p[0] == 0) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; while (len--) @@ -67,7 +86,27 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(int)) + if (len > sizeof(val)) + return ASN1_OVERRUN; + + if (len > 0) { + val = (signed char)*p++; + while (--len) + val = val * 256 + *p++; + } + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_integer64 (const unsigned char *p, size_t len, + int64_t *ret, size_t *size) +{ + int64_t val = 0; + size_t oldlen = len; + + if (len > sizeof(val)) return ASN1_OVERRUN; if (len > 0) { diff --git a/crypto/heimdal/lib/asn1/der_length.c b/crypto/heimdal/lib/asn1/der_length.c index db82025861ea..684ba9bc6f32 100644 --- a/crypto/heimdal/lib/asn1/der_length.c +++ b/crypto/heimdal/lib/asn1/der_length.c @@ -55,6 +55,24 @@ _heim_len_unsigned (unsigned val) return ret; } +size_t +_heim_len_unsigned64 (uint64_t val) +{ + size_t ret = 0; + int last_val_gt_128; + + do { + ++ret; + last_val_gt_128 = (val >= 128); + val /= 256; + } while (val); + + if(last_val_gt_128) + ret++; + + return ret; +} + size_t _heim_len_int (int val) { @@ -82,6 +100,33 @@ _heim_len_int (int val) return ret; } +size_t +_heim_len_int64 (int64_t val) +{ + unsigned char q; + size_t ret = 0; + + if (val >= 0) { + do { + q = val % 256; + ret++; + val /= 256; + } while(val); + if(q >= 128) + ret++; + } else { + val = ~val; + do { + q = ~(val % 256); + ret++; + val /= 256; + } while(val); + if(q < 128) + ret++; + } + return ret; +} + static size_t len_oid (const heim_oid *oid) { @@ -134,12 +179,24 @@ der_length_integer (const int *data) return _heim_len_int (*data); } +size_t +der_length_integer64 (const int64_t *data) +{ + return _heim_len_int64 (*data); +} + size_t der_length_unsigned (const unsigned *data) { return _heim_len_unsigned(*data); } +size_t +der_length_unsigned64 (const uint64_t *data) +{ + return _heim_len_unsigned64(*data); +} + size_t der_length_enumerated (const unsigned *data) { diff --git a/crypto/heimdal/lib/asn1/der_put.c b/crypto/heimdal/lib/asn1/der_put.c index 0b276d1ebdce..0ccb181c0b39 100644 --- a/crypto/heimdal/lib/asn1/der_put.c +++ b/crypto/heimdal/lib/asn1/der_put.c @@ -75,6 +75,38 @@ der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size) } } +int +der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size) +{ + unsigned char *base = p; + uint64_t val = *v; + + if (val) { + while (len > 0 && val) { + *p-- = val % 256; + val /= 256; + --len; + } + if (val != 0) + return ASN1_OVERFLOW; + else { + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + } + *size = base - p; + return 0; + } + } else if (len < 1) + return ASN1_OVERFLOW; + else { + *p = 0; + *size = 1; + return 0; + } +} + int der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) { @@ -115,6 +147,46 @@ der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) return 0; } +int +der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size) +{ + unsigned char *base = p; + int64_t val = *v; + + if(val >= 0) { + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = val % 256; + len--; + val /= 256; + } while(val); + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + len--; + } + } else { + val = ~val; + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = ~(val % 256); + len--; + val /= 256; + } while(val); + if(p[1] < 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + } + } + *size = base - p; + return 0; +} + int der_put_length (unsigned char *p, size_t len, size_t val, size_t *size) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 2194b329ce1d..76a893c5ade7 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -303,7 +303,7 @@ gen_assign_defval(const char *var, struct value *val) fprintf(codefile, "if((%s = strdup(\"%s\")) == NULL)\nreturn ENOMEM;\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "%s = %d;\n", var, val->u.integervalue); + fprintf(codefile, "%s = %" PRId64 ";\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -324,7 +324,7 @@ gen_compare_defval(const char *var, struct value *val) fprintf(codefile, "if(strcmp(%s, \"%s\") != 0)\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "if(%s != %d)\n", var, val->u.integervalue); + fprintf(codefile, "if(%s != %" PRId64 ")\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -397,7 +397,7 @@ generate_constant (const Symbol *s) case booleanvalue: break; case integervalue: - fprintf (headerfile, "enum { %s = %d };\n\n", + fprintf (headerfile, "enum { %s = %" PRId64 " };\n\n", s->gen_name, s->value->u.integervalue); break; case nullvalue: @@ -540,7 +540,7 @@ define_asn1 (int level, Type *t) if(t->members == NULL) { fprintf (headerfile, "INTEGER"); if (t->range) - fprintf (headerfile, " (%d..%d)", + fprintf (headerfile, " (%" PRId64 "..%" PRId64 ")", t->range->min, t->range->max); } else { Member *m; @@ -723,14 +723,16 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "} %s;\n", name); } else if (t->range == NULL) { fprintf (headerfile, "heim_integer %s;\n", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + fprintf (headerfile, "int64_t %s;\n", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + fprintf (headerfile, "uint64_t %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { fprintf (headerfile, "int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - fprintf (headerfile, "unsigned int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/crypto/heimdal/lib/asn1/gen_decode.c index bf2d93b806df..c821ee1481a7 100644 --- a/crypto/heimdal/lib/asn1/gen_decode.c +++ b/crypto/heimdal/lib/asn1/gen_decode.c @@ -189,19 +189,19 @@ range_check(const char *name, { if (r->min == r->max + 2 || r->min < r->max) fprintf (codefile, - "if ((%s)->%s > %d) {\n" + "if ((%s)->%s > %" PRId64 ") {\n" "e = ASN1_MAX_CONSTRAINT; %s;\n" "}\n", name, length, r->max, forwstr); if (r->min - 1 == r->max || r->min < r->max) fprintf (codefile, - "if ((%s)->%s < %d) {\n" + "if ((%s)->%s < %" PRId64 ") {\n" "e = ASN1_MIN_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); if (r->max == r->min) fprintf (codefile, - "if ((%s)->%s != %d) {\n" + "if ((%s)->%s != %" PRId64 ") {\n" "e = ASN1_EXACT_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); @@ -252,14 +252,16 @@ decode_type (const char *name, const Type *t, int optional, name); } else if (t->range == NULL) { decode_primitive ("heim_integer", name, forwstr); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + decode_primitive ("integer64", name, forwstr); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + decode_primitive ("unsigned64", name, forwstr); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { decode_primitive ("integer", name, forwstr); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - decode_primitive ("unsigned", name, forwstr); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { decode_primitive ("unsigned", name, forwstr); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/crypto/heimdal/lib/asn1/gen_encode.c index 1bd47484d83a..ac43b6a0d364 100644 --- a/crypto/heimdal/lib/asn1/gen_encode.c +++ b/crypto/heimdal/lib/asn1/gen_encode.c @@ -129,14 +129,16 @@ encode_type (const char *name, const Type *t, const char *tmpstr) fprintf(codefile, "}\n;"); } else if (t->range == NULL) { encode_primitive ("heim_integer", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + encode_primitive ("integer64", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + encode_primitive ("unsigned64", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { encode_primitive ("integer", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - encode_primitive ("unsigned", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { encode_primitive ("unsigned", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); constructed = 0; break; diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/crypto/heimdal/lib/asn1/gen_length.c index 20b5adfe5d02..f12246e676ec 100644 --- a/crypto/heimdal/lib/asn1/gen_length.c +++ b/crypto/heimdal/lib/asn1/gen_length.c @@ -80,14 +80,16 @@ length_type (const char *name, const Type *t, fprintf(codefile, "}\n"); } else if (t->range == NULL) { length_primitive ("heim_integer", name, variable); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + length_primitive ("integer64", name, variable); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + length_primitive ("unsigned64", name, variable); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { length_primitive ("integer", name, variable); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - length_primitive ("unsigned", name, variable); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { length_primitive ("unsigned", name, variable); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; diff --git a/crypto/heimdal/lib/asn1/gen_template.c b/crypto/heimdal/lib/asn1/gen_template.c index edd68e122380..15bf7d30c498 100644 --- a/crypto/heimdal/lib/asn1/gen_template.c +++ b/crypto/heimdal/lib/asn1/gen_template.c @@ -52,11 +52,13 @@ integer_symbol(const char *basename, const Type *t) return "int"; /* XXX enum foo */ else if (t->range == NULL) return "heim_integer"; - else if (t->range->min == INT_MIN && t->range->max == INT_MAX) + else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) + return "int64_t"; + else if (t->range->min >= 0 && t->range->max > UINT_MAX) *** 100 LINES SKIPPED *** From nobody Wed Apr 24 21:28:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsXn46PFz5J87l; Wed, 24 Apr 2024 21:28: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 4VPsXn1XN2z4T2b; Wed, 24 Apr 2024 21:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8CQasD7ilfgy4IS8husfxa84nicp5qspuA1ThHW9Rk=; b=t4D1mj+UIhCJ5/BtGsJkEDJN2FLwijqg5l1xIFdIkUi72QNvuEzyViCioH5CaNhzrwAy4E UlpS8xXt0aiimKcLeaiw2AsKtC5FFeucZ3jWcXZ+VyOLU8MyfkNv9m7KsEFWevbYLlHGjQ tYn6q/CsuptElRUlGeOiklYkHX2iAPFV49eamSvJQQDNMUlpLY3tXd3jthEpR3c7f2p9n8 u2XjOpNzpfRoRXk5DQXvne6NvzuA0zTmASLSoBhrradKvwI4dQgcGLE0+Qex7kVhH3NWZ8 SE7z9i9/linsedupYtY4JQeJSjsY+7kdxgj4Ui+zeLFOQOzOhGeHkXEG4Q47xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994089; a=rsa-sha256; cv=none; b=GodAHNjdD0Pn0bFRcljQgHil9a9ZBNMdVwvqZBq/esXuNYBZYJswlgR6pGUh0xgoeqeEm4 WiXgSFdyLkmrk1bhysrxHXZOVxX0J9r5xjW22ArAICYCWmItXcVvLdtLvCzwQGRQlvLhW+ pHyEcfXswNDE1zFYan2fWhvg6vFXtVcMdWgeTSZ61Htdn7IEN1CLttW5g9uH4U6pnG06bU lZTfiwsfNdSOPTP3J9SNHxOiK/IaG+fmy5XLJCBt9ZVex9r/QmRIGMyu6ElQp6NeU/xHzC 7bTWHDprPD3QsjlVJouXmxu2F/GNaQ22TxmQGo56fZoc87KiH5HIs11zotb2Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8CQasD7ilfgy4IS8husfxa84nicp5qspuA1ThHW9Rk=; b=LX+tt9XgQf3/x1G81eSN8eLzc6ytYRhkiSmvEZw47qP7Gym5TDWqx7lCL8kURmjIWBJOVb TTXlfMjAW224B76ofQD9duDi3yg0mfNAF/yyODlW7d13FJrVuf4Bloi8jkFPnEjnqloF/B fkQ85khsckYl5STOTRpghSnpfwLdE7UyUeiKlheQOTnU/ImL3tJqahXqlrh5GAz3XB20pP 1xwCpx15+sm0QCEI4xs4iECNSRm8eYDr+oBGQgqboY+vKRi3nX2+6ZgvxrNoDnayXKKtDW cViua25CF3b9iglSYryNNDo7DuWpEAOJVLYmJUovPzHTjdFGZNIFKeqHqWalLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXn0sP2zXMK; Wed, 24 Apr 2024 21:28: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 43OLS9nL086299; Wed, 24 Apr 2024 21:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS9Y3086296; Wed, 24 Apr 2024 21:28:09 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:09 GMT Message-Id: <202404242128.43OLS9Y3086296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 689dbdedd8bd - stable/14 - heimdal: asn1: Use unsigned bitfields for named bitsets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e commit 689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e Author: Dimitry Andric AuthorDate: 2024-04-17 17:49:30 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:27:11 +0000 heimdal: asn1: Use unsigned bitfields for named bitsets Import upstream 6747e1628: asn1: Use unsigned bitfields for named bitsets Signed 1-bit bitfields are undefined in C. This should fix the following warnings, which for unknown reasons are errors in CI: /usr/src/crypto/heimdal/lib/hx509/ca.c:1020:22: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1020 | ku.digitalSignature = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1021:21: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1021 | ku.keyEncipherment = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1028:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1028 | ku.keyCertSign = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1029:13: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1029 | ku.cRLSign = 1; | ^ ~ PR: 276960 Fixes: 1b7487592987 MFC after: 1 week (cherry picked from commit 219b6e442308d5353b2af5f0771ce9b887b70754) --- crypto/heimdal/lib/asn1/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 76a893c5ade7..f35d41667a57 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -727,10 +727,10 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "int64_t %s;\n", name); } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { fprintf (headerfile, "uint64_t %s;\n", name); - } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { - fprintf (headerfile, "int %s;\n", name); } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { + fprintf (headerfile, "int %s;\n", name); } else errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); From nobody Wed Apr 24 21:29:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsZS50VBz5J8V8; Wed, 24 Apr 2024 21:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPsZS3Wq7z4VXg; Wed, 24 Apr 2024 21:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PD77azksROonivNYopXOLHWMI/Sq5azqBLIx+uktuCY=; b=MS5eEGz4maFKKTLL8t4a7xt2KKG8nbuNWofc9oSOHjKv+uNAdFUHU3Uxli9MIcaAJb0+1q EMWlPtChWaBHFGQXc1JV0Wl0eoRBWzv86BDnT4uKxavGH58I9hjpzXuM6lsapQ1h3ME5wQ ds5qcKyMCFWgdZ7xaougsZul6J+Dgisd3us78Ma+Y9yeKBQZWyId//EuczjlxhilVqiHSW iAnrmciS9h9qg2cos+tQxW3rnDZjh6y0A6urlOFzE1PAiex1PbIX1jkZbaDdOE7X/M1E2S wBYqs9B3WOc0O0d9sgsQzkhcxVclCKE99DOVsZW5WGar8m+of2bMYrd/+kA+ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994176; a=rsa-sha256; cv=none; b=ZPCPD+A/A3apQsNMegV8jh117EER29gmSKIH+MkuNCHApQM6UcHkDm23HPDPDnbCb06g5F vVPk0XDL/GkxIalKBkLgZOvUQAurYEBy+k/QRRUg2WDzP6l9UwdwvJinrMTkO4vV+rP1kB ytKLWvjDay6UttF5XmqsgOTMRscjCzv+DWLjyB2oJK2ja7VcySPto1shYznrTGbrkPOvrA rW7Wds097EOJOl0c0wz/j91uAlslDGevbZTyP4swac7A1H0KzOBxjTTW8u4YwG3t5flYR+ Nd1XMXF/GcztzbOZ5cAPbnF1awPX7n4o3fKqKKoecqFL5a84rHCMZlZfixe/8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PD77azksROonivNYopXOLHWMI/Sq5azqBLIx+uktuCY=; b=CNv9VZrzubafXiUrPVeeHE8yxap0PUXwigjkwunKrr2mt+t5H9wbZIGYyoG6hBLiCgLvp/ WoHUXC52bbyvOTZyp2v2A27HZmPjfGYKqIoDP1k9bJFwRuTMdoxWS78rC6OiE0uAS01kY3 Bl4m5mVq9gHT8blKt/yMxDAB32XGaM+6pDcfDjScOasDuiFpVZVqiWLxDQaUrIlGlcYOkO fe2XTnpWGpflAJdYnC4oRRJebOTxsCqn9QNV+e1UdmYIq4kmQ14ru/Z8OkP+mZ5VJZ1p5D 1Xo9dQv6x83EQW9tpJxdj1Ka8fXUT0Us+DOsOG9kN1KVf52AGB9CVXcsmQOqtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZS36tmzXMP; Wed, 24 Apr 2024 21:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OLTaLa086860; Wed, 24 Apr 2024 21:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTajv086857; Wed, 24 Apr 2024 21:29:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:36 GMT Message-Id: <202404242129.43OLTajv086857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2efe30782cd9 - stable/13 - heimdal: Add 64-bit integer support to ASN.1 compiler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 commit 2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 Author: Dimitry Andric AuthorDate: 2024-04-16 18:56:37 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:47 +0000 heimdal: Add 64-bit integer support to ASN.1 compiler Import upstream 19d378f44: ASN.1 INTEGERs will now compile to C int64_t or uint64_t, depending on whether the constraint ranges include numbers that cannot be represented in 32-bit ints and whether they include negative numbers. Template backend support included. check-template is now built with --template, so we know we're testing it. Tests included. Also adjusts the generated files: * asn1parse.c, asn1parse.h (not strictly necessary, but nice to have) * der-protos.h, which needs a bunch of new prototypes. I copied these from a der-protos.h generated by the upstream build system, which uses a perl script for this. * adjust printf format strings for int64_t. Upstream uses %lld for this, but that is not portable, and leads to lots of -Werror warnings. This should fix target-dependent differences between headers generated by asn1_compile. For example, when cross compiling world from amd64 to i386, the generated cms_asn1.h header has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..-1), iv OCTET STRING, } while a native build on i386 has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..2147483647), iv OCTET STRING, } These are _both_ wrong, since the source file, cms.asn1, has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..4294967295), iv OCTET STRING -- exactly 8 octets } PR: 276960 Reviewed by: cy, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44814 Differential Revision: https://reviews.freebsd.org/D44815 (cherry picked from commit 1b7487592987c91020063a311a14dc15b6e58075) --- crypto/heimdal/lib/asn1/Makefile.am | 12 +++- crypto/heimdal/lib/asn1/asn1-template.h | 2 + crypto/heimdal/lib/asn1/asn1parse.c | 6 +- crypto/heimdal/lib/asn1/asn1parse.h | 2 +- crypto/heimdal/lib/asn1/asn1parse.y | 6 +- crypto/heimdal/lib/asn1/check-gen.c | 120 ++++++++++++++++++++++++++++++++ crypto/heimdal/lib/asn1/der-protos.h | 50 +++++++++++++ crypto/heimdal/lib/asn1/der_copy.c | 14 ++++ crypto/heimdal/lib/asn1/der_free.c | 12 ++++ crypto/heimdal/lib/asn1/der_get.c | 45 +++++++++++- crypto/heimdal/lib/asn1/der_length.c | 57 +++++++++++++++ crypto/heimdal/lib/asn1/der_put.c | 72 +++++++++++++++++++ crypto/heimdal/lib/asn1/gen.c | 20 +++--- crypto/heimdal/lib/asn1/gen_decode.c | 18 ++--- crypto/heimdal/lib/asn1/gen_encode.c | 12 ++-- crypto/heimdal/lib/asn1/gen_length.c | 12 ++-- crypto/heimdal/lib/asn1/gen_template.c | 22 +++--- crypto/heimdal/lib/asn1/lex.l | 2 +- crypto/heimdal/lib/asn1/symbol.h | 10 ++- crypto/heimdal/lib/asn1/template.c | 2 + crypto/heimdal/lib/asn1/test.asn1 | 2 + 21 files changed, 446 insertions(+), 52 deletions(-) diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/crypto/heimdal/lib/asn1/Makefile.am index 47158b88aa42..608639aed276 100644 --- a/crypto/heimdal/lib/asn1/Makefile.am +++ b/crypto/heimdal/lib/asn1/Makefile.am @@ -37,6 +37,7 @@ gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.x +gen_files_test_template = test_template_asn1-template.c gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -53,7 +54,7 @@ asn1_print_SOURCES = asn1_print.c check_der_SOURCES = check-der.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h -nodist_check_template_SOURCES = $(gen_files_test:.x=.c) +nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) @@ -134,6 +135,7 @@ CLEANFILES = \ $(gen_files_pkcs12) \ $(gen_files_digest) \ $(gen_files_kx509) \ + $(gen_files_test_template) \ $(gen_files_test) $(nodist_check_gen_SOURCES) \ asn1_err.c asn1_err.h \ rfc2459_asn1_files rfc2459_asn1*.h* \ @@ -145,6 +147,7 @@ CLEANFILES = \ pkcs12_asn1_files pkcs12_asn1*.h* \ digest_asn1_files digest_asn1*.h* \ kx509_asn1_files kx509_asn1*.h* \ + test_template_asn1_files test_template_asn1*.h* \ test_asn1_files test_asn1*.h* dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h @@ -170,6 +173,7 @@ priv_headers += pkcs9_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h +priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h @@ -178,7 +182,7 @@ $(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h $(srcdir $(libasn1_la_OBJECTS): $(nodist_include_HEADERS) $(priv_headers) asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(libasn1base_la_OBJECTS): asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(check_gen_OBJECTS): test_asn1.h -$(check_template_OBJECTS): test_asn1_files +$(check_template_OBJECTS): test_template_asn1.h test_template_asn1_files $(asn1_print_OBJECTS): krb5_asn1.h asn1parse.h: asn1parse.c @@ -192,6 +196,7 @@ $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files +$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 @@ -221,6 +226,9 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 + $(ASN1_COMPILE) --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) + test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) diff --git a/crypto/heimdal/lib/asn1/asn1-template.h b/crypto/heimdal/lib/asn1/asn1-template.h index 107706ce8340..5fd6b812630f 100644 --- a/crypto/heimdal/lib/asn1/asn1-template.h +++ b/crypto/heimdal/lib/asn1/asn1-template.h @@ -118,7 +118,9 @@ enum template_types { A1T_IMEMBER = 0, A1T_HEIM_INTEGER, A1T_INTEGER, + A1T_INTEGER64, A1T_UNSIGNED, + A1T_UNSIGNED64, A1T_GENERAL_STRING, A1T_OCTET_STRING, A1T_OCTET_STRING_BER, diff --git a/crypto/heimdal/lib/asn1/asn1parse.c b/crypto/heimdal/lib/asn1/asn1parse.c index 0e04fabf6296..a305f4b0267b 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.c +++ b/crypto/heimdal/lib/asn1/asn1parse.c @@ -304,7 +304,7 @@ struct string_list { typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -1874,7 +1874,7 @@ yyreduce: lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (5)].value)->u.integervalue - 1; + (yyval.range)->max = INT_MAX; } break; @@ -1884,7 +1884,7 @@ yyreduce: if((yyvsp[(4) - (5)].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(4) - (5)].value)->u.integervalue + 2; + (yyval.range)->min = INT_MIN; (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; } break; diff --git a/crypto/heimdal/lib/asn1/asn1parse.h b/crypto/heimdal/lib/asn1/asn1parse.h index 69b7d6dc1a4a..c1ced1df5a44 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.h +++ b/crypto/heimdal/lib/asn1/asn1parse.h @@ -224,7 +224,7 @@ typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; diff --git a/crypto/heimdal/lib/asn1/asn1parse.y b/crypto/heimdal/lib/asn1/asn1parse.y index e3bea6ce0ac9..b419676d3429 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.y +++ b/crypto/heimdal/lib/asn1/asn1parse.y @@ -69,7 +69,7 @@ struct string_list { %} %union { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -370,14 +370,14 @@ range : '(' Value RANGE Value ')' lex_error_message("Non-integer in first part of range"); $$ = ecalloc(1, sizeof(*$$)); $$->min = $2->u.integervalue; - $$->max = $2->u.integervalue - 1; + $$->max = INT_MAX; } | '(' kw_MIN RANGE Value ')' { if($4->type != integervalue) lex_error_message("Non-integer in second part of range"); $$ = ecalloc(1, sizeof(*$$)); - $$->min = $4->u.integervalue + 2; + $$->min = INT_MIN; $$->max = $4->u.integervalue; } | '(' Value ')' diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/crypto/heimdal/lib/asn1/check-gen.c index e686f166cfa0..44699cab4356 100644 --- a/crypto/heimdal/lib/asn1/check-gen.c +++ b/crypto/heimdal/lib/asn1/check-gen.c @@ -764,6 +764,124 @@ check_tag_length(void) return failed; } +static int +check_tag_length64(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\x01\xff\xff\xff\xff"}, + { 1, 7, 7, "\x02\x05\x02\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x7f\xff\xff\xff\xff\xff\xff"}, + { 1, 10, 10, "\x02\x08\x00\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x7f\xff\xff\xff\xff\xff\xff\xff"}, + { 1, 11, 11, "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTuint64 values[] = {0, 8589934591LL, 8589934592LL, + 36028797018963967LL, 36028797018963968LL, + 9223372036854775807LL, 18446744073709551615ULL, + 0, 127, 128, 256, 512 }; + TESTuint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTuint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + +static int +check_tag_length64s(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x01"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x80\x00\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTint64 values[] = {0, -8589934591LL, -8589934592LL, + -36028797018963967LL, -36028797018963968LL, + -9223372036854775807LL, -36028797018963967LL, + 0, 127, 128, 256, 512 }; + TESTint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + static int cmp_TESTChoice (void *a, void *b) { @@ -1291,6 +1409,8 @@ main(int argc, char **argv) ret += test_cert(); ret += check_tag_length(); + ret += check_tag_length64(); + ret += check_tag_length64s(); ret += test_large_tag(); ret += test_choice(); diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/crypto/heimdal/lib/asn1/der-protos.h index 3b3d81d175fb..9ebc78538a9e 100644 --- a/crypto/heimdal/lib/asn1/der-protos.h +++ b/crypto/heimdal/lib/asn1/der-protos.h @@ -67,6 +67,11 @@ der_copy_integer ( const int */*from*/, int */*to*/); +int +der_copy_integer64 ( + const int64_t */*from*/, + int64_t */*to*/); + int der_copy_octet_string ( const heim_octet_string */*from*/, @@ -92,6 +97,11 @@ der_copy_unsigned ( const unsigned */*from*/, unsigned */*to*/); +int +der_copy_unsigned64 ( + const uint64_t */*from*/, + uint64_t */*to*/); + int der_copy_utctime ( const time_t */*from*/, @@ -128,6 +138,9 @@ der_free_ia5_string (heim_ia5_string */*str*/); void der_free_integer (int */*i*/); +void +der_free_integer64 (int64_t */*i*/); + void der_free_octet_string (heim_octet_string */*k*/); @@ -143,6 +156,9 @@ der_free_universal_string (heim_universal_string */*k*/); void der_free_unsigned (unsigned */*u*/); +void +der_free_unsigned64 (uint64_t */*u*/); + void der_free_utctime (time_t */*t*/); @@ -214,6 +230,13 @@ der_get_integer ( int */*ret*/, size_t */*size*/); +int +der_get_integer64 ( + const unsigned char */*p*/, + size_t /*len*/, + int64_t */*ret*/, + size_t */*size*/); + int der_get_length ( const unsigned char */*p*/, @@ -284,6 +307,13 @@ der_get_unsigned ( unsigned */*ret*/, size_t */*size*/); +int +der_get_unsigned64 ( + const unsigned char */*p*/, + size_t /*len*/, + uint64_t */*ret*/, + size_t */*size*/); + int der_get_utctime ( const unsigned char */*p*/, @@ -367,6 +397,9 @@ der_length_ia5_string (const heim_ia5_string */*data*/); size_t der_length_integer (const int */*data*/); +size_t +der_length_integer64 (const int64_t */*data*/); + size_t der_length_len (size_t /*len*/); @@ -388,6 +421,9 @@ der_length_universal_string (const heim_universal_string */*data*/); size_t der_length_unsigned (const unsigned */*data*/); +size_t +der_length_unsigned64 (const uint64_t */*data*/); + size_t der_length_utctime (const time_t */*t*/); @@ -508,6 +544,13 @@ der_put_integer ( const int */*v*/, size_t */*size*/); +int +der_put_integer64 ( + unsigned char */*p*/, + size_t /*len*/, + const int64_t */*v*/, + size_t */*size*/); + int der_put_length ( unsigned char */*p*/, @@ -569,6 +612,13 @@ der_put_unsigned ( const unsigned */*v*/, size_t */*size*/); +int +der_put_unsigned64 ( + unsigned char */*p*/, + size_t /*len*/, + const uint64_t */*v*/, + size_t */*size*/); + int der_put_utctime ( unsigned char */*p*/, diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/crypto/heimdal/lib/asn1/der_copy.c index abaaf8e5d740..4faf87014280 100644 --- a/crypto/heimdal/lib/asn1/der_copy.c +++ b/crypto/heimdal/lib/asn1/der_copy.c @@ -54,6 +54,13 @@ der_copy_integer (const int *from, int *to) return 0; } +int +der_copy_integer64 (const int64_t *from, int64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_unsigned (const unsigned *from, unsigned *to) { @@ -61,6 +68,13 @@ der_copy_unsigned (const unsigned *from, unsigned *to) return 0; } +int +der_copy_unsigned64 (const uint64_t *from, uint64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_generalized_time (const time_t *from, time_t *to) { diff --git a/crypto/heimdal/lib/asn1/der_free.c b/crypto/heimdal/lib/asn1/der_free.c index 4bae5fc2338f..1584cfcb299e 100644 --- a/crypto/heimdal/lib/asn1/der_free.c +++ b/crypto/heimdal/lib/asn1/der_free.c @@ -50,12 +50,24 @@ der_free_integer (int *i) *i = 0; } +void +der_free_integer64 (int64_t *i) +{ + *i = 0; +} + void der_free_unsigned (unsigned *u) { *u = 0; } +void +der_free_unsigned64 (uint64_t *u) +{ + *u = 0; +} + void der_free_generalized_time(time_t *t) { diff --git a/crypto/heimdal/lib/asn1/der_get.c b/crypto/heimdal/lib/asn1/der_get.c index 3112da86f93b..8a456d4d983d 100644 --- a/crypto/heimdal/lib/asn1/der_get.c +++ b/crypto/heimdal/lib/asn1/der_get.c @@ -48,9 +48,28 @@ der_get_unsigned (const unsigned char *p, size_t len, unsigned val = 0; size_t oldlen = len; - if (len == sizeof(unsigned) + 1 && p[0] == 0) + if (len == sizeof(val) + 1 && p[0] == 0) ; - else if (len > sizeof(unsigned)) + else if (len > sizeof(val)) + return ASN1_OVERRUN; + + while (len--) + val = val * 256 + *p++; + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_unsigned64 (const unsigned char *p, size_t len, + uint64_t *ret, size_t *size) +{ + uint64_t val = 0; + size_t oldlen = len; + + if (len == sizeof(val) + 1 && p[0] == 0) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; while (len--) @@ -67,7 +86,27 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(int)) + if (len > sizeof(val)) + return ASN1_OVERRUN; + + if (len > 0) { + val = (signed char)*p++; + while (--len) + val = val * 256 + *p++; + } + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_integer64 (const unsigned char *p, size_t len, + int64_t *ret, size_t *size) +{ + int64_t val = 0; + size_t oldlen = len; + + if (len > sizeof(val)) return ASN1_OVERRUN; if (len > 0) { diff --git a/crypto/heimdal/lib/asn1/der_length.c b/crypto/heimdal/lib/asn1/der_length.c index db82025861ea..684ba9bc6f32 100644 --- a/crypto/heimdal/lib/asn1/der_length.c +++ b/crypto/heimdal/lib/asn1/der_length.c @@ -55,6 +55,24 @@ _heim_len_unsigned (unsigned val) return ret; } +size_t +_heim_len_unsigned64 (uint64_t val) +{ + size_t ret = 0; + int last_val_gt_128; + + do { + ++ret; + last_val_gt_128 = (val >= 128); + val /= 256; + } while (val); + + if(last_val_gt_128) + ret++; + + return ret; +} + size_t _heim_len_int (int val) { @@ -82,6 +100,33 @@ _heim_len_int (int val) return ret; } +size_t +_heim_len_int64 (int64_t val) +{ + unsigned char q; + size_t ret = 0; + + if (val >= 0) { + do { + q = val % 256; + ret++; + val /= 256; + } while(val); + if(q >= 128) + ret++; + } else { + val = ~val; + do { + q = ~(val % 256); + ret++; + val /= 256; + } while(val); + if(q < 128) + ret++; + } + return ret; +} + static size_t len_oid (const heim_oid *oid) { @@ -134,12 +179,24 @@ der_length_integer (const int *data) return _heim_len_int (*data); } +size_t +der_length_integer64 (const int64_t *data) +{ + return _heim_len_int64 (*data); +} + size_t der_length_unsigned (const unsigned *data) { return _heim_len_unsigned(*data); } +size_t +der_length_unsigned64 (const uint64_t *data) +{ + return _heim_len_unsigned64(*data); +} + size_t der_length_enumerated (const unsigned *data) { diff --git a/crypto/heimdal/lib/asn1/der_put.c b/crypto/heimdal/lib/asn1/der_put.c index 0b276d1ebdce..0ccb181c0b39 100644 --- a/crypto/heimdal/lib/asn1/der_put.c +++ b/crypto/heimdal/lib/asn1/der_put.c @@ -75,6 +75,38 @@ der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size) } } +int +der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size) +{ + unsigned char *base = p; + uint64_t val = *v; + + if (val) { + while (len > 0 && val) { + *p-- = val % 256; + val /= 256; + --len; + } + if (val != 0) + return ASN1_OVERFLOW; + else { + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + } + *size = base - p; + return 0; + } + } else if (len < 1) + return ASN1_OVERFLOW; + else { + *p = 0; + *size = 1; + return 0; + } +} + int der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) { @@ -115,6 +147,46 @@ der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) return 0; } +int +der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size) +{ + unsigned char *base = p; + int64_t val = *v; + + if(val >= 0) { + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = val % 256; + len--; + val /= 256; + } while(val); + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + len--; + } + } else { + val = ~val; + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = ~(val % 256); + len--; + val /= 256; + } while(val); + if(p[1] < 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + } + } + *size = base - p; + return 0; +} + int der_put_length (unsigned char *p, size_t len, size_t val, size_t *size) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 2194b329ce1d..76a893c5ade7 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -303,7 +303,7 @@ gen_assign_defval(const char *var, struct value *val) fprintf(codefile, "if((%s = strdup(\"%s\")) == NULL)\nreturn ENOMEM;\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "%s = %d;\n", var, val->u.integervalue); + fprintf(codefile, "%s = %" PRId64 ";\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -324,7 +324,7 @@ gen_compare_defval(const char *var, struct value *val) fprintf(codefile, "if(strcmp(%s, \"%s\") != 0)\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "if(%s != %d)\n", var, val->u.integervalue); + fprintf(codefile, "if(%s != %" PRId64 ")\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -397,7 +397,7 @@ generate_constant (const Symbol *s) case booleanvalue: break; case integervalue: - fprintf (headerfile, "enum { %s = %d };\n\n", + fprintf (headerfile, "enum { %s = %" PRId64 " };\n\n", s->gen_name, s->value->u.integervalue); break; case nullvalue: @@ -540,7 +540,7 @@ define_asn1 (int level, Type *t) if(t->members == NULL) { fprintf (headerfile, "INTEGER"); if (t->range) - fprintf (headerfile, " (%d..%d)", + fprintf (headerfile, " (%" PRId64 "..%" PRId64 ")", t->range->min, t->range->max); } else { Member *m; @@ -723,14 +723,16 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "} %s;\n", name); } else if (t->range == NULL) { fprintf (headerfile, "heim_integer %s;\n", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + fprintf (headerfile, "int64_t %s;\n", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + fprintf (headerfile, "uint64_t %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { fprintf (headerfile, "int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - fprintf (headerfile, "unsigned int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/crypto/heimdal/lib/asn1/gen_decode.c index bf2d93b806df..c821ee1481a7 100644 --- a/crypto/heimdal/lib/asn1/gen_decode.c +++ b/crypto/heimdal/lib/asn1/gen_decode.c @@ -189,19 +189,19 @@ range_check(const char *name, { if (r->min == r->max + 2 || r->min < r->max) fprintf (codefile, - "if ((%s)->%s > %d) {\n" + "if ((%s)->%s > %" PRId64 ") {\n" "e = ASN1_MAX_CONSTRAINT; %s;\n" "}\n", name, length, r->max, forwstr); if (r->min - 1 == r->max || r->min < r->max) fprintf (codefile, - "if ((%s)->%s < %d) {\n" + "if ((%s)->%s < %" PRId64 ") {\n" "e = ASN1_MIN_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); if (r->max == r->min) fprintf (codefile, - "if ((%s)->%s != %d) {\n" + "if ((%s)->%s != %" PRId64 ") {\n" "e = ASN1_EXACT_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); @@ -252,14 +252,16 @@ decode_type (const char *name, const Type *t, int optional, name); } else if (t->range == NULL) { decode_primitive ("heim_integer", name, forwstr); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + decode_primitive ("integer64", name, forwstr); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + decode_primitive ("unsigned64", name, forwstr); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { decode_primitive ("integer", name, forwstr); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - decode_primitive ("unsigned", name, forwstr); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { decode_primitive ("unsigned", name, forwstr); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/crypto/heimdal/lib/asn1/gen_encode.c index 1bd47484d83a..ac43b6a0d364 100644 --- a/crypto/heimdal/lib/asn1/gen_encode.c +++ b/crypto/heimdal/lib/asn1/gen_encode.c @@ -129,14 +129,16 @@ encode_type (const char *name, const Type *t, const char *tmpstr) fprintf(codefile, "}\n;"); } else if (t->range == NULL) { encode_primitive ("heim_integer", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + encode_primitive ("integer64", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + encode_primitive ("unsigned64", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { encode_primitive ("integer", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - encode_primitive ("unsigned", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { encode_primitive ("unsigned", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); constructed = 0; break; diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/crypto/heimdal/lib/asn1/gen_length.c index 20b5adfe5d02..f12246e676ec 100644 --- a/crypto/heimdal/lib/asn1/gen_length.c +++ b/crypto/heimdal/lib/asn1/gen_length.c @@ -80,14 +80,16 @@ length_type (const char *name, const Type *t, fprintf(codefile, "}\n"); } else if (t->range == NULL) { length_primitive ("heim_integer", name, variable); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + length_primitive ("integer64", name, variable); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + length_primitive ("unsigned64", name, variable); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { length_primitive ("integer", name, variable); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - length_primitive ("unsigned", name, variable); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { length_primitive ("unsigned", name, variable); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; diff --git a/crypto/heimdal/lib/asn1/gen_template.c b/crypto/heimdal/lib/asn1/gen_template.c index edd68e122380..15bf7d30c498 100644 --- a/crypto/heimdal/lib/asn1/gen_template.c +++ b/crypto/heimdal/lib/asn1/gen_template.c @@ -52,11 +52,13 @@ integer_symbol(const char *basename, const Type *t) return "int"; /* XXX enum foo */ else if (t->range == NULL) return "heim_integer"; - else if (t->range->min == INT_MIN && t->range->max == INT_MAX) + else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) + return "int64_t"; + else if (t->range->min >= 0 && t->range->max > UINT_MAX) *** 100 LINES SKIPPED *** From nobody Wed Apr 24 21:29:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsZR3CN8z5J8FD; Wed, 24 Apr 2024 21:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPsZR2dGGz4VXf; Wed, 24 Apr 2024 21:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a9m37bkuM7Hypp3bKL2jyPMhvUQNJDP2esPWiNG7pY=; b=GjkfJPjVWKSe8gbQopwfg1gRqcuKBztBLC4x1Z/8j8QI7PnzAhmkI76l6Mnyn3BgFdwKl6 Ve4qtNFC0WTPyHSP9FLRVWqKmdzRCScHAeDak6oSHDK4G+ZCa1J1ryYGO3f2xyG8VNDb0T eucjPn7neZBk5ANy+4MkqHb0BYaObaTawObl3ffM9IqK7OXE3m5NfnNNhmyMzOS1gb/kXw KE1pDXlfOV3aacB2a3n4EA+2uaIY/fxxo2xUuAo5W82bQmCBxfso4PfcO/ZkZnRGcsmAC4 dCh4IUyDajThcn7MODR+za2d6j1gTd5xET/uINsgfg5ruHYwmuwiUysaR1BwDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994175; a=rsa-sha256; cv=none; b=JXxVCN9yNbieAz34ZBM8zJhIVjREDZjD+lb2QhoHkUPHyLbNZjFx+ZIWZnkrHCuAByeOOu Xrzgg6AhSuA4Tt/+cKrHjAOtA1Bx9EV0TYrtDtMeUQ28AN9sm9thmGBA7rG9ZPN2Uetfg+ U17pMmhpWwwxQC5oGWc5Q/p7DGImPSDROoD7cQQxrj5ApzGeYrRQV11/iVshQvq4m8aHED iMFqXtXFNoUkgTzg7o2128VllkTFiyHCYjKAj2rhA73A903GFvb+3N3eD1+wEAvd8+DVdJ BoiJiVMQty2GGRgPUMbf7EsXFNjTKBU5Rhf+X5fztFCftSeXixSDEyhovoM4Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a9m37bkuM7Hypp3bKL2jyPMhvUQNJDP2esPWiNG7pY=; b=i98l6b0g9gGrhLhiOEfPfv6iUFOPjZoIcBg+hGB9ZJ97mzCPk5UOgtkzZGqLi/fyY7wiq/ PIXlV5j5Xuiy0AbGSYRFRl//Rb7fRGW9xxfWoU5ro+oH/ahQoYtOoGWS1I8aY17gZpJQyA E9jrB2EApsZYqTppPfjxh/FxjS9RbbwCiT6mzKatdP2AfkgErGCR0GShU8/McBhfOO8TJi HRN8CoHMsLyum2q0TtuiHHEwhp51Oofo/nybIJgR5csoGob5ag0506L3IlISjCrw2yqeMn 8xGTcPjJAB1+hdmw2Kibqnvrdsb5hwNwnbwHlPtbOrJHJLoO7dAXOGVYd/VIdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZR2F3pzXMN; Wed, 24 Apr 2024 21:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OLTZcE086805; Wed, 24 Apr 2024 21:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTZse086802; Wed, 24 Apr 2024 21:29:35 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:35 GMT Message-Id: <202404242129.43OLTZse086802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8b4cf1092b65 - stable/13 - Add a few missed libclang_rt files to ObsoleteFiles.inc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b4cf1092b65d941d7b62fa843621c9c86187e32 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4cf1092b65d941d7b62fa843621c9c86187e32 commit 8b4cf1092b65d941d7b62fa843621c9c86187e32 Author: Dimitry Andric AuthorDate: 2024-04-21 21:32:22 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:28 +0000 Add a few missed libclang_rt files to ObsoleteFiles.inc PR: 276104 Reported by: Mark Millard MFC after: 3 days (cherry picked from commit 0ab121e9f9a33dde06b292df02ec2eee03033e1f) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 55479a7f6bfc..d759e7db2bc6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -325,6 +325,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -343,6 +344,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Wed Apr 24 21:29:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsZT5wkxz5J8Kk; Wed, 24 Apr 2024 21:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPsZT4Jgrz4VVP; Wed, 24 Apr 2024 21:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9fK7z6ZrEJocjWnjMevve14Pw6ZmdWE+9yMGdgo1f8=; b=U2aYxvqk/T5M4yodbRZNCMTF5vQnFAPTJldaMHLrT6LyWPFRJLZE1GyuEWkX8gQRATMOxk HV1kXNB9mJxw43K3ZLSliwYk7L9IV0EIBDWAHro5XDhjZhVw+ByMOEvfEAplTEEOI04Ida YGl+e8MfP5NcNLQYKcDeVDpTsAoDXkikMSDBSNfr4TNGy2rBNzTfdlrgngm17NqEBcxPbT pBOfxmOoOxa60/Z+a0kscPB/gZk6byws6cey/akfj2VdERQMi6OHNXaKbpDFnBzB17J53V njSj4QLjWj+nt0ZrsNAnGa1CWXshMdpmNi9N1iK3fE7u+FDlNZ5+GygGWJaTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994177; a=rsa-sha256; cv=none; b=oT5SAKmUhvp2D+aU3bhW9I+h9VE+oKCG+UBh/jUPbfWXrmuhzBFgKDBKlifhLrR+g9nDMt fjypkuVX1oycE3pqmCivG0OoyivOJByjVbqRbbWihXTfvGrXqmeZ5/BMYbUJp9g2rmFZmN X0hpNaTqzTSDvZdAiySgPDsK44/QKPVXIqTIYY5UgtH5GVvmf0Tyu85ggAyUiuaAvq9UZy 8HPgKlQWuKzwvPXsVKTWgbvNspgGxsfqsIyVoUum1mn/DRD+L5i0WCegaWMuJ6I+RVho8I x8gRtg9W7hlExGNa0gl93RvQmZZ8eq7I0RieiG1acoqNv5pEMOAY7/KtAs+aAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9fK7z6ZrEJocjWnjMevve14Pw6ZmdWE+9yMGdgo1f8=; b=GiNDhO2XWKyUiWB4ulkqMnV4+ojfnELBdiHo1C9OhE9UhJIckjmqUugKpkCLLLw0z1tf0t F8yLlvr07okSMt/fy2K9AY/QLB4CoEJG58CaaTufsOVZKFpdCPfV+Bk3MSd8wJvbXuCICz qUsUPIQI6IriG6379FCz+QfTAR3eZe6I6KdJbDNk/VYHeYajzVazUd0Gp0Ayo0yBM9FH4T W7EJYSDjfyBzWtilot3YgDd5nL6qNpJn2pFffTvbRbkt+2wOrWhHU4ib2nMzfKDd724/2B WzAQB/4Y4lE56qqZQ4ve3fd6N/7JWSMndjMhpgqYInf5SdIBPbtN9Up3tJoJcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZT3wD2zXmM; Wed, 24 Apr 2024 21:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OLTb9b086915; Wed, 24 Apr 2024 21:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTbbD086912; Wed, 24 Apr 2024 21:29:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:37 GMT Message-Id: <202404242129.43OLTbbD086912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 15dfc47b6adc - stable/13 - heimdal: asn1: Use unsigned bitfields for named bitsets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 commit 15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 Author: Dimitry Andric AuthorDate: 2024-04-17 17:49:30 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:27:27 +0000 heimdal: asn1: Use unsigned bitfields for named bitsets Import upstream 6747e1628: asn1: Use unsigned bitfields for named bitsets Signed 1-bit bitfields are undefined in C. This should fix the following warnings, which for unknown reasons are errors in CI: /usr/src/crypto/heimdal/lib/hx509/ca.c:1020:22: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1020 | ku.digitalSignature = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1021:21: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1021 | ku.keyEncipherment = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1028:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1028 | ku.keyCertSign = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1029:13: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1029 | ku.cRLSign = 1; | ^ ~ PR: 276960 Fixes: 1b7487592987 MFC after: 1 week (cherry picked from commit 219b6e442308d5353b2af5f0771ce9b887b70754) --- crypto/heimdal/lib/asn1/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 76a893c5ade7..f35d41667a57 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -727,10 +727,10 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "int64_t %s;\n", name); } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { fprintf (headerfile, "uint64_t %s;\n", name); - } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { - fprintf (headerfile, "int %s;\n", name); } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { + fprintf (headerfile, "int %s;\n", name); } else errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); From nobody Wed Apr 24 22:12:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtX46GlLz5JDM0; Wed, 24 Apr 2024 22:12: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 4VPtX45gm3z4c0P; Wed, 24 Apr 2024 22:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5oNsUAi/dVWCFy54WeerXsodCCpArZXnC7PCHIzvXI=; b=sxQ2vztbv5hW7qn2uC4XtupEI7zq85bgrskYE0FvvcHmKk+ohq/jEXHgvnaddpZY0GLHfE 6eKr7eGaqdqkGHkDpgLKWq9BsbPCwO2bqlZci2xUgC8jOlIEIItCVNy3g4NZo5A9EgYypr tEX6wQ7HacppvkZCEDmma3NL8yafraNU7TvTrPOBBwnDAg4TOyhLci3cDHyBCx9/FmyOmC 8jxu0kO1dpCrIAGCyunyl1l5uL2MpsQNseFAKg1J+u0PuoeL1f7UVC76zjw1iCR1vgpfqs aBis32Iua118p1NcNPNMwocCd/47DkanAmKchKrI+5V3wVsQwRu5qMXhgwBS1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996756; a=rsa-sha256; cv=none; b=rI3Qrzh6fToxub4tipjZedf77OQ+mbTPichVnjqUzcNKiO8ivgs4B5nZHaS6XBuhEnh/cS gEWYeYKLkC/LukHjL9v9DNIekSZPqCi9WVwdL69uuZsLK+XNIVQAtRoX9Fsh8N9KH3wAjm j5zWBm5K6zH3xrQnP7Y3n9235NVPNftH9Cz8QDKo5trjKVGvQloxRAkb/K/23WoIFmXpA4 reLk29QxkTWw8/8rm3RTr/rzsMrwIAC3opc/y+V69eRH67UzVNG81/uchJrWOVmQg7d/7Q Icyoad+cCBrkweQIulB0pmGB5d3DZxEclKqytT98mbziIoGc/4a2SQBzj7nxJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5oNsUAi/dVWCFy54WeerXsodCCpArZXnC7PCHIzvXI=; b=R4Mha6SZX4jQH2PQeWPRDGpT/xC/zMzoUy4htJjXJ83iji2irbqDITm4pTPt3xt0lcZXWR HkjQKaXkAI4U6L/f1LxexWgPJPQfAW2Z+mtHUjGepc3O8CRgJOezWwSex/0nCKMqzD0gyk owzeHb2S8nuxwiJRNdFNmiwoipUJy0gh9PLyVNcG59Cf+tvjeJ1w+fmXjE6MxRLxK0rOfb c6RD5VdMHryniXzYl2x96U71Slog4l0+8N22f/fqdymTgmt7h7WC7wpQgMa0SBnhxMtE6X jkTL0gjn5UIWIHQuxbLoLFoA/8mXQJXqOGR+jA5bDmIXVNVqIDHwS27XhsmLfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX45GRFzYvR; Wed, 24 Apr 2024 22:12: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 43OMCaLP070649; Wed, 24 Apr 2024 22:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCa4k070646; Wed, 24 Apr 2024 22:12:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:36 GMT Message-Id: <202404242212.43OMCa4k070646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 34ee703400c0 - stable/14 - install: Always use a temporary 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34ee703400c0c1c9705dfc3d718ab5effd993618 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=34ee703400c0c1c9705dfc3d718ab5effd993618 commit 34ee703400c0c1c9705dfc3d718ab5effd993618 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-12 17:30:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:55 +0000 install: Always use a temporary file. Previously, we would only use a temporary file if explicitly asked to with the `-S` option, and even then, only if the target file already existed. This meant that an outside observer looking for the target file might see a partial file, and might see the file disappear and then reappear. With this patch, we always use a temporary file, ensuring atomicity. The downside is slightly increased disk usage. The upside is never having to worry about, for instance, cron jobs randomly failing if they happen to run simultaneously with `make installworld`. The `-S` option is retained, partly for compatibility, and partly to control the use of `fsync(2)`, which has a non-negligible cost (approximately 10% increase in wall time for `make installworld`). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: 0mp, brooks, imp, markj Differential Revision: https://reviews.freebsd.org/D44742 (cherry picked from commit e5035d08578e372d40b4e2d4c3574b7583549bd6) install: Simplify path construction. There's no need to copy the path twice to split it into base and dir. We simply call `basename()` first, then handle the two trivial cases in which it isn't safe to call `dirname()`. While here, add an early check that the destination is not an empty string. This would always fail eventually, so it may as well fail right away. Also add a test case for this shortcut. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44743 (cherry picked from commit 17dc7017d7375b3463d65adffe1eb980b0f86795) install: Don't skip syncing in the common case. In `copy()`, if no digest was requested (which is the common case), we use `copy_file_range()` to avoid needlessly copying the contents of the file into user space and back. When `copy_file_range()` returns successfully (which, again, is the common case), we simply return, and therefore never get to the point where we call `fsync()` if the `-S` option was specified. Fix this. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44756 (cherry picked from commit 4336161cc9c631d40d00adee97dfc8161b6bec9f) install: Remove the mmap(2) option. We already removed it from cp(1) over a year ago but never followed up here. Do so now, for the same reasons: significant complexity for little to no benefit. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44809 (cherry picked from commit a0439a1b820fa0e742c00d095f5f5c06f5f19432) install: Assorted nitpickery. * Use `errc()` instead of manually setting `errno` before calling `err()`. * Change one warning into a fatal error. * Drop some unnecessary casts. * `strlcat()` bounds checks were off-by-one. This does not matter in practice because the subsequent code renders an overrun harmless. * We were passing `SSIZE_MAX` to `copy_file_range()` instead of the requested size. This only matters if we're asked to install a file which is still being written to while we are copying it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44810 (cherry picked from commit 000a533e6d1db9878296b32d1cc212e11a2cc718) --- usr.bin/xinstall/install.1 | 31 +-- usr.bin/xinstall/tests/install_test.sh | 8 + usr.bin/xinstall/xinstall.c | 422 ++++++++++----------------------- 3 files changed, 148 insertions(+), 313 deletions(-) diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index 346b0f428121..193892c4a2b9 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -27,7 +27,7 @@ .\" .\" From: @(#)install.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 4, 2022 +.Dd April 16, 2024 .Dt INSTALL 1 .Os .Sh NAME @@ -227,16 +227,18 @@ Copy the file, as if the except if the target file does not already exist or is different, then preserve the access and modification times of the source file. .It Fl S -Safe copy. -Normally, +Flush each file to disk after copying. +This has a non-negligible impact on performance, but reduces the risk +of being left with a partial file if the system crashes or loses power +shortly after .Nm -unlinks an existing target before installing the new file. -With the +runs. +.Pp +Historically, .Fl S -flag a temporary file is used and then renamed to be -the target. -The reason this is safer is that if the copy or -rename fails, the existing target is left untouched. +also enabled the use of temporary files to ensure atomicity when +replacing an existing target. +Temporary files are no longer optional. .It Fl s .Nm exec's the command @@ -302,15 +304,7 @@ Ports Collection. .Sh FILES .Bl -tag -width "INS@XXXXXX" -compact .It Pa INS@XXXXXX -If either -.Fl S -option is specified, or the -.Fl C -or -.Fl p -option is used in conjunction with the -.Fl s -option, temporary files named +Temporary files named .Pa INS@XXXXXX , where .Pa XXXXXX @@ -333,7 +327,6 @@ The default was changed to copy in .Xr cp 1 , .Xr mv 1 , .Xr strip 1 , -.Xr mmap 2 , .Xr getgrnam 3 , .Xr getpwnam 3 , .Xr chown 8 diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index cbe95f0dfbf3..b35706521ec3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -25,6 +25,13 @@ # # +atf_test_case copy_to_empty +copy_to_empty_body() { + printf 'test\n123\r456\r\n789\0z' >testf + atf_check -s not-exit:0 -e match:"empty string" \ + install testf "" +} + copy_to_nonexistent_with_opts() { printf 'test\n123\r456\r\n789\0z' >testf atf_check install "$@" testf copyf @@ -497,6 +504,7 @@ set_optional_exec_body() } atf_init_test_cases() { + atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe atf_add_test_case copy_to_nonexistent_comparing diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 3764c5ef92fa..5d4a6f48b717 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -42,10 +42,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif /* not lint */ #endif -#include -#include -#include -#include #include #include #include @@ -157,7 +153,6 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); static char *copy(int, const char *, int, const char *, off_t); -static int create_newfile(const char *, int, struct stat *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -173,7 +168,6 @@ static void metadata_log(const char *, const char *, struct timespec *, const char *, const char *, off_t); static int parseid(const char *, id_t *); static int strip(const char *, int, const char *, char **); -static int trymmap(size_t); static void usage(void); int @@ -341,10 +335,6 @@ main(int argc, char *argv[]) } } - /* need to make a temp copy so we can compare stripped version */ - if (docompare && dostrip) - safecopy = 1; - /* get group and owner id's */ if (group != NULL && !dounpriv) { if (gid_from_group(group, &gid) == -1) { @@ -393,8 +383,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "%s vanished", to_name); if (S_ISLNK(to_sb.st_mode)) { if (argc != 2) { - errno = ENOTDIR; - err(EX_USAGE, "%s", to_name); + errc(EX_CANTCREAT, ENOTDIR, "%s", + to_name); } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -420,14 +410,13 @@ main(int argc, char *argv[]) if (!no_target && !dolink) { if (stat(*argv, &from_sb)) err(EX_OSERR, "%s", *argv); - if (!S_ISREG(to_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", to_name); - } + if (!S_ISREG(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (to_sb.st_dev == from_sb.st_dev && - to_sb.st_ino == from_sb.st_ino) - errx(EX_USAGE, - "%s and %s are the same file", *argv, to_name); + to_sb.st_ino == from_sb.st_ino) { + errx(EX_USAGE, "%s and %s are the same file", + *argv, to_name); + } } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -585,7 +574,7 @@ do_link(const char *from_name, const char *to_name, char tmpl[MAXPATHLEN]; int ret; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -632,7 +621,7 @@ do_symlink(const char *from_name, const char *to_name, { char tmpl[MAXPATHLEN]; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -675,8 +664,10 @@ static void makelink(const char *from_name, const char *to_name, const struct stat *target_sb) { - char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; - struct stat to_sb; + char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; + char *to_name_copy, *d, *ld, *ls, *s; + const char *base, *dir; + struct stat to_sb; /* Try hard links first. */ if (dolink & (LN_HARD|LN_MIXED)) { @@ -737,8 +728,6 @@ makelink(const char *from_name, const char *to_name, } if (dolink & LN_RELATIVE) { - char *to_name_copy, *cp, *d, *ld, *ls, *s; - if (*from_name != '/') { /* this is already a relative link */ do_symlink(from_name, to_name, target_sb); @@ -758,17 +747,23 @@ makelink(const char *from_name, const char *to_name, to_name_copy = strdup(to_name); if (to_name_copy == NULL) err(EX_OSERR, "%s: strdup", to_name); - cp = dirname(to_name_copy); - if (realpath(cp, dst) == NULL) - err(EX_OSERR, "%s: realpath", cp); - /* .. and add the last component. */ - if (strcmp(dst, "/") != 0) { - if (strlcat(dst, "/", sizeof(dst)) > sizeof(dst)) + base = basename(to_name_copy); + if (base == to_name_copy) { + /* destination is a file in cwd */ + (void)strlcpy(dst, "./", sizeof(dst)); + } else if (base == to_name_copy + 1) { + /* destination is a file in the root */ + (void)strlcpy(dst, "/", sizeof(dst)); + } else { + /* all other cases: safe to call dirname() */ + dir = dirname(to_name_copy); + if (realpath(dir, dst) == NULL) + err(EX_OSERR, "%s: realpath", dir); + if (strcmp(dst, "/") != 0 && + strlcat(dst, "/", sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); } - strcpy(to_name_copy, to_name); - cp = basename(to_name_copy); - if (strlcat(dst, cp, sizeof(dst)) > sizeof(dst)) + if (strlcat(dst, base, sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); free(to_name_copy); @@ -821,7 +816,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) struct stat from_sb, temp_sb, to_sb; struct timespec tsb[2]; int devnull, files_match, from_fd, serrno, stripped, target; - int tempcopy, temp_fd, to_fd; + int temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; char *digestresult; @@ -835,10 +830,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (!dolink) { if (stat(from_name, &from_sb)) err(EX_OSERR, "%s", from_name); - if (!S_ISREG(from_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", from_name); - } + if (!S_ISREG(from_sb.st_mode)) + errc(EX_OSERR, EFTYPE, "%s", from_name); } /* Build the target path. */ if (flags & DIRECTORY) { @@ -852,32 +845,18 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } else { devnull = 1; } + if (*to_name == '\0') + errx(EX_USAGE, "destination cannot be an empty string"); target = (lstat(to_name, &to_sb) == 0); if (dolink) { - if (target && !safecopy) { - if (to_sb.st_mode & S_IFDIR && rmdir(to_name) == -1) - err(EX_OSERR, "%s", to_name); -#if HAVE_STRUCT_STAT_ST_FLAGS - if (to_sb.st_flags & NOCHANGEBITS) - (void)chflags(to_name, - to_sb.st_flags & ~NOCHANGEBITS); -#endif - unlink(to_name); - } makelink(from_name, to_name, target ? &to_sb : NULL); return; } - if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) { - errno = EFTYPE; - warn("%s", to_name); - return; - } - - /* Only copy safe if the target exists. */ - tempcopy = safecopy && target; + if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (!devnull && (from_fd = open(from_name, O_RDONLY, 0)) < 0) err(EX_OSERR, "%s", from_name); @@ -899,40 +878,32 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!files_match) { - if (tempcopy) { - to_fd = create_tempfile(to_name, tempfile, - sizeof(tempfile)); - if (to_fd < 0) - err(EX_OSERR, "%s", tempfile); - } else { - if ((to_fd = create_newfile(to_name, target, - &to_sb)) < 0) - err(EX_OSERR, "%s", to_name); - if (verbose) - (void)printf("install: %s -> %s\n", - from_name, to_name); - } + to_fd = create_tempfile(to_name, tempfile, + sizeof(tempfile)); + if (to_fd < 0) + err(EX_OSERR, "%s", tempfile); if (!devnull) { - if (dostrip) - stripped = strip(tempcopy ? tempfile : to_name, - to_fd, from_name, &digestresult); - if (!stripped) - digestresult = copy(from_fd, from_name, to_fd, - tempcopy ? tempfile : to_name, from_sb.st_size); + if (dostrip) { + stripped = strip(tempfile, to_fd, from_name, + &digestresult); + } + if (!stripped) { + digestresult = copy(from_fd, from_name, to_fd, + tempfile, from_sb.st_size); + } } } if (dostrip) { if (!stripped) - (void)strip(tempcopy ? tempfile : to_name, to_fd, - NULL, &digestresult); + (void)strip(tempfile, to_fd, NULL, &digestresult); /* * Re-open our fd on the target, in case * we did not strip in-place. */ close(to_fd); - to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY, 0); + to_fd = open(tempfile, O_RDONLY, 0); if (to_fd < 0) err(EX_OSERR, "stripping %s", to_name); } @@ -976,16 +947,16 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) digestresult = digest_file(tempfile); /* - * Move the new file into place if doing a safe copy - * and the files are different (or just not compared). + * Move the new file into place if the files are different (or + * just not compared). */ - if (tempcopy && !files_match) { + if (!files_match) { #if HAVE_STRUCT_STAT_ST_FLAGS /* Try to turn off the immutable bits. */ if (to_sb.st_flags & NOCHANGEBITS) (void)chflags(to_name, to_sb.st_flags & ~NOCHANGEBITS); #endif - if (dobackup) { + if (target && dobackup) { if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", to_name, suffix) != strlen(to_name) + strlen(suffix)) { unlink(tempfile); @@ -1124,86 +1095,62 @@ compare(int from_fd, const char *from_name __unused, size_t from_len, int to_fd, const char *to_name __unused, size_t to_len, char **dresp) { - char *p, *q; int rv; - int do_digest, done_compare; + int do_digest; DIGEST_CTX ctx; - rv = 0; if (from_len != to_len) return 1; do_digest = (digesttype != DIGEST_NONE && dresp != NULL && *dresp == NULL); if (from_len <= MAX_CMP_SIZE) { + static char *buf, *buf1, *buf2; + static size_t bufsize; + int n1, n2; + if (do_digest) digest_init(&ctx); - done_compare = 0; - if (trymmap(from_len) && trymmap(to_len)) { - p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - from_fd, (off_t)0); - if (p == MAP_FAILED) - goto out; - q = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - to_fd, (off_t)0); - if (q == MAP_FAILED) { - munmap(p, from_len); - goto out; - } - rv = memcmp(p, q, from_len); - if (do_digest) - digest_update(&ctx, p, from_len); - munmap(p, from_len); - munmap(q, from_len); - done_compare = 1; + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize * 2); + if (buf == NULL) + err(1, "Not enough memory"); + buf1 = buf; + buf2 = buf + bufsize; } - out: - if (!done_compare) { - static char *buf, *buf1, *buf2; - static size_t bufsize; - int n1, n2; - - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + rv = 0; + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + while (rv == 0) { + n1 = read(from_fd, buf1, bufsize); + if (n1 == 0) + break; /* EOF */ + else if (n1 > 0) { + n2 = read(to_fd, buf2, n1); + if (n2 == n1) + rv = memcmp(buf1, buf2, n1); else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize * 2); - if (buf == NULL) - err(1, "Not enough memory"); - buf1 = buf; - buf2 = buf + bufsize; - } - rv = 0; - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); - while (rv == 0) { - n1 = read(from_fd, buf1, bufsize); - if (n1 == 0) - break; /* EOF */ - else if (n1 > 0) { - n2 = read(to_fd, buf2, n1); - if (n2 == n1) - rv = memcmp(buf1, buf2, n1); - else - rv = 1; /* out of sync */ - } else - rv = 1; /* read failure */ - if (do_digest) - digest_update(&ctx, buf1, n1); - } - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); + rv = 1; /* out of sync */ + } else + rv = 1; /* read failure */ + if (do_digest) + digest_update(&ctx, buf1, n1); } - } else + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + } else { rv = 1; /* don't bother in this case */ + } if (do_digest) { if (rv == 0) @@ -1235,65 +1182,6 @@ create_tempfile(const char *path, char *temp, size_t tsize) return (mkstemp(temp)); } -/* - * create_newfile -- - * create a new file, overwriting an existing one if necessary - */ -static int -create_newfile(const char *path, int target, struct stat *sbp) -{ - char backup[MAXPATHLEN]; - int saved_errno = 0; - int newfd; - - if (target) { - /* - * Unlink now... avoid ETXTBSY errors later. Try to turn - * off the append/immutable bits -- if we fail, go ahead, - * it might work. - */ -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags & ~NOCHANGEBITS); -#endif - - if (dobackup) { - if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix) != strlen(path) + strlen(suffix)) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - errx(EX_OSERR, "%s: backup filename too long", - path); - } - (void)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix); - if (verbose) - (void)printf("install: %s -> %s\n", - path, backup); - if (rename(path, backup) < 0) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - err(EX_OSERR, "rename: %s to %s", path, backup); - } - } else - if (unlink(path) < 0) - saved_errno = errno; - } - - newfd = open(path, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); - if (newfd < 0 && saved_errno != 0) - errno = saved_errno; - return newfd; -} - /* * copy -- * copy from one file to another @@ -1309,28 +1197,23 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, #ifndef BOOTSTRAP_XINSTALL ssize_t ret; #endif - char *p; - int done_copy; DIGEST_CTX ctx; /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(from_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", from_name); - if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(to_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", to_name); #ifndef BOOTSTRAP_XINSTALL /* Try copy_file_range() if no digest is requested */ if (digesttype == DIGEST_NONE) { - ret = 1; - while (ret > 0) { + do { ret = copy_file_range(from_fd, NULL, to_fd, NULL, - SSIZE_MAX, 0); - } - if (ret == 0) { - /* DIGEST_NONE always returns NULL */ - return (NULL); - } + (size_t)size, 0); + } while (ret > 0); + if (ret == 0) + goto done; if (errno != EINVAL) { serrno = errno; (void)unlink(to_name); @@ -1339,70 +1222,47 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, } /* Fall back */ } - #endif digest_init(&ctx); - done_copy = 0; - if (trymmap((size_t)size) && - (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED, - from_fd, (off_t)0)) != MAP_FAILED) { - nw = write(to_fd, p, size); - if (nw != size) { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } + while ((nr = read(from_fd, buf, bufsize)) > 0) { + if ((nw = write(to_fd, buf, nr)) != nr) { serrno = errno; (void)unlink(to_name); if (nw >= 0) { errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, (uintmax_t)size); + "short write to %s: %jd bytes written, " + "%jd bytes asked to write", + to_name, (uintmax_t)nw, + (uintmax_t)size); } else { errno = serrno; err(EX_OSERR, "%s", to_name); } } - digest_update(&ctx, p, size); - (void)munmap(p, size); - done_copy = 1; + digest_update(&ctx, buf, nr); } - if (!done_copy) { - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); - else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize); - if (buf == NULL) - err(1, "Not enough memory"); - } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { - serrno = errno; - (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { - errno = serrno; - err(EX_OSERR, "%s", to_name); - } - } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); - } + if (nr != 0) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", from_name); } +done: if (safecopy && fsync(to_fd) == -1) { serrno = errno; (void)unlink(to_name); @@ -1635,29 +1495,3 @@ usage(void) exit(EX_USAGE); /* NOTREACHED */ } - -/* - * trymmap -- - * return true (1) if mmap should be tried, false (0) if not. - */ -static int -trymmap(size_t filesize) -{ - /* - * This function existed to skip mmap() for NFS file systems whereas - * nowadays mmap() should be perfectly safe. Nevertheless, using mmap() - * only reduces the number of system calls if we need multiple read() - * syscalls, i.e. if the file size is > MAXBSIZE. However, mmap() is - * more expensive than read() so set the threshold at 4 fewer syscalls. - * Additionally, for larger file size mmap() can significantly increase - * the number of page faults, so avoid it in that case. - * - * Note: the 8MB limit is not based on any meaningful benchmarking - * results, it is simply reusing the same value that was used before - * and also matches bin/cp. - * - * XXX: Maybe we shouldn't bother with mmap() at all, since we use - * MAXBSIZE the syscall overhead of read() shouldn't be too high? - */ - return (filesize > 4 * MAXBSIZE && filesize < 8 * 1024 * 1024); -} From nobody Wed Apr 24 22:12:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtX61vKrz5JDNq; Wed, 24 Apr 2024 22:12: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 4VPtX56h5Pz4cPN; Wed, 24 Apr 2024 22:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf0e9nBdDzff6vV5b1x+cURzq9bQ1eIz8JrBa/dPG30=; b=p+lf7cSY3cKUF8T/aWI/pGNOvp+76DxrihG1XaUwa5MzDeUBy8+YqdsSYhVV8iICsmDddD R+VnDRrjLV8oQnCYZfIR/KW+3tpK0CgvCu1l7CliqFf10eB1jCwdL+R8sAcJt7MFZqc/5C kMaLxpcSa/rqUK50cglEw+sInxqtI9pzLeA4Vrnw6/m3vGBFj/EM31qYICP4eIIN3LPWXa LYzdT3+6DoMg05RsYMWyq7/O9L2ltoNNRxa3ixOWy41D1rE2AUdKDzCanTvl3zwR5EGURR HSMS1L4FD7oHGvLftHBngzO7QpjtFO4r/I3cpS3LOO3LVCBVyj3KmLlUl6ejKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996757; a=rsa-sha256; cv=none; b=Fg6WF5ZCw0cBbRfLFwAFrr0PckCdD0V5aoj7blWDkaU6agmHR9pNJhcilEJm659Je1Hp8D mqIeOZ4Cgv+wJcGO29NOge8PVwqo8yMZJ6IwzSIjT58pD/nchbb0HGX9oidaHF3JjeGoHj lDg2mfs6a8EK7DurVSIjouu1kJSiDMntkQwvjZoS3CoKSbiOjB0BoUimaO9L9vyK/JXg2A NNKq53f7+Xl7oDRRaForcGeqP8CSP4Fl4qQaZd0WFJOYJFc9pQBOu7rQt3g2kn8TwrCM2x J5zzoYoQ4RF/aQWyBwiFlp/o5s7FeTGeOnJIdRSoe2WbMGgxWusOTrxF8Okhfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf0e9nBdDzff6vV5b1x+cURzq9bQ1eIz8JrBa/dPG30=; b=Y1um2QZjaDW3Am+eIbsrtTvL9dDcTdHj60d7kxsClLACkRsslwnVnPvBpmxi+GKF5QCthJ iMo6KhDL/T2rEUmDwT4VOmHUinOK6nF+sOkU9sgk9xaVN26wreq7UZwao+4scEqBlUyKuy WyEViwcH3YgV7G7c+g2HDaXIR2+wjnAW3Pckj92i69t9xYM2S6aRFLr97d+g7cQ63iFGNo uw4J+Rzvvqby8aW8UIOYiZ12eHXhnweWSW+SPcnEf3L+KjPB5OBoJJP1SGnW0if/AiYHS6 1uJyyzO5PVbFE3t1mAfCfExO/5zjzwbCz/QjAwt6xe3CHXB+eQZsgtOEhrMlfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX56J1tzYX3; Wed, 24 Apr 2024 22:12: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 43OMCbng070700; Wed, 24 Apr 2024 22:12:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCbHF070697; Wed, 24 Apr 2024 22:12:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:37 GMT Message-Id: <202404242212.43OMCbHF070697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f1d4502c295 - stable/14 - install: Fix a compiler warning when bootstrapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f1d4502c29564021dc4772939d0df99abe083e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f1d4502c29564021dc4772939d0df99abe083e0 commit 9f1d4502c29564021dc4772939d0df99abe083e0 Author: Mark Johnston AuthorDate: 2024-04-19 18:22:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 install: Fix a compiler warning when bootstrapping Fixes: 4336161cc9c6 ("install: Don't skip syncing in the common case.") Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D44866 (cherry picked from commit 2f44f86575f9cba5da28b762c359f7a806400744) --- usr.bin/xinstall/xinstall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 5d4a6f48b717..1667c54e3649 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1262,7 +1262,9 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, errno = serrno; err(EX_OSERR, "%s", from_name); } +#ifndef BOOTSTRAP_XINSTALL done: +#endif if (safecopy && fsync(to_fd) == -1) { serrno = errno; (void)unlink(to_name); From nobody Wed Apr 24 22:12:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtX73Cjhz5JDGb; Wed, 24 Apr 2024 22:12: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 4VPtX70WfQz4c9N; Wed, 24 Apr 2024 22:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUWgryrVUwmiKb3xpYlFdiqSptjsnyEax81nzUYY9cE=; b=b2cbvl5baSeQ1ZIkzUshMmuVnsjL1+I1ZjfxN9Btqo8yqqErrRjXj1sJ5scBAvvSbtwaHF LkTR4o6Wg0Y2W2ChRs/Es3LcwCcHDUAPlsuVhu9xct4FClrEPtwD4mpUX+0bfQ8FHRkq0k okf29VBgpSVykyvi1YjpzQrDCJpLx8CaRXmnnNc40Gk5NVhX8e4M0lsVlrQxds5C2jaga+ 7juctk7NEFrEyFQz1DnxNGSZlusn5KaonuzFKVaXYu6Xq12Fw6Uz1PvmOOUMezV7sI9sN4 wJTO5e96nUAecAkwzSaVNPQYc1IC3SYDLft+b1frJ6LmsgQbQunqmESLPVo9Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996759; a=rsa-sha256; cv=none; b=tfKiywmxElZugY4+Zt4diHn5uF1OQp9o6/n3NTE8afpSyiQOcO4xQhxyhAIg0mJlHAxUqP X8qrWjiPHnMsCi+1GgqZVEIHXodgKrj1DVnZg+QNwGQ/I+SQeG0nGy0uFdA86rc3QW0j2V cx9Vf4Zw3q6aui9FffnuYQrx/vmqdKXA99VFg4zJKueYa0vtGosnjJ4Hws6YFhHS2pW17S qJjD4tHR4BHVHtaQiXWXpQ6AGkSxWWK02/DcmcslzcmNaSynKGX5Ss38L7GWdjFPozPsbo A8Pgjwp+eeeUJwaugVImFD79bVPoh6+F0GFIUZMlrU8sNl7Me//m50xGA7wahw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUWgryrVUwmiKb3xpYlFdiqSptjsnyEax81nzUYY9cE=; b=nTIsxpRCr2/t58WeaXdO1Oj/g6moGL65SNU1IfehmxqeAUPWQsQXUKa69iv3uVLX2PfwbF JnDiZkvL+Ilxy/s+/AxWEYehqj0Sk99kvWBa3Jp4oNY9LkJ/IiXetOuBe+Fh5a3qHqcmpS RDoN7WvrhGiBERFpmDm9twLOMWFJPHQs2jUwmKtpFeuBAYs6hWlUSOHep2uJgxcd8epB9l r7M0wwMSJUHp1DlusgpXq8tmCcyyRpQU8nYrpQtlUnqA0vQXLzmr2pd7Tss/Dzes0TO9SV FrjPwS53n7clnvi6ASKb3DJ076YAGZCoDQbs0lFMhC0m7n1aDcQiYgMTcUx92A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX705dnzYX4; Wed, 24 Apr 2024 22:12: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 43OMCcrJ070752; Wed, 24 Apr 2024 22:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCcMQ070749; Wed, 24 Apr 2024 22:12:38 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:38 GMT Message-Id: <202404242212.43OMCcMQ070749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 760720469681 - stable/14 - cp: Clarify an obscure 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 760720469681a2119b4537a6603337834317383b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=760720469681a2119b4537a6603337834317383b commit 760720469681a2119b4537a6603337834317383b Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 cp: Clarify an obscure comment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44805 (cherry picked from commit 64d6925d1901637125f9f739282e72c992657dc8) cp: Additional sanity check. Once we've successfully opened the file we've been asked to copy, check that it's of the same type as FTS told us it was. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44806 (cherry picked from commit 9075d4cfad5b339aabdf8033623a2164898c2786) cp: Use warnc(). MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit f070188c3ad6b87ee9ce220b21718333d1bd9d52) --- bin/cp/cp.c | 13 +++++++++---- bin/cp/utils.c | 27 ++++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index af7d5ffac398..a8c57308ae96 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -316,8 +316,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) case FTS_NS: case FTS_DNR: case FTS_ERR: - warnx("%s: %s", - curr->fts_path, strerror(curr->fts_errno)); + warnc(curr->fts_errno, "%s", curr->fts_path); badcp = rval = 1; continue; case FTS_DC: /* Warn, continue. */ @@ -491,13 +490,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) switch (curr->fts_statp->st_mode & S_IFMT) { case S_IFLNK: - /* Catch special case of a non-dangling symlink. */ if ((fts_options & FTS_LOGICAL) || ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) { + /* + * We asked FTS to follow links but got + * here anyway, which means the target is + * nonexistent or inaccessible. Let + * copy_file() deal with the error. + */ if (copy_file(curr, dne)) badcp = rval = 1; - } else { + } else { + /* Copy the link. */ if (copy_link(curr, !dne)) badcp = rval = 1; } diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 353d35214844..a2cb2f536843 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -106,21 +106,34 @@ copy_fallback(int from_fd, int to_fd) int copy_file(const FTSENT *entp, int dne) { - struct stat *fs; + struct stat sb, *fs; ssize_t wcount; off_t wtotal; int ch, checkch, from_fd, rval, to_fd; int use_copy_file_range = 1; + fs = entp->fts_statp; from_fd = to_fd = -1; - if (!lflag && !sflag && - (from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { - warn("%s", entp->fts_path); - return (1); + if (!lflag && !sflag) { + if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 || + fstat(from_fd, &sb) != 0) { + warn("%s", entp->fts_path); + return (1); + } + /* + * Check that the file hasn't been replaced with one of a + * different type. This can happen if we've been asked to + * copy something which is actively being modified and + * lost the race, or if we've been asked to copy something + * like /proc/X/fd/Y which stat(2) reports as S_IFREG but + * is actually something else once you open it. + */ + if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) { + warnx("%s: File changed", entp->fts_path); + return (1); + } } - fs = entp->fts_statp; - /* * If the file exists and we're interactive, verify with the user. * If the file DNE, set the mode to be the from file, minus setuid From nobody Wed Apr 24 22:12:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtX83vC1z5JDYD; Wed, 24 Apr 2024 22:12: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 4VPtX81JJNz4c2t; Wed, 24 Apr 2024 22:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIFea1F7odXF5ljOXGDqC9ClkDLkQuUNqGoV/8kNofw=; b=OO+GJYrrBhPEtothdW7BgSefdfR/gTw1touk60yEfeAZE5xX4I4nRSne6qCF95oBVqGHpZ m352TyRNjfkpGA0HLhskGZ3icGohANM8qvje5jd2qYMU9RAi4q+B1WTyAKwPPREKNBafVA tC/CrTN9qcBR78QL7Ns5tXqkvqGbO8nXRemF+HAnZOyhheEwdDxCMF3RNlTwg4Rodv82kQ 24gTP2148Qr4YvhYyEdH9aSNZNEfMtlyW9y9bXldyXYkIIQhWkfgEUbE1KHmiXQB+8L4Xj UoB91tJF4bqd/4Dvyn6ehlDMBJJ7rDdxakFqkN6uyL27TU0MKQEfrltFM64Ziw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996760; a=rsa-sha256; cv=none; b=eZZtuLk5EvkFhvk4zdZPRC9dGOjObbK/GrjkdiRVxUeI9z1/Go47NDsXkMiP3Xu8bqv4WO oF1pd2JMSBx+AmE8XSN1sk29Xy4l8Jkl1DbS8I9suEgy8i2udNrdCULBLPQ+I1hUsz8gfd jVassr7w6jEdKYkXMhg/BFI0Yeje6qIT73+i0CHsWO1vi6CjlIJMpa7cknSCOT42r/c/XB SsUJEbdx3SxcSgKJ1oyxb19e/Uuacn4vzXLfwUD79qDCzXmYzjL5SPHGy11q/dKCpxTCH0 A/feGMA5DXMtwYyI+dgX8Gp10unIcs/acvOUOj77a2JHzqhgycjxl3CopoXeTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIFea1F7odXF5ljOXGDqC9ClkDLkQuUNqGoV/8kNofw=; b=Dno36SLx0CHc8ENsutQt0bC4ejM5h7cxZSmd/IJRURqPBGhrAtesZz/FH/+k7Zbwd67y8k sLWWkrOEXRGQX/rwImFK0tjc0BbxzdvjVcT7sy+8mexbR/zJUUXWmH1WyBKPZAFjbMinW/ a/RCgu/WV0QmpRbGcgRpNbUg6e28OXgmbTByMNj2cEPd/3AsFK+eDraxLKWiMRiyoSYGWx YyBRFMkcOd2DElu4KgfPsfS/myDMVwCE7eiA2c4YNVzsju984o+wULZCPzk5Ks9EJfFFNe TLxC26I/9AsE2N2Y6TdkZ94LMn+mFftKXWL5bKQ/+WRew3YXMtG+7yMZbAIvrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX80wGDzZ3j; Wed, 24 Apr 2024 22:12: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 43OMCeWW070806; Wed, 24 Apr 2024 22:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCewP070803; Wed, 24 Apr 2024 22:12:40 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:40 GMT Message-Id: <202404242212.43OMCewP070803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f3032b76b3c - stable/14 - pf tests: Add option to send fragmented packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f3032b76b3c077d032fb86b614a5d64e04a7ed4 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f3032b76b3c077d032fb86b614a5d64e04a7ed4 commit 9f3032b76b3c077d032fb86b614a5d64e04a7ed4 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-26 09:14:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 pf tests: Add option to send fragmented packets Add option to send fragmented packets and to properly sniff them by reassembling them by the sniffer itself. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42354 (cherry picked from commit d7c9de2d68ca81c557e069c2b431529cf597886c) pf: Fix packet reassembly Don't drop fragmented packets when reassembly is disabled, they can be matched by rules with "fragment" keyword. Ensure that presence of scrub rules forces old behaviour. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42355 (cherry picked from commit ede5d4ff5b39ccbc193c30fb6c093c7c4de9a464) pf: Update documentation regarding matching, scrubbing and reassembly Update pf documentation: - default behaviour of fragment reassembly - introduction of scrub option for filter rules - disadvantages of using the old scrub ruleset - options supported for match rules - fix missing list block end - remove duplicate description of match filter rule - update example to modern syntax Reviewed by: kp Fragments obtained from: OpenBSD Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42270 (cherry picked from commit 5ed470bdb9da6442d6030cf0a7a8493f759fbb43) --- share/man/man5/pf.conf.5 | 147 ++++++++++++++------- sys/netpfil/pf/pf_norm.c | 51 ++++--- tests/sys/netpfil/common/pft_ping.py | 39 ++++-- tests/sys/netpfil/common/sniffer.py | 18 ++- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/fragmentation_compat.sh | 11 -- .../sys/netpfil/pf/fragmentation_no_reassembly.sh | 130 ++++++++++++++++++ 7 files changed, 308 insertions(+), 89 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 8255a89587be..3193c18760c8 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -401,7 +401,9 @@ set limit frags 20000 .Ed .Pp sets the maximum number of entries in the memory pool used for fragment -reassembly (generated by +reassembly (generated by the +.Ar set reassemble +option or .Ar scrub rules) to 20000. Using @@ -495,6 +497,29 @@ For example: .Bd -literal -offset indent set optimization aggressive .Ed +.It Ar set reassemble yes | no Op Cm no-df +The +.Cm reassemble +option is used to enable or disable the reassembly of fragmented packets, +and can be set to +.Cm yes +or +.Cm no . +If +.Cm no-df +is also specified, fragments with the +.Dq dont-fragment +bit set are reassembled too, +instead of being dropped; +the reassembled packet will have the +.Dq dont-fragment +bit cleared. +The default value is +.Cm no . +.Pp +This option is ignored if there are pre-FreeBSD 14 +.Cm scrub +rules present. .It Ar set block-policy The .Ar block-policy @@ -768,19 +793,21 @@ Used to specify that packets must already be tagged with the given tag in order to match the rule. Inverse tag matching can also be done by specifying the ! operator before the tagged keyword. +.El .Sh TRAFFIC NORMALIZATION -Traffic normalization is used to sanitize packet content in such -a way that there are no ambiguities in packet interpretation on -the receiving side. -The normalizer does IP fragment reassembly to prevent attacks -that confuse intrusion detection systems by sending overlapping -IP fragments. -Packet normalization is invoked with the -.Ar scrub -directive. -.Pp -.Ar scrub -has the following options: +Traffic normalization is a broad umbrella term +for aspects of the packet filter which deal with +verifying packets, packet fragments, spoofed traffic, +and other irregularities. +.Ss Scrub +Scrub involves sanitising packet content in such a way +that there are no ambiguities in packet interpretation on the receiving side. +It is invoked with the +.Cm scrub +option, added to filter rules. +.Pp +Parameters are specified enclosed in parentheses. +At least one of the following parameters must be specified: .Bl -tag -width xxxx .It Ar no-df Clears the @@ -839,22 +866,8 @@ Replaces the IP identification field with random values to compensate for predictable values generated by many hosts. This option only applies to packets that are not fragmented after the optional fragment reassembly. -.It Ar fragment reassemble -Using -.Ar scrub -rules, fragments can be reassembled by normalization. -In this case, fragments are buffered until they form a complete -packet, and only the completed packet is passed on to the filter. -The advantage is that filter rules have to deal only with complete -packets, and can ignore fragments. -The drawback of caching fragments is the additional memory cost. -This is the default behaviour unless no fragment reassemble is specified. -.It Ar no fragment reassemble -Do not reassemble fragments. .It Ar reassemble tcp Statefully normalizes TCP connections. -.Ar scrub reassemble tcp -rules may not have the direction (in/out) specified. .Ar reassemble tcp performs the following normalizations: .Pp @@ -906,6 +919,41 @@ blind attacker would have to guess the timestamp as well. .Pp For example, .Bd -literal -offset indent +match in all scrub (no-df random-id max-mss 1440) +.Ed +.Ss Scrub ruleset (pre-FreeBSD 14) +In order to maintain compatibility with older releases of FreeBSD +.Ar scrub +rules can also be specified in their own ruleset. +In such case they are invoked with the +.Ar scrub +directive. +If there are such rules present they determine packet reassembly behaviour. +When no such rules are present the option +.Ar set reassembly +takes precedence. +The +.Ar scrub +rules can take all parameters specified above for a +.Ar scrub +option of filter rules and 2 more parameters controlling fragment reassembly: +.Bl -tag -width xxxx +.It Ar fragment reassemble +Using +.Ar scrub +rules, fragments can be reassembled by normalization. +In this case, fragments are buffered until they form a complete +packet, and only the completed packet is passed on to the filter. +The advantage is that filter rules have to deal only with complete +packets, and can ignore fragments. +The drawback of caching fragments is the additional memory cost. +This is the default behaviour unless no fragment reassemble is specified. +.It Ar no fragment reassemble +Do not reassemble fragments. +.El +.Pp +For example, +.Bd -literal -offset indent scrub in on $ext_if all fragment reassemble .Ed .Pp @@ -917,6 +965,14 @@ much in the same way as works in the packet filter (see below). This mechanism should be used when it is necessary to exclude specific packets from broader scrub rules. +.Pp +.Ar scrub +rules in the +.Ar scrub +ruleset are evaluated for every packet before stateful filtering. +This means excessive usage of them will cause performance penalty. +.Ar scrub reassemble tcp +rules must not have the direction (in/out) specified. .Sh QUEUEING with ALTQ The ALTQ system is currently not available in the GENERIC kernel nor as loadable modules. @@ -1494,28 +1550,21 @@ rules differ from .Ar block and .Ar pass -rules in that parameters are set every time a packet matches the rule, not only +rules in that parameters are set for every rule a packet matches, not only on the last matching rule. For the following parameters, this means that the parameter effectively becomes "sticky" until explicitly overridden: .Ar queue , .Ar dnpipe , -.Ar dnqueue +.Ar dnqueue , +.Ar rtable , +.Ar scrub . .It Ar pass The packet is passed; state is created unless the .Ar no state option is specified. -.It Ar match -Action is unaltered, the previously matched rule's action still matters. -Match rules apply queue and rtable assignments for every matched packet, -subsequent matching pass or match rules can overwrite the assignment, -if they don't specify a queue or an rtable, respectively, the previously -set value remains. -Additionally, match rules can contain log statements; the is logging done -for each and every matching match rule, so it is possible to log a single -packet multiple times. .El .Pp By default @@ -2597,6 +2646,8 @@ contain the necessary header information for the subprotocol that allows to filter on things such as TCP ports or to perform NAT. .Pp Besides the use of +.Ar set reassemble +option or .Ar scrub rules as described in .Sx TRAFFIC NORMALIZATION @@ -2605,7 +2656,11 @@ above, there are three options for handling fragments in the packet filter. One alternative is to filter individual fragments with filter rules. If no .Ar scrub -rule applies to a fragment, it is passed to the filter. +rule applies to a fragment or +.Ar set reassemble +is set to +.Cm no +, it is passed to the filter. Filter rules with matching IP header parameters decide whether the fragment is passed or blocked, in the same way as complete packets are filtered. @@ -2638,11 +2693,13 @@ rules. .Pp In most cases, the benefits of reassembly outweigh the additional memory cost, and it's recommended to use +.Ar set reassemble +option or .Ar scrub -rules to reassemble -all fragments via the +rules with the .Ar fragment reassemble -modifier. +modifier to reassemble +all fragments. .Pp The memory allocated for fragment caching can be limited using .Xr pfctl 8 . @@ -3007,12 +3064,12 @@ rdr on $ext_if proto tcp from any to any port 80 \e # (157.161.48.183, the only routable address) # and the private network is 10.0.0.0/8, for which we are doing NAT. +# Reassemble incoming traffic +set reassemble yes + # use a macro for the interface name, so it can be changed easily ext_if = \&"kue0\&" -# normalize all incoming traffic -scrub in on $ext_if all fragment reassemble - # block and log everything by default block return log on $ext_if all diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 2625966a0278..a92462c53f15 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1043,14 +1043,22 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, int ip_len; int tag = -1; int verdict; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * - fragment reassembly depends on V_pf_status.reass + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * - fragment reassembly is performed if the matching rule has no + * PFRULE_FRAGMENT_NOREASS flag + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1076,7 +1084,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv4 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) @@ -1087,12 +1095,6 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); - } else if ((!V_pf_status.reass && (h->ip_off & htons(IP_MF | IP_OFFMASK)))) { - /* With no scrub rules IPv4 fragment reassembly depends on the - * global switch. Fragments can be dropped early if reassembly - * is disabled. */ - REASON_SET(reason, PFRES_NORM); - goto drop; } /* Check for illegal packets */ @@ -1107,9 +1109,10 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, } /* Clear IP_DF if the rule uses the no-df option or we're in no-df mode */ - if ((((r && r->rule_flag & PFRULE_NODF) || - (V_pf_status.reass & PF_REASS_NODF)) && h->ip_off & htons(IP_DF) - )) { + if (((!scrub_compat && V_pf_status.reass & PF_REASS_NODF) || + (r != NULL && r->rule_flag & PFRULE_NODF)) && + (h->ip_off & htons(IP_DF)) + ) { u_int16_t ip_off = h->ip_off; h->ip_off &= htons(~IP_DF); @@ -1143,7 +1146,9 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, goto bad; } - if (r==NULL || !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) { + if ((!scrub_compat && V_pf_status.reass) || + (r != NULL && !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) + ) { max = fragoff + ip_len; /* Fully buffer all of the fragments @@ -1203,14 +1208,20 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, int ooff; u_int8_t proto; int terminal; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * XXX: Fragment reassembly always performed for IPv6! + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1235,7 +1246,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv6 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index af5b84e34c67..1abf4f609832 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -82,17 +82,29 @@ def prepare_ipv4(dst_address, send_params): def send_icmp_ping(dst_address, sendif, send_params): send_length = send_params['length'] + send_frag_length = send_params['frag_length'] + packets = [] ether = sp.Ether() if ':' in dst_address: ip6 = prepare_ipv6(dst_address, send_params) icmp = sp.ICMPv6EchoRequest(data=sp.raw(build_payload(send_length))) - req = ether / ip6 / icmp + if send_frag_length: + for packet in sp.fragment(ip6 / icmp, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip6 / icmp) + else: ip = prepare_ipv4(dst_address, send_params) icmp = sp.ICMP(type='echo-request') raw = sp.raw(build_payload(send_length)) - req = ether / ip / icmp / raw - sp.sendp(req, sendif, verbose=False) + if send_frag_length: + for packet in sp.fragment(ip / icmp / raw, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip / icmp / raw) + for packet in packets: + sp.sendp(packet, sendif, verbose=False) def send_tcp_syn(dst_address, sendif, send_params): @@ -372,7 +384,7 @@ def check_tcp_syn_reply(expect_params, packet): return check_tcp_syn_reply_4(expect_params, packet) -def setup_sniffer(recvif, ping_type, sniff_type, expect_params): +def setup_sniffer(recvif, ping_type, sniff_type, expect_params, defrag): if ping_type == 'icmp' and sniff_type == 'request': checkfn = check_ping_request elif ping_type == 'icmp' and sniff_type == 'reply': @@ -384,7 +396,7 @@ def setup_sniffer(recvif, ping_type, sniff_type, expect_params): else: raise Exception('Unspported ping or sniff type') - return Sniffer(expect_params, checkfn, recvif) + return Sniffer(expect_params, checkfn, recvif, defrag=defrag) def parse_args(): @@ -417,6 +429,8 @@ def parse_args(): parser_send = parser.add_argument_group('Values set in transmitted packets') parser_send.add_argument('--send-flags', nargs=1, type=str, help='IPv4 fragmentation flags') + parser_send.add_argument('--send-frag-length', nargs=1, type=int, + help='Force IP fragmentation with given fragment length') parser_send.add_argument('--send-hlim', nargs=1, type=int, help='IPv6 Hop Limit or IPv4 Time To Live') parser_send.add_argument('--send-mss', nargs=1, type=int, @@ -428,7 +442,7 @@ def parse_args(): parser_send.add_argument('--send-tc', nargs=1, type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', - help='Include unaligned TCP options') + help='Include unaligned TCP options') # Expectations parser_expect = parser.add_argument_group('Values expected in sniffed packets') @@ -467,7 +481,7 @@ def main(): # Standardize parameters which have nargs=1. send_params = {} expect_params = {} - for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc'): + for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'frag_length'): param_arg = vars(args).get(f'send_{param_name}') send_params[param_name] = param_arg[0] if param_arg else None param_arg = vars(args).get(f'expect_{param_name}') @@ -488,6 +502,11 @@ def main(): sniffers = [] + if send_params['frag_length']: + defrag = True + else: + defrag = False + if recv_ifs: sniffer_params = copy(expect_params) sniffer_params['src_address'] = None @@ -495,7 +514,8 @@ def main(): for iface in recv_ifs: LOGGER.debug(f'Installing receive sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'request', sniffer_params, + setup_sniffer(iface, args.ping_type, 'request', + sniffer_params, defrag, )) if reply_ifs: @@ -505,7 +525,8 @@ def main(): for iface in reply_ifs: LOGGER.debug(f'Installing reply sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'reply', sniffer_params, + setup_sniffer(iface, args.ping_type, 'reply', + sniffer_params, defrag, )) LOGGER.debug(f'Installed {len(sniffers)} sniffers') diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py index ab3ddc0aea3c..14305a37278c 100644 --- a/tests/sys/netpfil/common/sniffer.py +++ b/tests/sys/netpfil/common/sniffer.py @@ -30,7 +30,7 @@ import scapy.all as sp import sys class Sniffer(threading.Thread): - def __init__(self, args, check_function, recvif, timeout=3): + def __init__(self, args, check_function, recvif, timeout=3, defrag=False): threading.Thread.__init__(self) self._sem = threading.Semaphore(0) @@ -38,6 +38,7 @@ class Sniffer(threading.Thread): self._timeout = timeout self._recvif = recvif self._check_function = check_function + self._defrag = defrag self.correctPackets = 0 self.start() @@ -55,6 +56,15 @@ class Sniffer(threading.Thread): def run(self): self.packets = [] - self.packets = sp.sniff(iface=self._recvif, - stop_filter=self._checkPacket, timeout=self._timeout, - started_callback=self._startedCb) + if self._defrag: + # With fragment reassembly we can't stop the sniffer after catching + # the good packets, as those have not been reassembled. We must + # wait for sniffer to finish and check returned packets instead. + self.packets = sp.sniff(session=sp.IPSession, iface=self._recvif, + timeout=self._timeout, started_callback=self._startedCb) + for p in self.packets: + self._checkPacket(p) + else: + self.packets = sp.sniff(iface=self._recvif, + stop_filter=self._checkPacket, timeout=self._timeout, + started_callback=self._startedCb) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index d3b187789685..1083f89a5502 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_SH+= altq \ forward \ fragmentation_compat \ fragmentation_pass \ + fragmentation_no_reassembly \ get_state \ icmp \ killstate \ diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index f66ebbad6b33..21ce6b734ea1 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -300,17 +300,6 @@ reassemble_body() atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 jexec alcatraz pfctl -e - pft_set_rules alcatraz \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Single fragment passes - atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 - - # But a fragmented ping does not - atf_check -s exit:2 -o ignore ping -c 1 -s 2000 192.0.2.2 - pft_set_rules alcatraz \ "scrub in" \ "pass out" \ diff --git a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh new file mode 100644 index 000000000000..fb5c15ac2ff8 --- /dev/null +++ b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh @@ -0,0 +1,130 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2017 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "match_full_v4" "cleanup" +match_full_v4_head() +{ + atf_set descr 'Matching non-fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_full_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only non-fragmented packets are passed + jexec router pfctl -e + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + ping_dummy_check_request exit:0 --ping-type=icmp + ping_dummy_check_request exit:1 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_full_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "match_fragment_v4" "cleanup" +match_fragment_v4_head() +{ + atf_set descr 'Matching fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_fragment_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only fragmented packets are passed + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_fragment_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "compat_override_v4" "cleanup" +compat_override_v4_head() +{ + atf_set descr 'Scrub rules override "set reassemble" for IPv4' + atf_set require.user root + atf_set require.progs scapy +} + +compat_override_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # The same as match_fragment_v4 but with "set reassemble yes" which + # is ignored because of presence of scrub rules. + # Only fragmented packets are passed. + pft_set_rules router \ + "set reassemble yes" \ + "no scrub" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +compat_override_v4_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "match_full_v4" + atf_add_test_case "match_fragment_v4" + atf_add_test_case "compat_override_v4" +} From nobody Wed Apr 24 22:14:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtZq5PQhz5JDdl; Wed, 24 Apr 2024 22:14: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 4VPtZq4tCHz4dNl; Wed, 24 Apr 2024 22:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbwcMY7oJ0dr8cBa23TzWJ/HP1YAC2DcqYTjaLeorZ4=; b=FFQ/ZbLEngbGcB7Kf7kZ5R9u4kRKHhqnXxTH/Nj8rZFsUxpHLQN7s/KxYuV/12jNG6nUVm fJ9uCuj8s2C064xvLsO1V+Tvmn8eiuSOXVRtIH/46+hmC+u2sym0R2JHvCY8a7aFIqspdq y6FgxQR5AKK9IdQid84D+0ASMbeDHPF6mB3/Jvn9JVklvTJozK91B2f99Gh8PoPD3OX9c7 3BZLPJgHeWkm0N1Psd/jki7J9LRt/H2nyPzTxsFNHOsetpOigak4upInVkheKgNWhm0CoI LsWwGcnQRkjArZdXEFDhxOjEkwCvUYXOEIGzmc56qnG+12K9Xm5UXyHc2F336Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996899; a=rsa-sha256; cv=none; b=I1CBAyor/rGxok85H2cMeRjZ1U+YTj9eEKOtOEoeIRYe3WA1GFCa5o/+hKPCBFh0Tz3dtk mCcIKV9uG8G8eido6+B5Jfevxsvb3oR/K+ShqWaY1RqRFVVYSv9wzzrRy+Zakb9usJnoA5 zqT5GRuVA7uCk3HVS0RJ/lX35Zns11H6P5RBylaWqSMHR5pnGbkltnK3FQ5S//MTvFwy9l rwGBy6t9utp9JocHoJaNS9F7CaPOyymi5XGyfSoTp9t2Wm9z4dbhfPoj7bUrvPUvPU5q8o 4bHTdybU3y0++W307Ypq6ZpWSrE2guoh/4C7wRKTOwwJFyK0OSgMhU5OwlLcZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbwcMY7oJ0dr8cBa23TzWJ/HP1YAC2DcqYTjaLeorZ4=; b=dr4xbiuyWpJdsMF5vKw5gTt+9yhRkLoMl3crDrOzTQtgHMJkcYoNn5aiP+ril3Tg8hfwNY nacH0w70XVv6aQUG/bNJEamBcBJZhxboIW1P7yq5XTKtgedi75ok640k93wz8KtIuiQUMj SUdlZzkRczXVAGqOBGK4LYKCLercejTzVW8jcsxM6TxCym4z4YoPYY+iYgh2NdFmYKjVIr fMFZXhOc5KXHPr7rK4zLddDcdkhkPXomm028sFTXcSd8MzQx4qWDi/Pcfqt5A+m5JqTFsI B7pUePSsj1q+T0mO9+fPhU8VxBR47Xsl5FJoNmhvtX19Iaha86mdKLURvEH0qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZq4TWTzYvT; Wed, 24 Apr 2024 22:14: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 43OMExtE071293; Wed, 24 Apr 2024 22:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMExmi071290; Wed, 24 Apr 2024 22:14:59 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:14:59 GMT Message-Id: <202404242214.43OMExmi071290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: ff28ca091142 - stable/14 - iflib: Add sysctl to request extra MSIX vectors on driver load List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff28ca091142538330b3469be7c9af678db65107 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff28ca091142538330b3469be7c9af678db65107 commit ff28ca091142538330b3469be7c9af678db65107 Author: Eric Joyner AuthorDate: 2023-03-22 19:18:44 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 iflib: Add sysctl to request extra MSIX vectors on driver load Intended to be used with upcoming feature to add sub-interfaces, since those new interfaces will be dynamically created and will need to have spare MSI-X interrupts already allocated for them on driver load. This sysctl is marked as a tunable since it will need to be set before the driver is loaded since MSI-X interrupt allocation and setup is done during the attach process. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41326 (cherry picked from commit 3c7da27a473e339392121404e06c506df040c16f) --- sys/net/iflib.c | 14 ++++++++++++++ sys/net/iflib.h | 1 + 2 files changed, 15 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 999a86fabc79..ac27450480c9 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -194,6 +194,7 @@ struct iflib_ctx { #define CORE_OFFSET_UNSPECIFIED 0xffff uint8_t ifc_sysctl_separate_txrx; uint8_t ifc_sysctl_use_logical_cores; + uint16_t ifc_sysctl_extra_msix_vectors; bool ifc_cpus_are_physical_cores; qidx_t ifc_sysctl_ntxds[8]; @@ -264,6 +265,13 @@ iflib_get_sctx(if_ctx_t ctx) return (ctx->ifc_sctx); } +uint16_t +iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx) +{ + + return (ctx->ifc_sysctl_extra_msix_vectors); +} + #define IP_ALIGNED(m) ((((uintptr_t)(m)->m_data) & 0x3) == 0x2) #define CACHE_PTR_INCREMENT (CACHE_LINE_SIZE/sizeof(void*)) #define CACHE_PTR_NEXT(ptr) ((void *)(((uintptr_t)(ptr)+CACHE_LINE_SIZE-1) & (CACHE_LINE_SIZE-1))) @@ -6802,6 +6810,12 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores", CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, "try to make use of logical cores for TX and RX"); + SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "use_extra_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_sysctl_extra_msix_vectors, 0, + "attempt to reserve the given number of extra MSI-X vectors during driver load for the creation of additional interfaces later"); + SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "allocated_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_softc_ctx.isc_vectors, 0, + "total # of MSI-X vectors allocated by driver"); /* XXX change for per-queue sizes */ SYSCTL_ADD_PROC(ctx_list, oid_list, OID_AUTO, "override_ntxds", diff --git a/sys/net/iflib.h b/sys/net/iflib.h index b16e2805aab6..5e1adccf202c 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -489,5 +489,6 @@ 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); +uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); #endif /* __IFLIB_H_ */ From nobody Wed Apr 24 22:15:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtZr6hRzz5JDn5; Wed, 24 Apr 2024 22:15: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 4VPtZr69Knz4dNm; Wed, 24 Apr 2024 22:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4BWpbxH2Y30/lYOc55WOXPunD7/JhQLMBH0Tri2w6Y=; b=jHiT4Laij3KJPQ1kDN8owkLYGavSGcNnwGN16Y1+4lohktcDq0INuQGFEJhXLU4+/D87fG Xt+W2lduTbtQCuURhvR2TeBdEwb2dKeXxsTBqEXsFBSEh1fPBreOHNGl52w6tTpJ8Mfn8l NWerDjub5807CHtUu5Y3hQkXlQIl6z/HjJeGVCeQTXDas1h5m6jdp3RA0A07Y+r+h3hnbS 9U5h9bLYO7uMnKNL2Zyy44RepVMKsTK3hTSG+Cq7stxMbtjPVjLAYRWL30/Xrsr5w2cVGe pVZc9UtIp3g5g9GhJ/31rLKv/M0Aeg4c9Z+vBInYbS4KCOPnZoAv+CWhlT/7Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996900; a=rsa-sha256; cv=none; b=GGLWy2YA6NrOk9gg3Y7WVAVwteqpVv0z8PohAbhrstnlakkLbAWT7THY1f5Nz0oKtAYfJQ KVkKBppPteFREuZKg8cfObClm49L+j+h0YHYzviVGpu5SN3WNTKCXkvChniX6iWHMOujT7 p2FFUQxzMZYk/smNPn17Pgzxz+vM2DkJzk8FKA3weQ5TH2omx5HJfVTq1tWRoewqQfMpA9 GAnTV45ELHVexsNysMvIJlBm34Zth/rLefv/As2Rh4egUwuOpr1IZzFzIB4dF8rVy9B2MD u45b2itq4OAipxD+ZEi7GFkx1NV8ygeyVKPhORCMpiNYCHkAPuR+nfexcuQmiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4BWpbxH2Y30/lYOc55WOXPunD7/JhQLMBH0Tri2w6Y=; b=SJ87BRNtTl3mbnOLVEYhAzlxerI94O4Y436hfIsmCwL8Wa8ncWHRSEep0i5UPOwb7AEO/a qSL2xlWyh1bQt6wC86pYtwVk61oKlmp+Dj+B3meAJQdIlJCzwS/qjX4gL+naRLyQI+DS13 3vu9HRWOAzORlwcoAEnPldgltPt08XObLQd2YWW0x9jzRsq18TMX+DcM+saoGrA+Eh5097 WiVPEEC951HbgmFauZtqI6MMS6Rd6RwCpKXJ0Kjxy/Z6OwpeJZilxaPjDoQ4bvd99WBLyH d65FEBrc9y2gehTvujF3iarGuCQmnqwYSEpfcwhESONXSbMlbRQfg5M+FCmciA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZr5nD6zYZb; Wed, 24 Apr 2024 22:15: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 43OMF0s4071360; Wed, 24 Apr 2024 22:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF09D071357; Wed, 24 Apr 2024 22:15:00 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:00 GMT Message-Id: <202404242215.43OMF09D071357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 59d1c385f681 - stable/14 - iflib: Add subinterface interrupt allocation function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59d1c385f68168052d2f62717ec2b89b29df17d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=59d1c385f68168052d2f62717ec2b89b29df17d8 commit 59d1c385f68168052d2f62717ec2b89b29df17d8 Author: Eric Joyner AuthorDate: 2023-01-18 00:46:39 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 iflib: Add subinterface interrupt allocation function The ice(4) driver will add the ability to create extra interfaces that hang off of the base interface; to do that the driver requires a method for the subinterface to request hardware interrupt resources from the base interface. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39930 (cherry picked from commit ed34a6b6eab9ea39759ccd3f12876a815d271929) --- sys/net/iflib.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- sys/net/iflib.h | 12 +++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index ac27450480c9..01493e90f6bb 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1467,8 +1467,8 @@ iflib_dma_alloc_align(if_ctx_t ctx, int size, int align, iflib_dma_info_t dma, i &dma->idi_tag); if (err) { device_printf(dev, - "%s: bus_dma_tag_create failed: %d\n", - __func__, err); + "%s: bus_dma_tag_create failed: %d (size=%d, align=%d)\n", + __func__, err, size, align); goto fail_0; } @@ -6197,6 +6197,81 @@ iflib_irq_set_affinity(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, return (0); } +/* + * Allocate a hardware interrupt for subctx using the parent (ctx)'s hardware + * resources. + * + * Similar to iflib_irq_alloc_generic(), but for interrupt type IFLIB_INTR_RXTX + * only. + * + * XXX: Could be removed if subctx's dev has its intr resource allocation + * methods replaced with custom ones? + */ +int +iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name) +{ + device_t dev, subdev; + struct grouptask *gtask; + struct taskqgroup *tqg; + iflib_filter_info_t info; + gtask_fn_t *fn; + int tqrid, err; + driver_filter_t *intr_fast; + void *q; + + MPASS(ctx != NULL); + MPASS(subctx != NULL); + + tqrid = rid; + dev = ctx->ifc_dev; + subdev = subctx->ifc_dev; + + switch (type) { + case IFLIB_INTR_RXTX: + q = &subctx->ifc_rxqs[qid]; + info = &subctx->ifc_rxqs[qid].ifr_filter_info; + gtask = &subctx->ifc_rxqs[qid].ifr_task; + tqg = qgroup_if_io_tqg; + fn = _task_fn_rx; + intr_fast = iflib_fast_intr_rxtx; + NET_GROUPTASK_INIT(gtask, 0, fn, q); + break; + default: + device_printf(dev, "%s: unknown net intr type for subctx %s (%d)\n", + __func__, device_get_nameunit(subdev), type); + return (EINVAL); + } + + info->ifi_filter = filter; + info->ifi_filter_arg = filter_arg; + info->ifi_task = gtask; + info->ifi_ctx = q; + + NET_GROUPTASK_INIT(gtask, 0, fn, q); + + /* Allocate interrupts from hardware using parent context */ + err = _iflib_irq_alloc(ctx, irq, rid, intr_fast, NULL, info, name); + if (err != 0) { + device_printf(dev, "_iflib_irq_alloc failed for subctx %s: %d\n", + device_get_nameunit(subdev), err); + return (err); + } + + if (tqrid != -1) { + err = iflib_irq_set_affinity(ctx, irq, type, qid, gtask, tqg, q, + name); + if (err) + return (err); + } else { + taskqgroup_attach(tqg, gtask, q, dev, irq->ii_res, name); + } + + return (0); +} + int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 5e1adccf202c..bf40c7429fb8 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -393,6 +393,11 @@ typedef enum { * function. */ #define IFLIB_FEATURE_QUEUE_SELECT_V2 1400073 +/* + * Driver can create subinterfaces with their own Tx/Rx queues + * that all share a single device (or commonly, port) + */ +#define IFLIB_FEATURE_SUB_INTERFACES 1500014 /* * These enum values are used in iflib_needs_restart to indicate to iflib @@ -491,4 +496,11 @@ void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); +/* + * Sub-interface support + */ +int iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name); #endif /* __IFLIB_H_ */ From nobody Wed Apr 24 22:15:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtZt1SqPz5JDdm; Wed, 24 Apr 2024 22:15: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 4VPtZt0Cjcz4dNq; Wed, 24 Apr 2024 22:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNNcOWXnEgyJJ2fy4pdslgUNHa6X1XlWJin8MzfecA=; b=KtD5TdMDHuzl3g6EGArJY45/tODlR5r8NS/srBbufb9LnI/tkk2964sTPd/1zIPU1ryZUk rCZ6I3tg8nkijrCubH1O733smPMUzHgkJPpSmmnqUYMkLZ73jMwDq1WXJmKi41U3YD8WsF THP4333gZsV85Dz618bUGw1jxMrUjrSzfiBZxwH+8kFeqM3CxE/ILfW8UrI0lhP8AzmRYQ wkwvzwf7yyjY5miZGLhwHi+SMzuZiXP8wV/g9TnRbZqKGudj6xJZKTr+Ym4ZbBQT8bvr1p EjAdu4HF1yQ6nxH6QTBbPURBEI8dgXPFpp2+qSln/8HlR70gJoTddvBY13ERjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996902; a=rsa-sha256; cv=none; b=jJCTNQ5g6oYRRqO1JWZocP+AoqIkddqI068SADLMNcM/yc2u4h0bG8gTEsuoXwHUVbZnpL NIE7TcC3lhA8wzPIQnCDBCb6ddWgtrBZP819/wEL7dOdy0WfDSwCMTGWPHt/w1HgfO9Qo2 igjVwsqUcW+RsEuDcCO+zC24nMI1fWAjZCfVheKkT1HNvtoqLVivdt6vnZ7rm3yVc9eY5q CXleyIg1INCsuT3nqu8rYnmuB/x4M8afQ3yEVZHK0ZYA1Oh+OQST40U2/NWYSQA6xGlzCL 8hMOih3NjGkXi9Cid44gcbYiPTic2BEcyBsXrPwBbniqrYkUprFGe5MZBF5/Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNNcOWXnEgyJJ2fy4pdslgUNHa6X1XlWJin8MzfecA=; b=JZMt/tmksM3HrNSrR0WRzGANTqhZPtq1i0TONRbDu+qs4aunTwcCRb91WBl/g3Lopg1lff PQ+zdAt8tamXs5qyiseDWqpJW8duN7hApOed3/f4cVnoB4eVnCXFMwc9u0ZnmxvLXEgri6 7oP5NR4E6lIailc7TkWSGNqUptsfdQeBUnbwqaA9ecYQ73n4iif6gyQvuuU6dEirhpNaGO wHFKIBSp037Tsy58vBXM3Bjzf/IGPjucg+kU7MrI4RMwsIJ7v4RZotIB3RLWGUy8aXm9YH WFP0291+KMO0o7jOrzerEfCIKK4i2fVOkQ4JsRajHKXFkOeGryQU3530WPJIeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZs6xBwzYLZ; Wed, 24 Apr 2024 22: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 43OMF1xB071403; Wed, 24 Apr 2024 22: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 43OMF1E4071400; Wed, 24 Apr 2024 22:15:01 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:01 GMT Message-Id: <202404242215.43OMF1E4071400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: eafd6c26f95e - stable/14 - ice_ddp: Update package to 1.3.36.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 commit eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 Author: Eric Joyner AuthorDate: 2024-02-13 06:39:21 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice_ddp: Update package to 1.3.36.0 This is intended to be used with the upcoming ice 1.39.13-k driver update, but is still backwards compatible with previous versions of the driver. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation (cherry picked from commit 768329961dc0c041f7647f1c4549944a2ca168aa) --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 6 +++--- sys/conf/files.powerpc | 6 +++--- .../dev/ice/{ice-1.3.35.0.pkg => ice-1.3.36.0.pkg} | Bin 692776 -> 692776 bytes sys/modules/ice_ddp/Makefile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 5ef285b70c55..8a5e643913a3 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -196,7 +196,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -205,8 +205,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ioat/ioat.c optional ioat pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 218571d0e23a..fd59014ad461 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -322,7 +322,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -331,8 +331,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0293efd28fbe..1a0388884ee8 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -95,7 +95,7 @@ dev/ice/irdma_di_if.m optional ice pci powerpc64 | ice pci powerpc64le \ dev/ice/ice_ddp_common.c optional ice pci powerpc64 | ice pci powerpc64le \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp powerpc64 | ice pci powerpc64le \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ @@ -104,8 +104,8 @@ ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp powerpc64 | ice pci powerpc64le \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ixl/if_ixl.c optional ixl pci powerpc64 \ diff --git a/sys/contrib/dev/ice/ice-1.3.35.0.pkg b/sys/contrib/dev/ice/ice-1.3.36.0.pkg similarity index 98% rename from sys/contrib/dev/ice/ice-1.3.35.0.pkg rename to sys/contrib/dev/ice/ice-1.3.36.0.pkg index fc3e8ebc640f..ce5dbf41f557 100644 Binary files a/sys/contrib/dev/ice/ice-1.3.35.0.pkg and b/sys/contrib/dev/ice/ice-1.3.36.0.pkg differ diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index ad85bc2a9935..7329f0897325 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,5 +1,5 @@ KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.35.0.pkg:ice_ddp:0x01032300 +FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.36.0.pkg:ice_ddp:0x01032400 .include From nobody Wed Apr 24 22:15:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtZv33f2z5JDhk; Wed, 24 Apr 2024 22:15: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 4VPtZv1Vhkz4dGp; Wed, 24 Apr 2024 22:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkUTFnH7bZNRtx2g3O9ZfPpX4wFDOhbxc98r0pwQeP0=; b=KEh0bIG6I3AMggdl46FbsjuOeRWy8QZTdlrHYMdHKFafHPR+bp0QCv5LbsaDGSfFrYT1wo 6J28hNjvWMH0HOzELR2xnCYqAxZpoBhU5p3AP22gopxsfYD86m9kP0Ho8vBKibAUd6UFre 1rrxcXNssDeiRMZOSYXp7YDCsqS2GmtkpZh1NmwdAzeixfcGfyVH/TSBGOoBbAaEfHlqqj 15oP+kv7dX/d1N7oQPaV5W5PBp5o4TO+BL4gs6HAaiEjMsOb7vFgF3gdj9YatDVKiO5xxu Vs0Y+zMRCuzvc8q88LU0Zj6nzZCuETKOhmWINTCDlBMeHrFD4P266QTMZ0+Qhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996903; a=rsa-sha256; cv=none; b=SyGDv6K8plQnXDHZWSfyQhgatrOvW/Tsc9MCqSWN0V0rtWYOFnjwNFc+ClWItmlXpTkrz4 RxkbZXyYsBGr+uxo+VZga1Q7ugSYD85rZz9bO49pOwJ4MJe5bdXQ2V/7jYfX5rFi0t8f75 m581I/QYJWmubf+qbzUWSUO2+X+7HHhHjgDU6ILBIGXgHTN1RXmcszfgo/KtzNNZTWr6K2 jBdHWvP550tRefIqGRnMHEic4k7LAISO5WVp2TOM2Tw90oAcNyJjQTGChjsgQJ0jl+xmsM lW5+iCz+uJJ+0O0+0XzA3m2ry7vhr8QZLv+gUkkt9YcIHsPcvgvqaDwrQMDQ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkUTFnH7bZNRtx2g3O9ZfPpX4wFDOhbxc98r0pwQeP0=; b=gNki1rypvg6VgunCEeTyFt90hd/NWV5AnelRy17Na61KhjkiEWk3L64RwGPvfl2KwT2kcU tJBKpBLJNMRbdHlirgxvEEpm68/cT0mrsTEjGFksP7eqo6rbnlkhUMobaSB2uUJsBQJ081 6dlLNvidgr7dqT7Nx3k5ZMKXmUeg7Zfn6rvbJliYDUIBYEDFW/yj4ORhawp+RspL/hEmS6 8mDsqN7dabC0C1kamcpur+kOz04bEQK1zxK5xnxfgL3Ygx2h4mTjqzCuzXss0UlELH7qyK WuMzvAKfknanw28cd7e8KXogO6eScj6a0Ou1j1OQJUdXBkAgvOA2fumuNG08jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZv0vpFzYX5; Wed, 24 Apr 2024 22:15: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 43OMF3tl071456; Wed, 24 Apr 2024 22:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF3FR071453; Wed, 24 Apr 2024 22:15:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:03 GMT Message-Id: <202404242215.43OMF3FR071453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 988dd5a1f361 - stable/14 - ice(4): Update copyright year to 2024 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 commit 988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 Author: Eric Joyner AuthorDate: 2024-02-13 06:25:47 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice(4): Update copyright year to 2024 Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D44003 (cherry picked from commit 015f8cc5b0c10336a048f37a7071ea03516de242) --- sys/dev/ice/ice_adminq_cmd.h | 2 +- sys/dev/ice/ice_alloc.h | 2 +- sys/dev/ice/ice_bitops.h | 2 +- sys/dev/ice/ice_common.c | 2 +- sys/dev/ice/ice_common.h | 2 +- sys/dev/ice/ice_common_sysctls.h | 2 +- sys/dev/ice/ice_common_txrx.h | 2 +- sys/dev/ice/ice_controlq.c | 2 +- sys/dev/ice/ice_controlq.h | 2 +- sys/dev/ice/ice_dcb.c | 2 +- sys/dev/ice/ice_dcb.h | 2 +- sys/dev/ice/ice_ddp_common.c | 2 +- sys/dev/ice/ice_ddp_common.h | 2 +- sys/dev/ice/ice_defs.h | 2 +- sys/dev/ice/ice_drv_info.h | 2 +- sys/dev/ice/ice_features.h | 2 +- sys/dev/ice/ice_flex_pipe.c | 2 +- sys/dev/ice/ice_flex_pipe.h | 2 +- sys/dev/ice/ice_flex_type.h | 2 +- sys/dev/ice/ice_flow.c | 2 +- sys/dev/ice/ice_flow.h | 2 +- sys/dev/ice/ice_fw_logging.c | 2 +- sys/dev/ice/ice_fwlog.c | 2 +- sys/dev/ice/ice_fwlog.h | 2 +- sys/dev/ice/ice_hw_autogen.h | 2 +- sys/dev/ice/ice_iflib.h | 2 +- sys/dev/ice/ice_iflib_recovery_txrx.c | 2 +- sys/dev/ice/ice_iflib_sysctls.h | 2 +- sys/dev/ice/ice_iflib_txrx.c | 2 +- sys/dev/ice/ice_lan_tx_rx.h | 2 +- sys/dev/ice/ice_lib.c | 2 +- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/ice_nvm.c | 2 +- sys/dev/ice/ice_nvm.h | 2 +- sys/dev/ice/ice_opts.h | 2 +- sys/dev/ice/ice_osdep.c | 2 +- sys/dev/ice/ice_osdep.h | 2 +- sys/dev/ice/ice_protocol_type.h | 2 +- sys/dev/ice/ice_rdma.c | 2 +- sys/dev/ice/ice_rdma.h | 2 +- sys/dev/ice/ice_rdma_internal.h | 2 +- sys/dev/ice/ice_resmgr.c | 2 +- sys/dev/ice/ice_resmgr.h | 2 +- sys/dev/ice/ice_rss.h | 2 +- sys/dev/ice/ice_sched.c | 2 +- sys/dev/ice/ice_sched.h | 2 +- sys/dev/ice/ice_status.h | 2 +- sys/dev/ice/ice_strings.c | 2 +- sys/dev/ice/ice_switch.c | 2 +- sys/dev/ice/ice_switch.h | 2 +- sys/dev/ice/ice_type.h | 2 +- sys/dev/ice/ice_vlan_mode.c | 2 +- sys/dev/ice/ice_vlan_mode.h | 2 +- sys/dev/ice/if_ice_iflib.c | 2 +- sys/dev/ice/irdma_di_if.m | 2 +- sys/dev/ice/irdma_if.m | 2 +- sys/dev/ice/virtchnl.h | 2 +- sys/dev/ice/virtchnl_inline_ipsec.h | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index e4dc14b0162c..31e9583494fc 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_alloc.h b/sys/dev/ice/ice_alloc.h index 4970fae3bcf7..90946143091a 100644 --- a/sys/dev/ice/ice_alloc.h +++ b/sys/dev/ice/ice_alloc.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index 9c20106b994a..c7bf3384675e 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 0df73583e137..73249cb7add4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 3d96792cf56f..024f6f4cdb01 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_sysctls.h b/sys/dev/ice/ice_common_sysctls.h index 3ff004152784..37a50296ea81 100644 --- a/sys/dev/ice/ice_common_sysctls.h +++ b/sys/dev/ice/ice_common_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_txrx.h b/sys/dev/ice/ice_common_txrx.h index 4a4d2fc948ed..865c1d27da44 100644 --- a/sys/dev/ice/ice_common_txrx.h +++ b/sys/dev/ice/ice_common_txrx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 6568be2d9748..09816d4a812a 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index b32c753d14c5..047dd1beaf60 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.c b/sys/dev/ice/ice_dcb.c index deb1505fa01c..a06117f90aad 100644 --- a/sys/dev/ice/ice_dcb.c +++ b/sys/dev/ice/ice_dcb.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.h b/sys/dev/ice/ice_dcb.h index 10c8c3cda9e9..ec2200afe200 100644 --- a/sys/dev/ice/ice_dcb.h +++ b/sys/dev/ice/ice_dcb.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.c b/sys/dev/ice/ice_ddp_common.c index 95e65317a4f2..a1573f5ea998 100644 --- a/sys/dev/ice/ice_ddp_common.c +++ b/sys/dev/ice/ice_ddp_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.h b/sys/dev/ice/ice_ddp_common.h index 10f6665d2b12..9305dc83520d 100644 --- a/sys/dev/ice/ice_ddp_common.h +++ b/sys/dev/ice/ice_ddp_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_defs.h b/sys/dev/ice/ice_defs.h index 3b96f9e0bf7c..e9f5192bed9f 100644 --- a/sys/dev/ice/ice_defs.h +++ b/sys/dev/ice/ice_defs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 41598923dc94..ff13fe99ee27 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index c259684df4fc..b58af574976d 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index fc31afab9e79..943b37746f9d 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.h b/sys/dev/ice/ice_flex_pipe.h index 16f9334daa83..559905e7fb59 100644 --- a/sys/dev/ice/ice_flex_pipe.h +++ b/sys/dev/ice/ice_flex_pipe.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_type.h b/sys/dev/ice/ice_flex_type.h index 5baa694ebda7..9c8f7b462677 100644 --- a/sys/dev/ice/ice_flex_type.h +++ b/sys/dev/ice/ice_flex_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index a45bb0408b9d..0cf37159b251 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index c6e272b4dd6b..0857b325ca7c 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c index 57445cc89056..a8caf65aca6d 100644 --- a/sys/dev/ice/ice_fw_logging.c +++ b/sys/dev/ice/ice_fw_logging.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.c b/sys/dev/ice/ice_fwlog.c index b66860f67cf5..c3c6d9101627 100644 --- a/sys/dev/ice/ice_fwlog.c +++ b/sys/dev/ice/ice_fwlog.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.h b/sys/dev/ice/ice_fwlog.h index 0aa7db9a8339..41e41de1e670 100644 --- a/sys/dev/ice/ice_fwlog.h +++ b/sys/dev/ice/ice_fwlog.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 36d13eb22f52..6b04bff4b722 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index d89d04985429..e9e09851b82c 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_recovery_txrx.c b/sys/dev/ice/ice_iflib_recovery_txrx.c index 69ee98b46d35..dd90ffb8f21a 100644 --- a/sys/dev/ice/ice_iflib_recovery_txrx.c +++ b/sys/dev/ice/ice_iflib_recovery_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_sysctls.h b/sys/dev/ice/ice_iflib_sysctls.h index 1eac7249447e..a718f5d12943 100644 --- a/sys/dev/ice/ice_iflib_sysctls.h +++ b/sys/dev/ice/ice_iflib_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index b74ab610327e..f3087c09702a 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h index 415565b4e99d..860958bffbaf 100644 --- a/sys/dev/ice/ice_lan_tx_rx.h +++ b/sys/dev/ice/ice_lan_tx_rx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 7dcce35b072b..114d2a319669 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index c07b9458db1f..fd8c8881cdbd 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.c b/sys/dev/ice/ice_nvm.c index 42a60e0df1c8..91393c1fc8b3 100644 --- a/sys/dev/ice/ice_nvm.c +++ b/sys/dev/ice/ice_nvm.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.h b/sys/dev/ice/ice_nvm.h index d359a9ea4e4e..32f791f63102 100644 --- a/sys/dev/ice/ice_nvm.h +++ b/sys/dev/ice/ice_nvm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_opts.h b/sys/dev/ice/ice_opts.h index 4b11f277debe..479ead0dc41e 100644 --- a/sys/dev/ice/ice_opts.h +++ b/sys/dev/ice/ice_opts.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c index c9ac8e9f97c9..88b4984c290f 100644 --- a/sys/dev/ice/ice_osdep.c +++ b/sys/dev/ice/ice_osdep.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.h b/sys/dev/ice/ice_osdep.h index c6774588bdaa..ea355ddb31f4 100644 --- a/sys/dev/ice/ice_osdep.h +++ b/sys/dev/ice/ice_osdep.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h index 0793eb005eca..ced1bc5037dd 100644 --- a/sys/dev/ice/ice_protocol_type.h +++ b/sys/dev/ice/ice_protocol_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.c b/sys/dev/ice/ice_rdma.c index a614ee500c10..3fe12cec7adc 100644 --- a/sys/dev/ice/ice_rdma.c +++ b/sys/dev/ice/ice_rdma.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.h b/sys/dev/ice/ice_rdma.h index 6d818f84b6cf..68aa2f2099e7 100644 --- a/sys/dev/ice/ice_rdma.h +++ b/sys/dev/ice/ice_rdma.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma_internal.h b/sys/dev/ice/ice_rdma_internal.h index 20718973af5d..c2ff8757c8c2 100644 --- a/sys/dev/ice/ice_rdma_internal.h +++ b/sys/dev/ice/ice_rdma_internal.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.c b/sys/dev/ice/ice_resmgr.c index 547d6035e2bb..824b986fff57 100644 --- a/sys/dev/ice/ice_resmgr.c +++ b/sys/dev/ice/ice_resmgr.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.h b/sys/dev/ice/ice_resmgr.h index eef028df4700..0869f5c5654c 100644 --- a/sys/dev/ice/ice_resmgr.h +++ b/sys/dev/ice/ice_resmgr.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h index 0b79bea6f30b..ede1fad5abe7 100644 --- a/sys/dev/ice/ice_rss.h +++ b/sys/dev/ice/ice_rss.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.c b/sys/dev/ice/ice_sched.c index 49a8415132cb..ed9432292c0c 100644 --- a/sys/dev/ice/ice_sched.c +++ b/sys/dev/ice/ice_sched.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.h b/sys/dev/ice/ice_sched.h index 4d9a4480fe58..490a7719a960 100644 --- a/sys/dev/ice/ice_sched.h +++ b/sys/dev/ice/ice_sched.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_status.h b/sys/dev/ice/ice_status.h index 48c8264c4bc5..016d987bac36 100644 --- a/sys/dev/ice/ice_status.h +++ b/sys/dev/ice/ice_status.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_strings.c b/sys/dev/ice/ice_strings.c index 16a1f9a34d56..7feaef163ef6 100644 --- a/sys/dev/ice/ice_strings.c +++ b/sys/dev/ice/ice_strings.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.c b/sys/dev/ice/ice_switch.c index dfa2368e2bee..44be3999d3de 100644 --- a/sys/dev/ice/ice_switch.c +++ b/sys/dev/ice/ice_switch.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.h b/sys/dev/ice/ice_switch.h index e5b0239d491b..70b5df769175 100644 --- a/sys/dev/ice/ice_switch.h +++ b/sys/dev/ice/ice_switch.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_type.h b/sys/dev/ice/ice_type.h index b7bab6a21a20..e153a772f746 100644 --- a/sys/dev/ice/ice_type.h +++ b/sys/dev/ice/ice_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.c b/sys/dev/ice/ice_vlan_mode.c index 9b298a6ad71a..e0c6d7897607 100644 --- a/sys/dev/ice/ice_vlan_mode.c +++ b/sys/dev/ice/ice_vlan_mode.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.h b/sys/dev/ice/ice_vlan_mode.h index 1cf4ebb68798..8b1a56c98a3d 100644 --- a/sys/dev/ice/ice_vlan_mode.h +++ b/sys/dev/ice/ice_vlan_mode.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index e43c05081098..fb710d078b42 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_di_if.m b/sys/dev/ice/irdma_di_if.m index 55564d554c12..61a1817925a2 100644 --- a/sys/dev/ice/irdma_di_if.m +++ b/sys/dev/ice/irdma_di_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_if.m b/sys/dev/ice/irdma_if.m index a78a4b05f7d2..d3aa68bcdf46 100644 --- a/sys/dev/ice/irdma_if.m +++ b/sys/dev/ice/irdma_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl.h b/sys/dev/ice/virtchnl.h index da281bfa366b..d7a1d3f254bf 100644 --- a/sys/dev/ice/virtchnl.h +++ b/sys/dev/ice/virtchnl.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl_inline_ipsec.h b/sys/dev/ice/virtchnl_inline_ipsec.h index ad8cfc1dcebb..adcd9f34c00f 100644 --- a/sys/dev/ice/virtchnl_inline_ipsec.h +++ b/sys/dev/ice/virtchnl_inline_ipsec.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without From nobody Wed Apr 24 22:15:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPtZw6qwNz5JDdq; Wed, 24 Apr 2024 22:15: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 4VPtZw2RCdz4dPP; Wed, 24 Apr 2024 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPeIGcF7R20giSt9fQWhf0D+GJJ2MN101s46Fpg4pxI=; b=CTjRPommyMcI5nYfzIWUoH4/rnZIbz0pQzXbXQ3CcwclKeyUYAQda6tZOERRz5ZyTK6Pu0 tUIEZlwXqLimc11I/JiC7pxLomqN6Hs+Rla4plvijRRrATmJf0EG03rittJc+r4aB8KHND Y8rk16k8rL2aq7Xm2zgOVUUHwxhjYEoTGrqFgon2oFyx/GWI+END7OZmjnDEQLLQNzcOCf HD60MLO1Y2Y+KQZbu0tQqM32VsSAvbGd5WPPblgPt66mogg1QQ/Xev2Zsw2k36S3cJFKm1 ILhW7u2kHjGLsZaxLx1qcKrOqSjUAiht0rVmb7zriR/13GLjMCfbGCiMpEgtYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996904; a=rsa-sha256; cv=none; b=Ag2F7yTk3pFkbgv3Q/a3HXXn4rRnbVjaoSqZDHeOqfqIXcYcB8Q4jlG3LgZVJdawNxJZAI 7Rk7vdohkxPBqDrqVYAm6W/6TpExyOss3MFaV8GKnC/XLoKL0BAjSbR3QBEdf5OFcR6wlA zAbpkgpzVAZEXXUE2vVC21vc9ay2VoqIQgizTUO9LhueqIivE0tqJjnyzqSot0kgUJfN4u v9dl41xE0QYTIt90v43fw8vsteVDAdKi5QHsuctrSVxmQKJE5DNMbomY51I46mN8Ha+ig/ hIyRBpUteSmMxee9BHh6uhTUyFXzXUtMQTzj7Z1sx2aRsQPK+WFki0eyKTkHmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPeIGcF7R20giSt9fQWhf0D+GJJ2MN101s46Fpg4pxI=; b=kqDxUqn6Fot4MCcQCCc8eXzG0uoUaVH/hV+OZXBIDCG1tEj4ATx6dFRY3fYIfvY5bX75o6 rT3mYnVo4nkmB+0/+EQovQcFMms+Ynh2NjTiVjGGANzFhBlw3jxvTYVOfKNuFxrR4Jat7D vTckUH0VNoOQ+FEnqpUtvv2JX+f2Cq0mEe+Pt88jU6gjZtfPgl4D5nbz5oJPLMhhzDSQM6 gXbsWwDrrS7pi13oxGO8sGWVALlChfpzNpEelsztXBeXE74ryzaAaSSc2jAseSZMV/X+xR 1u/O7TEcgKdLGRGgffdHHh0w2qq/Cb+J+z1QaOOwmCz5F5UwSozWW2t5qIbm1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZw20TGzYdh; Wed, 24 Apr 2024 22:15: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 43OMF4EP071500; Wed, 24 Apr 2024 22:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF44r071497; Wed, 24 Apr 2024 22:15:04 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:04 GMT Message-Id: <202404242215.43OMF44r071497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: f6de0a7c94e9 - stable/14 - ice(4): Update to 1.39.13-k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 commit f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 Author: Eric Joyner AuthorDate: 2024-02-13 06:26:26 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice(4): Update to 1.39.13-k - Adds mirror interface functionality - Remove unused virtchnl headers Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Tested by: jeffrey.e.pieper@intel.com Differential Revision: https://reviews.freebsd.org/D44004 (cherry picked from commit 9e54973fc33aa44b77d1c851cb36fcd82dc44cda) --- sys/dev/ice/ice_adminq_cmd.h | 21 +- sys/dev/ice/ice_bitops.h | 4 +- sys/dev/ice/ice_common.c | 43 +- sys/dev/ice/ice_common.h | 8 +- sys/dev/ice/ice_controlq.c | 10 +- sys/dev/ice/ice_controlq.h | 3 +- sys/dev/ice/ice_drv_info.h | 10 +- sys/dev/ice/ice_features.h | 1 - sys/dev/ice/ice_flex_pipe.c | 1 + sys/dev/ice/ice_flow.c | 71 +- sys/dev/ice/ice_flow.h | 8 +- sys/dev/ice/ice_hw_autogen.h | 1 + sys/dev/ice/ice_iflib.h | 32 +- sys/dev/ice/ice_iflib_txrx.c | 352 +++++++++- sys/dev/ice/ice_lib.c | 360 ++++++++-- sys/dev/ice/ice_lib.h | 30 +- sys/dev/ice/ice_nvm.c | 33 +- sys/dev/ice/ice_nvm.h | 1 + sys/dev/ice/ice_protocol_type.h | 1 + sys/dev/ice/ice_sched.c | 7 +- sys/dev/ice/ice_strings.c | 6 + sys/dev/ice/ice_switch.c | 31 +- sys/dev/ice/ice_switch.h | 9 +- sys/dev/ice/ice_type.h | 15 +- sys/dev/ice/if_ice_iflib.c | 1266 ++++++++++++++++++++++++++++++++++- sys/dev/ice/virtchnl_inline_ipsec.h | 594 ---------------- sys/dev/ice/virtchnl_lan_desc.h | 0 27 files changed, 2134 insertions(+), 784 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 31e9583494fc..70b56144faf2 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -152,6 +152,7 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_WOL_PROXY 0x0008 #define ICE_AQC_CAPS_SRIOV 0x0012 #define ICE_AQC_CAPS_VF 0x0013 +#define ICE_AQC_CAPS_VMDQ 0x0014 #define ICE_AQC_CAPS_802_1QBG 0x0015 #define ICE_AQC_CAPS_802_1BR 0x0016 #define ICE_AQC_CAPS_VSI 0x0017 @@ -184,6 +185,8 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_DYN_FLATTENING 0x008A #define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE 0x0090 #define ICE_AQC_CAPS_ROCEV2_LAG 0x0092 +#define ICE_AQC_BIT_ROCEV2_LAG 0x01 +#define ICE_AQC_BIT_SRIOV_LAG 0x02 u8 major_ver; u8 minor_ver; @@ -358,6 +361,8 @@ struct ice_aqc_set_port_params { #define ICE_AQC_RES_TYPE_FLAG_SHARED BIT(7) #define ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM BIT(12) #define ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX BIT(13) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_SHARED BIT(14) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_CTL BIT(15) #define ICE_AQC_RES_TYPE_FLAG_DEDICATED 0x00 @@ -2198,6 +2203,14 @@ struct ice_aqc_nvm { #define ICE_AQC_NVM_MINSREV_MOD_ID 0x130 #define ICE_AQC_NVM_TX_TOPO_MOD_ID 0x14B +#define ICE_AQC_NVM_CMPO_MOD_ID 0x153 + +/* Cage Max Power override NVM module */ +struct ice_aqc_nvm_cmpo { + __le16 length; +#define ICE_AQC_NVM_CMPO_ENABLE BIT(8) + __le16 cages_cfg[8]; +}; /* Used for reading and writing MinSRev using 0x0701 and 0x0703. Note that the * type field is excluded from the section when reading and writing from @@ -2509,11 +2522,13 @@ enum ice_lut_type { ICE_LUT_VSI = 0, ICE_LUT_PF = 1, ICE_LUT_GLOBAL = 2, - ICE_LUT_TYPE_MASK = 3 + ICE_LUT_TYPE_MASK = 3, + ICE_LUT_PF_SMALL = 5, /* yields ICE_LUT_PF when &= ICE_LUT_TYPE_MASK */ }; enum ice_lut_size { ICE_LUT_VSI_SIZE = 64, + ICE_LUT_PF_SMALL_SIZE = 128, ICE_LUT_GLOBAL_SIZE = 512, ICE_LUT_PF_SIZE = 2048, }; @@ -2796,7 +2811,7 @@ struct ice_aqc_event_lan_overflow { /* Debug Dump Internal Data (indirect 0xFF08) */ struct ice_aqc_debug_dump_internals { - u8 cluster_id; + __le16 cluster_id; /* Expresses next cluster ID in response */ #define ICE_AQC_DBG_DUMP_CLUSTER_ID_SW 0 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_TXSCHED 2 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_PROFILES 3 @@ -2809,7 +2824,7 @@ struct ice_aqc_debug_dump_internals { #define ICE_AQC_DBG_DUMP_CLUSTER_ID_L2P 8 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_QUEUE_MNG 9 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_FULL_CSR_SPACE 21 - u8 reserved; +#define ICE_AQC_DBG_DUMP_CLUSTER_ID_MNG_TRANSACTIONS 22 __le16 table_id; /* Used only for non-memory clusters */ __le32 idx; /* In table entries for tables, in bytes for memory */ __le32 addr_high; diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c7bf3384675e..499ee41228c3 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -402,7 +402,7 @@ static inline bool ice_is_any_bit_set(ice_bitmap_t *bitmap, u16 size) } /** - * ice_cp_bitmap - copy bitmaps. + * ice_cp_bitmap - copy bitmaps * @dst: bitmap destination * @src: bitmap to copy from * @size: Size of the bitmaps in bits @@ -460,7 +460,7 @@ ice_bitmap_hweight(ice_bitmap_t *bm, u16 size) } /** - * ice_cmp_bitmap - compares two bitmaps. + * ice_cmp_bitmap - compares two bitmaps * @bmp1: the bitmap to compare * @bmp2: the bitmap to compare with bmp1 * @size: Size of the bitmaps in bits diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 73249cb7add4..ef487bcfd0f4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -2319,6 +2319,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: sr_iov_1_1 = %d\n", prefix, caps->sr_iov_1_1); break; + case ICE_AQC_CAPS_VMDQ: + caps->vmdq = (number == 1); + ice_debug(hw, ICE_DBG_INIT, "%s: vmdq = %d\n", prefix, caps->vmdq); + break; case ICE_AQC_CAPS_802_1QBG: caps->evb_802_1_qbg = (number == 1); ice_debug(hw, ICE_DBG_INIT, "%s: evb_802_1_qbg = %d\n", prefix, number); @@ -2404,7 +2408,7 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: iwarp = %d\n", prefix, caps->iwarp); break; case ICE_AQC_CAPS_ROCEV2_LAG: - caps->roce_lag = (number == 1); + caps->roce_lag = !!(number & ICE_AQC_BIT_ROCEV2_LAG); ice_debug(hw, ICE_DBG_INIT, "%s: roce_lag = %d\n", prefix, caps->roce_lag); break; @@ -2726,6 +2730,10 @@ ice_parse_nac_topo_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, dev_p->nac_topo.mode = LE32_TO_CPU(cap->number); dev_p->nac_topo.id = LE32_TO_CPU(cap->phys_id) & ICE_NAC_TOPO_ID_M; + ice_info(hw, "PF is configured in %s mode with IP instance ID %d\n", + (dev_p->nac_topo.mode == 0) ? "primary" : "secondary", + dev_p->nac_topo.id); + ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_primary = %d\n", !!(dev_p->nac_topo.mode & ICE_NAC_TOPO_PRIMARY_M)); ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_dual = %d\n", @@ -3060,7 +3068,7 @@ void ice_clear_pxe_mode(struct ice_hw *hw) } /** - * ice_aq_set_port_params - set physical port parameters. + * ice_aq_set_port_params - set physical port parameters * @pi: pointer to the port info struct * @bad_frame_vsi: defines the VSI to which bad frames are forwarded * @save_bad_pac: if set packets with errors are forwarded to the bad frames VSI @@ -4058,6 +4066,8 @@ static u16 ice_lut_type_to_size(u16 lut_type) return ICE_LUT_GLOBAL_SIZE; case ICE_LUT_PF: return ICE_LUT_PF_SIZE; + case ICE_LUT_PF_SMALL: + return ICE_LUT_PF_SMALL_SIZE; default: return 0; } @@ -4089,6 +4099,8 @@ int ice_lut_size_to_type(int lut_size) return ICE_LUT_GLOBAL; case ICE_LUT_PF_SIZE: return ICE_LUT_PF; + case ICE_LUT_PF_SMALL_SIZE: + return ICE_LUT_PF_SMALL; default: return -1; } @@ -4116,8 +4128,8 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params vsi_handle = params->vsi_handle; lut = params->lut; - lut_type = params->lut_type; - lut_size = ice_lut_type_to_size(lut_type); + lut_size = ice_lut_type_to_size(params->lut_type); + lut_type = params->lut_type & ICE_LUT_TYPE_MASK; cmd_resp = &desc.params.get_set_rss_lut; if (lut_type == ICE_LUT_GLOBAL) glob_lut_idx = params->global_lut_id; @@ -4773,6 +4785,7 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * @buf: dump buffer * @buf_size: dump buffer size * @ret_buf_size: return buffer size (returned by FW) + * @ret_next_cluster: next cluster to read (returned by FW) * @ret_next_table: next block to read (returned by FW) * @ret_next_index: next index to read (returned by FW) * @cd: pointer to command details structure @@ -4780,10 +4793,10 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * Get internal FW/HW data (0xFF08) for debug purposes. */ enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd) + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd) { struct ice_aqc_debug_dump_internals *cmd; struct ice_aq_desc desc; @@ -4796,7 +4809,7 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_debug_dump_internals); - cmd->cluster_id = cluster_id; + cmd->cluster_id = CPU_TO_LE16(cluster_id); cmd->table_id = CPU_TO_LE16(table_id); cmd->idx = CPU_TO_LE32(start); @@ -4805,6 +4818,8 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, if (!status) { if (ret_buf_size) *ret_buf_size = LE16_TO_CPU(desc.datalen); + if (ret_next_cluster) + *ret_next_cluster = LE16_TO_CPU(cmd->cluster_id); if (ret_next_table) *ret_next_table = LE16_TO_CPU(cmd->table_id); if (ret_next_index) @@ -6051,7 +6066,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, */ enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd) { struct ice_aq_desc desc = { 0 }; @@ -6183,8 +6198,6 @@ static bool ice_is_fw_min_ver(struct ice_hw *hw, u8 branch, u8 maj, u8 min, if (hw->fw_min_ver == min && hw->fw_patch >= patch) return true; } - } else if (hw->fw_branch > branch) { - return true; } return false; @@ -6591,10 +6604,14 @@ u32 ice_get_link_speed(u16 index) */ bool ice_fw_supports_fec_dis_auto(struct ice_hw *hw) { - return ice_is_fw_min_ver(hw, ICE_FW_FEC_DIS_AUTO_BRANCH, + return ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E810, ICE_FW_FEC_DIS_AUTO_MAJ, ICE_FW_FEC_DIS_AUTO_MIN, - ICE_FW_FEC_DIS_AUTO_PATCH); + ICE_FW_FEC_DIS_AUTO_PATCH) || + ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E82X, + ICE_FW_FEC_DIS_AUTO_MAJ_E82X, + ICE_FW_FEC_DIS_AUTO_MIN_E82X, + ICE_FW_FEC_DIS_AUTO_PATCH_E82X); } /** diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 024f6f4cdb01..3abfba874b9c 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -88,10 +88,10 @@ enum ice_status ice_get_caps(struct ice_hw *hw); void ice_set_safe_mode_caps(struct ice_hw *hw); enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd); + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd); enum ice_status ice_set_mac_type(struct ice_hw *hw); @@ -352,7 +352,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, struct ice_sq_cd *cd); enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd); enum ice_status ice_aq_set_health_status_config(struct ice_hw *hw, u8 event_source, diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 09816d4a812a..8aa2a7f765a2 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -482,7 +482,7 @@ shutdown_sq_out: } /** - * ice_aq_ver_check - Check the reported AQ API version. + * ice_aq_ver_check - Check the reported AQ API version * @hw: pointer to the hardware structure * * Checks if the driver should load on a given AQ API version. @@ -1037,12 +1037,18 @@ ice_sq_send_cmd_nolock(struct ice_hw *hw, struct ice_ctl_q_info *cq, if (cq->sq.next_to_use == cq->sq.count) cq->sq.next_to_use = 0; wr32(hw, cq->sq.tail, cq->sq.next_to_use); + ice_flush(hw); + + /* Wait a short time before initial ice_sq_done() check, to allow + * hardware time for completion. + */ + ice_usec_delay(5, false); do { if (ice_sq_done(hw, cq)) break; - ice_usec_delay(ICE_CTL_Q_SQ_CMD_USEC, false); + ice_usec_delay(10, false); total_delay++; } while (total_delay < cq->sq_cmd_timeout); diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index 047dd1beaf60..d48d53a37161 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -60,8 +60,7 @@ enum ice_ctl_q { }; /* Control Queue timeout settings - max delay 1s */ -#define ICE_CTL_Q_SQ_CMD_TIMEOUT 10000 /* Count 10000 times */ -#define ICE_CTL_Q_SQ_CMD_USEC 100 /* Check every 100usec */ +#define ICE_CTL_Q_SQ_CMD_TIMEOUT 100000 /* Count 100000 times */ #define ICE_CTL_Q_ADMIN_INIT_TIMEOUT 10 /* Count 10 times */ #define ICE_CTL_Q_ADMIN_INIT_MSEC 100 /* Check every 100msec */ diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index ff13fe99ee27..8e1200e08a64 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -62,16 +62,16 @@ * @var ice_rc_version * @brief driver release candidate version number */ -const char ice_driver_version[] = "1.37.11-k"; +const char ice_driver_version[] = "1.39.13-k"; const uint8_t ice_major_version = 1; -const uint8_t ice_minor_version = 37; -const uint8_t ice_patch_version = 11; +const uint8_t ice_minor_version = 39; +const uint8_t ice_patch_version = 13; const uint8_t ice_rc_version = 0; #define PVIDV(vendor, devid, name) \ - PVID(vendor, devid, name " - 1.37.11-k") + PVID(vendor, devid, name " - 1.39.13-k") #define PVIDV_OEM(vendor, devid, svid, sdevid, revid, name) \ - PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.37.11-k") + PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.39.13-k") /** * @var ice_vendor_info_array diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index b58af574976d..03b8c63af291 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -89,7 +89,6 @@ enum feat_list { static inline void ice_disable_unsupported_features(ice_bitmap_t __unused *bitmap) { - ice_clear_bit(ICE_FEATURE_SRIOV, bitmap); #ifndef DEV_NETMAP ice_clear_bit(ICE_FEATURE_NETMAP, bitmap); #endif diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index 943b37746f9d..f103e2aa6e71 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -672,6 +672,7 @@ enum ice_status ice_replay_tunnels(struct ice_hw *hw) if (status) { ice_debug(hw, ICE_DBG_PKG, "ERR: 0x%x - destroy tunnel port 0x%x\n", status, port); + hw->tnl.tbl[i].ref = refs; break; } diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index 0cf37159b251..c04f86445767 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -404,12 +404,11 @@ struct ice_flow_prof_params { }; #define ICE_FLOW_SEG_HDRS_L3_MASK \ - (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | \ - ICE_FLOW_SEG_HDR_ARP) + (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_ARP) #define ICE_FLOW_SEG_HDRS_L4_MASK \ (ICE_FLOW_SEG_HDR_ICMP | ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | \ ICE_FLOW_SEG_HDR_SCTP) -/* mask for L4 protocols that are NOT part of IPV4/6 OTHER PTYPE groups */ +/* mask for L4 protocols that are NOT part of IPv4/6 OTHER PTYPE groups */ #define ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER \ (ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_SCTP) @@ -483,15 +482,13 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) if ((hdrs & ICE_FLOW_SEG_HDR_IPV4) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv4_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv4_il : (const ice_bitmap_t *)ice_ptypes_ipv4_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); } else if ((hdrs & ICE_FLOW_SEG_HDR_IPV6) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv6_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv6_il : (const ice_bitmap_t *)ice_ptypes_ipv6_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); @@ -645,8 +642,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params, case ICE_FLOW_FIELD_IDX_ICMP_TYPE: case ICE_FLOW_FIELD_IDX_ICMP_CODE: /* ICMP type and code share the same extraction seq. entry */ - prot_id = (params->prof->segs[seg].hdrs & - ICE_FLOW_SEG_HDR_IPV4) ? + prot_id = (params->prof->segs[seg].hdrs & ICE_FLOW_SEG_HDR_IPV4) ? ICE_PROT_ICMP_IL : ICE_PROT_ICMPV6_IL; sib = fld == ICE_FLOW_FIELD_IDX_ICMP_TYPE ? ICE_FLOW_FIELD_IDX_ICMP_CODE : @@ -1301,20 +1297,20 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info *segs, u8 seg_cnt, /* set outer most header */ if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; if (seg->hdrs & ~ICE_FLOW_RSS_SEG_HDR_VAL_MASKS) return ICE_ERR_PARAM; @@ -1418,11 +1414,14 @@ ice_get_rss_hdr_type(struct ice_flow_prof *prof) if (prof->segs_cnt == ICE_FLOW_SEG_SINGLE) { hdr_type = ICE_RSS_OUTER_HEADERS; } else if (prof->segs_cnt == ICE_FLOW_SEG_MAX) { - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs == ICE_FLOW_SEG_HDR_NONE) + const struct ice_flow_seg_info *s; + + s = &prof->segs[ICE_RSS_OUTER_HEADERS]; + if (s->hdrs == ICE_FLOW_SEG_HDR_NONE) hdr_type = ICE_RSS_INNER_HEADERS; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV4) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV4) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV4; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV6) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV6) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV6; } @@ -1529,13 +1528,14 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof) * [62:63] - Encapsulation flag: * 0 if non-tunneled * 1 if tunneled - * 2 for tunneled with outer ipv4 - * 3 for tunneled with outer ipv6 + * 2 for tunneled with outer IPv4 + * 3 for tunneled with outer IPv6 */ -#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ - ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ +#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ + ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ (((u64)(hdr) << ICE_FLOW_PROF_HDR_S) & ICE_FLOW_PROF_HDR_M) | \ - (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & ICE_FLOW_PROF_ENCAP_M))) + (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & \ + ICE_FLOW_PROF_ENCAP_M))) /** * ice_add_rss_cfg_sync - add an RSS configuration @@ -1559,7 +1559,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, return ICE_ERR_PARAM; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); @@ -1663,18 +1664,16 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; + ice_acquire_lock(&hw->rss_locks); local_cfg = *cfg; if (cfg->hdr_type < ICE_RSS_ANY_HEADERS) { - ice_acquire_lock(&hw->rss_locks); status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); - ice_release_lock(&hw->rss_locks); } else { - ice_acquire_lock(&hw->rss_locks); local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); if (!status) { @@ -1682,8 +1681,8 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); } - ice_release_lock(&hw->rss_locks); } + ice_release_lock(&hw->rss_locks); return status; } @@ -1707,7 +1706,8 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u8 segs_cnt; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); if (!segs) @@ -1762,8 +1762,8 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; @@ -1774,7 +1774,6 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, } else { local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, &local_cfg); - if (!status) { local_cfg.hdr_type = ICE_RSS_INNER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index 0857b325ca7c..31c369c144e0 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -188,14 +188,14 @@ enum ice_flow_avf_hdr_field { enum ice_rss_cfg_hdr_type { ICE_RSS_OUTER_HEADERS, /* take outer headers as inputset. */ ICE_RSS_INNER_HEADERS, /* take inner headers as inputset. */ - /* take inner headers as inputset for packet with outer ipv4. */ + /* take inner headers as inputset for packet with outer IPv4. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4, - /* take inner headers as inputset for packet with outer ipv6. */ + /* take inner headers as inputset for packet with outer IPv6. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6, /* take outer headers first then inner headers as inputset */ - /* take inner as inputset for GTPoGRE with outer ipv4 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv4 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE, - /* take inner as inputset for GTPoGRE with outer ipv6 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv6 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE, ICE_RSS_ANY_HEADERS }; diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 6b04bff4b722..8e59ebc76835 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -5476,6 +5476,7 @@ #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_S 1 #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_M BIT(1) #define GL_MNG_FWSM 0x000B6134 /* Reset Source: POR */ +#define GL_MNG_FWSM_FW_LOADING_M BIT(30) #define GL_MNG_FWSM_FW_MODES_S 0 #define GL_MNG_FWSM_FW_MODES_M MAKEMASK(0x7, 0) #define GL_MNG_FWSM_RSV0_S 3 diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index e9e09851b82c..4ac5fffe5b7e 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -192,6 +192,29 @@ struct ice_rx_queue { struct if_irq que_irq; }; +/** + * @struct ice_mirr_if + * @brief structure representing a mirroring interface + */ +struct ice_mirr_if { + struct ice_softc *back; + struct ifnet *ifp; + struct ice_vsi *vsi; + + device_t subdev; + if_ctx_t subctx; + if_softc_ctx_t subscctx; + + u16 num_irq_vectors; + u16 *if_imap; + u16 *os_imap; + struct ice_irq_vector *rx_irqvs; + + u32 state; + + bool if_attached; +}; + /** * @struct ice_softc * @brief main structure representing one device @@ -262,7 +285,7 @@ struct ice_softc { struct ice_resmgr rx_qmgr; /* Interrupt allocation manager */ - struct ice_resmgr imgr; + struct ice_resmgr dev_imgr; u16 *pf_imap; int lan_vectors; @@ -302,7 +325,7 @@ struct ice_softc { /* NVM link override settings */ struct ice_link_default_override_tlv ldo_tlv; - u16 fw_debug_dump_cluster_mask; + u32 fw_debug_dump_cluster_mask; struct sx *iflib_ctx_lock; @@ -310,6 +333,11 @@ struct ice_softc { ice_declare_bitmap(feat_cap, ICE_FEATURE_COUNT); ice_declare_bitmap(feat_en, ICE_FEATURE_COUNT); + struct ice_resmgr os_imgr; + /* For mirror interface */ + struct ice_mirr_if *mirr_if; + int extra_vectors; + int last_rid; }; #endif /* _ICE_IFLIB_H_ */ diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index f3087c09702a..a090717e7c5e 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -44,6 +44,18 @@ /* Tx/Rx hotpath utility functions */ #include "ice_common_txrx.h" +/* + * Driver private implementations + */ +static int _ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi); +static int _ice_ift_txd_credits_update(struct ice_softc *sc, struct ice_tx_queue *txq, bool clear); +static int _ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget); +static int _ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri); +static void _ice_ift_rxd_refill(struct ice_rx_queue *rxq, uint32_t pidx, + uint64_t *paddrs, uint16_t count); +static void _ice_ift_rxd_flush(struct ice_softc *sc, struct ice_rx_queue *rxq, + uint32_t pidx); + /* * iflib txrx method declarations */ @@ -55,6 +67,13 @@ static int ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t static void ice_ift_rxd_flush(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru); static qidx_t ice_ift_queue_select(void *arg, struct mbuf *m, if_pkt_info_t pi); +static int ice_ift_txd_credits_update_subif(void *arg, uint16_t txqid, bool clear); +static int ice_ift_txd_encap_subif(void *arg, if_pkt_info_t pi); +static void ice_ift_txd_flush_subif(void *arg, uint16_t txqid, qidx_t pidx); +static int ice_ift_rxd_available_subif(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget); +static int ice_ift_rxd_pkt_get_subif(void *arg, if_rxd_info_t ri); +static void ice_ift_rxd_refill_subif(void *arg, if_rxd_update_t iru); +static void ice_ift_rxd_flush_subif(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); /* Macro to help extract the NIC mode flexible Rx descriptor fields from the * advanced 32byte Rx descriptors. @@ -82,8 +101,27 @@ struct if_txrx ice_txrx = { }; /** - * ice_ift_txd_encap - prepare Tx descriptors for a packet - * @arg: the iflib softc structure pointer + * @var ice_subif_txrx + * @brief Tx/Rx operations for the iflib stack, for subinterfaces + * + * Structure defining the Tx and Rx related operations that iflib can request + * the subinterface driver to perform. These are the main entry points for the + * hot path of the transmit and receive paths in the iflib driver. + */ +struct if_txrx ice_subif_txrx = { + .ift_txd_credits_update = ice_ift_txd_credits_update_subif, + .ift_txd_encap = ice_ift_txd_encap_subif, + .ift_txd_flush = ice_ift_txd_flush_subif, + .ift_rxd_available = ice_ift_rxd_available_subif, + .ift_rxd_pkt_get = ice_ift_rxd_pkt_get_subif, + .ift_rxd_refill = ice_ift_rxd_refill_subif, + .ift_rxd_flush = ice_ift_rxd_flush_subif, + .ift_txq_select_v2 = NULL, +}; + +/** + * _ice_ift_txd_encap - prepare Tx descriptors for a packet + * @txq: driver's TX queue context * @pi: packet info * * Prepares and encapsulates the given packet into into Tx descriptors, in @@ -94,10 +132,8 @@ struct if_txrx ice_txrx = { * Return 0 on success, non-zero error code on failure. */ static int -ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +_ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; int nsegs = pi->ipi_nsegs; bus_dma_segment_t *segs = pi->ipi_segs; struct ice_tx_desc *txd = NULL; @@ -156,6 +192,27 @@ ice_ift_txd_encap(void *arg, if_pkt_info_t pi) return (0); } +/** + * ice_ift_txd_encap - prepare Tx descriptors for a packet + * @arg: the iflib softc structure pointer + * @pi: packet info + * + * Prepares and encapsulates the given packet into Tx descriptors, in + * preparation for sending to the transmit engine. Sets the necessary context + * descriptors for TSO and other offloads, and prepares the last descriptor + * for the writeback status. + * + * Return 0 on success, non-zero error code on failure. + */ +static int +ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; + + return _ice_ift_txd_encap(txq, pi); +} + /** * ice_ift_txd_flush - Flush Tx descriptors to hardware * @arg: device specific softc pointer @@ -176,9 +233,9 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) } /** - * ice_ift_txd_credits_update - cleanup Tx descriptors - * @arg: device private softc - * @txqid: the Tx queue to update + * _ice_ift_txd_credits_update - cleanup Tx descriptors + * @sc: device private softc + * @txq: the Tx queue to update * @clear: if false, only report, do not actually clean * * If clear is false, iflib is asking if we *could* clean up any Tx @@ -186,13 +243,12 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) * * If clear is true, iflib is requesting to cleanup and reclaim used Tx * descriptors. + * + * Called by other txd_credits_update functions passed to iflib. */ static int -ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +_ice_ift_txd_credits_update(struct ice_softc *sc __unused, struct ice_tx_queue *txq, bool clear) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; - qidx_t processed = 0; qidx_t cur, prev, ntxd, rs_cidx; int32_t delta; @@ -235,9 +291,28 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) } /** - * ice_ift_rxd_available - Return number of available Rx packets + * ice_ift_txd_credits_update - cleanup PF VSI Tx descriptors * @arg: device private softc - * @rxqid: the Rx queue id + * @txqid: the Tx queue to update + * @clear: if false, only report, do not actually clean + * + * Wrapper for _ice_ift_txd_credits_update() meant for TX queues that + * belong to the PF VSI. + * + * @see _ice_ift_txd_credits_update() + */ +static int +ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; + + return _ice_ift_txd_credits_update(sc, txq, clear); +} + +/** + * _ice_ift_rxd_available - Return number of available Rx packets + * @rxq: RX queue driver structure * @pidx: descriptor start point * @budget: maximum Rx budget * @@ -245,10 +320,8 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) * of the given budget. */ static int -ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +_ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; union ice_32b_rx_flex_desc *rxd; uint16_t status0; int cnt, i, nrxd; @@ -270,21 +343,54 @@ ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) return (cnt); } +/** + * ice_ift_rxd_available - Return number of available Rx packets + * @arg: device private softc + * @rxqid: the Rx queue id + * @pidx: descriptor start point + * @budget: maximum Rx budget + * + * Wrapper for _ice_ift_rxd_available() that provides a function pointer + * that iflib requires for RX processing. + */ +static int +ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; + + return _ice_ift_rxd_available(rxq, pidx, budget); +} + /** * ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer * @arg: device specific softc * @ri: receive packet info * - * This function is called by iflib, and executes in ithread context. It is - * called by iflib to obtain data which has been DMA'ed into host memory. - * Returns zero on success, and EBADMSG on failure. + * Wrapper function for _ice_ift_rxd_pkt_get() that provides a function pointer + * used by iflib for RX packet processing. */ static int ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) { struct ice_softc *sc = (struct ice_softc *)arg; - if_softc_ctx_t scctx = sc->scctx; struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[ri->iri_qsidx]; + + return _ice_ift_rxd_pkt_get(rxq, ri); +} + +/** + * _ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer + * @rxq: RX queue driver structure + * @ri: receive packet info + * + * This function is called by iflib, and executes in ithread context. It is + * called by iflib to obtain data which has been DMA'ed into host memory. + * Returns zero on success, and EBADMSG on failure. + */ +static int +_ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri) +{ union ice_32b_rx_flex_desc *cur; u16 status0, plen, ptype; bool eop; @@ -341,7 +447,7 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) /* Get packet type and set checksum flags */ ptype = le16toh(cur->wb.ptype_flex_flags0) & ICE_RX_FLEX_DESC_PTYPE_M; - if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(ri->iri_ifp) & IFCAP_RXCSUM) != 0) ice_rx_checksum(rxq, &ri->iri_csum_flags, &ri->iri_csum_data, status0, ptype); @@ -357,16 +463,14 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) * @arg: device specific softc structure * @iru: the Rx descriptor update structure * - * Update the Rx descriptor indices for a given queue, assigning new physical - * addresses to the descriptors, preparing them for re-use by the hardware. + * Wrapper function for _ice_ift_rxd_refill() that provides a function pointer + * used by iflib for RX packet processing. */ static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) { struct ice_softc *sc = (struct ice_softc *)arg; struct ice_rx_queue *rxq; - uint32_t next_pidx; - int i; uint64_t *paddrs; uint32_t pidx; uint16_t qsidx, count; @@ -378,6 +482,26 @@ ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) rxq = &(sc->pf_vsi.rx_queues[qsidx]); + _ice_ift_rxd_refill(rxq, pidx, paddrs, count); +} + +/** + * _ice_ift_rxd_refill - Prepare Rx descriptors for re-use by hardware + * @rxq: RX queue driver structure + * @pidx: first index to refill + * @paddrs: physical addresses to use *** 3364 LINES SKIPPED *** From nobody Wed Apr 24 23:47:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPwf70wBMz5JN43; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPwf70RTnz4nJn; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714002479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAj5BqJUOvLcu6p7hNh7go5h5SFY4RS1BP9HLPQ4Fp0=; b=qiUlkKiDH+ttLINKDD4A8yVcGesghqU2QyT4MDNQzOtJ/0lpnk+eMJC3UB367an7sXFCXQ PLPiOOH5BUw6D+/BBPY4w0cR/kBurHBLVR8xB20G/uu2Bd9MM4HC6kaYa8JbuV2Cjd4HIn 9KOgT09LsuTxqTrWXgGVTjQyHk01qYCIr3KhFnU4s8xdoOz290hrXx1Dx3LZ44PLh5CMNi UDA5OeNM5hzm3GEUEgKq3At/c+muiUjEz7HthLEVHFfPaQF/4cJIMXRfXyLE2tfxK8bweu lTIeKr3p77s+pU5B6ryEY6OcCe+kmCuj5qHxKtvG9dZxKLV3WtaumNGWg1ME9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714002479; a=rsa-sha256; cv=none; b=HoVvBn6AZDuzPgUl43qPqQbpSE1L3y2k4MPD0+MFhLQky5qCh4VeOSDp3DldjKDFZmNlK0 XlgpLtBTsMFlZIH3odlfK1++LltNSWEqqISk3EFboYu9xNEDcLkIULie9S+Z3AHl9RfJpc qneZgcfvRy3RI/FS6BLYpoQVnaGjIJqVWnloyuaVUngiUT/s4pvRYrikxSNQp2K8MWc3Z3 56Ofpbw7g1VZeb4Svxgoqd+H+mNbfGxEnLZy3mAEBWQ62xOwJtjRZmiMWfSYNcQrqvRDQn 2sL6LBIVFpDI0hmDzy7HCyY2u2Jem2I9Nz1AVFLFbjbh21uuzXGQisxYD25JIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714002479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAj5BqJUOvLcu6p7hNh7go5h5SFY4RS1BP9HLPQ4Fp0=; b=ljcqXGriDYZci7/spH4uAyNH68uiqMMcYEApb6hWdTYrsk0+sQ0vISmsMVphpKO4ZxEffY vPH+9NX131ZCPi4j+R1CcFnKkkiLEo33uvclgNjsV+2B0g6SVcQjEeot5ypDahga5jBrYY PuJKP332B6SwsK1HZJFytiOdZDmRjveLTiI/N9+vO3wrCQaauxiqboJFF9mwDOh9u/aKzx AEYMIdgmulXkTJWUPUec9ybV5oXajTOaQCARxl8f/H0ysn4+CHD0JdsLiSFR8sts+CeuIo l6cP8tInMT/CkKEyeY3vo2rA2nYnXFn+FspGEnXl1OajMopMkz3wqBys9ouiWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwf7032mzcFQ; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ONlwtp023041; Wed, 24 Apr 2024 23:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONlwHx023038; Wed, 24 Apr 2024 23:47:58 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:47:58 GMT Message-Id: <202404242347.43ONlwHx023038@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: 99ec4feefba6 - stable/14 - mfc-candidates: use stable/14 as default MFC-to 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99ec4feefba680f9d674bcddae360b731138249f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=99ec4feefba680f9d674bcddae360b731138249f commit 99ec4feefba680f9d674bcddae360b731138249f Author: Ed Maste AuthorDate: 2024-04-22 17:54:52 +0000 Commit: Ed Maste CommitDate: 2024-04-24 23:47:33 +0000 mfc-candidates: use stable/14 as default MFC-to branch This tool is typically invoked from within a working tree containing the desired MFC target branch, which is detected automatically. It also has a default for when it is invoked from elsewhere. Switch the default to the most recent branch, stable/14. Sponsored by: The FreeBSD Foundation (cherry picked from commit 76a8625bc71da3fa63eef5abb4782553d2588f5c) --- tools/tools/git/mfc-candidates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 76ff9b4d53c6..6610f539fef0 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -41,7 +41,7 @@ if [ "${repo}" = "ports.git" ]; then qtr=$(((month-1) / 3 + 1)) to_branch="freebsd/${year}Q${qtr}" elif [ "${repo}" = "src.git" ]; then - to_branch=freebsd/stable/13 + to_branch=freebsd/stable/14 # If pwd is a stable or release branch tree, default to it. cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) case $cur_branch in From nobody Wed Apr 24 23:58:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPwtT0DGxz5JNv8; Wed, 24 Apr 2024 23:58: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 4VPwtS4bphz4sgx; Wed, 24 Apr 2024 23:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymLEnw5tmXJf4gwaydG6VeKuvDf5x83vwuvzLhzhwIo=; b=J1dofEOca1cUbSL10nZ+56PpwyKmOLFf3+iesLVXIzQIUh64d4LDX2Sm49ccUjybecrCOS EOEWRo/CtMqnuON4E2VRsAeqElUNDHqwcx6Eo0x+0rPa1hBVSd0m5yIDjjvm/MJhk4Szto sV0QMeyF+/4sloWBqZQLoVfvrnmFN24ag2b2EHg/IAXUfF3zgMJ/IpZjoVoUcsvNh9/HHq lFu4Pa8G58OVzhk88wuFLHx4igZLA7EyRUhWUXoXuLi8e1IZ896a81G0d52Ev/FGQ6/bzL zPGekC7P31CROGtARs8ulzTbXrz1RsHPbEPkCcPHQsLixvDX66MLIWZQ3PJ7VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714003120; a=rsa-sha256; cv=none; b=Z35gQz54pajqoNBRQxNBn8FWE1ryO+srPdToIHmsnHDaaPjhaf6EGYt1hmauxXzergmqn0 rfjkg8AE3dF58ugAm15ZcwHU9WQ0zPvWkIIJpGJfHarObM8AxYu0ZH8/n0rkAxycCBXkSw 8fqYYxxd1onVxx0VytExN7fHL4zj0GKm6CWyrWOTQyZL9tJO/uSefIHs+Qo2r28CpautDJ JXwKaY8d3osylPF1daLbKMr4BPoIFOgkDWDSLTjuKK5nIHUvCNaKbDE/kgDid2tL/QNsJZ jetxB7ZDQAbZeymaqjR4zx5FcBSqTnD73oR6N/lPcvoxegAi4QXhFXJJrrdnFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymLEnw5tmXJf4gwaydG6VeKuvDf5x83vwuvzLhzhwIo=; b=AGNgjDuJqOD61AR7z5j+Wkb9gXPkOqdNCmbKY6CPganTI716W8IxyrzjBvQouJV12PtSF3 rA95+FRh0RNSiUhnKTixtuBOvoPpo9bi4HWXrfdJZ6Yswm1kj/m8ZMnLzKWSFLhXlK016D 46SzG4XxpoztPh4Yhmf498draLmTDWEcoF+7uvRkQqEz2lC4fkoZ152Qmc0FTywH5CM62G OSf2GLTU5zalTViX8d0eBKG4As7qRZXvg7SIkKy1ISd70Dm8GGi/h/o330nEb4gtMQJC/z JqKJwPuVDxwwA9tXERImPXrFoDxKINRO/wL0bHBA6nf50pleUCMq4/+gjTu2nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwtS45jszcKc; Wed, 24 Apr 2024 23:58: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 43ONweCL040358; Wed, 24 Apr 2024 23:58:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONweEK040355; Wed, 24 Apr 2024 23:58:40 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:58:40 GMT Message-Id: <202404242358.43ONweEK040355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c7a5881d7a6a - stable/14 - Add support for Intel Atom S1200 UART List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7a5881d7a6a37881bb65837e42829ee68a3883c Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c7a5881d7a6a37881bb65837e42829ee68a3883c commit c7a5881d7a6a37881bb65837e42829ee68a3883c Author: Henrich Hartzer AuthorDate: 2024-04-19 22:52:49 +0000 Commit: Warner Losh CommitDate: 2024-04-24 23:57:55 +0000 Add support for Intel Atom S1200 UART PR: 278316 Signed-off-by: Henrich Hartzer Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1164 (cherry picked from commit 1f2776e123603042944aad9f41ceb46b5b28d8ae) --- sys/dev/uart/uart_bus_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index f2da02d68f27..3b69439c75f0 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -136,6 +136,8 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x1d0f, 0x8250, 0x1d0f, 0, "Amazon PCI serial device", 0x10 }, { 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10, 8 * DEFAULT_RCLK }, +{ 0x8086, 0x0c5f, 0xffff, 0, "Atom Processor S1200 UART", + 0x10 | PCI_NO_MSI }, { 0x8086, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, 24 * DEFAULT_RCLK, 2 }, { 0x8086, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, From nobody Wed Apr 24 23:58:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPwtV01Dyz5JP0c; Wed, 24 Apr 2024 23:58: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 4VPwtT58mlz4sNd; Wed, 24 Apr 2024 23:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=CRQJOtUTi8NcHdGWujlxBJ+miueZSLbOsL0kJlqCwgFrZVuK2UwGajTNZlp1w3NJjVIGJF ez2OKDB7cvxPVVy9Lv+K3cF73FcoGOetP2j0HtVz8MTfWmL+5UEPSz4BZkmlBQ8GTOOcZT 8Ax+6Vvuawztxxqm9nt4rnZ4/ybUo5Pkpkp0+EIgLlQIujJiTV37CQ0dYstWfylfV0+vna zmAJ/qK68liDvDU72tDWbecj0QMBp3sS8r6HvVr2PXqnHu4EH5TRkqgwSnGCbIcBem2Do2 R5xh3A/4KrFFV+YvdQU3WbladzRzgwgKHvQSAeyMY5p4YEdEV9yMuOZtVW91Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714003121; a=rsa-sha256; cv=none; b=rFFpUlXbF1HK4yeT8pjR2tVC5H24ALzHqugNwvd5T5+gnzT/kmKOPsVdaXuk9iwNZ1ylGy +iUR8mFAUSrFWhx7g3MO7EO2SjqZK7y+S9mFMOUUSKUjXl+vx5RidIpwxndqAQ81+VJKao 3Tl948fmLmvOxutKfntzH45lszqmkpD8hyov3QJxq0aV0tNqSQhLONRcwYs5YVHHBWjC7m e29hbUlcH93uXpWcjGvH06pQ0xaHa8NSOffY7UsXZRZh9nBeu7AFVdeYYGn13Ap05wPpzf KtHokzSq1oUiEvfoHs2tHha1iiKzCfszMDm4GsRvfN/Z6eXYiYBLBVr1NILTHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=GnnalriSsvn7CzYwtgFtEoeeTe7MbQvdi1NekjzoMbxADzRns1ZaCAAlz8PFTjoHzlIAGr 6Lf9l1hMdTl/p7RNuHRpWY1N20Vf+dIePaoLxx/ZXtdQKThE2xFMbHNA5bau6xKs/2KwOs TqUTB9HpnLJ++BJFgqrJaBOH05grQImeB06xLMSjIDkC3btb7i6lnN3H2V45VY7a+rv+Ye ZXB1aXtHUmdGGyfSFDYL823eQzzTzEbwKsenClQtJAeIoY4NdRdMkCaQXxm0hnH4Y9OOBg qgwrXx3N/mu8Sb+XaSDCcGsMJMv0V8ySheDUPh7ynh4xy8T8s33UT3Kpl7WhXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwtT4n6gzcKd; Wed, 24 Apr 2024 23:58: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 43ONwf7p040400; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONwfnT040397; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:58:41 GMT Message-Id: <202404242358.43ONwfnT040397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9857f824ec77 - stable/14 - arm_kernel_bothdr.awk: Update to latest ota List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9857f824ec77cdc27c82e0871356eb2e9662fc86 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9857f824ec77cdc27c82e0871356eb2e9662fc86 commit 9857f824ec77cdc27c82e0871356eb2e9662fc86 Author: Warner Losh AuthorDate: 2024-04-15 21:07:46 +0000 Commit: Warner Losh CommitDate: 2024-04-24 23:57:55 +0000 arm_kernel_bothdr.awk: Update to latest ota The latest ota is the first one in FreeBSD that treats 0 + "0xf" as being '0' instead of '15'. Don't use this old trick anymore to convert from hexidecimal to a number. Write a function to do that instead. This fixes kernel.bin building on arm*. awk on 14 doesn't need this, but to build FreeBSD stable/14's kernel.bin on 15 we'll need it, so fast MFC. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44801 (cherry picked from commit de22251127cd0e89ce1edb56c58b202496a97ba3) --- sys/tools/arm_kernel_boothdr.awk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk index dcc65ab40b66..e0f193f7922c 100644 --- a/sys/tools/arm_kernel_boothdr.awk +++ b/sys/tools/arm_kernel_boothdr.awk @@ -47,6 +47,10 @@ BEGIN { } gHdrType = hdrtype + for (i = 0; i < 16; i++) { + hex[sprintf("%x", i)] = i; + hex[sprintf("%X", i)] = i; + } } function addr_to_offset(addr) { @@ -56,11 +60,13 @@ function addr_to_offset(addr) { function hexstr_to_num(str) { - # Prepend a 0x onto the string, then coerce it to a number by doing - # arithmetic with it, which makes awk run it through strtod(), - # which handles hex numbers that have a 0x prefix. + sum = 0; + len = length(str); + for (i = 1; i <= len; i++) { + sum = sum * 16 + hex[substr(str, i, 1)]; + } - return 0 + ("0x" str) + return sum; } function write_le32(num) { From nobody Thu Apr 25 03:19:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ1LZ0z5Yz5Jktf; Thu, 25 Apr 2024 03:19: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 4VQ1LZ0LMHz4GNF; Thu, 25 Apr 2024 03:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714015190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69RzxsqprP1hSYvq00oMDyRwpISzwprVLhioaWvwwRE=; b=tXOH5AfD1S5ixhhWzQtNqDzVpfY8alq2ZdiDZcidC4EPFEaxNXhi/KqQibEtC8LFm06MbZ Auii4t8DD0WDF42lUfidKku11cuuegD6blOSYXNNVoibXTpb9c3ihI8WoYmDyJyNxcD6bz +JfN5W6E49a7uWnam4ickN81Chk/j35pJ67QPDCIBXrlHnv+ebys/PdiAPdhgqKQHAl0Vr BsNfjPIAYwnb0uaLYDv6a7C2ihyyyQJ/txke5ZxHx9+RWAFGCoQwq9wjIso9tqeQK0xEby GLCHafB7WDTAX3/lzAYTqCwXvZZ7rnZYfyze2Dg9qazPldqlONIyepLVL962cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714015190; a=rsa-sha256; cv=none; b=IpypIAOk/OwgHbukkdl3uobyhykzMEQT+Qa7KErajxFmfoyZ91BwRLh//rcdOa/UIobEwN pwE1HKs72TGsjscjpj7UNlwfjTjQy19ojimU2O8k2ms9MKG58t+s3ASdTKhhEeL30NFk9y 8eoc3k1Rv/yRY5D7w+SQk15uVh44+vLnVA0vNsKKKOcFPwro8FnxDUD7OBcVXIDi8NL94b lk4KeKh2cl2wEBvjtRfqI7qItCBHbIhL1dCJF+5XehniYlBoIigCt7U/oi2q1tCaGSuY1X LuspFo3JpDyDxlQmnED41S17VOqceGm8AZkvQfhV7pipcWG4XQBnC5rObDPWgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714015190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69RzxsqprP1hSYvq00oMDyRwpISzwprVLhioaWvwwRE=; b=dmXVh6qurwummg8tc2CX/tqcOAzzgvOrgrUof6lq2YGpw0Fst/vyUoMwKWmf82pdGkf8O5 v6s3tVKOR9ZJQGS8eMTf2KVGN1arbsvckidMxbH21P0llAhE6LFzktJ4SFv0/QAZPYJEdJ /By3AIjazaji7f3NqJKjOMCiuaQJAEjnxR1mE0pthvIDwhNN2dIMWQXunbhLDYLrrq56cR fydDzfjczG7PUHCWnTk2l0d8LvA2QFCmSCuJ7RkzybByxVIVhW+fZDZQ3wtb/+0R30mOIh V/BRbMairf7UqiVT28/T+e0FHy6uYQoe1QHutyizWwsCFQoONIiwvc9YjTU/GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ1LY6jkPzjb5; Thu, 25 Apr 2024 03:19: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 43P3Jnwm079679; Thu, 25 Apr 2024 03:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P3Jnrx079676; Thu, 25 Apr 2024 03:19:49 GMT (envelope-from git) Date: Thu, 25 Apr 2024 03:19:49 GMT Message-Id: <202404250319.43P3Jnrx079676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c68eed82a3dc - main - accf_tls: accept filter that waits for TLS handshake header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c68eed82a3dcadf0c826e9e150f59769f4c44f24 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c68eed82a3dcadf0c826e9e150f59769f4c44f24 commit c68eed82a3dcadf0c826e9e150f59769f4c44f24 Author: Gleb Smirnoff AuthorDate: 2024-04-24 20:36:43 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-25 00:53:10 +0000 accf_tls: accept filter that waits for TLS handshake header --- share/man/man9/Makefile | 1 + share/man/man9/accf_tls.9 | 95 +++++++++++++++++++++++++++++++++++++ sys/conf/NOTES | 1 + sys/conf/files | 1 + sys/conf/options | 1 + sys/modules/Makefile | 1 + sys/modules/accf_tls/Makefile | 7 +++ sys/netinet/accf_tls.c | 106 ++++++++++++++++++++++++++++++++++++++++++ tests/sys/kern/socket_accf.c | 61 +++++++++++++++++++++++- 9 files changed, 273 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index b9fbc624d1ec..a5fa777d037c 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -5,6 +5,7 @@ MAN= accept_filter.9 \ accf_data.9 \ accf_dns.9 \ accf_http.9 \ + accf_tls.9 \ acl.9 \ alq.9 \ altq.9 \ diff --git a/share/man/man9/accf_tls.9 b/share/man/man9/accf_tls.9 new file mode 100644 index 000000000000..331ea2aa4fb8 --- /dev/null +++ b/share/man/man9/accf_tls.9 @@ -0,0 +1,95 @@ +.\" +.\" Copyright (c) 2024 Gleb Smirnoff +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" " +.Dd April 24, 2024 +.Dt ACCF_TLS 9 +.Os +.Sh NAME +.Nm accf_tls +.Nd "buffer incoming connections until a TLS handshake like requests arrive" +.Sh SYNOPSIS +.Nm options INET +.Nm options ACCEPT_FILTER_TLS +.Nm kldload accf_tls +.Sh DESCRIPTION +This is a filter to be placed on a socket that will be using +.Fn accept 2 +to receive incoming HTTPS connections. +It prevents the application from receiving the connected descriptor via +.Fn accept 2 +until a full TLS handshake has been buffered by the kernel. +The +.Nm +will first check that byte at offset 0 is +.Va 0x16 , +which matches handshake type. +Then it will read 2-byte request length value at offset 3 and will +continue reading until reading the entire length of the handshake is buffered. +If something other than +.Va 0x16 +is at offset 0, the kernel will allow the application to receive the +connection descriptor via +.Fn accept 2 . +.Pp +The utility of +.Nm +is such that a server will not have to context switch several times +before performing the initial parsing of the request. +This effectively reduces the amount of required CPU utilization +to handle incoming requests by keeping active +processes in preforking servers such as Apache low +and reducing the size of the file descriptor set that needs +to be managed by interfaces such as +.Fn select , +.Fn poll +or +.Fn kevent +based servers. +.Sh EXAMPLES +Assuming ACCEPT_FILTER_TLS has been included in the kernel config +file or the +.Nm +module +has been loaded, this will enable the TLS accept filter +on the socket +.Fa sok . +.Bd -literal -offset 0i + struct accept_filter_arg afa; + + bzero(&afa, sizeof(afa)); + strcpy(afa.af_name, "tlsready"); + setsockopt(sok, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); +.Ed +.Sh SEE ALSO +.Xr setsockopt 2 , +.Xr accept_filter 9 +.Sh HISTORY +The +.Nm +accept filter was introduced in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +filter was written by +.An Maksim Yevmenkin . diff --git a/sys/conf/NOTES b/sys/conf/NOTES index cdeee4eb7fd6..216a96c2073c 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1066,6 +1066,7 @@ options MBUF_PROFILING options ACCEPT_FILTER_DATA options ACCEPT_FILTER_DNS options ACCEPT_FILTER_HTTP +options ACCEPT_FILTER_TLS # TCP_SIGNATURE adds support for RFC 2385 (TCP-MD5) digests. These are # carried in TCP option 19. This option is commonly used to protect diff --git a/sys/conf/files b/sys/conf/files index 59d99b9f832b..29c02a503027 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4299,6 +4299,7 @@ netgraph/ng_vlan_rotate.c optional netgraph_vlan_rotate netinet/accf_data.c optional accept_filter_data inet netinet/accf_dns.c optional accept_filter_dns inet netinet/accf_http.c optional accept_filter_http inet +netinet/accf_tls.c optional accept_filter_tls inet netinet/if_ether.c optional inet ether netinet/igmp.c optional inet netinet/in.c optional inet diff --git a/sys/conf/options b/sys/conf/options index 4e9d8a5b0741..fcab21ad7e78 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -425,6 +425,7 @@ ISP_FCTAPE_OFF opt_isp.h ACCEPT_FILTER_DATA ACCEPT_FILTER_DNS ACCEPT_FILTER_HTTP +ACCEPT_FILTER_TLS ALTQ opt_global.h ALTQ_CBQ opt_altq.h ALTQ_CDNR opt_altq.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index d83a75ef2d4d..8af12fc02860 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -20,6 +20,7 @@ SUBDIR= \ accf_data \ accf_dns \ accf_http \ + accf_tls \ acl_nfs4 \ acl_posix1e \ ${_acpi} \ diff --git a/sys/modules/accf_tls/Makefile b/sys/modules/accf_tls/Makefile new file mode 100644 index 000000000000..f45b2f057f0a --- /dev/null +++ b/sys/modules/accf_tls/Makefile @@ -0,0 +1,7 @@ + +.PATH: ${SRCTOP}/sys/netinet + +KMOD= accf_tls +SRCS= accf_tls.c + +.include diff --git a/sys/netinet/accf_tls.c b/sys/netinet/accf_tls.c new file mode 100644 index 000000000000..9f1ed7000474 --- /dev/null +++ b/sys/netinet/accf_tls.c @@ -0,0 +1,106 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2018-2024 Netflix + * Author: Maksim Yevmenkin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#define ACCEPT_FILTER_MOD + +#include +#include +#include +#include +#include +#include +#include + +static int sbfull(struct sockbuf *sb); +static uint8_t sbmget8(struct mbuf *m, int offset); +static int so_hastls(struct socket *so, void *arg, int waitflag); + +ACCEPT_FILTER_DEFINE(accf_tls, "tlsready", so_hastls, NULL, NULL, 1); + +static int +sbfull(struct sockbuf *sb) +{ + + return (sbused(sb) >= sb->sb_hiwat || sb->sb_mbcnt >= sb->sb_mbmax); +} + +static uint8_t +sbmget8(struct mbuf *m, int offset) +{ + struct mbuf *n = m->m_nextpkt; + + while (m != NULL && offset >= m->m_len) { + offset -= m->m_len; + m = m->m_next; + if (m == NULL) { + m = n; + n = m->m_nextpkt; + } + } + + return *(mtod(m, uint8_t *) + offset); +} + +static int +so_hastls(struct socket *so, void *arg, int waitflag) +{ + struct sockbuf *sb = &so->so_rcv; + int avail; + uint16_t reclen; + + if ((sb->sb_state & SBS_CANTRCVMORE) || sbfull(sb)) + return (SU_ISCONNECTED); /* can't wait any longer */ + + /* + * struct { + * ContentType type; - 1 byte, 0x16 handshake + * ProtocolVersion version; - 2 bytes (major, minor) + * uint16 length; - 2 bytes, NBO, 2^14 max + * opaque fragment[TLSPlaintext.length]; + * } TLSPlaintext; + */ + + /* Did we get at least 5 bytes */ + avail = sbavail(sb); + if (avail < 5) + return (SU_OK); /* nope */ + + /* Does this look like TLS handshake? */ + if (sbmget8(sb->sb_mb, 0) != 0x16) + return (SU_ISCONNECTED); /* nope */ + + /* Did we get a complete TLS record? */ + reclen = (uint16_t) sbmget8(sb->sb_mb, 3) << 8; + reclen |= (uint16_t) sbmget8(sb->sb_mb, 4); + + if (reclen <= 16384 && avail < (int) 5 + reclen) + return (SU_OK); /* nope */ + + return (SU_ISCONNECTED); +} diff --git a/tests/sys/kern/socket_accf.c b/tests/sys/kern/socket_accf.c index 384062810c8d..747bcda87010 100644 --- a/tests/sys/kern/socket_accf.c +++ b/tests/sys/kern/socket_accf.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022 Gleb Smirnoff + * Copyright (c) 2022-2024 Gleb Smirnoff * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,6 +29,7 @@ #include #include #include +#include #include @@ -151,10 +152,68 @@ ATF_TC_BODY(http, tc) ATF_REQUIRE((a = accept(l, NULL, 0)) > 0); } +ATF_TC_WITHOUT_HEAD(tls); +ATF_TC_BODY(tls, tc) +{ + struct accept_filter_arg afa = { + .af_name = "tlsready" + }; + struct sockaddr_in sin; + int l, s, a; + + l = listensock(&sin); + accfon(l, &afa); + s = clientsock(&sin); + + /* 1) No data. */ + ATF_REQUIRE(accept(l, NULL, 0) == -1); + ATF_REQUIRE(errno == EAGAIN); + + /* 2) Less than 5 bytes. */ + ATF_REQUIRE(usend(s, "foo", sizeof("foo")) == sizeof("foo")); + ATF_REQUIRE(errno == EAGAIN); + + /* 3) Something that doesn't look like TLS handshake. */ + ATF_REQUIRE(usend(s, "bar", sizeof("bar")) == sizeof("bar")); + ATF_REQUIRE((a = accept(l, NULL, 0)) > 0); + + close(s); + close(a); + + /* 4) Partial TLS record. */ + s = clientsock(&sin); + struct { + uint8_t type; + uint16_t version; + uint16_t length; + } __attribute__((__packed__)) header = { + .type = 0x16, + .length = htons((uint16_t)(arc4random() % 16384)), + }; + _Static_assert(sizeof(header) == 5, ""); + ATF_REQUIRE(usend(s, &header, sizeof(header)) == sizeof(header)); + ssize_t sent = 0; + do { + size_t len; + char *buf; + + ATF_REQUIRE(accept(l, NULL, 0) == -1); + ATF_REQUIRE(errno == EAGAIN); + + len = arc4random() % 1024; + buf = alloca(len); + ATF_REQUIRE(usend(s, buf, len) == (ssize_t)len); + sent += len; + } while (sent < ntohs(header.length)); + /* TLS header with bytes >= declared length. */ + ATF_REQUIRE((a = accept(l, NULL, 0)) > 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, data); ATF_TP_ADD_TC(tp, http); + ATF_TP_ADD_TC(tp, tls); return (atf_no_error()); } From nobody Thu Apr 25 04:00:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ2Fk0vRvz5JpW8; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ2Fk0QZXz4LM9; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc2L4sn+pEus17Tu9DBS1sGRDCCqRorGaA5Hz5+pbs=; b=lvgCMExK26oz6p4yVWMeArAKW4HMGg1k38W7vBsisJGajcorN/7RVE3YXHMyEmMOJS7GV4 w6VdLOrN6Lk1i8+pdD2LcZBL5iSypnTJftyTCAlbRG383FZ8WMDGgvit6lQ61MG6V1HEjv qrhK2BlPnDDD8yrsA9PCTtTc0J4FGG6k0ETEHLf9BtPJ6ToJNqqCTQdV0yWGKyhQGAO98p /wNXA221IONDuiLwx7vpCd9zfiYvY5J+hHCi00FHO+EGWTpTFHXgusE86teNanZ91d/1V+ 6ev/QHa7OQPo9GUeujMAYLPErX9NUS6ZetjBfIiLYV0bwYIv9z5z7cMBxUtu+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017642; a=rsa-sha256; cv=none; b=JrxsYU+cRdNLzSq1RIpZHoAlsRSJNPiPCvE3H6UkLc9gvCzTeWRAu0E7XwgiJygE6Vj58P YYAP8FOvAhpW9YONw17I5qcICfASMuCbL8L1YbN5j7qD/QOciyN8I/xOmlBAsHeUqy96Ph MUn7sG6Dn7myhBpO10GjBb9IHLhPchBBY2ws7Xi8E+Tg5eTKmMEfrOy2EfeONANyonqY3P GjzsmBYap74DG9pGuF2FFVwef+5wIxVhQStszbiKCpQ9pHejhcR2eiWxQgfWi7T+INSV2l tYnKiagY+oCh605fLisBIDOPrQfXhDEEcQiZmSLh4a2C+eT+zh7Fu+t7JEZ4zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc2L4sn+pEus17Tu9DBS1sGRDCCqRorGaA5Hz5+pbs=; b=JzFlAPejOz+FX0HNlcz4HY9vN/noZdu8oVsNfCy0RNwOltgFlgIiGChKnBRSEYv0PqyHV0 orIC3ED1XWCnoOSQ1nFePc+ItXznZzGVlPbETO+gvJVx2dBCEInWC/OqjvVpK5HzU7C5SJ aECMg800y3QGqBDRTJEMb9wQM/huvGcnaojzr573mwBx8gOTrnRjf+AiX3XTF5nxw8vsbS zj+08TGZ14UJDGjG/KtJou8EVmhXFKHBDZWAZEPfhI9g/FX3OxFLOho3rJ++dbrqS7oLSW Uuw7ReyfL737bLE1qkddum01VgRlbncW5uot9l+KxM9K3lLtT11tIn3vYNrOoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fk01Lfzkgg; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P40fta055935; Thu, 25 Apr 2024 04:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40fM2055932; Thu, 25 Apr 2024 04:00:41 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:41 GMT Message-Id: <202404250400.43P40fM2055932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7c3092e343c3 - stable/14 - ahc(4)/ahd(4): fix target mode on ARM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c3092e343c368ce4988f7aca3a49fe13e5ff6dc Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7c3092e343c368ce4988f7aca3a49fe13e5ff6dc commit 7c3092e343c368ce4988f7aca3a49fe13e5ff6dc Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:58:58 +0000 ahc(4)/ahd(4): fix target mode on ARM One of the comments in ahc_execute_scb() notes that the CAM direction is actually w.r.t. the initiator. As a consequence, all of our sync ops end up being wrong because the direction is flipped from that of the transfer. Fix it to do proper invalidation and avoid spewing random garbage out on the SCSI bus. Reported and tested by: HP van Braam Reviewed by: imp, mav (cherry picked from commit 9dcf39575efb2ff32f955d9e04e04af28d45d798) --- sys/dev/aic7xxx/aic79xx_osm.c | 35 +++++++++++++++++++++-------------- sys/dev/aic7xxx/aic7xxx_osm.c | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index df73b3fadfa4..4a1e3336fe5f 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -303,6 +303,25 @@ ahd_platform_intr(void *arg) ahd_unlock(ahd); } +static void +ahd_sync_ccb(struct ahd_softc *ahd, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -324,13 +343,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, true); bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); } @@ -961,7 +974,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, scb->sg_count = 0; if (nsegments != 0) { void *sg; - bus_dmasync_op_t op; u_int i; /* Copy the segments into our SG list */ @@ -971,13 +983,8 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, /*last*/i == 1); dm_segs++; } - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index 46c87defa3a5..04037773c528 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -302,6 +302,25 @@ ahc_platform_intr(void *arg) ahc_unlock(ahc); } +static void +ahc_sync_ccb(struct ahc_softc *ahc, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -333,13 +352,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, true); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); } @@ -943,7 +956,6 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, if (nsegments != 0) { struct ahc_dma_seg *sg; bus_dma_segment_t *end_seg; - bus_dmasync_op_t op; end_seg = dm_segs + nsegments; @@ -968,12 +980,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, */ scb->hscb->sgptr = aic_htole32(scb->sg_list_phys|SG_FULL_RESID); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; From nobody Thu Apr 25 04:00:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ2Fl3Wlmz5Jpcn; Thu, 25 Apr 2024 04:00: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 4VQ2Fl1Wszz4LXS; Thu, 25 Apr 2024 04:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bT3knw5r1IMG/RmLrp1P0EQhzNVpprd6Cvz7tBCJFgQ=; b=p+9dIbjEDpq1qeBfEI4xwJCl3R+aji0eCkfuk4nVgHiSL/4APsOKVq9+2HEKR4d++erem7 Vtl6HoP46Inb9jTYDP/IrwnlV0IDusXJ+7csmL/mvBxePzKCClT1saSVzOEPgREUrsOUXH S31rNVoKx5e8Ta3eAA2QR69r2MDEqGJzPdqmcdMNaUquhJ3jtE87Oy+E6NjbPmIJ1egD2t 7WL8zrKPird4PwHuQzKvZ6/nNRiDMxHY05EKRJBs9m24ObNr+1KrKMpom4ahhijF/Ld/r+ Ts3IN3vlxTHngxsL8oWJAsCrKo+Zb5+OCzmprL2gZq7pevllD3Qgq6HiwO7/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017643; a=rsa-sha256; cv=none; b=v3bFshO8ZhEPmzDSS7R2uG6ldIGynQpwEhMviT3eQH0jErd4e0V2PN3Yqv5x2/Tijtr2/G TOQR94UYM8n3RKFqv0PYyFLeDD+Frw1Zrmso6erNuzXpS+6U9PvPXjwaxtWrxjgE+vZ6Xo PbgxQfWcTa5XkgHpjW1RDH7CQCBcPYnL4hm6z6b/RuGpXulMwTXuE3vSZw48DHi692YGCg dQLOaL3b94Pq3yqNtPdDvM0xZnDPSMbUAkMxdURiM+nUa7AwnrQPgHsP/5ab4EHEvUxcoL 4Vo1nuyWgjMge2QKHLiEZNlGxKA9dQh3T5aXmeWtIPJeERyIZc8wDxPxGAdSCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bT3knw5r1IMG/RmLrp1P0EQhzNVpprd6Cvz7tBCJFgQ=; b=WX3CcKogZxHl3KA47uln1OynIJfAR7EELes5BJnMmZ0nDkpSe1JgjDt3jLvcU8DWSaifA8 ClHJ6OVULm6n58QauXRX4pHL7EpdvGXc93HQXYcYgUSBmMK/HhdRxiw4GI4qZ2bPRu8dJI QXSUj/ihyRV+KEoQ8fscUgpVzQWGWDVh5KboOUooQwXIzwQcKYZ+wPvICFvuYzmHSkfuyi kl04X8lrWnfmN+lWwCgwRPCgH0NJDWcPaUDk6jNXUZNMxhF8TcF4Km4IFp9V9Xm0F3aM2f dcq6cSoY3nNMiXZQ85qubt1+h9IBXL5Log+WvFsbF8jVuHtBYbYXuBH0RDL7Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fl12yPzk8L; Thu, 25 Apr 2024 04:00: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 43P40hGr055991; Thu, 25 Apr 2024 04:00:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40hTB055988; Thu, 25 Apr 2024 04:00:43 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:43 GMT Message-Id: <202404250400.43P40hTB055988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 60a4a8532b74 - stable/14 - ahc(4): resolve some minor nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 commit 60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:03 +0000 ahc(4): resolve some minor nits In ahc_init(), qoutfifo is already assigned to effectively the same value a couple lines up, except in the first assignment it uses the proper definition; keep the more descriptive assignment. ahc_targetcmd_offset() gets the offset wrong entirely; as per the area of ahc_init() this diff also touches, targetcmds is laid out first in the shared map and it's followed by the qoutfifo. As a result, we'd generally be getting negative offsets here. We can't actually do a partial sync anyways, so there was no consequence to getting this wrong. Reviewed by: imp, mav (cherry picked from commit b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0) --- sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_inline.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 9934fbcc41bb..4d97d8ee6367 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -4931,7 +4931,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0; ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD); - ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256]; } ahc->qinfifo = &ahc->qoutfifo[256]; diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h index ac043ddb8bbd..6a6501b72c13 100644 --- a/sys/dev/aic7xxx/aic7xxx_inline.h +++ b/sys/dev/aic7xxx/aic7xxx_inline.h @@ -217,7 +217,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op) static __inline uint32_t ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index) { - return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo); + return (((uint8_t *)&ahc->targetcmds[index]) - (uint8_t *)ahc->targetcmds); } /******************************** Debugging ***********************************/ From nobody Thu Apr 25 04:00:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ2Fp3xDrz5JpXM; Thu, 25 Apr 2024 04:00: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 4VQ2Fn5GJfz4LZs; Thu, 25 Apr 2024 04:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYgmJUwxhsTFzw9h41DfssOtwLu/PuiLJ6kvQkA3Ccg=; b=V7KD7AN3lX6ZN81+UXCsKjXThE4JiJL032QYYM9ub33TaTtsEQIGBqBHDJQBoP3rPwaNK2 Op2TY7Hga/UrnKCA84e4BllHG4FpO7WN+grDcaLNVGXq3ESphHL8M19BkZl0/wuptKbBcm tagNXYC3HlAtc2nTGYxbrUiWJq4nGnX7AzPAZtv3rwYrpwERTC4h1xFR8Jg5Iaz3greT4d Gq7dNzTTv35dfpPPgNnjSaHd/z1T6O6Rlp3n3cyJnp4YhbGC0gLdMX2OGCR5pKCXLlbY0P 6z6kYDO4f6w2po+wS3AFog2dHnL7dUeXyITQH2njePOKIaUMqsLnjSQAcq0zFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017645; a=rsa-sha256; cv=none; b=vyZSKHaidpf2YMzAlQX1AhYMpcji8x2LHx5H2hDKJT8BQfbxXtNYiNccr/P9wrB2YiTXCU 2pRDubolad4pu1X00NVHzZgbVk1AwT0eI2c1EtpIzQ80TWQY+uLFWQHLzjeanOWigPUQNl oq4AZrUfkFYcFUGvPl5lHVOYJWHAp5huzlNcbHj3GNfWDNpWNtsIIFJY+N2yMGi2piwSbD lwOo1go5qTzkd0gCt4F2PtkXxEq5RSpAbCbGof/4WfdEY3cR62kufhGn3VIQhibmn0/mnU KyIGnfBATq/MgZaJrRNmhyhGd78UcjHUDVL6eASHFLOluwaut390z8koT0WutQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYgmJUwxhsTFzw9h41DfssOtwLu/PuiLJ6kvQkA3Ccg=; b=A+AHCMkfwm0/FcO+DTIRlXonI9jsKIr2Hs5+qH7Kkfp47yNTBeXDVChykkKy/7XFt/zts7 VGpf3SqUyYXjSoFBI5S03DGsigR7o/lLnWGeST+RSBtOtaxsC2nrG9rcEoKzNkTf+Jjf1G CYo5L7z/UsGEMa39CuGHtZrsf0zMi8PGPotJBUx9MuHEe3FqePo6gDsZqXEjZ1orHgVUG6 Gw5/tH/KUa18uZn2AamwH0UChYXNNvyoEPGZx6q2b1w51LcE8kM7V9Wqyr2u53DZlwANhL c2WKvz3o7MK41S5Qz41V9eSomSDdo2B6Ze+g9AIbNY0jX+YFwUUvo0oyTXMOpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fn4st3zkX5; Thu, 25 Apr 2024 04:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P40jV8056177; Thu, 25 Apr 2024 04:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40jO8056174; Thu, 25 Apr 2024 04:00:45 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:45 GMT Message-Id: <202404250400.43P40jO8056174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fac45b6b9a58 - stable/13 - ahc(4): resolve some minor nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fac45b6b9a58911a13c2709407863dbf8b7fd5b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fac45b6b9a58911a13c2709407863dbf8b7fd5b7 commit fac45b6b9a58911a13c2709407863dbf8b7fd5b7 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:20 +0000 ahc(4): resolve some minor nits In ahc_init(), qoutfifo is already assigned to effectively the same value a couple lines up, except in the first assignment it uses the proper definition; keep the more descriptive assignment. ahc_targetcmd_offset() gets the offset wrong entirely; as per the area of ahc_init() this diff also touches, targetcmds is laid out first in the shared map and it's followed by the qoutfifo. As a result, we'd generally be getting negative offsets here. We can't actually do a partial sync anyways, so there was no consequence to getting this wrong. Reviewed by: imp, mav (cherry picked from commit b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0) --- sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_inline.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 91bc68121067..141a0b526c97 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -4937,7 +4937,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0; ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD); - ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256]; } ahc->qinfifo = &ahc->qoutfifo[256]; diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h index ac043ddb8bbd..6a6501b72c13 100644 --- a/sys/dev/aic7xxx/aic7xxx_inline.h +++ b/sys/dev/aic7xxx/aic7xxx_inline.h @@ -217,7 +217,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op) static __inline uint32_t ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index) { - return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo); + return (((uint8_t *)&ahc->targetcmds[index]) - (uint8_t *)ahc->targetcmds); } /******************************** Debugging ***********************************/ From nobody Thu Apr 25 04:00:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ2Fn4z5Xz5JpkD; Thu, 25 Apr 2024 04:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ2Fm4Y2nz4LgZ; Thu, 25 Apr 2024 04:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56EPwbUl2upzR9hbJkgiys37T6ASDV+AUCXX6ysdezw=; b=jIz0hIdmAx47rdxR1mZshLI60AjLi108KY077/4IPtnWla84PNIuTnVntm84HwUhgQ1/tz Zn6MELnzze8NstupIxWd/2c/vYD+IcstV/AreGH2ZAPYJXnK2EZUfnkFFR4b9SIE4zrrdd 5ECN3L/RkTPfIbB+ipqXGLpBpSvwrG9GIaLQncLY/n66jo/DlUhIiuR8jfle4INbUCAaa0 I8c8wB0A0yKy6BEzw0YzTNNiFPw4YFyMDNuCJAX+gllemd7O5kGT6BmC0CnBIjlELM/bl0 7npR0/9HGJISO+KZ5qnn679Ix+dbWShdU/g0lV9pNkLhaKSmt/1mhkbY2QWOyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017644; a=rsa-sha256; cv=none; b=QOkY2h4Ebj/p50aV8pVr6y8Il+v+JRgA8TMiIgV2Nrz8P/6HsARZUNXMR/Y28lkA7msH+M U44eziNGZYjs//s+Ou3qD1j4rkfWhbBV4iSxLhyVVzyu5vrjEyRvTlMkMVobLvND5jnvD+ /vFJ0/6Zw3+A4Ur904qwVqRknHwNdrU5Y/25SMY1Jh9YNngHfYy3fKHhb4XfHhTr06TWQ4 J+jTgTcJ2wkQcyKNLwKqW0y1j86YUyV8RuxZoarAPeX6atgvM4PmMgZGggNmT110VITxEt yTNAlLDDqE2ZF3MiJs9tScypL3SzQPZXoRqnQNQeAa5Fe2Sa17mKQndSrV87tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56EPwbUl2upzR9hbJkgiys37T6ASDV+AUCXX6ysdezw=; b=YGo8oHYxNZcTMNQ09q7yrM7f6JolHI4TRAbx25J+YylEbOQj1AuIGyCOi4EXGPDwj+XYix OCRpd0iKVh7+Gv/mnTMccQu03s/eiIexqC3ZluySSqUF0MJTF5nDHOPYct2JYHdJUYdWKS hCQYlDKAHGqh2E8b18+Z9JoJYW52XsQhshTySTMpwLrGStgCHes5njQB8uKAqul9LKfpzE otbYCiGQb7MToZvh58uTKHY8LEpIbbSLknuziXyyftfM/yH9hLi9GPKDYNOfhgKhXWe5Jw hTR9kossjobCXRpPse7+GA0x7toQU36V8LR8E4/KKAaAZUc+a/OuPV0+4M2vaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fm49FTzkX4; Thu, 25 Apr 2024 04:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P40iE2056134; Thu, 25 Apr 2024 04:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40isB056131; Thu, 25 Apr 2024 04:00:44 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:44 GMT Message-Id: <202404250400.43P40isB056131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cef3d542b700 - stable/13 - ahc(4)/ahd(4): fix target mode on ARM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cef3d542b7009f7823f09cfd12ac671c0fbf87a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cef3d542b7009f7823f09cfd12ac671c0fbf87a7 commit cef3d542b7009f7823f09cfd12ac671c0fbf87a7 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:14 +0000 ahc(4)/ahd(4): fix target mode on ARM One of the comments in ahc_execute_scb() notes that the CAM direction is actually w.r.t. the initiator. As a consequence, all of our sync ops end up being wrong because the direction is flipped from that of the transfer. Fix it to do proper invalidation and avoid spewing random garbage out on the SCSI bus. Reported and tested by: HP van Braam Reviewed by: imp, mav (cherry picked from commit 9dcf39575efb2ff32f955d9e04e04af28d45d798) --- sys/dev/aic7xxx/aic79xx_osm.c | 35 +++++++++++++++++++++-------------- sys/dev/aic7xxx/aic7xxx_osm.c | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index c59770291786..d06a9c6e686b 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -302,6 +302,25 @@ ahd_platform_intr(void *arg) ahd_unlock(ahd); } +static void +ahd_sync_ccb(struct ahd_softc *ahd, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -323,13 +342,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, true); bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); } @@ -960,7 +973,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, scb->sg_count = 0; if (nsegments != 0) { void *sg; - bus_dmasync_op_t op; u_int i; /* Copy the segments into our SG list */ @@ -970,13 +982,8 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, /*last*/i == 1); dm_segs++; } - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index d2eb8528849a..d8d8115e5aab 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -303,6 +303,25 @@ ahc_platform_intr(void *arg) ahc_unlock(ahc); } +static void +ahc_sync_ccb(struct ahc_softc *ahc, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -334,13 +353,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, true); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); } @@ -944,7 +957,6 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, if (nsegments != 0) { struct ahc_dma_seg *sg; bus_dma_segment_t *end_seg; - bus_dmasync_op_t op; end_seg = dm_segs + nsegments; @@ -969,12 +981,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, */ scb->hscb->sgptr = aic_htole32(scb->sg_list_phys|SG_FULL_RESID); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; From nobody Thu Apr 25 04:56:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ3Tw4BzQz5JvdZ; Thu, 25 Apr 2024 04:56: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 4VQ3Tw1r7Bz4Qm6; Thu, 25 Apr 2024 04:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714020980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zS7Pp+nF1y39Is75NoCqjJWIg+bubIqtqDX2PwMoCYc=; b=lFcv4BvoKm1FDPhUFEQVZZTOnoEY6fSgLnrgNdPZ9FNlYSHl2JAEonabs5iDhACvSvA2cE K19fSJlZFiDPsePoz4bQ1ys8t5EblybnSXFM3cqvKyrXUz6yexN1rBNrq92BxKkknxBz5i 6E0RT6XpMjkb7VFUrD1oL5iQPlfCXJrcGhgiKJCRforceAB0Ew23wXzG5gSw7ZsKXvY7Tl qwl/ATw+0YJT2RKnzp1wg6d4ZIjBiD+S4Aq7/b+uKZGZsEZq5dvsafDK4Yy+BrHGB1EfIU ohMQpZgWCjGMOD9rEZAJii2ous/FrP1TiEg6lawN8qgDQoUnOQpV4U+o9eQYUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714020980; a=rsa-sha256; cv=none; b=cQ1JMBrnDHdzRqxMxpoUwA6ddP5aaVGOgnpdYbDdnpHJTXllPfygeaSL4O2gn7t01l82+1 Zv5NhJU0W76zynyZA3Axomd9Rlw4lPUgVvY5h3PI1b9ckcvwfbXX5e0w9pECVt70buoVyv 6z0Eqf1e9PEh7FXaEbxCLUSvxeuz2B2ivhcyijP14Qk/vyPiVPIXhZ0C+aT2DmycOBjBuG McQ7JBcG1Acxrhfw3OEcJAsbEVEyon9CL1Esre4JyGIXK1KBs5WRFvHQk4bbTDSzFkJ/0r D8cqTAH1msb0KWyJEDaP4E2S4Fj7TIEK1tKSLlXn4Uq311iUG2377h2GNBCrNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714020980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zS7Pp+nF1y39Is75NoCqjJWIg+bubIqtqDX2PwMoCYc=; b=ir0St3Ydhz2YGwmKssFAY+zrE95tGG+3MSuX8Uyea3AJm8CWBK+ZMp09uV8QkLcFlBXkME 7FeCJHtwlNzRcvqg1a4n550Pv9VVXsDh61lTtd/EJ2g2M+6m5DRKa+z2fzab/FgRafB0Q+ V51Q4UGYXn4lo0dmFfQN2Nkd0Xtry5UTyb2Xz9Xf7XjzoDVSwA9HJUpfIBNNjxEE7oJr89 qa1wB3pQ6qp1OX86xx33LLycKqUAjFvGpQeWRP9FMT3UUvU7x1+UTjvUiWH6SuM+1oWi4X Dwh/NFVj9nJaD4r75cgVztcTjWv0aEWKefvneXZAQssKFEKxWIbT+iKCRJqS7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ3Tw1S3Gzm0d; Thu, 25 Apr 2024 04:56: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 43P4uKdK047425; Thu, 25 Apr 2024 04:56:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P4uKKd047422; Thu, 25 Apr 2024 04:56:20 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:56:20 GMT Message-Id: <202404250456.43P4uKKd047422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 19307b86d31b - main - accept_filter: return different errors for non-listener and a busy socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19307b86d31b7dea4bb5c3f7e233ee0e59049258 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=19307b86d31b7dea4bb5c3f7e233ee0e59049258 commit 19307b86d31b7dea4bb5c3f7e233ee0e59049258 Author: Gleb Smirnoff AuthorDate: 2024-04-25 04:50:58 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-25 04:55:58 +0000 accept_filter: return different errors for non-listener and a busy socket The fact that an accept filter needs to be cleared first before setting to a different one isn't properly documented. The requirement that the socket needs already be listening, although trivial, isn't documented either. At least return a more meaningful error than EINVAL for an existing filter. Cover this with a test case. --- sys/kern/uipc_accf.c | 6 +++++- tests/sys/kern/socket_accf.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c index c63b5a1179bc..9e30e7839103 100644 --- a/sys/kern/uipc_accf.c +++ b/sys/kern/uipc_accf.c @@ -276,10 +276,14 @@ accept_filt_setopt(struct socket *so, struct sockopt *sopt) * without first removing it. */ SOCK_LOCK(so); - if (!SOLISTENING(so) || so->sol_accept_filter != NULL) { + if (__predict_false(!SOLISTENING(so))) { error = EINVAL; goto out; } + if (__predict_false(so->sol_accept_filter != NULL)) { + error = EBUSY; + goto out; + } /* * Invoke the accf_create() method of the filter if required. The diff --git a/tests/sys/kern/socket_accf.c b/tests/sys/kern/socket_accf.c index 747bcda87010..ae6522397cf7 100644 --- a/tests/sys/kern/socket_accf.c +++ b/tests/sys/kern/socket_accf.c @@ -209,11 +209,43 @@ ATF_TC_BODY(tls, tc) ATF_REQUIRE((a = accept(l, NULL, 0)) > 0); } +/* Check changing to a different filter. */ +ATF_TC_WITHOUT_HEAD(change); +ATF_TC_BODY(change, tc) +{ + struct accept_filter_arg dfa = { + .af_name = "dataready" + }; + struct accept_filter_arg hfa = { + .af_name = "httpready" + }; + struct sockaddr_in sin; + int n, l; + + l = listensock(&sin); + accfon(l, &dfa); + + /* Refuse to change filter without explicit removal of the old one. */ + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, &hfa, + sizeof(hfa)) != 0 && errno == EBUSY); + + /* But allow after clearing. */ + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0) == 0); + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, &hfa, + sizeof(hfa)) == 0); + + /* Must be listening socket. */ + ATF_REQUIRE((n = socket(PF_INET, SOCK_STREAM, 0)) > 0); + ATF_REQUIRE(setsockopt(n, SOL_SOCKET, SO_ACCEPTFILTER, &dfa, + sizeof(dfa)) != 0 && errno == EINVAL); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, data); ATF_TP_ADD_TC(tp, http); ATF_TP_ADD_TC(tp, tls); + ATF_TP_ADD_TC(tp, change); return (atf_no_error()); } From nobody Thu Apr 25 06:17:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5HJ2XNqz5K3pB; Thu, 25 Apr 2024 06:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ5HJ1wdxz4XF4; Thu, 25 Apr 2024 06:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DTjTXscsczHDAczDuwZTK63AVSM3Td6JTu2WvQ+8ZE=; b=ytPwhw7uIPXypXvlsYVLxhZ1+XTtyRZh98hAcqPJjupDKxfGg+uITVhplPaCkaqL2StGuF 4pNLX3JVzMaxnP5B1HhM3GxBYG1Be3/pftZ5IC9n6fB+RxcfnjkeAnW3GBjYZxwM94Gvj8 Li4BO22jD+7A4IC58Jcsg7kgssTUcEcuXjz8W0D63RjFBQA2mAz0lHWDo0RbbGFvXxB5yf 8+rawcRiFrvxE4Nlr8FPst1lKIQE41LQIVXFyaV5cmwamutkaRmlcjI2xfQVE+7FgKQy46 IGUaIg4nzYQp4u5HC2iSBoZJnuWGzuhzOsaBLf+1yGgFyRuDUOTSCXbu35SAlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025836; a=rsa-sha256; cv=none; b=pmv2PVeqhncPFyKc3opWk8eHMhPjychcqP+OI+hTLygPyC5IKQq+v9PpyGVL9YC6OmVW5v vhh8KKGAqXweuDQwxWLnHwvk9bA4465jHgY9JnrgrIOe0Rlk3MYsq7aguyCbbbA5UyDKN+ o1CbpcHlYVUJobZgg69q+1lWQyxoyV3WD2OSrbeKgIdTEfVLfIH3/b9DAkmdx5b+4OI344 YdF+AfyCoVE+VqzkMuDRph3zZ4lrALQiKs6joept8EgshuxJkGlgecxXBGHHu8NVZo69ND OKM6ALXrb1dYNc8yDdD42G85q2T1V9etkOsyvmML3JFxifhrp2b2dbLhalE6TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DTjTXscsczHDAczDuwZTK63AVSM3Td6JTu2WvQ+8ZE=; b=xl7+Rooa82wCe61/REsWE3BrY1jtTgt3hFQAfIF7rrLqoro+tUtXth02TVfkcu7chE2/kY ixT6zqOdMPJbKLRm+FT8BxmQoGIdcVWpbB0Js0eXre9eOR1yQt/3cLoy7IBSBnOM2f/atG MzhIWq7njT3UT54Me+bsMzlIEDYGb57VLSjyusIMw9EIEygpj0EPT/osKeXz5IdoUOA3Gy zy9qJdMIIn72ed6/bseEm5AHehmiiwH0/h7j6pLRwVIi8D9iN93BRfDGExFdU/CgxxRCF7 FsaawlbVi6d5a+KImGelBGfrpkpM0QroIS66AaPEM2jUjUcOjlV3qpKlfLWtTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5HJ1WxYzp43; Thu, 25 Apr 2024 06:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P6HGpC083360; Thu, 25 Apr 2024 06:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HGUS083357; Thu, 25 Apr 2024 06:17:16 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:16 GMT Message-Id: <202404250617.43P6HGUS083357@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: 068465dddc96 - stable/14 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 068465dddc9696bbb7162437c2a1a314baf91e9e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=068465dddc9696bbb7162437c2a1a314baf91e9e commit 068465dddc9696bbb7162437c2a1a314baf91e9e Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:04 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index 2ef044032f58..9752bdff55dc 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -58,7 +58,7 @@ typedef struct link_map { caddr_t l_base; /* Base Address of library */ const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index b97ad9b5cccb..a3c90c2f33cd 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -319,7 +319,7 @@ typedef _Bool bool; * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 06:17:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5HH2FNcz5K3rN; Thu, 25 Apr 2024 06:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ5HH1ZlLz4XHF; Thu, 25 Apr 2024 06:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TErUUtdKuP8K1Wh1kC9+/bF8WxagBX9OYZgcnGsAqT8=; b=dR6Lo8os01Dd15CfS7h6vbepb51bNM6ruEqVo300HtSyFFuGQxmon7ylCWwxLTM9Kj6Sog obd47+W1Bj2YmOHZ8fJKU19Lpz6ZkGRFRZ38BsS1zSoMzcygC66xFptY5FnEXCL4VPJ4a/ H7RThGlhhbPLj2NXb1R1qe6UJiYEp0GRxhB6IwyyChD0Yx1JcHac47+d+cpbtGPq6tpasV Pv5zRrdsRdWPydzUSoq7wKrz4r54vkGVuPa7SpwbpG+s/y8m92RQ6WUh0jFc5UzR7kyDkJ F7fcMX5uPmsA7Zc5n2gipuTzeA+ISRczFqooBpznRkgardcC08T46Ik31kG9QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025835; a=rsa-sha256; cv=none; b=wLNItVJVQnBiMEPvNpudoF9vwAiyewr4L3kaGU8UTUz+5yUpRXvpAY/vKIMZXbz4sYcwNT CVKdvDCQnfgbo0bDr0siwxFfKJaRHxFpD8/DiKmR9G3CmDyfMeUxd9wdOmsLceCYvsoVcn nClrTZPs0w1fqk5O2L77mhGw82SZS7blW2cV3RFQBOHdR4jkH4rNY33H3euNG0PtnulYHf OYdMHeTjQDFmRJtucwlovSGM8MzPLpRm0laM92buh1fz0aC2RYI/wuXgsk6J3qPZFd/Y17 Mf4Qs3vprmj+RIpIJ5iOq+huCugu6E4vGGIeNLX+36Vjlvs/wjUm0KXYAeUCVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TErUUtdKuP8K1Wh1kC9+/bF8WxagBX9OYZgcnGsAqT8=; b=FFI0dkVLytv5a1SCi4HjfLGjTGvj0kCH9Dxv26kEURWh8W5gm9rvj9CPoWRbHArBpkVrvV gYs0rdpyHrzUGd93zsM6DurV0bV6njboJykvH9lnDUuAdLBl2sp5uP77hvurFhR45+eDpm VIr6yT7xe4Zm0Pn4pGx0+B/WQKxLKXQfzXHhlV7jguI6h+xOCCaPIld+Xwo6aRfS2xs6ay CK2wL0kRk71UaiUyAjoYsSak5SYr9ZzN1KcyQIrWqquuNyQrSfDqVXnCRDcjmB2zTqhm0S tPwIM20b8PACQTNJDRZLEAiCyhZ+ZTk0Gc5JtRuSuI6KGA91qAs/RMfkbeF/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5HH14G0zp0t; Thu, 25 Apr 2024 06:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P6HFVJ083306; Thu, 25 Apr 2024 06:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HFA4083303; Thu, 25 Apr 2024 06:17:15 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:15 GMT Message-Id: <202404250617.43P6HFA4083303@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: 176336c65a49 - stable/14 - mwlstats: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 176336c65a49d1262b89dc394d0345eea529d441 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=176336c65a49d1262b89dc394d0345eea529d441 commit 176336c65a49d1262b89dc394d0345eea529d441 Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:16:42 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 925ed62de716..c9f6fe1ada2b 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:17:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5Hv3fpfz5K3pK; Thu, 25 Apr 2024 06:17: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 4VQ5Hv2fg3z4Y1X; Thu, 25 Apr 2024 06:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TsqsohHi3a6rKDr3JCz1NaZf2DgVFYc5G1Fe7iG5LEg=; b=l4Ai8+7Hetk1fPjN/s6q2Hr9PwOBLWSh7Q7fEkSnZ80kGR/fgG+RZTe5V9Yz6RBPTDYuS0 UT8vH9wkw3LpJtYAlxNWkEDwBmzajCVJO1tAiRONB5u/6pfOMpC4/TMVazuacRXQnteIru TOKTa7py3UTjh2S36t/DgtrLBdI547sS+TxDlAPIYzbQoxmXObUGwILY3FXh8oeCaLncCH o3ihe2Ccs4P/QqeURKepGCQ2aPWuJb0oGd/lrpFJP+TZXgXgeWE463EW4ylWMGWXHFZBxR SjvjX3ib1o6N4C4W8FVN4POwn5Zusgjxv8gRcsgd1hp1Vp3k73czeMYBBu/Bkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025867; a=rsa-sha256; cv=none; b=e2aP8Szue9qKLSPIgHo/4eTlJQfTULRgrYkvh1IEt8wRwY9wbbK2eeuVd6yR+YYf+ZWYIy 6tr7wN+jx1heI9EXQTqXvpLfwDYVN52aDZv27Ny0yaUUre136gvfpOCW9zNR220iz7jqth ZlBDm9xxE03768R8yCPFa+L0kLI7/cEPLKb2gr2D7gZfswyGKSHLmSIBGfKyQGdLOV/yU5 g25EiwsrrIzenEH1S6HX8zrHKXYbVF6lampwu0MGfPYpv3KdHpynsLYJxKQHLRlTatGVtk 6sX7BvBly0EApBj9S7HtfiSh+PX1gCa0rtjemfuuaag3OnEordc3uAT4q8W6Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TsqsohHi3a6rKDr3JCz1NaZf2DgVFYc5G1Fe7iG5LEg=; b=YxxPM7kgrQJRaNsLRAY3xckJj9LrufQl/R5QO3sQQ6Z3tzOj8xPWNP9nteCOML+vT7uUm0 GJWMQJD6BDCjlIyR/m32lCzr/IBQYO3goS3uWm+RHoBgMYMYSUZ90OjRDvW3mCZYQ5jEsR 2y1xeo4mnCix3hgB7FajfugwFRlHIzv/FEYgHc4LY9PLLHVA4yP2yj1zWDIl0Jsj3Sn7mD FD2RI+O3aQETL4NGYnRm9j8j00YP5JuWeVezRLV3AwxbPjovLKVfV224Nm0xbKV+kG0s14 Nwz94Ige8fN09pSTtXoaQQeWHMqMF8+f5/VAWWXWNJBfhBFu9Phq3WGQWKRA6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Hv2GC3znPT; Thu, 25 Apr 2024 06:17: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 43P6HlWi083568; Thu, 25 Apr 2024 06:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HlBU083565; Thu, 25 Apr 2024 06:17:47 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:47 GMT Message-Id: <202404250617.43P6HlBU083565@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: ce775a889af2 - stable/13 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ce775a889af2017c3119a364608030076ff9621e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ce775a889af2017c3119a364608030076ff9621e commit ce775a889af2017c3119a364608030076ff9621e Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:28 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index a4be4180d55d..2d4bb6b65edc 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -61,7 +61,7 @@ typedef struct link_map { #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index d2337cd32c45..a30a08224354 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -378,7 +378,7 @@ __bitcount64(__uint64_t _x) * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 06:17:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5Hw4D8sz5K3rQ; Thu, 25 Apr 2024 06:17: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 4VQ5Hw3fr8z4XtX; Thu, 25 Apr 2024 06:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdueZ1/e0fnNfMRJ7/n2c5Ny+x8Z8F8DtrfdEnzTmEA=; b=RGeDNuv4V6Oq9SOExs3x6CC/rsxNm/NLBcGAjFVw6gmaD/OJXvKrmagWYj5kTMRPcuULTe EnKIv31Fo2an2uK5IPjMPwzvu0aHEvVd6iiHnV/Y4F7rPaPG1+KFjiDuR+yxter60KSgkl kMozqX9KOsxXHV39hoV+j6fQVLTAHCTd1ojPvrBk+TaXsdthGJhlf5XqJULlgNWc8XL/gE JIDDHTBbQ4uNKp8WJfzw9gwReFG46o4PsOxsSSV1IK9gFJh443vDDLHEzTIf8V2Iq75h36 x05dnp00THhWhgNRIBmBE7P+OrV8o03TizEzwO4HCvWbFesim78Q+mIV9EnUmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025868; a=rsa-sha256; cv=none; b=FE3YJ+heL1JfmU8KfvgXCaDy0b+oW0ONgHq1+hlDWdiiHg8OLo+Wit0iSstypJhj573GsT 1vctdbawO7WYqDrT8nIVg1CPDL+tBpsi5VAGrg07xp1sF4uHJ1VvVUasKc59XVovT0BMBi jb+m3L9r9NHHwXudgO2uBtzVuLbC3azYaSKGnhriBxHWjJ48HMrRW0nmnZbruJHj9FGQy6 +4B/U8abvWSLdazCg1S0KuKgQxFzNin52Lc4oiJAD7sBcxKmziECUhxQovMz9pyJPhBDjx 8X0Nw2amWZd3ln+O+rmFEVh0sXn49IXWe7l2Jz0NTO6if2rQ5HGCdbSbhotIvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdueZ1/e0fnNfMRJ7/n2c5Ny+x8Z8F8DtrfdEnzTmEA=; b=MyIMkS0RFPuW42nZ3GAyRoc5sHEPdONK1/bWXLcbT9sLiHu2wE46h+gSisZqmW3Fge9ebb gXVPBW8Gq2uZj/4Nq8PdUfeFKF47yU/MAtxjHPYxjBBSmSsgG8Z1PVpgaFNGSxA3eNCkl5 u0ij5wkVM2GcHNsu/fWnn983tElem7IafSLYYHHp2e7CbLanc6yWXgDwm4IVZ3dtlGUvZJ 804cRS9rfZ1VHE3DeBaDZ2xUiaK+J4tMuh3XTDUa3ZQYxXHOCh+ZiMk9LE1ukgRb7Murym 6db0+b03qDhw9nGitRfMvqWEjRBxtmiLakcfOU3VmWCrjZuNOo8MIZdMWkm/8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Hw3HD4zp44; Thu, 25 Apr 2024 06:17: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 43P6HmSn083619; Thu, 25 Apr 2024 06:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HmtZ083616; Thu, 25 Apr 2024 06:17:48 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:48 GMT Message-Id: <202404250617.43P6HmtZ083616@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: 1002fa246b59 - stable/13 - mwlstats: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1002fa246b59c71a5861e248900be6d7e0ffb711 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1002fa246b59c71a5861e248900be6d7e0ffb711 commit 1002fa246b59c71a5861e248900be6d7e0ffb711 Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:38 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 925ed62de716..c9f6fe1ada2b 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:18:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5JK1f82z5K3pR; Thu, 25 Apr 2024 06:18: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 4VQ5JK1CwZz4YXw; Thu, 25 Apr 2024 06:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPYu9vXt/Z3yaNrstfUcSY7qKi1Wh5mYqbHSGe0K9QA=; b=GMxAN3NaDQdG1KN1DnaoGyF2eKMUnmZ6DNkjWlmmDxcIXG0ltOE5y1vhERE4cVwu0scZEg lsYGw/4QPcSH+WpDJ3bINAnpt74PnDgWMd5t8eUMweSDxM7EekGJTyYCqMk1vH1op/IvVh AynCvnynhvACthy+U4vWUH5Ymqd85Y+M2XXIalsE55Soeb0H9mkb3ZdTWM5z+sB7YJW90r S9OWW3YbhnVeDx5yxP4eOEnu1KNl2ctQ9gLwmULjOMc02vwxvMAcOkMZPpu3Y+Lb28ZEFP BczWJACsteixm5fb0+fAv63FkoAc99bgLiqS6w95u+evGaHT1DdGCGhGFJWwjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025889; a=rsa-sha256; cv=none; b=BMQLKnHwieLKTW94CmUk9KUX2012PyFvs5MIwmLmjG6Nje7a0k3RSHSTxIo40ajmZII+Ou GFYlZYnPkBvAPBjRtlUTof0MjBgyz+78yUUAl/3cFLG+ETvQztX/ofk44qQUJ0+WivmWaN ehAWchh2nYaAoXsL0/jvHPcXVi5NAZmAnlR5Bx7z9VeeuW+V9t+SsO/k2Cqp87Pz39oPhQ zlFhVC0qDzww0K9GBM/St9IT1jwWNWbpGiFUcAepH8ABnZd8oP/192GTvmeCAxme6qttMm TBeu2QtUhVVyQAZufbhGEjyBhejidzGUbdcqVacv6o6TnOmB9mh88oMW0SVlxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPYu9vXt/Z3yaNrstfUcSY7qKi1Wh5mYqbHSGe0K9QA=; b=LxprfVNMX01lniHby1p0tD8NDU6ErVLAQZEyeof9LB7llccd38nG3re5kXagg5M/nbo3nZ LrkOZ/i5SDVqXY18i3cbhpOfbXKj+d5Bnd1tRSWYayxZRH/O/O3mRZT6H2VZPtR0Jo+i8O 7O4qJV7k+C68ZPR1TjqHzQAp8gBscjD3cLX4MlEpjswRA/ugrlg0plpZO2fMspU/QVrHXb kAeR+ihIpZ9AOP/puGLn9avufzvRoU9XpBhJJMJ95587PAsHAiISLTadiFiFy3ckvm1Pva Wyqgc4Wv0k3ovRofOaAD49W6UYawK5QiDaKBx0ZLekMIyJLRgEuCI0KJrv/8+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5JK0qbczp45; Thu, 25 Apr 2024 06:18: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 43P6I9o0083813; Thu, 25 Apr 2024 06:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6I9GC083810; Thu, 25 Apr 2024 06:18:09 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:18:09 GMT Message-Id: <202404250618.43P6I9GC083810@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: 0cb97c19b1d2 - stable/12 - mwlstats: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d commit 0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:58 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 00d0c75a2376..e38cb6efd53f 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -128,7 +128,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:18:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ5Jc3mKYz5K3pp; Thu, 25 Apr 2024 06:18: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 4VQ5Jc3HGhz4Yn6; Thu, 25 Apr 2024 06:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3YPMPXlDOQwZ3gn63xHdkjDqNz+aSBkF7Ji3iPjFRdU=; b=n8ziBEMil1Gg2NCSk2nFkUnyZ6URerKQcaFiZBeKbTWMUsYDWDqMIoU5rGQAYswNTeSv5d GtIGqMapy9crxpopgbQBSRHNJmx5WoDz/mx4vF0P0vSNfJxE8gW9owJ3a/5X34Dh7ULnb8 1mux3pddJiEbKqufTz7LxW9grdsavF/3t0L5XWsEBNgCwh4uAJjJUPkBK1DRRiBTNI3mXw dDCnWLe41yXM69uU//DsynE6x+ivoPQQwKfZlo/iUnpgPUN93znVK24Q6u+S0a16BJ0usr /m6Zd9R2Z4QkOv/RzrIF34HxahJXbW4FK1OKqNRtLsuHj3ObohZjmqhVcyZeXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025904; a=rsa-sha256; cv=none; b=TMMraWIudtiN0HMokIVtpMboGYGz54eUVs6PED7KSmM1IpyTt+Fcq1AH7reeBPlnsEjezm OgXYgXGzjSoiVnirH86utmE0oYbXVMS4xLP2E0IdFiZtgCMJEJ8NzXoKs0dXUE3lamGs1B e/j4JmDRGWXB2VTB1TQgS2V7+NscVycs53bF1PA+8ayBlkB850gA6Upa2+IT/NSIESaz4P neR+9a7MBBymMXmDNF3sx35bvtRaIev2L99H8ZVAXOkj+i3N3zmgKERrChUdyOgJWbfj3o 9E54+rq1+06eFYl1N5dF+ggniuijOsV7rmAZfi6n9opqRzMJNCs9Bwl0CPfMpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3YPMPXlDOQwZ3gn63xHdkjDqNz+aSBkF7Ji3iPjFRdU=; b=baUISJfTtW1HC/h7y2aABWg5/SvHuhcuxb8HdDmAQTytLG4VAYFP+ZyLLlIjnfsvoy+dzQ Pi72qyh+hdLfy6/QeI+T0ErDyecoTJAsshCFUBwLJ0/Os6htioJOZDrbe/aMmRe/XND6kH VZC5HQnFCluX0nyk7SuBcWG8XLFI9EAmZaIq/ts4Ma5T3tLfhmId5Wj2kC52ystqHURsfm Hwn7quScs5UNg8v6jhxLTdwrVLNi4idLAFfOTQb+KdpJht5fJUxuyrYk7JfcdJRWN9B71N hwHgQjyp5wX2/+p0/qHnhWhZ7FkkIovzChJn4YBWVgwTCaI56iC+3h+wUt7uyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Jc2tq2znqD; Thu, 25 Apr 2024 06:18: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 43P6IOa6083986; Thu, 25 Apr 2024 06:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6IOJX083983; Thu, 25 Apr 2024 06:18:24 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:18:24 GMT Message-Id: <202404250618.43P6IOJX083983@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: 2e9bfb6a0071 - stable/12 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2e9bfb6a00717660e33ee828b451f258d2b2bb4a Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9bfb6a00717660e33ee828b451f258d2b2bb4a commit 2e9bfb6a00717660e33ee828b451f258d2b2bb4a Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:18:14 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index 8e41a670bec0..8b76f3fcdb43 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -63,7 +63,7 @@ typedef struct link_map { #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index 72889f3d5a93..0312e99cb0de 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -379,7 +379,7 @@ __bitcount64(__uint64_t _x) * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 09:44:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ9sr6CD6z5HD73; Thu, 25 Apr 2024 09:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ9sr5kN7z4sm9; Thu, 25 Apr 2024 09:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714038240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHD3lz4sU0zDxv49UbuaD7f5ozIm1gVnf4ALUzLsSTw=; b=YOsiUPzKjnql0bF/GolB/EoQHz75lzkb2RUJBRZnc1sbffSzYJ7MsW46F34gE04Uu2kq2+ 9U9uW9qM+DuzobL2xFdD/C0mIebvKKivsli8gVFOn0dsJsXKtSHHkqh+j799N5bgtcI7yx TaE0OVZwVEssNQ9V7ak/3iujRnUUE7i0tGSWusMrme51B5qaRLF6tO8tiSo2IHJITBv4b3 iYHclZtw9nxyat69hmzVL+3lhrFHeE1jty7V0vc19VF3NIANC3eBflgssduG+SNKAvHL98 02PYmA4HARkJLyIkCyGD0gntnlVv4YJotK6kPFxJNnaQeNaxhLKtaO6g72cHBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714038240; a=rsa-sha256; cv=none; b=fihUb749wipIbn7xlb/3wOZXziKpitYrIwO7xxQw8qCUmEuyNDjdlaFuvmqgYocYGkZbZL bUjInSX4I09ZhHuHa+AsHvScEyc5+shGe4NIphhFrbjTbllE0T52VILGqwp+E++TrPid1r RbIQEGC5BQ8aanD7pZ3ZDaheiUgIY4I6OmrZW+EMz0QL6Hcv4rfbdNNjfh28fFXEyxK77V nH17eGOAxKezMKQQ+GPLINfLTqfOSYGQSSL65x2T0e3qrZeL2yJd8bgtyPMpBc2d2I9OtG dwpateayOldPaT9gzEpjkqH4rjnLSB6PFoLuuNvIt3Ua41dYMDVCRUCmdZhmRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714038240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHD3lz4sU0zDxv49UbuaD7f5ozIm1gVnf4ALUzLsSTw=; b=jhnptTQWkAvYVOCV3UeR7PSQTyd9PxH6t7orYMtYCBPOvqj3cpRWsUoIZ9q+glhTDhSWle WzgYkQlT7M1vxJNvFy0eewUB9wK065tZLYJXd0wVM4BKGP2os11doASUkmVVieik230YG0 gDwsCXOYhM0rfNgfYe0g7oJCUCRZz/bqw2xNrYFUN3kTtq+YO+BSw+WTv5nSPjohryDde+ Q1JM49/LMufqlZwGvUxp6EKyy1BVGhgBJn3HGpk+pkiTbCLvWClzTlbBPvqpRd77Z3nf6P 53nIJ+yDF61mEcPMIFzYVssyZX31DRFhudmm6TMnGwVunBRT2warU7xEQ7pPcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ9sr5L46zvHH; Thu, 25 Apr 2024 09:44: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 43P9i0nM037392; Thu, 25 Apr 2024 09:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P9i0I5037389; Thu, 25 Apr 2024 09:44:00 GMT (envelope-from git) Date: Thu, 25 Apr 2024 09:44:00 GMT Message-Id: <202404250944.43P9i0I5037389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4395d3ced5cf - main - Document that gettimeofday() is obsolescent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4395d3ced5cfa46df400b5bb9996f9d74476997e Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=4395d3ced5cfa46df400b5bb9996f9d74476997e commit 4395d3ced5cfa46df400b5bb9996f9d74476997e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-24 11:31:54 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-25 09:42:59 +0000 Document that gettimeofday() is obsolescent Reported by: kaktus Reviewed by: kaktus, pstef MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D23942 --- lib/libsys/gettimeofday.2 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/libsys/gettimeofday.2 b/lib/libsys/gettimeofday.2 index 5b867aaad33c..cfba97149199 100644 --- a/lib/libsys/gettimeofday.2 +++ b/lib/libsys/gettimeofday.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 13, 2021 +.Dd April 24, 2024 .Dt GETTIMEOFDAY 2 .Os .Sh NAME @@ -41,6 +41,17 @@ .Ft int .Fn settimeofday "const struct timeval *tp" "const struct timezone *tzp" .Sh DESCRIPTION +.Em Note : +The +.Nm gettimeofday +function +.Po but not +.Nm settimeofday Pc +is obsolescent. +See the +.Sx STANDARDS +section for more details. +.Pp The system's notion of the current Greenwich time and the current time zone is obtained with the .Fn gettimeofday @@ -121,6 +132,18 @@ A user other than the super-user attempted to set the time. .Xr ctime 3 , .Xr timeradd 3 , .Xr clocks 7 +.Sh STANDARDS +The +.Nm gettimeofday +function is considered obsolescent and its usage discouraged by +.\" XXX: This should be replaced in the future when an appropriate argument to +.\" the St macro is available: -p1003.1-2017 +.No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) . +Application should use the +.Xr clock_gettime 2 +function instead as +.Nm gettimeofday +might be removed in the future. .Sh HISTORY The .Fn gettimeofday From nobody Thu Apr 25 09:50:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQB0z1pyJz5HDQq; Thu, 25 Apr 2024 09: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 4VQB0z1GVRz4tvs; Thu, 25 Apr 2024 09: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=1714038611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgeutYwTFaZeF8FgImIVUi70d0kL7XeVnYEQQ5femSg=; b=uEqr5lXAXRAbAteMh6hZDUYQczoDRxCnKY9tUOQ2TkdbjRDj+9eAd99ZN8WMJbWqRGR9Kc OdOo1XQHEBS2yYTkKOEN0z9SuwrZEoCWW/ZTmSUf6AV0vY1ehWjbA+CxZG5BQZzyv3pICN S2QKuuL/aMg0R+AV68r98755hM6UnYs+9hgSwPEseyruWVan6MJGoYM8H2ZN1J3wfnRg7+ 1dRt4S4XTGwyh0EzE2OR5DKYjANSvqPhrV8DriLqx1C8acR/xIaw7OrnY2GapUsFpSc9Pb EITHp55zPa6ZfZP4FR/q0tKq8To/ENcLDrZvRCXHzUYRwdijwPMvQkUE4Cl6UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714038611; a=rsa-sha256; cv=none; b=RITXDV+RPomfSJZnJNqxTu9kRG7koKb7UvQF+d3K6UbNpsfezP58DYmSquODS+S1ytPOG2 GN4EJkjbVutjexXDVWK8U8boTqUHLBZRpgFBzb1ec2X7EBQfdzFfV5hMufP7zEa6eiogay 6KLqTgrlY3y5aD/YICMdwDYjYcBAvcxGnB4djbQJdr3JcJ5ACp/yltGEK+V5eeQpzhZBaS BjYcidf9aWfdIzy36+CDZ84Cx62Sayg0qT8zuT7q5/FhqW84VCyRlYetw+IIVoGxHiPDng kileUI3OrA5/wHncV2Iwk26ClgbIGMpY4tPglKbVaYJ6Ce6WtLHQbmmmY8APKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714038611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgeutYwTFaZeF8FgImIVUi70d0kL7XeVnYEQQ5femSg=; b=VWozUnVoj5JhSXTcNTXvzt5D/Ij8gQmqajCtIv+J79K8WylWHQgSdLkUa12ueRAb0GzkGh I6oLIP1XFMaWoBJrkZxwEpUoG/2QDcMTDh25NI4OTEiohecTPVsQqvejh5/eederagtt8e C4qY8waJQ4YTFFTnHMkAIiWS0WWIJSKLKQHemJ5Y3Q4Q50o49LrE7HTKWCWM1PocnQJBzq d8Li7+xSisprDFKC5oQWJawcc5nWGcxQA2nVTlWClSaiHtppNwc8Ei96u7MbNivxMV8GZJ k/yAEAXYbbHqQJMCZD2SijOvjKFtl3l1Bu/xWE1VjICXq25rFI26EX9DBiy8bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQB0z0tVJztyR; Thu, 25 Apr 2024 09: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 43P9oBRl043009; Thu, 25 Apr 2024 09: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 43P9oB6P043000; Thu, 25 Apr 2024 09:50:11 GMT (envelope-from git) Date: Thu, 25 Apr 2024 09:50:11 GMT Message-Id: <202404250950.43P9oB6P043000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 177ba183076b - main - sync.8: Document that the "sync dance" is not a thing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 177ba183076bd6fe6b29b1d657b954cca256506b Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=177ba183076bd6fe6b29b1d657b954cca256506b commit 177ba183076bd6fe6b29b1d657b954cca256506b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 14:12:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-25 09:49:50 +0000 sync.8: Document that the "sync dance" is not a thing People still believe that it is essential to run sync(8) a couple of times before a reboot/halt. Document that this has not been necessary for a long time now. Reviewed by: imp, bcr, Pau Amma MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33233 --- bin/sync/sync.8 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index d7a11c9fd217..fcd07ca72240 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 31, 1993 +.Dd April 25, 2024 .Dt SYNC 8 .Os .Sh NAME @@ -69,3 +69,31 @@ A .Nm utility appeared in .At v4 . +.Pp +On systems older than +.Bx 4.0 , +commands like +.Xr reboot 8 +and +.Xr halt 8 +were unavailable. +The shutdown procedure involved running +.Nm , +waiting for the lights to stop, +and turning off the machine. +.Pp +Issuing three separate +.Nm +commands (one line each) was a placebo that would generally suffice in +.At v7 +machines that were otherwise quiesced systems. +It replaced the one-per-line +.Nm +as a substitute for waiting. +.Pp +.Bx 4.0 +introduced +.Xr reboot 2 +and +.Xr sync 2 +which rendered this trick obsolete. From nobody Thu Apr 25 09:52:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQB433rZCz5HDs4; Thu, 25 Apr 2024 09:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQB4339tlz4vMm; Thu, 25 Apr 2024 09:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714038771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wHgcntN/y0nScgD9ynSvn9TGHYO830JeAdhQnPXZ2+4=; b=Z2aTuJiSN98XS/l9da964kr2Ve3ju+Z51QQVlOdGtx9nJjkZNIN4rQsJ2m5yErUOmb0kWw gOxch7Uo1H+bo2IqGBpVLKsyJYjTfMl2p3Zue3gTfENxVNlIyICYA+9lkUfJGxV7jG7hMH HJm81M4/745ESTf5oXAsWFkNJlluAsqnvofsMGoZXnj8GoR2kgKzhmozeL/A1NlqvAYOT3 LJyborZt70FwFf8Uv96+mSXFB+WCmUIuPu9QPG4+Akjxd1dCIyKlEtOTwAK6KOtlOxkvRq 1GTKqyOpN5Givwus0QqgYmu1qUFduBU+OOH9Rz9pvtfrzDK1KpdJ6/qG80Wpcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714038771; a=rsa-sha256; cv=none; b=iA75FPJAUTxeUT0ujEcwEa+ffYu5im/bs2RqYXYSFGgBmQ+hbjci59UusDmhjxrixtg8jW 70ArxufbFKqFyuipB1CmEi/xWRViNvmOQbNfrsafb9/DxxgvyeEiDvR5KZY1H755IdAW7U uJVwJnyd/bvqjoGL2ONW8WcPotF08zhFY6qlAMdUNTOdd/URaa0ysiAAyFWO5iUs9zdZXn fhZJCyE0xVKQdw3Mb/MwQpyx+kQdMrOSBfX1tCw2Co63mj4iir3kMKy/JS09I1QoQfB4IV WWlf73POWMUh/ZKCI7inDBkyqWHF5K3IxdB/sc7c/b/nTLeKH2+6Xmz427I+jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714038771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wHgcntN/y0nScgD9ynSvn9TGHYO830JeAdhQnPXZ2+4=; b=A6z9ibfWdc/C1ubE2lt+ThjmObNkhfGQuXI53tTYqGgRvQyUHbILZVj4eS7ZzhSDWf+lfs 0WRY32WBOT9JxSQDibbiqgxe88h0js8UbXr+VcmA98s797mGTbROxh4fDBS5CNpMnAQ/SJ atQ3zjdfWLswJKLuqVkj4IfyoJdexh+gq4SOcHus6+duYKZG//Dl9OddtmmDesJ3RaB3RP si1+HkN5+xZdkrUvVusVDp0SeujRzoy9VJoAInbUDujcEO7gx2j9oSlnhpWmJqwCifKjMB vJvpII7a9Xyx5ZGs3vvJL2AtRIg9ynckUdQqneSq2bF+0BrW5jfWoTv1oTm9jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQB432mrgzv26; Thu, 25 Apr 2024 09:52: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 43P9qpuY053719; Thu, 25 Apr 2024 09:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P9qp61053716; Thu, 25 Apr 2024 09:52:51 GMT (envelope-from git) Date: Thu, 25 Apr 2024 09:52:51 GMT Message-Id: <202404250952.43P9qp61053716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 42255af64a54 - main - checkstyle9: Allow a space between "*" and _*restrict List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42255af64a5471a2668e3a0552d82639e1f70ee4 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=42255af64a5471a2668e3a0552d82639e1f70ee4 commit 42255af64a5471a2668e3a0552d82639e1f70ee4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 10:29:02 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-25 09:51:25 +0000 checkstyle9: Allow a space between "*" and _*restrict Before the change, we would get errors like this: ERROR: "foo * bar" should be "foo *bar" #369: FILE: foobar.c:369: +barbaz(char * __restrict s, Reviewed by: des, imp Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44911 --- tools/build/checkstyle9.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 7fa02bcabc97..99fd354fbacf 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -202,6 +202,7 @@ our $Sparse = qr{ # Notes to $Attribute: our $Attribute = qr{ const| + _*restrict| volatile| QEMU_NORETURN| QEMU_WARN_UNUSED_RESULT| From nobody Thu Apr 25 10:17:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQBd94Tp5z5HHrh; Thu, 25 Apr 2024 10:18:05 +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 4VQBd90d6yz4xV1; Thu, 25 Apr 2024 10:18:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 43PAHwLE076575; Thu, 25 Apr 2024 13:18:01 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 43PAHwLE076575 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 43PAHwGB076574; Thu, 25 Apr 2024 13:17:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Apr 2024 13:17:58 +0300 From: Konstantin Belousov To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4395d3ced5cf - main - Document that gettimeofday() is obsolescent Message-ID: References: <202404250944.43P9i0I5037389@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202404250944.43P9i0I5037389@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4VQBd90d6yz4xV1 On Thu, Apr 25, 2024 at 09:44:00AM +0000, Mateusz Piotrowski wrote: > The branch main has been updated by 0mp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4395d3ced5cfa46df400b5bb9996f9d74476997e > > commit 4395d3ced5cfa46df400b5bb9996f9d74476997e > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2024-04-24 11:31:54 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2024-04-25 09:42:59 +0000 > > Document that gettimeofday() is obsolescent > > Reported by: kaktus > Reviewed by: kaktus, pstef > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D23942 > --- > lib/libsys/gettimeofday.2 | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/lib/libsys/gettimeofday.2 b/lib/libsys/gettimeofday.2 > index 5b867aaad33c..cfba97149199 100644 > --- a/lib/libsys/gettimeofday.2 > +++ b/lib/libsys/gettimeofday.2 > @@ -25,7 +25,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd May 13, 2021 > +.Dd April 24, 2024 > .Dt GETTIMEOFDAY 2 > .Os > .Sh NAME > @@ -41,6 +41,17 @@ > .Ft int > .Fn settimeofday "const struct timeval *tp" "const struct timezone *tzp" > .Sh DESCRIPTION > +.Em Note : > +The > +.Nm gettimeofday > +function > +.Po but not > +.Nm settimeofday Pc > +is obsolescent. > +See the > +.Sx STANDARDS > +section for more details. > +.Pp > The system's notion of the current Greenwich time and the current time > zone is obtained with the > .Fn gettimeofday > @@ -121,6 +132,18 @@ A user other than the super-user attempted to set the time. > .Xr ctime 3 , > .Xr timeradd 3 , > .Xr clocks 7 > +.Sh STANDARDS > +The > +.Nm gettimeofday > +function is considered obsolescent and its usage discouraged by > +.\" XXX: This should be replaced in the future when an appropriate argument to > +.\" the St macro is available: -p1003.1-2017 > +.No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) . > +Application should use the > +.Xr clock_gettime 2 > +function instead as > +.Nm gettimeofday > +might be removed in the future. Obviously gettimeofday(2) is not going to be removed even in the far future. > .Sh HISTORY > The > .Fn gettimeofday From nobody Thu Apr 25 13:20:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQGh75bPrz5HjJh; Thu, 25 Apr 2024 13:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQGh758LYz3xs3; Thu, 25 Apr 2024 13:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1r/4f77a/3/bQbE+h+THWrf6lLWbm7r664gz6p8II=; b=x+lwG2QvBdQaq8HrdRyniFMu9P7yMyqB4qVmxm+Kmod5xcGbYhdN669EG+GSPTP4t8LTFH QIeEPesoBpnVVd6gTX8nnyvzsEwsOOKd90nneS7FoSUnw9QDcPkZGRHNeiFJtcMHtNHkie c1IJno3rXf6aAN5x0fnwlatVyTJn3zgVwTRYIj5m5dLj/NEe8uyzxDBbdc9EnOi0UQA5qF yyg0nm1TCFaIoVwDJ0p6yaFXkrnBasTol9ctDs6RRqZNt6gyKwzb8oG0g2XftP4C07PhUw JbaQW+mTmCFVp/tTeXEr8dRHOX7aubg48VviVQSWh3hJfl7TOkA5OkNb2316RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051255; a=rsa-sha256; cv=none; b=YVkZnZ+Pe8CL9yJ/nN3Kl3hh9wpPhGJPiinaynyQZG2Raom54e/b4aANiOuf9v9Hws69zu JLcnGAyKDOXODwxxZdobd+3JnLfg42mZ9p2uxzvBxh25fhMjAKgkOQrtxcaok2ZmT3Y7Zs 2VFU/eGdjz+G3bO8+GYCcs7UEoiPJOUlne/TvJZRcHrRjfpAD7KePaZN3B8bNPXMcMbN2q Vghyi1CjgpzskWUbngF8G2nUoNVYUAl+8PFLQuISD6+TRS8SYosKhkLJUwF6nhIiF/TUqG 42bvxw6JomSnolVTtCK8/1hsGJW+dKNTghhTU0HspgDLus/0uxeb6xisuTCU+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1r/4f77a/3/bQbE+h+THWrf6lLWbm7r664gz6p8II=; b=w2fOi7zfAKPE/XnQvPugcv0PtmWAK25yvVvatg8qh8AR4yvf/UKy8fcICXHXHfMYOAMSut rvQ0mhPe8/UQB717W9Tl+66KL47k0MY8jQJvaeuBzXyYxQJyPFvReUShW59TrzC9V6qOah hwtD4xGS6jv2jZKm86hKXX5AdZxSfy33UMS9rFKl6pSPrMnojMXjXZuc+ee7yWpBykkRXx k2NrfWL3JNcXkzUcPUbLbpO2vJ7HWdjeoiMYwSSagMrEKV/1J5JmhsBot9eKSOgH7iNTNK iFEqzWg0TZbRgyCpsB3/7yLTHki+jD0UqC/A/bUtW7TfUQyPqwQQ8+zcTSMEzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh74m3dz10mm; Thu, 25 Apr 2024 13:20: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 43PDKtTm001731; Thu, 25 Apr 2024 13:20:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKtwP001728; Thu, 25 Apr 2024 13:20:55 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:55 GMT Message-Id: <202404251320.43PDKtwP001728@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: eff68b69dfa2 - stable/14 - mv: Set file flags after setting file times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eff68b69dfa234f757b370b46596f7c8d604e05d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eff68b69dfa234f757b370b46596f7c8d604e05d commit eff68b69dfa234f757b370b46596f7c8d604e05d Author: Ricardo Branco AuthorDate: 2024-03-16 17:13:10 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:16 +0000 mv: Set file flags after setting file times Some file flags prevent modification of file times, so they should be set later. This matches NetBSD's behaviour. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1138 (cherry picked from commit 428f86fd2ff1fd2b073d556fac273c8c7f457376) --- bin/mv/mv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1320f603b3c4..dba71f55e5dc 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -331,6 +331,12 @@ err: if (unlink(to)) */ preserve_fd_acls(from_fd, to_fd, from, to); (void)close(from_fd); + + ts[0] = sbp->st_atim; + ts[1] = sbp->st_mtim; + if (futimens(to_fd, ts)) + warn("%s: set times", to); + /* * XXX * NFS doesn't support chflags; ignore errors unless there's reason @@ -351,11 +357,6 @@ err: if (unlink(to)) } else warn("%s: cannot stat", to); - ts[0] = sbp->st_atim; - ts[1] = sbp->st_mtim; - if (futimens(to_fd, ts)) - warn("%s: set times", to); - if (close(to_fd)) { warn("%s", to); return (1); From nobody Thu Apr 25 13:20:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQGh9084qz5Hj1S; Thu, 25 Apr 2024 13:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQGh85yrcz3xs4; Thu, 25 Apr 2024 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=hbR9i8KIfR+OCH2ffcAab7esC3Nnb/YC/CZVutFUMI9S/Swzuc7tQUVLhO/RxcqCwzZEXJ 4/3IbRkIZQk0kszSR5vztGFV0yibsfhq9RDehtLjq/qopXcocjkxafjTWQlGRp+h11rR/j kNa21NmCZFYLUmBZ5gCvedWKOEuJ/CNa7S+LVkkhsvOi/vychQ0CA8nSXhTD9if8qxHozq XXPunPXGowpb+8Rx/IwA+QJnpOOzF37rqvvh9XLjFPJoZfaFLYdT/vVbGDpC8Msjlp+nVW o+0e/WgYGW6tP87XOij912ActPNC5Ywb8eVCaS4+Jdj0qxWZBK0uiRcER0m4Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051256; a=rsa-sha256; cv=none; b=wXoqQzUeTg0JEJbiiPoV7+S+u0GC0rZ4FB8zCWtn5On9nTwtRU8alT0IyXtpaejbXJIcxD kRROoAO9WaoEdw9h1TDuOpn6t1Q0PpaTfumTFU5EGXJvkV+7u3vLyevjPzPDCH2pFH7Ge3 ljBcPyIkPb0en0Uyo6RC1OSs465X3Rz9E7feyGH0bnc8AZ3j8LZAe+iBtZ5196H3f5m5m2 kQFQAz1oFXNGauAtBboiYiCi6EJYbgDYW9PPJRXQI4Cq1/aSrRoZEhyT8mfaSz3Wi+aUOk RP01XNj9TDLFv//AFL0b4zSOuXmUgRQ0eiSoQ1EgSfyHEiiv/Xcy+77qoIjQJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=K8TECUZ8vrFE4NY5dW3hWOIGOLehCu2bY4xxkKr0fKKJi/egh2l9p/QpHsxZJjbIlP8srW tknQpiU3EjMHux8FX6hO8QFKkjJErErDb/YD00QTKjpMfB06xLqiqmYWUecj+Hb+QhVvHx eO+ABx76p8RLie8dhbHNmMFwCwLI7uz3/lRl3477Asc6Kp4+AlDH4aFIXHTfBSZkkzoOV4 t8zUEihjpQlM4B2bgeZ0ZMUIS5Q/WfNWrBIN+83XgPv73EV2PS8wfxiH5YyWh4fGewVJUa XmHj+cQuCqpkb3w8R9lR4rBZcxJ0tNoSfZNVcP3U3Y3CtCHuvi1pue9WYVv82g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh85Zwsz11K2; Thu, 25 Apr 2024 13:20: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 43PDKuqb001782; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKuQp001779; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:56 GMT Message-Id: <202404251320.43PDKuQp001779@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: 32004d854a2d - stable/14 - nfsserver: Rate-limit messages about requests from unprivileged ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 commit 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Author: Mark Johnston AuthorDate: 2024-04-17 14:36:58 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:16 +0000 nfsserver: Rate-limit messages about requests from unprivileged ports If access from unreserved ports is disabled, then a remote host can cause an NFS server to log a message by sending a packet. This is useful for diagnosing problems but bad for resiliency in the case where the server is being spammed with a large number of rejected requests. Limit prints to once per second (racily). Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44819 (cherry picked from commit b7e4666d7b69c22699a9299687018a892a5dad5b) --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 25f9c05d6f0b..022f7403d28b 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -191,6 +191,12 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) port = ntohs(sin->sin_port); if (port >= IPPORT_RESERVED && nd.nd_procnum != NFSPROC_NULL) { + static struct timeval privport_ratecheck = { + .tv_sec = 0, .tv_usec = 0 + }; + static const struct timeval privport_ratecheck_int = { + .tv_sec = 1, .tv_usec = 0 + }; #ifdef INET6 char buf[INET6_ADDRSTRLEN]; #else @@ -208,15 +214,19 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) (buf)) #endif #endif - printf("NFS request from unprivileged port (%s:%d)\n", + if (ratecheck(&privport_ratecheck, + &privport_ratecheck_int)) { + printf( + "NFS request from unprivileged port (%s:%d)\n", #ifdef INET6 - sin->sin_family == AF_INET6 ? - ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : + sin->sin_family == AF_INET6 ? + ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : #if defined(KLD_MODULE) #undef ip6_sprintf #endif #endif - inet_ntoa_r(sin->sin_addr, buf), port); + inet_ntoa_r(sin->sin_addr, buf), port); + } svcerr_weakauth(rqst); svc_freereq(rqst); m_freem(nd.nd_mrep); From nobody Thu Apr 25 13:20:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQGhB55kdz5Hj1W; Thu, 25 Apr 2024 13:20: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 4VQGhB17vKz3xsD; Thu, 25 Apr 2024 13:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpuYknRT/8Ru1LLwJIh/upaLGPeaaBzJq0cH9XzQWyE=; b=LzFgCJAdOBJO8ByCQrO7qy7Fr4n3MZP8V0jYJWpJhj99iCiYuBvx41Nm5miy/qt+hwutbz HqeqFskaPQr7N0SsQeGtxQC5DxtynI+yaoyS4GCqqOo2KmlBE2QnPToNS5o1vj8dp5ySo8 3D2eKsXd1tUZAM+AXcPMZNhFI81X5i70z3sPP7m8kdohgb1yGrR6qNQAR7rL5Xq+OYXM/S RPjk0nTpKs7X/80ltRMEo46dhn46HHnzmDmcInRSReMk2XyT2YBpgTpcx8eUl+eBJfCiKa eK+s7Bim1YRxZHRA8dN/1K0UCWJ+ERX0b7iqSMa6WqPPEzDf8N1y1EbW06yeog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051258; a=rsa-sha256; cv=none; b=LyU2cM9ZLpBYg2itdcQ5mlJs7sdfHgmDCV/JsNTrYZi2DOIpLR6UCyU+7gOfuXMD7fMQSe VXhttJS89Ip5fjmMEm8A5CWsa7ob5zrbWFdpjHwX9fNQdVh+utjXvpzOTPxJZbAfFgledU AlgVvLUjZO7CUKOcbLPMvtpI6lMWnfevhoAaFg8n9cDc5Wtoj6/WTUKbSbhUtleijqFTas d5b1sHsVdlp+DWas6ISz473K4qWMS+Q3K4MM6owxdjpVZg3lKz8IG43CLPypwb2pwXOC5t bDA4M/XgNICifihNK8VR3sJ0Pg/WXmYVB0UczimWYdviRtrQZ5rNoiTla65AwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpuYknRT/8Ru1LLwJIh/upaLGPeaaBzJq0cH9XzQWyE=; b=wyadnSGfbmrVmjiMomoHMq0N9n6hx+/buLWvDPfAR5WbrtrL2Nf8lBLCJAncpAe2G3OfVF HYz9fpdCwZyjxBsOERhGltqtqUS2vCTCihJNHx2qOjdeY/56zp4dpWkWBVMFZHUECfmGTL dO1DFm3g180YNL5ihoUU4KPl1Z76M51KefoQyt+4XqRzbXkHp0VSCtyGUBhtwfb7V22J7I rfsqpqeHkyBEJEKBdhX5uOcwURjZFPD0vYsmU+TPGOX9VE9QwaLQ8UCzlbWwnX9gZCiD90 mT9ym0J0GJCNXrQjZND99WX4CVDq22Xr2Zz/CJCFnt45gOJNFlOpa9FJW/agtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh96bNPz11VF; Thu, 25 Apr 2024 13:20: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 43PDKvPf001831; Thu, 25 Apr 2024 13:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKvPL001828; Thu, 25 Apr 2024 13:20:57 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:57 GMT Message-Id: <202404251320.43PDKvPL001828@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: a2eaf1cdd625 - stable/14 - dumpon: fix set but not used 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2eaf1cdd62576be5e29155e4f10eeb4593e2992 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2eaf1cdd62576be5e29155e4f10eeb4593e2992 commit a2eaf1cdd62576be5e29155e4f10eeb4593e2992 Author: inkeliz AuthorDate: 2024-04-17 21:22:44 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:18 +0000 dumpon: fix set but not used variable Signed-off-by: inkeliz Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1178 (cherry picked from commit 464b1ab216d5f78054626524addf99f5c622da96) --- sbin/dumpon/dumpon.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 81144e33bc71..eb890e250fbb 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -475,20 +475,23 @@ main(int argc, char *argv[]) struct diocskerneldump_arg ndconf, *kdap; struct addrinfo hints, *res; const char *dev, *pubkeyfile, *server, *client, *gateway; - int ch, error, fd, cipher; + int ch, error, fd; bool gzip, list, netdump, zstd, insert, rflag; uint8_t ins_idx; +#ifdef HAVE_CRYPTO + int cipher = KERNELDUMP_ENC_NONE; +#endif gzip = list = netdump = zstd = insert = rflag = false; kdap = NULL; pubkeyfile = NULL; server = client = gateway = NULL; ins_idx = KDA_APPEND; - cipher = KERNELDUMP_ENC_NONE; while ((ch = getopt(argc, argv, "C:c:g:i:k:lrs:vZz")) != -1) switch ((char)ch) { case 'C': +#ifdef HAVE_CRYPTO if (strcasecmp(optarg, "chacha") == 0 || strcasecmp(optarg, "chacha20") == 0) cipher = KERNELDUMP_ENC_CHACHA20; @@ -499,6 +502,11 @@ main(int argc, char *argv[]) errx(EX_USAGE, "Unrecognized cipher algorithm " "'%s'", optarg); break; +#else + errx(EX_USAGE, + "Built without crypto support, -C is unhandled."); + break; +#endif case 'c': client = optarg; break; From nobody Thu Apr 25 13:46:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQHFw3D8Bz5Hlm3; Thu, 25 Apr 2024 13:46: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 4VQHFw2bnTz42mF; Thu, 25 Apr 2024 13:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714052804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOUl1pcMmpXk3NC/P9b+4PNp4eR9dqZd99QG9TjIQZc=; b=jOiWyVW7PzUQn0kJFMllUqAu4tZ54DJ62Dow0e5noYmOjZ518v0i+YaVWILt+rF2Kg3pFs p4A1ufyg0Gse1OOcGhiO8JwB4BFVaLZe24ZQax0zoL/TUfR+4pqEJNJ2EIBiyCTsJO6ka0 xDxZbbDUTf/OBtguYrx+0MfCplTR6Ybxfo96BEKv2OVY/fP+zBAEpjfX/ysWjUHRe8ejpw JU84y9m9VEIxh7EKGk7CYR7BaK6dTR7DypQneWjDb+VeNmWyFdOAEQHc1BLdRg7DeeQ1an VzK5OlPzPF4V/XK7ASiQxkDJx5xKWSjgiSjIgGLUrtNedd5X4o98bLyUjwONvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714052804; a=rsa-sha256; cv=none; b=kcIIIK29/uRMC9SK+oibgQs5bZji2iJYdwXET1xL58psxmCL3v+erspIwBGyGJzIOEloWu e4fLc3jbjMyFahqsDSFJ274Jfaz3FZUO8M8eQIInWi77hL5OJHO6Fg5JBKtNFpdofecaeE Qhxa8/CDGlf+nS8orBJX6vn6CPN/gIJIXua3X9/lkNPVA92C8SLTeTjsDiNF7+wOjcDZ36 Q/M5o5+sSTa56Ss1NaAbb2NBV/FElJaS01N1zBKthsldC+rCU5AjCu361Lj1b3kPDwpv9p zE+qgJAlYPQSxe7aRahZGOLtQLA3b660eKOtMeoslqTmwgRzkz7Cp3XgDPbDBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714052804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOUl1pcMmpXk3NC/P9b+4PNp4eR9dqZd99QG9TjIQZc=; b=RUwz/P01ATS1JFMa8bLUfGNg4qin3N0w+znWpFgY59w/hJAQqNRcF4/7WBQlFPzAkHEomS plcGMZ19EeOTlmqnzp/ed21WYuz7dOPw99W9g1fbqsOTXzLv2Ds1jfrPVBeZPwmti7FE3L QDKLbY8BYaP7Vc+AxBYQkYeNn9kiUVDTre2nVc2imrhhWPSkC9u628xseNg6c0VhGTMJO2 ogdrkuDDjId72CCAL1BnCbSIvPWMQtjWz9TmtXPKdseLFAfMa/V5EdP+/gzPmQhY6LW4ZJ VfW8Iswev+axLYixpQXaEwcuABzZfrwlTWg8bLKwAseoWdmEr7jcQ7xA9AIGdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQHFw2Bq2z12C4; Thu, 25 Apr 2024 13:46: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 43PDkimW043218; Thu, 25 Apr 2024 13:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDkihh043215; Thu, 25 Apr 2024 13:46:44 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:46:44 GMT Message-Id: <202404251346.43PDkihh043215@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: d66399326cb4 - main - kthread: Set *tdptr earlier in kproc_kthread_add() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d66399326cb4f89d1565fb62c1c07974886893c5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d66399326cb4f89d1565fb62c1c07974886893c5 commit d66399326cb4f89d1565fb62c1c07974886893c5 Author: Mark Johnston AuthorDate: 2024-04-25 13:35:38 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:35:38 +0000 kthread: Set *tdptr earlier in kproc_kthread_add() See commit ae77041e0714 ("kthread: Set *newtdp earlier in kthread_add1()") for details. That commit was incomplete since g_init()'s first call to kproc_kthread_add() will cause kproc_kthread_add() to take the `*procptr == NULL` branch, which avoids kthread_create(). To ensure that the thread pointer is initialized before the thread starts running, we have to start the kernel process with RFSTOPPED. We could perhaps go further and use RFSTOPPED only when tdptr != NULL, but it's probably better to have consistent behaviour. Reviewed by: olce, kib Reported by: syzbot+e91e798f3c088215ace6@syzkaller.appspotmail.com MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44927 --- sys/kern/kern_kthread.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 8a84fd70918d..97d10fdb394a 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -495,13 +495,21 @@ kproc_kthread_add(void (*func)(void *), void *arg, struct thread *td; if (*procptr == NULL) { + /* + * Use RFSTOPPED to ensure that *tdptr is initialized before the + * thread starts running. + */ error = kproc_create(func, arg, - procptr, flags, pages, "%s", procname); + procptr, flags | RFSTOPPED, pages, "%s", procname); if (error) return (error); td = FIRST_THREAD_IN_PROC(*procptr); if (tdptr) *tdptr = td; + if ((flags & RFSTOPPED) == 0) { + thread_lock(td); + sched_add(td, SRQ_BORING); + } va_start(ap, fmt); vsnprintf(td->td_name, sizeof(td->td_name), fmt, ap); va_end(ap); From nobody Thu Apr 25 15:44:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQKsT13QQz5Hyyp; Thu, 25 Apr 2024 15:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQKsT0b3Mz4Fds; Thu, 25 Apr 2024 15:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714059853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzPoe0aRUv4RH06DIp1U8IM65hMQTUpGY6sY+oM4VII=; b=cUZrKYBKJSWY4tsL7lncXB412dR4T8nvbz1wWUOirgE5zriXIGNe/rUZndEilZ8au3VbY9 FRatgkHKTY6daUPG25hLTaAaCpUwmu3/IG8//Dc8UvUEW+s34fY1GJWDf7ZZrAtiyehS6j gcSE9isXg58AjgQAFE72EOR2QQ57fVVgb8gEqBcAUsNVIPz6DFYuty133g95YYAWMUDZmt J9f2/1cNO0vB3J+MdNzkg33zcSRe1erm9a7xfdRBvDkznLd5ADAjbN2mVgpOV+dEgUpplW jbTNfSbE7qsonfVwrYdLs+6vGp2G91PAA8hdSs8nS8mPllBvm3CLtiFcQ9cfnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714059853; a=rsa-sha256; cv=none; b=bh5ujLbQB8SpTnMy8V5h8u5sa2Gr+Oq9EGCOqLYy6stVlTs0CWLZWucIb4IWaIbPhKC9Be UflDysoMW4fx8JSAcRpy91cbz5MVxBPm51LmVxETiMWee4bD4vYcP74EHAyLkCHshlYSfc +bhUD5kV4mE4wFzAiduKKQ3w5NdlE7FVAntIL8iyi4NJVZDJ/IBFpYtjFEhBzqGfv50dq0 1HUjE47/g/op2kIU5YzNmDaBPmVUg/sMizBjOQQU5SnqHfq7A9AT+k1jhcBHE4MmyuIEfE 2OxAh/pZ+Bgph4yUhtRrjNWk+AO1xNWgNk5kqr+R6Hwg7hoMJJ2iNnZ6bTtR8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714059853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzPoe0aRUv4RH06DIp1U8IM65hMQTUpGY6sY+oM4VII=; b=jJGc/t4CphybmIerF2NzICQFu0BB/w2NPqKS8P8VDi6eyt1bTuDgthK8lhoLFSvty+jmRV VV1wQQWrgCsWYCdzkylljOC5SYJ/RvJal0zfe8FY0Ch/oXkP6Wdcs2NO7sxH7nWJNBXXl1 JtSO9OOLXAYVPbE9FbSmCxtRbjatG9ISkJ+t+qRUY1Cbl1krPY0m71KCfSuvDR5FznQbju 22Bk40018eM14kGrIFWdriJqSXjuAjjvwxxk1MqlstNjMScfNzxOOnYSxfSjeLq5m+zCha IDpvA+Uyf8PLnm8GiC69okNFPAEgGdga3ft3v25EeCm+VrDy3GiI20EC8PBh9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQKsT0Bchz155P; Thu, 25 Apr 2024 15:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43PFiCxV044920; Thu, 25 Apr 2024 15:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PFiCRX044917; Thu, 25 Apr 2024 15:44:12 GMT (envelope-from git) Date: Thu, 25 Apr 2024 15:44:12 GMT Message-Id: <202404251544.43PFiCRX044917@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: 514773a5486d - main - Skip building libclang_rt when WITHOUT_CLANG is used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 514773a5486d1fa4f2d5acb5af1766965c20765b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=514773a5486d1fa4f2d5acb5af1766965c20765b commit 514773a5486d1fa4f2d5acb5af1766965c20765b Author: Dimitry Andric AuthorDate: 2024-04-25 15:05:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-25 15:05:29 +0000 Skip building libclang_rt when WITHOUT_CLANG is used As noted in bug 277096, when building a pkgbase repository using WITHOUT_CROSS_COMPILER and WITHOUT_TOOLCHAIN (which sets WITHOUT_CLANG), the following residual files are left over: /usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.so /usr/lib/clang/18/share/asan_ignore_list.txt /usr/lib/clang/18/share/cfi_ignore_list.txt /usr/lib/clang/18/share/msan_ignore_list.txt This is because the lib/libclang_rt directory is still descended into, even if WITHOUT_CLANG is used. Fix it by not descending into the libclang_rt directory in that case. PR: 277096 Reported by: Siva Mahadevan MFC after: 3 days --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index cd1476a62d35..6135cff10c15 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -182,7 +182,7 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # The libraries under libclang_rt can only be built by clang. -.if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_TYPE} == "clang" && ${MK_CLANG} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries! From nobody Thu Apr 25 16:45:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQMD66Zd9z5J5qD; Thu, 25 Apr 2024 16:45: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 4VQMD65xtsz4LKs; Thu, 25 Apr 2024 16:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714063526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKGvvA/ZyV9A7wgRHVE7lNYQtE9dqKBfsZvKGpehPMo=; b=UI8nyRNPQ3pe9RagCB5ZrbwEY/JRF7j58Lm242z3aL2v0QCI/3qWJG7p/23boEjrKAQmD9 2xH3pk5JxCOgQfClR3CDmOpqsriMV9UimmceQbhMvsP6KUtky9mJDGwLPR0mfpOQnor3BW cNAi00ZgFV3qmXPu0hRs58duCBZihryjhExIbGzNQiVLl70RhR9j+LYwwen2hrK8LFLNUt GjCNjRTeewOansavH2d0ineBUy2v1WK/9HjpT3FUR0WUyMDASsKmZeHEoMSq0Pyy3jh/5t PQWbfFP1QicHvsi7STCV7QSeKeOH/aakDK4irrExKTV3UvX244DNXQgd/FpGhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714063526; a=rsa-sha256; cv=none; b=LSFcW5z14Hr5htTSIOMrxwEtWTN/HpJT1d/C4r2maRuf7sIH+PijkHK4MIlaN3DIxxbk8M uw6t1hQR7SAgH8wMrp3m2i3lB4ozcX7NPgue5rLY3/4yGDCX2qp+ZZB//adVjKMjVE1kva iYs00CxKqwiaa49vFZBAeThahjK4S400Bw9wG3s5ZgO+Yxayz3LEKlk0Gel8R3nIevvNO+ bJ28cgM9KD/nZTv6lLF8VGd5gFTxdO52eY4zyyKOgg+jNjG+OLg7ZrHow6nB+A0apXaInj fv+cuLQlDAJax/27F4w7KjYRpNVvxtnGzy4LgctpDNwHIolE6apTFohuFgh0fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714063526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKGvvA/ZyV9A7wgRHVE7lNYQtE9dqKBfsZvKGpehPMo=; b=E108arSe2GvIQQBL4eKBBGclTJQRDkL4d9Lh7UaFnsx9SGpo1ZzyHZvFcUPm42LwHjOjbp 8/jprpNZrTq9NlGdxt6oSb6xJpnvH/QOXlB219aJOnDA+zusoyzZneYiA978PcMbLMJI/g xVtlm85ula0PDgZB9hpZVK2RGjrxx1EtXmGZyR88G1NmJ8OLjCbSIsOvvtLceBVQrj9Jro IkpmHllmpeoOdpklGyLWtmwfzl/0QO9bleU+UmMyT1Su9HbXTk24J59XPOZ+79aPnTX/fS eWqwwbmAl6IdLXnaMvU1xm2PwJaWJnHcbjOgDPc3T6Oer9l2eLm/DFXkWThBRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQMD65Xtgz161b; Thu, 25 Apr 2024 16:45: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 43PGjQ22046715; Thu, 25 Apr 2024 16:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PGjQjF046713; Thu, 25 Apr 2024 16:45:26 GMT (envelope-from git) Date: Thu, 25 Apr 2024 16:45:26 GMT Message-Id: <202404251645.43PGjQjF046713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 54c3aa02e926 - main - Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54c3aa02e926268ba5551cd7d28fddf38b3589a2 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=54c3aa02e926268ba5551cd7d28fddf38b3589a2 commit 54c3aa02e926268ba5551cd7d28fddf38b3589a2 Author: Rick Macklem AuthorDate: 2024-04-25 16:41:23 +0000 Commit: Rick Macklem CommitDate: 2024-04-25 16:41:23 +0000 Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" This reverts commit f300335d9aebf2e99862bf783978bd44ede23550. It turns out that the old code was correct and it was wireshark that was broken and indicated that the RPC's XDR was bogus. Found during IETF bakeathon testing this week. --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++-------- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 899e88508b60..8141ee6cbdb6 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3003,18 +3003,12 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == + NFSV4OPEN_CLAIMDELEGATECURFH) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; - } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { - /* Fill in most of the stateid from the clientid. */ - stateid.seqid = 0; - stateid.other[0] = clientid.lval[0]; - stateid.other[1] = clientid.lval[1]; - stateid.other[2] = 0; - stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index da57ebde7a52..c73840277022 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,10 +2568,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2582,8 +2578,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2834,10 +2830,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2848,8 +2840,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Thu Apr 25 16:47:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQMH33l8xz5J5wR; Thu, 25 Apr 2024 16:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQMH33DJCz4LZr; Thu, 25 Apr 2024 16:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714063679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtCIOnjJRf0w2s2OsYdd9l/8ZjtGJcLFMtHKJzp2kNs=; b=d3/Ecsur5SeRUIgaxOLK/zD+XfnOYG/N35y7qFm4dg8LE8jF+U+61m/gECVbvpRsyc2z3l ZzHFVveD8x1I8aPgU/Y9ougD8pxJpZNCuqCsHFPG/xB0PFWtT/5paqfB0gKrLvQ9+5AEtH Ifw4rR5kyRg1ne533qWaQP+WKDAIJfw5F5eP54sBetZkvR/FRRXNy5eWmLbsIzjQQTtA9Y qIjx9hd2oWxbnfiyy66SjQSLm0TTzQDQPLlbHH5jSSbOv5KtO6tSplkFEI5lsLKtjdyCqh S+RqkClNzfhOa+Jb7asdiwgmDI4JtGfG72sYBPOw6gVkTLABq31NPX0MUpVnJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714063679; a=rsa-sha256; cv=none; b=cLmci8TnFpLIPeHBw2QDbu9FQ3In0ciZgx/+5rCrayZX9gehsNdaJ7vewrNirItTM2em9B ZxhKw6gIPdYQ93E+VP6nyibXhbfA0mnR9E846njjUiw3fg1iJhKKwrHaZMGTK1P7XeYwUa YMmKrXJadHN9/uQANsZ7utYNKJEaOMlq0/d54xzgZjuqD7eHGoqboqRv4WS3RonhImpYXV RPryWu9XG9tAhwupe8zbyXgzZCo10gYMRmpgXHT2AccynBIm0aUtm4MwG4uBAOLi3qO+2J nnxBy3+TOio+AVO86naFTSYmb24aH9IqvlCUETQ8kws1hKM0drjQDwgaZGxQvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714063679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtCIOnjJRf0w2s2OsYdd9l/8ZjtGJcLFMtHKJzp2kNs=; b=O6s0Fk0ahYHjiQVE40Zis7xg5PxgvE7uOiildHUVbgH+AmsYfUJmyq6bZWZeV5Z1pxpcnM 10XoPNtqDQGKNuF5qwP0wnKqsduy5vA7EpmfnNJ0PLxjycBU2kYIHLqAfnAVqff6NhQRoU fxTJB+NwPGsFYS2deK+RgRsYEh67oalq0jMS3mbw92l7PA8aL1hllC33IPvAr/l7uDGmXq Vz6yx1jKq/LS5+Jtx+ntsQRpX2lkY0PAA93FmXr3rY2VAq3SA7/Li2aBt5/y2JwUsYu+Cc Wsqr0eXbP/dTZw6+ex7hp1AyuTi7Z36QYxOEwgVvnmE4OtPKxpqiqHZrBhKFPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQMH32qWZz16Hc; Thu, 25 Apr 2024 16:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43PGlxig047247; Thu, 25 Apr 2024 16:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PGlxn7047244; Thu, 25 Apr 2024 16:47:59 GMT (envelope-from git) Date: Thu, 25 Apr 2024 16:47:59 GMT Message-Id: <202404251647.43PGlxn7047244@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: f08bf5a3acf1 - main - Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f08bf5a3acf146b17794fbde41279645ddbaa086 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f08bf5a3acf146b17794fbde41279645ddbaa086 commit f08bf5a3acf146b17794fbde41279645ddbaa086 Author: Dimitry Andric AuthorDate: 2024-04-25 16:47:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-25 16:47:47 +0000 Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): [sanitizer_symbolizer] Cast arguments for format strings in markup (#89815) When compiling the common sanitizer libraries, there are many warnings about format specifiers, similar to: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 31 | buffer->AppendF(kFormatData, DI->start); | ~~~~~~~~~~~ ^~~~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here 33 | constexpr const char *kFormatData = "{{{data:%p}}}"; | ^~ | %lu compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 46 | buffer->AppendF(kFormatFrame, frame_no, address); | ~~~~~~~~~~~~ ^~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here 36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; | ^~ | %lu ... This is because `uptr` is dependent on the platform, and can be either `unsigned long long`, `unsigned long`, or `unsigned int`. To fix the warnings, cast the arguments to the expected type of the format strings. PR: 276104 Reported by: pstef MFC after: 3 days --- .../lib/sanitizer_common/sanitizer_symbolizer_markup.cpp | 10 ++++++---- .../sanitizer_common/sanitizer_symbolizer_markup_constants.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp index b2a1069a9a61..31d91ef3c739 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp @@ -28,7 +28,7 @@ void MarkupStackTracePrinter::RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix) { RenderContext(buffer); - buffer->AppendF(kFormatData, DI->start); + buffer->AppendF(kFormatData, reinterpret_cast(DI->start)); } bool MarkupStackTracePrinter::RenderNeedsSymbolization(const char *format) { @@ -43,12 +43,13 @@ void MarkupStackTracePrinter::RenderFrame(InternalScopedString *buffer, const char *strip_path_prefix) { CHECK(!RenderNeedsSymbolization(format)); RenderContext(buffer); - buffer->AppendF(kFormatFrame, frame_no, address); + buffer->AppendF(kFormatFrame, frame_no, reinterpret_cast(address)); } bool MarkupSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *stack) { char buffer[kFormatFunctionMax]; - internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr); + internal_snprintf(buffer, sizeof(buffer), kFormatFunction, + reinterpret_cast(addr)); stack->info.function = internal_strdup(buffer); return true; } @@ -118,7 +119,8 @@ static void RenderMmaps(InternalScopedString *buffer, // module.base_address == dlpi_addr // range.beg == dlpi_addr + p_vaddr // relative address == p_vaddr == range.beg - module.base_address - buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId, + buffer->AppendF(kFormatMmap, reinterpret_cast(range.beg), + range.end - range.beg, static_cast(moduleId), accessBuffer.data(), range.beg - module.base_address()); buffer->Append("\n"); diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h index 83643504e128..a43661eaecf2 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h @@ -33,13 +33,13 @@ constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex. constexpr const char *kFormatData = "{{{data:%p}}}"; // One frame in a backtrace (printed on a line by itself). -constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; +constexpr const char *kFormatFrame = "{{{bt:%d:%p}}}"; // Module contextual element. -constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}"; +constexpr const char *kFormatModule = "{{{module:%zu:%s:elf:%s}}}"; // mmap for a module segment. -constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}"; +constexpr const char *kFormatMmap = "{{{mmap:%p:0x%zx:load:%d:%s:0x%zx}}}"; // Dump trigger element. #define FORMAT_DUMPFILE "{{{dumpfile:%s:%s}}}" From nobody Thu Apr 25 17:45:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQNYD5G9bz5JCZ6; Thu, 25 Apr 2024 17: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 4VQNYD4jydz4SQh; Thu, 25 Apr 2024 17: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=1714067120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCnRvd5pJsiJ3UMZYI/wOkif5GMgQpXCWuPB5pmVzrA=; b=IY0ohuckMdVwVI7vt21fsWc+k0aN547ga7QNO7A/dj0b7V1MD9jDSLomtQ3807sA10k3F3 1hxjFa7RIq/dIexGNAoUbT+7vuk9ghoqPCmFErQhDg2xUbcszmeeJXCHF1MWCvZmrItQYt 4aCXICdLpxS0TJKoNxWNL37+oFb7TmKw49r4MEKPkPTwwYnes5luvth2/rm0IMbf1eHCrq 4nLPzMLi1jttZtaYfSPzq+/dABwSB9EIC8YUWuWlb5Pig/CJEOvnrCW9O4MNALpGLi4WHC FqRAqA4mO1Vkpdj2/ZrMfeAmYjTzG9CvQ0Yg7p5R2Ac1QYl/TWoS0k9Ke9uZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714067120; a=rsa-sha256; cv=none; b=wOL80MPJlcXPBhDqOGdXHQofCtl+Tj7R+o31jUeN7rII9aMAp98s4JhwYNc3QcEMZ9feeQ xwqBcrPLze+9ipbx9Cc+oBuCuwwIeVSDT4j4lmF/gCyty7zdlehF9XTLI/eg97gpZEPT7z fM/Q7+bDNbSX/TPiF6075PUGOjhVVJm0x5C4WGud7wTS4lo0Ev14z9SI6U/FF6AlmvEhkT XXYHpQ8FTrlO5rwSoJCX7kpGRSBj/hDtDyTtJJMozHraDlsU6Was/GE687SyPsRtIrBmGN 7Q3sL15VBJrv1aDVVmTSv4F8V3TllWF9zgDh2IqCZ4gHbE7qzi4aW59ZnpZCLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714067120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCnRvd5pJsiJ3UMZYI/wOkif5GMgQpXCWuPB5pmVzrA=; b=H1JxbS/VDkgOk8SY7TsI+6JO/nccTwHMU9rdRC5vHgO6KixYU78qdoik236lXrvtnuXebV +CnMnDSZgGW/JM1vy2oL2yhPWGcDqZdf+grg75+LnQe33cZkTt5Lh6+OP9QGUM0sPEaC11 LKaxwlYsBMtikYNAMjCffzWPpzQK2IByyxXfc9fOh2B81MFir1DkawKOCy0057Jn/bgMho m096on2hiKKxBOEYXWsEAw9PxpvC26uFPg0GU36BcbOkE+dBstbahiDP99mf6FovGHYHWF FcHuvcL49kBi61ZSfh3neeTZtsMR4kZFPFlZfEoRV2yBe4wtkXFIfJeh9Op7Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQNYD4KY4z17g1; Thu, 25 Apr 2024 17: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 43PHjKTd047541; Thu, 25 Apr 2024 17: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 43PHjK82047538; Thu, 25 Apr 2024 17:45:20 GMT (envelope-from git) Date: Thu, 25 Apr 2024 17:45:20 GMT Message-Id: <202404251745.43PHjK82047538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ad31d4764255 - main - bsdinstall: update comment related to pkg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad31d4764255c0848f1f0fa10760d16b5a2922aa Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad31d4764255c0848f1f0fa10760d16b5a2922aa commit ad31d4764255c0848f1f0fa10760d16b5a2922aa Author: Bjoern A. Zeeb AuthorDate: 2024-04-25 14:47:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-25 17:44:18 +0000 bsdinstall: update comment related to pkg pkg_add has been gone since 2013(?). Refer to pkg(8) instead. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D44946 --- usr.sbin/bsdinstall/scripts/docsinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/docsinstall b/usr.sbin/bsdinstall/scripts/docsinstall index 8d22fdaa07b6..68a5798b0493 100755 --- a/usr.sbin/bsdinstall/scripts/docsinstall +++ b/usr.sbin/bsdinstall/scripts/docsinstall @@ -148,7 +148,7 @@ f_mustberoot_init dialog_menu_main || f_die f_dialog_menutag_fetch selected -# Let pkg_add be able to use name servers +# Let pkg(8) be able to use name servers f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/ # From nobody Thu Apr 25 18:20:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQPKJ6N78z5JGd6; Thu, 25 Apr 2024 18:20: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 4VQPKJ5mB6z4XSm; Thu, 25 Apr 2024 18:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714069204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJfAxlyIH6GOkYoyS9urg9ASSRBlkzlhQyK3NZIwdqI=; b=A9ZXEVIoDPgNBXLzW6SddBiMGCcuUuHnPBr9QsQolJcMMHqaX5DIpzQ2XzDYKqoFYnB1Wo kdpWStHMg3+7pAu5vaIYCC6nk37lT9tQYPpB5JCjZo/5z/jPU3mDx+8WMsE724M3bYv9Tr /acXPYSN4cu2sA0bc6RnAesmPmtMNRCHCQAIFHOFDQHyqo+UZKYzp+35dIOb6Tt9W12uQP Q9TcjiGOA7qLm/GEaf+BmFmpT3GXVCYKoJpNB5UvDqFa4qwku8sWsMyIbGZnNee6mmRT+b 0k6JpQIgBEaRPAOgl/9tnETP0vaRJELo3kb6TRW5+enaxjpPZ2f4hMZUeME6lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714069204; a=rsa-sha256; cv=none; b=cB6yf15ETRo8IwaWXWXvj06qgtbefAF1nvTpxIrl4lmMRDfx0cV/88VrLY+vdJZnAvRTDv L1Q/QVm3FG0oj/lR7+DC8EvrRlAQRIV0tXC5vm8ouwEKyCWKTY0QWvHzhPx3MvHaGSMEcs a5L2wnnjWL+IZVDFsM9jsbJhDyHaClobVuESkUuHUQz3UNZu7LnyvsW8s37R/ekBPEoUFE OlkU0Zyln3wRPTCaytQFjjjm1IM3yOvgtA1U3BS3Q9zTDDrsTTU9toodhX/8pSsFNXMTZt 4YE6GB5O/4nz1qe1NqLUg+Ukb5vuV71pzBx8tJKw7Igvcucr2EOuUzvSon07Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714069204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJfAxlyIH6GOkYoyS9urg9ASSRBlkzlhQyK3NZIwdqI=; b=Tt+mGhkoZDTlLZKMId/EyjlJAtCc3GdDR2wDQYIKbLMUNgz7RcWeY3ZFMFMY+u73TpJpKq 4yKGl9jhMtH8sJLPqrbwDDm0EmVkUkMKmjlWOlETmRmuHdHqxfDvE+6oqterawLYjIw+J8 sCduEeVRqnNzw1h/nNVLU4Xir/XZI1s1io6Q0AVYxn51cPe3Wwq9y778QzF79d0dzvVjS2 hodW6xm2oAnlLsT5qM5LB3p6aCSBCQqpeL7yQ68bGiq/xWkFlTWKaEIbbrnSQhV2LI4eOi ywvK1YyM055kWHYsje025ec/q1fcLl/RvTuduAY68bWAf9InrXhFddtUcWePcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQPKJ4yB5z18TC; Thu, 25 Apr 2024 18:20: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 43PIK4Qp001532; Thu, 25 Apr 2024 18:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PIK4BO001528; Thu, 25 Apr 2024 18:20:04 GMT (envelope-from git) Date: Thu, 25 Apr 2024 18:20:04 GMT Message-Id: <202404251820.43PIK4BO001528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 73585176ffd8 - main - if_bridge: Minor style 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73585176ffd84c13d68cad67c2ca81643f09075c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=73585176ffd84c13d68cad67c2ca81643f09075c commit 73585176ffd84c13d68cad67c2ca81643f09075c Author: Zhenlei Huang AuthorDate: 2024-04-25 18:19:11 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-25 18:19:11 +0000 if_bridge: Minor style fixes And more comments on the #ifdef INET blocks to improve readability. While here, revert the order of two prototypes to produce minimal diff compared to stable branches. MFC with: 65767e6126a7 --- sys/net/if_bridge.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 7b44d85d1fe8..1e6f9b578ee3 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -403,19 +403,16 @@ static int bridge_ioctl_sproto(struct bridge_softc *, void *); static int bridge_ioctl_stxhc(struct bridge_softc *, void *); static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *, int); -static void bridge_linkstate(struct ifnet *ifp); -static void bridge_linkcheck(struct bridge_softc *sc); - #ifdef INET static int bridge_ip_checkbasic(struct mbuf **mp); static int bridge_fragment(struct ifnet *, struct mbuf **mp, struct ether_header *, int, struct llc *); #endif /* INET */ - #ifdef INET6 static int bridge_ip6_checkbasic(struct mbuf **mp); #endif /* INET6 */ - +static void bridge_linkstate(struct ifnet *ifp); +static void bridge_linkcheck(struct bridge_softc *sc); /* * Use the "null" value from IEEE 802.1Q-2014 Table 9-2 @@ -3459,7 +3456,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) if (V_pfil_ipfw_arp == 0) return (0); /* Automatically pass */ - /*FALLTHROUGH*/ + /* FALLTHROUGH */ case ETHERTYPE_IP: #endif #ifdef INET6 @@ -3587,8 +3584,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir) ip->ip_sum = in_cksum(*mp, hlen); break; -#endif - +#endif /* INET */ #ifdef INET6 case ETHERTYPE_IPV6: if (V_pfil_bridge && dir == PFIL_OUT && bifp != NULL && (rv = @@ -3747,7 +3743,7 @@ bad: *mp = m; return (-1); } -#endif +#endif /* INET */ #ifdef INET6 /* @@ -3880,7 +3876,7 @@ dropit: } return (error); } -#endif +#endif /* INET */ static void bridge_linkstate(struct ifnet *ifp) From nobody Thu Apr 25 18:36:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQPh83Xg9z5JJBJ; Thu, 25 Apr 2024 18:36: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 4VQPh82p5Nz4YTR; Thu, 25 Apr 2024 18:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlU5vc89ZJ9riQpFAqceaGMi6PUwkjXcgXSb+iX4g9U=; b=cWyqZjY/ntn1H33Ahx4CkTlv/6BiFjOD3QJLXie0jYwT/EYGyuxZG5PPjhlGiLd6dzdSyh 79AYsuIPXGOfNTm9JS4YDUv88ho6lxX03kVO2wrxdDkGmb+/sGfwM7rgu3M3lgWsBkIAp5 RSnntIgslxpJUllCMQB1muEhHHES9c74ZsnjaWsqgrv/GaqtSu7eaCO4/AsnKWa5aHkBo/ ejzxo8NM0gKeFfqSZArWdBjY7fO+YKV/XJHJYedsYPLCbpyC/GuwfWYrJ3fR3t0dwW7ZZr wdmHEsJwjeEVLvwERyeIZs2QMc63cvpabIHiq3KKgyqZE2JxmXdCJLU+NnBMuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714070184; a=rsa-sha256; cv=none; b=OBkOB836fFqFaG1JGF4xTEkrFMHqbAP+SC6h+60w5d2HaRxMI4IenSFzeyIvSkdst9nPtJ 0DJMZsZ/BylsnmVZ/ogeBiQs6eA+eEknBZl3wB4DTXNMvBWe0qCjI0vp2Fb2rAmESmU+lL LxTlqjjVX90CkU8YSlyHv01Z9LzF6SF7rbq7j+/jbZX81fc0DL2fLLQ16yPPI7YtWGcryI 3DaMACqTBb0gLXRtDnYhDYxbf12c51HtLcWsla3KUI81yBxt5R3ZEf4bqjwyXsS89ydQdj in18E4F7BygSs3bioHn67DAsYdZcux/pI7af8MM8PBLeNr2Npj8M0ju+quM4UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlU5vc89ZJ9riQpFAqceaGMi6PUwkjXcgXSb+iX4g9U=; b=aiJW+TqHJCrWEkZCfkSu9Q7PDe+nFk/E7d4B92bThU/tkRELX2oTSmRrqP8L3NPwkb4+VK iYSs/mmh3iRZlT64nmeScLsAz2RyjINeD+vJIk84tQ5KgmnxpeDe5j7Xr3G/LVv2mxbaqV M3FXsD36+VA5zv+D/m4H9QQcJ5RJV36vSRmv0idFo9JQMF7a67NfH4lDYlWqyZJqQmbFSN 5NXbcA75WIVbSXd3zYbGaY51SiGukxQr8HRERYeI06HCjjteHEktSxPCZRRDQwaGPJEdAE MzmItp7FRvmc1F7T1EJf5d7nlBximJT9pRm/yt1OiQNCIDyn4FfsAq3AdTqoGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQPh82PSHz18jB; Thu, 25 Apr 2024 18:36: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 43PIaOD4032759; Thu, 25 Apr 2024 18:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PIaO1i032756; Thu, 25 Apr 2024 18:36:24 GMT (envelope-from git) Date: Thu, 25 Apr 2024 18:36:24 GMT Message-Id: <202404251836.43PIaO1i032756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1ed44fcc44b2 - main - tftpd: Use `size_t` where appropriate. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1ed44fcc44b2c04db330663589541608135402f4 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed44fcc44b2c04db330663589541608135402f4 commit 1ed44fcc44b2c04db330663589541608135402f4 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-25 18:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-25 18:36:12 +0000 tftpd: Use `size_t` where appropriate. * Limit the use of `ssize_t` to only where it's needed. * Correct one case of `int` being used for a length. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44954 --- libexec/tftpd/tests/functional.c | 52 ++++++++++++++++++++++++---------------- libexec/tftpd/tftp-utils.c | 4 ++-- libexec/tftpd/tftp-utils.h | 2 +- libexec/tftpd/tftpd.c | 16 ++++++------- 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 0bdbcfe559ed..bf7b5c77c898 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -51,8 +51,8 @@ static bool s_flag = false; /* Pass -s to tftpd */ static bool w_flag = false; /* Pass -w to tftpd */ /* Helper functions*/ -static void require_bufeq(const char *expected, ssize_t expected_len, - const char *actual, ssize_t len); +static void require_bufeq(const char *expected, size_t expected_len, + const char *actual, size_t len); /* * Receive a response from tftpd @@ -68,7 +68,7 @@ static void require_bufeq(const char *expected, ssize_t expected_len, (struct sockaddr*)&from, &fromlen); \ ATF_REQUIRE(r > 0); \ require_bufeq((hdr), sizeof(hdr), buffer, \ - MIN(r, (ssize_t)sizeof(hdr))); \ + MIN((size_t)r, sizeof(hdr))); \ require_bufeq((const char*) (contents), (contents_len), \ &buffer[sizeof(hdr)], r - sizeof(hdr)); \ if (protocol == PF_INET) { \ @@ -117,12 +117,13 @@ recv_data(uint16_t blocknum, const char* contents, size_t contents_len) * @param cmd Command to send, as a char array */ static void -send_bytes(const void* cmd, ssize_t len) +send_bytes(const void *cmd, size_t len) { ssize_t r; r = sendto(s, cmd, len, 0, (struct sockaddr*)(&addr), addr.ss_len); - ATF_REQUIRE_EQ(r, len); + ATF_REQUIRE(r >= 0); + ATF_REQUIRE_EQ(len, (size_t)r); } static void @@ -261,16 +262,16 @@ cleanup(void) /* Assert that two binary buffers are identical */ static void -require_bufeq(const char *expected, ssize_t expected_len, const char *actual, - ssize_t len) +require_bufeq(const char *expected, size_t expected_len, const char *actual, + size_t len) { - ssize_t i; + size_t i; ATF_REQUIRE_EQ_MSG(expected_len, len, - "Expected %zd bytes but got %zd", expected_len, len); + "Expected %zu bytes but got %zu", expected_len, len); for (i = 0; i < len; i++) { ATF_REQUIRE_EQ_MSG(actual[i], expected[i], - "Expected %#hhx at position %zd; got %hhx instead", + "Expected %#hhx at position %zu; got %hhx instead", expected[i], i, actual[i]); } } @@ -391,8 +392,8 @@ write_all(int fd, const void *buf, size_t nbytes) while (nbytes > 0) { r = write(fd, buf, nbytes); ATF_REQUIRE(r > 0); - nbytes -= r; - buf = (const char*)buf + r; + nbytes -= (size_t)r; + buf = (const char*)buf + (size_t)r; } } @@ -804,8 +805,9 @@ TFTPD_TC_DEFINE(w_flag,, w_flag = 1;) fd = open("small.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq(contents, contents_len, buffer, r); + require_bufeq(contents, contents_len, buffer, (size_t)r); } /* @@ -841,8 +843,9 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,) fd = open("medium.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, r); + require_bufeq((const char*)contents, 768, buffer, (size_t)r); } /* @@ -874,8 +877,9 @@ TFTPD_TC_DEFINE(wrq_dropped_data,) fd = open("small.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq(contents, contents_len, buffer, r); + require_bufeq(contents, contents_len, buffer, (size_t)r); } /* @@ -908,8 +912,9 @@ TFTPD_TC_DEFINE(wrq_duped_data,) fd = open("medium.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, r); + require_bufeq((const char*)contents, 768, buffer, (size_t)r); } /* @@ -972,8 +977,9 @@ TFTPD_TC_DEFINE(wrq_medium,) fd = open("medium.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, r); + require_bufeq((const char*)contents, 768, buffer, (size_t)r); } /* @@ -1004,8 +1010,9 @@ TFTPD_TC_DEFINE(wrq_medium_window,) fd = open("medium.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, r); + require_bufeq((const char*)contents, 768, buffer, (size_t)r); } /* @@ -1037,8 +1044,9 @@ TFTPD_TC_DEFINE(wrq_netascii,) fd = open("unix.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq(expected, sizeof(expected), buffer, r); + require_bufeq(expected, sizeof(expected), buffer, (size_t)r); } /* @@ -1075,8 +1083,9 @@ TFTPD_TC_DEFINE(wrq_small,) fd = open("small.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq(contents, contents_len, buffer, r); + require_bufeq(contents, contents_len, buffer, (size_t)r); } /* @@ -1162,8 +1171,9 @@ TFTPD_TC_DEFINE(wrq_window_rfc7440,) fd = open("rfc7440.txt", O_RDONLY); ATF_REQUIRE(fd >= 0); r = read(fd, buffer, sizeof(buffer)); + ATF_REQUIRE(r > 0); close(fd); - require_bufeq(contents, sizeof(contents), buffer, r); + require_bufeq(contents, sizeof(contents), buffer, (size_t)r); } diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c index 9754c3238d50..b309a94f7653 100644 --- a/libexec/tftpd/tftp-utils.c +++ b/libexec/tftpd/tftp-utils.c @@ -104,8 +104,8 @@ unmappedaddr(struct sockaddr_in6 *sin6) } /* Get a field from a \0 separated string */ -ssize_t -get_field(int peer, char *buffer, ssize_t size) +size_t +get_field(int peer, char *buffer, size_t size) { char *cp = buffer; diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h index 3fecf1fc8696..763b3b493c7e 100644 --- a/libexec/tftpd/tftp-utils.h +++ b/libexec/tftpd/tftp-utils.h @@ -63,7 +63,7 @@ extern int acting_as_client; /* */ void unmappedaddr(struct sockaddr_in6 *sin6); -ssize_t get_field(int peer, char *buffer, ssize_t size); +size_t get_field(int peer, char *buffer, size_t size); /* * Packet types diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 9b56029797ec..45e7344c86ed 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -68,8 +68,8 @@ #include #endif -static void tftp_wrq(int peer, char *, ssize_t); -static void tftp_rrq(int peer, char *, ssize_t); +static void tftp_wrq(int peer, char *, size_t); +static void tftp_rrq(int peer, char *, size_t); /* * Null-terminated directory prefix list for absolute pathname requests and @@ -81,7 +81,7 @@ static void tftp_rrq(int peer, char *, ssize_t); #define MAXDIRS 20 static struct dirlist { const char *name; - int len; + size_t len; } dirs[MAXDIRS+1]; static int suppress_naks; static int logging; @@ -392,7 +392,7 @@ main(int argc, char *argv[]) tp->th_opcode = ntohs(tp->th_opcode); if (tp->th_opcode == RRQ) { if (allow_ro) - tftp_rrq(peer, tp->th_stuff, n - 1); + tftp_rrq(peer, tp->th_stuff, (size_t)n - 1); else { tftp_log(LOG_WARNING, "%s read access denied", peername); @@ -400,7 +400,7 @@ main(int argc, char *argv[]) } } else if (tp->th_opcode == WRQ) { if (allow_wo) - tftp_wrq(peer, tp->th_stuff, n - 1); + tftp_wrq(peer, tp->th_stuff, (size_t)n - 1); else { tftp_log(LOG_WARNING, "%s write access denied", peername); @@ -443,7 +443,7 @@ reduce_path(char *fn) } static char * -parse_header(int peer, char *recvbuffer, ssize_t size, +parse_header(int peer, char *recvbuffer, size_t size, char **filename, char **mode) { char *cp; @@ -489,7 +489,7 @@ parse_header(int peer, char *recvbuffer, ssize_t size, * WRQ - receive a file from the client */ void -tftp_wrq(int peer, char *recvbuffer, ssize_t size) +tftp_wrq(int peer, char *recvbuffer, size_t size) { char *cp; int has_options = 0, ecode; @@ -534,7 +534,7 @@ tftp_wrq(int peer, char *recvbuffer, ssize_t size) * RRQ - send a file to the client */ void -tftp_rrq(int peer, char *recvbuffer, ssize_t size) +tftp_rrq(int peer, char *recvbuffer, size_t size) { char *cp; int has_options = 0, ecode; From nobody Thu Apr 25 18:36:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQPh94RSHz5JJ6N; Thu, 25 Apr 2024 18:36: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 4VQPh93LxJz4YlS; Thu, 25 Apr 2024 18:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoyYLNA1oJxfFnMkhm4qKC2wdRetqzMGiA771B+BEvs=; b=LqBQvG21XAK23TrJ5f6k0S9nDYPinoE1mnN4VQx0BkKEWQnv4k3eqGdUhwDBdB+sLkQqBV fpE5L+eRZs9Q5PnKq2d+TsLdwUayoQp0l6cW4RSaqiVQvP8kUG/qEJ9SvLt6YfXxOmyu8g OxUPmW/Y7cmXTvhru03cQ8QI830xqqIbXKlPnE6kSx8c8f6LKBZzbMvto8tnN4t+atwFso 4xwi/a5wao878XijZhSZpyVThNJLoWlUO3Ll4D3CMCr99/gHE5k3H3ZlXI5Ur0DE7xiL80 9OyKT/eCgBwLZMfr5Q440J0je13EhH65hiQ4lIHjam8l3tOb/mOIe7FzzAKJ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714070185; a=rsa-sha256; cv=none; b=ODldDdXtSeIgrq1yXKPp+bvX7I4rFm2H4vx3LV1x6BCoqwLY/JZcndROCbyR8XjqQEGmME yhg/IfzzSwHZh3uiDAs2mntvI/H9C0wZ+s4aQbnjznC2kOIchFb9YAvNeEVODjXtQmt+CH NUp5jYfLqra52pGzMqjIU0eoJgGM/0OX1q8iibpRIrpkcVs77BeVKa1aJkLoCawU+G9nMm MkgOopMIbgmTUyM5hZfnZuT3h576eY7waDSbx9CShTEaS4LAy3SYLheUQlvbKeQsCc4rwf eEZoY09Ye1nx8+JY+/UuznhvgKQrZkkp2VNprr6iOv6MNT6F4nOtpdIh903y/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=1714070185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoyYLNA1oJxfFnMkhm4qKC2wdRetqzMGiA771B+BEvs=; b=jeT8Y1XaKHYg5MPn2yMtg4JDLAgFRZ54zG0nbawI/M+sIszCf5FS5SdnbF0V2jttlieOCX 95FK9JSrNINUD3D8olg9MRJ2/47Z/LnBG+KlLHVgT4TQnMHSuAE1mev0mEBNoKjcVLX75S JFZqW5l9yJE3zkUI3XoumLaZnq29mEMYBl0NTWfi9Tc7SnTFTeIP2ZimDxWT/60FPD/2dW BRHJfdY+pRTfoEd6Ajxks6rRvXUwowixJ3T1pnTwCpJP5pQXtHx0yLijzHAmPdFvhrPVka KCuM5GID0Aurp3i7trkY1hPyhv9efsNf0wgT3PZLQzFOHq8xwPJDcFVCh9PyZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQPh92y09z18xF; Thu, 25 Apr 2024 18:36: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 43PIaPLj032814; Thu, 25 Apr 2024 18:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PIaPM7032811; Thu, 25 Apr 2024 18:36:25 GMT (envelope-from git) Date: Thu, 25 Apr 2024 18:36:25 GMT Message-Id: <202404251836.43PIaPM7032811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7ab7ecfcfe77 - main - tftpd: Clean up the 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 7ab7ecfcfe777f7816e3e01df5f277060b2b609a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7ab7ecfcfe777f7816e3e01df5f277060b2b609a commit 7ab7ecfcfe777f7816e3e01df5f277060b2b609a Author: Dag-Erling Smørgrav AuthorDate: 2024-04-25 18:35:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-25 18:36:13 +0000 tftpd: Clean up the tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44955 --- libexec/tftpd/tests/functional.c | 253 ++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 125 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index bf7b5c77c898..bbe4f3782192 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -60,24 +60,24 @@ static void require_bufeq(const char *expected, size_t expected_len, * @param contents The reply's expected contents, as a char array * @param contents_len Length of contents */ -#define RECV(hdr, contents, contents_len) do { \ - char buffer[1024]; \ - struct sockaddr_storage from; \ - socklen_t fromlen = sizeof(from); \ - ssize_t r = recvfrom(s, buffer, sizeof(buffer), 0, \ - (struct sockaddr*)&from, &fromlen); \ - ATF_REQUIRE(r > 0); \ - require_bufeq((hdr), sizeof(hdr), buffer, \ - MIN((size_t)r, sizeof(hdr))); \ - require_bufeq((const char*) (contents), (contents_len), \ - &buffer[sizeof(hdr)], r - sizeof(hdr)); \ - if (protocol == PF_INET) { \ - ((struct sockaddr_in*)&addr)->sin_port = \ - ((struct sockaddr_in*)&from)->sin_port; \ - } else { \ - ((struct sockaddr_in6*)&addr)->sin6_port = \ - ((struct sockaddr_in6*)&from)->sin6_port; \ - } \ +#define RECV(hdr, contents, contents_len) do { \ + char buffer[1024]; \ + struct sockaddr_storage from; \ + socklen_t fromlen = sizeof(from); \ + ssize_t r = recvfrom(s, buffer, sizeof(buffer), 0, \ + (struct sockaddr *)&from, &fromlen); \ + ATF_REQUIRE(r > 0); \ + require_bufeq((hdr), sizeof(hdr), buffer, \ + MIN((size_t)r, sizeof(hdr))); \ + require_bufeq((const char *) (contents), (contents_len), \ + &buffer[sizeof(hdr)], r - sizeof(hdr)); \ + if (protocol == PF_INET) { \ + ((struct sockaddr_in *)&addr)->sin_port = \ + ((struct sockaddr_in *)&from)->sin_port; \ + } else { \ + ((struct sockaddr_in6 *)&addr)->sin6_port = \ + ((struct sockaddr_in6 *)&from)->sin6_port; \ + } \ } while(0) static void @@ -101,15 +101,15 @@ recv_oack(const char *options, size_t options_len) * @param contents_len Length of contents expected to receive */ static void -recv_data(uint16_t blocknum, const char* contents, size_t contents_len) +recv_data(uint16_t blocknum, const char *contents, size_t contents_len) { char hdr[] = {0, 3, blocknum >> 8, blocknum & 0xFF}; RECV(hdr, contents, contents_len); } -#define RECV_ERROR(code, msg) do { \ - char hdr[] = {0, 5, code >> 8, code & 0xFF}; \ - RECV(hdr, msg, sizeof(msg)); \ +#define RECV_ERROR(code, msg) do { \ + char hdr[] = {0, 5, code >> 8, code & 0xFF}; \ + RECV(hdr, msg, sizeof(msg)); \ } while (0) /* @@ -121,13 +121,13 @@ send_bytes(const void *cmd, size_t len) { ssize_t r; - r = sendto(s, cmd, len, 0, (struct sockaddr*)(&addr), addr.ss_len); + r = sendto(s, cmd, len, 0, (struct sockaddr *)(&addr), addr.ss_len); ATF_REQUIRE(r >= 0); ATF_REQUIRE_EQ(len, (size_t)r); } static void -send_data(uint16_t blocknum, const char* contents, size_t contents_len) +send_data(uint16_t blocknum, const char *contents, size_t contents_len) { char buffer[1024]; @@ -144,10 +144,10 @@ send_data(uint16_t blocknum, const char* contents, size_t contents_len) * @param cmd Command to send, as a const string * (terminating NUL will be ignored) */ -#define SEND_STR(cmd) ATF_REQUIRE_EQ( \ - sendto(s, (cmd), sizeof(cmd) - 1, 0, (struct sockaddr*)(&addr), \ - addr.ss_len), \ - sizeof(cmd) - 1) +#define SEND_STR(cmd) \ + ATF_REQUIRE_EQ(sizeof(cmd) - 1, \ + sendto(s, (cmd), sizeof(cmd) - 1, 0, \ + (struct sockaddr *)(&addr), addr.ss_len)) /* * Acknowledge block blocknum @@ -156,13 +156,12 @@ static void send_ack(uint16_t blocknum) { char packet[] = { - 0, 4, /* ACK opcode in BE */ - blocknum >> 8, - blocknum & 0xFF + 0, 4, /* ACK opcode in BE */ + blocknum >> 8, + blocknum & 0xFF }; send_bytes(packet, sizeof(packet)); - } /* @@ -175,71 +174,74 @@ send_ack(uint16_t blocknum) * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" */ -#define SEND_RRQ(filename, mode) SEND_STR("\0\001" filename "\0" mode "\0") +#define SEND_RRQ(filename, mode) \ + SEND_STR("\0\001" filename "\0" mode "\0") /* * send a read request with options */ -#define SEND_RRQ_OPT(filename, mode, options) SEND_STR("\0\001" filename "\0" mode "\000" options) +#define SEND_RRQ_OPT(filename, mode, options) \ + SEND_STR("\0\001" filename "\0" mode "\000" options) /* * send a write request to tftpd. * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" */ -#define SEND_WRQ(filename, mode) SEND_STR("\0\002" filename "\0" mode "\0") +#define SEND_WRQ(filename, mode) \ + SEND_STR("\0\002" filename "\0" mode "\0") /* * send a write request with options */ -#define SEND_WRQ_OPT(filename, mode, options) SEND_STR("\0\002" filename "\0" mode "\000" options) +#define SEND_WRQ_OPT(filename, mode, options) \ + SEND_STR("\0\002" filename "\0" mode "\000" options) /* Define a test case, for both IPv4 and IPv6 */ -#define TFTPD_TC_DEFINE(name, head, ...) \ -static void \ -name ## _body(void); \ -ATF_TC_WITH_CLEANUP(name ## _v4); \ -ATF_TC_HEAD(name ## _v4, tc) \ -{ \ - head \ -} \ -ATF_TC_BODY(name ## _v4, tc) \ -{ \ - __VA_ARGS__; \ - protocol = AF_INET; \ - s = setup(&addr, __COUNTER__); \ - name ## _body(); \ - close(s); \ -} \ -ATF_TC_CLEANUP(name ## _v4, tc) \ -{ \ - cleanup(); \ -} \ -ATF_TC_WITH_CLEANUP(name ## _v6); \ -ATF_TC_HEAD(name ## _v6, tc) \ -{ \ - head \ -} \ -ATF_TC_BODY(name ## _v6, tc) \ -{ \ - __VA_ARGS__; \ - protocol = AF_INET6; \ - s = setup(&addr, __COUNTER__); \ - name ## _body(); \ - close(s); \ -} \ -ATF_TC_CLEANUP(name ## _v6, tc) \ -{ \ - cleanup(); \ -} \ -static void \ +#define TFTPD_TC_DEFINE(name, head, ...) \ +static void \ +name ## _body(void); \ +ATF_TC_WITH_CLEANUP(name ## _v4); \ +ATF_TC_HEAD(name ## _v4, tc) \ +{ \ + head \ +} \ +ATF_TC_BODY(name ## _v4, tc) \ +{ \ + __VA_ARGS__; \ + protocol = AF_INET; \ + s = setup(&addr, __COUNTER__); \ + name ## _body(); \ + close(s); \ +} \ +ATF_TC_CLEANUP(name ## _v4, tc) \ +{ \ + cleanup(); \ +} \ +ATF_TC_WITH_CLEANUP(name ## _v6); \ +ATF_TC_HEAD(name ## _v6, tc) \ +{ \ + head \ +} \ +ATF_TC_BODY(name ## _v6, tc) \ +{ \ + __VA_ARGS__; \ + protocol = AF_INET6; \ + s = setup(&addr, __COUNTER__); \ + name ## _body(); \ + close(s); \ +} \ +ATF_TC_CLEANUP(name ## _v6, tc) \ +{ \ + cleanup(); \ +} \ +static void \ name ## _body(void) /* Add the IPv4 and IPv6 versions of a test case */ -#define TFTPD_TC_ADD(tp, name ) \ -do { \ - ATF_TP_ADD_TC(tp, name ## _v4); \ - ATF_TP_ADD_TC(tp, name ## _v6); \ +#define TFTPD_TC_ADD(tp, name) do { \ + ATF_TP_ADD_TC(tp, name ## _v4); \ + ATF_TP_ADD_TC(tp, name ## _v6); \ } while (0) /* Standard cleanup used by all testcases */ @@ -262,15 +264,15 @@ cleanup(void) /* Assert that two binary buffers are identical */ static void -require_bufeq(const char *expected, size_t expected_len, const char *actual, - size_t len) +require_bufeq(const char *expected, size_t expected_len, + const char *actual, size_t len) { size_t i; ATF_REQUIRE_EQ_MSG(expected_len, len, "Expected %zu bytes but got %zu", expected_len, len); for (i = 0; i < len; i++) { - ATF_REQUIRE_EQ_MSG(actual[i], expected[i], + ATF_REQUIRE_EQ_MSG(expected[i], actual[i], "Expected %#hhx at position %zu; got %hhx instead", expected[i], i, actual[i]); } @@ -304,17 +306,17 @@ setup(struct sockaddr_storage *to, uint16_t idx) addr4.sin_len = len; addr4.sin_family = PF_INET; addr4.sin_port = htons(port); - server_addr = (struct sockaddr*)&addr4; + server_addr = (struct sockaddr *)&addr4; } else { len = sizeof(addr6); bzero(&addr6, len); addr6.sin6_len = len; addr6.sin6_family = PF_INET6; addr6.sin6_port = htons(port); - server_addr = (struct sockaddr*)&addr6; + server_addr = (struct sockaddr *)&addr6; } - ATF_REQUIRE_EQ(getcwd(pwd, sizeof(pwd)), pwd); + ATF_REQUIRE_EQ(pwd, getcwd(pwd, sizeof(pwd))); /* Must bind(2) pre-fork so it happens before the client's send(2) */ server_s = socket(protocol, SOCK_DGRAM, 0); @@ -324,7 +326,7 @@ setup(struct sockaddr_storage *to, uint16_t idx) } ATF_REQUIRE_MSG(server_s >= 0, "socket failed with error %s", strerror(errno)); - ATF_REQUIRE_EQ_MSG(bind(server_s, server_addr, len), 0, + ATF_REQUIRE_EQ_MSG(0, bind(server_s, server_addr, len), "bind failed with error %s", strerror(errno)); pid = fork(); @@ -337,8 +339,8 @@ setup(struct sockaddr_storage *to, uint16_t idx) pfh = pidfile_open(pidfile, 0644, NULL); ATF_REQUIRE_MSG(pfh != NULL, "pidfile_open: %s", strerror(errno)); - ATF_REQUIRE_EQ(pidfile_write(pfh), 0); - ATF_REQUIRE_EQ(pidfile_close(pfh), 0); + ATF_REQUIRE_EQ(0, pidfile_write(pfh)); + ATF_REQUIRE_EQ(0, pidfile_close(pfh)); bzero(argv, sizeof(argv)); argv[0] = execname; @@ -348,9 +350,9 @@ setup(struct sockaddr_storage *to, uint16_t idx) if (s_flag) argv[argv_idx++] = s_flag_str; argv[argv_idx++] = pwd; - ATF_REQUIRE_EQ(dup2(server_s, STDOUT_FILENO), STDOUT_FILENO); - ATF_REQUIRE_EQ(dup2(server_s, STDIN_FILENO), STDIN_FILENO); - ATF_REQUIRE_EQ(dup2(server_s, STDERR_FILENO), STDERR_FILENO); + ATF_REQUIRE_EQ(STDOUT_FILENO, dup2(server_s, STDOUT_FILENO)); + ATF_REQUIRE_EQ(STDIN_FILENO, dup2(server_s, STDIN_FILENO)); + ATF_REQUIRE_EQ(STDERR_FILENO, dup2(server_s, STDERR_FILENO)); execv(execname, argv); atf_tc_fail("exec failed"); break; @@ -358,14 +360,14 @@ setup(struct sockaddr_storage *to, uint16_t idx) /* In parent */ bzero(to, sizeof(*to)); if (protocol == PF_INET) { - struct sockaddr_in *to4 = (struct sockaddr_in*)to; + struct sockaddr_in *to4 = (struct sockaddr_in *)to; to4->sin_len = sizeof(*to4); to4->sin_family = PF_INET; to4->sin_port = htons(port); to4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } else { struct in6_addr loopback = IN6ADDR_LOOPBACK_INIT; - struct sockaddr_in6 *to6 = (struct sockaddr_in6*)to; + struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)to; to6->sin6_len = sizeof(*to6); to6->sin6_family = PF_INET6; to6->sin6_port = htons(port); @@ -393,7 +395,7 @@ write_all(int fd, const void *buf, size_t nbytes) r = write(fd, buf, nbytes); ATF_REQUIRE(r > 0); nbytes -= (size_t)r; - buf = (const char*)buf + (size_t)r; + buf = (const char *)buf + (size_t)r; } } @@ -433,13 +435,13 @@ TFTPD_TC_DEFINE(abspath,) */ TFTPD_TC_DEFINE(dotdot,) { - ATF_REQUIRE_EQ(mkdir("subdir", 0777), 0); + ATF_REQUIRE_EQ(0, mkdir("subdir", 0777)); SEND_RRQ("../disallowed.txt", "octet"); RECV_ERROR(2, "Access violation"); - s = setup(&addr, __COUNTER__); \ + s = setup(&addr, __COUNTER__); SEND_RRQ("subdir/../../disallowed.txt", "octet"); RECV_ERROR(2, "Access violation"); - s = setup(&addr, __COUNTER__); \ + s = setup(&addr, __COUNTER__); SEND_RRQ("/etc/passwd", "octet"); RECV_ERROR(2, "Access violation"); } @@ -447,8 +449,9 @@ TFTPD_TC_DEFINE(dotdot,) /* * With "-s", tftpd should chroot to the specified directory */ -TFTPD_TC_DEFINE(s_flag, atf_tc_set_md_var(tc, "require.user", "root");, - s_flag = true) +TFTPD_TC_DEFINE(s_flag, + atf_tc_set_md_var(tc, "require.user", "root");, + s_flag = true) { int fd; char contents[] = "small"; @@ -505,7 +508,7 @@ TFTPD_TC_DEFINE(rrq_dropped_data,) close(fd); SEND_RRQ("medium.txt", "octet"); - recv_data(1, (const char*)&contents[0], 512); + recv_data(1, (const char *)&contents[0], 512); send_ack(1); (void) recvfrom(s, buffer, sizeof(buffer), 0, NULL, NULL); /* @@ -513,7 +516,7 @@ TFTPD_TC_DEFINE(rrq_dropped_data,) * Eventually, client should resend the last ACK */ send_ack(1); - recv_data(2, (const char*)&contents[128], 256); + recv_data(2, (const char *)&contents[128], 256); send_ack(2); } @@ -535,11 +538,11 @@ TFTPD_TC_DEFINE(rrq_duped_ack,) close(fd); SEND_RRQ("medium.txt", "octet"); - recv_data(1, (const char*)&contents[0], 512); + recv_data(1, (const char *)&contents[0], 512); send_ack(1); send_ack(1); /* Dupe an ACK packet */ - recv_data(2, (const char*)&contents[128], 256); - recv_data(2, (const char*)&contents[128], 256); + recv_data(2, (const char *)&contents[128], 256); + recv_data(2, (const char *)&contents[128], 256); send_ack(2); } @@ -593,9 +596,9 @@ TFTPD_TC_DEFINE(rrq_medium,) close(fd); SEND_RRQ("medium.txt", "octet"); - recv_data(1, (const char*)&contents[0], 512); + recv_data(1, (const char *)&contents[0], 512); send_ack(1); - recv_data(2, (const char*)&contents[128], 256); + recv_data(2, (const char *)&contents[128], 256); send_ack(2); } @@ -620,8 +623,8 @@ TFTPD_TC_DEFINE(rrq_medium_window,) SEND_RRQ_OPT("medium.txt", "octet", OPTION_STR("windowsize", "2")); recv_oack(options, sizeof(options) - 1); send_ack(0); - recv_data(1, (const char*)&contents[0], 512); - recv_data(2, (const char*)&contents[128], 256); + recv_data(1, (const char *)&contents[0], 512); + recv_data(2, (const char *)&contents[128], 256); send_ack(2); } @@ -764,13 +767,13 @@ TFTPD_TC_DEFINE(unknown_modes,) { SEND_RRQ("foo.txt", "ascii"); /* Misspelling of "ascii" */ RECV_ERROR(4, "Illegal TFTP operation"); - s = setup(&addr, __COUNTER__); \ + s = setup(&addr, __COUNTER__); SEND_RRQ("foo.txt", "binary"); /* Obsolete. Use "octet" instead */ RECV_ERROR(4, "Illegal TFTP operation"); - s = setup(&addr, __COUNTER__); \ + s = setup(&addr, __COUNTER__); SEND_RRQ("foo.txt", "en_US.UTF-8"); RECV_ERROR(4, "Illegal TFTP operation"); - s = setup(&addr, __COUNTER__); \ + s = setup(&addr, __COUNTER__); SEND_RRQ("foo.txt", "mail"); /* Obsolete in RFC-1350 */ RECV_ERROR(4, "Illegal TFTP operation"); } @@ -830,14 +833,14 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,) SEND_WRQ("medium.txt", "octet"); recv_ack(0); - send_data(1, (const char*)&contents[0], 512); + send_data(1, (const char *)&contents[0], 512); /* * Servers "sends" an ACK packet, but network drops it. * Eventually, server should resend the last ACK */ (void) recvfrom(s, buffer, sizeof(buffer), 0, NULL, NULL); recv_ack(1); - send_data(2, (const char*)&contents[128], 256); + send_data(2, (const char *)&contents[128], 256); recv_ack(2); fd = open("medium.txt", O_RDONLY); @@ -845,7 +848,7 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,) r = read(fd, buffer, sizeof(buffer)); ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, (size_t)r); + require_bufeq((const char *)contents, 768, buffer, (size_t)r); } /* @@ -902,11 +905,11 @@ TFTPD_TC_DEFINE(wrq_duped_data,) SEND_WRQ("medium.txt", "octet"); recv_ack(0); - send_data(1, (const char*)&contents[0], 512); - send_data(1, (const char*)&contents[0], 512); + send_data(1, (const char *)&contents[0], 512); + send_data(1, (const char *)&contents[0], 512); recv_ack(1); recv_ack(1); - send_data(2, (const char*)&contents[128], 256); + send_data(2, (const char *)&contents[128], 256); recv_ack(2); fd = open("medium.txt", O_RDONLY); @@ -914,7 +917,7 @@ TFTPD_TC_DEFINE(wrq_duped_data,) r = read(fd, buffer, sizeof(buffer)); ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, (size_t)r); + require_bufeq((const char *)contents, 768, buffer, (size_t)r); } /* @@ -969,9 +972,9 @@ TFTPD_TC_DEFINE(wrq_medium,) SEND_WRQ("medium.txt", "octet"); recv_ack(0); - send_data(1, (const char*)&contents[0], 512); + send_data(1, (const char *)&contents[0], 512); recv_ack(1); - send_data(2, (const char*)&contents[128], 256); + send_data(2, (const char *)&contents[128], 256); recv_ack(2); fd = open("medium.txt", O_RDONLY); @@ -979,7 +982,7 @@ TFTPD_TC_DEFINE(wrq_medium,) r = read(fd, buffer, sizeof(buffer)); ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, (size_t)r); + require_bufeq((const char *)contents, 768, buffer, (size_t)r); } /* @@ -1003,8 +1006,8 @@ TFTPD_TC_DEFINE(wrq_medium_window,) SEND_WRQ_OPT("medium.txt", "octet", OPTION_STR("windowsize", "2")); recv_oack(options, sizeof(options) - 1); - send_data(1, (const char*)&contents[0], 512); - send_data(2, (const char*)&contents[128], 256); + send_data(1, (const char *)&contents[0], 512); + send_data(2, (const char *)&contents[128], 256); recv_ack(2); fd = open("medium.txt", O_RDONLY); @@ -1012,7 +1015,7 @@ TFTPD_TC_DEFINE(wrq_medium_window,) r = read(fd, buffer, sizeof(buffer)); ATF_REQUIRE(r > 0); close(fd); - require_bufeq((const char*)contents, 768, buffer, (size_t)r); + require_bufeq((const char *)contents, 768, buffer, (size_t)r); } /* @@ -1107,8 +1110,8 @@ TFTPD_TC_DEFINE(wrq_truncate,) send_data(1, NULL, 0); recv_ack(1); - ATF_REQUIRE_EQ(stat("small.txt", &sb), 0); - ATF_REQUIRE_EQ(sb.st_size, 0); + ATF_REQUIRE_EQ(0, stat("small.txt", &sb)); + ATF_REQUIRE_EQ(0, sb.st_size); } /* From nobody Thu Apr 25 18:36:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQPhB6NMnz5JJDW; Thu, 25 Apr 2024 18:36: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 4VQPhB4nTVz4YRH; Thu, 25 Apr 2024 18:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W9vJ/Ra0qJsBgjjaD+snGmOXN7Y0L5B7Usowu67fC/E=; b=hx3qaDLi5sgub4rlgtj9YfQiuiWIY+38E4yc6lOKbBPNM1MBQRc6eNT0/uqeFE6WeoAZWA EnF/yie4IlI5629WOeCpO87XPI+7zOAOLkaoxcJXJt7WpGK5EQT23D3g6ViZEU0/FamYqM U52n10+JcpTdEzyxlZyF38c1H6LhVgfnKzsISuuYbGMVy8uoO+PmS8xSvTqoAvxgebm9ly jH7hRx2HSiH8MM4uJfMVyAFEszGYsbS9z+ZdekEZccdLDtTFDZnUbqM+jrkNeYx01Q++TY rFGlzDivXq+Wy3AuCxp15aVJJuiTSAxCZ546hOvi68vvy4C2NvrMXqGk4KdKMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714070186; a=rsa-sha256; cv=none; b=us+Cr9bSQuJp8DYweuTgXxRW07NnfjRY9Fq0zziRvhXYBbJl8U3TvjiWdelZ8GhCFw/94t 719OHIWHuX0eUnGbIsE2SfbSeh4eKO768MBa4iBhmm4pGuOWH7LrMijWuNIXAd0xqvJPLi 7j0G8Yae1H7G7gF+GjBmmAa1SPfwoy1lbF7qeJWhWlLFiCANY+9RPePBvMjCttHx3RMjJc X95YSgME8sbOrdv2U4bWMtrAoxBbhCVO07Pp2Z9ORIK/OJSbcu6f1XjV8ADnQbUTbdaSA/ bKhnPvhxN6gUt4vUhQTxRX/V531+BmGqZgZHFD0ExYxKhMibTCC8cRaMNBmKlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W9vJ/Ra0qJsBgjjaD+snGmOXN7Y0L5B7Usowu67fC/E=; b=LE3DN1h6D00gLIA2yCk2WRFNyMEAH3RvKqkUHyHcf8vWcLE3xYW9Wk8lEEbti+PAnN17r4 CNkHqsZRurH5Y+Z/d3SQ77OP3k5uniYktZY61NSFH10Tn8GcRIJaCqYyr3AJShpWnBLA1f cMwXrlWjmnuJNO/7XP3tdgE2fgsR79SDRqvTAUfFgO8nRPPNVRlcIhHp6kTjVyp0cqwrjc W0pvnCcJvVVzVYS/pVD5vZXAap8tl3WVG60eKyQkK6fOD4yu0mmvV8Cla5zVj/rBhqsiyd tt+NCC0KA+Z0M399IgKnRIQCdyW1CX6X0hLbaszQhJMaLnAXnLUFBOnqBrYznA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQPhB3YrLz19BS; Thu, 25 Apr 2024 18:36: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 43PIaQVP032875; Thu, 25 Apr 2024 18:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PIaQYn032872; Thu, 25 Apr 2024 18:36:26 GMT (envelope-from git) Date: Thu, 25 Apr 2024 18:36:26 GMT Message-Id: <202404251836.43PIaQYn032872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 83a6e984ac01 - main - tftpd: Check the server status after each 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 83a6e984ac01657819418746f722163367ec30db Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=83a6e984ac01657819418746f722163367ec30db commit 83a6e984ac01657819418746f722163367ec30db Author: Dag-Erling Smørgrav AuthorDate: 2024-04-25 18:35:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-25 18:36:13 +0000 tftpd: Check the server status after each test. * In the setup phase, wait for the server to start (or fail to start) before proceeding with the test. This makes it possible to write test cases that don't expect a response from the server without ending up in a race over the server PID file. * After running each test, wait up to 30 seconds for the server to exit and check that the exit status matches what the test case says to expect (usually 0). * We still kill and collect the server in the cleanup phase, in case the test ended early. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44956 --- libexec/tftpd/tests/functional.c | 44 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index bbe4f3782192..3b70962854ba 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -208,11 +208,14 @@ ATF_TC_HEAD(name ## _v4, tc) \ } \ ATF_TC_BODY(name ## _v4, tc) \ { \ + int exitcode = 0; \ __VA_ARGS__; \ protocol = AF_INET; \ s = setup(&addr, __COUNTER__); \ name ## _body(); \ close(s); \ + if (exitcode >= 0) \ + check_server(exitcode); \ } \ ATF_TC_CLEANUP(name ## _v4, tc) \ { \ @@ -225,11 +228,14 @@ ATF_TC_HEAD(name ## _v6, tc) \ } \ ATF_TC_BODY(name ## _v6, tc) \ { \ + int exitcode = 0; \ __VA_ARGS__; \ protocol = AF_INET6; \ s = setup(&addr, __COUNTER__); \ name ## _body(); \ close(s); \ + if (exitcode >= 0) \ + check_server(exitcode); \ } \ ATF_TC_CLEANUP(name ## _v6, tc) \ { \ @@ -244,6 +250,33 @@ name ## _body(void) ATF_TP_ADD_TC(tp, name ## _v6); \ } while (0) +static void +sigalrm(int signo __unused) +{ +} + +/* Check that server exits with specific exit code */ +static void +check_server(int exitcode) +{ + struct sigaction sa = { .sa_handler = sigalrm }; + struct itimerval it = { .it_value = { .tv_sec = 30 } }; + FILE *f; + pid_t pid; + int wstatus; + + f = fopen(pidfile, "r"); + ATF_REQUIRE(f != NULL); + ATF_REQUIRE_INTEQ(1, fscanf(f, "%d", &pid)); + ATF_CHECK_INTEQ(0, fclose(f)); + ATF_REQUIRE_INTEQ(0, sigaction(SIGALRM, &sa, NULL)); + ATF_REQUIRE_EQ(0, setitimer(ITIMER_REAL, &it, NULL)); + ATF_REQUIRE_EQ(pid, waitpid(pid, &wstatus, 0)); + ATF_CHECK(WIFEXITED(wstatus)); + ATF_CHECK_INTEQ(exitcode, WEXITSTATUS(wstatus)); + unlink(pidfile); +} + /* Standard cleanup used by all testcases */ static void cleanup(void) @@ -254,12 +287,12 @@ cleanup(void) f = fopen(pidfile, "r"); if (f == NULL) return; + unlink(pidfile); if (fscanf(f, "%d", &pid) == 1) { kill(pid, SIGTERM); waitpid(pid, NULL, 0); } fclose(f); - unlink(pidfile); } /* Assert that two binary buffers are identical */ @@ -299,6 +332,9 @@ setup(struct sockaddr_storage *to, uint16_t idx) struct pidfh *pfh; uint16_t port = BASEPORT + idx; socklen_t len; + int pd[2]; + + ATF_REQUIRE_EQ(0, pipe2(pd, O_CLOEXEC)); if (protocol == PF_INET) { len = sizeof(addr4); @@ -358,6 +394,10 @@ setup(struct sockaddr_storage *to, uint16_t idx) break; default: /* In parent */ + ATF_REQUIRE_INTEQ(0, close(pd[1])); + /* block until other end is closed on exec() or exit() */ + ATF_REQUIRE_INTEQ(0, read(pd[0], &pd[1], sizeof(pd[1]))); + ATF_REQUIRE_INTEQ(0, close(pd[0])); bzero(to, sizeof(*to)); if (protocol == PF_INET) { struct sockaddr_in *to4 = (struct sockaddr_in *)to; @@ -374,7 +414,7 @@ setup(struct sockaddr_storage *to, uint16_t idx) to6->sin6_addr = loopback; } - close(server_s); + ATF_REQUIRE_INTEQ(0, close(server_s)); ATF_REQUIRE((client_s = socket(protocol, SOCK_DGRAM, 0)) > 0); break; } From nobody Thu Apr 25 18:36:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQPhD04vSz5JJBK; Thu, 25 Apr 2024 18:36: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 4VQPhC56ljz4YXP; Thu, 25 Apr 2024 18:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k80qAh0Bf21vaCQrJ61OwzBRiPVaM0P/MM4aY2o8YaI=; b=db38KYzgMhkCmGo+kU0E8x1KkWF1MoKgTSHjULxmQteNu0wS87RxJ9DfEgCXN740iWqOWj 9rmy/3AV7MLAzRFWvbm9c+c4W91TvXPFjOUNbeQsGDone+QwP8UwQm5He5B1+ZQ5mrLV2m AeuXMBzC1Y4m45nFwBlIkVcBTaVIHbbgghzNpHCkptFI+gfZ/kdiwC3ORfLoFHLojYN4vv cGZOMaEXPmbjscPtChyGNmxdM8DdksAl4ar86q71h2Vrmo2KjvqkU9Es94cnMO/vEyQ0Sd lQdJ2HvCedNrSV9ucQzfkRpOuhR5fLiYgIAARRC5c6W7EXMgeKOkf3q6FE5qyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714070187; a=rsa-sha256; cv=none; b=naDdBDOR3WNq2zfERBfQ7aLvkoBXkzV4SAwpQQ6NVx5IYCldnsFBEa7yidorogCQZHHj6Z STsWFLpdSOXxWPZSzVAMuYC5YyLXFhonSMDQgu3SFMvidk6iCZmP7nYjWYt79190tXl8fE NsUMcNzk1HgJuCPwGTzMBANhIabHr5g+t3iXN/j26mg/CZPKYluTbMPIz4TJJtLzb0d+QH 0wb2MQwRNnPGGBKx+daZ3JYx8jNQqxQZbOMndXf430BC5WaqRdCBHWwRJTh1KfeWEReXxO dIAxWEMLnGvGOFCnPF5JlXiYwx80GOwIq+SxVEQNciw8by1Kcc54o9GhzjSddQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714070187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k80qAh0Bf21vaCQrJ61OwzBRiPVaM0P/MM4aY2o8YaI=; b=gXsDX5EA+fV4RT7tRORPfqtWc1+11kmb/5Uno/0hkd9WQGXOFf8k0gqjHBiQmr8LreiZXm Kt1+VNry6NgLYub9TXLeeVx+DBoxVsvEc+N5Vqp5mhnJiuGhFRRhzIXqOlECoONG4VV993 kjpvqYQK0uheysmCc+77LehMJp6TE5EqQOydc59IGgyE6+gcz0OuC/8KaenQqRzARHa4+3 iJPpxIptSj27gaWVMk+fKbxCBWMsMgAzaWpM88J07C+Kf5fON5d/kIfMsId6nJp1IH8d9L MP7io5keWZo0GDrICpL+hL0qtpPZOsSWVjgPhLPrIn6qKtp5BXciiBNGrnDPnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQPhC4bKSz18fd; Thu, 25 Apr 2024 18:36: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 43PIaRGs032934; Thu, 25 Apr 2024 18:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PIaRJ0032931; Thu, 25 Apr 2024 18:36:27 GMT (envelope-from git) Date: Thu, 25 Apr 2024 18:36:27 GMT Message-Id: <202404251836.43PIaRJ0032931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f231af307b8 - main - tftpd: Immediately reject any request shorter than 4 bytes. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9f231af307b80eb222d9761bbd81fa4e130bb3d7 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f231af307b80eb222d9761bbd81fa4e130bb3d7 commit 9f231af307b80eb222d9761bbd81fa4e130bb3d7 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-25 18:35:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-25 18:36:13 +0000 tftpd: Immediately reject any request shorter than 4 bytes. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44957 --- libexec/tftpd/tests/functional.c | 19 +++++++++++++++++++ libexec/tftpd/tftpd.c | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 3b70962854ba..d3d2f46ffdee 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -1219,6 +1219,22 @@ TFTPD_TC_DEFINE(wrq_window_rfc7440,) require_bufeq(contents, sizeof(contents), buffer, (size_t)r); } +/* + * Send less than four bytes + */ +TFTPD_TC_DEFINE(short_packet1, /* no head */, exitcode = 1) +{ + SEND_STR("\1"); +} +TFTPD_TC_DEFINE(short_packet2, /* no head */, exitcode = 1) +{ + SEND_STR("\1\2"); +} +TFTPD_TC_DEFINE(short_packet3, /* no head */, exitcode = 1) +{ + SEND_STR("\1\2\3"); +} + /* * Main @@ -1256,6 +1272,9 @@ ATF_TP_ADD_TCS(tp) TFTPD_TC_ADD(tp, wrq_small); TFTPD_TC_ADD(tp, wrq_truncate); TFTPD_TC_ADD(tp, wrq_window_rfc7440); + TFTPD_TC_ADD(tp, short_packet1); + TFTPD_TC_ADD(tp, short_packet2); + TFTPD_TC_ADD(tp, short_packet3); return (atf_no_error()); } diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 45e7344c86ed..13f53024b147 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -228,6 +228,11 @@ main(int argc, char *argv[]) } getnameinfo((struct sockaddr *)&peer_sock, peer_sock.ss_len, peername, sizeof(peername), NULL, 0, NI_NUMERICHOST); + if ((size_t)n < 4 /* tftphdr */) { + tftp_log(LOG_ERR, "Rejecting %zd-byte request from %s", + n, peername); + exit(1); + } /* * Now that we have read the message out of the UDP From nobody Thu Apr 25 18:57:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQQ8d27H8z5JKs6 for ; Thu, 25 Apr 2024 18:57:37 +0000 (UTC) (envelope-from 0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com) Received: from a8-176.smtp-out.amazonses.com (a8-176.smtp-out.amazonses.com [54.240.8.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQQ8c4knZz4cwS for ; Thu, 25 Apr 2024 18:57:36 +0000 (UTC) (envelope-from 0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=dqtolf56kk3wpt62c3jnwboqvr7iedax header.b=f2QNOGOf; dkim=pass header.d=amazonses.com header.s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug header.b=QmdiV3eS; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com designates 54.240.8.176 as permitted sender) smtp.mailfrom=0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1714071455; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=4nMNlHrF+1t4SWhNHUMLYqyk2b+HQNFibs2i3BVpyeU=; b=f2QNOGOfiFhXVW4+bXbKrR313R8wyMRtG8nDf+wciI1cBj6+zMDkbB/UTpQ4+dkS 8q85k0gdURYc7pR9+J80341v5uuhVxjuYol7PpMKW5pDoahcXh79wmLntiXCBDgIZhp 6XjoKF3kwhu1PJfIDjf09mR0WhDihLfYBMmmS/Cw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1714071455; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=4nMNlHrF+1t4SWhNHUMLYqyk2b+HQNFibs2i3BVpyeU=; b=QmdiV3eS6QimIfU5h06XjYnMZjL2bLs6o3jjvcLHCw8pj/8LmB4rXYD0iyLB767F PCtMAwCUuipOwHj8XfVKQLNzOdEaScyddP66N4mt3L+q2asGnMr/yAHbZ4qjuCqObEJ nMPfesyHjI5vlS1Tq2clhRZe4WbesaOH7/6kQ8Pc= Message-ID: <0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@email.amazonses.com> Date: Thu, 25 Apr 2024 18:57:35 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, =?UTF-8?Q?Klaus_K=C3=BCchemann?= References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.04.25-54.240.8.176 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.39 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=dqtolf56kk3wpt62c3jnwboqvr7iedax,amazonses.com:s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug]; RWL_MAILSPIKE_VERYGOOD(-0.20)[54.240.8.176:from]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.176:from]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100018f169ec80d-468eb3c2-4b49-4846-ab61-88fe74eb4ab1-000000@amazonses.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_TO(0.00)[FreeBSD.org,googlemail.com]; RCPT_COUNT_FIVE(0.00)[5]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+] X-Rspamd-Queue-Id: 4VQQ8c4knZz4cwS On 4/19/24 16:11, Warner Losh wrote: > add dtb support for RPI CM4, CM4s, CM4_ioBoard > > Signed-off-by: Klaus Küchemann > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1182 > --- > --- a/release/arm64/RPI.conf > +++ b/release/arm64/RPI.conf > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb \ > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb bcm2711-rpi-cm4s.dtb" This broke the RPI release build, since bcm2711-rpi-cm4s.dtb doesn't exist. Is it provided by a port which we should add to the RPI build? -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Apr 25 19:24:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQQlV2CRWz5JNZZ for ; Thu, 25 Apr 2024 19:24:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (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 4VQQlT3454z4hJs for ; Thu, 25 Apr 2024 19:24:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=Ps8aKA7j; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::129) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-518a3e0d2ecso2100452e87.3 for ; Thu, 25 Apr 2024 12:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1714073060; x=1714677860; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=swH1JWODvoD/36RjSda6oNaGH0F32FDjFPpJBirpj2k=; b=Ps8aKA7jIAv/oEFfH5jMtiWUhSYDWnbhR5MWSGC/jcJjHj0eaoV2mGTIsRv3MCKoML SiokG2yVwyA68GMnZhz7s8Uitu57KwEYxpP69aK6tIt9GAAjP428DJ3lvcSvH7UNsJgf MJqS3ErPygWrrjN7NiWA8TMAkU7+53wKbb+lLbUG9yEXM7GHCo2AvG6dif6QNc61Gz0W yZmHx47ZILINfpteKtGaMwPYaDeOsaCz1x5+fN+ToA9Tg1NwHjE9wQAM5VHFxGclgu/V G/FC6upxhPG1LlpOIReBejP7LnFPEtpeFVA/0CWAsuZPzOGhbigeKce6PHqsIcGczdSM Wdig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714073060; x=1714677860; 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=swH1JWODvoD/36RjSda6oNaGH0F32FDjFPpJBirpj2k=; b=IfPuVsWp0AiInfzAkAn+jWeC/Rqk1ExQCGNLWceGQUIDUOU/LivFjmkjCv/zvzb0/4 w/EhyiDuODh9OB/+G7mvZkniHl47BFfXwFkSprp2Q60RknW0RYlUx01n1YNwKKnaW1UN qDY995IWZpRBwcKzANeUh7+cdkEk9CMl7ctGxcQTbsbJkyxVF4X3HUe0eQSD4SK/a7o3 hlhG23vJ43p1MCV7JIsXX06v2sxELYEWnC5G9l+o0VImmo9MJiC7xHupDq8+xF8hujT8 UyPIm3+RqGu9XI/hsHlAggfULttJoQAhPPZCE1R6WaJLbDZv7fwNfHg4K65Gqxq8+QCj MkgQ== X-Forwarded-Encrypted: i=1; AJvYcCXUQ7CIrbPEY4MQY0DS6Xv7Sq8H6GWQivHUyGeLZFKMGcFB5OYm2M2UXbkEFGil31z9ODya/WBkHZlWOjR58RBd+r8lslvHdErgn/eSqT44 X-Gm-Message-State: AOJu0YxazNd8meJvLB8WxPd7S5bPSN6A4W0Ki/S3gUQzSr7rOJShpZyb CqBXhKV6B5QagwL3NN2BuOWKGhwGCLPO4KjWvAjgeIOIpHvFYtPl3dV6WweYn3jEifIarucC2Us EnvrxQcTgkQzH9rjU8BVDoOyh2HdK8xyL28wBwA== X-Google-Smtp-Source: AGHT+IEgYIhocUMNmKs86CIn4yPiS2nyefoML0yPoCBRrLwLB0qaOwiCy+cxPpEujlDQrhYooszjcS6X8fWN8+DwW6k= X-Received: by 2002:a05:6512:329c:b0:51c:778f:b569 with SMTP id p28-20020a056512329c00b0051c778fb569mr230788lfe.29.1714073059566; Thu, 25 Apr 2024 12:24:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> In-Reply-To: <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> From: Warner Losh Date: Thu, 25 Apr 2024 13:24:07 -0600 Message-ID: Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard To: Colin Percival Cc: Warner Losh , src-committers , "" , "" , =?UTF-8?Q?Klaus_K=C3=BCchemann?= Content-Type: multipart/alternative; boundary="000000000000d5d9d10616f0bb74" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::129:from]; R_SPF_NA(0.00)[no SPF record]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,googlemail.com]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4VQQlT3454z4hJs --000000000000d5d9d10616f0bb74 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival wrote: > On 4/19/24 16:11, Warner Losh wrote: > > add dtb support for RPI CM4, CM4s, CM4_ioBoard > > > > Signed-off-by: Klaus K=C3=BCchemann > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1182 > > --- > > --- a/release/arm64/RPI.conf > > +++ b/release/arm64/RPI.conf > > -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dt= b > bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" > > +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dt= b > bcm2710-rpi-cm3.dtb \ > > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb > bcm2711-rpi-cm4s.dtb" > > This broke the RPI release build, since bcm2711-rpi-cm4s.dtb doesn't exis= t. > Is it provided by a port which we should add to the RPI build? > I thought it was in tree. I'll look into this and report back. Warner --=20 > Colin Percival > FreeBSD Release Engineering Lead & EC2 platform maintainer > Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoi= d > --000000000000d5d9d10616f0bb74 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival = <cperciva@tarsnap.com> wr= ote:
On 4/19/24 16:11, Warner Losh = wrote:
>=C2=A0 =C2=A0 =C2=A0 add dtb support for RPI CM4, CM4s, CM4_ioBoard
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Signed-off-by: Klaus K=C3=BCchemann <mac= iphone2@googlemail.com>
>=C2=A0 =C2=A0 =C2=A0 Reviewed by: imp
>=C2=A0 =C2=A0 =C2=A0 Pull Request: ht= tps://github.com/freebsd/freebsd-src/pull/1182
> ---
> --- a/release/arm64/RPI.conf
> +++ b/release/arm64/RPI.conf
> -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-p= lus.dtb bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb"
> +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-p= lus.dtb bcm2710-rpi-cm3.dtb \
> +=C2=A0 =C2=A0 =C2=A0bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm271= 1-rpi-cm4.dtb bcm2711-rpi-cm4s.dtb"

This broke the RPI release build, since bcm2711-rpi-cm4s.dtb doesn't ex= ist.
Is it provided by a port which we should add to the RPI build?

I thought it = was in tree. I'll look into this and report back.=C2=A0

Warner=C2=A0
<= br>
--
Colin Percival
FreeBSD Release Engineering Lead & EC2 platform maintainer
Founder, Tarsnap | www.tarsnap.com | Online backups for the tru= ly paranoid
--000000000000d5d9d10616f0bb74-- From nobody Thu Apr 25 19:33:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQQy75ncqz5JP8q; Thu, 25 Apr 2024 19:33: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 4VQQy74z8Dz4jlW; Thu, 25 Apr 2024 19:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714073615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbku9ZNc7U2P5sy6evPDxjMMX5vsgDfT8baYueUTGT4=; b=su4Gua+zGDzd/php7Hz4+ou+R/xIKdlPFFXFctmETmWPLaoB9buVy3jhdIgYLErDFlmW1L dgEPaoN5zoJXxB7WnlJcgZYcpX42iZJP3E6KFnKO5nQaTL5LwVSfSxAgHR5DOz5Yi5I73q ZeLyoV6TjWk3Z0anCUYDNKugddtEZi67FQV/QdtVIP+85zjaFhOZKGcZwqhyJP1qwqfLQP tdK9br6xyXTVtNV80Ysszp2jTx4MSSlhEayrKJ6kY4KDdkdsTfJDjEg2uGIVZtS3w6KZdV f9sVas9is0EyWiMMUS1TCQD9FmzcAfLRk8COEjwPtuUK85FUMS8SaGtqgoWzFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714073615; a=rsa-sha256; cv=none; b=FcyMdfekOG72REJ5wbCs/HHX6/9YT/ucQ8011wXkil8MMvIB5lM1AsEuj3AHieedrzKmHG bvbyxwoucjAYJZEZK9vocB0+3pQEcWeQ/dNYOsShjpMG9Qxms6r/BfKnr+1dLd/3/rdZ0K uwYQIX/nf0q7zk9hBdT0Z/fCW5d+9F4h66X+no+MZ27GWsqLDcXzg9rDfRI7jjoyFpbhKS UbvniMjx2JW9SFpTFyGTdQQ1NgV80E3BJzojOcuZVBMq7TnKvSJxw6EkzylARWON832jAF Ofwu3SgWDkeQE5VMmmH8yEdZ0Z1JC8Q/yK+Vm0rWtMX6LLtgLCcqJ9oeK6LlSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714073615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbku9ZNc7U2P5sy6evPDxjMMX5vsgDfT8baYueUTGT4=; b=gDCIb/7WKbMlqKygS40sw8s1QpCwIDHy73nCTdRr8ZD8O7dNRUco+CgEoA+AVqO3oPL8gB Gqs8sCoP4GGd8ft2u+YW9qxqePlobByImwBpvCQpATysKyJRyH/KCRE2Zr1hPWdZ3mJpYk k85RqIzGWpDmwPQgwuJ0w0X45Ga6VslYuLQ8XMWoqJ1dDVmG0H8xNFvh2Nf8k1mBFvl2Vo VnV7edV/HCHKiym+gHmxgQraJhQHo3xQ375ssVTj0L0f2ibmc2Y4/Iy59ZI6kL5cZAoAn4 CDa3LEBJmp5lZ1EpL8vM3OjPMTeV48KWQ1iWAhhumxrfpOca60QjeQmvcALCYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQQy74L6Pz1BjL; Thu, 25 Apr 2024 19:33: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 43PJXZrl033697; Thu, 25 Apr 2024 19:33:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PJXZv3033694; Thu, 25 Apr 2024 19:33:35 GMT (envelope-from git) Date: Thu, 25 Apr 2024 19:33:35 GMT Message-Id: <202404251933.43PJXZv3033694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8efba70d7914 - main - nfscl: Revert part of commit 196787f79e67 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8efba70d7914324890b1f8fe3079036eb2b5c3db Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8efba70d7914324890b1f8fe3079036eb2b5c3db commit 8efba70d7914324890b1f8fe3079036eb2b5c3db Author: Rick Macklem AuthorDate: 2024-04-25 19:32:02 +0000 Commit: Rick Macklem CommitDate: 2024-04-25 19:32:02 +0000 nfscl: Revert part of commit 196787f79e67 Commit 196787f79e67 erroneously assumed that the client code for Open/Claim_deleg_cur_FH was broken, but it was not. It was actually wireshark that was broken and indicated that the correct XDR was bogus. This reverts the part of 196787f79e67 that changed the arguments for Open/Claim_deleg_cur_FH. Found during the IETF bakeathon testing event this week. MFC after: 3 days --- sys/fs/nfsclient/nfs_clrpcops.c | 33 ++++++++++----------------------- sys/fs/nfsclient/nfs_clstate.c | 23 +---------------------- sys/fs/nfsclient/nfsmount.h | 1 - 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 09660730d485..75bb5236cb65 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -561,34 +561,21 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, *tl = txdr_unsigned(delegtype); } else { if (dp != NULL) { - if (NFSHASNFSV4N(nmp)) { + if (NFSHASNFSV4N(nmp)) *tl = txdr_unsigned( NFSV4OPEN_CLAIMDELEGATECURFH); - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) != - 0) { - NFSUNLOCKMNT(nmp); - /* - * Add a stateID argument to make old - * broken FreeBSD NFSv4.1/4.2 servers - * happy. - */ - NFSM_BUILD(tl, uint32_t *,NFSX_STATEID); - *tl++ = 0; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; - } else - NFSUNLOCKMNT(nmp); - } else { + else *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); - NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + if (NFSHASNFSV4N(nmp)) + *tl++ = 0; + else *tl++ = dp->nfsdl_stateid.seqid; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + if (!NFSHASNFSV4N(nmp)) (void)nfsm_strtom(nd, name, namelen); - } } else if (NFSHASNFSV4N(nmp)) { *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } else { diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index ebc11efea637..9fbaa6e63a56 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4512,7 +4512,6 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, { int error; struct nfscldeleg *dp; - bool try_busted_xdr; dp = *ndpp; do { @@ -4520,29 +4519,9 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 0, 0); - try_busted_xdr = false; if (error == NFSERR_DELAY) (void) nfs_catnap(PZERO, error, "nfstryop"); - else if (error == NFSERR_EXPIRED && NFSHASNFSV4N(nmp) && - reclaim == 0 && dp != NULL) { - /* This case is a Claim_Deleg_Cur_FH Open. */ - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) == 0) { - /* - * Old FreeBSD NFSv4.1/4.2 servers erroneously - * expect a stateID argument for Open - * Claim_Deleg_Cur_FH and interpret the - * Getattr reply as a stateID. This results - * in an NFSERR_EXPIRED failure. - * Setting NFSMNTP_BUGGYFBSDSRV makes the Open - * send a stateID, in violation of RFC8881. - */ - try_busted_xdr = true; - nmp->nm_privflag |= NFSMNTP_BUGGYFBSDSRV; - } - NFSUNLOCKMNT(nmp); - } - } while (error == NFSERR_DELAY || try_busted_xdr); + } while (error == NFSERR_DELAY); if (error == EAUTH || error == EACCES) { /* Try again using system credentials */ newnfs_setroot(cred); diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h index 7571add27b9c..37b84a015dab 100644 --- a/sys/fs/nfsclient/nfsmount.h +++ b/sys/fs/nfsclient/nfsmount.h @@ -124,7 +124,6 @@ struct nfsmount { #define NFSMNTP_DELEGISSUED 0x00000400 #define NFSMNTP_NODEALLOCATE 0x00000800 #define NFSMNTP_FAKEROOTFH 0x00001000 -#define NFSMNTP_BUGGYFBSDSRV 0x00002000 /* New mount flags only used by the kernel via nmount(2). */ #define NFSMNT_TLS 0x00000001 From nobody Thu Apr 25 19:43:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQR9m35qtz5JQ9y for ; Thu, 25 Apr 2024 19:43:40 +0000 (UTC) (envelope-from 0100018f16c8f233-cd4f06dd-028d-4ac0-b8f6-f433000cbf7e-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQR9m11Gsz4lJQ for ; Thu, 25 Apr 2024 19:43:40 +0000 (UTC) (envelope-from 0100018f16c8f233-cd4f06dd-028d-4ac0-b8f6-f433000cbf7e-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1714074219; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=c5cCERB0YG2/hbCrQ6yHear7QfQs4YiBiaylerms5X0=; b=Q3GVF33YP23QNBZKCe1EVgxzrFoUmmrWGbZofswKTKUhycCng5oc8NHxNs3+Fgs9 65xGcDceqDarpUDVQ/2MMlFB39gI1koTZg1loJrkgTB4d7xrlbHqtb8zeIjgTZuNd3V m/5L2Ewh2GKlte7Yksp5AOX9icXKwQDELT28Q1aM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1714074219; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=c5cCERB0YG2/hbCrQ6yHear7QfQs4YiBiaylerms5X0=; b=cTvxVvH0RFlb8cpEjP/wiF6+JhSWhiJRYZK9BPnYWll9549EVePzQ7qxMwXDku1w dbGWihJ+h/7JFBYZcIR/w3F7+IJZzllVGsDH/+IOBRsrA3VCwBkhqALAgIiByAML+dE RTSW6jsuNw68WEHYIJh0deRgjB7T713hJps627nc= Message-ID: <0100018f16c8f233-cd4f06dd-028d-4ac0-b8f6-f433000cbf7e-000000@email.amazonses.com> Date: Thu, 25 Apr 2024 19:43:39 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard To: Warner Losh Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, =?UTF-8?Q?Klaus_K=C3=BCchemann?= References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.04.25-54.240.8.237 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4VQR9m11Gsz4lJQ On 4/25/24 12:24, Warner Losh wrote: > On Thu, Apr 25, 2024, 12:57 PM Colin Percival > wrote: > On 4/19/24 16:11, Warner Losh wrote: > >      add dtb support for RPI CM4, CM4s, CM4_ioBoard > > > >      Signed-off-by: Klaus Küchemann > > >      Reviewed by: imp > >      Pull Request: https://github.com/freebsd/freebsd-src/pull/1182 > > > --- > > --- a/release/arm64/RPI.conf > > +++ b/release/arm64/RPI.conf > > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb > bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" > > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb > bcm2710-rpi-cm3.dtb \ > > +     bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb > bcm2711-rpi-cm4s.dtb" > > This broke the RPI release build, since bcm2711-rpi-cm4s.dtb doesn't exist. > Is it provided by a port which we should add to the RPI build? > > I thought it was in tree. I'll look into this and report back. Entirely possible. The release-building code is trying to copy it from /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb so if it's somewhere else we need to adjust that code. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Apr 25 20:01:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQRZG09lXz5JRJ2; Thu, 25 Apr 2024 20:01:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQRZF6lrDz4nZc; Thu, 25 Apr 2024 20:01:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714075285; 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=WWnYOS+akd2uFpC9goFDk3FEjozeo4UPZkYhmPnPIHQ=; b=aoVjvkybx/qBid2luY98nYUeKpaaH5AvV+WWiaXaLOsPZW7dYxkVd0U85zFbzskwNODfsc GJyRwDHzVbl7ek2UqsGkeSmf+eCyJWmDKJo3CP5XKx3WdEkCG8VjkEv79+4vsLTsGUjV4l zdM/kKkXIWO+hf9MEKKrlfyUojxAinpVNWAyBNUMPnxSXhfGlIoB3gfh7XLdtUK3uFkbVD xfjay0cwY+yOnTXWrQV1+zDZV3yvBtHWVX1gaDq0+H5HOFIXnJO5pXT64BDSRBH4fuA/Td 4OEDTDyNQwfqPNwFflchQLQEzWe32WFTZaSAXSTbjKm6SKKh22BI1T/Psry1Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714075285; a=rsa-sha256; cv=none; b=BH7C38uiGu6XLyL/SOvYZtqF6YPpkeJKNkOL5G6YW6NdUbi00rhrjEgvkqicR9DfgjaEPw npoLJo9ahI3A+0OCBVoQAIhU4bpbcuQhzHF8Oo8KdjBUg1nlun5yb1AIDzJ8+DI1MDqbch lbNv/RHe6IY9YrhX/vlroIOd5aPtlYdLL5Fylw332G6kFgvhTZOctr49mgTCsERhXEXjXn wVC2v84HfgMLyQjNnpz7d/p3tdJRm6mtRicdea2dDr720R4MfjaVq7eVHToZqfBQOTAITU EaUnKVxdIoNqx2nMLfKGTNtbwyJA9foxcMdgdshG8JxDM2F/+4cORA+Xo1dhzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714075285; 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=WWnYOS+akd2uFpC9goFDk3FEjozeo4UPZkYhmPnPIHQ=; b=O/qB+uQLwIoh1ruYWsIWa+DARpDo1WnNEk6dyFAgaQ9no51JQGVdIp22miagqZ/qcIAfcy UEo9iiT1f1TBRn5TDagTejgf9xlU3814z8x8Hdx07KzC3Agth/C63atEhcNQ0ziFXPLaP/ M1wv6LbvsTPKzoZ4fmf6dvZs4NaK9s7NryVFze0GPKVnbwIgSQL6YiRgYrlNWFpsZLgtds aX6urNNf/Qv9ZV1xeRZGxrzCKd/8fuEkneA5IOWHbKrafm4VFMyobJfVHV2n87hygqVydN n5g6fJsmU42kCGOWAuOKKaBgAi5FALGBvylTmx35bGTspknyGFinYzhCbUBrMg== Received: from [10.9.4.95] (unknown [209.182.120.176]) (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: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VQRZC6kQSzh0s; Thu, 25 Apr 2024 20:01:23 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> Date: Thu, 25 Apr 2024 15:01:20 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard To: Colin Percival , Warner Losh Cc: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, =?UTF-8?Q?Klaus_K=C3=BCchemann?= References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> Content-Language: en-US From: Kyle Evans In-Reply-To: <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/25/24 14:43, Colin Percival wrote: > On 4/25/24 12:24, Warner Losh wrote: >> On Thu, Apr 25, 2024, 12:57 PM Colin Percival > > wrote: >>     On 4/19/24 16:11, Warner Losh wrote: >>      >      add dtb support for RPI CM4, CM4s, CM4_ioBoard >>      > >>      >      Signed-off-by: Klaus Küchemann >     > >>      >      Reviewed by: imp >>      >      Pull Request: >> https://github.com/freebsd/freebsd-src/pull/1182 >>     >>      > --- >>      > --- a/release/arm64/RPI.conf >>      > +++ b/release/arm64/RPI.conf >>      > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >> bcm2710-rpi-3-b-plus.dtb >>     bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" >>      > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >> bcm2710-rpi-3-b-plus.dtb >>     bcm2710-rpi-cm3.dtb \ >>      > +     bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb >> bcm2711-rpi-cm4.dtb >>     bcm2711-rpi-cm4s.dtb" >> >>     This broke the RPI release build, since bcm2711-rpi-cm4s.dtb >> doesn't exist. >>     Is it provided by a port which we should add to the RPI build? >> >> I thought it was in tree. I'll look into this and report back. > > Entirely possible.  The release-building code is trying to copy it from > /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb > so if it's somewhere else we need to adjust that code. > The rpi-firmware port is supposed to provide all .dtb used here, but we've never installed that one. It really shouldn't have been included in the list to begin with, but I guess if there's demand we should fix the port to include it. Thanks, Kyle Evans From nobody Thu Apr 25 21:43:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQTrK2h32z5JcVC; Thu, 25 Apr 2024 21: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 4VQTrK25Lrz41qY; Thu, 25 Apr 2024 21: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=1714081425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzNk5oUWqhgCBtxs+2QpTp+dS4tIOsyEKdC0nFYR+VA=; b=hjm29Fw6fuTGDMcjdmMO8UFBH2JZtb+mWL/2YDt2lThKHSlv7/SCM6mFp34s253noJuVkf M9lBZsWd9xx6QAIhVsTIwGpNrgkowwKSiUZqfcyeUbWTNTdFmb02XRIT1Q3dauoLWftOVC +eSAFsGWJMbbmhPyXX77VrCYpAuj/UOmPxjqZUH5EfZor96xSmJ7lficcRVMUz163OBjEN fvgL+rHNzlYx2AqBfrdWiHUsWytnbzo7DfRIJMnPekgK4useUmVF2ZbdrU9qSC01K2u+3M ICSZGtlrXhcIK0tOo2OMQV7drzdLiIbG/l/J/Bwh9xz6DVM6GJ5XsOqhDq2G0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714081425; a=rsa-sha256; cv=none; b=lAjZHWTOLRyiARBqS7cngwuwzg3eGTfyDQSSgzo2R64y9WBpKEuB+TlasNbfRIcWHRzUdR LTJ9FznVL6UrEzS3puJoMRynecRo1ONFhbiL7HebLdw8ajB5yd3jbCb+BTu80nYJ5uNg2E wreJzh9/eJGYS+SSHmWdjC3gIBq5YpaM8oPQGXxMVUFs/0bp8+7Au1du9kDfqC9bpptMY3 cE9CzZ+/mPidPxq/Yg4qWP7IUYz0hZWLe0XNkB0jPtqs0rVbIbFpZd6Qj5hhTmbwbD8IyA W8ddGKELq/G/9kW43ELP8TSEsf1tVIir81Ia1X1qhk3EUGLx/yPdC+H9IlvMhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714081425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzNk5oUWqhgCBtxs+2QpTp+dS4tIOsyEKdC0nFYR+VA=; b=aDlhIJV3J53xafDveR9zWcDRwdZ1hEbg14APFcpfBGfsGszfpLC1532T1ziBpmciASjH/O VKL5NxP9giV1L9hkHjZCaBU/qr9RUDZ2EnZOf1bfsKoxHD759OgoeI+uY5n8HmenmRTtHo y5XEr+O7Gzyxn/IZBa7GKDq4C9SfgnD6OEsbZoV25j6xGsWxMZGPiw1us8v4mven43aPmX kgXZBlwunraPM45yMCPyZ4p0ynublkKTeDuIjzd/zjSkCV/x9+KGIALoiTyswZPMhVesc+ fOmXqdujfzDVx5Rw0uNzD1g3MG6+lbOWBB8GlihKEgCxdaTeRLfPPBtgwWO9Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQTrK1hb1zGWM; Thu, 25 Apr 2024 21: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 43PLhj8s052106; Thu, 25 Apr 2024 21: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 43PLhjjm052103; Thu, 25 Apr 2024 21:43:45 GMT (envelope-from git) Date: Thu, 25 Apr 2024 21:43:45 GMT Message-Id: <202404252143.43PLhjjm052103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 68cbb072fd1c - main - Revert "config.mk: Add MK_VIMAGE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68cbb072fd1c7f0928efbb466f278e6c2e0a2024 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=68cbb072fd1c7f0928efbb466f278e6c2e0a2024 commit 68cbb072fd1c7f0928efbb466f278e6c2e0a2024 Author: Brooks Davis AuthorDate: 2024-04-25 21:38:15 +0000 Commit: Brooks Davis CommitDate: 2024-04-25 21:43:36 +0000 Revert "config.mk: Add MK_VIMAGE knob" This commit broke "make makeman" checks in github CI due to a lack of option description files. The split between VIMAGE and VIMAGE_SUPPORT is not clearly justified and the code is broken because there is no opt_vimage.h (it's in opt_global.h). This reverts commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06. --- share/mk/src.opts.mk | 2 -- sys/conf/config.mk | 2 -- sys/conf/kern.opts.mk | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index b7196b6fe824..00405e3f934f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -183,7 +183,6 @@ __DEFAULT_YES_OPTIONS = \ USB \ UTMPX \ VI \ - VIMAGE \ VT \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ @@ -248,7 +247,6 @@ __LIBC_MALLOC_DEFAULT= jemalloc NETGRAPH \ PAM \ TESTS \ - VIMAGE \ WIRELESS __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var} .endfor diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 6e26ee0d5e66..729111b4ef3a 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -11,9 +11,7 @@ opt_global.h: touch ${.TARGET} @echo "#define SMP 1" >> ${.TARGET} @echo "#define MAC 1" >> ${.TARGET} -.if ${MK_VIMAGE_SUPPORT} != "no" @echo "#define VIMAGE 1" >> ${.TARGET} -.endif # Note: Define 'options' in DEFAULTS to 1. For simplicity, no check if the # option is in opt_global.h. Nearly all the options in DEFAUlTS today are in # opt_global.h with GEOM_* being the main exceptions. Move any options from diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 8b1151f3d624..d9d96a133250 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -52,7 +52,6 @@ __DEFAULT_YES_OPTIONS = \ SPLIT_KERNEL_DEBUG \ TESTS \ USB_GADGET_EXAMPLES \ - VIMAGE \ ZFS __DEFAULT_NO_OPTIONS = \ @@ -183,8 +182,7 @@ OPT_${opt}:= ${rep} # .for var in \ INET \ - INET6 \ - VIMAGE + INET6 .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else From nobody Thu Apr 25 21:44:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQTsq1Qgvz5JcYZ; Thu, 25 Apr 2024 21:45:03 +0000 (UTC) (envelope-from maciphone2@googlemail.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 4VQTsp6lZHz427Z; Thu, 25 Apr 2024 21:45:02 +0000 (UTC) (envelope-from maciphone2@googlemail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-571e3f40e31so1326166a12.2; Thu, 25 Apr 2024 14:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1714081499; x=1714686299; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :from:to:cc:subject:date:message-id:reply-to; bh=rklUYOXZOuzPvGh/mfeHzDD7eCpuvjcoWmeqVa8NC+w=; b=Eh1p+03q7iYBQQEIVccjMTELp86cpPdnh4P1b4CmdkTNRFEs9QYqY63hcFE380AjBL b6IQ5RVZZrUeWv0FKx1DGsYmoW9Y5cQe0rvkJgSAj+Pr14KEVa1FfrVs6irpZ/s5nTih inPF3rp2reLCJR5SsM9c+FftJvDuk0uBFXkOyVDY38HMI+VftqSXoEv+Uf/B7pVVBVCY oQpzmvTZH2gC3LQ38z9CgM1xQqxIMJcTgTHtHgx3QRzWGd2F66C3NVW+IbjDCmaheLtf JzoOpyzNPjJoenuIkKrzkY4Oh1V/jvZohZhffifVs/5Z0B0S+TIWmsm+nP5v5hjmI2pE bBNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714081499; x=1714686299; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rklUYOXZOuzPvGh/mfeHzDD7eCpuvjcoWmeqVa8NC+w=; b=emeRrAH44Cm+4GlCsSQbwVdGmqbGQEvdz8f3ES0fWY2WnosswB+YbVaS1TxwfKW9K2 O4B+O26s4AJhurUbto24WySdhg5CH4duAKFgPAp5aQSkzrwxWXmUiJTW5cSj15334GsC 1Jgevu40TZmf1yQWuasVnYU4azQPoaJOX7R8ZPUqdVazRpsPmWRLFGIVQiQflkA4OJ9q Ioa9TK1MlcP7J+wE7YQMxk2IkOljeR/oPhqU4NQx/K9tAtggbHqDthdZ0NWSoSeO9pjL UM1HP8I4Houpcaa+z6OANgLRggFjMfvmCbYC7plexRbtXKBVoP2nCx4kRWAhYevKH1Cm Ft4A== X-Forwarded-Encrypted: i=1; AJvYcCUmOwOFo993/Pzi5LhkYKUs6GnmmefLq80dX5CtCd6ok3eem2XX7wHUnVKPLhB6nv3hpod4vemDrc+pBnioGhKhHCwdKHzCHlrcZH2rqHhz7UsyP56tfjVS3f5pvHCFDCPYv692OCRxMMog7/cD/tDCUeSPfRV1hwlCxA5cPqNSyLRwS51tSLc2ZfO5O6g= X-Gm-Message-State: AOJu0YxKc2oz5HI/pxnoi6sMJ7QV92MpW5Zzsr1thq4h3ZOCNziZG8JB gdCYyVyaMWl2HiCzQ/5AW9U6dEFAxSfzfbyhalFAGj0+yObSeumULMtRmQ== X-Google-Smtp-Source: AGHT+IEvaaNEXNdQYRBqOztU5dc1jCq96l+FGWeThWUHgw+A1qswKdxBH6FYtDp98qFWsOnLjqyg2Q== X-Received: by 2002:a50:9352:0:b0:56b:c210:870c with SMTP id n18-20020a509352000000b0056bc210870cmr528438eda.15.1714081498757; Thu, 25 Apr 2024 14:44:58 -0700 (PDT) Received: from smtpclient.apple (dynamic-046-115-021-017.46.115.pool.telefonica.de. [46.115.21.17]) by smtp.googlemail.com with ESMTPSA id u25-20020a056402111900b005720c59dc57sm4998961edv.23.2024.04.25.14.44.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2024 14:44:58 -0700 (PDT) From: =?utf-8?Q?Klaus_K=C3=BCchemann?= Content-Type: multipart/alternative; boundary="Apple-Mail=_022483E1-1624-4E13-9994-F726AF53F022" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Date: Thu, 25 Apr 2024 23:44:45 +0200 References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> To: Kyle Evans , cperciva@tarsnap.com, Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> Message-Id: <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> X-Mailer: Apple Mail (2.3774.500.171.1.1) 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VQTsp6lZHz427Z --Apple-Mail=_022483E1-1624-4E13-9994-F726AF53F022 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > Am 25.04.2024 um 22:01 schrieb Kyle Evans : >=20 > On 4/25/24 14:43, Colin Percival wrote: >> On 4/25/24 12:24, Warner Losh wrote: >>> On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival = > wrote: >>> On 4/19/24 16:11, Warner Losh wrote: >>> > add dtb support for RPI CM4, CM4s, CM4_ioBoard >>> > >>> > Signed-off-by: Klaus K=C3=BCchemann = >> > >>> > Reviewed by: imp >>> > Pull Request: = https://github.com/freebsd/freebsd-src/pull/1182 >>> >>> > --- >>> > --- a/release/arm64/RPI.conf >>> > +++ b/release/arm64/RPI.conf >>> > -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb >>> bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" >>> > +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb >>> bcm2710-rpi-cm3.dtb \ >>> > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb = bcm2711-rpi-cm4.dtb >>> bcm2711-rpi-cm4s.dtb" >>>=20 >>> This broke the RPI release build, since bcm2711-rpi-cm4s.dtb = doesn't exist. >>> Is it provided by a port which we should add to the RPI build? >>>=20 >>> I thought it was in tree. I'll look into this and report back. >> Entirely possible. The release-building code is trying to copy it = from >> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb >> so if it's somewhere else we need to adjust that code. >=20 > The rpi-firmware port is supposed to provide all .dtb used here, but = we've never installed that one. It really shouldn't have been included = in the list to begin with, but I guess if there's demand we should fix = the port to include it. >=20 > Thanks, >=20 > Kyle Evans we only have tested/fixed the CM4-model, not forceably need the = cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at = least temporarily. =20 But please hold cm4.dtb and the cm4_io_.dtb, which will then hopefully = not break the rpi-release anymore.=20 Of course would be better to upgrade the port. thank you Regards Klaus --Apple-Mail=_022483E1-1624-4E13-9994-F726AF53F022 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

Am 25.04.2024 um 22:01 schrieb Kyle Evans = <kevans@FreeBSD.org>:

On 4/25/24 14:43, Colin = Percival wrote:
On 4/25/24 12:24, Warner = Losh wrote:
On Thu, Apr 25, 2024, = 12:57=E2=80=AFPM Colin Percival <cperciva@tarsnap.com = <mailto:cperciva@tarsnap.com>> wrote:
    On = 4/19/24 16:11, Warner Losh wrote:
     >  =     add dtb support for RPI CM4, CM4s, = CM4_ioBoard
     >
     = >      Signed-off-by: Klaus K=C3=BCchemann = <maciphone2@googlemail.com
    = <mailto:maciphone2@googlemail.com>>
     = >      Reviewed by: imp
     = >      Pull Request: = https://github.com/freebsd/freebsd-src/pull/1182
    = <https://github.com/freebsd/freebsd-src/pull/1182>
  &n= bsp;  > ---
     > --- = a/release/arm64/RPI.conf
     > +++ = b/release/arm64/RPI.conf
     > = -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb
    bcm2710-rpi-cm3.dtb = bcm2711-rpi-4-b.dtb"
     > = +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb
    bcm2710-rpi-cm3.dtb = \
     > +    =  bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb = bcm2711-rpi-cm4.dtb
    = bcm2711-rpi-cm4s.dtb"

    This broke the RPI = release build, since bcm2711-rpi-cm4s.dtb doesn't = exist.
    Is it provided by a port which we should = add to the RPI build?

I thought it was in tree. I'll look into = this and report back.
Entirely possible.  The = release-building code is trying to copy it = from
/usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb
so if it's = somewhere else we need to adjust that code.

The = rpi-firmware port is supposed to provide all .dtb used here, but we've = never installed that one.  It really shouldn't have been included = in the list to begin with, but I guess if there's demand we should fix = the port to include it.

Thanks,

Kyle = Evans

we only have tested/fixed the = CM4-model,  not forceably need the cm4s.dtb , so no objections to = remove cm4s.dtb from the dtb-list at least temporarily.  

But please hold cm4.dtb and the = cm4_io_.dtb, which will then hopefully not break the rpi-release = anymore. 

Of course = would be better to upgrade the port.

thank you

Regards

Klaus


= --Apple-Mail=_022483E1-1624-4E13-9994-F726AF53F022-- From nobody Thu Apr 25 22:09:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVPz4xmsz5JfC4; Thu, 25 Apr 2024 22:09:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQVPz4Mtmz44MN; Thu, 25 Apr 2024 22:09:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714082967; h=from:from:reply-to:subject: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=cGQBksAFiITXqYzbNTyM4+flUys8SnQ9ywnjHuD198I=; b=kkIDrnZgqrAQFdHgQpOlhie3wZbfzjEar4z0a3qGumL3Iio6VKBsoXUjZQmOJVZ7YPcjUL EPoVZqaQcKXkiKlZLb+MF9/I2pmiUHQW5m54R/3Kw24vE/Fjx+igdzgcqSxp97NDGUpDkw rdKbJ2lr7R37wVo2gmiHDCNTvWQTyiGJAetugRa2BrbSj+VlFDD/mcupeCjXjALd/0LUxu NFwZmA5CarzHERfz/iJciYW01LNeA8yZrd3An+wZmqwm5kYVrqO9fJLcwqwj8ierGYPc9A ZLyRtePzlrumNX04J6ImKc6/xfBZ/VUA9uBUBFxmYf8MwLDAmAoEauiCwEVgmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714082967; a=rsa-sha256; cv=none; b=WswAgzLmsS/h4VMdu0stTqxBjtvBZ+BJIBuHqWEPZApA72vc68KynoHe/5boL9QDqOdJff vYKlDUv9Lq0JgJiW/qkn802X7LFBbhv79ADz7FbIu+pTkg4zfH8gB+8wyJ0BFKFhU3mJ5t J6rOTd4QAr9v3wD9Kh7RrT/6vD7UD9x7Sae0OYH40kJoNKSs5rc149flugV+mkokbAspwQ w79+c0dCwctOhORWNpi5fTENfmzMe8Izdz0Aakn1F9NO4r9Sdk4vpVdUeFlin3jp7AWMw1 ZTD296pgpzNMmWwOJrGcIgKeekrTIjCItaDTcJgdU0ugYoaPPNW3MITLtEVgRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714082967; h=from:from:reply-to:subject: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=cGQBksAFiITXqYzbNTyM4+flUys8SnQ9ywnjHuD198I=; b=FgdxFa2nDaZX8kTieoVOhm+WELjqlKB4JqNuSn1O2ciMv4GmFyPeqvVVVm4yHxZIBiqjBj CzjcO+WlpX+jC7oCzv7i4B5LSSu1L8nbasFhaPXwc+9B9WhpiNNNSiHHrmphiEVWBYt5Tx P3Zhvsbz+8+L6Ka6GNSpM5IfvhZcGyJDDf+wR7W8xCwzDJyXPKmY+qK/xgh3Pgd5MHi5mY Br8PcR94k3ueL1wXeS3KI14d5Fv++aZL8wXDqfbNGSXaVOQNtvCJetAxfDmXL8r6hPptvP fnRl/CRZo4AZhjl7PuIfJEG8xnjEZY28rwzH6m5AkeGyxu2aq8e6jbN7mtpbrg== Received: from [10.9.4.95] (unknown [209.182.120.176]) (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: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VQVPy0t8tz11xH; Thu, 25 Apr 2024 22:09:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> Date: Thu, 25 Apr 2024 17:09:24 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Content-Language: en-US To: =?UTF-8?Q?Klaus_K=C3=BCchemann?= , cperciva@tarsnap.com, Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> From: Kyle Evans In-Reply-To: <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/25/24 16:44, Klaus Küchemann wrote: > > >> Am 25.04.2024 um 22:01 schrieb Kyle Evans : >> >> On 4/25/24 14:43, Colin Percival wrote: >>> On 4/25/24 12:24, Warner Losh wrote: >>>> On Thu, Apr 25, 2024, 12:57 PM Colin Percival >>> > wrote: >>>>     On 4/19/24 16:11, Warner Losh wrote: >>>>      >      add dtb support for RPI CM4, CM4s, CM4_ioBoard >>>>      > >>>>      >      Signed-off-by: Klaus Küchemann >>>     > >>>>      >      Reviewed by: imp >>>>      >      Pull Request: >>>> https://github.com/freebsd/freebsd-src/pull/1182 >>>>     >>>>      > --- >>>>      > --- a/release/arm64/RPI.conf >>>>      > +++ b/release/arm64/RPI.conf >>>>      > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >>>> bcm2710-rpi-3-b-plus.dtb >>>>     bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" >>>>      > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >>>> bcm2710-rpi-3-b-plus.dtb >>>>     bcm2710-rpi-cm3.dtb \ >>>>      > +     bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb >>>> bcm2711-rpi-cm4.dtb >>>>     bcm2711-rpi-cm4s.dtb" >>>> >>>>     This broke the RPI release build, since bcm2711-rpi-cm4s.dtb >>>> doesn't exist. >>>>     Is it provided by a port which we should add to the RPI build? >>>> >>>> I thought it was in tree. I'll look into this and report back. >>> Entirely possible.  The release-building code is trying to copy it from >>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb >>> so if it's somewhere else we need to adjust that code. >> >> The rpi-firmware port is supposed to provide all .dtb used here, but >> we've never installed that one.  It really shouldn't have been >> included in the list to begin with, but I guess if there's demand we >> should fix the port to include it. >> >> Thanks, >> >> Kyle Evans > > we only have tested/fixed the CM4-model,  not forceably need the > cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at > least temporarily. > > But please hold cm4.dtb and the cm4_io_.dtb, which will then hopefully > not break the rpi-release anymore. > I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to update the port (sysutils/rpi-firmware) to grab it then try again once new packages are available with it so that we don't break the snapshot again from the same file. Thanks, Kyle Evans From nobody Thu Apr 25 22:11:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVSp38Ngz5JfY5 for ; Thu, 25 Apr 2024 22:11:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe30.google.com (mail-vs1-xe30.google.com [IPv6:2607:f8b0:4864:20::e30]) (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 4VQVSp1Ggbz4571 for ; Thu, 25 Apr 2024 22:11:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vs1-xe30.google.com with SMTP id ada2fe7eead31-47a21e0cde6so615703137.0 for ; Thu, 25 Apr 2024 15:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1714083112; x=1714687912; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=o7nMoV10V7vDN46T6ZzC0RFPgwEu9BB+wWEhKOtLlz4=; b=Fhhxy5lQ416a0Zj8TA2U+27/G+wAnl/gY3SKf46erpXU9YoIYd2UyTkZ8tUpeh8Hlj N2fk0AwJ5iLKhdhtynes/24OuDTxjKNRc7LbnR0LEkRzKDr9cz6fAesnI1VNZYRXBYZg kpuAY1O8yRe4GSUqGRWZNU71u4vQHrntH9lNYfvSYE6E/oTF2c+g7vtnug8u0T2FKpFQ 3dkwqz8Xvxa3UyDLRxIDQxgT1kY3OOQvxcBN7aY8TxxRwwJN+mAa8pVPIwCTyB85xjP3 7v/1SFWC2wzVckdaiPUWmaU82SMpu+nuU5meaiSQeikUYY6bowjlYlNAhMNeJdP+ozY5 70VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714083112; x=1714687912; 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=o7nMoV10V7vDN46T6ZzC0RFPgwEu9BB+wWEhKOtLlz4=; b=FHOkVI87OuTJOhfHZMhNQxhbSWqyrSf4F+bE7afMaM7C7q0WaO+vs9oLK3hAeVLO5B SMYrqxeEAA3F2hXoC97g8igZqPobyn81+VRCjrUjrpXGhl4A022SCMMW5RMfSa/+LK8K imhUvWBgjFYZDJ/js/4tJocKtfCDlU/7WO188l+o/MLgwt0tKWsHm0hbmFG6CKTVQYef 8STPdJLahzFJrWrHeN1o+XPFAfyUdj3WJLyIcj5HVLEIAWTOMUoSxzdblJ2FpIzj87EK vJc74JcDEEu/ULIfErwpXF+dda1AXLrxG68t0Sm6haL6MwfEJP+/EF3stw8PbYeP2h55 guCA== X-Forwarded-Encrypted: i=1; AJvYcCUUiH7it5n3dISTtRj9bTx8ygHlwmJ0dW2Rt7g/09gPL+XXEpFEdDgBmMjFBl63QFSxP/fpsOqOeieyg8FPdWqO8XE1R+lMDsZgm2PXaAhO X-Gm-Message-State: AOJu0YyG4O8wjc6lNJ0j/TEjFm5Q3vuuQd7UJevJateDcTqlbip243it CFPUpGZI2LJqHF0vzPlTC1ToTZyNSIf81CPONfVNR5Y+GqVMKHlRnjX0V4wRc9Mui8B6TGKpQG6 YmfYvVKKBhPts1pCYal+zDgBRGuOKXsiT+0Te7C1fXtCT44tpybc= X-Google-Smtp-Source: AGHT+IG0kMyhTj9QYrsv6MLNGuss0KFUH92UOj2HRbrMu5tOlX48UET67/U8A3AkzxXsptFDOrug30rcaSnlg49dcB4= X-Received: by 2002:a05:6122:30a6:b0:4d4:3ec6:421e with SMTP id cd38-20020a05612230a600b004d43ec6421emr936581vkb.4.1714083111579; Thu, 25 Apr 2024 15:11:51 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> In-Reply-To: <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> From: Warner Losh Date: Thu, 25 Apr 2024 16:11:38 -0600 Message-ID: Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard To: Kyle Evans Cc: =?UTF-8?Q?Klaus_K=C3=BCchemann?= , Colin Percival , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000fb51510616f312a6" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4VQVSp1Ggbz4571 --000000000000fb51510616f312a6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Apr 25, 2024, 4:09=E2=80=AFPM Kyle Evans wrote= : > On 4/25/24 16:44, Klaus K=C3=BCchemann wrote: > > > > > >> Am 25.04.2024 um 22:01 schrieb Kyle Evans : > >> > >> On 4/25/24 14:43, Colin Percival wrote: > >>> On 4/25/24 12:24, Warner Losh wrote: > >>>> On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival >>>> > wrote: > >>>> On 4/19/24 16:11, Warner Losh wrote: > >>>> > add dtb support for RPI CM4, CM4s, CM4_ioBoard > >>>> > > >>>> > Signed-off-by: Klaus K=C3=BCchemann >>>> > > >>>> > Reviewed by: imp > >>>> > Pull Request: > >>>> https://github.com/freebsd/freebsd-src/pull/1182 > >>>> > >>>> > --- > >>>> > --- a/release/arm64/RPI.conf > >>>> > +++ b/release/arm64/RPI.conf > >>>> > -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb > >>>> bcm2710-rpi-3-b-plus.dtb > >>>> bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" > >>>> > +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb > >>>> bcm2710-rpi-3-b-plus.dtb > >>>> bcm2710-rpi-cm3.dtb \ > >>>> > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb > >>>> bcm2711-rpi-cm4.dtb > >>>> bcm2711-rpi-cm4s.dtb" > >>>> > >>>> This broke the RPI release build, since bcm2711-rpi-cm4s.dtb > >>>> doesn't exist. > >>>> Is it provided by a port which we should add to the RPI build? > >>>> > >>>> I thought it was in tree. I'll look into this and report back. > >>> Entirely possible. The release-building code is trying to copy it fr= om > >>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb > >>> so if it's somewhere else we need to adjust that code. > >> > >> The rpi-firmware port is supposed to provide all .dtb used here, but > >> we've never installed that one. It really shouldn't have been > >> included in the list to begin with, but I guess if there's demand we > >> should fix the port to include it. > >> > >> Thanks, > >> > >> Kyle Evans > > > > we only have tested/fixed the CM4-model, not forceably need the > > cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at > > least temporarily. > > > > But please hold cm4.dtb and the cm4_io_.dtb, which will then hopefully > > not break the rpi-release anymore. > > > > I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to > update the port (sysutils/rpi-firmware) to grab it then try again once > new packages are available with it so that we don't break the snapshot > again from the same file. > Thanks. Warner Thanks, > > Kyle Evans > --000000000000fb51510616f312a6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Apr 25, 2024, 4:09=E2=80=AFPM Kyle Evans <<= a href=3D"mailto:kevans@freebsd.org">kevans@freebsd.org> wrote:
<= /div>
On 4/25/24 16:44, Klaus K=C3=BCchemann = wrote:
>
>
>> Am 25.04.2024 um 22:01 schrieb Kyle Evans <kevans@FreeBSD.org&g= t;:
>>
>> On 4/25/24 14:43, Colin Percival wrote:
>>> On 4/25/24 12:24, Warner Losh wrote:
>>>> On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival <= cperciva@tarsnap.com
>>>> <mailto:cperciva@tarsnap.com>> wrote:
>>>> =C2=A0=C2=A0=C2=A0 On 4/19/24 16:11, Warner Losh wrote: >>>> =C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 =C2=A0 =C2=A0 add dtb = support for RPI CM4, CM4s, CM4_ioBoard
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 >
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 =C2=A0 =C2=A0 Signed-o= ff-by: Klaus K=C3=BCchemann <maciphone2@googlemail.com
>>>> =C2=A0=C2=A0=C2=A0 <mailto:maciphone2@googlemail= .com>>
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 =C2=A0 =C2=A0 Reviewed= by: imp
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 =C2=A0 =C2=A0 Pull Req= uest:
>>>> https://github.com/freeb= sd/freebsd-src/pull/1182
>>>> =C2=A0=C2=A0=C2=A0 <h= ttps://github.com/freebsd/freebsd-src/pull/1182>
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > ---
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > --- a/release/arm64/RPI.conf=
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > +++ b/release/arm64/RPI.conf=
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > -DTB=3D"bcm2710-rpi-2-b= .dtb bcm2710-rpi-3-b.dtb
>>>> bcm2710-rpi-3-b-plus.dtb
>>>> =C2=A0=C2=A0=C2=A0 bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb= "
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > +DTB=3D"bcm2710-rpi-2-b= .dtb bcm2710-rpi-3-b.dtb
>>>> bcm2710-rpi-3-b-plus.dtb
>>>> =C2=A0=C2=A0=C2=A0 bcm2710-rpi-cm3.dtb \
>>>> =C2=A0=C2=A0=C2=A0=C2=A0 > +=C2=A0 =C2=A0 =C2=A0bcm2711= -rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb
>>>> bcm2711-rpi-cm4.dtb
>>>> =C2=A0=C2=A0=C2=A0 bcm2711-rpi-cm4s.dtb"
>>>>
>>>> =C2=A0=C2=A0=C2=A0 This broke the RPI release build, since= bcm2711-rpi-cm4s.dtb
>>>> doesn't exist.
>>>> =C2=A0=C2=A0=C2=A0 Is it provided by a port which we shoul= d add to the RPI build?
>>>>
>>>> I thought it was in tree. I'll look into this and repo= rt back.
>>> Entirely possible.=C2=A0 The release-building code is trying t= o copy it from
>>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb
>>> so if it's somewhere else we need to adjust that code.
>>
>> The rpi-firmware port is supposed to provide all .dtb used here, b= ut
>> we've never installed that one.=C2=A0 It really shouldn't = have been
>> included in the list to begin with, but I guess if there's dem= and we
>> should fix the port to include it.
>>
>> Thanks,
>>
>> Kyle Evans
>
> we only have tested/fixed the CM4-model, =C2=A0not forceably need the =
> cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at > least temporarily.
>
> But please hold cm4.dtb and the cm4_io_.dtb, which will then hopefully=
> not break the rpi-release anymore.
>

I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to update the port (sysutils/rpi-firmware) to grab it then try again once
new packages are available with it so that we don't break the snapshot =
again from the same file.
Thanks.

Warner=C2=A0

<= div class=3D"gmail_quote">
Thanks,

Kyle Evans
--000000000000fb51510616f312a6-- From nobody Thu Apr 25 22:13:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVVT20Rjz5Jff1; Thu, 25 Apr 2024 22: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 4VQVVT1NbRz45Gj; Thu, 25 Apr 2024 22: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=1714083201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sWCD85z9p4i340bLpv8vjaNDDVkBPp6iaxnWmfnkpQU=; b=KvqRmLMy6K7aIUmUjcQWaEf/514hnhYPr0s7/PmtNvE82bjZxtPexjHxIc2mlkReIej0Dj Sc5oKZb5Jmoz5LzoEe6O0Nm9w5GlJuXAz/Dj4zfNneDVPWQbio+1b9hA3ObNb81aZmoA3g Bx7j9m4HIjeNkeXawKhQUCqGq5AT6lRrhuDDTlx58X2VUbEH1Jq/AgYGxR39N7H5rc0Wiy mfCuNn7KF0YK7latL5Z1S6+cqLwGMRRBTpZwtyA1vxu+PlfIYN9d7Hxh4joR9Q0ybQyUHm wMRInQbVPHwAVyP2vOwsywEpyl9JdL2OOEUE/B8HEP6GE/Nx5MePs/PXNfzi3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714083201; a=rsa-sha256; cv=none; b=tATi/oaogwzVv0P8lhGqj/ecBhRmvF84MwNPXSaOR+VLIxgQCxO9i0kS4tgA1Gotvo6zwW VHlsnjNfAiYna80EqlROQ6AzaYmxn+CSH350ZS+eD4lqCUC2f3ybXmwJHNSCAMHvKlL8uQ QuyqzyJhdeEDBAi0lDfg4FXx8bYWF/1PHR/osgfCiB4VJ5RAl2V5gnxxYdvxPQfPHnXrTE 09qQ/II2h6thm4HeVcorIajNfjdIB2d81eblnUTtJi/q20NhJJpNq7SDFB6fbS/YjDZRQR 1o/tNrOC6gxbx0y7d/76ua6U5/GU0aInLUABXEHUbmsHnVL0y9Tr4V9P3XCplw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714083201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sWCD85z9p4i340bLpv8vjaNDDVkBPp6iaxnWmfnkpQU=; b=mICa17/RLj1E7VdA0uyHHBhYrOyyRWk7iSYp4gOzKUqg3SlMz7a6S4sYF93oTcbu0HynIL W0T3FKkhWcYDB5UwBje02j1zGpVOga1Ijf8HVwRmmhyN9YsnZqAMzBBeSXeWztWm5FnEdD uQ9pmEnLUq5Z7WJm49BnOI6JSOVk8nHMZ5EzhDBjk4/t8K6tJLyFD11fDrJTILw8esJh0f pZHxFuxOqNVBGAW6gdUpUHLkSItD4KAl3ykYTZQorHM8rt53HRmcl4hB/T05GbM7yXtnwK sHdhFulVRCv8/Trb9QaEozpNQanoQ4haA6snFz+5jGsdoBYwsZeuGsldP9xj2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQVVT0ycXzHKl; Thu, 25 Apr 2024 22: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 43PMDLDR003447; Thu, 25 Apr 2024 22: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 43PMDL3Y003444; Thu, 25 Apr 2024 22:13:21 GMT (envelope-from git) Date: Thu, 25 Apr 2024 22:13:21 GMT Message-Id: <202404252213.43PMDL3Y003444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 9245ced9c835 - main - release: remove the RPI CM4s .dtb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9245ced9c8357d876141975a6431ce34143d2753 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9245ced9c8357d876141975a6431ce34143d2753 commit 9245ced9c8357d876141975a6431ce34143d2753 Author: Kyle Evans AuthorDate: 2024-04-25 22:10:32 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 22:10:32 +0000 release: remove the RPI CM4s .dtb This isn't actually packaged by the sysutils/rpi-firmware port, so we cannot include it in the image. Fix the RPI release build until an interested party adds it to the port and packages are available. Reported by: cperciva --- release/arm64/RPI.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/arm64/RPI.conf b/release/arm64/RPI.conf index a38385a24e80..b973687c535d 100644 --- a/release/arm64/RPI.conf +++ b/release/arm64/RPI.conf @@ -4,7 +4,7 @@ DTB_DIR="/usr/local/share/rpi-firmware" DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb \ - bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb bcm2711-rpi-cm4s.dtb" + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb" EMBEDDED_TARGET_ARCH="aarch64" EMBEDDED_TARGET="arm64" EMBEDDEDBUILD=1 From nobody Thu Apr 25 22:19:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVf84h0zz5JgCx; Thu, 25 Apr 2024 22:20:00 +0000 (UTC) (envelope-from maciphone2@googlemail.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 4VQVf827dkz45gB; Thu, 25 Apr 2024 22:20:00 +0000 (UTC) (envelope-from maciphone2@googlemail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-56e6a1edecfso2347469a12.1; Thu, 25 Apr 2024 15:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1714083598; x=1714688398; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :from:to:cc:subject:date:message-id:reply-to; bh=ascjDHG1rTRggjeZijNFPSN/XY9vjTOU8Ld2NP8MnpE=; b=SaXhkFDsJyy9s0zS63sDg3Mvco6ksFDbYj3eogNWptdOirLWp7QDeVLAbK3dHE/673 xhF47P5pWudXMSBX/TUEoQQMY+yMMyC9AxJjEGkeCQ94reB7CkSQSa82sLQ+E6mAVqJD I7VV+J4dMQybbx9iOcT+RTtkOZCbpu9c/lygBuRgjAFPMjqzpL89zJdNi3rAT5KytIy4 rVDU+qkKKzlHQTo56/wjbPIEyNSNkyWxsquzkUCIfXQ3n9fS6M2T+ivc3rqF35NWnAmt i3Pk4jNErFjOLxnFu5QnCZUx5VH0pn/NS4L2oOaMA7+ZVJ+aYVxY1Pwcz0fs2zIs+NWe //qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714083598; x=1714688398; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ascjDHG1rTRggjeZijNFPSN/XY9vjTOU8Ld2NP8MnpE=; b=wRb8CNqaJyr159hPjiFDZkTVMvcUJS4EH7r3iBVnya/ncBBub/uZcrdH134DTPkEq6 FpTiUwAUA/F5hcZMZ7Hmk3HkIxIui3tAujKU1Ft6J0e2QKUR+loucsF7QwO5QqtnvmAZ y9bi1rDbVxA0bbVRyNBrhsD2POlioz+m/Z490fnH1cQv3V4qG1Yte018uQVankszs0P8 5zoIwv5oRUIIX5OFAoWCS59CZWwHhiwNO/HW05L6+OOaOn+6Pw2YEkeuiiaTt90DgCUf lgeVt7CXPLAKfbG07UBtFu39fe0AXYfZJXd046AhmSx3TAVNOUicr2vVpTPUxPYrsM6U wX+g== X-Forwarded-Encrypted: i=1; AJvYcCX2fPp4dYpY0wQRRHWTBXJhsJu3H+6r/DWH0VbfH7dOoTGzL0reC2UV0cR7k45H5CT0byVPCDwlCPH5c8/eLX4lFSqJqw2esvOwUw4/vM76CKZr44Prj4gqZccvnEe75/xrlNs/0byT+r4cGqzbog4f2DEyuYy2LozG3v4c4FwCEpFIQhuLU89BqQC6238= X-Gm-Message-State: AOJu0YyUdmshhUkgEfEgGIU45ib4C/pktq0kLoMbG2lZ8i7WYVsYXBtz WDX5hkeeactXNCzbg+iVMVv/2bebMXb8BUuK2eZvAJlhk2f9bJ//YbTexw== X-Google-Smtp-Source: AGHT+IF7DuU1xWOafxN9q3DhR0xEBYKfGjWWHxp9dYY8G04wLrwAqGHi0UmYKSUIUlKO4NI/Z966dQ== X-Received: by 2002:a05:6402:26c1:b0:572:5285:6dc2 with SMTP id x1-20020a05640226c100b0057252856dc2mr492736edd.12.1714083597800; Thu, 25 Apr 2024 15:19:57 -0700 (PDT) Received: from smtpclient.apple (dynamic-046-115-021-017.46.115.pool.telefonica.de. [46.115.21.17]) by smtp.googlemail.com with ESMTPSA id l11-20020a50cbcb000000b0057030326144sm9335245edi.47.2024.04.25.15.19.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2024 15:19:56 -0700 (PDT) From: =?utf-8?Q?Klaus_K=C3=BCchemann?= Content-Type: multipart/alternative; boundary="Apple-Mail=_1E6194A7-523A-4EAA-80C9-840CB6271984" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Date: Fri, 26 Apr 2024 00:19:44 +0200 References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> To: Kyle Evans , Warner Losh , cperciva@tarsnap.com, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, hp@tmm.cx In-Reply-To: <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> Message-Id: X-Mailer: Apple Mail (2.3774.500.171.1.1) 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VQVf827dkz45gB --Apple-Mail=_1E6194A7-523A-4EAA-80C9-840CB6271984 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > Am 26.04.2024 um 00:09 schrieb Kyle Evans : >=20 > On 4/25/24 16:44, Klaus K=C3=BCchemann wrote: >>> Am 25.04.2024 um 22:01 schrieb Kyle Evans : >>>=20 >>> On 4/25/24 14:43, Colin Percival wrote: >>>> On 4/25/24 12:24, Warner Losh wrote: >>>>> On Thu, Apr 25, 2024, 12:57=E2=80=AFPM Colin Percival = > wrote: >>>>> On 4/19/24 16:11, Warner Losh wrote: >>>>> > add dtb support for RPI CM4, CM4s, CM4_ioBoard >>>>> > >>>>> > Signed-off-by: Klaus K=C3=BCchemann = >>>> > >>>>> > Reviewed by: imp >>>>> > Pull Request: = https://github.com/freebsd/freebsd-src/pull/1182 >>>>> >>>>> > --- >>>>> > --- a/release/arm64/RPI.conf >>>>> > +++ b/release/arm64/RPI.conf >>>>> > -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb >>>>> bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" >>>>> > +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb >>>>> bcm2710-rpi-cm3.dtb \ >>>>> > + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb = bcm2711-rpi-cm4.dtb >>>>> bcm2711-rpi-cm4s.dtb" >>>>>=20 >>>>> This broke the RPI release build, since bcm2711-rpi-cm4s.dtb = doesn't exist. >>>>> Is it provided by a port which we should add to the RPI build? >>>>>=20 >>>>> I thought it was in tree. I'll look into this and report back. >>>> Entirely possible. The release-building code is trying to copy it = from >>>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb >>>> so if it's somewhere else we need to adjust that code. >>>=20 >>> The rpi-firmware port is supposed to provide all .dtb used here, but = we've never installed that one. It really shouldn't have been included = in the list to begin with, but I guess if there's demand we should fix = the port to include it. >>>=20 >>> Thanks, >>>=20 >>> Kyle Evans >> we only have tested/fixed the CM4-model, not forceably need the = cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at = least temporarily. >> But please hold cm4.dtb and the cm4_io_.dtb, which will then = hopefully not break the rpi-release anymore. >=20 > I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to = update the port (sysutils/rpi-firmware) to grab it then try again once = new packages are available with it so that we don't break the snapshot = again from the same file. >=20 > Thanks, >=20 > Kyle Evans Yes, better at the moment , because Updating the port would require to test every rpi-model again because = the provided dtb-files can sometimes be very =E2=80=9Esensitive=E2=80=9C or critical in = behavior .=20 thank you and sorry for the breakage. Klaus --Apple-Mail=_1E6194A7-523A-4EAA-80C9-840CB6271984 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

Am 26.04.2024 um 00:09 schrieb Kyle Evans = <kevans@FreeBSD.org>:

On 4/25/24 16:44, Klaus K=C3=BCchemann = wrote:
Am 25.04.2024 um 22:01 = schrieb Kyle Evans <kevans@FreeBSD.org>:

On 4/25/24 14:43, = Colin Percival wrote:
On 4/25/24 12:24, = Warner Losh wrote:
On Thu, Apr 25, 2024, = 12:57=E2=80=AFPM Colin Percival <cperciva@tarsnap.com = <mailto:cperciva@tarsnap.com>> = wrote:
    On 4/19/24 16:11, Warner = Losh wrote:
     >      = add dtb support for RPI CM4, CM4s, = CM4_ioBoard
     >
   &nb= sp; >    =   Signed-off-by: Klaus K=C3=BCchemann = <maciphone2@googlemail.com
    <mailto:maciphone2@googlem= ail.com>>
     >      = Reviewed by: imp
     >      = Pull Request: = https://github.com/freebsd/freebsd-src/pull/1182
    <https://github.com/freebs= d/freebsd-src/pull/1182>
     > = ---
     > --- = a/release/arm64/RPI.conf
     > +++ = b/release/arm64/RPI.conf
     > = -DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb
    bcm2710-rpi-cm3.dtb = bcm2711-rpi-4-b.dtb"
     > = +DTB=3D"bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb = bcm2710-rpi-3-b-plus.dtb
    bcm2710-rpi-cm3.dtb = \
     > +    =  bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb = bcm2711-rpi-cm4.dtb
    bcm2711-rpi-cm4s.dtb"

=     This = broke the RPI release build, since bcm2711-rpi-cm4s.dtb doesn't = exist.
    Is it provided by a port = which we should add to the RPI build?

I thought it was in tree. = I'll look into this and report back.
Entirely = possible.  The release-building code is trying to copy it = from
/usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb
so if it's = somewhere else we need to adjust that code.

The = rpi-firmware port is supposed to provide all .dtb used here, but we've = never installed that one.  It really shouldn't have been included = in the list to begin with, but I guess if there's demand we should fix = the port to include it.

Thanks,

Kyle = Evans
we only have tested/fixed the CM4-model,  not = forceably need the cm4s.dtb , so no objections to remove cm4s.dtb from = the dtb-list at least temporarily.
But please hold cm4.dtb and the = cm4_io_.dtb, which will then hopefully not break the rpi-release = anymore.

I'm = going to go ahead and remove just the rpi-cm4s.dtb, feel free to update = the port (sysutils/rpi-firmware) to grab it then try again once new = packages are available with it so that we don't break the snapshot again = from the same file.

Thanks,

Kyle = Evans

Yes, better at the moment = , because
Updating the port would require to test every = rpi-model again because the provided dtb-files
 can = sometimes be very =E2=80=9Esensitive=E2=80=9C or critical in behavior =  . 

 thank you and sorry for the = breakage.
Klaus

= --Apple-Mail=_1E6194A7-523A-4EAA-80C9-840CB6271984-- From nobody Thu Apr 25 22:27:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQVqM5CX3z5JgqK; Thu, 25 Apr 2024 22:27:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQVqM4KTdz46Tx; Thu, 25 Apr 2024 22:27:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714084079; h=from:from:reply-to:subject: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=4lDrKQcy0Fx61Y4n1YHs+kGgQSXEWsVhOC+ib8waH1U=; b=yLSUiDRCZUYaKID5lQlki/WlDtHdZnKhWxocv58Wv5NsEhWXgmujDHqhrCjmFJzy9yTtcN Y3lL6Bec3Hn4cll7qNMQQPTwUqMwqW9tkMMegpfgYqDLmREatBY+8VNW+3igp3QWZSoFze v+I1DQdnT+fux7b8j7uyFdNS83E1eYn/+3jbgrtTPw5qZReQSrKs4buQqpF0hAtoySiM19 rWyV3+L2JxjQ5mlBmiVsGrXVY/vBmkyOGNgpej78ePm8TGZp8LTKVWckfKAvRs04lDCBqf TkuK6bkqHdFif8D7UXStw3TDxNvezOTpZnyveeJ0t6+gQziwk9aN7p3/Mf50Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714084079; a=rsa-sha256; cv=none; b=iqjTyAmkObyfyrBfpj/8m2T7SsXK4XdL1d2NGUk/9lVIfw2vT0MYaAAsGyJsZvlvK96gTd abLHJUeBnrG1Xiuit8bDcmV8B9iK1niAjVd8uYbjkig2fUeErHMEg6pOxZGz7E3XNX7aEC ldRTJDjShckf85tXM1f6Q4xE6EXjMfvxs8T4xv7dbqipV5TWobnW/fW3ISPsRpxlZ8C6kx 1dMNDYKXuEzEBR/8DFANK2U55L25BinhAx52/hP4ls79eiznk2vQJIIMPCm7HyEXlm3J5R o9GeL2xsUrWGAdXt5v9+034zeintJgDBMmcjUm9JKLd2Y+5qazFatocwBf4MFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714084079; h=from:from:reply-to:subject: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=4lDrKQcy0Fx61Y4n1YHs+kGgQSXEWsVhOC+ib8waH1U=; b=WZgpgBaBPTbu0mCHdLQ0CfyruQP56TL1yArHnaQg51uttD/SpDIQx+M2sBvBwpkClcvVxT tWF8e0RJIUj9zEKzVIjYlfIxrP0WxgEhZGYLlE0gCvjKChfU54h33ZZDFtCUtbKnHueciR /6/k6jQEzkPkr2zJZef9AaOlbFmdBmEo4ECFV1O/6EskdXTmshmCkKLVVNGR8oJyOLblVb weLnqIQgPtxi5LCqmP9MRe5cq/Puox9w0HLcvHL0hNJnAld/1DmSydr/kBC3jlW8+GteZL A+x7OqpFKmqLCnc5Qkj1WjrfgrnkWuhnygo16gM8SeB402l7Lpj+uSRbiCx8pw== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VQVqL5tDfz127R; Thu, 25 Apr 2024 22:27:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <89871449-6893-4bfa-8f21-76dca37adb09@FreeBSD.org> Date: Thu, 25 Apr 2024 17:27:57 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard Content-Language: en-US To: =?UTF-8?Q?Klaus_K=C3=BCchemann?= , Warner Losh , cperciva@tarsnap.com, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, hp@tmm.cx References: <202404192311.43JNBiVS059729@gitrepo.freebsd.org> <0100018f169ec80a-47d419c2-2cd6-4ee1-89da-3f4782429089-000000@email.amazonses.com> <0100018f16c8f23a-eacbe781-3f6e-4f02-9b4d-d26468364b1f-000000@email.amazonses.com> <7473b5ed-433b-4d51-8a23-cf6464eb4416@FreeBSD.org> <7FA67865-F391-4773-86BA-9998B3EC855E@googlemail.com> <142362e6-8a88-43f5-bff6-6ff90a12802e@FreeBSD.org> From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/25/24 17:19, Klaus Küchemann wrote: > > >> Am 26.04.2024 um 00:09 schrieb Kyle Evans : >> >> On 4/25/24 16:44, Klaus Küchemann wrote: >>>> Am 25.04.2024 um 22:01 schrieb Kyle Evans : >>>> >>>> On 4/25/24 14:43, Colin Percival wrote: >>>>> On 4/25/24 12:24, Warner Losh wrote: >>>>>> On Thu, Apr 25, 2024, 12:57 PM Colin Percival >>>>>> > wrote: >>>>>> On 4/19/24 16:11, Warner Losh wrote: >>>>>> >      add dtb support for RPI CM4, CM4s, CM4_ioBoard >>>>>> > >>>>>> >      Signed-off-by: Klaus Küchemann >>>>> > >>>>>> >      Reviewed by: imp >>>>>> >      Pull Request: https://github.com/freebsd/freebsd-src/pull/1182 >>>>>> >>>>>> > --- >>>>>> > --- a/release/arm64/RPI.conf >>>>>> > +++ b/release/arm64/RPI.conf >>>>>> > -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >>>>>> bcm2710-rpi-3-b-plus.dtb >>>>>> bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" >>>>>> > +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb >>>>>> bcm2710-rpi-3-b-plus.dtb >>>>>> bcm2710-rpi-cm3.dtb \ >>>>>> > +     bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb >>>>>> bcm2711-rpi-cm4s.dtb" >>>>>> >>>>>> This broke the RPI release build, since bcm2711-rpi-cm4s.dtb >>>>>> doesn't exist. >>>>>> Is it provided by a port which we should add to the RPI build? >>>>>> >>>>>> I thought it was in tree. I'll look into this and report back. >>>>> Entirely possible.  The release-building code is trying to copy it from >>>>> /usr/local/share/rpi-firmware/bcm2711-rpi-cm4s.dtb >>>>> so if it's somewhere else we need to adjust that code. >>>> >>>> The rpi-firmware port is supposed to provide all .dtb used here, but >>>> we've never installed that one.  It really shouldn't have been >>>> included in the list to begin with, but I guess if there's demand we >>>> should fix the port to include it. >>>> >>>> Thanks, >>>> >>>> Kyle Evans >>> we only have tested/fixed the CM4-model,  not forceably need the >>> cm4s.dtb , so no objections to remove cm4s.dtb from the dtb-list at >>> least temporarily. >>> But please hold cm4.dtb and the cm4_io_.dtb, which will then >>> hopefully not break the rpi-release anymore. >> >> I'm going to go ahead and remove just the rpi-cm4s.dtb, feel free to >> update the port (sysutils/rpi-firmware) to grab it then try again once >> new packages are available with it so that we don't break the snapshot >> again from the same file. >> >> Thanks, >> >> Kyle Evans > > Yes, better at the moment , because > Updating the port would require to test every rpi-model again because > the provided dtb-files >  can sometimes be very „sensitive“ or critical in behavior  . > You are over-complicating this... you don't need to actually update the port to a different version of the rpi-firmware repository. 055e044 is what's currently used, and the .dtb is there; it just needs to be added to the pkg-plist[0] so that it gets sucked into the package. We apparently stage all of boot/* into $DATADIR already (kind of ugly, but whatever floats the port's goat, man) so it shouldn't need anything else and won't invalidate any of the other blobs we package. [0] https://cgit.freebsd.org/ports/tree/sysutils/rpi-firmware/pkg-plist#n22 From nobody Thu Apr 25 23:47:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQXbb5sHxz5JpBD; Thu, 25 Apr 2024 23:47: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 4VQXbb4kdLz4GTS; Thu, 25 Apr 2024 23:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714088875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0/QCHGPhsrqexKYQihCctyKatJu4cd/XvbuxMpju3Q=; b=Yj/59zy5BR4GQ0h8GB/FqVrHtXKMh5j6UU9QAa68JZ2yZGXiWQqEgxKkDOTSmYekgo+32a XktPBbwrCkyWAbvZXbamH3zIzltCAa5Z/PG0ykiJr/Pw59JX8UDD4khsJQDgansvXMlUed P5sOeuTONn0s4cH13qoN4sZd+iKOh5GL1WBT7Mkuw71cKup56aqH01haevuO3fH3XKLFjw 6wQCdKfYBEAYpuuUD4tPkm4Py/HdlhHpWZRQ9ttVOVmGg+xVwiBJECkflEVVUj7y01IMy8 apIB54ok5UBzsCoBv1KXQ2BHick5SdyuXvDpF5d9coFBPfHUZpAKLu3cp1/ISQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714088875; a=rsa-sha256; cv=none; b=I332EIXdMnG+6L8KOEOTdd02DCaOfYOdpKLabawpylj/MRb4eXkUta+cAklgVf1FpgD7fO xicCQkJRytGtWUTG8ygWzGlG1YzSiqqRphygR1ZtTz2fikLE+2p2lRgbvn9dBfyrd47qdJ GctnG9pRUTJIc9kRLTFAUnbjEN7D7kLkCeHeRy+AnHImWDpfxTj0Hag+N+VpKUnFanfTOU XDuD7r0SOUmUuAX2qOvE5kZnshAxJo6DJ5og9QtfEXojMCxc8KKhCxUVeXHH0g53IUljm4 h6BRXscsppvIIzHEux0IAEbcxTxeTnH9bSsBFEmB/3ddWqA9F4T/Cujw/Imvkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714088875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0/QCHGPhsrqexKYQihCctyKatJu4cd/XvbuxMpju3Q=; b=BNURWOtZVJGYelYqPjcoMzDn/tdypNgf7HL+3gVSnTOCrlKTEIcqxTzPwy2aMyEOCIpbXC ekvRjPK3bgx7USNYZE1EFJ5WdMV3Jk/zhjlbCffiLPDFQsarVd3BMeWBAcdhL2J8MPAgRJ uwJsCfI6PxMIhuDaQGVrGpKD/C1nGtzAKvHZbuINIRJB5wrLDY9dj1KMQF4Nm8xyGexKSV bGoy1O4IkN1VMDHBq4YlQq7m+S1f3HsBhspMnmWkLFCrpMSN/2iIXMU47RIEPHn+hykzf5 LefX3Io/bF3IhsKmkd2OdS/C41YMeZRPE66OokE/lUleULd8yXMQNjCi/ahkIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQXbb456czKct; Thu, 25 Apr 2024 23:47: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 43PNltmU055597; Thu, 25 Apr 2024 23:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PNltdv055594; Thu, 25 Apr 2024 23:47:55 GMT (envelope-from git) Date: Thu, 25 Apr 2024 23:47:55 GMT Message-Id: <202404252347.43PNltdv055594@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: ce3b53ffcc3e - main - nvmecontrol: Flesh out nvmecontrol format information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ce3b53ffcc3ecc00fa6283542c60ff1fe697d853 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce3b53ffcc3ecc00fa6283542c60ff1fe697d853 commit ce3b53ffcc3ecc00fa6283542c60ff1fe697d853 Author: Warner Losh AuthorDate: 2024-04-25 23:47:18 +0000 Commit: Warner Losh CommitDate: 2024-04-25 23:47:18 +0000 nvmecontrol: Flesh out nvmecontrol format information The format command takes a number of different parameters. Include a brief summary of what the values mean, though since the driver's support for metadata is at best weak, 0's are almost always used for values other than -f format. Add an example that ties it all together. Sponsored by: Netflix Reviewed by: pauamma@gundo.com, chuck Differential Revision: https://reviews.freebsd.org/D44958 --- sbin/nvmecontrol/nvmecontrol.8 | 81 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index b812149b5c7d..b5a85b1ab9f5 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -442,24 +442,62 @@ Use Extended Data Structure. .Ss format Format either specified namespace, or all namespaces of specified controller, using specified parameters: +.Bl -tag -width 8n +.It Fl f Ar fmt +The index .Ar fmt -LBA Format, +of the parameters to use. +LBA Format #, as specified in the identification of the namespace using +.Dq nvmecontrol identify +command with a namespace specified maps this index into these parameters. +.It Fl m Ar mset +Metadata Setting. .Ar mset -Metadata Settings, -.Ar pi -Protection Information, -.Ar pil +.Bl -tag -compact -width 6n +.It Dv 0 +do not transfer metadata with LBA information +.It Dv 1 +Transfer the metadata as part of the extended LBA information. +.El +.It Fl p Ar pi +Protection Information. +.Bl -tag -compact -width 6n +.It Dv 0 +Protection Information not enabled. +.It Dv 1 +Type 1 information protection enabled. +.It Dv 2 +Type 2 information protection enabled. +.It Dv 3 +Type 3 information protection enabled. +.El +.It Fl l Ar pil Protection Information Location. +.Bl -tag -compact -width 6n +.It Dv 0 +Transfer the protection metadata as the last N bytes of the transfer. +.It Dv 1 +Transfer the protection metadata as the first N bytes of the transfer. +.El +.It Fl E +Enables User Data Erase during format. +All users data is erased and subsequent reads are indeterminate. +The drive may implement this as a cryptographic erase or it may +physically erase the underlying media. +.It Fl C +Enables Cryptographic Erase during format. +All user data is erased cryptographically by deleting the encryption key, +rendering it unintelligible. +.El +.Pp When formatting specific namespace, existing values are used as defaults. When formatting all namespaces, all parameters should be specified. Some controllers may not support formatting or erasing specific or all namespaces. -Option -.Fl E -enables User Data Erase during format. -Option -.Fl C -enables Cryptographic Erase during format. +The +.Xr nvme 4 +driver does not currently support metadata and protection information +transfers. .Ss sanitize Sanitize NVM subsystem of specified controller, using specified parameters: @@ -763,6 +801,27 @@ device. The corresponding .Pa nvmeXnsY device is used automatically. +.Pp +.Dl nvmecontrol format -f 2 -m 0 -p 0 -l 0 -C nvme2 +.Pp +Format all the name spaces on nvme2 using parameters from +.Dq LBA Format #2 +with no metadata or protection data using cryptographic erase. +If the +.Dq nvmecontrol identify -n 1 nvme2 +command ended with +.Pp +.Bl -verbatim +LBA Format #00: Data Size: 512 Metadata Size: 0 Performance: Good +LBA Format #01: Data Size: 512 Metadata Size: 8 Performance: Good +LBA Format #02: Data Size: 4096 Metadata Size: 0 Performance: Good +LBA Format #03: Data Size: 4096 Metadata Size: 8 Performance: Good +LBA Format #04: Data Size: 4096 Metadata Size: 64 Performance: Good +.El +.Pp +then this would give a 4k data format for at least namespace 1, with no +metadata. +.Pp .Sh DYNAMIC LOADING The directories .Pa /lib/nvmecontrol From nobody Fri Apr 26 03:13:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQd9G0TJFz5HQZ1; Fri, 26 Apr 2024 03:13: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 4VQd9F71h2z4YfB; Fri, 26 Apr 2024 03:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714101234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CK9A/P3l3h6bvXB7aVmj1HyAph/yn7RMIXqUMsVJGfE=; b=FM9AyGfOJ9uGnt0xM6aiPSAycn9KTWmhN4hl5WeFf2D4d9iPtRfjlqb5suWc934NtBcHLw Cs38Mefior3L1sMHkbvpfZlDnlPmVy577jEddl2c0Lw45iTKega24e04jBo7UsPGbkTDyx NQnaF4juD2WR2agCNLCG1tkwbac+AQSH5E5O0mIl61p1gkTXlZzZfE1fRcqmbCti5TzhIV oMlNjN0LWb8VkXSEdrQSwYBD7q68+sOjK74oBSqVaMc0Z7OcrizuhghWM81tc9CPeDKSpJ Mry44iptwHHQJMBecbMXCel32MbdRlQUhwQPZG1WSKYQFiRdka0k7BS0NqiSAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714101234; a=rsa-sha256; cv=none; b=iKFJ81I7eQaqVge0LRqCIH8oBBrEZ2gojQ3lahMS4ibtMfsdFH3FedhENiAg0rhoHo3K+C gBJdPSSk5GRHZmRcaaFcjTIzx9WO+YHDJq4H9+HpRkC7he0wafkBIqbd/DogEooMOuWS0P x84PH8tDhk28Bv04AtZPnGLgPRSpE6BIX/cRUMscYmYuO8h7X9/pAxvEMiNq4HIWiN9r+t 4hQ4sOqVL+moYB8lyerEoe6/R08CFwWKhnGCe/S2geTMHFQ9t7mTuhwx/VPudHeVP21URC xZuEgUdwSs2B+tu8+P9zXR81VQ0ZzDv4O8Ya414wYnHJ4ocKnb6LoIHrPfQNAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714101234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CK9A/P3l3h6bvXB7aVmj1HyAph/yn7RMIXqUMsVJGfE=; b=Dl5AF3FoYtd5nH7dYiQhpL79veehPt5V4q3jLtJN50/Vb9+Nj365dppGJOukPSGe06TPnS /o+WHCMtxJvalCgYmRvmt1fDMIh72MqY8MgP3n2skxrPSeRLZtf6FasovCPPGSNQoTJEvR 9OWNGQx1FAhTSB87CZ1RRNbVktrDJKUjJ6wZG7k8uXpv6l2j29HJUXZV5/zVSUFGSsukVn MREetRIKB/QtOMwMDwjlX5460HOPgSBZNQet2hhygDguEDyJ7Z276pebWUhdrZ7KRcwc5s LxAmDy+LOVi+882TO8Uog/qTKsPg3bNK9EvaoJ3t8KdWw01WNbhxTYT6ODfQuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQd9F6cqHzR1Z; Fri, 26 Apr 2024 03:13: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 43Q3Dr2R009583; Fri, 26 Apr 2024 03:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q3DrEh009580; Fri, 26 Apr 2024 03:13:53 GMT (envelope-from git) Date: Fri, 26 Apr 2024 03:13:53 GMT Message-Id: <202404260313.43Q3DrEh009580@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: f0e59ecff85d - main - CTL: READ(6) should be allowed on CD devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f0e59ecff85d4b9e875464199e065a269c9c2530 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0e59ecff85d4b9e875464199e065a269c9c2530 commit f0e59ecff85d4b9e875464199e065a269c9c2530 Author: HP van Braam AuthorDate: 2024-04-26 02:31:12 +0000 Commit: Warner Losh CommitDate: 2024-04-26 02:31:14 +0000 CTL: READ(6) should be allowed on CD devices DOS ASPI drivers use this, with this change applied it is possible to load a DOS ASPI CDROM driver and run the Windows 98 installer. Signed-off-by: HP van Braam Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1202 --- sys/cam/ctl/ctl_cmd_table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c index 8b81ea7e56b3..a62c5e8c1e81 100644 --- a/sys/cam/ctl/ctl_cmd_table.c +++ b/sys/cam/ctl/ctl_cmd_table.c @@ -944,6 +944,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] = /* 08 READ(6) */ {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_DIRECT | CTL_FLAG_DATA_IN | + CTL_CMD_FLAG_OK_ON_CDROM | CTL_CMD_FLAG_ALLOW_ON_PR_WRESV, CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE, 6, {0x1f, 0xff, 0xff, 0xff, 0x07}}, From nobody Fri Apr 26 04:00:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQfBT5Qmrz5HlfV; Fri, 26 Apr 2024 04:00: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 4VQfBT4rrKz4h83; Fri, 26 Apr 2024 04:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714104001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMyXfft9exwbpaMxWDTEp7EZjCVYtmx3EfiCryrMHMI=; b=oF5gv7v4DOHMITDwE0r6BAZ+gv2PanGInlTAkjHX5WYSXgPRI5qZXcKJ14rNuHpeoT+osQ 0WDHH1/MZBh8ulHqX20jkVjuMq6C91I7P2vhp3iK6UtpMuVqeQ1i1Vvv9jySII4H7c86rr pfIepgU5PbWinA0m/7E2TCc7zox9ZnAlWxcN47Z+G4okXm8P283YFnkRJ2WrXruXMUsjlC vOXvTGv7uMyf5KFzlj8UhBemvj/BNs/muZymhbzN7HS7xmil1OEJwEZL0PeoSfC1M86O4l bSuTXJs+3ETu/BUH5H5BzQhGhcIcU1satB6ca3NP/DGFtucVSZhy/WeKWSzLSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714104001; a=rsa-sha256; cv=none; b=R1lZPVxrd5cD6NtD2MF9MvO2tSPG03PoIhf59ZxC1NWAMGROVbdzDhdYTLWW4W9MvX7Jos KkMXIdVrA6PKUv3ewahRApHSm3oS+564OL5j6CXorOYwJ9R6uomnTgIHDfnwraNhYvQ42f ht+J21HgSPsc6NgGNW88ZVRbcZAHh6PCDD5+29Age7SRFWiHb5J0eIUPRvm1BeFPbF/O5p pLpB9gZejzWoQlp5BIdEJyOEHSdoTeeoBxLXMkMoJ2cKu7ceB1WDbx1iYA0qsGYYrdhJXH eqwD30Vvx+wdPqImBGaOQTTpsfEbY4Qr4kZgQk4mkjHM/n/LdsBcsgdAQevp/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=1714104001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMyXfft9exwbpaMxWDTEp7EZjCVYtmx3EfiCryrMHMI=; b=rXtIR0YnXO1YZidBHaIbyn8GMHPr1ZKusYhkVtLDdQydEjrDgZXeMrBP+Xg8siD09+hHoc Tnsk4zlehpMP5CnQdogdv40Shmy940UQOq3/+uHAvABlp5cy24DJGKfRrWoSiJOYSkg0Z7 POtgLhTnaKS7CVtJQrzjgQeRYrad+K/YF+fiy2iM9wPYEB0EPTaWpjexDkJkPYoNzCeZqt 89/z9DZ5tQ48qWmA+LlfQbdM4kkebZdT3/lM6HYt1EP3HdTq8H3VPl+ysLUwT9w194Ukqw J+LCOOabM5KSVsOdFfDZ3csA2sEfbDMR2jmWh+tIKlXDiXy//sufbIrlO09mYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQfBT4QFLzRvZ; Fri, 26 Apr 2024 04:00: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 43Q401Jb081435; Fri, 26 Apr 2024 04:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q401HZ081425; Fri, 26 Apr 2024 04:00:01 GMT (envelope-from git) Date: Fri, 26 Apr 2024 04:00:01 GMT Message-Id: <202404260400.43Q401HZ081425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 6251027c4252 - main - nfscl: Do not use nfso_own for delayed nfsrpc_doclose() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6251027c4252edb3b8f8fc359a40e610349e9af3 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6251027c4252edb3b8f8fc359a40e610349e9af3 commit 6251027c4252edb3b8f8fc359a40e610349e9af3 Author: Rick Macklem AuthorDate: 2024-04-26 03:58:21 +0000 Commit: Rick Macklem CommitDate: 2024-04-26 03:58:21 +0000 nfscl: Do not use nfso_own for delayed nfsrpc_doclose() When an initial attempt to close an NFSv4 lock returns NFSERR_DELAY, the open structure is put on a list for delayed closing. When this is done, the nfso_own field is set to NULL, so it cannot be used by nfsrpc_doclose(). Without this patch, the NFSv4 client can crash when a NFSv4 server replies NFSERR_DELAY to a Close operation. Fortunately, most extant NFSv4 servers do not do this. This patch avoids the crash for any that do return NFSERR_DELAY for Close. Found during a IETF bakeathon testing event this week. MFC after: 5 days --- sys/fs/nfsclient/nfs_clrpcops.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 75bb5236cb65..8c5532268287 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -826,6 +826,7 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p, u_int64_t off = 0, len = 0; u_int32_t type = NFSV4LOCKT_READ; int error, do_unlock, trycnt; + bool own_not_null; tcred = newnfs_getcred(); newnfs_copycred(&op->nfso_cred, tcred); @@ -892,22 +893,29 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p, * There could be other Opens for different files on the same * OpenOwner, so locking is required. */ - NFSLOCKCLSTATE(); - nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); - NFSUNLOCKCLSTATE(); + own_not_null = false; + if (op->nfso_own != NULL) { + own_not_null = true; + NFSLOCKCLSTATE(); + nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); + NFSUNLOCKCLSTATE(); + } do { error = nfscl_tryclose(op, tcred, nmp, p, loop_on_delayed); if (error == NFSERR_GRACE) (void) nfs_catnap(PZERO, error, "nfs_close"); } while (error == NFSERR_GRACE); - NFSLOCKCLSTATE(); - nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); + if (own_not_null) { + NFSLOCKCLSTATE(); + nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); + } LIST_FOREACH_SAFE(lp, &op->nfso_lock, nfsl_list, nlp) nfscl_freelockowner(lp, 0); if (freeop && error != NFSERR_DELAY) nfscl_freeopen(op, 0, true); - NFSUNLOCKCLSTATE(); + if (own_not_null) + NFSUNLOCKCLSTATE(); NFSFREECRED(tcred); return (error); } From nobody Fri Apr 26 08:21:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQm0C1WXXz5JCcg; Fri, 26 Apr 2024 08:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQm0C12xwz446x; Fri, 26 Apr 2024 08:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714119691; h=from:from:reply-to:subject:subject: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+gHHkkL1Ue+8cL1UqO8MvuRJcmh40Vskuoy3QY/8kw=; b=Cd4sTQjCRMR0hbYECuPZejlqDubhcn7SvTN8gdjVkcA+gnF8VnFwEXLiNbU8k762xMcJST Di7nIFkSnFyV94nWEURCRNKSEE3xFZYCRN1rcxI28EKCHGWCcSIE19tiqfluk6VXrlLGTf 21hAdgSTu5avcnTnKntvMNyzfazgxwXX4SqsZdqh9LQJMahIqlF8L3fL+NFG9FLnyqvZTT dYPUlA/h70MA7oC1Z5atXRFz4WexV8oJ3KAaexP8B8NRopjafEFpJllqP2WdaQZ4smGZEl BynJWpGyxVNtct4oVMjWE2q0zYyMd0AECzIeVKA1jkVP6yi28oB4QWx8fXmHxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714119691; a=rsa-sha256; cv=none; b=L4Gc34srvXpDgS2pyYHZza1cH46RekDn5TU3eCXw2FuWjANBiGUhLotZB7BevmdvV+ElP/ Wo1XoB2NLch2Vw8Eow1TGPs+9BLtjFnLmu+h7J4q84PtNidumxFvtNsP8fbKk8RvSAl/L4 hoRBTHdw1g/7mf/rRyFmaCAyd8R4fh/ZdHpMb9dXdKv191hCAihPDL52I1LRvF9OGxlF2R ibFDv2zUMBYZfzgIguKBwdOwAoDMEOiLzghIRYtDCYVfMQMbwUTr9Yh8MEhRrzeukCE8Rh KPcrC9oDG1G0/0U0d0zUw91nlUchYBg8UY4F5yYt8UnwGj0+xWTu7o6saMJolQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714119691; h=from:from:reply-to:subject:subject: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+gHHkkL1Ue+8cL1UqO8MvuRJcmh40Vskuoy3QY/8kw=; b=GrQKCFYfRL49LSvGBWhp1Rb0qrF2g2m2KE/TjQ9eiQgqEBFKZ5pJiSoBDSCcj3YTbLiKU7 0XSnrsyiBqERmJMbFS6oiGNSP38Z7FmUhz7iVNjQQmsdIIuwUvTAMMSfTna1luT6Iash/r xhi8+EGP+huG8wNEIGD4amdAM2qHOO5wnt+zEMAuaNmqHhu5tNRovXNMQ65xtSAYx5uPp4 WFEVddIBze0trCahfuy2I+clVmnszFulRbyQjhQn6QEvm/KA45Jd+Z9DJ5hxj1Z9IpX17f kAJiDrnmGGOi8EW/nTDhL1+7oNHwSNbNn19wpVUGqPEFo8tSgzTUmksWHOEJHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQm0C0LLczZwc; Fri, 26 Apr 2024 08:21: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 43Q8LU04032537; Fri, 26 Apr 2024 08:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q8LUVT032534; Fri, 26 Apr 2024 08:21:30 GMT (envelope-from git) Date: Fri, 26 Apr 2024 08:21:30 GMT Message-Id: <202404260821.43Q8LUVT032534@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: 9b10aa4a0591 - main - stress2: More detailed error reporting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9b10aa4a05915a6519d942fea48113757dcf1699 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=9b10aa4a05915a6519d942fea48113757dcf1699 commit 9b10aa4a05915a6519d942fea48113757dcf1699 Author: Peter Holm AuthorDate: 2024-04-26 08:20:49 +0000 Commit: Peter Holm CommitDate: 2024-04-26 08:20:49 +0000 stress2: More detailed error reporting --- tools/test/stress2/misc/rdwr.sh | 50 +++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/tools/test/stress2/misc/rdwr.sh b/tools/test/stress2/misc/rdwr.sh index c77c955dc210..893056558560 100755 --- a/tools/test/stress2/misc/rdwr.sh +++ b/tools/test/stress2/misc/rdwr.sh @@ -28,6 +28,11 @@ # Test with read/write length of INT_MAX (i386) or INT_MAX+1 (amd64) +# Seen: +# rdwr: readv(). Expected 2147483648 (80000000), got -2147483648 (ffffffff80000000) bytes: No error: 0 +# rdwr: writev(). Expected 2147483648 (80000000), got -2147483648 (ffffffff80000000) bytes: No error: 0 +# Fixed by: 78101d437a92 + . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 @@ -61,11 +66,22 @@ EOF #include #include +static int s; + +static void +er(char * syscall, size_t len, ssize_t ret) +{ + warn("%8s. Expected %zu (%zx), got %zd (%zx) bytes", + syscall, len, len, ret, ret); + s=1; +} + int main(int argc, char **argv) { int fd1, fd2; size_t len; + ssize_t r; void *p; struct iovec iov; @@ -85,34 +101,34 @@ main(int argc, char **argv) MAP_FAILED) err(1, "mmap"); - if (read(fd2, p, len) != len) - err(1, "read"); + if ((r = read(fd2, p, len)) != len) + er("read()", len, r); - if (write(fd1, p, len) != len) - err(1, "write"); + if ((r = write(fd1, p, len)) != len) + er("write()", len, r); - if (pread(fd2, p, len, 0) != len) - err(1, "pread"); + if ((r = pread(fd2, p, len, 0)) != len) + er("pread()", len, r); - if (pwrite(fd1, p, len, 0) != len) - err(1, "pwrite"); + if ((r = pwrite(fd1, p, len, 0)) != len) + er("pwrite()", len, r); iov.iov_base = p; iov.iov_len = len; - if (readv(fd2, &iov, 1) != len) - err(1, "readv"); + if ((r = readv(fd2, &iov, 1)) != len) + er("readv()", len, r); - if (writev(fd1, &iov, 1) != len) - err(1, "writev"); + if ((r = writev(fd1, &iov, 1)) != len) + er("writev()", len, r); - if (preadv(fd2, &iov, 1, 0) != len) - err(1, "preadv"); + if ((r = preadv(fd2, &iov, 1, 0)) != len) + er("preadv()", len, r); - if (pwritev(fd1, &iov, 1, 0) != len) - err(1, "pwritev"); + if ((r = pwritev(fd1, &iov, 1, 0)) != len) + er("pwritev()", len, r); close(fd1); close(fd2); - return (0); + return (s); } From nobody Fri Apr 26 09:27:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQnSG1BPtz5JK0W; Fri, 26 Apr 2024 09:27: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 4VQnSG0hqzz49W4; Fri, 26 Apr 2024 09:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714123646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7nkaYMmHZ9NFCWydKg/Ccz1Rt5JDbgcF0CEgqKK/eNc=; b=h3wsTPXVlmLn+EMxupTm+Ob0NtjMtXzUNK17GOhMyCh9l28Y1adD+0H9Kwll5QcVlx8jb9 LxrekiYBan9zwZ9U5dbQ2NdcAw6flcxqvVziOMrG+wp+IlFFFksS/5XgfJpYzRdj2fuxtJ z4zow02dpG8JSunNMgve0hvOD1pfUDgN/boN9ih3g2jeXyoT2F6ei+rgV6f9+sdFKAMipU nOZWxqBCvpFzWbfqCO7YzLtXRcr4HTchh/fcBVJ7iCN4kK47u6uJZ9+LeGUxqMnKeNYS66 hb0HtygHL3AREpalzNxrY7ONcuMizcPu/PFGnr58MPjF0+VgdrhsngM9ef7ZDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714123646; a=rsa-sha256; cv=none; b=ns45VFR6HjkPEf3eh4uonl+n0nZbtaMaDnDrTDn+zfBLh6K2SaYIKcdwcHlzTpKKAUQy2C gwalC3zNMEQ5uZb9yGzO5f5z/tOLEi6QiAngjePbNYpecPiLrRi2LaUtNVdg6GR4nyAw/e mopEn4W8+8naiOi7XxCShpc/cC7/L3vtplQp20IinM97l/J8raz4x0+2QcO+8TxXfe8PfG v2O9uNX65hQW1MUjltRyBitW2miw03VadIFXQLBLdHVeX9JczQVN7r2INQHVqZuC/yCpf8 uRx4l+pnLm0pD6lXFvUOgaIcdrG2QRSPiNvxzT0M+E+G5JO0QFzU6a/YtQbPIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714123646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7nkaYMmHZ9NFCWydKg/Ccz1Rt5JDbgcF0CEgqKK/eNc=; b=nV5bxjAiARmWny3rTxQPkIrc5FTjOal7s3jf4JWs2GdAUI8PAd1RR193o4rXC3aR9MzcOW /eXm4K0FqxKIyGAGLLtXBacUnrAlA23606HMTZnEmUWAsffd+Z+DjneWH3nOgY3eOBdx3d +glXZec/R2ZYXo0dsXqsTTec70a1q9753x/PaORWBEqB4GddocUDZHxaxSF9bVvhT963fh hnc/NZe+Re7Ubk5NxA8U2IiqzfdGlFwSKPvPBWzaW3NbcK+nEdP9VczF0Gnl+1/sTHEIez 0Tr6HlL8jWkzvcA3nstA7pNCIEAFMTTtgExmnM3PkXsLcFgAgIS1d9kdQzucrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQnSG0BtzzcPk; Fri, 26 Apr 2024 09:27: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 43Q9RP9r038492; Fri, 26 Apr 2024 09:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q9RPbT038489; Fri, 26 Apr 2024 09:27:25 GMT (envelope-from git) Date: Fri, 26 Apr 2024 09:27:25 GMT Message-Id: <202404260927.43Q9RPbT038489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: eeb04a736cb9 - main - date: Add support for nanoseconds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eeb04a736cb9c07d191af886e25d5f198824658e Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=eeb04a736cb9c07d191af886e25d5f198824658e commit eeb04a736cb9c07d191af886e25d5f198824658e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-21 21:25:32 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-26 09:26:50 +0000 date: Add support for nanoseconds This patch introduces support for a conversion specification for nanoseconds. The format of %N is meant to be compatible with that of GNU date. The nanoseconds conversion specification is implemented directly in date(1) instead of libc (in strftime(3)) to avoid introducing non-standard functions to libc at this time and modifying struct tm. Apart from introducing the nanoseconds conversion specification, this patch brings the following changes: - The "ns" format for ISO 8061 dates is now unlocked. E.g., date -Ins prints: 2024-04-22T12:20:28,763742224+02:00 - The -r flag when fed a file is now aware of the nanosecond part of the last modification time. - date(1) is now able to set the time with nanosecond precision. It is not possible as of now to do that by specifying nanoseconds directly via the command-line arguments. Instead, the -r flag can be used. - date(1) is now using the clock_gettime(3) family of functions instead of ctime(3) family of functions where possible. Reviewed by: des, markj Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44905 --- bin/date/date.1 | 28 ++++++-- bin/date/date.c | 132 ++++++++++++++++++++++++++++------- bin/date/tests/format_string_test.sh | 17 ++++- 3 files changed, 142 insertions(+), 35 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 286b1f45414a..afa6d555a503 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 19, 2023 +.Dd April 26, 2024 .Dt DATE 1 .Os .Sh NAME @@ -141,17 +141,19 @@ values are .Cm date , .Cm hours , .Cm minutes , +.Cm seconds , and -.Cm seconds . +.Cm ns No Pq for nanoseconds . The date and time is formatted to the specified precision. When .Ar FMT is .Cm hours -(or the more precise -.Cm minutes +.Po or the more precise +.Cm minutes , +.Cm seconds , or -.Cm seconds ) , +.Cm ns Pc , the .St -iso8601 format includes the timezone. @@ -325,7 +327,9 @@ which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described in the .Xr strftime 3 -manual page, as well as any arbitrary text. +manual page and +.Ql %N +for nanoseconds, as well as any arbitrary text. A newline .Pq Ql \en character is always output after the characters specified by @@ -551,6 +555,7 @@ prints: and exits with status 1. .Sh SEE ALSO .Xr locale 1 , +.Xr clock_gettime 2 , .Xr gettimeofday 2 , .Xr getutxent 3 , .Xr strftime 3 , @@ -581,6 +586,12 @@ The format selected by the .Fl I flag is compatible with .St -iso8601 . +.Pp +The +.Ql %N +conversion specification for nanoseconds is a non-standard extension. +It is compatible with GNU date's +.Ql %N . .Sh HISTORY A .Nm @@ -599,3 +610,8 @@ The .Fl I flag was added in .Fx 12.0 . +.Pp +The +.Ql %N +conversion specification was added in +.Fx 15.0 . diff --git a/bin/date/date.c b/bin/date/date.c index 0ff3b9f74cbd..ccd72cb98445 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -50,14 +51,14 @@ #define TM_YEAR_BASE 1900 #endif -static time_t tval; - static void badformat(void); static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); -static void printisodate(struct tm *); -static void setthetime(const char *, const char *, int); +static void printisodate(struct tm *, long); +static void setthetime(const char *, const char *, int, struct timespec *); +static size_t strftime_ns(char * __restrict, size_t, const char * __restrict, + const struct tm * __restrict, long); static void usage(void) __dead2; static const struct iso8601_fmt { @@ -68,6 +69,7 @@ static const struct iso8601_fmt { { "hours", "T%H" }, { "minutes", ":%M" }, { "seconds", ":%S" }, + { "ns", ",%N" }, }; static const struct iso8601_fmt *iso8601_selected; @@ -76,6 +78,7 @@ static const char *rfc2822_format = "%a, %d %b %Y %T %z"; int main(int argc, char *argv[]) { + struct timespec ts; int ch, rflag; bool Iflag, jflag, Rflag; const char *format; @@ -126,11 +129,12 @@ main(int argc, char *argv[]) break; case 'r': /* user specified seconds */ rflag = 1; - tval = strtoq(optarg, &tmp, 0); + ts.tv_sec = strtoq(optarg, &tmp, 0); if (*tmp != 0) { - if (stat(optarg, &sb) == 0) - tval = sb.st_mtim.tv_sec; - else + if (stat(optarg, &sb) == 0) { + ts.tv_sec = sb.st_mtim.tv_sec; + ts.tv_nsec = sb.st_mtim.tv_nsec; + } else usage(); } break; @@ -149,8 +153,8 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (!rflag && time(&tval) == -1) - err(1, "time"); + if (!rflag && clock_gettime(CLOCK_REALTIME, &ts) == -1) + err(1, "clock_gettime"); format = "%+"; @@ -166,7 +170,7 @@ main(int argc, char *argv[]) } if (*argv) { - setthetime(fmt, *argv, jflag); + setthetime(fmt, *argv, jflag, &ts); ++argv; } else if (fmt != NULL) usage(); @@ -179,7 +183,7 @@ main(int argc, char *argv[]) if (outzone != NULL && setenv("TZ", outzone, 1) != 0) err(1, "setenv(TZ)"); - lt = localtime(&tval); + lt = localtime(&ts.tv_sec); if (lt == NULL) errx(1, "invalid time"); badv = vary_apply(v, lt); @@ -192,7 +196,7 @@ main(int argc, char *argv[]) vary_destroy(v); if (Iflag) - printisodate(lt); + printisodate(lt, ts.tv_nsec); if (format == rfc2822_format) /* @@ -202,7 +206,7 @@ main(int argc, char *argv[]) setlocale(LC_TIME, "C"); - (void)strftime(buf, sizeof(buf), format, lt); + (void)strftime_ns(buf, sizeof(buf), format, lt, ts.tv_nsec); printdate(buf); } @@ -216,19 +220,19 @@ printdate(const char *buf) } static void -printisodate(struct tm *lt) +printisodate(struct tm *lt, long nsec) { const struct iso8601_fmt *it; - char fmtbuf[32], buf[32], tzbuf[8]; + char fmtbuf[64], buf[64], tzbuf[8]; fmtbuf[0] = 0; for (it = iso8601_fmts; it <= iso8601_selected; it++) strlcat(fmtbuf, it->format_string, sizeof(fmtbuf)); - (void)strftime(buf, sizeof(buf), fmtbuf, lt); + (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec); if (iso8601_selected > iso8601_fmts) { - (void)strftime(tzbuf, sizeof(tzbuf), "%z", lt); + (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec); memmove(&tzbuf[4], &tzbuf[3], 3); tzbuf[3] = ':'; strlcat(buf, tzbuf, sizeof(buf)); @@ -240,15 +244,14 @@ printisodate(struct tm *lt) #define ATOI2(s) ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0')) static void -setthetime(const char *fmt, const char *p, int jflag) +setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) { struct utmpx utx; struct tm *lt; - struct timeval tv; const char *dot, *t; int century; - lt = localtime(&tval); + lt = localtime(&ts->tv_sec); if (lt == NULL) errx(1, "invalid time"); lt->tm_isdst = -1; /* divine correct DST */ @@ -329,18 +332,17 @@ setthetime(const char *fmt, const char *p, int jflag) } /* convert broken-down time to GMT clock time */ - if ((tval = mktime(lt)) == -1) + if ((ts->tv_sec = mktime(lt)) == -1) errx(1, "nonexistent time"); + ts->tv_nsec = 0; if (!jflag) { utx.ut_type = OLD_TIME; memset(utx.ut_id, 0, sizeof(utx.ut_id)); (void)gettimeofday(&utx.ut_tv, NULL); pututxline(&utx); - tv.tv_sec = tval; - tv.tv_usec = 0; - if (settimeofday(&tv, NULL) != 0) - err(1, "settimeofday (timeval)"); + if (clock_settime(CLOCK_REALTIME, ts) != 0) + err(1, "clock_settime"); utx.ut_type = NEW_TIME; (void)gettimeofday(&utx.ut_tv, NULL); pututxline(&utx); @@ -351,6 +353,82 @@ setthetime(const char *fmt, const char *p, int jflag) } } +/* + * The strftime_ns function is a wrapper around strftime(3), which adds support + * for features absent from strftime(3). Currently, the only extra feature is + * support for %N, the nanosecond conversion specification. + * + * The functions scans the format string for the non-standard conversion + * specifications and replaces them with the date and time values before + * passing the format string to strftime(3). The handling of the non-standard + * conversion specifications happens before the call to strftime(3) to handle + * cases like "%%N" correctly ("%%N" should yield "%N" instead of nanoseconds). + */ +static size_t +strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, + const struct tm * __restrict t, long nsec) +{ + size_t prefixlen; + size_t ret; + char *newformat; + char *oldformat; + const char *prefix; + const char *suffix; + const char *tok; + bool seen_percent; + + seen_percent = false; + if (asprintf(&newformat, "%s", format) < 0) + err(1, "asprintf"); + tok = newformat; + for (tok = newformat; *tok != '\0'; tok++) { + switch (*tok) { + case '%': + /* + * If the previous token was a percent sign, + * then there are two percent tokens in a row. + */ + if (seen_percent) + seen_percent = false; + else + seen_percent = true; + break; + case 'N': + if (seen_percent) { + oldformat = newformat; + prefix = oldformat; + prefixlen = tok - oldformat - 1; + suffix = tok + 1; + /* + * Construct a new format string from the + * prefix (i.e., the part of the old fromat + * from its beginning to the currently handled + * "%N" conversion specification, the + * nanoseconds, and the suffix (i.e., the part + * of the old format from the next token to the + * end). + */ + if (asprintf(&newformat, "%.*s%.9ld%s", + (int)prefixlen, prefix, nsec, + suffix) < 0) { + err(1, "asprintf"); + } + free(oldformat); + tok = newformat + prefixlen + 9; + } + seen_percent = false; + break; + default: + seen_percent = false; + break; + } + } + + ret = strftime(s, maxsize, newformat, t); + free(newformat); + return (ret); +} + static void badformat(void) { @@ -374,7 +452,7 @@ static void usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: date [-jnRu] [-I[date|hours|minutes|seconds]] [-f input_fmt]", + "usage: date [-jnRu] [-I[date|hours|minutes|seconds|ns]] [-f input_fmt]", " " "[ -z output_zone ] [-r filename|seconds] [-v[+|-]val[y|m|w|d|H|M|S]]", " " diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh index a3e2939bfe5c..c2fe2111373f 100755 --- a/bin/date/tests/format_string_test.sh +++ b/bin/date/tests/format_string_test.sh @@ -30,6 +30,17 @@ check() date -r ${TEST2} +%${format_string} } +atf_test_case flag_r_file_test +flag_r_file_test_body() +{ + local file + + file="./testfile" + touch "$file" + atf_check -o "inline:$(stat -f '%9Fm' "$file")\n" \ + date -r "$file" +%s.%N +} + format_string_test() { local desc exp_output_1 exp_output_2 flag @@ -98,6 +109,8 @@ iso8601_${desc}_parity_body() { atf_init_test_cases() { + atf_add_test_case flag_r_file_test + format_string_test A A Saturday Monday format_string_test a a Sat Mon format_string_test B B February November @@ -118,6 +131,7 @@ atf_init_test_cases() format_string_test l l " 7" " 9" format_string_test M M 04 20 format_string_test m m 02 11 + format_string_test N N 000000000 000000000 format_string_test p p AM PM format_string_test R R 07:04 21:20 format_string_test r r "07:04:03 AM" "09:20:00 PM" @@ -143,6 +157,5 @@ atf_init_test_cases() iso8601_string_test hours hours "" "1970-02-07T07+00:00" "2001-11-12T21+00:00" iso8601_string_test minutes minutes "" "1970-02-07T07:04+00:00" "2001-11-12T21:20+00:00" iso8601_string_test seconds seconds "" "1970-02-07T07:04:03+00:00" "2001-11-12T21:20:00+00:00" - # BSD date(1) does not support fractional seconds at this time. - #iso8601_string_test ns ns "" "1970-02-07T07:04:03,000000000+00:00" "2001-11-12T21:20:00,000000000+00:00" + iso8601_string_test ns ns "" "1970-02-07T07:04:03,000000000+00:00" "2001-11-12T21:20:00,000000000+00:00" } From nobody Fri Apr 26 09:38:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQnj06FDpz5JKtY; Fri, 26 Apr 2024 09:38: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 4VQnj05j2kz4Cn9; Fri, 26 Apr 2024 09:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714124308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmI843eki0qDU1cWG6yaA3xdGUDtBEP8CpOWf+yHhBk=; b=FdNqVQ7j0q/6OvNOIPUIW/q6baNc9O+qs3EI2gXc7bWDzxONzDv8KCkPkCtUDFMlyTTTAw MDIGTpimUzaySRglT3enOI/7Oa1y1Rnm/zQOVkZq+9e8WUF8ju1aF07nokSV+xPfKlvTgV H+b7o244w9LTnMR360SfG71gS3pnLARdSzgfNee4dozUYIGwRVXYlsJZUfmRm+5spRokfx c5+NRcIwZSenvl89TaOOsilyZ4K00bAbOfWon86B15oJJDYoPztACmyis+GEVTJTX7KYOG qIqqS/BxWIMhYDncT0tZeSc3cDuqTWJRQ794glrJqPoD29kVJmo4yS6miWWTow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714124308; a=rsa-sha256; cv=none; b=M7fU6hZFPJ/88jCNFH494JC7LAnD53GP80r9x8BNpmrQV4+jdmGukwyTTIyQlfGaJss0dB m6f/c/qJheqlYtTOgUdEdWxj/5zKXBipTRa3pWpLl2ycKB+kOMbNoQhNXHZlZ7qpeXNGOc N3fan0jYNzrkvJwLnCjzq+sFk9PsrZMGC3bhC7br6+R2gQwozxKD1d54QgO9s4c21+2ULt /0EGKq2DPkpCz/O5D9vplKnTR9ryC+sSlXoXzGdU7lbdSU/9NNFHc2FTkqytFFwxMG+qyW XVaZmCQekbfA4hZ3OogXkoKav91ntjzKzf11mhOvqQ62UOYDUjO8nZ/Ye4gDXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714124308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmI843eki0qDU1cWG6yaA3xdGUDtBEP8CpOWf+yHhBk=; b=IS+zicWjICXEwHNiQis2beZLQ+CwirkPOlmHttG3IY8C0APMcUkNjYSSZMNDtrt0hQ49az stFzSjn7nE17S6X1RQrcW59aOTcstTuWMdCFdIjCtkSZKULeFGelhf7TX+RpEPe5bFz95I Gp7ZXzsIAA+p56NM5F8suBZCamA1fRAVuiLjroIneI7/oUBtAXuMRUzkwnAUJXG1W1Q6Pi 2dZda+Jp3T7AQeWRlmtsJmEGQvRQ/s+A0B5m3aYKRA6ypnHQuZYiSU1QWfuCQVGAllsIf2 kSbmq58fyQW9RtoRfzY4N7T3F7prGOK3BQKcl7UUcl42ddEi4Fpr2IbmTt+IRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQnj05JPDzdGC; Fri, 26 Apr 2024 09:38: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 43Q9cSSl055240; Fri, 26 Apr 2024 09:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q9cSwG055237; Fri, 26 Apr 2024 09:38:28 GMT (envelope-from git) Date: Fri, 26 Apr 2024 09:38:28 GMT Message-Id: <202404260938.43Q9cSwG055237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5626f9e79090 - main - style.9: Document the existence of tools/build/checkstyle9.pl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5626f9e790901999def12040a60746b0ceeb9b95 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5626f9e790901999def12040a60746b0ceeb9b95 commit 5626f9e790901999def12040a60746b0ceeb9b95 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-26 09:37:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-26 09:37:01 +0000 style.9: Document the existence of tools/build/checkstyle9.pl MFC after: 3 days Sponsored by: Klara, Inc. --- share/man/man9/style.9 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index b111619e8ff6..8eb82e3419ec 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 29, 2024 +.Dd April 26, 2024 .Dt STYLE 9 .Os .Sh NAME @@ -904,6 +904,10 @@ instead of the older .Fn CTASSERT . .Sh FILES .Bl -tag -width indent +.It Pa /usr/src/tools/build/checkstyle9.pl +A script to check for violations of +.Nm +in a source file. .It Pa /usr/src/tools/tools/editing/freebsd.el An Emacs plugin to follow the .Fx From nobody Fri Apr 26 10:23:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQphm1Nglz5JP4g for ; Fri, 26 Apr 2024 10:23: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 4VQphl6f5dz4GcS; Fri, 26 Apr 2024 10:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714126999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oy2xSuBK5XrJBZn9sTBD6jI8wMAyFagPEsppIuRtbac=; b=R4o/2g0eT9+h8ki3uyzuU6PG62rk4F2hTMsdhMxHKyoNKMlGo2nBOvD/HGz9UcUGJafgC0 3/Z/wS64Iaoq3qDbHKViqqdZFTf+3yPFyvgC1LhNnLir4jq+RJ1bRhC2ef5o5W0oxbTLD+ E2M6fFrEPrcGGhoeGtRqgb9ExLpN0xqMmd5XY5dlkennqsXU+gHkVf0ig43kNs/WPYXy5e mb7oHVqL2LhZDN8UYUl5xHf+KG3Ri0Q0kar5co+uhvCki8G4kzjaKy1MLGunZFZRaKyNvT QULqeWpk59ZQFQWCqWhU7nN8dKpibGeTQqAMMPni30aljnAFVmR8yqsZfHYS7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714126999; a=rsa-sha256; cv=none; b=Zw1+9Nq/INNC/fdmdQsNkqSDQA+S8kg7xfc56Rc95IVqUgQDbQyiQq9i89nZZAIjQgITMx 0bkACRWV7Iiinz4N0TWUcVJcIkSq5KxP0+dMxgzoGJ+S7B7UCe3UXSXdfi/8K6Wyx5bkD9 9RrZlHop9eP6tD+OhEYUAwZv8uDDEbry558v485GQF2eM4ISEnwfnmiBn5k29ZAET7H54r VdXFgMW8sgCsnIXSQKD6U7WDMPIzvhdu9P8PWPme+2IeOcnn/AwfjUqcCnYUfygFPIcMZT qMS4hQr06XsI+bFO9Kjs4f0MvXSks0iT9F7YOJlGyeww8qff+zyaAORw7nvmkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714126999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oy2xSuBK5XrJBZn9sTBD6jI8wMAyFagPEsppIuRtbac=; b=UzH1F+rnpoDNx2kWZUzLqm5nmgdpWmldY3MEi6kyMy2sOE9342Ri3CO//73+r/pi1s/oE1 AYmQt46CBISUR3sVq1V3v5aT2zz9fSyGYK9FO3IwXLH7ok8sj8FgDXReaVjkHOUuNc5pqh gi3pNFNYTu67L5alEqDWBo5kuqQx6UxmHF32Sx4DZ6TAQpJk2drvHqNWldAPMYY2359pjh l9ILhIvrWyM1VXjyjdY3ICHJqk2jBadyhVu1Iy0A+bL1VI/X0jWoIUQxTgUazSJZdEGaDu 8i2+cf5YPbeElWlnYxdl9Pu3dEVYJGZU9GEK94aXQIJ947vFJsj7DdG+39Rp9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQphl5xhRzfVL; Fri, 26 Apr 2024 10:23: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 43QANJBt039394; Fri, 26 Apr 2024 10:23:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QANJH1039393; Fri, 26 Apr 2024 10:23:19 GMT (envelope-from git) Date: Fri, 26 Apr 2024 10:23:19 GMT Message-Id: <202404261023.43QANJH1039393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a509d68f27b9..d6f77d3cfa8e - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d6f77d3cfa8e56aed99e2ea250fdb242f51747df X-Git-Oldrev: a509d68f27b9f114b876bbe3b9caa9d0ee0c5606 X-Git-Newrev: d6f77d3cfa8e56aed99e2ea250fdb242f51747df Auto-Submitted: auto-generated The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a509d68f27b9..d6f77d3cfa8e d6f77d3cfa8e Update vendor/libarchive to 3.7.4 From nobody Fri Apr 26 13:30:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQtsY04c6z5Jh6y for ; Fri, 26 Apr 2024 13:31:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 4VQtsX3Z8tz4YXp for ; Fri, 26 Apr 2024 13:31:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5723edf0ae5so2356554a12.0 for ; Fri, 26 Apr 2024 06:31:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1714138271; x=1714743071; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/O28NxtaPL2MkqAHhVyc6WqaYDhMrjj/eKi8Ydl5KI0=; b=xxg6FrZf4+f/ZWX9AwM2bZyOOy3JyJFi0q3SMcxXI6Iy8/65zvistc0zPRGD/C41Yd R5i/lzBlycnhTWJbqXCKLv1CJ8NCjoVZ01wehZrNCP5Vdp9o0t6nj6+EWn1mwEdzxdsI DvvJtN0Sid2MvWqeeaJILqAQdV2gwpYLiKr5XhJh6gsBeicp6xfkPlERE+nY9sBjiX9j VXF+4oDLPOvbK4H9XDTfTxFyCn5Ft/g0LYFBB5utHrGnzS6yXWOBUk5PK7Vy81K3XTlB 4YETmTxjBQtS66mmre28u1m/abuchWlBm4IHA4pUKmlpOxzWq1+Hpd6s03pmv2HPo44X 9iBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714138271; x=1714743071; 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=/O28NxtaPL2MkqAHhVyc6WqaYDhMrjj/eKi8Ydl5KI0=; b=DchPwxY8iKFLG681rPYFuCbGmCKY09WMzjznqMC6gE8nxKl3c65RkYO2lInjgLQWWR +sdbWw2k5xDYG0/TAdUNxisG50NyyEgj7w9ekl0lMEU1Cry4jEV7Hsdvtsxw7sJTkhfe CJ0mNXN4omx+Slt9azQ4LhqBpNKDN+Rf8zPJnpw78rtL5U2pzr0Hbj7ux5b9qmPiQTvQ 9IBkItBvtQQIL+3SGHJu648p9IDUMyoz8B1tTipPNQzDUy8FTxoieT/pMrIq5fnvEJyZ RzSAY+FJaMv7HB+5UqJ+7geAy4ZV+K85JMYhlOowvG1UQrSOh8r4bylr+xxxzBWdijlT XrzA== X-Forwarded-Encrypted: i=1; AJvYcCWNmX2sFentluVpQ+F4VAN6Xa1qK/VJidubODstDRxaehCn8uiLg4dqTu4cw/76bPBCD+2VnqxODK6GamZIw04UMhaOFRhvzEWVEwNKa0nj X-Gm-Message-State: AOJu0Yw1M/BxF4ZFoOij4XmqShIGnHE4I7PfvhOZtnZ/KLVwaqe+8r8h kQaFTZrNVAQHA4bSkXSndNIAJ4hNGA7Bo8IIeJiMszWduO2AhI8qlSSxABcsscLPtk1S63LvXIM sMugp5V2gkCxQccEE9wJdqQQFxqTqEzX+MaWFjw== X-Google-Smtp-Source: AGHT+IFeOlRpgSbQcwWBNZrSeSmZZo99wxBkg2MUJ0giAu86R50zZbyOWYXo7bOXL0aFzHp4rZZ5+AtdUTANl+HVLX0= X-Received: by 2002:a17:906:2810:b0:a55:b93e:90ef with SMTP id r16-20020a170906281000b00a55b93e90efmr1771782ejc.77.1714138270665; Fri, 26 Apr 2024 06:31:10 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404260938.43Q9cSwG055237@gitrepo.freebsd.org> In-Reply-To: <202404260938.43Q9cSwG055237@gitrepo.freebsd.org> From: Warner Losh Date: Fri, 26 Apr 2024 07:30:57 -0600 Message-ID: Subject: Re: git: 5626f9e79090 - main - style.9: Document the existence of tools/build/checkstyle9.pl To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000b828ef0616ffea11" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VQtsX3Z8tz4YXp --000000000000b828ef0616ffea11 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Apr 26, 2024, 3:38=E2=80=AFAM Mateusz Piotrowski <0mp@freebsd.org> = wrote: > The branch main has been updated by 0mp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D5626f9e790901999def12040a60746b= 0ceeb9b95 > > commit 5626f9e790901999def12040a60746b0ceeb9b95 > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2024-04-26 09:37:01 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2024-04-26 09:37:01 +0000 > > style.9: Document the existence of tools/build/checkstyle9.pl > > MFC after: 3 days > Sponsored by: Klara, Inc. > --- > share/man/man9/style.9 | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 > index b111619e8ff6..8eb82e3419ec 100644 > --- a/share/man/man9/style.9 > +++ b/share/man/man9/style.9 > @@ -22,7 +22,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF > .\" SUCH DAMAGE. > .\" > -.Dd January 29, 2024 > +.Dd April 26, 2024 > .Dt STYLE 9 > .Os > .Sh NAME > @@ -904,6 +904,10 @@ instead of the older > .Fn CTASSERT . > .Sh FILES > .Bl -tag -width indent > +.It Pa /usr/src/tools/build/checkstyle9.pl > +A script to check for violations of > Egregious violations and there are some false positives still. +.Nm > +in a source file. > .It Pa /usr/src/tools/tools/editing/freebsd.el > An Emacs plugin to follow the > .Fx > --000000000000b828ef0616ffea11 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Apr 26, 2024, 3:38=E2=80=AFAM Mateusz Piotrows= ki <0mp@freebsd.org> wrote:
The branch main has been updated by 0= mp:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D5626f9e790901999def12040a60746b0cee= b9b95

commit 5626f9e790901999def12040a60746b0ceeb9b95
Author:=C2=A0 =C2=A0 =C2=A0Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2024-04-26 09:37:01 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2024-04-26 09:37:01 +0000

=C2=A0 =C2=A0 style.9: Document the existence of tools/build/checkst= yle9.pl

=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 3 days
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Klara, Inc.
---
=C2=A0share/man/man9/style.9 | 6 +++++-
=C2=A01 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index b111619e8ff6..8eb82e3419ec 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -22,7 +22,7 @@
=C2=A0.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSS= IBILITY OF
=C2=A0.\" SUCH DAMAGE.
=C2=A0.\"
-.Dd January 29, 2024
+.Dd April 26, 2024
=C2=A0.Dt STYLE 9
=C2=A0.Os
=C2=A0.Sh NAME
@@ -904,6 +904,10 @@ instead of the older
=C2=A0.Fn CTASSERT .
=C2=A0.Sh FILES
=C2=A0.Bl -tag -width indent
+.It Pa /usr/src/tools/build/checkstyle9.pl
+A script to check for violations of

Egregious violations and there are so= me false positives still.

+.Nm
+in a source file.
=C2=A0.It Pa /usr/src/tools/tools/editing/freebsd.el
=C2=A0An Emacs plugin to follow the
=C2=A0.Fx
--000000000000b828ef0616ffea11-- From nobody Fri Apr 26 15:34:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQxbG4bbRz5HQYq; Fri, 26 Apr 2024 15:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQxbG44xMz4jMf; Fri, 26 Apr 2024 15:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714145642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TsmtqaUqfaY8nbbGGUK75IvAOdEuXeOHJCjUyHlSyw=; b=I/gBo5bQMrVukznvjXjcV270UI0S18O2HTMA3MGmhVoPNaH9gdgBMxthY/9e503mycd/9S 7nsHQesCOTMjLUprHXT043IN+6OlbQ2J76hxpYUrXq/YUFZjNuLwRiZ4kF9UV5z07gEPrC CFBX2h4V2p8jTtMDjJdOrdi+GI2Az1VFJdhhyOwirn1g8I6+uscYSwR6Z9gBt6RBLDMv64 rmI6kEaEdOobGjXj9V4is1jcvkPbKV6NVJ6ileP/wrsf6+lo0f5DygMP1D3iDA5IC5vJ3S +MNGwleUKS9ABAGOh67LdV95AMxUCv2QZiApIk2KtuPvVT0EoWKmzD4ePwAdkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714145642; a=rsa-sha256; cv=none; b=y34VnJbZgJaJrdlfLhm8xtBLIjHJe/qVUi7vvO9skVGHMglj6pka20TqrpsHsyFTfkV6ka jhda9pGsIpi2QGatJ8MJno/xywoZfNdwKTgG1/m0jJ1RkPcX0CFT6gnqJTXk7mRCy+XW3S 5Aty8yG3HYOMPD0+qZRyiqtoaSwkHOw7dx6tw4ILocsKfvgWvSP03R8W4Gluha3gQY2VTd IyOaniaGE2kfB0jPp0C8jGadPeaF118cTf9hBGXJ7XoOLCiTHF/R1P5uqMHwLKthGEvH4O zUTf0aVsET7z+MiX0ARH2MIuywzY/09Aqbmxumpb4t2Q4Csrs873hFfis78zMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714145642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TsmtqaUqfaY8nbbGGUK75IvAOdEuXeOHJCjUyHlSyw=; b=tMvrDRTyAZrm8w4k/XEjXoUQHv/VMin9NJBiZw/KrLtFaOKC1ULGk//KZALjPnxjLYk4dC QthOTWyJePmWlnLcKoCC5aeCCnMtaNl0bFhWeIkHARUMDp/tLIl9n577IfpFFravnkwsqu IOrHC9OpanHwH9/tzBp032YcHmgccMHmNT9ctlH8kOpDjiPrFLEiFVWfnNimEepMcb4ri6 4ac/2ntta2vjCPvDuVEv3QMUFprU94JbAcTYcyFlUBfe53U9CjlosbaUGiSkJurQch2HPB SDCKpyXh5ux5Zf5s0Eg5xGZa6O6CGAb3uw0G1/xKHKyb+5ch8PP1zMqRkq359g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQxbG3h8pzpPT; Fri, 26 Apr 2024 15:34: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 43QFY2vc062434; Fri, 26 Apr 2024 15:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QFY2qb062431; Fri, 26 Apr 2024 15:34:02 GMT (envelope-from git) Date: Fri, 26 Apr 2024 15:34:02 GMT Message-Id: <202404261534.43QFY2qb062431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7b390cb63689 - main - date: Fix tests by initializing timespec structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b390cb636899582243e4daa8edbdb30d686d9fb Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b390cb636899582243e4daa8edbdb30d686d9fb commit 7b390cb636899582243e4daa8edbdb30d686d9fb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-26 15:19:18 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-26 15:32:57 +0000 date: Fix tests by initializing timespec structure The tests related to nanosecond support were failing on amd64 due to uninitialized timespec structure. Fixes: eeb04a736cb9 date: Add support for nanoseconds Reviewed by: markj Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44975 --- bin/date/date.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/date/date.c b/bin/date/date.c index ccd72cb98445..718c94601dd6 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -96,6 +96,8 @@ main(int argc, char *argv[]) (void) setlocale(LC_TIME, ""); rflag = 0; Iflag = jflag = Rflag = 0; + ts.tv_sec = 0; + ts.tv_nsec = 0; while ((ch = getopt(argc, argv, "f:I::jnRr:uv:z:")) != -1) switch((char)ch) { case 'f': From nobody Fri Apr 26 16:39:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQz2X3dHtz5Hmwp; Fri, 26 Apr 2024 16:39: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 4VQz2X35MLz4p9S; Fri, 26 Apr 2024 16:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714149556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G04ZG6NLqcJ8+PVM0XQV/LuItP2BKRsHKR/FFk5f21A=; b=bBXy2U/ImSfl/ej+Z5hBwo8UqasisXsm/PysTTa7GygrqxNQT/0jwSHc1JmdsyMdPOD/cU X3hTCfnag7zLl1xmrwrbO2ynr1XWCvjJucXiPPl35Psq50LtsETn7YSJ8I3gfo59DAnYNC MHh2ilNFK1acSoYreicCsxZU8NkNcqqIMvn2th/GjzII+LQuMD/i5ViqdHv8bfwjIz9ppI aVJtuosRK7d6vUYy+X3IgG/MLy/Uh7o5YVCuohnrWNf/oAQbuS7gY9lM0iattxqsYKkqM9 6MdvCh8fAd0O+8kLgvr1VKMsF1yD0bZk/B4/aOr1e8WN4nD1ipTJIxrhhhIwGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714149556; a=rsa-sha256; cv=none; b=ofmL1Sy5jb0NF+ne6313lN9Fl54cy4Y9xss+fatYjtjOL6V0BC3ESaHweNKAQTe6ZHWc2F ZmyNWA2IqwthniF+gzjucX44TBtNQBjX+IPBMy/79bdtPAUh4J8QUjhkDBn6jKrJEFPyVk Omzuy+GqicszUzu6SjqC4ESkprMSV39w5XO2lQjRWTEgyQpGjtHNTPzTtiNTFOYkBI0a7U yaIHuMe8R93VuXj/Br0jzQ3NY/yLjqGgmARW2BJbkhjjwyLW23ydU+BvkKVxfvY0+eJgr/ ykzO6+VFZ6/kW09Fa6ViNdcC+ZS8qObdx9gjIlrU1ctwrJaOiRLZBJnzz7KaGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714149556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G04ZG6NLqcJ8+PVM0XQV/LuItP2BKRsHKR/FFk5f21A=; b=Dbm/uS5DpQejEeDRNkxabcWpRE+6sRvS1xteo06YbpmcHkYYUYJx1dBvnrqcgU3leUcNHW K3QLGvPx0tVS2jnYgGB4nfZe4nBq2KGR7fP4QaRA4pwuObBDXWFIh583Yl/sDl4Ex2iZpi oqyXQXyUd2p6cj8filo0+LXdG2iYZoCCten5HQ50RwKsynibeIwSGYoOTk82dUM/wQpmpq Errz1K7R/Eeb0ruiaR5+QaNw+zIsaAZdNKITZO4N60zOKm9B0N5weixft7lB/uF1uaRIt/ lz4IADuUTbgKzad/IxB8m8SnNWUs66J1LhkOVNz5OthsTFOwdpSmyEAzqXqveg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQz2X2ZHjzqll; Fri, 26 Apr 2024 16:39: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 43QGdGZY064878; Fri, 26 Apr 2024 16:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QGdGqG064875; Fri, 26 Apr 2024 16:39:16 GMT (envelope-from git) Date: Fri, 26 Apr 2024 16:39:16 GMT Message-Id: <202404261639.43QGdGqG064875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 4459abe334eb - main - script: minor style improvements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4459abe334eb4dbd416fa8094a64afc065ccd1cc Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4459abe334eb4dbd416fa8094a64afc065ccd1cc commit 4459abe334eb4dbd416fa8094a64afc065ccd1cc Author: Xavier Beaudouin AuthorDate: 2024-04-26 16:10:15 +0000 Commit: Kyle Evans CommitDate: 2024-04-26 16:38:52 +0000 script: minor style improvements Fix some nits pointed out by checkstyle9.pl in advance of functional changes to script(1). Reviewed by: des Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44167 --- usr.bin/script/script.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index a1fd6967c35c..0373a6667784 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -114,19 +115,19 @@ main(int argc, char *argv[]) usesleep = 1; rawout = 0; flushtime = 30; - fm_fd = -1; /* Shut up stupid "may be used uninitialized" GCC - warning. (not needed w/clang) */ + fm_fd = -1; showexit = 0; while ((ch = getopt(argc, argv, "adeFfkpqrT:t:")) != -1) - switch(ch) { + switch (ch) { case 'a': aflg = 1; break; case 'd': usesleep = 0; break; - case 'e': /* Default behavior, accepted for linux compat */ + case 'e': + /* Default behavior, accepted for linux compat. */ break; case 'F': Fflg = 1; @@ -239,6 +240,8 @@ main(int argc, char *argv[]) (void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &rtt); } + assert(fflg ? fm_fd >= 0 : fm_fd < 0); + child = fork(); if (child < 0) { warn("fork"); @@ -331,7 +334,7 @@ main(int argc, char *argv[]) } } if (n > 0 && FD_ISSET(master, &rfd)) { - cc = read(master, obuf, sizeof (obuf)); + cc = read(master, obuf, sizeof(obuf)); if (cc <= 0) break; (void)write(STDOUT_FILENO, obuf, cc); @@ -417,7 +420,7 @@ done(int eno) if (showexit) (void)fprintf(fscript, "\nCommand exit status:" " %d", eno); - (void)fprintf(fscript,"\nScript done on %s", + (void)fprintf(fscript, "\nScript done on %s", ctime(&tvec)); } (void)printf("\nScript done, output file is %s\n", fname); @@ -459,8 +462,7 @@ consume(FILE *fp, off_t len, char *buf, int reg) if (reg) { if (fseeko(fp, len, SEEK_CUR) == -1) err(1, NULL); - } - else { + } else { while (len > 0) { l = MIN(DEF_BUF, len); if (fread(buf, sizeof(char), l, fp) != l) From nobody Fri Apr 26 16:39:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQz2Y66xTz5HnBc; Fri, 26 Apr 2024 16:39: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 4VQz2Y3yjDz4p6s; Fri, 26 Apr 2024 16:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714149557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fCEgSdIckIbn+RC1Mzvb+Mt8eM5Clg4YTbpvrX/t5g=; b=nKSp/7O7qE9wk26CgqYSzi6CP440aCRYfUuHYF6WYXitY9MLjafdXlm/4i2gPigicX+gYI ipUZej5U0S+NQ4z/h5LY/f/8NS0a9cWzUBqPDQ8+EMfa39NS9UJzyzhYb3H/TiI2BQijHv Ig/OyQwuBGsmhTPtBqlKK9gEanNXuwnXl2JS4XIH+cC57exSFE81n1p5gfya4DBAjgb4w9 WykbWFzG43s6L1C0SX3yZx5gPhfklsqOLlBBiL4zRkm6P46+ArDEXBsDLWGfHn5DwrZX47 nB6c2kBgLrUZFZI9yn/w4jH/ISSCO3fD2VWPq/sK5Sf5uJPuZC57OvLCfwqNMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714149557; a=rsa-sha256; cv=none; b=E4tTI++83oaSBpNW8x7I4Py3p4seWHK0xVqzwEi1OB0CGeaHak1Q63MOjBoi+BtFyf38zQ owj8DrU7h3xxpcxEHXNL7d8DRlXBN7Tm5cEYwKnYbfjOy0ipJbEB5rCO/gG5X5/us/Z/KY nsxq6f6N/HCCsERkOELG/6eH2cUerl7HxkiU+2/sMYjmL+VyE5uxhq8GyYsAOCX6kKzeJa xr2+eMaD8mwv9HxY9MxuagK5oRFHesfth7PchAmTh44Wjwr2VhX5CiLkryxqG8MO7dNw2o WQuV06PSnO89jdbwipUIxvlDAZX9RUGpi96yWenHlNfFL5P/ltcrDk5UYhIBCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714149557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fCEgSdIckIbn+RC1Mzvb+Mt8eM5Clg4YTbpvrX/t5g=; b=JwmdzGbIvhGgRboxHMTgqlNhuAXvoL1Em/nQvBKB/1rB0+5znA6STJsJWOS5TR1BdlXXQp lN4kBW0Khl+LKjROiSgBE/jUMveNg/eVNpZs9JBl4rw+ium4FV142XwmPoESezYLBm41+d riPRO2x6xsSdpS1NMQzoF10sPkoLESyienO4Y0myo7OHC37raFhNpKTM1Kt+CmNgUvNmiL /UHtoDcIX3U1f3ep49BhyYH72tPARC8VwSSBuqbCHwC9wChSWVkgacSW43fGr9EXx58VrQ 38NIcmm7QAA84H9IGr3Rf2BnX9+16qpxxwl5VLlQ2txTp4BiOKS7dhogyKPfow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQz2Y3ZgpzqYb; Fri, 26 Apr 2024 16:39: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 43QGdHU1064934; Fri, 26 Apr 2024 16:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QGdHOZ064931; Fri, 26 Apr 2024 16:39:17 GMT (envelope-from git) Date: Fri, 26 Apr 2024 16:39:17 GMT Message-Id: <202404261639.43QGdHOZ064931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8ceac8e13dcc - main - script: handle terminal resize on SIGWINCH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ceac8e13dccbe4e177c8f2f443b87b7d2e3edb3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8ceac8e13dccbe4e177c8f2f443b87b7d2e3edb3 commit 8ceac8e13dccbe4e177c8f2f443b87b7d2e3edb3 Author: Kyle Evans AuthorDate: 2024-04-26 16:12:00 +0000 Commit: Kyle Evans CommitDate: 2024-04-26 16:39:00 +0000 script: handle terminal resize on SIGWINCH Add a -w flag to forward terminal resize events on to the child, which can be useful in some circumstances to avoid terminal corruption. Reviewed by: des Co-authored-by: Xavier Beaudouin Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44167 --- usr.bin/script/script.1 | 5 +++- usr.bin/script/script.c | 62 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1 index 78e2feef3712..5f40e5af28ff 100644 --- a/usr.bin/script/script.1 +++ b/usr.bin/script/script.1 @@ -33,7 +33,7 @@ .Nd make typescript of terminal session .Sh SYNOPSIS .Nm -.Op Fl aeFfkqr +.Op Fl aeFfkqrw .Op Fl t Ar time .Op Ar file Op Ar command ... .Nm @@ -131,6 +131,9 @@ characters, it indicates the default format: which is useful for both tools and humans to read, should be used. Note that time-stamps will only be output when different from the previous one. +.It Fl w +Forward terminal size changes on +.Dv SIGWINCH . .El .Pp The script ends when the forked shell (or command) exits (a diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 0373a6667784..cca265b8941b 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -77,6 +77,7 @@ static char *fmfname; static int fflg, qflg, ttyflg; static int usesleep, rawout, showexit; static TAILQ_HEAD(, buf_elm) obuf_list = TAILQ_HEAD_INITIALIZER(obuf_list); +static volatile sig_atomic_t doresize; static struct termios tt; @@ -94,31 +95,43 @@ static void record(FILE *, char *, size_t, int); static void consume(FILE *, off_t, char *, int); static void playback(FILE *) __dead2; static void usage(void) __dead2; +static void resizeit(int); int main(int argc, char *argv[]) { struct termios rtt, stt; struct winsize win; - struct timeval tv, *tvp; + struct timespec tv, *tvp; time_t tvec, start; char obuf[BUFSIZ]; char ibuf[BUFSIZ]; + sigset_t *pselmask, selmask; fd_set rfd, wfd; struct buf_elm *be; ssize_t cc; - int aflg, Fflg, kflg, pflg, ch, k, n, fcm; + int aflg, Fflg, kflg, pflg, wflg, ch, k, n, fcm; int flushtime, readstdin; int fm_fd, fm_log; - aflg = Fflg = kflg = pflg = 0; + aflg = Fflg = kflg = pflg = wflg = 0; + doresize = 0; usesleep = 1; rawout = 0; flushtime = 30; fm_fd = -1; showexit = 0; - while ((ch = getopt(argc, argv, "adeFfkpqrT:t:")) != -1) + /* + * For normal operation, we'll leave pselmask == NULL so that pselect(2) + * leaves the signal mask alone. If -w is specified, we'll restore the + * process signal mask upon entry with SIGWINCH unblocked so that we can + * forward resize events properly. + */ + sigemptyset(&selmask); + pselmask = NULL; + + while ((ch = getopt(argc, argv, "adeFfkpqrT:t:w")) != -1) switch (ch) { case 'a': aflg = 1; @@ -157,6 +170,9 @@ main(int argc, char *argv[]) if (strchr(optarg, '%')) tstamp_fmt = optarg; break; + case 'w': + wflg = 1; + break; case '?': default: usage(); @@ -260,6 +276,23 @@ main(int argc, char *argv[]) } close(slave); + if (wflg) { + struct sigaction sa = { .sa_handler = resizeit }; + sigset_t smask; + + sigaction(SIGWINCH, &sa, NULL); + + sigemptyset(&smask); + sigaddset(&smask, SIGWINCH); + + if (sigprocmask(SIG_BLOCK, &smask, &selmask) != 0) + err(1, "Failed to block SIGWINCH"); + + /* Just in case SIGWINCH was blocked before we came in. */ + sigdelset(&selmask, SIGWINCH); + pselmask = &selmask; + } + start = tvec = time(0); readstdin = 1; for (;;) { @@ -272,19 +305,26 @@ main(int argc, char *argv[]) FD_SET(master, &wfd); if (!readstdin && ttyflg) { tv.tv_sec = 1; - tv.tv_usec = 0; + tv.tv_nsec = 0; tvp = &tv; readstdin = 1; } else if (flushtime > 0) { tv.tv_sec = flushtime - (tvec - start); - tv.tv_usec = 0; + tv.tv_nsec = 0; tvp = &tv; } else { tvp = NULL; } - n = select(master + 1, &rfd, &wfd, NULL, tvp); + n = pselect(master + 1, &rfd, &wfd, NULL, tvp, pselmask); if (n < 0 && errno != EINTR) break; + + if (doresize) { + if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) != -1) + ioctl(master, TIOCSWINSZ, &win); + doresize = 0; + } + if (n > 0 && FD_ISSET(STDIN_FILENO, &rfd)) { cc = read(STDIN_FILENO, ibuf, BUFSIZ); if (cc < 0) @@ -359,7 +399,7 @@ static void usage(void) { (void)fprintf(stderr, - "usage: script [-aeFfkpqr] [-t time] [file [command ...]]\n"); + "usage: script [-aeFfkpqrw] [-t time] [file [command ...]]\n"); (void)fprintf(stderr, " script -p [-deq] [-T fmt] [file]\n"); exit(1); @@ -605,3 +645,9 @@ playback(FILE *fp) (void)fclose(fp); exit(0); } + +static void +resizeit(int signo __unused) +{ + doresize = 1; +} From nobody Fri Apr 26 19:27:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VR2mc6Vrpz5J4fc; Fri, 26 Apr 2024 19:27: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 4VR2mc62rjz4584; Fri, 26 Apr 2024 19:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714159648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HZSQ6vNF2zE2YJr1ofc25jOWvchj0abwFeOXmcUFW0=; b=E304mLXwazFiE28TFNnGgm1tdn2XRg6wcgUUC7s0ziPxA/1vhZPJUV+mdxeBDGlE/RUCVy A+bvSqPVW8xDYuguIvUaRz1mxfMshkUa4LFFt1kjcsg4uMAL0eA3H88J2j+VTyYjePp2DI viN6uZ1d5YDEZJOa6j4q9wThjFY8Di9RSZV9L5gyKU8Efv0S2Seb7OG2eXVh1tfpIDb3u0 nxCH6NfFqIQkFkPZJf+HE0hgtI/rm7Hd+ed1GntplKuoVvMkCX/ux9WYAguGp47KYBD6gO e9InrKV1L17vwofzOml1v8AUO3cRhVWdzFoSjtGCnvTKIGcKsvuOZmWf0yBtjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714159648; a=rsa-sha256; cv=none; b=OVMxeHnifiWptlVfFzZN7Llf+jQBW17n8TAuUGZNkG9fC8DlZUhd6PrU3POXxRuyDImnYZ CMqYYMXYfo0NOt5KyAV9pqD01XWKi+KOR5pedSoLpv6rU2tCR314xMbEiW84zMLYLtxBvd 2tM/hCh6/rOIinNxlDn5h/mSVDJsR18HVTO5eNfCtp9KEE5h5hE0zWUMv3NHht+5YOLLt6 aETqGiK8BPCRDWDyUMt1s+PxuzShic6bCilZffHXWD1ogOH7RG1oOPv7O8YYYDV8Fhs589 qOW5gHkyx3c8piC9EaQS9Kz2ALOVlyexurm+Mg6ygAk/WymbFRueu6HNib6BBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714159648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HZSQ6vNF2zE2YJr1ofc25jOWvchj0abwFeOXmcUFW0=; b=d6awQIFvpBgRgtS5fAQssqGQe+7thCq56e6OZ05t/zWCtfXzHbJvLJ/KJUUy7T/bquH3fp 0QuoQEyR5L06pPslmHxA9tAypRIOTcvLIj/R9RjDMcmZGzI4DwG686tDRkmNCTry7q47XZ oVgtFFgm6H87vqRqPTUP48rwcwfRsmpW38+VPwpVzPBAOZHsbHPssu1ACw5hw4PlBeBFlL yD18noGE3fny7E9yQR+JMidRP9+mMZfPS5PwRu2uIc1xuq83AO37F+ya3UEE3kY4iHtxfV eBUS+I0PyJ1OLfGfSpkcCXIcWIQd6Mr9puBkhBSqjQ+ubVoGMpteuvyL9aasNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VR2mc5WQ5ztpw; Fri, 26 Apr 2024 19:27: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 43QJRS6D051995; Fri, 26 Apr 2024 19:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QJRSoK051992; Fri, 26 Apr 2024 19:27:28 GMT (envelope-from git) Date: Fri, 26 Apr 2024 19:27:28 GMT Message-Id: <202404261927.43QJRSoK051992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: d5ad60b75f47 - stable/14 - libgcc_s: expose __divmoddi4 on i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5ad60b75f47feda1a8676f186030beab539df26 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ad60b75f47feda1a8676f186030beab539df26 commit d5ad60b75f47feda1a8676f186030beab539df26 Author: Brooks Davis AuthorDate: 2024-04-19 21:52:42 +0000 Commit: Brooks Davis CommitDate: 2024-04-26 18:30:42 +0000 libgcc_s: expose __divmoddi4 on i386 GCC has used this for some time (since 7.0) and apparently we were getting away with using the hidden symbol, but when linking with --no-undefined-version we get an error unless it's properly exported. (For anyone who wonders at the assymetry, __udivmoddi4 is indeed much older and was introduced with GCC 3.0.) MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44878 (cherry picked from commit 44e89340fe349abc020732958c6debd12b5adf2c) --- lib/libgcc_s/Symbol.map | 6 ++++++ lib/libgcc_s/Versions.def | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index 2aa31ec34542..ea5baaef6645 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -180,3 +180,9 @@ GCC_4.6.0 { __trunctfxf2; __unordtf2; }; + +GCC_7.0.0 { +#ifdef __i386__ + __divmoddi4; +#endif +}; diff --git a/lib/libgcc_s/Versions.def b/lib/libgcc_s/Versions.def index d28e9042f744..526387e055df 100644 --- a/lib/libgcc_s/Versions.def +++ b/lib/libgcc_s/Versions.def @@ -31,3 +31,6 @@ GCC_4.3.0 { GCC_4.6.0 { } GCC_4.3.0; + +GCC_7.0.0 { +} GCC_4.6.0; From nobody Sat Apr 27 00:56:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRB4M25FRz5JZyp; Sat, 27 Apr 2024 00:56: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 4VRB4M1R7Xz4c1P; Sat, 27 Apr 2024 00:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714179395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r5R6ME5probAOMUSs1utt3s3rE3eQquea1nq49b4fl0=; b=PmhHZ7WAT4GPuHIOeBOLH8rYidYm6Dqj9k5XPldE6BLJZk6nPtDMhVjyWMy/y5Qg5JAa/c Ct0U6GmSfk3OuTF4lUVUSKN4mv/ms9mIIvWlKfGuhg6aFsN+m3mIrHy4ea9Kdirfq2R0ju ypi9aUqalAwop3gDc8S3Iy9dNxTytRTAo9oP7S9hMp7okISy94FSZmNZrsYN5/TYYrxvc5 lidrdAIfKzpaEvYgTe1ckl3/Cfl5xkvKaI6hya31b/dSojMq/LgEerKA0OzwTRkXzxsKM5 5cXuwdz6zIAWZ22El2HGoblhdQEG/llDR10O6P+sVtD1wq5lqMpWx2F4FZLxmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714179395; a=rsa-sha256; cv=none; b=fhw8g5OO9wsZFVoGbGWwK+DuQGpvsZ0usl/rjanh+DfeyNCoq5Mh19e5VOkCNTxL4noG2x kA3fMU+VbptFBtegV3SMtZE7T/sYAyLH9kwhqhquqdNjFfLg72Vv7nBKT3t9twmHqBMFUS U0QrKNtJIjbFsVYjonxtgbw8qlHW8+KkEr5F/xuHUIdGQrajaGS3ZJ7waE+y6GJRAu5PsT E+LJyT2qd/OSaAL5rjRzK0QaDXhgbbb9Y5cHY36SVOW/T9/GC1sXpSZuXUxRzJjhUCC6Ul Tn3QEdzsN+lftrgIdCKb1IVGfwmFNb2inhqt5wQEMuAHUzyR/TQKVxLqWSr4+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=1714179395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r5R6ME5probAOMUSs1utt3s3rE3eQquea1nq49b4fl0=; b=IsHoZT08nWir7on8WfFKS32EZePCyL80F8kWYYIaQQkgRCcUEE8mKK5IUm6alc9UNNTSPZ RZCNPbdyx6QyrCr1npuRrBdt9NmWW3O70iGatmXCxQEXVe7ctLEENn/tVvYxeGUQQDpyfa P2JHdJuujAS2SyWmzmbziopQoS2/TB9wH0OqWz4A8t8GXSldVjQ64QlZjxYM/WjrbwdorQ cZKLGqOY3Lu6zErsJ/E4Ksxnny+w2HP2j0a7iVAOC2SgD4knKUVrj3jN6GtusLIfo/pGHp elR86bOjQE1jtDoFxerUN5sTuoh1DjndE+Vz1Yg9cfgJijBXl7UaDXGg+Yi0Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRB4M12lpz152G; Sat, 27 Apr 2024 00:56: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 43R0uZj2007495; Sat, 27 Apr 2024 00:56:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R0uZC4007492; Sat, 27 Apr 2024 00:56:35 GMT (envelope-from git) Date: Sat, 27 Apr 2024 00:56:35 GMT Message-Id: <202404270056.43R0uZC4007492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4ba444de708b - main - krpc: Ref cnt the client structures for TLS upcalls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ba444de708bada46a88ecac17b2f6c1dc912234 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4ba444de708bada46a88ecac17b2f6c1dc912234 commit 4ba444de708bada46a88ecac17b2f6c1dc912234 Author: Rick Macklem AuthorDate: 2024-04-27 00:55:24 +0000 Commit: Rick Macklem CommitDate: 2024-04-27 00:55:24 +0000 krpc: Ref cnt the client structures for TLS upcalls A crash occurred during testing, where the client structures had already been free'd when the upcall thread tried to lock them. This patch acquires a reference count on both of the structures and these are released when the upcall is done, so that the structures cannot be free'd prematurely. This happened because the testing is done over a very slow vpn. Found during a IETF bakeathon testing event this week. MFC after: 5 days --- sys/rpc/clnt_vc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index 386153dc1f36..91556dddebaa 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -754,6 +754,7 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) case CLSET_BACKCHANNEL: xprt = (SVCXPRT *)info; if (ct->ct_backchannelxprt == NULL) { + SVC_ACQUIRE(xprt); xprt->xp_p2 = ct; if (ct->ct_sslrefno != 0) xprt->xp_tls = RPCTLS_FLAGS_HANDSHAKE; @@ -767,9 +768,11 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) ct->ct_sslusec = *p++; ct->ct_sslrefno = *p; if (ct->ct_sslrefno != RPCTLS_REFNO_HANDSHAKE) { + /* cl ref cnt is released by clnt_vc_dotlsupcall(). */ + CLNT_ACQUIRE(cl); mtx_unlock(&ct->ct_lock); /* Start the kthread that handles upcalls. */ - error = kthread_add(clnt_vc_dotlsupcall, ct, + error = kthread_add(clnt_vc_dotlsupcall, cl, NULL, NULL, 0, 0, "krpctls%u", thrdnum++); if (error != 0) panic("Can't add KRPC thread error %d", error); @@ -869,6 +872,7 @@ clnt_vc_destroy(CLIENT *cl) mtx_lock(&ct->ct_lock); xprt->xp_p2 = NULL; sx_xunlock(&xprt->xp_lock); + SVC_RELEASE(xprt); } if (ct->ct_socket) { @@ -1269,7 +1273,8 @@ clnt_vc_upcallsdone(struct ct_data *ct) static void clnt_vc_dotlsupcall(void *data) { - struct ct_data *ct = (struct ct_data *)data; + CLIENT *cl = (CLIENT *)data; + struct ct_data *ct = (struct ct_data *)cl->cl_private; enum clnt_stat ret; uint32_t reterr; @@ -1306,5 +1311,6 @@ clnt_vc_dotlsupcall(void *data) ct->ct_rcvstate &= ~RPCRCVSTATE_UPCALLTHREAD; wakeup(&ct->ct_sslrefno); mtx_unlock(&ct->ct_lock); + CLNT_RELEASE(cl); kthread_exit(); } From nobody Sat Apr 27 03:02:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRDsZ0bhKz5HKx1; Sat, 27 Apr 2024 03:02: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 4VRDsZ04kzz4rLs; Sat, 27 Apr 2024 03:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsYTOPD5S2NWbQ0Q+9V39+oYOzclOPD6JVwboUXuJuk=; b=dL2BXWkZCRHkgC0a4NA36P7bfU96PmO7q2+oYNaLQqgc0jaYH3YqN2AJERdTeDPGgXSFG7 c8d9f9Bzid9B/2jTqOTgiBesVnbtaA8caNZErve1GaaKhaMukexH4B0gQzyx5oE4P8bC/W wWwfpchcO9v4s7VCfXHFBtaLZ++WDuj2n0M9k1dENGK8CKD7vcavrEutW+MKkvUU04sagB fQu/UcUQb+l4iHIi07pRnWkJHx4RAWCg1QJw1UhhHhWl3znx7X7+mTdKQe73WBbq2Bttzu ddQyFSZT2fJ8Vfx7SI00r3yPVSoPmxjxwJmpsX3Y38EnU6rWMix4yD8RAp6wxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714186946; a=rsa-sha256; cv=none; b=RMuvdeEbXyaUd8Vz+BQwh900LTS0CiS6LSdKKCL4OLpd36eTS1k29Ji3QbSk/8XEp9uDLQ 1IqiK918iWWD7nVl5mcBTNDrBgzQmTWpZRzX+f5ItXRHBz/vGYPdSyfX2k/3FCuy2vLe8X dL5kedH17XaV9zvriqNs34oVoI5qTq8T4jMnUPrZVeLz5rqmsWQywWpjeP+N+2wbyZzcx7 JIFs4NsdOc7qkAYU7E+ygimgP0Bo7WGFwCJfGF8fFgddcpaP77c8uVFb5eQsgevgRalByu gIcLynreqPziVcpa9U9kVhGlqbH8DS3XxSgjOx/Oq1wHRTWUPkGUFmpnaO0KxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsYTOPD5S2NWbQ0Q+9V39+oYOzclOPD6JVwboUXuJuk=; b=x+vl/uKUnJvTruFd+RMWIpalacbah4WWTRjhShC3Qq87ICJhYjUdBkweN17u93TfCLEfM1 NX2ia8ThXxnL/gGW5f9WLkjXTELPk4/Z0zUJEnqSOK9imNDzmxpXmwRk4Tk0u9YpkUGd4R RX9On57X6G2mJ0DVaO9HQdPXoQR2wVD+nnT29gFxVSyfIhaKrZjP/JzWGymincRakoELhU UyLdmiEhvPmsbiX7uBLUPaohvi/Kg7wUUZwAiiuWR27c7ADNG2VpbfxI6E560E8+yJun9O BsVYUyyR60wCxDg1/9nBPiPVYRhew1cNHsqpD3aHfHrGk4DRDx/8LZp0FA/z5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRDsY6nXgz1823; Sat, 27 Apr 2024 03:02: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 43R32PcU029898; Sat, 27 Apr 2024 03:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R32P0e029895; Sat, 27 Apr 2024 03:02:25 GMT (envelope-from git) Date: Sat, 27 Apr 2024 03:02:25 GMT Message-Id: <202404270302.43R32P0e029895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 75f1323c15cb - stable/14 - libpmc: Import AMD Zen 4 PMU events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75f1323c15cb95e55c0d55dcd468967857762815 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=75f1323c15cb95e55c0d55dcd468967857762815 commit 75f1323c15cb95e55c0d55dcd468967857762815 Author: Alexander Motin AuthorDate: 2024-04-20 15:54:04 +0000 Commit: Alexander Motin CommitDate: 2024-04-27 03:02:10 +0000 libpmc: Import AMD Zen 4 PMU events MFC after: 1 week (cherry picked from commit 278d6950943a9fec2bddb037b547c04a847c54ba) --- lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json | 82 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 828 +++++++++++++++ lib/libpmc/pmu-events/arch/x86/amdzen4/core.json | 122 +++ .../pmu-events/arch/x86/amdzen4/data-fabric.json | 1090 ++++++++++++++++++++ .../arch/x86/amdzen4/floating-point.json | 818 +++++++++++++++ .../arch/x86/amdzen4/memory-controller.json | 101 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/memory.json | 174 ++++ lib/libpmc/pmu-events/arch/x86/amdzen4/other.json | 138 +++ .../pmu-events/arch/x86/amdzen4/pipeline.json | 98 ++ .../pmu-events/arch/x86/amdzen4/recommended.json | 418 ++++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 11 files changed, 3871 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json new file mode 100644 index 000000000000..208c646c59ca --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json @@ -0,0 +1,82 @@ +[ + { + "EventName": "bp_l2_btb_correct", + "EventCode": "0x8b", + "BriefDescription": "L2 branch prediction overrides existing prediction (speculative)." + }, + { + "EventName": "bp_dyn_ind_pred", + "EventCode": "0x8e", + "BriefDescription": "Dynamic indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_de_redirect", + "EventCode": "0x91", + "BriefDescription": "Instruction decoder corrects the predicted target and resteers the branch predictor." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call/jump/return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns mispredicted. Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_ind_brch_instr", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_ret_msprd_brnch_instr_dir_msmtch", + "EventCode": "0x1c7", + "BriefDescription": "Retired branch instructions mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_uncond_brnch_instr_mispred", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect branch instructions mispredicted." + }, + { + "EventName": "ex_ret_uncond_brnch_instr", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json new file mode 100644 index 000000000000..e6d710cf3ce2 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -0,0 +1,828 @@ +[ + { + "EventName": "ls_mab_alloc.load_store_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", + "UMask": "0x3f" + }, + { + "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", + "UMask": "0x40" + }, + { + "EventName": "ls_mab_alloc.all_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", + "UMask": "0x7f" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_l2", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_ccx", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_dmnd_fills_from_sys.near_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_near", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_dmnd_fills_from_sys.far_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_far", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_dmnd_fills_from_sys.alternate_memories", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_dmnd_fills_from_sys.all", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_any_fills_from_sys.local_l2", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_any_fills_from_sys.local_ccx", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_any_fills_from_sys.local_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache or L3 cache or different L2 cache in the same CCX.", + "UMask": "0x03" + }, + { + "EventName": "ls_any_fills_from_sys.near_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_near", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_any_fills_from_sys.far_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_any_fills_from_sys.remote_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same or a different NUMA node.", + "UMask": "0x14" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_far", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.far_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either cache of another CCX, DRAM or MMIO when the address was in a different NUMA node (same or different socket).", + "UMask": "0x50" + }, + { + "EventName": "ls_any_fills_from_sys.all_dram_io", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.alternate_memories", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_any_fills_from_sys.all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_pref_instr_disp.prefetch", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchT0 (move data to all cache levels), T1 (move data to all cache levels except L1) and T2 (move data to all cache levels except L1 and L2).", + "UMask": "0x01" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_w", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchW (move data to L1 cache and mark it modifiable).", + "UMask": "0x02" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_nta", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchNTA (move data with minimum cache pollution i.e. non-temporal access).", + "UMask": "0x04" + }, + { + "EventName": "ls_pref_instr_disp.all", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of all types.", + "UMask": "0x07" + }, + { + "EventName": "ls_inef_sw_pref.data_pipe_sw_pf_dc_hit", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a data cache hit.", + "UMask": "0x01" + }, + { + "EventName": "ls_inef_sw_pref.mab_mch_cnt", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a match on an already allocated Miss Address Buffer (MAB).", + "UMask": "0x02" + }, + { + "EventName": "ls_inef_sw_pref.all", + "EventCode": "0x52", + "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "UMask": "0x03" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_l2", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_ccx", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_sw_pf_dc_fills.near_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_near", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_sw_pf_dc_fills.far_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_far", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_sw_pf_dc_fills.alternate_memories", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_sw_pf_dc_fills.all", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_l2", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_ccx", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_hw_pf_dc_fills.near_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_near", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_hw_pf_dc_fills.far_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_far", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_hw_pf_dc_fills.alternate_memories", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_hw_pf_dc_fills.all", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_alloc_mab_count", + "EventCode": "0x5f", + "BriefDescription": "In-flight L1 data cache misses i.e. Miss Address Buffer (MAB) allocations each cycle." + }, + { + "EventName": "l2_request_g1.group2", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of non-cacheable type (non-cached data and instructions reads, self-modifying code checks).", + "UMask": "0x01" + }, + { + "EventName": "l2_request_g1.l2_hw_pf", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: from hardware prefetchers to prefetch directly into L2 (hit or miss).", + "UMask": "0x02" + }, + { + "EventName": "l2_request_g1.prefetch_l2_cmd", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: prefetch directly into L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_request_g1.change_to_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache state change to writable, check L2 for current state.", + "UMask": "0x08" + }, + { + "EventName": "l2_request_g1.cacheable_ic_read", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: instruction cache reads.", + "UMask": "0x10" + }, + { + "EventName": "l2_request_g1.ls_rd_blk_c_s", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache shared reads.", + "UMask": "0x20" + }, + { + "EventName": "l2_request_g1.rd_blk_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache stores.", + "UMask": "0x40" + }, + { + "EventName": "l2_request_g1.rd_blk_l", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache reads including hardware and software prefetch.", + "UMask": "0x80" + }, + { + "EventName": "l2_request_g1.all_dc", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types from L1 data cache (including prefetches).", + "UMask": "0xe8" + }, + { + "EventName": "l2_request_g1.all_no_prefetch", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types not including prefetches.", + "UMask": "0xf9" + }, + { + "EventName": "l2_request_g1.all", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_miss", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache request miss in L2.", + "UMask": "0x01" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit non-modifiable line in L2.", + "UMask": "0x02" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit modifiable line in L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_cache_req_stat.ic_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache hits.", + "UMask": "0x06" + }, + { + "EventName": "l2_cache_req_stat.ic_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache access.", + "UMask": "0x07" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_c", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache request miss in L2.", + "UMask": "0x08" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_miss_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache misses.", + "UMask": "0x09" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache store or state change hit in L2.", + "UMask": "0x10" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit non-modifiable line in L2.", + "UMask": "0x20" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit modifiable line in L2.", + "UMask": "0x40" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_cs", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache shared read hit in L2.", + "UMask": "0x80" + }, + { + "EventName": "l2_cache_req_stat.dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache hits.", + "UMask": "0xf0" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache hits.", + "UMask": "0xf6" + }, + { + "EventName": "l2_cache_req_stat.dc_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache access.", + "UMask": "0xf8" + }, + { + "EventName": "l2_cache_req_stat.all", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache access.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_hit_l2.l2_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_hit_l2.l2_next_line", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_hit_l2.l2_up_down", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_hit_l2.l2_burst", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_hit_l2.l2_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stride (fetch additional lines into L2 cache when each access is at a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_hit_l2.l1_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_hit_l2.l1_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_hit_l2.l1_region", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_hit_l2.all", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_next_line", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_up_down", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_burst", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_region", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.all", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_next_line", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_up_down", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_burst", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_region", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_l3.all", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of all types.", + "UMask": "0xff" + }, + { + "EventName": "ic_cache_fill_l2", + "EventCode": "0x82", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from the L2 cache." + }, + { + "EventName": "ic_cache_fill_sys", + "EventCode": "0x83", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from system memory or another cache." + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_hit", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache hits.", + "UMask": "0x07" + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_miss", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache misses.", + "UMask": "0x18" + }, + { + "EventName": "ic_tag_hit_miss.all_instruction_cache_accesses", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache accesses of all types.", + "UMask": "0x1f" + }, + { + "EventName": "op_cache_hit_miss.op_cache_hit", + "EventCode": "0x28f", + "BriefDescription": "Op cache hits.", + "UMask": "0x03" + }, + { + "EventName": "op_cache_hit_miss.op_cache_miss", + "EventCode": "0x28f", + "BriefDescription": "Op cache misses.", + "UMask": "0x04" + }, + { + "EventName": "op_cache_hit_miss.all_op_cache_accesses", + "EventCode": "0x28f", + "BriefDescription": "Op cache accesses of all types.", + "UMask": "0x07" + }, + { + "EventName": "l3_lookup_state.l3_miss", + "EventCode": "0x04", + "BriefDescription": "L3 cache misses.", + "UMask": "0x01", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.l3_hit", + "EventCode": "0x04", + "BriefDescription": "L3 cache hits.", + "UMask": "0xfe", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.all_coherent_accesses_to_l3", + "EventCode": "0x04", + "BriefDescription": "L3 cache requests for all coherent accesses.", + "UMask": "0xff", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.near_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.far_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.all", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.near_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.far_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.all", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json new file mode 100644 index 000000000000..a56a41828bd4 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json @@ -0,0 +1,122 @@ +[ + { + "EventName": "ls_locks.bus_lock", + "EventCode": "0x25", + "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "UMask": "0x01" + }, + { + "EventName": "ls_ret_cl_flush", + "EventCode": "0x26", + "BriefDescription": "Retired CLFLUSH instructions." + }, + { + "EventName": "ls_ret_cpuid", + "EventCode": "0x27", + "BriefDescription": "Retired CPUID instructions." + }, + { + "EventName": "ls_smi_rx", + "EventCode": "0x2b", + "BriefDescription": "SMIs received." + }, + { + "EventName": "ls_int_taken", + "EventCode": "0x2c", + "BriefDescription": "Interrupts taken." + }, + { + "EventName": "ls_not_halted_cyc", *** 2984 LINES SKIPPED *** From nobody Sat Apr 27 03:02:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRDtB6wzcz5HKjl; Sat, 27 Apr 2024 03:02: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 4VRDtB50fCz4rpM; Sat, 27 Apr 2024 03:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HlYoHbBwMMKsYdXMFMEfGuj/zjbckmzwDjg6+JbXlI8=; b=yUN1JGYx+RJPkBfgZ2O5yAVSFsXtrPSdimZXCZD+TTgEcvNX3Qt3Yw5OnnU/Rw/8UMlwXj MxVwvviAeAt2amE9lG3QkHmRlMfhD/P/B1cYJ/nfLfzWS7dWjWghY/1vkJn+lBPXwmN8oW QC6LOqbhWdGXaiMTtYvjzlbP6cmfC4SU9/+8Y53b8Lx3NZljgZgAOeptsdI8yJvTl7iPaK 5N5X44QS0SR7m7mNXWYieE9zF/nMd6rWXNf5xHGXRkDrk32Pye2sZqUB0cQ8l7arI8GRvJ b8Va3wgDt8U3u19mY/cQk4KBki3n5eckoKtBbajikhOoE+vqYFd/B2sJZVwsRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714186978; a=rsa-sha256; cv=none; b=rTjzLDXKHh09IO8Ss5gzipt8pyMI5lOFFjaUhRTbIF/x4IrxATfUqE7e0qj0buWUYeG5fN shKJn8t3ntnvjdXbjQ6Mv5ho54RXYA2I/5zqhWcWRpaV4aAj2dtJnIyS8ZS4mwnlh0Ir0k +pqAcbIl4uZYopXVimftP5ToJrlqKV+/sN+ROtYLWMsqQ8rLeNoU3+EEdVPygHP/D/MNdP fNAKDyiX9JcWo1LIZws5CPB5d75y/n9WglNkFJyrk2ilfQ/zcQ1LCqPb3dFOkFwyEWP7sp zJjvGNruThI1W0dOPLh6ybZV5ldFgR8qEGWu+sS7Kb+s1KuZ+mlu785eMI7mpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HlYoHbBwMMKsYdXMFMEfGuj/zjbckmzwDjg6+JbXlI8=; b=OUHlEBxORsKOsVzwmYHiiU+67PhLVoFvjBTQg9Wq2IKbGPqq5X4C+j3/OWl4Ey+opbPTGS E1ReJgP8QHuI5J6SsiXjltde6OaHufu1BYHpNgLajQkZSo0lDuAsKWDHvZI8TU6jRc2ZZe mEgVQvV+VabAvGb6Vn//enLmUfLJaRORAF1EKx9OR6ZJD2R3bkPIV9UwSNAtje5hD1Y1Y1 pBNKpIBD1U9Z4jo1KQTaFE05TVt1dA/ZviiZ9ZCh9yCFl+ZReQEDFAokzWHjZWqzCoewhb aJtdVmaYAgqzhWnVDXawp8ClWzYg/63/UlJvKBkzoDx5JHKq409daKCQFRA1Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRDtB4bhNz18GN; Sat, 27 Apr 2024 03:02: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 43R32wV9030934; Sat, 27 Apr 2024 03:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R32wJC030931; Sat, 27 Apr 2024 03:02:58 GMT (envelope-from git) Date: Sat, 27 Apr 2024 03:02:58 GMT Message-Id: <202404270302.43R32wJC030931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: a36b9f244287 - stable/13 - libpmc: Import AMD Zen 4 PMU events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a36b9f2442875961a3dd85a9808c594b0cf6137f Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a36b9f2442875961a3dd85a9808c594b0cf6137f commit a36b9f2442875961a3dd85a9808c594b0cf6137f Author: Alexander Motin AuthorDate: 2024-04-20 15:54:04 +0000 Commit: Alexander Motin CommitDate: 2024-04-27 03:02:51 +0000 libpmc: Import AMD Zen 4 PMU events MFC after: 1 week (cherry picked from commit 278d6950943a9fec2bddb037b547c04a847c54ba) --- lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json | 82 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 828 +++++++++++++++ lib/libpmc/pmu-events/arch/x86/amdzen4/core.json | 122 +++ .../pmu-events/arch/x86/amdzen4/data-fabric.json | 1090 ++++++++++++++++++++ .../arch/x86/amdzen4/floating-point.json | 818 +++++++++++++++ .../arch/x86/amdzen4/memory-controller.json | 101 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/memory.json | 174 ++++ lib/libpmc/pmu-events/arch/x86/amdzen4/other.json | 138 +++ .../pmu-events/arch/x86/amdzen4/pipeline.json | 98 ++ .../pmu-events/arch/x86/amdzen4/recommended.json | 418 ++++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 11 files changed, 3871 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json new file mode 100644 index 000000000000..208c646c59ca --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json @@ -0,0 +1,82 @@ +[ + { + "EventName": "bp_l2_btb_correct", + "EventCode": "0x8b", + "BriefDescription": "L2 branch prediction overrides existing prediction (speculative)." + }, + { + "EventName": "bp_dyn_ind_pred", + "EventCode": "0x8e", + "BriefDescription": "Dynamic indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_de_redirect", + "EventCode": "0x91", + "BriefDescription": "Instruction decoder corrects the predicted target and resteers the branch predictor." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call/jump/return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns mispredicted. Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_ind_brch_instr", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_ret_msprd_brnch_instr_dir_msmtch", + "EventCode": "0x1c7", + "BriefDescription": "Retired branch instructions mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_uncond_brnch_instr_mispred", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect branch instructions mispredicted." + }, + { + "EventName": "ex_ret_uncond_brnch_instr", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json new file mode 100644 index 000000000000..e6d710cf3ce2 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -0,0 +1,828 @@ +[ + { + "EventName": "ls_mab_alloc.load_store_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", + "UMask": "0x3f" + }, + { + "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", + "UMask": "0x40" + }, + { + "EventName": "ls_mab_alloc.all_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", + "UMask": "0x7f" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_l2", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_ccx", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_dmnd_fills_from_sys.near_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_near", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_dmnd_fills_from_sys.far_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_far", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_dmnd_fills_from_sys.alternate_memories", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_dmnd_fills_from_sys.all", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_any_fills_from_sys.local_l2", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_any_fills_from_sys.local_ccx", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_any_fills_from_sys.local_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache or L3 cache or different L2 cache in the same CCX.", + "UMask": "0x03" + }, + { + "EventName": "ls_any_fills_from_sys.near_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_near", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_any_fills_from_sys.far_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_any_fills_from_sys.remote_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same or a different NUMA node.", + "UMask": "0x14" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_far", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.far_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either cache of another CCX, DRAM or MMIO when the address was in a different NUMA node (same or different socket).", + "UMask": "0x50" + }, + { + "EventName": "ls_any_fills_from_sys.all_dram_io", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.alternate_memories", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_any_fills_from_sys.all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_pref_instr_disp.prefetch", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchT0 (move data to all cache levels), T1 (move data to all cache levels except L1) and T2 (move data to all cache levels except L1 and L2).", + "UMask": "0x01" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_w", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchW (move data to L1 cache and mark it modifiable).", + "UMask": "0x02" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_nta", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchNTA (move data with minimum cache pollution i.e. non-temporal access).", + "UMask": "0x04" + }, + { + "EventName": "ls_pref_instr_disp.all", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of all types.", + "UMask": "0x07" + }, + { + "EventName": "ls_inef_sw_pref.data_pipe_sw_pf_dc_hit", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a data cache hit.", + "UMask": "0x01" + }, + { + "EventName": "ls_inef_sw_pref.mab_mch_cnt", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a match on an already allocated Miss Address Buffer (MAB).", + "UMask": "0x02" + }, + { + "EventName": "ls_inef_sw_pref.all", + "EventCode": "0x52", + "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "UMask": "0x03" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_l2", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_ccx", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_sw_pf_dc_fills.near_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_near", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_sw_pf_dc_fills.far_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_far", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_sw_pf_dc_fills.alternate_memories", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_sw_pf_dc_fills.all", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_l2", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_ccx", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_hw_pf_dc_fills.near_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_near", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_hw_pf_dc_fills.far_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_far", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_hw_pf_dc_fills.alternate_memories", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_hw_pf_dc_fills.all", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_alloc_mab_count", + "EventCode": "0x5f", + "BriefDescription": "In-flight L1 data cache misses i.e. Miss Address Buffer (MAB) allocations each cycle." + }, + { + "EventName": "l2_request_g1.group2", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of non-cacheable type (non-cached data and instructions reads, self-modifying code checks).", + "UMask": "0x01" + }, + { + "EventName": "l2_request_g1.l2_hw_pf", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: from hardware prefetchers to prefetch directly into L2 (hit or miss).", + "UMask": "0x02" + }, + { + "EventName": "l2_request_g1.prefetch_l2_cmd", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: prefetch directly into L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_request_g1.change_to_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache state change to writable, check L2 for current state.", + "UMask": "0x08" + }, + { + "EventName": "l2_request_g1.cacheable_ic_read", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: instruction cache reads.", + "UMask": "0x10" + }, + { + "EventName": "l2_request_g1.ls_rd_blk_c_s", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache shared reads.", + "UMask": "0x20" + }, + { + "EventName": "l2_request_g1.rd_blk_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache stores.", + "UMask": "0x40" + }, + { + "EventName": "l2_request_g1.rd_blk_l", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache reads including hardware and software prefetch.", + "UMask": "0x80" + }, + { + "EventName": "l2_request_g1.all_dc", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types from L1 data cache (including prefetches).", + "UMask": "0xe8" + }, + { + "EventName": "l2_request_g1.all_no_prefetch", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types not including prefetches.", + "UMask": "0xf9" + }, + { + "EventName": "l2_request_g1.all", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_miss", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache request miss in L2.", + "UMask": "0x01" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit non-modifiable line in L2.", + "UMask": "0x02" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit modifiable line in L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_cache_req_stat.ic_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache hits.", + "UMask": "0x06" + }, + { + "EventName": "l2_cache_req_stat.ic_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache access.", + "UMask": "0x07" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_c", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache request miss in L2.", + "UMask": "0x08" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_miss_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache misses.", + "UMask": "0x09" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache store or state change hit in L2.", + "UMask": "0x10" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit non-modifiable line in L2.", + "UMask": "0x20" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit modifiable line in L2.", + "UMask": "0x40" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_cs", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache shared read hit in L2.", + "UMask": "0x80" + }, + { + "EventName": "l2_cache_req_stat.dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache hits.", + "UMask": "0xf0" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache hits.", + "UMask": "0xf6" + }, + { + "EventName": "l2_cache_req_stat.dc_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache access.", + "UMask": "0xf8" + }, + { + "EventName": "l2_cache_req_stat.all", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache access.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_hit_l2.l2_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_hit_l2.l2_next_line", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_hit_l2.l2_up_down", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_hit_l2.l2_burst", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_hit_l2.l2_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stride (fetch additional lines into L2 cache when each access is at a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_hit_l2.l1_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_hit_l2.l1_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_hit_l2.l1_region", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_hit_l2.all", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_next_line", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_up_down", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_burst", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_region", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.all", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_next_line", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_up_down", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_burst", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_region", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_l3.all", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of all types.", + "UMask": "0xff" + }, + { + "EventName": "ic_cache_fill_l2", + "EventCode": "0x82", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from the L2 cache." + }, + { + "EventName": "ic_cache_fill_sys", + "EventCode": "0x83", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from system memory or another cache." + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_hit", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache hits.", + "UMask": "0x07" + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_miss", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache misses.", + "UMask": "0x18" + }, + { + "EventName": "ic_tag_hit_miss.all_instruction_cache_accesses", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache accesses of all types.", + "UMask": "0x1f" + }, + { + "EventName": "op_cache_hit_miss.op_cache_hit", + "EventCode": "0x28f", + "BriefDescription": "Op cache hits.", + "UMask": "0x03" + }, + { + "EventName": "op_cache_hit_miss.op_cache_miss", + "EventCode": "0x28f", + "BriefDescription": "Op cache misses.", + "UMask": "0x04" + }, + { + "EventName": "op_cache_hit_miss.all_op_cache_accesses", + "EventCode": "0x28f", + "BriefDescription": "Op cache accesses of all types.", + "UMask": "0x07" + }, + { + "EventName": "l3_lookup_state.l3_miss", + "EventCode": "0x04", + "BriefDescription": "L3 cache misses.", + "UMask": "0x01", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.l3_hit", + "EventCode": "0x04", + "BriefDescription": "L3 cache hits.", + "UMask": "0xfe", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.all_coherent_accesses_to_l3", + "EventCode": "0x04", + "BriefDescription": "L3 cache requests for all coherent accesses.", + "UMask": "0xff", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.near_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.far_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.all", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.near_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.far_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.all", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json new file mode 100644 index 000000000000..a56a41828bd4 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json @@ -0,0 +1,122 @@ +[ + { + "EventName": "ls_locks.bus_lock", + "EventCode": "0x25", + "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "UMask": "0x01" + }, + { + "EventName": "ls_ret_cl_flush", + "EventCode": "0x26", + "BriefDescription": "Retired CLFLUSH instructions." + }, + { + "EventName": "ls_ret_cpuid", + "EventCode": "0x27", + "BriefDescription": "Retired CPUID instructions." + }, + { + "EventName": "ls_smi_rx", + "EventCode": "0x2b", + "BriefDescription": "SMIs received." + }, + { + "EventName": "ls_int_taken", + "EventCode": "0x2c", + "BriefDescription": "Interrupts taken." + }, + { + "EventName": "ls_not_halted_cyc", *** 2984 LINES SKIPPED *** From nobody Sat Apr 27 05:49:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRJZw1MZZz5HrxS; Sat, 27 Apr 2024 05:50: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 4VRJZw0hTGz58t0; Sat, 27 Apr 2024 05:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvLPDSkKxok/u+hjIco5SwUCioVwKdAtKD91mjBchP0=; b=bmATsT/eLrrJ73+7aDRmoetJr+v0gKopLO9nm8k0kdqMYCbEAiG21W7YPJurWYcmiSYiI4 I9bscOfIoF7TZJPbpHYOfe/oie5bpZqD3TXZQUtu7vIxnJIdegCSnd/zBKP+YGHWIeE3jg NU7nS3hWedXdGITGi6T5e8Xdr/TKKC6AmevPeu5OOFdUJWX+CNw6DSZ4tJydzaVEkBtGA/ rtNaaXBhj8DHQJq10US8LKDfLN6z5JdMHyG61ZbhonFEe7wCRXhrLm7ba4lt1qUL37/4/2 W7h7IRJ8ceyvWlBEFfHPYtA/8zvxwEC6As7/NBFMGfvjWOVm/55ZJRxvZ86W6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197000; a=rsa-sha256; cv=none; b=tkzwr2lmVmXKWQvhgTDhiKgjaFg/r/Bc6hARXNSlqM89QrVL0+bFhs5ECx7Y52lWoM4TQX +elUFJIcpBaYmIgCWumnplE3F12TLMxX+/xXa5Bc9hZlgkXdTCsYBXOCVfSw/EVCVdrADq 0pyhJA/2jrRUKRoqTbBAKehI7Ng2vuezZf5HVLghuQR/Mht367AMQRAOHVf2PNnq3UcRdY NIJQ+zBQwma9W+JXSk0GdJNhYpUzPzoGfOuNJwaHluA94XXjyWP4KstcCNrkmiYP17Lx6G BwT6psq1b7SAXjBgwdHm77IhPwpOny2nn5jyiM2Q4dac5+RkixMHEQCFXdhqOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvLPDSkKxok/u+hjIco5SwUCioVwKdAtKD91mjBchP0=; b=Y5oKIzzIaYM4FKFzi9/hJ435jy1p77guCiOUIGU06eLKAi64ySgT279//4wN0cDLPI5vA/ EgbKNFJxanjDHxUoteu72/NvmkIsc5THMXHm7SvKwzXJWMnTUK6m14kvYOQpLX59NSVAKH cK7OgV7+QukpTcDI9q2lHx72FO6UXR/+aa3YbWAdKYN318Z4iKKGFrbcGI7bZptO9hGTg/ dQrfWc3FkqaHBA5/woRBaFbaAt/dKV+JEgzEzRTzUtQigxZFIM/4Fy2w88iPnoH2VjRpHO 2h6XuUMRRXD30yuoYh4clEmGZ2BTR9YU7QoyOmgIS0bn9H/I5KIC46MFidYtEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJZw02pXzFDC; Sat, 27 Apr 2024 05:50: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 43R5nxqB000431; Sat, 27 Apr 2024 05:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5nxBt000428; Sat, 27 Apr 2024 05:49:59 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:49:59 GMT Message-Id: <202404270549.43R5nxBt000428@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: 8ca6066eb00f - stable/14 - i386: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ca6066eb00f8f03fe16ba041bd9827bf61c3939 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca6066eb00f8f03fe16ba041bd9827bf61c3939 commit 8ca6066eb00f8f03fe16ba041bd9827bf61c3939 Author: Gordon Bergling AuthorDate: 2024-04-20 12:13:33 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:49:27 +0000 i386: Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895) --- sys/i386/include/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index dae829b2c0f6..5aca9fb15181 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -91,7 +91,7 @@ __mbu(void) */ /* - * Always use lock prefixes. The result is slighly less optimal for + * Always use lock prefixes. The result is slightly less optimal for * UP systems, but it matters less now, and sometimes UP is emulated * over SMP. * From nobody Sat Apr 27 05:50:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRJZx3DRdz5Hs80; Sat, 27 Apr 2024 05:50: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 4VRJZx20j4z58fB; Sat, 27 Apr 2024 05:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Puni1LfPYw0YlHxGjt0GkIDidEmsz6510fvcfwXfb0=; b=MH80dxLa/VTWDQO/E1LBbQaRYkRqL3IwZRnfVIxJH22BE60TaZ8470nDhQDZwYvs8qLO/m /dwrLZSPCtsYrtqZqDGeajSgUJ+v1Mc1sGdWbNfHIwHWKWvX/vQ2U9P18FvVPEvd7pFMGV lY0vXxDhmInYveya4xSStjWsyCEsxvJaMATJXJhbvlNvkkgm98oMm9UjtnglqJOEEm0Lg1 pUhIWvxZk73gOMHILKmsRXRSqMbczIYux7zHRBDuzNkaOfWoLK45qdJ61Ogx10g/4Zi8ho r7AI/FKcoxGSLAXkkSmcc6VmXA5ST3ODr0XvHU0bOYRsZQsQqi6ejTNS3ziInA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197001; a=rsa-sha256; cv=none; b=v+oy7/FFHb6mY9JcIVkOXjKzYZfC1ZiOWE8VQwu9oiIG/sxOxUprmtj/+DPCnETAAQaL1J rAP4qZ1uw3LxN/QKf8QHETMlZgm1BHbPASCJhH+PeuMDeN4/Bho49C0JjQGziLUKChG28s pJ7EQvKeR9l00eWtr0MfwWclTj2p3J1uPienzpsmH0a4RBAR+/8Ze2US6OGQlv7SvKFmNz KIf260FDQoI2MhaK7XH8rVk9w8hu7tej1W5s6S0RNC+eeW1UKOVVhALGhr8aCtVODqrI+N FbPoETd8Urr7QsoYzuGBFA1OWTAdWbRIPo880q80nfhIwo99keC+2v3SLuCJdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Puni1LfPYw0YlHxGjt0GkIDidEmsz6510fvcfwXfb0=; b=tp0FQQK29+ROk1iNfhgepB2hlTUNyJkAP01PbE5Elx4hzhIUG0PYLD1fHz5yRrZ0KLdJGf d1rH91cVbT7qsV5QGySB5E/N3bBxnd8MlYkxTklDrFAoHUAhKQnWvW+PRWAyJhB5goQAGr /W95wo5/S2hgvMaiBoraDCmARsUnm00GgV+kwtn0i9284m2vfgBr9WGa6TFTjHfeolw4OL HQxMaNQUbHyClMuhWJGs5ZwMayH1Nmkd0tg3qtx4haHB4i3wyyVKwcz0DHqmsaFw1gVQon 1PMKJDCe19YR9+LGsnwk0A6Oyi7VG9wiXw27ZHTvsCgyvxKNMfGmo+DqDW0mmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJZx0bVZz1CsG; Sat, 27 Apr 2024 05:50: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 43R5o03p002200; Sat, 27 Apr 2024 05:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5o0gp002179; Sat, 27 Apr 2024 05:50:00 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:00 GMT Message-Id: <202404270550.43R5o0gp002179@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: 4f8ee76d2a33 - stable/14 - ds1307(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f8ee76d2a33ad09e5bf4453f3700e66e3947cec Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8ee76d2a33ad09e5bf4453f3700e66e3947cec commit 4f8ee76d2a33ad09e5bf4453f3700e66e3947cec Author: Gordon Bergling AuthorDate: 2024-04-20 12:14:21 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:49:47 +0000 ds1307(4): Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit fa3b320668ba6068014337bbbb05dbd39ac8dfb6) --- sys/dev/iicbus/rtc/ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c index cc232bae0e94..7c9d006b2146 100644 --- a/sys/dev/iicbus/rtc/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts) /* * If the chip is in AM/PM mode remember that. * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0, - * in slighly different positions. + * in slightly different positions. */ if (sc->chiptype == TYPE_EPSON_RX8035) ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24); From nobody Sat Apr 27 05:50:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRJbT6lc3z5HsHN; Sat, 27 Apr 2024 05:50: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 4VRJbT648Nz59W2; Sat, 27 Apr 2024 05:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhWnM62eMugRWZKGQHef2SX/pT5jhqgpSKiPRnao5Cc=; b=rEdijI8cjHSKYiwIqhZMK+UUgj4IfRF34f8SzIOItC8lLHshISzh27DeFvweJAV0sKJ62Z 11oZuQ8FWJndwEHm6AetpDpgdjUFic4fIKyOVf6fPhPDHYYIfo4EM8qgCbc/ZOrrUXtLov Nplv8dnx0+alOYDBFa7LgF1ZcTT+FJ6Dvi7DOTTEB3pDyizm+kLD3JNJsqV1MU3Uv/F//X 7LOXr7Gkowu/xT+udwNweti1pfY/rqTBEaPQBuFAgQEajWLNGk5TSudJ/vL8o/tctJXff4 zXF7BP4aZRrhfoybzQREMlm8GW9rO3v/fK0Lxis/7kCLvuDyM0AmoHOC2pYd+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197029; a=rsa-sha256; cv=none; b=On+uVsNhqQ0hQ1VIOnst7AzCRoQ834QZ81Et+7HVOW7fOj66dCFPZJNuh2fHq6jDBP/iex Cwq+D3OipNtNPTkLfDYdiMpN3rR/+CuNspss3EzDNnES+GV58opMzs6JWkTZxF3nf1fzpe TtGjCYg8VcB451yj7HZK/x4rdCwQpytbb7ldo5Om7Bi3GA7HEusFJcaHzexL2faP/ACzi3 G48StlxDAI6m7zK1bo3+jP8zG8uiEXJ0KHk0zXrKC0cekAKn/+Wb+7qMSzvII1+pyr0p6u H8sN7pLmCylBitaVR9U0EUqKK8yjONlxBti+bZ5F+m7OcZmw+oEkBDyCsYCVGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhWnM62eMugRWZKGQHef2SX/pT5jhqgpSKiPRnao5Cc=; b=B/R1lbfK8oqTcMN5Tdx+F2CrLgf+4kIeyunSx6xDrNmTe5tBvTvziTVKwDQURGeNfQf9c3 QCTiUitpkuBvAHyr7CbBim2YHMYkZxlVdtE92C/t8gZK+0O0UHSrsq+cqFHZjM16BX+R8/ ezaFsLbMy0XcP/S6oLKqN7joQKONEmPoap0n9Fzk7k3usr4t8inRgkWHip5CXoB6H6Htad 6W5TIvuXYfnRWTAGt4xPTB/MxL0fgkai1jWRc01Oe5IjcaggvVBoG3iYY1c743cE6rVunA HLW77d4xh80pG8lmKNsVqjYxKIsZqZWHsljO2aau07AoDhGkMJkACw6Vs5lb4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJbT4kdJzFB1; Sat, 27 Apr 2024 05:50: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 43R5oTsc009290; Sat, 27 Apr 2024 05:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5oTRe009287; Sat, 27 Apr 2024 05:50:29 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:29 GMT Message-Id: <202404270550.43R5oTRe009287@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: 3f8208145440 - stable/13 - i386: 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3f8208145440e7f30e07dcc255fcd864481d3612 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3f8208145440e7f30e07dcc255fcd864481d3612 commit 3f8208145440e7f30e07dcc255fcd864481d3612 Author: Gordon Bergling AuthorDate: 2024-04-20 12:13:33 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:50:11 +0000 i386: Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895) --- sys/i386/include/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 99ffb41aef90..96fcfcaed2c7 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -131,7 +131,7 @@ void atomic_subtract_64(volatile uint64_t *, uint64_t); #else /* !__GNUCLIKE_ASM */ /* - * Always use lock prefixes. The result is slighly less optimal for + * Always use lock prefixes. The result is slightly less optimal for * UP systems, but it matters less now, and sometimes UP is emulated * over SMP. * From nobody Sat Apr 27 05:50:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRJbW1M9Lz5HsMq; Sat, 27 Apr 2024 05:50: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 4VRJbV6KC0z3wc7; Sat, 27 Apr 2024 05:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1vLi/UO+B9U/gdj9MLGvb5A3XtPrr5nD2lB9lt7298=; b=vnysWWxknhJP5eaGDmo9CP2+GiMe5MxSeWqAuXiWdD1Vuu5YkXO1VdE0vSFyolLjuUAtQS XYBN87BEg433hDMSkvy7JK2Eq2xPciIj5plr3TYtMy5FAQYdR7qNNbbM9nb5+dTGNNr3WN HLRYmboi/nDXenzniIQ6gMUJPOaR3wXUBJPFN3YDJEQzBUifyrPLg1ZvmxIsFGRdPsde/8 LAVvKDHQEShYbkHLQq972xeCUHzaXV0YDAWjWWrZGKyj/B2hLgre5hBnZ18ZVH2U/kuQgD f2Dvs3Yc2sjWrmNzQrbZqH9DnOPCKy7mRRcqNyVkLFpJMu3AahaAlKqA1f3/fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197030; a=rsa-sha256; cv=none; b=CsYsWhrkVV1go4UB79qioQx0l8hHa3I7Jh+GnvWoTX7keMfFoimh3n5nOQEuUt2axN7K2g C8LbN2P0bgNA0lzZibHaNKEcWw9QFgk9qCqVWAaSckcADtGyzfM469j5KnNZcm4eiaFy+o 9UWiF0Vd3fHqsJuHaJWjKl/zpSVzkmjVrJ1CVmSdsREUnxahpxLvWh5/SuS+yJeBpsaBT+ hcA82U4ozjf6VIA6f6sIYJAjueZ8O3E3r69ctFK6CJvdsttzFoc0i7cm0eEHdkqzmImldR LTo36jh69G/CsPstxKOzjL447Vcw9lmFGnPQNXHmtbsGWyrvy47VPMsP3XwB/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=1714197030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1vLi/UO+B9U/gdj9MLGvb5A3XtPrr5nD2lB9lt7298=; b=dEN3hWqhPl4HsBeVe62imOMBd69mTDIfZYlNytZjohPJjMbX365x4ZUO0kgGHop86z4G8N 9x1UMxwqOHpyWQYouOaFRXpxn+xFvoUjgsf1PukZcmSZCJR7YLstwQIWKLXxCi60hVTO3X gQcfSUOUbbtBERxmkf5j/OrBburlib1HPMubkF5VtR7bkIscvEsdtl2Lrsh2s0y/hsgL5g EUFn9DoVwVDQIBtYf/B4Zcmt0POVFo+jIHCvCXpN+j3tZFwpDZVIMl/m3Gjo44TJJDv6BH Y5eIwkHKnAH+8YchUDpzbpTC9KzlEotKSLj8lswmXbBdRQUXgTfP8Ak1WfJvQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJbV5mbKz1CsH; Sat, 27 Apr 2024 05:50: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 43R5oU6N009346; Sat, 27 Apr 2024 05:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5oU6w009343; Sat, 27 Apr 2024 05:50:30 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:30 GMT Message-Id: <202404270550.43R5oU6w009343@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: 5da0bdbf28b1 - stable/13 - ds1307(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f commit 5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f Author: Gordon Bergling AuthorDate: 2024-04-20 12:14:21 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:50:20 +0000 ds1307(4): Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit fa3b320668ba6068014337bbbb05dbd39ac8dfb6) --- sys/dev/iicbus/ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/ds1307.c index 8fe425f40a4a..abc66779494c 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/ds1307.c @@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts) /* * If the chip is in AM/PM mode remember that. * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0, - * in slighly different positions. + * in slightly different positions. */ if (sc->chiptype == TYPE_EPSON_RX8035) ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24); From nobody Sat Apr 27 07:07:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRLJm67nbz5J103; Sat, 27 Apr 2024 07:07: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 4VRLJm5dhkz44bK; Sat, 27 Apr 2024 07:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqzyDkd8hDOlf3hUGytRx1PpXJnbZZH4D3KMhufHPYQ=; b=bvVNKsaspaMmA4oQqtzXSGh613f6SqqazCZ8+yOiuo++C/C/vitgW4kvuB3KroeKYkrvHX gkpE7Q+LnW1ngRwwaIvsxYtCa08YCojwvLxKpl6sKOUMVP10B3OrwktA08NoU71roGPRpZ +bqKoN7B9qtqlTT4XZRS4cxaOop/ZOGDXB6u7gHmySoUuXl/PIpywrmOOI4U/RWJDHMnt+ ngE8o5ercwVwwqeXWx6MNweGbh9Obb5XmxqgOf9J0HyXbnj/9yic6uEPRfU5oGoVGDPJKP UBKcEqbArHcqzhpikmSxC4Q4CyOJVbNIvFvKzL4kIURaucs8Qt0mQZLSY1QSMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714201672; a=rsa-sha256; cv=none; b=jdWErrhbv74mjgsz8Ecw5FMZ545KUgrg8MhC0wGjI1GGV3nz3noS+GgKoanl5szsbyJCLZ RQfFdbYtJOk5k5yAdipNkArgp8oPfNjQhOOfCJ3WJxGWtPDvoAs5IG5UGIUqarMd70oiej 53v4g3jMI4tc9VVZcLel16ZiKPagZtey8ChNHZVwAGSWOW4yh3CEYp90qum7rSYdvt2L7y QOXiYYITcdi99MsqulM8bjMXht/rjukHgLsYhAezLpNrVewEX9PfoOpZ/1xtnAzTYU5ZTJ CVjcaIbrUZjowGhEZ6ifKFnKU003EhfEvokPLYQcJTI1aYEzeLnzt/5BE9UvtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqzyDkd8hDOlf3hUGytRx1PpXJnbZZH4D3KMhufHPYQ=; b=fyUjmRDiT0GyABMbuV1KWn0aw0W2Ag9lTwtTYNtffmKdvhtc6xEuLz/a5PM4oP76v9Imht 18O3E9ab4w8Ap9IRm4+HGQh5J8hIfEq7m12Zvg/J8hrauvrNjy5Nen4piKFUAo0Gpi31Vt nAOMFapj2sk9SSkW1rdp+R2tTJEcrZbcpmQ9DE9tCaWScfG4Iw6wGyuuPpegAg8NckA4nx AqQD41luQSnN4l56EUL7UMrwlHArDVnRF405SauGYJ+NYkirWWrgUfU1i9h1WpyVBRjfP+ L06pTH7JjzEFHS+WDM5Ajm7G/IRWqChsq8ZlwCROFE+YnrfbWSl0zCaLOS7ssg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRLJm59tzzGHt; Sat, 27 Apr 2024 07:07: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 43R77qwa036768; Sat, 27 Apr 2024 07:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R77qqE036765; Sat, 27 Apr 2024 07:07:52 GMT (envelope-from git) Date: Sat, 27 Apr 2024 07:07:52 GMT Message-Id: <202404270707.43R77qqE036765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 5132cb42607b - stable/14 - MFV: less: Do not trust st_size if it equals zero List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d commit 5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d Author: Ricardo Branco AuthorDate: 2024-04-24 05:29:46 +0000 Commit: Xin LI CommitDate: 2024-04-27 07:07:32 +0000 MFV: less: Do not trust st_size if it equals zero This is a smaller version of upstream 1fafd968b48e5cea6c85f126d77071a8de707a55 to address the issue that less not being able to operate on files residing in pseudo-filesystems that advertize a zero size value. PR: bin/276133 (cherry picked from commit cae336280b0d7ad3d49788c5fc0986f91328eb50) --- contrib/less/ch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fd53b2d66e38..51045438a296 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -700,7 +700,6 @@ public void ch_flush(void) ch_block = 0; /* ch_fpos / LBUFSIZE; */ ch_offset = 0; /* ch_fpos % LBUFSIZE; */ -#if HAVE_PROCFS /* * This is a kludge to workaround a Linux kernel bug: files in * /proc have a size of 0 according to fstat() but have readable @@ -709,17 +708,9 @@ public void ch_flush(void) */ if (ch_fsize == 0) { - struct statfs st; - if (fstatfs(ch_file, &st) == 0) - { - if (st.f_type == PROC_SUPER_MAGIC) - { - ch_fsize = NULL_POSITION; - ch_flags &= ~CH_CANSEEK; - } - } + ch_fsize = NULL_POSITION; + ch_flags &= ~CH_CANSEEK; } -#endif if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) { From nobody Sat Apr 27 07:08:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRLKS2GMLz5J0xB; Sat, 27 Apr 2024 07:08: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 4VRLKS0c49z44Tv; Sat, 27 Apr 2024 07:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6oHJPF9IPfYc6Aa3iFsZ99jKYnJJA8C+3gO4wOhotM=; b=aenj40V53K7PRQ5loxHfcZxsgRlbGuvbSThvaRCpO94lzIhVI0cuY9rXWBzGoDcTsHY25j u0TMhg9LFNX/h3FHImBzWYADqrZXs58PctJp6zcEnQw1o056O1+u+GvG/LU3XZ75X+J4cL iYP5NZXGF5+ifEsbmSrCoW+KfC8IoNZa5nbDe7VWqTyoUdU4bAc+o75qxL6WQ6YteeSFEc xKLH5sOa8ebgYpCcUoNANGCc55Ra7bvRq/9/Ws5+SgJ1zRwi1SZ/Y+RcYl32hwzbDFk8yY QVaNyP39zu0TZHYWFELoz/8VQ8kd3lOxSIfcuttKWEevyRwrSLBYADVB4DFzKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714201708; a=rsa-sha256; cv=none; b=L3L+9qUd5ZOTYyixpul//qYXEfEShAkSExKy3IrTeIo1lkTD0SKH0wZJ5pRQefW6gbzgBv WaJrl5mZH09hnmHnub7YtKXYuo7VohkkrPvHbpt4/rCv+Qv/ZcT1Yisbj5XZUVWyd6popv pOG/2jQ71qR7bsKW5RxD8Nssysm6U8wge1Me7Q2nB8N6q2ILWEbPLuUqr7BeksvTX/rngB plbl4G8oE7Vr24hYeYT625M6Lre37JMaSR52gA2zoMMB9YaNQfgg2pfIOpMOt8hJN5JLy0 2mUMnpjuCpUbHPUGu7LvA2e32H+XKHcqQKf1ijODOKSRRWsTsAn1mYehEDROgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6oHJPF9IPfYc6Aa3iFsZ99jKYnJJA8C+3gO4wOhotM=; b=JFfVVGkt1ugDJdWgYnMl+w4DSRY3rxutJgfx+D+UV+DBXINqwqg3agmPn14jOxg+JPQsHr U65rKtRa2pluQ/C+xMn2LzS51blX2bllyojKyUOr9vzliBAULofR5RDDWjXifvog6jBYeM Wg8f6OvKBxiF/kzw2HB3GzJq5hyHC7XklIL6asi/8wwkS0cDSg+QwSjIEstApUTBCkSir6 2lwCcPFMMMVVjCxeX97Whd/Pho1rhVBmsPoj6E4eyCGx4TK7V6Y2RiEbTnEDm18nmZKCUr RVYgP9VAfH8P6TSL+lcuquMvTVdOW/PIIpQ/lgv5l5BO3zQqDr0V4rb+0UhUoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRLKR6SBVzGvK; Sat, 27 Apr 2024 07:08: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 43R78Rxb037010; Sat, 27 Apr 2024 07:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R78ROD037007; Sat, 27 Apr 2024 07:08:27 GMT (envelope-from git) Date: Sat, 27 Apr 2024 07:08:27 GMT Message-Id: <202404270708.43R78ROD037007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 302d0acea8a0 - stable/13 - MFV: less: Do not trust st_size if it equals zero List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 commit 302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 Author: Ricardo Branco AuthorDate: 2024-04-24 05:29:46 +0000 Commit: Xin LI CommitDate: 2024-04-27 07:08:17 +0000 MFV: less: Do not trust st_size if it equals zero This is a smaller version of upstream 1fafd968b48e5cea6c85f126d77071a8de707a55 to address the issue that less not being able to operate on files residing in pseudo-filesystems that advertize a zero size value. PR: bin/276133 (cherry picked from commit cae336280b0d7ad3d49788c5fc0986f91328eb50) --- contrib/less/ch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fd53b2d66e38..51045438a296 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -700,7 +700,6 @@ public void ch_flush(void) ch_block = 0; /* ch_fpos / LBUFSIZE; */ ch_offset = 0; /* ch_fpos % LBUFSIZE; */ -#if HAVE_PROCFS /* * This is a kludge to workaround a Linux kernel bug: files in * /proc have a size of 0 according to fstat() but have readable @@ -709,17 +708,9 @@ public void ch_flush(void) */ if (ch_fsize == 0) { - struct statfs st; - if (fstatfs(ch_file, &st) == 0) - { - if (st.f_type == PROC_SUPER_MAGIC) - { - ch_fsize = NULL_POSITION; - ch_flags &= ~CH_CANSEEK; - } - } + ch_fsize = NULL_POSITION; + ch_flags &= ~CH_CANSEEK; } -#endif if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) { From nobody Sat Apr 27 08:50:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRNbK6wSyz5J9Vx; Sat, 27 Apr 2024 08: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 4VRNbK3glmz4G7r; Sat, 27 Apr 2024 08: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=1714207837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fM8yPE6dQkkUFK7kDCmnosxhVvEhdya3kvg+/KSuGrA=; b=A0PX0chgA0TXKbZ8NtdxZnmUb0zGSUCfFY3GPOzhNZbgf2NlzxmXHxCwEbQ5Ptf3aJtet3 Jv7NhypCKvxWgVWy8U0xVIPMLZR+U/RHvWgkb962uwQ+WG5DccUIUUqCPFOqKI1o8/jdAF uAQ3VrtBm3S3DrQAUg8nZh8fF+gl+kBekF1LaZrsmhSSL+9iNrFlWpo+eT1wzzcbuqxaU2 l2kU/TS/mNASt/ToXELiPrLNnDs+ZKKaYowoms0Q/Vuo1P1aTd1guEmjrfcEWfwAHalEKe dWmm0O8Wz4iEJJOoxGKTQH9cWCjvAjdQ1pp7suogiJnSXHUS5+XGMNngVS9AQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714207837; a=rsa-sha256; cv=none; b=DQ+Mgy5Qu0Jh51nZnMr14R1w61IjgaDl9cd8Dd++cCO2UuHEsHwp0OSASWToaR6FOAYdid x31W2d5CrwuAFPtBRhG2qpwhhpReuI7zVxpj5KPzF5xXwNkvDn9VKAqCMxNKzKfpequavK ILk3JSIib5Fhb6vuqh+1alCDiRiKK+X9AZjh/k8fjfd8N9nARoLkJHWF5o5VdprO5pbkr0 5Pq99A7kpwm0nEm3auhBgkZM1rvUeFMylOfQyQ1Ezhs/wFTyvJHrE0AxuoEbJNwcYXpzkZ u2k8czmr48QU9gjbhI7elo3UxoKkrReai+Vx7fALYjjvJudYZmKdTr5XYzSFUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714207837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fM8yPE6dQkkUFK7kDCmnosxhVvEhdya3kvg+/KSuGrA=; b=HQ9BZU9WlUnJK8JWP+GxRmHUtbWjeBVnARWq/RL6lH2g2Bu7/D/Ex8VliWY5Q5c1bVehPa /H/jOHdTQzEqT9ONcmrShdQIn1BqDYgXILlQOWF+cQRuyyEVsqbUV2+owoPs8Ia28lVPyj AC2nDFWEUJEckE8fMur/H1VFqBgPqiWwMdIh+Vi4dERE8eieIxer3o0yfcIEjeMAiKjZ3M Q88MybyJrDf4goS6f3itcuTZUyg0wml00+xWEKx17Lfp4GLssC5DvYS5eV+SzZo5YYkEUh UdsbekYdgs6n2ghvaRNtvzSAQe4obLmIxITyWfmdWtPMw9Wc8CCFvtg+plEeVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRNbK3HkYzJj2; Sat, 27 Apr 2024 08: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 43R8obCC014582; Sat, 27 Apr 2024 08: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 43R8obwS014578; Sat, 27 Apr 2024 08:50:37 GMT (envelope-from git) Date: Sat, 27 Apr 2024 08:50:37 GMT Message-Id: <202404270850.43R8obwS014578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 9718d4ab9938 - main - snd_hdspe(4): Recognize newer firmware's PCI vendor id. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9718d4ab99386918f5b5c207c58289eaade20623 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=9718d4ab99386918f5b5c207c58289eaade20623 commit 9718d4ab99386918f5b5c207c58289eaade20623 Author: Florian Walpen AuthorDate: 2024-04-27 08:48:37 +0000 Commit: Ruslan Bukin CommitDate: 2024-04-27 08:48:37 +0000 snd_hdspe(4): Recognize newer firmware's PCI vendor id. At least for HDSPe RayDAT cards, newer firmware comes with RME's own PCI vendor id instead of the Xilinx one. Other HDSPe cards are probably also affected. Update snd_hdspe(4) to recognize both the old Xilinx and the new RME vendor ids. Differential Revision: https://reviews.freebsd.org/D44978 MFC after: 1 day --- sys/dev/sound/pci/hdspe.c | 3 ++- sys/dev/sound/pci/hdspe.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 0773362f2bc3..f9c36df359e3 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -474,7 +474,8 @@ hdspe_probe(device_t dev) { uint32_t rev; - if (pci_get_vendor(dev) == PCI_VENDOR_XILINX && + if ((pci_get_vendor(dev) == PCI_VENDOR_XILINX || + pci_get_vendor(dev) == PCI_VENDOR_RME) && pci_get_device(dev) == PCI_DEVICE_XILINX_HDSPE) { rev = pci_get_revid(dev); switch (rev) { diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index de20462170e7..daffeb4ddebc 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -28,6 +28,7 @@ */ #define PCI_VENDOR_XILINX 0x10ee +#define PCI_VENDOR_RME 0x1d18 /* Newer firmware versions. */ #define PCI_DEVICE_XILINX_HDSPE 0x3fc6 /* AIO, MADI, AES, RayDAT */ #define PCI_CLASS_REVISION 0x08 #define PCI_REVISION_AIO 212 From nobody Sat Apr 27 11:21:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRRz52ZxPz5JPhp; Sat, 27 Apr 2024 11:22:57 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRRz35YGLz4Y17; Sat, 27 Apr 2024 11:22:55 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=leidinger.net header.s=outgoing-alex header.b="VXbB1H/X"; dmarc=pass (policy=quarantine) header.from=leidinger.net; spf=pass (mx1.freebsd.org: domain of Alexander@Leidinger.net designates 89.238.82.207 as permitted sender) smtp.mailfrom=Alexander@Leidinger.net List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1714216957; 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=2LioOmscApLeVeTAh6LCfYdEn8EXzLLd2puFfr2bB/o=; b=VXbB1H/X+ykLpfLotc05VoDmQRS+bOUI7KUjttJDD+n0NQHpcwXdrlCRr0BNQYVC4C0ykM VqIftVx7AmqTlnW9B7lUcPqWj19mMql0Y6rRVa5C7KmSVabVVnpf8DjkVDtXNjmCinIJxR A4zb2eiSkv4kOFuIJnXF/hjWLcbi1MnDuOzH0u14rWc00p32NbacArmO31rnFrI0CfrQMo KujRHtKiWSXU1JZP/jSwfSR6J26ezitOajvjgvO6K2ZVpnjW+hC8WRwDdTIu3R1uxQFqvx s0FmA9/n7sdNd9drY1fpOQbBWs3XhYF+rIlYX2kLUZvOMiRtHAqlvfheryEmJw== Date: Sat, 27 Apr 2024 13:21:42 +0200 From: Alexander Leidinger To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ca63710d3668 - main - linux: ignore setsockopt(IPV6_RECVERR) In-Reply-To: <202404230452.43N4qiLN063717@gitrepo.freebsd.org> References: <202404230452.43N4qiLN063717@gitrepo.freebsd.org> Message-ID: <83548d055cfcd19ac14de1a91507d73e@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_05fe25e9b3ac8b5e04a65dbe171b49d8"; micalg=pgp-sha256 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.09 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.990]; DMARC_POLICY_ALLOW(-0.50)[leidinger.net,quarantine]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_DKIM_ALLOW(-0.20)[leidinger.net:s=outgoing-alex]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE]; HAS_ORG_HEADER(0.00)[]; DKIM_TRACE(0.00)[leidinger.net:+]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[] X-Rspamd-Queue-Id: 4VRRz35YGLz4Y17 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_05fe25e9b3ac8b5e04a65dbe171b49d8 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Am 2024-04-23 06:52, schrieb Warner Losh: > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ca63710d3668cf6f3cb4faf065d8b4eeffa028ad > > commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad > Author: Lexi Winter > AuthorDate: 2024-04-22 21:58:11 +0000 > Commit: Warner Losh > CommitDate: 2024-04-23 04:36:34 +0000 > > linux: ignore setsockopt(IPV6_RECVERR) > Add support for ignoring IPV6_RECVERR, controlled by the same > sysctl. > This fixes DNS in Linux when using IPv6 resolvers. And all applications which depend upon a working DNS in an IPv6 enabled system (e.g. biology/linux-foldingathome started to work again for me). Any MFC target for this? Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_05fe25e9b3ac8b5e04a65dbe171b49d8 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmYs39UACgkQEg2wmwP4 2IY77RAAm/fXOs73/r3ENuoFEqLWupXB3SFsQeI/h/CPcFJogGVBgBoVeLT9dARE yOnzeb4PuhU7bEjBJCJn1flVBrCyaRxE4yJgXe395g+1HoxJFUXHZ9Ed9LVj50fF LpVaiITa4AYvWDWYPcDZHcp/lgTXdNzbv/XZrgV/y4Q79Tn1WbNcgMGQcUeYqwwu STzIfBecYbA8shI0f9i7Lqdp/IxD5daDs2illQJRhODUZDGynKc6oreysBjTWVZz ouMO9RMoNQXaCKKV+AAmA+x+bFRLyNb50ArhPXT0jQPhMIMCsiq7UlWZnOjeyQPF XNdYu+94JXS0lTZaubARwU4j5r1fz63QsrJVAF2DoWtzcmQ3lq3y8j21Q92cnAKl 2OW2h/4n2vdyd5m85zHRvpwf41h5mnqvSX5WirsezfcsueOl0xreD5kMgZUTZmDV SaXB8aeLeJ+T8OeBZX2VFdv4nXJbQoqvYbl8K8Kvu3I2XwsJ+7n8vzaKC1yLqhrV sX8XV97po7dJBBv+c8nsx/3SSlFVB/5cO/E0iQ9DkJiruPwy11YHbz8N8BwhfNOr dQTQtfYxLjqWOTHZFowXdiUt0757r6I6AxpAFAtxWqmyMR1+xv3UM5rJksKJ3nIf 9x6wFmBLFlicrLTiYk1piFmRHRu1FqAQ6ySTqwfPadua5Tb2DP8= =Ymvt -----END PGP SIGNATURE----- --=_05fe25e9b3ac8b5e04a65dbe171b49d8-- From nobody Sat Apr 27 13:02:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRVBY4MYnz5J4Wn for ; Sat, 27 Apr 2024 13:03:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (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 4VRVBX4wzgz4jKd for ; Sat, 27 Apr 2024 13:03:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-56e56ee8d5cso3908459a12.2 for ; Sat, 27 Apr 2024 06:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1714222977; x=1714827777; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ez8oU6KEhI+VJvjScZ6PN2TBAw/TCDpkwrcog2vec3c=; b=Vf1GoqPvbbjBCQmo2eOrmdQE4UpeKA1j9ukVJ6LRUnROImRYF/0gORJKJda18ZRxXR VGAX1j+6KF46UlkEcHs2w7hliSS5XgwJeEE5TfjYb0WobCoiL9yjdqJ32zihrUTRYQkS nnWrEI3HzOgEE1ZIEzZ9hehFTlce+U5RvkPCEHTKY8bYxuFQPJiKBzKWDiXF1myBVaXi owzcSOITAF9XyFqmXvApA6KcgYJhce2HQz7O/iXy69yh51suicjQqnM5d9and5HnXMXf cezANqMreWLDh62puXkc8IGnR7v3KmdRltCgAC0Z/k/D/ZQBtdwKtvn63cgVrMwfWpJS uWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714222977; x=1714827777; 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=ez8oU6KEhI+VJvjScZ6PN2TBAw/TCDpkwrcog2vec3c=; b=O52KE3fS9ZPxH28vGdzeAwoQ2P4nKN1OwhHPVBuOYz0x+MOuLA3OhH5DdyM4sK2cUQ bujA25hnggNjdtJ2OhMnIaJ/zFasSZhAEQQC9Ur2RwmVgwmmkc8Qon65MsgLmef4zsEg YYmtExqoM8PGBF76t65rA8tWj+hQxM7FxG51O/N7E6kahk3aQWIg8P52mSTlnvJPc0GJ 2xNFiM6KngjYOb1U8kc81xCSaCDRAMnvLGfsHQVm1LCYfR6VGaYeKNAuWRI9gVtovS8d h8EsMLH3S3L1SzUzVC1TpmuC/7nCKeyTGeH9JHpgqPpk3KTR9K1/pmWLGSrpCpgK0G7m gxYQ== X-Forwarded-Encrypted: i=1; AJvYcCWcALQ4D2t4+u5MXZCRL+o9LPa5mPeexxOQ0rW4MlPyGJCmMwAkZk+EsDoLby4ciiw/5x3j6SlaXvC2Um+C0a6+yMvMyjMiFAs/Or2FY38T X-Gm-Message-State: AOJu0YzFzkIJwTvPmJOzrBLoqF9If7jiQwPBlqNQXLxz5yqfeq8XMye+ 8qcsOPO0wktf+ZqUwk1WMM2CMRXGuLi0JmuE4T0mlq/ffH3ZnccdUPWSRGMw8JAPsVJTEH0aRL4 x1DL8wAx0wby8EfTioCDMguj5YAnps/tIJXBkiw== X-Google-Smtp-Source: AGHT+IHUEOSiaZ/qmUgaxpKrBFnPuIMelkZXNzSy2V9V94PiLtP0B5bRr48AU/p8v3u8ZGhFo9Gsyz9/ecEs6RfFmow= X-Received: by 2002:a17:906:3bd5:b0:a55:3488:f730 with SMTP id v21-20020a1709063bd500b00a553488f730mr3877853ejf.31.1714222977151; Sat, 27 Apr 2024 06:02:57 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404230452.43N4qiLN063717@gitrepo.freebsd.org> <83548d055cfcd19ac14de1a91507d73e@Leidinger.net> In-Reply-To: <83548d055cfcd19ac14de1a91507d73e@Leidinger.net> From: Warner Losh Date: Sat, 27 Apr 2024 07:02:45 -0600 Message-ID: Subject: Re: git: ca63710d3668 - main - linux: ignore setsockopt(IPV6_RECVERR) To: Alexander Leidinger Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009e92b6061713a3ee" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VRVBX4wzgz4jKd --0000000000009e92b6061713a3ee Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Apr 27, 2024 at 5:22=E2=80=AFAM Alexander Leidinger wrote: > Am 2024-04-23 06:52, schrieb Warner Losh: > > The branch main has been updated by imp: > > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=3Dca63710d3668cf6f3cb4faf065d8b4e= effa028ad > > > > commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad > > Author: Lexi Winter > > AuthorDate: 2024-04-22 21:58:11 +0000 > > Commit: Warner Losh > > CommitDate: 2024-04-23 04:36:34 +0000 > > > > linux: ignore setsockopt(IPV6_RECVERR) > > > Add support for ignoring IPV6_RECVERR, controlled by the same > > sysctl. > > This fixes DNS in Linux when using IPv6 resolvers. > > And all applications which depend upon a working DNS in an IPv6 enabled > system (e.g. biology/linux-foldingathome started to work again for me). > > Any MFC target for this? > I'll merge this now. I'd tagged it as mfc in the pull request. Warner --0000000000009e92b6061713a3ee Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Apr 27, 2024 at 5:22=E2=80=AF= AM Alexander Leidinger <Alexa= nder@leidinger.net> wrote:
Am 2024-04-23 06:52, schrieb Warner Losh:
> The branch main has been updated by imp:
>
> URL:
> https://cgit.= FreeBSD.org/src/commit/?id=3Dca63710d3668cf6f3cb4faf065d8b4eeffa028ad >
> commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad
> Author:=C2=A0 =C2=A0 =C2=A0Lexi Winter <lexi@le-Fay.ORG>
> AuthorDate: 2024-04-22 21:58:11 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-04-23 04:36:34 +0000
>
>=C2=A0 =C2=A0 =C2=A0linux: ignore setsockopt(IPV6_RECVERR)

>=C2=A0 =C2=A0 =C2=A0Add support for ignoring IPV6_RECVERR, controlled b= y the same
> sysctl.
>=C2=A0 =C2=A0 =C2=A0This fixes DNS in Linux when using IPv6 resolvers.<= br>
And all applications which depend upon a working DNS in an IPv6 enabled system (e.g. biology/linux-foldingathome started to work again for me).

Any MFC target for this?

I'll merge= this now. I'd tagged it as mfc in the pull request.

=
Warner
--0000000000009e92b6061713a3ee-- From nobody Sat Apr 27 13:03:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRVBs2TGbz5J4sJ; Sat, 27 Apr 2024 13:03: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 4VRVBs1fKRz4jrp; Sat, 27 Apr 2024 13:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714222997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkcmEIVfz6ogm0Vgm+9P1uystdx+UF0D0DibSmgVkec=; b=ZNE1ywuCoC4Ak5yyKAOqE7NBcBjvVYf5yRBfxNYN0oveZVMhVa19r4sXM9P5fkdyuGZ3Lk +25zrZQQ3OHVaBGukcfiIxoU4DM9/E72nUomwXHUffanJDtEwyUPqX8yA1gA5nuaR4QA31 Cw3XkqUa30mNAqXU8zuTxNDSeiE7fQKmhQ/l5Ci3ttvKKF2Qosk6SSEX2jGYJ9dRFcI/2D WWO9CxcOfCZBxkSISZyj/YhXB0RpfvhZcxoQAjtlAFcPA8tJ80rCvFUVArkgmsDQszBSZr jbssjGZxkL0W+VwtT6a1p2EOOtE1hZ0cogWhMjshkLmrJe/SyctnO2n+KDINEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714222997; a=rsa-sha256; cv=none; b=Od54nr9VRHC+mx87by8Zw3/iuQBv8IS5DrPl13lu7FQfdLMljZ5IodhN4A7UXSrm+OIh+D cOe8zEMzof2YLmdMBuy8TP0fKTE4cgfjC5KFst4mp77NRxk0oFFYvdcyEBNjzXMkeV8xsF nn/h0cYGxuF/CWUjp3jdOkXv0hvKFbJVqqp3tM4W+ruddIBrbKJdGnQVWJ1tALx7p4LcwQ c8uMr0SPtZan30cbiimpas2QSfcT8OHuqXeVysnNBcjh4hBTAT48v6WR68WrYJzIhY3+89 uBplwb2w1NL0NTeEODSZtCPS1edan/8wae2OvW9ZlBOX1IiMS0mZVZTYec+f9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714222997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkcmEIVfz6ogm0Vgm+9P1uystdx+UF0D0DibSmgVkec=; b=IAuHsQjYA9/5uNzufNUUAM/BWn9zZRuex/zrZA5D+qFwRAdflIXmAsiVMPBbrXUQYVdr5i X1wUAIe2auaC23nwCZsk7FOz/YrFbiax1COHTYkz/qGPwc+f4+L+MNvGh6OCpSW7NOj20u 50ZFzp8lGgR0qv07ZHBUx9rsCdBESDFlDLZr5e0brqC1IPr2s82CXv8oM+5tlD0SaMRcVS Z/m4VnKL+rmLLHHqL4YXMtEZ+haaS/2pXgEWmAEfIbNtC/7Q7sVPgmqQ7We2NKHjnMovb4 M6FanxwlIPaEmNK4LhnoXi/K+tXn1f9T+DFr6UGNmeNtQzCg2uxERNkUNBNEBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRVBs1C8NzRpl; Sat, 27 Apr 2024 13:03: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 43RD3HoZ045461; Sat, 27 Apr 2024 13:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RD3HIC045458; Sat, 27 Apr 2024 13:03:17 GMT (envelope-from git) Date: Sat, 27 Apr 2024 13:03:17 GMT Message-Id: <202404271303.43RD3HIC045458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8c81694af438 - stable/14 - linux: ignore setsockopt(IPV6_RECVERR) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c81694af438fee9071f826efcc9f1633c50ab3d Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c81694af438fee9071f826efcc9f1633c50ab3d commit 8c81694af438fee9071f826efcc9f1633c50ab3d Author: Lexi Winter AuthorDate: 2024-04-22 21:58:11 +0000 Commit: Warner Losh CommitDate: 2024-04-27 12:59:46 +0000 linux: ignore setsockopt(IPV6_RECVERR) Under Linux, the socket options IP_RECVERR and IPV6_RECVERR are used to receive socket errors via a dedicated 'error queue' which can be retrieved via recvmsg(). FreeBSD does not support this functionality. For IPv4, the sysctl compat.linux.ignore_ip_recverr can be set to 1 to silently ignore attempts to set IP_RECVERR and return success to the application, which is wrong, but is required for (among other things) a functional DNS client in recent versions of glibc. Add support for ignoring IPV6_RECVERR, controlled by the same sysctl. This fixes DNS in Linux when using IPv6 resolvers. Reviewed by: imp, Jose Luis Duran Pull Request: https://github.com/freebsd/freebsd-src/pull/1118 (cherry picked from commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad) --- sys/compat/linux/linux_socket.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a5ed5c5c62db..705a64de8ede 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -501,6 +501,11 @@ linux_to_bsd_ip6_sockopt(int opt) "unsupported IPv6 socket option IPV6_RECVFRAGSIZE (%d)", opt); return (-2); + case LINUX_IPV6_RECVERR: + LINUX_RATELIMIT_MSG_OPT1( + "unsupported IPv6 socket option IPV6_RECVERR (%d), you can not get extended reliability info in linux programs", + opt); + return (-2); /* unknown sockopts */ default: @@ -2110,6 +2115,14 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_IPV6: + if (args->optname == LINUX_IPV6_RECVERR && + linux_ignore_ip_recverr) { + /* + * XXX: This is a hack to unbreak DNS resolution + * with glibc 2.30 and above. + */ + return (0); + } name = linux_to_bsd_ip6_sockopt(args->optname); break; case IPPROTO_TCP: From nobody Sat Apr 27 14:46:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXTZ2nWvz5JGB2; Sat, 27 Apr 2024 14:46: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 4VRXTZ0Zjlz41hL; Sat, 27 Apr 2024 14:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqZLzV8KhdT0sdizWPXKUac9w8HXIv2AHf3WaHvO5vc=; b=N7Bi0S6qfrBbclE6v0nTEzLJqVn1wUg1c+xV9H3NSSah2JJWEOb1gNpFmNkplz68Q8ylg4 Ovx/ao4drvHSqbK3f8g5bKhZwneU0hknRa1IYNSg2jyvrSR54xPSkQ912aS9geMea/oUyQ XPmOgPJABK117ag5Z8t3ZEMS3+9rBosFPScInLSFsdE6QqJhbPQ/uxSyySLtCux8Wnskzi kVeQxKOnUKNDSbonFhgm0hAc++sR5oFX1igiYQnveogl079MlJ2BsBa/kwjQaMOOj4BVU/ RyM3IYo5YPG1MOMeMJr5SBrZTWUzO6uFnNvPsAHN3sU2EMl8l5FhGJWcl7BWcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229170; a=rsa-sha256; cv=none; b=MjcBiz/b7AFPQpRHn99R2YbviFhx1NFnHTtNCPqb+f1g7CVnDH9us4t71Mxfc73JKGAzIM bLqBEsbS5XRBk3CljRnCIdBh5kFiCjtbmqXWyx3SgFcd1DJwCjBaCGvUglXZcJUHGOQnR3 rNbGtq41YVLGqQ5UXHP1BwOpb7nm2nXjwqALtHE5R4ENZkbgYZxeIzQ/6AE3QRndub9Vx1 ZXXEKb24D5jmxj6w93llH0gw42wmlev40vEv9ISU9xi37fIjlgS0rYYhn/Nj2dYk+NIfcA bCvLKDNVWKk1iufm59FD6+Q7QanWQraYJgINhWmOkqeRcJQRXVktbFivqVOidA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqZLzV8KhdT0sdizWPXKUac9w8HXIv2AHf3WaHvO5vc=; b=X9ZTAD8ba9wWG+9N8Fx59BBc3492Gf3r4io1Fv/z95g3uhcuMHLmepOs6cTO0ne5uFmeDV HIBSJGq1QJU+HsMC2+DQsfgD+W77/nKeRKWTPisuw0eOzFeacbVasXExKXArF2qSr843YT 66x6JEgMNR/MXkQDfziTYYobLPz7rLtQo/l06JLWKBWQnreclq7AxuLVNVl2vz3KNoKru9 LArYuN4pPp1vuo4hj+ndRyL4Vq6s+t2FdYXlrfNcCJ9QVwQA4sPX6no227PCH1sGNls8P0 g2ATqEokYUj5Ze27UyIiLRO6qoMdPrY4ovt4TwS+XRUKFP6NMLd9Yr3ENdZXiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXTZ08K4zWF1; Sat, 27 Apr 2024 14: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 43REk9KH015229; Sat, 27 Apr 2024 14:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REk9dZ015226; Sat, 27 Apr 2024 14:46:09 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:46:09 GMT Message-Id: <202404271446.43REk9dZ015226@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: d776dd5fbd48 - stable/14 - Support ARP for 802 networks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d776dd5fbd484acdf00f6df55583e9aa53226859 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d776dd5fbd484acdf00f6df55583e9aa53226859 commit d776dd5fbd484acdf00f6df55583e9aa53226859 Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-27 14:45:22 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 (cherry picked from commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b) --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0319807dbfd2..f201fd67cab4 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -47,7 +47,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index df564b210f9b..a14671528f18 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -684,6 +684,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband"; From nobody Sat Apr 27 14:47:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXWK5HqWz5JGSN; Sat, 27 Apr 2024 14:47: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 4VRXWK4gnCz41xg; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=TnkxiLVYZCW/wjP7yKlllviO5NUpYtuoLn/3HCvC19Q8Uxq/mQORtWpRcL84nHMfqZCkNX LLq1yzrtggqrREwUZ7a5otrRDEG0w9cJoXDf4cQNx6WERFeOWCRuXO/Hc5FfhLIxgU7y/h C5MuqupddrEsxRR1XxNX/CoMLb8XZ4/1GUXFKxYM82mNObHHmNKd7v1WEt2uCe2CUNLZqK sboSM8RRw/CI45bxjIyqRtLnHcHfcKM2zclKeij2DHaWHoza9FVgn+iFnUKA74eEPwzb6g PlxvQCeE06oH+DXA0YwXip0h5TXPy52K5hYSTOAhKR4bOKf6ezohq1yNk1T1xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229261; a=rsa-sha256; cv=none; b=YE4VT0sX01uaCcUCBLWX6T+0srtMN9d+LtK2OerjO7NrWwVLO2pasTRhFd0aKLEwCpVCrb ngFNHXJaDULygw/5YcVw/BuzQnjfLgBl8ziGHnOK4R3yWCQeCMNeevSJ6AQen2ImuAOq2L cFawGlidcA+x9f7vkO9KR3uHUtbNSYeKvT5R/Neot8ALlO6gfhyTuEEM0i39hV2a4hhpDs L5krPo9b1o8HnkAbh6h4Ob5jn74Ldh9qr44LobDoGAYnRXgpPMOQTiXHdXkBK8nX2LwlBQ Ap0AvI4n2TXWY08PxUK4cEvlygRKnBoW3oSrGP6Uqr2i3wN8k6rb+kAdwAqQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=F2tMT2HUbcYj37n7J8R2IHA0GEDXwZ5z6y2Cy3oVhzvdIBJlV+h6IVMV2QpfkhEkfzdpjP UOcNJP4Pke1YJbP6NKCChm1FSGpA/UYhWbxamlLCtysqOlWQ2ImOFjAXfrTnEpmVo9QBpB d44YetSIXvyGqU8KpvwPT4my0HqMj41AsmvYk/zn+mZARdOoHD/GdH22frhemMI+w32kTe 5eMOQqmB9ita9Drqg9zvXjMCSlmqmga6NBisHI/ac5owL9CPjAD8pdLnHLMA1J80Y56ZIr MerWR+uP24Hl+PNMprfzYbVwDdJ9fpxJiiifBmUOlTRtbqYogpcR42crT1/KXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXWK4HDPzWcR; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43RElfUp015568; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RElfG9015565; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:47:41 GMT Message-Id: <202404271447.43RElfG9015565@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: 90499f6efd57 - stable/13 - Support ARP for 802 networks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 90499f6efd57754563223bce1ec173669f1ce8a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90499f6efd57754563223bce1ec173669f1ce8a1 commit 90499f6efd57754563223bce1ec173669f1ce8a1 Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-27 14:47:16 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 (cherry picked from commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b) (cherry picked from commit d776dd5fbd484acdf00f6df55583e9aa53226859) --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0319807dbfd2..f201fd67cab4 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -47,7 +47,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index cd5055e31533..9c72f9268ae5 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -684,6 +684,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband"; From nobody Sat Apr 27 14:58:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXm54q4Kz5JH6P; Sat, 27 Apr 2024 14:58: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 4VRXm549mdz42r3; Sat, 27 Apr 2024 14:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S636cxuU6kHwVnLea9gLtWWOa3DdcK/NwxPDSNATvKg=; b=yea+Tqd5OkgW/dYqRI7BWSEkHKmDyISXCFx8n2C18ogeoGJ8oOfL3J3jplYloFvJ3zjP75 yrmp0MiQXvntrOEk9X5Ar/BZ3UqDxNjDTcwxjzhLAEYr1RsMJi5ZPg2nmMWUfwVYr/vlI9 CMczthvmIlwBjYyK9d9MxgDNDuzCZX7IwNV3Wk1oVfni7TdGSI0NHFdmbTJh9xbn4G2nSl NOGK80yjCwsbt6Hz1t6fqKTOSZqiqQP451lHb++pO0O4f53YKkDsElTpr27u1LD4V5/I8y SCmSEANDFqFJOvrnB2VAmhIZITn6PUKdyqUuSCYnY/BiKBd0eJJkyXfikg6lPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229925; a=rsa-sha256; cv=none; b=Pb+/i2+sCUhRsdsUP2jtc0oy+dGUBICytV1V+mDVYsTrTbFAgIue9c1ri4DNfGnPq6g2fN dkguXRJZeG1K+92W98LUOylv2rVT1cczv3e5oWz/W0Pu+1blIvzqIFQR2eu6Ob6tBPxEgH w3Lc0lTSVRwS2MY5zma8FFxbrhZNsabwjtxzdUhN6/HeOhREDTITKE1h/f4P1p+lUpqhsU WaJm69wz4WJH6eml+l28fcnjA0IC9ZXZY7179I4IYU7doiSdD357bG/+nCUBVe7NRI56wI rf2+aOGaaT+zmpDryAZE49knH3HXtNaOBZ6V32bnSG1ukJ4GsqXY2exHrsKJbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S636cxuU6kHwVnLea9gLtWWOa3DdcK/NwxPDSNATvKg=; b=gl1JNW6Dt2oxefWUq1UOLyVRc/MAX4hZqKigVzZx1/BMx8SStpmDs/b4FU3pxYXVIiGvap MN9zLqfTNsEbcof01AShi/aiLHOb3/GVI1OURjmp4+Z4IlJQtRDZkCTlbJRcJqCb7lUtYM GnqnpZoje7QdAZypL+H8z96NmxN9yxt/T9EeyWC2PJnqKqmHDOcO4ESMm7/k4fscOu0J0+ 7VUaPJdi3ly2jHFzqNzNUR9BRhdG9lJKEKevJoudIIwrSL00fIuuEkJUN2o0xD+F/MmL1p AjCVsNJRX87b2J36FICaqJBURO3UWvCS0wCoLW4crHUbG5Y8m6bIAdmhWduF+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 4VRXm53gMGzX4w; Sat, 27 Apr 2024 14:58: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 43REwjkX032478; Sat, 27 Apr 2024 14:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwjHI032475; Sat, 27 Apr 2024 14:58:45 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:45 GMT Message-Id: <202404271458.43REwjHI032475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1d06b45463bf - stable/13 - Fix MNT_IGNORE for devfs, fdescfs and nullfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d06b45463bf404b5010f2370cb39b68a32da323 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1d06b45463bf404b5010f2370cb39b68a32da323 commit 1d06b45463bf404b5010f2370cb39b68a32da323 Author: Doug Rabson AuthorDate: 2023-08-26 09:32:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:39 +0000 Fix MNT_IGNORE for devfs, fdescfs and nullfs The MNT_IGNORE flag can be used to mark certain filesystem mounts so that utilities such as df(1) and mount(8) can filter out those mounts by default. This can be used, for instance, to reduce the noise from running container workloads inside jails which often have at least three and sometimes as many as ten mounts per container. The flag is supplied by the nmount(2) system call and is recorded so that it can be reported by statfs(2). Unfortunately several filesystems override the default behaviour and mask out the flag, defeating its purpose. This change preserves the MNT_IGNORE flag for those filesystems so that it can be reported correctly. MFC after: 1 week (cherry picked from commit b5c4616582cebdcf4dee909a3c2f5b113c4ae59e) --- sys/fs/devfs/devfs_vfsops.c | 2 +- sys/fs/fdescfs/fdesc_vfsops.c | 2 +- sys/fs/nullfs/null_vfsops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index a81a63ebf27a..dbc29fbe4d78 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -224,7 +224,7 @@ static int devfs_statfs(struct mount *mp, struct statfs *sbp) { - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 309134798374..30924580dece 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -219,7 +219,7 @@ fdesc_statfs(struct mount *mp, struct statfs *sbp) freefd += (lim - fdp->fd_nfiles); FILEDESC_SUNLOCK(fdp); - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 77ead04b1616..271f5bf249fc 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -337,7 +337,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED)) | + MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; From nobody Sat Apr 27 14:58:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXm659HBz5JH8V; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRXm64WVvz4321; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=HdlPUoiEo/qUI5N8VwfmLXzzOqCoIgw8uISCemnpi18ciMtpKKnvLZgSuEhNEPpt6g82Ep No/EPxIhdwvD2T8S1mHUUMfO2qzj9Rh/sHF1DpJeDXVOQEPBlXKVLs3q9JtNxPGitsWbnu HTS4vicShnCm4TNnt43gn9Z6W3m3R7t9q7U1qF5MsTVmwQLTYuAo/f5FE32Xi9M+1S/jRx uccFJvVPQiQmI6BYlYsgxj1mX4lsk1qnN2uZqzTthQwyV45aq1exrRu36R7TkHHWn6u8DE Vwu3uAEG2NVG2YNB4BmJ7I8HDEryAIg3kXHs6S/dYxmr+r3bJIvGL/TCbOmKCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229926; a=rsa-sha256; cv=none; b=ASZ+mVmWc6M7ivyVzm2Bj/ESOvYqJEmZFEh2CDozl4BR2cQFaUgUoAn99zNGtffysv3yv6 RlOX4eedj5aa8iNDET2yj6nH65kTk9OVy/DMfO1OmB5TDqnDAbK20Fi7Lz3Aqz6j2/oSf+ +ZpdCuMgJGanN/tPF0FSXKc+hKHGZWfHwptjnwQhbRIaof7vedIyie6VJ6njSGLvlt9BkW AA7PKMRHg7a4S4HHuYWQTg86kEDk/knwzKaT1pNHnBF9LOpZyZv0REAjjF9fqEQltd+7fu busuihbArQPlp5fft0zMRzKDQsxg6sfaKOU8SBxnchv66kqvIF7w4uW3h0BwRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=aiFsnX1LTJjf+Ukt1EPg89pMKpTPwGpFd7nj/8tK5B5KuSAwFQa48NAtUTA/wXXu7wlHBv OcJDsC/hqypM/3Ym5t8/UxkGksonpX3Xf2kkJ2HRQQHoN6Cn0nU4ySJTIXibJVsJoHGh6u LSLjPJdpeLFSCTCInV7BD1O4FT0i1y+xlC/bZExy6SaogeceySnjNGXkfHW9mw26uBiH6S 2a+ACZdQuGhHztahcRDdrTt7sKLc5feLQCX1PK704JDXMkD3DL1LqPOq5+gbeEsD7BKidP sq/ES2JTtdBP3v2mjJksJUXM3vSCzbLSV04UV0K/SCemtOgrLkN+4y5WUCG6+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 4VRXm646dszX4x; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43REwkOY032528; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwkkr032525; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:46 GMT Message-Id: <202404271458.43REwkkr032525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 82c8a5f4f18c - stable/13 - nullfs: Show correct exported flag. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 commit 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 (cherry picked from commit 2b258dd17caf329bc549f93d9858b74109a479d7) --- sys/fs/nullfs/null_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 271f5bf249fc..01ab822de087 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -336,9 +336,10 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | - (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); + sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | + MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; + mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); + sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks; From nobody Sat Apr 27 14:58:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXm82stgz5JGFj; Sat, 27 Apr 2024 14:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRXm75Wzgz432T; Sat, 27 Apr 2024 14:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YrakTBjXlk/TiNxwqWXV3x5xXpiU1OjjgE3n0fHlI3Q=; b=dGbSmJhiWpNODMMk8N20NxhlE7VwXdk29AhDbb18SMrIb6xVL/8AK6OWyIo9NQJ2ixMGwj sma16B+4XDDJ+ZZyE+LY5hPV5juVQssqh92ZOIzh/1UlOGoq/llwBUry9PKoPSuRD0R6Kb jYmbrrimpp5XLQ6b07ApVboCvzdCHbfa1Zp2GiXLm2Er6AZDABpLQ2eqhWm2ddBl6rYacf C88kwbjT6CC43N0o2DKjWEqmODJeQabMYDw8aE2jLptWNbYQpv/L0tcLyTyYKNYazYv2KJ jOLqHiFP18ur9l8ANLSAodjBAbvWrw+nvCv/IQBR2EGkqzXjS2PJ7OhJAtbi+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229927; a=rsa-sha256; cv=none; b=QLlSj4DLGS/azUdGDiJya0Pqs0WpW9MjXA++muzhZF3sDdTQgP9SBdlxKhhBdweLM09lJx S9Ldx4skrFcKnyYzcDlqoHYhD4mwUDhAw15+/UD+SZsA5NRrghmkZ0wnY5H7yoL7NKW6UF t+Jh0K0EEpmX/pt5ISU5wPtQ/AxelZYj6q/mehsgTAHIjW8z6yzETgi7zmUr0nADMrOtDy NK107IKXfwGdJ70dkaDM9+OyCS7OacYjrsEtfHV5ZjLxuMZeWakBu429EnnLB0ri4OjmYk Z+5Jr3n4zx9naX/CQPuNgDysI98oV7gvusaJubDyG7A/oIcyXx9fFQFZXReLJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YrakTBjXlk/TiNxwqWXV3x5xXpiU1OjjgE3n0fHlI3Q=; b=SKaQ8xNOZCeziRgkhCy8ilwIHz1NwoibOXcJ7fdaRXsoHbUXTpsSCEKhQ8gIAu3J5ZeFuI gjCgbwkyqFUaMGJz9JRVOxTCM8F64G+BPp2upvrqS3gcg9U4zICqysf1r287g5KNb4bNuW JCrawSTsGrWF2xY3Lp9WgY8VfMT3l2vsIx0Iw2EiRbj4pCnAqSbTE7hDf6ExEEpKkzCPkT ovQegEYitSkCoxtfn++rPCjjLreYYz5y7tzrev7fotVMp2pG4iyqAvmlX5b2HDablj47Ku hRem14XkGa7TGn3Vp/CPfuxPhDCklpj+CosE9wb4mxfSiIb5DibEH6SvsbEKvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm757vnzX02; Sat, 27 Apr 2024 14:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43REwlUb032578; Sat, 27 Apr 2024 14:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwlOT032575; Sat, 27 Apr 2024 14:58:47 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:47 GMT Message-Id: <202404271458.43REwlOT032575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 44101eb5803e - stable/13 - install: Always use a temporary 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44101eb5803e602be442d2305d800264af963b42 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44101eb5803e602be442d2305d800264af963b42 commit 44101eb5803e602be442d2305d800264af963b42 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-12 17:30:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 install: Always use a temporary file. Previously, we would only use a temporary file if explicitly asked to with the `-S` option, and even then, only if the target file already existed. This meant that an outside observer looking for the target file might see a partial file, and might see the file disappear and then reappear. With this patch, we always use a temporary file, ensuring atomicity. The downside is slightly increased disk usage. The upside is never having to worry about, for instance, cron jobs randomly failing if they happen to run simultaneously with `make installworld`. The `-S` option is retained, partly for compatibility, and partly to control the use of `fsync(2)`, which has a non-negligible cost (approximately 10% increase in wall time for `make installworld`). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: 0mp, brooks, imp, markj Differential Revision: https://reviews.freebsd.org/D44742 (cherry picked from commit e5035d08578e372d40b4e2d4c3574b7583549bd6) install: Simplify path construction. There's no need to copy the path twice to split it into base and dir. We simply call `basename()` first, then handle the two trivial cases in which it isn't safe to call `dirname()`. While here, add an early check that the destination is not an empty string. This would always fail eventually, so it may as well fail right away. Also add a test case for this shortcut. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44743 (cherry picked from commit 17dc7017d7375b3463d65adffe1eb980b0f86795) install: Remove the mmap(2) option. We already removed it from cp(1) over a year ago but never followed up here. Do so now, for the same reasons: significant complexity for little to no benefit. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44809 (cherry picked from commit a0439a1b820fa0e742c00d095f5f5c06f5f19432) install: Assorted nitpickery. * Use `errc()` instead of manually setting `errno` before calling `err()`. * Change one warning into a fatal error. * Drop some unnecessary casts. * `strlcat()` bounds checks were off-by-one. This does not matter in practice because the subsequent code renders an overrun harmless. * We were passing `SSIZE_MAX` to `copy_file_range()` instead of the requested size. This only matters if we're asked to install a file which is still being written to while we are copying it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44810 (cherry picked from commit 000a533e6d1db9878296b32d1cc212e11a2cc718) --- usr.bin/xinstall/install.1 | 31 +-- usr.bin/xinstall/tests/install_test.sh | 8 + usr.bin/xinstall/xinstall.c | 407 ++++++++++----------------------- 3 files changed, 142 insertions(+), 304 deletions(-) diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index 346b0f428121..193892c4a2b9 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -27,7 +27,7 @@ .\" .\" From: @(#)install.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 4, 2022 +.Dd April 16, 2024 .Dt INSTALL 1 .Os .Sh NAME @@ -227,16 +227,18 @@ Copy the file, as if the except if the target file does not already exist or is different, then preserve the access and modification times of the source file. .It Fl S -Safe copy. -Normally, +Flush each file to disk after copying. +This has a non-negligible impact on performance, but reduces the risk +of being left with a partial file if the system crashes or loses power +shortly after .Nm -unlinks an existing target before installing the new file. -With the +runs. +.Pp +Historically, .Fl S -flag a temporary file is used and then renamed to be -the target. -The reason this is safer is that if the copy or -rename fails, the existing target is left untouched. +also enabled the use of temporary files to ensure atomicity when +replacing an existing target. +Temporary files are no longer optional. .It Fl s .Nm exec's the command @@ -302,15 +304,7 @@ Ports Collection. .Sh FILES .Bl -tag -width "INS@XXXXXX" -compact .It Pa INS@XXXXXX -If either -.Fl S -option is specified, or the -.Fl C -or -.Fl p -option is used in conjunction with the -.Fl s -option, temporary files named +Temporary files named .Pa INS@XXXXXX , where .Pa XXXXXX @@ -333,7 +327,6 @@ The default was changed to copy in .Xr cp 1 , .Xr mv 1 , .Xr strip 1 , -.Xr mmap 2 , .Xr getgrnam 3 , .Xr getpwnam 3 , .Xr chown 8 diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index cbe95f0dfbf3..b35706521ec3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -25,6 +25,13 @@ # # +atf_test_case copy_to_empty +copy_to_empty_body() { + printf 'test\n123\r456\r\n789\0z' >testf + atf_check -s not-exit:0 -e match:"empty string" \ + install testf "" +} + copy_to_nonexistent_with_opts() { printf 'test\n123\r456\r\n789\0z' >testf atf_check install "$@" testf copyf @@ -497,6 +504,7 @@ set_optional_exec_body() } atf_init_test_cases() { + atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe atf_add_test_case copy_to_nonexistent_comparing diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index f1fe1a969377..efd37150246b 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -42,10 +42,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif /* not lint */ #endif -#include -#include -#include -#include #include #include #include @@ -157,7 +153,6 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); static char *copy(int, const char *, int, const char *, off_t); -static int create_newfile(const char *, int, struct stat *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -173,7 +168,6 @@ static void metadata_log(const char *, const char *, struct timespec *, const char *, const char *, off_t); static int parseid(const char *, id_t *); static int strip(const char *, int, const char *, char **); -static int trymmap(size_t); static void usage(void); int @@ -341,10 +335,6 @@ main(int argc, char *argv[]) } } - /* need to make a temp copy so we can compare stripped version */ - if (docompare && dostrip) - safecopy = 1; - /* get group and owner id's */ if (group != NULL && !dounpriv) { if (gid_from_group(group, &gid) == -1) { @@ -393,8 +383,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "%s vanished", to_name); if (S_ISLNK(to_sb.st_mode)) { if (argc != 2) { - errno = ENOTDIR; - err(EX_USAGE, "%s", to_name); + errc(EX_CANTCREAT, ENOTDIR, "%s", + to_name); } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -420,14 +410,13 @@ main(int argc, char *argv[]) if (!no_target && !dolink) { if (stat(*argv, &from_sb)) err(EX_OSERR, "%s", *argv); - if (!S_ISREG(to_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", to_name); - } + if (!S_ISREG(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (to_sb.st_dev == from_sb.st_dev && - to_sb.st_ino == from_sb.st_ino) - errx(EX_USAGE, - "%s and %s are the same file", *argv, to_name); + to_sb.st_ino == from_sb.st_ino) { + errx(EX_USAGE, "%s and %s are the same file", + *argv, to_name); + } } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -585,7 +574,7 @@ do_link(const char *from_name, const char *to_name, char tmpl[MAXPATHLEN]; int ret; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -632,7 +621,7 @@ do_symlink(const char *from_name, const char *to_name, { char tmpl[MAXPATHLEN]; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -675,8 +664,10 @@ static void makelink(const char *from_name, const char *to_name, const struct stat *target_sb) { - char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; - struct stat to_sb; + char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; + char *to_name_copy, *d, *ld, *ls, *s; + const char *base, *dir; + struct stat to_sb; /* Try hard links first. */ if (dolink & (LN_HARD|LN_MIXED)) { @@ -737,8 +728,6 @@ makelink(const char *from_name, const char *to_name, } if (dolink & LN_RELATIVE) { - char *to_name_copy, *cp, *d, *ld, *ls, *s; - if (*from_name != '/') { /* this is already a relative link */ do_symlink(from_name, to_name, target_sb); @@ -758,17 +747,23 @@ makelink(const char *from_name, const char *to_name, to_name_copy = strdup(to_name); if (to_name_copy == NULL) err(EX_OSERR, "%s: strdup", to_name); - cp = dirname(to_name_copy); - if (realpath(cp, dst) == NULL) - err(EX_OSERR, "%s: realpath", cp); - /* .. and add the last component. */ - if (strcmp(dst, "/") != 0) { - if (strlcat(dst, "/", sizeof(dst)) > sizeof(dst)) + base = basename(to_name_copy); + if (base == to_name_copy) { + /* destination is a file in cwd */ + (void)strlcpy(dst, "./", sizeof(dst)); + } else if (base == to_name_copy + 1) { + /* destination is a file in the root */ + (void)strlcpy(dst, "/", sizeof(dst)); + } else { + /* all other cases: safe to call dirname() */ + dir = dirname(to_name_copy); + if (realpath(dir, dst) == NULL) + err(EX_OSERR, "%s: realpath", dir); + if (strcmp(dst, "/") != 0 && + strlcat(dst, "/", sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); } - strcpy(to_name_copy, to_name); - cp = basename(to_name_copy); - if (strlcat(dst, cp, sizeof(dst)) > sizeof(dst)) + if (strlcat(dst, base, sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); free(to_name_copy); @@ -821,7 +816,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) struct stat from_sb, temp_sb, to_sb; struct timespec tsb[2]; int devnull, files_match, from_fd, serrno, stripped, target; - int tempcopy, temp_fd, to_fd; + int temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; char *digestresult; @@ -835,10 +830,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (!dolink) { if (stat(from_name, &from_sb)) err(EX_OSERR, "%s", from_name); - if (!S_ISREG(from_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", from_name); - } + if (!S_ISREG(from_sb.st_mode)) + errc(EX_OSERR, EFTYPE, "%s", from_name); } /* Build the target path. */ if (flags & DIRECTORY) { @@ -852,32 +845,18 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } else { devnull = 1; } + if (*to_name == '\0') + errx(EX_USAGE, "destination cannot be an empty string"); target = (lstat(to_name, &to_sb) == 0); if (dolink) { - if (target && !safecopy) { - if (to_sb.st_mode & S_IFDIR && rmdir(to_name) == -1) - err(EX_OSERR, "%s", to_name); -#if HAVE_STRUCT_STAT_ST_FLAGS - if (to_sb.st_flags & NOCHANGEBITS) - (void)chflags(to_name, - to_sb.st_flags & ~NOCHANGEBITS); -#endif - unlink(to_name); - } makelink(from_name, to_name, target ? &to_sb : NULL); return; } - if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) { - errno = EFTYPE; - warn("%s", to_name); - return; - } - - /* Only copy safe if the target exists. */ - tempcopy = safecopy && target; + if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (!devnull && (from_fd = open(from_name, O_RDONLY, 0)) < 0) err(EX_OSERR, "%s", from_name); @@ -899,40 +878,32 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!files_match) { - if (tempcopy) { - to_fd = create_tempfile(to_name, tempfile, - sizeof(tempfile)); - if (to_fd < 0) - err(EX_OSERR, "%s", tempfile); - } else { - if ((to_fd = create_newfile(to_name, target, - &to_sb)) < 0) - err(EX_OSERR, "%s", to_name); - if (verbose) - (void)printf("install: %s -> %s\n", - from_name, to_name); - } + to_fd = create_tempfile(to_name, tempfile, + sizeof(tempfile)); + if (to_fd < 0) + err(EX_OSERR, "%s", tempfile); if (!devnull) { - if (dostrip) - stripped = strip(tempcopy ? tempfile : to_name, - to_fd, from_name, &digestresult); - if (!stripped) - digestresult = copy(from_fd, from_name, to_fd, - tempcopy ? tempfile : to_name, from_sb.st_size); + if (dostrip) { + stripped = strip(tempfile, to_fd, from_name, + &digestresult); + } + if (!stripped) { + digestresult = copy(from_fd, from_name, to_fd, + tempfile, from_sb.st_size); + } } } if (dostrip) { if (!stripped) - (void)strip(tempcopy ? tempfile : to_name, to_fd, - NULL, &digestresult); + (void)strip(tempfile, to_fd, NULL, &digestresult); /* * Re-open our fd on the target, in case * we did not strip in-place. */ close(to_fd); - to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY, 0); + to_fd = open(tempfile, O_RDONLY, 0); if (to_fd < 0) err(EX_OSERR, "stripping %s", to_name); } @@ -976,16 +947,16 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) digestresult = digest_file(tempfile); /* - * Move the new file into place if doing a safe copy - * and the files are different (or just not compared). + * Move the new file into place if the files are different (or + * just not compared). */ - if (tempcopy && !files_match) { + if (!files_match) { #if HAVE_STRUCT_STAT_ST_FLAGS /* Try to turn off the immutable bits. */ if (to_sb.st_flags & NOCHANGEBITS) (void)chflags(to_name, to_sb.st_flags & ~NOCHANGEBITS); #endif - if (dobackup) { + if (target && dobackup) { if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", to_name, suffix) != strlen(to_name) + strlen(suffix)) { unlink(tempfile); @@ -1124,86 +1095,62 @@ compare(int from_fd, const char *from_name __unused, size_t from_len, int to_fd, const char *to_name __unused, size_t to_len, char **dresp) { - char *p, *q; int rv; - int do_digest, done_compare; + int do_digest; DIGEST_CTX ctx; - rv = 0; if (from_len != to_len) return 1; do_digest = (digesttype != DIGEST_NONE && dresp != NULL && *dresp == NULL); if (from_len <= MAX_CMP_SIZE) { + static char *buf, *buf1, *buf2; + static size_t bufsize; + int n1, n2; + if (do_digest) digest_init(&ctx); - done_compare = 0; - if (trymmap(from_len) && trymmap(to_len)) { - p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - from_fd, (off_t)0); - if (p == MAP_FAILED) - goto out; - q = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - to_fd, (off_t)0); - if (q == MAP_FAILED) { - munmap(p, from_len); - goto out; - } - rv = memcmp(p, q, from_len); - if (do_digest) - digest_update(&ctx, p, from_len); - munmap(p, from_len); - munmap(q, from_len); - done_compare = 1; + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize * 2); + if (buf == NULL) + err(1, "Not enough memory"); + buf1 = buf; + buf2 = buf + bufsize; } - out: - if (!done_compare) { - static char *buf, *buf1, *buf2; - static size_t bufsize; - int n1, n2; - - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + rv = 0; + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + while (rv == 0) { + n1 = read(from_fd, buf1, bufsize); + if (n1 == 0) + break; /* EOF */ + else if (n1 > 0) { + n2 = read(to_fd, buf2, n1); + if (n2 == n1) + rv = memcmp(buf1, buf2, n1); else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize * 2); - if (buf == NULL) - err(1, "Not enough memory"); - buf1 = buf; - buf2 = buf + bufsize; - } - rv = 0; - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); - while (rv == 0) { - n1 = read(from_fd, buf1, bufsize); - if (n1 == 0) - break; /* EOF */ - else if (n1 > 0) { - n2 = read(to_fd, buf2, n1); - if (n2 == n1) - rv = memcmp(buf1, buf2, n1); - else - rv = 1; /* out of sync */ - } else - rv = 1; /* read failure */ - if (do_digest) - digest_update(&ctx, buf1, n1); - } - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); + rv = 1; /* out of sync */ + } else + rv = 1; /* read failure */ + if (do_digest) + digest_update(&ctx, buf1, n1); } - } else + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + } else { rv = 1; /* don't bother in this case */ + } if (do_digest) { if (rv == 0) @@ -1235,65 +1182,6 @@ create_tempfile(const char *path, char *temp, size_t tsize) return (mkstemp(temp)); } -/* - * create_newfile -- - * create a new file, overwriting an existing one if necessary - */ -static int -create_newfile(const char *path, int target, struct stat *sbp) -{ - char backup[MAXPATHLEN]; - int saved_errno = 0; - int newfd; - - if (target) { - /* - * Unlink now... avoid ETXTBSY errors later. Try to turn - * off the append/immutable bits -- if we fail, go ahead, - * it might work. - */ -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags & ~NOCHANGEBITS); -#endif - - if (dobackup) { - if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix) != strlen(path) + strlen(suffix)) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - errx(EX_OSERR, "%s: backup filename too long", - path); - } - (void)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix); - if (verbose) - (void)printf("install: %s -> %s\n", - path, backup); - if (rename(path, backup) < 0) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - err(EX_OSERR, "rename: %s to %s", path, backup); - } - } else - if (unlink(path) < 0) - saved_errno = errno; - } - - newfd = open(path, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); - if (newfd < 0 && saved_errno != 0) - errno = saved_errno; - return newfd; -} - /* * copy -- * copy from one file to another @@ -1306,77 +1194,52 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, static size_t bufsize; int nr, nw; int serrno; - char *p; - int done_copy; DIGEST_CTX ctx; /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(from_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", from_name); - if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(to_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", to_name); digest_init(&ctx); - done_copy = 0; - if (trymmap((size_t)size) && - (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED, - from_fd, (off_t)0)) != MAP_FAILED) { - nw = write(to_fd, p, size); - if (nw != size) { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } + while ((nr = read(from_fd, buf, bufsize)) > 0) { + if ((nw = write(to_fd, buf, nr)) != nr) { serrno = errno; (void)unlink(to_name); if (nw >= 0) { errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, (uintmax_t)size); + "short write to %s: %jd bytes written, " + "%jd bytes asked to write", + to_name, (uintmax_t)nw, + (uintmax_t)size); } else { errno = serrno; err(EX_OSERR, "%s", to_name); } } - digest_update(&ctx, p, size); - (void)munmap(p, size); - done_copy = 1; + digest_update(&ctx, buf, nr); } - if (!done_copy) { - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); - else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize); - if (buf == NULL) - err(1, "Not enough memory"); - } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { - serrno = errno; - (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { - errno = serrno; - err(EX_OSERR, "%s", to_name); - } - } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); - } + if (nr != 0) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", from_name); } if (safecopy && fsync(to_fd) == -1) { serrno = errno; @@ -1600,29 +1463,3 @@ usage(void) exit(EX_USAGE); /* NOTREACHED */ } - -/* - * trymmap -- - * return true (1) if mmap should be tried, false (0) if not. - */ -static int -trymmap(size_t filesize) -{ - /* - * This function existed to skip mmap() for NFS file systems whereas - * nowadays mmap() should be perfectly safe. Nevertheless, using mmap() - * only reduces the number of system calls if we need multiple read() - * syscalls, i.e. if the file size is > MAXBSIZE. However, mmap() is - * more expensive than read() so set the threshold at 4 fewer syscalls. - * Additionally, for larger file size mmap() can significantly increase - * the number of page faults, so avoid it in that case. - * - * Note: the 8MB limit is not based on any meaningful benchmarking - * results, it is simply reusing the same value that was used before - * and also matches bin/cp. - * - * XXX: Maybe we shouldn't bother with mmap() at all, since we use - * MAXBSIZE the syscall overhead of read() shouldn't be too high? - */ - return (filesize > 4 * MAXBSIZE && filesize < 8 * 1024 * 1024); -} From nobody Sat Apr 27 14:58:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRXm924Xmz5JGsp; Sat, 27 Apr 2024 14:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRXm90gdbz42rk; Sat, 27 Apr 2024 14:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+PV8hAxpO41QDGF3mgogNU0h8qSxcOUg7eRciShvbc=; b=aaPT+1cV6x/HKb8uvrHkH2s3bNBu3pLQ4e5+AQgmoCQ3wrTwOwtfXovMTOvpSsl5/i3YVR 4ZypdHU7Xol1BA6zqgfm+GdVZ331t0fT4wijSbrFftxZ/aKBooPR9vaRJE1wpVB4h/I2vw CZJJhHm5UR9kap+jm4Or0x25Z1cjdUdPLTEXCmzQp2gf5DytRp1qs0xPGD4mJjm4ogyGjN A/zrij5GBr/vGXhSFpX5Ww48S19lQ+rc4cUZ65DLS3+z5GWBO2ZFjHCai5yKPCaX95XIMf RO0vaTfUjoeGe6Twq3Txfignz1bK3ZkM98qEaDqWUgH7nej80CHV7MV3XKnJMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229929; a=rsa-sha256; cv=none; b=kzf+2GbNKID22U913gxIgs+9UFnEoTZd51ZhQUj1cbNrAjxsGvkxuZSRf7lsZcNL4+0ijZ y0hw4m3dPetJzyeiIAI+B2RWiNc38dh15wYc8DqlWTU2BUsCNKH16S6GBMxV+oUNqZ1rQF 6AyhF82FaeraNvTQHYonQSv3w9G5eqkSUOP/rFTgB5XMbvTQbfyTqf5OIcLPhzC87EkpZV ZAbf9EOLvM2bsACtEcm/iOlRPB2wDWCF7EDsLnDXiVVGMLbAChGcHsGeu2KUcxp0A22utA PUlvmpOmp4dnJtCUsmc8eUQk1Od6n4o3zKV1RNVoc40oCFpG0BOL/CBnuGLSCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+PV8hAxpO41QDGF3mgogNU0h8qSxcOUg7eRciShvbc=; b=oInqOgCL01Bmxce74Vs/nqefakxVhhzuIAH/ZHTdWAKam6iZgafh4y8OHxewxWOAX+J2XR etdQrE+uQ8AI3woGfU864s286FQxpZo6kiBQ9/4HuG6OWbDJUnBhsE22gnci4Rr0SXSLMr 0/MpeDWt1IWFdeud8vnzCRzP4mY/Jla1fhsSneaCImBk2WrQWrcBKnVmAospoi31P2La/R /PS6rYcRHPrjvIXhdgGGqNQVoSMBnXiBtImjSq8rH5Ac4Z4w+0vRBMaw3YadkzYEodslAw mZczqLXw3gTP0arxzmPgM4eTbTGwMFShcvkAZYr9bnPaTDDm6kUCg4EjWgraFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm868lSzWlD; Sat, 27 Apr 2024 14:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43REwmFI032623; Sat, 27 Apr 2024 14:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwmsr032620; Sat, 27 Apr 2024 14:58:48 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:48 GMT Message-Id: <202404271458.43REwmsr032620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 17997507040c - stable/13 - cp: Clarify an obscure 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17997507040c4ad1c6a25ce93c3981ee19ce28c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17997507040c4ad1c6a25ce93c3981ee19ce28c0 commit 17997507040c4ad1c6a25ce93c3981ee19ce28c0 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 cp: Clarify an obscure comment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44805 (cherry picked from commit 64d6925d1901637125f9f739282e72c992657dc8) cp: Additional sanity check. Once we've successfully opened the file we've been asked to copy, check that it's of the same type as FTS told us it was. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44806 (cherry picked from commit 9075d4cfad5b339aabdf8033623a2164898c2786) cp: Use warnc(). MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit f070188c3ad6b87ee9ce220b21718333d1bd9d52) --- bin/cp/cp.c | 13 +++++++++---- bin/cp/utils.c | 27 ++++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index af7d5ffac398..a8c57308ae96 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -316,8 +316,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) case FTS_NS: case FTS_DNR: case FTS_ERR: - warnx("%s: %s", - curr->fts_path, strerror(curr->fts_errno)); + warnc(curr->fts_errno, "%s", curr->fts_path); badcp = rval = 1; continue; case FTS_DC: /* Warn, continue. */ @@ -491,13 +490,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) switch (curr->fts_statp->st_mode & S_IFMT) { case S_IFLNK: - /* Catch special case of a non-dangling symlink. */ if ((fts_options & FTS_LOGICAL) || ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) { + /* + * We asked FTS to follow links but got + * here anyway, which means the target is + * nonexistent or inaccessible. Let + * copy_file() deal with the error. + */ if (copy_file(curr, dne)) badcp = rval = 1; - } else { + } else { + /* Copy the link. */ if (copy_link(curr, !dne)) badcp = rval = 1; } diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 0bb5157e3f57..9f6ef888c7ea 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -106,21 +106,34 @@ copy_fallback(int from_fd, int to_fd) int copy_file(const FTSENT *entp, int dne) { - struct stat *fs; + struct stat sb, *fs; ssize_t wcount; off_t wtotal; int ch, checkch, from_fd, rval, to_fd; int use_copy_file_range = 1; + fs = entp->fts_statp; from_fd = to_fd = -1; - if (!lflag && !sflag && - (from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { - warn("%s", entp->fts_path); - return (1); + if (!lflag && !sflag) { + if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 || + fstat(from_fd, &sb) != 0) { + warn("%s", entp->fts_path); + return (1); + } + /* + * Check that the file hasn't been replaced with one of a + * different type. This can happen if we've been asked to + * copy something which is actively being modified and + * lost the race, or if we've been asked to copy something + * like /proc/X/fd/Y which stat(2) reports as S_IFREG but + * is actually something else once you open it. + */ + if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) { + warnx("%s: File changed", entp->fts_path); + return (1); + } } - fs = entp->fts_statp; - /* * If the file exists and we're interactive, verify with the user. * If the file DNE, set the mode to be the from file, minus setuid From nobody Sat Apr 27 17:30:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRc781ntPz5JX58 for ; Sat, 27 Apr 2024 17:30:28 +0000 (UTC) (envelope-from 0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com) Received: from a8-60.smtp-out.amazonses.com (a8-60.smtp-out.amazonses.com [54.240.8.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRc773bLXz4YwL for ; Sat, 27 Apr 2024 17:30:27 +0000 (UTC) (envelope-from 0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=dqtolf56kk3wpt62c3jnwboqvr7iedax header.b=hSMRFKko; dkim=pass header.d=amazonses.com header.s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug header.b="h+/da7F3"; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com designates 54.240.8.60 as permitted sender) smtp.mailfrom=0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1714239026; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=Dkr68mq1vgLIE8VRfoy5aUGus+HiWuoWQ1rdVOlO0iA=; b=hSMRFKkoXHewKAlopeHBhKaLgjz/WFnxm4CY/M9X7ndPQS/PV9Z+beGTubPKgJKI 0ufGytXmptr4M6S4MA9mYXYO6wueEcoPwqpPuBU69kDmR9VxBwu1mj7BTlgxtI9xBv/ 6yrdIk0XKSWxzta4LBAd9uq0Fy5Gcnr8/7wH+gmc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1714239026; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=Dkr68mq1vgLIE8VRfoy5aUGus+HiWuoWQ1rdVOlO0iA=; b=h+/da7F3RDlfffyG37AUumdTqyXB9ZgRhaclkRd6Gb7nbab/pOBP0WwKCXJdi6IC NkiKgwXeZdw5bHn+uFUOtpZga1FZ3hvrj4T36AG//pjU5wzf4i+9X/oSo2V3CqbXhhU +Zx6b1t20FRLN9/s4ZD/VdvpxJNoSDr3XWFCh5TY= Message-ID: <0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@email.amazonses.com> Date: Sat, 27 Apr 2024 17:30:25 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a87dd74125d2 - main - scmi: Add an SCMI VirtIO transport driver To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202404110959.43B9xVBJ090851@gitrepo.freebsd.org> Content-Language: en-US Cc: Isaac Cilia Attard From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202404110959.43B9xVBJ090851@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.04.27-54.240.8.60 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.38 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=dqtolf56kk3wpt62c3jnwboqvr7iedax,amazonses.com:s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug]; RWL_MAILSPIKE_VERYGOOD(-0.20)[54.240.8.60:from]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.60:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100018f209bb336-8c67fe6d-09d3-4ec3-84ec-9f442360c28b-000000@amazonses.com]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4VRc773bLXz4YwL Hi Andrew, It looks like this breaks arm64 kernel configs without 'device virtio_scmi' since sys/dev/firmware/arm/scmi_virtio.c (which is 'optional fdt scmi') uses functions from sys/dev/virtio/scmi/virtio_scmi.c (which is 'optional virtio_scmi'). In particular, the "ARM" kernel configuration (whcih has std.dev and std.arm but not std.virt) breaks. Reported by Isaac Cilia Attard (CCed). Colin Percival On 4/11/24 02:59, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a87dd74125d290791d7259ceeab9507bada9987e > > commit a87dd74125d290791d7259ceeab9507bada9987e > Author: Cristian Marussi > AuthorDate: 2023-10-23 18:07:06 +0000 > Commit: Andrew Turner > CommitDate: 2024-04-11 09:58:57 +0000 > > scmi: Add an SCMI VirtIO transport driver > > Add an SCMI transport driver based on the virtio-scmi backend. > > Reviewed by: andrew, bryanv > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D43048 > --- > sys/conf/files.arm64 | 1 + > sys/dev/firmware/arm/scmi.c | 15 +- > sys/dev/firmware/arm/scmi.h | 2 + > sys/dev/firmware/arm/scmi_virtio.c | 298 +++++++++++++++++++++++++++++++++++++ > 4 files changed, 313 insertions(+), 3 deletions(-) > > diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 > index a22ffa2b7f0c..632fbab5070d 100644 > --- a/sys/conf/files.arm64 > +++ b/sys/conf/files.arm64 > @@ -275,6 +275,7 @@ dev/firmware/arm/scmi_clk.c optional fdt scmi > dev/firmware/arm/scmi_if.m optional fdt scmi > dev/firmware/arm/scmi_mailbox.c optional fdt scmi > dev/firmware/arm/scmi_smc.c optional fdt scmi > +dev/firmware/arm/scmi_virtio.c optional fdt scmi > dev/firmware/arm/scmi_shmem.c optional fdt scmi > > dev/gpio/pl061.c optional pl061 gpio > diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c > index 945c2b2e9f6e..ef4bcbf13996 100644 > --- a/sys/dev/firmware/arm/scmi.c > +++ b/sys/dev/firmware/arm/scmi.c > @@ -484,10 +484,19 @@ scmi_process_response(struct scmi_softc *sc, uint32_t hdr) > > mtx_lock_spin(&req->mtx); > req->done = true; > - if (!req->timed_out) > - wakeup(req); > - else > + if (!req->timed_out) { > + /* > + * Consider the case in which a polled message is picked > + * by chance on the IRQ path on another CPU: setting poll_done > + * will terminate the other poll loop. > + */ > + if (!req->msg.polling) > + wakeup(req); > + else > + atomic_store_rel_int(&req->msg.poll_done, 1); > + } else { > timed_out = true; > + } > mtx_unlock_spin(&req->mtx); > > if (timed_out) > diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h > index 572422594292..345ae6eeb03a 100644 > --- a/sys/dev/firmware/arm/scmi.h > +++ b/sys/dev/firmware/arm/scmi.h > @@ -62,12 +62,14 @@ struct scmi_softc { > > struct scmi_msg { > bool polling; > + int poll_done; > uint32_t tx_len; > uint32_t rx_len; > #define SCMI_MSG_HDR_SIZE (sizeof(uint32_t)) > uint32_t hdr; > uint8_t payld[]; > }; > +#define hdr_to_msg(h) __containerof((h), struct scmi_msg, hdr) > > void *scmi_buf_get(device_t dev, uint8_t protocol_id, uint8_t message_id, > int tx_payd_sz, int rx_payld_sz); > diff --git a/sys/dev/firmware/arm/scmi_virtio.c b/sys/dev/firmware/arm/scmi_virtio.c > new file mode 100644 > index 000000000000..12cbb9ecefd5 > --- /dev/null > +++ b/sys/dev/firmware/arm/scmi_virtio.c > @@ -0,0 +1,298 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2023 Arm Ltd > + * > + * 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 "scmi.h" > +#include "scmi_protocols.h" > + > +#define SCMI_VIRTIO_POLLING_INTERVAL_MS 2 > + > +struct scmi_virtio_softc { > + struct scmi_softc base; > + device_t virtio_dev; > + int cmdq_sz; > + int evtq_sz; > + void *p2a_pool; > +}; > + > +static void scmi_virtio_callback(void *, unsigned int, void *); > +static void *scmi_virtio_p2a_pool_init(device_t, unsigned int); > +static int scmi_virtio_transport_init(device_t); > +static void scmi_virtio_transport_cleanup(device_t); > +static int scmi_virtio_xfer_msg(device_t, struct scmi_msg *); > +static int scmi_virtio_poll_msg(device_t, struct scmi_msg *, unsigned int); > +static void scmi_virtio_clear_channel(device_t, void *); > +static int scmi_virtio_probe(device_t); > +static int scmi_virtio_attach(device_t); > + > +static void > +scmi_virtio_callback(void *msg, unsigned int len, void *priv) > +{ > + struct scmi_virtio_softc *sc; > + uint32_t hdr; > + > + sc = priv; > + > + if (msg == NULL || len < sizeof(hdr)) { > + device_printf(sc->virtio_dev, "Ignoring malformed message.\n"); > + return; > + } > + > + hdr = le32toh(*((uint32_t *)msg)); > + scmi_rx_irq_callback(sc->base.dev, msg, hdr); > +} > + > +static void * > +scmi_virtio_p2a_pool_init(device_t dev, unsigned int max_msg) > +{ > + struct scmi_virtio_softc *sc; > + void *pool; > + uint8_t *buf; > + int i; > + > + sc = device_get_softc(dev); > + > + pool = mallocarray(max_msg, SCMI_MAX_MSG_SIZE, M_DEVBUF, > + M_ZERO | M_WAITOK); > + > + for (i = 0, buf = pool; i < max_msg; i++, buf += SCMI_MAX_MSG_SIZE) { > + /* Feed platform with pre-allocated P2A buffers */ > + virtio_scmi_message_enqueue(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_P2A, buf, 0, SCMI_MAX_MSG_SIZE); > + } > + > + device_printf(dev, > + "Fed %d initial P2A buffers to platform.\n", max_msg); > + > + return (pool); > +} > + > +static void > +scmi_virtio_clear_channel(device_t dev, void *msg) > +{ > + struct scmi_virtio_softc *sc; > + > + sc = device_get_softc(dev); > + virtio_scmi_message_enqueue(sc->virtio_dev, VIRTIO_SCMI_CHAN_P2A, > + msg, 0, SCMI_MAX_MSG_SIZE); > +} > + > +static int > +scmi_virtio_transport_init(device_t dev) > +{ > + struct scmi_virtio_softc *sc; > + int ret; > + > + sc = device_get_softc(dev); > + > + sc->cmdq_sz = virtio_scmi_channel_size_get(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_A2P); > + sc->evtq_sz = virtio_scmi_channel_size_get(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_P2A); > + > + if (!sc->cmdq_sz) { > + device_printf(dev, > + "VirtIO cmdq virtqueue not found. Aborting.\n"); > + return (ENXIO); > + } > + > + /* > + * P2A buffers are owned by the platform initially; allocate a feed an > + * appropriate number of buffers. > + */ > + if (sc->evtq_sz != 0) { > + sc->p2a_pool = scmi_virtio_p2a_pool_init(dev, sc->evtq_sz); > + if (sc->p2a_pool == NULL) > + return (ENOMEM); > + } > + > + /* Note that setting a callback also enables that VQ interrupts */ > + ret = virtio_scmi_channel_callback_set(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_A2P, scmi_virtio_callback, sc); > + if (ret) { > + device_printf(dev, "Failed to set VirtIO cmdq callback.\n"); > + return (ENXIO); > + } > + > + device_printf(dev, > + "VirtIO cmdq virtqueue configured - cmdq_sz:%d\n", sc->cmdq_sz); > + > + /* P2A channel is optional */ > + if (sc->evtq_sz) { > + ret = virtio_scmi_channel_callback_set(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_P2A, scmi_virtio_callback, sc); > + if (ret == 0) { > + device_printf(dev, > + "VirtIO evtq virtqueue configured - evtq_sz:%d\n", > + sc->evtq_sz); > + } else { > + device_printf(dev, > + "Failed to set VirtIO evtq callback.Skip.\n"); > + sc->evtq_sz = 0; > + } > + } > + > + sc->base.trs_desc.reply_timo_ms = 100; > + > + return (0); > +} > + > +static void > +scmi_virtio_transport_cleanup(device_t dev) > +{ > + struct scmi_virtio_softc *sc; > + > + sc = device_get_softc(dev); > + > + if (sc->evtq_sz != 0) { > + virtio_scmi_channel_callback_set(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_P2A, NULL, NULL); > + free(sc->p2a_pool, M_DEVBUF); > + } > + > + virtio_scmi_channel_callback_set(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_A2P, NULL, NULL); > +} > + > +static int > +scmi_virtio_xfer_msg(device_t dev, struct scmi_msg *msg) > +{ > + struct scmi_virtio_softc *sc; > + > + sc = device_get_softc(dev); > + > + return (virtio_scmi_message_enqueue(sc->virtio_dev, > + VIRTIO_SCMI_CHAN_A2P, &msg->hdr, msg->tx_len, msg->rx_len)); > +} > + > +static int > +scmi_virtio_poll_msg(device_t dev, struct scmi_msg *msg, unsigned int tmo_ms) > +{ > + struct scmi_virtio_softc *sc; > + device_t vdev; > + int tmo_loops; > + > + sc = device_get_softc(dev); > + vdev = sc->virtio_dev; > + > + tmo_loops = tmo_ms / SCMI_VIRTIO_POLLING_INTERVAL_MS; > + while (tmo_loops-- && atomic_load_acq_int(&msg->poll_done) == 0) { > + struct scmi_msg *rx_msg; > + void *rx_buf; > + uint32_t rx_len; > + > + rx_buf = virtio_scmi_message_poll(vdev, &rx_len); > + if (rx_buf == NULL) { > + DELAY(SCMI_VIRTIO_POLLING_INTERVAL_MS * 1000); > + continue; > + } > + > + rx_msg = hdr_to_msg(rx_buf); > + rx_msg->rx_len = rx_len; > + /* Complete the polling on any poll path */ > + if (rx_msg->polling) > + atomic_store_rel_int(&rx_msg->poll_done, 1); > + > + if (__predict_true(rx_msg == msg)) > + break; > + > + /* > + * Polling returned an unexpected message: either a message > + * polled by some other thread of execution or a message not > + * supposed to be polled. > + */ > + device_printf(dev, "POLLED OoO HDR:|%08X| - polling:%d\n", > + rx_msg->hdr, rx_msg->polling); > + > + if (!rx_msg->polling) > + scmi_rx_irq_callback(sc->base.dev, rx_msg, rx_msg->hdr); > + } > + > + return (tmo_loops > 0 ? 0 : ETIMEDOUT); > +} > + > +static int > +scmi_virtio_probe(device_t dev) > +{ > + if (!ofw_bus_is_compatible(dev, "arm,scmi-virtio")) > + return (ENXIO); > + > + if (!ofw_bus_status_okay(dev)) > + return (ENXIO); > + > + device_set_desc(dev, "ARM SCMI VirtIO Transport driver"); > + > + return (BUS_PROBE_DEFAULT); > +} > + > +static int > +scmi_virtio_attach(device_t dev) > +{ > + struct scmi_virtio_softc *sc; > + > + sc = device_get_softc(dev); > + sc->virtio_dev = virtio_scmi_transport_get(); > + if (sc->virtio_dev == NULL) > + return (1); > + > + /* When attach fails there is nothing to cleanup*/ > + return (scmi_attach(dev)); > +} > + > +static device_method_t scmi_virtio_methods[] = { > + DEVMETHOD(device_probe, scmi_virtio_probe), > + DEVMETHOD(device_attach, scmi_virtio_attach), > + > + /* SCMI interface */ > + DEVMETHOD(scmi_transport_init, scmi_virtio_transport_init), > + DEVMETHOD(scmi_transport_cleanup, scmi_virtio_transport_cleanup), > + DEVMETHOD(scmi_xfer_msg, scmi_virtio_xfer_msg), > + DEVMETHOD(scmi_poll_msg, scmi_virtio_poll_msg), > + DEVMETHOD(scmi_clear_channel, scmi_virtio_clear_channel), > + > + DEVMETHOD_END > +}; > + > +DEFINE_CLASS_1(scmi_virtio, scmi_virtio_driver, scmi_virtio_methods, > + sizeof(struct scmi_virtio_softc), scmi_driver); > + > +/* Needs to be after the mmio_sram driver */ > +DRIVER_MODULE(scmi_virtio, simplebus, scmi_virtio_driver, 0, 0); > +MODULE_VERSION(scmi_virtio, 1); > -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sat Apr 27 17:46:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRcTh357Yz5JYQH; Sat, 27 Apr 2024 17:46: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 4VRcTg6fHxz4cg0; Sat, 27 Apr 2024 17:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714239991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJ8quz4v64ffauJq07kQYdegH9cebyDCQoonxRBugEQ=; b=vSk/4GSSGtDzGlJM/MqBxvO0yBRwwVm9TLSDXBNdMJoSXMFR1avHD1ksZG/RUJs4Zp/mWC /snkiyaScQbwT6zgnPG4C0djjLyxEwKV4U8gDbc1rLuBMOJTNFy5WJ48A2e7d6bNqqX1UX H0MSakvO2pGM/Un2CaHV3e4vYZTu8TnMNwIwMdlJJBeg7IG9X4IqemCWv/lJK1bRd3UES1 dM+nlOciqR0qnwYvH1EVE6Kju2A3yWZDeN1Z++HBnqYRc+ZcEbbSPGoD2+yyIPaSc2zOS7 tM2fILkx1jBiV9Xb5Opdfb840OM3OrgRlGTZMe5z90D84uywvEktR4jg0ju1Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714239991; a=rsa-sha256; cv=none; b=swDaApWuLkODQ1HTL/2vrKLDlK6lxuTJSfv+vR76zWLlAzrVYZjswYsvr65JfW4wKnWUxq l/VXpU63goIC7xkY5aAoThkjnFE+AmUUpi6WalhD7WpZvU9mr24HLJHD8aBGNgx3qxq/OG vhlEOYgJVyKGLjI+Zyu5WIzML6sqQbRBWWH805OmLnWuTdM8bvbTlXE68/BK3EShrGcixB YhFCNsO7PidXAmcRZYFHGc9JCVgSIkirZPNDhSt5CAqHAcTSGch80R94K43cI26Y0EW7UN 1PMkok6KmWr9HRaj5u5nh7nhbupuQHW+qCK+RrCXSg1sNhYsEtRfJVcsHIZTaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714239991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJ8quz4v64ffauJq07kQYdegH9cebyDCQoonxRBugEQ=; b=fTJNy5uV+3Qs+oRSZan8w8Zi3ySeqH6I4LIWLD7abUFyLPCYBq+n9rLfrT6UBT4Q49MGmR dm51cQARM2SQlq8u6/mtCrqQt0bUjRTPJyJS1VZJGxNzDbRaLYKcH02GlI53EI6a1XH10/ ZNrGLSylm2O3cbrvTTFZ5ve+Odk3gDlJSY07kC2mfp6907pUbgveNZDrfldbx3OGKuBv6E K9+HyFosWG/LNut/cQpHQFhLl/8efe91lzEqS5b4JD2CPOSG0hcLmEdJZVrOWI7tcgxh0y nCqbhO+cT0w92JA1nGIbNgi3e8M28BXUCpz0LBxEPGqgZhwqB4IpYA4a/H/KuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRcTg6FSZzrPB; Sat, 27 Apr 2024 17:46: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 43RHkVmL020324; Sat, 27 Apr 2024 17:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RHkVLN020321; Sat, 27 Apr 2024 17:46:31 GMT (envelope-from git) Date: Sat, 27 Apr 2024 17:46:31 GMT Message-Id: <202404271746.43RHkVLN020321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: c8d6c9351a92 - stable/14 - unionfs_lookup(): fix wild accesses to vnode private data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8d6c9351a9255becf3a772be441d4648b998306 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d6c9351a9255becf3a772be441d4648b998306 commit c8d6c9351a9255becf3a772be441d4648b998306 Author: Jason A. Harmening AuthorDate: 2024-02-18 00:19:32 +0000 Commit: Jason A. Harmening CommitDate: 2024-04-27 17:42:36 +0000 unionfs_lookup(): fix wild accesses to vnode private data There are a few spots in which unionfs_lookup() accesses unionfs vnode private data without holding the corresponding vnode lock or interlock. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44601 (cherry picked from commit b18029bc59d2ed6b0eeeb233189cf713b34b467c) --- sys/fs/unionfs/union_vnops.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 5a2d4751ed4f..eff437fbcad3 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -81,7 +81,7 @@ static int unionfs_lookup(struct vop_cachedlookup_args *ap) { - struct unionfs_node *dunp; + struct unionfs_node *dunp, *unp; struct vnode *dvp, *udvp, *ldvp, *vp, *uvp, *lvp, *dtmpvp; struct vattr va; struct componentname *cnp; @@ -141,6 +141,9 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (dtmpvp == udvp && ldvp != NULLVP) { VOP_UNLOCK(udvp); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); + dunp = VTOUNIONFS(dvp); + if (error == 0 && dunp == NULL) + error = ENOENT; } if (error == 0) { @@ -154,14 +157,15 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) VOP_UNLOCK(vp); vrele(vp); + dtmpvp = dunp->un_dvp; + vref(dtmpvp); VOP_UNLOCK(dvp); - *(ap->a_vpp) = dunp->un_dvp; - vref(dunp->un_dvp); + *(ap->a_vpp) = dtmpvp; if (nameiop == DELETE || nameiop == RENAME) - vn_lock(dunp->un_dvp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(dtmpvp, LK_EXCLUSIVE | LK_RETRY); else if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(dunp->un_dvp, cnp->cn_lkflags | + vn_lock(dtmpvp, cnp->cn_lkflags | LK_RETRY); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); @@ -274,8 +278,12 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); lockflag = 1; } - error = unionfs_mkshadowdir(MOUNTTOUNIONFSMOUNT(dvp->v_mount), - udvp, VTOUNIONFS(vp), cnp, td); + unp = VTOUNIONFS(vp); + if (unp == NULL) + error = ENOENT; + else + error = unionfs_mkshadowdir(MOUNTTOUNIONFSMOUNT(dvp->v_mount), + udvp, unp, cnp, td); if (lockflag != 0) VOP_UNLOCK(vp); if (error != 0) { From nobody Sat Apr 27 18:55:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRf145NRDz5Jg2v; Sat, 27 Apr 2024 18:55: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 4VRf144sNbz4n8b; Sat, 27 Apr 2024 18:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714244120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXXN3EsqW0/5RddiVjDBZ+d8djSiJpV+pUehKFyAMYU=; b=sy9LaObxtHUzTRyHMSH06wBUmPXFe+5X/M7MuCPs/n/Al2A7IFOQ/92w5U7/qFzkfKqZEZ iixBxcCF6PIk04p/gUk04XVDrwtNglIQtNNSpx6iXQolJY4FtBONfKchFj8G3+DPjnuP2Q +D2SJfbr2/UC+0DDYsyFdd3GtIAGwAnUtVMlow7JaLrXnmib1EnVXCTcCUGT2aR8hi6ynm r2kPaZdq+QaH6Aaix00wFAVHczJzsOfI7n2r5yohvLtVbluz14PokYYE5hIsCZrDdUr4lF D994C5Chweh8EF4I8ra4eLftbuf0gkWo/6Me1sdutZ+hwQcqQyockyWMP9rzsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714244120; a=rsa-sha256; cv=none; b=V3MVuE8JL5z0YjPmYjR851NqkHe2xKS5d3MUxJ7twQ9+jJQSKQct/m5InwFaT5L2pyPR/n 8u+JOf97f7m/fjLJ6um68wxtL2Q7NXMLzzWJmCURCjOjKbu2Y723Rb8LP3riMNXKw5sUnW EDtQ+1NhaMVTOI+lM1inc4FdepwVoY0uO+HuXbgNnx4n05pC5+hR2rrA2Y8BR06z7QcVk8 ZNnH6VbKigF61gf/Vld0R/2T+rH4ljFj66iCruoN2DqLK2ELjESSXXZ9dFYhcBGnuEMBmp 68+X7jxorpBE/lNaLxu5AI8H7biguXq9w3D6d8I0P0vKAENdj8ynlfTQQLUong== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714244120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXXN3EsqW0/5RddiVjDBZ+d8djSiJpV+pUehKFyAMYU=; b=g+Oaf3yB8uvHfb9lq3U6VgMo8ts0ZIkxcSSKmZAKVbtiPUUqcgihDZvQsn7TszcXfuG19/ PdX8rvc0RSuZj9+Fi+WvlBH88PDl+QVLGCVfACl/xhN3YL2C6pOWIKJonmqtAjGn1OjWGE 2urqAw0yj39TGNSpc/IF+Cvm8xw0O8X6sECJrn2wkNbjQzubatNwbF6yEGQxBoZC3I1mSE 1vjn/0qg5/l6UWb9PNFNG2xjzQnjZWj2Spnn/FnAX1Om3KBg9IBJmtSK3W02aNysiZMDs1 VbBjzT66TZxP4uA5H4gd51mXUMI696hlPmQUHOXQ1JLTkiFD0JuPWRmaQFVxKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRf144Jx9zt6W; Sat, 27 Apr 2024 18:55: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 43RItKeH038413; Sat, 27 Apr 2024 18:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RItKx3038410; Sat, 27 Apr 2024 18:55:20 GMT (envelope-from git) Date: Sat, 27 Apr 2024 18:55:20 GMT Message-Id: <202404271855.43RItKx3038410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 6e74b603fc02 - main - uuidgen(1): Add EXAMPLES to 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e74b603fc021761c0a20e08f58b674f45ad5f04 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=6e74b603fc021761c0a20e08f58b674f45ad5f04 commit 6e74b603fc021761c0a20e08f58b674f45ad5f04 Author: Fernando Apesteguía AuthorDate: 2023-09-07 15:17:38 +0000 Commit: Fernando Apesteguía CommitDate: 2024-04-27 18:53:59 +0000 uuidgen(1): Add EXAMPLES to manual page Approved by: manpages@ (gbe@) Reviewed by: gbe@, pauamma Differential Revision: https://reviews.freebsd.org/D43494 --- bin/uuidgen/uuidgen.1 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 51475c900bbc..1c2e7cce91d3 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -77,6 +77,30 @@ to each other, but operating system latency and processing time will be reflected in the distance between two successive identifiers. .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Generate a batch of three UUIDs. +Notice the similarity of the string before the first hyphen of the UUID +(known as +.Em time_low +in +.Em rfc4122 +): +.Bd -literal -offset indent +$ uuidgen -n3 +8bc44345-4d90-11ee-88c7-b42e991fc52e +8bc44346-4d90-11ee-88c7-b42e991fc52e +8bc44347-4d90-11ee-88c7-b42e991fc52e +.Ed +.Pp +Generate a batch of random UUIDs without hyphens: +.Bd -literal -offset indent +$ uuidgen -r -c -n3 +5ad8b60a0f4e41f59c82d273202275f9 +6c41925486cd4bf59720a5bad85de2e4 +8144fdab63f648a1812d12453f975313 +.Ed +.Pp +Notice that the UUIDs are not similar to each other. .Sh SEE ALSO .Xr uuidgen 2 , .Xr uuid 3 From nobody Sun Apr 28 00:12:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRn2j4m1Hz5K8KP; Sun, 28 Apr 2024 00:12: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 4VRn2j4bCTz4P9k; Sun, 28 Apr 2024 00:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714263133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=920bU7Y3n9lgRu2s/yWYYK4Z4IYIyCNmnuLYFvaT9A4=; b=Xxgp0QVzv7CkurulNelzNEVKs+Qa1N0g96wWN4Xav0CM0lZ2icZK/gCWA4nBLWMMJhD3ud zSj9D/JjP3lk9T5/4FtQIHgaw9Xpp/CCZL9PJiHBk0A35NDXKk8xTjxc4IE4wqkTOFNsRT WQLjy3+gWStcYnhzy+fqNNOfYGdMfwWoX/BVfNA24OtxupGUGwICo9Gfwkb6rZSwsJNLi3 tqC7vm8uzDId5sKYVNXld/WSdymeSVWNg8TlW+URJ/S8wrKcdiEYP1JTiizwq16FBm2gC+ 070mq2XgcTEuUzUSZ8xFWf6LJwV7wDU4Aysmr3tqMWrkMEi2KTUd67QjY6xE9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714263133; a=rsa-sha256; cv=none; b=yW337IsBiH7qmlXdLubEr/j6qAYf7cahDegcpr2i38um4Us1MmwlqpSI9ihJej4i1VGWZP RRYXiYjadqeBFTmhyMIMcclD7XhhP1EkhPHjMsMLTaIrS0FlxDjkZkGOfmQEVaaDMLlWKt P/zsLgmacdMj4Miy3ijF9T64ebU8eGghSEPANdsnfawT2RfL2Xshsd2sFUjihmNvjz9OQg 35fb7N9GDEASENf8sR6rR/Q14Lb0f+scSeSPIxVkckAv7oC+IkZryDZNdWg3QkSIa/Ajor PIGDcqD/zH2alxuZMfcLCwrBbdI9xLziazOsKGsQ1+99mhkWQ3WXnQZGe7HF5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714263133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=920bU7Y3n9lgRu2s/yWYYK4Z4IYIyCNmnuLYFvaT9A4=; b=Z4w9jLPwAk8ZxItdg71OUi3EXLRO3cfzhT9303FZvQS2xyaHIsuoD3fGLMTLOWdDNE18gM w91jr0il86InneHFv6sDnXdb/MyJShhZ0NeQCIKvXXAZQJ8TJlDiVT65G3VHfwe93Q2l9O aI5XnNq4/0x+ePdBQryi0+pekbhYW7Cd0b33jo3n/WWhVsCWWM776CEya1YCjVC5Zo/Lak Uw5vdx8ML9HLeXui8tPkn80ZVHYwh4NjTvfWYK1eYzFODZNL2NXsjhbC24xQBJqNJX5FRX 7yqjZwHmwSxFwu6LTxmgwpLf6VZFoRfDO9st6JCKpwRNubAsL0GncL5+A3GEpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRn2j3tW2z130Z; Sun, 28 Apr 2024 00:12: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 43S0CDtT077958; Sun, 28 Apr 2024 00:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S0CDKd077955; Sun, 28 Apr 2024 00:12:13 GMT (envelope-from git) Date: Sun, 28 Apr 2024 00:12:13 GMT Message-Id: <202404280012.43S0CDKd077955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 03a39a17089a - main - nfscl: Clear out a lot of cruft related to B_DIRECT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03a39a17089adc1d0e28076670e664dcdebccf73 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=03a39a17089adc1d0e28076670e664dcdebccf73 commit 03a39a17089adc1d0e28076670e664dcdebccf73 Author: Rick Macklem AuthorDate: 2024-04-28 00:10:48 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 00:10:48 +0000 nfscl: Clear out a lot of cruft related to B_DIRECT There is only one place in the unpatched sources where B_DIRECT is set in the NFS client and this code is never executed. As such, this patch removes this code that is never executed, since B_DIRECT should never be set. During a IETF testing event this week, I saw a crash in ncl_doio_directwrite(), but this function is only called if B_DIRECT is set. I cannot explain how ncl_doio_directwrite() got called, but once this patch was applied to the sources, the crash did not recur. This is not surprising, since this patch deleted the function. Reviewed by: kib, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44980 --- sys/fs/nfs/nfs_commonport.c | 1 - sys/fs/nfs/nfsport.h | 2 - sys/fs/nfsclient/nfs.h | 1 - sys/fs/nfsclient/nfs_clbio.c | 237 ++++++++-------------------------------- sys/fs/nfsclient/nfs_clnfsiod.c | 19 ++-- sys/fs/nfsclient/nfs_clvnops.c | 24 +--- sys/fs/nfsclient/nfsnode.h | 3 - 7 files changed, 57 insertions(+), 230 deletions(-) diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c index cfceaf604b13..2db9af5b9ea9 100644 --- a/sys/fs/nfs/nfs_commonport.c +++ b/sys/fs/nfs/nfs_commonport.c @@ -121,7 +121,6 @@ MALLOC_DEFINE(M_NEWNFSCLCLIENT, "NFSCL client", "NFSCL Client"); MALLOC_DEFINE(M_NEWNFSCLLOCKOWNER, "NFSCL lckown", "NFSCL Lock Owner"); MALLOC_DEFINE(M_NEWNFSCLLOCK, "NFSCL lck", "NFSCL Lock"); MALLOC_DEFINE(M_NEWNFSV4NODE, "NEWNFSnode", "NFS vnode"); -MALLOC_DEFINE(M_NEWNFSDIRECTIO, "NEWdirectio", "NFS Direct IO buffer"); MALLOC_DEFINE(M_NEWNFSDIROFF, "NFSCL diroff", "NFS directory offset data"); MALLOC_DEFINE(M_NEWNFSDROLLBACK, "NFSD rollback", diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 7e88ccdaffa1..0b16ba9b85a8 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -938,7 +938,6 @@ MALLOC_DECLARE(M_NEWNFSCLLOCKOWNER); MALLOC_DECLARE(M_NEWNFSCLLOCK); MALLOC_DECLARE(M_NEWNFSDIROFF); MALLOC_DECLARE(M_NEWNFSV4NODE); -MALLOC_DECLARE(M_NEWNFSDIRECTIO); MALLOC_DECLARE(M_NEWNFSMNT); MALLOC_DECLARE(M_NEWNFSDROLLBACK); MALLOC_DECLARE(M_NEWNFSLAYOUT); @@ -965,7 +964,6 @@ MALLOC_DECLARE(M_NEWNFSDSESSION); #define M_NFSCLLOCK M_NEWNFSCLLOCK #define M_NFSDIROFF M_NEWNFSDIROFF #define M_NFSV4NODE M_NEWNFSV4NODE -#define M_NFSDIRECTIO M_NEWNFSDIRECTIO #define M_NFSDROLLBACK M_NEWNFSDROLLBACK #define M_NFSLAYOUT M_NEWNFSLAYOUT #define M_NFSFLAYOUT M_NEWNFSFLAYOUT diff --git a/sys/fs/nfsclient/nfs.h b/sys/fs/nfsclient/nfs.h index aa755a6b5f4d..eeb68a434a6b 100644 --- a/sys/fs/nfsclient/nfs.h +++ b/sys/fs/nfsclient/nfs.h @@ -90,7 +90,6 @@ enum nfsiod_state { * Function prototypes. */ int ncl_meta_setsize(struct vnode *, struct thread *, u_quad_t); -void ncl_doio_directwrite(struct buf *); int ncl_bioread(struct vnode *, struct uio *, int, struct ucred *); int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *); int ncl_vinvalbuf(struct vnode *, int, struct thread *, int); diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 1cf45bb0c924..c691e797aa01 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -764,144 +764,58 @@ static int nfs_directio_write(struct vnode *vp, struct uio *uiop, struct ucred *cred, int ioflag) { - int error; + struct uio uio; + struct iovec iov; struct nfsmount *nmp = VFSTONFS(vp->v_mount); struct thread *td = uiop->uio_td; - int size; - int wsize; + int error, iomode, must_commit, size, wsize; + KASSERT((ioflag & IO_SYNC) != 0, ("nfs_directio_write: not sync")); mtx_lock(&nmp->nm_mtx); wsize = nmp->nm_wsize; mtx_unlock(&nmp->nm_mtx); - if (ioflag & IO_SYNC) { - int iomode, must_commit; - struct uio uio; - struct iovec iov; -do_sync: - while (uiop->uio_resid > 0) { - size = MIN(uiop->uio_resid, wsize); - size = MIN(uiop->uio_iov->iov_len, size); - iov.iov_base = uiop->uio_iov->iov_base; - iov.iov_len = size; - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_offset = uiop->uio_offset; - uio.uio_resid = size; - uio.uio_segflg = uiop->uio_segflg; - uio.uio_rw = UIO_WRITE; - uio.uio_td = td; - iomode = NFSWRITE_FILESYNC; - /* - * When doing direct I/O we do not care if the - * server's write verifier has changed, but we - * do not want to update the verifier if it has - * changed, since that hides the change from - * writes being done through the buffer cache. - * By passing must_commit in set to two, the code - * in nfsrpc_writerpc() will not update the - * verifier on the mount point. - */ - must_commit = 2; - error = ncl_writerpc(vp, &uio, cred, &iomode, - &must_commit, 0, ioflag); - KASSERT((must_commit == 2), - ("ncl_directio_write: Updated write verifier")); - if (error) - return (error); - if (iomode != NFSWRITE_FILESYNC) - printf("nfs_directio_write: Broken server " - "did not reply FILE_SYNC\n"); - uiop->uio_offset += size; - uiop->uio_resid -= size; - if (uiop->uio_iov->iov_len <= size) { - uiop->uio_iovcnt--; - uiop->uio_iov++; - } else { - uiop->uio_iov->iov_base = - (char *)uiop->uio_iov->iov_base + size; - uiop->uio_iov->iov_len -= size; - } - } - } else { - struct uio *t_uio; - struct iovec *t_iov; - struct buf *bp; - + while (uiop->uio_resid > 0) { + size = MIN(uiop->uio_resid, wsize); + size = MIN(uiop->uio_iov->iov_len, size); + iov.iov_base = uiop->uio_iov->iov_base; + iov.iov_len = size; + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = uiop->uio_offset; + uio.uio_resid = size; + uio.uio_segflg = uiop->uio_segflg; + uio.uio_rw = UIO_WRITE; + uio.uio_td = td; + iomode = NFSWRITE_FILESYNC; /* - * Break up the write into blocksize chunks and hand these - * over to nfsiod's for write back. - * Unfortunately, this incurs a copy of the data. Since - * the user could modify the buffer before the write is - * initiated. - * - * The obvious optimization here is that one of the 2 copies - * in the async write path can be eliminated by copying the - * data here directly into mbufs and passing the mbuf chain - * down. But that will require a fair amount of re-working - * of the code and can be done if there's enough interest - * in NFS directio access. + * When doing direct I/O we do not care if the + * server's write verifier has changed, but we + * do not want to update the verifier if it has + * changed, since that hides the change from + * writes being done through the buffer cache. + * By passing must_commit in set to two, the code + * in nfsrpc_writerpc() will not update the + * verifier on the mount point. */ - while (uiop->uio_resid > 0) { - size = MIN(uiop->uio_resid, wsize); - size = MIN(uiop->uio_iov->iov_len, size); - bp = uma_zalloc(ncl_pbuf_zone, M_WAITOK); - t_uio = malloc(sizeof(struct uio), M_NFSDIRECTIO, M_WAITOK); - t_iov = malloc(sizeof(struct iovec), M_NFSDIRECTIO, M_WAITOK); - t_iov->iov_base = malloc(size, M_NFSDIRECTIO, M_WAITOK); - t_iov->iov_len = size; - t_uio->uio_iov = t_iov; - t_uio->uio_iovcnt = 1; - t_uio->uio_offset = uiop->uio_offset; - t_uio->uio_resid = size; - t_uio->uio_segflg = UIO_SYSSPACE; - t_uio->uio_rw = UIO_WRITE; - t_uio->uio_td = td; - KASSERT(uiop->uio_segflg == UIO_USERSPACE || - uiop->uio_segflg == UIO_SYSSPACE, - ("nfs_directio_write: Bad uio_segflg")); - if (uiop->uio_segflg == UIO_USERSPACE) { - error = copyin(uiop->uio_iov->iov_base, - t_iov->iov_base, size); - if (error != 0) - goto err_free; - } else - /* - * UIO_SYSSPACE may never happen, but handle - * it just in case it does. - */ - bcopy(uiop->uio_iov->iov_base, t_iov->iov_base, - size); - bp->b_flags |= B_DIRECT; - bp->b_iocmd = BIO_WRITE; - if (cred != NOCRED) { - crhold(cred); - bp->b_wcred = cred; - } else - bp->b_wcred = NOCRED; - bp->b_caller1 = (void *)t_uio; - bp->b_vp = vp; - error = ncl_asyncio(nmp, bp, NOCRED, td); -err_free: - if (error) { - free(t_iov->iov_base, M_NFSDIRECTIO); - free(t_iov, M_NFSDIRECTIO); - free(t_uio, M_NFSDIRECTIO); - bp->b_vp = NULL; - uma_zfree(ncl_pbuf_zone, bp); - if (error == EINTR) - return (error); - goto do_sync; - } - uiop->uio_offset += size; - uiop->uio_resid -= size; - if (uiop->uio_iov->iov_len <= size) { - uiop->uio_iovcnt--; - uiop->uio_iov++; - } else { - uiop->uio_iov->iov_base = - (char *)uiop->uio_iov->iov_base + size; - uiop->uio_iov->iov_len -= size; - } + must_commit = 2; + error = ncl_writerpc(vp, &uio, cred, &iomode, + &must_commit, 0, ioflag); + KASSERT(must_commit == 2, + ("ncl_directio_write: Updated write verifier")); + if (error != 0) + return (error); + if (iomode != NFSWRITE_FILESYNC) + printf("nfs_directio_write: Broken server " + "did not reply FILE_SYNC\n"); + uiop->uio_offset += size; + uiop->uio_resid -= size; + if (uiop->uio_iov->iov_len <= size) { + uiop->uio_iovcnt--; + uiop->uio_iov++; + } else { + uiop->uio_iov->iov_base = + (char *)uiop->uio_iov->iov_base + size; + uiop->uio_iov->iov_len -= size; } } return (0); @@ -1467,7 +1381,7 @@ ncl_vinvalbuf(struct vnode *vp, int flags, struct thread *td, int intrflg) nanouptime(&ts); NFSLOCKNODE(np); } - if (np->n_directio_asyncwr == 0 && (np->n_flag & NMODIFIED) != 0) { + if ((np->n_flag & NMODIFIED) != 0) { np->n_localmodtime = ts; np->n_flag &= ~NMODIFIED; } @@ -1612,12 +1526,8 @@ again: BUF_KERNPROC(bp); TAILQ_INSERT_TAIL(&nmp->nm_bufq, bp, b_freelist); nmp->nm_bufqlen++; - if ((bp->b_flags & B_DIRECT) && bp->b_iocmd == BIO_WRITE) { - NFSLOCKNODE(VTONFS(bp->b_vp)); - VTONFS(bp->b_vp)->n_flag |= NMODIFIED; - VTONFS(bp->b_vp)->n_directio_asyncwr++; - NFSUNLOCKNODE(VTONFS(bp->b_vp)); - } + KASSERT((bp->b_flags & B_DIRECT) == 0, + ("ncl_asyncio: B_DIRECT set")); NFSUNLOCKIOD(); return (0); } @@ -1632,59 +1542,6 @@ again: return (EIO); } -void -ncl_doio_directwrite(struct buf *bp) -{ - int iomode, must_commit; - struct uio *uiop = (struct uio *)bp->b_caller1; - char *iov_base = uiop->uio_iov->iov_base; - - iomode = NFSWRITE_FILESYNC; - uiop->uio_td = NULL; /* NULL since we're in nfsiod */ - /* - * When doing direct I/O we do not care if the - * server's write verifier has changed, but we - * do not want to update the verifier if it has - * changed, since that hides the change from - * writes being done through the buffer cache. - * By passing must_commit in set to two, the code - * in nfsrpc_writerpc() will not update the - * verifier on the mount point. - */ - must_commit = 2; - ncl_writerpc(bp->b_vp, uiop, bp->b_wcred, &iomode, &must_commit, 0, 0); - KASSERT((must_commit == 2), ("ncl_doio_directwrite: Updated write" - " verifier")); - if (iomode != NFSWRITE_FILESYNC) - printf("ncl_doio_directwrite: Broken server " - "did not reply FILE_SYNC\n"); - free(iov_base, M_NFSDIRECTIO); - free(uiop->uio_iov, M_NFSDIRECTIO); - free(uiop, M_NFSDIRECTIO); - if ((bp->b_flags & B_DIRECT) && bp->b_iocmd == BIO_WRITE) { - struct nfsnode *np = VTONFS(bp->b_vp); - NFSLOCKNODE(np); - if (NFSHASPNFS(VFSTONFS(bp->b_vp->v_mount))) { - /* - * Invalidate the attribute cache, since writes to a DS - * won't update the size attribute. - */ - np->n_attrstamp = 0; - } - np->n_directio_asyncwr--; - if (np->n_directio_asyncwr == 0) { - np->n_flag &= ~NMODIFIED; - if ((np->n_flag & NFSYNCWAIT)) { - np->n_flag &= ~NFSYNCWAIT; - wakeup((caddr_t)&np->n_directio_asyncwr); - } - } - NFSUNLOCKNODE(np); - } - bp->b_vp = NULL; - uma_zfree(ncl_pbuf_zone, bp); -} - /* * Do an I/O operation to/from a cache block. This may be called * synchronously or from an nfsiod. diff --git a/sys/fs/nfsclient/nfs_clnfsiod.c b/sys/fs/nfsclient/nfs_clnfsiod.c index be3a89a1f159..5e3c5ca0066c 100644 --- a/sys/fs/nfsclient/nfs_clnfsiod.c +++ b/sys/fs/nfsclient/nfs_clnfsiod.c @@ -291,17 +291,14 @@ nfssvc_iod(void *instance) wakeup(&nmp->nm_bufq); } NFSUNLOCKIOD(); - if (bp->b_flags & B_DIRECT) { - KASSERT((bp->b_iocmd == BIO_WRITE), ("nfscvs_iod: BIO_WRITE not set")); - (void)ncl_doio_directwrite(bp); - } else { - if (bp->b_iocmd == BIO_READ) - (void) ncl_doio(bp->b_vp, bp, bp->b_rcred, - NULL, 0); - else - (void) ncl_doio(bp->b_vp, bp, bp->b_wcred, - NULL, 0); - } + KASSERT((bp->b_flags & B_DIRECT) == 0, + ("nfssvc_iod: B_DIRECT set")); + if (bp->b_iocmd == BIO_READ) + (void) ncl_doio(bp->b_vp, bp, bp->b_rcred, + NULL, 0); + else + (void) ncl_doio(bp->b_vp, bp, bp->b_wcred, + NULL, 0); NFSLOCKIOD(); /* * Make sure the nmp hasn't been dismounted as soon as diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 85c0ebd7a10f..76a3cdf9281e 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -961,10 +961,6 @@ nfs_close(struct vop_close_args *ap) error = nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0); } - if (newnfs_directio_enable) - KASSERT((np->n_directio_asyncwr == 0), - ("nfs_close: dirty unflushed (%d) directio buffers\n", - np->n_directio_asyncwr)); if (newnfs_directio_enable && (fmode & O_DIRECT) && (vp->v_type == VREG)) { NFSLOCKNODE(np); KASSERT((np->n_directio_opens > 0), @@ -3188,21 +3184,6 @@ loop: * Wait for all the async IO requests to drain */ BO_UNLOCK(bo); - NFSLOCKNODE(np); - while (np->n_directio_asyncwr > 0) { - np->n_flag |= NFSYNCWAIT; - error = newnfs_msleep(td, &np->n_directio_asyncwr, - &np->n_mtx, slpflag | (PRIBIO + 1), - "nfsfsync", 0); - if (error) { - if (newnfs_sigintr(nmp, td)) { - NFSUNLOCKNODE(np); - error = EINTR; - goto done; - } - } - } - NFSUNLOCKNODE(np); } else BO_UNLOCK(bo); if (NFSHASPNFS(nmp)) { @@ -3220,15 +3201,14 @@ loop: np->n_flag &= ~NWRITEERR; } if (commit && bo->bo_dirty.bv_cnt == 0 && - bo->bo_numoutput == 0 && np->n_directio_asyncwr == 0) + bo->bo_numoutput == 0) np->n_flag &= ~NMODIFIED; NFSUNLOCKNODE(np); done: if (bvec != NULL && bvec != bvec_on_stack) free(bvec, M_TEMP); if (error == 0 && commit != 0 && waitfor == MNT_WAIT && - (bo->bo_dirty.bv_cnt != 0 || bo->bo_numoutput != 0 || - np->n_directio_asyncwr != 0)) { + (bo->bo_dirty.bv_cnt != 0 || bo->bo_numoutput != 0)) { if (trycnt++ < 5) { /* try, try again... */ passone = 1; diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h index 99b6ae57b1fd..cc1959b7bf79 100644 --- a/sys/fs/nfsclient/nfsnode.h +++ b/sys/fs/nfsclient/nfsnode.h @@ -122,7 +122,6 @@ struct nfsnode { short n_fhsize; /* size in bytes, of fh */ u_int32_t n_flag; /* Flag for locking.. */ int n_directio_opens; - int n_directio_asyncwr; u_int64_t n_change; /* old Change attribute */ struct nfsv4node *n_v4; /* extra V4 stuff */ struct ucred *n_writecred; /* Cred. for putpages */ @@ -142,8 +141,6 @@ struct nfsnode { * Flags for n_flag */ #define NDIRCOOKIELK 0x00000001 /* Lock to serialize access to directory cookies */ -#define NFSYNCWAIT 0x00000002 /* fsync waiting for all directio async - writes to drain */ #define NMODIFIED 0x00000004 /* Might have a modified buffer in bio */ #define NWRITEERR 0x00000008 /* Flag write errors so close will know */ #define NCREATED 0x00000010 /* Opened by nfs_create() */ From nobody Sun Apr 28 00:22:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRnGS4qLqz5K9K6; Sun, 28 Apr 2024 00:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRnGS4HTHz4Q1N; Sun, 28 Apr 2024 00:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714263744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKwT01NpraHMvYqMi0CeMUYh6SG5eEGi0cqVflTDb58=; b=RFkFK3t/KWPWZrIJ+pYXZRgbl8qFF123VeLeU0zroafpjYssCbdpYf/TVdLrXxw72EfjlO eA+MLmKb4k/3Y37AuRFRHE4HE8LWhh5msIvzpC0xA2MCRBzmDMdWKfKNTbaQF1bDEd2bMn 2j8RbFXkMEA+Tb7Vvev644Xu6EflYsM7x90c6zJppTi0+mr0bGDxpWt29lOoINohIuflyC tksdbEM5GEY/0XspcMeFJB7oAsZbI2uq3P9SNPtnPkvAwhc6G9/V6hyL/BrKZOIZgt+Zp9 /xFVLkMwsDHC02td4rFrKZg8YeI1hkY8fngcVcUv2T05fx9jOtW0GwSG8WFmAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714263744; a=rsa-sha256; cv=none; b=ZFBqH6AuBbKWf/syR3EY2DIJryVpM1uWuXN8KjShLG8LaHLH9S7YPs6TdwrouImJhS5vHB 0yZhNW2cjJI2LJ+3giz8smbKweWZJZpdfrX5+P7vjKmI4YUYZdLqTAmi33ep10/O910hfM 6tEa6x/1lC6puUAp/6SPuTp9yOB4BfSjGeyoMl2crHpqucA7/zjN0GU1MlFbVYXngYFqeU 1V6hIm9ZFaeciyfoyVAwfIvcPgBeibfYLfHJzlF+MZP/iIUfMMvc1wQ7pT6Yy0mDlNF9oI SLPSEXPQPakp1UotIbeKVcPwW1YNI/r3rBCJR1qWR/UCLU3f4OyGZkEN4SK/vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714263744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKwT01NpraHMvYqMi0CeMUYh6SG5eEGi0cqVflTDb58=; b=VxtbV+PJpQNflBpZJnb0WOCY5aHATzjT0MNGCGPcULJ+BavOss3dZ9gcKlHsndxeRhuxIS HerRa1/NG+m3CHEhMGgRAsXI1fwlOtyxKgeFkBX7yFG4kxlqucqoSftarIJDbpYdsTocm3 B7QRmb5cpYOthIVNnUbNx8Yi5JuPGhXvBvK6JSBHukPFMJ12pmHONdQthgYCJwZJpCcrsL o27XSnqmsWpvmgRBeJhOBUJosDMZjGd6KFJjj+C1C2PM7oJlZUAM+IkFygpGgu6mkoKaU4 Sq1rXn+kJLieyCrBmQDPAC1v4vIE+Yo0MXRohalwjWeZrglB4ktiLE8moH9Zxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRnGS3tsWz131b; Sun, 28 Apr 2024 00:22: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 43S0MOB5095624; Sun, 28 Apr 2024 00:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S0MOvf095621; Sun, 28 Apr 2024 00:22:24 GMT (envelope-from git) Date: Sun, 28 Apr 2024 00:22:24 GMT Message-Id: <202404280022.43S0MOvf095621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: cd4bd9750c1b - main - bitset: Add ORNOT macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd4bd9750c1b194ba22fbbc333d6166556a26577 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4bd9750c1b194ba22fbbc333d6166556a26577 commit cd4bd9750c1b194ba22fbbc333d6166556a26577 Author: Jake Freeland AuthorDate: 2024-04-28 00:20:34 +0000 Commit: Jake Freeland CommitDate: 2024-04-28 00:20:34 +0000 bitset: Add ORNOT macros Macros to ANDNOT a bitset currently exist, but there are no ORNOT equivalents. Introduce ORNOT macros for bitset(9), cpuset(9), and domainset(9). Approved by: markj (mentor) Reviewed by: markj MFC after: 1 week Sponsored by: NIKSUN, Inc. Differential Revision: https://reviews.freebsd.org/D44976 --- share/man/man9/Makefile | 3 +++ share/man/man9/bitset.9 | 39 +++++++++++++++++++++++++++++++++++++++ share/man/man9/cpuset.9 | 15 +++++++++++++++ sys/sys/bitset.h | 14 ++++++++++++++ sys/sys/cpuset.h | 1 + sys/sys/domainset.h | 1 + 6 files changed, 73 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index a5fa777d037c..dfc9bd996504 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -635,6 +635,8 @@ MLINKS+=bitset.9 BITSET_DEFINE.9 \ bitset.9 BIT_CMP.9 \ bitset.9 BIT_OR.9 \ bitset.9 BIT_OR2.9 \ + bitset.9 BIT_ORNOT.9 \ + bitset.9 BIT_ORNOT2.9 \ bitset.9 BIT_AND.9 \ bitset.9 BIT_AND2.9 \ bitset.9 BIT_ANDNOT.9 \ @@ -924,6 +926,7 @@ MLINKS+=cpuset.9 CPUSET_T_INITIALIZER.9 \ cpuset.9 CPU_OVERLAP.9 \ cpuset.9 CPU_CMP.9 \ cpuset.9 CPU_OR.9 \ + cpuset.9 CPU_ORNOT.9 \ cpuset.9 CPU_AND.9 \ cpuset.9 CPU_ANDNOT.9 \ cpuset.9 CPU_CLR_ATOMIC.9 \ diff --git a/share/man/man9/bitset.9 b/share/man/man9/bitset.9 index 1bdfdeb7484c..a4e360a678d7 100644 --- a/share/man/man9/bitset.9 +++ b/share/man/man9/bitset.9 @@ -51,6 +51,8 @@ .Nm BIT_CMP , .Nm BIT_OR , .Nm BIT_OR2 , +.Nm BIT_ORNOT , +.Nm BIT_ORNOT2 , .Nm BIT_AND , .Nm BIT_AND2 , .Nm BIT_ANDNOT , @@ -123,6 +125,13 @@ .Fa "struct STRUCTNAME *src1" .Fa "struct STRUCTNAME *src2" .Fc +.Fn BIT_ORNOT "const SETSIZE" "struct STRUCTNAME *dst" "struct STRUCTNAME *src" +.Fo BIT_ORNOT2 +.Fa "const SETSIZE" +.Fa "struct STRUCTNAME *dst" +.Fa "struct STRUCTNAME *src1" +.Fa "struct STRUCTNAME *src2" +.Fc .Fn BIT_AND "const SETSIZE" "struct STRUCTNAME *dst" "struct STRUCTNAME *src" .Fo BIT_AND2 .Fa "const SETSIZE" @@ -459,6 +468,36 @@ equivalent of the scalar: .Fa src2 . ) .Pp The +.Fn BIT_ORNOT +macro sets bits not in +.Fa src +in +.Fa dst . +(It is the +.Nm +equivalent of the scalar: +.Fa dst +|= +.Fa ~ src . ) +.Pp +The +.Fn BIT_ORNOT2 +macro computes +.Fa src1 +bitwise or not +.Fa src2 +and assigns the result to +.Fa dst . +(It is the +.Nm +equivalent of the scalar: +.Fa dst += +.Fa src1 +| ~ +.Fa src2 . ) +.Pp +The .Fn BIT_AND macro clears bits absent from .Fa src diff --git a/share/man/man9/cpuset.9 b/share/man/man9/cpuset.9 index 974dc55b2c65..20485059a4c8 100644 --- a/share/man/man9/cpuset.9 +++ b/share/man/man9/cpuset.9 @@ -45,6 +45,7 @@ .Nm CPU_OVERLAP , .Nm CPU_CMP , .Nm CPU_OR , +.Nm CPU_ORNOT , .Nm CPU_AND , .Nm CPU_ANDNOT , .Nm CPU_XOR , @@ -86,6 +87,7 @@ .Ft bool .Fn CPU_CMP "cpuset_t *cpuset1" "cpuset_t *cpuset2" .Fn CPU_OR "cpuset_t *dst" "cpuset_t *src1" "cpuset_t *src2" +.Fn CPU_ORNOT "cpuset_t *dst" "cpuset_t *src1" "cpuset_t *src2" .Fn CPU_AND "cpuset_t *dst" "cpuset_t *src1" "cpuset_t *src2" .Fn CPU_ANDNOT "cpuset_t *dst" "cpuset_t *src1" "cpuset_t *src2" .Fn CPU_XOR "cpuset_t *dst" "cpuset_t *src1" "cpuset_t *src2" @@ -296,6 +298,19 @@ is composed of multiple machine words, performs multiple individually atomic operations.) .Pp The +.Fn CPU_ORNOT +macro add CPUs not in +.Fa src +to +.Fa dst . +(It is the +.Nm +equivalent of the scalar: +.Fa dst +|= +.Fa ~ src . ) +.Pp +The .Fn CPU_AND macro removes CPUs absent from .Fa src diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 5ff2bb76a4ab..4afac9b172e8 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -135,6 +135,18 @@ (d)->__bits[__i] = (s1)->__bits[__i] | (s2)->__bits[__i];\ } while (0) +#define __BIT_ORNOT(_s, d, s) do { \ + __size_t __i; \ + for (__i = 0; __i < __bitset_words((_s)); __i++) \ + (d)->__bits[__i] |= ~(s)->__bits[__i]; \ +} while (0) + +#define __BIT_ORNOT2(_s, d, s1, s2) do { \ + __size_t __i; \ + for (__i = 0; __i < __bitset_words((_s)); __i++) \ + (d)->__bits[__i] = (s1)->__bits[__i] | ~(s2)->__bits[__i];\ +} while (0) + #define __BIT_AND(_s, d, s) do { \ __size_t __i; \ for (__i = 0; __i < __bitset_words((_s)); __i++) \ @@ -330,6 +342,8 @@ #define BIT_ISSET(_s, n, p) __BIT_ISSET(_s, n, p) #define BIT_OR(_s, d, s) __BIT_OR(_s, d, s) #define BIT_OR2(_s, d, s1, s2) __BIT_OR2(_s, d, s1, s2) +#define BIT_ORNOT(_s, d, s) __BIT_ORNOT(_s, d, s) +#define BIT_ORNOT2(_s, d, s1, s2) __BIT_ORNOT2(_s, d, s1, s2) #define BIT_OR_ATOMIC(_s, d, s) __BIT_OR_ATOMIC(_s, d, s) #define BIT_OVERLAP(_s, p, c) __BIT_OVERLAP(_s, p, c) #define BIT_SET(_s, n, p) __BIT_SET(_s, n, p) diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h index 219e190f0b37..b036b45da283 100644 --- a/sys/sys/cpuset.h +++ b/sys/sys/cpuset.h @@ -56,6 +56,7 @@ #define CPU_OVERLAP(p, c) __BIT_OVERLAP(CPU_SETSIZE, p, c) #define CPU_CMP(p, c) __BIT_CMP(CPU_SETSIZE, p, c) #define CPU_OR(d, s1, s2) __BIT_OR2(CPU_SETSIZE, d, s1, s2) +#define CPU_ORNOT(d, s1, s2) __BIT_ORNOT2(CPU_SETSIZE, d, s1, s2) #define CPU_AND(d, s1, s2) __BIT_AND2(CPU_SETSIZE, d, s1, s2) #define CPU_ANDNOT(d, s1, s2) __BIT_ANDNOT2(CPU_SETSIZE, d, s1, s2) #define CPU_XOR(d, s1, s2) __BIT_XOR2(CPU_SETSIZE, d, s1, s2) diff --git a/sys/sys/domainset.h b/sys/sys/domainset.h index 42891263b81b..f98b175e9bc8 100644 --- a/sys/sys/domainset.h +++ b/sys/sys/domainset.h @@ -54,6 +54,7 @@ #define DOMAINSET_OVERLAP(p, c) __BIT_OVERLAP(DOMAINSET_SETSIZE, p, c) #define DOMAINSET_CMP(p, c) __BIT_CMP(DOMAINSET_SETSIZE, p, c) #define DOMAINSET_OR(d, s) __BIT_OR(DOMAINSET_SETSIZE, d, s) +#define DOMAINSET_ORNOT(d, s) __BIT_ORNOT(DOMAINSET_SETSIZE, d, s) #define DOMAINSET_AND(d, s) __BIT_AND(DOMAINSET_SETSIZE, d, s) #define DOMAINSET_ANDNOT(d, s) __BIT_ANDNOT(DOMAINSET_SETSIZE, d, s) #define DOMAINSET_CLR_ATOMIC(n, p) __BIT_CLR_ATOMIC(DOMAINSET_SETSIZE, n, p) From nobody Sun Apr 28 00:36:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRnZv5gkYz5KBKd; Sun, 28 Apr 2024 00:36: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 4VRnZv3gYFz4RKd; Sun, 28 Apr 2024 00:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714264599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mrf0AlnaZyB2OizQHN9mT60OwmjUzxe3aW0iuWEJU3g=; b=iI6X4nGx138hy1dVYZKz0kezmqtrunvi5OrJ1fW6oASyPdHRBCK2aMOY1sqxslfdCyYbKf 7PgckxDSrxEUEdn4HrK1uAv2I/15YR4azSpVLRkpHL3mlUr8aWA9xCx5FMzi0D7leD/EoW Vi99ikVQCi6p9S/rJPjc/4zf6GoNlVNlMdi88pK26q1bJ+Xarw2N2Eig0O2N8u65wb9WYD XQ0RozoadIoLXpSIaGspzTSia3ZFPSak1OyvMGQ9SWM7VXFasYzdqWPwAe9m53SMrIyZRh CLINiR5ex7EQArwc0uTbJpeQIZWfprxOPBzrjj1uODVp6wutfAdX9lX4R2TVew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714264599; a=rsa-sha256; cv=none; b=rsmgzNgwDHLjO8VIbPr2pRSpHvFxngr2cQ5ynbI0XeGbpzaMalX8W13PaU7aDkHDrjxUkl kCTtcaP/kbYl/RVJWkn/WlYgM6WmxsOlbOQRUkWOUWARxrn8uf6L2V6FpBtDaE9IwFaZs7 ImELTcJIBgFA4TreX7tAQFG4NgPdE+ifZN1QO2mxzUy3fJsQhOoUV36wKj+BQiEfLSYcgi RzMuxDrXM+mPDGF7wUIbaI7f4gFzphaLpUCO+5YolbRxkXBelN9tdjeucPGkSwOB+4yCr5 BfKF25y663kXGJYzOHnN8Ag/ZemGkuQb+px84qUpZBuph8aP4Rov5J8wVxaqhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714264599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mrf0AlnaZyB2OizQHN9mT60OwmjUzxe3aW0iuWEJU3g=; b=bLxJrJKth2V8yWEPEVPBtqB1rLEnHC7fBSSgxjYU0CRp6MW/FKEFpf1rO0DrQPKWCcUmEM wfCs6UO7sET9wPxrz4zvxda+cb+WtNBYtRQXYt9zcEalljM8cQfbmvzEsP4V9NHxO764TO bO/RmGnXt8q0cCfoLAGuBBq+62a8/FcJifuiA6AInVSl0wGEIFk6nQrJQAlqJQeGp/T9cn Sl4R2KvlucnjgBoLuAfqJffve+SsMR0SOidN0IvW3tbyW6j5dws4SdcBvi7+bqEWGLO2Fr 6cCnaSaoLPyKyf3iVXGIlTsW2785yMQIbUw7dWNdh/pdlVUAeqQ9WCqS4zJ09A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRnZv3GB1z13Ff; Sun, 28 Apr 2024 00:36: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 43S0adke012966; Sun, 28 Apr 2024 00:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S0adE5012963; Sun, 28 Apr 2024 00:36:39 GMT (envelope-from git) Date: Sun, 28 Apr 2024 00:36:39 GMT Message-Id: <202404280036.43S0adE5012963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2fe5dc8691d5 - stable/14 - nfscl: Revert part of commit 196787f79e67 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fe5dc8691d5b90b06818b417da9b01683b49e68 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2fe5dc8691d5b90b06818b417da9b01683b49e68 commit 2fe5dc8691d5b90b06818b417da9b01683b49e68 Author: Rick Macklem AuthorDate: 2024-04-25 19:32:02 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 00:35:22 +0000 nfscl: Revert part of commit 196787f79e67 Commit 196787f79e67 erroneously assumed that the client code for Open/Claim_deleg_cur_FH was broken, but it was not. It was actually wireshark that was broken and indicated that the correct XDR was bogus. This reverts the part of 196787f79e67 that changed the arguments for Open/Claim_deleg_cur_FH. Found during the IETF bakeathon testing event this week. (cherry picked from commit 8efba70d7914324890b1f8fe3079036eb2b5c3db) --- sys/fs/nfsclient/nfs_clrpcops.c | 33 ++++++++++----------------------- sys/fs/nfsclient/nfs_clstate.c | 23 +---------------------- sys/fs/nfsclient/nfsmount.h | 1 - 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 09660730d485..75bb5236cb65 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -561,34 +561,21 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, *tl = txdr_unsigned(delegtype); } else { if (dp != NULL) { - if (NFSHASNFSV4N(nmp)) { + if (NFSHASNFSV4N(nmp)) *tl = txdr_unsigned( NFSV4OPEN_CLAIMDELEGATECURFH); - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) != - 0) { - NFSUNLOCKMNT(nmp); - /* - * Add a stateID argument to make old - * broken FreeBSD NFSv4.1/4.2 servers - * happy. - */ - NFSM_BUILD(tl, uint32_t *,NFSX_STATEID); - *tl++ = 0; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; - } else - NFSUNLOCKMNT(nmp); - } else { + else *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); - NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + if (NFSHASNFSV4N(nmp)) + *tl++ = 0; + else *tl++ = dp->nfsdl_stateid.seqid; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + if (!NFSHASNFSV4N(nmp)) (void)nfsm_strtom(nd, name, namelen); - } } else if (NFSHASNFSV4N(nmp)) { *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } else { diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index ebc11efea637..9fbaa6e63a56 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4512,7 +4512,6 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, { int error; struct nfscldeleg *dp; - bool try_busted_xdr; dp = *ndpp; do { @@ -4520,29 +4519,9 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 0, 0); - try_busted_xdr = false; if (error == NFSERR_DELAY) (void) nfs_catnap(PZERO, error, "nfstryop"); - else if (error == NFSERR_EXPIRED && NFSHASNFSV4N(nmp) && - reclaim == 0 && dp != NULL) { - /* This case is a Claim_Deleg_Cur_FH Open. */ - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) == 0) { - /* - * Old FreeBSD NFSv4.1/4.2 servers erroneously - * expect a stateID argument for Open - * Claim_Deleg_Cur_FH and interpret the - * Getattr reply as a stateID. This results - * in an NFSERR_EXPIRED failure. - * Setting NFSMNTP_BUGGYFBSDSRV makes the Open - * send a stateID, in violation of RFC8881. - */ - try_busted_xdr = true; - nmp->nm_privflag |= NFSMNTP_BUGGYFBSDSRV; - } - NFSUNLOCKMNT(nmp); - } - } while (error == NFSERR_DELAY || try_busted_xdr); + } while (error == NFSERR_DELAY); if (error == EAUTH || error == EACCES) { /* Try again using system credentials */ newnfs_setroot(cred); diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h index 7571add27b9c..37b84a015dab 100644 --- a/sys/fs/nfsclient/nfsmount.h +++ b/sys/fs/nfsclient/nfsmount.h @@ -124,7 +124,6 @@ struct nfsmount { #define NFSMNTP_DELEGISSUED 0x00000400 #define NFSMNTP_NODEALLOCATE 0x00000800 #define NFSMNTP_FAKEROOTFH 0x00001000 -#define NFSMNTP_BUGGYFBSDSRV 0x00002000 /* New mount flags only used by the kernel via nmount(2). */ #define NFSMNT_TLS 0x00000001 From nobody Sun Apr 28 01:37:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRpxS5G3sz5HKN6; Sun, 28 Apr 2024 01:37: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 4VRpxS4hYZz4Xxq; Sun, 28 Apr 2024 01:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVnJiXVE99Br+4XfOzo8LgsGRwTVXvX/AUqckD7cjqk=; b=Kr9mVFg389I46OqCzxSSPqKP6ovCqFuYUcHuKYF1Hrpg+2QV2oKfYi1AZjW9xE5+uFwMGZ OCw1hxZaHK9BwbP5EkCLU7pDPVrpCutX7YHorSJKn41qo+LsipenWEn8sZEnK6kT9RHCpf rtZyIJVQj86m7I0MvwcXptC2ZA5FfEU/YYYftitK3CvFjqLa9ioRYOHGckGw4cTJ8rtHTi 6T5zETP5KGV3z8nSrAgGEi2PvnqcjhuznuVXCDQhJOBc9lNg1SC8g9WqQ5o0FThI3z0vM3 p5M1ZXcTdamD81fp5KttzkzXyFwkrbCoWBDU0Ny34WtTeVRKGYm0kJPu6LLaEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714268268; a=rsa-sha256; cv=none; b=JgR63Cc8CbUOSbmjGBUFi24b3NVHI92M9nsjJSiyqt8liiUKw/9p/I9nhxeonzNVffezd6 zAlXK0Kb+nhpqFWBZcMq7EX2e5uKOBDgHLG9ZCxQee3F9XxuyD7O0pif+Snm+D243kWjN8 5xPbf6nEdxeo4P5mkzBPmzFFsUl9KzdF8SFgO/jKwhwGhpTyDYCkP9A09x0KXxKPlVAEyU zLQ5nWTPqE6945ujo1fdVq2AhXvHT7FIOibUdkr7y//NgOFIEv04+mEK+/X1lwHTEWWBx3 S976WadIR9R57sKvNZGGyO9Nua75TwwaPqtbMXxrCL+7pufnMep/csk3UOs/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVnJiXVE99Br+4XfOzo8LgsGRwTVXvX/AUqckD7cjqk=; b=Jt1r0kBaHhYbt7Mh5TLuMUULKcPQDtz8xU4o6bljcDmmBLuium5xX7Mx+/4quaIEwhPCPj yGmL9e5ItzKDsw5YbfGrig1xru+ZISkzaiFLsR66zKFJiFffsooqF1HeE9p54Cmp8ZjAts Tduy5qYcn0BabhsGR1pjV2FRe6nyegEuRAm/6+KbxnrPCEHnTrRbaRK4mCthvPIZg8/ZHx mLpYCSCAkmptW1TqzV/d7qTPubgMa0KxIPmMpXqgV1h9nQSTpHQbcy6pR2uoo+iSacWePq 1761K64x19NiFjRsEwN1/KPunMuhfiHE1q61PQ8XWkCN3FNOdxJWGJCD/6tekA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRpxS3s1cz15Ks; Sun, 28 Apr 2024 01:37: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 43S1bmRq014017; Sun, 28 Apr 2024 01:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S1bmSd014014; Sun, 28 Apr 2024 01:37:48 GMT (envelope-from git) Date: Sun, 28 Apr 2024 01:37:48 GMT Message-Id: <202404280137.43S1bmSd014014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: aab71045646b - stable/14 - Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aab71045646b7cd17a96a4fa73635a558ab40805 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=aab71045646b7cd17a96a4fa73635a558ab40805 commit aab71045646b7cd17a96a4fa73635a558ab40805 Author: Rick Macklem AuthorDate: 2024-04-25 16:41:23 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 01:36:04 +0000 Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" This reverts commit f300335d9aebf2e99862bf783978bd44ede23550. It turns out that the old code was correct and it was wireshark that was broken and indicated that the RPC's XDR was bogus. Found during IETF bakeathon testing this week. (cherry picked from commit 54c3aa02e926268ba5551cd7d28fddf38b3589a2) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++-------- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 899e88508b60..8141ee6cbdb6 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3003,18 +3003,12 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == + NFSV4OPEN_CLAIMDELEGATECURFH) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; - } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { - /* Fill in most of the stateid from the clientid. */ - stateid.seqid = 0; - stateid.other[0] = clientid.lval[0]; - stateid.other[1] = clientid.lval[1]; - stateid.other[2] = 0; - stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index da57ebde7a52..c73840277022 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,10 +2568,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2582,8 +2578,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2834,10 +2830,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2848,8 +2840,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Sun Apr 28 01:42:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRq2R4hldz5HKyV; Sun, 28 Apr 2024 01:42: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 4VRq2R4Gftz4YL3; Sun, 28 Apr 2024 01:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROXVjeUn1TpZjVkDTlPRMhxSzo7V/C7KTUwCe0pLaOc=; b=UpmkppWfuuFxtT45N+JzdR8GnFForM+sIs12WB+v1OMPRnQH8Kqg8IwI3QTn2BUbC3dFIj TysQqFXnJ5hXpSMeEk0xcyHX9srRxajt8eR8Co6vmy0unxJM+9Z2/X44QECekR6CI2ywZx dWVbS77Mb8jEibZduLs448ff1K+Ln59dCIf/P8vFOIh5/NBh2vQY2FhCB77wRlKdO1IMAW h++Jqzen9P5L7moKAT9w7oAzuLHnfdvchbef0qzdF3MilIJUYFZT6eBbxkzvq4V3e+2wKw N7MmRPRZ2L94TubtMQd5noT9lEAj6tRKX5tARzExPwYP2pBpIIh0JcIRQZ6b8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714268527; a=rsa-sha256; cv=none; b=UDpBlQPtfLqjOUVheSfjsNl24yIBPLhGd4paGF54HDGdVbp4UXTwdoRL7wRyja9Fh+NuAP YASD2g5JAsgiNHCKkcr2QD9WEETvjkDXKQLAkbvGtpjkK887B1OtmcGC6gSo7wFKGP/eLh zN9Yx2sHcuqImHhRgYb3QQuWK9kg/o/3mXVipot0IvwXuwx6zWZ31zb53SQ1YwSD7cy6tv Es+DbqY+IUqRdSA97+977VYfV0VnSzez/mdxLFYm68MtVNmkNoign6p7JQe4D53tJLd1dx jRC4YMQWMnSZgGyQ2CbYx1YdiaCNtxcjLCVU0yiMmCM+6DveHzmnsQZs1a+zdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROXVjeUn1TpZjVkDTlPRMhxSzo7V/C7KTUwCe0pLaOc=; b=ZOiMxN8giPZxcmM51w2IoF7Mvbs5i6ur98B4mr9gpiKWve2gUG6MCXkdXvqaupjgpl3p1J uEP2X9QsbrhC91jAqjzTnEyFov2aje7Mth+V2OpmBeTty4zdUTrd9SgFlFeeqFmzAXRrnC 3AG4pIlSuf1jX4JNqjjN/IZyrcd3xtescvvSFHSTv+04wsysaXX6qVSb5y7S4MCyo884xn lEt2XCo5o4OZcTCTf+DF8gccHSVg+TLibrtgIyS86sJ2+UVKNqmiTW6YAsx445/ZRlwHhJ n25/wrBIy47DBDBjFVMxILD2h1ZlSSBZBdV68/cr1FBqpZ9N3O66S/XCe2Ufew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRq2R3tdJz15Hx; Sun, 28 Apr 2024 01:42: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 43S1g7Fl027107; Sun, 28 Apr 2024 01:42:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S1g7Qx027104; Sun, 28 Apr 2024 01:42:07 GMT (envelope-from git) Date: Sun, 28 Apr 2024 01:42:07 GMT Message-Id: <202404280142.43S1g7Qx027104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: fba90651e430 - stable/13 - Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fba90651e4308508465d7bb02b8d55759922a312 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fba90651e4308508465d7bb02b8d55759922a312 commit fba90651e4308508465d7bb02b8d55759922a312 Author: Rick Macklem AuthorDate: 2024-04-25 16:41:23 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 01:41:12 +0000 Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" This reverts commit f300335d9aebf2e99862bf783978bd44ede23550. It turns out that the old code was correct and it was wireshark that was broken and indicated that the RPC's XDR was bogus. Found during IETF bakeathon testing this week. (cherry picked from commit 54c3aa02e926268ba5551cd7d28fddf38b3589a2) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++-------- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index c1ba36347b4c..437f4b1c685d 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3006,18 +3006,12 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == + NFSV4OPEN_CLAIMDELEGATECURFH) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; - } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { - /* Fill in most of the stateid from the clientid. */ - stateid.seqid = 0; - stateid.other[0] = clientid.lval[0]; - stateid.other[1] = clientid.lval[1]; - stateid.other[2] = 0; - stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index f54459947f44..06d0b79f10d5 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2555,10 +2555,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2569,8 +2565,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2821,10 +2817,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2835,8 +2827,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Sun Apr 28 03:19:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRsBV24Vvz5Hl4H; Sun, 28 Apr 2024 03:19: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 4VRsBV1N2vz4jfW; Sun, 28 Apr 2024 03:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714274354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+E13tMakp1hrQpgGtkjZ3/3RE9J/SqXRF/rIoyoUR30=; b=Td0gRGeQ/uXWp33Zjet0nEpTYEX395XRjlQKbqwvW6AuhhaGBUu4Agbk+/nv4GJF6jakb4 JkyuyI9919YoZS4PYpE+iK52JyfE8dzb/79KmgEFryu7VOX5GEw9U+u7Y3uAhLgpHCUNpD E+O4+buqP57qu/FJtMcQMc0YKjaIcJXvjhN8xAw8ihDVvf6nhohWmu3ylmxIfYKFXCjEhq 83+zuArcNdQfkqSzkpXGoeumXxKnlLOCThB53qMZ+BNOlk9fiE9xzMXlUB1f4uSRNWi4Eg V/Go+9zByvbJULANtn4J+enmAdFZM1iXVFD2HABUaltZgrsy7X04f1c7+2gmOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714274354; a=rsa-sha256; cv=none; b=i5vm8EpvvdZKuASL+xQyh3/nRNEuHoEheqHLx0SKYpmPMhKGje8JMm4mA/yBZpDQWUWiIQ LpgWq1fTbvxxxL63+YyAisL4ZWLHsgg9uWY5H4mtXpXnXzenrS+DvXZK/s+w5nvOzzALTK v/yTO0HWk9gSM+GKIXHNvRBZBWaJOvxEfL5gx82r0snr3rebh3fujzL/mGQIFi8zriI9hQ atrmbEJOpjahVYi3j2b9iIdYGlBdhzAhpIqU4E8PNpge+2WWf8j1mIKRAvttdFnMqjb7br gLYG2d3jpBtY9ns/QENLTrda+qu2hpxfvDLyJ5NawAqKk/8Z4Y23SiMoZv1kYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714274354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+E13tMakp1hrQpgGtkjZ3/3RE9J/SqXRF/rIoyoUR30=; b=dg0cPbsdTRpr8IQOkoiNqDofv80iFpm2sibsrbBNcPI2ZJ3ZvP9uR4aUkuuIoe90I8zZTJ hISVhiTDTbys/wq9og64lKuQsgDc7Bmmr0LjAybKGdJWjbnQln0RE8wR6AiIj3ggJPvJqN TZFAKNfiYgeiz/fdRl/Tamy50OjUXHHO7QYdpTRIf7GMKVzFnZB3c5dyVm8o8uMvnXUGi6 dpwpZViSkept3KCdOhJUoPxFX1ymQPBXZkwESX3MMKeAMQcb9IhA1KbM0YFge0dbWuBzD+ MirfMWHy7pcnGVatoPRQhRGIYmnIgWfhQsccEM8wvLgYh1zoyqHtSVaeMjUiqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRsBV0v1Vz17Kg; Sun, 28 Apr 2024 03:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43S3JEYN084958; Sun, 28 Apr 2024 03:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S3JExs084955; Sun, 28 Apr 2024 03:19:14 GMT (envelope-from git) Date: Sun, 28 Apr 2024 03:19:14 GMT Message-Id: <202404280319.43S3JExs084955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: b30a7e5418be - main - bhyve.8: Update and rearrange to improve readability List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b30a7e5418be5c5d27ac967f5ce99461ab79c37c Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=b30a7e5418be5c5d27ac967f5ce99461ab79c37c commit b30a7e5418be5c5d27ac967f5ce99461ab79c37c Author: Chris Moerz AuthorDate: 2024-04-26 18:23:13 +0000 Commit: Joseph Mingrone CommitDate: 2024-04-28 03:18:35 +0000 bhyve.8: Update and rearrange to improve readability bhyve's man page is a very long block of text that has grown to proportions that make it hard to read. In particular, the level of nesting of various content means man can no longer render the text in a user-friendly way. To remedy this: - move the -s argument documentation into a separate section and reformat the various arguments so they are consistent - add documentation on how to use the -o config.dump feature - make the listing of various arguments more consistent - consolidated duplicate listings of TPM backends - add an example for the config.dump feature - fix various formatting inconsistencies. Reviewed by: emaste, imp, jrm, Pau Amma , rgrimes Differential Revision: https://reviews.freebsd.org/D43940 --- usr.sbin/bhyve/bhyve.8 | 249 ++++++++++++++++++++++++++++++------------------- 1 file changed, 151 insertions(+), 98 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 42ba328451a9..527ccf720540 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 10, 2024 +.Dd April 26, 2024 .Dt BHYVE 8 .Os .Sh NAME @@ -356,10 +356,45 @@ If not specified, the .Ar bus value defaults to 0. .Pp -The +See +.Sx "PCI EMULATION" +for available options for the +.Ar emulation +argument. +.It Fl U Ar uuid +Set the universally unique identifier +.Pq UUID +in the guest's System Management BIOS System Information structure. +By default a UUID is generated from the host's hostname and +.Ar vmname . +.It Fl u +RTC keeps UTC time. +.It Fl W +Force virtio PCI device emulations to use MSI interrupts instead of MSI-X +interrupts. +.It Fl w +Ignore accesses to unimplemented Model Specific Registers (MSRs). +This is intended for debug purposes. +.It Fl x +The guest's local APIC is configured in x2APIC mode. +This option applies only to the amd64 platform. +.It Fl Y +Disable MPtable generation. +This option applies only to the amd64 platform. +.It Ar vmname +Alphanumeric name of the guest. +This should be the same as that created by +.Xr bhyveload 8 . +.El +.Sh PCI EMULATION +.Nm +provides emulation for various PCI devices. +They are specified by the +.Fl s +.Ar slot,emulation,conf +configuration's .Ar emulation -argument -can be one of the following: +argument, which can be one of the following: .Bl -tag -width "amd_hostbridge" .It Cm hostbridge A simple host bridge. @@ -400,7 +435,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a fwcfg type and the debug/test device. +optionally, a fwcfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -419,8 +454,7 @@ If .Ar conf is not specified, the device emulation has no backend and can be considered unconnected. -.Pp -Network device backends: +.Ss Network device backends .Sm off .Bl -bullet .It @@ -452,7 +486,7 @@ Network device backends: .Pp If .Cm mac -is not specified, the MAC address is derived from a fixed OUI and the +is not specified, the MAC address is derived from a fixed OUI, and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. .Pp @@ -503,16 +537,15 @@ forwarded to the guest. Multiple rules can be specified, separated by semicolons. Note that semicolons must be escaped or quoted to prevent the shell from interpreting them. -.Pp -Block storage device backends: -.Sm off +.Ss Block storage device backends: .Bl -bullet +.Sm off .It .Ar /filename Op Cm \&, Ar block-device-options .It .Ar /dev/xxx Op Cm \&, Ar block-device-options -.El .Sm on +.El .Pp The .Ar block-device-options @@ -541,14 +574,13 @@ A fwcfg file is used to specify the bootorder. The guest firmware may ignore or doesn't support this fwcfg file. In that case, this feature doesn't work as expected. .El -.Pp -SCSI device backends: -.Sm off +.Ss SCSI device backends .Bl -bullet +.Sm off .It .Pa /dev/cam/ctl Oo Ar pp Cm \&. Ar vp Oc Oo Cm \&, Ar scsi-device-options Oc -.El .Sm on +.El .Pp The .Ar scsi-device-options @@ -564,14 +596,13 @@ A fwcfg file is used to specify the bootorder. The guest firmware may ignore or doesn't support this fwcfg file. In that case, this feature doesn't work as expected. .El -.Pp -9P device backends: -.Sm off +.Ss 9P device backends .Bl -bullet +.Sm off .It .Ar sharename Cm = Ar /path/to/share Op Cm \&, Ar 9p-device-options -.El .Sm on +.El .Pp The .Ar 9p-device-options @@ -580,8 +611,7 @@ are: .It Cm ro Expose the share in read-only mode. .El -.Pp -TTY device backends: +.Ss TTY device backends .Bl -tag -width 10n .It Cm stdio Connect the serial port to the standard input and output of @@ -591,11 +621,25 @@ process. .It Ar /dev/xxx Use the host TTY device for serial port I/O. .El +.Ss TPM device backends +.Bl -bullet +.Sm off +.It +.Ar type Ns \&, Ns Ar path Ns Op Cm \&, Ns Ar tpm-device-options +.Sm on +.El +.Pp +Emulate a TPM device. The argument +.Ar path +needs to point to a valid TPM device path, i.e. +.Pa /dev/tpm0 . +.El .Pp -TPM device backends: +Supported options for +.Ar type : .Bl -tag -width 10n -.It Ar type Ns \&, Ns Ar path Ns Op Cm \&, Ns Ar tpm-device-options -Emulate a TPM device. +.It Cm passthru +pass a physical TPM device through to the guest .El .Pp The @@ -607,19 +651,23 @@ Version of the TPM device according to the TCG specification. Defaults to .Cm 2.0 .El +.Ss Boot ROM device backends +.Sm off +.Bl -bullet +.It +.Ar romfile Ns Op Cm \&, Ns Ar varfile +.El +.Sm on .Pp -Boot ROM device backends: -.Bl -tag -width 10n -.It Ar romfile Ns Op Cm \&, Ns Ar varfile Map .Ar romfile in the guest address space reserved for boot firmware. +.Pp If .Ar varfile is provided, that file is also mapped in the boot firmware guest address space, and any modifications the guest makes will be saved to that file. -.El .Pp Fwcfg types: .Bl -tag -width 10n @@ -647,8 +695,7 @@ many other things to the guest. Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well. .El -.Pp -Pass-through device backends: +.Ss Pass-through device backends .Sm off .Bl -bullet .It @@ -697,28 +744,7 @@ The host device must have been reserved at boot-time using the .Va pptdevs loader variable as described in .Xr vmm 4 . -.Pp -TPM devices: -.Bl -tag -width 10n -.It Ns Ar type -Specifies the type of the TPM device. -.Pp -Supported types: -.Bl -tag -width 10n -.It Cm passthru -.El -.It Cm version= Ns Ar version -The -.Ar version -of the emulated TPM device according to the TCG specification. -.Pp -Supported versions: -.Bl -tag -width 10n -.It Cm 2.0 -.El -.El -.Pp -Virtio console device backends: +.Ss Virtio console device backends .Bl -bullet .Sm off .It @@ -735,7 +761,7 @@ accepts at most one connection per port at a time. Limitations: .Bl -bullet .It -Due to lack of destructors in +Due to the lack of destructors in .Nm , sockets on the filesystem must be cleaned up manually after .Nm @@ -748,16 +774,18 @@ resize at present. .It Emergency write is advertised, but no-op at present. .El +.Ss Virtio input device backends: +.Bl -bullet +.Sm off +.It +.Ar /dev/input/eventX +.Sm on +.El .Pp -Virtio input device backends: -.Bl -tag -width 10n -.It Ar /dev/input/eventX Send input events of .Ar /dev/input/eventX to guest by VirtIO Input Interface. -.El -.Pp -Framebuffer devices backends: +.Ss Framebuffer device backends .Bl -bullet .Sm off .It @@ -800,8 +828,8 @@ and maximum is 3840x2160 pixels. Possible values for this option are .Cm io (default), -.Cm on -, and +.Cm on , +and .Cm off . PCI graphics cards have a dual personality in that they are standard PCI devices with BAR addressing, but may also @@ -846,15 +874,17 @@ intended for use on untrusted networks. Many implementations will want to use stronger security, such as running the session over an encrypted channel provided by IPsec or SSH. .El -.Pp -xHCI USB device backends: -.Bl -tag -width 10n -.It Cm tablet -A USB tablet device which provides precise cursor synchronization -when using VNC. +.Ss xHCI USB device backends +.Bl -bullet +.Sm off +.It +.Ar tablet +.Sm on .El .Pp -NVMe device backends: +A USB tablet device that provides precise cursor synchronization +when using VNC. +.Ss NVMe device backends .Bl -bullet .Sm off .It @@ -897,8 +927,7 @@ Supported values are: and .Cm disable . .El -.Pp -AHCI device backends: +.Ss AHCI device backends .Bl -bullet .It .Sm off @@ -923,8 +952,7 @@ Revision Number with maximum 8 characters. .It Cm model Model Number with maximum 40 characters. .El -.Pp -HD Audio device backends: +.Ss HD Audio device backends .Bl -bullet .It .Sm off @@ -942,31 +970,6 @@ Playback device, typically Recording device, typically .Ar /dev/dsp0 . .El -.It Fl U Ar uuid -Set the universally unique identifier -.Pq UUID -in the guest's System Management BIOS System Information structure. -By default a UUID is generated from the host's hostname and -.Ar vmname . -.It Fl u -RTC keeps UTC time. -.It Fl W -Force virtio PCI device emulations to use MSI interrupts instead of MSI-X -interrupts. -.It Fl w -Ignore accesses to unimplemented Model Specific Registers (MSRs). -This is intended for debug purposes. -.It Fl x -The guest's local APIC is configured in x2APIC mode. -This option applies only to the amd64 platform. -.It Fl Y -Disable MPtable generation. -This option applies only to the amd64 platform. -.It Ar vmname -Alphanumeric name of the guest. -This should be the same as that created by -.Xr bhyveload 8 . -.El .Sh CONFIGURATION VARIABLES .Nm uses an internal tree of configuration variables to describe global and @@ -993,6 +996,31 @@ and global settings. .Pp More details on configuration variables can be found in .Xr bhyve_config 5 . +.Sh CONFIGURATION FILE CREATION +The +.Fl k +flag allows one to provide a path to a configuration file holding all +settings, which otherwise would need to be defined by providing a long +list of program arguments to +.Nm . +.Pp +There is a very simple way to translate a complex set of program +arguments to an equivalent configuration file in +.Xr bhyve_config 5 +format. +.Pp +Use +.Fl o +.Ar config.dump=1 +to make +.Nm +dump a configuration file representing the used flags and arguments to +stdout. You can pipe the output into a file to persist the generated settings. +.Pp +Make sure to remove the +.Ar config.dump +line from the resulting configuration file before using it to start +.Nm . .Sh DEBUG SERVER The current debug server provides limited support for debuggers. .Ss Registers @@ -1131,6 +1159,31 @@ bhyve -c 2 -m 4g -w -H \\ -l bootrom,/usr/local/share/uefi-firmware/BHYVE_UEFI_CODE.fd,BHYVE_UEFI_VARS.fd uefivm .Ed +.Pp +To create a configuration file +.Pa configfile +for a virtual machine, use +.Fl o +.Ar config.dump=1 : +.Bd -literal -offset indent +/usr/sbin/bhyve -c 2 -m 256 -A -H -P \\ + -s 0:0,hostbridge -s 1:0,virtio-net,tap0 \\ + -s 2:0,ahci-hd,./vm0.img \\ + -s 31,lpc -l com1,stdio \\ + -o config.dump=1 vm0 > configfile +.Ed +.Pp +Then use an editor of your choice to remove the line "config.dump=1" +from the newly generated +.Pa configfile . +.Pp +To start +.Nm +using this configuration file, use flag +.Fl k : +.Bd -literal -offset indent +/usr/sbin/bhyve -k configfile vm0 +.Ed .Sh SEE ALSO .Xr bhyve 4 , .Xr netgraph 4 , From nobody Sun Apr 28 05:20:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvtx1MTLz5Hxj2; Sun, 28 Apr 2024 05:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRvtx0x11z4tZM; Sun, 28 Apr 2024 05:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qAbYv+ZbiVzcS5ata6nD7+faUfbPUbMQKOPxbntZAY=; b=Ch7FqWGJowFsd2j7uVUCqfYfr8AzfRfcEmvLCkLXIKOD2IHAagZN1IOB2kTITk0N2BtItk dT3YhFLWS+5v7hZ1oMGu2KJZ0OS3IJLouFF3yAB3HfL6R5AYXFcclgNwzQ6Y+eFLmOjuRn D856mf78m1WvhC99LFYLfRdg8j7ASraB0QIuIiZLpUt7oeCWJ4yT7ngD1yLKre+pX5Re08 biQvPSHHBXc/Dbx3XtB46aatK3ECft2ycNH3odGNs26Ngc1ITZii72v9d41SnKndEDKlCS XRd2wo2qG04OVDzwUI0U7TScU4iA1PUgeZeuyTe1NdAWyiZb17ujXHT685jBpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281657; a=rsa-sha256; cv=none; b=cUeIEFvySoL1yucBphc6G76WiSSpIiixubKGaRQTclGd3UAo2sMgw5ng9ccPS+Il6hQlX2 hYu3CcdF8v235gS4YijsQEFz52PPwaPZhN4/QmFwMtyghjxqA2aTd9p+/oEwC5ZB3dIynA GJWXHJeBK2pVMLq+wlgjgOtq9gVwOuaGmU/jS+gdrRR/nio0OhtK3OE3twunK6MuqeQEWW EztEnt7SACH8L6WbaWyrY2nJ5MrbinwK2VT6mrUZf97zOnv/wbZXsnttm21tUFZ1bnIDuP eVGi3AC6AAplntIkwbiGcvD0fmWlfWa54jfsLtwxKkrPEKLk0p29qWYAEuoEsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qAbYv+ZbiVzcS5ata6nD7+faUfbPUbMQKOPxbntZAY=; b=SDeyySvOoZA/ATEYKaDuRAPDcnvzvysh2aUOkNTf9y1I7AK+3tjDrZJKM6jIiG7bhGKfxz eyJ++65G3e0yqH1o7sBlAbJgLQtF0TWfZwhT1jU6eGXRiYLPrNFSQ+wr7LIhtODrjQWYSB XvknBvr5wHWgxll3ErproRq9TcPWd0+uK6HKa/Ln/0L7+Bkdbgx7iVJrOkl2zgcLSmNNqU 8le7oBs3BShkQYN1RZlmiY1hjJFNVk4PEe7UbWblI4JiJn7DZhgB9rmnOJ3iWtdZrcznct xdmmA2WcSA8eposfZEOeowTwCz12FpxYvpUHBpn5dbnGe7Wewm6ixTVjd3zvLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvtx0Xq7z1BWP; Sun, 28 Apr 2024 05:20: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 43S5KuUr096799; Sun, 28 Apr 2024 05:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5Ku2S096796; Sun, 28 Apr 2024 05:20:56 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:20:56 GMT Message-Id: <202404280520.43S5Ku2S096796@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: 770e03ac3913 - stable/14 - wtap: Fix typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 770e03ac3913685733ec2d634b457664e1dd7904 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=770e03ac3913685733ec2d634b457664e1dd7904 commit 770e03ac3913685733ec2d634b457664e1dd7904 Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:20:25 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ (cherry picked from commit 026520a5f2d2ec01e19494c37b87448df86ef21a) --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 040fc340cb13..f9e0c2a7e5c4 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -595,7 +595,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index 422def943d34..1e23b99bc272 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -190,7 +190,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -208,7 +208,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 28 05:20:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvty4VgLz5HxfK; Sun, 28 Apr 2024 05:20: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 4VRvty1bmvz4tR6; Sun, 28 Apr 2024 05:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJ6HXR+c8JcWyU0Lkji7cqe98uLje59jxok7uUn3U=; b=ljL+vfDsw6bz79cEuUiGn53bzoOjkaY4BVUiTq+r88YnCMVKcwCb4b3sieG5IrUCQWD9c3 IguOqriCgOuklusYyOPL3/MWrXD2QkhAA3SI8K+fAyxx3fGYz0vOduwfWIbfjW2cbE1fB+ Ve+PrvBMYZathHVybY5jyYprBRs/QNYIcScgRlWvZ8nQMdNkmwwEMEMg8KEiJM+V71oEDe wKpVeMjcYHhJ2YG9Z5s5UMzFUj2AQpKiwcgZRnVkWORk8YP8P1/jfzZIAXD74UYvgawiW2 WYRLiyt/tR2/Irf0mCalN5Q7bbpfdjMyZvx/9FDaHQDZsAmO3DqUGmUYqY+6Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281658; a=rsa-sha256; cv=none; b=irExsFQrxT7e5HykArqoVLWXnRmY0//m1zqnT0bZ7MqhPK5lVEwy2S8SM6WlpU36fT7Ipy +rf9bwVtOGc7OCQh4jQtTuwU+NimHsdr81mMgLAH2tWWDt5PPvlyEoJPnfhX3oWmdaWIvm 7TW+41VbFkM/W3SmqhQmXP+QCM1niHQL6RD7g9i/dmfXNgxGjSIX0Q1WqfraIeW66/URmr WyRLX8oiN0WD5GDke6mODfgtckkP2ere5i4FprG/uDTG5bQlXmgPnyX6E32FfMaIN5mBLn qZhZ824RpiWXPG6h40/eGDYFi7AL/6SnLKnSF2WvWj7/QE8EzYiCJBx+lyIIZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJ6HXR+c8JcWyU0Lkji7cqe98uLje59jxok7uUn3U=; b=PjBkrAHa9SmbYLI3SN+2rbFFO7PYnAnVdtXulVTkgRcoRTfGLy5Araq/RvBLvyDf2kQmvW KfdccOTCBadKWdZnmwKJexgEyYrHUIohLe65tBomuoQIXPOzGG99XiPDkeycRwjEKmATFE 5Efv/4ScsamFttonoJ685WQksKBcdbnSbvruCFb5QzxNcksPvxOLZTuvHbHb2fGwOgtnVd rGyCwUP+jYw6BszwcYZcgVTmRwZWIcKhfLgRkKKdG5qNK2z9HbDZa/OmxZT5oUSdEdn7F4 eq6XuFagb0Keu90ERSmiHoVC8HzS5vAlmKDOv11hNqNr+8Et2VzhB+p1b8ikGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvty1BnWz1BWR; Sun, 28 Apr 2024 05:20: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 43S5KwCH096854; Sun, 28 Apr 2024 05:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5Kw4W096851; Sun, 28 Apr 2024 05:20:58 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:20:58 GMT Message-Id: <202404280520.43S5Kw4W096851@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: 025a5f6b2540 - stable/14 - vmm(4): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 025a5f6b2540682c69ac63f7754ce74b43441034 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=025a5f6b2540682c69ac63f7754ce74b43441034 commit 025a5f6b2540682c69ac63f7754ce74b43441034 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:20:46 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 7dd68d8aea95..34aebc62fed4 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:21:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvw21HFLz5HxQv; Sun, 28 Apr 2024 05:21: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 4VRvw20qStz4v2B; Sun, 28 Apr 2024 05:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Exq51H1Bpvvl3BhrJHa29HVJ4bfMNoROpZCFq5iu5OA=; b=SozCiF6+Ke2DcFfoYC5P/t70tce6bqNUADgKrrSwtYL5H2+LtEO+pCrviUIqUggOoKYI0/ 2cYvSBaoYuX5hcZzkOrzYzCFEL2K+YF/C8H8bk/7JZSCInmwcvNwW6HI9SwCZOXkWD8Al/ tvjEjGgG8sevZoVLtCZfMVkQGRQz1ZPbZ6uMuUJvfmKNa6ZAmhf6L7W5OWd8kO0F0uc8I0 XIZFxy3W5VM6BDcqUYKIRI4oRuoHgZttfL8F9Jufv+OaAoT2VcvUdzJu3fRFXPedFW9uKJ 9SS34Zt03imv4yJPCmbdrhmjpcaGLq6fV1NYroWQGYlY7RhtxZIkuoAfvyZKNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281714; a=rsa-sha256; cv=none; b=nfjZPF42kgQ2LLb/NGDSTYdyY3ToXrh94BH1o3ZqnvEZ5igrDnKyGkw7J3XummhBUViW7w V/3WifFMzjSz1xwPnfShZ4F0qFc1kDi2QuaEo2QyPHzWlBgwN2Uaoi6rnB+zJ7BkHBypfG N1wUJYhGQebSYDnuTl5R+Akn3iRbV3H4Jnj7OLHe5ct2DHYiSI5pkHru0SMQ7lUOfpSbPQ yydPDF0TQB4hFrSZSKpO26iQNZOXYxPg8EoNXRPDptBhEUIEnVQ0syijyG0HsEKo6kkeSm idODIT82sOM1gN8UIKE0VcMaRL3Ky/LXdvWgLCHlcmTFafbab150gEq/6b6J0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Exq51H1Bpvvl3BhrJHa29HVJ4bfMNoROpZCFq5iu5OA=; b=ndghSQZY77dDuaqOkrk/tCvYU3QW4lLp7/SoIIt7xAktMf7iF+NSWqXp8SAwU6zb7kfS60 wdJfIT+aXzUyhAmOzXGEJAuO/KyDzyhhm9uvs8k1xYv/EvU21x0C92lvNsj41mq4U3H9Nu 2igoxUyYiJSro8tiJIOvV/8ODMJSLW+NJ5yIWLi010tmOeQEwl1lSTHhUWuac8kNdsmfLI j8TcM1rlLHoCEkgWjqlEV76NF8Xj2RO+E5gKHDS/ouFumjLMNJmwDwGhYCBMrSOK0twDgk z1xHfm24i2u+2E4KJB9+hmogzbV72oJ/xcsj8blG6Sc0mg8fwcw4UQjh3PtTyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvw20RfRz1BBv; Sun, 28 Apr 2024 05:21: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 43S5Lrke002231; Sun, 28 Apr 2024 05:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5LrtL002228; Sun, 28 Apr 2024 05:21:53 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:21:53 GMT Message-Id: <202404280521.43S5LrtL002228@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: 5f9d770bdce7 - stable/13 - wtap: Fix typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5f9d770bdce792cac5f5b4bd4db5c69c5b02821c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5f9d770bdce792cac5f5b4bd4db5c69c5b02821c commit 5f9d770bdce792cac5f5b4bd4db5c69c5b02821c Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:21:33 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ (cherry picked from commit 026520a5f2d2ec01e19494c37b87448df86ef21a) --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 08f840c6dc0c..05487572c242 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -538,7 +538,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index 14041ec2b89c..46c67f8e1a3a 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -188,7 +188,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -206,7 +206,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 28 05:21:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvw32vgbz5HxQw; Sun, 28 Apr 2024 05: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 4VRvw31rDvz4v0W; Sun, 28 Apr 2024 05: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=1714281715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFwovyG/RIeoq8RIhXOK01CPA8OXbrCpKKipua9u8Gc=; b=dNi4mV+OgGcdcREHP6nIsvUGSG+1aEKDsC+KZiSNEPttBPhRywpBmPFDR4/wmlQvK0KYuZ G3dqKpGAL14M5+hafXUwA4C9n3vwAg3L7V2pYXHk8kmZxw3ouJK6orlTP/Oqi1VOF1zRX/ IsxsAxeKhtvOemODq6wkiQTauiQTqm2s2TKugEXVVOz9A0Y0pcYvocGFIpMpM77hSkYX/R aQ8MXlBLMGctrtlzLNfI2cjJEBoqZe3axW3COSqftNTdBrjEvexrEfwVoI3O4a4EMcZLMr ITi7YzdJs/Wnk8aAJSSTiyjdG03nthHeDZUTFr/0tVayFkxnCjUoQTfhYkppSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281715; a=rsa-sha256; cv=none; b=yC8lbd60dX85cGcEgE069I1Sv2U6fasP2A5P/sEW5SR2VZcR3oH2iFM2lZNjLx2vu5eNns zCcLqPyWoa0KtEp6Sl2PPUUiv8kXRLITiurK20pZeqqkLUbDL19AsHb8sirZVwZJZ12tBy k+GZrQmC2htNvkupqYNFQzOMDxAW0hUgxLwGPTVQtgHz0areUAUBQfTxrFI9qai68gwWdA QaQu2GZm9Yf8Ss//wOMZwMg6PXbQd0Vm7+Ryq4u6l/ZuLAQ0FRvFO/rIIR9/Dx81sZ+8MM +9e+E7NO2+V931nIpzPUUxsreESCvcUtsSe3F74vmuhesMFpScElKtnFrF0BNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFwovyG/RIeoq8RIhXOK01CPA8OXbrCpKKipua9u8Gc=; b=fFcdD0LVTZc3sUYUxbbDHJ/UDPYVZ/VKFnPtackENZ09ARu47MSmydrEgfpPJzPg7LU3Aw RRcl5hbdBFviS5OtZT3QJ19GiIWlz+BO5KzS82XKhE9bGLDp3Nt5fpduPwucEbuopCGmmP xtW4wUQOPAknWDYDXeNxGZ1fH6FLSTpW25mtwgvAsnht1GbYaKCOSlIPJhOSrV3vvUZZua FcJA/xOfxIoOgKxyrEY1gM/dKZo8A6uj6okIQxB8sdOluyebSg3chi7SFCR20ZQkDIPZVv 2BoXM+eZoBMfn0AwrMlBmIV4s2xZ4MR7lmw0YwR7c99t7rPfsMvmTAh1wHB5Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvw31SQmz1C2L; Sun, 28 Apr 2024 05: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 43S5Lt2N002288; Sun, 28 Apr 2024 05: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 43S5Lt9G002285; Sun, 28 Apr 2024 05:21:55 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:21:55 GMT Message-Id: <202404280521.43S5Lt9G002285@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: 3ad3a5f32bf0 - stable/13 - vmm(4): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 commit 3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:21:41 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index f45e292b11a2..1aa00c6849f1 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:22:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvx84bl2z5HxRB; Sun, 28 Apr 2024 05:22: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 4VRvx83rnGz4vYx; Sun, 28 Apr 2024 05:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNTKflqwIh9O/wyUWGqmBLy7GciMNd4SOS3oU/7ft/Q=; b=isd1j5isNOWyLlmHGXWtlIL0oLRC8zposPkbganHyCNUypBmWy69L/R72i+vLZfWsVLEfZ GW4wS30XV3tQElP4vBtoVWxAa+F04oPVJFRFLthcMLs+0YwQEekYrMTqlnXy0ibZvNgcR0 M0736CPC10uubCIBj8USXDHzVBNpXVJmf5T1K4UNHm3RAe/1pIw/C3H/vpSGUNWFk4y4eX Q2xqOTUhtb726cyy+Cac39L0LgW/NcQxw/49m/nCZMmCePcLkBRyBTkBXsaSyrc2c+WQeJ bx0oeU0usUgfN7yJXfuMeKIabmGK9K8RTo6KwG5foCGRksf2lM75E7NjQIvCGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281772; a=rsa-sha256; cv=none; b=wZLvapbKDSqLVldzGo9jrGRlZyCffWmd33fBZqbFSYICkkcHTs4xV7jjaQ4Ru1mxJ9uj9F rtKqPRg3+3LJlgx6NBwPYUh34lxURTnAnYjkOuGaqfOBNxgJJbkBVHiI1Zoim/w+fDYiWt RZ9wWUwgKfNQoWojP1FMSYeAyonyRDN9sNArLoeyAcR7XpFTcbCwtKgEru3JkeT8Jc96qJ nCNcuX+nOB6S0aSOc2oKx6JG5mvDgFgx60Dafs7hxAfJFylKEb/cRXbMyKtlCpAi9hy+/J U4QIoCuiW1miVWbUbrjqPwEHjMLOzFbdDjikkod7MdjNfYAjA1r2igb3mJxnrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNTKflqwIh9O/wyUWGqmBLy7GciMNd4SOS3oU/7ft/Q=; b=ajwDJZ/k/wpjK7Apf/ddi+VLAbOprGsYBtxvFi6ekzRXYt8oEVCXzwWqdvuNa2SpnWzxK7 /nYUnbMX/7rp07pi0ABN3vv0bDq7U6mHHjzZn91vKo0dPoANpIGW2/gFd49PXpsoSIJOYR A7UMMZ6T9638bsV7f7Aydzd9/MNCCPflriMbdH4BdKZO63fo7Ghznt4HfGIbboLQmBFHw+ gkj1EN5B0cIpagp/o3oDICIBdnn6/QWAiQ6cnampiLC45PRgxmY7IQmnNRWSGiaVSUkY4h JSPRxwPzNuaMU2Yu0zbZsflY7CjR+0/7zvso3uj3ZffIQtckN9D8W5X18zEL3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvx83S63z1C3C; Sun, 28 Apr 2024 05:22: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 43S5MqWk003453; Sun, 28 Apr 2024 05:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5MqCV003450; Sun, 28 Apr 2024 05:22:52 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:22:52 GMT Message-Id: <202404280522.43S5MqCV003450@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: cd79c46103aa - stable/12 - vmm(4): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cd79c46103aadae5c04e3c01b936a7fdefa899c8 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cd79c46103aadae5c04e3c01b936a7fdefa899c8 commit cd79c46103aadae5c04e3c01b936a7fdefa899c8 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:22:31 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 86a9f558e32a..6f264a8482e5 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -419,7 +419,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:22:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRvx95Sp0z5HxWr; Sun, 28 Apr 2024 05:22: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 4VRvx94nXLz4vRJ; Sun, 28 Apr 2024 05:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJjk5ejBVad+w5/09CcH1WcFzWpAgU7ZT+2NsqCW7g=; b=j3bmimV7JtPysV86wF0ciYWP8Fc++lwIgyamkDBsJSIqz1LAUsIIz1BNxeuoZv8e7xiMk1 Iki36X0TkvOtgEltATfnG/dxdeGGjOZQ64vRc2K5e7SwpWrNm4bkXBuoG0rWdkDwIFu/Wu tCQICV4tLkA3Y6f/hA5EySc+D4AeiGh+UHnYe3LDjVbkvGqu4H+a9jCuW6KcwukL9xz3ph 8K3oa+dxo6JS4a5yJzxWTzvFFhHHcLRobY6XJkE1C7nPzNcTQTTftHgn8tuRuZ36PmCuUG Blyrmc2UwZdEPAdnd8JENeZHEfw0YcJmBS34N+vyBKwKY/hb1z/jnLlX+RTW4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281773; a=rsa-sha256; cv=none; b=JIxoEK8c9N0c5PUgMSGVdjA2RsW/HWLqy4k9m5hjhxqyRfcO/erlpOauGgAT6dC5Ld1MnA 0Af5gytQdmByKMSiB90TS+cU2I79g04kwvqDNNR+92BKCWEN5sZ4aCW/P0NvH6Lcc2lhKS SZUhdogRMN0luklgU0GeNw98sF5eVacA5Hnl7EG1HETNKqDDpM1z32jZw/hxqQ3c+ssi+Q WXNXafyaKpKqTmmRYIOttLljNn3ooBXlqsZoXFZ1sEk9qSd8hb7ur8ucSM8DEc5tezLEB6 MQYqnHhC3BawuRScp0kQmCUjQQ4xstwXs+X4jHAVFFzI3amJ6yyfuBx7sjzwVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJjk5ejBVad+w5/09CcH1WcFzWpAgU7ZT+2NsqCW7g=; b=DUM6S+S8RoxAW/W3joUDYc5tcrSOtpHnkjSevQ/H0FqoajjTB/ssB/7yLzHBVQTQCCzdiV dAu3gTcnEtcl9JsnnS28AjqH/NTTTYVIgfZDJGJhxMrgyMs9rY2tfeDkZcljhCjGmIKJQg Kxl92wiqXpE1vF7iFjpDBzWY9y1gcnP1ScRVEfXfBkMPAm/FJ7LpLLmO3Gp9AIGD3LdTf6 dqpTSVmbKaDRZydgDBbgkjP+9ZShDMOwfRODmEFuOcjbPuta5iAC1xv6AtAPzK9WPJUd0O SDY1qsh+oDNWwOAAMGzCQmgHyIMkbyvlbS/6hXAuONddqwnpLdz8k+17oZw/nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvx94Lfpz1C2V; Sun, 28 Apr 2024 05:22: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 43S5Mr9V003500; Sun, 28 Apr 2024 05:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5MrWe003497; Sun, 28 Apr 2024 05:22:53 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:22:53 GMT Message-Id: <202404280522.43S5MrWe003497@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: f3e5aa50fc46 - stable/12 - wtap: Fix typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f3e5aa50fc46f3a96411f9424653d210c9792866 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f3e5aa50fc46f3a96411f9424653d210c9792866 commit f3e5aa50fc46f3a96411f9424653d210c9792866 Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:22:44 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ (cherry picked from commit 026520a5f2d2ec01e19494c37b87448df86ef21a) --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 8f50c00a1f11..1ba2adf1f51a 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -571,7 +571,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index b76fae1d6299..fb21833ac739 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -190,7 +190,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -208,7 +208,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 28 08:04:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRzX00dlzz5JD7W; Sun, 28 Apr 2024 08:04: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 4VRzWz6vsCz49C3; Sun, 28 Apr 2024 08:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=cqQms0dgJz7iIlF7dbFbBX24tke7xEY9/wmmNGDlNhXqvvhhAm+W1i0xmXXpoBTMhWf3BT fZ3t2xjhrED0+b0T9hFf54Xoib1f6WIQNQ8P0HPxcuxHEetou8uo+2o0O6nKvUIEQe0/Tk kLfchwQlwV+/hydHg0dXFNnSt+FYol4gpp0RvPEHiZdvTOFvtVWvqlvaSUGfax3a2egQA0 frw1q6qcKdKmOlDdjGQyIoJnqWaiFspgt99YTag01x/LkA46wUSlH75U3NBQMHadEkUeHh MZzq/hKphW50k+Xr6qnkiLHtkJWtHYhTKL5H6Hb3V9nZOsKoli41of8D/lv38w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291488; a=rsa-sha256; cv=none; b=YnmAQrH8Bl/hgc0nMtfjhO3EKbC6dSPQ6C0RGI3eGvdoapnrI9jEJ2CqQvrgAy+PMw3wXj gmGIHTDoo+fNafDTpjf4CTaYgSPCq6x2V3z+G+mDNxg1gLO5rJ0fphphpkQGEeIdDIBgLM E9nyri11jNuYYTzuWNMjAnhzZUIdYK+k5/qO9DbeJy/CYqoJ5xXyN9/wyAcGwre+aWT8hz puPTZq4MYVz6m1R6fZQJsPtmT/Ou1ZjzWMT0+mw6Q3Tjz0Fs/pEq1QDm4Ot8mzaAu4+tDI WbJj/BoX1btYIS6A4waRxlTCh5pMcQ0hJYPORrnB3xLu3dBySqinjeJlJdSQrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=CD21mIgZ+Us78sqcfx7goUZ8NcBmDWdOUpSELxeg3i8fFhOtc0GQ5fj5whk7VcVzi2e5t6 3io1LifIpaEulzbSbD5X36qWxlE2q3Nd3IufWRkTHJcuv3+5cup0hHifWDa8659ct+SwH6 0feaCYYLxiZC+AzwWgA/MmHPT2WOoLK363m8U3dWf12fYzVn1uSdIb1pauBLkf2E17rWQ0 7Pn5+Z9SiOs+lhimCInWbBkqXHlcQcKyBUpRfILdn66F3/uYnb6mzwzHifFMp/A3+Zicbu AUZrsrZpzc193mW/nE0EWiH8lrMRxC0o/VjTo1gkMJIS10phZ0WC+SS4eWdgeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzWz6VwnzHKF; Sun, 28 Apr 2024 08:04: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 43S84lUx075757; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S84lk3075754; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:04:47 GMT Message-Id: <202404280804.43S84lk3075754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9e6098a91168 - stable/14 - Skip building libclang_rt when WITHOUT_CLANG is used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6098a91168e4c90f6d38295f2876fe0e0fe190 commit 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Author: Dimitry Andric AuthorDate: 2024-04-25 15:05:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:03:37 +0000 Skip building libclang_rt when WITHOUT_CLANG is used As noted in bug 277096, when building a pkgbase repository using WITHOUT_CROSS_COMPILER and WITHOUT_TOOLCHAIN (which sets WITHOUT_CLANG), the following residual files are left over: /usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.so /usr/lib/clang/18/share/asan_ignore_list.txt /usr/lib/clang/18/share/cfi_ignore_list.txt /usr/lib/clang/18/share/msan_ignore_list.txt This is because the lib/libclang_rt directory is still descended into, even if WITHOUT_CLANG is used. Fix it by not descending into the libclang_rt directory in that case. PR: 277096 Reported by: Siva Mahadevan MFC after: 3 days (cherry picked from commit 514773a5486d1fa4f2d5acb5af1766965c20765b) --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 6c0574e76afb..294e2b695bdc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -179,7 +179,7 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # The libraries under libclang_rt can only be built by clang. -.if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_TYPE} == "clang" && ${MK_CLANG} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries! From nobody Sun Apr 28 08:04:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRzX11NBWz5JDVp; Sun, 28 Apr 2024 08: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 4VRzX10p7Tz49WD; Sun, 28 Apr 2024 08: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=1714291489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmxoPIcJS2t9+o1aOz+YF7OWZv02WEfqsvNScGBxEIw=; b=hXX2Z4V/wAYskQqfhMKbu4n81C7UlmyWjY8APITh2tzA1oZhnN/dKc2b0rukRlPGEajXl0 GWZr8U7uZNWTOp+159NzTZZiFdpL+Btfev1ruSZZD6swQlHAgF/rh8ZsYlFXugyy/ljvaH piqQm2FdY29M8TSUtrfySynVzbRX0zkaPVd9y7Q2b20+0bUlxMFimDvCjA0ozirKcxPstu u39RA2J01/Wla28pQAnQqHbcN/hfwSPsWmtdUwm/wmcfxt5z2PkXuZ0MTvU3xrhwAhBmaq ZClM2XunuyvYV6EV8MYFsLavSVCKWOgoly3oL+sqs7vI3r9gCbMXG363Ey/pZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291489; a=rsa-sha256; cv=none; b=XXJ1/VPbJig8JE/uTaGFmDvBDw8oN+SyEvY3Z0xO2Arwvg4apHZAma6X0iaDsASP6wVdrJ G9qkjDVhA3PLY/kuwGZYljOruBptUaisb2Bw+i0GhhzzM1g7G4GA1dej0SUfYPxhMmLmjq wYkpYL2cYzlc0X/Zolw7e3HdXbq3KN5aB13BpQTdDXrbQ8U9tlL00I9NAGnQxt1Fw5rlQg M7sRYXt/Kxt8B3NJxoC4gQb/T8dnbUKmfe0Gh87ZKqTmsahXldBVmFmGFYDM0FTpPRE5G0 Ltd7gvzk8S/v0EAxXFzus6oOB/kHUgGakQzO2BvcMh/hOZQ3daouamBtNxD8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmxoPIcJS2t9+o1aOz+YF7OWZv02WEfqsvNScGBxEIw=; b=Po3xNF2ErFp7aMJBZhD6CDCSErAO3fwNktZrfZ4D9cwCeX3GLDXhfVDbTHXf4pdGEfXi63 ekcBznKd1bphXM1UGTJXtgoQ1VNeYm+yzrtF3e1lF+lOaQrezzz/VP+PNrI2AwZbHMAiDb mekbUtiuAyquppv3ufitxptYyL99ls1B7uTTh+UnTSHjEHb1W4VFC6hxEajywrAes/Kvyj coCbBIv/88IMPVA64bHHl5KAcN0nBPK0VNgtFR33+hHM8ZUxp/0Gvrc4mBosHOtmEu0YGj zBdQIrY9n+bop6607SyeJQbsmJMK8VxE4+epNZ/dlkBVyuiBK9N2Mkj9PBPNMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzX10QM7zHVJ; Sun, 28 Apr 2024 08: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 43S84mp3075808; Sun, 28 Apr 2024 08:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S84m4t075805; Sun, 28 Apr 2024 08:04:48 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:04:48 GMT Message-Id: <202404280804.43S84m4t075805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 43fae14940a5 - stable/14 - Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 43fae14940a5db63e30acd48c2d1a2fcc35f6aaf Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=43fae14940a5db63e30acd48c2d1a2fcc35f6aaf commit 43fae14940a5db63e30acd48c2d1a2fcc35f6aaf Author: Dimitry Andric AuthorDate: 2024-04-25 16:47:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:03:46 +0000 Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): [sanitizer_symbolizer] Cast arguments for format strings in markup (#89815) When compiling the common sanitizer libraries, there are many warnings about format specifiers, similar to: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 31 | buffer->AppendF(kFormatData, DI->start); | ~~~~~~~~~~~ ^~~~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here 33 | constexpr const char *kFormatData = "{{{data:%p}}}"; | ^~ | %lu compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 46 | buffer->AppendF(kFormatFrame, frame_no, address); | ~~~~~~~~~~~~ ^~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here 36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; | ^~ | %lu ... This is because `uptr` is dependent on the platform, and can be either `unsigned long long`, `unsigned long`, or `unsigned int`. To fix the warnings, cast the arguments to the expected type of the format strings. PR: 276104 Reported by: pstef MFC after: 3 days (cherry picked from commit f08bf5a3acf146b17794fbde41279645ddbaa086) --- .../lib/sanitizer_common/sanitizer_symbolizer_markup.cpp | 10 ++++++---- .../sanitizer_common/sanitizer_symbolizer_markup_constants.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp index b2a1069a9a61..31d91ef3c739 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp @@ -28,7 +28,7 @@ void MarkupStackTracePrinter::RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix) { RenderContext(buffer); - buffer->AppendF(kFormatData, DI->start); + buffer->AppendF(kFormatData, reinterpret_cast(DI->start)); } bool MarkupStackTracePrinter::RenderNeedsSymbolization(const char *format) { @@ -43,12 +43,13 @@ void MarkupStackTracePrinter::RenderFrame(InternalScopedString *buffer, const char *strip_path_prefix) { CHECK(!RenderNeedsSymbolization(format)); RenderContext(buffer); - buffer->AppendF(kFormatFrame, frame_no, address); + buffer->AppendF(kFormatFrame, frame_no, reinterpret_cast(address)); } bool MarkupSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *stack) { char buffer[kFormatFunctionMax]; - internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr); + internal_snprintf(buffer, sizeof(buffer), kFormatFunction, + reinterpret_cast(addr)); stack->info.function = internal_strdup(buffer); return true; } @@ -118,7 +119,8 @@ static void RenderMmaps(InternalScopedString *buffer, // module.base_address == dlpi_addr // range.beg == dlpi_addr + p_vaddr // relative address == p_vaddr == range.beg - module.base_address - buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId, + buffer->AppendF(kFormatMmap, reinterpret_cast(range.beg), + range.end - range.beg, static_cast(moduleId), accessBuffer.data(), range.beg - module.base_address()); buffer->Append("\n"); diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h index 83643504e128..a43661eaecf2 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h @@ -33,13 +33,13 @@ constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex. constexpr const char *kFormatData = "{{{data:%p}}}"; // One frame in a backtrace (printed on a line by itself). -constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; +constexpr const char *kFormatFrame = "{{{bt:%d:%p}}}"; // Module contextual element. -constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}"; +constexpr const char *kFormatModule = "{{{module:%zu:%s:elf:%s}}}"; // mmap for a module segment. -constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}"; +constexpr const char *kFormatMmap = "{{{mmap:%p:0x%zx:load:%d:%s:0x%zx}}}"; // Dump trigger element. #define FORMAT_DUMPFILE "{{{dumpfile:%s:%s}}}" From nobody Sun Apr 28 08:05:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VRzXQ37Cfz5JDVs; Sun, 28 Apr 2024 08:05: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 4VRzXQ2bmQz49vv; Sun, 28 Apr 2024 08:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQ2M004TPoj/A86LItY6kXxJkWxyqSDPgUrKkDj1C6g=; b=cT7UjyhuYcW+8h6OB33DcuBBh+uYCgYPYQDCkt5kTsrxDnG6kW4kcCNtYIuXHc9BahhHwi rM4nJlagVl4gszJ4CzZ4nBNShWvC130Bf72vVXbGFpzwUgVZjz6mmcHz+shqp1ZaYF1Pzi c4auxBoqYozqNoNBi2aAbm5ZoBrCVfei8cghFxf3xzN5GqQhFGQ3DbPHwFxcIJQwXtjsTG vWC+NNDdo4bvqgx4Gt7oA4omwdemCXHnOcVpR89FYsKsFCUI9a0l7SeLml/Ti4Nw3GVUys tEkrMGnhRZvBeFIg1q2SeMcRziFK8FHSFBQNp6C/uI4WsQMWR8V4AfXaUH/JUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291510; a=rsa-sha256; cv=none; b=KKY432/ZeBVyVm255LFQ3KjYG6RTqGSTtTxUIzlT/VUKC57THxavp/s3NK976tJxZ8hRly gtTurZiCTmJU75ugSnidVZ+uB6qoCp/z0N3KVH6KvHRI7L1wfN7J/a29ThBbhRTjII5Ac4 0ikdtuxqq2i6ZuxrQEUGxmD/4b9b+sPB5OIECXwnfOk2koNPFUd5fc1mTGe1FxyZ0+RaPh wJf3e+3eiNQbVOZvfQkPZk7nCpBQr5UM7jMvgNeRfOaoD9Nwvfz8NPjWS5f78pr/OZfbF1 9uam8e+TGTakjsIL8i6ceEanO275xPN9r/5HYhniJL/4lz7FP0KJBzGwhtV2SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQ2M004TPoj/A86LItY6kXxJkWxyqSDPgUrKkDj1C6g=; b=bq+eEc5n6H7QcYwlo2SD2jGVpetpDkzGuBtjYdiOAFtsDHW8wL99X7Sk5EKfqpCYx7BTky pDO7pnUyLdESaaJDwxyWlG2yldg5/2fyOhq5N/Q2LTeE/nyjbAo5N4qwONjM+jpgrrCzDH lDUZ8sYK2hEcqkTrGwGkhkXOxfG4zssK31+TcOnRyBiOoWNahnGzaHUyGlDIkg4HQ4BnaN UaTBbHzA8NbvgvXL1ierfadOX+0q5hoeiGwJTETc0hYd4GBbySS/hG4flpA4zkNrc5fd3m hIJZea8ex316vOETWVg0eF/CCwxdEHn1BVxmV71W9Y50qWPAkdnrA4YDSNGVvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzXQ1vFYzHPr; Sun, 28 Apr 2024 08:05: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 43S85AEv076025; Sun, 28 Apr 2024 08:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S85Aeo076022; Sun, 28 Apr 2024 08:05:10 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:05:10 GMT Message-Id: <202404280805.43S85Aeo076022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b9b248b1df62 - stable/13 - Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: b9b248b1df62579913ce93ef4583e185e798a717 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b9b248b1df62579913ce93ef4583e185e798a717 commit b9b248b1df62579913ce93ef4583e185e798a717 Author: Dimitry Andric AuthorDate: 2024-04-25 16:47:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:04:33 +0000 Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): [sanitizer_symbolizer] Cast arguments for format strings in markup (#89815) When compiling the common sanitizer libraries, there are many warnings about format specifiers, similar to: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 31 | buffer->AppendF(kFormatData, DI->start); | ~~~~~~~~~~~ ^~~~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here 33 | constexpr const char *kFormatData = "{{{data:%p}}}"; | ^~ | %lu compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 46 | buffer->AppendF(kFormatFrame, frame_no, address); | ~~~~~~~~~~~~ ^~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here 36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; | ^~ | %lu ... This is because `uptr` is dependent on the platform, and can be either `unsigned long long`, `unsigned long`, or `unsigned int`. To fix the warnings, cast the arguments to the expected type of the format strings. PR: 276104 Reported by: pstef MFC after: 3 days (cherry picked from commit f08bf5a3acf146b17794fbde41279645ddbaa086) --- .../lib/sanitizer_common/sanitizer_symbolizer_markup.cpp | 10 ++++++---- .../sanitizer_common/sanitizer_symbolizer_markup_constants.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp index b2a1069a9a61..31d91ef3c739 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp @@ -28,7 +28,7 @@ void MarkupStackTracePrinter::RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix) { RenderContext(buffer); - buffer->AppendF(kFormatData, DI->start); + buffer->AppendF(kFormatData, reinterpret_cast(DI->start)); } bool MarkupStackTracePrinter::RenderNeedsSymbolization(const char *format) { @@ -43,12 +43,13 @@ void MarkupStackTracePrinter::RenderFrame(InternalScopedString *buffer, const char *strip_path_prefix) { CHECK(!RenderNeedsSymbolization(format)); RenderContext(buffer); - buffer->AppendF(kFormatFrame, frame_no, address); + buffer->AppendF(kFormatFrame, frame_no, reinterpret_cast(address)); } bool MarkupSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *stack) { char buffer[kFormatFunctionMax]; - internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr); + internal_snprintf(buffer, sizeof(buffer), kFormatFunction, + reinterpret_cast(addr)); stack->info.function = internal_strdup(buffer); return true; } @@ -118,7 +119,8 @@ static void RenderMmaps(InternalScopedString *buffer, // module.base_address == dlpi_addr // range.beg == dlpi_addr + p_vaddr // relative address == p_vaddr == range.beg - module.base_address - buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId, + buffer->AppendF(kFormatMmap, reinterpret_cast(range.beg), + range.end - range.beg, static_cast(moduleId), accessBuffer.data(), range.beg - module.base_address()); buffer->Append("\n"); diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h index 83643504e128..a43661eaecf2 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h @@ -33,13 +33,13 @@ constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex. constexpr const char *kFormatData = "{{{data:%p}}}"; // One frame in a backtrace (printed on a line by itself). -constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; +constexpr const char *kFormatFrame = "{{{bt:%d:%p}}}"; // Module contextual element. -constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}"; +constexpr const char *kFormatModule = "{{{module:%zu:%s:elf:%s}}}"; // mmap for a module segment. -constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}"; +constexpr const char *kFormatMmap = "{{{mmap:%p:0x%zx:load:%d:%s:0x%zx}}}"; // Dump trigger element. #define FORMAT_DUMPFILE "{{{dumpfile:%s:%s}}}" From nobody Sun Apr 28 12:37:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VS5bJ3FZzz5J9Yb; Sun, 28 Apr 2024 12:38:04 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 4VS5bG5FQ9z4d30; Sun, 28 Apr 2024 12:38:02 +0000 (UTC) (envelope-from mpp302@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.208.178 as permitted sender) smtp.mailfrom=mpp302@gmail.com Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2db239711ebso8922031fa.1; Sun, 28 Apr 2024 05:38:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714307880; x=1714912680; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MkYB5BkpAd+CUHu3Ol2C/vZiMFQtnWUGP/w49DfCSBo=; b=PYjDwJEEYm+w97UEXS8t/8xNupZTq7ACwFY5eGIBi5io6Jwmt7Eg5aiCtj8XpvtoFG PExVPXFDzugd4o/rkSJnHlPNxPuPVwlc9NN1hdahXJz6/8qEZpdpXBfDGedOeL0lC+eC 4tQ1DG/GQH+nWmVt5Fc8EUToPe99llCg17003PCs0pMw5YINv/klX9L2Of+Go/mYE15T uoI1tKDNxqyy8PlvjtwFSsVbEwCJcl20e3x5xWnDpLNIv0EvbS2nuVf/aWqNW1D9C6mr A41KY8Ea/vo9FZRpeM8n/mIzdCAxyEg7GnrjbeP2gA73wsL0sTFu/sZi3rFWrlXPKsuI 5jEQ== X-Forwarded-Encrypted: i=1; AJvYcCUdOm8ocZN9wXCnJVa4JAshsRJH0hLRaXrb8EzUsP+1/GPcFoKaUQidZq27P7K8a4rzdTByvOFqImgpQFIulx2njyA9i0IL/LBf6mQNyMTG7f8kxVo8fJ6ktUL/qlac+ValDlnPRValU/atieOjd80ktg== X-Gm-Message-State: AOJu0YwGQXkAa4SqL1xKrqxMYvXex8aAG+rUonVEQn9nIrs3t7pJIqoR gnRWsXstMOVYJNSvOypJ9RlVL16jXGvF9KUrU/G6zO01WGgos/FSzKT/6RDE X-Google-Smtp-Source: AGHT+IHmprmZES6UCHpPJoXBQ6RMlJa4+NMsjkFUnffe0snTk/PzJ5Q2CbOr/p8dfnmFWZPPIBcGyQ== X-Received: by 2002:a2e:97d4:0:b0:2df:1e3e:27e8 with SMTP id m20-20020a2e97d4000000b002df1e3e27e8mr4320120ljj.0.1714307879831; Sun, 28 Apr 2024 05:37:59 -0700 (PDT) Received: from smtpclient.apple (ip5f5af551.dynamic.kabel-deutschland.de. [95.90.245.81]) by smtp.gmail.com with ESMTPSA id t16-20020a056402241000b005701eaa2023sm12260146eda.72.2024.04.28.05.37.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2024 05:37:59 -0700 (PDT) From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-Id: <026867C8-33DC-4555-8B6B-03E0E848510D@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_9FB49A63-E48C-4927-8AF2-0542D31DC5BD" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: 5626f9e79090 - main - style.9: Document the existence of tools/build/checkstyle9.pl Date: Sun, 28 Apr 2024 14:37:48 +0200 In-Reply-To: Cc: src-committers , "" , "" To: Warner Losh References: <202404260938.43Q9cSwG055237@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3774.500.171.1.1) X-Spamd-Bar: - X-Spamd-Result: default: False [-1.28 / 15.00]; URI_COUNT_ODD(1.00)[9]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.88)[-0.878]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.178:from]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.178:from] X-Rspamd-Queue-Id: 4VS5bG5FQ9z4d30 --Apple-Mail=_9FB49A63-E48C-4927-8AF2-0542D31DC5BD Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hey Warner, Thanks for taking a look at the patch! > On 26. Apr 2024, at 15:30, Warner Losh wrote: > On Fri, Apr 26, 2024, 3:38=E2=80=AFAM Mateusz Piotrowski = <0mp@freebsd.org > wrote: >> The branch main has been updated by 0mp: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5626f9e790901999def12040a60746b0= ceeb9b95 = [...] >>=20 >> style.9: Document the existence of tools/build/checkstyle9.pl = [...] >> share/man/man9/style.9 | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) [...] >> @@ -904,6 +904,10 @@ instead of the older >> .Fn CTASSERT . >> .Sh FILES >> .Bl -tag -width indent >> +.It Pa /usr/src/tools/build/checkstyle9.pl >> +A script to check for violations of >=20 >=20 > Egregious violations and there are some false positives still. checkstyle9 is already warning against those imperfections. I assumed = that there is no need to warn against those in the manual page as well. = I can add additional disclaimers if you think they are desired :) Best, Mateusz Piotrowski --Apple-Mail=_9FB49A63-E48C-4927-8AF2-0542D31DC5BD Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 Hey = Warner,

Thanks for taking a look at the patch!

On 26. Apr 2024, at 15:30, Warner Losh = <imp@bsdimp.com> wrote:
On Fri, Apr = 26, 2024, 3:38=E2=80=AFAM Mateusz Piotrowski <0mp@freebsd.org> = wrote:
The branch = main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D5626f9e7909019= 99def12040a60746b0ceeb9b95
[...]

  =   style.9: = Document the existence of tools/build/checkstyle9.pl
[...]
 share/man/man9/style.9 | 6 +++++-
 1 file changed, 5 = insertions(+), 1 = deletion(-)
[...]
=
@@ -904,6 +904,10 @@ instead of = the older
 .Fn CTASSERT .
 .Sh FILES
 .Bl -tag = -width indent
+.It Pa /usr/src/tools/build/checkstyle9.pl
+A script to check for = violations of

Egregious violations and there are some false positives = still.

checkstyle9 is = already warning against those imperfections. I assumed that there is no = need to warn against those in the manual page as well. I can add = additional disclaimers if you think they are desired = :)

Best,
Mateusz = Piotrowski

= --Apple-Mail=_9FB49A63-E48C-4927-8AF2-0542D31DC5BD-- From nobody Sun Apr 28 17:13:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSChm4r4lz5JbmB; Sun, 28 Apr 2024 17:13: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 4VSChm22Ymz4yk4; Sun, 28 Apr 2024 17:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714324392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TL1o4H+OIar3hYrZHTgZWcqkPinJ04h+Fs5BhUspC4k=; b=Pf/aQeUW8PZx/4YjSDPeC+C8W/PXW8sLaWTl0HsIjd2s8RMQIEiXFktACz4oa9h4K36tuZ ID7x0Fz7sJxNX8X571BmKD6xelw2jJeKq6444BmkM9M7LinJHUAYp5J/cYPf/8UtCGtiep OjimxDRdlXiHtSTlA6Dxc5LP2kNDpCKdSI9iifG7kqXWDcLnIcU1tj+HN3+xGA/jRJgwHu 8pgn91dXaY7lm1vjW3vWuGDXGaXvwz2XHWEvl3qBpiRShZE1jRTNi9CA/WCk75s4tv9jmn 6xCx5rztEznSxuUJs4Gtb2AVE/tAdYghe9mCnk2FcYf0QhXieCUPcmMLfg6WVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714324392; a=rsa-sha256; cv=none; b=nqCNrj21fgocJFDtf6qaDUi90lBTpwHBMRq7bptxiCER/bbgubdebC55+zK2Y2cLDJ9rWz 1UY/DeShIqCy8B09zHw3Mcuc6NmotL1HX7xx/tFZAp1YPU1xOyeHsJR4QHZ82g7yz7Hxhx VBoTSchBKwDEeBNYjv5gGBP+SJOGKyCTNRxOh16EHoXPZW201LtfREsvgHMsALQJL3Sox5 To5cv/sLUOucEqx/bThHCJ5nI76LhnGS39JJHFS4x3Xsx+s2RyOolRQqNemllYMOg79uxR p+uIEVdbO2TV+f/GgEfHt78yFeHO3H7dvtW+m+8Ht0XLWCZNL/tYToy13F6gkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714324392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TL1o4H+OIar3hYrZHTgZWcqkPinJ04h+Fs5BhUspC4k=; b=dqP5N8lWfzsrta8iWOx2BD9Ve27+i2+Puw0y3MUCWkfunncF5VxclwsBuYHiMG7nhnLwVs pR2ZAszmNieAJJtEVP69ESHk53lKtr0edi29+r1lP7GAft5kKXNq1deyHSOWrEWADeeOpd 864DKXMbOCgmuaqNvyikYF5vYtqFvVtpstatf7rBSaFmBwcUMres60xPra1sKIKKtUnPG5 TVsqXK1L2eJeWYelw0qy9kyx6A3Kmib+S81j5k5e6LliZXe6VDJF571XPfuJLKf07JqdXd jDcWdhce4Ah65NNAL96FgPFI/FEMyAlOPPAeomCsoShs0/sO+tii21uXBh7MrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSChm1dySzYwy; Sun, 28 Apr 2024 17:13: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 43SHDCAs006962; Sun, 28 Apr 2024 17:13:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SHDCea006959; Sun, 28 Apr 2024 17:13:12 GMT (envelope-from git) Date: Sun, 28 Apr 2024 17:13:12 GMT Message-Id: <202404281713.43SHDCea006959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: dafb424b8d44 - main - date: Correctly check outcome of mktime(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dafb424b8d44c7fdc9cfe876a79aad05c438def0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dafb424b8d44c7fdc9cfe876a79aad05c438def0 commit dafb424b8d44c7fdc9cfe876a79aad05c438def0 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-28 17:12:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-28 17:12:58 +0000 date: Correctly check outcome of mktime(). X-MFC-With: 7b390cb63689 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44982 --- bin/date/date.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/date/date.c b/bin/date/date.c index 718c94601dd6..3ce9ee3235fb 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -334,7 +334,9 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) } /* convert broken-down time to GMT clock time */ - if ((ts->tv_sec = mktime(lt)) == -1) + lt->tm_yday = -1; + ts->tv_sec = mktime(lt); + if (lt->tm_yday == -1) errx(1, "nonexistent time"); ts->tv_nsec = 0; From nobody Sun Apr 28 18:12:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSF0q6RsHz5Jh5r; Sun, 28 Apr 2024 18:12: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 4VSF0q5q5pz53vn; Sun, 28 Apr 2024 18:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714327931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKpqgLjNDnTCYugTxM6f2L91N2DdFF54djbqxPxNUuE=; b=Tlij/B2ZM3aLS39ewkq9DSzcJj1s9e0mfKfRGZiukPCVx4JO/ejOSzEktkDxI3czftLD6v KzmPQ3i+36H/JGHr8lkpZ6s74urKpYQQIGFM20Zo2ImI9HQfHcXYXDt0DYDNiPXthmy6aF ldA0tvqKXkqq0XhbU9TJ2KHXhRE5cQ9CwahWg+EKV5kC85YdYYgDGq33vIAIVQHyMOqcCS VFLRpHtMVRF6WkmY7ZiGwWFVCGLjL+Ep9qHneeTOB68IjGU2IJ2DV9e6aZoSt657A4NiHz n6xA5A28mmRIKg1xfNY1JO9rSKiB4TQaY5muOZXKPdXb1Uv0w+9WP2q4dhrlbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714327931; a=rsa-sha256; cv=none; b=yp51+V3K5z5K2ftjLHHKdmvDt/Q282OfPfm6yW5emHa3bWpp7bW3VhyHN1vpClNBmRwoe3 1NqtNK8+3tM/aF03U/uW6gNAf8z/YIKzP7hvlM6MnFMt4N2ARcFFEH7khfftMXY5AmyRi6 5QGFfhbBloHuZUvXthdeM/lc1LbkqML8YVs3pTiPlOz+8rC6Npmy9n52YLaNFwqXAR/lyb D3mdIMod68FcK1AUYoBQ3TlGzE9VvJlt8G4wpRolvc6Fkaaow6y8KBBKPcfiqd+mxXUN6q hIKkEfelm3DxXQ537nFGFdBVLdyfr6hGLzDunpnJU9facK2UT2FrGZSoSpElww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714327931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKpqgLjNDnTCYugTxM6f2L91N2DdFF54djbqxPxNUuE=; b=hpf7PdxvDfKFOc+RpIWkyDO7MBCGAuC11y/+tihmSZR8+/aZUdm0GnQudhqOS+TM4OLbci Qq8Hx01yHTOx54Swq+zIyjC/4mWVpdQzW7rhuHiQFC0VnXdphp3adHLXIwJk+XgmFTpw4S Ea8HlXMPaldIw2LqMa8zkGB5M3XHG9wRTJYM3Tf9HOL4MF7L7QKqL7Xa1dWQSpTJqexvVZ ME4bjzsVx5qr9UfEKMRrESecmcatLyi9d9ZAVu836pxZJrh3SQH8VCqIgVAmpzPmmwBl88 k6hn3NqaNHHqbn4roCBmG68MSkJK2i3WjviucGxkxud8TMln1pKJTpfkeWk6ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSF0q5QCqzbnP; Sun, 28 Apr 2024 18:12: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 43SICBKA008154; Sun, 28 Apr 2024 18:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SICBSW008151; Sun, 28 Apr 2024 18:12:11 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:12:11 GMT Message-Id: <202404281812.43SICBSW008151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6662c2312e95 - main - gettimeofday.2: Do mention improbable future removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6662c2312e956439652ce2d06b42753b6a78fc61 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6662c2312e956439652ce2d06b42753b6a78fc61 commit 6662c2312e956439652ce2d06b42753b6a78fc61 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-28 18:06:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-28 18:11:22 +0000 gettimeofday.2: Do mention improbable future removal As kib@ noted: > Obviously gettimeofday(2) is not going to be removed > even in the far future. Reported by: kib Fixes: 4395d3ced5cf Document that gettimeofday() is obsolescent MFC after: 3 days --- lib/libsys/gettimeofday.2 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/libsys/gettimeofday.2 b/lib/libsys/gettimeofday.2 index cfba97149199..4fcd4b52312b 100644 --- a/lib/libsys/gettimeofday.2 +++ b/lib/libsys/gettimeofday.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 24, 2024 +.Dd April 28, 2024 .Dt GETTIMEOFDAY 2 .Os .Sh NAME @@ -139,11 +139,9 @@ function is considered obsolescent and its usage discouraged by .\" XXX: This should be replaced in the future when an appropriate argument to .\" the St macro is available: -p1003.1-2017 .No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) . -Application should use the +Applications should use the .Xr clock_gettime 2 -function instead as -.Nm gettimeofday -might be removed in the future. +function instead. .Sh HISTORY The .Fn gettimeofday From nobody Sun Apr 28 18:16:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSF5c6KTCz5JhnY for ; Sun, 28 Apr 2024 18:16:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 4VSF5c2xKrz54Ph for ; Sun, 28 Apr 2024 18:16:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-571bddddbc2so4460636a12.1 for ; Sun, 28 Apr 2024 11:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1714328176; x=1714932976; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=YB+QBDP748La5hcuu3drequV5zieljIJrFAOqM/2SVc=; b=LQW426hshnRqTeonH8Z4E4Qjd3xxM0X/uIPPUxo6E3jKYCB4FaEnym9Gxlq80fj17z 1QZfZJRBAkpVKdtHvbb7wzfqJzP0MBPqRkNgFufoZJT0sQrkT8SUi68N13p+rgMOrzr0 gk7El+zmLFBmrVUhXrolwZ1Ucye5SP6Ki3u5bX4yRLkFfh0ZD5ohI4UnLaEUSF/4FwSA bilUlWHc/qC9zCoZvimmn7XgI4MuvGPaJiO+TpEvP5Cu9JbgAGmwTN2Vy/hnykxCfiUP VckyGAsBJAeAmPYSUcYBnjZZJTtRRcR6gxwgufzCpZ+G0SihSiG1EWVnIauxSDiiAeWT kJ3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714328176; x=1714932976; 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=YB+QBDP748La5hcuu3drequV5zieljIJrFAOqM/2SVc=; b=s75W+KPoJMd0byiIzQM1x56W4/6SNcghcMbzqkqKLGStQNCTV/+e+S+0OjmwRIOTwo SSt9RZsit3Di57ONlG6RCs2oLCLK5P+MK+bRH3RC61wT7/S+CFwfe+MTMEEUswddbZWU RCBCOrmpakjAKYju5bkt5zJKtWHfntFzigKpWRH2rfAZnVQvxiQGBxKLBYBTA2U9C/a3 kXPdlO3QugEoO5aj1cpzbKr++RjWYq1tpUTtTk9uB+oIAqVmCKn5othPMHef/FV0RlZv kpqqtA4nEe05zUKfiJ5Y5bfLl8bHGZHNlS6mDi+mp2XCPV9noDt5mZS+cZDPVfmHrpVJ Lskg== X-Forwarded-Encrypted: i=1; AJvYcCXqQ/ngvY/K4oCp7YeWHtSpDuoHigpFd643B7yrEUb1FvoRAgX++6RfMjUPx8lDwIW+qxq0Hsio6Rohz7A/ZsnyTv1Dbdsmzyy5rcn3SNLV X-Gm-Message-State: AOJu0Yx568skRmjjdieHZGryonfAgzOnC0BOgI7Vs9cGSP624ded15LP BAC/lQCgoRhCTpQECZtneKLZtpD8WVizOwytJ/ZcTaF+K52MjWQwrMkloWEdFcQ68SPvd2l523+ ZorYUD7RmYKeJEZlmZnmKABk3UJmK3q65z1UWvA== X-Google-Smtp-Source: AGHT+IFlPV/Ral8eEGzf5kIdiCQzjBWKEcRGwoWcmYTaen489DcecZMndMYvNLNHr0l7mtXzxqAQK0QFe4PrRrxHVng= X-Received: by 2002:a17:906:445:b0:a52:6721:f276 with SMTP id e5-20020a170906044500b00a526721f276mr4281931eja.19.1714328176530; Sun, 28 Apr 2024 11:16:16 -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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202404281812.43SICBSW008151@gitrepo.freebsd.org> In-Reply-To: <202404281812.43SICBSW008151@gitrepo.freebsd.org> From: Warner Losh Date: Sun, 28 Apr 2024 12:16:05 -0600 Message-ID: Subject: Re: git: 6662c2312e95 - main - gettimeofday.2: Do mention improbable future removal To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000fdb05b06172c2149" 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:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VSF5c2xKrz54Ph --000000000000fdb05b06172c2149 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Apr 28, 2024 at 12:12=E2=80=AFPM Mateusz Piotrowski <0mp@freebsd.or= g> wrote: > The branch main has been updated by 0mp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D6662c2312e956439652ce2d06b42753= b6a78fc61 > > commit 6662c2312e956439652ce2d06b42753b6a78fc61 > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2024-04-28 18:06:05 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2024-04-28 18:11:22 +0000 > > gettimeofday.2: Do mention improbable future removal > > As kib@ noted: > > > Obviously gettimeofday(2) is not going to be removed > > even in the far future. > > Reported by: kib > Fixes: 4395d3ced5cf Document that gettimeofday() is > obsolescent > MFC after: 3 days > --- > lib/libsys/gettimeofday.2 | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/lib/libsys/gettimeofday.2 b/lib/libsys/gettimeofday.2 > index cfba97149199..4fcd4b52312b 100644 > --- a/lib/libsys/gettimeofday.2 > +++ b/lib/libsys/gettimeofday.2 > @@ -25,7 +25,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF > .\" SUCH DAMAGE. > .\" > -.Dd April 24, 2024 > +.Dd April 28, 2024 > .Dt GETTIMEOFDAY 2 > .Os > .Sh NAME > @@ -139,11 +139,9 @@ function is considered obsolescent and its usage > discouraged by > .\" XXX: This should be replaced in the future when an appropriate > argument to > .\" the St macro is available: -p1003.1-2017 > .No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) . > No, this should be .St -p1003.1-2008 since the 2017 edition was only typographical and technical changes. The mdoc folks are never going to have a -p1003.1-2017 because it's not a full new standard. Warner > -Application should use the > +Applications should use the > .Xr clock_gettime 2 > -function instead as > -.Nm gettimeofday > -might be removed in the future. > +function instead. > .Sh HISTORY > The > .Fn gettimeofday > --000000000000fdb05b06172c2149 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Apr 28, 2024 at 12:12=E2=80= =AFPM Mateusz Piotrowski <0mp@freebsd= .org> wrote:
The branch main has been updated by 0mp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D6662c2312e956439652ce2d06b42753b6a78fc61
commit 6662c2312e956439652ce2d06b42753b6a78fc61
Author:=C2=A0 =C2=A0 =C2=A0Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2024-04-28 18:06:05 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2024-04-28 18:11:22 +0000

=C2=A0 =C2=A0 gettimeofday.2: Do mention improbable future removal

=C2=A0 =C2=A0 As kib@ noted:

=C2=A0 =C2=A0 > Obviously gettimeofday(2) is not going to be removed
=C2=A0 =C2=A0 > even in the far future.

=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 kib
=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 4395d3ced5cf Documen= t that gettimeofday() is obsolescent
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 3 days
---
=C2=A0lib/libsys/gettimeofday.2 | 8 +++-----
=C2=A01 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/libsys/gettimeofday.2 b/lib/libsys/gettimeofday.2
index cfba97149199..4fcd4b52312b 100644
--- a/lib/libsys/gettimeofday.2
+++ b/lib/libsys/gettimeofday.2
@@ -25,7 +25,7 @@
=C2=A0.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSS= IBILITY OF
=C2=A0.\" SUCH DAMAGE.
=C2=A0.\"
-.Dd April 24, 2024
+.Dd April 28, 2024
=C2=A0.Dt GETTIMEOFDAY 2
=C2=A0.Os
=C2=A0.Sh NAME
@@ -139,11 +139,9 @@ function is considered obsolescent and its usage disco= uraged by
=C2=A0.\" XXX: This should be replaced in the future when an appropria= te argument to
=C2=A0.\" the St macro is available: -p1003.1-2017
=C2=A0.No IEEE Std 1003.1-2008, 2017 Edition (\\(LqPOSIX.1\\(Rq) .

No, this should be .St -p1003.1-2008 since the = 2017 edition was only typographical
and technical changes. The md= oc folks are never going to have a -p1003.1-2017
because it's= not a full new standard.

Warner
=C2=A0
-Application should use the
+Applications should use the
=C2=A0.Xr clock_gettime 2
-function instead as
-.Nm gettimeofday
-might be removed in the future.
+function instead.
=C2=A0.Sh HISTORY
=C2=A0The
=C2=A0.Fn gettimeofday
--000000000000fdb05b06172c2149-- From nobody Sun Apr 28 18:29:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSFNJ0pNcz5JjhW; Sun, 28 Apr 2024 18:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSFNJ08JYz55rn; Sun, 28 Apr 2024 18:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5uYXKXXYQGJEUoQHq5i843AdELygRdOX3RAwUBIqpY=; b=ipZERwADwQWnHfdUNHloanGVnfQQjJad5Dupmd1XtPOMLeDvQxKxd6rG4zgY+Fp+3FGCNa aJOFPT9F1UV+lIvUM/jPTek4yq/xXXNk3dHewI4NhQxigNa8MHT+v50cg/LXiBpUGUN9Ii OCaB9rcK161r644hfD0pzdYFegSU3yrYugrXimsJYrqTTjhlWc9NQ+5KyZBHpGoI5celGL yAHMkblkZbqILVlhTtCZruG/CxO1PK99IAcnN3ag0c5ZoFLayEDl/NkyPtud5mxfntm50t LCCwkVKtgBtPcKsSRqJfmKMmH3kB+tapUiolg9/mwmM4wXW/Dq5iyJRfVDcGSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328944; a=rsa-sha256; cv=none; b=eC7S9zS1Y5vSgunm6stAlWBL0uJDiyUBtP87GYUmTtA/0XBYYKomM+WViHkJwKI2QB0usc rmaVYk4ncAyRk8DA6bNLxI9jfcFMTjQy1D9r4xiD3XCwQgUO4uUU4kQ+L6TLNKCzAUD6yh TBE6vlshQJgcCreEHh58WrdeuVpRiNNvO0ZePXcRexEFOSX6nsROiLXXY6XuqSSCzj5I3V aBj41KIxBMthX2rBno4lRhOoC/r47iUcfcAONDW2C2OI/wZb3Zfx7NOpKyix783MC9pHpb lwfQJaVUh4kB1PQX5ccdBtnF9WiYSNdv1yZH8b3ptzpSoLGHDHOR8cYMHjw/pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5uYXKXXYQGJEUoQHq5i843AdELygRdOX3RAwUBIqpY=; b=XFbfEOPDWF26kwH1RUXi5mgGLwp0ctuZF/jvYhYvHYrhw9whj3nP8uqMF4/Be1FAzqS+V3 y9f7bGWoO6N1EdV7BR2cDdM/6yYeWpVB0eSFy88WFIj6MDs//r+IXhpi27YpRUTbMc5Sla Pi5CqvE34O3cAAef8R+YlIXtsjuFv2EekVu8r5JZ9Alls8CUXhDiYxc0AsJ2vYAkXFYY+4 EwYSRZN7tilGCgD3QVdtn7UXtVQKAobXE0YL/YEDyXhc+dZgEsR7HOEZmOxvXGKnelbzv6 OaSokGevt9z3Zyacoh+F9QomAZkai/BmWZXJPhK1ByoS8ytopXyPxQybq+UuZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSFNH6rqQzbtt; Sun, 28 Apr 2024 18:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SIT3Zc026589; Sun, 28 Apr 2024 18:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SIT35b026586; Sun, 28 Apr 2024 18:29:03 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:29:03 GMT Message-Id: <202404281829.43SIT35b026586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: bb27b83033d0 - stable/14 - sync.8: Document that the "sync dance" is not a thing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb27b83033d0a9a6425ceb508ad51cfb0cf266ea Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb27b83033d0a9a6425ceb508ad51cfb0cf266ea commit bb27b83033d0a9a6425ceb508ad51cfb0cf266ea Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 14:12:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-28 18:28:43 +0000 sync.8: Document that the "sync dance" is not a thing People still believe that it is essential to run sync(8) a couple of times before a reboot/halt. Document that this has not been necessary for a long time now. Reviewed by: imp, bcr, Pau Amma MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33233 (cherry picked from commit 177ba183076bd6fe6b29b1d657b954cca256506b) --- bin/sync/sync.8 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index 732d813880e2..222e9edf59f9 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -28,7 +28,7 @@ .\" .\" @(#)sync.8 8.1 (Berkeley) 5/31/93 .\" -.Dd May 31, 1993 +.Dd April 25, 2024 .Dt SYNC 8 .Os .Sh NAME @@ -71,3 +71,31 @@ A .Nm utility appeared in .At v4 . +.Pp +On systems older than +.Bx 4.0 , +commands like +.Xr reboot 8 +and +.Xr halt 8 +were unavailable. +The shutdown procedure involved running +.Nm , +waiting for the lights to stop, +and turning off the machine. +.Pp +Issuing three separate +.Nm +commands (one line each) was a placebo that would generally suffice in +.At v7 +machines that were otherwise quiesced systems. +It replaced the one-per-line +.Nm +as a substitute for waiting. +.Pp +.Bx 4.0 +introduced +.Xr reboot 2 +and +.Xr sync 2 +which rendered this trick obsolete. From nobody Sun Apr 28 18:29:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSFP44D7Vz5Jjpr; Sun, 28 Apr 2024 18:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSFP42V4Wz561q; Sun, 28 Apr 2024 18:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KV+6PARgQnrTb5b+ajANG2YySrCe5emJ7PliKfLNq8=; b=mGsunC/9rLmEg+gvGHDQQ+WnddmWI3JDpGU4Xo1AEo4Nqq4ynRampFnddeN5rlpVOYdCev fmb2xPFjOguNPaepHob+DHbRPq4jqMauLbB/LVn2oNJp5u33cbAQyIiwTul2/yVDwVwyYN w79Aa+AH1W25DNKG4qGH2CoYPqdBtutbJblfr9YY4Nb4zHVouaO92ynNpkXiK9phOPVxj2 E0Sg0/C0qusQzmSqURzGiClpse5eLeNOjXIjaVWVFI4RYF5x33SPZb5wNBaIxpD+d2S1Wu siRCYNNZHwr1l1tO5P3tINOSkCR1Bf49MJtXjDoCxjI3Vtw+W/fWOHyOQbOLew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328984; a=rsa-sha256; cv=none; b=yuQNIcvrBOlhZpTaSca8Amo8Vojt4Fo4/vHb4X48xfRODF3UYJlWSAE7mu0HqOIAOoEpAV Ix3YkBZZa5B/Ha2RmLChB9z6k+YUZKF86GM90A34KvB9svT4p9bsP5LF+lJU2U8t2iKWcS 5Zl4nQkfukPu2j7IQxQacPnnKyvVqhTrGbbkAqRLwxDXoDq9WHXonrrbB8AWOB9HTY4tWX 9RQFcjB3IRc43mvtH7NKJaZmQDJqf/Wb3dACUaVciM3HH+xnBfkSpo4z+2CwfuB7CNFe+W 7yBzFri+jH2xiUtgHH3JXnyfp4/9Ab0kYtY3YTTCwon2MUzoENfy95TDU35Q1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KV+6PARgQnrTb5b+ajANG2YySrCe5emJ7PliKfLNq8=; b=Y+hipgWavOnpDgDxOLcqzXcuEMDO4+lM7wQgduuCf850mo5p6wgJqdVMxqrw8qCaoTGahM Hod+xB8NeHRfC6LZHo8DU6cEejEjEqSjWbCuBCNITfds9GDuyS0Ochbt8CgjFLazQ1Xtde G5hm6KInn9oRmFgokAx/bgphCGgmJMkgw4OqTYwAxk/TMleDDviN7HTEwlNYgK4af5my3i K+pF9kqqX1jyzarCEHh/qRs0ZsW2pzl3QLX/zkG3hqbJX4bxDPq7CqhAbXvUNrfasnGkYh biYXnf/1SxgsOQgTIlOcvKtDzEfSRi0MGKdQFGMAlylFsPmSMpDZDDOydl6z5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSFP425W9zc5c; Sun, 28 Apr 2024 18:29: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 43SITiiV026831; Sun, 28 Apr 2024 18:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SITiZF026828; Sun, 28 Apr 2024 18:29:44 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:29:44 GMT Message-Id: <202404281829.43SITiZF026828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5119386711a8 - stable/13 - sync.8: Document that the "sync dance" is not a thing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5119386711a88f86dfb3ec3eb609d0d2c6a4f050 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5119386711a88f86dfb3ec3eb609d0d2c6a4f050 commit 5119386711a88f86dfb3ec3eb609d0d2c6a4f050 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 14:12:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-28 18:29:36 +0000 sync.8: Document that the "sync dance" is not a thing People still believe that it is essential to run sync(8) a couple of times before a reboot/halt. Document that this has not been necessary for a long time now. Reviewed by: imp, bcr, Pau Amma MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33233 (cherry picked from commit 177ba183076bd6fe6b29b1d657b954cca256506b) --- bin/sync/sync.8 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index 732d813880e2..222e9edf59f9 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -28,7 +28,7 @@ .\" .\" @(#)sync.8 8.1 (Berkeley) 5/31/93 .\" -.Dd May 31, 1993 +.Dd April 25, 2024 .Dt SYNC 8 .Os .Sh NAME @@ -71,3 +71,31 @@ A .Nm utility appeared in .At v4 . +.Pp +On systems older than +.Bx 4.0 , +commands like +.Xr reboot 8 +and +.Xr halt 8 +were unavailable. +The shutdown procedure involved running +.Nm , +waiting for the lights to stop, +and turning off the machine. +.Pp +Issuing three separate +.Nm +commands (one line each) was a placebo that would generally suffice in +.At v7 +machines that were otherwise quiesced systems. +It replaced the one-per-line +.Nm +as a substitute for waiting. +.Pp +.Bx 4.0 +introduced +.Xr reboot 2 +and +.Xr sync 2 +which rendered this trick obsolete. From nobody Sun Apr 28 19:43:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH1j54Jnz5JqVX; Sun, 28 Apr 2024 19:43: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 4VSH1j4MVwz41Sp; Sun, 28 Apr 2024 19:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8dS/I+Epmm498Cv1ttUMWC/pBo3q6kuTPmO6iZWD8Qw=; b=Kx/qlyUdombEKMXS92scDm6Gr05N9YSd42YnwK1he2GufLCLAndx1Y8PBp3nVzokPAc8Jf 3M1w1GTXVS+cSQ8sF7S8DRTVtF9/azyuFxuOQfGKD5HehW9aAZHcvATqECb6Oir901hBIY j/ZY63troRu51bUtcVLgkLsfVHGFw/z/6B8qHYSS8r/95PxAweqb9tevL7cdi8CgFsvg05 vWerH/f6hgz5Vhw0FHsYWpeW06jRsddHJPTajM9QiGDj4rV3ijPqOI/AQ57s1y84DEifcw wf9uybbQC+DLPMfm6BemftCjE7zK2QHxuTIHMm9gl7C5lE0gne6PLG4+mj313w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333385; a=rsa-sha256; cv=none; b=wGIQre7QYkbwXSxZeOpm/baAqQ8APLSGETy7WP/7a3ERHyRWPvghbsNa+RA0c59JnrjYzG PDgbdXqilNWxrQtpHyVQxSPiOF3+WB03jl24+TJ9TOMc6yF9LbIkLW7kUNtAuMHQreRNj/ mhKvoCzjJ8lO3oR2DMSnU7vnnals+Xq6cr+kQiV5V3FzsPdjn334vN5r3Ajrxa42zyoE+X qSe/2f91rX9YUCk8avUfUIamzv43aFI/i/cmaWU/IiIq28falLYf9CZXZ2J11Awc7BUuhZ XbpZ37ILOfn2UDskWDp2xUD52A8EQVtz5aqm7QJfKUK6zZ4r7t96YExVwDFA7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8dS/I+Epmm498Cv1ttUMWC/pBo3q6kuTPmO6iZWD8Qw=; b=jtg9XnLLBp1OiMNfCe2ffFUXcWQP7161aq0xtkQf3scKNXyXBMkT3qjImKNi+4NOnqmOzA fXdn/E7Xs+AfrHGVHPgukSe2Wwjk7BuL5KnhkwnZUNCO3sFNHAvy1BmV0exqKo7fvWYcy2 gB6Wz/ZlAlcMV1s2JEyVUSKZZkdnYK8xT+wIcLG+Q2J1fVayT4YqjLvqAsXU2qYS0SxZrW h871GaHfF4MFpj3kIwLFbGUElFKppQHavk3/zlWVpDAoEFXI7RaTy4MapGoRoaXP7dK7qr hQOOIC3AeAJJKeZHvpDAbgjiXJlbivahSSsOcygKvfOKdTSlGOzRByxtsku11Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH1j3z8zzfKs; Sun, 28 Apr 2024 19:43: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 43SJh5BP061930; Sun, 28 Apr 2024 19:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJh5Ip061927; Sun, 28 Apr 2024 19:43:05 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:43:05 GMT Message-Id: <202404281943.43SJh5Ip061927@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: 56ee5fc43c40 - main - rtld snprintf: do not erronously skip a char at the buffer boundary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 56ee5fc43c40479e2651b21862e299bcf73017ae Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56ee5fc43c40479e2651b21862e299bcf73017ae commit 56ee5fc43c40479e2651b21862e299bcf73017ae Author: Konstantin Belousov AuthorDate: 2024-04-28 06:37:24 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-28 19:42:12 +0000 rtld snprintf: do not erronously skip a char at the buffer boundary Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44987 --- libexec/rtld-elf/rtld_printf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/rtld_printf.c b/libexec/rtld-elf/rtld_printf.c index 07598c73c6d4..befac1c547b7 100644 --- a/libexec/rtld-elf/rtld_printf.c +++ b/libexec/rtld-elf/rtld_printf.c @@ -81,11 +81,10 @@ snprintf_func(int ch, struct snprintf_arg *const info) } break; case PRINT_METHOD_WRITE: - if (info->remain > 0) { - *info->str++ = ch; - info->remain--; - } else + if (info->remain == 0) printf_out(info); + *info->str++ = ch; + info->remain--; break; } } From nobody Sun Apr 28 19:48:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8W2PFSz5Jr7M; Sun, 28 Apr 2024 19:48: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 4VSH8W1kzrz429h; Sun, 28 Apr 2024 19:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oDvFfLEzy2gmbzqBh9k1UV/K+vsI2gg0ZKepjulkkCw=; b=DaRZtC0VvmnGtrxOHrS3LP39m0HYIPF1pyF1PXsun0hMMVIV0hEL70OX3b1xB55Xy7SU5T 8YuwsirtEHqe7gLOA8flnE70oOcFcxfQ9NMsZyfUXhrVWy6zZtruXXDhZz9VzcQGyWO5xV Dplc5lcAhW9vLnXG31yGCSXy7vX0zurW5DrQUrDuKvO+m6GEXou2BhWvRMnkJtMxruG3pW MupKR6RMYurzCz4BxE8436WrXXk+JBmdI3bCx5gFIqWPm2IJYIlKIIM+VgptHNKa3DQsl6 F2NQqYaLTnJ+G0/iKJ8MEBxbWxIeEGz6q7WwujYrJzaxa+pieK8JZrBWqjxUgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333739; a=rsa-sha256; cv=none; b=kQLsKQlsifEzbeCq0lHtdiKMapKWuhOJYfS7+zqHWiJpRh93z/UvCmP7C/zx9cj/XTsB5w aArxtKUaqnqRQxq79Kzbs97x0ZqQExuCq9xKtU4B5rRXlGSvMsXFfU5os59IReImxv8IBe d7Urrb2A2oJgOfZyVttY5vPY+UuWR5Bl4vJMt4cJH6xFCc12JQs8rYB6KroEXCJVkU0otU 12HNIKnUZwSLw5+GZFoCP/PXP2k2OA+ic0C/YbtDUgKRBkh+/zcgP/CRgXHvvu8qun7U/e NePdcHl+ZMPrpPq+1pCoqfbuZSDKhQlYwH/dICrMyE9h5wNCwcsdUbe39LXlnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oDvFfLEzy2gmbzqBh9k1UV/K+vsI2gg0ZKepjulkkCw=; b=IvSSWMj8DqkRA0TUUVnPEnOCU1foqd3fSYlfHYk3Cu2RsPw+eTYsg37KJLEp7JUlhsX99V tfFtC7CFXVhb+x1wahiofKVxKGsjHN9uaQB29VbaHJRuYeFx8cU2xxC+eR+pxHCmGDbu4N 37dsvacwRkEQL2ikwJK3v+jYhRNm0co6BitffHeoDKmSz2076he8LLU93XOBDRiQ0OD6L9 SagAVYbmpzPOghjvWBHhRvaTv4Q6L2tXOEt2QQcei6E6aHQRR3yDWuhTyhPB2VMKLm2s1p X/428IuHU78uRO2JtC7T8JE9ov0J/pCD01JGhHzmauSBjoS0FymKc/ihevua7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8W1KmszfKw; Sun, 28 Apr 2024 19:48: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 43SJmxSN063123; Sun, 28 Apr 2024 19:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJmxt6063120; Sun, 28 Apr 2024 19:48:59 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:48:59 GMT Message-Id: <202404281948.43SJmxt6063120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 074d6fbebc16 - main - sound: Fix NULL dereference in dsp_clone() and mixer_clone() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 074d6fbebc160222cde6b726adcc7350881d7824 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=074d6fbebc160222cde6b726adcc7350881d7824 commit 074d6fbebc160222cde6b726adcc7350881d7824 Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:14 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Fix NULL dereference in dsp_clone() and mixer_clone() If we only have a single soundcard attached and we detach it right before entering [dsp|mixer]_clone(), there is a chance pcm_unregister() will have returned already, meaning it will have set snd_unit to -1, and thus devclass_get_softc() will return NULL here. While here, 1) move the calls to dsp_destroy_dev() and mixer_uninit() below the point where we unset SD_F_REGISTERED, and 2) follow what mixer_clone() does and make sure we don't use a NULL d->dsp_dev in dsp_clone(). Reported by: KASAN Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44924 --- sys/dev/sound/pcm/dsp.c | 14 ++++++++++---- sys/dev/sound/pcm/mixer.c | 3 ++- sys/dev/sound/pcm/sound.c | 7 +++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 1c020ba22611..c5bb27530d2b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2086,10 +2086,16 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, return; found: d = devclass_get_softc(pcm_devclass, snd_unit); - if (!PCM_REGISTERED(d)) - return; - *dev = d->dsp_dev; - dev_ref(*dev); + /* + * If we only have a single soundcard attached and we detach it right + * before entering dsp_clone(), there is a chance pcm_unregister() will + * have returned already, meaning it will have set snd_unit to -1, and + * thus devclass_get_softc() will return NULL here. + */ + if (d != NULL && PCM_REGISTERED(d) && d->dsp_dev != NULL) { + *dev = d->dsp_dev; + dev_ref(*dev); + } } static void diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 0178e1ae8c3e..33a7eb26606d 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1378,7 +1378,8 @@ mixer_clone(void *arg, return; if (strcmp(name, "mixer") == 0) { d = devclass_get_softc(pcm_devclass, snd_unit); - if (PCM_REGISTERED(d) && d->mixer_dev != NULL) { + /* See related comment in dsp_clone(). */ + if (d != NULL && PCM_REGISTERED(d) && d->mixer_dev != NULL) { *dev = d->mixer_dev; dev_ref(*dev); } diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index e88ccb1f25a6..faf4bd1c7dce 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -1013,10 +1013,6 @@ pcm_unregister(device_t dev) CHN_UNLOCK(ch); } - dsp_destroy_dev(dev); - - (void)mixer_uninit(dev); - /* remove /dev/sndstat entry first */ sndstat_unregister(dev); @@ -1034,6 +1030,9 @@ pcm_unregister(device_t dev) d->rec_sysctl_tree = NULL; } + dsp_destroy_dev(dev); + (void)mixer_uninit(dev); + while (!CHN_EMPTY(d, channels.pcm)) pcm_killchan(dev); From nobody Sun Apr 28 19:49:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8X58YBz5Jr2Y; Sun, 28 Apr 2024 19:49: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 4VSH8X319Yz426s; Sun, 28 Apr 2024 19:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsa9ctrVmBYHj892MQalvDe3xKrPN3PkV7q/MAVt2kY=; b=DlT0B8kkj+Em+s4WEpNODSuD2Jtx1KBWQnQ7ltToISFpsnqptSn8FAuB5MY//vkIFm7o8m 3kPh24/KjKbc0VqJ9CDmRzfOws47gqJsfCoVlh1SE1mMXe3jWiW36LiTm1PQS4/CdBPyvH V1dqNFhJ3q5YmytjrxgVveaB8HwyQy29zx3WPqapltsNszOH4peJGjTWd+MCyS8NSq92u3 IH3YIgFxQUjd6YPv6G9G8Gy168tcrJ4XAF2crqRdQDZ5vEPugljH2SxqGok63Cg63POxsu j4IH1R/JIjWTS7pyX991aauvVELMYvWeVgxTtYKMp43duUxcpiiWjV4sLPRcHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333740; a=rsa-sha256; cv=none; b=FuQyQpiwZl763SJwzYW1s2hEMHPJYAajh5j/sst2ImCpMiRcEqS+Y5tz2u988pWQLNJuEv 15AzcyvIk4q+oAvSm17pjL2GoEI/eP00l7qPE5u+NpYBY5X+HOk4GPRyxlOtSgCmxZ4SZY gF05LjEAlWiYoT86MQZN5eZ3+GL3o6snGPNs1jZh2lnPvDXuzJHVtfRY5r39bdT6pKNV0L yeF59UT14XwBy40b2bu1iZDXJfhCCNnjzYosim/J/CqhkLRV0WOr8PIo9+1C+hxj9l0Na+ R39VJz58sfdlx9goTKyI3czp8LVXL8GLakxGlZFntAvwHijgTXTtDXceQwKYVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsa9ctrVmBYHj892MQalvDe3xKrPN3PkV7q/MAVt2kY=; b=HRS+WuYHeism9S6QJTe0j+fqsKl4atTi+UYu/lzGWqx5M5btxBHkgQELR1tl+Nq2Mj2t9O qXlKuxIzFjYMpM7Jtyt8jiWncXuUrLRE/F2GWhtYcKZZqzUbwLsauWL206LsfB35gPPRo0 la6yIfyZFe8VmvVgk0aL9EiruIMgB/UR7bkb+6K3G6eG2C21Ainbt98eYeZ1skiXgT4Tvw e+iaNOdnINpJ97ZAMBaAltPz8TEGSw3EDnpa50K9/Va8eWWVotY+6rwNniqbEobEqp8s2D KgKV3K8WAs5N6bXjaemhAewfgsI57Wv3fb20rv0QHj24Pxx1948P8foU5R1Ggw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8X2d4SzfJr; Sun, 28 Apr 2024 19:49: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 43SJn02v063179; Sun, 28 Apr 2024 19:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn0bF063176; Sun, 28 Apr 2024 19:49:00 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:00 GMT Message-Id: <202404281949.43SJn0bF063176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b18b990d8e7b - main - sound: Wrap dsp_clone() and mixer_clone() with bus_topo_lock() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b18b990d8e7b15d25243d85ea22374dfdde8a18b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b18b990d8e7b15d25243d85ea22374dfdde8a18b commit b18b990d8e7b15d25243d85ea22374dfdde8a18b Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:29 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Wrap dsp_clone() and mixer_clone() with bus_topo_lock() Make sure that the softc isn't freed in between the checks. Sponsored by: The FreeBSD Foundation MFC after; 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44991 --- sys/dev/sound/pcm/dsp.c | 2 ++ sys/dev/sound/pcm/mixer.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c5bb27530d2b..df1482d6a97a 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2085,6 +2085,7 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, } return; found: + bus_topo_lock(); d = devclass_get_softc(pcm_devclass, snd_unit); /* * If we only have a single soundcard attached and we detach it right @@ -2096,6 +2097,7 @@ found: *dev = d->dsp_dev; dev_ref(*dev); } + bus_topo_unlock(); } static void diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 33a7eb26606d..2f4a6f4d6395 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1377,12 +1377,14 @@ mixer_clone(void *arg, if (*dev != NULL) return; if (strcmp(name, "mixer") == 0) { + bus_topo_lock(); d = devclass_get_softc(pcm_devclass, snd_unit); /* See related comment in dsp_clone(). */ if (d != NULL && PCM_REGISTERED(d) && d->mixer_dev != NULL) { *dev = d->mixer_dev; dev_ref(*dev); } + bus_topo_unlock(); } } From nobody Sun Apr 28 19:49:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8Y6sgVz5JqcN; Sun, 28 Apr 2024 19:49: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 4VSH8Y4nhLz42NH; Sun, 28 Apr 2024 19:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvEY0UmoMmefBr2/v8gLpsJlZrhyZUxhJdF/YHVCTa8=; b=UQzBWtEGZMgEwR+mB5SVjBomzpYMt50aQ4d8l2uCkSL7FKlp/L1NXSl4qdAL2Kmh5lg38O M9Jg0srg88YywODSEI6blxFztOEnrJr9A29Hv6TeZakLvhd8xUQjzxdFxFiJEuiJxnakKc E2tQ6A6iNEhoISkeW7UrnwXMF8NwLOLEK4xB08PatwjWMGEwiAbkR4FK8/HSaKKDgCBJqO RYorix8v8bekQIXesGWbs7no3GTTKxfLX6XZTkJbr7Ux9St+br2LpJSazgpWCLu200mODE HV6rTRKBpqAP59aJlgoRLycxcHEztDO2Ue4PsihHeSJqnrGTZMEeVzPf/aIDXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333741; a=rsa-sha256; cv=none; b=sKmKTc9NKilwgG/5RHCqpSo50wjysJ0KymNIiKUvMJsLnqN+wi00vODswakkLCrjLVZtI4 CfvHmkSGAhLZ0fe8m/PgawTIgK3jAM6Jk5GetHxfgTfqiYpy+bGG3jHn4qMX6fOMbCq9KV iLI9CRlYUVCNWxKYHv0dqu0cZfAhFkzYS1qTkCauYeguXpygedxUpgrTH4+D3uxYuAyA6O +gPbOsAla/rPm+c9M9K5DQdh4WhWVYCUHLUJNhqkxZRSLB433Mcio/kilmM3OSN8wrH5j1 NRSacD/Q/OsTjqtyOX5QOBElMYoULGNqO9NmVTDHla8aakFQ2WGMMppH5q4dEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvEY0UmoMmefBr2/v8gLpsJlZrhyZUxhJdF/YHVCTa8=; b=VWzfMHs038HSaVskd70NQoyknaR9c+lY5dcfvyVqeeWAhTvDNlmHWY7KrMlsklwkP93FAi WOlc1s8HWo/U8q0lZ3lYZLori8xbhbaAdQAhUsO1e7f/t1lhIYRpL9BQr4bKYJEtONUtJb SLKTlwlSpXjiuZJEd530ikOUjXGS8rrK1FO1Hh25pKmZk0BwPgzAIKvLJRKtMrvMFuJYo5 G88ZBnLE0hdz61bkGBNfV45reFIvKtlq6/xa8yxro41tYDQa+3EnOXGSkHd+p1q34GuyIh Ug/ieAxLA1q6kJa2BwT0J39mAzqHb3+E/94hCMs9HkTL6srO2kD6pS0NbXohzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8Y3s0nzf6C; Sun, 28 Apr 2024 19:49: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 43SJn1uj063240; Sun, 28 Apr 2024 19:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn1Nq063237; Sun, 28 Apr 2024 19:49:01 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:01 GMT Message-Id: <202404281949.43SJn1Nq063237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 03614fcba25b - main - sound: Fix panic caused by sleeping-channel destruction during asynchronous 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03614fcba25b9de99e69819bc4690f66a3d24438 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=03614fcba25b9de99e69819bc4690f66a3d24438 commit 03614fcba25b9de99e69819bc4690f66a3d24438 Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:40 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Fix panic caused by sleeping-channel destruction during asynchronous detach Currently we are force-destroying all channels unconditionally in pcm_killchan(). However, since asynchronous audio device detach is possible as of 44e128fe9d92, if we do not check whether the channel is sleeping or not and forcefully kill it, we will get a panic from cv_timedwait_sig() (called from chn_sleep()), because it will try to use a freed lock/cv. Modify pcm_killchan() (renamed to pcm_killchans() since that's a more appropriate name now) to loop through the channel list and destroy only the channels that are awake, otherwise wake up the sleeping thread and try again. This loop is repeated until all channels are awakened and destroyed. To reduce code duplication, implement chn_shutdown() which wakes up the channel and sets CHN_F_DEAD, and use it in pcm_unregister() and pcm_killchans(). Reported by: KASAN Fixes: 44e128fe9d92 ("sound: Implement asynchronous device detach") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44923 --- sys/dev/sound/pcm/channel.c | 9 +++++++ sys/dev/sound/pcm/channel.h | 1 + sys/dev/sound/pcm/sound.c | 64 ++++++++++++++++++++++++++++++--------------- 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index b4872fdb8037..cf9239839aca 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1301,6 +1301,15 @@ chn_kill(struct pcm_channel *c) return (0); } +void +chn_shutdown(struct pcm_channel *c) +{ + CHN_LOCKASSERT(c); + + chn_wakeup(c); + c->flags |= CHN_F_DEAD; +} + int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 21007454584e..c8d33c583188 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -264,6 +264,7 @@ int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); int chn_kill(struct pcm_channel *c); +void chn_shutdown(struct pcm_channel *c); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index faf4bd1c7dce..0a88d732def7 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -674,23 +674,50 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) return (err); } -static int -pcm_killchan(device_t dev) +static void +pcm_killchans(struct snddev_info *d) { - struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; int error; + bool found; PCM_BUSYASSERT(d); + do { + found = false; + CHN_FOREACH(ch, d, channels.pcm) { + CHN_LOCK(ch); + /* + * Make sure no channel has went to sleep in the + * meantime. + */ + chn_shutdown(ch); + /* + * We have to give a thread sleeping in chn_sleep() a + * chance to observe that the channel is dead. + */ + if ((ch->flags & CHN_F_SLEEPING) == 0) { + found = true; + CHN_UNLOCK(ch); + break; + } + CHN_UNLOCK(ch); + } - ch = CHN_FIRST(d, channels.pcm); + /* + * All channels are still sleeping. Sleep for a bit and try + * again to see if any of them is awake now. + */ + if (!found) { + pause_sbt("pcmkillchans", SBT_1MS * 5, 0, 0); + continue; + } - PCM_LOCK(d); - error = pcm_chn_remove(d, ch); - PCM_UNLOCK(d); - if (error) - return (error); - return (pcm_chn_destroy(ch)); + PCM_LOCK(d); + error = pcm_chn_remove(d, ch); + PCM_UNLOCK(d); + if (error == 0) + pcm_chn_destroy(ch); + } while (!CHN_EMPTY(d, channels.pcm)); } static int @@ -1000,15 +1027,11 @@ pcm_unregister(device_t dev) CHN_FOREACH(ch, d, channels.pcm) { CHN_LOCK(ch); - if (ch->flags & CHN_F_SLEEPING) { - /* - * We are detaching, so do not wait for the timeout in - * chn_read()/chn_write(). Wake up the thread and kill - * the channel immediately. - */ - CHN_BROADCAST(&ch->intr_cv); - ch->flags |= CHN_F_DEAD; - } + /* + * Do not wait for the timeout in chn_read()/chn_write(). Wake + * up the sleeping thread and kill the channel. + */ + chn_shutdown(ch); chn_abort(ch); CHN_UNLOCK(ch); } @@ -1033,8 +1056,7 @@ pcm_unregister(device_t dev) dsp_destroy_dev(dev); (void)mixer_uninit(dev); - while (!CHN_EMPTY(d, channels.pcm)) - pcm_killchan(dev); + pcm_killchans(d); PCM_LOCK(d); PCM_RELEASE(d); From nobody Sun Apr 28 19:49:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8c1bpHz5Jr1Z; Sun, 28 Apr 2024 19:49: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 4VSH8b6dBPz42JF; Sun, 28 Apr 2024 19:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vo7S9QDLowMJL2n3ufnYjhY2AoscE+nHR9jR/PeeANE=; b=Rqk2JJlH+VmJVUC0uByYH+o8R0J6jOjspdnvgcJ/UhiuwBSqvbXgADZFbjcbJo1LIT3rcC LhzEiXqNtkYNDYCZSZ1m0zYnRkr1bKnthbCuLPVsbP7Dw7LqM3pF+60TbtVgo+JbCtwmV0 BWkHNR6bc9tasxf1weMCxw5scGJMGv5PpyP+hcxwopXzBYQGy958u1jhNlDuCp/xxSjqqm fKFigrs6df+uJ5AeHmJwTmKmWZfVhPHSoij9PNU49FZmrZWA4SKDJeXzHy6U5A5JfNfWfC QxTi3TIhxg8dBB8kRipsdMq2Gceq7EYTOohtJqXgmiDcJmNBhA63eGN47P1Avw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333743; a=rsa-sha256; cv=none; b=wldQZQ8f/DnGznIdAbA9o7kExaZdY7038uNA1MbY1yWD7E1Evf94fviqdXaURAxFFMReZ/ fJ/X6XBb/ic/ftsrBF8hJnthuIoHcHe1Ph3rVMZzB36/Y6xgs41vsx8+yzDAc/E3kTCtz6 YdiADfuWriibECohMxj3dgvPXzpFodfT64MwSeZ1oyE+xh1cGAyZy58hxzfL23xdRPEn9h 1fKUrAcgoUKfOmfZKsfT1XqbBGZRS69MCV2aUbWlrjGcrCIkbU4t8rVzRnMcYsvLZbgDbi 3QUCr0ZquBsytQebklr/VrebUqBx9sGDhmP1NmF2fnFxVeXws5gLk25OVSq4TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vo7S9QDLowMJL2n3ufnYjhY2AoscE+nHR9jR/PeeANE=; b=SCcyvkm0334ioPe0NWuXuhZ5tLWNQzQBA4EbTplGJQSOdeCMgkTnWpe7vv08eem2pOtHFx Y61OqcE2n72Ulji7x3T5LwA90xB32fa9yzTZshyXhS3LduP0hiQPMgIlTRIbbPqxGjfND+ QGMywCymzIcF6efzgHYso8mD8HiM7w1a42oo1QDzHvhaNEFZu2VZRxX4JZ2grRCHslagpm FA9LTYFDA4uH1QvLH8Am3p6fP8CYCbKI0B/G30dyr1qteRCAU+HW3gN4DSIfJi5M7/6f9D BvcBs4h7QChWmVxQ57RuoGxyCoIFDVjMPlv7A+vU7c4LaWVJFHGxY7Hcheflww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8b5FyZzdrh; Sun, 28 Apr 2024 19:49: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 43SJn3QY063447; Sun, 28 Apr 2024 19:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn3PV063444; Sun, 28 Apr 2024 19:49:03 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:03 GMT Message-Id: <202404281949.43SJn3PV063444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 25723d66369f - main - sound: Retire unit.* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25723d66369fe6786e9e4f5f77381b944755f267 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=25723d66369fe6786e9e4f5f77381b944755f267 commit 25723d66369fe6786e9e4f5f77381b944755f267 Author: Christos Margiolis AuthorDate: 2024-04-28 19:44:35 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Retire unit.* The unit.* code is largely obsolete and imposes limits that are no longer needed nowadays. - Capping the maximum allowed soundcards in a given machine. By default, the limit is 512 (snd_max_u() in unit.c), and the maximum possible is 2048 (SND_UNIT_UMAX in unit.h). It can also be tuned through the hw.snd.maxunit loader(8) tunable. Even though these limits are large enough that they should never cause problems, there is no need for this limit to exist in the first place. - Capping the available device/channel types. By default, this is 32 (snd_max_d() in unit.c). However, these types are pre-defined in pcm/sound.h (see SND_DEV_*), so the cap is unnecessary when we know that their number is constant. - Capping the number of channels per-device. By default, the limit 1024 (snd_max_c() in unit.c). This is probably the most problematic of the limits mentioned, because this limit can never be reached, as the maximum is hard-capped at either hw.snd.maxautovchans (16 by default), or SND_MAXHWCHAN and SND_MAXVCHANS. These limtits are encoded in masks (see SND_U_MASK, SND_D_MASK, SND_C_MASK in unit.h) and are used to construct a bitfield of the form [dsp_unit, type, channel_unit] in snd_mkunit() which is assigned to pcm_channel->unit. This patch gets rid of everything unit.*-related and makes a slightly different use of the "unit" field to only contain the channel unit number. The channel type is stored in a new pcm_channel->type field, and the DSP unit number need not be stored at all, since we can fetch it from device_get_unit(pcm_channel->dev). This change has the effect that we no longer need to impose caps on the number of soundcards, device/channel types and per-device channels. As a result the code is noticeably simplified and more readable. Apart from the fact that the hw.snd.maxunit loader(8) tunable is also retired as a side-effect of this patch, sound(4)'s behavior remains the same. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D44912 --- RELNOTES | 3 + sys/conf/files | 1 - sys/dev/sound/pcm/channel.h | 9 +- sys/dev/sound/pcm/dsp.c | 98 +++----------------- sys/dev/sound/pcm/dsp.h | 2 +- sys/dev/sound/pcm/feeder.c | 4 +- sys/dev/sound/pcm/mixer.c | 5 +- sys/dev/sound/pcm/sound.c | 144 ++++++++++-------------------- sys/dev/sound/pcm/sound.h | 18 +--- sys/dev/sound/pcm/vchan.c | 2 +- sys/dev/sound/unit.c | 188 --------------------------------------- sys/dev/sound/unit.h | 52 ----------- sys/modules/sound/sound/Makefile | 2 +- 13 files changed, 74 insertions(+), 454 deletions(-) diff --git a/RELNOTES b/RELNOTES index 91d6d74a38fc..658a82a9e1b0 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,9 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +8fef193e14e2: + As a side-effect of retiring the unit.* code in sound(4), the + hw.snd.maxunit loader(8) tunable is also retired. 6d5ce2bb6344: The default value of the nfs_reserved_port_only rc.conf(5) setting has changed. The FreeBSD NFS server now requires the source port of diff --git a/sys/conf/files b/sys/conf/files index 29c02a503027..ef0a56eb8b45 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3072,7 +3072,6 @@ dev/smc/if_smc.c optional smc dev/smc/if_smc_acpi.c optional smc acpi dev/smc/if_smc_fdt.c optional smc fdt dev/snp/snp.c optional snp -dev/sound/unit.c optional sound dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci dev/sound/pci/cmi.c optional snd_cmi pci diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index c8d33c583188..d4f73275ed39 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -104,6 +104,7 @@ struct pcm_channel { void *devinfo; device_t dev; int unit; + int type; char name[CHN_NAMELEN]; char comm[MAXCOMLEN + 1]; struct mtx *lock; @@ -224,7 +225,7 @@ struct pcm_channel { #define CHN_INSERT_SORT(w, x, y, z) do { \ struct pcm_channel *t, *a = NULL; \ CHN_FOREACH(t, x, z) { \ - if ((y)->unit w t->unit) \ + if ((y)->type w t->type) \ a = t; \ else \ break; \ @@ -235,13 +236,9 @@ struct pcm_channel { CHN_INSERT_HEAD(x, y, z); \ } while (0) -#define CHN_INSERT_SORT_ASCEND(x, y, z) CHN_INSERT_SORT(>, x, y, z) +#define CHN_INSERT_SORT_ASCEND(x, y, z) CHN_INSERT_SORT(>=, x, y, z) #define CHN_INSERT_SORT_DESCEND(x, y, z) CHN_INSERT_SORT(<, x, y, z) -#define CHN_UNIT(x) (snd_unit2u((x)->unit)) -#define CHN_DEV(x) (snd_unit2d((x)->unit)) -#define CHN_CHAN(x) (snd_unit2c((x)->unit)) - #define CHN_BUF_PARENT(x, y) \ (((x) != NULL && (x)->parentchannel != NULL && \ (x)->parentchannel->bufhard != NULL) ? \ diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index df1482d6a97a..448ecb183298 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -444,7 +444,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (DSP_F_READ(flags)) { /* open for read */ rderror = pcm_chnalloc(d, &rdch, PCMDIR_REC, - td->td_proc->p_pid, td->td_proc->p_comm, -1); + td->td_proc->p_pid, td->td_proc->p_comm); if (rderror == 0 && chn_reset(rdch, fmt, spd) != 0) rderror = ENXIO; @@ -472,7 +472,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (DSP_F_WRITE(flags)) { /* open for write */ wrerror = pcm_chnalloc(d, &wrch, PCMDIR_PLAY, - td->td_proc->p_pid, td->td_proc->p_comm, -1); + td->td_proc->p_pid, td->td_proc->p_comm); if (wrerror == 0 && chn_reset(wrch, fmt, spd) != 0) wrerror = ENXIO; @@ -629,69 +629,13 @@ dsp_write(struct cdev *i_dev, struct uio *buf, int flag) return (dsp_io_ops(priv, buf)); } -static int -dsp_get_volume_channel(struct dsp_cdevpriv *priv, struct pcm_channel **volch) -{ - struct snddev_info *d; - struct pcm_channel *c; - int unit; - - KASSERT(volch != NULL, - ("%s(): NULL query priv=%p volch=%p", __func__, priv, volch)); - - d = priv->sc; - if (!PCM_REGISTERED(d)) { - *volch = NULL; - return (EINVAL); - } - - PCM_UNLOCKASSERT(d); - - *volch = NULL; - - c = priv->volch; - if (c != NULL) { - if (!(c->feederflags & (1 << FEEDER_VOLUME))) - return (-1); - *volch = c; - return (0); - } - - PCM_LOCK(d); - PCM_WAIT(d); - PCM_ACQUIRE(d); - - unit = dev2unit(d->dsp_dev); - - CHN_FOREACH(c, d, channels.pcm) { - CHN_LOCK(c); - if (c->unit != unit) { - CHN_UNLOCK(c); - continue; - } - *volch = c; - pcm_chnref(c, 1); - priv->volch = c; - CHN_UNLOCK(c); - PCM_RELEASE(d); - PCM_UNLOCK(d); - return ((c->feederflags & (1 << FEEDER_VOLUME)) ? 0 : -1); - } - - PCM_RELEASE(d); - PCM_UNLOCK(d); - - return (EINVAL); -} - static int dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, u_long cmd, caddr_t arg) { struct snddev_info *d; struct pcm_channel *rdch, *wrch; - int j, devtype, ret; - int left, right, center, mute; + int j, left, right, center, mute; d = priv->sc; if (!PCM_REGISTERED(d) || !(pcm_getflags(d->dev) & SD_F_VPC)) @@ -716,19 +660,6 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, volch = wrch; } - devtype = PCMDEV(d->dsp_dev); - - /* Look super harder */ - if (volch == NULL && - (devtype == SND_DEV_DSPHW_PLAY || devtype == SND_DEV_DSPHW_VPLAY || - devtype == SND_DEV_DSPHW_REC || devtype == SND_DEV_DSPHW_VREC)) { - ret = dsp_get_volume_channel(priv, &volch); - if (ret != 0) - return (ret); - if (volch == NULL) - return (EINVAL); - } - /* Final validation */ if (volch == NULL) return (EINVAL); @@ -2105,8 +2036,6 @@ dsp_sysinit(void *p) { if (dsp_ehtag != NULL) return; - /* initialize unit numbering */ - snd_unit_init(); dsp_ehtag = EVENTHANDLER_REGISTER(dev_clone, dsp_clone, 0, 1000); } @@ -2123,20 +2052,19 @@ SYSINIT(dsp_sysinit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysinit, NULL); SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); char * -dsp_unit2name(char *buf, size_t len, int unit) +dsp_unit2name(char *buf, size_t len, struct pcm_channel *ch) { - int i, dtype; + int i; KASSERT(buf != NULL && len != 0, ("bogus buf=%p len=%ju", buf, (uintmax_t)len)); - dtype = snd_unit2d(unit); - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (dtype != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) + if (ch->type != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) continue; - snprintf(buf, len, "%s%d%s%d", dsp_cdevs[i].name, - snd_unit2u(unit), dsp_cdevs[i].sep, snd_unit2c(unit)); + snprintf(buf, len, "%s%d%s%d", + dsp_cdevs[i].name, device_get_unit(ch->dev), + dsp_cdevs[i].sep, ch->unit); return (buf); } @@ -2224,12 +2152,10 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) if (devfs_foreach_cdevpriv(i_dev, dsp_oss_audioinfo_cb, ch) != 0) { devname = dsp_unit2name(buf, - sizeof(buf), ch->unit); + sizeof(buf), ch); } - } else if (ai->dev == nchan) { - devname = dsp_unit2name(buf, sizeof(buf), - ch->unit); - } + } else if (ai->dev == nchan) + devname = dsp_unit2name(buf, sizeof(buf), ch); if (devname != NULL) break; CHN_UNLOCK(ch); diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 6098c0641eb5..b81e60dc19b5 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -35,7 +35,7 @@ extern struct cdevsw dsp_cdevsw; int dsp_make_dev(device_t); void dsp_destroy_dev(device_t); -char *dsp_unit2name(char *, size_t, int); +char *dsp_unit2name(char *, size_t, struct pcm_channel *); int dsp_oss_audioinfo(struct cdev *, oss_audioinfo *); #endif /* !_PCMDSP_H_ */ diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 8278a85948a8..78443ad76140 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -82,9 +82,7 @@ feeder_register(void *p) if (snd_verbose < 0 || snd_verbose > 4) snd_verbose = 1; - /* initialize unit numbering */ - snd_unit_init(); - if (snd_unit < 0 || snd_unit > PCMMAXUNIT) + if (snd_unit < 0) snd_unit = -1; if (snd_maxautovchans < 0 || diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 2f4a6f4d6395..3e197b120c9d 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -727,7 +727,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) u_int16_t v; struct cdev *pdev; const char *name; - int i, unit, devunit, val; + int i, unit, val; snddev = device_get_softc(dev); if (snddev == NULL) @@ -764,8 +764,7 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ - devunit = snd_mkunit(unit, SND_DEV_CTL, 0); - pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666, + pdev = make_dev(&mixer_cdevsw, SND_DEV_CTL, UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 0a88d732def7..c32536a55960 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -244,98 +244,63 @@ pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num) /* return error status and a locked channel */ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, - pid_t pid, char *comm, int devunit) + pid_t pid, char *comm) { struct pcm_channel *c; int err, vchancount, vchan_num; + bool retry; - KASSERT(d != NULL && ch != NULL && (devunit == -1 || - !(devunit & ~(SND_U_MASK | SND_D_MASK | SND_C_MASK))) && + KASSERT(d != NULL && ch != NULL && (direction == PCMDIR_PLAY || direction == PCMDIR_REC), - ("%s(): invalid d=%p ch=%p direction=%d pid=%d devunit=%d", - __func__, d, ch, direction, pid, devunit)); + ("%s(): invalid d=%p ch=%p direction=%d pid=%d", + __func__, d, ch, direction, pid)); PCM_BUSYASSERT(d); - /* Double check again. */ - if (devunit != -1) { - switch (snd_unit2d(devunit)) { - case SND_DEV_DSPHW_PLAY: - case SND_DEV_DSPHW_VPLAY: - if (direction != PCMDIR_PLAY) - return (ENOTSUP); - break; - case SND_DEV_DSPHW_REC: - case SND_DEV_DSPHW_VREC: - if (direction != PCMDIR_REC) - return (ENOTSUP); - break; - default: - if (!(direction == PCMDIR_PLAY || - direction == PCMDIR_REC)) - return (ENOTSUP); - break; - } - } - *ch = NULL; vchan_num = 0; vchancount = (direction == PCMDIR_PLAY) ? d->pvchancount : d->rvchancount; + retry = false; retry_chnalloc: err = ENOTSUP; /* scan for a free channel */ CHN_FOREACH(c, d, channels.pcm) { CHN_LOCK(c); - if (devunit == -1 && c->direction == direction && - (c->flags & CHN_F_VIRTUAL)) { + if (c->direction == direction && (c->flags & CHN_F_VIRTUAL)) { if (vchancount < snd_maxautovchans && - vchan_num < CHN_CHAN(c)) { + vchan_num < c->unit) { CHN_UNLOCK(c); goto vchan_alloc; } vchan_num++; } - if (c->direction == direction && !(c->flags & CHN_F_BUSY) && - (devunit == -1 || devunit == -2 || c->unit == devunit)) { + if (c->direction == direction && !(c->flags & CHN_F_BUSY)) { c->flags |= CHN_F_BUSY; c->pid = pid; strlcpy(c->comm, (comm != NULL) ? comm : CHN_COMM_UNKNOWN, sizeof(c->comm)); *ch = c; return (0); - } else if (c->unit == devunit) { - if (c->direction != direction) - err = ENOTSUP; - else if (c->flags & CHN_F_BUSY) - err = EBUSY; - else - err = EINVAL; - CHN_UNLOCK(c); - return (err); - } else if ((devunit == -1 || devunit == -2) && - c->direction == direction && (c->flags & CHN_F_BUSY)) + } else if (c->direction == direction && (c->flags & CHN_F_BUSY)) err = EBUSY; CHN_UNLOCK(c); } - if (devunit == -2) + /* + * We came from retry_chnalloc and still didn't find a free channel. + */ + if (retry) return (err); vchan_alloc: /* no channel available */ - if (devunit == -1 || snd_unit2d(devunit) == SND_DEV_DSPHW_VPLAY || - snd_unit2d(devunit) == SND_DEV_DSPHW_VREC) { - if (!(vchancount > 0 && vchancount < snd_maxautovchans) && - (devunit == -1 || snd_unit2c(devunit) < snd_maxautovchans)) - return (err); - err = pcm_setvchans(d, direction, vchancount + 1, - (devunit == -1) ? -1 : snd_unit2c(devunit)); - if (err == 0) { - if (devunit == -1) - devunit = -2; - goto retry_chnalloc; - } + if (!(vchancount > 0 && vchancount < snd_maxautovchans)) + return (err); + err = pcm_setvchans(d, direction, vchancount + 1, -1); + if (err == 0) { + retry = true; + goto retry_chnalloc; } return (err); @@ -445,7 +410,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c { struct pcm_channel *ch; int direction, err, rpnum, *pnum, max; - int udc, device, chan; + int type, unit; char *dirs, *devname, buf[CHN_NAMELEN]; PCM_BUSYASSERT(d); @@ -457,56 +422,54 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c dirs = "play"; direction = PCMDIR_PLAY; pnum = &d->playcount; - device = SND_DEV_DSPHW_PLAY; + type = SND_DEV_DSPHW_PLAY; max = SND_MAXHWCHAN; break; case PCMDIR_PLAY_VIRTUAL: dirs = "virtual_play"; direction = PCMDIR_PLAY; pnum = &d->pvchancount; - device = SND_DEV_DSPHW_VPLAY; + type = SND_DEV_DSPHW_VPLAY; max = SND_MAXVCHANS; break; case PCMDIR_REC: dirs = "record"; direction = PCMDIR_REC; pnum = &d->reccount; - device = SND_DEV_DSPHW_REC; + type = SND_DEV_DSPHW_REC; max = SND_MAXHWCHAN; break; case PCMDIR_REC_VIRTUAL: dirs = "virtual_record"; direction = PCMDIR_REC; pnum = &d->rvchancount; - device = SND_DEV_DSPHW_VREC; + type = SND_DEV_DSPHW_VREC; max = SND_MAXVCHANS; break; default: return (NULL); } - chan = (num == -1) ? 0 : num; + unit = (num == -1) ? 0 : num; - if (*pnum >= max || chan >= max) + if (*pnum >= max || unit >= max) return (NULL); rpnum = 0; CHN_FOREACH(ch, d, channels.pcm) { - if (CHN_DEV(ch) != device) + if (ch->type != type) continue; - if (chan == CHN_CHAN(ch)) { - if (num != -1) { - device_printf(d->dev, - "channel num=%d allocated!\n", chan); - return (NULL); - } - chan++; - if (chan >= max) { - device_printf(d->dev, - "chan=%d > %d\n", chan, max); - return (NULL); - } + if (unit == ch->unit && num != -1) { + device_printf(d->dev, + "channel num=%d allocated!\n", unit); + return (NULL); + } + unit++; + if (unit >= max) { + device_printf(d->dev, + "chan=%d > %d\n", unit, max); + return (NULL); } rpnum++; } @@ -518,25 +481,24 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c return (NULL); } - udc = snd_mkunit(device_get_unit(d->dev), device, chan); - devname = dsp_unit2name(buf, sizeof(buf), udc); - - if (devname == NULL) { - device_printf(d->dev, - "Failed to query device name udc=0x%08x\n", udc); - return (NULL); - } - PCM_UNLOCK(d); ch = malloc(sizeof(*ch), M_DEVBUF, M_WAITOK | M_ZERO); ch->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); - ch->unit = udc; + ch->type = type; + ch->unit = unit; ch->pid = -1; strlcpy(ch->comm, CHN_COMM_UNUSED, sizeof(ch->comm)); ch->parentsnddev = d; ch->parentchannel = parent; ch->dev = d->dev; ch->trigger = PCMTRIG_STOP; + devname = dsp_unit2name(buf, sizeof(buf), ch); + if (devname == NULL) { + device_printf(d->dev, "Failed to query device name"); + kobj_delete(ch->methods, M_DEVBUF); + free(ch, M_DEVBUF); + return (NULL); + } snprintf(ch->name, sizeof(ch->name), "%s:%s:%s", device_get_nameunit(ch->dev), dirs, devname); @@ -585,7 +547,7 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) CHN_INSERT_SORT_ASCEND(d, ch, channels.pcm); - switch (CHN_DEV(ch)) { + switch (ch->type) { case SND_DEV_DSPHW_PLAY: d->playcount++; break; @@ -625,7 +587,7 @@ pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch) CHN_REMOVE(d, ch, channels.pcm); - switch (CHN_DEV(ch)) { + switch (ch->type) { case SND_DEV_DSPHW_PLAY: d->playcount--; break; @@ -939,14 +901,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) return EINVAL; } - if (device_get_unit(dev) > PCMMAXUNIT) { - device_printf(dev, "PCMMAXUNIT reached : unit=%d > %d\n", - device_get_unit(dev), PCMMAXUNIT); - device_printf(dev, - "Use 'hw.snd.maxunit' tunable to raise the limit.\n"); - return ENODEV; - } - d = device_get_softc(dev); d->dev = dev; d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index fe310a3be3d6..1f2dda880742 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -88,7 +88,6 @@ struct snd_mixer; #include #include #include -#include #define PCM_SOFTC_SIZE (sizeof(struct snddev_info)) @@ -100,21 +99,6 @@ struct snd_mixer; #define SOUND_PREFVER SOUND_MODVER #define SOUND_MAXVER SOUND_MODVER -/* - * We're abusing the fact that MAXMINOR still have enough room - * for our bit twiddling and nobody ever need 512 unique soundcards, - * 32 unique device types and 1024 unique cloneable devices for the - * next 100 years... - */ - -#define PCMMAXUNIT (snd_max_u()) -#define PCMMAXDEV (snd_max_d()) -#define PCMMAXCHAN (snd_max_c()) - -#define PCMUNIT(x) (snd_unit2u(dev2unit(x))) -#define PCMDEV(x) (snd_unit2d(dev2unit(x))) -#define PCMCHAN(x) (snd_unit2c(dev2unit(x))) - /* * By design, limit possible channels for each direction. */ @@ -311,7 +295,7 @@ SYSCTL_DECL(_hw_snd); int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, - pid_t pid, char *comm, int devunit); + pid_t pid, char *comm); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index d10c3ff4aabb..ac5a0535ddce 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -923,7 +923,7 @@ vchan_sync(struct pcm_channel *c) if (snd_passthrough_verbose != 0) { char *devname, buf[CHN_NAMELEN]; - devname = dsp_unit2name(buf, sizeof(buf), c->unit); + devname = dsp_unit2name(buf, sizeof(buf), c); device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", __func__, (devname != NULL) ? devname : "dspX", c->comm, diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c deleted file mode 100644 index 28ffbde1f7ec..000000000000 --- a/sys/dev/sound/unit.c +++ /dev/null @@ -1,188 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_snd.h" -#endif - -#include - -/* - * Unit magic allocator for sound driver. - * - * 'u' = Unit of attached soundcards - * 'd' = Device type - * 'c' = Channel number - * - * eg: dsp0.p1 - u=0, d=p, c=1 - * dsp1.vp0 - u=1, d=vp, c=0 - * - * Maximum unit of soundcards can be tuned through "hw.snd.maxunit", which is - * between SND_UNIT_UMIN (16) and SND_UNIT_UMAX (2048). By design, the maximum - * allowable allocated channel is 256. - */ - -/* Default width */ -static int snd_u_shift = 9; /* 0 - 0x1ff : 512 distinct soundcards */ -static int snd_d_shift = 5; /* 0 - 0x1f : 32 distinct device types */ -static int snd_c_shift = 10; /* 0 - 0x3ff : 1024 distinct channels - (256 limit "by design") */ - -static int snd_unit_initialized = 0; - -#ifdef SND_DIAGNOSTIC -#define SND_UNIT_ASSERT() do { \ - if (snd_unit_initialized == 0) \ - panic("%s(): Uninitialized sound unit!", __func__); \ -} while (0) -#else -#define SND_UNIT_ASSERT() KASSERT(snd_unit_initialized != 0, \ - ("%s(): Uninitialized sound unit!", \ - __func__)) -#endif - -#define MKMASK(x) ((1 << snd_##x##_shift) - 1) - -int -snd_max_u(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(u)); -} - -int -snd_max_d(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(d)); -} - -int -snd_max_c(void) -{ - SND_UNIT_ASSERT(); - - return (MKMASK(c)); -} - -int -snd_unit2u(int unit) -{ - SND_UNIT_ASSERT(); - - return ((unit >> (snd_c_shift + snd_d_shift)) & MKMASK(u)); -} - -int -snd_unit2d(int unit) -{ - SND_UNIT_ASSERT(); - - return ((unit >> snd_c_shift) & MKMASK(d)); -} - -int -snd_unit2c(int unit) -{ - SND_UNIT_ASSERT(); - - return (unit & MKMASK(c)); -} - -int -snd_u2unit(int u) -{ - SND_UNIT_ASSERT(); - - return ((u & MKMASK(u)) << (snd_c_shift + snd_d_shift)); -} - -int -snd_d2unit(int d) -{ - SND_UNIT_ASSERT(); - - return ((d & MKMASK(d)) << snd_c_shift); -} - -int -snd_c2unit(int c) -{ - SND_UNIT_ASSERT(); - - return (c & MKMASK(c)); -} - -int -snd_mkunit(int u, int d, int c) -{ - SND_UNIT_ASSERT(); - - return ((c & MKMASK(c)) | ((d & MKMASK(d)) << snd_c_shift) | - ((u & MKMASK(u)) << (snd_c_shift + snd_d_shift))); -} - -/* - * This *must* be called first before any of the functions above!!! - */ -void -snd_unit_init(void) -{ - int i; - - if (snd_unit_initialized != 0) - return; - - snd_unit_initialized = 1; - - if (getenv_int("hw.snd.maxunit", &i) != 0) { - if (i < SND_UNIT_UMIN) - i = SND_UNIT_UMIN; - else if (i > SND_UNIT_UMAX) - i = SND_UNIT_UMAX; - else - i = roundup2(i, 2); - - for (snd_u_shift = 0; (i >> (snd_u_shift + 1)) != 0; - snd_u_shift++) - ; - - /* Make room for channels to fit within 24bit MAXMINOR limit. */ - snd_c_shift = 24 - snd_u_shift - snd_d_shift; - } - - if (bootverbose != 0) - printf("%s() u=0x%08x [%d] d=0x%08x [%d] c=0x%08x [%d]\n", - __func__, SND_U_MASK, snd_max_u() + 1, - SND_D_MASK, snd_max_d() + 1, SND_C_MASK, snd_max_c() + 1); -} diff --git a/sys/dev/sound/unit.h b/sys/dev/sound/unit.h deleted file mode 100644 index 9ddd68a2fe04..000000000000 --- a/sys/dev/sound/unit.h +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * 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. - */ - -#ifndef _SND_UNIT_H_ -#define _SND_UNIT_H_ - -#define SND_UNIT_UMIN 16 -#define SND_UNIT_UMAX 2048 - -int snd_max_u(void); -int snd_max_d(void); -int snd_max_c(void); -int snd_unit2u(int); -int snd_unit2d(int); -int snd_unit2c(int); -int snd_u2unit(int); -int snd_d2unit(int); -int snd_c2unit(int); -int snd_mkunit(int, int, int); - -void snd_unit_init(void); - -#define SND_U_MASK (snd_u2unit(snd_max_u())) -#define SND_D_MASK (snd_d2unit(snd_max_d())) -#define SND_C_MASK (snd_c2unit(snd_max_c())) - -#endif /* !_SND_UNIT_H_ */ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 833330ef9b26..1c3685715503 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -17,7 +17,7 @@ SRCS+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h SRCS+= mpu_if.h mpufoi_if.h synth_if.h SRCS+= mpu_if.c mpufoi_if.c synth_if.c SRCS+= ac97.c ac97_patch.c buffer.c channel.c dsp.c -SRCS+= mixer.c sndstat.c sound.c unit.c vchan.c +SRCS+= mixer.c sndstat.c sound.c vchan.c SRCS+= midi.c mpu401.c sequencer.c feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk From nobody Sun Apr 28 19:49:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8b0Sg2z5Jr9r; Sun, 28 Apr 2024 19:49: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 4VSH8Z56hpz429v; Sun, 28 Apr 2024 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8HxLDV8iEGr8AtnjG6DQjnd3GVpPLw8UifVdS4W9bGc=; b=KfmD1uSNCP4DblMo53GSltwZxsD438NhDiyvnCwgpsf8JRCvvxyoJT5aWrAAvbExk+x93o wE/qdeeZda7ceA+mu7VE8EP8GgTFtV7BPBk+t8kaM00w9QZ+jSQav9iG0QJSAryGJf+7I3 AeV3GdE5YUsYfoxfDnGZOJR9UUB4ErKEfch3ehfVw/5hDrvoEC0xC0EnrTWeBETbljReZD jpym5UYwDT4OpCL61xwTIaLv0ztjU5SuT7YeWDuRAHnYBnA4aWAFJBHc/5WxZO323Srrbm E46gW35eK07Ofunr51uhXJDo6pw1YNisNaqXrwXxVchsMSOtC3LxmwpF4+DuSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333742; a=rsa-sha256; cv=none; b=KWkE/v7LZFlXNzRmZlzV0IA3oq343Ex3vYtW/a95LxWU8CECcHrrTqi5JPkZplCtfbqqvT eXYjKhV4yY5lrb7QNGZKuVRGR73dsqpse1AM4TLUmeU3X55d5w1fGoNjJ3U/+VIRxCYmU+ mP16Wz/AUunermvU7kTbrZ/TVJqe25S/KCv85VBLJ3wIgk6TS+YBma/jTxfh3jbD2RogFa E+DJGLBgDLWp2jqVEaGt5mEBqyh7t5xF7EWFsalzEGvz4SB72/MnJ/6Qc6ZEHsl5iHZaW0 qPyOSgVV18C+7J8Y7muValiTxHrCD4iz5FUz8honNBsDDkeghmq5fvNpJazpfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8HxLDV8iEGr8AtnjG6DQjnd3GVpPLw8UifVdS4W9bGc=; b=R3lM8dc67VH997Et69QeUu6e2v+IKYQfBBhfIVTq7Bktj/EdBhZlbjZ1VQTZHPg0RP/8AC azztwxwcIAGPtnjCtZs16Op+7gCDEcPf9lWid4wGom/JfQkIZBV/WucayRE3RT7dUIAafx KrIFUa3tNlmFgs6zqJ8v/0pkx2WmvB0+SGctLypWXf9FMsVrwrmM2J5bRvl9IzJnNgTYO0 U6clrps7XHebvDgoX7ZWI15uliTqwA66wYV/9ZbH3HOtC958zSPlJrPVfz60Mad9wYiVX8 Yr1bFr84LH/smiBKCo78Q7ytx0e4hP5fuKERuCW51eOEaQqnLruhiqQZvWCbKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8Z4kwZzdpW; Sun, 28 Apr 2024 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SJn239063300; Sun, 28 Apr 2024 19:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn2uR063297; Sun, 28 Apr 2024 19:49:02 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:02 GMT Message-Id: <202404281949.43SJn2uR063297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fa284525499d - main - sound: Assert that we do not enter chn_sleep() with CHN_F_SLEEPING List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa284525499d75955525839074bf5968d0923e6b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fa284525499d75955525839074bf5968d0923e6b commit fa284525499d75955525839074bf5968d0923e6b Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:52 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Assert that we do not enter chn_sleep() with CHN_F_SLEEPING Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44959 --- sys/dev/sound/pcm/channel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index cf9239839aca..1527d5ea3d2c 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -332,6 +332,8 @@ chn_sleep(struct pcm_channel *c, int timeout) int ret; CHN_LOCKASSERT(c); + KASSERT((c->flags & CHN_F_SLEEPING) == 0, + ("%s(): entered with CHN_F_SLEEPING", __func__)); if (c->flags & CHN_F_DEAD) return (EINVAL); From nobody Sun Apr 28 19:49:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8f2RLjz5Jr2f; Sun, 28 Apr 2024 19:49: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 4VSH8f0szpz42Wq; Sun, 28 Apr 2024 19:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8zxLuuECWxpqmyn6jZp2kufxf53CTMfgdM8kAU3xWU=; b=ncI+00blLPgfi86fNrFv9PTGsW9I7/VYkRQ6wlq0/HuT9vmbQtWL5emf8ePq3ZfNjbsvSk SugEb+jWP+50EqDwCRlimOwdR+zhYZ0No1xqQZk3K4t+/UGsNsPr7An7768ho4IY8EzAyb MvvouJckX2s808IbpkserkU4ppsH74oibrwJMyMpwhuBQQjROXJrYjyppPZkbNTi2Frzbr UxIhdb8TigsXN6N6b15t1iHI0E4LuIxVBf9pNIur85j5sDvZatGeDhNpyL+OeF1A+kajTN 2H+ZuzwbT/s6wlfjNoTx+jXCBYtyN8VZOgeH9UAWa1ouxjmhHALaxED4z1wZ5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333746; a=rsa-sha256; cv=none; b=CSr6Rwxg8d8h5lpA8uONQu2GJHhpHCF6wiu3SYq/qptJD+JgAOLgt0ksib4JtEUV67Z/zN 967oOjY9QL35sHgC06JtdeqGu6UGWGmr/cHDzuV5BQYnmPq+dFAfe+dQwxaPMq6sE3HqJW HJfe9f7sfsL/RqFa1j3P7VNOVaCR9dQmmdsca8NdFl3tt7x+UBmRTtPNZoFAMrG5gm8NLC 1d3ea/5X1KeRwc2q0h1nYUi2iF8nibS/S2ooP3NodFDZDIpQPAujmoBMRdXTi7GxkbKFyC f7Ocw8OYLQ8nVjyV4W0+ZDmIzJOtZ7igPee4tLeufEOI/vLgO6ae9QbuiAXHhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8zxLuuECWxpqmyn6jZp2kufxf53CTMfgdM8kAU3xWU=; b=ZxZHOImbR+Of9KT9PTs5sIYc1wFKnLTfSvcOHb4TOhg9iqxD/Yx5INNxLNxClIxK7IsEm2 53XzuikBZblJQ7jG01cDZMsNJ+QmRvH4Ew8A0hmBE/FIxDNTRUAuAK9wkFaVDi3mPvLk74 ngYtznslr0500fDVssJPk8fwRLwzRdd3ogUOSPGVQX1XgWg5rtRuw5/VmtH2zdp/KF/dOV 7Bb/cpNnEQJEXQ/TLz68szTubk4qmv0mldrwV+t5J0u84Tg2zxz7RVT+QmBACgJ+yYa/fH rgHTFGOCiVtzITMBSKejKiqINC7fq933JRE7CAJbK6/3wqOFks9FSpfHUlGYEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8f0V44zf8M; Sun, 28 Apr 2024 19:49: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 43SJn5mY063568; Sun, 28 Apr 2024 19:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn5dF063565; Sun, 28 Apr 2024 19:49:05 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:05 GMT Message-Id: <202404281949.43SJn5dF063565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a24050e2b784 - main - sound: Move pcm_chnref() and pcm_chnrelease() to pcm/channel.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a24050e2b784e13561da3ab731a1db92f2e3366c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a24050e2b784e13561da3ab731a1db92f2e3366c commit a24050e2b784e13561da3ab731a1db92f2e3366c Author: Christos Margiolis AuthorDate: 2024-04-28 19:46:55 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Move pcm_chnref() and pcm_chnrelease() to pcm/channel.c Improve code layering. These are channel functions, and so they do not belong in pcm/sound.c. While here, assert in chn_ref() that new refcount won't be negative. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44985 --- sys/dev/sound/pcm/channel.c | 28 ++++++++++++++++++++++++++++ sys/dev/sound/pcm/channel.h | 2 ++ sys/dev/sound/pcm/dsp.c | 26 +++++++++++++------------- sys/dev/sound/pcm/sound.c | 26 -------------------------- sys/dev/sound/pcm/sound.h | 2 -- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 21a91ff13186..0fea169e3eb7 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1314,6 +1314,34 @@ chn_shutdown(struct pcm_channel *c) c->flags |= CHN_F_DEAD; } +/* release a locked channel and unlock it */ +int +chn_release(struct pcm_channel *c) +{ + PCM_BUSYASSERT(c->parentsnddev); + CHN_LOCKASSERT(c); + + c->flags &= ~CHN_F_BUSY; + c->pid = -1; + strlcpy(c->comm, CHN_COMM_UNUSED, sizeof(c->comm)); + CHN_UNLOCK(c); + + return (0); +} + +int +chn_ref(struct pcm_channel *c, int ref) +{ + PCM_BUSYASSERT(c->parentsnddev); + CHN_LOCKASSERT(c); + KASSERT((c->refcount + ref) >= 0, + ("%s(): new refcount will be negative", __func__)); + + c->refcount += ref; + + return (c->refcount); +} + int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 45381b907fa2..698a1186924f 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -262,6 +262,8 @@ int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); +int chn_release(struct pcm_channel *c); +int chn_ref(struct pcm_channel *c, int ref); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 448ecb183298..9c31fff7e8cd 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -181,8 +181,8 @@ getchns(struct dsp_cdevpriv *priv, uint32_t prio) pcm_setflags(d->dev, flags); if (ch != NULL) { CHN_LOCK(ch); - pcm_chnref(ch, -1); - pcm_chnrelease(ch); + chn_ref(ch, -1); + chn_release(ch); } PCM_RELEASE(d); PCM_UNLOCK(d); @@ -301,7 +301,7 @@ dsp_close(void *data) wdref--; else { CHN_LOCK(volch); - pcm_chnref(volch, -1); + chn_ref(volch, -1); CHN_UNLOCK(volch); } } @@ -332,12 +332,12 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(rdch); - pcm_chnref(rdch, rdref); + chn_ref(rdch, rdref); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); chn_reset(rdch, 0, 0); - pcm_chnrelease(rdch); + chn_release(rdch); } if (wrch != NULL) { /* @@ -350,12 +350,12 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(wrch); - pcm_chnref(wrch, wdref); + chn_ref(wrch, wdref); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); chn_reset(wrch, 0, 0); - pcm_chnrelease(wrch); + chn_release(wrch); } PCM_LOCK(d); } @@ -451,7 +451,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (rderror != 0) { if (rdch != NULL) - pcm_chnrelease(rdch); + chn_release(rdch); if (!DSP_F_DUPLEX(flags)) { PCM_RELEASE_QUICK(d); PCM_GIANT_EXIT(d); @@ -463,7 +463,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) rdch->flags |= CHN_F_NBIO; if (flags & O_EXCL) rdch->flags |= CHN_F_EXCLUSIVE; - pcm_chnref(rdch, 1); + chn_ref(rdch, 1); chn_vpc_reset(rdch, SND_VOL_C_PCM, 0); CHN_UNLOCK(rdch); } @@ -479,7 +479,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (wrerror != 0) { if (wrch != NULL) - pcm_chnrelease(wrch); + chn_release(wrch); if (!DSP_F_DUPLEX(flags)) { if (rdch != NULL) { /* @@ -487,8 +487,8 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) * created record channel */ CHN_LOCK(rdch); - pcm_chnref(rdch, -1); - pcm_chnrelease(rdch); + chn_ref(rdch, -1); + chn_release(rdch); } PCM_RELEASE_QUICK(d); PCM_GIANT_EXIT(d); @@ -500,7 +500,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) wrch->flags |= CHN_F_NBIO; if (flags & O_EXCL) wrch->flags |= CHN_F_EXCLUSIVE; - pcm_chnref(wrch, 1); + chn_ref(wrch, 1); chn_vpc_reset(wrch, SND_VOL_C_PCM, 0); CHN_UNLOCK(wrch); } diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b44a7344121c..029326dfc05a 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -306,32 +306,6 @@ vchan_alloc: return (err); } -/* release a locked channel and unlock it */ -int -pcm_chnrelease(struct pcm_channel *c) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - - c->flags &= ~CHN_F_BUSY; - c->pid = -1; - strlcpy(c->comm, CHN_COMM_UNUSED, sizeof(c->comm)); - CHN_UNLOCK(c); - - return (0); -} - -int -pcm_chnref(struct pcm_channel *c, int ref) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - - c->refcount += ref; - - return (c->refcount); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 70addf32bddd..08aa56cc96f7 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -296,8 +296,6 @@ SYSCTL_DECL(_hw_snd); int pcm_setvchans(struct snddev_info *d, int direction, int newcnt, int num); int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm); -int pcm_chnrelease(struct pcm_channel *c); -int pcm_chnref(struct pcm_channel *c, int ref); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); From nobody Sun Apr 28 19:49:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8d4MS9z5JrDL; Sun, 28 Apr 2024 19:49: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 4VSH8c6xVHz42ML; Sun, 28 Apr 2024 19:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czRFE5cxOKsI9xCga5Ky/F4v1RekTvnZnCdADPTSYjE=; b=N9GIsjIJHcy5dKj4V7Y0rMyAY8nFcPTxqpq+a/YzRtsgONVGtv9LWXOsIeUyJRYijbRohr /REdsVTMpF+XEdQUg5ExV6d4HJ6SOhaywb/qm6Up4Xp6SvoTT5qdhJvMeQiildgqn4z6G1 8U3+vdPQNTC8T78h01PsCSNkVG2L16kLS94pQrwEfuXUQFssFnhmtsgoxZDKLYVv2E9kPD 7iOEyDtVvHJ/lJlok01hiceLPTDdfyw5R7kMdKNitMdQ3bHmAgzJiT+StLaYZMgyPh88Hl vi9fXIYKiD3w/mImHSpCqaj52O35yMXkZq5UexJS+FtwWrzgc8OGzXGfY+C2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333745; a=rsa-sha256; cv=none; b=ChX805RzZmuwmR+HOzeVEhCgFMC4meoTd651Q5wxMtmVvf6T2OjRHnV7WglwJNrv4/aWgc GCYuBYsOM7nya7xUOF0nhVsVIUc997smGIOuFgwEs+co9wsMPHItuCNjAzGHuChXzKVItW aSx9UlR//9KW2ObX1XBCLpPfAO08IVM1yhugeIppvCSMJZ6DcE6zPuW67/OWWKUg9Lj3kg UEYYINiQw6qIHZmM9Yk16HqO2kaBBeZUCJqkTnCSFVTbCyXs5tjOsFHgVWMRSxq4BNI0lZ O3uBvcEr5qV6i4+Z9DmGaZ6VTJxSMoqpOSJAdzTMsKQ55AzzOK5Vd/2tlCXxaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czRFE5cxOKsI9xCga5Ky/F4v1RekTvnZnCdADPTSYjE=; b=e9X6O8orAfrCb68w2vjMLW1f8sCCsrlwOyybzw9urSrVWbr0NaH0/pXcY+JL3vHo0LmN9m Su+y7mEcPQKmH0DerUGT+Wp0rHELfqTzP+sio3RIjYXcNFzW5ZYB6QCEucuiiYohPeHSJk uk2cUcT+J6Kf68B90ehNQmGlJLLiACN+SlDMY0FVbH8JFsEQMoNY5j0L721Ui6qr9oegjY VVf+Ou3D3/jamuCCXEnMhS1zNaJ5uXx73yqeFdOEgi/oaYZ0CymxD0FBSjaxpAEQi8r5Vi LZYEoQK6Q74wXTNKwAFaVtuexSAwkjUBN2OmfA4n2ElK8gyQwXcN+rmnH8NBHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8c6Yjxzf6F; Sun, 28 Apr 2024 19:49: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 43SJn4bk063519; Sun, 28 Apr 2024 19:49:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn4Ln063516; Sun, 28 Apr 2024 19:49:04 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:04 GMT Message-Id: <202404281949.43SJn4Ln063516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b3ea087c05d8 - main - sound: Merge pcm_chn_destroy() and chn_kill() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3ea087c05d8c75978a302cbb3fa92ce1afa3e49 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b3ea087c05d8c75978a302cbb3fa92ce1afa3e49 commit b3ea087c05d8c75978a302cbb3fa92ce1afa3e49 Author: Christos Margiolis AuthorDate: 2024-04-28 19:46:08 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Merge pcm_chn_destroy() and chn_kill() pcm_chn_destroy() acts like a wrapper around chn_kill(), and additionally calls a few more functions that should in fact be part of chn_kill()'s logic. Merge pcm_chn_destroy()'s functionality in chn_kill() to improve readability, as well as code layering. While here, convert chn_kill() to void as it currently always returns 0. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44984 --- sys/dev/sound/pcm/channel.c | 12 +++++++----- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/sound.c | 26 ++------------------------ sys/dev/sound/pcm/sound.h | 1 - sys/dev/sound/pcm/vchan.c | 6 +++--- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 1527d5ea3d2c..21a91ff13186 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1279,11 +1279,13 @@ out: return 0; } -int +void chn_kill(struct pcm_channel *c) { - struct snd_dbuf *b = c->bufhard; - struct snd_dbuf *bs = c->bufsoft; + struct snd_dbuf *b = c->bufhard; + struct snd_dbuf *bs = c->bufsoft; + + PCM_BUSYASSERT(c->parentsnddev); if (CHN_STARTED(c)) { CHN_LOCK(c); @@ -1299,8 +1301,8 @@ chn_kill(struct pcm_channel *c) CHN_LOCK(c); c->flags |= CHN_F_DEAD; chn_lockdestroy(c); - - return (0); + kobj_delete(c->methods, M_DEVBUF); + free(c, M_DEVBUF); } void diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index d4f73275ed39..45381b907fa2 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,7 +260,7 @@ int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); -int chn_kill(struct pcm_channel *c); +void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index c32536a55960..b44a7344121c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -515,28 +515,6 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c return (ch); } -int -pcm_chn_destroy(struct pcm_channel *ch) -{ - struct snddev_info *d __diagused; - int err; - - d = ch->parentsnddev; - PCM_BUSYASSERT(d); - - err = chn_kill(ch); - if (err) { - device_printf(ch->dev, "chn_kill(%s) failed, err = %d\n", - ch->name, err); - return (err); - } - - kobj_delete(ch->methods, M_DEVBUF); - free(ch, M_DEVBUF); - - return (0); -} - int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) { @@ -630,7 +608,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (err) { device_printf(d->dev, "pcm_chn_add(%s) failed, err=%d\n", ch->name, err); - pcm_chn_destroy(ch); + chn_kill(ch); } return (err); @@ -678,7 +656,7 @@ pcm_killchans(struct snddev_info *d) error = pcm_chn_remove(d, ch); PCM_UNLOCK(d); if (error == 0) - pcm_chn_destroy(ch); + chn_kill(ch); } while (!CHN_EMPTY(d, channels.pcm)); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 1f2dda880742..70addf32bddd 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -300,7 +300,6 @@ int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); -int pcm_chn_destroy(struct pcm_channel *ch); int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch); int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index ac5a0535ddce..c3bc36d924bd 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -709,7 +709,7 @@ vchan_create(struct pcm_channel *parent, int num) ret = pcm_chn_add(d, ch); PCM_UNLOCK(d); if (ret != 0) { - pcm_chn_destroy(ch); + chn_kill(ch); CHN_LOCK(parent); return (ret); } @@ -837,7 +837,7 @@ vchan_create(struct pcm_channel *parent, int num) PCM_LOCK(d); if (pcm_chn_remove(d, ch) == 0) { PCM_UNLOCK(d); - pcm_chn_destroy(ch); + chn_kill(ch); } else PCM_UNLOCK(d); CHN_LOCK(parent); @@ -890,7 +890,7 @@ vchan_destroy(struct pcm_channel *c) /* destroy ourselves */ if (ret == 0) - ret = pcm_chn_destroy(c); + chn_kill(c); CHN_LOCK(parent); From nobody Sun Apr 28 19:49:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8g5gBwz5Jr1h; Sun, 28 Apr 2024 19:49: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 4VSH8g1V2Pz42cg; Sun, 28 Apr 2024 19:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtFVjBwkY13RrhTDgBPvualpLpsOYBlpFuA3wQflni0=; b=apuhxeSRJ0xTenlRMcc5YAS0jHCmuGuZBc6F81hhv44TXPizyhZvEus/cyYZVdQXZaZR0d GPizOqsClK9DapW9O6MvRTuhM4tlmqk4cdfJBf9u41JwRv0NCiwi6+PmXBs+uw7Sof8Dkr EeOWCQCW1X073O+tn9mZdpXOOzIZLWbFFQg8e5QCo1R7KAyucRZ3RgLrrhnRQHxRJtNEk4 xyYB5jVPvUrFNqzIuAF28OOYdz5CSYVHapwP0ep+PqIMJdvc9d+YAz3kfEq4hw8RLTGC70 yXBCOZAjouODcRa6HOtjqjytAtgcaVzV8XZJX5BU54f+oxr7ZXzYWsm6os4zqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333747; a=rsa-sha256; cv=none; b=vnpWK7KGm1JR6IzyPtjk+S7Ohkx7CcSqow1SN/Q+lokehilxtrhMl8X3xUxPjiMaBVU0OF vgJMOrsClTkkGA0yrINUzqcGEr7ZrmfmliqpaI5cEPnhiaGatCEABsVRvlSRIDAwW3hkfc 4qjDVFg1TUSJ4EeSaFt2FN5VFGAaUYoIKKSy+zASm+9bqIK2yBzqIcQLsbtKqrj/qdPcJ5 KrP2ASamhX4oQh9OWbkk5vI17QsI3ow9heceDp1PAJJoQ15fy8YC1Na8pI6pV17CGzh+Zc CR/0PGkfTFQx4B/eLXe4k1OwxNbWMA3tvKSwV+jB6XRVrKJYKP1n1wtMH24/Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtFVjBwkY13RrhTDgBPvualpLpsOYBlpFuA3wQflni0=; b=GFGFwFKxQBaRNHPx3+F038DT125sXXXNQBIx7N4x/I05AI1lvbvdwrIUKIxVvDLJyH4vXL 5nkU5o4w+hf77fe1eTotLsKqUcPx4loooq3JwGld5wHtmK/wgglduilNRNpoBA5skjcDTM pRR95LcRFdrqRHfw031fSVIdEAYdslnVytqudG7vhIuIdRu6H10f4KrGWDt639lMZA+Fj/ o83JWaKBL9qS7lVUJ6ca+xh+JyVCujqjXb43k6YAhTIyl+Tpq/L6X084OgpYIYZOMTS/PR L2Uyaw8sDh/sWMg7GXqaMXtla7h9GawmC+9andmBB4wmxHIzXLoSJybr1tVIaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8g15pXzdpX; Sun, 28 Apr 2024 19: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 43SJn7Wa063616; Sun, 28 Apr 2024 19: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 43SJn7U2063613; Sun, 28 Apr 2024 19:49:07 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:07 GMT Message-Id: <202404281949.43SJn7U2063613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e56c8996fc43 - main - sound: Add missing space in dev.pcm.X.mode description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e56c8996fc437488686e7cdef18258f16c5ea74e Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e56c8996fc437488686e7cdef18258f16c5ea74e commit e56c8996fc437488686e7cdef18258f16c5ea74e Author: Christos Margiolis AuthorDate: 2024-04-28 19:47:11 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +0000 sound: Add missing space in dev.pcm.X.mode description Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44990 --- sys/dev/sound/pcm/sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 029326dfc05a..9d5eaf3f5ad7 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -833,8 +833,8 @@ pcm_sysinit(device_t dev) SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "mode", CTLFLAG_RD, NULL, mode, - "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than one" - "mode is supported)"); + "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " + "one mode is supported)"); if (d->flags & SD_F_AUTOVCHAN) vchan_initsys(dev); if (d->flags & SD_F_EQ) From nobody Sun Apr 28 19:49:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSH8h6Lgvz5JqyQ; Sun, 28 Apr 2024 19:49: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 4VSH8h29Wdz42XH; Sun, 28 Apr 2024 19: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=1714333748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cA9+9Ce8R9GzB23u0P79z+h4xiJp2Nu0wtxS2UWmo58=; b=sstKEFSoU5ywlladund/Wkw6lQ7PdNbdezHB6VBL1Tyg6q+FhYEzLo9v9GZxaaYa3sNsSF /hmtPxGY9CE8FViHVrmjmB3xrwxEcuPcezNPyeM+EpfDZFb3o2os2BYQl1dYgbVABZPdcO 62mVl+DsDHcubp1A0bkP1FMnBhX9aOX7klLO7mTEwKeVoLzK7cn0fX62eKI21IAekkij9h 9rnfQQqfqmkYIsKT0A3rRM++wqpjaMm6OnLsyWxLPboccoQgPA5YTrvkmBGC9DTIYjXcBj VBsbjjP76PXjZJIdYE+xCmXABEbi9C4l7W3aP8s0GE84zCRrPhZzi25Num4/IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333748; a=rsa-sha256; cv=none; b=no/U1731cXHNd25ipsG6VMvNMVJdGLBSFRN8TjOfZ1CJioRRb1Rfc4vzp/ZzrO0wvt1BcR QUMkYTCPBj8NcaMKBJVHvvdr0H0AEIRNDcFujMrQdJ0yRdEgWzZ0qer4wFo5JSMfC7zUXE zHYhPs/0GpFQMQTj+/3FmoqTJ1LegJrKEz005iEfjOv8pBDHF3TQsxvFuG/2TO+o1XsyjH hPbaM/zfNq/GxVZFTMtGT/90iBtoEtJHqOkM2fM1+9mOqjweGxsAIMYwF/BVutqKJvvQqS GT+BvBJt8YmIPopLfDxl0HV5i0AN0lPvm4HXmeDDpvhbpoQo9JPD7bz1WJ96HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cA9+9Ce8R9GzB23u0P79z+h4xiJp2Nu0wtxS2UWmo58=; b=D7p/8a9/LSAsVPdIACuL+8VhqwLR71cgBbnbDVZoBqWluVk8a37wuEJu1A+3NHIzvoz3xN zVktXVAeXAi9veSIQm/pkrax5R6qb7ImdamXwliDoWNR8em01kPRdenjVinKxcU6hwDdUg YAAMy1NQm7YtRYY3p66MgSWQp5/qme30bnGzALraVrxOPB6kcd2IxrTGY9QI2n9iolff8o mZdVZNistwU6T4EsBJ23vTG8sI+7+CziXdiLDKyOHQKkO8/8Bxvxdigv5M3gpi1qf5E21B ap6XhNA8CIS1Cu9BT2bV4N6aPygjjEgaF9n+AHqDFltu5MOGaAq7CF9PjlalpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSH8h1hYdzdpY; Sun, 28 Apr 2024 19:49: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 43SJn8FJ063661; Sun, 28 Apr 2024 19:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn8o2063658; Sun, 28 Apr 2024 19:49:08 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:08 GMT Message-Id: <202404281949.43SJn8o2063658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 7cc1afc55890 - main - sound: Remove chn_timeout check from chn_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cc1afc5589000ac6ad7a908b07fad3401367bd1 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7cc1afc5589000ac6ad7a908b07fad3401367bd1 commit 7cc1afc5589000ac6ad7a908b07fad3401367bd1 Author: Christos Margiolis AuthorDate: 2024-04-28 19:47:33 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:25 +0000 sound: Remove chn_timeout check from chn_init() This check is not related to channel initializion, but is also unnecessary, since sysctl_hw_snd_timeout() takes care of checking if chn_timeout is within bounds. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44992 --- sys/dev/sound/pcm/channel.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 0fea169e3eb7..859476f212ae 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1164,9 +1164,6 @@ chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) struct snd_dbuf *b, *bs; int i, ret; - if (chn_timeout < CHN_TIMEOUT_MIN || chn_timeout > CHN_TIMEOUT_MAX) - chn_timeout = CHN_TIMEOUT; - chn_lockinit(c, dir); b = NULL; From nobody Sun Apr 28 20:00:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSHPX67CRz5JrnR; Sun, 28 Apr 2024 20:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSHPX535Jz467P; Sun, 28 Apr 2024 20:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714334416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3R4T9J8Jn+El1TDeGYI2uT4L2ZVt64CMt6XBlTAGNe0=; b=tGMR0oeII30LXI3tOPGQTi3Ptnpt3I9vZZVraa/ykG2qNaAw/aqZXD99CXfKND4vsxLnay nzNjI85ortCHkkE623/xO2rSUa+49zafKCI+9UCNBNEv6M+NCYs8fsO2urGJWWiaKrIT6v 3jtsH6s9pAMamb9tBLL/2DolwQyxxTi5tUf8VO6gtZ/C540mdiFJBq58AZtAgtT/NmTY+t 5NAfyGbeywAGjhGl9UhuoB958Hkj9X+SJZktSiHRMLyFJIyAOFXWA9FaxShK5smzuztGzx wncn8zwVTsSwZSNJ3P6CE01yWcrryknXPqZ6+lxGLzSFCqgMHjfHAwqIuaYczg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714334416; a=rsa-sha256; cv=none; b=MMw+nCkWl0GgTCv/u0BaI7eGOnEeWTwOUvkDHeIT5CO0FWdH6ewA/utd5gkuFTkGO2y9NL ft+g07Y+60DRpxfVGrqKWNbk89ca7WF2L9qZ378RAOuoW7RlSix7JSLuGIyOruhdGmmuPP UV4Euf3w7sG0UrcDhUJKy9tSRY1rq9T7VwytpGuW6G6giO3hJ59KXz3mGA45BrYz5eZKzY 8eT7hEDrC3gOCAnANSnkhcBx2yTOGjopx2ck0qZ6ZLzLiy1Xs67REq0ScpcALwSIffTZzG n3N7s1KuVz0X/MQLqNU/zlC7vPVewerSPS2BybDkAHJ3dsVQ+DjsSjQWfnEkRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714334416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3R4T9J8Jn+El1TDeGYI2uT4L2ZVt64CMt6XBlTAGNe0=; b=d97JMdCcSmjFdHxlEJw9LXsZ3ZZ1YVNb+9m/BWCAWWTXDBkdgfwYqzAhISoXgLW/UvhL8g xzTF9KHclNLTTqAuO8wOtCTT7Zi64Ief2lpxkn+fF5Lw2KdapagsLYl1Dg5SyeE2yRIetn kUj2bRZBnLVreXkZmPnUk8yh0BjswBbh1cekCED3NljippaarwMGTeyU6ihU6ZJTQHBaf/ 9Wk3Mhqi7bwSqIZXjWeCe5FmPgp4zX0sI3kQgvnUxNsJ0cw7H5mwGOJNvMTbBvlhHc8Cmy WhMO7ZV5qDHn2aONYTYR+b5uyqgRgAzm+d9nCuDXO75Sr63eE6VTeo8pPiCNGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSHPX4frlzdqS; Sun, 28 Apr 2024 20:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SK0GIR089185; Sun, 28 Apr 2024 20:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SK0G3B089180; Sun, 28 Apr 2024 20:00:16 GMT (envelope-from git) Date: Sun, 28 Apr 2024 20:00:16 GMT Message-Id: <202404282000.43SK0G3B089180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 993d1fad5bd8 - main - RELNOTES: Fix wrong commit hash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 993d1fad5bd805dbd1820975e58839ff4276e7b0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=993d1fad5bd805dbd1820975e58839ff4276e7b0 commit 993d1fad5bd805dbd1820975e58839ff4276e7b0 Author: Christos Margiolis AuthorDate: 2024-04-28 19:59:17 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:59:17 +0000 RELNOTES: Fix wrong commit hash Fixes: 25723d66369f ("sound: Retire unit.*") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- RELNOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index 658a82a9e1b0..6994e0792186 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,7 +10,7 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. -8fef193e14e2: +25723d66369f: As a side-effect of retiring the unit.* code in sound(4), the hw.snd.maxunit loader(8) tunable is also retired. 6d5ce2bb6344: From nobody Sun Apr 28 20:34:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSJ8z69swz5JvfC; Sun, 28 Apr 2024 20:34:27 +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 4VSJ8z4Fbrz4BHL; Sun, 28 Apr 2024 20:34:27 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 43SKYKtR002509; Sun, 28 Apr 2024 23:34:23 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 43SKYKtR002509 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 43SKYKho002508; Sun, 28 Apr 2024 23:34:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 28 Apr 2024 23:34:20 +0300 From: Konstantin Belousov To: Mateusz Piotrowski <0mp@freebsd.org>, \@kib.kiev.ua@tom.home Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6662c2312e95 - main - gettimeofday.2: Do mention improbable future removal Message-ID: References: <202404281812.43SICBSW008151@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202404281812.43SICBSW008151@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4VSJ8z4Fbrz4BHL On Sun, Apr 28, 2024 at 06:12:11PM +0000, Mateusz Piotrowski wrote: > The branch main has been updated by 0mp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6662c2312e956439652ce2d06b42753b6a78fc61 > > commit 6662c2312e956439652ce2d06b42753b6a78fc61 > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2024-04-28 18:06:05 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2024-04-28 18:11:22 +0000 > > gettimeofday.2: Do mention improbable future removal > > As kib@ noted: > > > Obviously gettimeofday(2) is not going to be removed > > even in the far future. > > Reported by: kib > Fixes: 4395d3ced5cf Document that gettimeofday() is obsolescent > MFC after: 3 days Thank you. From nobody Sun Apr 28 20:34:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSJ9V49cvz5JvRF; Sun, 28 Apr 2024 20:34:54 +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 4VSJ9V2QwMz4CXK; Sun, 28 Apr 2024 20:34:54 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 43SKYlwg002546; Sun, 28 Apr 2024 23:34:50 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 43SKYlwg002546 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 43SKYlaT002545; Sun, 28 Apr 2024 23:34:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 28 Apr 2024 23:34:47 +0300 From: Konstantin Belousov To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6662c2312e95 - main - gettimeofday.2: Do mention improbable future removal Message-ID: References: <202404281812.43SICBSW008151@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202404281812.43SICBSW008151@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4VSJ9V2QwMz4CXK On Sun, Apr 28, 2024 at 06:12:11PM +0000, Mateusz Piotrowski wrote: > The branch main has been updated by 0mp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6662c2312e956439652ce2d06b42753b6a78fc61 > > commit 6662c2312e956439652ce2d06b42753b6a78fc61 > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2024-04-28 18:06:05 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2024-04-28 18:11:22 +0000 > > gettimeofday.2: Do mention improbable future removal > > As kib@ noted: > > > Obviously gettimeofday(2) is not going to be removed > > even in the far future. > > Reported by: kib > Fixes: 4395d3ced5cf Document that gettimeofday() is obsolescent > MFC after: 3 days Thank you.