From nobody Mon Dec 2 01:46:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1mpc4w9dz5fL7V; Mon, 02 Dec 2024 01:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1mpc4JB2z4j8m; Mon, 2 Dec 2024 01:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQEUjOXaYwWji+bfXIPAbQup8lKwtjUQ6vY49FbNYhA=; b=DBqowLogtYAsS3e7oaCvhxB4uvQGgq6lHAGBDpfxA3kdAn1Z/VgU2a6s/eyr+XgUa9SvAZ whgqfaXLXuomeueVNThQq42lgWgiUJNAIG14Mo822CNgDdXGqwpKYTiHEC7jThyZuYuqeO fn3TbtgvmUvQleah5I899wh7sWLIZ1moAJnZ8Uqljxf41zauvFTjqqeaiaSTIsz1xtekjB iixcfyXMCM0pDAu4LoYedDXZMEoI1AQ0LFwDlUCxGTRTCt9hNrL6E43C3pYqFVdjW7iHrv A61HFXbV+79R21Pq3zxttuWnjsnARlxJ5z6DMDIMgIFPyvymk6oiRV0ZCvBixA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQEUjOXaYwWji+bfXIPAbQup8lKwtjUQ6vY49FbNYhA=; b=n6wMONhxo4e7Rixuprae2yR2NSRAc5Pli6610nIy90vOGx43hbD+kd8HoGg01oPUtnmpob zjPp+BdF4HW3YQxS+gV/vSst5suGKvAFgxZm7VZAB73MrVDrTHAW9Lt9mGrKxZ0wlTu/SU 0c9QtmDNVN2y4gi6N/1271hiI2whHesYADKBToofB2OS7ujky482uqZGlEHQeULSNEopvy 5I/emazyt9uL5mSTgA6oryPb7gsEAG8+ea3kD9cT1JMgo5AAOesSLbptkJvH14ZBjXUQhL eU07Ll+8K+Q+Piv+yobCde6HOxAED1MCMrkeJQs5x6jd09Cpf4GFaXwQry0d3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733103976; a=rsa-sha256; cv=none; b=jHCjKurgI/b6A6XWCLdhPRZt0u42bqxx2pQl58UCeSlOliEOx5qMtg5m9bET9DMkrmWbLo QnhBSDZRKxIYDBnaK2o73nK9p62sbYLxVV4E8J5iM3uLnKmML9/gUvjM+9j5o+YzF17rT3 R89IcBVjv+/T+K/m+4yoWuJmzpm5DrdK9wgW+1BMDtzog8vorS5nzlf4f3kHcsbRwZP0F9 0Icb1Ey1tH7K9GHwe1UY4ZEh235nXxKLFnERcM5eV3TeQ05ux10YmyXj45uNNxvb0qNQDK Wf39TsXWifAGP+bXtCQmVzs1vj4Fyn3zqQ0yX8jJqHKGpfVQ5wG/iyMkxc+KSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1mpc3QkxzHfv; Mon, 2 Dec 2024 01:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B21kGDf026483; Mon, 2 Dec 2024 01:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B21kGwq026480; Mon, 2 Dec 2024 01:46:16 GMT (envelope-from git) Date: Mon, 2 Dec 2024 01:46:16 GMT Message-Id: <202412020146.4B21kGwq026480@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: 8e9f1e10c624 - stable/14 - amd64 pmap: assert and explain why pmap_qremove() is safe WRT supermappings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 8e9f1e10c624e289212a9244c317b61ea8195a7e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9f1e10c624e289212a9244c317b61ea8195a7e commit 8e9f1e10c624e289212a9244c317b61ea8195a7e Author: Konstantin Belousov AuthorDate: 2024-11-23 21:02:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-02 01:44:55 +0000 amd64 pmap: assert and explain why pmap_qremove() is safe WRT supermappings (cherry picked from commit 2d6923790b16785ac691cedb23234067672fe1cc) --- sys/amd64/amd64/pmap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 9e6196de2e89..5a6c2b479937 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -4077,7 +4077,19 @@ pmap_qremove(vm_offset_t sva, int count) va = sva; while (count-- > 0) { + /* + * pmap_enter() calls within the kernel virtual + * address space happen on virtual addresses from + * subarenas that import superpage-sized and -aligned + * address ranges. So, the virtual address that we + * allocate to use with pmap_qenter() can't be close + * enough to one of those pmap_enter() calls for it to + * be caught up in a promotion. + */ KASSERT(va >= VM_MIN_KERNEL_ADDRESS, ("usermode va %lx", va)); + KASSERT((*vtopde(va) & X86_PG_PS) == 0, + ("pmap_qremove on promoted va %#lx", va)); + pmap_kremove(va); va += PAGE_SIZE; } From nobody Mon Dec 2 01:46:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1mpd6Hjbz5fLFp; Mon, 02 Dec 2024 01:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1mpd5fq8z4jWR; Mon, 2 Dec 2024 01:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbtrxK+QC72CVW9Dn43vmPCCCQ4VmkhI+T4gcjsFAzo=; b=p4fuvZ/uo6emWDsf7c1upRk01JhvZr+W7/JX1eTj9hom9+oIAe7KPlRZSBnCfKNLhg1Prt DnsVwuFP3TDDN/NZMj2iV6X2sPfSyBCmwlrpWSRJITyjXaXf7vOiuCefnPnkgC+m+/Kaq1 L1Dkm9CdPCEWUjfU4oyYdp9tArZpQhVlHD6wbR5kjYa/UTdyRN4CWY02fkQoSofaPCSVaS s+WmsZY8tCPWBp5GrWw2U2RmzskRSdVKziqe93KRtbtea5r+yV6gm9RtfYtLlSF4DyRyBE t5FJbbQ4WsowYn1g5bOhRzboqZo8KUzQ4vEWbGAgY8hxhzvM2gsjthHAtBj87A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbtrxK+QC72CVW9Dn43vmPCCCQ4VmkhI+T4gcjsFAzo=; b=UIeqF/P8zZi+xT9zYQCZ3KFsGiGwCT6xEe9EOxl+CUK9K46+FmvMl0uh0pqLRwPum9Frp6 CwXy1H3W+QqShLngIUjTnLDB30wm84r/ECeP4DFxbDbR9t7ZXjUPJ9E53wQ4A8Lx/JOG10 yTINLvV7ovrLzvYbPEpqy/fh03selVMbGkA/XdTWb1qudR68se7ebTIn8zXkXEN3nitbnA apd6AzgpKyF2iJx+yxoFkSilACDXK/9AROsRv11/iS1ArpwJlE3Otyr93G1u9jolysVwKX rPJIghX6tMWdwaET0KLIym704Sntb52h+BOAde8iMMHi40aclf7LBd1U6OUvrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733103977; a=rsa-sha256; cv=none; b=VSLzna6I/XHcBw5XAYbncGpMhT7+iIqI0ggX8jcFoHHrIb1elvUKcutA4B0e7OU6ZaqpJ3 r2F/xlrPLZCdAgzHi2U96Bpwfy21D7E2RmcwhSfcx4IQ8VkZeUXUZ5LJPSCCE9Lh3VCD3a j+G3vUyxO8g38pfUZ5vBPxMmd6CG8vEMo/e6eS1OQj9Zl3DDXsGjbupkmLeFhqce46+CyT jbhW9PMf1RPLzK9Q2pxTKXWmQO+E3L91U0JKtx0lfR93U3rB9s4LvxQ745/vb4yNG3jLuh /8oLGg2QSWWCwxTwMEyKJEdn9uxR9oRMsKuXZ5BtpiOOswi6ebMsY/0lw3VOOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1mpd59gSzHt6; Mon, 2 Dec 2024 01:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B21kHXn026528; Mon, 2 Dec 2024 01:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B21kH1k026525; Mon, 2 Dec 2024 01:46:17 GMT (envelope-from git) Date: Mon, 2 Dec 2024 01:46:17 GMT Message-Id: <202412020146.4B21kH1k026525@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: 7302cdd34994 - stable/14 - amd64: switch pmap_map_io_transient() to use pmap_kenter_attr() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 7302cdd34994fe3db06111f5c73e63a85bb9ef34 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7302cdd34994fe3db06111f5c73e63a85bb9ef34 commit 7302cdd34994fe3db06111f5c73e63a85bb9ef34 Author: Konstantin Belousov AuthorDate: 2024-11-23 21:03:40 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-02 01:44:55 +0000 amd64: switch pmap_map_io_transient() to use pmap_kenter_attr() (cherry picked from commit 6ec4ff70885d8048be8de9b9d690dd371e3d4a3e) --- sys/amd64/amd64/pmap.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5a6c2b479937..406ff7744e5b 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -10504,8 +10504,7 @@ pmap_map_io_transient(vm_page_t page[], vm_offset_t vaddr[], int count, { vm_paddr_t paddr; bool needs_mapping; - pt_entry_t *pte; - int cache_bits, error __unused, i; + int error __unused, i; /* * Allocate any KVA space that we need, this is done in a separate @@ -10550,11 +10549,8 @@ pmap_map_io_transient(vm_page_t page[], vm_offset_t vaddr[], int count, */ pmap_qenter(vaddr[i], &page[i], 1); } else { - pte = vtopte(vaddr[i]); - cache_bits = pmap_cache_bits(kernel_pmap, - page[i]->md.pat_mode, false); - pte_store(pte, paddr | X86_PG_RW | X86_PG_V | - cache_bits); + pmap_kenter_attr(vaddr[i], paddr, + page[i]->md.pat_mode); pmap_invlpg(kernel_pmap, vaddr[i]); } } From nobody Mon Dec 2 01:46:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1mph1rPTz5fKpT; Mon, 02 Dec 2024 01:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1mpg6mtNz4jJs; Mon, 2 Dec 2024 01:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ytIFupsY+VpKCIUmuQeEDuRBmelMyGPR0yW+bUB88c=; b=rI8evTpID8QCV1BteuIa+RumAwjbYcpoIQ2tp7kKAEIy9/R4BA5piCGRjsDgbBEWuqrNnf KpHD3Ud7jZK9FTXyDQRyDK9ODc6qya0hAIDwmQv54i2tdLhp4lS3+MvCZfhqYpRfgXA/oR WDukrJDGQxH7TyxtIqDIlcK6XQwwvp0n0fz/Sj0p/7xYxp7f3xuVG11DXbkygT1uOtTmno 744kU+66s+lzzHZKKB/edhEwHuTb6wZiDjg+ALfbVWop+qCf5tPyDpSEqp6tPK8r+jBuQD YtiJLvdyRQcpLES8k0v48R52GzcRB/JHPE+d5R9WsOz2CgoQdmFmidKlimgyZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ytIFupsY+VpKCIUmuQeEDuRBmelMyGPR0yW+bUB88c=; b=BvV9mJjlMlEFweHr4dWK52pQc+sWc7dSpcZ8a7wG/5AnRNqhtSnsJKkyqwcdTv80Qcln5f aaAWTTFdev7zszzyC9ZXCPBWba+9OQmM8oDJyQlRz6ICkBaEsZLNfFXil0repf9kg/4yUq m5440MDLy13qN28/mMREhkpcWQECEo1kN0fcEgY1XeLSWTRzFWB0gqWCALaclBG+HOcABc Pg61H1Ukpl/upNq6GMdkqis1EXOfrP+3pQo/IA8Ug4D8UaxkYmGUfqIlHtxZq0/9ItfIL4 Gg02lNT+uwyUzxKE37L0hYrMwuOgz5RV3nm7Jh1Z39XwLuqWxUYRMH1XTg2ZXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733103979; a=rsa-sha256; cv=none; b=xUFIezzushHZ/zs/4Fnq3Pp+EJsGJJRjMYhp8inoiFjM5UF2t/IXzqb30S5WtH6yZjQo0n zhq4zY0YLRxQF885m2fuTTVWjoUtpS55H0Wr1tcw2efUY5YBQgYTSFPtIqjmdpTBti6Ijz +z8OxOUm15C/QVmv8r+VMGRv1aAVygeqjuItCxK85LBJMYl3tpOg9AxfxUH+Rtw9a5TUo5 8YO2m9eTfpPlr6zsGfD25hyDwc9sGHpajgLLTgOKsm/QKyJdjfp6KY+pyibeouqbqS9Axm Pjtbrz1sh522AEUrNX6PSh8SY85cuM0bIC5EZCFOgTWbbr2C6lekwHRMKAysAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1mpg6693zHt7; Mon, 2 Dec 2024 01:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B21kJaA026618; Mon, 2 Dec 2024 01:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B21kJUG026615; Mon, 2 Dec 2024 01:46:19 GMT (envelope-from git) Date: Mon, 2 Dec 2024 01:46:19 GMT Message-Id: <202412020146.4B21kJUG026615@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: 96b72aa66bc9 - stable/14 - kern___realpathat(): honor uio_seg argument List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 96b72aa66bc920b2c2d741ccad425a6dec0ccc2b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=96b72aa66bc920b2c2d741ccad425a6dec0ccc2b commit 96b72aa66bc920b2c2d741ccad425a6dec0ccc2b Author: Konstantin Belousov AuthorDate: 2024-11-25 14:07:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-02 01:44:56 +0000 kern___realpathat(): honor uio_seg argument (cherry picked from commit bde575b273eeb17abe878e43dd018e8373741298) --- sys/kern/vfs_cache.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index aa6141cb0230..ab28540be8a8 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3203,7 +3203,15 @@ kern___realpathat(struct thread *td, int fd, const char *path, char *buf, &freebuf, &size); } if (error == 0) { - error = copyout(retbuf, buf, min(strlen(retbuf) + 1, size)); + size_t len; + + len = strlen(retbuf) + 1; + if (size < len) + error = ENAMETOOLONG; + else if (pathseg == UIO_USERSPACE) + error = copyout(retbuf, buf, len); + else + memcpy(buf, retbuf, len); free(freebuf, M_TEMP); } out: From nobody Mon Dec 2 01:46:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1mpg00PBz5fL7X; Mon, 02 Dec 2024 01:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1mpf6DC4z4j8p; Mon, 2 Dec 2024 01:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZRghMlscu7m14ktN2sqlryxgCFNi1TEzgYeqQ4AjOk=; b=Xv5g9fI1m+nCJL2S7pMUySCncz0pvTg/uwJ7k50wPlv5kLZBFaqhV+e4HkQgt9E7ut6B0L XEmJSkkJBWQEWCIdNFh+s1AXhsmqoGzs3IBzSVAXSPSfFxGi3H4XtcAHiyVOGuDTvHvHVS kKferjrXl0UhHQTdABDXe1FOVIz5Rne/udTTBh9c5GLhvOqaSxYfx4iPp2hVi6ceWQSHef 9aIY+TXMfcNIKERFileJ0GaaQ2sSXm9AWG6Zv3u20iVVsZd0cQdnZuiQ1qSV3oaAY+miAs NNFqeJgjgJCSlAbHPqiMFuy+XbVKcEfmyvHbWWKGupHAuKf4XLG76WmrkP0HkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733103978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZRghMlscu7m14ktN2sqlryxgCFNi1TEzgYeqQ4AjOk=; b=AW2P6dPt6XfrbfRhpVNsyCceMCwGVws+Is3X5JqoG9L6LRraw7y1an034+nEg3tuLacGoR BQMuMkguR6tYextInjb+hZXvSgFAXMwMokraSKzQEVZNPCBgIRJB0U4PsIiMi43kexdgV3 93DjdNKovTLU50DVOqJqw4E453u8+mWIMvKbz2gPqIv35LSlAarGcOAh9zQqk9EJv/7lt0 zJqkOngk5l01lrJW5YU0MT0AIEgjEH34+VRkaQBwgoBijzfVzL5pDvKV/ZAFgpLLf5wdl6 SBNZXz8qBUKGw6YCLrc+y5UAFv2zQRfVpkOG/TYTtCsqJkdT+CE6GjPi1+N4kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733103978; a=rsa-sha256; cv=none; b=fsW/+sSMP+7WNRcKMmSvy0/oA/nVUSy6tof/qOarGBTSQp/ORKgCgGcnF+F/5ZdbjlCrfP O/6tk9bYTM3vHb4MDxIDfroDwy9nMwOo03dgLfN3Nn0lvliFMe3+oEiNP7CnMLBx+nUz6v hTrA40g5H6qubCx+/Te7Nd5axz9rH6TEmAEC4kw6p070DG8G9LWIT/EtmNjUgPGlXOLZXO A344byRj5lcWSbqwnam8vQRtaCiT8296T2gr1MNlSLbiL5n2cw7CWZRsJk+2lmKgVJoC0f QKrzqSk4GLvym2q9GaLi0qHIvVTkev2w+Vta+0JXDgawJ8FNq7khx0eial+Hvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1mpf4wLKzJ7K; Mon, 2 Dec 2024 01:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B21kIWB026579; Mon, 2 Dec 2024 01:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B21kIdN026576; Mon, 2 Dec 2024 01:46:18 GMT (envelope-from git) Date: Mon, 2 Dec 2024 01:46:18 GMT Message-Id: <202412020146.4B21kIdN026576@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: 057da12eeaa6 - stable/14 - kern___realpathat(): do not copyout past end of string List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 057da12eeaa6700793340ffcfede620135b7f540 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=057da12eeaa6700793340ffcfede620135b7f540 commit 057da12eeaa6700793340ffcfede620135b7f540 Author: Konstantin Belousov AuthorDate: 2024-11-25 12:41:46 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-02 01:44:55 +0000 kern___realpathat(): do not copyout past end of string (cherry picked from commit 67218bcea847c93ccd002335748884b02a3ca807) --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index d48c1c0be80a..aa6141cb0230 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3203,7 +3203,7 @@ kern___realpathat(struct thread *td, int fd, const char *path, char *buf, &freebuf, &size); } if (error == 0) { - error = copyout(retbuf, buf, size); + error = copyout(retbuf, buf, min(strlen(retbuf) + 1, size)); free(freebuf, M_TEMP); } out: From nobody Mon Dec 2 10:23:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y20HR5Dvxz5fW31; Mon, 02 Dec 2024 10:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y20HR4Vqwz4Nmg; Mon, 2 Dec 2024 10:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bugkkKYl+XOPXd1fXgbd7sWjCJYP1Vlbxe3/zZXfck=; b=LSH9NKIz9qlrzM4t4XpuUa77zTHNzQflSYe26yh7tZLCvN/R6ll5FGRbq5YV9ns6RWsvQN WL5/m9qt3ujnX/JHn4XlyUAH1yYEd83SIWpexR6pkbk/LnqhDhVHfqNOfjjyoA6duv2YuR keeTsHz/178GdekE3yR3idzYYnyMyKwP5gYecpdaM3zPZJlFdAB4eHCEnl5UNJ7GWwTIYg 33FDSrJ97qy0R/8UZPxa0zQcgkxxJLJKA75MqFkWNKaQocL/Pee60nUgNZSEfDPmkGXmof J3HlSTfggk411TMf8W6czJpIdtB/t8Ypm9wRyTaipDhFZWy83aqggUMc7JVBhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bugkkKYl+XOPXd1fXgbd7sWjCJYP1Vlbxe3/zZXfck=; b=Kgp/ruaBaA3yQgUbuhfHlfUM8Tt9fO6eabEzDyjwMsUmXIsqGysLV/0yjASzNRdu0NIDO6 mWV45ZTtC7wVgoKTsi+M00flrLA03Ty1UKbcNJItx5/WuPehzgs9Bm4K4T7uP9nKZuuFww KqikPPruAElc7mBcxqgco9InFHmnQoC0Ebf0T69+Yz0qJubQJ5bkjfAgkmdTLPsgN+tq5q XQMupDWDNv7mpsBWpbt8z1TeuiqA6/grW5YzR5HPetrxelKdB6gfcgkTzdMS2+LQDY0yAE uCENzlVTjd+5BUUU9TqF1gFl0ChWJ0i5JkpH5HKVR7lXbYUWxL0B7pdYM7skag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733135011; a=rsa-sha256; cv=none; b=kqA9p6outNxTd+qp/5bv1f2RdkrQ8nL3GfjtyiEc17RoL0rHIhfP5p/AsX56kMSDXSHXeB Da8hPu7DvqaHmJtwYGJ4RETnzWIj4wnZMaZN9em2Kp2N3bigAB2SWlcZ0xwl2TakJDIFDJ 7jvDmsWBcUXNSVUUYmmNv4Y71U0EVOOvbyzK5hYiuxULn1BhyqGlGulXMkCEYAlyPv1OG7 Z3aCaUHmgl41iUH40dpOm4S7dg/QqmD8T3wneGDDsqiWEO7AkgHVlJlahsrZSlc56nEOV9 8ApFSsWDzweQQmYJonGxuMctsE2wY9QxOpO5y01cPsaHUpCfk3DAovrrYNRxRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y20HR3bQwzZ48; Mon, 2 Dec 2024 10:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2ANVJd096020; Mon, 2 Dec 2024 10:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2ANVg4096017; Mon, 2 Dec 2024 10:23:31 GMT (envelope-from git) Date: Mon, 2 Dec 2024 10:23:31 GMT Message-Id: <202412021023.4B2ANVg4096017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: a731e69eebc3 - stable/14 - ipfw: fix order of memcpy arguments. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c commit a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c Author: Andrey V. Elsukov AuthorDate: 2024-11-23 12:52:43 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 10:22:36 +0000 ipfw: fix order of memcpy arguments. This fixes `ipfw table N lookup addr` command for MAC tables. (cherry picked from commit e012d79c9c732a6aef21066feba2e5e48833cca4) --- sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index 89e6b69bc3ad..ccc1a8098585 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -4306,7 +4306,7 @@ ta_find_mac_radix_tentry(void *ta_state, struct table_info *ti, if (tent->subtype == AF_LINK) { struct sa_mac sa; KEY_LEN(sa) = KEY_LEN_MAC; - memcpy(tent->k.mac, sa.mac_addr.octet, ETHER_ADDR_LEN); + memcpy(sa.mac_addr.octet, tent->k.mac, ETHER_ADDR_LEN); rnh = (struct radix_node_head *)ti->state; e = rnh->rnh_matchaddr(&sa, &rnh->rh); } From nobody Mon Dec 2 10:25:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y20K86Rj1z5fWNf; Mon, 02 Dec 2024 10:25: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y20K85yzBz4Nd1; Mon, 2 Dec 2024 10:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNPAqS/h0inUB1t4Qv20LzXyyx8gXPlG6EKII/wX630=; b=FJ0lxbIG22cvJ36Ujw9ykw287t+ZS/4P/R7jYC01pR7x6p2ofMBkblZysAAkgAldisOAxQ gPbeIAy2GKIhJmrrG8nx8LAn5QIX+bYoPqITMgtj7TCsD7FuTqqHdXku6AfopN6Ek/ufDJ GRveO9DXryP+RtZ0jEIWEk6k4UJkTuZnM2hxVzuB4hkRVEpwpYgn3VpD2c8iY7zEEMS7bM fJlDoUKIlnTJoMZ7AX4RALEweONIMKmP9N/hwL/J8NlVPQGZJhQj29kOij3LHqp6FvmIgx drZXn96wFIpbmah8iRbL/fPbDKNxkEv1VNbaZFMRCQ8HzaSWEjC9HzE1iVCDyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNPAqS/h0inUB1t4Qv20LzXyyx8gXPlG6EKII/wX630=; b=pQXebMhlNsk8m4KNoWSk6phiABiQPZJ2fMZo5G6f7TDTjIIXxQMLV5B9lbFWZrK9zyHLQs +TrvR1S+el5K2XSmDzsrtntAyvYBgha2VUytS1KVFse3U2qnh4cK/xXdxDllE18wphjnS9 HEqaWDQcfzyY9Pbhky94x3qbjKfkAsnDd2On5kSmSd0EpxUg7v2BbsIYNtJBIOIxtfeR0R Qk34t9f4JKvCsZujZymBz97b6XBuOW2pkr0nsNoIFCqlzqVJxKnVQLqWPg9JsXh94W5i+e cc/bZRxOEWI7jccUzbK9gOcTm7uI7bB9Akr3A7L6o/5aQu9QxuGw3bSQl3ERgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733135100; a=rsa-sha256; cv=none; b=w7bv1Ut+tSBnszCMZs7rlVqlAiXeI9etAfY5XtpV+3qzgKNzPzUFGtqOlODVHXmFjPqKaI Tb7Qfj8uLkypKwwvXIx+apHQPjRhWXTka5VxKsAdz29s0GQZOkPaYU2egZzHhk32tTPDbN hNHx25MipnWlzCPm6JCSWtjEJowBm3RLt3eLrxEHtBlszy2oXMwGTWwbVuQOccm+hpVHGO 8tYFe96m4P7pZp4RKsDG1DIcnVWuZbTHcGbj1uYsqEy24mkVFHlt5nmZ2zNWlqmwKWeoTz 2VLycJtvUF7OzEhPLaDCdWun1NhaL5jhN2GvRyeBRV54/0T6FgmJ/mG2RTtUKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y20K85THXzZ49; Mon, 2 Dec 2024 10:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2AP0uQ096576; Mon, 2 Dec 2024 10:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2AP0Qg096573; Mon, 2 Dec 2024 10:25:00 GMT (envelope-from git) Date: Mon, 2 Dec 2024 10:25:00 GMT Message-Id: <202412021025.4B2AP0Qg096573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 628e76a986b9 - stable/14 - ipsec: fix IPv6 over IPv4 tunneling. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 628e76a986b9621199e77730eebfdb8e0e43c945 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=628e76a986b9621199e77730eebfdb8e0e43c945 commit 628e76a986b9621199e77730eebfdb8e0e43c945 Author: Andrey V. Elsukov AuthorDate: 2024-11-25 17:42:00 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 10:24:03 +0000 ipsec: fix IPv6 over IPv4 tunneling. Properly initialize setdf variable in ipsec_encap(). It is used for AF_INET6 case when IPv6 datagram is going to be encapsulated into IPv4 datagram. PR: 282535 Fixes: 4046178557e1 (cherry picked from commit c94d6389e428fac55946bfcdbbc3162c06a9278e) --- sys/netipsec/ipsec_output.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index caf3c3f74433..ebff5ee5adc7 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -1083,7 +1083,7 @@ ipsec_encap(struct mbuf **mp, struct secasindex *saidx) #endif struct ip *ip; #ifdef INET - int setdf; + int setdf = V_ip4_ipsec_dfbit == 1 ? 1: 0; #endif uint8_t itos, proto; @@ -1093,17 +1093,11 @@ ipsec_encap(struct mbuf **mp, struct secasindex *saidx) case IPVERSION: proto = IPPROTO_IPIP; /* - * Collect IP_DF state from the inner header - * and honor system-wide control of how to handle it. + * Copy IP_DF flag from the inner header if + * system-wide control variable is greater than 1. */ - switch (V_ip4_ipsec_dfbit) { - case 0: /* clear in outer header */ - case 1: /* set in outer header */ - setdf = V_ip4_ipsec_dfbit; - break; - default:/* propagate to outer header */ + if (V_ip4_ipsec_dfbit > 1) setdf = (ip->ip_off & htons(IP_DF)) != 0; - } itos = ip->ip_tos; break; #endif From nobody Mon Dec 2 10:37:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y20bl5nTWz5fX9S; Mon, 02 Dec 2024 10:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y20bl57zkz4QvV; Mon, 2 Dec 2024 10:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2V8uHT8BkP02SdzHvK6Y+QEMqO40akEPHRsXVR1CgM=; b=Q9xmhfMFc5rnedI4NVo7ABhqBGBuT20jqvxvPB1i4AEkLIKCtEz9rPDixKhmEOLK+y2it7 bAUiLzncYdZ956aixrsWqyT3ZcGALqdr08ryVnbLxXl9KKxahjybRaqOLzRacX0J3i4Ph1 DZxlr4kJMW28qTJt4X/QG+1Vt6ZnhnI7GxvZmpDK+HI50OzHcL8gIKEvsv0iokBjgn/ozN 0vxtAnkq1dbV2N9GwtHjpuZ9T/dil2SBA9lN/Q/SLAuCBMVVw7cuf9na4/1sWiZ/gtzl+i cHNgVK75jA9WKsaEBxvUrH+Jf1klZ6P8ZUTQEnzmZoZZJhkfPPx51FG6wkPW9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2V8uHT8BkP02SdzHvK6Y+QEMqO40akEPHRsXVR1CgM=; b=pNmermF/XCPVI1fA0MLXOwibV86dFeqQM/YqrBTRZgG2Ll324jUyAgkuC6CNEmbj46gKVc xcCmi+pvyr0EWmoncXQxxJxWCeG0EXQzCCno6SdeCV6hcFgf7lP9IoeAdA3GCVElP7SA5k uzCA31S89nh6xT6OhANb3V1VGoO0bv/u0FpN7h183xmzv3w5/KgUcEpCH4f5omcXieZ1U/ ZaB5Dr0nhJvmdRalC6ioGYrwP6QzCJzY0jTJ9DSU/Pq/GAvNaM0CssYf56x5SPIgDuzK3S Sy3zFbftwN0IpPCxlaWwJ1PH4slt8Z7j8cM4U05PAJ08huX07G69Ea/sPbti1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733135859; a=rsa-sha256; cv=none; b=w7Ku8VqBxtZ0/K3VdHRYOhE76eKIKD+XGCLGAiSnCsbdBNYLgTrlRvOs0xmOCnrTjD34lv rIig1ttBToDGEhnOfgrggVX256PCXYxS90magvRG5wEI491r+zJWra+Ir8RkgR4sPD53hL sdl1sdHBRTju/8Q8ggrFVr/ZpdxQOEVGahc0Iwv3cT27fco6odZ6ON7Yb4fB9y9+p9gL38 +2HUDBv/siLdjKmQ8kHf0MPElZ5iX5ZAq7zfmPHH+yobyj4oN2wgzaXOI/sc/3ddxuRMhp YmjDCvWYmX7nM2kUz08xuaxEf13ag+H2/FZNtuIkQfqSaAQi8FGuuHuAOBgtqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y20bl4YP6zZ4v; Mon, 2 Dec 2024 10:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2AbdSn015515; Mon, 2 Dec 2024 10:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2Abdkc015512; Mon, 2 Dec 2024 10:37:39 GMT (envelope-from git) Date: Mon, 2 Dec 2024 10:37:39 GMT Message-Id: <202412021037.4B2Abdkc015512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 447a1e6914fa - stable/13 - ipfw: fix order of memcpy arguments. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 447a1e6914fa8ce26683246dab5ebfd210eba042 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=447a1e6914fa8ce26683246dab5ebfd210eba042 commit 447a1e6914fa8ce26683246dab5ebfd210eba042 Author: Andrey V. Elsukov AuthorDate: 2024-11-23 12:52:43 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 10:36:48 +0000 ipfw: fix order of memcpy arguments. This fixes `ipfw table N lookup addr` command for MAC tables. (cherry picked from commit e012d79c9c732a6aef21066feba2e5e48833cca4) --- sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index f2ea1ddfc384..e1e45cb3d085 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -4314,7 +4314,7 @@ ta_find_mac_radix_tentry(void *ta_state, struct table_info *ti, if (tent->subtype == AF_LINK) { struct sa_mac sa; KEY_LEN(sa) = KEY_LEN_MAC; - memcpy(tent->k.mac, sa.mac_addr.octet, ETHER_ADDR_LEN); + memcpy(sa.mac_addr.octet, tent->k.mac, ETHER_ADDR_LEN); rnh = (struct radix_node_head *)ti->state; e = rnh->rnh_matchaddr(&sa, &rnh->rh); } From nobody Mon Dec 2 16:53:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y28xJ3lCwz5g6vg; Mon, 02 Dec 2024 16:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y28xJ36G3z4b6v; Mon, 2 Dec 2024 16:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733158404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4MxZzEQC/Rge7xi/szK6WaD0/7PI/tZ41LHqbiqkSU=; b=lo9FgsWZMksufcVjNPdqetpy8sDYC/3TfkRgfxsx4vNXGzNj+ja38SgFPTxgO5IErFFpgX 2QDna0H3RO7uDGDXIdQO8fdVg354KPD9WoLScgCQRGEcEUFemY0+GYmYrflc5+OGbl0hp2 61D37PV6vbTNBJXYyFeJDCUPoHDPPjtayWSKHckQbz15cO0989OIVa927AUFir6sAoR1Lj AixTybYXggl2W8Xe41mQMLNK+KBKzDxJ36fKBMhPUeqy5lFzHBZUK+UWjGK12LQ9KSYzwK kDiiG1O7daYpTqMSQYEzyWlmqLSDW00nLtwPWylIY3ll/waB22Hehdd8yGNynw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733158404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4MxZzEQC/Rge7xi/szK6WaD0/7PI/tZ41LHqbiqkSU=; b=tVqAne5kHjwmIUN2EOPiB7YDTsl/PXEA8/YN5hERiSrAgh17e5sk3uDJw0mcrCFoybHm65 GcZ968RXLU/S8zJYv6XYGVAFXblKfEJSZnHYe/aQmsMswHw1yBhNI4QbdjtsOuN4joSmhB 4Rj4hVxGBGd7iKuN1qW/kW4QhBCJum5DtFatGueJi7PestQpgCIgBMKKSvdvR+VurNjxmW 3L6Ob/eynlJTOfaqDVbinc6BFw8IcAyX3iNbdyH8HwxGSIiiMM196gezQh6IQ/5w2n8DKq dlxy9sJ7hYP2pelTKOS2QX2S0nuGb9D2GcksXowFyb8sZxYxU22rA4r0olTTfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733158404; a=rsa-sha256; cv=none; b=p26US/pqQ0yDAzrcD0UTr8qu0rGNiECuW/1FhDleOUyiSvQ9wk/8jb3bCjcrmJGQrJTvUz 3cAPgex/g6YTSIw1JA3ACijmOfG9G+FMvdDICGJgD9kE9kj2uki+huMtkWe05diLV3aIx6 HcSYmypJGfhhSTl7hTkPW50tDLPqLlcMr5ok8FQRsVrIgdLbmChIpC6XRuks5AFjyNvrXh rvR3nTrIhEU1/ZYywtIwHz9jfPMWJAcI1fF1uJ3H30gi2pZe4lzRzBw16olyNHAMsjDzHt qUw+ebCO9Lc35BDqgrmW8tdeN+VqzhL9Un/BMuX2dJ458w47Qv0CKfONiVZBsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y28xJ2jcKzmLl; Mon, 2 Dec 2024 16:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2GrOiq025276; Mon, 2 Dec 2024 16:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2GrO1A025273; Mon, 2 Dec 2024 16:53:24 GMT (envelope-from git) Date: Mon, 2 Dec 2024 16:53:24 GMT Message-Id: <202412021653.4B2GrO1A025273@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: 2d7d4c66269d - stable/14 - llvm19: permit incremental builds from llvm18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 2d7d4c66269d25cda284fd7129ae561f40d253a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2d7d4c66269d25cda284fd7129ae561f40d253a0 commit 2d7d4c66269d25cda284fd7129ae561f40d253a0 Author: Brooks Davis AuthorDate: 2024-10-23 22:37:28 +0000 Commit: Dimitry Andric CommitDate: 2024-12-02 15:47:45 +0000 llvm19: permit incremental builds from llvm18 Detect and delete out of date clang-tblgen produced output. I found it sufficent for compilation to delete only arm_*.inc files, but it seems safer to regenerate all output and a few extra clang-tblgen runs pales in comparison to the full build we're doing at this point. Reviewed by: dim, emaste Differential Revision: https://reviews.freebsd.org/D47270 (cherry picked from commit 8b2e7da70855e48c0ba8c874fa528b599fb7c9a9) --- tools/build/depend-cleanup.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 271aac789be3..6da37606300c 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -166,3 +166,13 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ echo "removing rescue.mk without nvme_util.o" rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi + +# 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 +p="$OBJTOP"/lib/clang/libclang/clang/Basic +f="$p"/arm_mve_builtin_sema.inc +if [ -e "$f" ]; then + if grep -q SemaBuiltinConstantArgRange "$f"; then + echo "Removing pre-llvm19 clang-tblgen output" + run rm -f "$p"/*.inc + fi +fi From nobody Mon Dec 2 16:54:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y28y764KLz5g6mT; Mon, 02 Dec 2024 16:54: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y28y75Kp7z4bFK; Mon, 2 Dec 2024 16:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733158447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAMkolZQf0wMCRZFYAbE/eshIjpOS3O2+1B3TSFNkLk=; b=g9/JT4/XEl04hiVP0ovUhHqZaWxLo4MoDWJN1kM0JTGEIGJV9vEBqsgNgUhP68bBGFXYcj YY5q4U5M9JD9Eu/YCZoT9Nm1Stlxe0SfasRAHqstDff/zPGRzUP9MLks39sQLTSUK19tHM +WfxDUbFZdHOx5pONsGKerMRcARS8yaSKjk3jvKTtH0Kz1T4dSdLoFT/v7WphuQJjd/pB4 pICnMvK+GDMGNoxfXESyn5e/RrwLS9XkR7J/3XrvUrjuXqJ2HNTTKtwj11cYdCB/WknWzp 0YQM5UAWZFBIvKSpOGmdahtJVVN9eDdnRd2tjVeVhSefxHjTSJVJVtCz6u+kDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733158447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAMkolZQf0wMCRZFYAbE/eshIjpOS3O2+1B3TSFNkLk=; b=nxT1gyI7aJDPDrOC/psxBp+c+y29ln48EhjTNYtpmxpJVB2PQACQsNAptWHIwaoc1gl+Ai nePgwtFfKFDbH0UwALhCkwzrieHtyn4q6A2aHBIKoH4cvDiMQza4TL09CwCfOSt+1p/yQP IqhZ0MV6WBW390HZj0gV68NHpCtf5vgECzn2sIVoyffb9GtIOkY7HpNx2IfzziLmSjkzLo 9F0QTQQwPXyxxp3Ko4sWrZCkGJR0QZa2AhmMkMt7rSqRszaJowjJt3Sx0VBtZ6khzQQK+f kosYAPS34v6DZSZyqnL571lh3n1sB9rlKZH7Ne6aCxbXb59aXUXXJj2k3s808A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733158447; a=rsa-sha256; cv=none; b=isOGtaMq8pZ3zR4k4PO+qXpD2v4/3HhXjWczEB1VhiiKi+X4mRFWFxh5NcHMERu4MUT7y6 XjmfE83VlKKjp1xDIg1SBgQ753N1iqM4tIEXqlxi8prPgYBW+v7tDiTI8VbbHPQf/p8joX NjvzwsV7CdjbHGsv8+vJM8OAoQaQYj+jsDBnvgXfIhodO5AUbiWxUE4rEQs1CbnFiY/NXW loFN3kvGIH3Cs55Y+vPUV0hl8yQEL561TBEGi6xV4ZmD5AOV92Drs9mNIBAvgq5Mb2zy+l 5uQ/OZmY7jU0jlz9bffzVaK+n3ok+QdAiyGz9cZWRt65Jmr3qKnoOa2I5XMu9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y28y74x20zmNn; Mon, 2 Dec 2024 16:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2Gs78M025640; Mon, 2 Dec 2024 16:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2Gs7hP025637; Mon, 2 Dec 2024 16:54:07 GMT (envelope-from git) Date: Mon, 2 Dec 2024 16:54:07 GMT Message-Id: <202412021654.4B2Gs7hP025637@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: 99b2ab71c5b6 - stable/13 - llvm19: permit incremental builds from llvm18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 99b2ab71c5b6ebf76b4dd2d3e3eaf2d281de3432 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=99b2ab71c5b6ebf76b4dd2d3e3eaf2d281de3432 commit 99b2ab71c5b6ebf76b4dd2d3e3eaf2d281de3432 Author: Brooks Davis AuthorDate: 2024-10-23 22:37:28 +0000 Commit: Dimitry Andric CommitDate: 2024-12-02 15:47:49 +0000 llvm19: permit incremental builds from llvm18 Detect and delete out of date clang-tblgen produced output. I found it sufficent for compilation to delete only arm_*.inc files, but it seems safer to regenerate all output and a few extra clang-tblgen runs pales in comparison to the full build we're doing at this point. Reviewed by: dim, emaste Differential Revision: https://reviews.freebsd.org/D47270 (cherry picked from commit 8b2e7da70855e48c0ba8c874fa528b599fb7c9a9) --- tools/build/depend-cleanup.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e165ef0ba8f6..effb6376d225 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -95,3 +95,13 @@ if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then echo "Removing old zic directory" rm -rf "$OBJTOP"/usr.sbin/zic/zic fi + +# 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 +p="$OBJTOP"/lib/clang/libclang/clang/Basic +f="$p"/arm_mve_builtin_sema.inc +if [ -e "$f" ]; then + if grep -q SemaBuiltinConstantArgRange "$f"; then + echo "Removing pre-llvm19 clang-tblgen output" + run rm -f "$p"/*.inc + fi +fi From nobody Mon Dec 2 21:10:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2GfG1dZdz5gRfc; Mon, 02 Dec 2024 21:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2GfF6n0Jz42J7; Mon, 2 Dec 2024 21:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733173846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVkdO3lqxgpmux/X3r+1kwFznaSFN0TTqwMiPEnLPUI=; b=t6/KrKhvk7WOnhcjPjcbysB0r7prISfglHLQ6/DMJUsU2o+7Ofh5xIf0yKV1Ew+8bSf5OE 62GAcKPmD5FjAm25h3t9U/lYswbWyIFpvs8JJp88GoT9JnalQeBg4Ow/HMsh0YkAHMHXTV 69IBk57ZqczH8a+TEgY0vjEjfvZ/Q06BNNu9xLRJlrBINTkrnQVkdea5DXa6N0uuWo+TKI +G/hHyuEMYHBmgx3I5Xyj2TLJS8VxUZQvXsZ9JHG7gjMsjXjFVs9LvdFbhEhOZyyM+NZFG 8OoeAAB3nPQphOwtDyPO/NSmNXMumHiZLS+jbRLADqVnWJ53scpntNV2XMHRkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733173845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVkdO3lqxgpmux/X3r+1kwFznaSFN0TTqwMiPEnLPUI=; b=JGvwVNQtRWo9jApgFsbgr8snMIjuwyCgbjLKweRag8KROQO65/W+R8WwVY5BKmv88oKIs9 Ravqeb2uYgIKSEaamNy/SmTAUAu8dq9GblsK/Ks7bqdc/4WpA1vfIqdgyu85s7DKglEhXe OFTGMMji3uWZ2kZp1dUoNP+6+0ba9Lod2uq+DZsW9Kbw2jxZWVAqz3LzJq2WQBJpytIlVm 6+HgwzBYK39Ccs6HtKJ6TKJ0HwhmlwdtnD8wAcC0S/M0iSmpNc3dSntaaZdS2q3MHaAWvx EFUyQiAInjyffqt199tKWwxrSl0I66a3ILl9+/ROCt2w9ooYq337tnwul9IZqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733173845; a=rsa-sha256; cv=none; b=l6TAb9RoySXLs2vO5Fn6DAXFX/9y1RwYOWP0+yQr8sCGNjhUmZo7jmLicp/C6O53T9d++U xJ6YK3B2FEMVF3y2M9smTRUS9SHOjzks8YJuUNTzFHMNL9q6n32sKwPFYkJgsoBc/DxTHT 22FHB5yDQvB+Yq+BakRmeBgYiPgtQv51F1wy9JFtC+X1yNZ/z+TSmtx7ELdbQ4BelRkb96 aL/vulxipFRBNvheETrrB6hMzXRAS0kZuYzV/jrov7xXX/lKzwjQpuWOvbLMBd+pZ/CaU9 ae0ICwhqauLC9GAqenOGpENzbpxTQiB2wAdRdmar7tf1jB7x2oeqkWnfljVl/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2GfF6NH8ztfC; Mon, 2 Dec 2024 21:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2LAj41002585; Mon, 2 Dec 2024 21:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2LAj0w002582; Mon, 2 Dec 2024 21:10:45 GMT (envelope-from git) Date: Mon, 2 Dec 2024 21:10:45 GMT Message-Id: <202412022110.4B2LAj0w002582@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: 957f7a2a58e5 - stable/14 - comsat: Improve use of setuid() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 957f7a2a58e550bd31d8ebec67f99d19087746a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=957f7a2a58e550bd31d8ebec67f99d19087746a2 commit 957f7a2a58e550bd31d8ebec67f99d19087746a2 Author: Ed Maste AuthorDate: 2024-11-27 20:36:46 +0000 Commit: Ed Maste CommitDate: 2024-12-02 21:10:31 +0000 comsat: Improve use of setuid() Just return from jkfprintf if either (a) user lookup fails (that is, getpwnam fails) or (b) setuid() to the user's uid fails. If comsat is invoked from inetd using the default of tty:tty we will now return due to setuid() failing rather than fopen() failing. PR: 270404 Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47823 (cherry picked from commit 062b69ba045dc0fef3d9b8d73365d2798c05a480) --- libexec/comsat/comsat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 138881db9e4a..3f94f8d56201 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -225,8 +225,10 @@ jkfprintf(FILE *tp, char user[], char file[], off_t offset) unsigned char line[BUFSIZ]; /* Set effective uid to user in case mail drop is on nfs */ - if ((p = getpwnam(user)) != NULL) - (void) setuid(p->pw_uid); + if ((p = getpwnam(user)) == NULL) + return; + if (setuid(p->pw_uid) != 0) + return; if ((fi = fopen(file, "r")) == NULL) return; From nobody Mon Dec 2 21:10:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2GfH0rQCz5gRfd; Mon, 02 Dec 2024 21:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2GfH02PDz42GP; Mon, 2 Dec 2024 21:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733173847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rNkj8SdmgCHs077FJVUEaFY5qMcQJJ3ArvxOHyFHMPs=; b=Uzg3JAVgFnVyb/ND6mActi+hDego6lG405QPXUBiY2/zj9hJ9w9VAa/kULgqy/ZLEP0U3G XZ2M8X4Pf60dk7XEkqGmLiByw4onTA6HgB8qccUS8IGrR2fb8y3PFWpJyfPTYEcQWO8jv4 XJu3UWqSqyj95YogKozToh36spq3XIFlTpV3Yf3dpi8IIqCRBl5Jep+99pljBVnBD5Z/um TYT9PJWid/E9lB98OhnWFJ0RhjghZJxCb6RfQmNldJ7XhB1X8isP44zaMz+MeHz21otCBc CsAI9lrrF7Low8HoAurmrNkXm+LNhVXrM/wKXO2PFVtX1rKP1OT2L0wdg0TZQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733173847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rNkj8SdmgCHs077FJVUEaFY5qMcQJJ3ArvxOHyFHMPs=; b=uOrFeTq6slg9XQNYxA810c93NCl0HSNJrTW90/BLpVS3LxBfeVrjVDspirQqhVe8jbd1Pc 66Nwo6gSXVEW214wgOx346CRO8pIOe1WykGD1nw95j4xGY3e+dlJxIIVmU8ioVszlrTxLh HuXGjztdN1QcwAOcri4DkQU+tVPqTHtf8oTlbH+S2CUv4skExHqFdlbOgxi/dk5C2+XE9L l7Ua0Y+K79nLnhKutPY5TgeIacZGp22JxyUdV9SgW0AJY9Zy6Gl2hdM9M5DDhJaAIVHCVV /nU7aoUaL14DMBPkxb3OssQHfyLL+eJBWu5kGipKWoWfy7aDkuteG4U+OO256g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733173847; a=rsa-sha256; cv=none; b=ll/29zSEP5QWLGQVMwAHR+r+xk1IxQU5hmx9a3k+lxdsz9jVeqz6XtTM5I061QoNZ+td7M 6BoTMwBFaAF6PrBqvMJKwOx0+alyapCKv8F4Nw4zIWYaVtArerSHILPylHj8d0oBPr0/va lxsKEklCosb0x2GU0TWxFwlQOrxp0rGdg1Y5rrvN/pTckdelbKiySr6A9G5pASXgrbhDMf NLTAYg+EVsprMjShKO9YtGB9Pl3WZNRSOuLfWYy4Qb7OY2Ub1wj6lspxjFxbAyCCgCVv17 ElJIHIzc8PO/NpT+14ldso7L8R+LCQleUxSqFcA6RjkjVb/lSZajuQQKwNlthA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2GfG6m8lztF9; Mon, 2 Dec 2024 21:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2LAkVO002630; Mon, 2 Dec 2024 21:10:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2LAkFf002627; Mon, 2 Dec 2024 21:10:46 GMT (envelope-from git) Date: Mon, 2 Dec 2024 21:10:46 GMT Message-Id: <202412022110.4B2LAkFf002627@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: 0e0329c6dbab - stable/14 - ng_parse: disallow negative length for malloc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 0e0329c6dbabc12f5ab08bb63929a2ba6d506084 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0329c6dbabc12f5ab08bb63929a2ba6d506084 commit 0e0329c6dbabc12f5ab08bb63929a2ba6d506084 Author: Ed Maste AuthorDate: 2022-11-01 14:01:29 +0000 Commit: Ed Maste CommitDate: 2024-12-02 21:10:31 +0000 ng_parse: disallow negative length for malloc This is an interim robustness improvement; further improvements as described in the PR and/or Phabricator review are still needed. PR: 267334 Reported by: Robert Morris Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37229 (cherry picked from commit ae4f39464c61182c2bdfd3cc61594f8707b3daf0) --- sys/netgraph/ng_parse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index e11070274484..1a1d9d8b3064 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1207,6 +1207,8 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int align, len, blen, error = 0; /* Initialize */ + if (num < 0) + return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) { error = ENOMEM; From nobody Tue Dec 3 00:51:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXg2bS7z5fH3P; Tue, 03 Dec 2024 00:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXg1xV1z4T8f; Tue, 3 Dec 2024 00:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAKAS7zedabyEiRClDx3yHwpSc4x2uFrJ4OW4L1Nsc8=; b=P/HLxI4JDmhYun6AGdq1r0YUMudQT4CxfRaSYr2po5zixQMTN2Xc38xo1f7WYNvvnhUimA AW5q+mJxNJTL796GxBce9dwMd85yLxU78WHGaSbS/5Gw09Vqdm2ujb0iahXveriLcy1ETs AbnepHGvOGT+UEqBnreuaqMwwVnJmHe3nZ/YKnqpgvgntQ5aZaPtOzeL/rwV58AbF5ltNg qTUvmemXSOjA8Lh4CQp7+M4S6EaSFUy07PgUv2xIB8TplhYHLEIexu9KJ7sb1m0CcjMi0o GwL6nWDojTw1btoZ1uKHHVhDgeMaPxqlV/3zX9FkyXg9IgKGRDzPqXuEftJgMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAKAS7zedabyEiRClDx3yHwpSc4x2uFrJ4OW4L1Nsc8=; b=Ioo6S2mflH4f0HrTl/p88atb+qgoR2Hg7yk222Ws9Wwe3x4pxo17qVMDACi7/1KSFzkcOj u6sA8ImclFtLIuEYq/F7xgl/lC5wQg9x6igMxXTJo7ZENogBVOprKl7V9iOZ05FxU6pYOa AEIYPj7IoaDEo8WFGVe3XaWSeR0/9RzC/OC3wF/V8MSohpv7edkzn1KG8ZKd78MQ0OPwrs reId886UaT2HsqF4//IHLmCT3Q6WY/k6ACYuC4IoLmMZ9oG7lXM2JYeQ6eIaCplj/yF+tn FsB59JBPn+NRjwYynMpr/ank1G177h9q7q+TdxnGahlMYAuEqC1Ot3CIzsKeEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187075; a=rsa-sha256; cv=none; b=JWzuW7exC/VTu1ey7WXW8NAB1Pvq3kbDB8YgwD435qefiXfY8C68Lslvu7Oe955B9krUJE 2JP5UieF44MU86nkNQPj2GPTJ5t5akicILuJxdTASPmBGR3qVDvGTID899Y+BMsjFf63RV Mn8QftoRaplPSp6KkJKDPj3snkFXrqaBYHHo4NFCbH1rq+GCV6lFJpSqJS0q/IP4flrEy1 XxOuqK3oxjDqV8XsF6Bkykc7aYfqc5sna74TiUG6tBLQPFM0XVKBqHYEDzyYWOtjhEyJO1 wJPux+fdoWKyQTDqn4kfXYcLLwlia6CpiHcxeNFY/QLr4QuWP74KsAG1lT0SVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXg1YStz11RZ; Tue, 3 Dec 2024 00:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pFHS015797; Tue, 3 Dec 2024 00:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pFfQ015794; Tue, 3 Dec 2024 00:51:15 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:15 GMT Message-Id: <202412030051.4B30pFfQ015794@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: edb7173b8c99 - stable/14 - amd64: add machine/pte.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: edb7173b8c99fd4177a0e6eca28f2e4496335df3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=edb7173b8c99fd4177a0e6eca28f2e4496335df3 commit edb7173b8c99fd4177a0e6eca28f2e4496335df3 Author: Konstantin Belousov AuthorDate: 2024-11-25 23:10:34 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:21 +0000 amd64: add machine/pte.h (cherry picked from commit 28fdf718b30b43d1f9ecaa1d2de021d7b53f8a67) --- sys/amd64/include/pmap.h | 58 +------------------------- sys/amd64/include/pte.h | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 57 deletions(-) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 0e989de558b3..7ef826c19fe7 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -50,48 +50,7 @@ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ -/* - * Page-directory and page-table entries follow this format, with a few - * of the fields not present here and there, depending on a lot of things. - */ - /* ---- Intel Nomenclature ---- */ -#define X86_PG_V 0x001 /* P Valid */ -#define X86_PG_RW 0x002 /* R/W Read/Write */ -#define X86_PG_U 0x004 /* U/S User/Supervisor */ -#define X86_PG_NC_PWT 0x008 /* PWT Write through */ -#define X86_PG_NC_PCD 0x010 /* PCD Cache disable */ -#define X86_PG_A 0x020 /* A Accessed */ -#define X86_PG_M 0x040 /* D Dirty */ -#define X86_PG_PS 0x080 /* PS Page size (0=4k,1=2M) */ -#define X86_PG_PTE_PAT 0x080 /* PAT PAT index */ -#define X86_PG_G 0x100 /* G Global */ -#define X86_PG_AVAIL1 0x200 /* / Available for system */ -#define X86_PG_AVAIL2 0x400 /* < programmers use */ -#define X86_PG_AVAIL3 0x800 /* \ */ -#define X86_PG_PDE_PAT 0x1000 /* PAT PAT index */ -#define X86_PG_PKU(idx) ((pt_entry_t)idx << 59) -#define X86_PG_NX (1ul<<63) /* No-execute */ -#define X86_PG_AVAIL(x) (1ul << (x)) - -/* Page level cache control fields used to determine the PAT type */ -#define X86_PG_PDE_CACHE (X86_PG_PDE_PAT | X86_PG_NC_PWT | X86_PG_NC_PCD) -#define X86_PG_PTE_CACHE (X86_PG_PTE_PAT | X86_PG_NC_PWT | X86_PG_NC_PCD) - -/* Protection keys indexes */ -#define PMAP_MAX_PKRU_IDX 0xf -#define X86_PG_PKU_MASK X86_PG_PKU(PMAP_MAX_PKRU_IDX) - -/* - * Intel extended page table (EPT) bit definitions. - */ -#define EPT_PG_READ 0x001 /* R Read */ -#define EPT_PG_WRITE 0x002 /* W Write */ -#define EPT_PG_EXECUTE 0x004 /* X Execute */ -#define EPT_PG_IGNORE_PAT 0x040 /* IPAT Ignore PAT */ -#define EPT_PG_PS 0x080 /* PS Page size */ -#define EPT_PG_A 0x100 /* A Accessed */ -#define EPT_PG_M 0x200 /* D Dirty */ -#define EPT_PG_MEMORY_TYPE(x) ((x) << 3) /* MT Memory Type */ +#include /* * Define the PG_xx macros in terms of the bits on x86 PTEs. @@ -120,9 +79,6 @@ #define EPT_PG_EMUL_V X86_PG_AVAIL(52) #define EPT_PG_EMUL_RW X86_PG_AVAIL(53) #define PG_PROMOTED X86_PG_AVAIL(54) /* PDE only */ -#define PG_FRAME (0x000ffffffffff000ul) -#define PG_PS_FRAME (0x000fffffffe00000ul) -#define PG_PS_PDP_FRAME (0x000fffffc0000000ul) /* * Promotion to a 2MB (PDE) page mapping requires that the corresponding 4KB @@ -132,18 +88,6 @@ PG_M | PG_U | PG_RW | PG_V | PG_PKU_MASK) /* - * Page Protection Exception bits - */ - -#define PGEX_P 0x01 /* Protection violation vs. not present */ -#define PGEX_W 0x02 /* during a Write cycle */ -#define PGEX_U 0x04 /* access from User mode (UPL) */ -#define PGEX_RSV 0x08 /* reserved PTE field is non-zero */ -#define PGEX_I 0x10 /* during an instruction fetch */ -#define PGEX_PK 0x20 /* protection key violation */ -#define PGEX_SGX 0x8000 /* SGX-related */ - -/* * undef the PG_xx macros that define bits in the regular x86 PTEs that * have a different position in nested PTEs. This is done when compiling * code that needs to be aware of the differences between regular x86 and diff --git a/sys/amd64/include/pte.h b/sys/amd64/include/pte.h new file mode 100644 index 000000000000..5195bdc224f8 --- /dev/null +++ b/sys/amd64/include/pte.h @@ -0,0 +1,104 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2003 Peter Wemm. + * Copyright (c) 1991 Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * the Systems Programming Group of the University of Utah Computer + * Science Department and William Jolitz of UUNET Technologies 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. + * + * Derived from hp300 version by Mike Hibler, this version by William + * Jolitz uses a recursive map [a pde points to the page directory] to + * map the page tables using the pagetables themselves. This is done to + * reduce the impact on kernel virtual memory for lots of sparse address + * space, and to reduce the cost of memory to each process. + */ + +#ifndef _MACHINE_PTE_H_ +#define _MACHINE_PTE_H_ + +/* + * Page-directory and page-table entries follow this format, with a few + * of the fields not present here and there, depending on a lot of things. + */ + /* ---- Intel Nomenclature ---- */ +#define X86_PG_V 0x001 /* P Valid */ +#define X86_PG_RW 0x002 /* R/W Read/Write */ +#define X86_PG_U 0x004 /* U/S User/Supervisor */ +#define X86_PG_NC_PWT 0x008 /* PWT Write through */ +#define X86_PG_NC_PCD 0x010 /* PCD Cache disable */ +#define X86_PG_A 0x020 /* A Accessed */ +#define X86_PG_M 0x040 /* D Dirty */ +#define X86_PG_PS 0x080 /* PS Page size (0=4k,1=2M) */ +#define X86_PG_PTE_PAT 0x080 /* PAT PAT index */ +#define X86_PG_G 0x100 /* G Global */ +#define X86_PG_AVAIL1 0x200 /* / Available for system */ +#define X86_PG_AVAIL2 0x400 /* < programmers use */ +#define X86_PG_AVAIL3 0x800 /* \ */ +#define X86_PG_PDE_PAT 0x1000 /* PAT PAT index */ +#define X86_PG_PKU(idx) ((pt_entry_t)idx << 59) +#define X86_PG_NX (1ul<<63) /* No-execute */ +#define X86_PG_AVAIL(x) (1ul << (x)) + +/* Page level cache control fields used to determine the PAT type */ +#define X86_PG_PDE_CACHE (X86_PG_PDE_PAT | X86_PG_NC_PWT | X86_PG_NC_PCD) +#define X86_PG_PTE_CACHE (X86_PG_PTE_PAT | X86_PG_NC_PWT | X86_PG_NC_PCD) + +/* Protection keys indexes */ +#define PMAP_MAX_PKRU_IDX 0xf +#define X86_PG_PKU_MASK X86_PG_PKU(PMAP_MAX_PKRU_IDX) + +/* + * Intel extended page table (EPT) bit definitions. + */ +#define EPT_PG_READ 0x001 /* R Read */ +#define EPT_PG_WRITE 0x002 /* W Write */ +#define EPT_PG_EXECUTE 0x004 /* X Execute */ +#define EPT_PG_IGNORE_PAT 0x040 /* IPAT Ignore PAT */ +#define EPT_PG_PS 0x080 /* PS Page size */ +#define EPT_PG_A 0x100 /* A Accessed */ +#define EPT_PG_M 0x200 /* D Dirty */ +#define EPT_PG_MEMORY_TYPE(x) ((x) << 3) /* MT Memory Type */ + +#define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) +#define PG_PS_PDP_FRAME (0x000fffffc0000000ul) + +/* + * Page Protection Exception bits + */ +#define PGEX_P 0x01 /* Protection violation vs. not present */ +#define PGEX_W 0x02 /* during a Write cycle */ +#define PGEX_U 0x04 /* access from User mode (UPL) */ +#define PGEX_RSV 0x08 /* reserved PTE field is non-zero */ +#define PGEX_I 0x10 /* during an instruction fetch */ +#define PGEX_PK 0x20 /* protection key violation */ +#define PGEX_SGX 0x8000 /* SGX-related */ + +#endif From nobody Tue Dec 3 00:51:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXh50fwz5fGWX; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXh36tBz4THS; Tue, 3 Dec 2024 00:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2F40LWiVHLgQivmoB6onIF9UmyZnR7o+VZAbHOkCbrs=; b=pKWt3sdyGJ8QRbU4UjhhoPXvRAkztzxCotTls6/jEO5n4Bz8toUvM2bEZnYbRNjvxX6W55 s0zqtVQ4GVZbmjQL4pzRmdXc60f6bEYfs6SgzvVmgb2fbjt9mDns6d0Ln8Hw4jBvgbEmtl PSAxaeNjhc3JyybR8dLfGGEasA09sokHE7WpW8Z145Xtcri48qdOaNgrvORYsD2ypa9Lz+ cOzEPQOrOjTT+WJSQhJ2h0Of0PWEYX91lpmeStbn2YMi7n1Cmp7AElytqpd9xdYi4hx67F NehNbf9Tw+PCh2iA6OaFP6ggBWV57JeypRu1QBLnoexdFXACbFra7Zykc4YQBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2F40LWiVHLgQivmoB6onIF9UmyZnR7o+VZAbHOkCbrs=; b=KqlOHvArATkN/XumjiVu2LzVQUz0tMfUIpw+p6vneGWMFFPgRkUrjpAr0gFytlVGVfN6uH v3clq8pEf528dgpUn9MotecvW4yWiMAoG+Xh3dSt/XYMiquCMzBH6xZOueb8VvsOMC3qTU mMxSigpyO1OeegxQVGW2ghjJodQ2MhMzaQbA6H7G8yLr/0aj+/ZPpj0b2b8qC6nulHyEMH UvZ+JWOfYzAehWNYwnhliO9ehvZVoZG6hfT96tRmO/5oonQ3OKWD+2wZkcEDO3NCT+P794 fk1WjSHJGp5ai5wF5svPs9/HJbLRIEvjDMJVSszUqyDqztiUF++iwpa0E5p00A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187076; a=rsa-sha256; cv=none; b=aoLzJcKcBInwqzRr/9y7MPOS3BqDLCGqMjfFheiN7wi1Qxyf2B+73aetsr+DEC2g5Aam8G DdZOdfysPaIXE/oc4CB2PddR0jYisrxADKZfn3AsDoIGCyJBvXhNIaq+XDQ9/RtjU8xqV5 9aFd1BIAGb5OPehgAuwTByLKFHUjTywv/thPA6ZE1FedmplKs9xa+ySUleGoztZV3cKeao SsmjtAKOkMvvSDGwxKREx8WaeOX1yoKL48v4+2nCH05mbjvSD6HVFLRzJrV9bJoxD4RHqF /Qy8Gtz+99CZWvzN3jVuZBoEhDOa8HY4B16lynkJ8UlHEOU0+klDHAS6I4d3jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXh2YrRz1177; Tue, 3 Dec 2024 00:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pG5N015852; Tue, 3 Dec 2024 00:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pGsI015849; Tue, 3 Dec 2024 00:51:16 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:16 GMT Message-Id: <202412030051.4B30pGsI015849@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: 077cbcaefb25 - stable/14 - amdiommu: Fix device table segment base register offsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 077cbcaefb252c6ca9b9e64a9b5cf76409d82586 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=077cbcaefb252c6ca9b9e64a9b5cf76409d82586 commit 077cbcaefb252c6ca9b9e64a9b5cf76409d82586 Author: Jason A. Harmening AuthorDate: 2024-11-25 23:24:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:21 +0000 amdiommu: Fix device table segment base register offsets (cherry picked from commit 5035db222e8fa77d0b40fcd5a92c073dd1c590c2) --- sys/x86/iommu/amd_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 4373987ae24a..1d9d3b6b72ef 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -277,7 +277,7 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) pmap_qenter(seg_vaddr, &m, 1); } reg = i == 0 ? AMDIOMMU_DEVTAB_BASE : AMDIOMMU_DEVTAB_S1_BASE + - i - 1; + ((i - 1) << 3); amdiommu_write8(sc, reg, rval); } From nobody Tue Dec 3 00:51:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXk0tNDz5fH3Q; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXj4BS7z4TQF; Tue, 3 Dec 2024 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Xvj4LPJs/a+9amlqXtEkflpK1o54/z4wscT4LBU4gk=; b=iWdENm7fiT3GiOSQZjdTagz1imAQuCC86DaTD06B4BxAxQhay/zPD9foX0iYMqS2r16vZU /Pch+1yZK/0sz27YVL8FNJ48RfuHaSJPn5LcxJd2DTmX/Inx7O6mO1ilUAeWFsIou9U60+ OPfR3sXs0VfMrr8+czThnAYnqS6fO5Ybx4y6tv2logG2trh3hcel3Z1Gf5N9po46hxcUoB 1X0A7MdNGUB/hQkiwE56YP0I1N5wih2MVnpZuQtvmoGUaui5kr5UEvvu99YbncP/CpU7ny AXWb+f+iwRnerQJtjzwZAdFi6nx9NfZI/CYENbyQUnEUnUoaPdBjhpU5AZJCfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Xvj4LPJs/a+9amlqXtEkflpK1o54/z4wscT4LBU4gk=; b=GDOzJSnEwVwXr3hWTMsnkkNBXUJfZWM7Z7xjEkVVM/PcBoHZBD7XE9lpEjFneOEsqtu7QN Ohz0OTA4kV+JEUmJvgRJKujELkHD9ApW7Agix0LbtRYrpERFs26iuBy/4lU/jS5E0sLA1Z IKIq7aJjLHOdcRFrdFfb4Qe1Rp4anXHGOqt3xWvd8a9j51bkdDgaHdn7iw3vlRXOTjf+sv AIel4w2kQqCXm8EED21OJRL4X6CBnizMa11afIZYTvRIWXxEAM1N4/OnYScBnijoE64v+c 7U33QykWr3pQ6yj1zah0Xqg7ZwpfuZBXhQofHVZl5C0A83KM8r3McGIcZR8MRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187077; a=rsa-sha256; cv=none; b=lKWU+4VlG6iAwvxT+Dv5IYoIizTZiUD/obam7TvA5kjkYrjeAFXZDCqsrKNJIzUzTWWCSi g8Iw9I3JAkMjR0Jzz8/GE7UdH0FuF5dfq8NzeLT8agi2c9ejIRLB6fIDv3ID5RNvPacq1P uoA5eqYcsU1ODJ6KEc+KESTyD8hLuJC3vHb+cH2LV3NbzXjjDmWk9fgyPzxyUPIvM69rr4 c9Nl3pRP5RbrjUQypoT07Dw5hxS9Rjz2nNoO+0HJfP1trmOabg8K1CgShL9xUcI1VbYOwp dXSdlIyqL3gsuBKdWAATDnDO+vdnEk5lMTvI3FtssLi3wxPJHM7wfR8o/nttag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXj3Kzdz11V3; Tue, 3 Dec 2024 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pHgx015913; Tue, 3 Dec 2024 00:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pHNH015909; Tue, 3 Dec 2024 00:51:17 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:17 GMT Message-Id: <202412030051.4B30pHNH015909@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: 18172439a303 - stable/14 - amdiommu: use static array for device table base register offsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 18172439a303d048e668c2fdae4249d37e223524 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18172439a303d048e668c2fdae4249d37e223524 commit 18172439a303d048e668c2fdae4249d37e223524 Author: Jason A. Harmening AuthorDate: 2024-11-26 18:12:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 amdiommu: use static array for device table base register offsets (cherry picked from commit 31e796c86de08f48422a12a2b846876e93391a63) --- sys/x86/iommu/amd_drv.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 1d9d3b6b72ef..2ab0213925eb 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -224,10 +224,24 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) u_int devtbl_sz, dom, i, reclaimno, segnum_log, segnum, seg_sz; int error; + static const int devtab_base_regs[] = { + AMDIOMMU_DEVTAB_BASE, + AMDIOMMU_DEVTAB_S1_BASE, + AMDIOMMU_DEVTAB_S2_BASE, + AMDIOMMU_DEVTAB_S3_BASE, + AMDIOMMU_DEVTAB_S4_BASE, + AMDIOMMU_DEVTAB_S5_BASE, + AMDIOMMU_DEVTAB_S6_BASE, + AMDIOMMU_DEVTAB_S7_BASE + }; + segnum_log = (sc->efr & AMDIOMMU_EFR_DEVTBLSEG_MASK) >> AMDIOMMU_EFR_DEVTBLSEG_SHIFT; segnum = 1 << segnum_log; + KASSERT(segnum <= nitems(devtab_base_regs), + ("%s: unsupported devtab segment count %u", __func__, segnum)); + devtbl_sz = amdiommu_devtbl_sz(sc); seg_sz = devtbl_sz / segnum; sc->devtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, atop(devtbl_sz), @@ -248,7 +262,6 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) for (i = 0; i < segnum; i++) { vm_page_t m; uint64_t rval; - u_int reg; for (reclaimno = 0; reclaimno < 3; reclaimno++) { VM_OBJECT_WLOCK(sc->devtbl_obj); @@ -276,9 +289,7 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) pmap_zero_page(m); pmap_qenter(seg_vaddr, &m, 1); } - reg = i == 0 ? AMDIOMMU_DEVTAB_BASE : AMDIOMMU_DEVTAB_S1_BASE + - ((i - 1) << 3); - amdiommu_write8(sc, reg, rval); + amdiommu_write8(sc, devtab_base_regs[i], rval); } return (0); From nobody Tue Dec 3 00:51:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXk6Fvsz5fGln; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXk4fZfz4TNS; Tue, 3 Dec 2024 00:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUHBrPIi0eCDa/vWK5jETeVf7Pqq+qqxkZ5tg5kApN0=; b=ytekuJntm50G67BLaW4jDLLPu6EuhxHA8FcHZ3DsCvAhaFItsGeEmCDDHiH19mv25T939D tTHE3/cZu8eJxL1kXHsiWzY4W/YykqgHL/XOt4AhauZKQcjaMiDwMW1BoG06vLY8QxzlQX i3puk3ejjEP/EbLrOtuVOEwnCSMHfVOW7E4KwQmKzKOw10oixgwaj7sY5PcFMTpej5vx5y oXaKCgKyh1d24u8aupepgD2eyPHYIsP/1T/d74Gi+tfB2Oeoc16a7TDtS098f6hb+NEC0W i9WAEBiD6KNzwXbGossfbZfprsBnjOt0GHNe7kytyPEcJS3TRLORgPepEWHr2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUHBrPIi0eCDa/vWK5jETeVf7Pqq+qqxkZ5tg5kApN0=; b=O1R1PfU4wPr9Pw+sf00YaxoM5T0lYz6akD8Kygl6R0e8eR98ey/lZaGDycDOxA7jd+pU9i C8bb6RXQdLVfL/SfIoGWDMC6WtKolxnhdPZ70NidEK4NSPmhC6FtdX4eAwbjbPBo/7v+Wn UYRtAwqR/SQMPiqghiIirWKBY6ZEiW+Imoj4flIekZGYGf3KKh90MB2HcmAuoEqMOuC2a7 J9iM5bOpCAK+DMvd2pd5yLN+SLybtAlv/FVAucWWcU3MI+uFdvZTwvJFuCc0PYIq710xr2 gA/yBJ0lWD5SXvf2PHkme3pauh2MbmgepqFvVKw6ZU6hdHthJ3UPYNd8TvGmLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187078; a=rsa-sha256; cv=none; b=mwO7IDDJOspT8vuM95oxq4rQdc2JoheC9jv/av7BwBCiLA4QKo2axnPSuqXwaf2D818CqQ 3f6qgqNspp+mM9GrbefCXpI3fNU7nSC3UDQelLXk2EwQYXNcLPiqS0SjrrXDnhN/of2T5o LJBRTjJlNc+4hyFzsg3+J1ljFmus0Wnp9ddgQ4Cvz5mdoprRga0wkKU8GIHpAC0G9fJxi+ M3qbyjy17exMCi1YYxHv94kJu9Nr1F2oZRubrzpZdxYlWTNBG8Oi6BxiGFpntFwVRIPmKN tHo889N3AHnXlK0oiGUCkKbodkUJpgWXcJKhNTmDH43L/3dLHARD9IDtuS0gsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXk4G93z11Rb; Tue, 3 Dec 2024 00:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pIgI015973; Tue, 3 Dec 2024 00:51:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pI0X015970; Tue, 3 Dec 2024 00:51:18 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:18 GMT Message-Id: <202412030051.4B30pI0X015970@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: ebe9a47c0065 - stable/14 - acpica: rename acpi_parse_pxm() to acpi_pxm_parse() and make it non-static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: ebe9a47c00658e80fe54f4ff8d1b6c51c0e6b081 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe9a47c00658e80fe54f4ff8d1b6c51c0e6b081 commit ebe9a47c00658e80fe54f4ff8d1b6c51c0e6b081 Author: Konstantin Belousov AuthorDate: 2024-10-30 15:54:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 acpica: rename acpi_parse_pxm() to acpi_pxm_parse() and make it non-static (cherry picked from commit 6f423295f18a3f53a31453d61dbbd5271d7bd099) --- sys/dev/acpica/acpi.c | 8 ++++---- sys/dev/acpica/acpivar.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index c2bfe5f2fa5d..45b6146b6308 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1236,8 +1236,8 @@ acpi_hint_device_unit(device_t acdev, device_t child, const char *name, * _PXM to a NUMA domain. If the device does not have a _PXM method, * -2 is returned. If any other error occurs, -1 is returned. */ -static int -acpi_parse_pxm(device_t dev) +int +acpi_pxm_parse(device_t dev) { #ifdef NUMA #if defined(__i386__) || defined(__amd64__) || defined(__aarch64__) @@ -1264,7 +1264,7 @@ acpi_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize, { int d, error; - d = acpi_parse_pxm(child); + d = acpi_pxm_parse(child); if (d < 0) return (bus_generic_get_cpus(dev, child, op, setsize, cpuset)); @@ -1300,7 +1300,7 @@ acpi_get_domain(device_t dev, device_t child, int *domain) { int d; - d = acpi_parse_pxm(child); + d = acpi_pxm_parse(child); if (d >= 0) { *domain = d; return (0); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index eb6022cde159..a8bd9ec33cb7 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -585,6 +585,7 @@ void acpi_pxm_parse_tables(void); void acpi_pxm_set_mem_locality(void); void acpi_pxm_set_cpu_locality(void); int acpi_pxm_get_cpu_locality(int apic_id); +int acpi_pxm_parse(device_t dev); /* * Map a PXM to a VM domain. From nobody Tue Dec 3 00:51:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXm1WTbz5fGjn; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXl6X0mz4TLL; Tue, 3 Dec 2024 00:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhcJoV7+tEE9yKk0TJ2bhXk8Jr9nTe4t/gspF6XCXEQ=; b=R/Rmvhb3PnUx9C83uJanv7bBA0NHXYeyJrca/K7jgsiH5YQQI9ZLafRCgYdc/FrDWddsk8 j+DW9E3sgqToaXSRwAM83zSJJRdZy41h7r13JuD/4UTmrdCdrsToe/cG0vc+WQEK+PR68x fMUq9XP+a2js3o/xdCksPzf/lnBjpcaOOyaBFXP09Qd3g5TSGW1n0xJKLukTT2aEIuLqDP 6O037lfce1s0XTakmQncCkdhCU+U3UpHNta7eAQS5ZSD2/LlXbdB6NHOB9dS9cD70GLAG2 AZ4gkYZulCUmNrK7M8CUrB9oSQQsEHjtbfi1xqJY/aBHtiC5sKZ/yDNSrqJWFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhcJoV7+tEE9yKk0TJ2bhXk8Jr9nTe4t/gspF6XCXEQ=; b=ALM4bkuoENRaEq/NHVm0Ah0sjDIh0NQJXVudt+x2Pv7TdwkyH9ywKhI5bUjD2XnpztVwLV IpXr1UIXP2b1faItjgVynelFsHNfLWSAox7+UdJ2WuqMCYa4yqaJMnRuOswpDnvaFkYATg 5eq2qUGyNutv/u1rtut8Aslp/1FWOaDVKEKgaHHlTcjAi9kABAh2r+JmZcT36WUA/75wB5 DZU+Om0256loon7UhzcIZNlPgd2filAYqV3vYBYtHdYog4NpA37ip4ficKyfYiIt2bu2MI sVW6VmWSHU+abfpZdFCkDFn/2JM61P+UWsBYBF0hLbUB0aSidzKatBQA+u/HVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187079; a=rsa-sha256; cv=none; b=gmk5zrAl/Mq2HV298bPAHa8geui5Va0gumtd0b/PWG+MLbaEjcI5vm/ojYLk+MklN1ocXc w0voW9qqrxeWLURusYcwrt+oalbC7w1parqUjMOsxHCZ7eytoyhqxQUJQ84XUG2anr4jrp tIOUQ+YbrfXawLr4PGwHD9nPTlYgPGMNG14xGsgwg8Fc+ywJyRaPiMjmKsEYJDPd3wDJHm 3TEqowItzxjPqQOj8sbxDqcQhnxvJ+4/ou8nA7PKpdwnCyJETTXW3Ll8IxYBhYu55eJRwV Gn4GFmule3Nqg2cMIjm8fUe0uvQihxTOhR1A8VVGvBcHUIbIew8TXZpC1XkuPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXl5GKXz10nC; Tue, 3 Dec 2024 00:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pJSs016012; Tue, 3 Dec 2024 00:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pJjf016009; Tue, 3 Dec 2024 00:51:19 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:19 GMT Message-Id: <202412030051.4B30pJjf016009@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: dc75bb826441 - stable/14 - acpica: add domain ivar List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: dc75bb826441630c9d3934044172b9b97873d532 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dc75bb826441630c9d3934044172b9b97873d532 commit dc75bb826441630c9d3934044172b9b97873d532 Author: Konstantin Belousov AuthorDate: 2024-10-26 10:12:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 acpica: add domain ivar (cherry picked from commit 7dd1f0dcd134de52c5ace8da5876b3bd518cee7e) --- sys/dev/acpica/acpi.c | 43 +++++++++++++++++++++---------------------- sys/dev/acpica/acpi_pci.c | 28 +++++++++++++++++++++++++++- sys/dev/acpica/acpivar.h | 9 ++++++++- 3 files changed, 56 insertions(+), 24 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 45b6146b6308..cbb454a52099 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -137,6 +137,7 @@ static bus_child_location_t acpi_child_location_method; static bus_hint_device_unit_t acpi_hint_device_unit; static bus_get_property_t acpi_bus_get_prop; static bus_get_device_path_t acpi_get_device_path; +static bus_get_domain_t acpi_get_domain_method; static acpi_id_probe_t acpi_device_id_probe; static acpi_evaluate_object_t acpi_device_eval_obj; @@ -211,7 +212,7 @@ static device_method_t acpi_methods[] = { DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_hint_device_unit, acpi_hint_device_unit), DEVMETHOD(bus_get_cpus, acpi_get_cpus), - DEVMETHOD(bus_get_domain, acpi_get_domain), + DEVMETHOD(bus_get_domain, acpi_get_domain_method), DEVMETHOD(bus_get_property, acpi_bus_get_prop), DEVMETHOD(bus_get_device_path, acpi_get_device_path), @@ -809,6 +810,7 @@ acpi_add_child(device_t bus, u_int order, const char *name, int unit) if ((ad = malloc(sizeof(*ad), M_ACPIDEV, M_NOWAIT | M_ZERO)) == NULL) return (NULL); + ad->ad_domain = ACPI_DEV_DOMAIN_UNKNOWN; resource_list_init(&ad->ad_rl); child = device_add_child_ordered(bus, order, name, unit); @@ -1045,6 +1047,9 @@ acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) case ACPI_IVAR_FLAGS: *(int *)result = ad->ad_flags; break; + case ACPI_IVAR_DOMAIN: + *(int *)result = ad->ad_domain; + break; case ISA_IVAR_VENDORID: case ISA_IVAR_SERIAL: case ISA_IVAR_COMPATID: @@ -1089,6 +1094,9 @@ acpi_write_ivar(device_t dev, device_t child, int index, uintptr_t value) case ACPI_IVAR_FLAGS: ad->ad_flags = (int)value; break; + case ACPI_IVAR_DOMAIN: + ad->ad_domain = (int)value; + break; default: panic("bad ivar write request (%d)", index); return (ENOENT); @@ -1287,29 +1295,16 @@ acpi_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize, } } -/* - * Fetch the NUMA domain for the given device 'dev'. - * - * If a device has a _PXM method, map that to a NUMA domain. - * Otherwise, pass the request up to the parent. - * If there's no matching domain or the domain cannot be - * determined, return ENOENT. - */ -int -acpi_get_domain(device_t dev, device_t child, int *domain) +static int +acpi_get_domain_method(device_t dev, device_t child, int *domain) { - int d; + int error; - d = acpi_pxm_parse(child); - if (d >= 0) { - *domain = d; + error = acpi_read_ivar(dev, child, ACPI_IVAR_DOMAIN, + (uintptr_t *)domain); + if (error == 0 && *domain != ACPI_DEV_DOMAIN_UNKNOWN) return (0); - } - if (d == -1) - return (ENOENT); - - /* No _PXM node; go up a level */ - return (bus_generic_get_domain(dev, child, domain)); + return (ENOENT); } /* @@ -2303,7 +2298,7 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status) ACPI_HANDLE h; device_t bus, child; char *handle_str; - int order; + int d, order; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -2411,6 +2406,10 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status) } AcpiOsFree(devinfo); } + + d = acpi_pxm_parse(child); + if (d >= 0) + ad->ad_domain = d; break; } } diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index a1ac3499662d..6411af02ee58 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -93,6 +93,7 @@ static int acpi_pci_set_powerstate_method(device_t dev, device_t child, int state); static void acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child); static bus_dma_tag_t acpi_pci_get_dma_tag(device_t bus, device_t child); +static int acpi_pci_get_domain(device_t dev, device_t child, int *domain); static device_method_t acpi_pci_methods[] = { /* Device interface */ @@ -108,7 +109,7 @@ static device_method_t acpi_pci_methods[] = { DEVMETHOD(bus_get_device_path, acpi_pci_get_device_path), DEVMETHOD(bus_get_cpus, acpi_get_cpus), DEVMETHOD(bus_get_dma_tag, acpi_pci_get_dma_tag), - DEVMETHOD(bus_get_domain, acpi_get_domain), + DEVMETHOD(bus_get_domain, acpi_pci_get_domain), /* PCI interface */ DEVMETHOD(pci_alloc_devinfo, acpi_pci_alloc_devinfo), @@ -206,6 +207,31 @@ acpi_pci_get_device_path(device_t bus, device_t child, const char *locator, stru return (pci_get_device_path_method(bus, child, locator, sb)); } +/* + * Fetch the NUMA domain for the given device 'dev'. + * + * If a device has a _PXM method, map that to a NUMA domain. + * Otherwise, pass the request up to the parent. + * If there's no matching domain or the domain cannot be + * determined, return ENOENT. + */ +static int +acpi_pci_get_domain(device_t dev, device_t child, int *domain) +{ + int d; + + d = acpi_pxm_parse(child); + if (d >= 0) { + *domain = d; + return (0); + } + if (d == -1) + return (ENOENT); + + /* No _PXM node; go up a level */ + return (bus_generic_get_domain(dev, child, domain)); +} + /* * PCI power manangement */ diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index a8bd9ec33cb7..80ea18e782ac 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -86,6 +86,7 @@ struct acpi_device { void *ad_private; int ad_flags; int ad_cls_class; + int ad_domain; ACPI_BUFFER dsd; /* Device Specific Data */ const ACPI_OBJECT *dsd_pkg; @@ -269,6 +270,12 @@ extern int acpi_override_isa_irq_polarity; #define ACPI_IVAR_UNUSED 0x101 /* Unused/reserved. */ #define ACPI_IVAR_PRIVATE 0x102 #define ACPI_IVAR_FLAGS 0x103 +#define ACPI_IVAR_DOMAIN 0x104 + +/* + * ad_domain NUMA domain special value. + */ +#define ACPI_DEV_DOMAIN_UNKNOWN (-1) /* * Accessor functions for our ivars. Default value for BUS_READ_IVAR is @@ -294,6 +301,7 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \ __ACPI_BUS_ACCESSOR(acpi, handle, ACPI, HANDLE, ACPI_HANDLE) __ACPI_BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *) __ACPI_BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int) +__ACPI_BUS_ACCESSOR(acpi, domain, ACPI, DOMAIN, int) void acpi_fake_objhandler(ACPI_HANDLE h, void *data); static __inline device_t @@ -594,7 +602,6 @@ int acpi_pxm_parse(device_t dev); */ int acpi_map_pxm_to_vm_domainid(int pxm); bus_get_cpus_t acpi_get_cpus; -bus_get_domain_t acpi_get_domain; #ifdef __aarch64__ /* From nobody Tue Dec 3 00:51:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXn25q7z5fH5W; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXm6N7bz4TJ5; Tue, 3 Dec 2024 00:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymYYx5brmbqRNVbRMnqMKGyjSn+uqzEU65ahC8NP+JA=; b=sOFFjnU9/8YiTMcFHvQL8LQpWP6dg9Zu49xVbnKwnfegyCghFNhaY4qQU4T7um2y0h1PaD HAskt96B+4nSW0u4RNHByihQ/hjjfihOKoLISAUMOwvmrzcrtOWZpOU0mWEIyvNh+EVOKo AHusjI15OowyiufKrJe1S9/rTdWsrJc0Ko3H3GN8+CwB5//YrPZVdun7wl1pruoHQudEm4 2oxXmLy1nH3VOIgV04VuO1Z9YnnXZEgDUjxrn+pRnmgPYM6x6wbRct2MO3ucvM+72UAFcR IFVFUSFnjfDALNR3K950WyKWnxAsvNEFguJ9dzXMxdpdXRtrsuM92SqmJXOWvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymYYx5brmbqRNVbRMnqMKGyjSn+uqzEU65ahC8NP+JA=; b=kbeq8vOsLgdp8pFCfE7KLTL2SD2N28/ZKYGgoRWFn7a7hUR7HkCUoi4yHJCCIeu/ZUQgXE gYSTVPzHthkwyVis1UwEKgLdOMTIQMCS/767eMkmmVAbM6B7AwRw4zCO3IDq0/Fc7gvQS1 R/U0BWxSBTF65sNU+an6Yg11ECxNdT5HLcfHG/mji8QjCIwR75eb7qT87t/ebFQlZxYB9V /zC73AN9lRJmCirptDVEV17efpheczixQmzNxFSJQ6s1dekBEVsxaTx5WSZ4eIpiVfoXWJ f4q72V3+/CgkC0HSe3YjY1LVJDGvxGcyGSdEjvyDyoAazVslo5RH5tIX5zrF3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187080; a=rsa-sha256; cv=none; b=co8bJeCbvXH3hRo5SxAFvlvsd4Pve9fwizAjsoivUwYa8HEcT/5oyaPOYsCUSyYqsfBrXc kaSHCDXjCkPYQ1k356F6CS+kdlHoo9GQdBhXODMphmzaQruBZvUG3eqqG+jpDXO+JAuFGY jN1/LoOm4AtQ6SB6i5zxA89k0AVQsU79+VXfzMcs4QEoJ7YkmQ26IbVCSYnqZwCvWqLZX0 +IVpkMjMyCYTNq/VsjkZyYKgI1soy/dfITazUTcPTFhnpxFoizPGITWGnkSB7geGO6RzPG Gd8wQlY62QNn4ZEQW1mx13akDAEFy2byDacDtO+Aj8L1KAK91iKrB6ADopU6SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXm5rWrz117C; Tue, 3 Dec 2024 00:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pKmN016060; Tue, 3 Dec 2024 00:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pKXd016057; Tue, 3 Dec 2024 00:51:20 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:20 GMT Message-Id: <202412030051.4B30pKXd016057@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: d5adab0e7824 - stable/14 - dmar: set acpi ivar domain on identify() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: d5adab0e7824d45fbf364b227b01180ff92c049e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d5adab0e7824d45fbf364b227b01180ff92c049e commit d5adab0e7824d45fbf364b227b01180ff92c049e Author: Konstantin Belousov AuthorDate: 2024-10-25 05:38:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 dmar: set acpi ivar domain on identify() (cherry picked from commit 3f0289ea7f66c82656a43edf6527055fd27d225d) --- sys/x86/iommu/intel_drv.c | 60 ++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index b21c8460e830..dd2a3d1a631f 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -160,6 +160,27 @@ dmar_count_iter(ACPI_DMAR_HEADER *dmarh, void *arg) return (1); } +/* Remapping Hardware Static Affinity Structure lookup */ +struct rhsa_iter_arg { + uint64_t base; + u_int proxim_dom; +}; + +static int +dmar_rhsa_iter(ACPI_DMAR_HEADER *dmarh, void *arg) +{ + struct rhsa_iter_arg *ria; + ACPI_DMAR_RHSA *adr; + + if (dmarh->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) { + ria = arg; + adr = (ACPI_DMAR_RHSA *)dmarh; + if (adr->BaseAddress == ria->base) + ria->proxim_dom = adr->ProximityDomain; + } + return (1); +} + int dmar_rmrr_enable = 1; static int dmar_enable = 0; @@ -168,6 +189,7 @@ dmar_identify(driver_t *driver, device_t parent) { ACPI_TABLE_DMAR *dmartbl; ACPI_DMAR_HARDWARE_UNIT *dmarh; + struct rhsa_iter_arg ria; ACPI_STATUS status; int i, error; @@ -217,7 +239,15 @@ dmar_identify(driver_t *driver, device_t parent) i, (uintmax_t)dmarh->Address, error); device_delete_child(parent, dmar_devs[i]); dmar_devs[i] = NULL; + continue; } + + ria.base = dmarh->Address; + ria.proxim_dom = -1; + dmar_iterate_tbl(dmar_rhsa_iter, &ria); + acpi_set_domain(dmar_devs[i], ria.proxim_dom == -1 ? + ACPI_DEV_DOMAIN_UNKNOWN : + acpi_map_pxm_to_vm_domainid(ria.proxim_dom)); } } @@ -326,34 +356,12 @@ dmar_print_caps(device_t dev, struct dmar_unit *unit, DMAR_ECAP_IRO(unit->hw_ecap)); } -/* Remapping Hardware Static Affinity Structure lookup */ -struct rhsa_iter_arg { - uint64_t base; - u_int proxim_dom; -}; - -static int -dmar_rhsa_iter(ACPI_DMAR_HEADER *dmarh, void *arg) -{ - struct rhsa_iter_arg *ria; - ACPI_DMAR_RHSA *adr; - - if (dmarh->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) { - ria = arg; - adr = (ACPI_DMAR_RHSA *)dmarh; - if (adr->BaseAddress == ria->base) - ria->proxim_dom = adr->ProximityDomain; - } - return (1); -} - static int dmar_attach(device_t dev) { struct dmar_unit *unit; ACPI_DMAR_HARDWARE_UNIT *dmaru; struct iommu_msi_data *dmd; - struct rhsa_iter_arg ria; uint64_t timeout; int disable_pmr; int i, error; @@ -381,13 +389,7 @@ dmar_attach(device_t dev) if (bootverbose) dmar_print_caps(dev, unit, dmaru); dmar_quirks_post_ident(unit); - unit->memdomain = -1; - ria.base = unit->base; - ria.proxim_dom = -1; - dmar_iterate_tbl(dmar_rhsa_iter, &ria); - if (ria.proxim_dom != -1) - unit->memdomain = acpi_map_pxm_to_vm_domainid(ria.proxim_dom); - + unit->memdomain = acpi_get_domain(dev); timeout = dmar_get_timeout(); TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); From nobody Tue Dec 3 00:51:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXp3Pc1z5fGd1; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXp0XZ4z4TLk; Tue, 3 Dec 2024 00:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZhYgJVB49RKsbbOA+PbYDTT6oTLoEQPXdOpnUw4p6Y=; b=X0CUBPl3f97nzYiQBi5nTAAweKBU21wJASqU38sXObRy4VUJgM9ZIsJ7O+vpYOpI8rF0xt R5gp1m37UbFMGpQXnMvDBRAadYPJsFN/eUZozQQmXty424lMzZuj+uyhu1u8re21/ZqN2l IG2tQAv838Q3a9j04wl8RfVigLzOop1bMVfYNfyA7B6phdbEbABq8wy+hNFV8DSbhOMvqv HJLZh44agkXtZ+8MEszedCIhjIG2vgBIReFoRZd3c0c8+yEjnroJS15gt1EPdxGU04ojkE Oro0Bp7kGshJnxzoO9tlOnRzDZGkbPe3YPeNWqO0MfnP1Tvlng+tm96mFXQm3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZhYgJVB49RKsbbOA+PbYDTT6oTLoEQPXdOpnUw4p6Y=; b=L7GwMcHNGd61YY7rXquVlfAtuNXk6mbio8o0Cytg59QCHD/NQYAwQ3foOhfTQReTUwGsuE Hy1+kuX1FG+uYzCg1/GgE9G6R76UDgZ9TC8HgnKugdVOUYQw0wt7KGh3Ayyp0G2Hs+Usri ulQqYVToOmf+wha7V3LFBFSPW0jWkvKl2aF1IqRWNy2V8bZ6t0lBhhs7Kclz1YS7prX4ty Np9hhQ9rSnmbjpUHwEwOJb3ZXaG48poCWyZuFzkx6Yiw60h0xmkMMCVf3yNn4bN4OOtgt+ r6BHiAZw9mf4MPovoexhe6+8QNMIMvENO7aSszV3aDt68M76J/hIhSWgtllDTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187082; a=rsa-sha256; cv=none; b=A6/hMQW1i7b+70gKYDjxvnAJXyS/Wp+vvmtTxcMZNZadLmBhT1vv4qI+MbLv62w6Uii1Tg 9NvyW2QNcWYegIDAbfWL+f5gh0T/xn+kTJ0vkaPswJ8uxwXdipwi4GFJNz18Jr/F51Lgoa yGuZ9u9wou4yZQ+1IvXxVFo6pIf8pQB0tl4jOfu12J711V7Q7L0vK27XjRFvY45F6jD0Dw HzJh9yw1mZ+S6y9mc+qyCBozzAuarLCouMs5Ka59Uwd5zorJFi4tA9cwLhwTlGfH1KB/0F TQ89umipgn3nYOF8cZ9/A42SA6/7tKLdEIStha+UCdDBXNoW6leq4u8ldHzFNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXn6b3xz10G7; Tue, 3 Dec 2024 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pLWI016105; Tue, 3 Dec 2024 00:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pLE0016102; Tue, 3 Dec 2024 00:51:21 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:21 GMT Message-Id: <202412030051.4B30pLE0016102@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: fb0014d04e84 - stable/14 - stdio(3): correct summary information for fileno(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: fb0014d04e845f1cec15981a4ca1186cc9dfdb26 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fb0014d04e845f1cec15981a4ca1186cc9dfdb26 commit fb0014d04e845f1cec15981a4ca1186cc9dfdb26 Author: Konstantin Belousov AuthorDate: 2024-11-28 22:11:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 stdio(3): correct summary information for fileno(3) (cherry picked from commit 35ac34a23bc0e54eb2a2314b906c6e7769dee7f0) --- lib/libc/stdio/stdio.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3 index 4447ca1b2b87..f25cd357e6f0 100644 --- a/lib/libc/stdio/stdio.3 +++ b/lib/libc/stdio/stdio.3 @@ -254,7 +254,7 @@ library conforms to .It "fgets get a line from a stream" .It "fgetwc get next wide character from input stream" .It "fgetws get a line of wide characters from a stream" -.It "fileno check and reset stream status" +.It "fileno map a stream pointer to a file descriptor" .It "fopen stream open functions" .It "fprintf formatted output conversion" .It "fpurge flush a stream" From nobody Tue Dec 3 00:51:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXq6pQhz5fGp3; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXq1Jl9z4TT8; Tue, 3 Dec 2024 00:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xUM+jTkRUh+i70MAnLwBoauTdiI8yMFciE/w8BhbdIU=; b=gvH+7Lea4bXIhV7MmD1sI6pf9/cRbU4M1r8JKHGlxxSfJC1ZILgzdP7L2Ds684EBhwkgUE ZqaCzC5aedBiuPO0R19278f//wEr72TEs3KqeIcFAV2WIQcAKFkaWOfeOYNKSsO4HsuxTe /iUoXnp7qvKqN0/5ykj2E6cnr0Icow3iIsyGRZtb45qRCvWcY3r3grCRouXM7WxNQW8fVn IMZqJf/4ezFPd24qTcdusNqUm00HRT4WujMwiaSEg+EQzJno0grBQIXQp/0Yd2Iz++DMB2 YEITYOK+R7jySXSpxXXKiC/xjH7W1jCz/u336y1DkByyZuAI9a4FTdCdrw1FjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xUM+jTkRUh+i70MAnLwBoauTdiI8yMFciE/w8BhbdIU=; b=M5C/vJEYvA0JRnoFosH443dHL2KmEiOZyeiBtYc40zhx3nvivWLJgtArgo4fZi5IAPLohb JgbvtgY0UL0AoRY4JCPI4p4CjT2mwQTxrTnL5GIvagda7mFJFMCIXNNIccuwqtfvSzd0sC 5x6unXunMk4AJPfReNY98sK5OYbZ7ftiVaqw8dy7ZJ3wSEre06RkHmYzk/6aDydlE6+FtC /0AljyOZppNxMDE0kppwKGL8rl3w9r0B74V96qWxOy0y+218BkVZ0Fdvedl7LW9XHAJoPh XS3nlPN/fIAg9skIJRWzOQw0YnxOZVeavsw5XcXIWE/S8Uq7nri0UmlmsBYVpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187083; a=rsa-sha256; cv=none; b=FeDbfreUiVbz3lcqp5tE9NtcaO6yVZH7MqoBBVNTBKojJkSa5smpqXUDFZqz9w+bsndjA+ M4vnDwp5XTBNsRO+hiooZD8LF2k4edK75ofNSg0lMinAeHQp1C4y1IY/a7Sl9WeKOHnou5 g8SMdFOUc/L7WWxhswIzuYCkdMGWLzEe6/No3hmr4rchXmbmmkdF7+y2yjnk5GRXQqnHkw EI9cvhFc0nfm7q4WdHydezjOHCBkdPE7oz0eHL9MAn7FjDw263HwlhjKOsTbfMyl9gom8M 4kok8IM2ehQwZGhE9f1lCsGNvwgSHmpY8Lu50/kovRnMmbBPidEZfJpxazFI3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXq0s9Cz117D; Tue, 3 Dec 2024 00:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pNOb016151; Tue, 3 Dec 2024 00:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pNJa016148; Tue, 3 Dec 2024 00:51:23 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:23 GMT Message-Id: <202412030051.4B30pNJa016148@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: 9fb5c02356b0 - stable/14 - fileno(3): set errno when returning -1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 9fb5c02356b0717aa3cdde3c19adc6d3f0521225 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9fb5c02356b0717aa3cdde3c19adc6d3f0521225 commit 9fb5c02356b0717aa3cdde3c19adc6d3f0521225 Author: Konstantin Belousov AuthorDate: 2024-11-28 22:12:29 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 fileno(3): set errno when returning -1 PR: 283014 (cherry picked from commit 7cd756ff4fe7e65a9a3f588904998bf6f4b37623) --- include/stdio.h | 4 ---- lib/libc/stdio/ferror.3 | 20 ++++++++++++++++++-- lib/libc/stdio/fileno.c | 25 ++++++++++++++++++++----- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index b7c412c81da7..0b6d9f22709d 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -497,10 +497,6 @@ extern int __isthreaded; #define ferror(p) (!__isthreaded ? __sferror(p) : (ferror)(p)) #define clearerr(p) (!__isthreaded ? __sclearerr(p) : (clearerr)(p)) -#if __POSIX_VISIBLE -#define fileno(p) (!__isthreaded ? __sfileno(p) : (fileno)(p)) -#endif - #define getc(fp) (!__isthreaded ? __sgetc(fp) : (getc)(fp)) #define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : (putc)(x, fp)) diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3 index 1529c002fb7f..7c4a3ee58b23 100644 --- a/lib/libc/stdio/ferror.3 +++ b/lib/libc/stdio/ferror.3 @@ -112,9 +112,25 @@ before calling them. These functions may be used to avoid the overhead of locking the stream and to prevent races when multiple threads are operating on the same stream. .Sh ERRORS -These functions should not fail and do not set the external -variable +These functions, except +.Fn fileno , +should not fail and do not set the external variable .Va errno . +.Pp +On error, +.Fn fileno +returns \-1 and sets +.Va errno +to one of the following values: +.Bl -tag -width Er +.It Bq Er EBADF +The stream is not associated with a file. +.It Bq Er EBADF +The file descriptor underlying stream is not a valid file descriptor. +.Pp +Note that detection of this condition is not reliable, the error might +be not reported. +.El .Sh SEE ALSO .Xr open 2 , .Xr fdopen 3 , diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c index 3adf8dcb959e..cb5bfef8409b 100644 --- a/lib/libc/stdio/fileno.c +++ b/lib/libc/stdio/fileno.c @@ -36,6 +36,7 @@ static char sccsid[] = "@(#)fileno.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include "namespace.h" +#include #include #include "un-namespace.h" #include "libc_private.h" @@ -43,14 +44,29 @@ static char sccsid[] = "@(#)fileno.c 8.1 (Berkeley) 6/4/93"; #undef fileno #undef fileno_unlocked +static int +__fileno_impl(FILE *fp) +{ + int fd; + + fd = fp->_file; + if (fd == -1) + errno = EBADF; + return (fd); +} + int fileno(FILE *fp) { int fd; - FLOCKFILE(fp); - fd = __sfileno(fp); - FUNLOCKFILE(fp); + if (__isthreaded) { + FLOCKFILE(fp); + fd = __fileno_impl(fp); + FUNLOCKFILE(fp); + } else { + fd = __fileno_impl(fp); + } return (fd); } @@ -58,6 +74,5 @@ fileno(FILE *fp) int fileno_unlocked(FILE *fp) { - - return (__sfileno(fp)); + return (__fileno_impl(fp)); } From nobody Tue Dec 3 00:51:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXr69Bxz5fGp6; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXr2Pp7z4TWb; Tue, 3 Dec 2024 00:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43O7JijBqBqWmbmfG2vS1DQr7F4E0J+Rbn1QaYnuUF0=; b=AQ26yANs9lyiSHBn5uHtgLya36dY6qsEAI8E9Hss//ufjqP2kTOlxLznYwzh+la8Thoesu zb9qb/EK0gUdyrwKf8Q3RiwjPj6MHo3ZDRXjRLvJiwHkaDijuoinAUhqw5uxBo1Zbe1H0M lZbovcAin846D6NWmXV5GVJ8sy72z5m04sDUNntnZY01UtQBUwt/XGNbPM/IKWkCCZYSRl NkWIFBO/p+CX5IJN84NXecWR1E3dwYbGI4N4CcdAwts6UBqBzqcSoRBVvyIkMzEkYnk2Qe txwFdzOz0xo7K44ARjSw5yd0qDp+rAePmZrRqAsmafUJRYFWaShkjoSHmNnhRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43O7JijBqBqWmbmfG2vS1DQr7F4E0J+Rbn1QaYnuUF0=; b=fk1nN11IpBftU8KXxTKJEyZTQsOVFhXDQbQO8aVLOCeKEvsacPQi6+ikPt3bvaML+VZ3m+ 9ASkbM8R1Pe1d5aWcpH05eAx/rG3nG8MOzi7Uc3CmBn4DuBf6BcWja2tcLoszk+Krj+46a zJK8aY8zFS83IE+0thUW8iPq754n/7FWdh72YSBKhlP+xnR7CsB5+Om9O0bpENzERaAAhR dOfG4EfRgJvqbAGPAqoF/Ezxz3h8I27A+t/8MFsBFtXTnkJIIm8MM0+RkrN4lv1PlT+IR5 gTAKrIqCuCEL0Q0ZLQE8D/Aurc92pYBHuwzmrnKuDNSf0m/306w+lIzNJwWssQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187084; a=rsa-sha256; cv=none; b=Zhq7W+tbikooURTossNI3CqYgdivw9CoHEu1KUQ/xu/qEm6z+CrGSKRvsx/eRIi8BySFWL zu1mQelQk3cmuBRwU74Kn4UxDWltUqgDdUO21Zuo2qAfYCUXElUjdbWwrxAV1aezpa33U0 /F7Yll3NZwKW4EgEpRDJSVYTNkryaS6znFB4HHxYAJxANCzG+POhjSqAefhpDngbjGxmCe vxdtC9SEqGbrS9eAQDBLkmc/are5ast8JEhU9iYWWACsASAoYG53ZpLYXfY5KN7DdZwbJz g+sigfdHFssEz6ijeGDdOxlTZcowEjYYNkb+eK7NSXmtZdOZcWIRNPTwTinyvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXr1bYPz117F; Tue, 3 Dec 2024 00:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pOXa016202; Tue, 3 Dec 2024 00:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pOrE016199; Tue, 3 Dec 2024 00:51:24 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:24 GMT Message-Id: <202412030051.4B30pOrE016199@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: 468d647a5a10 - stable/14 - mlx5e: Immediately initialize TLS send tags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 468d647a5a10468378afdb74f2eeafc707a6d28e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=468d647a5a10468378afdb74f2eeafc707a6d28e commit 468d647a5a10468378afdb74f2eeafc707a6d28e Author: Andrew Gallatin AuthorDate: 2024-10-23 19:16:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 mlx5e: Immediately initialize TLS send tags (cherry picked from commit 81dbc22ce8b66759a9fc4ebdef5cfc7a6185af22) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 84 +++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index f2ed45826843..de0cd49eeab5 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -212,53 +212,62 @@ mlx5e_tls_cleanup(struct mlx5e_priv *priv) counter_u64_free(ptls->stats.arg[x]); } + +static int +mlx5e_tls_st_init(struct mlx5e_priv *priv, struct mlx5e_tls_tag *ptag) +{ + int err; + + /* try to open TIS, if not present */ + if (ptag->tisn == 0) { + err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, + priv->pdn, &ptag->tisn); + if (err) { + MLX5E_TLS_STAT_INC(ptag, tx_error, 1); + return (err); + } + } + MLX5_SET(sw_tls_cntx, ptag->crypto_params, progress.pd, ptag->tisn); + + /* try to allocate a DEK context ID */ + err = mlx5_encryption_key_create(priv->mdev, priv->pdn, + MLX5_ADDR_OF(sw_tls_cntx, ptag->crypto_params, key.key_data), + MLX5_GET(sw_tls_cntx, ptag->crypto_params, key.key_len), + &ptag->dek_index); + if (err) { + MLX5E_TLS_STAT_INC(ptag, tx_error, 1); + return (err); + } + + MLX5_SET(sw_tls_cntx, ptag->crypto_params, param.dek_index, ptag->dek_index); + + ptag->dek_index_ok = 1; + + MLX5E_TLS_TAG_LOCK(ptag); + if (ptag->state == MLX5E_TLS_ST_INIT) + ptag->state = MLX5E_TLS_ST_SETUP; + MLX5E_TLS_TAG_UNLOCK(ptag); + return (0); +} + static void mlx5e_tls_work(struct work_struct *work) { struct mlx5e_tls_tag *ptag; struct mlx5e_priv *priv; - int err; ptag = container_of(work, struct mlx5e_tls_tag, work); priv = container_of(ptag->tls, struct mlx5e_priv, tls); switch (ptag->state) { case MLX5E_TLS_ST_INIT: - /* try to open TIS, if not present */ - if (ptag->tisn == 0) { - err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, - priv->pdn, &ptag->tisn); - if (err) { - MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - break; - } - } - MLX5_SET(sw_tls_cntx, ptag->crypto_params, progress.pd, ptag->tisn); - - /* try to allocate a DEK context ID */ - err = mlx5_encryption_key_create(priv->mdev, priv->pdn, - MLX5_ADDR_OF(sw_tls_cntx, ptag->crypto_params, key.key_data), - MLX5_GET(sw_tls_cntx, ptag->crypto_params, key.key_len), - &ptag->dek_index); - if (err) { - MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - break; - } - - MLX5_SET(sw_tls_cntx, ptag->crypto_params, param.dek_index, ptag->dek_index); - - ptag->dek_index_ok = 1; - - MLX5E_TLS_TAG_LOCK(ptag); - if (ptag->state == MLX5E_TLS_ST_INIT) - ptag->state = MLX5E_TLS_ST_SETUP; - MLX5E_TLS_TAG_UNLOCK(ptag); + (void)mlx5e_tls_st_init(priv, ptag); break; case MLX5E_TLS_ST_RELEASE: /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) - err = mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); + (void)mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); /* free tag */ mlx5e_tls_tag_zfree(ptag); @@ -439,8 +448,17 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, /* reset state */ ptag->state = MLX5E_TLS_ST_INIT; - queue_work(priv->tls.wq, &ptag->work); - flush_work(&ptag->work); + /* + * Try to immediately init the tag. We may fail if the NIC's + * resources are tied up with send tags that are in the work + * queue, waiting to be freed. So if we fail, put ourselves + * on the queue so as to try again after resouces have been freed. + */ + error = mlx5e_tls_st_init(priv, ptag); + if (error != 0) { + queue_work(priv->tls.wq, &ptag->work); + flush_work(&ptag->work); + } return (0); From nobody Tue Dec 3 00:51:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXt05p6z5fGWw; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXs38m9z4TTX; Tue, 3 Dec 2024 00:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUuqVqGWoP9DsBY89FF03Ut4LVzSWgI4pvOzz+YY4HE=; b=w99/NdqdjWvGmVcwMhUsdtt6rzV6o3Y06kXh3wFXEO8hFTcJ7C04iwhyv9zaYAS60o7SRu JerLPw6ObfOgE44bQXsUsJUEijdLBNnH6CUmu1pFkVtgAnLeY2/ZMOb1NoOvat66OGSGmv 9s/B3rUWhn+5WcXs+v+CKmUYb3A5AHdNYXpQWjcjpzARNtJweuyU5ZKhEV1bVvx+autxey 0S9L2xxES6Or3os4KnTHjB41uyOiBjuJi3K+vxSeKQAlC9VfSpeadq8UcHzOZXRwYmjnja M9rCqSikCEDVEkkPcTTR4bAuQQp/SXktmq26bsPmrH1rSdTsXkMPtNHwK1zNSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUuqVqGWoP9DsBY89FF03Ut4LVzSWgI4pvOzz+YY4HE=; b=p1H+Kp6FfJGd8PU4b5xkHO3qDuBLXx5EHEV+HDE72qR81HgHqOsBNxSFI4Pi2ll0ko8SbP 0QSx7kkICL8fXZhDJFLSHxsfiV6UhZa0e40QWbu6Jlc2BHwyxQ7+idwNuU7O4pWgaE4kzx v/mQepTNJG8XdkHqLBMI1s91d1mPB3hDZXTcHsTsuURh8j3tIRN/ibuIL0pn+I4MPB7qQj /pKr7RfmULyUAHAd3TJyT4r5jT2kqmaBMP5+xub3wMpY9ktzkssX9Tn4eL+gHGUVPryOil AxL0iSN055M4T8ZoFaJ/ZCje9NETz8pCkUDEEfJp/4NXYu9DLMVULngxYR0Npg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187085; a=rsa-sha256; cv=none; b=WoPKLuEWFAXCFhCqe27w8eIQZVmRbEcgfu6rw0wXIv0zzkorxFpp/YqF4wra0EkhR+RbEX sr5lIfz9sWGE+wOY/TVpAO5ivvxAZJLopkxc4qTeUNxrvIxMq+erZwz8mACiJRoTZArwo0 CkRTjtIYbfovggTExe5tx9mkeJdp7HBWszJht3Gw6lJtpvYA2v3qHnV92a2K0IwpfrESY6 olulyTp9IVUKz0E4VJ/VtYuRzOLdO9ceMe7hyllEY6Yz3TuE4es8wkjw5zOGYUOFgruf1g 0uwZHNM6ldbWfzfyUqPj5FkdMxAfgJ4rlsvsOuU46MCxV62lrRKzBPEI5DMbLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXs2mv2z11M4; Tue, 3 Dec 2024 00:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pPFg016259; Tue, 3 Dec 2024 00:51:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pPKc016256; Tue, 3 Dec 2024 00:51:25 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:25 GMT Message-Id: <202412030051.4B30pPKc016256@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: 5cd87fd6df53 - stable/14 - mlx5e: Use M_WAITOK when allocating TLS tags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 5cd87fd6df53482f84fd26b99cc43d9045cff87b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5cd87fd6df53482f84fd26b99cc43d9045cff87b commit 5cd87fd6df53482f84fd26b99cc43d9045cff87b Author: Andrew Gallatin AuthorDate: 2024-10-23 19:56:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 mlx5e: Use M_WAITOK when allocating TLS tags (cherry picked from commit 49597c3e84c4a1cc35f2c392d93db8d0a1cccac2) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index de0cd49eeab5..f84493f49b5d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -333,9 +333,7 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, return (EOPNOTSUPP); /* allocate new tag from zone, if any */ - ptag = uma_zalloc(priv->tls.zone, M_NOWAIT); - if (ptag == NULL) - return (ENOMEM); + ptag = uma_zalloc(priv->tls.zone, M_WAITOK); /* sanity check default values */ MPASS(ptag->dek_index == 0); From nobody Tue Dec 3 00:51:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXt5xdJz5fH3c; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXt4NX8z4Tfh; Tue, 3 Dec 2024 00:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VwEYZXw70l8BzK5Y7QoUYCybZ1LTaYMd5yeLRJQWfE=; b=s7F5xxlw1n0gRq5G9+Ti73IdgAeITVXUtONZ21pRKWlT3BYfz7Jxva4HQOTz2D9qYnwaeI RJGLxn5BHHL0Ys+g9h7T0Jj18e5n6/Oi0bI1cf+dklqaMAS6LXtr5LflueUIU/pDqiQ4xC xoiddlDQWMKys1LXDdfk35BJd2abKsPSTjL9D1lfMwlxL858cmSrYf6QlRkWF6VWKvzUqo hxYjIkRzeVAhiwAR5vfTjVDfR2I8wtxG1wBcY6sCK/E+z5HyFB66z7cCrB2+7u2IdLTwrm kE4nXX2lD0H3TeUG+ZOzC7HXmocA30dWzcGFy4AEkENSKVlAPglleUUNeVg6FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VwEYZXw70l8BzK5Y7QoUYCybZ1LTaYMd5yeLRJQWfE=; b=KDKXD2zThpXUNguchelxSM/Vt0FCuk/xovxKrB2MvjWd1GFQVdo+x/xo04Pdkm2ryjSa9D iqEXE9Ege2Er4U/FeVnKTTEJa+Ola6mul3F1Mhvr+AZ0/JgwnR33tiKMLoD7drL/0ygSHd qC9ejnd+0u8uVCWn7oth/+qXx4MKq4KN1JhH1xTlLtGp/0osS76Hr/2Tf5AT7dPQjge+d9 1EPm6ejrB5KmagISssXUl49hkQWumjZNnYewYswH7/sLJ/OygS3ItLcbM6Y234loL8btOD LegDARUwPCzB3+k+5exKHRJIwtD39KIMIDwkzSA40ErV0HQ0z28uFyNlz/x7Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187086; a=rsa-sha256; cv=none; b=PNw+I/4Riu1kKSmrVmT2G8z82PN3VptDQnuXmm7FqUvTAOXccUZNW7aJcnEbiZn5ECNwx0 LCop+dQCeumvUv5T6p1bQjHawLJBkD9S1aDFWUTQ/hh9KN0lZNuCuUJ4lvPJPGDo/MNP1i ONrqzMoHeHg6kyvDFYC99jEDlXLxi3Vqw5pSaRBJ2V58pe2/THY/2FV8Lk9RnH+fWRwL20 fmSZzWSCVG5kxZs9faa4PH5BBC9/iig3Y32FZbGzrT7n9H92SBXY1mAMBXA4vUMvfOAVea Z5sAMDdu3a1RZ822zBoYZQLYEULZMC609eFnTOc1hMSS/rkIkJxyekCbq/ImMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXt40lPz117G; Tue, 3 Dec 2024 00:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pQES016319; Tue, 3 Dec 2024 00:51:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pQI9016316; Tue, 3 Dec 2024 00:51:26 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:26 GMT Message-Id: <202412030051.4B30pQI9016316@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: 9ff300614ba7 - stable/14 - mlx5e tls: Ensure all allocated tags have a hw context associated List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 9ff300614ba71cfc2958b8ffe606e3df53023b29 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ff300614ba71cfc2958b8ffe606e3df53023b29 commit 9ff300614ba71cfc2958b8ffe606e3df53023b29 Author: Andrew Gallatin AuthorDate: 2024-11-23 09:43:17 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 mlx5e tls: Ensure all allocated tags have a hw context associated (cherry picked from commit 81b38bce07940b7a4001dfeb8cd63774229ca950) --- sys/dev/mlx5/mlx5_en/en_hw_tls.h | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 132 ++++++++++++++++++++++++---------- 2 files changed, 95 insertions(+), 39 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en_hw_tls.h b/sys/dev/mlx5/mlx5_en/en_hw_tls.h index 2018198e5e52..d637314e040e 100644 --- a/sys/dev/mlx5/mlx5_en/en_hw_tls.h +++ b/sys/dev/mlx5/mlx5_en/en_hw_tls.h @@ -84,7 +84,7 @@ struct mlx5e_tls { struct workqueue_struct *wq; uma_zone_t zone; uint32_t max_resources; /* max number of resources */ - volatile uint32_t num_resources; /* current number of resources */ + int zone_max; int init; /* set when ready */ char zname[32]; }; diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index f84493f49b5d..a4ddf2d7f69e 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -80,17 +80,57 @@ static const char *mlx5e_tls_stats_desc[] = { static void mlx5e_tls_work(struct work_struct *); +/* + * Expand the tls tag UMA zone in a sleepable context + */ + +static void +mlx5e_prealloc_tags(struct mlx5e_priv *priv, int nitems) +{ + struct mlx5e_tls_tag **tags; + int i; + + tags = malloc(sizeof(tags[0]) * nitems, + M_MLX5E_TLS, M_WAITOK); + for (i = 0; i < nitems; i++) + tags[i] = uma_zalloc(priv->tls.zone, M_WAITOK); + __compiler_membar(); + for (i = 0; i < nitems; i++) + uma_zfree(priv->tls.zone, tags[i]); + free(tags, M_MLX5E_TLS); +} + static int mlx5e_tls_tag_import(void *arg, void **store, int cnt, int domain, int flags) { struct mlx5e_tls_tag *ptag; - int i; + struct mlx5e_priv *priv = arg; + int err, i; + + /* + * mlx5_tls_open_tis() sleeps on a firmware command, so + * zone allocations must be done from a sleepable context. + * Note that the uma_zalloc() in mlx5e_tls_snd_tag_alloc() + * is done with M_NOWAIT so that hitting the zone limit does + * not cause the allocation to pause forever. + */ for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS, mlx5_dev_domainset(arg), flags | M_ZERO); + if (ptag == NULL) + return (i); + ptag->tls = &priv->tls; mtx_init(&ptag->mtx, "mlx5-tls-tag-mtx", NULL, MTX_DEF); INIT_WORK(&ptag->work, mlx5e_tls_work); + err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, + priv->pdn, &ptag->tisn); + if (err) { + MLX5E_TLS_STAT_INC(ptag, tx_error, 1); + free(ptag, M_MLX5E_TLS); + return (i); + } + store[i] = ptag; } return (i); @@ -113,7 +153,6 @@ mlx5e_tls_tag_release(void *arg, void **store, int cnt) if (ptag->tisn != 0) { mlx5_tls_close_tis(priv->mdev, ptag->tisn); - atomic_add_32(&ptls->num_resources, -1U); } mtx_destroy(&ptag->mtx); @@ -135,20 +174,38 @@ mlx5e_tls_tag_zfree(struct mlx5e_tls_tag *ptag) /* avoid leaking keys */ memset(ptag->crypto_params, 0, sizeof(ptag->crypto_params)); - /* update number of TIS contexts */ - if (ptag->tisn == 0) - atomic_add_32(&ptag->tls->num_resources, -1U); - /* return tag to UMA */ uma_zfree(ptag->tls->zone, ptag); } +static int +mlx5e_max_tag_proc(SYSCTL_HANDLER_ARGS) +{ + struct mlx5e_priv *priv = (struct mlx5e_priv *)arg1; + struct mlx5e_tls *ptls = &priv->tls; + int err; + unsigned int max_tags; + + max_tags = ptls->zone_max; + err = sysctl_handle_int(oidp, &max_tags, arg2, req); + if (err != 0 || req->newptr == NULL ) + return err; + if (max_tags == ptls->zone_max) + return 0; + if (max_tags > priv->tls.max_resources || max_tags == 0) + return (EINVAL); + ptls->zone_max = max_tags; + uma_zone_set_max(ptls->zone, ptls->zone_max); + return 0; +} + int mlx5e_tls_init(struct mlx5e_priv *priv) { struct mlx5e_tls *ptls = &priv->tls; struct sysctl_oid *node; - uint32_t x; + uint32_t max_dek, max_tis, x; + int zone_max = 0, prealloc_tags = 0; if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0 || MLX5_CAP_GEN(priv->mdev, log_max_dek) == 0) @@ -163,13 +220,31 @@ mlx5e_tls_init(struct mlx5e_priv *priv) snprintf(ptls->zname, sizeof(ptls->zname), "mlx5_%u_tls", device_get_unit(priv->mdev->pdev->dev.bsddev)); + + TUNABLE_INT_FETCH("hw.mlx5.tls_max_tags", &zone_max); + TUNABLE_INT_FETCH("hw.mlx5.tls_prealloc_tags", &prealloc_tags); + ptls->zone = uma_zcache_create(ptls->zname, sizeof(struct mlx5e_tls_tag), NULL, NULL, NULL, NULL, - mlx5e_tls_tag_import, mlx5e_tls_tag_release, priv->mdev, - UMA_ZONE_UNMANAGED); + mlx5e_tls_tag_import, mlx5e_tls_tag_release, priv, + UMA_ZONE_UNMANAGED | (prealloc_tags ? UMA_ZONE_NOFREE : 0)); /* shared between RX and TX TLS */ - ptls->max_resources = 1U << (MLX5_CAP_GEN(priv->mdev, log_max_dek) - 1); + max_dek = 1U << (MLX5_CAP_GEN(priv->mdev, log_max_dek) - 1); + max_tis = 1U << (MLX5_CAP_GEN(priv->mdev, log_max_tis) - 1); + ptls->max_resources = MIN(max_dek, max_tis); + + if (zone_max != 0) { + ptls->zone_max = zone_max; + if (ptls->zone_max > priv->tls.max_resources) + ptls->zone_max = priv->tls.max_resources; + } else { + ptls->zone_max = priv->tls.max_resources; + } + + uma_zone_set_max(ptls->zone, ptls->zone_max); + if (prealloc_tags != 0) + mlx5e_prealloc_tags(priv, ptls->zone_max); for (x = 0; x != MLX5E_TLS_STATS_NUM; x++) ptls->stats.arg[x] = counter_u64_alloc(M_WAITOK); @@ -182,6 +257,10 @@ mlx5e_tls_init(struct mlx5e_priv *priv) if (node == NULL) return (0); + SYSCTL_ADD_PROC(&priv->sysctl_ctx, SYSCTL_CHILDREN(node), OID_AUTO, "tls_max_tag", + CTLFLAG_RW | CTLTYPE_UINT | CTLFLAG_MPSAFE, priv, 0, mlx5e_max_tag_proc, + "IU", "Max number of TLS offload session tags"); + mlx5e_create_counter_stats(&ptls->ctx, SYSCTL_CHILDREN(node), "stats", mlx5e_tls_stats_desc, MLX5E_TLS_STATS_NUM, @@ -205,9 +284,6 @@ mlx5e_tls_cleanup(struct mlx5e_priv *priv) uma_zdestroy(ptls->zone); destroy_workqueue(ptls->wq); - /* check if all resources are freed */ - MPASS(priv->tls.num_resources == 0); - for (x = 0; x != MLX5E_TLS_STATS_NUM; x++) counter_u64_free(ptls->stats.arg[x]); } @@ -332,28 +408,16 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, if (priv->gone != 0 || priv->tls.init == 0) return (EOPNOTSUPP); - /* allocate new tag from zone, if any */ ptag = uma_zalloc(priv->tls.zone, M_WAITOK); + if (ptag == NULL) + return (ENOMEM); /* sanity check default values */ MPASS(ptag->dek_index == 0); MPASS(ptag->dek_index_ok == 0); - /* setup TLS tag */ - ptag->tls = &priv->tls; - /* check if there is no TIS context */ - if (ptag->tisn == 0) { - uint32_t value; - - value = atomic_fetchadd_32(&priv->tls.num_resources, 1U); - - /* check resource limits */ - if (value >= priv->tls.max_resources) { - error = ENOMEM; - goto failure; - } - } + KASSERT(ptag->tisn != 0, ("ptag %p w/0 tisn", ptag)); en = ¶ms->tls.tls->params; @@ -446,17 +510,9 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, /* reset state */ ptag->state = MLX5E_TLS_ST_INIT; - /* - * Try to immediately init the tag. We may fail if the NIC's - * resources are tied up with send tags that are in the work - * queue, waiting to be freed. So if we fail, put ourselves - * on the queue so as to try again after resouces have been freed. - */ error = mlx5e_tls_st_init(priv, ptag); - if (error != 0) { - queue_work(priv->tls.wq, &ptag->work); - flush_work(&ptag->work); - } + if (error != 0) + goto failure; return (0); From nobody Tue Dec 3 00:51:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXw28DPz5fGdV; Tue, 03 Dec 2024 00:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXv6RmKz4TTx; Tue, 3 Dec 2024 00:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PoTPbedafiiDCh7ks1V9pvQfOpSVnJgKuJH+vBrxjc8=; b=boe9OQeyD1WzXPUpXtVNJ4CAinhjjLVi9+XFv47DwopLOxyS76fhcehV99kjX0XqaV0/rr 6fEFZBzPctC40dIKDaMZIpda+ZlJsebD1yrpuHaHO67bForFwgyMVASvRkkQyLzGjWBNYF QhLzm3hE0JWo34sHI/Xnli4AJnyWA1/09jbcNDtwd3MQGPWNHle+3zTWD8vhrjf5MZrgnW 7n1NQAFEd1E5ceyX846B3AxGbhZH0OMPcoGljTxIFji/LS3vdgQCKqgp3FaBfYj/lSRjIM 636goPLFaOiiygKDSHlHdAf1vKOX4PJ8d1SgSTEATc4/Y9iCZ/aJfKi0Ri4EWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PoTPbedafiiDCh7ks1V9pvQfOpSVnJgKuJH+vBrxjc8=; b=q11jJGREGmJjOBY4qhHWpAyonqEG/OMzrjkrjurCfCiaWooao6Z17L714znMLlGdexQw02 DBxHLXy0RpQ8ofAqRfJ2N+9EUx1Dthgc5MmBgatRWasTJdJ4B0WQjIDKoMYYiNRWSoZpdC 3DSsKSQ1czdV06O9hMCiOPX/RwEmY5sU0RyvrF/NzqXl0sd0Hvomj3nFBzxatRr4fSHAXs MSi7ZKuUMXaxhHvjCflVmufSJVDllUnMSWkC/PEsdUCpw9h61GZCP1+688JZdae+gqt8SO /29w3Oq3zd/dgLmSOEABRm+u9H3dWD4XyAZhnw8FLzAlrSgiuXOiHbmUznz8Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187087; a=rsa-sha256; cv=none; b=EOziVHEu6ketpVQvoI/AdoPYRCgtZWeDrz3BNAw4Up9fBL4LQW16VxonVNyDmBiha8Nqg6 ktWVTY2aVW0pF1iTo8IvvJADSMbDhRm2IHpX4awn7b4Eqp58vWwikmFDOJe9MzVmQKOWmj hyRIEFdPbcaTT9wAo17XUbwg4R/Z8m726rsBAdmrvPSdq2SJtRtMRaXkzF0dZ5Y3BMAP7f WYnps78YEGwBsKDk3myexdQrRoXEVirY9XIC22KO70KkkSqK50GJDE5HK9+QQYZB1G5RDC AO2808xlSKC4h+UOoD8nGreh5UIEB5dt/mcUhQl5cqO75Ec3MTG0EKOtKwWrAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXv4dFrz10nL; Tue, 3 Dec 2024 00:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pRhP016359; Tue, 3 Dec 2024 00:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pRLg016356; Tue, 3 Dec 2024 00:51:27 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:27 GMT Message-Id: <202412030051.4B30pRLg016356@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: 75cba37ccf90 - stable/14 - mlx5_en: style function prototype List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 75cba37ccf90be5011e6260c7699f702eaa6d825 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=75cba37ccf90be5011e6260c7699f702eaa6d825 commit 75cba37ccf90be5011e6260c7699f702eaa6d825 Author: Konstantin Belousov AuthorDate: 2024-11-23 10:01:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:23 +0000 mlx5_en: style function prototype (cherry picked from commit 64bf5a431cbe1842db6f54993d6d426484012a5a) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index a4ddf2d7f69e..2e31818df912 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -392,8 +392,7 @@ mlx5e_tls_set_params(void *ctx, const struct tls_session_params *en) CTASSERT(MLX5E_TLS_ST_INIT == 0); int -mlx5e_tls_snd_tag_alloc(if_t ifp, - union if_snd_tag_alloc_params *params, +mlx5e_tls_snd_tag_alloc(if_t ifp, union if_snd_tag_alloc_params *params, struct m_snd_tag **ppmt) { union if_snd_tag_alloc_params rl_params; From nobody Tue Dec 3 00:51:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXx4hszz5fGm5; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXx0hjDz4TVJ; Tue, 3 Dec 2024 00:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ri4jH/rneaXyoznzixS2hnhB4DXXSKusOXlWVs2c3M=; b=orKI/4V3culFclr+Cq3CXtrz0/AOIdq76j7SzMnl4RXThyiTIExOKXSbFwGf4C3WtaNjtj PJayjsQM+mWnqsKhnMgvLZBteRVaynVk27dXJjU9QtI0OGGmhQ02Q4XypXnNglkGfv4fYp fzzp9npJHfcA4i3E+qada/q9RJrIaSVQxzO0dRfXwv28Oli96NqR93BxSnsUiSr9RVBAZ+ SiSQOJ0Ef4DuH2zfjspkeqVBFWXfBJZ3R30HNbmsHCelFm9BfoG+Zz9ZhUeZ+i5BhBZXW9 BYjFoz5TBB5V+F3bUH6iAPCIrJ/AHDfua85UeArjz/aHBAWTm1wYtRrk7vx5Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ri4jH/rneaXyoznzixS2hnhB4DXXSKusOXlWVs2c3M=; b=NPE5XK8/hYTIglhSvp2NRfKwiFlnjboRm52+soW3gMdQEIYBHhtxNEMPt0VVlSQsWgd+TR +vQShGKervYUGZZSaWTQ3b1L25eCh+iUOSjF5hAQYkh4fB3VAHEcvWtpn3eXKsthrLlCg9 9U4b4Av/fUZVDpxcv70vh12P9808L46u+E5ntBi20TZVJ2+tJxCAwtxmcRv73nzgBSqgSM /7ZrLv8GXVQJ+2T8NeE+eQ+NlvWOoVaA7L8XvzHiGYm+gGjvKYR3LkXfqPK+WvCBCmEatP EvVdzUtlDyM/afBFF2Zza5cCO8m7UYgj1fN8v1q2kONF94U72lMbJQSOGmn5hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187089; a=rsa-sha256; cv=none; b=EdGBsI6ZBw2axBClr+ZQDbuGdanVI+t6vcfSNuyPAszuHbkKtkTnhDjAYxB7MGpAr0c8pZ k1cddcjUphnLLXlF9EDJ8Yg0n9DtiCWTeWYdksQ1fvb1NmCoXIR3PQwm86yFxGrnT6xc/Z gYIk/HCLJ2NKnZ/jpk1je5F7I4PfTUkCretKfUPxV2SSa1m00sR7uZeyv1pxNqly+6fMyZ WaiIwQzZ3I/tPJsvaYX1JspQBkl3jhM2JrABf0Z7seyGY2dvvKVKE2NucUudwCbChBqVIi Z5p+rViYlFuDtkQ89pHMso47jqepaDDmzGhNZhPYyRKidPmhMC0auPMDoTjiOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXw64BNz11hv; Tue, 3 Dec 2024 00:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pSAl016422; Tue, 3 Dec 2024 00:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pST1016419; Tue, 3 Dec 2024 00:51:28 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:28 GMT Message-Id: <202412030051.4B30pST1016419@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: e6bcfb14f27d - stable/14 - mlx5en: fix the sign of mlx5e_tls_st_init() error, convert from Linux to BSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: e6bcfb14f27df1704d77cacfe9962d3fbc49f20e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6bcfb14f27df1704d77cacfe9962d3fbc49f20e commit e6bcfb14f27df1704d77cacfe9962d3fbc49f20e Author: Konstantin Belousov AuthorDate: 2024-11-20 13:00:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:23 +0000 mlx5en: fix the sign of mlx5e_tls_st_init() error, convert from Linux to BSD (cherry picked from commit 0d38b0bc8fbc82e3b4664d34d30d9e0091b277b9) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index 2e31818df912..66ecf33e67b2 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -300,7 +300,7 @@ mlx5e_tls_st_init(struct mlx5e_priv *priv, struct mlx5e_tls_tag *ptag) priv->pdn, &ptag->tisn); if (err) { MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - return (err); + return (-err); } } MLX5_SET(sw_tls_cntx, ptag->crypto_params, progress.pd, ptag->tisn); @@ -312,7 +312,7 @@ mlx5e_tls_st_init(struct mlx5e_priv *priv, struct mlx5e_tls_tag *ptag) &ptag->dek_index); if (err) { MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - return (err); + return (-err); } MLX5_SET(sw_tls_cntx, ptag->crypto_params, param.dek_index, ptag->dek_index); From nobody Tue Dec 3 00:51:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXy3NHxz5fGgN; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXy0lJ8z4TgN; Tue, 3 Dec 2024 00:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWRYBqKtVRR9fJ6COKALotltH9Y7cWGiJSoqcmtYuDQ=; b=jNhz8KWLquHehUQO+04BgMl77MWek/pLJUMGu5zUm1JsQYWAY/3aE0SoF6sKt0VRpJLGTc Uyx4DhvlPU/9YeLwRXwl3SawtJEYvtSynJTtmXUcU4KZ4aPYLeg4sgFTPVUKp3y2Egfvuh B418wZINbLEojl5NIfUI4bHdwaJD5DHuCL9lvpLqEyJZ6iNQlkiW7Vl2SwTOjqGNglgp4N CgsvL+zCOsAVYPI7LKJSFOeEh0GZUpvLLwwh/EfJw1JR+0BkS6fa7JjxFviSjfXhcxlwiv XaXKfl5yeDrBMRYbq1sX9QEL++d1hw0P+ZYjMFkoieQip64hN0o1RUtqVw6UUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWRYBqKtVRR9fJ6COKALotltH9Y7cWGiJSoqcmtYuDQ=; b=jBCiZ6Twm+5Ue6F529aoFRdyvF4VL+f0FseQts4UXrNGjLkPMr1pxmyCbVcLK9QGvnp2Zm IyClW8zuvbtPjh6CY7Y93UzDKDlNlRKB1BQeDMYxvJTEOuK4/a5Is8+UXKz3B77kCZ3X1L OqD7bvmPvR0IW7nDzp1xjQiJWIXcRyNuT2H+vLgQ4E7VFmuWh1CriB0CBRbWMqDq0Ykzh4 7lYPViBCTwfwF1QR7rjSkMw1cPrb9IoowzNSuc/xuVPUxwjP0nNwi5+tPPLVAQtaxUBGJB 5q/QkykxLOoNAgJgmwToVpfl10GEIBx9mPbsnwc8/1RkVdrgpZAkhcRyTNwJlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187090; a=rsa-sha256; cv=none; b=RcAgoFpuSYweVbuAUYZ5zyNlkWP8zWSTTqoMkOfpqNED32ZM8K5pMw9w6Wu8LlrG1F7Cm7 U7F0kxcJw1rQu/xvkCj2WZLuzuagzxGN945Og1xBm9CKGLVDoFq2AaVBoD4XXWmxpRLn37 xekfGtjSO9A7fim3eJxEl9FN/yEajbn5P85etrJGrHaSglee2BFfgRelwFOvpaJsji5zMT 21Vvbj4jnfjELJ8OsxtX3m1IMHbz9rqEXF3AiRexCOwU+eh5di7j45xC9BxnRYPphz0VU9 6QyMw+3KUSADdzkilkpUkZdkagGAz6nflxZ7D4lwv0y9sukrf0y5hp5NOvuu6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXx6yDmz11hy; Tue, 3 Dec 2024 00:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pT8K016485; Tue, 3 Dec 2024 00:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pTMW016482; Tue, 3 Dec 2024 00:51:29 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:29 GMT Message-Id: <202412030051.4B30pTMW016482@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: 7211ab584ecf - stable/14 - mlx5e tls: use non-sleeping malloc flag is it was intended List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 7211ab584ecf5e0a7053733188c90797bd20fcb9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7211ab584ecf5e0a7053733188c90797bd20fcb9 commit 7211ab584ecf5e0a7053733188c90797bd20fcb9 Author: Gleb Smirnoff AuthorDate: 2024-11-25 18:45:09 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:23 +0000 mlx5e tls: use non-sleeping malloc flag is it was intended (cherry picked from commit 67f93079075be4a2f5b7198fb3bda6d10bbd54e7) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index 66ecf33e67b2..af280abcdcd2 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -407,7 +407,7 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, union if_snd_tag_alloc_params *params, if (priv->gone != 0 || priv->tls.init == 0) return (EOPNOTSUPP); - ptag = uma_zalloc(priv->tls.zone, M_WAITOK); + ptag = uma_zalloc(priv->tls.zone, M_NOWAIT); if (ptag == NULL) return (ENOMEM); From nobody Tue Dec 3 00:51:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MXz2wlSz5fGpN; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXz1bLlz4Tm2; Tue, 3 Dec 2024 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fo482mTaC94HkYW0AMLXXQPmzXrwp2hdXy9YxHLJuoM=; b=HEZ1OaznJTkVA7YrtoPNyFvNpsysjDxtVrYMig2GMWaXzRjUK22I8Geiut+wzXwKxpSCVr HLXrVX/jEVvLODY+bu6K6Ww2b6suy6KLMcsBD0+rLiNY2kFiUdVX8yv3kKtiyyaXLip2Vt ae+bQ+8luIFR5A1qchPHTTrHQMfzwEavOMIf6WUQzCScRjWGkE3ZyDs4G6RCEuZjrzDFVx 6YI2/XZcvxjHcvVf0ZVOFkZOt22J5o2Z8Ch17WLjc5FBN1Kyif6wkxZUFQzghYVj2TwSr7 iqtyDZfjE7AdiwEZhTChJTw4AeuiZ6TQBhzfe1lxCZtVz50z5KEWIw37i2oo9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fo482mTaC94HkYW0AMLXXQPmzXrwp2hdXy9YxHLJuoM=; b=RvTXe/srPeOXzEY9V9+51td3ruEjK4R1W75Z47A4fWzNjs18UICMxWEsrPLFCJWn/Cda7h Hrq+So3SJ1B1e/RHZzD3Z5eKV16X1PD34MlG8t/FxCFrxeSSeBA45A51Orll8hHCj3g5/W uGfiV+dmhxucMtNl1YsOssrQLp2YC3A5xdKoJ1u5dgeUiwF8mXAtuMVh39wPbCCG/uIFqS oK0EBzdvnyzENUcuyeFTOdx43zqWeiY0/YHomI9yApfT4hTMvhkvHT9fcFshh4U8LDGFhx VdUqjM5fveaDpoN6Y0wYWo0jd6i4YZEJgXpOT2m8UJuJ+4og9Qqje6fY8z9zJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187091; a=rsa-sha256; cv=none; b=rw9+lMEmGyPrwBouGCyx3cjp8FuR/XasWKPlRU9mGxgYJJDcy5MtMDeINQvqPtI5PQMeEY 7OSXk3NXzmBjyuQEU+/X3xlosEIrfKPXelPGo8hmdGrUFqMs1d9CPZncQ6961hOOnRNeHD fcsEwtOSjaKRpK7ZDESeWhVEva4EXqzCTmVAeU3cwmLruaegxQJBHzHASW1p+vOIBCLEGH iSeVb/CUyAxr20dgAlKm7Lw3ols4jI/CkO/DPGJbE0f83tUR3qAgVTTzImm+YK44C58o9j iO7iArusu/QraEMrC7xCKpPaIeKi+Z4NV9j0OMqfMmVnIZiMYUoZH865kI8E3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MXz0b2Xz11MF; Tue, 3 Dec 2024 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pVOd017235; Tue, 3 Dec 2024 00:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pV9u017217; Tue, 3 Dec 2024 00:51:31 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:31 GMT Message-Id: <202412030051.4B30pV9u017217@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: 2657d38625cf - stable/14 - mlx5en: move runtime capabilities checks into helper functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 2657d38625cff8c16dfbb7e8ca80d895f988d840 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2657d38625cff8c16dfbb7e8ca80d895f988d840 commit 2657d38625cff8c16dfbb7e8ca80d895f988d840 Author: Konstantin Belousov AuthorDate: 2024-11-21 05:51:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:23 +0000 mlx5en: move runtime capabilities checks into helper functions (cherry picked from commit cca0dc49e0ca66f7696920266ea6340b05e3e455) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 56 +++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 4399af43b93b..58d305dd43f3 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3399,6 +3399,41 @@ mlx5e_set_rx_mode(if_t ifp) queue_work(priv->wq, &priv->set_rx_mode_work); } +static bool +mlx5e_is_ratelimit_capable(struct mlx5_core_dev *mdev) +{ +#ifdef RATELIMIT + if (MLX5_CAP_GEN(mdev, qos) && + MLX5_CAP_QOS(mdev, packet_pacing)) + return (true); +#endif + return (false); +} + +static bool +mlx5e_is_tlstx_capable(struct mlx5_core_dev *mdev) +{ +#ifdef KERN_TLS + if (MLX5_CAP_GEN(mdev, tls_tx) != 0 && + MLX5_CAP_GEN(mdev, log_max_dek) != 0) + return (true); +#endif + return (false); +} + +static bool +mlx5e_is_tlsrx_capable(struct mlx5_core_dev *mdev) +{ +#ifdef KERN_TLS + if (MLX5_CAP_GEN(mdev, tls_rx) != 0 && + MLX5_CAP_GEN(mdev, log_max_dek) != 0 && + MLX5_CAP_FLOWTABLE_NIC_RX(mdev, + ft_field_support.outer_ip_version) != 0) + return (true); +#endif + return (false); +} + static int mlx5e_ioctl(if_t ifp, u_long command, caddr_t data) { @@ -4518,23 +4553,16 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) if_setcapabilitiesbit(ifp, IFCAP_TSO | IFCAP_VLAN_HWTSO, 0); if_setcapabilitiesbit(ifp, IFCAP_HWSTATS | IFCAP_HWRXTSTMP, 0); if_setcapabilitiesbit(ifp, IFCAP_MEXTPG, 0); -#ifdef KERN_TLS - if (MLX5_CAP_GEN(mdev, tls_tx) != 0 && - MLX5_CAP_GEN(mdev, log_max_dek) != 0) + if (mlx5e_is_tlstx_capable(mdev)) if_setcapabilitiesbit(ifp, IFCAP_TXTLS4 | IFCAP_TXTLS6, 0); - if (MLX5_CAP_GEN(mdev, tls_rx) != 0 && - MLX5_CAP_GEN(mdev, log_max_dek) != 0 && - MLX5_CAP_FLOWTABLE_NIC_RX(mdev, - ft_field_support.outer_ip_version) != 0) + if (mlx5e_is_tlsrx_capable(mdev)) if_setcapabilities2bit(ifp, IFCAP2_BIT(IFCAP2_RXTLS4) | IFCAP2_BIT(IFCAP2_RXTLS6), 0); -#endif -#ifdef RATELIMIT - if (MLX5_CAP_GEN(mdev, qos) && - MLX5_CAP_QOS(mdev, packet_pacing)) - if_setcapabilitiesbit(ifp, IFCAP_TXRTLMT | IFCAP_TXTLS_RTLMT, - 0); -#endif + if (mlx5e_is_ratelimit_capable(mdev)) { + if_setcapabilitiesbit(ifp, IFCAP_TXRTLMT, 0); + if (mlx5e_is_tlstx_capable(mdev)) + if_setcapabilitiesbit(ifp, IFCAP_TXTLS_RTLMT, 0); + } if_setcapabilitiesbit(ifp, IFCAP_VXLAN_HWCSUM | IFCAP_VXLAN_HWTSO, 0); if_setsndtagallocfn(ifp, mlx5e_snd_tag_alloc); From nobody Tue Dec 3 00:51:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2MY03ZMzz5fGgR; Tue, 03 Dec 2024 00:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MY02L7hz4TmB; Tue, 3 Dec 2024 00:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cmm7iYN5XWx9A/4Z2gfMkCHmeXLGmFEu2w1KuU1iPuY=; b=hn8ljJxLGEKqQEr+w8FbiaG9LWC03FrH72FCs047OJ5h6J6PI/JUX1upLl09YntH+wrI5N pU7WRkFGLPc8tVF16ubB2a574djNjO+eBBfKnYMO9kS+kVpGB31Qdl+o8dAq+DNUa56auh 1IT+FO2TNh8HWis/eOWDjPjpuwTWrLh9dl4jr2DUjY1w/5frJnsODb/ayXHbPuGhxyz3ZT GaqEYI2oLV0OF5z9HnqpiKMloOsGmhO3AyWDZqa/oyBE2/xgAA244vZpnjAiRVCNzjrYE6 7zW/KMMGph+yjdWviJorbHZAqezrY1yMpHvl1npMRl32hRT2gMgny7QnFpkGZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cmm7iYN5XWx9A/4Z2gfMkCHmeXLGmFEu2w1KuU1iPuY=; b=uzw7S3TJRfUTCciRkr6q3EdNtdCvrOVuDi1KYj63giUmeRWi754efaqF4RZNFrN/2+RjKh krtnI9mlyakthJn1v6wYNejESQPwzvFFSDbj5dyOV8GP6icC0XvhqcQq1l5aqMI7HMVzq8 SVA+vQu2tBaNcmKcXi488HjC7tx/MsRK2sj2QE8w0Oj2JjQv2IAhXo5xeR5DIRzuYAHDdE /rFIby0j5m2NuVV6pmCm2QFvsRApf7Bxkpp9GQM8xpNA8bR/ttlQTRkhvlF9tPdSbbiKll G2kPNBFUgtnlNGPj3Zs/eAU6lgci9P7Lp6XPnb8+uXo4D0oH7726oKXqmL7WCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187092; a=rsa-sha256; cv=none; b=MaoDCt3Qd5bfRaoOMUWTPfr+q5VCZPWBSuq8ZE9jHWYviu3FWtBLkY5rxaOpWPs6fSRQjM rhAC8MU0Xby/IAuVpgAIO0JVSH60YbK0nE7aEZhfyO8Q8f/nzLujeKmRyURrDGjaYdw3Lq VyGeZz284ZN9hUb+IXAoeVrUIgsazdNkAX7di46IQhKc5rsKL6+p3rl9S0SXQ2K5cCrU7C WUTPCL75SqTyjgCpr3MNgv5Y+Y8mXGiDgnH/OR/SLdzI1WA6I5whbjGR8geY5tI1VFMxMw 9XrBo22Es4x0/m84q7SizDZQGOKg2RjGXKwYzNoxl/LpeUgc4V+1ZR9f8J+U2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2MY01xsbz11j2; Tue, 3 Dec 2024 00:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pWNd017478; Tue, 3 Dec 2024 00:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pWfi017476; Tue, 3 Dec 2024 00:51:32 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:32 GMT Message-Id: <202412030051.4B30pWfi017476@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: f16b81e620c6 - stable/14 - mlx5en: only enable to toggle offload caps if they are supported List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f16b81e620c613f509ed5bf66b7f96f87928bb1c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f16b81e620c613f509ed5bf66b7f96f87928bb1c commit f16b81e620c613f509ed5bf66b7f96f87928bb1c Author: Konstantin Belousov AuthorDate: 2024-11-21 06:06:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:23 +0000 mlx5en: only enable to toggle offload caps if they are supported (cherry picked from commit 4cc5d081d8c23020130c5f30ed31f79fa105de74) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 58d305dd43f3..0e1de4d304a9 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3537,6 +3537,20 @@ mlx5e_ioctl(if_t ifp, u_long command, caddr_t data) drv_ioctl_data = (struct siocsifcapnv_driver_data *)data; PRIV_LOCK(priv); siocsifcap_driver: + if (!mlx5e_is_tlstx_capable(priv->mdev)) { + drv_ioctl_data->reqcap &= ~(IFCAP_TXTLS4 | + IFCAP_TXTLS6); + } + if (!mlx5e_is_tlsrx_capable(priv->mdev)) { + drv_ioctl_data->reqcap &= ~( + IFCAP2_BIT(IFCAP2_RXTLS4) | + IFCAP2_BIT(IFCAP2_RXTLS6)); + } + if (!mlx5e_is_ratelimit_capable(priv->mdev)) { + drv_ioctl_data->reqcap &= ~(IFCAP_TXTLS_RTLMT | + IFCAP_TXRTLMT); + } + mask = drv_ioctl_data->reqcap ^ if_getcapenable(ifp); if (mask & IFCAP_TXCSUM) { From nobody Tue Dec 3 02:17:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRl4WF4z5fRkN; Tue, 03 Dec 2024 02:17: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRl3zp3z4hRC; Tue, 3 Dec 2024 02:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a+UKHEObZZBl39rt3/bwG7D/claBloJRYdRJkqVrvU=; b=KGS4N5Tf/aLheO2LnQaimspAt5DmNuX+YvUbBV/B3MoTvM7cSZaywmR1+HPDacTK4IE0Zi UmTOWbvreUAdAK3RG+F29S0rRPV5rTxe1+PORX+2MTHKc9/Ds9nfHVgUc8vFVtdG8onv7I fILNaBBPsLn2L8NGeorsyxDXmrV9b0w8YENX1R/4KoDdq/NgOIoZDlCnk3fZ1/+D/48jWg IePcmCfJxrXC7vMeA3/fffb/pu5dTXqLny6I5ODGqvbcbSGVlxxIsi9XKRQFk9E7STRBRm 2rdrkQyKm1nXh0Du6W9xVd+NQJZvBvgYxmvZyaZvHThQHJYI7Npq5Z/731tDYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a+UKHEObZZBl39rt3/bwG7D/claBloJRYdRJkqVrvU=; b=XykL/EkQ3zom8GUAeI6sA4LZEueMhxiwD5QyiBWhwYJpIns27vHyr5gqRPl5R4tEOxzbkp EupGu26zg6y6kosq6+DcESDkw4D8/52qhH9Fznycfiy8UczTTovRLQ/55rSuf3QdpkFTWH 0xaC1dxxiKlsYUzlSQuA3VXSP7YrlsC7jDmLT54EBNbNH78UvZgDeR+kwyzn5mnvjtgzVc kktR7MYlxSSfnx8DoI/WIG328Na3uZfgCICPi/CUHDXRCWA09NtSToGwv6ymeuMbOF0jKz hqNHSPxkw+2BWHfwWbyn3/pt3ZFWgGe1gmvB9TnoUVLupoCS5ojB/3R44dNpUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192227; a=rsa-sha256; cv=none; b=QadQOlDrbhwtCXrAPP8QSF2jOEo3vGgYhZfraBHGt3Gl1LLWMcJiRoHorhPS/P2vu1tp1X JxevP0v12D1wGP+XNbpKs/9+YpRiZYzfyKKSaLXQEqOZrIGKOS+0lN3eLETP6pEhZlc7om ZvnIE7qKDFSu7BHtGJz5ETBBWVyT9F1Yqu3vUlrtRE3wisfj8QTmtB5PENGFcWD8ZMmgd3 Qpv1GCkHP/feECD09KiJ6JvxVbTcOLH+Ny76wiWW8QbDJURLLsVFpEgUxqyNGHhCcaBz03 paTnPgb0glq1cguRs3XTY3D1eF6oYc0KADvSlCTrX3oMsC/bDMaBX1csTw8g6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRl3S2Hz13cZ; Tue, 3 Dec 2024 02:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32H7ux070509; Tue, 3 Dec 2024 02:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32H7lR070506; Tue, 3 Dec 2024 02:17:07 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:07 GMT Message-Id: <202412030217.4B32H7lR070506@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: 85c50de4db33 - stable/14 - dtrace: Remove an unused typedef List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 85c50de4db339640dda37f3e36b3677601103264 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=85c50de4db339640dda37f3e36b3677601103264 commit 85c50de4db339640dda37f3e36b3677601103264 Author: Mark Johnston AuthorDate: 2024-11-23 01:40:53 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:01:58 +0000 dtrace: Remove an unused typedef No functional change intended. MFC after: 1 week (cherry picked from commit 1905ce3a6bef5652ad36ced7df9da6d2acb96b69) --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h index cdd4cf21a2f9..45201447024e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h @@ -51,11 +51,7 @@ extern "C" { #include #ifndef illumos -#ifdef __sparcv9 -typedef uint32_t pc_t; -#else typedef uintptr_t pc_t; -#endif typedef u_long greg_t; #endif From nobody Tue Dec 3 02:17:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRm5Kjcz5fRm9; Tue, 03 Dec 2024 02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRm4syxz4hP3; Tue, 3 Dec 2024 02: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=1733192228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qR9gh7A34MTzyhFBRK6W1193SupGfcyBktqcjU1gLo=; b=EtisOy/IPzHhR2T7EfX7jw1RPCJr1ws/oucxA7+CJEwFuMcr3IFBvaL5SXs4j50xTaX9sm 3Y55b7UWiFpYKx4qJJT+AwoAliHdjv3R/m3jYbS5rtwNep3PlolzbYUW/vj+fPswusbp41 xx3eofHidUDsFKo+zq7KGE2RHKRBYyI9dVIpwAO71ysFk24WGfSOtphF2PWD4B8G97Lp2B xkF9CU080gNeDScpsAltlota/HwIvgFZiaD/RoOnumCUzZkv5l5yejbXmriUVFs9hg+XON 3Z7QiG5aD1qozmV8QxvyAAAKdJj9rROeRB7iMNMh/IluqKJTIjTDj2nAFhW9Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qR9gh7A34MTzyhFBRK6W1193SupGfcyBktqcjU1gLo=; b=dqXeUFt1OkkhTq6CaCnxuXf4fG7pVC8drtoiTtR+SIC2iTU09IjKydAicJQIxgV6W7xlvx nClVdt0w0aGHoaNYUgCk3A15XsINPtj8ZXj3wlAe7qaA4D3PyVNSJY8N/zHLZ3VDsXWhSW 7qQn0V5t9SGkUJSKBwW6OHj/umpoT8P2EsQbbGcyzgKMuWlGhsxccLIl7EHhwlR1UKZeoR CAlLsAOmcYSubJDKZ38JCLHV8N8QJ16uBHh1BKp561PGK7TUIikYlgclXdI7Xu4K/aAAL6 HDxaVZOoo6alQa48FW2sfvYJ9GvQDLVMfl5HtvAMyp2qJxkM1/tKtfeSE04acw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192228; a=rsa-sha256; cv=none; b=LwF6Vz2jhIyFjqySajgmNaWBX58vMsx2th1qududb7H1poyY8bnGavjt6efeitbWFDdMhZ dpPy+nr8fXHClwW5A5KypEAT+OYShwk36UPDbV9AgcsuzMbXbSHVeRqv8Atc1XXhT4LiAL UgCFhjKJzaQXNCxVeTnnDpaTqWtkaFYsiU4oJg/4V0OqlfAYfh3qTxI9GhTfCqsUM4ZoRj hrJHlAcZk6yD43trZ1fC/cgTS9poI/UTr0uY/WzpqAFZ5cWuHFD6COyIcEMo8YNA83Smzg siiRHR/FQHx6+CBrSsdNfolPkUIfqphra7WQdwJdxdMKuLukHPqvMBvDyB4srw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRm4Lj4z13mK; Tue, 3 Dec 2024 02:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32H8PP070554; Tue, 3 Dec 2024 02:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32H8q0070551; Tue, 3 Dec 2024 02:17:08 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:08 GMT Message-Id: <202412030217.4B32H8q0070551@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: a5c39c444891 - stable/14 - mii_fdt: Search for the "ethernet-ports" subnode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: a5c39c4448919d227fc671f7c229daab92c1ceff Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5c39c4448919d227fc671f7c229daab92c1ceff commit a5c39c4448919d227fc671f7c229daab92c1ceff Author: Mark Johnston AuthorDate: 2024-11-19 21:05:19 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:01:59 +0000 mii_fdt: Search for the "ethernet-ports" subnode This is a more common name for the parent of the port nodes. PR: 280770 MFC after: 2 weeks Reported by: Mike Belanger (cherry picked from commit d6b692835e52d85441dfdd20a01c12e17cb50914) --- sys/dev/mii/mii_fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mii/mii_fdt.c b/sys/dev/mii/mii_fdt.c index 240312114cf2..2254af162a34 100644 --- a/sys/dev/mii/mii_fdt.c +++ b/sys/dev/mii/mii_fdt.c @@ -115,6 +115,8 @@ mii_fdt_lookup_phy(phandle_t node, int addr) * Since we have multiple candidates select one based on PHY address. */ ports = ofw_bus_find_child(node, "ports"); + if (ports <= 0) + ports = ofw_bus_find_child(node, "ethernet-ports"); if (ports <= 0) return (-1); From nobody Tue Dec 3 02:17:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRp29hRz5fRkW; Tue, 03 Dec 2024 02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRn6vygz4hMG; Tue, 3 Dec 2024 02: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=1733192230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioShujQWg/QgOMi5OcxszKuuGLlueryworrBiG0Z0vM=; b=PfUtcsFpOxW7PFVLpoqmE91VPwlty7NibMjfPLUWmEbwlbZVf6ST3d33qVWGJVDwJQfeYu e8sVLbgxXiznsC5tP8zeYAIFJJEywoympq4hF28yTRoGWepcifvYE8dzn8SNV3y/Zy5wDg vFt20ttrs4qeLbGyO1S6SkEf7ovAeplRQ6UkbPKBO3+idVwdTAVcoybWD9cWtSFK3I5yZ9 JocpJ0FnZy2ceb2Ic2I+XRS/6dNM3KQgPPM2NOlGMHKheVujMNxE2DpepegsiQJ7PknTr/ TlULaaOAw/plh55/3t40Q6qYg/37+w7KASrO4xSQ7H7hdHk7P0vLYj3BimGHJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioShujQWg/QgOMi5OcxszKuuGLlueryworrBiG0Z0vM=; b=HwNvv6Dh3u6x7ItiDLavGkzFcM4GKj77Q64Gixx0vKt9IQ+V4OlzZJcGOkne3XbBCOykaJ VWmxE/GbwWRpp6B3Y59olSCKtZLNHtqLI72eQ5gCjMhUz8kBTUf3Q+ZEVjzh70P95Ncfxx MfotTQz9gYu6hd5GQfCrJTVMDTbmuIHL/oIk1f/PXjmK2a3ulKxdCNaXvqEBi4b5TKLJlT u3rx+1zrQMSHqV6su6XYW9zT2QHzUJbjOF+VPVWWgxigD7DX8+0o84c50KPrsLPSoqGKvf amcQeHgd3DvBr4wSbIT7MpeHGbzXSG1bFx6igfVvJQMNj4vETm+yqFm15vXEcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192230; a=rsa-sha256; cv=none; b=xO76mheIK0rB+cZlgJ6PHTKVe8wptrToM/OxHtVncdM68QMwIMbjjfpy5dUKsxP00js+lS tUY9UvxoRK56QCTgnTXXvocBGRT76D/QQWwL8J5gfr/E4L3xz005V6U/BK2xwV1zH+fPO5 +KWwcjyZbkq84SS9mA7cUY9p0yXFWQotYyK2zksmzL4azESB5v73NSBH/yrjqUXzvFZYi7 Isqpbj6gyVh4OyHDrSQqU48UY5bGrwveAeOh9LpYS9opy1tOFNFfAXl9isD2WAXhhMWIMb RSBs+lb9SFlUIpLpWB6TNrZHkLVIprnZ2DHqzMMYa7uImq3Q00cMeZ6P3QirjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRn5PjBz1393; Tue, 3 Dec 2024 02:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32H9pa070622; Tue, 3 Dec 2024 02:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32H9uj070619; Tue, 3 Dec 2024 02:17:09 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:09 GMT Message-Id: <202412030217.4B32H9uj070619@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: d841b67b4747 - stable/14 - vnode: Make the vop_vector reference a pointer to const List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: d841b67b47479b19606768b348a6f99dacd64a98 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d841b67b47479b19606768b348a6f99dacd64a98 commit d841b67b47479b19606768b348a6f99dacd64a98 Author: Mark Johnston AuthorDate: 2024-11-25 22:38:22 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:02:10 +0000 vnode: Make the vop_vector reference a pointer to const No functional change intended. MFC after: 1 week (cherry picked from commit cd048d5d8be736419df878c26e6e170b8569dd12) --- sys/sys/vnode.h | 2 +- sys/tools/vnode_if.awk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 0cd48ea44747..2cf62a51e101 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -134,7 +134,7 @@ struct vnode { seqc_t v_seqc; /* i modification count */ uint32_t v_nchash; /* u namecache hash */ u_int v_hash; - struct vop_vector *v_op; /* u vnode operations vector */ + const struct vop_vector *v_op; /* u vnode operations vector */ void *v_data; /* u private data for fs */ /* diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 0fff9a831756..b477bbc91c43 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -328,7 +328,7 @@ while ((getline < srcfile) > 0) { # Print out function prototypes. printh("int " uname "_AP(struct " name "_args *);"); - printh("int " uname "_APV(struct vop_vector *vop, struct " name "_args *);"); + printh("int " uname "_APV(const struct vop_vector *vop, struct " name "_args *);"); printh(""); printh("static __inline int " uname "("); for (i = 0; i < numargs; ++i) { @@ -392,7 +392,7 @@ while ((getline < srcfile) > 0) { printc(""); printc("\treturn(" uname "_APV(a->a_" args[0] "->v_op, a));"); printc("}"); - printc("\nint\n" uname "_APV(struct vop_vector *vop, struct " name "_args *a)"); + printc("\nint\n" uname "_APV(const struct vop_vector *vop, struct " name "_args *a)"); printc("{"); printc("\tint rc;"); printc(""); From nobody Tue Dec 3 02:17:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRq2dp2z5fRRQ; Tue, 03 Dec 2024 02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRq0mB7z4hTV; Tue, 3 Dec 2024 02: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=1733192231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DAdlQkXYEA/8SNVlMFzpi9uLxJ1eQDwIE6/oKOYgphA=; b=Uaus72NlWLKqBHCwWS3vc89EyZQLhUmPEAZZlFqdkZzPDTY3EOHj06aVuwvyqP/ZmEMb+B Hs7/UF0lqZQ/xVdeAdVHQyJ0OSjbbJCLu8EyXo4rsXD4UhF3nP5sXPRhhr1syL0nfDx9HZ ah+b8NWWFVCsm1n0PTkj1fEam2r7w2LpUIRZH6XmlvMHopzH2B74QFqvq7CpryndqObbvc r95b0tLuI3e5hUFWS1uc8TffCijG9XrkgMh6+P9+WBtxOgWvfXwM+bV+fmIr8uqpXcvn8Q kOxrLdaLtnL0wsP/DL0HMCDGSub4CsCW6AERV/DqmhSxuheF5Rawbz5G04RLvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DAdlQkXYEA/8SNVlMFzpi9uLxJ1eQDwIE6/oKOYgphA=; b=RD2QMkhKpVvtXWq2dUiMDzoptZ/ymgmucOI6q1qfdU3Tk4UkCaXlWD2e88JPUwu5QFCnUq RUUXFJZw2+7to79iThi7dCX/J4aX4aNopz0WsTVAt6k8NnkLqCIcVdqo9Uq4qh3NQZPQZk 2kJ+YTm7iIBbqpdw6dM1D6Q8anzLbZ/v/iQjOWQGHf1zxUsq07h/Vz83MghZJK7htCMDdB M3hsaCRxELKg8FswwtwXZldxg6xPm+AkNDZBm+DiXcxHEdwSgQv9dmrS/kJXg6sTHP3R6M go+s8wHHxvC4q+CUhfR8NofuM95QkMXEi9R7YxTKCtZTYo6Fh8egaFaLQA6Lew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192231; a=rsa-sha256; cv=none; b=g19s8/0UzGc0qOxcImH9/0hcvAwj2eoRDQl1kTCFwEzTS20Ob3SRcEcE0rH5uNQmxodB7I juBKzgPSm7MV5iYrDlIS3BFFp8DllRuzj14VOiL4oIBxLP2a3oGUzQmEGTxvCDjskq22EL JIPWhobTqPqksMj1nxA5zbEABM9FpzaNl6OO34x1ZYWadasa8ym4Ef0yGrNAsJIYfef3ke ORIEhLEogyHFgqmpU8YgOWo6JijxmHQVxTiXg2kG/G2CHQMmleRyuuE2IELb/gyQcHNat/ KlR/h4somAXEExvVFFu+1SiDrwRaLazPjnG8k/ICnyVmBjLc4Wfv0/rYi8tPvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRp6Rm2z12vQ; Tue, 3 Dec 2024 02:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32HAdw070682; Tue, 3 Dec 2024 02:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32HACI070679; Tue, 3 Dec 2024 02:17:10 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:10 GMT Message-Id: <202412030217.4B32HACI070679@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: fd3139245639 - stable/14 - kevent: Use designated array indices to initialize the sysfilt_ops table List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: fd313924563917857e3567a62e405252cf2bafaf Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd313924563917857e3567a62e405252cf2bafaf commit fd313924563917857e3567a62e405252cf2bafaf Author: Mark Johnston AuthorDate: 2024-11-19 22:40:08 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:02:21 +0000 kevent: Use designated array indices to initialize the sysfilt_ops table This makes it a bit easier to see where operations on a particular filter are defined. No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay (cherry picked from commit f06b747118cb47212bfc178993171007ee7e9424) --- sys/kern/kern_event.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 41295c374e65..fa96fbad20ce 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -346,19 +346,19 @@ static struct { int for_nolock; int for_refcnt; } sysfilt_ops[EVFILT_SYSCOUNT] = { - { &file_filtops, 1 }, /* EVFILT_READ */ - { &file_filtops, 1 }, /* EVFILT_WRITE */ - { &null_filtops }, /* EVFILT_AIO */ - { &file_filtops, 1 }, /* EVFILT_VNODE */ - { &proc_filtops, 1 }, /* EVFILT_PROC */ - { &sig_filtops, 1 }, /* EVFILT_SIGNAL */ - { &timer_filtops, 1 }, /* EVFILT_TIMER */ - { &file_filtops, 1 }, /* EVFILT_PROCDESC */ - { &fs_filtops, 1 }, /* EVFILT_FS */ - { &null_filtops }, /* EVFILT_LIO */ - { &user_filtops, 1 }, /* EVFILT_USER */ - { &null_filtops }, /* EVFILT_SENDFILE */ - { &file_filtops, 1 }, /* EVFILT_EMPTY */ + [~EVFILT_READ] = { &file_filtops, 1 }, + [~EVFILT_WRITE] = { &file_filtops, 1 }, + [~EVFILT_AIO] = { &null_filtops }, + [~EVFILT_VNODE] = { &file_filtops, 1 }, + [~EVFILT_PROC] = { &proc_filtops, 1 }, + [~EVFILT_SIGNAL] = { &sig_filtops, 1 }, + [~EVFILT_TIMER] = { &timer_filtops, 1 }, + [~EVFILT_PROCDESC] = { &file_filtops, 1 }, + [~EVFILT_FS] = { &fs_filtops, 1 }, + [~EVFILT_LIO] = { &null_filtops }, + [~EVFILT_USER] = { &user_filtops, 1 }, + [~EVFILT_SENDFILE] = { &null_filtops }, + [~EVFILT_EMPTY] = { &file_filtops, 1 }, }; /* From nobody Tue Dec 3 02:17:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRr2YLxz5fRpL; Tue, 03 Dec 2024 02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRr0M6Hz4h7G; Tue, 3 Dec 2024 02: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=1733192232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2aPR5q5joR+qbNLxX0CslfEL5jn6K7vC2FRKdiai3k=; b=eXaak3C3ZNWMXvQX5C2Et3ixcq9+7bMLfevE+eWvgulaCepiSoMrrD4mHneMlX/wERNILJ uvZyrnDPqYT85StMmFaHU0S8zbDTNwZefifemGFhrt6K8Yk3KudrewRGlo2e+uIWn7hASB aLeZcV5x1WCBp+fD1htZFh1swHiMByQMOCV+oVdMtE5ORKv7AvtHtY7yUSySWNRkXg6VMs LdUt3aO9HCQsN9fqhjPU/ZFwOXtsz0QIFQTJoypTu0RJIf5pTN+hZv+dAJtpr06RqaMdW8 FYt4Nfp5zmWZ1sHXf8b+K4usEPxKMf5Lffvd4OGAumRJ/z1qhbBNv9pgioehpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2aPR5q5joR+qbNLxX0CslfEL5jn6K7vC2FRKdiai3k=; b=jpA4w3hOMFYPEndFSzzAAcatX2NTlytsEoPNuNqaZRQRNBD+izfbVhKFMPjxp7nTcuyOBI ci2trcDr6FXtUkhF6AbmziDQMOVjcQygXVxPxJkhALIPZo9G1S7mt423RePztsFsa4pQfZ aWkxCdOkVFmKtA8lW3W4hFI5WH6O1rrwxqQokG3wUOjWII9RcuUR3Zs4bXBKlJA8Cl2dKU /kyPUIPuqjksafFl6s4ZfBAukEQBY/EoQQAqSjaHflN5iK0M44HTjR50qm27L6X+xUEOhC GpKix15/ufJoVB9TRy9ugQMzjn9bLzaXIkfG1I4lIcjPjNkHIguWQFDJvbzDqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192232; a=rsa-sha256; cv=none; b=FXGwtJIwCawhU/s34S2AG+3KuTbsvDDDjQhYWhSK8t/i3UTDGbxdXCM4gJbOSgdsTJL3oj ROALYoikU8FDYuI+JpBITLObIaYz5fKyqEimGWpb+Zqfku/DmtJfcTrMY5aEf+tVBkJY6L WpfyFimyWmiSWi4alAYo9qFIAa2N7/M69EI6todzxzT6lIOCqnRXbrHa4gYtKLS4IfTadv fO2RdF+ahJXIxvA8FkXgncIBVn2HFXWf1XS5EovrcguekPzWw5iQWNJjAGM4w87ga1Mbud EjAMz6RxeOhdZeG/F6R0VPxcMXnaJK/3dEaVRlNtIBMFIIVwWOFDxpXVJNIZ6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRq6nMGz13NC; Tue, 3 Dec 2024 02:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32HBrZ070740; Tue, 3 Dec 2024 02:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32HBJ9070737; Tue, 3 Dec 2024 02:17:11 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:11 GMT Message-Id: <202412030217.4B32HBJ9070737@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: da44138dc2ad - stable/14 - unix: Add support for atomically setting the socket mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: da44138dc2adefb698bd34c9cff73e1a5588ef26 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da44138dc2adefb698bd34c9cff73e1a5588ef26 commit da44138dc2adefb698bd34c9cff73e1a5588ef26 Author: Mark Johnston AuthorDate: 2024-11-03 14:39:32 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:03:26 +0000 unix: Add support for atomically setting the socket mode With this patch, it is possible to call fchmod() on a unix socket prior to binding it to the filesystem namespace, so that the mode is set atomically. Without this, one has to call chmod() after bind(), leaving a window where threads can connect to the socket with the default mode. After bind(), fchmod() reverts to failing with EINVAL. This interface is copied from Linux. The behaviour of fstat() is unmodified, i.e., it continues to return the mode as set by soo_stat(). PR: 282393 Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47361 (cherry picked from commit bfd03046d18776ea70785ca1ef36dfc60822de3b) --- lib/libc/sys/chmod.2 | 9 ++++++++- share/man/man4/unix.4 | 12 +++++++++++- sys/kern/sys_socket.c | 17 ++++++++++++++++- sys/kern/uipc_usrreq.c | 29 ++++++++++++++++++++++++++++- sys/sys/protosw.h | 4 ++++ sys/sys/unpcb.h | 1 + tests/sys/kern/unix_dgram.c | 41 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 108 insertions(+), 5 deletions(-) diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2 index 7bcf19d50a1d..b3cb8aad0230 100644 --- a/lib/libc/sys/chmod.2 +++ b/lib/libc/sys/chmod.2 @@ -27,7 +27,7 @@ .\" .\" @(#)chmod.2 8.1 (Berkeley) 6/4/93 .\" -.Dd March 30, 2021 +.Dd October 31, 2024 .Dt CHMOD 2 .Os .Sh NAME @@ -216,6 +216,13 @@ This makes the system somewhat more secure by protecting set-user-id (set-group-id) files from remaining set-user-id (set-group-id) if they are modified, at the expense of a degree of compatibility. +.Pp +While it is normally an error to invoke +.Fn fchmod +on a socket, it is possible to do so on +.Dv AF_LOCAL +sockets before they are bound to a file name; see +.Xr unix 4 . .Sh RETURN VALUES .Rv -std .Sh ERRORS diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4 index c055ed230190..7b8d33273c0a 100644 --- a/share/man/man4/unix.4 +++ b/share/man/man4/unix.4 @@ -27,7 +27,7 @@ .\" .\" @(#)unix.4 8.1 (Berkeley) 6/9/93 .\" -.Dd June 24, 2022 +.Dd October 31, 2024 .Dt UNIX 4 .Os .Sh NAME @@ -79,6 +79,15 @@ removed when the socket is closed \(em .Xr unlink 2 must be used to remove the file. .Pp +Prior to binding a socket, +.Xr fchmod 2 +can be used to set the permissions of the socket file. +This avoids the race that would otherwise occur between creation of the file +and a subsequent call to +.Xr chmod 2 . +Once the socket is bound to a file name, the permissions of the file can not be +changed this way. +.Pp The length of .Ux Ns -domain address, required by @@ -451,6 +460,7 @@ The order is preserved for writes coming through a particular connection. .Sh SEE ALSO .Xr connect 2 , .Xr dup 2 , +.Xr fchmod 2 , .Xr fcntl 2 , .Xr getsockopt 2 , .Xr listen 2 , diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 45b458f81f19..58891b0de000 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -93,6 +93,7 @@ static fo_poll_t soo_poll; extern fo_kqfilter_t soo_kqfilter; static fo_stat_t soo_stat; static fo_close_t soo_close; +static fo_chmod_t soo_chmod; static fo_fill_kinfo_t soo_fill_kinfo; static fo_aio_queue_t soo_aio_queue; @@ -107,7 +108,7 @@ struct fileops socketops = { .fo_kqfilter = soo_kqfilter, .fo_stat = soo_stat, .fo_close = soo_close, - .fo_chmod = invfo_chmod, + .fo_chmod = soo_chmod, .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = soo_fill_kinfo, @@ -356,6 +357,20 @@ soo_close(struct file *fp, struct thread *td) return (error); } +static int +soo_chmod(struct file *fp, mode_t mode, struct ucred *cred, struct thread *td) +{ + struct socket *so; + int error; + + so = fp->f_data; + if (so->so_proto->pr_chmod != NULL) + error = so->so_proto->pr_chmod(so, mode, cred, td); + else + error = EINVAL; + return (error); +} + static int soo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 87b82763b5f1..78469adcd84d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -511,6 +511,7 @@ uipc_attach(struct socket *so, int proto, struct thread *td) unp->unp_socket = so; so->so_pcb = unp; refcount_init(&unp->unp_refcount, 1); + unp->unp_mode = ACCESSPERMS; if ((locked = UNP_LINK_WOWNED()) == false) UNP_LINK_WLOCK(); @@ -553,6 +554,7 @@ uipc_bindat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td) struct mount *mp; cap_rights_t rights; char *buf; + mode_t mode; if (nam->sa_family != AF_UNIX) return (EAFNOSUPPORT); @@ -585,6 +587,7 @@ uipc_bindat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td) return (EALREADY); } unp->unp_flags |= UNP_BINDING; + mode = unp->unp_mode & ~td->td_proc->p_pd->pd_cmask; UNP_PCB_UNLOCK(unp); buf = malloc(namelen + 1, M_TEMP, M_WAITOK); @@ -617,7 +620,7 @@ restart: } VATTR_NULL(&vattr); vattr.va_type = VSOCK; - vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_pd->pd_cmask); + vattr.va_mode = mode; #ifdef MAC error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); @@ -729,6 +732,27 @@ uipc_close(struct socket *so) } } +static int +uipc_chmod(struct socket *so, mode_t mode, struct ucred *cred __unused, + struct thread *td __unused) +{ + struct unpcb *unp; + int error; + + if ((mode & ~ACCESSPERMS) != 0) + return (EINVAL); + + error = 0; + unp = sotounpcb(so); + UNP_PCB_LOCK(unp); + if (unp->unp_vnode != NULL || (unp->unp_flags & UNP_BINDING) != 0) + error = EINVAL; + else + unp->unp_mode = mode; + UNP_PCB_UNLOCK(unp); + return (error); +} + static int uipc_connect2(struct socket *so1, struct socket *so2) { @@ -3352,6 +3376,7 @@ static struct protosw streamproto = { .pr_sockaddr = uipc_sockaddr, .pr_soreceive = soreceive_generic, .pr_close = uipc_close, + .pr_chmod = uipc_chmod, }; static struct protosw dgramproto = { @@ -3376,6 +3401,7 @@ static struct protosw dgramproto = { .pr_sockaddr = uipc_sockaddr, .pr_soreceive = uipc_soreceive_dgram, .pr_close = uipc_close, + .pr_chmod = uipc_chmod, }; static struct protosw seqpacketproto = { @@ -3407,6 +3433,7 @@ static struct protosw seqpacketproto = { .pr_sockaddr = uipc_sockaddr, .pr_soreceive = soreceive_generic, /* XXX: or...? */ .pr_close = uipc_close, + .pr_chmod = uipc_chmod, }; static struct domain localdomain = { diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 66b194ff1b9a..3f1e2f897cac 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -34,6 +34,7 @@ #ifndef _SYS_PROTOSW_H_ #define _SYS_PROTOSW_H_ +#include #include /* Forward declare these structures referenced from prototypes below. */ @@ -104,6 +105,8 @@ typedef int pr_bindat_t(int, struct socket *, struct sockaddr *, typedef int pr_connectat_t(int, struct socket *, struct sockaddr *, struct thread *); typedef int pr_aio_queue_t(struct socket *, struct kaiocb *); +typedef int pr_chmod_t(struct socket *, __mode_t, struct ucred *, + struct thread *); struct protosw { short pr_type; /* socket type used for */ @@ -144,6 +147,7 @@ struct protosw { pr_flush_t *pr_flush; /* XXXGL: merge with pr_shutdown_t! */ pr_sosetlabel_t *pr_sosetlabel; /* MAC, XXXGL: remove */ pr_setsbopt_t *pr_setsbopt; /* Socket buffer ioctls */ + pr_chmod_t *pr_chmod; /* fchmod(2) */ }; /*#endif*/ diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h index 8549ea279c16..0deb9b4690c7 100644 --- a/sys/sys/unpcb.h +++ b/sys/sys/unpcb.h @@ -95,6 +95,7 @@ struct unpcb { u_int unp_msgcount; /* (g) references from message queue */ u_int unp_gcrefs; /* (g) garbage collector refcount */ ino_t unp_ino; /* (g) fake inode number */ + mode_t unp_mode; /* (g) initial pre-bind() mode */ LIST_ENTRY(unpcb) unp_dead; /* (g) link in dead list */ } __aligned(CACHE_LINE_SIZE); diff --git a/tests/sys/kern/unix_dgram.c b/tests/sys/kern/unix_dgram.c index 9df0d4ca7168..7464cdf197cd 100644 --- a/tests/sys/kern/unix_dgram.c +++ b/tests/sys/kern/unix_dgram.c @@ -25,13 +25,15 @@ * SUCH DAMAGE. */ -#include #include #include #include #include +#include #include +#include #include + #include #include #include @@ -391,12 +393,49 @@ ATF_TC_BODY(selfgetpeername, tc) ATF_REQUIRE(close(sd) == 0); } +ATF_TC_WITHOUT_HEAD(fchmod); +ATF_TC_BODY(fchmod, tc) +{ + struct stat sb; + struct sockaddr_un sun; + int error, sd; + + memset(&sun, 0, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "sock", sizeof(sun.sun_path)); + + sd = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(sd != -1); + + error = fchmod(sd, 0600 | S_ISUID); + ATF_REQUIRE_ERRNO(EINVAL, error == -1); + + umask(0022); + error = fchmod(sd, 0766); + ATF_REQUIRE(error == 0); + + error = bind(sd, (struct sockaddr *)&sun, sizeof(sun)); + ATF_REQUIRE(error == 0); + + error = stat(sun.sun_path, &sb); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG((sb.st_mode & 0777) == 0744, + "sb.st_mode = %o", sb.st_mode); + + error = fchmod(sd, 0666); + ATF_REQUIRE_ERRNO(EINVAL, error == -1); + + ATF_REQUIRE(close(sd) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic); ATF_TP_ADD_TC(tp, one2many); ATF_TP_ADD_TC(tp, event); ATF_TP_ADD_TC(tp, selfgetpeername); + ATF_TP_ADD_TC(tp, fchmod); return (atf_no_error()); } From nobody Tue Dec 3 02:17:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2PRs3xN7z5fRZn; Tue, 03 Dec 2024 02:17: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRs26tLz4hKn; Tue, 3 Dec 2024 02: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=1733192233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4dJUNthiGEHiXolAVipBCNNLMDOcpIO44QrHh8nx0U=; b=IGkiIa33Xvb2YxAMHuqDcRBEVFTLf9l+ke3X/0Y8bpU4GnV7EEVXmiv8NrUFcM291RSsfY 8E1hQ8Sgf6ziem8K//m6emWENYGfeIcYNMxmRNdWaEKgoLqFTPgvmhiyZI7XUbEpB/T4HV u5BvnuQ7CbKOW0bnZcs+ufBUV2u450sgIksIB6aZre1RJQtqEIMN2vDwKAWPpSKgpi/Rw/ xesdZvuuH7t3/+Wpj93CwnHyEeTJ+B46rhZrosAOkxS0QwwFh1IOHRoJUNSwZrwrCW0v0z KxAQ+tPeY/2JJk7K6uT5AS8RmThoeyLDbD8YNjT8REtqYPnpyu2XD/0/5X86VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4dJUNthiGEHiXolAVipBCNNLMDOcpIO44QrHh8nx0U=; b=VF+eUS9jly+cKCiuEIqdZMh785tkDOURlyHsQvYCeyE41k5YavQQRLuHxtIA8CntX6JNoF 8v4CWWc/p13LPOOC6NjlxVrykDnWxitSX9Bx46XWn5GcjuEaRplVApLAbUSdqXqyM7CPSI MP8dhaHDGH1IA2rENd7tRbVvZv/NPLH3TYLnXu8wqo1uG51AdfuhEe/ldwB0GGswmlC9EB +kFsA5IdNGdsOlEDJ6Sq0WznHLjv56S4Sslz8gtmnfL6IR8o2sqIvRBYYQe/td2ePNShzr RwgEXnJqZETstghqKX6+M0It9CwTgn+M+QV+K+jffBi6jqLmVjSU+CgdqbwWJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192233; a=rsa-sha256; cv=none; b=FZnPh6exleKyd0nJyXNsbitZZnYsdisqLsEl5/ZxW1R3i9L22aclQOfpdZn/+14gclt2yF fJzwtgT1bwZLQQse0UJc5bYI4/OR6Dq9Sl66VUQBr/StpV+CCLvleC39+GvD+sTtZtT5uV E9f829Wkexn9ywn4ML1VeOJasroMIvt4NMkBnx6VsAExs8u2pIudDMnRofotFw4KLq5uUK eMIH/LEtwWWKGcmBqCJw65UFg1Jp657F3yu1KZn5JkvqYKdr3MvdeMpe8NR5zftDy2KXhn IkurZOXZnMJRCl7pf6P+2ewSTohUCz7iYDV3X8CA0mcr2RIaIGqsdaLiVihBsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2PRs12Fvz13Z4; Tue, 3 Dec 2024 02:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32HDKV070794; Tue, 3 Dec 2024 02:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32HDBl070791; Tue, 3 Dec 2024 02:17:13 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:13 GMT Message-Id: <202412030217.4B32HDBl070791@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: 48155c983c4b - stable/14 - kern: Make fileops and filterops tables const where possible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 48155c983c4ba7158e738bd1d4b3144751bd1d86 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48155c983c4ba7158e738bd1d4b3144751bd1d86 commit 48155c983c4ba7158e738bd1d4b3144751bd1d86 Author: Mark Johnston AuthorDate: 2024-11-25 22:39:31 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:03:42 +0000 kern: Make fileops and filterops tables const where possible No functional change intended. MFC after: 1 week (cherry picked from commit ef9ffb8594eee294334ced627755bf5b46b48f9f) --- sys/arm/ti/ti_pruss.c | 2 +- sys/cam/scsi/scsi_pass.c | 2 +- sys/cam/scsi/scsi_target.c | 2 +- sys/compat/linuxkpi/common/include/linux/file.h | 2 +- sys/compat/linuxkpi/common/src/linux_compat.c | 6 +++--- sys/dev/beri/beri_ring.c | 4 ++-- sys/dev/cyapa/cyapa.c | 2 +- sys/dev/evdev/cdev.c | 2 +- sys/dev/evdev/uinput.c | 4 ++-- sys/dev/gpio/gpioc.c | 2 +- sys/dev/hid/hidraw.c | 2 +- sys/dev/netmap/netmap_freebsd.c | 4 ++-- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 2 +- sys/dev/usb/usb_dev.c | 4 ++-- sys/fs/cuse/cuse.c | 4 ++-- sys/fs/devfs/devfs_vnops.c | 4 ++-- sys/fs/fuse/fuse_device.c | 4 ++-- sys/geom/geom_dev.c | 2 +- sys/kern/kern_descrip.c | 9 +++++---- sys/kern/kern_devctl.c | 2 +- sys/kern/kern_event.c | 18 +++++++++--------- sys/kern/kern_sig.c | 2 +- sys/kern/subr_log.c | 2 +- sys/kern/sys_eventfd.c | 6 +++--- sys/kern/sys_pipe.c | 8 ++++---- sys/kern/sys_procdesc.c | 4 ++-- sys/kern/sys_socket.c | 2 +- sys/kern/sys_timerfd.c | 4 ++-- sys/kern/tty.c | 4 ++-- sys/kern/tty_pts.c | 6 +++--- sys/kern/uipc_mqueue.c | 8 ++++---- sys/kern/uipc_sem.c | 2 +- sys/kern/uipc_shm.c | 2 +- sys/kern/uipc_socket.c | 6 +++--- sys/kern/vfs_aio.c | 4 ++-- sys/kern/vfs_subr.c | 8 ++++---- sys/kern/vfs_vnops.c | 2 +- sys/net/bpf.c | 4 ++-- sys/net/if_tuntap.c | 4 ++-- sys/security/audit/audit_pipe.c | 2 +- sys/sys/file.h | 12 ++++++------ sys/sys/mman.h | 2 +- sys/sys/pipe.h | 2 +- sys/x86/acpica/acpi_apm.c | 2 +- 44 files changed, 91 insertions(+), 90 deletions(-) diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c index b6895a8a9cef..9f8bcedbdb05 100644 --- a/sys/arm/ti/ti_pruss.c +++ b/sys/arm/ti/ti_pruss.c @@ -789,7 +789,7 @@ ti_pruss_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr, return (0); } -static struct filterops ti_pruss_kq_read = { +static const struct filterops ti_pruss_kq_read = { .f_isfd = 1, .f_detach = ti_pruss_irq_kqread_detach, .f_event = ti_pruss_irq_kqevent, diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index ff48bed30e68..72035e1e0d0e 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -203,7 +203,7 @@ static struct cdevsw pass_cdevsw = { .d_name = "pass", }; -static struct filterops passread_filtops = { +static const struct filterops passread_filtops = { .f_isfd = 1, .f_detach = passreadfiltdetach, .f_event = passreadfilt diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c index 6872e3a2a93b..278fcd908d7b 100644 --- a/sys/cam/scsi/scsi_target.c +++ b/sys/cam/scsi/scsi_target.c @@ -105,7 +105,7 @@ static d_poll_t targpoll; static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = { +static const struct filterops targread_filtops = { .f_isfd = 1, .f_detach = targreadfiltdetach, .f_event = targreadfilt, diff --git a/sys/compat/linuxkpi/common/include/linux/file.h b/sys/compat/linuxkpi/common/include/linux/file.h index f94e3d89ced1..f6e988c2d88e 100644 --- a/sys/compat/linuxkpi/common/include/linux/file.h +++ b/sys/compat/linuxkpi/common/include/linux/file.h @@ -43,7 +43,7 @@ struct linux_file; #undef file -extern struct fileops linuxfileops; +extern const struct fileops linuxfileops; static inline struct linux_file * linux_fget(unsigned int fd) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index fe1a545c6a3a..1fc71c55469a 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1113,13 +1113,13 @@ linux_file_kqfilter_write_event(struct knote *kn, long hint) return ((filp->f_kqflags & LINUX_KQ_FLAG_NEED_WRITE) ? 1 : 0); } -static struct filterops linux_dev_kqfiltops_read = { +static const struct filterops linux_dev_kqfiltops_read = { .f_isfd = 1, .f_detach = linux_file_kqfilter_detach, .f_event = linux_file_kqfilter_read_event, }; -static struct filterops linux_dev_kqfiltops_write = { +static const struct filterops linux_dev_kqfiltops_write = { .f_isfd = 1, .f_detach = linux_file_kqfilter_detach, .f_event = linux_file_kqfilter_write_event, @@ -1738,7 +1738,7 @@ linux_file_kcmp(struct file *fp1, struct file *fp2, struct thread *td) return (kcmp_cmp((uintptr_t)filp1->f_cdev, (uintptr_t)filp2->f_cdev)); } -struct fileops linuxfileops = { +const struct fileops linuxfileops = { .fo_read = linux_file_read, .fo_write = linux_file_write, .fo_truncate = invfo_truncate, diff --git a/sys/dev/beri/beri_ring.c b/sys/dev/beri/beri_ring.c index 6d48a411da38..eed002a3dfd6 100644 --- a/sys/dev/beri/beri_ring.c +++ b/sys/dev/beri/beri_ring.c @@ -366,14 +366,14 @@ beri_kqdetach(struct knote *kn) knlist_remove(&sc->beri_rsel.si_note, kn, 0); } -static struct filterops beri_read_filterops = { +static const struct filterops beri_read_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = beri_kqdetach, .f_event = beri_kqread, }; -static struct filterops beri_write_filterops = { +static const struct filterops beri_write_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = beri_kqdetach, diff --git a/sys/dev/cyapa/cyapa.c b/sys/dev/cyapa/cyapa.c index 307cd4d35b2e..50fa4faa560a 100644 --- a/sys/dev/cyapa/cyapa.c +++ b/sys/dev/cyapa/cyapa.c @@ -1100,7 +1100,7 @@ again: static void cyapafiltdetach(struct knote *); static int cyapafilt(struct knote *, long); -static struct filterops cyapa_filtops = { +static const struct filterops cyapa_filtops = { .f_isfd = 1, .f_detach = cyapafiltdetach, .f_event = cyapafilt diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c index c9a8258a03a9..9fe1299a0937 100644 --- a/sys/dev/evdev/cdev.c +++ b/sys/dev/evdev/cdev.c @@ -91,7 +91,7 @@ static struct cdevsw evdev_cdevsw = { .d_name = "evdev", }; -static struct filterops evdev_cdev_filterops = { +static const struct filterops evdev_cdev_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = evdev_kqdetach, diff --git a/sys/dev/evdev/uinput.c b/sys/dev/evdev/uinput.c index 3bf0e91b7360..9ac9fee8a157 100644 --- a/sys/dev/evdev/uinput.c +++ b/sys/dev/evdev/uinput.c @@ -93,13 +93,13 @@ static struct cdevsw uinput_cdevsw = { static struct cdev *uinput_cdev; -static struct evdev_methods uinput_ev_methods = { +static const struct evdev_methods uinput_ev_methods = { .ev_open = NULL, .ev_close = NULL, .ev_event = uinput_ev_event, }; -static struct filterops uinput_filterops = { +static const struct filterops uinput_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = uinput_kqdetach, diff --git a/sys/dev/gpio/gpioc.c b/sys/dev/gpio/gpioc.c index 6fb79fa8d751..067a43617f11 100644 --- a/sys/dev/gpio/gpioc.c +++ b/sys/dev/gpio/gpioc.c @@ -152,7 +152,7 @@ static struct cdevsw gpioc_cdevsw = { .d_name = "gpioc", }; -static struct filterops gpioc_read_filterops = { +static const struct filterops gpioc_read_filterops = { .f_isfd = true, .f_attach = NULL, .f_detach = gpioc_kqdetach, diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index 6a05b633cfc8..618a6d2d5c31 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -172,7 +172,7 @@ static int hidraw_kqread(struct knote *, long); static void hidraw_kqdetach(struct knote *); static void hidraw_notify(struct hidraw_softc *); -static struct filterops hidraw_filterops_read = { +static const struct filterops hidraw_filterops_read = { .f_isfd = 1, .f_detach = hidraw_kqdetach, .f_event = hidraw_kqread, diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index 215b1f7bd09e..6448fdc74160 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -1397,13 +1397,13 @@ netmap_knwrite(struct knote *kn, long hint) return netmap_knrw(kn, hint, POLLOUT); } -static struct filterops netmap_rfiltops = { +static const struct filterops netmap_rfiltops = { .f_isfd = 1, .f_detach = netmap_knrdetach, .f_event = netmap_knread, }; -static struct filterops netmap_wfiltops = { +static const struct filterops netmap_wfiltops = { .f_isfd = 1, .f_detach = netmap_knwdetach, .f_event = netmap_knwrite, diff --git a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c index a70f25d57dcb..661d5bd0f14e 100644 --- a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c +++ b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c @@ -85,7 +85,7 @@ static struct cdevsw adf_state_cdevsw = { .d_name = ADF_DEV_STATE_NAME, }; -static struct filterops adf_state_read_filterops = { +static const struct filterops adf_state_read_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = adf_state_kqread_detach, diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index c58c3b5f64d5..a736a12fc4f4 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -1228,13 +1228,13 @@ usb_filter_read(struct knote *kn, long hint) return (m ? 1 : 0); } -static struct filterops usb_filtops_write = { +static const struct filterops usb_filtops_write = { .f_isfd = 1, .f_detach = usb_filter_detach, .f_event = usb_filter_write, }; -static struct filterops usb_filtops_read = { +static const struct filterops usb_filtops_read = { .f_isfd = 1, .f_detach = usb_filter_detach, .f_event = usb_filter_read, diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index 9ef234c35427..e32154654386 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -191,13 +191,13 @@ static void cuse_client_kqfilter_write_detach(struct knote *kn); static int cuse_client_kqfilter_read_event(struct knote *kn, long hint); static int cuse_client_kqfilter_write_event(struct knote *kn, long hint); -static struct filterops cuse_client_kqfilter_read_ops = { +static const struct filterops cuse_client_kqfilter_read_ops = { .f_isfd = 1, .f_detach = cuse_client_kqfilter_read_detach, .f_event = cuse_client_kqfilter_read_event, }; -static struct filterops cuse_client_kqfilter_write_ops = { +static const struct filterops cuse_client_kqfilter_write_ops = { .f_isfd = 1, .f_detach = cuse_client_kqfilter_write_detach, .f_event = cuse_client_kqfilter_write_event, diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 9dcf3b235feb..7d17362df05e 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -68,7 +68,7 @@ static struct vop_vector devfs_vnodeops; static struct vop_vector devfs_specops; -static struct fileops devfs_ops_f; +static const struct fileops devfs_ops_f; #include #include @@ -2039,7 +2039,7 @@ devfs_cmp_f(struct file *fp1, struct file *fp2, struct thread *td) return (kcmp_cmp((uintptr_t)fp1->f_data, (uintptr_t)fp2->f_data)); } -static struct fileops devfs_ops_f = { +static const struct fileops devfs_ops_f = { .fo_read = devfs_read_f, .fo_write = devfs_write_f, .fo_truncate = devfs_truncate_f, diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 88ebe702ec0a..5df9be59ce36 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -121,13 +121,13 @@ static int fuse_device_filt_read(struct knote *kn, long hint); static int fuse_device_filt_write(struct knote *kn, long hint); static void fuse_device_filt_detach(struct knote *kn); -struct filterops fuse_device_rfiltops = { +static const struct filterops fuse_device_rfiltops = { .f_isfd = 1, .f_detach = fuse_device_filt_detach, .f_event = fuse_device_filt_read, }; -struct filterops fuse_device_wfiltops = { +static const struct filterops fuse_device_wfiltops = { .f_isfd = 1, .f_event = fuse_device_filt_write, }; diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index f12236264d19..0b5cfdf77149 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -79,7 +79,7 @@ static d_kqfilter_t g_dev_kqfilter; static void gdev_filter_detach(struct knote *kn); static int gdev_filter_vnode(struct knote *kn, long hint); -static struct filterops gdev_filterops_vnode = { +static const struct filterops gdev_filterops_vnode = { .f_isfd = 1, .f_detach = gdev_filter_detach, .f_event = gdev_filter_vnode, diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 9036e3a25ab8..61cf7fc845a2 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2861,7 +2861,8 @@ closef_nothread(struct file *fp) * called with bad data. */ void -finit(struct file *fp, u_int flag, short type, void *data, struct fileops *ops) +finit(struct file *fp, u_int flag, short type, void *data, + const struct fileops *ops) { fp->f_data = data; fp->f_flag = flag; @@ -2870,7 +2871,7 @@ finit(struct file *fp, u_int flag, short type, void *data, struct fileops *ops) } void -finit_vnode(struct file *fp, u_int flag, void *data, struct fileops *ops) +finit_vnode(struct file *fp, u_int flag, void *data, const struct fileops *ops) { fp->f_seqcount[UIO_READ] = 1; fp->f_seqcount[UIO_WRITE] = 1; @@ -5267,7 +5268,7 @@ badfo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) return (0); } -struct fileops badfileops = { +const struct fileops badfileops = { .fo_read = badfo_readwrite, .fo_write = badfo_readwrite, .fo_truncate = badfo_truncate, @@ -5298,7 +5299,7 @@ path_close(struct file *fp, struct thread *td) return (0); } -struct fileops path_fileops = { +const struct fileops path_fileops = { .fo_read = badfo_readwrite, .fo_write = badfo_readwrite, .fo_truncate = badfo_truncate, diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index 602b82105525..d83bc380c2fe 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -126,7 +126,7 @@ static struct cdevsw dev_cdevsw = { static void filt_devctl_detach(struct knote *kn); static int filt_devctl_read(struct knote *kn, long hint); -static struct filterops devctl_rfiltops = { +static const struct filterops devctl_rfiltops = { .f_isfd = 1, .f_detach = filt_devctl_detach, .f_event = filt_devctl_read, diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index fa96fbad20ce..dcb2c10ee1f5 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -127,7 +127,7 @@ static fo_stat_t kqueue_stat; static fo_close_t kqueue_close; static fo_fill_kinfo_t kqueue_fill_kinfo; -static struct fileops kqueueops = { +static const struct fileops kqueueops = { .fo_read = invfo_rdwr, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, @@ -173,30 +173,30 @@ static int filt_user(struct knote *kn, long hint); static void filt_usertouch(struct knote *kn, struct kevent *kev, u_long type); -static struct filterops file_filtops = { +static const struct filterops file_filtops = { .f_isfd = 1, .f_attach = filt_fileattach, }; -static struct filterops kqread_filtops = { +static const struct filterops kqread_filtops = { .f_isfd = 1, .f_detach = filt_kqdetach, .f_event = filt_kqueue, }; /* XXX - move to kern_proc.c? */ -static struct filterops proc_filtops = { +static const struct filterops proc_filtops = { .f_isfd = 0, .f_attach = filt_procattach, .f_detach = filt_procdetach, .f_event = filt_proc, }; -static struct filterops timer_filtops = { +static const struct filterops timer_filtops = { .f_isfd = 0, .f_attach = filt_timerattach, .f_detach = filt_timerdetach, .f_event = filt_timer, .f_touch = filt_timertouch, }; -static struct filterops user_filtops = { +static const struct filterops user_filtops = { .f_attach = filt_userattach, .f_detach = filt_userdetach, .f_event = filt_user, @@ -327,14 +327,14 @@ filt_nullattach(struct knote *kn) return (ENXIO); }; -struct filterops null_filtops = { +static const struct filterops null_filtops = { .f_isfd = 0, .f_attach = filt_nullattach, }; /* XXX - make SYSINIT to add these, and move into respective modules. */ -extern struct filterops sig_filtops; -extern struct filterops fs_filtops; +extern const struct filterops sig_filtops; +extern const struct filterops fs_filtops; /* * Table for all system-defined filters. diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 802231767762..6661f4cd6187 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -119,7 +119,7 @@ static void sigqueue_start(void); static void sigfastblock_setpend(struct thread *td, bool resched); static uma_zone_t ksiginfo_zone = NULL; -struct filterops sig_filtops = { +const struct filterops sig_filtops = { .f_isfd = 0, .f_attach = filt_sigattach, .f_detach = filt_sigdetach, diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index bb78e4a35451..5a6ebacb780c 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -77,7 +77,7 @@ static struct cdevsw log_cdevsw = { static int logkqread(struct knote *note, long hint); static void logkqdetach(struct knote *note); -static struct filterops log_read_filterops = { +static const struct filterops log_read_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = logkqdetach, diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c index 739dbf75b01e..20e73f9c6b1b 100644 --- a/sys/kern/sys_eventfd.c +++ b/sys/kern/sys_eventfd.c @@ -64,7 +64,7 @@ static fo_stat_t eventfd_stat; static fo_close_t eventfd_close; static fo_fill_kinfo_t eventfd_fill_kinfo; -static struct fileops eventfdops = { +static const struct fileops eventfdops = { .fo_read = eventfd_read, .fo_write = eventfd_write, .fo_truncate = invfo_truncate, @@ -85,13 +85,13 @@ static void filt_eventfddetach(struct knote *kn); static int filt_eventfdread(struct knote *kn, long hint); static int filt_eventfdwrite(struct knote *kn, long hint); -static struct filterops eventfd_rfiltops = { +static const struct filterops eventfd_rfiltops = { .f_isfd = 1, .f_detach = filt_eventfddetach, .f_event = filt_eventfdread }; -static struct filterops eventfd_wfiltops = { +static const struct filterops eventfd_wfiltops = { .f_isfd = 1, .f_detach = filt_eventfddetach, .f_event = filt_eventfdwrite diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index c34c7b24a269..f2f1a42adf2b 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -154,7 +154,7 @@ static fo_chmod_t pipe_chmod; static fo_chown_t pipe_chown; static fo_fill_kinfo_t pipe_fill_kinfo; -struct fileops pipeops = { +const struct fileops pipeops = { .fo_read = pipe_read, .fo_write = pipe_write, .fo_truncate = pipe_truncate, @@ -177,17 +177,17 @@ static int filt_pipenotsup(struct knote *kn, long hint); static int filt_piperead(struct knote *kn, long hint); static int filt_pipewrite(struct knote *kn, long hint); -static struct filterops pipe_nfiltops = { +static const struct filterops pipe_nfiltops = { .f_isfd = 1, .f_detach = filt_pipedetach_notsup, .f_event = filt_pipenotsup }; -static struct filterops pipe_rfiltops = { +static const struct filterops pipe_rfiltops = { .f_isfd = 1, .f_detach = filt_pipedetach, .f_event = filt_piperead }; -static struct filterops pipe_wfiltops = { +static const struct filterops pipe_wfiltops = { .f_isfd = 1, .f_detach = filt_pipedetach, .f_event = filt_pipewrite diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index e8e0efd5bb00..dbf8e579530f 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -99,7 +99,7 @@ static fo_close_t procdesc_close; static fo_fill_kinfo_t procdesc_fill_kinfo; static fo_cmp_t procdesc_cmp; -static struct fileops procdesc_ops = { +static const struct fileops procdesc_ops = { .fo_read = invfo_rdwr, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, @@ -484,7 +484,7 @@ procdesc_kqops_event(struct knote *kn, long hint) return (kn->kn_fflags != 0); } -static struct filterops procdesc_kqops = { +static const struct filterops procdesc_kqops = { .f_isfd = 1, .f_detach = procdesc_kqops_detach, .f_event = procdesc_kqops_event, diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 58891b0de000..ca7ead961e68 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -99,7 +99,7 @@ static fo_aio_queue_t soo_aio_queue; static void soo_aio_cancel(struct kaiocb *job); -struct fileops socketops = { +const struct fileops socketops = { .fo_read = soo_read, .fo_write = soo_write, .fo_truncate = invfo_truncate, diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 8ac5b845f7ac..ab7e048a2ab1 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -284,7 +284,7 @@ filt_timerfdread(struct knote *kn, long hint) return (tfd->tfd_count > 0); } -static struct filterops timerfd_rfiltops = { +static const struct filterops timerfd_rfiltops = { .f_isfd = 1, .f_detach = filt_timerfddetach, .f_event = filt_timerfdread, @@ -359,7 +359,7 @@ timerfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, return (0); } -static struct fileops timerfdops = { +static const struct fileops timerfdops = { .fo_read = timerfd_read, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, diff --git a/sys/kern/tty.c b/sys/kern/tty.c index b6e300321e9c..b1b3b268d0e9 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -751,13 +751,13 @@ tty_kqops_write_event(struct knote *kn, long hint __unused) } } -static struct filterops tty_kqops_read = { +static const struct filterops tty_kqops_read = { .f_isfd = 1, .f_detach = tty_kqops_read_detach, .f_event = tty_kqops_read_event, }; -static struct filterops tty_kqops_write = { +static const struct filterops tty_kqops_write = { .f_isfd = 1, .f_detach = tty_kqops_write_detach, .f_event = tty_kqops_write_event, diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index 4a3b3d77c89e..d629fa0e7593 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -488,12 +488,12 @@ pts_kqops_write_event(struct knote *kn, long hint) } } -static struct filterops pts_kqops_read = { +static const struct filterops pts_kqops_read = { .f_isfd = 1, .f_detach = pts_kqops_read_detach, .f_event = pts_kqops_read_event, }; -static struct filterops pts_kqops_write = { +static const struct filterops pts_kqops_write = { .f_isfd = 1, .f_detach = pts_kqops_write_detach, .f_event = pts_kqops_write_event, @@ -597,7 +597,7 @@ ptsdev_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) return (0); } -static struct fileops ptsdev_ops = { +static const struct fileops ptsdev_ops = { .fo_read = ptsdev_read, .fo_write = ptsdev_write, .fo_truncate = invfo_truncate, diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 5fcabbac7923..7dd0f9796682 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -226,7 +226,7 @@ static uma_zone_t mqueue_zone; static uma_zone_t mvdata_zone; static uma_zone_t mqnoti_zone; static struct vop_vector mqfs_vnodeops; -static struct fileops mqueueops; +static const struct fileops mqueueops; static unsigned mqfs_osd_jail_slot; /* @@ -273,12 +273,12 @@ static void filt_mqdetach(struct knote *kn); static int filt_mqread(struct knote *kn, long hint); static int filt_mqwrite(struct knote *kn, long hint); -struct filterops mq_rfiltops = { +static const struct filterops mq_rfiltops = { .f_isfd = 1, .f_detach = filt_mqdetach, .f_event = filt_mqread, }; -struct filterops mq_wfiltops = { +static const struct filterops mq_wfiltops = { .f_isfd = 1, .f_detach = filt_mqdetach, .f_event = filt_mqwrite, @@ -2648,7 +2648,7 @@ mqf_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) return (0); } -static struct fileops mqueueops = { +static const struct fileops mqueueops = { .fo_read = invfo_rdwr, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index b4652e9106ac..35ca9a9fb06e 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -140,7 +140,7 @@ static fo_chown_t ksem_chown; static fo_fill_kinfo_t ksem_fill_kinfo; /* File descriptor operations. */ -static struct fileops ksem_ops = { +static const struct fileops ksem_ops = { .fo_read = invfo_rdwr, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index f51998d0ed00..dad9fb23250f 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -150,7 +150,7 @@ static fo_fallocate_t shm_fallocate; static fo_fspacectl_t shm_fspacectl; /* File descriptor operations. */ -struct fileops shm_ops = { +const struct fileops shm_ops = { .fo_read = shm_read, .fo_write = shm_write, .fo_truncate = shm_truncate, diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4ecd69d509ed..162c489ea6fe 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -191,17 +191,17 @@ static int filt_soempty(struct knote *kn, long hint); static int inline hhook_run_socket(struct socket *so, void *hctx, int32_t h_id); fo_kqfilter_t soo_kqfilter; -static struct filterops soread_filtops = { +static const struct filterops soread_filtops = { .f_isfd = 1, .f_detach = filt_sordetach, .f_event = filt_soread, }; -static struct filterops sowrite_filtops = { +static const struct filterops sowrite_filtops = { .f_isfd = 1, .f_detach = filt_sowdetach, .f_event = filt_sowrite, }; -static struct filterops soempty_filtops = { +static const struct filterops soempty_filtops = { .f_isfd = 1, .f_detach = filt_sowdetach, .f_event = filt_soempty, diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index fd6682ef03b0..c5b0c7896a17 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -347,13 +347,13 @@ static int filt_lio(struct knote *kn, long hint); static uma_zone_t kaio_zone, aiocb_zone, aiolio_zone; /* kqueue filters for aio */ -static struct filterops aio_filtops = { +static const struct filterops aio_filtops = { .f_isfd = 0, .f_attach = filt_aioattach, .f_detach = filt_aiodetach, .f_event = filt_aio, }; -static struct filterops lio_filtops = { +static const struct filterops lio_filtops = { .f_isfd = 0, .f_attach = filt_lioattach, .f_detach = filt_liodetach, diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 747cdf722cc9..404c51b7db77 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6409,7 +6409,7 @@ static int filt_fsattach(struct knote *kn); static void filt_fsdetach(struct knote *kn); static int filt_fsevent(struct knote *kn, long hint); -struct filterops fs_filtops = { +const struct filterops fs_filtops = { .f_isfd = 0, .f_attach = filt_fsattach, .f_detach = filt_fsdetach, @@ -6489,17 +6489,17 @@ static int filt_vfsread(struct knote *kn, long hint); static int filt_vfswrite(struct knote *kn, long hint); static int filt_vfsvnode(struct knote *kn, long hint); static void filt_vfsdetach(struct knote *kn); -static struct filterops vfsread_filtops = { +static const struct filterops vfsread_filtops = { .f_isfd = 1, .f_detach = filt_vfsdetach, .f_event = filt_vfsread }; -static struct filterops vfswrite_filtops = { +static const struct filterops vfswrite_filtops = { .f_isfd = 1, .f_detach = filt_vfsdetach, .f_event = filt_vfswrite }; -static struct filterops vfsvnode_filtops = { +static const struct filterops vfsvnode_filtops = { .f_isfd = 1, .f_detach = filt_vfsdetach, .f_event = filt_vfsvnode diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 53a2ddf94862..c28d6e66853f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -108,7 +108,7 @@ static fo_mmap_t vn_mmap; static fo_fallocate_t vn_fallocate; static fo_fspacectl_t vn_fspacectl; -struct fileops vnops = { +const struct fileops vnops = { .fo_read = vn_io_fault, .fo_write = vn_io_fault, .fo_truncate = vn_truncate, diff --git a/sys/net/bpf.c b/sys/net/bpf.c index c0631591a10e..8a68f65a80f7 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -251,13 +251,13 @@ static struct cdevsw bpf_cdevsw = { .d_kqfilter = bpfkqfilter, }; -static struct filterops bpfread_filtops = { +static const struct filterops bpfread_filtops = { .f_isfd = 1, .f_detach = filt_bpfdetach, .f_event = filt_bpfread, }; -static struct filterops bpfwrite_filtops = { +static const struct filterops bpfwrite_filtops = { .f_isfd = 1, .f_detach = filt_bpfdetach, .f_event = filt_bpfwrite, diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 0dee2260973d..a0275a7471e5 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -253,14 +253,14 @@ static int tunkqread(struct knote *, long); static int tunkqwrite(struct knote *, long); static void tunkqdetach(struct knote *); -static struct filterops tun_read_filterops = { +static const struct filterops tun_read_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = tunkqdetach, .f_event = tunkqread, }; -static struct filterops tun_write_filterops = { +static const struct filterops tun_write_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = tunkqdetach, diff --git a/sys/security/audit/audit_pipe.c b/sys/security/audit/audit_pipe.c index 926865b499d1..c50287321cbd 100644 --- a/sys/security/audit/audit_pipe.c +++ b/sys/security/audit/audit_pipe.c @@ -239,7 +239,7 @@ static struct cdevsw audit_pipe_cdevsw = { static int audit_pipe_kqread(struct knote *note, long hint); static void audit_pipe_kqdetach(struct knote *note); -static struct filterops audit_pipe_read_filterops = { +static const struct filterops audit_pipe_read_filterops = { .f_isfd = 1, .f_attach = NULL, .f_detach = audit_pipe_kqdetach, diff --git a/sys/sys/file.h b/sys/sys/file.h index c1439b9bbaac..da96f3e332fc 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -248,10 +248,10 @@ struct xfile { #ifdef _KERNEL -extern struct fileops vnops; -extern struct fileops badfileops; -extern struct fileops path_fileops; -extern struct fileops socketops; +extern const struct fileops vnops; +extern const struct fileops badfileops; +extern const struct fileops path_fileops; +extern const struct fileops socketops; extern int maxfiles; /* kernel limit on number of open files */ extern int maxfilesperproc; /* per process limit on number of open files */ @@ -283,8 +283,8 @@ fo_kqfilter_t vn_kqfilter_opath; int vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif); int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); -void finit(struct file *, u_int, short, void *, struct fileops *); -void finit_vnode(struct file *, u_int, void *, struct fileops *); +void finit(struct file *, u_int, short, void *, const struct fileops *); +void finit_vnode(struct file *, u_int, void *, const struct fileops *); int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp); int fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, diff --git a/sys/sys/mman.h b/sys/sys/mman.h index 36973b941e61..d444f02d3c89 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -312,7 +312,7 @@ bool shm_largepage(struct shmfd *shmfd); void shm_remove_prison(struct prison *pr); int shm_get_path(struct vm_object *obj, char *path, size_t sz); -extern struct fileops shm_ops; +extern const struct fileops shm_ops; #define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index 0f35316432eb..a83ea800c677 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -52,7 +52,7 @@ * See sys_pipe.c for info on what these limits mean. */ extern long maxpipekva; -extern struct fileops pipeops; +extern const struct fileops pipeops; #endif /* diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index 4e880c3e5411..e7e4b0f1a546 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -61,7 +61,7 @@ static d_poll_t apmpoll; static d_kqfilter_t apmkqfilter; static void apmreadfiltdetach(struct knote *kn); static int apmreadfilt(struct knote *kn, long hint); -static struct filterops apm_readfiltops = { +static const struct filterops apm_readfiltops = { .f_isfd = 1, .f_detach = apmreadfiltdetach, .f_event = apmreadfilt, From nobody Tue Dec 3 04:01:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2Rm82cjqz5fcyB; Tue, 03 Dec 2024 04:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2Rm75k6jz4tXL; Tue, 3 Dec 2024 04:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3oXDM59rJ6OM+k4vylTRYQHgN/cA/4hxZt/fM/vBIE=; b=R9DyuxWDTtobK6v1wfG6/vP0XJqVrFiqV9vzPO4Iv5FQmZWVnUK1drgk4zAt6nYWNVIQoV F5wvn4SE9//U4uQp2Ot+Wt8dBqXm+oQYfgmln95gTmdY5y/dpn/t/uVw2xY2JAe8gBAD40 QUH33voi3NtwDDFogQqna6vcAtQTce8F7jxbHSuCH+YcGzVO/6OFBTk+8xrlRgvBmjI31f CpbuSC16lcvu1t5p4npjz3V9vqfKRvgisfcY1efrncpVs9Q2GfywVhUPALv2W8PyLEgzsb lK7uApRAagvP8KLY1wLsFpQi9MzLa3VATOiFNLLQjRz5UlMz54sa0nb6Hv7LNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3oXDM59rJ6OM+k4vylTRYQHgN/cA/4hxZt/fM/vBIE=; b=S6+2vvr8snhToqCoWrytXCONvR7qFyxSefX1QWEQvwG+5F2KmT8+hzLO0qM5HYwHCmKYS/ ucsZw/uccwk5qWKuxM7h5H5YAo25mxXn2BdjTXU2CpHIGnJo5tncHmCVu0BN+YPLw4DQ4e AjTUZ1dtxgGSmOW0iJqSi2+E4hrmaONn5/nPIhvebCr1Do8sCIW4D28sNsm9Po3d3rzy4A 2zS44rIuXCm7P6tgka3LJ1dH1R9Pc7xCb5Eyspt8+jjcHd4g/uYPh0UPZJj8fwVAtAopGX 0aQ3xfusMADdeWb9IxjNZ9VWXP7u6v3aS2wu+QV35YPtEqwyU3GqprOUOkSW+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733198487; a=rsa-sha256; cv=none; b=t7j36D4Y3Z4WN7mDhLmprJtT0famkU7vzUbwOUPoz9BOqcHQ6MfXHycsmpfbTQsZAZ+Ziu /0K1L3kjRT6hcv1dQnsXVWQBNGwe44q/Sl/zF033nMw5UAFStlPy9b2QGf7Pbc3PfRjtSD XCaIY2W1CRqyADX34V3qo7Pvb91nfo7RcG9BFv1wWllmYXZIxLyBXl0o+VL2k2+frtXiCo 9ZsrmiBDf6y5Iy92IVrfuntbhtNRAoYPhcScaEom2HhJ+nIbJ67h5vH5Kt5rKiShYPYXlP Zlp7/GkNQugyMX5fzRSP5ang8FCusnN+1KfQ8Fs86O6o1W3sQ9oG/ZDAqkS75Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2Rm75Kzmz16gk; Tue, 3 Dec 2024 04:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B341RDT071242; Tue, 3 Dec 2024 04:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B341RWm071239; Tue, 3 Dec 2024 04:01:27 GMT (envelope-from git) Date: Tue, 3 Dec 2024 04:01:27 GMT Message-Id: <202412030401.4B341RWm071239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: edf50670e215 - stable/14 - e1000: Remove old itr sysctl handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: edf50670e215ca1427817ef2598a5acb3ae3b5c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=edf50670e215ca1427817ef2598a5acb3ae3b5c4 commit edf50670e215ca1427817ef2598a5acb3ae3b5c4 Author: Kevin Bowling AuthorDate: 2024-11-29 06:23:23 +0000 Commit: Kevin Bowling CommitDate: 2024-12-03 04:01:14 +0000 e1000: Remove old itr sysctl handler This implementation had various bugs. bde@ reported that the unit conversion/scaling is wrong, and it also does not handle 82574L or igb(4) devices correctly. With the new AIM code, it is expected most users will not need to manually tune this. If you do need static control: hw.em.enable_aim=0 for all interfaces at boot or dev.em.X.enable_aim=0 for individual interfaces at runtime and they will track the hw.em.max_interrupt_rate tunable. That codepath has been bugfixed for all supported chipsets. You may view the current rate with dev.em.X.queue_rx_0.interrupt_rate which has been bugfixed for all supported chipsets. If you need to set different rates per interface for some reason let me know and I will rethink how to add this back. Otherwise you can leave AIM on for general purpose interfaces and disable it at runtime on special purpose low or high latency interfaces that would track hw.em.max_interrupt_rate if you have a mix of concerns. PR: 235031 Reported by: Bruce Evans Relnotes: yes Sponsored by: BBOX.io (cherry picked from commit 4020351325c02cc27aa4992c199ff18a9542a52c) --- sys/dev/e1000/if_em.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index aed97d076a5e..449cb9e07f3a 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1234,10 +1234,6 @@ em_if_attach_pre(if_ctx_t ctx) "transmit interrupt delay limit in usecs", &sc->tx_abs_int_delay, E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "itr", - "interrupt delay limit in usecs/4", &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), - EM_INTS_TO_ITR(em_max_interrupt_rate)); } hw->mac.autoneg = DO_AUTO_NEG; @@ -5403,8 +5399,6 @@ em_sysctl_int_delay(SYSCTL_HANDLER_ARGS) return (EINVAL); info->value = usecs; ticks = EM_USECS_TO_TICKS(usecs); - if (info->offset == E1000_ITR) /* units are 256ns here */ - ticks *= 4; sc = info->sc; From nobody Tue Dec 3 04:02:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2Rmy0cRHz5fcyW; Tue, 03 Dec 2024 04:02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2Rmy06NMz4tWD; Tue, 3 Dec 2024 04:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVsR6VHtAubB1OP8rzwjaSuaRSZfGzMDBu3XgkGcfRA=; b=Ogi9QfACN5Ub712Mb1/zJke/W5KrH3uNcH1HS+zWLHRQ3z7jDinvOsFeSYZ1P4Gq8rZGYc V6LIO3AuB/2eX10NvKUnkQKF9PCH/V5mFqWgJRQOcsP4CuWjYRtBOR6F8HK4+bdsr7xSHU Yg28cWzUX2lupQ4x8BPbBtbp0kXL0hlkHHlxVS8+d9p78js1aangGn/0IIJWS6Gw2muKr3 EECjD/Mh5FLY83qTsT8JUL19wVtzgtU33NW4XFscCbsevdPn3O5XKLNQivs+fYylLCcxt+ m2Q79Gu8f719SGBDeJoFvqggbJRjLZPk+klKoPznvWWETBHsUuEJryj886L8Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVsR6VHtAubB1OP8rzwjaSuaRSZfGzMDBu3XgkGcfRA=; b=lgS0oqGKEVbpWxQBRWHL/cKqpskDiSbTMKMhDY0s5FJ8QKwKTrMqKBB1lwZ8e/3emZMG0F P/OsPrmewNa5c7N+gaSiz395cjq78ep0lgzsLBQd6J0OPvyBIHWpfC8Qgvbk0GJB1WrYsI 6Z9WpUK0rxkEkKapZyT23qBR3k8dL9cnhttkOuCpB+lYk/nHhdZ22YCxBgQN6rXW/erZj4 2BwcegLuZ15k+INn95+KECthGuwXl0Jo0bUspPpt1hvxHhLimfNAo9YhxgKGO38LiZ8cCp We163SHw8XMKwbSiYzGTV8K1GCb73O7hWA6mKO1TcCjm+a1K3x5oecx9SGnz9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733198530; a=rsa-sha256; cv=none; b=FEmBQeNAcbkwQvLRYlYjNbH/WZj2Xwq9CaVlX9UuoYCWr0tqBIHlvlCBnWb8VD8e8hchFg rGrsQ+WwznmZ4qGIN/wZMKgTSCnT580Mf0dKY/twLzS6msTYHAADpI16TZ9lYxBuLVuQg3 63Dk8um1BO1Z3nqArewKMDc3USxc6o7c+sHQfRh1KwpF3gfcVqMoH91hodedzSy6brxdPt 22c6/C/eeCcpgoPG5K33MVNZSBZCC46Rf1upDpaoBMW19otgOD/FE2ROrxEWNT5PqgBeP8 /dyuzEMC3DS8Ln06GBSIu3vWIJ6fGmXVdJ+mGDKWQTD+9Bw8gs1NRgyGy60QNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2Rmx6ql9z16l1; Tue, 3 Dec 2024 04:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B3429nf072853; Tue, 3 Dec 2024 04:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B34290n072850; Tue, 3 Dec 2024 04:02:09 GMT (envelope-from git) Date: Tue, 3 Dec 2024 04:02:09 GMT Message-Id: <202412030402.4B34290n072850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a42c3e61504b - stable/13 - e1000: Remove old itr sysctl handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a42c3e61504b136ad9eecbd2ba0c763035dd1b7d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a42c3e61504b136ad9eecbd2ba0c763035dd1b7d commit a42c3e61504b136ad9eecbd2ba0c763035dd1b7d Author: Kevin Bowling AuthorDate: 2024-11-29 06:23:23 +0000 Commit: Kevin Bowling CommitDate: 2024-12-03 04:01:53 +0000 e1000: Remove old itr sysctl handler This implementation had various bugs. bde@ reported that the unit conversion/scaling is wrong, and it also does not handle 82574L or igb(4) devices correctly. With the new AIM code, it is expected most users will not need to manually tune this. If you do need static control: hw.em.enable_aim=0 for all interfaces at boot or dev.em.X.enable_aim=0 for individual interfaces at runtime and they will track the hw.em.max_interrupt_rate tunable. That codepath has been bugfixed for all supported chipsets. You may view the current rate with dev.em.X.queue_rx_0.interrupt_rate which has been bugfixed for all supported chipsets. If you need to set different rates per interface for some reason let me know and I will rethink how to add this back. Otherwise you can leave AIM on for general purpose interfaces and disable it at runtime on special purpose low or high latency interfaces that would track hw.em.max_interrupt_rate if you have a mix of concerns. PR: 235031 Reported by: Bruce Evans Relnotes: yes Sponsored by: BBOX.io (cherry picked from commit 4020351325c02cc27aa4992c199ff18a9542a52c) --- sys/dev/e1000/if_em.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1a5dbe2335ba..fcf1ccbd9a3e 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1236,10 +1236,6 @@ em_if_attach_pre(if_ctx_t ctx) "transmit interrupt delay limit in usecs", &sc->tx_abs_int_delay, E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "itr", - "interrupt delay limit in usecs/4", &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), - EM_INTS_TO_ITR(em_max_interrupt_rate)); } hw->mac.autoneg = DO_AUTO_NEG; @@ -5405,8 +5401,6 @@ em_sysctl_int_delay(SYSCTL_HANDLER_ARGS) return (EINVAL); info->value = usecs; ticks = EM_USECS_TO_TICKS(usecs); - if (info->offset == E1000_ITR) /* units are 256ns here */ - ticks *= 4; sc = info->sc; From nobody Wed Dec 4 01:12:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2zyp2wSyz5fbXL; Wed, 04 Dec 2024 01:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2zyp2CXpz45h7; Wed, 4 Dec 2024 01:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733274754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6cOsiE9pAekw+MuhAddi4g+oril1G6Xuapl/m4BqL0=; b=BbBhr1/MoNc6fphqs2MV1jW42jm9reBuJzXRiUWqBDR4WRHtqv0vRhjm5K9NsjrmBqoOIZ kk6FvPK5gknXf1RRXpx4LQyFavyMa48yFb9cKtZreoVtYzDo4ZEtLE2wnOpmUAj+mmqswJ z7SUWCtXfuXoM5XX9EaSnh4nxyDzjt8mygAtReZtofgobGrBynUykTwdsx2sMMOT0TKvhO zMIXPUY0mmvScdp8FKiCkdhNvFcgheY2MkFn9X2LAXUl8011mjJC2sUCRmWkGOJpAQIq+S 00cJLDQ9Tlw+D6PaqLmNDkzNgPUhkSMrBbOVsYW+9sYIXYLRyunSNOhTYloWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733274754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6cOsiE9pAekw+MuhAddi4g+oril1G6Xuapl/m4BqL0=; b=oTyu5nfZKQRlH+CH7iV+T4TGcybKeR6v+zJeg6jb5eH0NLDDRjmqrLcGoJnZ9W54E41Yx5 NCvTugvWvSuriAhzuH8mWeq//27ho6CNGx663QOswJUSI2mqf6niVTEdmAGS/YGkkh4N43 kN0cgxX8gR8H77qgbGlWbrYmdYt/zuvT86l3kpA0ijT19vyD53JUCzh1pfVxa6vzwWx8K5 fiVM7sfkq7kI73KIpqkKzVX9cZV25WS+Re1dEI+ecZvZC3vNTEm3ODDdMaQfbY8afbmA5M bRXYSfTR1IT6gWB/czGqeTKcm3cw6cz3PlwiDGFezm+0lc888Bg2jypG8GWIVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733274754; a=rsa-sha256; cv=none; b=eupXrCq6ynmMSysiQmwHh9Gu1Ptg9TJog4cBwRL65Qpcn4rc4ouuV4oCWlydUXlXxigikJ Ox8mIRBiQYiwAH5LUSl2+7fc6C6VmMuoETESGgzCyTZLcF1vrYiVLcjVqeJ/chuVzqWEJY FGOmWfbnEbOqTMr/UQBaWxMlnPiAkN03AcioLC4M+9fNvbnhsPbksLBLgLeS9dz5cRYWr+ 4BnuKwCJBdevDVbX8WT8rzkic/+bxz9ofutZonjRWUT/XokWO+Dfhq/QWWBLPi/RjFgpWz RojWsC2yPLW18YrUjnNNibYQqqMXjUkYnXy2SgFyaUpdncz0lou2mVepTsUSgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2zyp1q8szmPt; Wed, 4 Dec 2024 01:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B41CY1j038039; Wed, 4 Dec 2024 01:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B41CYKk038036; Wed, 4 Dec 2024 01:12:34 GMT (envelope-from git) Date: Wed, 4 Dec 2024 01:12:34 GMT Message-Id: <202412040112.4B41CYKk038036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: e3a0e41c2285 - stable/14 - ppp.8: Fix typo cuad0 -> cuau0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e3a0e41c22853166ed2f47e3f7859da6220be97c Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e3a0e41c22853166ed2f47e3f7859da6220be97c commit e3a0e41c22853166ed2f47e3f7859da6220be97c Author: Jose Luis Duran AuthorDate: 2024-11-05 04:07:07 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-04 00:55:31 +0000 ppp.8: Fix typo cuad0 -> cuau0 Fix a typo that was missed probably because it was capitalized. Mark up with .Pa and fix capitalization. Specify that cuaUX and cuauX are for USB and UART attachments respectively. - Silence most lint warnings - Update outdated links - Minor style fixes - Some igor(1) warnings were ignored on purpose PR: 248359 Reviewed by: imp, mhorne, Alexander Ziaee Approved by: emaste (mentor) Fixes: 839f11a4fe18 ("A number of places in the source tree still reference cuad.* after sio(4) was deprecated by uart(4).") MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1515 (cherry picked from commit 21ca690b5668d6b19b93327da3d4a423ea183fe4) --- usr.sbin/ppp/ppp.8 | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index 95b833c73c5c..9242a9c337a0 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 27, 2022 +.Dd November 18, 2024 .Dt PPP 8 .Os .Sh NAME @@ -263,7 +263,8 @@ will force it to exit. .It Supports client callback. .Nm can use either the standard LCP callback protocol or the Microsoft -CallBack Control Protocol (https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-CBCP/[MS-CBCP].pdf). +CallBack Control Protocol +.Pq Lk https://winprotocoldocs-bhdugrdyduf5h2e4.b02.azurefd.net/MS-CBCP/%5bMS-CBCP%5d.pdf . .It Supports NAT or packet aliasing. Packet aliasing (a.k.a.\& IP masquerading) allows computers on a private, unregistered network to access the Internet. @@ -339,7 +340,7 @@ to check the packet flow over the link. .It Supports PPP over TCP and PPP over UDP. If a device name is specified as -.Em host Ns No : Ns Em port Ns +.Em host : Ns Em port Ns .Xo .Op / Ns tcp|udp , .Xc @@ -353,7 +354,7 @@ into synchronous mode. If .Nm is given a device specification of the format -.No PPPoE: Ns Ar iface Ns Xo +.No PPPoE\&: Ns Ar iface Ns Xo .Op \&: Ns Ar provider Ns .Xc and if @@ -2166,13 +2167,22 @@ set device /dev/cuau0 set speed 115200 .Ed .Pp -Cuad0 is the first serial port on -.Fx . +.Pa cuaU0 +and +.Pa cuau0 +are the first +.Xr usb 4 +and +.Xr uart 4 +serial ports found by +.Fx , +respectively. If you are running .Nm on .Ox , -cua00 is the first. +.Pa cua00 +is the first. A speed of 115200 should be specified if you have a modem capable of bit rates of 28800 or more. In general, the serial speed should be about four times the modem speed. @@ -2734,7 +2744,7 @@ Default: Disabled and Denied. This option allows DNS negotiation. .Pp If -.Dq enable Ns No d, +.Dq enable Ns No d , .Nm will request that the peer confirms the entries in .Pa /etc/resolv.conf . @@ -2743,7 +2753,7 @@ If the peer NAKs our request (suggesting new IP numbers), is updated and another request is sent to confirm the new entries. .Pp If -.Dq accept Ns No ed, +.Dq accept Ns No ed , .Nm will answer any DNS queries requested by the peer rather than rejecting them. @@ -3446,8 +3456,7 @@ This command gives a summary of available nat commands. This option causes various NAT statistics and information to be logged to the file .Pa /var/log/alias.log . -.It nat port Ar proto Ar targetIP Ns Xo -.No : Ns Ar targetPort Ns +.It nat port Ar proto Ar targetIP Ns Xo : Ns Ar targetPort Ns .Oo .No - Ns Ar targetPort .Oc Ar aliasPort Ns @@ -4390,8 +4399,8 @@ This is required (in addition to one or more other callback options) if you wish callback to be optional. .El .It set cbcp Oo -.No *| Ns Ar number Ns Oo -.No , Ns Ar number Ns ...\& Oc +.No *| Ns Ar number Ns +.Oo , Ns Ar number Ns ...\& Oc .Op Ar delay Op Ar retry .Oc If no arguments are given, CBCP (Microsoft's CallBack Control Protocol) @@ -4403,7 +4412,7 @@ requesting no callback in the CBCP phase. Otherwise, .Nm attempts to use the given phone -.Ar number Ns No (s). +.Ar number Ns No (s) . .Pp In server mode .Pq Fl direct , @@ -4421,7 +4430,7 @@ is specified, .Nm will expect the peer to specify the number. .It set cd Oo -.No off| Ns Ar seconds Ns Op !\& +.No off\&| Ns Ar seconds Ns Op !\& .Oc Normally, .Nm @@ -4578,7 +4587,7 @@ does not begin with it must either begin with an exclamation mark .Pq Dq !\& , be of the format -.No PPPoE: Ns Ar iface Ns Xo +.No PPPoE\&: Ns Ar iface Ns Xo .Op \&: Ns Ar provider Ns .Xc (on @@ -4596,7 +4605,7 @@ Standard input, output and error are fed back to and are read and written as if they were a regular device. .Pp If a -.No PPPoE: Ns Ar iface Ns Xo +.No PPPoE\&: Ns Ar iface Ns Xo .Op \&: Ns Ar provider Ns .Xc specification is given, @@ -4635,7 +4644,7 @@ and for further details. .Pp If a -.Ar host Ns No : Ns Ar port Ns Oo +.Ar host : Ns Ar port Ns Oo .No /tcp|udp .Oc specification is given, @@ -4864,7 +4873,7 @@ It allows the user to specify a set of characters that will be .Sq escaped as they travel across the link. .It set filter dial|alive|in|out Ar rule-no Xo -.No permit|deny|clear| Ns Ar rule-no +.No permit|deny|clear\&| Ns Ar rule-no .Op !\& .Oo Op host .Ar src_addr Ns Op / Ns Ar width From nobody Wed Dec 4 01:12:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2zyq3P0lz5fbhr; Wed, 04 Dec 2024 01:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2zyq2tLgz45h8; Wed, 4 Dec 2024 01:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733274755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1ZAA7To9LBzHTlrXFS1OTaUdyN6Q7HWM29SnHQTZQg=; b=XbmosB+XMiLpbSxX0Va/i5dUvlvc8R+XSJyz/9ewXeoB2pKbA7fcEc7qCn5U1Ax3aJ2+e/ qBQhfnFasLfJbsV01UC89zy1fTgAmnc4Mm8O9Z08l8lTc4fBXQBqGInvoNu1ENZqo0L9mY 2SAqbjw836PpC+Z9NjYQpRKnL6mMfPID9KzdkVayNmLylGHPBTHDrgvsi5kw+32YiSt6mg SrakW7inRALJ6YKD5Vu2M3ps4vZ12B+AvxeCE0BjdEG3iXQfAxbJjpnL4Q3YDnYUJt/D3R HHiGhvtHS8fJoQwbBER9XlTPKaG4lzVgbmmvTHcA0keWN24K+Jcpq52VVBbH+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733274755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1ZAA7To9LBzHTlrXFS1OTaUdyN6Q7HWM29SnHQTZQg=; b=P5OR6OzAwj+K1vL2VfjoNafzvZrtkaNNbLBptut+9mgd6qtfoSMCFDr9yOZoKJwMY1b2Ed GzDjEPWlMb3H8VnPVKLJyIPJ0KRt26IXrZaNbB7/kA+ttz4CCeY9ffruYKsIAKFNpqLPAL OY5vur1lL7NI+YHD9i+AN0nNWbjo973jq4LCTvRNmDzm7EE58+98pwSLfwlVYmCToF48rP ence7GnVi/APtW8plh4WzH48ESQ9DAZdJODWbQFHSYDqWtk4h6joZUJj0Lybgp3E9MNFNN ykbNqU4B90fmkfLhppRyukZeLAwBKDwP1lL7erLdhYVXkXEIPgFNNqrn1GYpAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733274755; a=rsa-sha256; cv=none; b=O+IyJli62pPN1npvuXP/faw/v5LJj1jxzuN3rxawOkdQ7ivCQJSGJBCUvKZA/sm7ZF+SbT nyqQGLwYsqLjASfa6Gny8aOq4lYvVBrWOtzbhZ//WZ5utTprUQcWdOAok6c1YawMJdjZxx mE7ZGlhZyQXOWPS6cjmHT+ELQE4PNEUuFdBT0qrjrCtHtOfZdnGRT8Q6AZsOZRW5tqigQb xeq32+KIXlh+v6EbOg6CmH2tbiwDXsqNx1wHAguUtGZ1bwmMh8ilagYkn6U2WVfTQG2J0T Vw6ECQgCWotBfacciF5PpP2bFswO1WgLW4/VYjsmNq01hT+65hC2g5Uvi4TLgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2zyq2VcxzmhS; Wed, 4 Dec 2024 01:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B41CZ2A038081; Wed, 4 Dec 2024 01:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B41CZTA038078; Wed, 4 Dec 2024 01:12:35 GMT (envelope-from git) Date: Wed, 4 Dec 2024 01:12:35 GMT Message-Id: <202412040112.4B41CZTA038078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: ae50b6ba682a - stable/14 - mtree: Fix BSD.tests.dist sorting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae50b6ba682adf434fec3870ed6d5e4dd19e5163 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=ae50b6ba682adf434fec3870ed6d5e4dd19e5163 commit ae50b6ba682adf434fec3870ed6d5e4dd19e5163 Author: Jose Luis Duran AuthorDate: 2024-11-24 01:49:16 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-04 01:06:40 +0000 mtree: Fix BSD.tests.dist sorting Reviewed by: imp Approved by: emaste (mentor) Fixes: 60d717baf214 ("ctl: add some ATF tests for READ BUFFER") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47719 (cherry picked from commit 4b8e65d12fd7c06c0f670bdb11815971c3bebfed) --- etc/mtree/BSD.tests.dist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index a756236fd534..f3767f19e05e 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -515,6 +515,10 @@ .. auditpipe .. + cam + ctl + .. + .. capsicum .. cddl @@ -763,10 +767,6 @@ .. compat32 .. - cam - ctl - .. - .. devrandom .. dtrace From nobody Wed Dec 4 01:12:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2zyr5rDhz5fbkY; Wed, 04 Dec 2024 01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2zyr4JTQz45kV; Wed, 4 Dec 2024 01: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=1733274756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKqfgzcq9DxJRr+kMF4qhf7XgLUeS7IS+gM+sGJuWTw=; b=HQJhVxvRfe2ix3+eZ0TQdQdaG/57zpeOJC/rWjWLQqmQL7emUG24vOTXOaOl88ocFn8nOm mGz3pSRj+0a4Zoo0Q3BXkl+NpdSAyf/RqgCN+huQ3VbM8BpJ3xT1GWA3u4x5aMDlJesz96 pTQZvY7Tq05D3AZK79OOmPJAYdfPB+4ebBCm06YnAkQsaouRxZ0dcJQtwWONROK9PZrZNn BTg4OFr1TcYnB7/Q4a/XNaRIjvbAJYHrHgV9hDlhoiMBNmj3NEwVyCSUAcVb8rAQiLTlT+ tBMKhsIxH99Vc/mL7/6cz0MTv65MKhD9kRp9kEc/UayEwGdFs7Nl+TpZq55eeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733274756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKqfgzcq9DxJRr+kMF4qhf7XgLUeS7IS+gM+sGJuWTw=; b=O+IsWHqY2q3J3MUdxjq4MBEK+civ6I8u06Gx9ggnClQ/HZsSwwd6PXC2fUzkR8utbXNPFv 97VufihirTzcWFFFEyGopcnjuHRmhsnYv6awXtnYflxJBkAKUJyW1rH1AaN8z+a4Sh7/C0 4JfsLhxCM4CvzL5lUPsmKQpEJxolHm8r087A+vH6AJ7kZa+wBkkLLzvLCXFQlOrj4eiw1m +/Mo8bEE6ZvbweebgbNvagR8deRYMjuB7HJHEY0QFL5rDXas4fKSZlg7L+bREWfAJxJ3fa 9SNlzZCRVOm6Qz8+n6xATQRneU5Icq6u3onRB21zZsy0Zv9X5Ooswu8cKeM7ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733274756; a=rsa-sha256; cv=none; b=ZJ55sp+TvojnSFOABCWv/q0I17ofPIAnbrbZCdHjy0Moh1HVnViJ2awo7+94Uq9hQSavBj ukpTSNIX5ci7g+m7wqscPx0I1Wf/y3N1X/lsY9YKGEca17lpD5AS5uW5aFOD4VWL6lPpCX w6frfJo13c0ym6mjEJWtcb7EYMoZ+nriN+YljsF8PX+sEFg9MSwj5oZxXEyRylar/GiFAI OVoupmrATdVXmpEJBSqdUMafwS+3rKrY18tueZY/AR+/27YmyNKvKkxx5SerxGft0OkFTZ 7qBWYVmgIhZcVksmUuLz1624Oj6ZP/W/TGGc9oANwwU6CU/DtRhNk1Q6c0uLnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2zyr3q52zmsk; Wed, 4 Dec 2024 01:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B41Capd038132; Wed, 4 Dec 2024 01:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B41Ca53038129; Wed, 4 Dec 2024 01:12:36 GMT (envelope-from git) Date: Wed, 4 Dec 2024 01:12:36 GMT Message-Id: <202412040112.4B41Ca53038129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: ea4863825ee2 - stable/14 - mtree: Add missing entries in BSD.tests.dist List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea4863825ee277bce8b889a9a9223ce21a6d5eea Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=ea4863825ee277bce8b889a9a9223ce21a6d5eea commit ea4863825ee277bce8b889a9a9223ce21a6d5eea Author: Jose Luis Duran AuthorDate: 2024-11-27 16:06:06 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-04 01:07:20 +0000 mtree: Add missing entries in BSD.tests.dist Reviewed by: emaste, christos Approved by: emaste (mentor) Fixes: 95eb4b873b6a ("sound tests: Add sndstat nvlist ATF test") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47724 (cherry picked from commit f08dfd819bf73a584bf90da268242a7ed483dc32) --- etc/mtree/BSD.tests.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index f3767f19e05e..b152fb6e5271 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -905,6 +905,8 @@ .. posixshm .. + sound + .. sys .. vfs From nobody Wed Dec 4 12:04:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQh42hJz5gRvj; Wed, 04 Dec 2024 12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQg6vrsz46Th; Wed, 4 Dec 2024 12:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frwRrVAu/tTfN/8APacHaYoBxhnYUjNp8Eewdd/X66w=; b=H9ocFvLSDC8IfIIgd4myDGfFHYiuJGZ/en+oz8iND4i7YM/H9ho/Wldg2MjF1eziQPWRHe Nh1r89ogBXidzS+khXypFF+FwQLodXTbN+vdH5xcnyaCn6AVeSmZ39EwCSIkR72o8T0Y7M HTnBjOh9zOBb71zRltvJWPHouvWMZem38B5LZ96FRDzw1EaSOibZ0J3mFjypPcNbguHoRY /YlYCGl21e5u9uGj4y2gd87AUKGei1i6Jj9vQXqqnkT36vc9W/ziOdLZhpXMPXnYjIkrnE E+4rO1dk69Hes0ss8T9xeB9tAFWux2and4vLp+hSbnIaq076sZVg9RJfQOcwjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frwRrVAu/tTfN/8APacHaYoBxhnYUjNp8Eewdd/X66w=; b=s/JApAu/lIpxzr0vTmxDbrlLXzRP7FZI1TZCRL8cZSCdQr+t6J9nLzC0hIsH2I1B1Hvoj1 b5hrImcV+MMJKnHl09dILQMuHqubXEpBonciUfrquGNJ9VfLHiqBWTbvpgrjqeZzX5kYhV nu18Xm7qYINfks/cR66Olnh0rrSz2hpdU1xqZ8xh4HeDorYQwPObi2ICbGKNN+Se4LQGGs VkPlMlklBoha9kIwASWpldo7MhVFDDoELpiRSFMPzkHvu4yq5gqmHYJQ/9+nnwLYmPMIDg mlI6XcXhs89XDTqbv7i011J3nah0I9fXuYewUN38GYowc37qwtF7U0tnL5c9aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313852; a=rsa-sha256; cv=none; b=TzvIcHyIUgMOsgZy2I1oCXIc+ubLD5WvbuBsycdfAhwboTUFu+lOywKQvnVVDJzT5GsS77 r7SwbcPvSWiz3SOLEF3/MewbHyUdRDM/yqOn9Qsgcsfwp++zUBEIgjKsdJPawluVHarSjA /O8F9Y96/thwmj+zCHW3fcZBrjI4j46JleDlwd4L4KkI1UmW8U7C5ovCnDzhkeD/PHPyA7 uEg4rjLEkCDICFvtbQqsoqZKE8ZgUEwYy1isTkFJSKifGaHgZnQmBrRtsAxq2B5ku8zKPz W1Xukn/b7L2QvasHRvqLTbHNPlqAJUGvDHgRjJwZWsEF2g28bylbGbORDs8/ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQf67kxz16WK; Wed, 4 Dec 2024 12:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4A5T049690; Wed, 4 Dec 2024 12:04:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4ACe049687; Wed, 4 Dec 2024 12:04:10 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:10 GMT Message-Id: <202412041204.4B4C4ACe049687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 01f650cb8d03 - stable/14 - sound: Merge ac97 and ac97_patch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 01f650cb8d034f1de4616d173fbfd62c85636b42 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=01f650cb8d034f1de4616d173fbfd62c85636b42 commit 01f650cb8d034f1de4616d173fbfd62c85636b42 Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:20 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Merge ac97 and ac97_patch No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47732 (cherry picked from commit 0b4e32912566d802c7a6501d9ce8119f04dbc2fb) --- sys/conf/files | 1 - sys/dev/sound/pcm/ac97.c | 96 +++++++++++++++++++++++++++++++- sys/dev/sound/pcm/ac97_patch.c | 117 --------------------------------------- sys/dev/sound/pcm/ac97_patch.h | 35 ------------ sys/modules/sound/sound/Makefile | 2 +- 5 files changed, 96 insertions(+), 155 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 68ca2fe2e6ec..2fc2d151e143 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3107,7 +3107,6 @@ dev/sound/pci/hdspe.c optional snd_hdspe pci dev/sound/pci/hdspe-pcm.c optional snd_hdspe pci dev/sound/pcm/ac97.c optional sound dev/sound/pcm/ac97_if.m optional sound -dev/sound/pcm/ac97_patch.c optional sound dev/sound/pcm/buffer.c optional sound \ dependency "snd_fxdiv_gen.h" dev/sound/pcm/channel.c optional sound diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index d04ec2d8271c..71eb387afa1b 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -32,7 +32,6 @@ #include #include -#include #include @@ -40,6 +39,8 @@ static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); +typedef void (*ac97_patch)(struct ac97_info *); + struct ac97mixtable_entry { int reg; /* register index */ /* reg < 0 if inverted polarity */ @@ -133,6 +134,12 @@ static const struct ac97_vendorid ac97vendorid[] = { { 0x00000000, NULL } }; +static void ad1886_patch(struct ac97_info *); +static void ad198x_patch(struct ac97_info *); +static void ad1981b_patch(struct ac97_info *); +static void cmi9739_patch(struct ac97_info *); +static void alc655_patch(struct ac97_info *); + static struct ac97_codecid ac97codecid[] = { { 0x41445303, 0x00, 0, "AD1819", 0 }, { 0x41445340, 0x00, 0, "AD1881", 0 }, @@ -872,6 +879,93 @@ ac97_getflags(struct ac97_info *codec) return codec->flags; } +static void +ad1886_patch(struct ac97_info *codec) +{ +#define AC97_AD_JACK_SPDIF 0x72 + /* + * Presario700 workaround + * for Jack Sense/SPDIF Register misetting causing + * no audible output + * by Santiago Nullo 04/05/2002 + */ + ac97_wrcd(codec, AC97_AD_JACK_SPDIF, 0x0010); +} + +static void +ad198x_patch(struct ac97_info *codec) +{ + switch (ac97_getsubvendor(codec)) { + case 0x11931043: /* Not for ASUS A9T (probably else too). */ + break; + default: + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0420); + break; + } +} + +static void +ad1981b_patch(struct ac97_info *codec) +{ + /* + * Enable headphone jack sensing. + */ + switch (ac97_getsubvendor(codec)) { + case 0x02d91014: /* IBM Thinkcentre */ + case 0x099c103c: /* HP nx6110 */ + ac97_wrcd(codec, AC97_AD_JACK_SPDIF, + ac97_rdcd(codec, AC97_AD_JACK_SPDIF) | 0x0800); + break; + default: + break; + } +} + +static void +cmi9739_patch(struct ac97_info *codec) +{ + /* + * Few laptops need extra register initialization + * to power up the internal speakers. + */ + switch (ac97_getsubvendor(codec)) { + case 0x18431043: /* ASUS W1000N */ + ac97_wrcd(codec, AC97_REG_POWER, 0x000f); + ac97_wrcd(codec, AC97_MIXEXT_CLFE, 0x0000); + ac97_wrcd(codec, 0x64, 0x7110); + break; + default: + break; + } +} + +static void +alc655_patch(struct ac97_info *codec) +{ + /* + * MSI (Micro-Star International) specific EAPD quirk. + */ + switch (ac97_getsubvendor(codec)) { + case 0x00611462: /* MSI S250 */ + case 0x01311462: /* MSI S270 */ + case 0x01611462: /* LG K1 Express */ + case 0x03511462: /* MSI L725 */ + ac97_wrcd(codec, 0x7a, ac97_rdcd(codec, 0x7a) & 0xfffd); + break; + case 0x10ca1734: + /* + * Amilo Pro V2055 with ALC655 has phone out by default + * disabled (surround on), leaving us only with internal + * speakers. This should really go to mixer. We write the + * Data Flow Control reg. + */ + ac97_wrcd(codec, 0x6a, ac97_rdcd(codec, 0x6a) | 0x0001); + break; + default: + break; + } +} + /* -------------------------------------------------------------------- */ static int diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c deleted file mode 100644 index 671b6598f51a..000000000000 --- a/sys/dev/sound/pcm/ac97_patch.c +++ /dev/null @@ -1,117 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2002 Orion Hodson - * 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. - */ - -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_snd.h" -#endif - -#include -#include -#include - -void ad1886_patch(struct ac97_info* codec) -{ -#define AC97_AD_JACK_SPDIF 0x72 - /* - * Presario700 workaround - * for Jack Sense/SPDIF Register misetting causing - * no audible output - * by Santiago Nullo 04/05/2002 - */ - ac97_wrcd(codec, AC97_AD_JACK_SPDIF, 0x0010); -} - -void ad198x_patch(struct ac97_info* codec) -{ - switch (ac97_getsubvendor(codec)) { - case 0x11931043: /* Not for ASUS A9T (probably else too). */ - break; - default: - ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0420); - break; - } -} - -void ad1981b_patch(struct ac97_info* codec) -{ - /* - * Enable headphone jack sensing. - */ - switch (ac97_getsubvendor(codec)) { - case 0x02d91014: /* IBM Thinkcentre */ - case 0x099c103c: /* HP nx6110 */ - ac97_wrcd(codec, AC97_AD_JACK_SPDIF, - ac97_rdcd(codec, AC97_AD_JACK_SPDIF) | 0x0800); - break; - default: - break; - } -} - -void cmi9739_patch(struct ac97_info* codec) -{ - /* - * Few laptops need extra register initialization - * to power up the internal speakers. - */ - switch (ac97_getsubvendor(codec)) { - case 0x18431043: /* ASUS W1000N */ - ac97_wrcd(codec, AC97_REG_POWER, 0x000f); - ac97_wrcd(codec, AC97_MIXEXT_CLFE, 0x0000); - ac97_wrcd(codec, 0x64, 0x7110); - break; - default: - break; - } -} - -void alc655_patch(struct ac97_info* codec) -{ - /* - * MSI (Micro-Star International) specific EAPD quirk. - */ - switch (ac97_getsubvendor(codec)) { - case 0x00611462: /* MSI S250 */ - case 0x01311462: /* MSI S270 */ - case 0x01611462: /* LG K1 Express */ - case 0x03511462: /* MSI L725 */ - ac97_wrcd(codec, 0x7a, ac97_rdcd(codec, 0x7a) & 0xfffd); - break; - case 0x10ca1734: - /* - * Amilo Pro V2055 with ALC655 has phone out by default - * disabled (surround on), leaving us only with internal - * speakers. This should really go to mixer. We write the - * Data Flow Control reg. - */ - ac97_wrcd(codec, 0x6a, ac97_rdcd(codec, 0x6a) | 0x0001); - break; - default: - break; - } -} diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h deleted file mode 100644 index 997b10dbd02c..000000000000 --- a/sys/dev/sound/pcm/ac97_patch.h +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2003 Orion Hodson - * 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. - */ - -typedef void (*ac97_patch)(struct ac97_info*); - -void ad1886_patch(struct ac97_info*); -void ad198x_patch(struct ac97_info*); -void ad1981b_patch(struct ac97_info*); -void cmi9739_patch(struct ac97_info*); -void alc655_patch(struct ac97_info*); diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 1c3685715503..b29154117719 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -16,7 +16,7 @@ SRCS+= feeder_matrix.c feeder_mixer.c 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+= ac97.c buffer.c channel.c dsp.c SRCS+= mixer.c sndstat.c sound.c vchan.c SRCS+= midi.c mpu401.c sequencer.c From nobody Wed Dec 4 12:04:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQh47q0z5gS7c; Wed, 04 Dec 2024 12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQh1fz8z46MM; Wed, 4 Dec 2024 12: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=1733313852; h=from:from:reply-to:subject:subject: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+Qh1FioAYbonkczGhvXdV0uJLM35JcDuvfGueo6beM=; b=YJL/OuSsv4D+55b7tmh0YGMs+0ilpZzo2YOVA/t46a5ghNzyGuODP2a1GfM/cy2jFr0Jh6 HQ+xO0YM877MHfersNXk8LO2xFbM1F1TXs40eHJoR98giFeQIh4F7oojdsN9j/VLZ3JYWF H5iJpVjnShtXg/KSxvLHgPpHz5aoF7mxK3LN5bp9i6bvc3/glaVw/YAi/mNOJT5UKNrRvF 6kSI93k8032K9pi2J82yxCYRz20PRKrlC9F1Eh1LtkAXo7lS7OvucHNMT4NNBtL49P/rZv h3PYByQKWo9kmTphrXSOYA78jnziq7pixGLZZOSNoc33delL6ONc0eWj0gn96A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313852; h=from:from:reply-to:subject:subject: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+Qh1FioAYbonkczGhvXdV0uJLM35JcDuvfGueo6beM=; b=i8gScQga5xYL8g8AQvF3tpV3NH7YRnHIt9WqEcLHiXPqFVd9FGQA6Rv95rigkI7fIYKuzb eBBB2o7xMit9I11TXydjqEhk4F5Y8FJN0oEkEhRQMur5IOdIK3UsPQzPS8E3DmPH/fOclH PgKIS7kjCljMK5ikbjwCBsrCsEEKVBjxM89hJmn7aQGvYYwjNYiXH+EE8qqoP0+03VVmej VCRkKxU4xg34iP437X1NNkmug1UtnAkssFuardV7lOVhT+EornlKVVRUJHmRyi8iXL0ORR AZxKw5BkSfx99I3XSroYtnBL0ftnsqtcfhLc9phebb70BRpVlHduLcbC4lvLcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313852; a=rsa-sha256; cv=none; b=k+6T2/FoVu5brTZL0nVF+saCkCYrv7pLKAGybSX+xacRQ5Wm3Ib3k6L9dhlXkzkPHYHXSG uCgzM4AuCguMnC3OuwKa6FDPv++VowmRryQq2QDA6OVd29v526aT9KwMTZ2KugclTB2d7Z eFMMjqCNMkzeb3NYChIDGqAT4rH9rhOTnsxLHEOdWg0zW51kDlfmhgJD06L4SMEX4oFsaJ +sjB3fVp1ldYg2XbXKTT/2OPg1yTU0Thopf20krM270HIIcGKuGro2p5//YqKAmC8MNwu6 5ui6dbl9kfzOvprvL7wzV8BJQIuYPXz2jnXT527750XLMdxbxY9tZqhZHCRkIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQh0Dj0z16Gr; Wed, 4 Dec 2024 12:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4BBk049735; Wed, 4 Dec 2024 12:04:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4BEb049732; Wed, 4 Dec 2024 12:04:11 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:11 GMT Message-Id: <202412041204.4B4C4BEb049732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 03241eb78078 - stable/14 - sound: Remove dead code from pcm/ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 03241eb78078a9cd319ec50822762d926d14bc30 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=03241eb78078a9cd319ec50822762d926d14bc30 commit 03241eb78078a9cd319ec50822762d926d14bc30 Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:27 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Remove dead code from pcm/ No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47733 (cherry picked from commit 00731aaaed76785af8befe13e9a4e85b3554b3f5) --- sys/dev/sound/pcm/ac97.c | 23 ------------------ sys/dev/sound/pcm/buffer.c | 9 ------- sys/dev/sound/pcm/channel.c | 53 ----------------------------------------- sys/dev/sound/pcm/dsp.c | 22 ----------------- sys/dev/sound/pcm/feeder.h | 26 -------------------- sys/dev/sound/pcm/feeder_rate.c | 21 ---------------- 6 files changed, 154 deletions(-) diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index 71eb387afa1b..f5ca06cd3942 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -322,12 +322,6 @@ ac97_rdcd(struct ac97_info *codec, int reg) i[1] = AC97_READ(codec->methods, codec->devinfo, reg); while (i[0] != i[1] && j) i[j-- & 1] = AC97_READ(codec->methods, codec->devinfo, reg); -#if 0 - if (j < 100) { - device_printf(codec->dev, "%s(): Inconsistent register value at" - " 0x%08x (retry: %d)\n", __func__, reg, 100 - j); - } -#endif return i[!(j & 1)]; } return AC97_READ(codec->methods, codec->devinfo, reg); @@ -512,9 +506,6 @@ ac97_setmixer(struct ac97_info *codec, unsigned channel, unsigned left, unsigned snd_mtxunlock(codec->lock); return left | (right << 8); } else { -#if 0 - printf("ac97_setmixer: reg=%d, bits=%d, enable=%d\n", e->reg, e->bits, e->enable); -#endif return -1; } } @@ -737,10 +728,6 @@ ac97_initmixer(struct ac97_info *codec) for (j = 0; k >> j; j++) ; if (j != 0) { -#if 0 - device_printf(codec->dev, "%2d: [ac97_rdcd() = %d] [Testbit = %d] %d -> %d\n", - i, k, bit, codec->mix[i].bits, j); -#endif codec->mix[i].enable = 1; codec->mix[i].bits = j; } else if (reg == AC97_MIX_BEEP) { @@ -756,9 +743,6 @@ ac97_initmixer(struct ac97_info *codec) codec->mix[i].enable = 0; ac97_wrcd(codec, reg, old); } -#if 0 - printf("mixch %d, en=%d, b=%d\n", i, codec->mix[i].enable, codec->mix[i].bits); -#endif } device_printf(codec->dev, "<%s>\n", @@ -1097,13 +1081,6 @@ ac97mix_init(struct snd_mixer *m) if (pcm_getflags(codec->dev) & SD_F_SOFTPCMVOL) ac97_wrcd(codec, AC97_MIX_PCM, 0); -#if 0 - /* XXX For the sake of debugging purposes */ - mix_setparentchild(m, SOUND_MIXER_VOLUME, - SOUND_MASK_PCM | SOUND_MASK_CD); - mix_setrealdev(m, SOUND_MIXER_VOLUME, SOUND_MIXER_NONE); - ac97_wrcd(codec, AC97_MIX_MASTER, 0); -#endif mask = 0; for (i = 0; i < AC97_MIXER_SIZE; i++) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index afb4b95e357a..8bf3631afb7a 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -356,15 +356,6 @@ sndbuf_setfmt(struct snd_dbuf *b, u_int32_t fmt) b->fmt = fmt; b->bps = AFMT_BPS(b->fmt); b->align = AFMT_ALIGN(b->fmt); -#if 0 - b->bps = AFMT_CHANNEL(b->fmt); - if (b->fmt & AFMT_16BIT) - b->bps <<= 1; - else if (b->fmt & AFMT_24BIT) - b->bps *= 3; - else if (b->fmt & AFMT_32BIT) - b->bps <<= 2; -#endif return 0; } diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index f619ddd4bc35..728284b055e5 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -405,23 +405,6 @@ chn_wrfeed(struct pcm_channel *c) chn_wakeup(c); } -#if 0 -static void -chn_wrupdate(struct pcm_channel *c) -{ - - CHN_LOCKASSERT(c); - KASSERT(c->direction == PCMDIR_PLAY, ("%s(): bad channel", __func__)); - - if ((c->flags & (CHN_F_MMAP | CHN_F_VIRTUAL)) || CHN_STOPPED(c)) - return; - chn_dmaupdate(c); - chn_wrfeed(c); - /* tell the driver we've updated the primary buffer */ - chn_trigger(c, PCMTRIG_EMLDMAWR); -} -#endif - static void chn_wrintr(struct pcm_channel *c) { @@ -535,22 +518,6 @@ chn_rdfeed(struct pcm_channel *c) chn_wakeup(c); } -#if 0 -static void -chn_rdupdate(struct pcm_channel *c) -{ - - CHN_LOCKASSERT(c); - KASSERT(c->direction == PCMDIR_REC, ("chn_rdupdate on bad channel")); - - if ((c->flags & (CHN_F_MMAP | CHN_F_VIRTUAL)) || CHN_STOPPED(c)) - return; - chn_trigger(c, PCMTRIG_EMLDMARD); - chn_dmaupdate(c); - chn_rdfeed(c); -} -#endif - /* read interrupt routine. Must be called with interrupts blocked. */ static void chn_rdintr(struct pcm_channel *c) @@ -1980,12 +1947,6 @@ chn_resizebuf(struct pcm_channel *c, int latency, hblksz -= hblksz % sndbuf_getalign(b); -#if 0 - hblksz = sndbuf_getmaxsize(b) >> 1; - hblksz -= hblksz % sndbuf_getalign(b); - hblkcnt = 2; -#endif - CHN_UNLOCK(c); if (chn_usefrags == 0 || CHANNEL_SETFRAGMENTS(c->methods, c->devinfo, @@ -2016,14 +1977,6 @@ chn_resizebuf(struct pcm_channel *c, int latency, if (limit > CHN_2NDBUFMAXSIZE) limit = CHN_2NDBUFMAXSIZE; -#if 0 - while (limit > 0 && (sblksz * sblkcnt) > limit) { - if (sblkcnt < 4) - break; - sblkcnt >>= 1; - } -#endif - while ((sblksz * sblkcnt) < limit) sblkcnt <<= 1; @@ -2140,12 +2093,6 @@ chn_setspeed(struct pcm_channel *c, uint32_t speed) uint32_t oldformat, oldspeed, format; int ret; -#if 0 - /* XXX force 48k */ - if (c->format & AFMT_PASSTHROUGH) - speed = AFMT_PASSTHROUGH_RATE; -#endif - oldformat = c->format; oldspeed = c->speed; format = oldformat; diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index ccf240681a25..dcbdd581c82a 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1257,7 +1257,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct snd_dbuf *bs = wrch->bufsoft; CHN_LOCK(wrch); - /* XXX abusive DMA update: chn_wrupdate(wrch); */ a->bytes = sndbuf_getfree(bs); a->fragments = a->bytes / sndbuf_getblksz(bs); a->fragstotal = sndbuf_getblkcnt(bs); @@ -1275,7 +1274,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct snd_dbuf *bs = rdch->bufsoft; CHN_LOCK(rdch); - /* XXX abusive DMA update: chn_rdupdate(rdch); */ a->bytes = sndbuf_gettotal(bs); a->blocks = sndbuf_getblocks(bs) - rdch->blocks; a->ptr = sndbuf_getfreeptr(bs); @@ -1293,7 +1291,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct snd_dbuf *bs = wrch->bufsoft; CHN_LOCK(wrch); - /* XXX abusive DMA update: chn_wrupdate(wrch); */ a->bytes = sndbuf_gettotal(bs); a->blocks = sndbuf_getblocks(bs) - wrch->blocks; a->ptr = sndbuf_getreadyptr(bs); @@ -1385,7 +1382,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct snd_dbuf *bs = wrch->bufsoft; CHN_LOCK(wrch); - /* XXX abusive DMA update: chn_wrupdate(wrch); */ *arg_i = sndbuf_getready(bs); CHN_UNLOCK(wrch); } else @@ -1582,14 +1578,8 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, CHN_LOCK(chn); bs = chn->bufsoft; -#if 0 - tmp = (sndbuf_getsize(b) + chn_getptr(chn) - sndbuf_gethwptr(b)) % sndbuf_getsize(b); - oc->samples = (sndbuf_gettotal(b) + tmp) / sndbuf_getalign(b); - oc->fifo_samples = (sndbuf_getready(b) - tmp) / sndbuf_getalign(b); -#else oc->samples = sndbuf_gettotal(bs) / sndbuf_getalign(bs); oc->fifo_samples = sndbuf_getready(bs) / sndbuf_getalign(bs); -#endif CHN_UNLOCK(chn); } break; @@ -1738,18 +1728,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, case SNDCTL_SETNAME: ret = dsp_oss_setname(wrch, rdch, (oss_longname_t *)arg); break; -#if 0 - /** - * @note The S/PDIF interface ioctls, @c SNDCTL_DSP_READCTL and - * @c SNDCTL_DSP_WRITECTL have been omitted at the suggestion of - * 4Front Technologies. - */ - case SNDCTL_DSP_READCTL: - case SNDCTL_DSP_WRITECTL: - ret = EINVAL; - break; -#endif /* !0 (explicitly omitted ioctls) */ - #endif /* !OSSV4_EXPERIMENT */ case SNDCTL_DSP_MAPINBUF: case SNDCTL_DSP_MAPOUTBUF: diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 1e240d934e94..60b8280e59ef 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -167,32 +167,6 @@ int feeder_matrix_oss_get_channel_order(struct pcmchan_matrix *, int feeder_matrix_oss_set_channel_order(struct pcmchan_matrix *, unsigned long long *); -#if 0 -/* feeder_matrix */ -enum { - FEEDMATRIX_TYPE, - FEEDMATRIX_RESET, - FEEDMATRIX_CHANNELS_IN, - FEEDMATRIX_CHANNELS_OUT, - FEEDMATRIX_SET_MAP -}; - -enum { - FEEDMATRIX_TYPE_NONE, - FEEDMATRIX_TYPE_AUTO, - FEEDMATRIX_TYPE_2X1, - FEEDMATRIX_TYPE_1X2, - FEEDMATRIX_TYPE_2X2 -}; - -#define FEEDMATRIX_TYPE_STEREO_TO_MONO FEEDMATRIX_TYPE_2X1 -#define FEEDMATRIX_TYPE_MONO_TO_STEREO FEEDMATRIX_TYPE_1X2 -#define FEEDMATRIX_TYPE_SWAP_STEREO FEEDMATRIX_TYPE_2X2 -#define FEEDMATRIX_MAP(x, y) ((((x) & 0x3f) << 6) | ((y) & 0x3f)) -#define FEEDMATRIX_MAP_SRC(x) ((x) & 0x3f) -#define FEEDMATRIX_MAP_DST(x) (((x) >> 6) & 0x3f) -#endif - /* * By default, various feeders only deal with sign 16/32 bit native-endian * since it should provide the fastest processing path. Processing 8bit samples diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 77de21e7a31a..40e5d3018ab4 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -431,11 +431,6 @@ z_roundpow2(int32_t v) static void z_feed_zoh(struct z_info *info, uint8_t *dst) { -#if 0 - z_copy(info->z_delay + - (info->z_start * info->channels * info->bps), dst, - info->channels * info->bps); -#else uint32_t cnt; uint8_t *src; @@ -449,7 +444,6 @@ z_feed_zoh(struct z_info *info, uint8_t *dst) do { *dst++ = *src++; } while (--cnt != 0); -#endif } /* @@ -1171,14 +1165,6 @@ z_setup_adaptive_sinc: info->z_scale = Z_ONE; } -#if 0 -#define Z_SCALE_DIV 10000 -#define Z_SCALE_LIMIT(s, v) \ - ((((uint64_t)(s) * (v)) + (Z_SCALE_DIV >> 1)) / Z_SCALE_DIV) - - info->z_scale = Z_SCALE_LIMIT(info->z_scale, 9780); -#endif - /* Smallest drift increment. */ info->z_dx = info->z_dy / info->z_gy; @@ -1672,12 +1658,6 @@ z_resampler_feed_internal(struct pcm_feeder *f, struct pcm_channel *c, */ do { info->z_resample(info, dst); -#if 0 - startdrift = z_gy2gx(info, 1); - alphadrift = z_drift(info, startdrift, 1); - info->z_start += startdrift; - info->z_alpha += alphadrift; -#else info->z_alpha += alphadrift; if (info->z_alpha < info->z_gy) info->z_start += startdrift; @@ -1685,7 +1665,6 @@ z_resampler_feed_internal(struct pcm_feeder *f, struct pcm_channel *c, info->z_start += startdrift - 1; info->z_alpha -= info->z_gy; } -#endif dst += align; #ifdef Z_DIAGNOSTIC info->z_cycle++; From nobody Wed Dec 4 12:04:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQj58C6z5gS34; Wed, 04 Dec 2024 12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQj2nrwz46PY; Wed, 4 Dec 2024 12: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=1733313853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6SN++cWYyRY1f9VFAy9S7G1/lfo7FNmCRZY/AFY1uU=; b=vlscyLPKeQO5SzLc2RPCDFTQUwCbCGONIrp1dtBITOmMhf0ipeJn3MurA2cScVfM8viEkI 2nFwaLHSA5qzx6OU9A/4oTA2pHr5P4yNAJBA069OB48Hs8EolmCoDRC5tlmFPWvZWKCljp hiIafD4iZCClvLCy8Xp92B9gzi1ND6pJ3nk3gOdlztTkNQSRCs8lLgdCtqf/PujZbVUXM/ 8J0rHotBuZ6RlIReZ4HdtfZ40jMeChGOjQmt+lNB3b40sbRAqmMPPSVaWmLx/mVmn6LQ9/ j8aIrkKSmPC8YCKPjxEVlz6b57cmNpF6r/qOZJbhRT6PDlh6b3BSTnZD4tqPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6SN++cWYyRY1f9VFAy9S7G1/lfo7FNmCRZY/AFY1uU=; b=Bwn1xa4lE1lp3Mt+OJm8rXxYSV1w1EaHbA52oojSLh7WoNd9OnUEy2Iuo1j9lJDRPOZ3Py WUt+RchjzVn/snN6B7ntmg9xx+vzHfdgyRRPj6zP5P/boc8F4Y6TJ+mnShhfrzXdZErFhg QZEybILY9AesnfJGPhprYO5bvfCRIbk5sElsqVslw27sIgygnzkOikEmTqwMFREhjnEOF5 L8jnC3/FGB3ToGplxdtVm2LgvgKbIX9fsiFXgt28voQINtZfI3cGsSnQgxDIvfBDFF1zYy vZ9UA3LvgbbWxUErHA2nmhiWpG12XogpZvA9ultzDaIjhIbR9dfDqKOb0V2WmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313853; a=rsa-sha256; cv=none; b=SctAwsd3d31BhcP8I9cZHgPgVIvmfYLtlz6xOrKrSbSFsjcABms7/NmGxqwHd6+ItNseXr +WCrAw0SPljnublzWe9jdzpQUzvaDLd3qPa5ebKhnWv1//YxVkUGIxi/jZWO8L8uSPW4pf EaYWQXzIXJ/U6Q9HtSWynj5485UhLrWD3q3PmH2i/xeIshu6dzsRpq9wcr63YTKe2S3SfP GbRlrYN6wLYDewGbDHwzRDob38C13entv+WAruKTqpU4770DfapqFCG+fS2NwbR5Gbnj7D sequu8leCxdma1Z82K/kcTA+ZfFYn218joUg3m9MunB4uztu0QsyO+kQZ9Qw/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQj10CCz16F8; Wed, 4 Dec 2024 12:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4DG9049786; Wed, 4 Dec 2024 12:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4Dib049783; Wed, 4 Dec 2024 12:04:13 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:13 GMT Message-Id: <202412041204.4B4C4Dib049783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 732bb2807dc8 - stable/14 - sound: Remove unused code from pcm/g711.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 732bb2807dc8dcc13822e6511e1703cce26a27cd Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=732bb2807dc8dcc13822e6511e1703cce26a27cd commit 732bb2807dc8dcc13822e6511e1703cce26a27cd Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:32 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Remove unused code from pcm/g711.h These routines are already implemented in pcm/intpcm.h. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47734 (cherry picked from commit b882251204128388eb2f8e4f74e83ff1ca7863c4) --- sys/dev/sound/pcm/g711.h | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h index fe9ddb651c8b..b7a57dd17a6b 100644 --- a/sys/dev/sound/pcm/g711.h +++ b/sys/dev/sound/pcm/g711.h @@ -187,37 +187,4 @@ static const struct { \ U8_TO_ULAW, U8_TO_ALAW \ } -#define G711_DECLARE_OP(t) \ -static __inline intpcm_t \ -pcm_read_ulaw(uint8_t v) \ -{ \ - \ - return (_G711_TO_INTPCM((t).ulaw_to_u8, v)); \ -} \ - \ -static __inline intpcm_t \ -pcm_read_alaw(uint8_t v) \ -{ \ - \ - return (_G711_TO_INTPCM((t).alaw_to_u8, v)); \ -} \ - \ -static __inline void \ -pcm_write_ulaw(uint8_t *dst, intpcm_t v) \ -{ \ - \ - *dst = _INTPCM_TO_G711((t).u8_to_ulaw, v); \ -} \ - \ -static __inline void \ -pcm_write_alaw(uint8_t *dst, intpcm_t v) \ -{ \ - \ - *dst = _INTPCM_TO_G711((t).u8_to_alaw, v); \ -} - -#define G711_DECLARE(t) \ - G711_DECLARE_TABLE(t); \ - G711_DECLARE_OP(t) - #endif /* !_SND_G711_H_ */ From nobody Wed Dec 4 12:04:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQk5mWPz5gS7f; Wed, 04 Dec 2024 12:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQk2vlyz46Wt; Wed, 4 Dec 2024 12:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSRc2VPDKbld9tpcjl8Y8WMdEPcyMRByw2f5J6dfPHQ=; b=sGjURQiHHPn0u6ULfjysvos+peDJUV3rMsJ8C7OQZ8g0LLEer48TIvDtiygfuYbC7gfcVn chzXhyK89gDanEW+cGtDwmRFP8zIiG/eZiMFblBGn3dyziSHdjPkYUR2kjh+HgAueJZSjS 2oy87kuamnGFOTIDdm279QnjUgv/3BKLJcYjzvvx2XAdGsX+Ui0aYvXXBz2xsclWPujDHx 2aGYksNFGvnoyKZ/bP4ms5EZXgdPmLcyoJfhz0BNKvtXB6Pf/C6bQJxPaWh1NLb55w9180 6YOu5KHeVgxN4vIKwpZszrBHzZlPjhGYsfrT8X2d39nwEOMPjE3q+dM7JbDKxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSRc2VPDKbld9tpcjl8Y8WMdEPcyMRByw2f5J6dfPHQ=; b=h5mvygU2na53VcVi+STDokvo7Vw6FMZzZGAkFQkKuSJahJmFSpj0L9TXaXmzTWEKIMKTFf uwQFJVedBYwbb4iSx2H7Ke//likfdQol9+TjjbcpxcPHhkxBsp3aD01XNiUoj+kANigNTN qPBiAOj2hSH2CaOoSbDvirFMxoR319+xNnRe1/DnQddh+4Hm6LYK/orVKrlfMUU4RpvLi1 F92rldup0i4oIiR0kKfSF0c5QZF5mHfhBqiV72V+b2KtuoZtAKjOsgkRo8E6c90a9M5Mle aQeEWqJVJV7BzBDtchJwCc7du4VaXNsnXPC7EgXnSK/kZM4JXWJ+qY0DtyfX+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313854; a=rsa-sha256; cv=none; b=kiTMq/JrzCEkOUWudgZwrsxGL8plTyd1FKBZ1yM9Ctql/88MT0Pfn0ULKJKbVP9gzAMiV4 VrhsNtukTeDPd//MZTBtQ5o7HJXrliLnATxT9B9d/LJFb38+icavQ/oiMfYnQPMztfGllR XfacRVmCm8GZ62y7bvJeWKK0u1groMVPJYNb/FkD+gr3BRfqU5OWGbjPXQFKmS9tkwxJh/ UpjcJqYY8l4VuuvxrTF8Ohyb0NLUDbpP96m5lsFcQ2eCKRr5LN1s0A8eJVtY5el33K3Hse qrI+d4TXJtBhGmsXF2JOHqrD40jUfItML4Q8JSCBn17Sl2vr6qjm2SEdiuExrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQk200cz16F9; Wed, 4 Dec 2024 12:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4Ets049823; Wed, 4 Dec 2024 12:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4EtT049820; Wed, 4 Dec 2024 12:04:14 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:14 GMT Message-Id: <202412041204.4B4C4EtT049820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1b4b19841cbd - stable/14 - sound: Dissolve pcm/intpcm.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b4b19841cbdf537ef723b38eb22f21493c0174d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1b4b19841cbdf537ef723b38eb22f21493c0174d commit 1b4b19841cbdf537ef723b38eb22f21493c0174d Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:38 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Dissolve pcm/intpcm.h Part of a series of patches to cleanup/simplify pcm/. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47736 (cherry picked from commit 88eaa1504d12c82a36d83c16e9fd6c41175d2e0a) --- sys/dev/sound/pcm/feeder.h | 7 ++ sys/dev/sound/pcm/feeder_format.c | 106 ++++++++++++++++++++++++++++-- sys/dev/sound/pcm/g711.h | 11 ---- sys/dev/sound/pcm/intpcm.h | 135 -------------------------------------- sys/dev/sound/pcm/sound.h | 1 + 5 files changed, 109 insertions(+), 151 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 60b8280e59ef..bd0d9dcb8f9c 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -161,6 +161,13 @@ int feeder_matrix_setup(struct pcm_feeder *, struct pcmchan_matrix *, struct pcmchan_matrix *); int feeder_matrix_compare(struct pcmchan_matrix *, struct pcmchan_matrix *); +/* feeder_format */ +typedef intpcm_t intpcm_read_t(uint8_t *); +typedef void intpcm_write_t(uint8_t *, intpcm_t); + +intpcm_read_t *feeder_format_read_op(uint32_t); +intpcm_write_t *feeder_format_write_op(uint32_t); + /* 4Front OSS stuffs */ int feeder_matrix_oss_get_channel_order(struct pcmchan_matrix *, unsigned long long *); diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 3bdd808df0ee..53c7d3768a32 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -36,9 +36,7 @@ #include "opt_snd.h" #endif #include -#include #include -#include #include "feeder_if.h" #define SND_USE_FXDIV @@ -47,8 +45,6 @@ #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) -INTPCM_DECLARE(intpcm_conv_tables) - struct feed_format_info { uint32_t ibps, obps; uint32_t ialign, oalign, channels; @@ -57,6 +53,107 @@ struct feed_format_info { uint8_t reservoir[FEEDFORMAT_RESERVOIR]; }; +#define INTPCM_DECLARE_OP_WRITE(SIGN, BIT, ENDIAN, SHIFT) \ +static __inline void \ +intpcm_write_##SIGN##BIT##ENDIAN(uint8_t *dst, intpcm_t v) \ +{ \ + \ + _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v >> SHIFT); \ +} + +#define INTPCM_DECLARE_OP_8(SIGN, ENDIAN) \ +static __inline intpcm_t \ +intpcm_read_##SIGN##8##ENDIAN(uint8_t *src) \ +{ \ + \ + return (_PCM_READ_##SIGN##8##_##ENDIAN(src) << 24); \ +} \ +INTPCM_DECLARE_OP_WRITE(SIGN, 8, ENDIAN, 24) + +#define INTPCM_DECLARE_OP_16(SIGN, ENDIAN) \ +static __inline intpcm_t \ +intpcm_read_##SIGN##16##ENDIAN(uint8_t *src) \ +{ \ + \ + return (_PCM_READ_##SIGN##16##_##ENDIAN(src) << 16); \ +} \ +INTPCM_DECLARE_OP_WRITE(SIGN, 16, ENDIAN, 16) + +#define INTPCM_DECLARE_OP_24(SIGN, ENDIAN) \ +static __inline intpcm_t \ +intpcm_read_##SIGN##24##ENDIAN(uint8_t *src) \ +{ \ + \ + return (_PCM_READ_##SIGN##24##_##ENDIAN(src) << 8); \ +} \ +INTPCM_DECLARE_OP_WRITE(SIGN, 24, ENDIAN, 8) + +#define INTPCM_DECLARE_OP_32(SIGN, ENDIAN) \ +static __inline intpcm_t \ +intpcm_read_##SIGN##32##ENDIAN(uint8_t *src) \ +{ \ + \ + return (_PCM_READ_##SIGN##32##_##ENDIAN(src)); \ +} \ + \ +static __inline void \ +intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \ +{ \ + \ + _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \ +} + +INTPCM_DECLARE_OP_8(S, NE) +INTPCM_DECLARE_OP_16(S, LE) +INTPCM_DECLARE_OP_16(S, BE) +INTPCM_DECLARE_OP_24(S, LE) +INTPCM_DECLARE_OP_24(S, BE) +INTPCM_DECLARE_OP_32(S, LE) +INTPCM_DECLARE_OP_32(S, BE) +INTPCM_DECLARE_OP_8(U, NE) +INTPCM_DECLARE_OP_16(U, LE) +INTPCM_DECLARE_OP_16(U, BE) +INTPCM_DECLARE_OP_24(U, LE) +INTPCM_DECLARE_OP_24(U, BE) +INTPCM_DECLARE_OP_32(U, LE) +INTPCM_DECLARE_OP_32(U, BE) + +static const struct { + const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; + const uint8_t alaw_to_u8[G711_TABLE_SIZE]; + const uint8_t u8_to_ulaw[G711_TABLE_SIZE]; + const uint8_t u8_to_alaw[G711_TABLE_SIZE]; +} xlaw_conv_tables = { + ULAW_TO_U8, + ALAW_TO_U8, + U8_TO_ULAW, + U8_TO_ALAW +}; + +static __inline intpcm_t +intpcm_read_ulaw(uint8_t *src) +{ + return (_G711_TO_INTPCM(xlaw_conv_tables.ulaw_to_u8, *src) << 24); +} + +static __inline intpcm_t +intpcm_read_alaw(uint8_t *src) +{ + return (_G711_TO_INTPCM(xlaw_conv_tables.alaw_to_u8, *src) << 24); +} + +static __inline void +intpcm_write_ulaw(uint8_t *dst, intpcm_t v) +{ + *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_ulaw, v >> 24); +} + +static __inline void +intpcm_write_alaw(uint8_t *dst, intpcm_t v) +{ + *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_alaw, v >> 24); +} + /* * dummy ac3/dts passthrough, etc. * XXX assume as s16le. @@ -269,7 +366,6 @@ static kobj_method_t feeder_format_methods[] = { FEEDER_DECLARE(feeder_format, NULL); -/* Extern */ intpcm_read_t * feeder_format_read_op(uint32_t format) { diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h index b7a57dd17a6b..481ef368e144 100644 --- a/sys/dev/sound/pcm/g711.h +++ b/sys/dev/sound/pcm/g711.h @@ -176,15 +176,4 @@ #define _INTPCM_TO_G711(t, v) ((t)[(uint8_t)((v) ^ 0x80)]) -#define G711_DECLARE_TABLE(t) \ -static const struct { \ - const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; \ - const uint8_t alaw_to_u8[G711_TABLE_SIZE]; \ - const uint8_t u8_to_ulaw[G711_TABLE_SIZE]; \ - const uint8_t u8_to_alaw[G711_TABLE_SIZE]; \ -} t = { \ - ULAW_TO_U8, ALAW_TO_U8, \ - U8_TO_ULAW, U8_TO_ALAW \ -} - #endif /* !_SND_G711_H_ */ diff --git a/sys/dev/sound/pcm/intpcm.h b/sys/dev/sound/pcm/intpcm.h deleted file mode 100644 index 1e85535feec1..000000000000 --- a/sys/dev/sound/pcm/intpcm.h +++ /dev/null @@ -1,135 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2008-2009 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_INTPCM_H_ -#define _SND_INTPCM_H_ - -typedef intpcm_t intpcm_read_t(uint8_t *); -typedef void intpcm_write_t(uint8_t *, intpcm_t); - -extern intpcm_read_t *feeder_format_read_op(uint32_t); -extern intpcm_write_t *feeder_format_write_op(uint32_t); - -#define INTPCM_DECLARE_OP_WRITE(SIGN, BIT, ENDIAN, SHIFT) \ -static __inline void \ -intpcm_write_##SIGN##BIT##ENDIAN(uint8_t *dst, intpcm_t v) \ -{ \ - \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v >> SHIFT); \ -} - -#define INTPCM_DECLARE_OP_8(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##8##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##8##_##ENDIAN(src) << 24); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 8, ENDIAN, 24) - -#define INTPCM_DECLARE_OP_16(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##16##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##16##_##ENDIAN(src) << 16); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 16, ENDIAN, 16) - -#define INTPCM_DECLARE_OP_24(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##24##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##24##_##ENDIAN(src) << 8); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 24, ENDIAN, 8) - -#define INTPCM_DECLARE_OP_32(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##32##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##32##_##ENDIAN(src)); \ -} \ - \ -static __inline void \ -intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \ -{ \ - \ - _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \ -} - -#define INTPCM_DECLARE(t) \ - \ -G711_DECLARE_TABLE(t); \ - \ -static __inline intpcm_t \ -intpcm_read_ulaw(uint8_t *src) \ -{ \ - \ - return (_G711_TO_INTPCM((t).ulaw_to_u8, *src) << 24); \ -} \ - \ -static __inline intpcm_t \ -intpcm_read_alaw(uint8_t *src) \ -{ \ - \ - return (_G711_TO_INTPCM((t).alaw_to_u8, *src) << 24); \ -} \ - \ -static __inline void \ -intpcm_write_ulaw(uint8_t *dst, intpcm_t v) \ -{ \ - \ - *dst = _INTPCM_TO_G711((t).u8_to_ulaw, v >> 24); \ -} \ - \ -static __inline void \ -intpcm_write_alaw(uint8_t *dst, intpcm_t v) \ -{ \ - \ - *dst = _INTPCM_TO_G711((t).u8_to_alaw, v >> 24); \ -} \ - \ -INTPCM_DECLARE_OP_8(S, NE) \ -INTPCM_DECLARE_OP_16(S, LE) \ -INTPCM_DECLARE_OP_16(S, BE) \ -INTPCM_DECLARE_OP_24(S, LE) \ -INTPCM_DECLARE_OP_24(S, BE) \ -INTPCM_DECLARE_OP_32(S, LE) \ -INTPCM_DECLARE_OP_32(S, BE) \ -INTPCM_DECLARE_OP_8(U, NE) \ -INTPCM_DECLARE_OP_16(U, LE) \ -INTPCM_DECLARE_OP_16(U, BE) \ -INTPCM_DECLARE_OP_24(U, LE) \ -INTPCM_DECLARE_OP_24(U, BE) \ -INTPCM_DECLARE_OP_32(U, LE) \ -INTPCM_DECLARE_OP_32(U, BE) - -#endif /* !_SND_INTPCM_H_ */ diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 467adad2ddff..e70a61f3b6d5 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -85,6 +85,7 @@ struct snd_mixer; #include #include #include +#include #include #include #include From nobody Wed Dec 4 12:04:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQl5t10z5gSN2; Wed, 04 Dec 2024 12:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQl31h9z46Tl; Wed, 4 Dec 2024 12:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glXgt+hYlD/XpmaK1Y4WIDT1LbP1IcXIJywrRw/+Nn0=; b=yPCXQ9MrqZlP5hoxSzErqveNasKzA8sjevKgnGd4rQK1UGGuYb4EAEBS9E0ucHlyu8vZ7y W9ZgFFnMGryNHdjZY8y7o8UtuwhKuQToTDRXLhY44mZgS99Yi6iIvY3J2N31j6Rlwp7S3Q tzzTbS+2Cg6KoZKLcPy/Ndj6AJMBhpah4X2VcHCxx1pJ/CrBskkYM1o0hUPj5byEzqT19j ZtUCkifTpjQ7B7cZFibAzVh5sz+vx3oAoJKElvDlHz6YfP1GyF0CfWp5wTSWPAwBnbQ2sJ SIvBwT51ZKVC6xsiPZI/MGCiVNhhy4tCC1PVPcleC3Iog46ytHWbZnlQhZzw/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glXgt+hYlD/XpmaK1Y4WIDT1LbP1IcXIJywrRw/+Nn0=; b=eeW2bp5o6tZMfc5TVKdTzUuyn/e1Ip32m/K3oWgYBWMtBVjFGh/MYiYWa5ydc1VIRsypw0 huaKFWFqjyi1yVPa8uvKKbGr59ICJa+1XJYUgEi7DRbRaal588Lo16kTeFAWzgLYb3RwRU kEuPjiOzYaHZGNpxma/9/M4VsNp0/8bNqXi9sIsTkavTfRjCWnRkuqm2bDPtpXKO9BvGTy owmyUH0SSyoY0Hy1EFYNkNHr3DciEPaD+fklqLyEbe1lq/7+9Hqm9WlpGApTP9uIMwH/CV ES8ymlvUiXb6u2yq/GoFH8uGrcIhlYKTKxfZzHxRjd9RNjSLqZzrMRUw2Aw49g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313855; a=rsa-sha256; cv=none; b=fJJswGwpBcGJVQKKbNS7K5CXmRJdsF2/DtYU+r4Y1XnFMIAP6ifj15GVKbTk6c+sFueuTz Qa6WDuiVp8/9VkR96oe6K8HHVASlTOlGM/+21z3gjccdOV0kYSiBJunNolABk94R0clD37 ZegOOLcrWl6U77T88WSSTFBOjLPwuC0qWPOp4INhgHLpaBd66dI0J9eqny1hyvPlyDaIdx RDipSodWxLezQ8Fwmd8XkCo7Dzu/+e6fX7YQ3gLa1IAMN96HSx68eRAazc9JIQV01NYM8s bVDrv6PNzq7M93mn3PHyTaY/BdKRZSiy+K3tZZYB6XB40Xj5fSymps4kwhEaNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQl2Rwkz163c; Wed, 4 Dec 2024 12:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4Fuv049865; Wed, 4 Dec 2024 12:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4Fp6049862; Wed, 4 Dec 2024 12:04:15 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:15 GMT Message-Id: <202412041204.4B4C4Fp6049862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2c17a7d8f65d - stable/14 - sound: Merge pcm/matrix_map.h with pcm/matrix.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c17a7d8f65d99f9f24a369236aa163eaaab63e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2c17a7d8f65d99f9f24a369236aa163eaaab63e1 commit 2c17a7d8f65d99f9f24a369236aa163eaaab63e1 Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:43 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Merge pcm/matrix_map.h with pcm/matrix.h No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47737 (cherry picked from commit 5a217a8d7d2a0dc19eb5d7bb1bd0f21116fbcf69) --- sys/dev/sound/pcm/matrix.h | 640 +++++++++++++++++++++++++++++++++++++++ sys/dev/sound/pcm/matrix_map.h | 672 ----------------------------------------- sys/dev/sound/pcm/sound.h | 1 - 3 files changed, 640 insertions(+), 673 deletions(-) diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h index 14f3a3410a70..e2798c651536 100644 --- a/sys/dev/sound/pcm/matrix.h +++ b/sys/dev/sound/pcm/matrix.h @@ -217,4 +217,644 @@ (x)[SND_VOL_C_MASTER][z]) / \ (x)[SND_VOL_C_MASTER][SND_CHN_T_VOL_0DB]) \ +/* + * Standard matrix maps: + * + * struct pcmchan_matrix { + * .id = Matrix identity (see matrix.h). Custom defined should use + * one of SND_CHN_MATRIX_MISC (for whatever purposes) or + * SND_CHN_MATRIX_DRV (hardware driver). + * .channels = Total number of channels, including whatever 'extended' + * (the X.ext notions, mostly LFE). + * .ext = Total number of extended channels (LFE). + * .map = { + * Sequences of channel type and interleave structure. + * [interleave offset] = { + * .type = channel type (see matrix.h). + * .members = Masks of channels that is acceptable as a + * member of this channel type. + * }, + * [total channels] = { + * .type = Maximum channels marker (SND_CHN_T_MAX). + * .members = 0 (no channels allowed here). + * }, + * }, + * .mask = Mask of channels that exist in this map. + * .offset = { + * channel offset that directly translate to the above interleave + * offset according to SND_CHN_T_* definitions. + * } + * }; + * + * Rule of thumb: Avoid using SND_CHN_T_* that is marked with XXX (matrix.h), + * or be prepared for the horror to come. + * + */ + +#define SND_CHN_MATRIX_MAP_1_0 { \ + .id = SND_CHN_MATRIX_1_0, \ + .channels = 1, \ + .ext = 0, \ + .map = { \ + /* Mono, center, etc. */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL | \ + SND_CHN_T_MASK_SR \ + }, \ + [1] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_FC, \ + .offset = { 0, 0, 0, 0, 0, 0, -1, -1, 0, \ + 0, 0, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_2_0 { \ + .id = SND_CHN_MATRIX_2_0, \ + .channels = 2, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SR \ + }, \ + [2] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR, \ + .offset = { 0, 1, -1, -1, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_2_1 { \ + .id = SND_CHN_MATRIX_2_1, \ + .channels = 3, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SR \ + }, \ + /* LFE */ \ + [2] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + [3] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_LF, \ + .offset = { 0, 1, -1, 2, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_3_0 { /* 3 channels default */ \ + .id = SND_CHN_MATRIX_3_0, \ + .channels = 3, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SR \ + }, \ + /* Rear Center */ \ + [2] = { \ + .type = SND_CHN_T_BC, \ + .members = \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR \ + }, \ + [3] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BC, \ + .offset = { 0, 1, -1, -1, -1, -1, -1, -1, 2, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_3_1 { \ + .id = SND_CHN_MATRIX_3_1, \ + .channels = 4, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_SR \ + }, \ + /* LFE */ \ + [2] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + /* Rear Center */ \ + [3] = { \ + .type = SND_CHN_T_BC, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR \ + }, \ + [4] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BC, \ + .offset = { 0, 1, -1, 2, -1, -1, -1, -1, 3, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_4_0 { \ + .id = SND_CHN_MATRIX_4_0, \ + .channels = 4, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SR \ + }, \ + [4] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR, \ + .offset = { 0, 1, -1, -1, 2, 3, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_4_1 { \ + .id = SND_CHN_MATRIX_4_1, \ + .channels = 5, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SR \ + }, \ + /* LFE */ \ + [4] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + [5] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_LF, \ + .offset = { 0, 1, -1, 4, 2, 3, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_5_0 { /* 5 channels default */ \ + .id = SND_CHN_MATRIX_5_0, \ + .channels = 5, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SR \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = SND_CHN_T_MASK_FC \ + }, \ + [5] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC, \ + .offset = { 0, 1, 4, -1, 2, 3, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_5_1 { /* 6 channels default */ \ + .id = SND_CHN_MATRIX_5_1, \ + .channels = 6, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_SR \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = SND_CHN_T_MASK_FC \ + }, \ + /* LFE */ \ + [5] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + [6] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF, \ + .offset = { 0, 1, 4, 5, 2, 3, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_6_0 { \ + .id = SND_CHN_MATRIX_6_0, \ + .channels = 6, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SR \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = SND_CHN_T_MASK_FC \ + }, \ + /* Rear Center */ \ + [5] = { \ + .type = SND_CHN_T_BC, \ + .members = SND_CHN_T_MASK_BC \ + }, \ + [6] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_BC, \ + .offset = { 0, 1, 4, -1, 2, 3, -1, -1, 5, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_6_1 { \ + .id = SND_CHN_MATRIX_6_1, \ + .channels = 7, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_SL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_SR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_SL \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_SR \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = SND_CHN_T_MASK_FC \ + }, \ + /* LFE */ \ + [5] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + /* Rear Center */ \ + [6] = { \ + .type = SND_CHN_T_BC, \ + .members = SND_CHN_T_MASK_BC \ + }, \ + [7] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_BC, \ + .offset = { 0, 1, 4, 5, 2, 3, -1, -1, 6, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_7_0 { \ + .id = SND_CHN_MATRIX_7_0, \ + .channels = 7, \ + .ext = 0, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = \ + SND_CHN_T_MASK_FL | SND_CHN_T_MASK_LF \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = \ + SND_CHN_T_MASK_FR | SND_CHN_T_MASK_LF \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_LF \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ + SND_CHN_T_MASK_LF \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF \ + }, \ + /* Side Left */ \ + [5] = { \ + .type = SND_CHN_T_SL, \ + .members = \ + SND_CHN_T_MASK_SL | SND_CHN_T_MASK_LF \ + }, \ + /* Side Right */ \ + [6] = { \ + .type = SND_CHN_T_SR, \ + .members = \ + SND_CHN_T_MASK_SR | SND_CHN_T_MASK_LF \ + }, \ + [7] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC | \ + SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR, \ + .offset = { 0, 1, 4, -1, 2, 3, -1, -1, -1, \ + 5, 6, -1, -1, -1, -1, -1, -1, -1 } \ +} + +#define SND_CHN_MATRIX_MAP_7_1 { \ + .id = SND_CHN_MATRIX_7_1, \ + .channels = 8, \ + .ext = 1, \ + .map = { \ + /* Left */ \ + [0] = { \ + .type = SND_CHN_T_FL, \ + .members = SND_CHN_T_MASK_FL \ + }, \ + /* Right */ \ + [1] = { \ + .type = SND_CHN_T_FR, \ + .members = SND_CHN_T_MASK_FR \ + }, \ + /* Rear Left */ \ + [2] = { \ + .type = SND_CHN_T_BL, \ + .members = \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC \ + }, \ + /* Rear Right */ \ + [3] = { \ + .type = SND_CHN_T_BR, \ + .members = \ + SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC \ + }, \ + /* Center */ \ + [4] = { \ + .type = SND_CHN_T_FC, \ + .members = SND_CHN_T_MASK_FC \ + }, \ + /* LFE */ \ + [5] = { \ + .type = SND_CHN_T_LF, \ + .members = SND_CHN_T_MASK_LF \ + }, \ + /* Side Left */ \ + [6] = { \ + .type = SND_CHN_T_SL, \ + .members = SND_CHN_T_MASK_SL \ + }, \ + /* Side Right */ \ + [7] = { \ + .type = SND_CHN_T_SR, \ + .members = SND_CHN_T_MASK_SR \ + }, \ + [8] = { \ + .type = SND_CHN_T_MAX, \ + .members = 0 \ + } \ + }, \ + .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ + SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ + SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \ + SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR, \ + .offset = { 0, 1, 4, 5, 2, 3, -1, -1, -1, \ + 6, 7, -1, -1, -1, -1, -1, -1, -1 } \ +} + #endif /* !_SND_MATRIX_H_ */ diff --git a/sys/dev/sound/pcm/matrix_map.h b/sys/dev/sound/pcm/matrix_map.h deleted file mode 100644 index ec0619614273..000000000000 --- a/sys/dev/sound/pcm/matrix_map.h +++ /dev/null @@ -1,672 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2009 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_MATRIX_MAP_H_ -#define _SND_MATRIX_MAP_H_ - -/* - * Standard matrix maps: - * - * struct pcmchan_matrix { - * .id = Matrix identity (see matrix.h). Custom defined should use - * one of SND_CHN_MATRIX_MISC (for whatever purposes) or - * SND_CHN_MATRIX_DRV (hardware driver). - * .channels = Total number of channels, including whatever 'extended' - * (the X.ext notions, mostly LFE). - * .ext = Total number of extended channels (LFE). - * .map = { - * Sequences of channel type and interleave structure. - * [interleave offset] = { - * .type = channel type (see matrix.h). - * .members = Masks of channels that is acceptable as a - * member of this channel type. - * }, - * [total channels] = { - * .type = Maximum channels marker (SND_CHN_T_MAX). - * .members = 0 (no channels allowed here). - * }, - * }, - * .mask = Mask of channels that exist in this map. - * .offset = { - * channel offset that directly translate to the above interleave - * offset according to SND_CHN_T_* definitions. - * } - * }; - * - * Rule of thumb: Avoid using SND_CHN_T_* that is marked with XXX (matrix.h), - * or be prepared for the horror to come. - * - */ - -#define SND_CHN_MATRIX_MAP_1_0 { \ - .id = SND_CHN_MATRIX_1_0, \ - .channels = 1, \ - .ext = 0, \ - .map = { \ - /* Mono, center, etc. */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_FC | SND_CHN_T_MASK_LF | \ - SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ - SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL | \ - SND_CHN_T_MASK_SR \ - }, \ - [1] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_FC, \ - .offset = { 0, 0, 0, 0, 0, 0, -1, -1, 0, \ - 0, 0, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_2_0 { \ - .id = SND_CHN_MATRIX_2_0, \ - .channels = 2, \ - .ext = 0, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ - SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BR | \ - SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SR \ - }, \ - [2] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR, \ - .offset = { 0, 1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_2_1 { \ - .id = SND_CHN_MATRIX_2_1, \ - .channels = 3, \ - .ext = 1, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BC | \ - SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ - SND_CHN_T_MASK_SR \ - }, \ - /* LFE */ \ - [2] = { \ - .type = SND_CHN_T_LF, \ - .members = SND_CHN_T_MASK_LF \ - }, \ - [3] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_LF, \ - .offset = { 0, 1, -1, 2, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_3_0 { /* 3 channels default */ \ - .id = SND_CHN_MATRIX_3_0, \ - .channels = 3, \ - .ext = 0, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SR \ - }, \ - /* Rear Center */ \ - [2] = { \ - .type = SND_CHN_T_BC, \ - .members = \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ - SND_CHN_T_MASK_BR | SND_CHN_T_MASK_BC | \ - SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR \ - }, \ - [3] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_BC, \ - .offset = { 0, 1, -1, -1, -1, -1, -1, -1, 2, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_3_1 { \ - .id = SND_CHN_MATRIX_3_1, \ - .channels = 4, \ - .ext = 1, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_SR \ - }, \ - /* LFE */ \ - [2] = { \ - .type = SND_CHN_T_LF, \ - .members = SND_CHN_T_MASK_LF \ - }, \ - /* Rear Center */ \ - [3] = { \ - .type = SND_CHN_T_BC, \ - .members = \ - SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR | \ - SND_CHN_T_MASK_BC | \ - SND_CHN_T_MASK_SL | SND_CHN_T_MASK_SR \ - }, \ - [4] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BC, \ - .offset = { 0, 1, -1, 2, -1, -1, -1, -1, 3, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_4_0 { \ - .id = SND_CHN_MATRIX_4_0, \ - .channels = 4, \ - .ext = 0, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_SR \ - }, \ - /* Rear Left */ \ - [2] = { \ - .type = SND_CHN_T_BL, \ - .members = \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BL | \ - SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SL \ - }, \ - /* Rear Right */ \ - [3] = { \ - .type = SND_CHN_T_BR, \ - .members = \ - SND_CHN_T_MASK_LF | SND_CHN_T_MASK_BR | \ - SND_CHN_T_MASK_BC | SND_CHN_T_MASK_SR \ - }, \ - [4] = { \ - .type = SND_CHN_T_MAX, \ - .members = 0 \ - } \ - }, \ - .mask = SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FR | \ - SND_CHN_T_MASK_BL | SND_CHN_T_MASK_BR, \ - .offset = { 0, 1, -1, -1, 2, 3, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1 } \ -} - -#define SND_CHN_MATRIX_MAP_4_1 { \ - .id = SND_CHN_MATRIX_4_1, \ - .channels = 5, \ - .ext = 1, \ - .map = { \ - /* Left */ \ - [0] = { \ - .type = SND_CHN_T_FL, \ - .members = \ - SND_CHN_T_MASK_FL | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_SL \ - }, \ - /* Right */ \ - [1] = { \ - .type = SND_CHN_T_FR, \ - .members = \ - SND_CHN_T_MASK_FR | SND_CHN_T_MASK_FC | \ - SND_CHN_T_MASK_SR \ - }, \ - /* Rear Left */ \ - [2] = { \ *** 379 LINES SKIPPED *** From nobody Wed Dec 4 12:04:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQn5RNGz5gS38; Wed, 04 Dec 2024 12:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQm4Xwtz46mJ; Wed, 4 Dec 2024 12:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dqXJhgzu2a0YDgftCclpQn6sJrrakRj+i5hHPn7FIwo=; b=n254NCANv+EsbO7gpnxdaekRmqd10AYRqhWSRqwpOk6KYLDOrz6RhFDCEKKxmNIm4r5VKb nc1efEULrQwu47ahQXoRQaJ/TMeVxV6E4GP/6z0H7dxhFRRzhY46xCcazk02JU8hjPeVYi F4WsqilUWh8RsljJIOZG2d+jtLSEd7AiRxRt/VomKTdzqW2gtFt0bNJqAFXnNwMmvVby7/ G+BV9hBu3F/dPDWs7q49GbVONqxQx8bxWmuIz9M55y7szd2fPAFQ6T0lw4voBLIuGTbGYv SZPYwlMUl3dyoZVEQrNF7GFG6+Hy2e67p1HcDqL9U2Iy0kS1FNi83v3+W6X3Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dqXJhgzu2a0YDgftCclpQn6sJrrakRj+i5hHPn7FIwo=; b=xMSi6/9Ma2N1mvXV1rp3FUQsTnqNTWFzecJKyNbD7StM2Lja844BpWSXQFAYJ8CAwYCCwE Ap3KxMtLOm9tadWuWr3Z6Lo/Jh+lh2dOHncxZ6pdETVE1HRQ4FVy6P1M/Ijd9t2ES8gShK SKp8yUWoy1bCeeP0uo8ZvAyHD6ZuRastHn3B7eVbIZ6yrKqcXLfxpCyAbMggNgK+iyk8ca 8TTAgwCHrsqgyJNsgnJ2scu3ciOtSGwDZWyfZ694IPtg9WkkOQmqS7XlsHFdRF+XI8eTKg f2V58sa8LRkHxRF4G4X8E0mhpMlM0eCB7FAdRTutaRh4UPfBbMyuRxXQ7lWZHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313856; a=rsa-sha256; cv=none; b=N3FTp8f1XSLiDqWHpmRQlDVxim3+i+K8ZxgljNFrivOCXElgyFDjArpgS4xmk0lWMkUHzg HoJCiRSYp6zelgIvMe2Efuj3UMLyrY5+6sVo9WCbVTe+TrbfiB7bfkdCSxf3QIS+5JtAbd olFXN6cIKtmDpw/09S3qY60iNNOSyob94g3aOtpk7yaaJe+1gehRDIKEf8TbLMS2crg4RU GrznsPt9uWdJa0Wpqsj98+V91+RcpEEgsqhRrlbJ1ftgQrKKMSDX33FfxAI97oUO3zRdqq 2/e1l1Ad8NUWCGq61Avdzm7kJ3H6N61nuVVXk22K1A5yymByU7un/z4uW2fdhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQm3TZ4z163d; Wed, 4 Dec 2024 12:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4GhN049907; Wed, 4 Dec 2024 12:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4GGX049904; Wed, 4 Dec 2024 12:04:16 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:16 GMT Message-Id: <202412041204.4B4C4GGX049904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 63979e82e54d - stable/14 - sound: Fix mis-sorted CHN_F_BITS line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 63979e82e54d195055573ae9078c768f74689a1e Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=63979e82e54d195055573ae9078c768f74689a1e commit 63979e82e54d195055573ae9078c768f74689a1e Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:50 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Fix mis-sorted CHN_F_BITS line Fixes: 5317480967bf ("sound: Remove CHN_F_SLEEPING") Reported by: jhb Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D47781 (cherry picked from commit 29ba0cc4d919243436f1bf73a22a554fa5073a44) --- sys/dev/sound/pcm/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index cef8aa4e86e5..47089aca0745 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -381,8 +381,8 @@ enum { "\002ABORTING" \ "\003RUNNING" \ "\004TRIGGERED" \ - /* \006 */ \ "\005NOTRIGGER" \ + /* \006 */ \ "\007NBIO" \ "\010MMAP" \ "\011BUSY" \ From nobody Wed Dec 4 12:04:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3GQr4q1Fz5gS3J; Wed, 04 Dec 2024 12:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3GQn5W6Sz46mK; Wed, 4 Dec 2024 12:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5uRFkDwzhwvpcoUJRZloPy7L8aZteA3zsgjGHhTCfk=; b=N5L+vrudw2tI5N2I1Zy98v5qLXQRsgMaM6KBxodr7uyxQsKGgN+ipqZTTKlFaUjaWwwkTQ hUnUMa1fMGQHrfTSyeQvk1V1sojHf/TNPMCnNvV4njd/YWfnoojOzl/gZH8ahwRzVbGSX5 SOoyphnNCjHSMZeG9UUpc7d6TOUhqwkLQSK2xHSt3l9Bc+SjypqRxvQ9Tj5/e7sFRmbH50 e+0OEEGrzvP4Vcj6W04PItLXzisJBZUAz0Rk1en6RoWeVfHGc9ZtwyFGnGfJSyyQQamUBV /ysagtI9ecv1Y9OHfrXJBi/VEQx1jODfDqXV/g4vTpEqUVoOknS8hU8RM7mJIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733313857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5uRFkDwzhwvpcoUJRZloPy7L8aZteA3zsgjGHhTCfk=; b=noSmI4ilgnDBX65j5fDXE8+L6JznngWLUVxh6pNnbijKjP/2tqv0R+YLUKRdPsd3VBkiu0 +wGVXdE+KImFLv072vJUkLafWtVtG5in3/0QF6nM7fi5VaH9GE4XjaIxeeKZH3/IUT4C46 lYfF+mADnZWUhEgBb/Fto4Zc+kGEGQi/qi4i5tBWCiAIZcT4YbUjkCohH8+p3M0lVrukXz 5PH4sukp8XDWaR2UTotvyoLk9xhBRURDaYYcw8ScKjiSvGkCtgVMA63QDIt+CnUOyQc1lR lEmImDw710V8DtcSLyjtHXxMvltZAbe1KRtc5LjMp/2r+VnkOhhQIBctRGJMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733313857; a=rsa-sha256; cv=none; b=hi39hZHIlztJIoTCRalaKY3tLZZW/09nBHKWMrkfXrdkbrzm0/aB9RzK2RvsTj3rw3nkeY RXDvOMA3SIKSw7+Ic4lcFt/SupILs9dL5piTKr+xpokd9IHPlSJ3hqCvG2LNkw4fDZtuKj F4vS+9zohMVecx8ldU2s5H9vQY0lcVai6rjy+z2eCakEuZeBgEHDcv4GvpdxwL2Iml8Vg0 1cMvNiwUHJ+30iwlU68W36X3JdqkucuA+wUsU9Nj5C39+UTZJvMCOvY2AKQ94H/Zw55mbB lRe8Y8x+jBMzuLBpptlDRmrNxui5p30nJXHOZbY4ia6N8ybjFHRtRdXKy8Jzhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3GQn4SRWz16Gs; Wed, 4 Dec 2024 12:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4C4HRi049951; Wed, 4 Dec 2024 12:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4C4Htf049948; Wed, 4 Dec 2024 12:04:17 GMT (envelope-from git) Date: Wed, 4 Dec 2024 12:04:17 GMT Message-Id: <202412041204.4B4C4Htf049948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 134a275eea7a - stable/14 - sound: Do not access cv_waiters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 134a275eea7a2edf34b4b98cf6f382d7a3618597 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=134a275eea7a2edf34b4b98cf6f382d7a3618597 commit 134a275eea7a2edf34b4b98cf6f382d7a3618597 Author: Christos Margiolis AuthorDate: 2024-12-02 16:26:58 +0000 Commit: Christos Margiolis CommitDate: 2024-12-04 12:03:36 +0000 sound: Do not access cv_waiters Remove uses of cv_waiters in PCM_RELEASE and CHN_BROADCAST, and also use a counter around cv_timedwait_sig() in chn_sleep(), which is checked in pcm_killchans(), as opposed to reading cv_waiters directly, which is a layering violation. While here, move CHN_BROADCAST below the channel lock operations. Reported by: avg, jhb, markj Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, avg Differential Revision: https://reviews.freebsd.org/D47780 (cherry picked from commit 46a97b9cd6fd4415270afe4070082ae69ee21035) --- sys/dev/sound/pcm/channel.c | 2 ++ sys/dev/sound/pcm/channel.h | 9 ++++----- sys/dev/sound/pcm/sound.c | 4 ++-- sys/dev/sound/pcm/sound.h | 13 ++----------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 728284b055e5..925a82bb170f 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -329,7 +329,9 @@ chn_sleep(struct pcm_channel *c, int timeout) if (c->flags & CHN_F_DEAD) return (EINVAL); + c->sleeping++; ret = cv_timedwait_sig(&c->intr_cv, c->lock, timeout); + c->sleeping--; return ((c->flags & CHN_F_DEAD) ? EINVAL : ret); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 47089aca0745..67f5019f4727 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -117,6 +117,8 @@ struct pcm_channel { * lock. */ unsigned int inprog; + /* Incrememnt/decrement around cv_timedwait_sig() in chn_sleep(). */ + unsigned int sleeping; /** * Special channel operations should examine @c inprog after acquiring * lock. If zero, operations may continue. Else, thread should @@ -242,11 +244,6 @@ struct pcm_channel { (x)->parentchannel->bufhard != NULL) ? \ (x)->parentchannel->bufhard : (y)) -#define CHN_BROADCAST(x) do { \ - if ((x)->cv_waiters != 0) \ - cv_broadcastpri(x, PRIBIO); \ -} while (0) - #include "channel_if.h" int chn_reinit(struct pcm_channel *c); @@ -320,6 +317,8 @@ int chn_getpeaks(struct pcm_channel *c, int *lpeak, int *rpeak); #define CHN_LOCKASSERT(c) mtx_assert((c)->lock, MA_OWNED) #define CHN_UNLOCKASSERT(c) mtx_assert((c)->lock, MA_NOTOWNED) +#define CHN_BROADCAST(x) cv_broadcastpri(x, PRIBIO) + int snd_fmtvalid(uint32_t fmt, uint32_t *fmtlist); uint32_t snd_str2afmt(const char *); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 761c505fd402..b8f4efea8789 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -221,8 +221,8 @@ pcm_killchans(struct snddev_info *d) /* Make sure all channels are stopped. */ CHN_FOREACH(ch, d, channels.pcm) { CHN_LOCK(ch); - if (ch->intr_cv.cv_waiters == 0 && CHN_STOPPED(ch) && - ch->inprog == 0) { + if (ch->inprog == 0 && ch->sleeping == 0 && + CHN_STOPPED(ch)) { CHN_UNLOCK(ch); continue; } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 65e8c3002026..59d9930712b3 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -359,15 +359,7 @@ int sound_oss_card_info(oss_card_info *); __func__, __LINE__); \ if ((x)->flags & SD_F_BUSY) { \ (x)->flags &= ~SD_F_BUSY; \ - if ((x)->cv.cv_waiters != 0) { \ - if ((x)->cv.cv_waiters > 1 && snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [PCM RELEASE] " \ - "cv_waiters=%d > 1!\n", \ - __func__, __LINE__, \ - (x)->cv.cv_waiters); \ - cv_broadcast(&(x)->cv); \ - } \ + cv_broadcast(&(x)->cv); \ } else \ panic("%s(%d): [PCM RELEASE] Releasing non-BUSY cv!", \ __func__, __LINE__); \ @@ -459,8 +451,7 @@ int sound_oss_card_info(oss_card_info *); ("%s(%d): [PCM RELEASE] Releasing non-BUSY cv!", \ __func__, __LINE__)); \ (x)->flags &= ~SD_F_BUSY; \ - if ((x)->cv.cv_waiters != 0) \ - cv_broadcast(&(x)->cv); \ + cv_broadcast(&(x)->cv); \ } while (0) /* Quick version, for shorter path. */ From nobody Wed Dec 4 17:09:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3PBp0MPLz5ft7N; Wed, 04 Dec 2024 17:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3PBn6zl1z4lJ3; Wed, 4 Dec 2024 17:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txOsQwd/4ChgQGNsxNNdtlXirw2FXSMICOwmdNSNFQE=; b=L5DwTs4yJlHY8O+tro8gdzZZyvj5aOxkBLQN8oLXB6gOrxBF/Ew++sEuQzdyzWy0Rptrbf +fPB/IgXzYRJ8MzW9o5Xlv9CjMsMJ71IF7owyGIWY3W3zWTIcs6JZ0Fnd9a4V1umSmj6vc mUPWKuj+qMgumCKPjzvVYgxSSRUiX4NpYHTKw3PEk1wG3MZwbNNhFva9HjBjok/WQAhOCd c4duSjQqThrnACJOGN6u1UZSXZJYyf799Q0YTNQNfASwx477eiY2U3ciN86u73FvLi/AiU rmM29q+ipzHOXcT20MDOEq7s2Mday2/tk1JWThbTp5uO0kC1PMSyB5DFE1trLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txOsQwd/4ChgQGNsxNNdtlXirw2FXSMICOwmdNSNFQE=; b=APJegkC+QtlgWfzuQK77VVVDyC1TkL/4Y+VThoy1Cel/r8fI7W3kiTJ1tBNlkjN2kitad/ IxxsiV3inVI642YUsvNFoJALWvB7zh6D+XDxJkntmzLA2FspaFzNdmk9E67aPhhBtcuo0b QS0Z1t6pB7xKwwdvtKlI+5munHoX5DlNnKRh1p4h6BE628k57588hVuL4/gc5Pck6J5xjk 2kGC6RbbXNe2q9McWkw0upgE6BEBmlvcPdOMriNUKwAy4An/x2xD4GT81g8NYouiODyFjp EF+TOnx2OElY9O/mMxzYYGycdoL71WlSLN5KUhFZZw4n73VNih56NU4k7bfdyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332162; a=rsa-sha256; cv=none; b=tkTqfVAcsKadsIadED0YOzVjCimiRW3Z/z6eZYZPEILiIF22Fk447ZyCMxVI1Ol/0pZhA4 GtBHZi6W0vcqnsKszPLtVqnnaKpWAUlez3+zeUktIogq3qGFKlBSR+5vLmvjNV4TlFqHU9 21FpaAoYaEcEQU8k7WBExmLEXbappSsDjeykpfGmhVO+iWEk+/49MmAmh2snsINFI2bq4w dQEBwfvDuLqFT2A4BS92GmeQA6xpySUH1EZXV4oTHOhmi5hmRDIytu0gRVyW6yRpnjOS1w 5U6F0vRJVLqfNHahv4gfAoYB0MMB+VKbGobSSaPlEAdPNUs4TcPikKiDysDpWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3PBn6VgPzGfN; Wed, 4 Dec 2024 17:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4H9LDK012003; Wed, 4 Dec 2024 17:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H9LHA012000; Wed, 4 Dec 2024 17:09:21 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:09:21 GMT Message-Id: <202412041709.4B4H9LHA012000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a7f33b501935 - stable/14 - rc.d/var_run: Add missing $(dirname) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a7f33b5019353fbb689b860142672c02081f0ee1 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a7f33b5019353fbb689b860142672c02081f0ee1 commit a7f33b5019353fbb689b860142672c02081f0ee1 Author: Cy Schubert AuthorDate: 2024-11-25 17:11:47 +0000 Commit: Cy Schubert CommitDate: 2024-12-04 17:08:27 +0000 rc.d/var_run: Add missing $(dirname) We intend to create the containing directory here. Fix this typo. PR: 282939 (cherry picked from commit 4d58cf6ff905377dbca1ecf004f53133e6b57a46) --- libexec/rc/rc.d/var_run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/var_run b/libexec/rc/rc.d/var_run index bf8f0cb737b4..9f0f7fcf37fd 100755 --- a/libexec/rc/rc.d/var_run +++ b/libexec/rc/rc.d/var_run @@ -24,7 +24,7 @@ _var_run_load() { _var_run_save() { if [ ! -d $(dirname ${var_run_mtree}) ]; then - mkdir -p ${var_run_mtree} + mkdir -p $(dirname ${var_run_mtree}) fi mtree -dcbj -p /var/run > ${var_run_mtree} } From nobody Wed Dec 4 17:09:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3PBq2rS2z5ft9x; Wed, 04 Dec 2024 17:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3PBq1RSNz4lFh; Wed, 4 Dec 2024 17:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pj3+hImercz+MUW+GRpCyfTLJOI8xw3R7Hw6UMcTl+c=; b=hOC9zxL1MCPG5RA/dT4+T1qXvHBrnUti27XGls6RzTFmKvMJhgZANOeRvpS2fFkIXRsC68 DAmOgO0nblU+mzePOx2Qao0gfOpF0j1r4u0fEEPIx8Hfq971Jr8hqgbMt1l0zVKj6DfalW VZC7tig1fNc1hVXJKK64szrtyx/LoKVHISunRYXqplxK+oGYKP0+WJpsYkHJwWcTWKbiYy c9R5r+8XvWEubnVXtlib4/+/gvHmxI45RmOjOdilwx/uzFE8ZWgO9gpZJvCRkPogEM/3rV 7mpF4D3R2uGd/ER+ejgDpvemYwZVeBhPYd5bFdEn3oWt4JMJe1HUm9L7djFeqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pj3+hImercz+MUW+GRpCyfTLJOI8xw3R7Hw6UMcTl+c=; b=oV4bCh9zhC+ShSQ56JF/0evVBvoUmZV/mdYIeN2qvWgzz1OMSOW6kJiJHnWIt8Qn4B3Gcn pYlpS3rnz9xqyjNbv1eCs8kwCDMSVz5ZfQUARUWoWTmTVSemS9m+4CvZuNacu0DNOFS1dY so3kPKgVyq/mJ1+LToQ/mePdWx78ERtysaSvlPlJB38iHkI1ISFOWq3qmIQ6ZNRvYI1Fi4 x2mNQ/CAZM9fGKyKy/LsSfcOQ5ibRZjUVUkolcUTyDmFdwM13RYIGh2qUizmVxqdhjgIIQ AGWTmhNDZtNn9dCSBXL1N4LUhletQ3387SSMkJOVEx/W7gVdCHneGamD2wOWJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332163; a=rsa-sha256; cv=none; b=aTOuBiKjqQcPoDksq0PxIlLhH0A0BEE4AceAEsR8O7Fma6gmda5bdj7Lp6zc37bUbdmKT0 PeWVz1wim9xF3fohZLwnFGUPoKHGGImZdXZEE3u4xoXVuhxQwtIrDTOWVZ+c/Kp2MhIGO8 5ABlXM5vUoIFCHT05OW/Ne1emhz+X+eN4ro9cAQ2D1U+mqCrb2P6gpY0laSyw4vIAZ80qU FQaxCpYTWbV7EE4u4TDlzti1zOvAhJv97ywYV/ej/sVEOEoOBGJ48Cwr5bFFH+vPUvLBBz b6Fsu0ZWTFnYIARxvkYdT77tuJs6b60R1uwU8In370XAG0liqSC9ivaFDD55Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3PBq0H5TzGT1; Wed, 4 Dec 2024 17:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4H9Mpd012048; Wed, 4 Dec 2024 17:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H9MU2012045; Wed, 4 Dec 2024 17:09:22 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:09:22 GMT Message-Id: <202412041709.4B4H9MU2012045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 63188b9cfc50 - stable/14 - truss: Fix grammar in error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 63188b9cfc504dd35d6b0da6e9bde03157a1bde2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=63188b9cfc504dd35d6b0da6e9bde03157a1bde2 commit 63188b9cfc504dd35d6b0da6e9bde03157a1bde2 Author: Cy Schubert AuthorDate: 2024-11-25 22:51:36 +0000 Commit: Cy Schubert CommitDate: 2024-12-04 17:08:28 +0000 truss: Fix grammar in error messages (cherry picked from commit 501c4801edfcc2943eba8e4f8922436dd0f07dc8) --- usr.bin/truss/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index 52f02b6f8700..d5fa1ed50ce1 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -160,7 +160,7 @@ setup_and_wait(struct trussinfo *info, char *command[]) /* Only in the parent here */ if (waitpid(pid, NULL, 0) < 0) - err(1, "unexpect stop in waitpid"); + err(1, "unexpected stop in waitpid"); new_proc(info, pid, 0); } @@ -179,10 +179,10 @@ start_tracing(struct trussinfo *info, pid_t pid) usleep(200); } while (ret && retry-- > 0); if (ret) - err(1, "can not attach to target process"); + err(1, "Cannot attach to target process"); if (waitpid(pid, NULL, 0) < 0) - err(1, "Unexpect stop in waitpid"); + err(1, "Unexpected stop in waitpid"); new_proc(info, pid, 0); } From nobody Wed Dec 4 17:09:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3PCJ30Wtz5ftR3; Wed, 04 Dec 2024 17:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3PCJ0vX3z4lrv; Wed, 4 Dec 2024 17:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqLTixuqIR5Ocx7i44sBpFZ2chKd6htMQ94TUIcv5HM=; b=p4/1MtVBZOspJcaufW65zG+/HfkcUyqxy7joqnu8YdBoRMUrsJBbRmo9X6EiecCKWUuSxf GbribKCPWAkwX6pblLELGrGoiWXBp6mZJvtwKnNa4XuAlUz3YdiwKoqNmcSMWN3AGnzY63 dGCM7E94KY21RAGRVetjcQLIFNiVxWK4f/QPHmqGW+UhRG5Dv0pIIWxMg0uczGnQrbf7y8 81F39z1NN6de7jIQ3gYdnyf1usPyayfYd5bQYC2aU78yK3dY2wp9U3qtszDJrkel+GlPhf 86zM1r9eN6icVeX1I5ORXBHOdx4A2i7DRLNxrr85hXWrxRolSwbCLHi2Mjl8ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqLTixuqIR5Ocx7i44sBpFZ2chKd6htMQ94TUIcv5HM=; b=OFtPP69Pc+PlrNAsoQWA4vT0PnMqVp8YJCwKl3bWhk/oCvksU4hoHxTJQ1QYT8u1Aj5bAo zlOsHFSOeJlU3g7vR60Lazlec+pFqq/EbZgIUcrvY7KIkcpnrFfDCyMKwKYq6NDz5EXE4i hZN6fDC3SGMPjj+l95fuInlk+FHq5PWcUn62IZ2lSpeKjLykNNfkAgMYr4JRWbbKsDfHCh QiElFEgMlT0R+L1CdCykPNdAYQ4P57kh1O3CgAfKj9VRmHOBXORjUa7LOhZR5RqzXjAvoX EsEREZqZduBFDWPB1pQTKiNBXa1lq8fVdkzvT29cJyqaUq6s1JcRGgn21yKLww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332188; a=rsa-sha256; cv=none; b=iI5uMDEBTIX4+kZ7QYp9PkvLteqv3sIyPpiEiZ1WjVT1r0Gdsiyc43owGokbN2kIetIPpI 3wWO3rJVl1U/biNxFy3mTBn0i76g+87uPXEFEiX+04PhHJNXX4UfzoA1YisQYAcCL/U0ci Vw+3JoCc9QTxh2kLmjB4ymanNJ7PgiyhwIJOJD/eZaVcgbAEUyUv+a7kiR58AGcqIL05LR 0kFyXENHGqC08Nd83YtvKKkNPHMina29AaFedsP8QLuZ6sqhC4QVLkFJPWksYBN0tAhNIw 48xRxFw9mPZNpKI83lDIGS5QTgPIxscvVKXPWWOGrJFjqXaQF7OmJbSn4T7KXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3PCJ0LpszGl2; Wed, 4 Dec 2024 17:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4H9lTD013042; Wed, 4 Dec 2024 17:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H9l9T013039; Wed, 4 Dec 2024 17:09:47 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:09:47 GMT Message-Id: <202412041709.4B4H9l9T013039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2904d7309b3d - stable/13 - rc.d/var_run: Add missing $(dirname) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2904d7309b3d013b5a1d4279d7bfb32e44666dcd Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2904d7309b3d013b5a1d4279d7bfb32e44666dcd commit 2904d7309b3d013b5a1d4279d7bfb32e44666dcd Author: Cy Schubert AuthorDate: 2024-11-25 17:11:47 +0000 Commit: Cy Schubert CommitDate: 2024-12-04 17:09:41 +0000 rc.d/var_run: Add missing $(dirname) We intend to create the containing directory here. Fix this typo. PR: 282939 (cherry picked from commit 4d58cf6ff905377dbca1ecf004f53133e6b57a46) --- libexec/rc/rc.d/var_run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/var_run b/libexec/rc/rc.d/var_run index daff06ce1a3f..eb9cdbd59305 100755 --- a/libexec/rc/rc.d/var_run +++ b/libexec/rc/rc.d/var_run @@ -29,7 +29,7 @@ _var_run_load() { _var_run_save() { if [ ! -d $(dirname ${var_run_mtree}) ]; then - mkdir -p ${var_run_mtree} + mkdir -p $(dirname ${var_run_mtree}) fi mtree -dcbj -p /var/run > ${var_run_mtree} } From nobody Wed Dec 4 17:09:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3PCK3hwhz5ftR6; Wed, 04 Dec 2024 17:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3PCK220Bz4m3D; Wed, 4 Dec 2024 17:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxU2F9wNyOQkat2M4ap+zFa17Ui+QyW7YCBMOsR6Mig=; b=JUJaNvsEoZpnOLqGVmEKeEc76W8QywyOcr4DZf9FgzGVWAmfS1iRifjPrEZNoIoql9nOaE 5xuWxDrmNLBY5dOBWHA+ZicUNU36WfGCs0okn6J2l3qRRNj7wne9f992HDHcJ0eV3wDuD4 kHN6f2unspHn5jG6OT4VHXRemO41MlDXtT1uOGX3Be9KZlCpYKdPlGbVW/pLHg6o+B4xc1 EfULAF9TCABsu3vbRU/vrxD5b/O7ZhQulaqau3ATcV1v2vLReZN3MW/WYSjM5nUw4y1pv3 5LFXeUiw8Dks8LQcBK6u26bEwRUDsk/PA/Z0e8VEAtXBaEOgPcVweyZko62C6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxU2F9wNyOQkat2M4ap+zFa17Ui+QyW7YCBMOsR6Mig=; b=p0FcHMZVeqQlTnWbZYxI89wRQXKejpoMZIhMLGm2+bgU0q+dK3bzk8i56hR4Ym7tlQK5pT urb5IyEXrSBceP8yoLPDiQHDpPZn0FwELMZinUTWxvaCq0Dec51kdu6s7+cpUBGuIDzBBk IH5Yx8DGQfJ4hPx0sH2YNcNuHHFgJKysikbwKvjKwJxEj/nZ07iRczmiJpWGKT3Sph6OAT TK7SuoUqOw3843VQbBX/cTgbkO6qa/TW1GFbAQP1YgKjmZ9iJ+H4ZvWT6LKcULVAyOMnYe eUBVeJqxeRhh8JS/x9LsYQpYRZ2pzKaIA3JRB0ZRGXnvk9cDcZV/bfmmfzlv4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332189; a=rsa-sha256; cv=none; b=LfbItgivpy0SKh+2RPQy95VACSeeAqe3khv0h3rsKooZoar4lXhZ/AeeAy4KIH/YUphSJ4 vNKT93ScJJ5y0jy7rfgg0jTg6cr76qI/I0RpUKaMrr9kMVbX9IfsUQhd/2zzVS8Kw4bMHj Dn3ZhwnC6M5r7LN2J0NJJTASPR9wFtOHpUv4BFVlzWMhiI4+XQVmkjAMqMYrOIckhzyLfW WlItIdvhxPRHQRM3TRMBFkiV7jWAqbs9PzpUgrbWFA/GcfJLd7gk6EJaanrxlkcBVxF+PC s4DNvq8U/VKmN9d3R4AnDvn1JEpIxgviHVsHKzkmQY86SzH2avm/bMue0V2Qew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3PCK1KWWzFGb; Wed, 4 Dec 2024 17:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4H9nBm013094; Wed, 4 Dec 2024 17:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H9nxu013091; Wed, 4 Dec 2024 17:09:49 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:09:49 GMT Message-Id: <202412041709.4B4H9nxu013091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 546f545a12f9 - stable/13 - truss: Fix grammar in error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 546f545a12f9e1b8bf83284b4c2eabbe906e304e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=546f545a12f9e1b8bf83284b4c2eabbe906e304e commit 546f545a12f9e1b8bf83284b4c2eabbe906e304e Author: Cy Schubert AuthorDate: 2024-11-25 22:51:36 +0000 Commit: Cy Schubert CommitDate: 2024-12-04 17:09:42 +0000 truss: Fix grammar in error messages (cherry picked from commit 501c4801edfcc2943eba8e4f8922436dd0f07dc8) --- usr.bin/truss/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index 0022bb532144..cdc880220319 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -178,7 +178,7 @@ setup_and_wait(struct trussinfo *info, char *command[]) /* Only in the parent here */ if (waitpid(pid, NULL, 0) < 0) - err(1, "unexpect stop in waitpid"); + err(1, "unexpected stop in waitpid"); new_proc(info, pid, 0); } @@ -197,10 +197,10 @@ start_tracing(struct trussinfo *info, pid_t pid) usleep(200); } while (ret && retry-- > 0); if (ret) - err(1, "can not attach to target process"); + err(1, "Cannot attach to target process"); if (waitpid(pid, NULL, 0) < 0) - err(1, "Unexpect stop in waitpid"); + err(1, "Unexpected stop in waitpid"); new_proc(info, pid, 0); } From nobody Wed Dec 4 18:34:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3R554hTRz5g1Rs; Wed, 04 Dec 2024 18:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3R5544Dmz4v6C; Wed, 4 Dec 2024 18:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRqilYJXGPWjAkf0Yb1/pNYQzWhsLo0qnORYcPByxfs=; b=V0xHKh7SGrOSUwngLAcoQoMJDHlZ6xh0OZHf4xVycuHyciPBNc2e1fzfuMI8pA9PN5esGb GamYsQ9vndDiX+f/32DdD2ROHiz0flN0RUUe356gui3HlGUUD7rQi60zHucYY3RmPj8nrA EZOr/9nZkKY0Z+5Fb+1Tx+UhdYyafy3x3TglegjSgOHcXL01nIdu99Zt0xpWODgc6IVMQ5 OxJTVPFBS9cSLUKia0jbaRl0PWM1npNIrewfYmJ/XyCcrk0XE1VcN6eFufMXV2MYCNgog7 hinqmgG8o1bLPWUF2fJaHHfwvumRyiyIOg7sDuyNSLQvKpX6PlAuuGSFU1bnwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRqilYJXGPWjAkf0Yb1/pNYQzWhsLo0qnORYcPByxfs=; b=AA3MziktNt2xQCCi0gMbNZJugwsHoybj7SxqGADXwNrBxZSRmFdRcjLlFD6oCaK8LW+J8E HHSqMsEf0S798dREB9fVLW8hPmQ26W+VTOtRfLdmHMlJ580UndyWCwiLfClmq/meIjloTa Oe0yApq+aBYBWc3uaHAVHUSc3CkIX/754kFyOHXQ1mhSzPJ2vk5wwq0U4PpmwnJJCw/6IL LT/wInhj6KTrAdbJD+e2GJiTQaDHigLmkwiTRmJ6qCYxG1GJGSW+rUmLJIQy46LBzP7hOs kdDBFldzETd7uaj3BLl2f6Hu9VdtnvMS4IcHEcgdr9IJJFBafLu3edoqIs0juw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733337273; a=rsa-sha256; cv=none; b=EekeLScEEocuavuiYczIvFcs+rUQR960OgQexZ9HicgeSTQEeJ5ojM68GxsO4/pbEPoDOh KP8MAoI/VzyMNYrCTITAj2bNV8OGE9y3aB8ys6jk1XwuM+YrNXbnfCIOj/nBNJJV09+RW+ 4vfunBjWN5oqaxVyOu52PYXU12G4DnLRmnYODv2Rgx5ijTXjpYvWa2GOXr9ACoTQstamOI Ubjt8uzq2+sK+L73yoBzKsanflzzDKVemTBCRnRtp9qgIs9kCmkj3tM7uztTjLuoUUFIir pN2z/Fbum6JNaUi/GBpJGw6niaRoH45nCeHTdlguAmsAMba0SiGYs+7NY7y/cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3R553gbkzJnC; Wed, 4 Dec 2024 18:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4IYXsT077603; Wed, 4 Dec 2024 18:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4IYXOB077600; Wed, 4 Dec 2024 18:34:33 GMT (envelope-from git) Date: Wed, 4 Dec 2024 18:34:33 GMT Message-Id: <202412041834.4B4IYXOB077600@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: 25caac4d4566 - stable/14 - sched_getcpu: Add man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 25caac4d456665e4f05f018a15e8ad98bb5d3d9f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=25caac4d456665e4f05f018a15e8ad98bb5d3d9f commit 25caac4d456665e4f05f018a15e8ad98bb5d3d9f Author: Ed Maste AuthorDate: 2024-11-13 22:04:06 +0000 Commit: Ed Maste CommitDate: 2024-12-04 18:32:58 +0000 sched_getcpu: Add man page Moved from libsys to libc for stable/14. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47556 (cherry picked from commit 36887e04947fedfebb9b648fadd0dd6cc03142ea) --- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/sched_getcpu.3 | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index e964e3dcff26..7628f121feac 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -299,6 +299,7 @@ MAN+= abort2.2 \ rmdir.2 \ rtprio.2 \ sched_get_priority_max.2 \ + sched_getcpu.3 \ sched_setparam.2 \ sched_setscheduler.2 \ sched_yield.2 \ diff --git a/lib/libc/sys/sched_getcpu.3 b/lib/libc/sys/sched_getcpu.3 new file mode 100644 index 000000000000..050a8f3facb4 --- /dev/null +++ b/lib/libc/sys/sched_getcpu.3 @@ -0,0 +1,51 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" This documentation was written by Ed Maste +.\" under sponsorship from the FreeBSD Foundation. +.\" +.Dd November 13, 2024 +.Dt SCHED_GETCPU 3 +.Os +.Sh NAME +.Nm sched_getcpu +.Nd get current CPU +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sched.h +.Ft int +.Fn sched_getcpu void +.Sh DESCRIPTION +The +.Fn sched_getcpu +function returns the current CPU on which the calling thread is running. +.Sh RETURN VALUES +.Fn sched_getcpu +returns the 0-based index of the current CPU at the time of the call. +The value may become invalid immediately after return, unless the thread is +pinned to a specific CPU. +CPU numbering is the same as used by +.Xr cpuset 2 +and CPU affinity calls. +.Pp +There are no error values as +.Fn sched_getcpu +does not fail. +.Sh SEE ALSO +.Xr cpuset 2 , +.Xr cpuset_getaffinity 2 , +.Xr cpuset_setaffinity 2 , +.Xr pthread_getaffinity_np 3 , +.Xr pthread_setaffinity_np +.Sh STANDARDS +The +.Nm +function originated in Linux. +This implementation aims to be source-compatible with the Linux implementation. +.Sh HISTORY +The +.Nm +function was introduced in +.Fx 13.1 . From nobody Wed Dec 4 18:35:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3R663mJ3z5g1DV; Wed, 04 Dec 2024 18:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3R660gtTz4vcP; Wed, 4 Dec 2024 18:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCTr1ek9us7UI2JADPaW5a8LgvSYJkEqk8tKTjblIBM=; b=qYX1FIArhgTP6ewFHs4gZFWSC2iDbd3ZUafpbiAjzF04J2znn8tpwnZf8zQa4tYXj/zyVU ZJMGNNHJs+R3+JgetcbhYa5/VoQv26bqfyym48kBu3jDcDqCYcpXg3qD3MzaQRMXsUBHW4 m8stzE24lMBziNgEdfl4SamsNRtFkO9LW2N9rOhG6Wl15eWWjbqz0NGr7DSSjCier7s4uY FEQ3GQurl3mV8MRAArr52KDMBi6PLdt/MTq6LoW3tUGoJh4lmgR8JvW1oXhdN2khuNWBQ6 8/29WIj+lN4YxD1v2qqGyT/Z48XsEAdcU+iVy6S0tvn4m9/Xz4fncMfxqegKHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCTr1ek9us7UI2JADPaW5a8LgvSYJkEqk8tKTjblIBM=; b=gnMuFcNp8dNfcELN4OegNicNkQBM0sXxPeqVg/nw5m101CvDX+Mi0fEeB5QwKBXjKuRkvX F4TQWH/vcw9bpZjuYxbF1VaHC0Tgk/IUJaiaWqwl2DYIZWBXqh2NwtFy0PuNcc/lN35C3+ bwhLAKBmdGLKkKCfTqvsQ85YykOa6+sgG0PCVotlJPg/PCW5M99GFkI8LwmSe0FnMOqeLz nXLqMRHhqWb863r0hSThq6Y6j6w+Bbwo2+vkYqmVv5mBYiG6qG5dEFzZS1rzIEBfjIOTB0 mNEOAWKIzTVvbK2Gd9Re9P4leiuSLAnAGcOXa7NC5UcTbBKZX9jfxZQdmT7maQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733337326; a=rsa-sha256; cv=none; b=e64zPVfZrTkP1TVUUvgDhcWgj2YxPLO0dqPF0fO59uF/cTOk35QWqEXDqDODElg4dOZjyH 1lpov/HxtURjsk9E90rLVeJCFmDH7uxUyiy821sJ0XKUfwMn5jLdG15RpKJU5TlkaIg27Z qW6lgOTxlCxKMpop0fGlOYsJ6asSbxb+hs21Fv2PeXkDebI1we6lTYZlbbwCz+qbiqcowf wVEWBtL0+71b1a63XcX4dcD6DLAqrRpzdYVG5ZhHXFICfbU43LQqjqNXaCwAV6X3+rOzhH uk0by+8UiJhvUFfsfYWByS2X781YXXJQ1cMqRGTc3vBWW6DCpTmBxDzM+wNLmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3R660JLXzJTv; Wed, 4 Dec 2024 18:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4IZP6s078374; Wed, 4 Dec 2024 18:35:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4IZPvV078371; Wed, 4 Dec 2024 18:35:25 GMT (envelope-from git) Date: Wed, 4 Dec 2024 18:35:25 GMT Message-Id: <202412041835.4B4IZPvV078371@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: d2c306da0ef7 - stable/14 - rtwn: Add device ID for TPLink RTL8192CU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: d2c306da0ef767ae367d177ae56bc6a74670fc73 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c306da0ef767ae367d177ae56bc6a74670fc73 commit d2c306da0ef767ae367d177ae56bc6a74670fc73 Author: Augustin Cavalier AuthorDate: 2024-11-09 18:47:44 +0000 Commit: Ed Maste CommitDate: 2024-12-04 18:35:12 +0000 rtwn: Add device ID for TPLink RTL8192CU (cherry picked from commit 7dfaf238562cfb9b8f2fe9a025220fd7147fedfe) --- sys/dev/rtwn/usb/rtwn_usb_attach.h | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/rtwn/usb/rtwn_usb_attach.h b/sys/dev/rtwn/usb/rtwn_usb_attach.h index 728a0a6a3b24..cd5485b36678 100644 --- a/sys/dev/rtwn/usb/rtwn_usb_attach.h +++ b/sys/dev/rtwn/usb/rtwn_usb_attach.h @@ -96,6 +96,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8192CU_DEV(SITECOMEU, RTL8188CU_1), RTWN_RTL8192CU_DEV(SITECOMEU, RTL8188CU_2), RTWN_RTL8192CU_DEV(SITECOMEU, RTL8192CU), + RTWN_RTL8192CU_DEV(TPLINK, RTL8192CU), RTWN_RTL8192CU_DEV(TRENDNET, RTL8188CU), RTWN_RTL8192CU_DEV(TRENDNET, RTL8192CU), RTWN_RTL8192CU_DEV(ZYXEL, RTL8192CU), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index af33b2cdec07..1c8942cdc782 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4831,6 +4831,7 @@ product TOSHIBA HSDPA 0x1302 G450 modem product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive /* TP-Link products */ +product TPLINK RTL8192CU 0x0100 RTL8192CU product TPLINK T4U 0x0101 Archer T4U product TPLINK WN821NV5 0x0107 TL-WN821N v5 product TPLINK WN822NV4 0x0108 TL-WN822N v4 From nobody Wed Dec 4 18:38:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3R9t6KfKz5g1Tj; Wed, 04 Dec 2024 18:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3R9t5qXsz40Wx; Wed, 4 Dec 2024 18:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r6FbIw+Cth6hecl4N/aq4bwDVP4LYaLklbcGmmaPi00=; b=DDZEBhk4wscwuDxQWoCs+L5JYVRcN76HQTBGAFMrAmU0yJ0zzmTbT/CM5yX3X6/VyCR5fc m1+xuWieT0sDgb+3OPVmIWf1Co1Vop4A/hx86zaYw0jlh+Upe1ozP2m1PmJq7tMitF2PaP DHg30zhnQcwFmY5oqRkAsghdV7OESnREPgS2skNRI+jiIq6l8EyCkTVxzSpD+PkzCDqQpn OmS0Q8sGZd3NKdIdAGvVj+mqCxC9odbRRPLz3Ouz+JloTGVYMmK0Cs5MMQ57E6xBuRvBmu gzXPmpeEmYebgVEn0TOzHxtWR+uga1Rwi5KHAgXG0PacI/7Vh8DMPZJqPWB0WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r6FbIw+Cth6hecl4N/aq4bwDVP4LYaLklbcGmmaPi00=; b=i7rYnmFWF02xtU75ZnfVOAtb5qzuiI0gKuQRUTqCG1XFMRAQO+zx2HizBJB1t9Aw8WiCMe EHBUVSpAKxFTwmy+Q5FJBs0fWCL9mofrR7mWXcemvz697suImFLh+AaB1XkgSYmTHaPmVU Jmg+ODKiyjBGV0mXxmb7lvpLIN45/cIgFLIXTr26+avHik5NxVLMEkteI5SWujzFcA8Ucp VpSxTJBiQ8coYPnGSegdHe9GvKBKwZp9Wi9GidJVgJ5OMNqqETCXHepszLf5wsALvl5AmW i3BrCMTO6n98vWeD7ohpAk7TI/iC45PlDDTb20fv8ozUxLhSDPjLtz7V9+Vs8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733337522; a=rsa-sha256; cv=none; b=TxsPcD2WwMLq5tSExPO3s36HZvI5Wp86nKHsRkyFJ0C8cJV8kncZFKHqTAtBwydajNU2uh Gh8YV8WQW5Fupi18jXieZLxUx0I3qKJeeR055Gj8hCjdB0B3/Rok+9FYdvZRNsq0RQT+ks okbKZ2lArPy6jJhp4VAL638uYFWhKUezQzEwRp+NOb4ziCXubpnIp43EK+EhsC+pScm0mu XHjNWWMofhJXB/5X0HLYzSFRcxok7PHDlaescBdPeAoQCkOcbnIgHlDRSEUkLVCIomFZ8A 2xejHltYyXQreA55B5rtAvI1crflSn2XCtoBIuMXYQ6fVlgiutEByphAeqqcVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3R9t5JWvzJr4; Wed, 4 Dec 2024 18:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4IcgPN079405; Wed, 4 Dec 2024 18:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4IcgUm079402; Wed, 4 Dec 2024 18:38:42 GMT (envelope-from git) Date: Wed, 4 Dec 2024 18:38:42 GMT Message-Id: <202412041838.4B4IcgUm079402@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: bb9678f1ff68 - stable/14 - comsat: Use initgroups and setgid not just setuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: bb9678f1ff6881b036220045adb58047332cfb0d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bb9678f1ff6881b036220045adb58047332cfb0d commit bb9678f1ff6881b036220045adb58047332cfb0d Author: Ed Maste AuthorDate: 2024-11-28 16:54:48 +0000 Commit: Ed Maste CommitDate: 2024-12-04 18:38:31 +0000 comsat: Use initgroups and setgid not just setuid PR: 270404 Reviewed by: jlduran Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47828 (cherry picked from commit d4dd9e22c13896e6b5e2a6fc78dad4f8496cc14d) --- libexec/comsat/comsat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 3f94f8d56201..1a9fb443e68e 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -224,10 +224,11 @@ jkfprintf(FILE *tp, char user[], char file[], off_t offset) struct passwd *p; unsigned char line[BUFSIZ]; - /* Set effective uid to user in case mail drop is on nfs */ - if ((p = getpwnam(user)) == NULL) - return; - if (setuid(p->pw_uid) != 0) + /* Set uid/gid/groups to user's in case mail drop is on nfs */ + if ((p = getpwnam(user)) == NULL || + initgroups(p->pw_name, p->pw_gid) == -1 || + setgid(p->pw_gid) == -1 || + setuid(p->pw_uid) == -1) return; if ((fi = fopen(file, "r")) == NULL) From nobody Wed Dec 4 18:38:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3R9w1SLLz5g1Xw; Wed, 04 Dec 2024 18:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3R9v6KYYz40ZY; Wed, 4 Dec 2024 18:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWuNqJT4hAopi1nxjY9eN1D4drLCqvBxaHX2+6/OhZY=; b=JQIX2XnUuKpd14GtPpFmoVt7lYwYHbwSkMw8MjthBpXmIp8n84vhDAurT/bFY9KZjfJJ2K k1jZqvRO1bIlnAq65uIvlpiyNvViNF/tgHoaYKz1QuwVuDNI/We/vEI78JZNQZH/dFdH78 5aKGvIUOxGezWUGk0I+IYzJdJH8vlb7Umbnl+1M+nN7c7ywsZ1yiVy/sDKejyroGb1SPZR YvR0XiNX1OlFC46FUD6yepOUFTr94W8f+Sc3IywQF0gausLbYVDgkbAu7caZsuW8OqbXp7 sQR4lXynTjY8AHNA+Hbp/OILpEfqMeiuQn0i/LjO56jqNm4TF1F4oFpUZ+Uoeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733337523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWuNqJT4hAopi1nxjY9eN1D4drLCqvBxaHX2+6/OhZY=; b=CG7RNnB0LnwOaZ/5NrUIdEwWBzmeiIQIQchsPh/TdcMPyWxOIhRNWbKban7nQioXycx+tx 6oOE2IV+8nnugiC+4hMBzR/mIPoIRKtv7y1eEYwZr7+zDXMK9IA0Y8bnpbbu1WM1vzz98x dU8vdZgzn/Q2UKdrqud9Pfx0VVx1wpIOkQnrG9oOluCiju5Y7UvnnmgyaM5K5NljvK3Grl t5HEqgJm/rzmapNamfT3LwxRdpqQJjOQ9DLcSAZ43kNXJmbaxtpvcg9qngl5mf6WO0zJvd 33XRcTOUGAHPzzdlCqoAD6uE5+geiYYOw1WQlLkT0YMrF7ia0jnQBRh/iMZDyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733337523; a=rsa-sha256; cv=none; b=IdY+VuPkm0ssk0XnLCFsmdd64iDm9Q3JBTWhj25TGtoPICT+m1HeqxYPCN+iHl/UcvJ/UC zIr7qMhi5VkR7IWn7v5egRq4oMHjShRUdbdRnhC57o1enKQPMEP+TE/XKDedLwIFWlo8Sl F3VdRqXE1ZgP9mNsYLDSQwsjCV+hd7rvpetEagbrrLJboQnKR039l0Nw1eg+feDj1tDYL9 406WZWEGDEO6yM3MEBOPxdLPaxAH8j9SVUEzRTRGV4ME6nuJQsu1hIaP5kJLw7bncIMgzK fJtlILC+J31c11whkFfB6E6VMIb0NOJEk8P6YQEK4ugOwCTyWDrHVU5ZpJiXrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3R9v5xdkzJr5; Wed, 4 Dec 2024 18:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4IchoZ079455; Wed, 4 Dec 2024 18:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4IchRq079452; Wed, 4 Dec 2024 18:38:43 GMT (envelope-from git) Date: Wed, 4 Dec 2024 18:38:43 GMT Message-Id: <202412041838.4B4IchRq079452@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: 30bcbf8a2fef - stable/14 - comsat: move uid/gid setting earlier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 30bcbf8a2fefe81e28bd9e293d9ee970464b0da4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=30bcbf8a2fefe81e28bd9e293d9ee970464b0da4 commit 30bcbf8a2fefe81e28bd9e293d9ee970464b0da4 Author: Ed Maste AuthorDate: 2024-12-01 20:43:10 +0000 Commit: Ed Maste CommitDate: 2024-12-04 18:38:31 +0000 comsat: move uid/gid setting earlier It's good to reduce privilege as early as possible. Suggested by: jlduran Reviewed by: jlduran Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47869 (cherry picked from commit 91629228e3df14997df12ffc6e7be6b9964e5463) --- libexec/comsat/comsat.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 1a9fb443e68e..2358336be61a 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -71,7 +71,7 @@ static int debug = 0; static char hostname[MAXHOSTNAMELEN]; -static void jkfprintf(FILE *, char[], char[], off_t); +static void jkfprintf(FILE *, char[], off_t); static void mailfor(char *); static void notify(struct utmpx *, char[], off_t, int); static void reapchildren(int); @@ -159,6 +159,7 @@ notify(struct utmpx *utp, char file[], off_t offset, int folder) FILE *tp; struct stat stb; struct termios tio; + struct passwd *p; char tty[20]; const char *s = utp->ut_line; @@ -192,6 +193,14 @@ notify(struct utmpx *utp, char file[], off_t offset, int folder) } (void)tcgetattr(fileno(tp), &tio); cr = ((tio.c_oflag & (OPOST|ONLCR)) == (OPOST|ONLCR)) ? "\n" : "\n\r"; + + /* Set uid/gid/groups to user's in case mail drop is on nfs */ + if ((p = getpwnam(utp->ut_user)) == NULL || + initgroups(p->pw_name, p->pw_gid) == -1 || + setgid(p->pw_gid) == -1 || + setuid(p->pw_uid) == -1) + return; + switch (stb.st_mode & (S_IXUSR | S_IXGRP)) { case S_IXUSR: case (S_IXUSR | S_IXGRP): @@ -200,7 +209,7 @@ notify(struct utmpx *utp, char file[], off_t offset, int folder) cr, utp->ut_user, (int)sizeof(hostname), hostname, folder ? cr : "", folder ? "to " : "", folder ? file : "", cr, cr); - jkfprintf(tp, utp->ut_user, file, offset); + jkfprintf(tp, file, offset); break; case S_IXGRP: (void)fprintf(tp, "\007"); @@ -216,21 +225,13 @@ notify(struct utmpx *utp, char file[], off_t offset, int folder) } static void -jkfprintf(FILE *tp, char user[], char file[], off_t offset) +jkfprintf(FILE *tp, char file[], off_t offset) { unsigned char *cp, ch; FILE *fi; int linecnt, charcnt, inheader; - struct passwd *p; unsigned char line[BUFSIZ]; - /* Set uid/gid/groups to user's in case mail drop is on nfs */ - if ((p = getpwnam(user)) == NULL || - initgroups(p->pw_name, p->pw_gid) == -1 || - setgid(p->pw_gid) == -1 || - setuid(p->pw_uid) == -1) - return; - if ((fi = fopen(file, "r")) == NULL) return; From nobody Fri Dec 6 13:52:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xkp4jBGz5gK2W; Fri, 06 Dec 2024 13:52: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xkp255Jz46v9; Fri, 6 Dec 2024 13: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=1733493154; h=from:from:reply-to:subject:subject: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+55kda5gqJZmk8xU6b/md6X5Ht8yDd5H7ig7QqYqTE=; b=qx9DruQg0lfc2jUJ2mTdGG9JFORYj2POTpnQtn4qar/qzdHPEtzDGHHUFTkYJ387gjF27q zYqVVZpZTBosavDUgQt4abDI2VyVmklYWrgFAXDWXs5H1HBScqRuygM9dV85U/uNMzdHbR fmjN2Yoy7nsMY6l0ikygDqbVLFC9QLEJxT+Qr39QniVOqrjDk/0QedGtfyspRok3c4bf/t 8iqJ+TY0Q6CmY6L2x9YP9LB+6YMAgscuwNtM0jBOiCdwOI1hon7n0oNhg4HjWxyIPSBI/E gwR0yKzHpfLMG19y6EYVOzCYl5kZYXQGxmanRcDSM2Xx+OhGiM+PecTrXyB4bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493154; h=from:from:reply-to:subject:subject: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+55kda5gqJZmk8xU6b/md6X5Ht8yDd5H7ig7QqYqTE=; b=UzLpKiEUwJKuGg0v8w8FwC9AKflrbvvrc5PbzlxbjUgHO5Ncink0DTi71DMXtY95+X5AsN OaS/POsVMH2KlHZxbdfoBm6OGTK6mfhNYaKNpqc6fHZkGJAeGX35IH1weZrjNh6kvHBvjk Buh4NXzvKbKXLgYEN9c7tEHH+1i9yJB8TR+/zRlkyugmHAWQcnlypL/sr3p694LVcGVdQW n/F0C52v4evouQbyzqsByMfhIdiJQhg/DdJPg7bQG1cDs+PEBAIIdRRes3mfHHaqeBNIEj Gzg1RLPKUB0trOCjk3e9u8PvEnVnZW3hVFcMVF16+n0aLXJyZh+I2lIZZjW3kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493154; a=rsa-sha256; cv=none; b=xxoOmZjeo1QL9UsIin6TipPXPIUUunx/5O9Tz9xcoPt2qwiZkFMDgW4O10wiCLejXSd0bk +qwyR/+KLtq7Z0NhprJZRcY5TXyBvechKdW7gkwoHIztv8WTuYDf+Skia6vq0QRJrPNMu9 pQYr1s2AUcYn0Tch8W+90DHEwKZ/7ijbV0z0Pqvb3neIoO5v6I034XnbPJKKzJTjR3MVLX WO7j2lU09HtSPxDWGAGPKls9jJ3we9XEFVJf9Y7BvwW4Z07S7enwhAHvQvrhGQV+ZITtEX ZPCuh1fko0PjNw1XzYZrzfeM+5hTTY/JwYSuPoXKwxW7s+3SqUjMiBarmNuBtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xkp1hq3zgjm; Fri, 6 Dec 2024 13:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DqYOB018900; Fri, 6 Dec 2024 13:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6DqYJo018897; Fri, 6 Dec 2024 13:52:34 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:52:34 GMT Message-Id: <202412061352.4B6DqYJo018897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1f6936723e10 - stable/14 - ena: Remove \n from sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f6936723e1051e92fb9b658f5f6fa13c2001cee Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1f6936723e1051e92fb9b658f5f6fa13c2001cee commit 1f6936723e1051e92fb9b658f5f6fa13c2001cee Author: Zhenlei Huang AuthorDate: 2024-11-26 15:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:51:41 +0000 ena: Remove \n from sysctl description sysctl(8) prints a newline after the description, no need for this extra newline. MFC after: 1 week (cherry picked from commit f2233ac33ab64f9bb03370c097af97f26dd0fca1) --- sys/dev/ena/ena_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index a6076c57e3f5..837d9b9a7165 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -158,7 +158,7 @@ SYSCTL_INT(_hw_ena, OID_AUTO, enable_9k_mbufs, CTLFLAG_RDTUN, int ena_force_large_llq_header = ENA_LLQ_HEADER_SIZE_POLICY_DEFAULT; SYSCTL_INT(_hw_ena, OID_AUTO, force_large_llq_header, CTLFLAG_RDTUN, &ena_force_large_llq_header, 0, - "Change default LLQ entry size received from the device\n"); + "Change default LLQ entry size received from the device"); int ena_rss_table_size = ENA_RX_RSS_TABLE_SIZE; From nobody Fri Dec 6 13:52:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xkq3slNz5gJmy; Fri, 06 Dec 2024 13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xkq2Rnxz46VM; Fri, 6 Dec 2024 13:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0YLaTs1R61lJEpqoDtzWNh8YQlq6G+cfSlERQ8GESg=; b=RCVYf80rmVQQpV4jjWy8r2PL9RLM4HE/Nu7DKRj/652AjLX6HguOuPRv8FeqfudtO3u37U bHzXZcnpllmkQLayOWfNk/n/uVnOYWZccJsTIs0qBRs0AsNAsqU3uFrqc6ncD+BA38H+a7 3zlpfPe/+V0pZXmR5cosAi9LJUvSX/MexphGCjSD6SEquLnjO+bAYcMxK91H8vpV679KZo 9GKXBE0BprUaL9E8Aa+Vj2TT/62LFMkhkbZRbUwLMEINXVz9X7IkjarLQQEMlOYx3seVgT 3OqBMn8TCJ7EuSmuQNFadbWbNSqeEnHyPMy0ZBlqRkmz/Wf40A2NjNQ7EH12Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0YLaTs1R61lJEpqoDtzWNh8YQlq6G+cfSlERQ8GESg=; b=fccKxRKWSynjFUNFA+mPdRwIQOJ1o3jTU0pp0kuEmq7y/KTqu/rsiKZN1MgcJ1zf6CMAqR +0rsl9vuh9T9PIZXGjhaP4WRaDZwK+rlnZE/uiZjV6fC3U5HT1txjcjpk5mDdr3M3x8kh8 ghbpBg6/xnF7ggivyb4sL5SWaFeVYV1aXgxpvjKqecjjv5k6RPibgIfrcmfIuS72UN8qcF OlqCOE5F4kQasjxbgpH/DtuF7haP7NsemrwWGWHpBGQ5l3VRoarsVpXv0sAgf6aUA7euSj ocrKEX5MO/c2uSCE51Jllb9uYg7TwHY+URGNQ6ZiEm2fu7u6q09d1tZz1tUqyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493155; a=rsa-sha256; cv=none; b=xQtIIyoOdFX266GCQBetxHaY0eB1hLIiLKYjd1Y4q+X2Gu8Eb02/PCUKfxphdIqGOYmAjm ONLVLsSw2XJodTDFRmucitCEioQvE8OTZniSU/9v3I/n2qDPQN+j+m5s7qgTR1bPvkO5hI JIJYvqdCqWg6tcbFTGjCfKrf9WtzeHTtPkznLoIJKdtPUaUrnEdQIhgdGA6lyH6IuMhNX+ Ky5dPoBSHzNOrY75xtU8ZrQjCRB2K3JSLR+8RGFgzl7/UwCkRTGplpRa9eHjdh7XCLz67j 3UKTxcFPVW6c+6iwNIHhTGXm9DDI8FU6i0pctVTwoK0QfLXfDu0yQ1G4rQoqAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xkq230Gzgtq; Fri, 6 Dec 2024 13:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DqZ1f018960; Fri, 6 Dec 2024 13:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6DqZc8018957; Fri, 6 Dec 2024 13:52:35 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:52:35 GMT Message-Id: <202412061352.4B6DqZc8018957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 20675c61d139 - stable/14 - Install vmx man page also on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 20675c61d1397c3f9f5dc857b0997a1172e05164 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=20675c61d1397c3f9f5dc857b0997a1172e05164 commit 20675c61d1397c3f9f5dc857b0997a1172e05164 Author: Zhenlei Huang AuthorDate: 2024-11-28 10:04:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:51:41 +0000 Install vmx man page also on arm64 Fixes: 375d797b8191 Enable pvscsi and vmx in arm64 GENERIC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47711 (cherry picked from commit 4de4f81f379edc5f3a0c0bd1a2325bf8a1873e7e) --- share/man/man4/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e83be3054aca..90e84c31c98e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -832,7 +832,6 @@ _if_bxe.4= if_bxe.4 _if_hn.4= if_hn.4 _if_nfe.4= if_nfe.4 _if_urtw.4= if_urtw.4 -_if_vmx.4= if_vmx.4 _if_wpi.4= if_wpi.4 _igc.4= igc.4 _imcsmb.4= imcsmb.4 @@ -863,7 +862,6 @@ _urtw.4= urtw.4 _viawd.4= viawd.4 _vmci.4= vmci.4 _vmd.4= vmd.4 -_vmx.4= vmx.4 _wbwd.4= wbwd.4 _wdatwd.4= wdatwd.4 _wpi.4= wpi.4 @@ -899,9 +897,11 @@ _vmm.4= vmm.4 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" _gve.4= gve.4 +_if_vmx.4= if_vmx.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 +_vmx.4= vmx.4 .endif .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ From nobody Fri Dec 6 13:52:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xks0KGQz5gKHQ; Fri, 06 Dec 2024 13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xkr4vNQz46db; Fri, 6 Dec 2024 13: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=1733493156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9YxOUOxZIoJqRxWd4C77qh5RNUAYpbWfYIHS/yV8aPI=; b=jqcK6ojhRFKACstHrDxUwq6s//A6Ig5yI0NgSatU9CUEOJWktkuzRhojw/44j66G/8rFKH YewqLVpk1q4WF1pko/hE0IufuOsfcV3YEn/uzR/0TK8H6yiYl5KrIc6AXA5gMgTfvfvzsu XBXFHmzaFml8DA+eZ4U2JyZiQTslsJym2B4D7u6/BGWqggXoS6L7tgZ/Fk3VPBxdE7pIUd 5k6rap3zUFIyywlMf0HgQVm/ak4DwvEoLKRm+Yy8ddCImej8GRpPne6cwNt7EsiVKrD5ys wLZuBTBcOrE0xqKPdXAjG2RRMHXjJ+a2yVtVCAsCLU8X4jUhVSWIV9sIrb3cew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9YxOUOxZIoJqRxWd4C77qh5RNUAYpbWfYIHS/yV8aPI=; b=mIrA11UqTZX29iz0uL8NS2orbQy+BNpu5RvJNIuismadBMBd9VMk7blLnIVPh4HbR1P+Np xtKgX3BDYCnQ0Nn0KlyPryyE4zj3OEvzjK7VXn/DNGCmJIRteKX7QBIKrB+XUqeXL/ePT5 ShjN1Fq2pXb/up2VKmTeQCL9cMj+lujLdU2onuYAELes9mG5CcCbdB7BfF0xbj0Er97FaB n14oQJZpgVJ5zKwzXL5ND+kKFMRAfIWIRm4G+r6sWd7VNDPAISQpykoi4eSzmVGyuj+s14 8g+ruYkqxn8pGzN/5gcUV0SK/YfRa6ckoAT8uqIqb/F0LpJxVopCEOpfYkexyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493156; a=rsa-sha256; cv=none; b=k4ZKikQGlKMWQLNyI5tJa4+jvPKsKeYEUaOo5IGTPwFs1+eoVRg8W8H1f9B+5UFTgviGrR BMi/TTY/s4awKOjPPBhTAJOtZ4Zh+3IXw6qe8AT+h40a+mdAImBJwPvHcB/Bluu2iJGv9F /jgbaW7jIK89Wmk3BsVnH+ANcbqgt+9viqJN/xgxg3cwB3AOSBKpekQVmwqBDgnjIzJxZS DR9tFD9T/MPcrKFhUkAM98foaQngEP03cHC57T9S5wYQkWI2be1NxRcXu1hIUq6O1QuwHf LY4UYjo25oe5YAIE0i925UxF33uSEt79HaXlzakNjxDCrUc/z7LYcV37Y2yECQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xkr3HYpzgtr; Fri, 6 Dec 2024 13:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Dqaie019002; Fri, 6 Dec 2024 13:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6DqaML018999; Fri, 6 Dec 2024 13:52:36 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:52:36 GMT Message-Id: <202412061352.4B6DqaML018999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d460330dfe80 - stable/14 - Install pvscsi man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d460330dfe80fb5545da5321c7fe1c9e2bf19003 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d460330dfe80fb5545da5321c7fe1c9e2bf19003 commit d460330dfe80fb5545da5321c7fe1c9e2bf19003 Author: Zhenlei Huang AuthorDate: 2024-11-28 10:04:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:51:41 +0000 Install pvscsi man page This was lost during the initial introduction of the pvscsi driver [1]. Later the driver was enabled on arm64 [2], so also install the man page on arm64. 1. 052e12a5084f Add the pvscsi driver to the tree 2. 375d797b8191 Enable pvscsi and vmx in arm64 GENERIC Reviewed by: emaste, Alexander Ziaee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47712 (cherry picked from commit 1811fa623d74b42f79c109c3fe8ea9dd21d60076) --- share/man/man4/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 90e84c31c98e..5bbf718911d7 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -455,6 +455,7 @@ MAN= aac.4 \ pty.4 \ puc.4 \ pwmc.4 \ + ${_pvscsi.4} \ ${_qat.4} \ ${_qat_c2xxx.4} \ ${_qlxge.4} \ @@ -901,6 +902,7 @@ _if_vmx.4= if_vmx.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 +_pvscsi.4= pvscsi.4 _vmx.4= vmx.4 .endif From nobody Fri Dec 6 13:52:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xkv2M9Bz5gKHT; Fri, 06 Dec 2024 13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xks59f1z46s1; Fri, 6 Dec 2024 13: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=1733493157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbCAY1vHiR25D9ZDc9egvht5LIauHXCjuEvZ3Q33DSw=; b=hbbEZawZC011qWogvbcYPY83yIxq7qjsD8cSAG0CzLzW/MdWapp0pOykKD11Z4UtIOJdOX y1ZmsHChZautO0bsBP5sHJI9UgbUC20JvLqBkUSFRZgRH6nc/NSTdrXbg8Q/jOStt+6iTq l2Ybl2fQtSF3cvfztQQKfmngHgo56xCgFSNhzLUYHJY2xhbr1ZaIUlWi465YMfSYwVDe19 7CKGcO4oOS6IrfNFVJqje+LNk8OndA5vEKaDAhyuvIgjwWYOFfwWx2zazz9M/lY3/7NMoV LqB0a6XYx38+JQZr3ar2fWeK33JYZ5O10s0GIZpKYBjv9ACVNUTMWS1A5ikm5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbCAY1vHiR25D9ZDc9egvht5LIauHXCjuEvZ3Q33DSw=; b=i7mIk66bUQ7lzwcYd3zwe6WVWzuNHTLG0sD6t5zzaooCdBGAk8Hb0j2HZmzg/PWzVF0zcH g+sfLMYaKH+fAgH8aWQuaNQwVHGtWuNObahsKTpJ5UJpMjbaiQ6/IjEj0nM4Q5w9KpUIch b2yHoWaJyXtpl8eYd+3x8/P/+2/JF94e8jPmIsD5A2IDIOWhFwlPSPa+S4gakIaz4xYpt0 fPafImrY5s/4PZqIGtY8XB6vbMTnPfQx8Y/whpE4ER5k4Mnq0JeAydoVJ3i9ORwZHO0mbE GybcPB5OuI+2b+ZCWPc1quu58ptI0UaxBNyDKzjPEw9orhqpHY9Qrst21O5Nqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493157; a=rsa-sha256; cv=none; b=YYsqMy5nf6ifVS2h0nBoJNB07v0Tu/gZcyii8hQ8ZHA211hbc7mMcDUyqhR8MY21JXErh7 yZcOjvAXwSS4x7pIz8iFwmqlkNyRjwpIM2W1xxc4Xvg9VI+obULFJQUVbGeWlAaXI5CL9D QX3NY0KQW+B5Fjv+w0U1vW1yRrWBZ/inotxK9MSgAAoaD7/NmxEOr45HW0z/MjROtH9YDv 2jxuqb2KFzhkF4ARmaJRI8gqeYmJK3jLW1QbQxflsG7NnvKjjjAGCrCAYpP0BKAwHij8W2 +jyzv5XQCN9M+Y3bBZ1fGOVxCNrbMZ3hKxOvoKMDODMGrQjs4zlI2kyt4AiHEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xks4ZpNzgS7; Fri, 6 Dec 2024 13:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DqbvT019044; Fri, 6 Dec 2024 13:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6Dqbud019041; Fri, 6 Dec 2024 13:52:37 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:52:37 GMT Message-Id: <202412061352.4B6Dqbud019041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0b80bf9edb19 - stable/14 - udp: Prefer memcpy() over bcopy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b80bf9edb199ca35dae25241e2dc38bd7e84cb9 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0b80bf9edb199ca35dae25241e2dc38bd7e84cb9 commit 0b80bf9edb199ca35dae25241e2dc38bd7e84cb9 Author: Zhenlei Huang AuthorDate: 2024-11-28 10:04:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:51:42 +0000 udp: Prefer memcpy() over bcopy() The variable b[] is on the stack, thus cannot overlap with ipov, which points to the heap area, so prefer memcpy() over memmove(), aka bcopy(). No functional change intended. Reviewed by: cc, rrs, cy, #transport, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47713 (cherry picked from commit 949190c5afbc677c53b5d96354b52256923a11d1) --- sys/netinet/udp_usrreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 7329600ecc79..47f7eb65f119 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -546,12 +546,12 @@ udp_input(struct mbuf **mp, int *offp, int proto) char b[offsetof(struct ipovly, ih_src)]; struct ipovly *ipov = (struct ipovly *)ip; - bcopy(ipov, b, sizeof(b)); + memcpy(b, ipov, sizeof(b)); bzero(ipov, sizeof(ipov->ih_x1)); ipov->ih_len = (proto == IPPROTO_UDP) ? uh->uh_ulen : htons(ip_len); uh_sum = in_cksum(m, len + sizeof (struct ip)); - bcopy(b, ipov, sizeof(b)); + memcpy(ipov, b, sizeof(b)); } if (uh_sum) { UDPSTAT_INC(udps_badsum); From nobody Fri Dec 6 13:57:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xrl62Ngz5gK7C; Fri, 06 Dec 2024 13:57: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xrl5RHZz47pR; Fri, 6 Dec 2024 13:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sfUMx8l5wf+5OZNRshhis2i/tDtnf4eH2/Jn5sHbQYA=; b=mnmFEhyuB8xiY8M2G2ZJEcskN2nbWheHLCZzb37QeapjSbfsu6XxgC6eT5TN4jB0eate/T hFZcJ3YjTD4iHNRDLlbZxt9infmWDMYEynHMjtziw/KI6o1ujIoPDkYhVY23cLS2vone1p StWdD8Yxw9rN/MmYJox41w89niaeqrIj5O/yS76c+PdDZTh5vxNctggpmq/M5D5vrDa3w9 1tWwckXFX/BxltWqrNR56d+X2eWD3DmKwZj0uIdYGGiCYoSNUci6n51oQCKdg2M2+zcZW+ w+FwnoD2Dtao9caRn7W6QI8Kx1mgd34y9IBaI9ywBmjXS0tNYkymJM4IZpBlCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sfUMx8l5wf+5OZNRshhis2i/tDtnf4eH2/Jn5sHbQYA=; b=F/pz6RFWiXjLZ4rXCyYj6FB4UyKMNGQniPC5Rd5yTSzfW690fl7Ap2MAa3fa/miUN9qmL7 OviwbiigCnqEIXkQWaTA8Ylgk+2Kt9WiwdIMtnjLuoB3ipRcadLw2Nj1hUSjhEjSAILYDE SKzXxlo2I1XVJ+LrQb+DkI+HtGGDQuQmZuicQWJDtNeFLN64toCSbxpPFza1deA+4NTFIO wyUq02LNaMhpmXltuxvOIBBFpR+TFwFsxejWrtdTvD63C1mZmi9Y1H6xXy10YLc3NKLzW4 A9OtRILWqVG99nio4iP8Ytu5qIldIm4PMMEy/V349WBX2t88+qdGhCEc2F8FgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493463; a=rsa-sha256; cv=none; b=tH0pBL+SFUQcVIanlbYsjeR7i7rvN8c4LXsc7Ed3ISN3JtKZimgiTj3VqfGOLgXiXRPpvP 4PfOcuU9cwHrmJSLKfHfzWgQ32ITm28BN1UFZOUCpfMaEj090uOKGcO56pRkr//7FbNx99 qv6Olzr3oa7DunpXexcDmMZTo53z7jGEdRb+qj2r8n/pEutJXO0hUuyJerxjPjQsBdJfZj efZADBl1DD6V/lhLmc/SA2l9iTzmy37vq/7jZ9vTiLcsByYvS0I7T0awvTngggLB9rPgG2 NkQA6m+rrEV6YDbQP9X6kQLU8Tx+mDQnwjv9JK8CKCEr+tPswBZOEnBNsMZuKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xrl4mZxzgTQ; Fri, 6 Dec 2024 13:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DvhEw020630; Fri, 6 Dec 2024 13:57:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6Dvhxr020627; Fri, 6 Dec 2024 13:57:43 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:57:43 GMT Message-Id: <202412061357.4B6Dvhxr020627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 192b108d4441 - stable/13 - ena: Remove \n from sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 192b108d44418f7c0a96431fb3c7c706ff833d8c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=192b108d44418f7c0a96431fb3c7c706ff833d8c commit 192b108d44418f7c0a96431fb3c7c706ff833d8c Author: Zhenlei Huang AuthorDate: 2024-11-26 15:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:56:52 +0000 ena: Remove \n from sysctl description sysctl(8) prints a newline after the description, no need for this extra newline. MFC after: 1 week (cherry picked from commit f2233ac33ab64f9bb03370c097af97f26dd0fca1) (cherry picked from commit 1f6936723e1051e92fb9b658f5f6fa13c2001cee) --- sys/dev/ena/ena_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index a6076c57e3f5..837d9b9a7165 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -158,7 +158,7 @@ SYSCTL_INT(_hw_ena, OID_AUTO, enable_9k_mbufs, CTLFLAG_RDTUN, int ena_force_large_llq_header = ENA_LLQ_HEADER_SIZE_POLICY_DEFAULT; SYSCTL_INT(_hw_ena, OID_AUTO, force_large_llq_header, CTLFLAG_RDTUN, &ena_force_large_llq_header, 0, - "Change default LLQ entry size received from the device\n"); + "Change default LLQ entry size received from the device"); int ena_rss_table_size = ENA_RX_RSS_TABLE_SIZE; From nobody Fri Dec 6 13:57:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xrn02zQz5gKDS; Fri, 06 Dec 2024 13:57: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xrm5n7pz47cm; Fri, 6 Dec 2024 13:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFFxun3aneV3lcv6wTx2zGW3VuuII63ektkUdlSTqG0=; b=a9/zZFDHnWj5di8KIUU6txmKRtsj9LatLYe2x0+vQTIbFRFu9CgfuOyGrEGdFF5OVfZP+6 3jnF4hkCbhkWqNo8QQZDt3EB9uefXFip0pO6Q6PwD5iBTBtF7vdicGHEpD6q8mu65TCu+J WRoqt6JTDfXOla8rp+Yec0fxsltdrd5g6YhhuJqPLaVUpbVDG796ed7ANOf5t3ijAyp557 obBItoYqXEMHNZJatUx/uk+MUWEA8DB6JNAgXetzmbh/R89uXzvnnDGh91fBQ3ZrTnOwMv kIPG7x2LRIOxN+BXhkOut2juyC1ap/VjuxuHwacMxZirNEkaXE6U8fbpMl/ghQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFFxun3aneV3lcv6wTx2zGW3VuuII63ektkUdlSTqG0=; b=kNwWrlN/laiyUfKKFO9AsiD7ORI4cX1FGyHwZQ3rpJoYF3+Avdu5w+IenLrfn/U12o3MoC vbV5Qx1oqQzk4o+pPVPvEmqiinU/ap4Y5Ws5Y3P2gMU1uQ4DHZLexnoJnIFmVJ9RunbUkg Veay20CoSDre/0yRQLhIAMAKEB16ohSPjUmu1TOLFBkNNQS1sNYZCnHufPtjv3ikrdFq3h mdlmcYIJqthFF3eDyKnygTopUb/rnS1r6cSoDhz1bXXM+zvXGZ6JIs9CXX1+u9Mtppxf9n iWnVnnr+2Vd0StHsei2Yw06CFvvXtdUPTTBAfvNn2S1YCSwyyoYV2Vpoc6vsog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493464; a=rsa-sha256; cv=none; b=gjZrfTt56j+JF3+UmQOfsieca6kPSpVLRjeIsmGhOp6coz7WvdHF65ghkuCRsK/v7u2pjf N/JA5OoM83qOT8/lA4DhK775aWH7pDG6rrZ3CE3KruQArEhJhqqtlPnithjbL6a+0YkBvo OGAjVzB+qn5h5X/r1pwNuweXeOkLTAwYzNPK3w5fYrJdrk4EMqv+DusQAqD13mz1ae79JH JG2dl0X+YbG5I4bN/GqiqHoXC56ZQS6dRf2KZauyhzW/iyxh1JwoAfvpILVtlukR3u3vO9 K7jRED9mUgY2bb3heP8tVXgOqelEtZK4rho+uRXUQfEmBQ582ne9NmZo4OnUEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xrm5DWDzgjp; Fri, 6 Dec 2024 13:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DviL4020692; Fri, 6 Dec 2024 13:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6Dvi7X020689; Fri, 6 Dec 2024 13:57:44 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:57:44 GMT Message-Id: <202412061357.4B6Dvi7X020689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 92bd3b208845 - stable/13 - Install vmx man page also on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 92bd3b208845b492299e1f67c58762a84581c66b Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=92bd3b208845b492299e1f67c58762a84581c66b commit 92bd3b208845b492299e1f67c58762a84581c66b Author: Zhenlei Huang AuthorDate: 2024-11-28 10:04:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:56:52 +0000 Install vmx man page also on arm64 Fixes: 375d797b8191 Enable pvscsi and vmx in arm64 GENERIC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47711 (cherry picked from commit 4de4f81f379edc5f3a0c0bd1a2325bf8a1873e7e) (cherry picked from commit 20675c61d1397c3f9f5dc857b0997a1172e05164) --- share/man/man4/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index d961e7f17879..49d39321a64e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -845,7 +845,6 @@ _if_bxe.4= if_bxe.4 _if_ndis.4= if_ndis.4 _if_nfe.4= if_nfe.4 _if_urtw.4= if_urtw.4 -_if_vmx.4= if_vmx.4 _if_wpi.4= if_wpi.4 _igc.4= igc.4 _imcsmb.4= imcsmb.4 @@ -878,7 +877,6 @@ _urtw.4= urtw.4 _viawd.4= viawd.4 _vmci.4= vmci.4 _vmd.4= vmd.4 -_vmx.4= vmx.4 _wbwd.4= wbwd.4 _wpi.4= wpi.4 _xen.4= xen.4 @@ -922,9 +920,11 @@ _nvme.4= nvme.4 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" _gve.4= gve.4 +_if_vmx.4= if_vmx.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 +_vmx.4= vmx.4 .endif .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ From nobody Fri Dec 6 13:57:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Xrp0fR9z5gKV2; Fri, 06 Dec 2024 13:57: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Xrn6nhxz47ph; Fri, 6 Dec 2024 13:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTK8p74LKvG75N7Eqe6whhsn7rU1/r0pm4xa0MH43cs=; b=IrMMUXjT0DiYzBKRO3TJ3sYb0SIr/qqIlrSbd5IVPItlyKYavr70SZiDDfn3IyIJ5BHLmt ToGmuGJ8PrMc+gcVsvAk10tSgzc5Gfo8BNyZtDRscmO/OcAl7BCP8Nc6X0lSIkeeZYWpG1 iYxKzVCzDOLeIMsy/RKgisePsE4u8KyDPjyqFTiT62KG9dEEO3pOS79ZPw4ZG0oXqgPwEv LsNXOgfzaDgqhjFnKThNnhtSiX4+N0uPXBNSHUh+zRgwuY/27P7znm8SjV15eBkZ4UuRD+ IFFFz3joE7Tff+C4IX5VqBz8bbx8q4yfrf2pivJFlBLAFWP6HApJTJu02fjffw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733493465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTK8p74LKvG75N7Eqe6whhsn7rU1/r0pm4xa0MH43cs=; b=Ae+W2JRLRhq1jYRSkB2zsTCmzCA5rR0XgVQPdAaFsxll0zXYYyyVg4huWbd3FvVAJIzaLk dxc2azGEe9Pxkp2kNAhevoiklEf2q5RMoSB889i53ebHAChG4FmG9uHbmTYbjoLOJ1ILNt 4yinqTiQSFyF3lSRU187mGvKg/094B7JQ5GsFI0ICyUGr5SCzdRSBXGth3PYRAkd7481s1 t1JaDN+FrinwQOfufDPohIsceVrkMRE0mWAUrLEoH6z5sXaEq2lrNNV9kZDUVSYr5TCCqc x5Yl2AMjLy1ekVK7kXoqrlsOEoZZ5IXvhkeJc/kYqKJiQU8tDn/xepXJrcwJlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733493466; a=rsa-sha256; cv=none; b=dcjLEvaz7u50pvsHXUqJvkNChRm2S9FQTN0AlPxo3ykacrzMUWZyXErPLm0XpK73PupC/K cUXRBCiRNm2lrMkXk5Elm4Uf88BNyjVgvY/WjSUTumnpG6I2YahXeO/Ma9Cvb0HgPNdTsn 5CLpGG94Omabnu/W9RKk1XwgY91nkNn2Lj3BltRhdb9arGbRZVLyVlkJl/FuIcWQI2wFRg TAIUVLymm4oEeBtaI6pEToa90bZ+DZFlS7W9qb3yi9TYXfDvFof8n8KzLYg/u0swTHlzhu AkkaX4srgRwi+1MYAjmpiVStGFC/eu2N3sfM/qLib6AHk9YKwCRdTrk6qXMx1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Xrn6M33zgTR; Fri, 6 Dec 2024 13:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6DvjAE020731; Fri, 6 Dec 2024 13:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6DvjTM020728; Fri, 6 Dec 2024 13:57:45 GMT (envelope-from git) Date: Fri, 6 Dec 2024 13:57:45 GMT Message-Id: <202412061357.4B6DvjTM020728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 84d166902af2 - stable/13 - Install pvscsi man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 84d166902af23eb24b1862e4636ea0fedb737414 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=84d166902af23eb24b1862e4636ea0fedb737414 commit 84d166902af23eb24b1862e4636ea0fedb737414 Author: Zhenlei Huang AuthorDate: 2024-11-28 10:04:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-06 13:56:53 +0000 Install pvscsi man page This was lost during the initial introduction of the pvscsi driver [1]. Later the driver was enabled on arm64 [2], so also install the man page on arm64. 1. 052e12a5084f Add the pvscsi driver to the tree 2. 375d797b8191 Enable pvscsi and vmx in arm64 GENERIC Reviewed by: emaste, Alexander Ziaee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47712 (cherry picked from commit 1811fa623d74b42f79c109c3fe8ea9dd21d60076) (cherry picked from commit d460330dfe80fb5545da5321c7fe1c9e2bf19003) --- share/man/man4/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 49d39321a64e..e687a2d66ce2 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -463,6 +463,7 @@ MAN= aac.4 \ pty.4 \ puc.4 \ pwmc.4 \ + ${_pvscsi.4} \ ${_qat.4} \ ${_qlxge.4} \ ${_qlxgb.4} \ @@ -924,6 +925,7 @@ _if_vmx.4= if_vmx.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 +_pvscsi.4= pvscsi.4 _vmx.4= vmx.4 .endif From nobody Fri Dec 6 14:51:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Z2w0JZvz5gNqF; Fri, 06 Dec 2024 14:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Z2v6yW5z4FjQ; Fri, 6 Dec 2024 14:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO2eubgGQ7UL0EyEv8ixdKISsMls4B9oxmBd5CT+fEs=; b=xaZrMKEy5cYb5AULWbHHRJxfrJyMCAZcEA9BI1fuiOYm2hQI1FuDCm2qxB8iMmyZ5+sNAA hOrIOLcK7ASDxHoFjbCdZmiu1P+ZwdXyRg51LMzvo7MotAse0Gy1QZHsqBIHRM63BtcbYl 9yKoVGj2+yeOdbqD0W71sB6QBIHygFphbimOGlVBAg3DSyPO8izLD/JEHemtPuKCOeQbeS DUppPER2XTpcA1agZyOMQOQSU4UDGm33cSzYUheCIb784kaQejv8eqHOUhwYQ515ugZCil uRdEKYu3HFLxVL+FQG5ZMUGvQHMk3DBEIG5LfBlugl9SXoJTJu5g6LhmG0gYjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO2eubgGQ7UL0EyEv8ixdKISsMls4B9oxmBd5CT+fEs=; b=nUwUiD1AoIuG7bWtedYoNPIUQPCzyWOBHmwELAkSRuc+aZZU0ZOPlJfNWdxEUSDAmKhfnJ iq+fMGWlNynXqPzTW4mFst8dCtznp7Wydndx3zBSrqoELPzISBBVbqoNA/rEQu3dkp0hJN GKBJVNmyJbV8awuhsbE/RfPyHE4OFGosYbtcXZSasPPkOVdYFIAMiD0mPRwo7Kr++XVEcr X78e2gNdWNmEE+Mc2zLjDWOqKYtxsxtUnCZOZNQB0q0nsSjzHiMSNTJqPp3qV7NVRnrVDW YBaZZIz6jaQKDMjwPVP15py9ZZ4y7sD0/8lAkNksHhEwds56oezjPRzWmocWVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733496696; a=rsa-sha256; cv=none; b=kBq07g2tbrvpJe/ufkubFQ+8ZYqpTYiHsIr22x9hn1w4THutNdC4ZE74brhJW/8+RrKuuK nCsHwiXh6HJCgENGRopmmZCYUkGYt97tUG7URGzr51xjeAZDH5MygYf4ggkJU6Sppc+t/i hBKKzx0AU81ddd4R2W5awOXzEk3BRIHH7DbhXMRtNcVtNfgnzhxB4MUHFhFA8NPcV2F2Tv i9XuBm1/HfdFG3p7c/fbtflA2QnclzzqV8l3vFB7s2YrCNKxRWAwGkjzaefyxVM3mqKcXY VixFz2u2STArNCKYi0mKMesUXgAxBYBe8Wj+WXYPyN65CG6hs2sKFHsiNxqrCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Z2v6YnVzhy7; Fri, 6 Dec 2024 14:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6EpZHT028237; Fri, 6 Dec 2024 14:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6EpZpZ028234; Fri, 6 Dec 2024 14:51:35 GMT (envelope-from git) Date: Fri, 6 Dec 2024 14:51:35 GMT Message-Id: <202412061451.4B6EpZpZ028234@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: 804dbdeea266 - stable/14 - devd tests: Fix client_test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 804dbdeea266599bdb7cb576048f8b13038b521f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=804dbdeea266599bdb7cb576048f8b13038b521f commit 804dbdeea266599bdb7cb576048f8b13038b521f Author: Mark Johnston AuthorDate: 2024-11-21 18:55:13 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 14:51:09 +0000 devd tests: Fix client_test The loop doesn't check for overflow of the event buffer, which can easily happen if other tests are running in parallel (the bectl tests in particular trigger devd events). When that overflow occurs, a funny thing can happen: the loop ends up trying to read 0 bytes from the socket, succeeds, and then prints its buffer to stdout. It does this as fast as possible, eventually timing out. Then, because kyua wants to log the test's output, it slurps the output file into memory so that it can insert it into the test db. This output file is quite large, usually around 8GB when I see it happen, and is large enough to trigger an OOM kill in my test suite runner VM. Fix the test: use a larger buffer and fail the test if we fill it before both events are observed. Also don't print the output buffer on every loop iteration, since unlike the seqpacket test that will just print the same output over and over. Reviewed by: imp, asomers MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D47625 (cherry picked from commit 30cafaa9611d82525ab32ec32304b93835a5124a) --- sbin/devd/tests/client_test.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/sbin/devd/tests/client_test.c b/sbin/devd/tests/client_test.c index 729c7a2f8bad..fdac3c98b3c6 100644 --- a/sbin/devd/tests/client_test.c +++ b/sbin/devd/tests/client_test.c @@ -22,15 +22,14 @@ * SUCH DAMAGE. */ -#include -#include -#include - #include -#include #include #include +#include +#include +#include + #include const char create_pat[] = "!system=DEVFS subsystem=CDEV type=CREATE cdev=md"; @@ -134,29 +133,37 @@ ATF_TC_BODY(seqpacket, tc) ATF_TC_WITHOUT_HEAD(stream); ATF_TC_BODY(stream, tc) { + char *event; int s; bool got_create_event = false; bool got_destroy_event = false; - ssize_t len = 0; + size_t len = 0, sz; s = common_setup(SOCK_STREAM, "/var/run/devd.pipe"); + + /* + * Use a large buffer: we're reading from a stream socket so can't rely + * on record boundaries. Instead, we just keep appending to the buffer. + */ + sz = 1024 * 1024; + event = malloc(sz); + ATF_REQUIRE(event != NULL); + /* * Loop until both events are detected on the same or different reads. * There may be extra events due to unrelated system activity. * If we never get both events, then the test will timeout. */ - while (!(got_create_event && got_destroy_event)) { - char event[1024]; + while (!(got_create_event && got_destroy_event) && len < sz - 1) { ssize_t newlen; char *create_pos, *destroy_pos; /* Read 1 less than sizeof(event) to allow space for NULL */ - newlen = read(s, &event[len], sizeof(event) - len - 1); - ATF_REQUIRE(newlen != -1); + newlen = read(s, &event[len], sz - len - 1); + ATF_REQUIRE(newlen > 0); len += newlen; /* NULL terminate the result */ event[len] = '\0'; - printf("%s", event); create_pos = strstr(event, create_pat); if (create_pos != NULL) @@ -166,7 +173,11 @@ ATF_TC_BODY(stream, tc) if (destroy_pos != NULL) got_destroy_event = true; } + printf("%s", event); + if (len >= sz - 1) + atf_tc_fail("Event buffer overflowed"); + free(event); close(s); } From nobody Fri Dec 6 14:51:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Z2x2vyxz5gNYF; Fri, 06 Dec 2024 14:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Z2x0tPtz4FR2; Fri, 6 Dec 2024 14:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHiHsdbkUB3hLixpCyg/ZNvEF7is1RquwHbhf/yFQFU=; b=q6cj08zkin5Jh1NDJ8kgziVfMZDJ5VcA0Fh0S/F6xrdanmlwrOJFLQWcjxxXuMR2QqcnkA XQD5vO8CPzfdv4DoQ1CLgBxqXYsrjm88KuoOg/wemGiS3lrwgdHp4Zq0m5tvCUYzTvpfqh bFy3stklAahw9acWkr7sFgIHxDijcbJYzvRnKnhQgh03vgoQ8BLMpScKWLey55x/qci6yt 7PKG/U1c2sB3FoQnOSLOVAQnkJF9mXbgDBXMsUPt/1JDcrKxRzx2tMg5lwoZQfLfecJIgi ufPOsRoz71ohxcrV2MnxKR7uiI6vBnxzpELpqkeH1KWbReRKA2JDos28WwnX2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHiHsdbkUB3hLixpCyg/ZNvEF7is1RquwHbhf/yFQFU=; b=IROjKb2uKdTrUV60DUzCd6U7pxVu98o21if4Rssx0s5WFxBuV4TLNKnGZ1Ij34WXQCz7/i Yd8ELi4Sda0A/jqo3qm5dA3E+p6Ud2mF6eso7YsreH0/W4Wziclbb+4nydmwIcDigFuxtX RUl56YlUssJuQ1L3Vju15dpC27IH5kebSPJ3Ss77/WGMMFH/8YPMhniSeuGy3qZ2sWeDfD aa+onzG3cHkjBd7pIhoWPw4BrEcZ+IkkRRNltIT5J1Mn3Qsp0HnziSzpfEOaslgGZfFKiS 6b+KLQx6qYHjhI3UqY3mG3Ce3/PFHVE/ya+9O1ZwHuhofu4kqTYPe6qCl9YyHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733496697; a=rsa-sha256; cv=none; b=JSl6KTPhcQ1sgHo8N1yh7lZ083wfpVyAC94TYrgajmV+Jo1hVkcTOipSlNZtpd7Sm4dz8E qLXEqT1+0cDJNZ9hcY4Dld0akXSNXl8AMoFtYVrZfEM2EDTlaBKlxUhjrNo0+loExmXyLp 6JitLvVLAv+2zeFOhyiJzLr6lBTL2YgrW/2hwIT9gOCQo2rtyIiykHCijoIvS6D64JD509 ao5l6b45NZSGhprGKkP4C3kD8nuXndvm3vopgM1J+hZPQhOllK415wqv0Q+nbsUYD0wFL4 aHKklbz0ouMIYFJWrkiBvluO6DKkDfpG2XR70f5Iq9C533xOGHqQYkQHtAc8zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Z2x0Tc6zj8X; Fri, 6 Dec 2024 14:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Epa2B028288; Fri, 6 Dec 2024 14:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6EpaSQ028285; Fri, 6 Dec 2024 14:51:36 GMT (envelope-from git) Date: Fri, 6 Dec 2024 14:51:36 GMT Message-Id: <202412061451.4B6EpaSQ028285@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: 6f07c8273582 - stable/14 - dtrace/amd64: Make invop providers usable with KMSAN enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 6f07c82735826b6bfc744318aa86040439920016 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6f07c82735826b6bfc744318aa86040439920016 commit 6f07c82735826b6bfc744318aa86040439920016 Author: Mark Johnston AuthorDate: 2024-11-22 13:51:37 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 14:51:09 +0000 dtrace/amd64: Make invop providers usable with KMSAN enabled - Use a fresh context when entering dtrace_invop() via a breakpoint exception. - Mark the #BP trapframe as initialized. MFC after: 2 weeks (cherry picked from commit cc3da1955c16df5eb0019e0fef810696b035b7cf) --- sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 8 ++++++++ sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S index 4c18fbf08220..217d8c2936eb 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -58,6 +58,8 @@ ENTRY(dtrace_invop_start) + KMSAN_ENTER + /* * #BP traps with %rip set to the next address. We need to decrement * the value to indicate the address of the int3 (0xcc) instruction @@ -77,6 +79,12 @@ call dtrace_invop addq $16, %rsp +#ifdef KMSAN + movq %rax, %r12 + KMSAN_LEAVE + movq %r12, %rax +#endif + cmpl $DTRACE_INVOP_PUSHL_EBP, %eax je bp_push cmpl $DTRACE_INVOP_CALL, %eax diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c index 09b820241e50..81aa53d00bd8 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -68,6 +69,8 @@ dtrace_invop(uintptr_t addr, struct trapframe *frame, void **scratch) dtrace_invop_hdlr_t *hdlr; int rval; + kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED); + td = curthread; td->t_dtrace_trapframe = frame; rval = 0; From nobody Fri Dec 6 14:51:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Z2y5SsXz5gNgw; Fri, 06 Dec 2024 14:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Z2y1tkCz4Fg9; Fri, 6 Dec 2024 14:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5s8t9w4Jh7Lu9bssIsJXGFeTmnkylKyxFg/UV48LlU=; b=TtI0Ea+9h4mqpRGxoWPEhz7W3MInuzu4mBCeQwF/l8w28pcNixzLpiUK+nyzP09n1G9R7T bqlYzZ0hqFXgdetppYDzsR3qxY+V+/hvTmcmftdYDvzHdW1bMlXYYweKBaohnTprtCMaqc TkgE9P/cGsDWuMCswvzklSjDcp57GhiZu/NjBHYPNA/LGL4PVNVaq5JNPE7HaBiaNOWdCh ucYE/bFaLFWgPuE/wQZnaN6VwVwmDxaDZszDF0WVwav1cOXtYSnMSBfSkHQyUeOt92aveT HvC2V1yQKSLj/S8AvX+CO8PtxaOfdDCS6KrXHsjjxMxiEWegQaaAVy4nf2YjLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5s8t9w4Jh7Lu9bssIsJXGFeTmnkylKyxFg/UV48LlU=; b=UsLpLIIDWSGrF9RZeD+wk1yD6pT/TxYoEAyi0EHm/tjU+0HfAT7g6i0zwhveZBvfU34yYq wFW11vT2uiH/s9RXyX6tQxaJrBegym2wV/R5w1f4cRxFN3r2RTCx+W7SRGbhSKw2Y27Kb0 Doyvm7GDcMDYsOxWjfeAbL81r2edFTz5mTjQupM695149/a5O+1EBR8a9BQ7lqG19M+HNu FJfj11dtM51f5i4W9nmilbpNW53Mow9gmvxKV6YvcOznPVkxetAZnAkRJAhFSk+dCH2V3y UFu1S6h+nZJN/WTbc0ugZffs93VCXcKXi9T92JoI2h6sjYdZS2F20rGs+5vPeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733496698; a=rsa-sha256; cv=none; b=X73KBg9rAkudajsgJUOxtjbVga9z4TIRx+Hd2JvTBDhnVwIa0CvfZiTuUJ1qhdqLy+87xZ cHKuPe6rDRTqXFnIJD2L6+bBEJypMOI1E+BrE8zRq3MkwCko5vrcY5I7adQ77lpVi5Xbou bfiEx6zGMyFYOJHLsEDAM8trbjU0qXTP/3zxXmBBouqdfd+tqUKSH3drUDbZJC5NlrN3P9 xE6nG/Ox9Lyw7mb6pSNSEVFiTyrkulKqGPP2zv2aAIHQWRtJJe1rzYm7eOybwBXBjTpRPq +Q3LZlnVGMGF9kWxJM2H9tYnTMkcKJyFifbxa/w/nrw4+qY+fWSmYY92Zd2VtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Z2y1VtjzhkW; Fri, 6 Dec 2024 14:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Epc5J028347; Fri, 6 Dec 2024 14:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6EpcNq028344; Fri, 6 Dec 2024 14:51:38 GMT (envelope-from git) Date: Fri, 6 Dec 2024 14:51:38 GMT Message-Id: <202412061451.4B6EpcNq028344@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: b8fa7c986e91 - stable/14 - dtrace: Address KMSAN warnings in dtrace_disx86 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b8fa7c986e91b2beefa9e4d6c15ddc43740814ad Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8fa7c986e91b2beefa9e4d6c15ddc43740814ad commit b8fa7c986e91b2beefa9e4d6c15ddc43740814ad Author: Mark Johnston AuthorDate: 2024-11-22 13:50:26 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 14:51:09 +0000 dtrace: Address KMSAN warnings in dtrace_disx86 wbit was not being initialized in a couple of cases. Reported by: asomers MFC after: 2 weeks (cherry picked from commit 418d8f0dc269b314bba51de63869b20da1d9a76e) --- sys/cddl/dev/dtrace/x86/dis_tables.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/dtrace/x86/dis_tables.c b/sys/cddl/dev/dtrace/x86/dis_tables.c index 1afadc94afc2..44c96437055b 100644 --- a/sys/cddl/dev/dtrace/x86/dis_tables.c +++ b/sys/cddl/dev/dtrace/x86/dis_tables.c @@ -3720,8 +3720,8 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode) x->d86_len = 0; x->d86_rmindex = -1; x->d86_error = 0; -#ifdef DIS_TEXT x->d86_numopnds = 0; +#ifdef DIS_TEXT x->d86_seg_prefix = NULL; x->d86_mnem[0] = 0; for (i = 0; i < 4; ++i) { @@ -4860,6 +4860,7 @@ mm_shift: dtrace_rex_adjust(rex_prefix, mode, NULL, &r_m); dtrace_get_operand(x, mode, r_m, LONG_OPND, vbit); dtrace_get_operand(x, REG_ONLY, reg, SEG_OPND, 1 - vbit); + wbit = SEG_OPND; break; /* @@ -5787,6 +5788,7 @@ xmmprm: #endif dtrace_rex_adjust(rex_prefix, mode, ®, &r_m); dtrace_get_operand(x, mode, r_m, BYTE_OPND, 0); + wbit = LONG_OPND; } break; @@ -6442,7 +6444,7 @@ done: else x->d86_memsize = dp->it_size; - } else if (wbit == 0) { + } else if (wbit == BYTE_OPND) { x->d86_memsize = 1; } else if (wbit == LONG_OPND) { From nobody Fri Dec 6 14:51:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Z306Gkfz5gNc1; Fri, 06 Dec 2024 14:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Z304NM5z4FpJ; Fri, 6 Dec 2024 14:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GI72o1odPah0zssgDlXtLEqvCUtjQ68stIDSuZYSLs=; b=KbqTuqjEV565Y+X35s39Yd543gkWBR4s5bjeSrHochV8D2pIAf/swPvMBDYjp9CEe+GqpM Inco2zq24pz+iGwUY9I5IKyhg1uECPFC3OgJe9OOmCitZgVtw0tIAdAq+uF/N4TtkF3Un7 E078llQZMq2anPtqMJby0XHMr0AWczE8/AoROHdfgYylXgToE3IA6VQAzzO+BqtftG9GVB rVpcqSI7vmPgip3oOnjAV/wUKk7GZDpkr4fTqRWS+4WagDbmVesHaV0HvoIc+DvlnS8tFW /s6yhV2LDqFt151BTvoB+LS+iIAgt6pvVZe7riU/DXRDeiVhlHAnu9yLbI1MRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GI72o1odPah0zssgDlXtLEqvCUtjQ68stIDSuZYSLs=; b=yYr4/ZG2HgFWRnBjtN05P0AMLtkrgMZvA9L5TzHapqXw0fSENzrh5HCGNbB6xYpLFHsVOx yczRAoqRQnrh5D84AjtnlJfVpg0kKHin6+b0a/jIAsLkHTSW+SrXgWNNQ7YAAgP55T96nZ dMJKXKvlYZhjSe5kz4kW6TZrkfXd/d81fMGDZEwesCEdurSNVyby/GooUM0CJphrlRPXt6 rzHU1iIM9ByRBBzHLU702+hUXLU4jq89z+Y6rT49GlT1pKgMgjZJFxGP1uF52y1G9dX0AQ Mov8R/56yMgPFALwGFZNpL9hgXKtOc5V/lhKuGJvfMp6hVQ8rnvjeGj3dFjYzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733496700; a=rsa-sha256; cv=none; b=N9FPFyOyucMv9j6COvSySITaimZ8Vs+rSb6yJawHr0rk4fNKLjAT7Ytmlxwz4HtDMhL/4L E+ihkP4Q1/jCsFJQNb119YOpoIFuY1odwdlCLOPPI1R5lM5yiT+5t+3mgg+/0NKfl0Qz0H EWqIG4jJR9mL8lxJz4LSAGO8Oy37kEFkSbHeZ3e2m0Xj4KxIAdv51jItM0xvViSUV7S8Na Xkj/W+RJmhbD9Qmg0Yw4qh/B7lMwpmvRIgrjsymSPLRm3Jo3NL6ExQjlUh5aIPDGQ+BufA peBH0R2v0Hdvi5t5eor+41Z0N4cOJpXzOr5P09wA/Yt40JELJOauSwKg4o+FsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Z303X6vzhy9; Fri, 6 Dec 2024 14:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6EpeFY028434; Fri, 6 Dec 2024 14:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6Epe2Z028431; Fri, 6 Dec 2024 14:51:40 GMT (envelope-from git) Date: Fri, 6 Dec 2024 14:51:40 GMT Message-Id: <202412061451.4B6Epe2Z028431@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: b64e34805596 - stable/14 - buf: Add a runningbufclaim() helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b64e34805596130ae702ec9dd536888dd43f7456 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b64e34805596130ae702ec9dd536888dd43f7456 commit b64e34805596130ae702ec9dd536888dd43f7456 Author: Mark Johnston AuthorDate: 2024-11-22 13:54:08 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 14:51:09 +0000 buf: Add a runningbufclaim() helper No functional change intended. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47696 (cherry picked from commit 4efe531c9d50a803a28d001fab9cc3011eb1f587) --- sys/kern/vfs_bio.c | 15 ++++++++++++--- sys/sys/buf.h | 2 +- sys/ufs/ffs/ffs_snapshot.c | 11 ++++------- sys/ufs/ffs/ffs_vfsops.c | 4 +--- sys/vm/vnode_pager.c | 8 ++++---- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index c15e2c99fead..c7c890dd83bd 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -204,7 +204,7 @@ static int sysctl_bufspace(SYSCTL_HANDLER_ARGS); int vmiodirenable = TRUE; SYSCTL_INT(_vfs, OID_AUTO, vmiodirenable, CTLFLAG_RW, &vmiodirenable, 0, "Use the VM system for directory writes"); -long runningbufspace; +static long runningbufspace; SYSCTL_LONG(_vfs, OID_AUTO, runningbufspace, CTLFLAG_RD, &runningbufspace, 0, "Amount of presently outstanding async buffer io"); SYSCTL_PROC(_vfs, OID_AUTO, bufspace, CTLTYPE_LONG|CTLFLAG_MPSAFE|CTLFLAG_RD, @@ -939,6 +939,16 @@ runningbufwakeup(struct buf *bp) runningwakeup(); } +long +runningbufclaim(struct buf *bp, int space) +{ + long old; + + old = atomic_fetchadd_long(&runningbufspace, space); + bp->b_runningbufspace = space; + return (old); +} + /* * waitrunningbufspace() * @@ -2346,8 +2356,7 @@ bufwrite(struct buf *bp) /* * Normal bwrites pipeline writes */ - bp->b_runningbufspace = bp->b_bufsize; - space = atomic_fetchadd_long(&runningbufspace, bp->b_runningbufspace); + space = runningbufclaim(bp, bp->b_bufsize); #ifdef RACCT if (racct_enable) { diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 7fffb52f84f2..7c0ea9605e28 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -514,7 +514,6 @@ extern int nbuf; /* The number of buffer headers */ extern u_long maxswzone; /* Max KVA for swap structures */ extern u_long maxbcache; /* Max KVA for buffer cache */ extern int maxbcachebuf; /* Max buffer cache block size */ -extern long runningbufspace; extern long hibufspace; extern int dirtybufthresh; extern int bdwriteskip; @@ -531,6 +530,7 @@ buf_mapped(struct buf *bp) return (bp->b_data != unmapped_buf); } +long runningbufclaim(struct buf *, int); void runningbufwakeup(struct buf *); void waitrunningbufspace(void); caddr_t kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est); diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index fedac50e38fb..ae3b444a19e9 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -2345,9 +2345,8 @@ ffs_copyonwrite(struct vnode *devvp, struct buf *bp) TAILQ_EMPTY(&sn->sn_head)) { VI_UNLOCK(devvp); if (saved_runningbufspace != 0) { - bp->b_runningbufspace = saved_runningbufspace; - atomic_add_long(&runningbufspace, - bp->b_runningbufspace); + (void)runningbufclaim(bp, + saved_runningbufspace); } return (0); /* Snapshot gone */ } @@ -2481,10 +2480,8 @@ ffs_copyonwrite(struct vnode *devvp, struct buf *bp) /* * I/O on bp will now be started, so count it in runningbufspace. */ - if (saved_runningbufspace != 0) { - bp->b_runningbufspace = saved_runningbufspace; - atomic_add_long(&runningbufspace, bp->b_runningbufspace); - } + if (saved_runningbufspace != 0) + (void)runningbufclaim(bp, saved_runningbufspace); return (error); } diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 14046de1e7b3..c56603752a50 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -2519,9 +2519,7 @@ ffs_geom_strategy(struct bufobj *bo, struct buf *bp) return; } } - bp->b_runningbufspace = bp->b_bufsize; - atomic_add_long(&runningbufspace, - bp->b_runningbufspace); + (void)runningbufclaim(bp, bp->b_bufsize); } else { error = ffs_copyonwrite(vp, bp); if (error != 0 && error != EOPNOTSUPP) { diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index a690e48e07ee..496c3586c321 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -702,8 +702,7 @@ vnode_pager_input_smlfs(vm_object_t object, vm_page_t m) bp->b_vp = vp; bp->b_bcount = bsize; bp->b_bufsize = bsize; - bp->b_runningbufspace = bp->b_bufsize; - atomic_add_long(&runningbufspace, bp->b_runningbufspace); + (void)runningbufclaim(bp, bp->b_bufsize); /* do the input */ bp->b_iooffset = dbtob(bp->b_blkno); @@ -1145,7 +1144,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, bp->b_wcred = crhold(curthread->td_ucred); pbgetbo(bo, bp); bp->b_vp = vp; - bp->b_bcount = bp->b_bufsize = bp->b_runningbufspace = bytecount; + bp->b_bcount = bp->b_bufsize = bytecount; bp->b_iooffset = dbtob(bp->b_blkno); KASSERT(IDX_TO_OFF(m[0]->pindex - bp->b_pages[0]->pindex) == (blkno0 - bp->b_blkno) * DEV_BSIZE + @@ -1155,7 +1154,8 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, (uintmax_t)m[0]->pindex, (uintmax_t)bp->b_pages[0]->pindex, (uintmax_t)blkno0, (uintmax_t)bp->b_blkno)); - atomic_add_long(&runningbufspace, bp->b_runningbufspace); + (void)runningbufclaim(bp, bp->b_bufsize); + VM_CNT_INC(v_vnodein); VM_CNT_ADD(v_vnodepgsin, bp->b_npages); From nobody Fri Dec 6 14:51:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4Z2z5rW9z5gNmh; Fri, 06 Dec 2024 14:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4Z2z2s97z4Fp6; Fri, 6 Dec 2024 14:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hezvglV71CTJDFLlm5fEqWrCSED6mwuRGMHvhyCJNvk=; b=rH+P9WZZl8HFvvG1djdrDXl6YljWbPsA3+zh7kSvfiy0FBC2M3bHoFw4oPhOBwHhK/6XSP p1p0BzO5dIqPeq9MImmzBp7e6J/aqnHaK0EOipxi9MCBSKrl+92dDBsaFGfVRRdZhU+z9r Ao9nHPkl6usPg7MFsnJBkoEo9Vy6XKxwtiau3p/BXniaGOnKWuDeValLPMBsbEcVGbEXLZ 5LuNWXhECjFAYtGgpGbWY/r1QCkUPmZ5yEj91Xm30FBNE9hVmGb72FrbTr//axwXwgPcDn OpeUZeCKOViEka/0aC5Logxs/U9aQBQ/AF0l9AbeM5Z0a0XdCCT3NxxAlLo6wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733496699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hezvglV71CTJDFLlm5fEqWrCSED6mwuRGMHvhyCJNvk=; b=VX8VmoC/a6L+ytMK8qU8zvHa2+va2IkUG8Am3/3zsS8jWwDZ2G9jg7W3b8BXe2m2gQc+er M0R0Xp1MQpQ7YDHTvUuXdiIS0uAUWpfBictYv2ClwxzWJCxnpTqFTHHWn1hyvL/fayW8jx PZiotD+CVk0CRSBMbOViDhdRt/vfnoneHZ0fCb/r9oUgDBvU2yYGLF0j0jEkBavrdvXRRU d4BpKCjVpjoqnvHXHmWqic3U9JlzchhWnN2OkGtYs74/JkEyqDugj48ZPUKjwvEOA1Zz0L cTO7QiFT0h2zSNpJP4VjdQRZjFFosvVplmLxd8x5iQHgl4axLLcJMD+E7bsiLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733496699; a=rsa-sha256; cv=none; b=vpi99bTi641AFHIKBng0nEyJbPlxJ9jlxzIIE7puRC84qwvd/tVx7eElQWHucJM4iV3uCf TnAq2xni7lpzlmiY+CZ9JnWaWMKPo5CQz4dNzl79kl2Fs0y/u6u0QRQ6GDEFDWrBffTUOM EP7cD3lUXuz5GpwbJEG0244CV1P6PYiexPl414tHDAazY39DwCMpnyKyzQbzqoAmcYFjF1 +WndpJQWs6PQT1vQO4h8u/IDVAgU6oQZkfKpQN4O5FoCcMZI8uMKn6Gv29OLLIdhd88tzz gHmUgZErQPvep82EM1sSP/4Gc/+dFZtzKcj0I7/68fsDZ2NWZnxN7gUaQrOzLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4Z2z2SwSzhTk; Fri, 6 Dec 2024 14:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Epd0s028390; Fri, 6 Dec 2024 14:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6EpdJD028387; Fri, 6 Dec 2024 14:51:39 GMT (envelope-from git) Date: Fri, 6 Dec 2024 14:51:39 GMT Message-Id: <202412061451.4B6EpdJD028387@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: 1aa509e25288 - stable/14 - dtrace: Avoid excessive pcpu allocations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 1aa509e252883961ed7b5e931c54e30488c9be1a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa509e252883961ed7b5e931c54e30488c9be1a commit 1aa509e252883961ed7b5e931c54e30488c9be1a Author: Mark Johnston AuthorDate: 2024-11-22 13:55:20 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 14:51:09 +0000 dtrace: Avoid excessive pcpu allocations We were previously allocating MAXCPU structures for several purposes, but this is generally unnecessary and is quite excessive, especially after MAXCPU was bumped to 1024 on amd64 and arm64. We already are careful to allocate only as many per-CPU tracing buffers as are needed; extend this to other allocations. For example, in a 2-vCPU VM, the size of a consumer state structure drops from 64KB to 128B. The size of the per-consumer `dts_buffer` and `dts_aggbuffer` arrays shrink similarly. Ditto for pre-allocations of local and global D variable storage space. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47667 (cherry picked from commit 5d12db2dafece9f6a0453c4a45c4abed6b1e15ec) --- .../contrib/opensolaris/uts/common/dtrace/dtrace.c | 66 ++++++++++------------ sys/cddl/dev/dtrace/dtrace_ioctl.c | 2 +- sys/cddl/dev/dtrace/dtrace_load.c | 4 +- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index d3e40e96e897..5f635cc088d7 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -741,7 +741,7 @@ dtrace_canstore_statvar(uint64_t addr, size_t sz, size_t *remain, return (0); maxglobalsize = dtrace_statvar_maxsize + sizeof (uint64_t); - maxlocalsize = maxglobalsize * NCPU; + maxlocalsize = maxglobalsize * (mp_maxid + 1); for (i = 0; i < nsvars; i++) { dtrace_statvar_t *svar = svars[i]; @@ -1744,7 +1744,7 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate) dtrace_dynvar_t **rinsep; int i, j, work = 0; - for (i = 0; i < NCPU; i++) { + CPU_FOREACH(i) { dcpu = &dstate->dtds_percpu[i]; rinsep = &dcpu->dtdsc_rinsing; @@ -1782,7 +1782,7 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate) * rinsing list -- and then we borrow this CPU to * rinse our dirty list. */ - for (j = 0; j < NCPU; j++) { + CPU_FOREACH(j) { dtrace_dstate_percpu_t *rinser; rinser = &dstate->dtds_percpu[j]; @@ -1800,7 +1800,7 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate) break; } - if (j == NCPU) { + if (j > mp_maxid) { /* * We were unable to find another CPU that * could accept this dirty list -- we are @@ -1841,7 +1841,7 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate) dtrace_sync(); - for (i = 0; i < NCPU; i++) { + CPU_FOREACH(i) { dcpu = &dstate->dtds_percpu[i]; if (dcpu->dtdsc_rinsing == NULL) @@ -2190,7 +2190,7 @@ retry: case DTRACE_DSTATE_CLEAN: { void *sp = &dstate->dtds_state; - if (++cpu >= NCPU) + if (++cpu > mp_maxid) cpu = 0; if (dcpu->dtdsc_dirty != NULL && @@ -6504,7 +6504,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate, size_t lim; sz += sizeof (uint64_t); - ASSERT(svar->dtsv_size == NCPU * sz); + ASSERT(svar->dtsv_size == (mp_maxid + 1) * sz); a += curcpu * sz; if (*(uint8_t *)a == UINT8_MAX) { @@ -6521,7 +6521,8 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate, break; } - ASSERT(svar->dtsv_size == NCPU * sizeof (uint64_t)); + ASSERT(svar->dtsv_size == + (mp_maxid + 1) * sizeof (uint64_t)); tmp = (uint64_t *)(uintptr_t)svar->dtsv_data; regs[rd] = tmp[curcpu]; break; @@ -6544,7 +6545,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate, size_t lim; sz += sizeof (uint64_t); - ASSERT(svar->dtsv_size == NCPU * sz); + ASSERT(svar->dtsv_size == (mp_maxid + 1) * sz); a += curcpu * sz; if (regs[rd] == 0) { @@ -6565,7 +6566,8 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate, break; } - ASSERT(svar->dtsv_size == NCPU * sizeof (uint64_t)); + ASSERT(svar->dtsv_size == + (mp_maxid + 1) * sizeof (uint64_t)); tmp = (uint64_t *)(uintptr_t)svar->dtsv_data; tmp[curcpu] = regs[rd]; break; @@ -10678,10 +10680,11 @@ dtrace_difo_init(dtrace_difo_t *dp, dtrace_vstate_t *vstate) svarp = &vstate->dtvs_locals; if (v->dtdv_type.dtdt_flags & DIF_TF_BYREF) - dsize = NCPU * (v->dtdv_type.dtdt_size + + dsize = (mp_maxid + 1) * + (v->dtdv_type.dtdt_size + sizeof (uint64_t)); else - dsize = NCPU * sizeof (uint64_t); + dsize = (mp_maxid + 1) * sizeof (uint64_t); break; @@ -12603,7 +12606,7 @@ dtrace_buffer_consumed(dtrace_buffer_t *bufs, hrtime_t when) { int i; - for (i = 0; i < NCPU; i++) { + CPU_FOREACH(i) { dtrace_buffer_t *buf = &bufs[i]; if (buf->dtb_size == 0) @@ -12627,7 +12630,7 @@ dtrace_buffer_free(dtrace_buffer_t *bufs) { int i; - for (i = 0; i < NCPU; i++) { + CPU_FOREACH(i) { dtrace_buffer_t *buf = &bufs[i]; if (buf->dtb_tomax == NULL) { @@ -14379,7 +14382,8 @@ dtrace_dstate_init(dtrace_dstate_t *dstate, size_t size) dstate->dtds_size = size; dstate->dtds_base = base; dstate->dtds_percpu = kmem_cache_alloc(dtrace_state_cache, KM_SLEEP); - bzero(dstate->dtds_percpu, NCPU * sizeof (dtrace_dstate_percpu_t)); + bzero(dstate->dtds_percpu, + (mp_maxid + 1) * sizeof (dtrace_dstate_percpu_t)); hashsize = size / (dstate->dtds_chunksize + sizeof (dtrace_dynhash_t)); @@ -14413,14 +14417,10 @@ dtrace_dstate_init(dtrace_dstate_t *dstate, size_t size) VERIFY((uintptr_t)start < limit); VERIFY((uintptr_t)start >= (uintptr_t)base); - maxper = (limit - (uintptr_t)start) / NCPU; + maxper = (limit - (uintptr_t)start) / (mp_maxid + 1); maxper = (maxper / dstate->dtds_chunksize) * dstate->dtds_chunksize; -#ifndef illumos CPU_FOREACH(i) { -#else - for (i = 0; i < NCPU; i++) { -#endif dstate->dtds_percpu[i].dtdsc_free = dvar = start; /* @@ -14430,7 +14430,7 @@ dtrace_dstate_init(dtrace_dstate_t *dstate, size_t size) * whatever is left over. In either case, we set the limit to * be the limit of the dynamic variable space. */ - if (maxper == 0 || i == NCPU - 1) { + if (maxper == 0 || i == mp_maxid) { limit = (uintptr_t)base + size; start = NULL; } else { @@ -14603,7 +14603,7 @@ dtrace_state_create(struct cdev *dev, struct ucred *cred __unused) char c[30]; dtrace_state_t *state; dtrace_optval_t *opt; - int bufsize = NCPU * sizeof (dtrace_buffer_t), i; + int bufsize = (mp_maxid + 1) * sizeof (dtrace_buffer_t), i; int cpu_it; ASSERT(MUTEX_HELD(&dtrace_lock)); @@ -14651,12 +14651,6 @@ dtrace_state_create(struct cdev *dev, struct ucred *cred __unused) state->dts_dev = dev; #endif - /* - * We allocate NCPU buffers. On the one hand, this can be quite - * a bit of memory per instance (nearly 36K on a Starcat). On the - * other hand, it saves an additional memory reference in the probe - * path. - */ state->dts_buffer = kmem_zalloc(bufsize, KM_SLEEP); state->dts_aggbuffer = kmem_zalloc(bufsize, KM_SLEEP); @@ -14666,12 +14660,12 @@ dtrace_state_create(struct cdev *dev, struct ucred *cred __unused) * assumed to be seeded at this point (if from Fortuna seed file). */ arc4random_buf(&state->dts_rstate[0], 2 * sizeof(uint64_t)); - for (cpu_it = 1; cpu_it < NCPU; cpu_it++) { + for (cpu_it = 1; cpu_it <= mp_maxid; cpu_it++) { /* * Each CPU is assigned a 2^64 period, non-overlapping * subsequence. */ - dtrace_xoroshiro128_plus_jump(state->dts_rstate[cpu_it-1], + dtrace_xoroshiro128_plus_jump(state->dts_rstate[cpu_it - 1], state->dts_rstate[cpu_it]); } @@ -14970,7 +14964,7 @@ dtrace_state_go(dtrace_state_t *state, processorid_t *cpu) cyc_handler_t hdlr; cyc_time_t when; #endif - int rval = 0, i, bufsize = NCPU * sizeof (dtrace_buffer_t); + int rval = 0, i, bufsize = (mp_maxid + 1) * sizeof (dtrace_buffer_t); dtrace_icookie_t cookie; mutex_enter(&cpu_lock); @@ -15224,10 +15218,10 @@ dtrace_state_go(dtrace_state_t *state, processorid_t *cpu) * We enable anonymous tracing before APs are started, so we must * activate buffers using the current CPU. */ - if (state == dtrace_anon.dta_state) - for (int i = 0; i < NCPU; i++) + if (state == dtrace_anon.dta_state) { + CPU_FOREACH(i) dtrace_buffer_activate_cpu(state, i); - else + } else dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_buffer_activate, state); #else @@ -15410,7 +15404,7 @@ dtrace_state_destroy(dtrace_state_t *state) #ifdef illumos minor_t minor = getminor(state->dts_dev); #endif - int i, bufsize = NCPU * sizeof (dtrace_buffer_t); + int i, bufsize = (mp_maxid + 1) * sizeof (dtrace_buffer_t); dtrace_speculation_t *spec = state->dts_speculations; int nspec = state->dts_nspeculations; uint32_t match; @@ -15724,7 +15718,7 @@ dtrace_helper_trace(dtrace_helper_action_t *helper, if ((svar = vstate->dtvs_locals[i]) == NULL) continue; - ASSERT(svar->dtsv_size >= NCPU * sizeof (uint64_t)); + ASSERT(svar->dtsv_size >= (mp_maxid + 1) * sizeof (uint64_t)); ent->dtht_locals[i] = ((uint64_t *)(uintptr_t)svar->dtsv_data)[curcpu]; } diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index be7fff170166..01d51197fde8 100644 --- a/sys/cddl/dev/dtrace/dtrace_ioctl.c +++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c @@ -229,7 +229,7 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, "DTRACEIOC_AGGSNAP":"DTRACEIOC_BUFSNAP", curcpu, desc.dtbd_cpu); - if (desc.dtbd_cpu >= MAXCPU || CPU_ABSENT(desc.dtbd_cpu)) + if (desc.dtbd_cpu > mp_maxid || CPU_ABSENT(desc.dtbd_cpu)) return (ENOENT); mutex_enter(&dtrace_lock); diff --git a/sys/cddl/dev/dtrace/dtrace_load.c b/sys/cddl/dev/dtrace/dtrace_load.c index ef2d29e143f8..115e6d0a8ed7 100644 --- a/sys/cddl/dev/dtrace/dtrace_load.c +++ b/sys/cddl/dev/dtrace/dtrace_load.c @@ -100,8 +100,8 @@ dtrace_load(void *dummy) mutex_enter(&dtrace_lock); dtrace_state_cache = kmem_cache_create("dtrace_state_cache", - sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN, - NULL, NULL, NULL, NULL, NULL, 0); + sizeof (dtrace_dstate_percpu_t) * (mp_maxid + 1), + DTRACE_STATE_ALIGN, NULL, NULL, NULL, NULL, NULL, 0); ASSERT(MUTEX_HELD(&cpu_lock)); dtrace_bymod = dtrace_hash_create(offsetof(dtrace_probe_t, dtpr_mod), From nobody Fri Dec 6 15:50:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4bMC3TpWz5gSdf; Fri, 06 Dec 2024 15:50: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4bMC2qDVz4L80; Fri, 6 Dec 2024 15:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733500247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iN+5WNvaBQtcEAMxvT/j7cGsvgo1js2QWXGIIV8bvh4=; b=sEwsMOo/gPRBlb3WAX6EilpBhQn3WxSme+f+z1jjhFvk4CCW26/OUlbZRp0RusTGhKim3q vYG6dI8yfEz9duyL6HG2n+shzk0wAKhs2rvkx1r1y0jGYdW7ebKXDQ8k27PCMgOPLZruxA P0822ErAYNeqssuC1ORzsjZXmc9QimbCNF/Tmlx3hvpZKvnT9APODFtCuEmWRJJZuKbt++ cUpibgB4gbYhDws9/JLXC/m02GkVCLDJjUotav9lvJRQDR0ZEoZv5IgMYX0XabHhJJZ0hU WZweOYQT6SpysFL2dgBDLppro57vaW4sQBgULAmNGhhwOnWNYyoFVANQYA8iIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733500247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iN+5WNvaBQtcEAMxvT/j7cGsvgo1js2QWXGIIV8bvh4=; b=yqlrvo85hJDmJPJfpgSC5ENJTWNWF5AJ5n3acIlJzLpJo8wi9h5KiU68vtpgCNsv1338Pl 49KC4tgHRdqLjv7CRcQVvv0lBj5LxJ+EkQdEaZV8ibq8CI9XGrty73LYxLozuiVvOnUI4m r8hoB87eADKqjOj5Us3orwAhR4akZJMUd5qWz8i36Udi5kUDruN9ayW9l+BaLAtOWHugnv XiaRkVnsD914m4/s7onz1FTrpCFavlWXPGYPEJN3ifNVYNwS8/lqGyeeOVV+CvyVZVK3Zg 9LOmZEpYCYXgOdNXCwE+RWk6L0eXMh+l5w086VVC5aZIzSxTyWtYUSwZpJ8H7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733500247; a=rsa-sha256; cv=none; b=MOawZ+FxCwcZ+a+VdAMPF/Pl+HxI3LD3wiGLj4jOblTOS1Yl42hRA1NKVaGgqEE+Qr/OAi ydQEFwDxr/s2NVokPIrHixfniF2G5XbyDggMtFOO0UGFVkppuAZnePa5kBAeRQwLDUg8+X ESdm4LZQfDF6YYQKbVTTjq/PA44gL+D5ps5DQof7tDEXPbJO62/9CvyJxf/PMO3FRmtdlv 0f+0r7bQ7kwpEO+O4HtcLg7Hj177Cyn4GfFb8wZrArZ0EG/l8T4Tq37DfHzDUUjcCOdwyd I4x4/XFuKKQgy5rvWU4N2GBn4w3O1YAeBQdOlTyniuBBTPiaxb/Bo4iqS2elaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4bMC2QYkzkYh; Fri, 6 Dec 2024 15:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Folvx035654; Fri, 6 Dec 2024 15:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6FolHD035651; Fri, 6 Dec 2024 15:50:47 GMT (envelope-from git) Date: Fri, 6 Dec 2024 15:50:47 GMT Message-Id: <202412061550.4B6FolHD035651@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: f2c09b4f321b - stable/14 - cap_rights_is_empty: add MLINK List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f2c09b4f321bfd6ead1359d9cbe49848a23f07bf Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f2c09b4f321bfd6ead1359d9cbe49848a23f07bf commit f2c09b4f321bfd6ead1359d9cbe49848a23f07bf Author: Ed Maste AuthorDate: 2024-12-02 20:35:10 +0000 Commit: Ed Maste CommitDate: 2024-12-06 15:50:31 +0000 cap_rights_is_empty: add MLINK Fixes: a7100ae23aca ("capsicum: introduce cap_rights_is_empty Function") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3505e0d6675b332c154e01110456d767e222c5d6) --- lib/libc/capability/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/capability/Makefile.inc b/lib/libc/capability/Makefile.inc index cf214d7f5627..b217c43555fc 100644 --- a/lib/libc/capability/Makefile.inc +++ b/lib/libc/capability/Makefile.inc @@ -10,6 +10,7 @@ MAN+= cap_rights_init.3 MLINKS+=cap_rights_init.3 cap_rights_set.3 MLINKS+=cap_rights_init.3 cap_rights_clear.3 +MLINKS+=cap_rights_init.3 cap_rights_is_empty.3 MLINKS+=cap_rights_init.3 cap_rights_is_set.3 MLINKS+=cap_rights_init.3 cap_rights_is_valid.3 MLINKS+=cap_rights_init.3 cap_rights_merge.3 From nobody Fri Dec 6 20:32:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4jcg0rqzz5fr5b; Fri, 06 Dec 2024 20:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4jcg0K1pz59F4; Fri, 6 Dec 2024 20:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rftp0ap7s8nSgKlIaK76maKw3EHFcvyer2wLS4slcgk=; b=SEvEhgV3GQkXsXdQWym1WpwK73WwlLWg4Sviahmh5F0bfJXNlXRdmZHLCtEK2U8E4fD3aR EpcsUNt83CPD6SluiVPerKJobQ0uJCI+yzleRUXXeRiUZsmlj6W3UDYPQFBslQhrMtCtmH kdHQkPnhZI0U8qU0zUAsUmj8eCA8l5dA/oPqwgflW5LciAx2Iz/by02X0wRsP+Y3rcQKN7 TrybleWuLMvCgh0N3FNJlFbWKuyAclaR8zwL9dJ74EGXXcj4pUS7+/JMVeq8gh+i5v7O2V Rm5B0EhxwsNE8LqPTMoxj2L58QeAPx3IR+sQND51mTgJmMDouJwc9fUiLbAF0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rftp0ap7s8nSgKlIaK76maKw3EHFcvyer2wLS4slcgk=; b=yD/1xvKkju3UEUY+875TNvN2lGfJp/8lBPkqTU8dI5HtSeSFGtVi58tKQ62QbdxtnVvvNa PQZ+cA1of0w1BmgZHN7kRbuuSYMBXUg1kzGLNWYcC6ZK1oOXnCeSdE26b05swL0L0sSXMr EdgNalZe0Iuh5W6xF37qFgVJ15bXQyGMQzZHWOYht+RsWOSf7QYEyoIUD/bKPjV1npyHP5 V8cwFR54nSszV1nIVjnpqZlqgA6wqJie+g7Dcqj78cLmbKRk7iLjP14pTFPqy/zd0a3+yb TpaSYKFgrntMi9L7E7cOX3c99X3+VQvu9inRARMTy2g0gZZjrgWohLJsdrceTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733517171; a=rsa-sha256; cv=none; b=ZQPB6vpLSHXlir9OR2yBr7Hq7U/pCndYlYxxR7xZ8Azn8qvP16EH8jQ7c8DmaWGoM6fLWf yaXEC+gMMHbbB+6T8Ak1py+kOT4wBsBLnwolVOlSCVvv2bNbHWL8pGXT/oz3HTP6Ub4nqV kPn1FRNKK+Emhd0iHEG0k5Ugo6VnWi2DYfIT/iYi8LtU9TgFO3Ms/jgcg5QuLdItOzgUEw Cp+xmDqUc9mQdGAuABovoq1dFi/LBjl9mpl6xmA8NTCglcXGQRZ8DwjwXy9lf2xs5L4Tv8 WLjudfhobgAbSNxTp2yaS5KliLNMj4HGys+l7v3Gc7tDd9UwkCnRWt8yk5Q1Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4jcf6vc8zsZm; Fri, 6 Dec 2024 20:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6KWo6S064244; Fri, 6 Dec 2024 20:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6KWohE064241; Fri, 6 Dec 2024 20:32:50 GMT (envelope-from git) Date: Fri, 6 Dec 2024 20:32:50 GMT Message-Id: <202412062032.4B6KWohE064241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 61d74539ebdb - stable/14 - cxgbe(4): Update the board names of the T6 OCP cards. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 61d74539ebdb447d60b8c9481504f9505308b30a Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=61d74539ebdb447d60b8c9481504f9505308b30a commit 61d74539ebdb447d60b8c9481504f9505308b30a Author: Navdeep Parhar AuthorDate: 2024-11-28 06:28:37 +0000 Commit: Navdeep Parhar CommitDate: 2024-12-06 18:22:36 +0000 cxgbe(4): Update the board names of the T6 OCP cards. Sponsored by: Chelsio Communications (cherry picked from commit 5c15094916bfacf33f832b9144d551a59b6bcc98) --- sys/dev/cxgbe/t4_iov.c | 6 +++--- sys/dev/cxgbe/t4_main.c | 6 +++--- sys/dev/cxgbe/t4_vf.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/cxgbe/t4_iov.c b/sys/dev/cxgbe/t4_iov.c index 7f4e80ca020d..d11568019d16 100644 --- a/sys/dev/cxgbe/t4_iov.c +++ b/sys/dev/cxgbe/t4_iov.c @@ -100,15 +100,15 @@ struct { {0x6002, "Chelsio T6225-SO-CR"}, /* 2 x 10/25G, nomem */ {0x6003, "Chelsio T6425-CR"}, /* 4 x 10/25G */ {0x6004, "Chelsio T6425-SO-CR"}, /* 4 x 10/25G, nomem */ - {0x6005, "Chelsio T6225-OCP-SO"}, /* 2 x 10/25G, nomem */ - {0x6006, "Chelsio T62100-OCP-SO"}, /* 2 x 40/50/100G, nomem */ + {0x6005, "Chelsio T6225-SO-OCP3"}, /* 2 x 10/25G, nomem */ + {0x6006, "Chelsio T6225-OCP3"}, /* 2 x 10/25G */ {0x6007, "Chelsio T62100-LP-CR"}, /* 2 x 40/50/100G */ {0x6008, "Chelsio T62100-SO-CR"}, /* 2 x 40/50/100G, nomem */ {0x6009, "Chelsio T6210-BT"}, /* 2 x 10GBASE-T */ {0x600d, "Chelsio T62100-CR"}, /* 2 x 40/50/100G */ {0x6010, "Chelsio T6-DBG-100"}, /* 2 x 40/50/100G, debug */ {0x6011, "Chelsio T6225-LL-CR"}, /* 2 x 10/25G */ - {0x6014, "Chelsio T61100-OCP-SO"}, /* 1 x 40/50/100G, nomem */ + {0x6014, "Chelsio T62100-SO-OCP3"}, /* 2 x 40/50/100G, nomem */ {0x6015, "Chelsio T6201-BT"}, /* 2 x 1000BASE-T */ /* Custom */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 61a88a4c05ce..ab9dbc52e5ad 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -935,15 +935,15 @@ struct { {0x6402, "Chelsio T6225-SO-CR"}, /* 2 x 10/25G, nomem */ {0x6403, "Chelsio T6425-CR"}, /* 4 x 10/25G */ {0x6404, "Chelsio T6425-SO-CR"}, /* 4 x 10/25G, nomem */ - {0x6405, "Chelsio T6225-OCP-SO"}, /* 2 x 10/25G, nomem */ - {0x6406, "Chelsio T62100-OCP-SO"}, /* 2 x 40/50/100G, nomem */ + {0x6405, "Chelsio T6225-SO-OCP3"}, /* 2 x 10/25G, nomem */ + {0x6406, "Chelsio T62100-OCP3"}, /* 2 x 10/25G */ {0x6407, "Chelsio T62100-LP-CR"}, /* 2 x 40/50/100G */ {0x6408, "Chelsio T62100-SO-CR"}, /* 2 x 40/50/100G, nomem */ {0x6409, "Chelsio T6210-BT"}, /* 2 x 10GBASE-T */ {0x640d, "Chelsio T62100-CR"}, /* 2 x 40/50/100G */ {0x6410, "Chelsio T6-DBG-100"}, /* 2 x 40/50/100G, debug */ {0x6411, "Chelsio T6225-LL-CR"}, /* 2 x 10/25G */ - {0x6414, "Chelsio T61100-OCP-SO"}, /* 1 x 40/50/100G, nomem */ + {0x6414, "Chelsio T62100-SO-OCP3"}, /* 2 x 40/50/100G, nomem */ {0x6415, "Chelsio T6201-BT"}, /* 2 x 1000BASE-T */ /* Custom */ diff --git a/sys/dev/cxgbe/t4_vf.c b/sys/dev/cxgbe/t4_vf.c index 8ca6dd98a66f..39b5fe273183 100644 --- a/sys/dev/cxgbe/t4_vf.c +++ b/sys/dev/cxgbe/t4_vf.c @@ -105,15 +105,15 @@ struct { {0x6802, "Chelsio T6225-SO-CR VF"}, /* 2 x 10/25G, nomem */ {0x6803, "Chelsio T6425-CR VF"}, /* 4 x 10/25G */ {0x6804, "Chelsio T6425-SO-CR VF"}, /* 4 x 10/25G, nomem */ - {0x6805, "Chelsio T6225-OCP-SO VF"}, /* 2 x 10/25G, nomem */ - {0x6806, "Chelsio T62100-OCP-SO VF"}, /* 2 x 40/50/100G, nomem */ + {0x6805, "Chelsio T6225-SO-OCP3 VF"}, /* 2 x 10/25G, nomem */ + {0x6806, "Chelsio T6225-OCP3 VF"}, /* 2 x 10/25G */ {0x6807, "Chelsio T62100-LP-CR VF"}, /* 2 x 40/50/100G */ {0x6808, "Chelsio T62100-SO-CR VF"}, /* 2 x 40/50/100G, nomem */ {0x6809, "Chelsio T6210-BT VF"}, /* 2 x 10GBASE-T */ {0x680d, "Chelsio T62100-CR VF"}, /* 2 x 40/50/100G */ {0x6810, "Chelsio T6-DBG-100 VF"}, /* 2 x 40/50/100G, debug */ {0x6811, "Chelsio T6225-LL-CR VF"}, /* 2 x 10/25G */ - {0x6814, "Chelsio T61100-OCP-SO VF"}, /* 1 x 40/50/100G, nomem */ + {0x6814, "Chelsio T62100-SO-OCP3 VF"}, /* 2 x 40/50/100G, nomem */ {0x6815, "Chelsio T6201-BT VF"}, /* 2 x 1000BASE-T */ /* Custom */ From nobody Fri Dec 6 20:32:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4jch24rsz5fqnC; Fri, 06 Dec 2024 20:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4jch1K1Hz3wdy; Fri, 6 Dec 2024 20:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riNXrvkOZeVnIEOJY34zi9GkdocoiUAHtHuRLXAxU0s=; b=IlmyxoFNOLmktxG0ygIX1irN2E3d1mXfOtM759Z8mDYU/RGHMMm73zGUQeQ3UXsTY9Fukz 7j+W6I9pzopNUtHAXw8ieEF4b7v2db7UNdm0YQ2q8uW6BSpi7DcrvO6iiUfuhsHWIc37kE v41yQ9Q47pEerzRA16GLi2bk5KqQFK2VDda9q1LQ1b+H0RlieP0Q8NS6IOx1mlf6CvLSQm gbpMU2kqd1qh+IfOx2XUAEfDafmbeiBIWFEoCewVquLc/R7021IJZRQnNIx0vfsSs+udKY ryuL17I6U1E/mLykH6hjEB/m5nZ1fHwqVTetncI3ICLxL1VTr7Z0d/9Ftm9DdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riNXrvkOZeVnIEOJY34zi9GkdocoiUAHtHuRLXAxU0s=; b=che7Md60rBx0YYwSMFbJTdbYCWPKAF6R0+jfSGpHkn8CcxV1RqfPrdmJYRVS4Kj+hyXSOy QkD7hGCZgLyRKFghbkOqY503+TAMc1cu1mqJGOeWtvg8xd6Q9le+wD4ZqQVDwIHnOzFnFT HBUBxZyht9xPZEhFUDtPXvL5VRoTjyusKj0c9fypfWeJtAR26HQAE7l6W6xO6T2JBTVhoJ kEo3G47Z6aqASbWPoNpaaFhOvFn9FW4+aO/c92+wJ785HrNAxZsduiQwkllo6Pmpy45AVo +a2KSzpR/wTgSWG6kLgZVhJ+zryPSAJEwTEfIcwGtAC6E3Md7GZw3q5M2UZ7IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733517172; a=rsa-sha256; cv=none; b=vhuQ5BtDA0VLahGrJJNATKmyozNI5j51rIy5dCdjx4XxrDuVMwJ812WUAxq+HEPn+LTY3f pSsqY7muosP+CL9buDDT1et4mStUZA2JGAf8mrumjezGRwP425A+mJMRtkPkLR9XivyDOL vFYh6v7I4nWKZYf3nbq6l2/pF6KgNts/dI/0DxXYXdfpU+U6F8COH6uuKDOQ/EcqCSCRES VjeGmOnp2V8M/XgJqgJUDCBGv4LZ/zYO3iLLVRBoxXtbcjEdmGH72DycUPCVPHq+LAQYkV VR/1Fnhq/JhLIseh1l72YdEt3KImR6JNMD8x3Xal2oybOU5FQ3G2TAqA1F5dHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4jch0wBVzs3v; Fri, 6 Dec 2024 20:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6KWqBq064304; Fri, 6 Dec 2024 20:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6KWqXl064301; Fri, 6 Dec 2024 20:32:52 GMT (envelope-from git) Date: Fri, 6 Dec 2024 20:32:52 GMT Message-Id: <202412062032.4B6KWqXl064301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 6ae8e077aee5 - stable/14 - cxgbe(4): Fix the name of the 2 x 10/25 OCP card. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ae8e077aee5a91d2df2c43c08fa5019e976f81c Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=6ae8e077aee5a91d2df2c43c08fa5019e976f81c commit 6ae8e077aee5a91d2df2c43c08fa5019e976f81c Author: Navdeep Parhar AuthorDate: 2024-11-29 18:17:49 +0000 Commit: Navdeep Parhar CommitDate: 2024-12-06 18:23:10 +0000 cxgbe(4): Fix the name of the 2 x 10/25 OCP card. Reported by: Sony Arpita Das @ Chelsio Fixes: 5c15094916bf cxgbe(4): Update the board names of the T6 OCP cards. Sponsored by: Chelsio Communications (cherry picked from commit 878413d5590c9f24fb8a92ebca00899662594874) --- sys/dev/cxgbe/t4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index ab9dbc52e5ad..9a163880220d 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -936,7 +936,7 @@ struct { {0x6403, "Chelsio T6425-CR"}, /* 4 x 10/25G */ {0x6404, "Chelsio T6425-SO-CR"}, /* 4 x 10/25G, nomem */ {0x6405, "Chelsio T6225-SO-OCP3"}, /* 2 x 10/25G, nomem */ - {0x6406, "Chelsio T62100-OCP3"}, /* 2 x 10/25G */ + {0x6406, "Chelsio T6225-OCP3"}, /* 2 x 10/25G */ {0x6407, "Chelsio T62100-LP-CR"}, /* 2 x 40/50/100G */ {0x6408, "Chelsio T62100-SO-CR"}, /* 2 x 40/50/100G, nomem */ {0x6409, "Chelsio T6210-BT"}, /* 2 x 10GBASE-T */ From nobody Fri Dec 6 20:37:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4jk76krVz5fqpQ; Fri, 06 Dec 2024 20:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4jk76FMjz3xHR; Fri, 6 Dec 2024 20:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y125PCZNfCVEj450PajwyATXfhrnaZX2/OoRZ9X6G1I=; b=GKEEM2p31d4L4qC0SZ+y4leifxBTr/rCVcL6RrkmCJGQhx9o/YDAZZ+6IDIzvApRWoH58t LJNcqgmNoFcvBAwz4ojTrpDcv0+LqonPPi2xtkLvAV3qnxmS/OrSvfBVqlsHYLkiEcxENJ 6wafFjfkefzFR2QP4kONcnN/km/vuJpnVz1raWzzBqVfXiaotQUXESgkLEmT/qMP9Q0Ni3 h8NkbydPT9AqyKUofpnBpBE01y0m8sH/aFO7YefQQd7Q3rRVF9cPL+wcwfIZ9h5zTUd6jh ZM6lRDUhDALn8ad+RHXD9/1drP3miAwB26IcuxNSQvF8sic7QxbxmBvWA0Cj1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733517455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y125PCZNfCVEj450PajwyATXfhrnaZX2/OoRZ9X6G1I=; b=pCH4nzuKbfjA4a4bxlxp9f/W5fRH38q3q2sIILlI5S6Y60xaqIwCDrAJ5PtgPutGMniKyg ND85KSb2LqrtzNhkQWNIJi/Su0VtEeYE81mc9lAMXNHL+gDPmOeCSMDHfl2sUdIGKd7vfv 8oXC2iGU9SPFq18NckaVzhM/eCsiJPjFUvrAWOfcLNpzujBQ0pekGOGKsHMWTRKx3XPUZu W6VMAm7HK307Q+EqXz4dGnsx3+tVUbP5wlfb/zoLoCaYu8+i/Wmu67JU8tXshAZfw5pYSA UHV/TTjYq5//gCj+9XxiaAq1UFKP8dA5i2lDAw1Sms1t7Z0YqRG9vjHk9RnBTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733517455; a=rsa-sha256; cv=none; b=PPWIqeTrkM8O6AaYeJufo12K8chmEBQikCPJUV37EPCK565vfwdhGhlS+5X0CmJOWCbxIU R4/2h6uR9AAKVxzxUbj/vmmIS5GyKVngpjB5f4eDduserPwQZL6RbhP36aw5GYWhWXT9Su zarPeSK2FeR4TR4uDJtcrngD9goVRcDwsk4/fgg7LRp53XG9BacgFMvltbFJwOdpSMHnR3 JnrlB23i/W38P02NmI0uazKreDuqAQPHuK/Pw6TQag31UIuT4B8cfxjFMM7ukDf8T8XUiR bll9takHrrzKfpahz7PiiAAa/dh6qyiJwyPKZ2CW/Fbx/0KyPBcsKWw5RIen3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4jk75rPLzt0s; Fri, 6 Dec 2024 20:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6KbZlr066067; Fri, 6 Dec 2024 20:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6KbZuf066064; Fri, 6 Dec 2024 20:37:35 GMT (envelope-from git) Date: Fri, 6 Dec 2024 20:37:35 GMT Message-Id: <202412062037.4B6KbZuf066064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: ada9196f3547 - stable/14 - cxgbe/t4_tom: Change stid allocation strategy to be more IPv6 friendly. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ada9196f3547f3911cf6b5d9843f03acab81ae85 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=ada9196f3547f3911cf6b5d9843f03acab81ae85 commit ada9196f3547f3911cf6b5d9843f03acab81ae85 Author: Navdeep Parhar AuthorDate: 2024-10-10 17:45:17 +0000 Commit: Navdeep Parhar CommitDate: 2024-12-06 20:34:28 +0000 cxgbe/t4_tom: Change stid allocation strategy to be more IPv6 friendly. A hardware IPv6 server needs 2 consecutive stids (server tids) starting from a 2-aligned stid whereas an IPv4 server needs only 1 stid without any constraint. The allocator used to grab the first free stid(s) for both but this can fragment the stid space leaving nothing suitable for IPv6 even when lots of stids are available. Change the allocator to prefer stids for IPv4 from the ones that cannot be used for IPv6. Reviewed by: jhb Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D47042 (cherry picked from commit f48fb131c2523d4915d1ad4eba002251c64f5574) --- sys/dev/cxgbe/offload.h | 13 +--- sys/dev/cxgbe/tom/t4_listen.c | 174 +++++++++++++++++++++++++----------------- sys/dev/cxgbe/tom/t4_tom.h | 2 +- 3 files changed, 105 insertions(+), 84 deletions(-) diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index c13901ee1a59..b57c03f076b5 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -33,6 +33,7 @@ #include #include #include +#include #define INIT_ULPTX_WRH(w, wrlen, atomic, tid) do { \ (w)->wr_hi = htonl(V_FW_WR_OP(FW_ULPTX_WR) | V_FW_WR_ATOMIC(atomic)); \ @@ -57,15 +58,6 @@ OPCODE_TID(w) = htonl(MK_OPCODE_TID(cpl, tid)); \ } while (0) -TAILQ_HEAD(stid_head, stid_region); -struct listen_ctx; - -struct stid_region { - TAILQ_ENTRY(stid_region) link; - u_int used; /* # of stids used by this region */ - u_int free; /* # of contiguous stids free right after this region */ -}; - /* * Max # of ATIDs. The absolute HW max is larger than this but we reserve a few * of the upper bits for use as a cookie to demux the reply. @@ -143,9 +135,8 @@ struct tid_info { struct mtx stid_lock __aligned(CACHE_LINE_SIZE); struct listen_ctx **stid_tab; + bitstr_t *stid_bitmap; u_int stids_in_use; - u_int nstids_free_head; /* # of available stids at the beginning */ - struct stid_head stids; bool stid_tab_stopped; struct mtx atid_lock __aligned(CACHE_LINE_SIZE); diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index 8a39218a55ba..8226c44669ab 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -72,9 +72,9 @@ #include "tom/t4_tom.h" /* stid services */ -static int alloc_stid(struct adapter *, struct listen_ctx *, int); +static int alloc_stid(struct adapter *, bool, void *); static struct listen_ctx *lookup_stid(struct adapter *, int); -static void free_stid(struct adapter *, struct listen_ctx *); +static void free_stid(struct adapter *, int , bool); /* lctx services */ static struct listen_ctx *alloc_lctx(struct adapter *, struct inpcb *, @@ -103,10 +103,14 @@ alloc_stid_tab(struct adapter *sc) M_ZERO | M_NOWAIT); if (t->stid_tab == NULL) return (ENOMEM); + t->stid_bitmap = bit_alloc(t->nstids, M_CXGBE, M_NOWAIT); + if (t->stid_bitmap == NULL) { + free(t->stid_tab, M_CXGBE); + t->stid_tab = NULL; + return (ENOMEM); + } mtx_init(&t->stid_lock, "stid lock", NULL, MTX_DEF); t->stids_in_use = 0; - TAILQ_INIT(&t->stids); - t->nstids_free_head = t->nstids; return (0); } @@ -123,6 +127,8 @@ free_stid_tab(struct adapter *sc) mtx_destroy(&t->stid_lock); free(t->stid_tab, M_CXGBE); t->stid_tab = NULL; + free(t->stid_bitmap, M_CXGBE); + t->stid_bitmap = NULL; } void @@ -194,74 +200,94 @@ restart_stid_tab(struct adapter *sc) } static int -alloc_stid(struct adapter *sc, struct listen_ctx *lctx, int isipv6) +alloc_stid(struct adapter *sc, bool isipv6, void *ctx) { struct tid_info *t = &sc->tids; - u_int stid, n, f, mask; - struct stid_region *sr = &lctx->stid_region; - - /* - * An IPv6 server needs 2 naturally aligned stids (1 stid = 4 cells) in - * the TCAM. The start of the stid region is properly aligned (the chip - * requires each region to be 128-cell aligned). - */ - n = isipv6 ? 2 : 1; - mask = n - 1; - KASSERT((t->stid_base & mask) == 0 && (t->nstids & mask) == 0, - ("%s: stid region (%u, %u) not properly aligned. n = %u", - __func__, t->stid_base, t->nstids, n)); + const u_int n = isipv6 ? 2 : 1; + int stid, pair_stid; + u_int i; + ssize_t val; mtx_lock(&t->stid_lock); + MPASS(t->stids_in_use <= t->nstids); if (n > t->nstids - t->stids_in_use || t->stid_tab_stopped) { mtx_unlock(&t->stid_lock); return (-1); } - if (t->nstids_free_head >= n) { + stid = -1; + if (isipv6) { /* - * This allocation will definitely succeed because the region - * starts at a good alignment and we just checked we have enough - * stids free. + * An IPv6 server needs 2 naturally aligned stids (1 stid = 4 + * cells) in the TCAM. We know that the start of the stid + * region is properly aligned already (the chip requires each + * region to be 128-cell aligned). */ - f = t->nstids_free_head & mask; - t->nstids_free_head -= n + f; - stid = t->nstids_free_head; - TAILQ_INSERT_HEAD(&t->stids, sr, link); + for (i = 0; i + 1 < t->nstids; i = roundup2(val + 1, 2)) { + bit_ffc_area_at(t->stid_bitmap, i, t->nstids, 2, &val); + if (val == -1) + break; + if ((val & 1) == 0) { + stid = val; + break; + } + } } else { - struct stid_region *s; - - stid = t->nstids_free_head; - TAILQ_FOREACH(s, &t->stids, link) { - stid += s->used + s->free; - f = stid & mask; - if (s->free >= n + f) { - stid -= n + f; - s->free -= n + f; - TAILQ_INSERT_AFTER(&t->stids, s, sr, link); - goto allocated; + /* + * An IPv4 server needs one stid without any alignment + * requirements. But we try extra hard to find an available + * stid adjacent to a used stid so that free "stid-pairs" are + * left intact for IPv6. + */ + bit_ffc_at(t->stid_bitmap, 0, t->nstids, &val); + while (val != -1) { + if (stid == -1) { + /* + * First usable stid. Look no further if it's + * an ideal fit. + */ + stid = val; + if (val & 1 || bit_test(t->stid_bitmap, val + 1)) + break; + } else { + /* + * We have an unused stid already but are now + * looking for in-use stids because we'd prefer + * to grab an unused stid adjacent to one that's + * in use. + * + * Odd stids pair with the previous stid and + * even ones pair with the next stid. + */ + pair_stid = val & 1 ? val - 1 : val + 1; + if (bit_test(t->stid_bitmap, pair_stid) == 0) { + stid = pair_stid; + break; + } } + val = roundup2(val + 1, 2); + if (val >= t->nstids) + break; + bit_ffs_at(t->stid_bitmap, val, t->nstids, &val); } + } - if (__predict_false(stid != t->nstids)) { - panic("%s: stids TAILQ (%p) corrupt." - " At %d instead of %d at the end of the queue.", - __func__, &t->stids, stid, t->nstids); + if (stid >= 0) { + MPASS(stid + n - 1 < t->nstids); + MPASS(bit_ntest(t->stid_bitmap, stid, stid + n - 1, 0)); + bit_nset(t->stid_bitmap, stid, stid + n - 1); + t->stids_in_use += n; + t->stid_tab[stid] = ctx; +#ifdef INVARIANTS + if (n == 2) { + MPASS((stid & 1) == 0); + t->stid_tab[stid + 1] = NULL; } - - mtx_unlock(&t->stid_lock); - return (-1); +#endif + stid += t->stid_base; } - -allocated: - sr->used = n; - sr->free = f; - t->stids_in_use += n; - t->stid_tab[stid] = lctx; mtx_unlock(&t->stid_lock); - - KASSERT(((stid + t->stid_base) & mask) == 0, - ("%s: EDOOFUS.", __func__)); - return (stid + t->stid_base); + return (stid); } static struct listen_ctx * @@ -273,25 +299,28 @@ lookup_stid(struct adapter *sc, int stid) } static void -free_stid(struct adapter *sc, struct listen_ctx *lctx) +free_stid(struct adapter *sc, int stid, bool isipv6) { struct tid_info *t = &sc->tids; - struct stid_region *sr = &lctx->stid_region; - struct stid_region *s; - - KASSERT(sr->used > 0, ("%s: nonsense free (%d)", __func__, sr->used)); + const u_int n = isipv6 ? 2 : 1; mtx_lock(&t->stid_lock); - s = TAILQ_PREV(sr, stid_head, link); - if (s != NULL) - s->free += sr->used + sr->free; - else - t->nstids_free_head += sr->used + sr->free; - KASSERT(t->stids_in_use >= sr->used, - ("%s: stids_in_use (%u) < stids being freed (%u)", __func__, - t->stids_in_use, sr->used)); - t->stids_in_use -= sr->used; - TAILQ_REMOVE(&t->stids, sr, link); + MPASS(stid >= t->stid_base); + stid -= t->stid_base; + MPASS(stid + n - 1 < t->nstids); + MPASS(t->stids_in_use <= t->nstids); + MPASS(t->stids_in_use >= n); + MPASS(t->stid_tab[stid] != NULL); +#ifdef INVARIANTS + if (n == 2) { + MPASS((stid & 1) == 0); + MPASS(t->stid_tab[stid + 1] == NULL); + } +#endif + MPASS(bit_ntest(t->stid_bitmap, stid, stid + n - 1, 1)); + bit_nclear(t->stid_bitmap, stid, stid + n - 1); + t->stid_tab[stid] = NULL; + t->stids_in_use -= n; mtx_unlock(&t->stid_lock); } @@ -306,13 +335,14 @@ alloc_lctx(struct adapter *sc, struct inpcb *inp, struct vi_info *vi) if (lctx == NULL) return (NULL); - lctx->stid = alloc_stid(sc, lctx, inp->inp_vflag & INP_IPV6); + lctx->isipv6 = inp->inp_vflag & INP_IPV6; + lctx->stid = alloc_stid(sc, lctx->isipv6, lctx); if (lctx->stid < 0) { free(lctx, M_CXGBE); return (NULL); } - if (inp->inp_vflag & INP_IPV6 && + if (lctx->isipv6 && !IN6_ARE_ADDR_EQUAL(&in6addr_any, &inp->in6p_laddr)) { lctx->ce = t4_get_clip_entry(sc, &inp->in6p_laddr, true); if (lctx->ce == NULL) { @@ -348,7 +378,7 @@ free_lctx(struct adapter *sc, struct listen_ctx *lctx) if (lctx->ce) t4_release_clip_entry(sc, lctx->ce); - free_stid(sc, lctx); + free_stid(sc, lctx->stid, lctx->isipv6); free(lctx, M_CXGBE); return (in_pcbrele_wlocked(inp)); diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index 8debab4940b1..1f97dd81a0bc 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -294,8 +294,8 @@ struct listen_ctx { LIST_ENTRY(listen_ctx) link; /* listen hash linkage */ volatile int refcount; int stid; - struct stid_region stid_region; int flags; + bool isipv6; struct inpcb *inp; /* listening socket's inp */ struct vnet *vnet; struct sge_wrq *ctrlq; From nobody Sat Dec 7 00:01:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4pFj4JM0z5g76j; Sat, 07 Dec 2024 00:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4pFj1ZJvz4LPB; Sat, 7 Dec 2024 00:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733529705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSyOk8CBCcusxvAg3ThUCg8j2R7F0pjzZepcrT0Dzqs=; b=CQJh1/u2JMxNWN+wAM+1BbPlxjkm5TMKAtAg87Aja1XQveb+0w/G5PyDOtxetlBovqKCm0 tzlDgIY0Ma9xxYKOHd3m0cR1YOcuje9Lt17TjWrznVIFHpTcpYxgIbu8REyQP4Qq5IWogq PSDc+zuKOvQ2ABpuVV30s+8WB10veKNr66X+ghgGuHDR4f9SJm2WEnp6hmWEZkmdfQqNyu /JQxhlVVxlMcurmjt8yJizsK8GNd/+NgO80MJ7kY34h4HrvVG3If0mwIyFJdnjYX6SjmM2 wq1yd/EAbiWI3ecgD+TLUm0OkwlijfCamuwUOYyFg6JgrC51m9UE40wgGbc2xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733529705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSyOk8CBCcusxvAg3ThUCg8j2R7F0pjzZepcrT0Dzqs=; b=CcinIH1iu7wK4WrMwcSQiCPq15br2ARzyfrMPP/9QiG522HZUijzY3CO/9Vmga3ZOUnwHS MbeamuMXcjDfy2xL09u5NySe1uaMC8CjGE1miDAL3qEtxtwMqXVAL+Ah2lppIuLDqOqSKT 0vAb184snDkxMQHctLrx2n0w8dA7NCSODWXw0h0jqxiyE5/ubshJGBpQ94ONfBEin++ia4 XenMeKeWPMAuNlq5oHdjngTug0I3DXXboWjMC4clZTH/4V2mx4sCDJOyZEpfpGRGZYv6V9 HhyShVTEpg/MkoZy6ihOGqolXZDVYOaPc4/uk4Y+FsTiMKaUT9Nky+TEtV3aAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733529705; a=rsa-sha256; cv=none; b=ekQ2L3AQ+ufG9ZNwxMuN0ZTzxAJKZYONNXNR48w+GnM1zMMkq/lG5ra0EFoMALVdmJxiHF hRl7iT265hhHJ9A4JxCFbEfUqXW6jWRYlM7EDd1E2/H/p/K8AxKUUdbdOGcNoIgAQ05FP3 djamzhIQfZlqitYAi9KlzmxpMmKq0YPMGJzs3GvdOJB2X4HZRVih5sNrEI8BCxE/z6J6+y UjecMw5ykli/yy2831CnmcNuEI5J255WaAVzitgsHjBADDVPADDQVVHI30XfmuyByidnYU n72p4/LQ9kX+JKRY0gm4nJuDZRJJdaOmUDYOAgOEK7cchy0rEyrg/FSVUNYwAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4pFj18z3z10HG; Sat, 7 Dec 2024 00:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B701jOb055015; Sat, 7 Dec 2024 00:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B701jFe055012; Sat, 7 Dec 2024 00:01:45 GMT (envelope-from git) Date: Sat, 7 Dec 2024 00:01:45 GMT Message-Id: <202412070001.4B701jFe055012@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: 4651f4be1ed3 - stable/13 - ACPI: Treat all 20-element _BIX entires as revision 0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 4651f4be1ed36d72f6d299a040f9a41eeb5c43c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4651f4be1ed36d72f6d299a040f9a41eeb5c43c4 commit 4651f4be1ed36d72f6d299a040f9a41eeb5c43c4 Author: Bartosz Fabianowski AuthorDate: 2024-10-02 18:21:28 +0000 Commit: Warner Losh CommitDate: 2024-12-07 00:01:59 +0000 ACPI: Treat all 20-element _BIX entires as revision 0 Some Fujitsu Lifebooks return an invalid _BIX object. The first element of _BIX is a revision number, which indicates what elements will follow: * ACPI 4.0 defined _BIX revision 0 with 20 elements. * ACPI 6.0 introduced _BIX revision 1 with 21 elements. The problem is that the offending Lifebooks have the a non-zero _BIX revision, but provide 20 fields only. The ACPICA parser chokes on this [1], but that seems to be inconsequential. More importantly, our own battery info handling code also verifies that for revision > 0, there are at least 21 fields - and refuses to process the invalid _BIX. One workaround would be to introduce special case / quirk handling for Fujitsu Lifebooks. A better one is to relax the requirements check: If there are only 20 elements, treat the _BIX as revision 0, no matter what revision number was provided by the device. Linux doesn't run into this problem by the way because it only supports the 20 fields defined in the ACPI 4.0 spec [3]. It never looks at the revision number or the 21st field added in ACPI 6.0. [1] https://cgit.freebsd.org/src/tree/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#n815 [2] https://cgit.freebsd.org/src/tree/sys/dev/acpica/acpi_cmbat.c#n371 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/acpi/battery.c#n418 PR: 252030 Reviewed by: imp MFC After: 2 weeks (cherry picked from commit cd8c3af747cc300c8257c315c7576644e2bb86ff) --- sys/dev/acpica/acpi_cmbat.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 553cce3ab292..7b0d541d2441 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -399,8 +399,17 @@ acpi_cmbat_get_bix(void *arg) sc->bix.rev != ACPI_BIX_REV_1) ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_1); } else if (ACPI_PKG_VALID_EQ(res, 20)) {/* ACPI 4.0 _BIX */ - if (sc->bix.rev != ACPI_BIX_REV_0) - ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_0); + /* + * Some models claim to be rev.1, but have a _BIX with only 20 + * members. Be lenient and treat this as a valid rev.0 _BIX. + */ + if (sc->bix.rev != ACPI_BIX_REV_0) { + ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), + "_BIX containing too few objects for revision %u. " + "Treating as revision %u instead.\n", + sc->bix.rev, ACPI_BIX_REV_0); + sc->bix.rev = ACPI_BIX_REV_0; + } } else if (ACPI_PKG_VALID(res, 22)) { /* _BIX with 22 or more members. */ if (ACPI_BIX_REV_MIN_CHECK(sc->bix.rev, ACPI_BIX_REV_1 + 1)) { From nobody Sat Dec 7 00:17:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4pbh6rqYz5g8Kj; Sat, 07 Dec 2024 00:17: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4pbh67D0z4MTt; Sat, 7 Dec 2024 00:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX13dMkKCefiAiMYnmNDOUNzjnF7kEnLcpNdJwReus0=; b=B8t4NbBEX/0duWE3swI/JFuWXaQwHFIVWyfsF7PenujrtM1KqgwyeRd+AU8AFkojsjQa+a qqi61CQdFcAbIFZX9WLh+dfO2Ut0jKLoQhLREniPT/CCdcdjhFMlXYsbR1wVsv7o8p1OIf Yxh9WNrACzUj/lYNqlde4G4bkh5tquFAK/Zzw7o+f4KjUiEn/Xb0H6MFVMNxxpV74AwweU g9+CKt6GqkgdQ+Lq3fswp+8GCovTjclFGr8DFLm0PKgVhi9tvFpoJn0jS0FzZEBY9Ly79T cC2GFyii/FJAIMnhlk11OLtS1rc0IacsSLsISFHgKgGy8PgUd4Ma5oMqIP5T2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX13dMkKCefiAiMYnmNDOUNzjnF7kEnLcpNdJwReus0=; b=XH3QTwSc7ee93vejqiQof56JotWczW/MKexsJYmrJ3kx+oruuV9ViEJrv2JxpTlafyLf0z LqVA8mGKPi6eUjoxhhmnrYgHIgtZ11ClCrlb0ZYWdzM4P5wbbn+TbkFu65DuF7CySXTe3v Qr7LkO4YKx5vAi660oli8ApOhKRmtl50DryhgxZ0xnZ+EdkbhpBMJfoG7dfJq0ELMq0T2r ESkQC1yScHGUTPAY8IQ1aUKi5Nyw2nfvkhYLzC8S38QX2oH+8E9dh/Xxxvilfu3W8g+OKt fotL841Ivil8+yZ1RXyXuoxyLTeWS/KQ81nsMEyY73u91tB3FifwLVIHeWFG8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733530640; a=rsa-sha256; cv=none; b=qLGBYJvpvnnc2ORpGxh55j8UMHo8gum3gtR17ALsrNB3lbPrMKVKHUUeyZu4nsLbKF4OZV ohynvp2vaap7qbaKOgAZH3QiUPMXt2I/XW7sBUTglo803r40UhwFLlQHm4/cEEk022Azrx yOpR2uQk9/V9eIiJyr3RcAqsK+UOySoK+JxAXfi9aIV5VXG2Ar37lVFCQP0WiscXiTIFob Vz15zzH3WGjouHuVxdtryAGC9FzYoYNrKdqZ5+xc5usB2sKleRLHrN8I/8fiL2fv4LOsAD AQ0RO5h2Sg9wXyR/Q0W4OPItbSqpAn28O/tDa+7k+j2NC7E9fx546+Vel4zKJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4pbh5Xgbz10N0; Sat, 7 Dec 2024 00:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B70HKD5076552; Sat, 7 Dec 2024 00:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B70HKPP076549; Sat, 7 Dec 2024 00:17:20 GMT (envelope-from git) Date: Sat, 7 Dec 2024 00:17:20 GMT Message-Id: <202412070017.4B70HKPP076549@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: 3c59c4453f0e - stable/14 - ACPI: Treat all 20-element _BIX entires as revision 0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 3c59c4453f0efbb606da9bf6a879f53ae980a645 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c59c4453f0efbb606da9bf6a879f53ae980a645 commit 3c59c4453f0efbb606da9bf6a879f53ae980a645 Author: Bartosz Fabianowski AuthorDate: 2024-10-02 18:21:28 +0000 Commit: Warner Losh CommitDate: 2024-12-07 00:11:27 +0000 ACPI: Treat all 20-element _BIX entires as revision 0 Some Fujitsu Lifebooks return an invalid _BIX object. The first element of _BIX is a revision number, which indicates what elements will follow: * ACPI 4.0 defined _BIX revision 0 with 20 elements. * ACPI 6.0 introduced _BIX revision 1 with 21 elements. The problem is that the offending Lifebooks have the a non-zero _BIX revision, but provide 20 fields only. The ACPICA parser chokes on this [1], but that seems to be inconsequential. More importantly, our own battery info handling code also verifies that for revision > 0, there are at least 21 fields - and refuses to process the invalid _BIX. One workaround would be to introduce special case / quirk handling for Fujitsu Lifebooks. A better one is to relax the requirements check: If there are only 20 elements, treat the _BIX as revision 0, no matter what revision number was provided by the device. Linux doesn't run into this problem by the way because it only supports the 20 fields defined in the ACPI 4.0 spec [3]. It never looks at the revision number or the 21st field added in ACPI 6.0. [1] https://cgit.freebsd.org/src/tree/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#n815 [2] https://cgit.freebsd.org/src/tree/sys/dev/acpica/acpi_cmbat.c#n371 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/acpi/battery.c#n418 PR: 252030 Reviewed by: imp MFC After: 2 weeks (cherry picked from commit cd8c3af747cc300c8257c315c7576644e2bb86ff) --- sys/dev/acpica/acpi_cmbat.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 8c08868456d7..e85967aed9c9 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -398,8 +398,17 @@ acpi_cmbat_get_bix(void *arg) sc->bix.rev != ACPI_BIX_REV_1) ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_1); } else if (ACPI_PKG_VALID_EQ(res, 20)) {/* ACPI 4.0 _BIX */ - if (sc->bix.rev != ACPI_BIX_REV_0) - ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_0); + /* + * Some models claim to be rev.1, but have a _BIX with only 20 + * members. Be lenient and treat this as a valid rev.0 _BIX. + */ + if (sc->bix.rev != ACPI_BIX_REV_0) { + ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), + "_BIX containing too few objects for revision %u. " + "Treating as revision %u instead.\n", + sc->bix.rev, ACPI_BIX_REV_0); + sc->bix.rev = ACPI_BIX_REV_0; + } } else if (ACPI_PKG_VALID(res, 22)) { /* _BIX with 22 or more members. */ if (ACPI_BIX_REV_MIN_CHECK(sc->bix.rev, ACPI_BIX_REV_1 + 1)) { From nobody Sun Dec 8 01:39:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5SN06nm4z5fpQL; Sun, 08 Dec 2024 01:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5SN065C5z4gvw; Sun, 8 Dec 2024 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733621968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrMRWc50EQX8WhNvdWuKzDXutmvc81b3FSgQ4Bldf2k=; b=Qkp9YHCxa47Z5SDHwIegA7Iwd6IS8JxOY7D9UX/H6mL9wo3mDNCeFN/ZdfarBajTlfRuIb RIkwi5ZGv9WPEo9/dvlJhS6XM0ESnZCVmwYaD1mfnocvNNLnASPWnfb8lP/yJgK1nS59UR NLU9DmVzkc2X9MWuaYjdDyLDYFYs6QOIPz87NevUU9q+5T7i88wKZ4PViGiTpsp+H9Hzsu 5KsW8Ded1NkfaqHKlmnAus0pkliRkei0vmCXcRjBIrIPRVL4VB9o/1XXYNA1bHPc8GbMfD Z2HMryfYOYNsNJrPZAQ6Hmt1QVxDL6W58P7D8eUjk2PAOwgSTS86rwQJLdpHEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733621968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrMRWc50EQX8WhNvdWuKzDXutmvc81b3FSgQ4Bldf2k=; b=VY8rP+RRtjROZm6wq1I8plwWM/teWLrHypDFdDa+/ICg7l+EHhoGrKaByKkidqBHtwaiTP de2i+dxwEnDPv2srM+iYeTrpac3+2bpnVfHYS9KmcQBvxFMHfQ27GlCqMo59K86XE7eike UyBDwKXR2TB/3Y01ZZ+HZTYDLTJb6QerzGPThv9aLNtMBsn3D0ywTDaR62wVCfYPXAh9wG B1p2JnBc19yMyfklxMKkluiAEwH85dS66nPKo7Lo9UES8rcTcXkv1O6t7Ix/ZncSE31y2d FwQwzA8CU8IZICIbEksGONXvApkNWPoVB1BAM5bW18PfiB9XrIgwV/ohMdIxaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733621968; a=rsa-sha256; cv=none; b=t5q/6rRVtSezjAcj8NWvnNbP0aSDsaYbkTGsZRMtlM11/jDDjYAp2o6qP0k4bL/a4EYtJd YRH2/BkqCz0Be7M7nU/WxXsf15kZrsPCTnZtnUKI5BwZcodnnzJvR83kQRM/rBE6ZetLzx RTCC+XdQQJFNPG3FdQSj8V6RFjlDwcF1mlgL4htVf2rOGY0mXe8RSow/QpiDQ4FFOHonrH 94PYOP2KrGLVc3BuHRqg4DG2jUot97SqA8UtMF18Wo3SHEO/Zs4gSBUNXgyNXlP1S1AINi yDBoEV87b+zW5ie3X7ML7MGcy2gNfrYlZuEhAV5rFwJmEgaxY0ZwCEbrseEBzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5SN05FYWzY4N; Sun, 8 Dec 2024 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B81dSkW002618; Sun, 8 Dec 2024 01:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B81dSon002615; Sun, 8 Dec 2024 01:39:28 GMT (envelope-from git) Date: Sun, 8 Dec 2024 01:39:28 GMT Message-Id: <202412080139.4B81dSon002615@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: 9d1d9fe0a077 - stable/14 - nfs: Add support for the NFSv4.2 mode_umask attribute List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 9d1d9fe0a077d8ad158e25ec39a0277c836b8c3d Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9d1d9fe0a077d8ad158e25ec39a0277c836b8c3d commit 9d1d9fe0a077d8ad158e25ec39a0277c836b8c3d Author: Rick Macklem AuthorDate: 2024-08-21 01:48:19 +0000 Commit: Rick Macklem CommitDate: 2024-12-08 01:38:15 +0000 nfs: Add support for the NFSv4.2 mode_umask attribute RFC8275 defines a new attribute as an extension to NFSv4.2 called MODE_UMASK. This patch adds support for this attribute to the NFSv4.2 client and server. Since FreeBSD applies the umask above the VFS/VOP layer, this attribute does not actually have any effect on the handling of ACL inheritance, which is what it is designed for. However, future changes to NFSv4.2 require support of it, so this patch does that, resulting in behaviour identcal to the mode attribute already supported. (cherry picked from commit 2477e88b8d4328535357bc62409f673a551be179) --- sys/fs/nfs/nfs_commonsubs.c | 46 ++++++++++++++++++++++++++++------------- sys/fs/nfs/nfscl.h | 9 ++++---- sys/fs/nfs/nfsproto.h | 12 +++++++---- sys/fs/nfsclient/nfs_clrpcops.c | 18 +++++++++------- sys/fs/nfsserver/nfs_nfsdport.c | 17 +++++++++++++++ 5 files changed, 72 insertions(+), 30 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 84dcf4385f9a..b83df5e21ecd 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -610,8 +610,18 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, break; case ND_NFSV4: NFSZERO_ATTRBIT(&attrbits); - if (vap->va_mode != (mode_t)VNOVAL) - NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_MODE); + np = NULL; + if (strcmp(vp->v_mount->mnt_vfc->vfc_name, "nfs") == 0) + np = VTONFS(vp); + if (vap->va_mode != (mode_t)VNOVAL) { + if ((flags & NFSSATTR_NEWFILE) != 0 && np != NULL && + NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_MODEUMASK)) + NFSSETBIT_ATTRBIT(&attrbits, + NFSATTRBIT_MODEUMASK); + else + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_MODE); + } if ((flags & NFSSATTR_FULL) && vap->va_uid != (uid_t)VNOVAL) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_OWNER); if ((flags & NFSSATTR_FULL) && vap->va_gid != (gid_t)VNOVAL) @@ -622,18 +632,14 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMEACCESSSET); if (vap->va_mtime.tv_sec != VNOVAL) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMEMODIFYSET); - if (vap->va_birthtime.tv_sec != VNOVAL && - strcmp(vp->v_mount->mnt_vfc->vfc_name, "nfs") == 0) { - /* - * We can only test for support of TimeCreate if - * the "vp" argument is for an NFS vnode. - */ - np = VTONFS(vp); - if (NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, - NFSATTRBIT_TIMECREATE)) - NFSSETBIT_ATTRBIT(&attrbits, - NFSATTRBIT_TIMECREATE); - } + /* + * We can only test for support of TimeCreate if + * the "vp" argument is for an NFS vnode. + */ + if (vap->va_birthtime.tv_sec != VNOVAL && np != NULL && + NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_TIMECREATE)) + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); break; @@ -3114,6 +3120,18 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, *tl = newnfs_false; retnum += NFSX_UNSIGNED; break; + case NFSATTRBIT_MODEUMASK: + NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); + /* + * Since FreeBSD applies the umask above the VFS/VOP, + * there is no umask to handle here. If FreeBSD + * moves handling of umask to below the VFS/VOP, + * this could change. + */ + *tl++ = vtonfsv34_mode(vap->va_mode); + *tl = 0; + retnum += 2 * NFSX_UNSIGNED; + break; default: printf("EEK! Bad V4 attribute bitpos=%d\n", bitpos); } diff --git a/sys/fs/nfs/nfscl.h b/sys/fs/nfs/nfscl.h index a52b9e433145..3b1445e1923c 100644 --- a/sys/fs/nfs/nfscl.h +++ b/sys/fs/nfs/nfscl.h @@ -68,10 +68,11 @@ struct nfsv4node { * These flag bits are used for the argument to nfscl_fillsattr() to * indicate special handling of the attributes. */ -#define NFSSATTR_FULL 0x1 -#define NFSSATTR_SIZE0 0x2 -#define NFSSATTR_SIZENEG1 0x4 -#define NFSSATTR_SIZERDEV 0x8 +#define NFSSATTR_FULL 0x01 +#define NFSSATTR_SIZE0 0x02 +#define NFSSATTR_SIZENEG1 0x04 +#define NFSSATTR_SIZERDEV 0x08 +#define NFSSATTR_NEWFILE 0x10 /* Use this macro for debug printfs. */ #define NFSCL_DEBUG(level, ...) do { \ diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 0268940fd8a6..ce7acf102d41 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1183,7 +1183,8 @@ struct nfsv3_sattr { */ #define NFSATTRBIT_SUPPSETONLY1 (NFSATTRBM_TIMEACCESSSET | \ NFSATTRBM_TIMEMODIFYSET) -#define NFSATTRBIT_SUPPSETONLY2 (NFSATTRBM_MODESETMASKED) +#define NFSATTRBIT_SUPPSETONLY2 (NFSATTRBM_MODESETMASKED | \ + NFSATTRBM_MODEUMASK) /* * NFSATTRBIT_SETABLE - SETABLE0 - bits 0<->31 @@ -1197,11 +1198,12 @@ struct nfsv3_sattr { (NFSATTRBM_MODE | \ NFSATTRBM_OWNER | \ NFSATTRBM_OWNERGROUP | \ - NFSATTRBM_TIMECREATE | \ + NFSATTRBM_TIMECREATE | \ NFSATTRBM_TIMEACCESSSET | \ NFSATTRBM_TIMEMODIFYSET) #define NFSATTRBIT_SETABLE2 \ - (NFSATTRBM_MODESETMASKED) + (NFSATTRBM_MODESETMASKED | \ + NFSATTRBM_MODEUMASK) /* * NFSATTRBIT_NFSV41 - Attributes only supported by NFSv4.1. @@ -1218,7 +1220,9 @@ struct nfsv3_sattr { /* * NFSATTRBIT_NFSV42 - Attributes only supported by NFSv4.2. */ -#define NFSATTRBIT_NFSV42_2 NFSATTRBM_XATTRSUPPORT +#define NFSATTRBIT_NFSV42_2 \ + (NFSATTRBM_XATTRSUPPORT | \ + NFSATTRBM_MODEUMASK) /* * Set of attributes that the getattr vnode op needs. diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 8947b608b743..7540893ce63c 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2423,7 +2423,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap, *tl = vtonfsv34_type(vtyp); } if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, 0); if ((nd->nd_flag & ND_NFSV3) && (vtyp == VCHR || vtyp == VBLK)) { NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED); @@ -2645,14 +2645,16 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (NFSHASSESSPERSIST(nmp)) { /* Use GUARDED for persistent sessions. */ *tl = txdr_unsigned(NFSCREATE_GUARDED); - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, + 0); } else { /* Otherwise, use EXCLUSIVE4_1. */ *tl = txdr_unsigned(NFSCREATE_EXCLUSIVE41); NFSM_BUILD(tl, u_int32_t *, NFSX_VERF); *tl++ = cverf.lval[0]; *tl = cverf.lval[1]; - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, + 0); } } else { /* NFSv4.0 */ @@ -2663,7 +2665,7 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, } } else { *tl = txdr_unsigned(NFSCREATE_UNCHECKED); - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, 0); } NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); @@ -3238,7 +3240,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, *tl = txdr_unsigned(NFDIR); } (void) nfsm_strtom(nd, name, namelen); - nfscl_fillsattr(nd, vap, dvp, NFSSATTR_SIZENEG1, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_SIZENEG1 | NFSSATTR_NEWFILE, 0); if (nd->nd_flag & ND_NFSV4) { NFSGETATTR_ATTRBIT(&attrbits); NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED); @@ -8456,18 +8458,18 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (NFSHASSESSPERSIST(nmp)) { /* Use GUARDED for persistent sessions. */ *tl = txdr_unsigned(NFSCREATE_GUARDED); - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, 0); } else { /* Otherwise, use EXCLUSIVE4_1. */ *tl = txdr_unsigned(NFSCREATE_EXCLUSIVE41); NFSM_BUILD(tl, u_int32_t *, NFSX_VERF); *tl++ = cverf.lval[0]; *tl = cverf.lval[1]; - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, 0); } } else { *tl = txdr_unsigned(NFSCREATE_UNCHECKED); - nfscl_fillsattr(nd, vap, dvp, 0, 0); + nfscl_fillsattr(nd, vap, dvp, NFSSATTR_NEWFILE, 0); } NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 84b579def954..ae3d81926db2 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3223,6 +3223,23 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, } attrsum += 2 * NFSX_UNSIGNED; break; + case NFSATTRBIT_MODEUMASK: + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + mode = fxdr_unsigned(u_short, *tl++); + mask = fxdr_unsigned(u_short, *tl); + /* + * If moderet != 0, mode has already been done. + * If vp != NULL, this is not a file object creation. + */ + if ((nd->nd_flag & ND_NFSV42) == 0) + nd->nd_repstat = NFSERR_ATTRNOTSUPP; + else if ((mask & ~0777) != 0 || vp != NULL || + moderet != 0) + nd->nd_repstat = NFSERR_INVAL; + else + nvap->na_mode = (mode & ~mask); + attrsum += 2 * NFSX_UNSIGNED; + break; default: nd->nd_repstat = NFSERR_ATTRNOTSUPP; /* From nobody Sun Dec 8 01:43:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5SSN0rlwz5fpp2; Sun, 08 Dec 2024 01:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5SSN0J6Xz4hT7; Sun, 8 Dec 2024 01:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733622196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55ZCqNI2E1kcrTKGhCfFuUc+46ORwz5g08nZgtB/7RA=; b=tYeohi2sLOMbp7xkQY4z8ypyW8/neThV3/Lw+Uy28YYFvfGhTipYSDrG4A8/eLACz4O8NX JEu8rRd6K3v6pIuv/R9stsAYtFiL5DQyY1ChIi/Z3KFSQ/qr4oNZktkIPzOsWH887YmR3X oZ4i0nGRPdQ38Hg9hG/G9Z0V/NUQN/awbrY/WIMi0HTnuNLNUMB8mjV8b0kkmxanAin8rA MccfMvUvd15EYHTIZEdJvn5ZOSA64LozvFXN0hM7MK/WObbIYSoJjXV1+j7wkVws7nRnWA ub25qa4i+f6cJHkU8Y8evVoyrurmmQhpysjzLoD/PYgPtGA4vf2x5kURjmFT3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733622196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55ZCqNI2E1kcrTKGhCfFuUc+46ORwz5g08nZgtB/7RA=; b=Oo717nuFLsoVdt4DKmWANUWolhcMws5PZ+KLH122ldG4Vq5oKA11XpEzbbM7sm6kOkMb6F 28KFKTpUKXaoWpC8E5OpUCzP6oApQBjKiwK6VXH+H452Za7ESiii3s+FBnnSvrSRdmfSg9 qdPaIUGF8GOLhzgJrK7IvALEJJwFKhHFo1cInS4JDqLfILm2J5ZjPCMllh4XeX7n29AH1U rbAOI4CEoqwkWF1N9iredxW6AincavtC6MHLrbF0nd4W0B3kaigwVtehA51S1LOhSXLxEh BuWqUio797cC/CBkIA5fs4nEAtyYYOHXKxBwgYoAYeZeXdY8XknT222mi4oJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733622196; a=rsa-sha256; cv=none; b=HjOX70IY8vHruwEMW6SDy7vGZ4l0ta0sl14D/RH/Oakm9WIjkJfUUe1oWZmEFaqOvce9i0 ZBvqaq5/g1JJY4qoOvx2aCEv8m8gZraQJjuBEnkghfe+dWVBm1ge7jeoahQ7DLAXekzCXk 0+xVj8s36WY0pGRYbwvbT3swyljr4uAUF87t93Kn/dNUbSjeQfrR/qytKzivdxPONhjtkZ wb8wQ9HQArCEEajf1pzrWoAeijSj0AYf7N/chpwrmPB7YyxzUfB38w0Ht3qgiDuJjK7Ovj q+wn54y67PvYNTBa6dF12tiRqdmQVIRtz2QcDol76I0g7zAWUq1AumN/+uFpcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5SSM70wHzXp6; Sun, 8 Dec 2024 01:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B81hFIh019172; Sun, 8 Dec 2024 01:43:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B81hFsX019169; Sun, 8 Dec 2024 01:43:15 GMT (envelope-from git) Date: Sun, 8 Dec 2024 01:43:15 GMT Message-Id: <202412080143.4B81hFsX019169@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: 7a4f370a352f - stable/14 - nfs_commonsubs.c: Make all upper case user domain work List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 7a4f370a352f89f00411a0e9cd7a7b8f8424be3a Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7a4f370a352f89f00411a0e9cd7a7b8f8424be3a commit 7a4f370a352f89f00411a0e9cd7a7b8f8424be3a Author: Rick Macklem AuthorDate: 2024-11-24 20:47:56 +0000 Commit: Rick Macklem CommitDate: 2024-12-08 01:41:52 +0000 nfs_commonsubs.c: Make all upper case user domain work Without this patch, an all upper case user domain name (as specified by nfsuserd(8)) would not work. I believe this was done so that Kerberos realms were not confused with user domains. Now, RFC8881 specifies that the user domain name is a DNS name. As such, all upper case names should work. This patch fixes this case so that it works. The custom comparison function is no longer needed. PR: 282620 (cherry picked from commit 0347ddf41f4226c0351d2d1d78f09e8300ebac93) --- sys/fs/nfs/nfs_commonsubs.c | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index b83df5e21ecd..510e497bce2e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -225,7 +225,6 @@ static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); static void nfsv4_wanted(struct nfsv4lock *lp); static uint32_t nfsv4_filesavail(struct statfs *, struct mount *); -static int nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len); static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name); static void nfsrv_removeuser(struct nfsusrgrp *usrp, int isuser); static int nfsrv_getrefstr(struct nfsrv_descript *, u_char **, u_char **, @@ -3442,13 +3441,13 @@ tryagain: /* * If an '@' is found and the domain name matches, search for * the name with dns stripped off. - * Mixed case alpahbetics will match for the domain name, but - * all upper case will not. + * The match for alphabetics in now case insensitive, + * since RFC8881 defines this string as a DNS domain name. */ if (cnt == 0 && i < len && i > 0 && (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) && - !nfsrv_cmpmixedcase(cp, - NFSD_VNET(nfsrv_dnsname), NFSD_VNET(nfsrv_dnsnamelen))) { + strncasecmp(cp, NFSD_VNET(nfsrv_dnsname), + NFSD_VNET(nfsrv_dnsnamelen)) == 0) { len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1); *(cp - 1) = '\0'; } @@ -3669,8 +3668,8 @@ tryagain: */ if (cnt == 0 && i < len && i > 0 && (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) && - !nfsrv_cmpmixedcase(cp, - NFSD_VNET(nfsrv_dnsname), NFSD_VNET(nfsrv_dnsnamelen))) { + strncasecmp(cp, NFSD_VNET(nfsrv_dnsname), + NFSD_VNET(nfsrv_dnsnamelen)) == 0) { len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1); *(cp - 1) = '\0'; } @@ -3718,35 +3717,6 @@ out: return (error); } -/* - * Cmp len chars, allowing mixed case in the first argument to match lower - * case in the second, but not if the first argument is all upper case. - * Return 0 for a match, 1 otherwise. - */ -static int -nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len) -{ - int i; - u_char tmp; - int fndlower = 0; - - for (i = 0; i < len; i++) { - if (*cp >= 'A' && *cp <= 'Z') { - tmp = *cp++ + ('a' - 'A'); - } else { - tmp = *cp++; - if (tmp >= 'a' && tmp <= 'z') - fndlower = 1; - } - if (tmp != *cp2++) - return (1); - } - if (fndlower) - return (0); - else - return (1); -} - /* * Set the port for the nfsuserd. */ From nobody Sun Dec 8 01:51:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5SdY4hX9z5fqRS; Sun, 08 Dec 2024 01:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5SdY4H24z4jmw; Sun, 8 Dec 2024 01:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733622673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHf9i8TeRQdqQgQJu6NyhNisiNhdurypXAkyH1B5P9U=; b=HdZCFN1YMvZaD7kOUg5OncMjaXYCAcIMW0/Nb72wSf/FXpTIiYNaOnFPAoncF6V12YtXXG fyKqit9WspaRfpD2v4UainpKo8rsDrlsY3q3hhr81y4/cswnqZ52wg92cfgmImsic6zjNe sYDB09lUwpK9YD77JSUM6UDjfK/aAYHsYZWqSossoZQtNkuIN9ngiamGv/keGd7Okwnu44 31N1gm3Y/miJl+x3wTuFunXYJx2hBAXR0SosrVB1iZHWqeXCd/MWgAI6xpdtuSPncWWkFd Mqimz6MQvTEuza2I6HFcfTTo9LDP70IC0/Dcv/mK+NHbO91s74aAsw74lvBQPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733622673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHf9i8TeRQdqQgQJu6NyhNisiNhdurypXAkyH1B5P9U=; b=Fmr7aLfyzvF68lgbdd+eB1QdPWYR2XZXfCK0wcxUHf5eIWzxbKk7xhOpeIABwhlni33gzM /ZDUgL0nfn1gfBhjAFkAtZU6oR64cEnA3/0X7ismWjx9zyjRZ7vSovWGc0I9Lybh3PecA8 vp1rPHKKuqEBhXJJZqC86HTJFXU+aAJ+LE9niwnHfPCz77Lz8ew0opbb3z4wCqIhLnxEwK i1q443Yh3cvmzkqOE1lzDr8+ZIAk/pYfjI7QMQ13SCTC1fNeU89Qbsy9rOq2rDvZJedztj WYSMIBhcjeNSN5YdRYYE3tmCa8A29n8BENGBe/SQep6kPtNfwo9iwSZS9nJqrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733622673; a=rsa-sha256; cv=none; b=lyCloC9PuOU23U+EZ7tl2v42c+lFl7V0YhWjUs/Jm9my/RTHjbpsbubE6n1avPGeCAxgFL 348S2WhzlpUzUGI4B9DDsFvMhI9VDl4i2rMzhhYXn7amgJoD7BDgAQpez+Y++6ep7G0cv/ PxZ1lrZFuyIREL2a0N9JF8U6riB7D7Hb+sZMIMJ+6SHyyExHyLr35stgjVDQXu5k2jsU9Z /shQP980IH0LswXx/8CRhtMqKJi/2RQWJ56f/K49Ka4E3iXMuov8/jWqbcoJUP6RzU9s8p bcCsHO/QLN9CCpt1K8+h6RFo9Bz2Jux1Lt6QbR0MoerjU1wvLtyUlxgVX9yvRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5SdY3sZDzYK5; Sun, 8 Dec 2024 01:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B81pD05034323; Sun, 8 Dec 2024 01:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B81pDq6034321; Sun, 8 Dec 2024 01:51:13 GMT (envelope-from git) Date: Sun, 8 Dec 2024 01:51:13 GMT Message-Id: <202412080151.4B81pDq6034321@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: f6245e432208 - stable/13 - nfs_commonsubs.c: Make all upper case user domain work List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f6245e432208cf1dd43f31b759db64aac7590108 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f6245e432208cf1dd43f31b759db64aac7590108 commit f6245e432208cf1dd43f31b759db64aac7590108 Author: Rick Macklem AuthorDate: 2024-11-24 20:47:56 +0000 Commit: Rick Macklem CommitDate: 2024-12-08 01:49:55 +0000 nfs_commonsubs.c: Make all upper case user domain work Without this patch, an all upper case user domain name (as specified by nfsuserd(8)) would not work. I believe this was done so that Kerberos realms were not confused with user domains. Now, RFC8881 specifies that the user domain name is a DNS name. As such, all upper case names should work. This patch fixes this case so that it works. The custom comparison function is no longer needed. PR: 282620 (cherry picked from commit 0347ddf41f4226c0351d2d1d78f09e8300ebac93) --- sys/fs/nfs/nfs_commonsubs.c | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 256342f146f0..ebed4a4b5905 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -225,7 +225,6 @@ static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); static void nfsv4_wanted(struct nfsv4lock *lp); static uint32_t nfsv4_filesavail(struct statfs *, struct mount *); -static int nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len); static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name); static void nfsrv_removeuser(struct nfsusrgrp *usrp, int isuser); static int nfsrv_getrefstr(struct nfsrv_descript *, u_char **, u_char **, @@ -3365,13 +3364,13 @@ tryagain: /* * If an '@' is found and the domain name matches, search for * the name with dns stripped off. - * Mixed case alpahbetics will match for the domain name, but - * all upper case will not. + * The match for alphabetics in now case insensitive, + * since RFC8881 defines this string as a DNS domain name. */ if (cnt == 0 && i < len && i > 0 && (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) && - !nfsrv_cmpmixedcase(cp, - NFSD_VNET(nfsrv_dnsname), NFSD_VNET(nfsrv_dnsnamelen))) { + strncasecmp(cp, NFSD_VNET(nfsrv_dnsname), + NFSD_VNET(nfsrv_dnsnamelen)) == 0) { len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1); *(cp - 1) = '\0'; } @@ -3592,8 +3591,8 @@ tryagain: */ if (cnt == 0 && i < len && i > 0 && (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) && - !nfsrv_cmpmixedcase(cp, - NFSD_VNET(nfsrv_dnsname), NFSD_VNET(nfsrv_dnsnamelen))) { + strncasecmp(cp, NFSD_VNET(nfsrv_dnsname), + NFSD_VNET(nfsrv_dnsnamelen)) == 0) { len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1); *(cp - 1) = '\0'; } @@ -3641,35 +3640,6 @@ out: return (error); } -/* - * Cmp len chars, allowing mixed case in the first argument to match lower - * case in the second, but not if the first argument is all upper case. - * Return 0 for a match, 1 otherwise. - */ -static int -nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len) -{ - int i; - u_char tmp; - int fndlower = 0; - - for (i = 0; i < len; i++) { - if (*cp >= 'A' && *cp <= 'Z') { - tmp = *cp++ + ('a' - 'A'); - } else { - tmp = *cp++; - if (tmp >= 'a' && tmp <= 'z') - fndlower = 1; - } - if (tmp != *cp2++) - return (1); - } - if (fndlower) - return (0); - else - return (1); -} - /* * Set the port for the nfsuserd. */ From nobody Sun Dec 8 13:37:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJk26D4z5ghCd; Sun, 08 Dec 2024 13:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJk1XFBz4q0G; Sun, 8 Dec 2024 13:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WoWqsWGTXj/2zvCS2zrR3qoM588G3vSDvGVic+du7I=; b=qyLsMHndx8DSj9mQRl/uJzw70md95VKD0goEJHzK2tAZzb/mMJs9tNdd30X1lKj69U75gX WFfd/jG7BdTXHdiY+fV1UzwI//nt7Mk4cylNnjwrTmrRti4vSaP5vd8iJOyeJnlulnP60X 7nXL3fqw8Be5m/rZmr0N6aTBN/WhVxmrF4BTVk/fNedGD8/MN8oSlr2sDWod1bk2E+EPOe H+wb3v+ZYMpKHMQLPunqitiwCa+aeg9W8F4UK3dbpvENlrzzCodYspQhCAX2FfA9ZtZyxj K54XXTp+h1fASMT39RVkB8LKEgbd10tK1qvUdANkWbLCZ54oTex1eldzDT4+1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WoWqsWGTXj/2zvCS2zrR3qoM588G3vSDvGVic+du7I=; b=BN8+HgcEIBe6iXpN1aKcRpc3/BsMs647JwTLxfr3m7CFq/Pqmqn9j4NhZHlE9Yf7hrXIyC DehZrkbLsen52zk3OVaM/E6yU5t9SVKNydg+L7NWr2vW6gIFRgSbx76twcBJ/zstjBWxus xes9/F/yOYRdjrsbve2XFzckVdmMxdt77PRWIgcV68ngXIn1mQitHoHpK1spuN5m7/xsHZ HNSrLxH4XV52QSeF6RtRiFNF4sPcYmlNZr9fQyYjhzY0AzULhyO89sRcDdqdn5C0dEMhGU dqmc/nmdsr6FkzBfeKOL2hmyRfRJ26yif1M5v4ibjlmOy/P1yM35tas4p67R/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665062; a=rsa-sha256; cv=none; b=f3+mL4i37wVYqSYlShzlUhvCISJ87Dky7oQ0vHMjHglIf0wm0qUNp0r5C28Nk2c9/GJSck jLhqshAsx8ku4wYW2pIs30tl0hbt3EufBWNLOTxN4alpYJnrlOXXTC2y7VfgXPR9gb0MDa ymFDEsjAfj+qYDMdEyDycUq5z8wTyrWT5CpJ3pXHCE6xmcgvj0v3Km3JCF5S/FxPt1cK+K zAsGpOVtL3ncq7OY8oYNJkg4cE6EKQOBqy8MHioU0wbrZhrL88CCM6jD6ZtejHTLu6xHTa 2LavvjCJLZ4ug0YwwFP12z0BuZjr7keMxNM6tobgeSWjbGzZEyuwGilcDntRow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mJk0fW2ztpm; Sun, 8 Dec 2024 13:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DbfCA038935; Sun, 8 Dec 2024 13:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8DbfB3038932; Sun, 8 Dec 2024 13:37:41 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:41 GMT Message-Id: <202412081337.4B8DbfB3038932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: 60799897ea89 - stable/14 - arm: switch the BUSDMA buffers to normal uncached memory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60799897ea89606ce5d46a520a9588ead2433750 Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=60799897ea89606ce5d46a520a9588ead2433750 commit 60799897ea89606ce5d46a520a9588ead2433750 Author: Michal Meloun AuthorDate: 2024-11-08 12:00:57 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:37 +0000 arm: switch the BUSDMA buffers to normal uncached memory The BUSDMA buffer is treated as normal memory during compilation and compiler is free to inline/optimize basic functions (i.e. memset, memcpy) accessing buffers, including when an instruction is generated that performs a word access to unaligned data. We support this, but only if the buffer in question is mapped as normal memory (cached or not), but not to memory mapped as strongly ordered or device type. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47485 (cherry picked from commit 248109448f6afb3d093a522677aab2975a3e7a15) --- sys/arm/include/vm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/include/vm.h b/sys/arm/include/vm.h index 439dbdf440a6..697b48689bd8 100644 --- a/sys/arm/include/vm.h +++ b/sys/arm/include/vm.h @@ -36,7 +36,7 @@ #define VM_MEMATTR_WRITE_THROUGH ((vm_memattr_t)4) #define VM_MEMATTR_DEFAULT VM_MEMATTR_WB_WA -#define VM_MEMATTR_UNCACHEABLE VM_MEMATTR_SO /* misused by DMA */ +#define VM_MEMATTR_UNCACHEABLE VM_MEMATTR_NOCACHE /* used by BUSDMA */ #ifdef _KERNEL /* Don't export aliased VM_MEMATTR to userland */ #define VM_MEMATTR_WRITE_COMBINING VM_MEMATTR_WRITE_THROUGH /* for DRM */ From nobody Sun Dec 8 13:37:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJl2fR1z5gh22; Sun, 08 Dec 2024 13:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJl26yZz4prR; Sun, 8 Dec 2024 13:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n93sw1SEkS8OJyu51CwLqA25sFT0DYJqHkTgWAs5Pls=; b=E8enFPWz6rJrN42v+P36ymn8I9KUxZInH3zeMoiUV2sZZMusFXoqaSP5j4C/F7UztQZnWB w02Oyi041GfTBFhJCk4EI4mCvvrITgQjmMVyD5XAFm5I0opx82mke4FJkT3iGo5AfDsCE2 PfOE/vowBbQzf/2GblDk9zub7OhFp3cwJGf0y6g+6SdhAeVO5WYjmYcnjmfYnHGSkQcDnx /h8EuAsm7/UTXMuLCLUpTTRkj1InsfiWeNPiM79WUO/WNEfBVxgEvofIMa+VbV5nTX/itZ NXyWZv5PT3CjNPO2wQC0re56wQxFTNSbljDiVXX+b+ZQ5OY/Rwqh7f5TIE3sMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n93sw1SEkS8OJyu51CwLqA25sFT0DYJqHkTgWAs5Pls=; b=kOzTKv+QuGzHM3OxeGPuMgY41shp2Ph1DjLP2w9rONc/Gxmf6uU082kByVwyksahpfeCk3 LFCdJCFw4ISGG/+s4G6Q4lPT14sJ/Q+zAj28vS9hGwUFadmdVfyM/ohDOiyMhEwoSWyBCu Cpp6ofa108w2fHZldY2iKLC3VON8Bgx+ReGzSqn37RtafbePuwpxpcObAV+465Yk/0S6Q/ ONv7BtduTL7a+f0l4VfwKiKn7x1jdT8XRyILt/dTCQEIC47tbz0iG7rYO1KGlWMg6dEMlZ c1THJfM3/dukC/fWkqSznNo4tDKNp/739iz4Wq/KUoYOXbpndYO0T/FQuq2SLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665063; a=rsa-sha256; cv=none; b=Vm9GfXUZeI7NaXKTKD44ZbX8SksMVFv5KPNrl6VTe8xN5pPsn58e5ETEBKz7rUB6qwQy4p +ShpZZeMHCGGxoMENjrLW9NfrLY0ZKHhd/XPeo6kE3ntwjk4Hsy8CsU8vMqUe5Ec/EX25R 9ohBf68KSKyfN1dv0CFYX+S9hPht2GVrLw5KKs9Vjxe5fOxuNhw0EYYVk8Yy/KUoczPFmv F/wGISOAIpdHSgnBLe3eT8F1qkkE5rnMcJCQD4/jI8ifi2h7SfjuD6TBtHpkrd7Tzv5rJE 4ydKUagyien9eCtTp2+Yl48daRVgrIaM+MI08g7h+dxDQv9s+Biwk2Dxm0dPSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mJl1F7bzvWS; Sun, 8 Dec 2024 13:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DbhQQ038977; Sun, 8 Dec 2024 13:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8DbhFG038974; Sun, 8 Dec 2024 13:37:43 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:43 GMT Message-Id: <202412081337.4B8DbhFG038974@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: df890fef1dcf - stable/14 - arm: Fix typo in ldscript.arm. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df890fef1dcfb556d27c82a8901ce355ed304849 Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=df890fef1dcfb556d27c82a8901ce355ed304849 commit df890fef1dcfb556d27c82a8901ce355ed304849 Author: Michal Meloun AuthorDate: 2024-11-17 10:21:47 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:37 +0000 arm: Fix typo in ldscript.arm. MFC after: 1 week (cherry picked from commit 0381f0b63b9a5e55d4eca3da5c35ab55e4ce948b) --- sys/conf/ldscript.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index f42af5bc4a4c..a1c38a5636e2 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -64,7 +64,7 @@ SECTIONS _extab_start = .; PROVIDE(extab_start = .); .ARM.extab : { *(.ARM.extab) } - _extab.end = .; + _extab_end = .; PROVIDE(extab_end = .); _exidx_start = .; From nobody Sun Dec 8 13:37:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJn6Lv2z5ghJn; Sun, 08 Dec 2024 13:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJn3rr7z4q54; Sun, 8 Dec 2024 13:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05ZcgilnSiRmcYg5XF+k7gRBK58eNv83OBacF3kEgH4=; b=ZP9UnRmF6JbBXPvKAb9pvOds+XoTd3++Tq1ecTgq6ta1Tmo6LDj8xONMQGhkxmf7Mj7P5m BK8XFAtXPLW3Yr3J0qNDOWJj9Z1PHWPLLBnFKo1Anr4CbGtD5L1i+0UbrDHowXP/+PInnU fNknhZuE44YsGoIBPRLemGgW5Fjtgsgq2YxmVAAxdPGyFwZYSWsssjlI1WB7DKNYv/+uIE W5eBkvNhvwp3YRBcXhrBgZQysPpObsFdJs1vMZmwh3PakGjKdXnnXHRMIEO61OvTbFzYz3 FxAU243Cw1ayNRSZrJ+DQo/eS8M1hmr+Sn1URF7fO/0bcFIbLOEllIvaxIkTHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05ZcgilnSiRmcYg5XF+k7gRBK58eNv83OBacF3kEgH4=; b=k9hirEJDkmkiYX0PvvTfZDTfCI5UU3iC9es5W0brZOcU65cnPwO8c2Uld36j5EhQkXcUAn 8KNVfQlx1BjWHr/P4oapYL4dHyDb+cXH6LngAX6epI/DwayzIuFItpjmtD2iG7G6JS6A4m Onpe3nMQELyDTYU6Lx6XqH7rBzotvxYnM0R3xFrmSVVcizkgN3N+6GG71+5stU77hmSGZ9 BavyIgACX/dGaQFjXhA9295TI0jsnzf3fnrWHoWuodOEtmpARzkL6bBCWwct7mdiGLMnbj X/Fg+gd91GffjlQNHJoBXoy6ErxWQtVeak2MtpfgoXn4RZg7jH1FWiljg52/Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665065; a=rsa-sha256; cv=none; b=R4OwAELVysTMKGuxFUMgK+noxpUuvKSBEQmv7LQHhZLmJXQT8f3BmPcM46oq1QfgU2WTEm cv5Mtdn011ofS9qDFl/Lt1BV9TjVvE3lmsZwwCdVwGZo9eM4zMOQaRFER2rRnyF/w4E59K uMnHUNB8Fe55gkUHJ1tw+mblfzDdHVZE4WB1z36HKuagtHWNjUt+IJC4t2tKVzGtFqUT1+ iZmEk2idDozwlz4ohzNoeAdyzXa9exIZ7bYTrlV2CZ8rVkIroJBs7YcZcX60WECwAwWC0x d2at8CtLRspjWuxHAysw9guO90sZNpjgC6+cggDhRwCx0Pbm98Qx9dJszWOp1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mJn2xVYzvFD; Sun, 8 Dec 2024 13:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DbjLY039116; Sun, 8 Dec 2024 13:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8Dbjga039113; Sun, 8 Dec 2024 13:37:45 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:45 GMT Message-Id: <202412081337.4B8Dbjga039113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: d321b707d6a9 - stable/14 - arm: add read_frequently, read_mostly and exclusive_cache_line sections to linker script. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d321b707d6a939ddda1a77915b0f8518923f8b84 Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=d321b707d6a939ddda1a77915b0f8518923f8b84 commit d321b707d6a939ddda1a77915b0f8518923f8b84 Author: Michal Meloun AuthorDate: 2024-11-17 10:39:19 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:38 +0000 arm: add read_frequently, read_mostly and exclusive_cache_line sections to linker script. MFC after: 1 week (cherry picked from commit d98a18d032e6ed3dbae30233d217c6597000e391) --- sys/conf/ldscript.arm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index 4c6716908bde..62f9c0847c4a 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -82,6 +82,21 @@ SECTIONS *(.data) *(.gnu.linkonce.d*) } + . = ALIGN(64); + .data.read_frequently : + { + *(SORT_BY_ALIGNMENT(.data.read_frequently)) + } + .data.read_mostly : + { + *(.data.read_mostly) + } + . = ALIGN(64); + .data.exclusive_cache_line : + { + *(.data.exclusive_cache_line) + } + . = ALIGN(64); .data1 : { *(.data1) } . = ALIGN(32 / 8); .init_array : From nobody Sun Dec 8 13:37:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJm6FT8z5ghCg; Sun, 08 Dec 2024 13:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJm2v97z4q2D; Sun, 8 Dec 2024 13:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKjhxe5zYVHys6CWFz12BBlJzL5ajgc2l8Pz78FkIss=; b=oNz15rjCpcpg6vQ2RK1cEE8GHaJNz+GzCGMtZxt5KxEt23TQHmU+lzUgLuVRC1vqE1uXw0 H0XgMjrBGW/zWQWCv35Di7g273B/1fffP68EXjwHvEj6oOtyutafQzuNzxUeT/w7sQ/NjC rEbA9XLwLzh6xXv4WNZSmy/DMQbn7m//iWWvY9RcsBis70oha8SBl0L6CQ1+FTq/cB2Oxh 34ypLDrWZ2fSOMYWInMsk4nZq3QpHWheCCs4SMqU/SVTmsrQhZlQsDtQDetn4RUmrOia3d 1yeK8nJxX0xmd64q7tOySIcR//UIAu+br9bGgA4nQ+zXQeN0SN1HAvSKrUlJAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKjhxe5zYVHys6CWFz12BBlJzL5ajgc2l8Pz78FkIss=; b=fmhLxxGB5kgBD6zMM5sY2AeH6UGJJqXZW4J1d+C2BTLcM9upepBgK+zbYRz74vI2FM2Fgl ZwIi6y1KErnbNeM0qOXAdZ9k7SGuCM/WfLD2C6rOJAbuVLDD1swU+flKXjXqvVYaqxKSJa 7javWjEdfohRbNrJckM2ODCrLV0SB46EjtEnbUBdyFUmbNkqgERysgweEj1950HXmrofSk CHBF1snkQxiB0eptQBKsO6oY2voIxPx+tkGMuxhugQbrhJPfddyjJVMxpsCarBKGOCcSK/ DahOFVRa3OXhoDlr7Ig7WB8IQ31GXjTvx5qIZLQ4MbtAM6b8jF0TOzRtBjaXrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665064; a=rsa-sha256; cv=none; b=CMX5wGFVosUeefJH3CHnk+l/1PBXGJi8BpIay7n17sGzDaoo/HrQTeK3bQA0l6zNLcNma1 +WDi14t3z6RAplzGQpNdvBJhJ5duloILU+3OMopJ/1OUbzyxfs9RSZk6DPh/Swvmguoi/n /yhwrC5zCh0HsGu1vckCUN3b3CoRMRxN5oou4E73oq5FISNrvX21aRABGlYR/aG7/dRjFE gTdYqZHt/nEclg/5S0NSjvRHfOZreChUPu09HeB3Ku3EX1s7iaeVBKtmAJeRbiSkq7ltJP jICoWFSJmJRA++ANa/ZLk8ZCruf+a6nwih6B4WQ6mKsGWKoDSpyFVeyVGV34ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mJm2GlRzvWT; Sun, 8 Dec 2024 13:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8Dbi8I039029; Sun, 8 Dec 2024 13:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8DbiT7039026; Sun, 8 Dec 2024 13:37:44 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:44 GMT Message-Id: <202412081337.4B8DbiT7039026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: c159be9a0a73 - stable/14 - arm: fix symbols around the .ARM.exidx section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c159be9a0a738d70e009392db5894a54a79dc21f Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=c159be9a0a738d70e009392db5894a54a79dc21f commit c159be9a0a738d70e009392db5894a54a79dc21f Author: Michal Meloun AuthorDate: 2024-11-17 10:33:32 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:38 +0000 arm: fix symbols around the .ARM.exidx section Insert a direct assignment to the location counter to ensure that orphaned sections cannot be emitted between the _exidx_start symbol and the .ARM.exidx section. Discussed with: jrtc27 MFC after: 1 week (cherry picked from commit 1701dfae1be3be6f8f1fdd3b6b636d3161b33420) --- sys/conf/ldscript.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index a1c38a5636e2..4c6716908bde 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -67,6 +67,7 @@ SECTIONS _extab_end = .; PROVIDE(extab_end = .); + . = ALIGN(4); _exidx_start = .; PROVIDE(exidx_start = .); .ARM.exidx : { *(.ARM.exidx) } From nobody Sun Dec 8 13:37:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJq0Pxxz5gh4k; Sun, 08 Dec 2024 13:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJp4jzbz4ps6; Sun, 8 Dec 2024 13:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmDP97cttU6QLIrasvd7bCZ9D1jg42jmavW6eU5VdII=; b=IZFJMJjyE1/JNsPfC7UZFS60mTYJezF++lnNviDEYbcClS/NPz8/SzL1lQD4iV+OQimtU+ AyycHcjRPpAHxbN1HSb01W9y2QNcH1GRyXhxNnhZob/4Gk8hsk7dkwEdvxgbcIrxXcCAgI r5F+asmoyrfAbND7zmKcztgNJeoOdhYjrD7COImweBa68u7xCx3ZSZtaLM3eUqwZUUbkP8 MQMhKWNft1GqYojhGfelqQMsiwIvmIo7J5x8QuusRBd2ubywig5HOPZZy+qROoc0sEw0xw YFih1Xc8HDqmUfVl7BvkdEbOtJ3LtcCg1qIqeyLt7sarEG/6JH029MSqFxr1jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmDP97cttU6QLIrasvd7bCZ9D1jg42jmavW6eU5VdII=; b=FCNHndd+tBMVppj1gopOKGk4cV1SCtkpMRJ+hM4rbJmZunfGubv8hmF2jt7rsaNiPwcKjq 4D3y99KOe3xk31KHfsJ7FricVeQBZbnQulExOzxDBxYy/UdJmgrBHUPg5FJ6p/eVB+yD3A dUUe+V38NOHg0l/E8aZfolOI2zyUpDbesIP6mbrR4NUbdXjWjZqbmW2Z5j9g/XdqKaygPB fTiP1tS9+rax488bm3z1cau60ufEvqEjlbWEwz5jWvm86AYn3nXYDs4PeVDll9Nx0dAOBp i30xUk/MPfn4UQsifnYKg/hq+2JgMI/FpgBoa2ga3x0K9Hy875PLD6jrc/Epeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665066; a=rsa-sha256; cv=none; b=aTYNtsI4dfb4IMGzwiKF5+oi5drEoJtnfbvSd1R+YY/i4KYT1GBlf9zO9zjLWLDmnXuwBn An043ABEFPbzlQDNvOGyifSzWuZ6sAGGT55wSa9lq6IEujZFEBo8seK/zfEE4oXCgUnBjK weMoCMeCFwNs8IJKQhBFvGPCwIrTwmsc+W+Mze4el/KazVbnr20RtuZsisjRQcQJZ/peEn oJZzDdqffMq6QKc4J0iljUj2jCoANiazPh6uLvirBQzyN36aFQj/LF9LpnOztsZUb+Gpdy zB2yjTrPQa8dsF8/1W2O5Cl1C95moEd6NZB20Df7wxHUEuOnUWRUaYtQMLRJZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mJp3rRtzvFF; Sun, 8 Dec 2024 13:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DbkF4039165; Sun, 8 Dec 2024 13:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8DbkTX039162; Sun, 8 Dec 2024 13:37:46 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:46 GMT Message-Id: <202412081337.4B8DbkTX039162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: 83ad268f7e0e - stable/14 - arm: align data section to the supersection. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83ad268f7e0e084e495f8318c96184556902a5fa Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=83ad268f7e0e084e495f8318c96184556902a5fa commit 83ad268f7e0e084e495f8318c96184556902a5fa Author: Michal Meloun AuthorDate: 2024-11-17 10:50:41 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:38 +0000 arm: align data section to the supersection. Offset based data section alignment is probably not applicable to any system other than i386. MFC after: 4 week (cherry picked from commit 60e72eb16a08bdebb40c99cdfcde04e606fe4f3e) --- sys/conf/ldscript.arm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index 62f9c0847c4a..ac6f641a0a50 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -74,9 +74,7 @@ SECTIONS _exidx_end = .; PROVIDE(exidx_end = .); - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x1000) + (. & (0x1000 - 1)) ; + . = ALIGN(0x10000); .data : { *(.data) From nobody Sun Dec 8 13:37:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mJq6lzpz5ghGc; Sun, 08 Dec 2024 13:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mJq5NH9z4q2r; Sun, 8 Dec 2024 13:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7luUoRXN1WXZT2RaxjQJs2BGFNQ3R0bF1lRLVCYxys=; b=ZR4KX79gWJcJey7N48hN6/KVO0JRepcj/g6yN8bvf0dLUQ1cGMkl4lkhWqR3t0TvFj4au/ jUtOZROmhunW/JsjaBKzXGwSWWb5qah0GTFVaNorEZbKG7D8xwbDKT00jCBNoiu/ipswar ENtOGzXqb32jwkHryz+tzwQ29LMl3+YjBpOI8m3m95pClznMC9DVwfsoIFKa/fNtQu6U+n BUR6/XJTnIUV8I7B2PVjxORPmfIRn2yAzOj6AQQRgXi1kBsXQ5/UnaXyasDOhXX9xHElPD f3XgsCZUSaxPDOvw0zkCJiirm6nstsZexdzd+snxwHdKAQoJZoPgUEJrb6Xaeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7luUoRXN1WXZT2RaxjQJs2BGFNQ3R0bF1lRLVCYxys=; b=FjCMVR/lrFzWg0OYAwWUYnhqyTJS01u2zlFJe2bmAIUcNSuDCFuTUzaBSsiV4KbXXUTgn6 5poz19jgXtMZxat8mUk44t2VLxAIW3dcOn9nxNz+f8P7C34v4kzkBdkkBwIANeMBtGNw1s uMUJ4/FNmO0rnGp2zHqDMe5qGJZDUNqE5ZFGX2yQGEioXQtAz1jKWznEb+dcD5XyRpMwq2 ViX4BJPPiCIbdGaDOGgRU612q1srvmDlq1ekI2CRcxRgwS2OfG7hZSHn1VUMaIQRHgpoLK ajXFDSqt5tmn3B+unH/0+k5v/n+Mu3IwRw2saqkR7banaEK0PQWUzQP6w30IYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665067; a=rsa-sha256; cv=none; b=dyJ5oQtcmSiyNp15K7rYGEWYLo5UEkep8YbLZAq/G7xUG5CWMYcy2g/mfz/9rUedll8CDE +4Kijjfs9TIe4QAFmKwaSgUicK+m9dZJ+ZwCx8I8Jcug97WdIg6j8ue0s3Op/dXKe4+JSV 7BdfLjyxUOR/aalNnP+f+ptG7i3sHIIvDU1OXEBfT24lAxmZSSxFZnm2KuKqcHrmLhvD+8 lviyyAOOFZ1ETlNHHe3vp6tfgdCzbo7Jq8oXW2KbrpwdtSIeFGOkXGq2SGWOlsESYz9atp qnU0dDepBBnz96jjUsvu2gvxeVO7tSurXnDrS9jiMHuAr9ktsiXw6K2ZIHWa+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 4Y5mJq4sgHzvR8; Sun, 8 Dec 2024 13:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DblO0039221; Sun, 8 Dec 2024 13:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8Dbl7d039218; Sun, 8 Dec 2024 13:37:47 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:37:47 GMT Message-Id: <202412081337.4B8Dbl7d039218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: d94ff663b6a6 - stable/14 - arm: Fix VFP state corruption during signal delivery List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d94ff663b6a6e208af2bc27474e00d96659fcb41 Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=d94ff663b6a6e208af2bc27474e00d96659fcb41 commit d94ff663b6a6e208af2bc27474e00d96659fcb41 Author: Michal Meloun AuthorDate: 2024-11-26 11:08:21 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 10:36:38 +0000 arm: Fix VFP state corruption during signal delivery D37419 corrupts VFP context store on signal delivery and D38696 corrupts PCB because it performs a binary copy between structures with different layouts. Revert the problematic parts of these commits to have signals delivery working. Unfortunately, there are more problems with these revisions and more fixes need to be developed. Fixes: 6926e2699ae55080f860488895a2a9aa6e6d9b4d Fixes: 4d2427f2c4451babe1bad600ae02c8a7c66031fe MFC after: 4 weeks (cherry picked from commit 3abef90c325dc9badc51cc0e195db3fd5548ff53) --- sys/arm/arm/exec_machdep.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/sys/arm/arm/exec_machdep.c b/sys/arm/arm/exec_machdep.c index 6f52e1724a5c..258526d03ff5 100644 --- a/sys/arm/arm/exec_machdep.c +++ b/sys/arm/arm/exec_machdep.c @@ -102,14 +102,19 @@ get_vfpcontext(struct thread *td, mcontext_vfp_t *vfp) P_SHOULDSTOP(td->td_proc)); pcb = td->td_pcb; - if ((pcb->pcb_fpflags & PCB_FP_STARTED) != 0 && td == curthread) { + if (td == curthread) { critical_enter(); vfp_store(&pcb->pcb_vfpstate, false); critical_exit(); } KASSERT(pcb->pcb_vfpsaved == &pcb->pcb_vfpstate, ("Called get_vfpcontext while the kernel is using the VFP")); - memcpy(vfp, &pcb->pcb_vfpstate, sizeof(*vfp)); + + memset(vfp, 0, sizeof(*vfp)); + memcpy(vfp->mcv_reg, pcb->pcb_vfpstate.reg, + sizeof(vfp->mcv_reg)); + vfp->mcv_fpscr = pcb->pcb_vfpstate.fpscr; + } /* @@ -128,7 +133,10 @@ set_vfpcontext(struct thread *td, mcontext_vfp_t *vfp) } KASSERT(pcb->pcb_vfpsaved == &pcb->pcb_vfpstate, ("Called set_vfpcontext while the kernel is using the VFP")); - memcpy(&pcb->pcb_vfpstate, vfp, sizeof(*vfp)); + memcpy(pcb->pcb_vfpstate.reg, vfp->mcv_reg, + sizeof(pcb->pcb_vfpstate.reg)); + pcb->pcb_vfpstate.fpscr = vfp->mcv_fpscr; + } #endif @@ -164,8 +172,6 @@ get_mcontext(struct thread *td, mcontext_t *mcp, int clear_ret) { struct trapframe *tf = td->td_frame; __greg_t *gr = mcp->__gregs; - mcontext_vfp_t mcontext_vfp; - int rv; if (clear_ret & GET_MC_CLEAR_RET) { gr[_REG_R0] = 0; @@ -190,19 +196,9 @@ get_mcontext(struct thread *td, mcontext_t *mcp, int clear_ret) gr[_REG_LR] = tf->tf_usr_lr; gr[_REG_PC] = tf->tf_pc; -#ifdef VFP - if (mcp->mc_vfp_size != sizeof(mcontext_vfp_t)) - return (EINVAL); - get_vfpcontext(td, &mcontext_vfp); -#else - bzero(&mcontext_vfp, sizeof(mcontext_vfp)); -#endif - - if (mcp->mc_vfp_ptr != NULL) { - rv = copyout(&mcontext_vfp, mcp->mc_vfp_ptr, sizeof(mcontext_vfp)); - if (rv != 0) - return (rv); - } + mcp->mc_vfp_size = 0; + mcp->mc_vfp_ptr = NULL; + memset(&mcp->mc_spare, 0, sizeof(mcp->mc_spare)); return (0); } @@ -316,6 +312,16 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Populate the siginfo frame. */ bzero(&frame, sizeof(frame)); get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); + +#ifdef VFP + get_vfpcontext(td, &frame.sf_vfp); + frame.sf_uc.uc_mcontext.mc_vfp_size = sizeof(fp->sf_vfp); + frame.sf_uc.uc_mcontext.mc_vfp_ptr = &fp->sf_vfp; +#else + frame.sf_uc.uc_mcontext.mc_vfp_size = 0; + frame.sf_uc.uc_mcontext.mc_vfp_ptr = NULL; +#endif + frame.sf_si = ksi->ksi_info; frame.sf_uc.uc_sigmask = *mask; frame.sf_uc.uc_stack = td->td_sigstk; From nobody Sun Dec 8 13:38:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mKF3mX2z5ghGm; Sun, 08 Dec 2024 13:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mKD562Pz4qxY; Sun, 8 Dec 2024 13:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv44yyGTv2FoG452WePHye58d06Asfua2zCI5HXZB0w=; b=DrTNn2lppcfQKsiQwBF3qERsfhEqByWIIh3crDXco1+ga+xFHro6OnI7MCtxfjBcF+wRgp FicLDhMXNZynG8FW6z1LwLbfVjKn0iMQW6P37tQtDeWFBB95lIaFfri2yh/wSHlU7cymye uY84H90BIjZZykwn3eg+cU6XgdyBo0gL9MYUc/LuZ7YNTpT1wlorjmbfIaIM7E5FS+giRi 3BprrtWhCUOa1BImHdYqIkySeD7zwXLp6Kt0MVWWJ926Vk8/0VNLKh28zYb7QcCEDFIPXz 1wi0EmqOOBcPrHMQMhbxQgXIipwZIT+6cxfRNgzSC9822MrmP0Z+d+Jf4GS5Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv44yyGTv2FoG452WePHye58d06Asfua2zCI5HXZB0w=; b=GSTHPnT4djJuj4v2VsKbO91yckRMR6Rd0bcWlRXkL7PIcbQGPl6HROPb/uA+P94GKavOQu HvAQqL65YYMmJ+Jbkgai5crxXd1VBBbHWLIpVPUAwsUYoVs6lF1fKKn/4q763Oqz8S6Gr5 aDcfzsRoRWOq/eEyWPNxz8C5qh4gzySH1cr6b9JLQcaTLI/fRV05xXX0/dqE94IkwdwKK/ zPXIvOuym8XOhLMlO/aZqRWFkSqQtmrE0RETgLI4jsefzinJP1Ru4QWeBEaO3a8pPM6aP6 7fVVmd3CjSsoxHiyaHnHIM0K7jyU9DkUAAKB5P6AiUIiSgZBi99mAXe/rSbZsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665088; a=rsa-sha256; cv=none; b=PRnktvSaJqWHYIlgLexNGcG6bDu4MfMfmwdIFu0DqtTOGWHx0PZEJ7sMpoKRSC4A/FmU+a JYVhjJM0HgVMlM2C5YDU0fZ7nXfpL/EbuzkIzbPqg0sns+bT8Yto4I8b3mJZqzgs2cV8lM xhjuhNEaaQe9ErnbG6Z6fi6K5F8QQDP82F2CxqEO2jbKpjgXV6NO/E9TcVQUY1ifWxsfLL gVytu3t1spetZv5fyyLgg6u+e73nFGX1soTHEo4XK6tNuIofyim1oEI84YbAUpSdKBABgi MO8wEB9C6YZI713Wo9ilB3FxtXffNNFytyhbtGJ4221qacALKwigaqZwFNSN1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mKD3DHCzvTW; Sun, 8 Dec 2024 13:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8Dc8jG039566; Sun, 8 Dec 2024 13:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8Dc8fa039563; Sun, 8 Dec 2024 13:38:08 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:38:08 GMT Message-Id: <202412081338.4B8Dc8fa039563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: b9d95dc51a21 - stable/13 - arm: fix symbols around the .ARM.exidx section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9d95dc51a21449aa363b3bd963c330ebd690913 Auto-Submitted: auto-generated The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d95dc51a21449aa363b3bd963c330ebd690913 commit b9d95dc51a21449aa363b3bd963c330ebd690913 Author: Michal Meloun AuthorDate: 2024-11-17 10:33:32 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 13:19:42 +0000 arm: fix symbols around the .ARM.exidx section Insert a direct assignment to the location counter to ensure that orphaned sections cannot be emitted between the _exidx_start symbol and the .ARM.exidx section. Discussed with: jrtc27 MFC after: 1 week (cherry picked from commit 1701dfae1be3be6f8f1fdd3b6b636d3161b33420) --- sys/conf/ldscript.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index 37e8d442b33e..62adb1e773d0 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -67,6 +67,7 @@ SECTIONS _extab_end = .; PROVIDE(extab_end = .); + . = ALIGN(4); _exidx_start = .; PROVIDE(exidx_start = .); .ARM.exidx : { *(.ARM.exidx) } From nobody Sun Dec 8 13:38:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mKG2r1bz5ghMk; Sun, 08 Dec 2024 13:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mKF5HJQz4qv6; Sun, 8 Dec 2024 13:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moWEaJ2Qe0wnvosJUICEmxnWSw+YsziJTVbRSgyV46g=; b=w9BzH8ng8Bd3gUfo0Zz9tPLK2Ma6F8kON8S5b6YlciNvzW+I3+2NJhJSn2V3CF538VihIK M6qbARovV9eMco1j0Vv0jVvwBcC9hjp0dNBNGteAuHJfzwb30auCIlsdHd5wxqm9nh5Mb0 tFqDgP1qOg7/TDXvG8ZIO+5EkrMrXR+B900ox2w4svY5aWYIIuR67SS3zYfKccT81tZmza lhz23ACt7q8CA3DzspRp75ak5TOvtjprRxfL8i453tyHxsahyj+Sz2UA1XddrdCD4MQ28U EhFu+OG6UELisJjW7sO0PVhUQb/OSU5EmsVr1ROsE/byeFy1fm1HviCICiMKBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moWEaJ2Qe0wnvosJUICEmxnWSw+YsziJTVbRSgyV46g=; b=MVFsVhuX5nWLYQkVW5059mGh+fmCL7rd6RHlY79xzO6aMN6WybhpGKpiPdFViJJytCE7Y2 Jl5rMZFpvF4CNer60m/dOYV7GWNOIEQ+CdwBIrgXodOM6uCDKP1NqLy8Qpyhx+m4qIie1Q W34CcG4W3trIEZFtmGQE1mdI+YouN3umgsNmHvvVlck4Gz5JF75vnVR8R+kz9PIO3UMbcw oApvNSAqOkojQYNKevxRXErBzLAdr6oxjfoKyKwZguzWOlBzlT+OmHXJsGq41uDuGQtFeF eLBRVwS1jpoMlcxYZOHqzOzZ1USDBc+olL2rmQ6xYc/TX3m38hbYPharu90qIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665089; a=rsa-sha256; cv=none; b=hHIrANoEiYs93tUVNUCb3q1mqZmciWsf5zI1uMbMkJ/Slt6eCqQRqbMkYIt/GiqFZReoKp /ZE7bExXl4ImMs8VqFyKo+nCLgJazNQw5Dls9kfXYKQ/5mKvgDGD081U/IX5SxLNEjjWG/ oMUpPwxOQe3BaFEQhNhdrMFKyNdpxtjYEcpKYk2O1cLUUJPi3cqi57OVj19t6LJgL3rIh8 AK5dfWDu6mgY5VQZv7x+lSiRq+chB44994irMFaAFg6qt/rfHwQTJmMGUU3s6oRNo4LEPR pTczBHteJm491LR51t7uy2a/MHi68Sdqp4zRFMR06Y/z1mdlos0yuS7w99TYdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mKF4GRmzvFG; Sun, 8 Dec 2024 13:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8Dc9jU039634; Sun, 8 Dec 2024 13:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8Dc9S9039631; Sun, 8 Dec 2024 13:38:09 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:38:09 GMT Message-Id: <202412081338.4B8Dc9S9039631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: a9956e87506f - stable/13 - arm: add read_frequently, read_mostly and exclusive_cache_line sections to linker script. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a9956e87506f2c1b99d6fddc60a315e8dc18b55e Auto-Submitted: auto-generated The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=a9956e87506f2c1b99d6fddc60a315e8dc18b55e commit a9956e87506f2c1b99d6fddc60a315e8dc18b55e Author: Michal Meloun AuthorDate: 2024-11-17 10:39:19 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 13:19:42 +0000 arm: add read_frequently, read_mostly and exclusive_cache_line sections to linker script. MFC after: 1 week (cherry picked from commit d98a18d032e6ed3dbae30233d217c6597000e391) --- sys/conf/ldscript.arm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index 62adb1e773d0..6b44073e26d2 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -82,6 +82,21 @@ SECTIONS *(.data) *(.gnu.linkonce.d*) } + . = ALIGN(64); + .data.read_frequently : + { + *(SORT_BY_ALIGNMENT(.data.read_frequently)) + } + .data.read_mostly : + { + *(.data.read_mostly) + } + . = ALIGN(64); + .data.exclusive_cache_line : + { + *(.data.exclusive_cache_line) + } + . = ALIGN(64); .data1 : { *(.data1) } . = ALIGN(32 / 8); _start_ctors = .; From nobody Sun Dec 8 13:38:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mKD4jhnz5ghRL; Sun, 08 Dec 2024 13:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mKC2vL5z4qlh; Sun, 8 Dec 2024 13:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Roha6tImTzsKUagghh19kOLZB3OKPvw9Lp9gbWRp0mo=; b=Rkk9gek39UY4ilQTj6WLnIqHfNsIhtnZB99f0pBEWU4IULd9ulZwaVLu0rjYexMRTg1Jsd 0jSE5aw8RDdsnfwMFy8yqD5dADA/ZGjjGhA5JwVsPwcNsCwuDgSjJ6xQmaDB8hyQ/IYkBN 9o9XzWehexxx/3cHkf/V7mkF14XaYg5DyMSDZdYC1L5BzLyz7oD2pbJlbDD0uhq2kQwYnw M41FGpNp5IsOFABuHBpIPaFnPdv3XsSBWca6IGnrxJHXOc5/CsUTHUjBFFr1+MbMpT0/b/ kGCitHPFP5liiD9sH0DVRw+xO+0TARbct2g9Bn8xe1eezdx4fpz9XCKh4JGZGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Roha6tImTzsKUagghh19kOLZB3OKPvw9Lp9gbWRp0mo=; b=cUdsEkkymqfKKdORl5Ml8gTek5j793q7w0l28YqpF6QCyh4uJ8ZAz+ahO2ukvW9PFdCThc t5ctnIwIoiEDubiTXia/ecfTcRlSmb0R2/M00M0BNpt0oSbdxr+RJAOH/KzSq6F2fUzz65 8ZqclINGhaNsMXdH/xvFGFr7Ie+aBs/QGNgEgGzJTmlrmMeMOS6A0ZsDx7YIBVKXAr+7Gc +QwcVxekZJFAFevvQiU1dIneU/OyN6O1dIqiT8JCchzzpgwh43KWf7Ktjh7IT/My2bN5dl MX9W/NFv7rbRwjsGkROFw1INXv1odp/YwcjjYPw1nf9J6FB4yF3V3aKRaFx8kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665087; a=rsa-sha256; cv=none; b=is26Vd0ao5ZxMhY5gfuC0FSTNYTLfkuMqrsJ3Fs/fq3/hnPLEFrHw12hc1Z8Q3iPhEf/i9 VCCV4bhy1bzS0fzu+508C/jCza8g52Bp++/h3hrv5mTMlyU7GhmfXFIrBeTl9DVYSpAlo+ RT00U0hsw1iArt+HAI3y2s8a8HxfCGTvaG4cbRezYKifWRKjh4Zp5DH43geH/8p7igA0Q8 XAvUTA9OfUD9m+Eu4XVIIo/HmzgPddzpkLU5NGvy8fSefluwzTA9TaE8hh+WD5AbsdgCi2 uFG8VhiddYZLnmuFN+ymqFDHQMJf3m0Tx6MsMwORUOtpzXkYg/bYDFPdcrofcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mKC2Vx5ztrj; Sun, 8 Dec 2024 13:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8Dc7gj039512; Sun, 8 Dec 2024 13:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8Dc7YJ039509; Sun, 8 Dec 2024 13:38:07 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:38:07 GMT Message-Id: <202412081338.4B8Dc7YJ039509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: b66e0c51005a - stable/13 - arm: Fix typo in ldscript.arm. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b66e0c51005a0c43c0bd7769cb155b617eb88b1d Auto-Submitted: auto-generated The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=b66e0c51005a0c43c0bd7769cb155b617eb88b1d commit b66e0c51005a0c43c0bd7769cb155b617eb88b1d Author: Michal Meloun AuthorDate: 2024-11-17 10:21:47 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 13:19:42 +0000 arm: Fix typo in ldscript.arm. MFC after: 1 week (cherry picked from commit 0381f0b63b9a5e55d4eca3da5c35ab55e4ce948b) --- sys/conf/ldscript.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index a9c39977a6fc..37e8d442b33e 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -64,7 +64,7 @@ SECTIONS _extab_start = .; PROVIDE(extab_start = .); .ARM.extab : { *(.ARM.extab) } - _extab.end = .; + _extab_end = .; PROVIDE(extab_end = .); _exidx_start = .; From nobody Sun Dec 8 13:38:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5mKJ3Fhwz5ghMn; Sun, 08 Dec 2024 13:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5mKH09g3z4qvF; Sun, 8 Dec 2024 13:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMH2u0hcrilbjC8sZ/ATRTql9MJFFsiWVHQefke65aE=; b=rqwVcoPfqUJYHzK5jRwGVRZRDiVFsHOIPwoT0xD/p/07bRXfxMsEJvcRsZSrpsDVoFy44y PDr7UlGJ2v98pjAEnie44qI2YZYUxH5YtJ+HRrYaj0DbL3d/tsBiHctVK07gXVE68+/PRp xxxrJNKiVri1HJ+j2Xb/zw2sZgpXlMXcdlf7UqiVH89ki3cirnVzxxjhGCdUo1LE2997j8 5K3Hw2HPhmMhtiu5XjTqw/o5MoSOhpKpQ5nHMq5XDSDWZrl+Tw+h88J416azyqxvfnRZqR dg8T7mkW6Hj9BbSIK3MRxdBeb6HUiyXVcZn8rCzMHYJ3dq/LwaMtxkKHNKjTTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733665091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMH2u0hcrilbjC8sZ/ATRTql9MJFFsiWVHQefke65aE=; b=jFhmqJ8gUa6iRVy3SJeIjMCjtDheCNVyDLAODh/5fxyt1N781FUjOlc0ysf1CMqPz7q9Ov NoC18uzs0YL28wQnDn0nVXy4J5zkrVAHZwEmaTagKhDk3/996Rzh9kFZ4s+nerB9cvsbXL oa5H0bMba6EvcN7WmRRV/MUTuDDMQZGzdB7Z29Wnoh1c7vBXBuh/uP9y9ICY82re0Z1kIU lgLKk3No5w+B4CC42CFCNt8PhQKXE30ojg7SptjSEI1fgtKPhvc9uAFDpEjUjCjwgLEUw5 JObJWUpUjU00ApjOI40y/p9YxJQmj5ThLexEOaKnY+3becF0Fv8FwyzJSvfpHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733665091; a=rsa-sha256; cv=none; b=lDt8mzJUnntNS/76QOdkKS1DzvKz9rx1NLCBUvtFqZg1NcWDYpwyk5MUWqK17sq4pE0zbQ 4wZq9yidwv9GeD7VYMTf/z26nPzRywAvLjbhP0rcwwZVUR4POM9ZLNjf89XSkT+0342DQt nehwrQWg4boQIelEOawekjWeVkng179tuwu8zOKbDnE3IRc1S+06mbUwaQcu3PYYz4gXVG PTHuJJXbsXerLYFp3d1PSTR0SRI3PR82EqVoiTX8Co5ADNYP3i8YE4g2+dv21XlOqf4Bfw 18zKuCwq4q1u3w8iuL+DBJdxuyMCguXCgEiinZ7w7WEl4bvQuhIAy7OlykkRew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5mKG5bNSzvWV; Sun, 8 Dec 2024 13:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8DcAue039682; Sun, 8 Dec 2024 13:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8DcAj2039679; Sun, 8 Dec 2024 13:38:10 GMT (envelope-from git) Date: Sun, 8 Dec 2024 13:38:10 GMT Message-Id: <202412081338.4B8DcAj2039679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: abed528a9726 - stable/13 - arm: align data section to the supersection. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: abed528a9726700303845f5c8b5162fcd32f31dc Auto-Submitted: auto-generated The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=abed528a9726700303845f5c8b5162fcd32f31dc commit abed528a9726700303845f5c8b5162fcd32f31dc Author: Michal Meloun AuthorDate: 2024-11-17 10:50:41 +0000 Commit: Michal Meloun CommitDate: 2024-12-08 13:19:42 +0000 arm: align data section to the supersection. Offset based data section alignment is probably not applicable to any system other than i386. MFC after: 4 week (cherry picked from commit 60e72eb16a08bdebb40c99cdfcde04e606fe4f3e) --- sys/conf/ldscript.arm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm index 6b44073e26d2..6200e51b93bb 100644 --- a/sys/conf/ldscript.arm +++ b/sys/conf/ldscript.arm @@ -74,9 +74,7 @@ SECTIONS _exidx_end = .; PROVIDE(exidx_end = .); - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x1000) + (. & (0x1000 - 1)) ; + . = ALIGN(0x10000); .data : { *(.data)